Merge pull request #28 from bingnz/fix-data-uri-import-directory

fix: use `currentDirectory` rather than `entryPath`.

src/data-uri-visitor.ts

@@ -22,7 +22,7 @@ export class DataUriVisitor {
     }
 
     public visitCall(callNode: Less.CallNode) {
-        const { ruleNode, importedFile, entryPath } = this.getImportInfo(
+        const { ruleNode, importedFile, filePath } = this.getImportInfo(
             callNode
         );
 
@@ -31,7 +31,7 @@ export class DataUriVisitor {
         }
 
         this.addImport({
-            directory: entryPath ? path.normalize(entryPath) : "",
+            directory: filePath ? path.normalize(filePath) : "",
             relativePath: importedFile
         });
 
@@ -52,7 +52,7 @@ export class DataUriVisitor {
 
     private getImportInfo(
         ruleNode: Less.CallNode
-    ): { ruleNode: Less.CallNode; importedFile?: string; entryPath?: string } {
+    ): { ruleNode: Less.CallNode; importedFile?: string; filePath?: string } {
         if (ruleNode.name !== "data-uri" || ruleNode.args.length === 0) {
             return { ruleNode };
         }
@@ -67,8 +67,9 @@ export class DataUriVisitor {
             typeof ruleNode.fileInfo === "function"
                 ? ruleNode.fileInfo()
                 : ruleNode.currentFileInfo;
-        const entryPath = fileInfo.entryPath;
 
-        return { ruleNode, importedFile, entryPath };
+        const filePath = fileInfo.currentDirectory;
+
+        return { ruleNode, importedFile, filePath };
     }
 }

test/import-lister.js

@@ -374,6 +374,21 @@ function readFileAsStream(file, type) {
             );
         });
 
+        describe("when passing in a file with a data-uri with content in a subdirectory", () => {
+            const filePath =
+                "./test/list-imports-cases/file-with-data-uri-subdirectory/file.less";
+            it("should return the referenced file and image as an imports", async () => {
+                const f = await readFile(new File({ path: filePath }));
+                const importList = await importLister.listImports(f);
+                expect(
+                    importList.map(x => x.path.split(path.sep).join("!")).sort()
+                ).to.deep.equal([
+                    "test!list-imports-cases!file-with-data-uri-subdirectory!content!image.svg",
+                    "test!list-imports-cases!file-with-data-uri-subdirectory!content!include.less"
+                ]);
+            });
+        });
+
         describe("when passing in a file with a data-uri with MIME type and import by reference", () => {
             const filePath =
                 "./test/list-imports-cases/file-with-data-uri-mime-type/file.less";

test/list-imports-cases/file-with-data-uri-subdirectory/content/include.less

@@ -0,0 +1 @@
+.a { background-image: data-uri('image.svg') }

test/list-imports-cases/file-with-data-uri-subdirectory/file.less

@@ -0,0 +1 @@
+@import "content/include.less";

test/mocha.opts

@@ -1 +1,2 @@
-test/**/*.js
+test/**/*.js
+--timeout 5000