packtory 0.0.86 → 0.0.88

package/packtory/stages/package-analysis-stage.js

@@ -1,7 +1,33 @@
 import { resolveDeadCodeEliminationByName } from "../options/dead-code-elimination-resolution.js";
 import { createResolvedPackage } from "../resolved-package.js";
+function mergeSourceFilePaths(existing, sourceFilePaths) {
+    const merged = new Set(existing);
+    for (const sourceFilePath of sourceFilePaths) {
+        merged.add(sourceFilePath);
+    }
+    return merged;
+}
+function withSubstitutionPublicModuleSourceFilePaths(sourceFilePathsByPackageName, packageName, sourceFilePaths) {
+    const updated = new Map(sourceFilePathsByPackageName);
+    updated.set(packageName, mergeSourceFilePaths(sourceFilePathsByPackageName.get(packageName), sourceFilePaths));
+    return updated;
+}
+function collectSubstitutionPublicModuleSourceFilePaths(linkedPackages) {
+    let sourceFilePathsByPackageName = new Map();
+    for (const linkedPackage of linkedPackages) {
+        const substitutions = linkedPackage.linkedBundle.substitutedSourceFilePathsByPackageName;
+        for (const [packageName, sourceFilePaths] of substitutions) {
+            sourceFilePathsByPackageName = withSubstitutionPublicModuleSourceFilePaths(sourceFilePathsByPackageName, packageName, sourceFilePaths);
+        }
+    }
+    return sourceFilePathsByPackageName;
+}
+function substitutionPublicModuleSourceFilePathsFor(sourceFilePathsByPackageName, packageName) {
+    return sourceFilePathsByPackageName.get(packageName) ?? new Set();
+}
 export async function analyzeResolvedPackages(dependencies, config, linkedPackages) {
     const deadCodeEliminationByName = resolveDeadCodeEliminationByName(config);
+    const publicSubstitutionPathsByName = collectSubstitutionPublicModuleSourceFilePaths(linkedPackages);
     const analyzedBundles = await dependencies.deadCodeEliminator.eliminate(linkedPackages.map(function (linkedPackage) {
         const deadCodeElimination = deadCodeEliminationByName.get(linkedPackage.name);
         if (!deadCodeEliminationByName.has(linkedPackage.name)) {
@@ -10,6 +36,7 @@ export async function analyzeResolvedPackages(dependencies, config, linkedPackag
         return {
             bundle: linkedPackage.linkedBundle,
             transformationsEnabled: deadCodeElimination?.enabled ?? true,
+            substitutionPublicModuleSourceFilePaths: substitutionPublicModuleSourceFilePathsFor(publicSubstitutionPathsByName, linkedPackage.name),
             deadCodeElimination
         };
     }));

package/packtory/stages/package-analysis-stage.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-analysis-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/package-analysis-stage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gCAAgC,EAAE,MAAM,gDAAgD,CAAC;AAClG,OAAO,EAAE,qBAAqB,EAAwB,MAAM,wBAAwB,CAAC;AAOrF,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,YAAyC,EACzC,MAAwC,EACxC,cAAwC;IAExC,MAAM,yBAAyB,GAAG,gCAAgC,CAAC,MAAM,CAAC,CAAC;IAC3E,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,SAAS,CACnE,cAAc,CAAC,GAAG,CAAC,UAAU,aAAa;QACtC,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC9E,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,uDAAuD,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC;QAClG,CAAC;QACD,OAAO;YACH,MAAM,EAAE,aAAa,CAAC,YAAY;YAClC,sBAAsB,EAAE,mBAAmB,EAAE,OAAO,IAAI,IAAI;YAC5D,mBAAmB;SACtB,CAAC;IACN,CAAC,CAAC,CACL,CAAC;IAEF,OAAO,cAAc,CAAC,GAAG,CAAC,UAAU,aAAa,EAAE,KAAK;QACpD,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,wCAAwC,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,qBAAqB,CAAC,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"package-analysis-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/package-analysis-stage.ts"],"names":[],"mappings":"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"}

package/readme.md

@@ -7,10 +7,17 @@ npm install packtory
 ```
 
 ```javascript
-import { buildAndPublishAll, packAllPackages, packPackage, resolveAndLinkAll } from 'packtory';
+import {
+    buildAndPublishAll,
+    inspectPackageDependencies,
+    packAllPackages,
+    packPackage,
+    resolveAndLinkAll
+} from 'packtory';
 
 await buildAndPublishAll(config, { dryRun: true, stage: false });
 await resolveAndLinkAll(config);
+await inspectPackageDependencies(config, 'pkg');
 await packPackage(config, {
     packageName: 'pkg',
     format: 'zip',
@@ -25,6 +32,6 @@ await packAllPackages(config, {
 });
 ```
 
-Main exports: `buildAndPublishAll`, `resolveAndLinkAll`, `diffAgainstLatestPublished`, `planReleaseAgainstLatestPublished`, `packPackage`, and `packAllPackages`.
+Main exports: `buildAndPublishAll`, `resolveAndLinkAll`, `diffAgainstLatestPublished`, `planReleaseAgainstLatestPublished`, `inspectPackageDependencies`, `packPackage`, and `packAllPackages`.
 
 See the repository readme for configuration and workflow documentation.

package/sbom.cdx.json

@@ -9,16 +9,16 @@
                 {
                     "type": "application",
                     "name": "packtory",
-                    "version": "0.0.92"
+                    "version": "0.0.97"
                 }
             ]
         },
         "component": {
             "type": "library",
             "name": "packtory",
-            "version": "0.0.86",
-            "bom-ref": "pkg:npm/packtory@0.0.86",
-            "purl": "pkg:npm/packtory@0.0.86"
+            "version": "0.0.88",
+            "bom-ref": "pkg:npm/packtory@0.0.88",
+            "purl": "pkg:npm/packtory@0.0.88"
         }
     },
     "components": [
@@ -38,15 +38,15 @@
         {
             "type": "library",
             "name": "@cyclonedx/cyclonedx-library",
-            "version": "10.1.1",
-            "bom-ref": "pkg:npm/@cyclonedx/cyclonedx-library@10.1.1",
+            "version": "10.2.0",
+            "bom-ref": "pkg:npm/@cyclonedx/cyclonedx-library@10.2.0",
             "scope": "required",
             "licenses": [
                 {
                     "expression": "Apache-2.0"
                 }
             ],
-            "purl": "pkg:npm/@cyclonedx/cyclonedx-library@10.1.1"
+            "purl": "pkg:npm/@cyclonedx/cyclonedx-library@10.2.0"
         },
         {
             "type": "library",
@@ -194,15 +194,15 @@
         {
             "type": "library",
             "name": "remeda",
-            "version": "2.40.0",
-            "bom-ref": "pkg:npm/remeda@2.40.0",
+            "version": "2.42.0",
+            "bom-ref": "pkg:npm/remeda@2.42.0",
             "scope": "required",
             "licenses": [
                 {
                     "expression": "MIT"
                 }
             ],
-            "purl": "pkg:npm/remeda@2.40.0"
+            "purl": "pkg:npm/remeda@2.42.0"
         },
         {
             "type": "library",
@@ -340,7 +340,7 @@
             "ref": "pkg:npm/@arethetypeswrong/core@0.18.5"
         },
         {
-            "ref": "pkg:npm/@cyclonedx/cyclonedx-library@10.1.1"
+            "ref": "pkg:npm/@cyclonedx/cyclonedx-library@10.2.0"
         },
         {
             "ref": "pkg:npm/@jridgewell/trace-mapping@0.3.31"
@@ -376,10 +376,10 @@
             "ref": "pkg:npm/npm-registry-fetch@20.0.1"
         },
         {
-            "ref": "pkg:npm/packtory@0.0.86",
+            "ref": "pkg:npm/packtory@0.0.88",
             "dependsOn": [
                 "pkg:npm/@arethetypeswrong/core@0.18.5",
-                "pkg:npm/@cyclonedx/cyclonedx-library@10.1.1",
+                "pkg:npm/@cyclonedx/cyclonedx-library@10.2.0",
                 "pkg:npm/@jridgewell/trace-mapping@0.3.31",
                 "pkg:npm/@schema-hub/zod-error-formatter@0.0.16",
                 "pkg:npm/@ts-morph/common@0.29.0",
@@ -391,7 +391,7 @@
                 "pkg:npm/libnpmpublish@12.0.0",
                 "pkg:npm/npm-package-arg@14.0.0",
                 "pkg:npm/npm-registry-fetch@20.0.1",
-                "pkg:npm/remeda@2.40.0",
+                "pkg:npm/remeda@2.42.0",
                 "pkg:npm/semver@7.8.5",
                 "pkg:npm/spdx-expression-parse@5.0.0",
                 "pkg:npm/ssri@14.0.0",
@@ -405,7 +405,7 @@
             ]
         },
         {
-            "ref": "pkg:npm/remeda@2.40.0"
+            "ref": "pkg:npm/remeda@2.42.0"
         },
         {
             "ref": "pkg:npm/semver@7.8.5"