Merge pull request #241 from savi-lang/add/load-from-deps-dir

Add ability to load 3rd-party deps from the `deps` dir, by version.

examples/adventofcode/2018/manifest.savi

@@ -1,6 +1,6 @@
 :manifest "adventofcode-2018"
   :sources "src/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :dependency Map "TODO: specify version"
-  :dependency Time "TODO: specify version"
+  :dependency Spec v0
+  :dependency Map v0
+  :dependency Time v0

examples/http/manifest.savi

@@ -1,8 +1,8 @@
 :manifest "http-example"
   :sources "src/*.savi"
 
-  :dependency HTTPServer "TODO: specify version"
-  :dependency TCP "TODO: specify version"
-  :dependency IO "TODO: specify version"
-  :transitive dependency ByteStream "TODO: specify version"
-  :transitive dependency OSError "TODO: specify version"
+  :dependency HTTPServer v0
+  :dependency TCP v0
+  :dependency IO v0
+  :transitive dependency ByteStream v0
+  :transitive dependency OSError v0

packages/ByteStream.manifest.savi

@@ -5,5 +5,5 @@
   :copies ByteStream
   :sources "spec/ByteStream/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/DeterministicRandom.manifest.savi

@@ -1,11 +1,11 @@
 :manifest lib DeterministicRandom
   :sources "src/DeterministicRandom/**/*.savi"
 
-  :dependency Random "TODO: specify version"
+  :dependency Random v0
 
 :manifest bin "spec-DeterministicRandom"
   :copies DeterministicRandom
   :sources "spec/DeterministicRandom/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/HTTPServer.manifest.savi

@@ -1,11 +1,11 @@
 :manifest lib HTTPServer
   :sources "src/HTTPServer/**/*.savi"
 
-  :dependency ByteStream "TODO: specify version"
+  :dependency ByteStream v0
 
 :manifest bin "spec-HTTPServer"
   :copies HTTPServer
   :sources "spec/HTTPServer/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/IO.manifest.savi

@@ -1,5 +1,5 @@
 :manifest lib IO
   :sources "src/IO/**/*.savi"
 
-  :dependency ByteStream "TODO: specify version"
-  :dependency OSError "TODO: specify version"
+  :dependency ByteStream v0
+  :dependency OSError v0

packages/JSON.manifest.savi

@@ -5,5 +5,5 @@
   :copies JSON
   :sources "spec/JSON/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/Map.manifest.savi

@@ -5,5 +5,5 @@
   :copies Map
   :sources "spec/Map/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/Random.manifest.savi

@@ -5,7 +5,7 @@
   :copies Random
   :sources "spec/Random/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0
 
-  :dependency DeterministicRandom "TODO: specify version"
+  :dependency DeterministicRandom v0

packages/Regex.manifest.savi

@@ -5,5 +5,5 @@
   :copies Regex
   :sources "spec/Regex/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/Savi.manifest.savi

@@ -1,5 +1,5 @@
 :manifest bin "spec-Savi"
   :sources "spec/Savi/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/Spec.manifest.savi

@@ -1,7 +1,7 @@
 :manifest lib Spec
   :sources "src/Spec/**/*.savi"
 
-  :dependency Map "TODO: specify version"
+  :dependency Map v0
 
 :manifest bin "spec-Spec"
   :copies Spec

packages/StdIn.manifest.savi

@@ -1,6 +1,6 @@
 :manifest lib StdIn
   :sources "src/StdIn/**/*.savi"
 
-  :dependency ByteStream "TODO: specify version"
-  :dependency IO "TODO: specify version"
-  :transitive dependency OSError "TODO: specify version"
+  :dependency ByteStream v0
+  :dependency IO v0
+  :transitive dependency OSError v0

packages/TCP.manifest.savi

@@ -1,13 +1,13 @@
 :manifest lib TCP
   :sources "src/TCP/**/*.savi"
 
-  :dependency ByteStream "TODO: specify version"
-  :dependency IO "TODO: specify version"
-  :dependency OSError "TODO: specify version"
+  :dependency ByteStream v0
+  :dependency IO v0
+  :dependency OSError v0
 
 :manifest bin "spec-TCP"
   :copies TCP
   :sources "spec/TCP/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/Time.manifest.savi

@@ -5,5 +5,5 @@
   :copies Time
   :sources "spec/Time/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/Unicode.manifest.savi

@@ -5,5 +5,5 @@
   :copies Unicode
   :sources "spec/Unicode/**/*.savi"
 
-  :dependency Spec "TODO: specify version"
-  :transitive dependency Map "TODO: specify version"
+  :dependency Spec v0
+  :transitive dependency Map v0

packages/src/Savi/declarators/declarators.savi

@@ -502,7 +502,7 @@
   :begins manifest_dependency
 
   :term name Name
-  :term version String
+  :term version Name
 
 // TODO: Document this.
 :declarator transitive
@@ -512,7 +512,7 @@
 
   :keyword dependency
   :term name Name
-  :term version String
+  :term version Name
 
 // TODO: Document this.
 :declarator from

spec/integration/fix-manifests-missing-transitive-deps/savi.errors.txt

@@ -10,12 +10,12 @@ from ./manifest.savi:1:
 
 - this transitive dependency needs to be added:
   from ../../../packages/TCP.manifest.savi:4:
-  :dependency ByteStream "TODO: specify version"
+  :dependency ByteStream v0
               ^~~~~~~~~~
 
 - it is required by this existing dependency:
   from ./manifest.savi:4:
-  :dependency TCP "TODO: specify version"
+  :dependency TCP v0
               ^~~
 
 - run again with --fix to auto-fix this issue.
@@ -29,12 +29,12 @@ from ./manifest.savi:1:
 
 - this transitive dependency needs to be added:
   from ../../../packages/TCP.manifest.savi:5:
-  :dependency IO "TODO: specify version"
+  :dependency IO v0
               ^~
 
 - it is required by this existing dependency:
   from ./manifest.savi:4:
-  :dependency TCP "TODO: specify version"
+  :dependency TCP v0
               ^~~
 
 - run again with --fix to auto-fix this issue.
@@ -48,12 +48,12 @@ from ./manifest.savi:1:
 
 - this transitive dependency needs to be added:
   from ../../../packages/TCP.manifest.savi:6:
-  :dependency OSError "TODO: specify version"
+  :dependency OSError v0
               ^~~~~~~
 
 - it is required by this existing dependency:
   from ./manifest.savi:4:
-  :dependency TCP "TODO: specify version"
+  :dependency TCP v0
               ^~~
 
 - run again with --fix to auto-fix this issue.

spec/integration/fix-manifests-missing-transitive-deps/savi.fix.after.dir/manifest.savi

@@ -1,10 +1,10 @@
 :manifest "example"
   :sources "main.savi"
 
-  :dependency TCP "TODO: specify version"
+  :dependency TCP v0
 
-  :transitive dependency ByteStream "TODO: specify version"
+  :transitive dependency ByteStream v0
 
-  :transitive dependency IO "TODO: specify version"
+  :transitive dependency IO v0
 
-  :transitive dependency OSError "TODO: specify version"
+  :transitive dependency OSError v0

spec/integration/fix-manifests-missing-transitive-deps/savi.fix.before.dir/manifest.savi

@@ -1,4 +1,4 @@
 :manifest "example"
   :sources "main.savi"
 
-  :dependency TCP "TODO: specify version"
+  :dependency TCP v0

spec/integration/run-stdin-from-file/manifest.savi

@@ -1,7 +1,7 @@
 :manifest "example"
   :sources "src/*.savi"
 
-  :dependency StdIn "TODO: specify version"
-  :dependency IO "TODO: specify version"
-  :transitive dependency ByteStream "TODO: specify version"
-  :transitive dependency OSError "TODO: specify version"
+  :dependency StdIn v0
+  :dependency IO v0
+  :transitive dependency ByteStream v0
+  :transitive dependency OSError v0

spec/integration/run-stdin-from-pipe-large/manifest.savi

@@ -1,7 +1,7 @@
 :manifest "example"
   :sources "src/*.savi"
 
-  :dependency StdIn "TODO: specify version"
-  :dependency IO "TODO: specify version"
-  :transitive dependency ByteStream "TODO: specify version"
-  :transitive dependency OSError "TODO: specify version"
+  :dependency StdIn v0
+  :dependency IO v0
+  :transitive dependency ByteStream v0
+  :transitive dependency OSError v0

spec/integration/run-stdin-from-pipe/manifest.savi

@@ -1,7 +1,7 @@
 :manifest "example"
   :sources "src/*.savi"
 
-  :dependency StdIn "TODO: specify version"
-  :dependency IO "TODO: specify version"
-  :transitive dependency ByteStream "TODO: specify version"
-  :transitive dependency OSError "TODO: specify version"
+  :dependency StdIn v0
+  :dependency IO v0
+  :transitive dependency ByteStream v0
+  :transitive dependency OSError v0

spec/integration/run-stdout/manifest.savi

@@ -1,4 +1,4 @@
 :manifest "example"
   :sources "src/*.savi"
 
-  :dependency ByteStream "TODO: specify version"
+  :dependency ByteStream v0

src/savi/compiler/context.cr

@@ -89,7 +89,7 @@ class Savi::Compiler::Context
     return if @program.manifests.any?(&.name.pos.source.package.path.==(path))
 
     # Otherwise go ahead and load the manifests.
-    sources = compiler.source_service.get_manifest_sources_at_or_above(path)
+    sources = compiler.source_service.get_manifest_sources_at(path)
     docs = sources.map { |source| Parser.parse(source) }
     package = compile_package(sources.first.package, docs)
     self

src/savi/compiler/manifests.cr

@@ -39,7 +39,7 @@ class Savi::Compiler::Manifests
 
     # Prove that all transitive dependencies are accounted for.
     manifest.dependencies.each { |dep|
-      @manifests_by_name[dep.name.value].dependencies.each { |dep_dep|
+      @manifests_by_name[dep.name.value]?.try(&.dependencies.each { |dep_dep|
         next if @manifests_by_name[dep_dep.name.value]?
 
         ctx.error_at manifest.name,
@@ -49,10 +49,10 @@ class Savi::Compiler::Manifests
           ], [
             {manifest.append_pos, [
               "\n",
-              "  :transitive dependency #{dep_dep.name.value} #{dep_dep.version_node.value.inspect}"
+              "  :transitive dependency #{dep_dep.name.value} #{dep_dep.version.value}"
             ].join("\n")}
           ]
-      }
+      })
     }
 
     basic_manifest_checks(ctx)
@@ -118,9 +118,16 @@ class Savi::Compiler::Manifests
     orig_manifests_size = manifests.size
 
     # Compile all manifests at the path where the dep is to be found.
-    # TODO: actually use the given path from the dep information.
-    # Currently, this assumes all dependencies come from the standard package.
-    dep_path = ctx.compiler.source_service.standard_package_path
+    dep_path = if dep.location_nodes.empty?
+      # If not specified assume it come from the standard packages path.
+      # TODO: In the future, we should remove this option and source all
+      # standard library packages from individual GitHub repos, so that they
+      # can be versioned independently of one another.
+      ctx.compiler.source_service.standard_package_path
+    else
+      ctx.compiler.source_service.find_latest_in_deps(ctx, dep)
+    end
+    return unless dep_path
     ctx.compile_manifests_at_path(dep_path)
 
     # Limit the manifests we look at to just the set of newly added ones.