feature: input methods like shallow and dependecy have the same output, so that mean deep dependecy also parse vue files as shallow

Author: anthony-redFox

__tests__/lib/input/shallow.js

@@ -35,12 +35,6 @@ test('shallow deps directory', async function () {
   expect(deps[0].file.match(/input.js/)).toBeTruthy();
 });
 
-test('throws on non-string or object input', function () {
-  return shallow([true], {}).catch(err => {
-    expect(err.message).toBe('Indexes should be either strings or objects');
-  });
-});
-
 test('shallow deps literal', async function () {
   const obj = {
     file: 'foo.js',

package-lock.json

@@ -37,7 +37,6 @@
     "remark-html": "^15.0.0",
     "remark-reference-links": "^6.0.0",
     "remark-toc": "^8.0.1",
-    "detective": "^5.2.0",
     "konan": "^2.1.1",
     "resolve": "^1.20.0",
     "strip-json-comments": "^4.0.0",

package.json

@@ -1,13 +1,10 @@
-import fs from 'fs';
-import path from 'path';
 import _ from 'lodash';
 import sort from './sort.js';
 import { nest } from './nest.js';
 import filterAccess from './filter_access.js';
 import dependency from './input/dependency.js';
 import shallow from './input/shallow.js';
 import parseJavaScript from './parsers/javascript.js';
-import parseVueScript from './parsers/vue.js';
 import github from './github.js';
 import hierarchy from './hierarchy.js';
 import inferName from './infer/name.js';
@@ -107,17 +104,6 @@ function buildInternal(inputsAndConfig) {
   ]);
 
   const extractedComments = _.flatMap(inputs, function (sourceFile) {
-    if (!sourceFile.source) {
-      sourceFile.source = fs.readFileSync(sourceFile.file, 'utf8');
-    }
-
-    if (!sourceFile.file) {
-      sourceFile.file = '';
-    }
-
-    if (path.extname(sourceFile.file) === '.vue') {
-      return parseVueScript(sourceFile, config).map(buildPipeline);
-    }
     return parseJavaScript(sourceFile, config).map(buildPipeline);
   }).filter(Boolean);
 
@@ -146,10 +132,6 @@ function lintInternal(inputsAndConfig) {
   ]);
 
   const extractedComments = _.flatMap(inputs, sourceFile => {
-    if (!sourceFile.source) {
-      sourceFile.source = fs.readFileSync(sourceFile.file, 'utf8');
-    }
-
     return parseJavaScript(sourceFile, config).map(lintPipeline);
   }).filter(Boolean);
 

src/index.js

@@ -1,6 +1,6 @@
 import mdeps from './moduleDeps.js';
 import internalOnly from '../module_filters.js';
-import smartGlob from '../smart_glob.js';
+import smartGlob from './smart_glob.js';
 
 /**
  * Returns a array of dependencies, given an array of entry

src/input/dependency.js

@@ -1,9 +1,9 @@
 import path from 'path';
 import util from 'util';
-import { readFile } from 'fs/promises';
 import r from 'resolve';
-import detective from 'detective';
+import readFileCode from './readFileCode.js';
 import konan from 'konan';
+import { parseToAst } from '../parsers/parse_to_ast.js';
 
 // const parseExst = ['.js', '.mjs', '.jsx', '.vue', '.ts', '.tsx'];
 const resolveExst = ['.json', '.css', '.less', '.sass'];
@@ -35,9 +35,8 @@ class Deps {
     if (this.fileCache[file]) {
       return this.fileCache[file];
     }
-    return readFile(file, {
-      encoding: 'utf8'
-    });
+
+    return readFileCode(file);
   }
 
   async walk(id, parent) {
@@ -95,15 +94,10 @@ class Deps {
 
   parseDeps(file, src) {
     try {
-      try {
-        return konan(src).strings;
-      } catch (ex) {
-        // konan does not support Vue (component) file, try to parse using detective (as a fallback)
-        return detective(src);
-      }
+      const ast = parseToAst(src, file);
+      return konan(ast).strings;
     } catch (ex) {
       console.error(`Parsing file ${file}: ${ex}`);
-      return;
     }
   }
 }

src/input/moduleDeps.js

@@ -0,0 +1,42 @@
+import path from 'path';
+import { readFile } from 'fs/promises';
+let vuecompiler = null;
+let vueVersion = 'v3';
+
+async function vueParser(source) {
+  if (!vuecompiler) {
+    try {
+      vuecompiler = await import('@vue/compiler-sfc');
+    } catch {
+      try {
+        vuecompiler = await import('vue-template-compiler');
+        vueVersion = 'v2';
+      } catch (err) {
+        console.error(
+          'You need to load package vue-template-compiler for Vue 2 or @vue/compiler-sfc for Vue 3'
+        );
+        throw err;
+      }
+    }
+  }
+
+  let component = {};
+  if (vueVersion === 'v3') {
+    component = vuecompiler.parse(source).descriptor;
+  } else {
+    component = vuecompiler.parseComponent(source);
+  }
+
+  return component.script?.content || '';
+}
+
+export default async function readFileCode(file) {
+  let source = await readFile(file, {
+    encoding: 'utf8'
+  });
+
+  if (path.extname(file) === '.vue') {
+    source = await vueParser(source);
+  }
+  return source;
+}

src/input/readFileCode.js

@@ -1,4 +1,5 @@
-import smartGlob from '../smart_glob.js';
+import smartGlob from './smart_glob.js';
+import readFileCode from './readFileCode.js';
 
 /**
  * A readable source for content that doesn't do dependency resolution, but
@@ -16,25 +17,22 @@ import smartGlob from '../smart_glob.js';
  * @param config parsing options
  * @returns promise with parsed files
  */
-export default function (indexes, config) {
+export default async function (indexes, config) {
   const objects = [];
-  const strings = [];
-  for (const index of indexes) {
-    if (typeof index === 'string') {
-      strings.push(index);
-    } else if (typeof index === 'object') {
-      objects.push(index);
-    } else {
-      return Promise.reject(
-        new Error('Indexes should be either strings or objects')
-      );
+  const paths = indexes.filter(v => {
+    if (typeof v === 'object') {
+      v.file = v.file ?? '';
+      objects.push(v);
+      return false;
     }
-  }
-  return Promise.resolve(
-    objects.concat(
-      smartGlob(strings, config.parseExtension).map(file => ({
-        file
-      }))
-    )
+    return typeof v === 'string';
+  });
+  const files = await Promise.all(
+    smartGlob(paths, config.parseExtension).map(async file => ({
+      source: await readFileCode(file),
+      file
+    }))
   );
+
+  return [...objects, ...files];
 }