@teambit/dependencies 1.0.449 → 1.0.450

package/files-dependency-builder/precinct/index.ts

@@ -34,6 +34,7 @@ type FileInfo = {
   content: string | object;
   type: string;
   ast: any;
+  filename: string;
 };
 
 type Options = {
@@ -102,6 +103,7 @@ const getFileInfo = (filename: string): FileInfo => {
     type: '',
     // initialized with the content
     ast: content,
+    filename,
   };
 };
 
@@ -112,13 +114,13 @@ const getFileInfo = (filename: string): FileInfo => {
  * JavaScript or unknown content. We can deal with it later.
  */
 const getDetector = (fileInfo: FileInfo, options?: Options): Detective | undefined => {
-  const { ext } = fileInfo;
+  const { ext, filename } = fileInfo;
   const normalizedOptions: Options = options || {};
 
   // from env detectors
   if (options?.envDetectors) {
     for (const detector of options.envDetectors) {
-      if (detector.isSupported({ ext })) {
+      if (detector.isSupported({ ext, filename })) {
         fileInfo.type = detector.type || '';
         return detector.detect as Detective;
       }
@@ -140,8 +142,8 @@ const getDetector = (fileInfo: FileInfo, options?: Options): Detective | undefin
   }
 
   // from global detector hook (legacy)
-  if (detectorHook.isSupported(ext)) {
-    const detector = detectorHook.getDetector(ext);
+  if (detectorHook.isSupported(ext, filename)) {
+    const detector = detectorHook.getDetector(ext, filename);
     if (detector) {
       fileInfo.type = ext;
       typeToDetective[ext] = detector.detect as Detective;
@@ -210,41 +212,8 @@ const getDepsFromFile = (filename: string, options?: Options): string[] => {
   return normalizeDeps(deps, normalizedOptions?.includeCore);
 };
 
-/**
- * Finds the list of dependencies for the given file
- *
- * @param {String|Object} content - File's content or AST
- * @param {Object} [options]
- * @param {String} [options.type] - The type of content being passed in. Useful if you want to use a non-js detective
- * @return {String[]}
- */
-// eslint-disable-next-line complexity
-const precinct = (content: string | object, options?: string | Options): BuiltinDeps => {
-  // Legacy form backCompat where type was the second parameter
-  const normalizedOptions: Options = typeof options === 'string' ? { type: options } : options || {};
-  const type = normalizedOptions.type || '';
-
-  debug('options given: ', normalizedOptions);
-
-  const fileInfo: FileInfo = {
-    content,
-    ast: content,
-    ext: type ? '' : '.js',
-    type,
-  };
-
-  const detective = getDetector(fileInfo, normalizedOptions) || getJsDetector(fileInfo, normalizedOptions);
-  if (!detective) {
-    return [];
-  }
-
-  const deps = detective(fileInfo.ast, normalizedOptions[fileInfo.type]);
-  // @ts-ignore
-  precinct.ast = detective.ast || fileInfo.ast;
-
-  return deps;
+const precinct = {
+  paperwork: getDepsFromFile,
 };
 
-precinct.paperwork = getDepsFromFile;
-
 export default precinct;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/dependencies",
-  "version": "1.0.449",
+  "version": "1.0.450",
   "homepage": "https://bit.cloud/teambit/dependencies/dependencies",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.dependencies",
     "name": "dependencies",
-    "version": "1.0.449"
+    "version": "1.0.450"
   },
   "dependencies": {
     "archy": "1.0.0",
@@ -38,20 +38,20 @@
     "@teambit/styling.deps-detectors.detective-sass": "0.0.9",
     "@teambit/styling.deps-detectors.detective-scss": "0.0.9",
     "@teambit/typescript.deps-detectors.detective-typescript": "0.0.8",
-    "@teambit/cli": "0.0.1026",
-    "@teambit/graph": "1.0.449",
-    "@teambit/aspect-loader": "1.0.449",
+    "@teambit/cli": "0.0.1027",
+    "@teambit/graph": "1.0.450",
+    "@teambit/aspect-loader": "1.0.450",
     "@teambit/component-package-version": "0.0.434",
-    "@teambit/dependency-resolver": "1.0.449",
-    "@teambit/dev-files": "1.0.449",
-    "@teambit/logger": "0.0.1119",
-    "@teambit/scope": "1.0.449",
-    "@teambit/workspace": "1.0.449",
-    "@teambit/component.sources": "0.0.41",
+    "@teambit/dependency-resolver": "1.0.450",
+    "@teambit/dev-files": "1.0.450",
+    "@teambit/logger": "0.0.1120",
+    "@teambit/scope": "1.0.450",
+    "@teambit/workspace": "1.0.450",
+    "@teambit/component.sources": "0.0.42",
     "@teambit/legacy.utils": "0.0.6",
     "@teambit/toolbox.path.path": "0.0.4",
     "@teambit/component-issues": "0.0.151",
-    "@teambit/legacy.bit-map": "0.0.45",
+    "@teambit/legacy.bit-map": "0.0.46",
     "@teambit/toolbox.fs.extension-getter": "0.0.1",
     "@teambit/toolbox.fs.last-modified": "0.0.1"
   },
@@ -66,8 +66,8 @@
     "@types/mocha": "9.1.0",
     "@teambit/defender.fs.global-bit-temp-dir": "0.0.1",
     "@teambit/harmony.envs.core-aspect-env": "0.0.60",
-    "@teambit/component.testing.mock-components": "0.0.247",
-    "@teambit/harmony.testing.load-aspect": "0.0.242",
+    "@teambit/component.testing.mock-components": "0.0.248",
+    "@teambit/harmony.testing.load-aspect": "0.0.243",
     "@teambit/workspace.testing.mock-workspace": "0.0.27"
   },
   "peerDependencies": {