packtory 0.0.68 → 0.0.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/bundle-emitter/registry/registry-client.d.ts +1 -1
  2. package/bundle-emitter/registry/registry-client.d.ts.map +1 -1
  3. package/bundle-emitter/repository-coherence.js +9 -9
  4. package/bundle-emitter/repository-coherence.js.map +1 -1
  5. package/checks/check-runner.js +2 -2
  6. package/checks/check-runner.js.map +1 -1
  7. package/checks/rules/max-bundle-size.d.ts.map +1 -1
  8. package/checks/rules/max-bundle-size.js +4 -4
  9. package/checks/rules/max-bundle-size.js.map +1 -1
  10. package/checks/rules/no-dev-dependency-imports.js +4 -4
  11. package/checks/rules/no-dev-dependency-imports.js.map +1 -1
  12. package/checks/rules/no-duplicated-files.js +3 -3
  13. package/checks/rules/no-duplicated-files.js.map +1 -1
  14. package/checks/rules/no-side-effects.js +4 -4
  15. package/checks/rules/no-side-effects.js.map +1 -1
  16. package/checks/rules/no-unused-bundle-dependencies.js +4 -4
  17. package/checks/rules/no-unused-bundle-dependencies.js.map +1 -1
  18. package/checks/rules/required-files.d.ts.map +1 -1
  19. package/checks/rules/required-files.js +4 -4
  20. package/checks/rules/required-files.js.map +1 -1
  21. package/checks/rules/type-script-declaration-integrity.d.ts.map +1 -1
  22. package/checks/rules/type-script-declaration-integrity.js +16 -2
  23. package/checks/rules/type-script-declaration-integrity.js.map +1 -1
  24. package/checks/rules/type-script-declaration-project.js +22 -11
  25. package/checks/rules/type-script-declaration-project.js.map +1 -1
  26. package/checks/rules/type-script-integrity.d.ts.map +1 -1
  27. package/checks/rules/type-script-integrity.js +11 -7
  28. package/checks/rules/type-script-integrity.js.map +1 -1
  29. package/checks/rules/unique-target-paths.js +3 -3
  30. package/checks/rules/unique-target-paths.js.map +1 -1
  31. package/dependency-scanner/scanner.js +35 -24
  32. package/dependency-scanner/scanner.js.map +1 -1
  33. package/git/git-command.js +6 -6
  34. package/git/git-command.js.map +1 -1
  35. package/package-surface/package-surface-index.js +30 -3
  36. package/package-surface/package-surface-index.js.map +1 -1
  37. package/package-surface/substitution-exports.js +8 -15
  38. package/package-surface/substitution-exports.js.map +1 -1
  39. package/package.json +1 -1
  40. package/packtory/package-processor-publish.js +5 -5
  41. package/packtory/package-processor-publish.js.map +1 -1
  42. package/packtory/packtory-pack.js +10 -8
  43. package/packtory/packtory-pack.js.map +1 -1
  44. package/packtory/packtory-release-plan.js +7 -7
  45. package/packtory/packtory-release-plan.js.map +1 -1
  46. package/packtory/packtory.js +8 -8
  47. package/packtory/packtory.js.map +1 -1
  48. package/packtory/scheduler.js +11 -11
  49. package/packtory/scheduler.js.map +1 -1
  50. package/packtory/stages/package-resolution-stage.js +2 -2
  51. package/packtory/stages/package-resolution-stage.js.map +1 -1
  52. package/packtory/stages/publish-stage.js +6 -6
  53. package/packtory/stages/publish-stage.js.map +1 -1
  54. package/packtory/stages/release-diff-stage.js +2 -2
  55. package/packtory/stages/release-diff-stage.js.map +1 -1
  56. package/published-package/published-package.js +5 -3
  57. package/published-package/published-package.js.map +1 -1
  58. package/resource-resolver/dependency-resolution-walker.js +25 -18
  59. package/resource-resolver/dependency-resolution-walker.js.map +1 -1
  60. package/sbom.cdx.json +5 -5
  61. package/version-manager/optional-bundle-fields.js +2 -2
  62. package/version-manager/optional-bundle-fields.js.map +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"release-diff-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/release-diff-stage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"release-diff-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/release-diff-stage.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,11 @@
1
1
  import { isString } from 'remeda';
2
- export function explicitBinTargetPaths(pkg) {
3
- if (pkg.binField === undefined) {
2
+ export function explicitBinTargetPaths(sourcePackage) {
3
+ if (sourcePackage.binField === undefined) {
4
4
  return new Set();
5
5
  }
6
- const targets = isString(pkg.binField) ? [pkg.binField] : Object.values(pkg.binField).filter(isString);
6
+ const targets = isString(sourcePackage.binField)
7
+ ? [sourcePackage.binField]
8
+ : Object.values(sourcePackage.binField).filter(isString);
7
9
  return new Set(targets.map(function (target) {
8
10
  return target.replace(/^\.\//u, '');
9
11
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"published-package.js","sourceRoot":"","sources":["../../../../source/published-package/published-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAsDlC,MAAM,UAAU,sBAAsB,CAAC,GAA4C;IAC/E,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,IAAI,GAAG,EAAU,CAAC;IAC7B,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAE,GAAG,CAAC,QAAQ,CAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzG,OAAO,IAAI,GAAG,CACV,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM;QACxB,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CACL,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"published-package.js","sourceRoot":"","sources":["../../../../source/published-package/published-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAsDlC,MAAM,UAAU,sBAAsB,CAAC,aAAsD;IACzF,IAAI,aAAa,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,IAAI,GAAG,EAAU,CAAC;IAC7B,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC5C,CAAC,CAAC,CAAE,aAAa,CAAC,QAAQ,CAAE;QAC5B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7D,OAAO,IAAI,GAAG,CACV,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM;QACxB,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CACL,CAAC;AACN,CAAC"}
@@ -13,30 +13,37 @@ async function findReadableDeclarationCompanion(fileManager, filePath) {
13
13
  }
14
14
  return undefined;
15
15
  }
16
- async function scanDeclarationGraph(dependencies, options, entryFile, scannedDeclarationFiles) {
17
- if (scannedDeclarationFiles.has(entryFile)) {
16
+ async function scanDeclarationGraph(dependencies, options, entryFiles, scannedDeclarationFiles) {
17
+ const pendingEntryFiles = entryFiles.filter(function (entryFile) {
18
+ return !scannedDeclarationFiles.has(entryFile);
19
+ });
20
+ if (pendingEntryFiles.length === 0) {
18
21
  return emptyDependencyFiles();
19
22
  }
20
- scannedDeclarationFiles.record(entryFile);
21
- const declarationDependencyGraph = await dependencies.dependencyScanner.scan(entryFile, options.sourcesFolder, {
23
+ pendingEntryFiles.forEach(function (entryFile) {
24
+ scannedDeclarationFiles.record(entryFile);
25
+ });
26
+ const declarationDependencyGraph = await dependencies.dependencyScanner.scanEntries(pendingEntryFiles, options.sourcesFolder, {
22
27
  includeSourceMapFiles: options.includeSourceMapFiles,
23
28
  resolveDeclarationFiles: true,
24
29
  mainPackageJson: options.mainPackageJson
25
30
  });
26
- return declarationDependencyGraph.flatten(entryFile);
31
+ return pendingEntryFiles.reduce(function (result, entryFile) {
32
+ return mergeDependencyFiles(result, declarationDependencyGraph.flatten(entryFile));
33
+ }, emptyDependencyFiles());
27
34
  }
28
- async function resolveDeclarationCompanionDependencies(context, jsDependencies) {
29
- let result = emptyDependencyFiles();
35
+ async function collectDeclarationCompanionEntries(context, jsDependencies) {
36
+ const companions = [];
30
37
  const nonRootLocalFiles = jsDependencies.localFiles.filter(function (localFile) {
31
38
  return !context.rootJsSourceFilePaths.has(localFile.filePath);
32
39
  });
33
40
  for (const localFile of nonRootLocalFiles) {
34
41
  const declarationCompanion = await findReadableDeclarationCompanion(context.dependencies.fileManager, localFile.filePath);
35
42
  if (declarationCompanion !== undefined) {
36
- result = mergeDependencyFiles(result, await scanDeclarationGraph(context.dependencies, context.options, declarationCompanion, context.scannedDeclarationFiles));
43
+ companions.push(declarationCompanion);
37
44
  }
38
45
  }
39
- return result;
46
+ return companions;
40
47
  }
41
48
  function createDeclarationScanTracker() {
42
49
  const scannedDeclarationFiles = new Set();
@@ -59,20 +66,20 @@ async function resolveJsDependencies(context, root) {
59
66
  });
60
67
  return jsDependencyGraph.flatten(root.js);
61
68
  }
62
- async function resolveRootDeclarationDependencies(context, root) {
69
+ async function resolveRootDeclarationDependencies(context, root, jsDependencies) {
70
+ const entryFiles = [];
63
71
  if (root.declarationFile !== undefined) {
64
- return await scanDeclarationGraph(context.dependencies, context.options, root.declarationFile, context.scannedDeclarationFiles);
72
+ entryFiles.push(root.declarationFile);
73
+ }
74
+ if (context.packageHasDeclarationRoots) {
75
+ entryFiles.push(...await collectDeclarationCompanionEntries(context, jsDependencies));
65
76
  }
66
- return emptyDependencyFiles();
77
+ return scanDeclarationGraph(context.dependencies, context.options, entryFiles, context.scannedDeclarationFiles);
67
78
  }
68
79
  async function resolveDependenciesForRoot(context, root) {
69
80
  const jsDependencies = await resolveJsDependencies(context, root);
70
- const declarationDependencies = await resolveRootDeclarationDependencies(context, root);
71
- let dependencyFiles = mergeDependencyFiles(jsDependencies, declarationDependencies);
72
- if (context.packageHasDeclarationRoots) {
73
- dependencyFiles = mergeDependencyFiles(dependencyFiles, await resolveDeclarationCompanionDependencies(context, jsDependencies));
74
- }
75
- return dependencyFiles;
81
+ const declarationDependencies = await resolveRootDeclarationDependencies(context, root, jsDependencies);
82
+ return mergeDependencyFiles(jsDependencies, declarationDependencies);
76
83
  }
77
84
  export async function resolveDependenciesForAllRoots(dependencies, options) {
78
85
  const { roots } = resolveRootsAndSurface(options);
@@ -1 +1 @@
1
- {"version":3,"file":"dependency-resolution-walker.js","sourceRoot":"","sources":["../../../../source/resource-resolver/dependency-resolution-walker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dependency-resolution-walker.js","sourceRoot":"","sources":["../../../../source/resource-resolver/dependency-resolution-walker.ts"],"names":[],"mappings":"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"}
package/sbom.cdx.json CHANGED
@@ -9,16 +9,16 @@
9
9
  {
10
10
  "type": "application",
11
11
  "name": "packtory",
12
- "version": "0.0.71"
12
+ "version": "0.0.74"
13
13
  }
14
14
  ]
15
15
  },
16
16
  "component": {
17
17
  "type": "library",
18
18
  "name": "packtory",
19
- "version": "0.0.68",
20
- "bom-ref": "pkg:npm/packtory@0.0.68",
21
- "purl": "pkg:npm/packtory@0.0.68"
19
+ "version": "0.0.70",
20
+ "bom-ref": "pkg:npm/packtory@0.0.70",
21
+ "purl": "pkg:npm/packtory@0.0.70"
22
22
  }
23
23
  },
24
24
  "components": [
@@ -379,7 +379,7 @@
379
379
  "ref": "pkg:npm/npm-registry-fetch@20.0.1"
380
380
  },
381
381
  {
382
- "ref": "pkg:npm/packtory@0.0.68",
382
+ "ref": "pkg:npm/packtory@0.0.70",
383
383
  "dependsOn": [
384
384
  "pkg:npm/@arethetypeswrong/core@0.18.5",
385
385
  "pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",
@@ -1,6 +1,6 @@
1
1
  import { isDefined, pickBy } from 'remeda';
2
- export function buildOptionalVersionedBundleFields(params) {
3
- const { importsField, binField, typesMainFile } = params;
2
+ export function buildOptionalVersionedBundleFields(input) {
3
+ const { importsField, binField, typesMainFile } = input;
4
4
  return pickBy({ importsField, binField, typesMainFile }, isDefined);
5
5
  }
6
6
  //# sourceMappingURL=optional-bundle-fields.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"optional-bundle-fields.js","sourceRoot":"","sources":["../../../../source/version-manager/optional-bundle-fields.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAgB3C,MAAM,UAAU,kCAAkC,CAAC,MAA0C;IACzF,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAEzD,OAAO,MAAM,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,SAAS,CAAC,CAAC;AACxE,CAAC"}
1
+ {"version":3,"file":"optional-bundle-fields.js","sourceRoot":"","sources":["../../../../source/version-manager/optional-bundle-fields.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAgB3C,MAAM,UAAU,kCAAkC,CAAC,KAAyC;IACxF,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAExD,OAAO,MAAM,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,SAAS,CAAC,CAAC;AACxE,CAAC"}