Handle local imports with quoted paths

modules/imports/src/main/scala/org/dhallj/imports/Canonicalization.scala

@@ -9,20 +9,12 @@ import org.dhallj.imports.ResolveImportsVisitor._
 
 import scala.collection.JavaConverters._
 
-/**
- * Abstract over java.nio.Path so we can assert that their
- * normalization has the same behaviour as the Dhall spec's
- * import path canonicalization
- *
- * TODO check behaviour of `canonicalize /..` as the Dhall
- * spec seems to differ from Java here
- */
 object Canonicalization {
 
   def canonicalize[F[_]](imp: ImportContext)(implicit F: Sync[F]): F[ImportContext] = imp match {
     case Remote(uri, headers) => F.delay(Remote(uri.normalize, headers))
     case Local(path)          => LocalFile[F](path).map(_.canonicalize.toPath).map(Local)
-    case Classpath(path)      => F.delay(Classpath(path.normalize))
+    case Classpath(path)      => LocalFile[F](path).map(_.canonicalize.toPath).map(Classpath)
     case i                    => F.pure(i)
   }
 
@@ -55,8 +47,10 @@ object Canonicalization {
         child match {
           //Also note that if the path is absolute then this violates referential sanity but we handle that elsewhere
           case Local(path2) =>
-            if (path2.isAbsolute) canonicalize(Classpath(path2))
-            else canonicalize(Classpath(path.getParent.resolve(path2)))
+            for {
+              parent <- LocalFile[F](path)
+              c <- LocalFile[F](path2)
+            } yield Classpath(parent.chain(c).canonicalize.toPath)
           case _ => canonicalize(child)
         }
       case _ => canonicalize(child)
@@ -89,7 +83,8 @@ object Canonicalization {
         case l   => F.pure(LocalFile(LocalDirs(l.take(l.length - 1)), l.last))
       }
 
-    def canonicalize(f: LocalFile): LocalFile = LocalFile(f.dirs.canonicalize, f.filename)
+    def canonicalize(f: LocalFile): LocalFile =
+      LocalFile(f.dirs.canonicalize, f.filename.stripPrefix("\"").stripSuffix("\""))
 
     def chain(lhs: LocalFile, rhs: LocalFile): LocalFile = LocalFile(LocalDirs.chain(lhs.dirs, rhs.dirs), rhs.filename)
   }
@@ -107,7 +102,7 @@ object Canonicalization {
 
     def canonicalize(d: LocalDirs): LocalDirs = d.ds match {
       case Nil => d
-      case l   => LocalDirs(canonicalize(l))
+      case l   => LocalDirs(canonicalize(l.map(_.stripPrefix("\"").stripSuffix("\""))))
     }
 
     def canonicalize(l: List[String]): List[String] =

modules/imports/src/main/scala/org/dhallj/imports/ResolveImportsVisitor.scala

@@ -1,18 +1,16 @@
 package org.dhallj.imports
 
-import java.math.BigInteger
 import java.net.URI
 import java.nio.file.Path
 import java.security.MessageDigest
-import java.util.{List => JList, Map => JMap}
 
 import cats.effect.Sync
 import cats.implicits._
 import org.dhallj.cats.LiftVisitor
-import org.dhallj.core._
 import org.dhallj.core.DhallException.ResolutionFailure
 import org.dhallj.core.Expr.ImportMode
 import org.dhallj.core.Expr.Util.typeCheck
+import org.dhallj.core._
 import org.dhallj.core.binary.Decode
 import org.dhallj.imports.Caching.ImportsCache
 import org.dhallj.imports.Canonicalization.canonicalize
@@ -25,7 +23,6 @@ import org.http4s.{EntityDecoder, Headers, Request}
 
 import scala.collection.mutable.{Map => MMap}
 
-//TODO quoted path components?
 //TODO proper error handling
 private[dhallj] case class ResolveImportsVisitor[F[_] <: AnyRef](cache: ImportsCache[F], parents: List[ImportContext])(
   implicit Client: Client[F],

modules/imports/src/test/scala/org/dhallj/imports/CanonicalizationSuite.scala

@@ -21,6 +21,11 @@ class CanonicalizationSuite extends FunSuite {
     assertEquals(canonicalize[IO](Local(Paths.get("/foo.dhall"))).unsafeRunSync, Local(Paths.get("/foo.dhall")))
   }
 
+  test("Imports - quoted") {
+    assertEquals(canonicalize[IO](Local(Paths.get("/\"foo\"/\"bar.dhall\""))).unsafeRunSync,
+                 Local(Paths.get("/foo/bar.dhall")))
+  }
+
   test("Paths - Trailing .") {
     assertEquals(canonicalize[IO](Local(Paths.get("/foo/./bar.dhall"))).unsafeRunSync,
                  Local(Paths.get("/foo/bar.dhall")))

modules/imports/src/test/scala/org/dhallj/imports/ImportResolutionSuite.scala

@@ -28,6 +28,13 @@ class ImportResolutionSuite extends FunSuite {
     assert(resolve(expr) == expected)
   }
 
+  test("Quoted import") {
+    val expr = parse("let x = classpath:/\"local\"/\"package.dhall\" in x")
+    val expected = parse("let x = 1 in x").normalize
+
+    assert(resolve(expr) == expected)
+  }
+
   test("Classpath -> classpath relative import") {
     val expr = parse("let x = classpath:/local-local-relative/package.dhall in x")
     val expected = parse("let x = 1 in x").normalize
@@ -58,6 +65,16 @@ class ImportResolutionSuite extends FunSuite {
     assert(resolve(expr) == expected)
   }
 
+  //TODO - dependent on https://github.com/travisbrown/dhallj/issues/34
+  test("Quoted remote import".fail) {
+    val expr = parse(
+      "let any = https://raw.githubusercontent.com/\"dhall-lang\"/\"dhall-lang\"/\"master\"/\"Prelude\"/\"List\"/\"any\" in any Natural Natural/even [2,3,5]"
+    )
+    val expected = parse("True").normalize
+
+    assert(resolve(expr) == expected)
+  }
+
   test("Multiple imports") {
     val expr = parse("let x = classpath:/multiple-imports/package.dhall in x")
     val expected = parse("let x = [1,2] in x").normalize