app-builder-lib 26.0.7 → 26.0.8

package/out/node-module-collector/nodeModulesCollector.js

@@ -8,27 +8,54 @@ const builder_util_1 = require("builder-util");
 class NodeModulesCollector {
     constructor(rootDir) {
         this.rootDir = rootDir;
-        this.allDependencies = new Map();
-        this.dependencyPathMap = new Map();
         this.nodeModules = [];
+        this.dependencyPathMap = new Map();
+        this.allDependencies = new Map();
     }
-    transToHoisterTree(obj, key = `.`, nodes = new Map()) {
-        let node = nodes.get(key);
-        const name = key.match(/@?[^@]+/)[0];
-        if (!node) {
-            node = {
-                name,
-                identName: name,
-                reference: key.match(/@?[^@]+@?(.+)?/)[1] || ``,
-                dependencies: new Set(),
-                peerNames: new Set([]),
-            };
-            nodes.set(key, node);
-            for (const dep of (obj[key] || {}).dependencies || []) {
-                node.dependencies.add(this.transToHoisterTree(obj, dep, nodes));
-            }
-        }
-        return node;
+    async getNodeModules() {
+        const tree = await this.getDependenciesTree();
+        const realTree = this.getTreeFromWorkspaces(tree);
+        const parsedTree = this.extractRelevantData(realTree);
+        this.collectAllDependencies(parsedTree);
+        const productionTree = this.extractProductionDependencyTree(parsedTree);
+        const dependencyGraph = this.convertToDependencyGraph(productionTree);
+        const hoisterResult = (0, hoist_1.hoist)(this.transToHoisterTree(dependencyGraph), { check: true });
+        this._getNodeModules(hoisterResult.dependencies, this.nodeModules);
+        return this.nodeModules;
+    }
+    async getDependenciesTree() {
+        const command = this.getCommand();
+        const args = this.getArgs();
+        const dependencies = await (0, builder_util_1.exec)(command, args, {
+            cwd: this.rootDir,
+            shell: true,
+        });
+        return this.parseDependenciesTree(dependencies);
+    }
+    extractRelevantData(npmTree) {
+        // Do not use `...npmTree` as we are explicitly extracting the data we need
+        const { name, version, path, workspaces, dependencies } = npmTree;
+        const tree = {
+            name,
+            version,
+            path,
+            workspaces,
+            // DFS extract subtree
+            dependencies: this.extractInternal(dependencies),
+        };
+        return tree;
+    }
+    extractInternal(deps) {
+        return deps && Object.keys(deps).length > 0
+            ? Object.entries(deps).reduce((accum, [packageName, depObjectOrVersionString]) => {
+                return {
+                    ...accum,
+                    [packageName]: typeof depObjectOrVersionString === "object" && Object.keys(depObjectOrVersionString).length > 0
+                        ? this.extractRelevantData(depObjectOrVersionString)
+                        : depObjectOrVersionString,
+                };
+            }, {})
+            : undefined;
     }
     resolvePath(filePath) {
         try {
@@ -45,59 +72,79 @@ class NodeModulesCollector {
             return filePath;
         }
     }
-    convertToDependencyGraph(tree) {
-        const result = { ".": {} };
-        const flatten = (node, parentKey = ".") => {
-            var _a;
-            const dependencies = node.dependencies || {};
-            for (const [key, value] of Object.entries(dependencies)) {
-                // Skip empty dependencies(like some optionalDependencies)
-                if (Object.keys(value).length === 0) {
-                    continue;
-                }
-                const version = value.version || "";
-                const newKey = `${key}@${version}`;
-                this.dependencyPathMap.set(newKey, path.normalize(this.resolvePath(value.path)));
-                if (!((_a = result[parentKey]) === null || _a === void 0 ? void 0 : _a.dependencies)) {
-                    result[parentKey] = { dependencies: [] };
-                }
-                result[parentKey].dependencies.push(newKey);
-                if (node.__circularDependencyDetected) {
-                    continue;
-                }
-                flatten(value, newKey);
+    convertToDependencyGraph(tree, parentKey = ".") {
+        return Object.entries(tree.dependencies || {}).reduce((acc, curr) => {
+            const [packageName, dependencies] = curr;
+            // Skip empty dependencies (like some optionalDependencies)
+            if (Object.keys(dependencies).length === 0) {
+                return acc;
             }
-        };
-        flatten(tree);
-        return result;
+            const version = dependencies.version || "";
+            const newKey = `${packageName}@${version}`;
+            if (!dependencies.path) {
+                builder_util_1.log.error({
+                    packageName,
+                    data: dependencies,
+                    parentModule: tree.name,
+                    parentVersion: tree.version,
+                }, "dependency path is undefined");
+                throw new Error("unable to parse `path` during `tree.dependencies` reduce");
+            }
+            // Map dependency details: name, version and path to the dependency tree
+            this.dependencyPathMap.set(newKey, path.normalize(this.resolvePath(dependencies.path)));
+            if (!acc[parentKey]) {
+                acc[parentKey] = { dependencies: [] };
+            }
+            acc[parentKey].dependencies.push(newKey);
+            if (tree.implicitDependenciesInjected) {
+                builder_util_1.log.debug({
+                    dependency: packageName,
+                    version,
+                    path: dependencies.path,
+                    parentModule: tree.name,
+                    parentVersion: tree.version,
+                }, "converted implicit dependency");
+                return acc;
+            }
+            return { ...acc, ...this.convertToDependencyGraph(dependencies, newKey) };
+        }, {});
     }
-    getAllDependencies(tree) {
-        const dependencies = tree.dependencies || {};
-        for (const [key, value] of Object.entries(dependencies)) {
-            if (value.dependencies && Object.keys(value.dependencies).length > 0) {
+    collectAllDependencies(tree) {
+        var _a;
+        for (const [key, value] of Object.entries(tree.dependencies || {})) {
+            if (Object.keys((_a = value.dependencies) !== null && _a !== void 0 ? _a : {}).length > 0) {
                 this.allDependencies.set(`${key}@${value.version}`, value);
-                this.getAllDependencies(value);
+                this.collectAllDependencies(value);
             }
         }
     }
-    async getDependenciesTree() {
-        const command = this.getCommand();
-        const args = this.getArgs();
-        const dependencies = await (0, builder_util_1.exec)(command, args, {
-            cwd: this.rootDir,
-            shell: true,
-        });
-        const dependencyTree = JSON.parse(dependencies);
-        // pnpm returns an array of dependency trees
-        if (Array.isArray(dependencyTree)) {
-            const tree = dependencyTree[0];
-            if (tree.optionalDependencies) {
-                tree.dependencies = { ...tree.dependencies, ...tree.optionalDependencies };
+    getTreeFromWorkspaces(tree) {
+        if (tree.workspaces && tree.dependencies) {
+            for (const [key, value] of Object.entries(tree.dependencies)) {
+                if (this.rootDir.endsWith(path.normalize(key))) {
+                    return value;
+                }
             }
-            return tree;
         }
-        // yarn and npm return a single dependency tree
-        return dependencyTree;
+        return tree;
+    }
+    transToHoisterTree(obj, key = `.`, nodes = new Map()) {
+        let node = nodes.get(key);
+        const name = key.match(/@?[^@]+/)[0];
+        if (!node) {
+            node = {
+                name,
+                identName: name,
+                reference: key.match(/@?[^@]+@?(.+)?/)[1] || ``,
+                dependencies: new Set(),
+                peerNames: new Set([]),
+            };
+            nodes.set(key, node);
+            for (const dep of (obj[key] || {}).dependencies || []) {
+                node.dependencies.add(this.transToHoisterTree(obj, dep, nodes));
+            }
+        }
+        return node;
     }
     _getNodeModules(dependencies, result) {
         if (dependencies.size === 0) {
@@ -117,32 +164,12 @@ class NodeModulesCollector {
             };
             result.push(node);
             if (d.dependencies.size > 0) {
-                node["dependencies"] = [];
-                this._getNodeModules(d.dependencies, node["dependencies"]);
+                node.dependencies = [];
+                this._getNodeModules(d.dependencies, node.dependencies);
             }
         }
         result.sort((a, b) => a.name.localeCompare(b.name));
     }
-    getTreeFromWorkspaces(tree) {
-        if (tree.workspaces && tree.dependencies) {
-            for (const [key, value] of Object.entries(tree.dependencies)) {
-                if (this.rootDir.endsWith(path.normalize(key))) {
-                    return value;
-                }
-            }
-        }
-        return tree;
-    }
-    async getNodeModules() {
-        const tree = await this.getDependenciesTree();
-        const realTree = this.getTreeFromWorkspaces(tree);
-        this.getAllDependencies(realTree);
-        this.removeNonProductionDependencie(realTree);
-        const dependencyGraph = this.convertToDependencyGraph(realTree);
-        const hoisterResult = (0, hoist_1.hoist)(this.transToHoisterTree(dependencyGraph), { check: true });
-        this._getNodeModules(hoisterResult.dependencies, this.nodeModules);
-        return this.nodeModules;
-    }
 }
 exports.NodeModulesCollector = NodeModulesCollector;
 //# sourceMappingURL=nodeModulesCollector.js.map

package/out/node-module-collector/nodeModulesCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/nodeModulesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import { hoist, type HoisterTree, type HoisterResult } from \"./hoist\"\nimport * as path from \"path\"\nimport * as fs from \"fs\"\nimport { NodeModuleInfo, DependencyTree, DependencyGraph } from \"./types\"\nimport { exec, log } from \"builder-util\"\n\nexport abstract class NodeModulesCollector {\n  private nodeModules: NodeModuleInfo[]\n  protected dependencyPathMap: Map<string, string>\n  protected allDependencies: Map<string, DependencyTree> = new Map()\n\n  constructor(private readonly rootDir: string) {\n    this.dependencyPathMap = new Map()\n    this.nodeModules = []\n  }\n\n  private transToHoisterTree(obj: DependencyGraph, key: string = `.`, nodes: Map<string, HoisterTree> = new Map()): HoisterTree {\n    let node = nodes.get(key)\n    const name = key.match(/@?[^@]+/)![0]\n    if (!node) {\n      node = {\n        name,\n        identName: name,\n        reference: key.match(/@?[^@]+@?(.+)?/)![1] || ``,\n        dependencies: new Set<HoisterTree>(),\n        peerNames: new Set<string>([]),\n      }\n      nodes.set(key, node)\n\n      for (const dep of (obj[key] || {}).dependencies || []) {\n        node.dependencies.add(this.transToHoisterTree(obj, dep, nodes))\n      }\n    }\n    return node\n  }\n\n  protected resolvePath(filePath: string) {\n    try {\n      const stats = fs.lstatSync(filePath)\n      if (stats.isSymbolicLink()) {\n        return fs.realpathSync(filePath)\n      } else {\n        return filePath\n      }\n    } catch (error: any) {\n      log.debug({ message: error.message || error.stack }, \"error resolving path\")\n      return filePath\n    }\n  }\n\n  private convertToDependencyGraph(tree: DependencyTree): DependencyGraph {\n    const result: DependencyGraph = { \".\": {} }\n\n    const flatten = (node: DependencyTree, parentKey = \".\") => {\n      const dependencies = node.dependencies || {}\n\n      for (const [key, value] of Object.entries(dependencies)) {\n        // Skip empty dependencies(like some optionalDependencies)\n        if (Object.keys(value).length === 0) {\n          continue\n        }\n        const version = value.version || \"\"\n        const newKey = `${key}@${version}`\n        this.dependencyPathMap.set(newKey, path.normalize(this.resolvePath(value.path)))\n        if (!result[parentKey]?.dependencies) {\n          result[parentKey] = { dependencies: [] }\n        }\n        result[parentKey].dependencies!.push(newKey)\n\n        if (node.__circularDependencyDetected) {\n          continue\n        }\n        flatten(value, newKey)\n      }\n    }\n\n    flatten(tree)\n    return result\n  }\n\n  getAllDependencies(tree: DependencyTree) {\n    const dependencies = tree.dependencies || {}\n    for (const [key, value] of Object.entries(dependencies)) {\n      if (value.dependencies && Object.keys(value.dependencies).length > 0) {\n        this.allDependencies.set(`${key}@${value.version}`, value)\n        this.getAllDependencies(value)\n      }\n    }\n  }\n\n  abstract getCommand(): string\n  abstract getArgs(): string[]\n  abstract removeNonProductionDependencie(tree: DependencyTree): void\n\n  protected async getDependenciesTree(): Promise<DependencyTree> {\n    const command = this.getCommand()\n    const args = this.getArgs()\n    const dependencies = await exec(command, args, {\n      cwd: this.rootDir,\n      shell: true,\n    })\n    const dependencyTree: DependencyTree | DependencyTree[] = JSON.parse(dependencies)\n\n    // pnpm returns an array of dependency trees\n    if (Array.isArray(dependencyTree)) {\n      const tree = dependencyTree[0]\n      if (tree.optionalDependencies) {\n        tree.dependencies = { ...tree.dependencies, ...tree.optionalDependencies }\n      }\n      return tree\n    }\n\n    // yarn and npm return a single dependency tree\n    return dependencyTree\n  }\n\n  private _getNodeModules(dependencies: Set<HoisterResult>, result: NodeModuleInfo[]) {\n    if (dependencies.size === 0) {\n      return\n    }\n\n    for (const d of dependencies.values()) {\n      const reference = [...d.references][0]\n      const p = this.dependencyPathMap.get(`${d.name}@${reference}`)\n      if (p === undefined) {\n        log.debug({ name: d.name, reference }, \"cannot find path for dependency\")\n        continue\n      }\n      const node: NodeModuleInfo = {\n        name: d.name,\n        version: reference,\n        dir: p,\n      }\n      result.push(node)\n      if (d.dependencies.size > 0) {\n        node[\"dependencies\"] = []\n        this._getNodeModules(d.dependencies, node[\"dependencies\"])\n      }\n    }\n    result.sort((a, b) => a.name.localeCompare(b.name))\n  }\n\n  private getTreeFromWorkspaces(tree: DependencyTree): DependencyTree {\n    if (tree.workspaces && tree.dependencies) {\n      for (const [key, value] of Object.entries(tree.dependencies)) {\n        if (this.rootDir.endsWith(path.normalize(key))) {\n          return value\n        }\n      }\n    }\n    return tree\n  }\n\n  public async getNodeModules(): Promise<NodeModuleInfo[]> {\n    const tree = await this.getDependenciesTree()\n    const realTree = this.getTreeFromWorkspaces(tree)\n    this.getAllDependencies(realTree)\n    this.removeNonProductionDependencie(realTree)\n    const dependencyGraph = this.convertToDependencyGraph(realTree)\n    const hoisterResult = hoist(this.transToHoisterTree(dependencyGraph), { check: true })\n    this._getNodeModules(hoisterResult.dependencies, this.nodeModules)\n    return this.nodeModules\n  }\n}\n"]}
+{"version":3,"file":"nodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/nodeModulesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import { hoist, type HoisterTree, type HoisterResult } from \"./hoist\"\nimport * as path from \"path\"\nimport * as fs from \"fs\"\nimport type { NodeModuleInfo, DependencyTree, DependencyGraph, Dependency } from \"./types\"\nimport { exec, log } from \"builder-util\"\n\nexport abstract class NodeModulesCollector<T extends Dependency<T, OptionalsType>, OptionalsType> {\n  private nodeModules: NodeModuleInfo[] = []\n  protected dependencyPathMap: Map<string, string> = new Map()\n  protected allDependencies: Map<string, T> = new Map()\n\n  constructor(private readonly rootDir: string) {}\n\n  public async getNodeModules(): Promise<NodeModuleInfo[]> {\n    const tree: T = await this.getDependenciesTree()\n    const realTree: T = this.getTreeFromWorkspaces(tree)\n    const parsedTree: Dependency<T, OptionalsType> = this.extractRelevantData(realTree)\n\n    this.collectAllDependencies(parsedTree)\n\n    const productionTree: DependencyTree = this.extractProductionDependencyTree(parsedTree)\n    const dependencyGraph: DependencyGraph = this.convertToDependencyGraph(productionTree)\n\n    const hoisterResult: HoisterResult = hoist(this.transToHoisterTree(dependencyGraph), { check: true })\n    this._getNodeModules(hoisterResult.dependencies, this.nodeModules)\n\n    return this.nodeModules\n  }\n\n  protected abstract getCommand(): string\n  protected abstract getArgs(): string[]\n  protected abstract parseDependenciesTree(jsonBlob: string): T\n  protected abstract extractProductionDependencyTree(tree: Dependency<T, OptionalsType>): DependencyTree\n\n  protected async getDependenciesTree(): Promise<T> {\n    const command = this.getCommand()\n    const args = this.getArgs()\n    const dependencies = await exec(command, args, {\n      cwd: this.rootDir,\n      shell: true,\n    })\n    return this.parseDependenciesTree(dependencies)\n  }\n\n  protected extractRelevantData(npmTree: T): Dependency<T, OptionalsType> {\n    // Do not use `...npmTree` as we are explicitly extracting the data we need\n    const { name, version, path, workspaces, dependencies } = npmTree\n    const tree: Dependency<T, OptionalsType> = {\n      name,\n      version,\n      path,\n      workspaces,\n      // DFS extract subtree\n      dependencies: this.extractInternal(dependencies),\n    }\n\n    return tree\n  }\n\n  protected extractInternal(deps: T[\"dependencies\"]): T[\"dependencies\"] {\n    return deps && Object.keys(deps).length > 0\n      ? Object.entries(deps).reduce((accum, [packageName, depObjectOrVersionString]) => {\n          return {\n            ...accum,\n            [packageName]:\n              typeof depObjectOrVersionString === \"object\" && Object.keys(depObjectOrVersionString).length > 0\n                ? this.extractRelevantData(depObjectOrVersionString)\n                : depObjectOrVersionString,\n          }\n        }, {})\n      : undefined\n  }\n\n  protected resolvePath(filePath: string): string {\n    try {\n      const stats = fs.lstatSync(filePath)\n      if (stats.isSymbolicLink()) {\n        return fs.realpathSync(filePath)\n      } else {\n        return filePath\n      }\n    } catch (error: any) {\n      log.debug({ message: error.message || error.stack }, \"error resolving path\")\n      return filePath\n    }\n  }\n\n  private convertToDependencyGraph(tree: DependencyTree, parentKey = \".\"): DependencyGraph {\n    return Object.entries(tree.dependencies || {}).reduce<DependencyGraph>((acc, curr) => {\n      const [packageName, dependencies] = curr\n      // Skip empty dependencies (like some optionalDependencies)\n      if (Object.keys(dependencies).length === 0) {\n        return acc\n      }\n      const version = dependencies.version || \"\"\n      const newKey = `${packageName}@${version}`\n      if (!dependencies.path) {\n        log.error(\n          {\n            packageName,\n            data: dependencies,\n            parentModule: tree.name,\n            parentVersion: tree.version,\n          },\n          \"dependency path is undefined\"\n        )\n        throw new Error(\"unable to parse `path` during `tree.dependencies` reduce\")\n      }\n      // Map dependency details: name, version and path to the dependency tree\n      this.dependencyPathMap.set(newKey, path.normalize(this.resolvePath(dependencies.path)))\n      if (!acc[parentKey]) {\n        acc[parentKey] = { dependencies: [] }\n      }\n      acc[parentKey].dependencies.push(newKey)\n      if (tree.implicitDependenciesInjected) {\n        log.debug(\n          {\n            dependency: packageName,\n            version,\n            path: dependencies.path,\n            parentModule: tree.name,\n            parentVersion: tree.version,\n          },\n          \"converted implicit dependency\"\n        )\n        return acc\n      }\n\n      return { ...acc, ...this.convertToDependencyGraph(dependencies, newKey) }\n    }, {})\n  }\n\n  private collectAllDependencies(tree: Dependency<T, OptionalsType>) {\n    for (const [key, value] of Object.entries(tree.dependencies || {})) {\n      if (Object.keys(value.dependencies ?? {}).length > 0) {\n        this.allDependencies.set(`${key}@${value.version}`, value)\n        this.collectAllDependencies(value)\n      }\n    }\n  }\n\n  private getTreeFromWorkspaces(tree: T): T {\n    if (tree.workspaces && tree.dependencies) {\n      for (const [key, value] of Object.entries(tree.dependencies)) {\n        if (this.rootDir.endsWith(path.normalize(key))) {\n          return value\n        }\n      }\n    }\n    return tree\n  }\n\n  private transToHoisterTree(obj: DependencyGraph, key: string = `.`, nodes: Map<string, HoisterTree> = new Map()): HoisterTree {\n    let node = nodes.get(key)\n    const name = key.match(/@?[^@]+/)![0]\n    if (!node) {\n      node = {\n        name,\n        identName: name,\n        reference: key.match(/@?[^@]+@?(.+)?/)![1] || ``,\n        dependencies: new Set<HoisterTree>(),\n        peerNames: new Set<string>([]),\n      }\n      nodes.set(key, node)\n\n      for (const dep of (obj[key] || {}).dependencies || []) {\n        node.dependencies.add(this.transToHoisterTree(obj, dep, nodes))\n      }\n    }\n    return node\n  }\n\n  private _getNodeModules(dependencies: Set<HoisterResult>, result: NodeModuleInfo[]) {\n    if (dependencies.size === 0) {\n      return\n    }\n\n    for (const d of dependencies.values()) {\n      const reference = [...d.references][0]\n      const p = this.dependencyPathMap.get(`${d.name}@${reference}`)\n      if (p === undefined) {\n        log.debug({ name: d.name, reference }, \"cannot find path for dependency\")\n        continue\n      }\n      const node: NodeModuleInfo = {\n        name: d.name,\n        version: reference,\n        dir: p,\n      }\n      result.push(node)\n      if (d.dependencies.size > 0) {\n        node.dependencies = []\n        this._getNodeModules(d.dependencies, node.dependencies)\n      }\n    }\n    result.sort((a, b) => a.name.localeCompare(b.name))\n  }\n}\n"]}

package/out/node-module-collector/npmNodeModulesCollector.d.ts

@@ -1,8 +1,10 @@
 import { NodeModulesCollector } from "./nodeModulesCollector";
-import { DependencyTree } from "./types";
-export declare class NpmNodeModulesCollector extends NodeModulesCollector {
+import { DependencyTree, NpmDependency } from "./types";
+export declare class NpmNodeModulesCollector extends NodeModulesCollector<NpmDependency, string> {
     constructor(rootDir: string);
     getCommand(): string;
     getArgs(): string[];
-    removeNonProductionDependencie(tree: DependencyTree): void;
+    protected extractRelevantData(npmTree: NpmDependency): NpmDependency;
+    protected extractProductionDependencyTree(tree: NpmDependency): DependencyTree;
+    protected parseDependenciesTree(jsonBlob: string): NpmDependency;
 }

package/out/node-module-collector/npmNodeModulesCollector.js

@@ -13,23 +13,52 @@ class NpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollecto
     getArgs() {
         return ["list", "-a", "--include", "prod", "--include", "optional", "--omit", "dev", "--json", "--long", "--silent"];
     }
-    removeNonProductionDependencie(tree) {
-        var _a;
-        const dependencies = tree.dependencies || {};
-        const _dependencies = tree._dependencies || {};
-        if (Object.keys(_dependencies).length > 0 && Object.keys(dependencies).length === 0) {
-            tree.dependencies = ((_a = this.allDependencies.get(`${tree.name}@${tree.version}`)) === null || _a === void 0 ? void 0 : _a.dependencies) || {};
-            tree.__circularDependencyDetected = true;
-            builder_util_1.log.debug({ name: tree.name, version: tree.version }, "circular dependency detected");
-            return;
+    extractRelevantData(npmTree) {
+        const tree = super.extractRelevantData(npmTree);
+        const { optionalDependencies, _dependencies } = npmTree;
+        return { ...tree, optionalDependencies, _dependencies };
+    }
+    extractProductionDependencyTree(tree) {
+        var _a, _b, _c, _d;
+        const _deps = (_a = tree._dependencies) !== null && _a !== void 0 ? _a : {};
+        let deps = (_b = tree.dependencies) !== null && _b !== void 0 ? _b : {};
+        let implicitDependenciesInjected = false;
+        if (Object.keys(_deps).length > 0 && Object.keys(deps).length === 0) {
+            builder_util_1.log.debug({ name: tree.name, version: tree.version }, "injecting implicit _dependencies");
+            deps = (_d = (_c = this.allDependencies.get(`${tree.name}@${tree.version}`)) === null || _c === void 0 ? void 0 : _c.dependencies) !== null && _d !== void 0 ? _d : {};
+            implicitDependenciesInjected = true;
         }
-        for (const [key, value] of Object.entries(dependencies)) {
-            if (!_dependencies[key] || Object.keys(value).length === 0) {
-                delete dependencies[key];
-                continue;
+        const dependencies = Object.entries(deps).reduce((acc, curr) => {
+            const [packageName, dependency] = curr;
+            if (!_deps[packageName] || Object.keys(dependency).length === 0) {
+                return acc;
             }
-            this.removeNonProductionDependencie(value);
-        }
+            if (implicitDependenciesInjected) {
+                const { name, version, path, workspaces } = dependency;
+                const simplifiedTree = { name, version, path, workspaces };
+                return {
+                    ...acc,
+                    [packageName]: { ...simplifiedTree, implicitDependenciesInjected },
+                };
+            }
+            return {
+                ...acc,
+                [packageName]: this.extractProductionDependencyTree(dependency),
+            };
+        }, {});
+        const { name, version, path: packagePath, workspaces } = tree;
+        const depTree = {
+            name,
+            version,
+            path: packagePath,
+            workspaces,
+            dependencies,
+            implicitDependenciesInjected,
+        };
+        return depTree;
+    }
+    parseDependenciesTree(jsonBlob) {
+        return JSON.parse(jsonBlob);
     }
 }
 exports.NpmNodeModulesCollector = NpmNodeModulesCollector;

package/out/node-module-collector/npmNodeModulesCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"npmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/npmNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAE7D,+CAAkC;AAElC,MAAa,uBAAwB,SAAQ,2CAAoB;IAC/D,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,UAAU;QACR,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;IACzD,CAAC;IAED,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;IACtH,CAAC;IAED,8BAA8B,CAAC,IAAoB;;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAA;QAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,CAAA;QAC9C,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpF,IAAI,CAAC,YAAY,GAAG,CAAA,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,0CAAE,YAAY,KAAI,EAAE,CAAA;YAChG,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAA;YACxC,kBAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,8BAA8B,CAAC,CAAA;YACrF,OAAM;QACR,CAAC;QAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3D,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;gBACxB,SAAQ;YACV,CAAC;YACD,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAA;QAC5C,CAAC;IACH,CAAC;CACF;AA/BD,0DA+BC","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { DependencyTree } from \"./types\"\nimport { log } from \"builder-util\"\n\nexport class NpmNodeModulesCollector extends NodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"npm.cmd\" : \"npm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"-a\", \"--include\", \"prod\", \"--include\", \"optional\", \"--omit\", \"dev\", \"--json\", \"--long\", \"--silent\"]\n  }\n\n  removeNonProductionDependencie(tree: DependencyTree) {\n    const dependencies = tree.dependencies || {}\n    const _dependencies = tree._dependencies || {}\n    if (Object.keys(_dependencies).length > 0 && Object.keys(dependencies).length === 0) {\n      tree.dependencies = this.allDependencies.get(`${tree.name}@${tree.version}`)?.dependencies || {}\n      tree.__circularDependencyDetected = true\n      log.debug({ name: tree.name, version: tree.version }, \"circular dependency detected\")\n      return\n    }\n\n    for (const [key, value] of Object.entries(dependencies)) {\n      if (!_dependencies[key] || Object.keys(value).length === 0) {\n        delete dependencies[key]\n        continue\n      }\n      this.removeNonProductionDependencie(value)\n    }\n  }\n}\n"]}
+{"version":3,"file":"npmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/npmNodeModulesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { DependencyTree, NpmDependency, ParsedDependencyTree } from \"./types\"\nimport { log } from \"builder-util\"\n\nexport class NpmNodeModulesCollector extends NodeModulesCollector<NpmDependency, string> {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"npm.cmd\" : \"npm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"-a\", \"--include\", \"prod\", \"--include\", \"optional\", \"--omit\", \"dev\", \"--json\", \"--long\", \"--silent\"]\n  }\n\n  protected extractRelevantData(npmTree: NpmDependency): NpmDependency {\n    const tree = super.extractRelevantData(npmTree)\n    const { optionalDependencies, _dependencies } = npmTree\n    return { ...tree, optionalDependencies, _dependencies }\n  }\n\n  protected extractProductionDependencyTree(tree: NpmDependency): DependencyTree {\n    const _deps = tree._dependencies ?? {}\n\n    let deps = tree.dependencies ?? {}\n    let implicitDependenciesInjected = false\n\n    if (Object.keys(_deps).length > 0 && Object.keys(deps).length === 0) {\n      log.debug({ name: tree.name, version: tree.version }, \"injecting implicit _dependencies\")\n      deps = this.allDependencies.get(`${tree.name}@${tree.version}`)?.dependencies ?? {}\n      implicitDependenciesInjected = true\n    }\n\n    const dependencies = Object.entries(deps).reduce<DependencyTree[\"dependencies\"]>((acc, curr) => {\n      const [packageName, dependency] = curr\n      if (!_deps[packageName] || Object.keys(dependency).length === 0) {\n        return acc\n      }\n      if (implicitDependenciesInjected) {\n        const { name, version, path, workspaces } = dependency\n        const simplifiedTree: ParsedDependencyTree = { name, version, path, workspaces }\n        return {\n          ...acc,\n          [packageName]: { ...simplifiedTree, implicitDependenciesInjected },\n        }\n      }\n      return {\n        ...acc,\n        [packageName]: this.extractProductionDependencyTree(dependency),\n      }\n    }, {})\n\n    const { name, version, path: packagePath, workspaces } = tree\n    const depTree: DependencyTree = {\n      name,\n      version,\n      path: packagePath,\n      workspaces,\n      dependencies,\n      implicitDependenciesInjected,\n    }\n    return depTree\n  }\n\n  protected parseDependenciesTree(jsonBlob: string): NpmDependency {\n    return JSON.parse(jsonBlob)\n  }\n}\n"]}

package/out/node-module-collector/pnpmNodeModulesCollector.d.ts

@@ -1,8 +1,10 @@
 import { NodeModulesCollector } from "./nodeModulesCollector";
-import { DependencyTree } from "./types";
-export declare class PnpmNodeModulesCollector extends NodeModulesCollector {
+import { DependencyTree, PnpmDependency } from "./types";
+export declare class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmDependency, PnpmDependency> {
     constructor(rootDir: string);
     getCommand(): string;
     getArgs(): string[];
-    removeNonProductionDependencie(tree: DependencyTree): void;
+    protected extractRelevantData(npmTree: PnpmDependency): PnpmDependency;
+    extractProductionDependencyTree(tree: PnpmDependency): DependencyTree;
+    protected parseDependenciesTree(jsonBlob: string): PnpmDependency;
 }

package/out/node-module-collector/pnpmNodeModulesCollector.js

@@ -13,20 +13,43 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
     getArgs() {
         return ["list", "--prod", "--json", "--depth", "Infinity"];
     }
-    removeNonProductionDependencie(tree) {
-        const dependencies = tree.dependencies || {};
+    extractRelevantData(npmTree) {
+        const tree = super.extractRelevantData(npmTree);
+        return {
+            ...tree,
+            optionalDependencies: this.extractInternal(npmTree.optionalDependencies),
+        };
+    }
+    extractProductionDependencyTree(tree) {
         const p = path.normalize(this.resolvePath(tree.path));
-        const pJson = require(path.join(p, "package.json"));
-        const _dependencies = pJson.dependencies || {};
-        const _optionalDependencies = pJson.optionalDependencies || {};
-        const prodDependencies = { ..._dependencies, ..._optionalDependencies };
-        for (const [key, value] of Object.entries(dependencies)) {
-            if (!prodDependencies[key]) {
-                delete dependencies[key];
-                continue;
+        const packageJson = require(path.join(p, "package.json"));
+        const prodDependencies = { ...(packageJson.dependencies || {}), ...(packageJson.optionalDependencies || {}) };
+        const deps = { ...(tree.dependencies || {}), ...(tree.optionalDependencies || {}) };
+        const dependencies = Object.entries(deps).reduce((acc, curr) => {
+            const [packageName, dependency] = curr;
+            if (!prodDependencies[packageName]) {
+                return acc;
             }
-            this.removeNonProductionDependencie(value);
-        }
+            return {
+                ...acc,
+                [packageName]: this.extractProductionDependencyTree(dependency),
+            };
+        }, {});
+        const { name, version, path: packagePath, workspaces } = tree;
+        const depTree = {
+            name,
+            version,
+            path: packagePath,
+            workspaces,
+            dependencies,
+            implicitDependenciesInjected: false,
+        };
+        return depTree;
+    }
+    parseDependenciesTree(jsonBlob) {
+        const dependencyTree = JSON.parse(jsonBlob);
+        // pnpm returns an array of dependency trees
+        return dependencyTree[0];
     }
 }
 exports.PnpmNodeModulesCollector = PnpmNodeModulesCollector;

package/out/node-module-collector/pnpmNodeModulesCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"pnpmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/pnpmNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAE7D,6BAA4B;AAE5B,MAAa,wBAAyB,SAAQ,2CAAoB;IAChE,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,UAAU;QACR,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAA;IAC3D,CAAC;IAED,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IAC5D,CAAC;IAED,8BAA8B,CAAC,IAAoB;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAA;QAC5C,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACrD,MAAM,KAAK,GAAe,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAA;QAC/D,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,IAAI,EAAE,CAAA;QAC9C,MAAM,qBAAqB,GAAG,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAA;QAC9D,MAAM,gBAAgB,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,qBAAqB,EAAE,CAAA;QACvE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;gBACxB,SAAQ;YACV,CAAC;YACD,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAA;QAC5C,CAAC;IACH,CAAC;CACF;AA5BD,4DA4BC","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { DependencyTree, Dependency } from \"./types\"\nimport * as path from \"path\"\n\nexport class PnpmNodeModulesCollector extends NodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"pnpm.cmd\" : \"pnpm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"--prod\", \"--json\", \"--depth\", \"Infinity\"]\n  }\n\n  removeNonProductionDependencie(tree: DependencyTree) {\n    const dependencies = tree.dependencies || {}\n    const p = path.normalize(this.resolvePath(tree.path))\n    const pJson: Dependency = require(path.join(p, \"package.json\"))\n    const _dependencies = pJson.dependencies || {}\n    const _optionalDependencies = pJson.optionalDependencies || {}\n    const prodDependencies = { ..._dependencies, ..._optionalDependencies }\n    for (const [key, value] of Object.entries(dependencies)) {\n      if (!prodDependencies[key]) {\n        delete dependencies[key]\n        continue\n      }\n      this.removeNonProductionDependencie(value)\n    }\n  }\n}\n"]}
+{"version":3,"file":"pnpmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/pnpmNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAE7D,6BAA4B;AAE5B,MAAa,wBAAyB,SAAQ,2CAAoD;IAChG,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,UAAU;QACR,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAA;IAC3D,CAAC;IAED,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IAC5D,CAAC;IAES,mBAAmB,CAAC,OAAuB;QACnD,MAAM,IAAI,GAAG,KAAK,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;QAC/C,OAAO;YACL,GAAG,IAAI;YACP,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC;SACzE,CAAA;IACH,CAAC;IAED,+BAA+B,CAAC,IAAoB;QAClD,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACrD,MAAM,WAAW,GAA+B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAA;QACrF,MAAM,gBAAgB,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,oBAAoB,IAAI,EAAE,CAAC,EAAE,CAAA;QAE7G,MAAM,IAAI,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,EAAE,CAAA;QACnF,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAiC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC7F,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,IAAI,CAAA;YACtC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;gBACnC,OAAO,GAAG,CAAA;YACZ,CAAC;YACD,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,+BAA+B,CAAC,UAAU,CAAC;aAChE,CAAA;QACH,CAAC,EAAE,EAAE,CAAC,CAAA;QAEN,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;QAC7D,MAAM,OAAO,GAAmB;YAC9B,IAAI;YACJ,OAAO;YACP,IAAI,EAAE,WAAW;YACjB,UAAU;YACV,YAAY;YACZ,4BAA4B,EAAE,KAAK;SACpC,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAES,qBAAqB,CAAC,QAAgB;QAC9C,MAAM,cAAc,GAAqB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC7D,4CAA4C;QAC5C,OAAO,cAAc,CAAC,CAAC,CAAC,CAAA;IAC1B,CAAC;CACF;AAvDD,4DAuDC","sourcesContent":["import { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { Dependency, DependencyTree, PnpmDependency } from \"./types\"\nimport * as path from \"path\"\n\nexport class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmDependency, PnpmDependency> {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  getCommand(): string {\n    return process.platform === \"win32\" ? \"pnpm.cmd\" : \"pnpm\"\n  }\n\n  getArgs(): string[] {\n    return [\"list\", \"--prod\", \"--json\", \"--depth\", \"Infinity\"]\n  }\n\n  protected extractRelevantData(npmTree: PnpmDependency): PnpmDependency {\n    const tree = super.extractRelevantData(npmTree)\n    return {\n      ...tree,\n      optionalDependencies: this.extractInternal(npmTree.optionalDependencies),\n    }\n  }\n\n  extractProductionDependencyTree(tree: PnpmDependency): DependencyTree {\n    const p = path.normalize(this.resolvePath(tree.path))\n    const packageJson: Dependency<string, string> = require(path.join(p, \"package.json\"))\n    const prodDependencies = { ...(packageJson.dependencies || {}), ...(packageJson.optionalDependencies || {}) }\n\n    const deps = { ...(tree.dependencies || {}), ...(tree.optionalDependencies || {}) }\n    const dependencies = Object.entries(deps).reduce<DependencyTree[\"dependencies\"]>((acc, curr) => {\n      const [packageName, dependency] = curr\n      if (!prodDependencies[packageName]) {\n        return acc\n      }\n      return {\n        ...acc,\n        [packageName]: this.extractProductionDependencyTree(dependency),\n      }\n    }, {})\n\n    const { name, version, path: packagePath, workspaces } = tree\n    const depTree: DependencyTree = {\n      name,\n      version,\n      path: packagePath,\n      workspaces,\n      dependencies,\n      implicitDependenciesInjected: false,\n    }\n    return depTree\n  }\n\n  protected parseDependenciesTree(jsonBlob: string): PnpmDependency {\n    const dependencyTree: PnpmDependency[] = JSON.parse(jsonBlob)\n    // pnpm returns an array of dependency trees\n    return dependencyTree[0]\n  }\n}\n"]}

package/out/node-module-collector/types.d.ts

@@ -4,37 +4,35 @@ export interface NodeModuleInfo {
     dir: string;
     dependencies?: Array<NodeModuleInfo>;
 }
-export interface DependencyTree {
+export type ParsedDependencyTree = {
     readonly name: string;
     readonly version: string;
     readonly path: string;
     readonly workspaces?: string[];
-    __circularDependencyDetected?: boolean;
-    dependencies?: {
-        [packageName: string]: DependencyTree;
-    };
-    _dependencies?: {
+};
+export interface DependencyTree extends Omit<Dependency<DependencyTree, DependencyTree>, "optionalDependencies"> {
+    readonly implicitDependenciesInjected: boolean;
+}
+export interface PnpmDependency extends Dependency<PnpmDependency, PnpmDependency> {
+}
+export interface NpmDependency extends Dependency<NpmDependency, string> {
+    readonly _dependencies?: {
         [packageName: string]: string;
     };
-    optionalDependencies?: {
-        [packageName: string]: DependencyTree;
-    };
-    peerDependencies?: {
-        [packageName: string]: DependencyTree;
-    };
 }
-export interface Dependency {
-    dependencies?: {
-        [packageName: string]: string;
+export type Dependency<T, V> = Dependencies<T, V> & ParsedDependencyTree;
+export type Dependencies<T, V> = {
+    readonly dependencies?: {
+        [packageName: string]: T;
     };
-    optionalDependencies?: {
-        [packageName: string]: string;
+    readonly optionalDependencies?: {
+        [packageName: string]: V;
     };
-}
+};
 export interface DependencyGraph {
     [packageNameAndVersion: string]: PackageDependencies;
 }
 interface PackageDependencies {
-    dependencies?: string[];
+    readonly dependencies: string[];
 }
 export {};

package/out/node-module-collector/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/node-module-collector/types.ts"],"names":[],"mappings":"","sourcesContent":["export interface NodeModuleInfo {\n  name: string\n  version: string\n  dir: string\n  dependencies?: Array<NodeModuleInfo>\n}\n\nexport interface DependencyTree {\n  readonly name: string\n  readonly version: string\n  readonly path: string\n  readonly workspaces?: string[]\n  __circularDependencyDetected?: boolean\n  dependencies?: {\n    [packageName: string]: DependencyTree\n  }\n  // for npm list --json\n  _dependencies?: {\n    [packageName: string]: string\n  }\n  optionalDependencies?: {\n    [packageName: string]: DependencyTree\n  }\n  peerDependencies?: {\n    [packageName: string]: DependencyTree\n  }\n}\n\nexport interface Dependency {\n  dependencies?: {\n    [packageName: string]: string\n  }\n  optionalDependencies?: {\n    [packageName: string]: string\n  }\n}\n\nexport interface DependencyGraph {\n  [packageNameAndVersion: string]: PackageDependencies\n}\n\ninterface PackageDependencies {\n  dependencies?: string[]\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/node-module-collector/types.ts"],"names":[],"mappings":"","sourcesContent":["export interface NodeModuleInfo {\n  name: string\n  version: string\n  dir: string\n  dependencies?: Array<NodeModuleInfo>\n}\n\nexport type ParsedDependencyTree = {\n  readonly name: string\n  readonly version: string\n  readonly path: string\n  readonly workspaces?: string[] // we only use this at root level\n}\n\nexport interface DependencyTree extends Omit<Dependency<DependencyTree, DependencyTree>, \"optionalDependencies\"> {\n  readonly implicitDependenciesInjected: boolean\n}\n\n// Note: `PnpmDependency` and `NpmDependency` include the output of `JSON.parse(...)` of `pnpm list` and `npm list` respectively\n// This object has a TON of info - a majority, if not all, of each dependency's package.json\n// We extract only what we need when constructing DependencyTree in `extractProductionDependencyTree`\n// eslint-disable-next-line @typescript-eslint/no-empty-object-type\nexport interface PnpmDependency extends Dependency<PnpmDependency, PnpmDependency> {}\nexport interface NpmDependency extends Dependency<NpmDependency, string> {\n  // implicit dependencies\n  readonly _dependencies?: {\n    [packageName: string]: string\n  }\n}\n\nexport type Dependency<T, V> = Dependencies<T, V> & ParsedDependencyTree\n\nexport type Dependencies<T, V> = {\n  readonly dependencies?: {\n    [packageName: string]: T\n  }\n  readonly optionalDependencies?: {\n    [packageName: string]: V\n  }\n}\n\nexport interface DependencyGraph {\n  [packageNameAndVersion: string]: PackageDependencies\n}\n\ninterface PackageDependencies {\n  readonly dependencies: string[]\n}\n"]}