packtory 0.0.68 → 0.0.69
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.
- package/checks/rules/type-script-declaration-integrity.d.ts.map +1 -1
- package/checks/rules/type-script-declaration-integrity.js +16 -2
- package/checks/rules/type-script-declaration-integrity.js.map +1 -1
- package/checks/rules/type-script-declaration-project.js +22 -11
- package/checks/rules/type-script-declaration-project.js.map +1 -1
- package/checks/rules/type-script-integrity.js +8 -4
- package/checks/rules/type-script-integrity.js.map +1 -1
- package/package-surface/package-surface-index.js +30 -3
- package/package-surface/package-surface-index.js.map +1 -1
- package/package-surface/substitution-exports.js +8 -15
- package/package-surface/substitution-exports.js.map +1 -1
- package/package.json +1 -1
- package/sbom.cdx.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-script-declaration-integrity.d.ts","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-integrity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8CAA8C;AAEhG,OAAO,KAAK,EAGR,0BAA0B,
|
|
1
|
+
{"version":3,"file":"type-script-declaration-integrity.d.ts","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-integrity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8CAA8C;AAEhG,OAAO,KAAK,EAGR,0BAA0B,EAG7B,MAAM,sCAAsC"}
|
|
@@ -22,6 +22,19 @@ function collectDeclarationPaths(packageFiles) {
|
|
|
22
22
|
})
|
|
23
23
|
.filter(isDeclarationPath));
|
|
24
24
|
}
|
|
25
|
+
function collectResolutionPackageFiles(packageName, publishedPackages) {
|
|
26
|
+
return Array
|
|
27
|
+
.from(publishedPackages)
|
|
28
|
+
.filter(function ([candidateName]) {
|
|
29
|
+
return candidateName !== packageName;
|
|
30
|
+
})
|
|
31
|
+
.map(function ([candidateName, publishedPackage]) {
|
|
32
|
+
return {
|
|
33
|
+
packageName: candidateName,
|
|
34
|
+
packageFiles: collectPackageFiles(publishedPackage)
|
|
35
|
+
};
|
|
36
|
+
});
|
|
37
|
+
}
|
|
25
38
|
function checkedDeclarationPaths(project, declarationPaths, rootPaths, declarationMode) {
|
|
26
39
|
if (declarationMode === 'all') {
|
|
27
40
|
return declarationPaths;
|
|
@@ -38,11 +51,12 @@ function formatDeclarationDiagnostic(packageName, modeLabel, diagnostic) {
|
|
|
38
51
|
}
|
|
39
52
|
export function createDeclarationIntegritySummarizer(dependencies) {
|
|
40
53
|
const { createDeclarationProjects } = dependencies;
|
|
41
|
-
return function summarizeDeclarationIntegrity(packageName, publishedPackage, declarationMode) {
|
|
54
|
+
return function summarizeDeclarationIntegrity(packageName, publishedPackage, declarationMode, resolutionPackages) {
|
|
42
55
|
const packageFiles = collectPackageFiles(publishedPackage);
|
|
43
56
|
const declarationPaths = collectDeclarationPaths(packageFiles);
|
|
44
57
|
const rootPaths = declarationRootsFromManifest(publishedPackage.manifestFile.content);
|
|
45
|
-
|
|
58
|
+
const resolutionPackageFiles = collectResolutionPackageFiles(packageName, resolutionPackages);
|
|
59
|
+
return createDeclarationProjects(packageName, packageFiles, resolutionPackageFiles).flatMap(function (project) {
|
|
46
60
|
const checkedPaths = checkedDeclarationPaths(project, declarationPaths, rootPaths, declarationMode);
|
|
47
61
|
return project
|
|
48
62
|
.listDiagnostics()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-script-declaration-integrity.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-integrity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"type-script-declaration-integrity.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-integrity.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,22 @@ function createModeProject(project, packageFolder, modeLabel) {
|
|
|
69
69
|
}
|
|
70
70
|
export function createDeclarationProjectFactory(dependencies) {
|
|
71
71
|
const { Project, fileSystemHost, packageResolutionBaseFolder } = dependencies;
|
|
72
|
-
function
|
|
72
|
+
function addPackageFiles(project, packageName, packageFiles, createdFilePaths) {
|
|
73
|
+
const packageFolder = declarationProjectPackageFolder(packageResolutionBaseFolder, packageName);
|
|
74
|
+
for (const packageFile of packageFiles) {
|
|
75
|
+
const filePath = declarationProjectPackageFilePath(packageFolder, packageFile.filePath);
|
|
76
|
+
if (!createdFilePaths.has(filePath)) {
|
|
77
|
+
createdFilePaths.add(filePath);
|
|
78
|
+
if (path.basename(packageFile.filePath) === 'package.json') {
|
|
79
|
+
project.createSourceFile(filePath, packageFile.content, { scriptKind: ScriptKind.JSON });
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
project.createSourceFile(filePath, packageFile.content);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
function createProjectForMode(packageName, packageFiles, resolutionPackages, compilerMode) {
|
|
73
88
|
const packageFolder = declarationProjectPackageFolder(packageResolutionBaseFolder, packageName);
|
|
74
89
|
const project = new Project({
|
|
75
90
|
fileSystem: fileSystemHost,
|
|
@@ -84,20 +99,16 @@ export function createDeclarationProjectFactory(dependencies) {
|
|
|
84
99
|
target: ScriptTarget.ESNext
|
|
85
100
|
}
|
|
86
101
|
});
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}
|
|
92
|
-
else {
|
|
93
|
-
project.createSourceFile(filePath, packageFile.content);
|
|
94
|
-
}
|
|
102
|
+
const createdFilePaths = new Set();
|
|
103
|
+
addPackageFiles(project, packageName, packageFiles, createdFilePaths);
|
|
104
|
+
for (const resolutionPackage of resolutionPackages) {
|
|
105
|
+
addPackageFiles(project, resolutionPackage.packageName, resolutionPackage.packageFiles, createdFilePaths);
|
|
95
106
|
}
|
|
96
107
|
return createModeProject(project, packageFolder, compilerMode.label);
|
|
97
108
|
}
|
|
98
|
-
return function createDeclarationProjects(packageName, packageFiles) {
|
|
109
|
+
return function createDeclarationProjects(packageName, packageFiles, resolutionPackages) {
|
|
99
110
|
return declarationCompilerModes().map(function (compilerMode) {
|
|
100
|
-
return createProjectForMode(packageName, packageFiles, compilerMode);
|
|
111
|
+
return createProjectForMode(packageName, packageFiles, resolutionPackages, compilerMode);
|
|
101
112
|
});
|
|
102
113
|
};
|
|
103
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-script-declaration-project.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-project.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACH,UAAU,EACV,oBAAoB,EACpB,UAAU,EACV,YAAY,EACZ,EAAE,IAAI,UAAU,EAKnB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"type-script-declaration-project.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,10 +24,10 @@ export function createTypeScriptIntegrityRule(dependencies) {
|
|
|
24
24
|
return [`Package "${packageName}" failed TypeScript integrity: ${String(error)}`];
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
async function runForPackage(packageName, publishedPackage, declarationMode) {
|
|
27
|
+
async function runForPackage(packageName, publishedPackage, publishedPackages, declarationMode) {
|
|
28
28
|
return [
|
|
29
29
|
...await summarizePackageResolution(packageName, publishedPackage),
|
|
30
|
-
...summarizeDeclarationIntegrity(packageName, publishedPackage, declarationMode)
|
|
30
|
+
...summarizeDeclarationIntegrity(packageName, publishedPackage, declarationMode, publishedPackages)
|
|
31
31
|
];
|
|
32
32
|
}
|
|
33
33
|
async function run(params) {
|
|
@@ -36,12 +36,16 @@ export function createTypeScriptIntegrityRule(dependencies) {
|
|
|
36
36
|
return [];
|
|
37
37
|
}
|
|
38
38
|
const declarationMode = globalConfig.declarations ?? defaultDeclarationMode;
|
|
39
|
+
const { publishedPackages } = params;
|
|
40
|
+
if (publishedPackages === undefined) {
|
|
41
|
+
throw new Error('Published packages missing for TypeScript integrity');
|
|
42
|
+
}
|
|
39
43
|
const issuesByBundle = await Promise.all(params.bundles.map(async function (bundle) {
|
|
40
|
-
const publishedPackage =
|
|
44
|
+
const publishedPackage = publishedPackages.get(bundle.name);
|
|
41
45
|
if (publishedPackage === undefined) {
|
|
42
46
|
throw new Error(`Published package missing for "${bundle.name}"`);
|
|
43
47
|
}
|
|
44
|
-
return await runForPackage(bundle.name, publishedPackage, declarationMode);
|
|
48
|
+
return await runForPackage(bundle.name, publishedPackage, publishedPackages, declarationMode);
|
|
45
49
|
}));
|
|
46
50
|
return issuesByBundle.flat();
|
|
47
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-script-integrity.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-integrity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC;AAK7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAEhF,MAAM,QAAQ,GAAG,qBAAqB,CAAC;AACvC,MAAM,sBAAsB,GAA8B,CAAE,YAAY,EAAE,SAAS,CAAE,CAAC;AACtF,MAAM,qBAAqB,GAAqD,CAAE,KAAK,EAAE,eAAe,CAAE,CAAC;AAC3G,MAAM,sBAAsB,GAAoB,KAAK,CAAC;AAEtD,MAAM,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC;IAChC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;CAC1D,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;AAQ5C,MAAM,CAAC,MAAM,0BAA0B,GAAuE;IAC1G,YAAY;IACZ,gBAAgB;CACnB,CAAC;AAOF,MAAM,UAAU,6BAA6B,CACzC,YAA6C;IAE7C,MAAM,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,GAAG,YAAY,CAAC;IAEjF,KAAK,UAAU,0BAA0B,CACrC,WAAmB,EACnB,gBAAwD;QAExD,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,CAAC;YACxF,OAAO,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC,CAAC;QAClF,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,OAAO,CAAE,YAAY,WAAW,kCAAkC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAE,CAAC;QACxF,CAAC;IACL,CAAC;IAED,KAAK,UAAU,aAAa,CACxB,WAAmB,EACnB,gBAAwD,EACxD,eAAgC;QAEhC,OAAO;YACH,GAAG,MAAM,0BAA0B,CAAC,WAAW,EAAE,gBAAgB,CAAC;YAClE,GAAG,6BAA6B,CAAC,WAAW,EAAE,gBAAgB,EAAE,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"type-script-integrity.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-integrity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { declarationCompanionCandidates } from "../common/declaration-companion-paths.js";
|
|
1
2
|
import { getEntryRootIds, getRoot } from "./root-registry.js";
|
|
2
3
|
import { toPackageSpecifier } from "./specifier-syntax.js";
|
|
3
4
|
function createPublicModuleIndexBuilder() {
|
|
@@ -101,8 +102,17 @@ function indexExplicitPublicModules(bundle) {
|
|
|
101
102
|
}
|
|
102
103
|
return publicModuleIndex.build();
|
|
103
104
|
}
|
|
104
|
-
function
|
|
105
|
-
const
|
|
105
|
+
function declarationCompanionSpecifier(bundle, targetFilePath) {
|
|
106
|
+
const companion = bundle.contents.find(function (entry) {
|
|
107
|
+
const candidatePaths = declarationCompanionCandidates(entry.fileDescription.targetFilePath);
|
|
108
|
+
return candidatePaths.includes(targetFilePath);
|
|
109
|
+
});
|
|
110
|
+
if (companion === undefined) {
|
|
111
|
+
return undefined;
|
|
112
|
+
}
|
|
113
|
+
return toPackageSpecifier(bundle.name, `./${companion.fileDescription.targetFilePath}`);
|
|
114
|
+
}
|
|
115
|
+
function recordImplicitRootModules(bundle, publicModuleIndex) {
|
|
106
116
|
const defaultRoot = getRoot(bundle, bundle.surface.defaultModuleRoot);
|
|
107
117
|
publicModuleIndex.recordFirstIndexedPublicSpecifier({
|
|
108
118
|
publicSourceFilePath: defaultRoot.js.sourceFilePath,
|
|
@@ -118,13 +128,30 @@ function indexImplicitPublicModules(bundle) {
|
|
|
118
128
|
});
|
|
119
129
|
}
|
|
120
130
|
}
|
|
121
|
-
|
|
131
|
+
}
|
|
132
|
+
function recordImplicitContentModule(bundle, publicModuleIndex, entry) {
|
|
133
|
+
const companionSpecifier = declarationCompanionSpecifier(bundle, entry.fileDescription.targetFilePath);
|
|
134
|
+
if (companionSpecifier === undefined) {
|
|
122
135
|
publicModuleIndex.recordFirstIndexedPublicSpecifier({
|
|
123
136
|
publicSourceFilePath: entry.fileDescription.sourceFilePath,
|
|
124
137
|
sourceFilePaths: [entry.fileDescription.sourceFilePath],
|
|
125
138
|
specifier: toPackageSpecifier(bundle.name, `./${entry.fileDescription.targetFilePath}`)
|
|
126
139
|
});
|
|
127
140
|
}
|
|
141
|
+
else {
|
|
142
|
+
publicModuleIndex.recordFirstIndexedPublicSpecifier({
|
|
143
|
+
publicSourceFilePath: undefined,
|
|
144
|
+
sourceFilePaths: [entry.fileDescription.sourceFilePath],
|
|
145
|
+
specifier: companionSpecifier
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
function indexImplicitPublicModules(bundle) {
|
|
150
|
+
const publicModuleIndex = createPublicModuleIndexBuilder();
|
|
151
|
+
recordImplicitRootModules(bundle, publicModuleIndex);
|
|
152
|
+
for (const entry of bundle.contents) {
|
|
153
|
+
recordImplicitContentModule(bundle, publicModuleIndex, entry);
|
|
154
|
+
}
|
|
128
155
|
return publicModuleIndex.build();
|
|
129
156
|
}
|
|
130
157
|
export function indexPublicModules(bundle) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-surface-index.js","sourceRoot":"","sources":["../../../../source/package-surface/package-surface-index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package-surface-index.js","sourceRoot":"","sources":["../../../../source/package-surface/package-surface-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,13 +41,6 @@ function findBundleContent(bundleName, contentBySourceFilePath, sourceFilePath)
|
|
|
41
41
|
}
|
|
42
42
|
return content;
|
|
43
43
|
}
|
|
44
|
-
function declarationCompanionTargetPaths(targetFilePath) {
|
|
45
|
-
if (isDeclarationCompanionFilePath(targetFilePath)) {
|
|
46
|
-
return null;
|
|
47
|
-
}
|
|
48
|
-
const candidates = declarationCompanionCandidates(targetFilePath);
|
|
49
|
-
return candidates.length === 0 ? undefined : candidates;
|
|
50
|
-
}
|
|
51
44
|
function findDeclarationCompanionTargetPath(targetFilePaths, candidatePaths) {
|
|
52
45
|
return candidatePaths.find(function (candidatePath) {
|
|
53
46
|
return targetFilePaths.has(candidatePath);
|
|
@@ -67,11 +60,8 @@ function existingDeclarationTargetFilePathFor(bundleName, lookups, jsTargetFileP
|
|
|
67
60
|
return undefined;
|
|
68
61
|
}
|
|
69
62
|
function declarationTargetFilePathFor(bundleName, lookups, jsTargetFilePath) {
|
|
70
|
-
const declarationCandidates =
|
|
71
|
-
if (declarationCandidates ===
|
|
72
|
-
return null;
|
|
73
|
-
}
|
|
74
|
-
if (declarationCandidates === undefined) {
|
|
63
|
+
const declarationCandidates = declarationCompanionCandidates(jsTargetFilePath);
|
|
64
|
+
if (declarationCandidates.length === 0) {
|
|
75
65
|
return undefined;
|
|
76
66
|
}
|
|
77
67
|
return existingDeclarationTargetFilePathFor(bundleName, lookups, jsTargetFilePath, declarationCandidates);
|
|
@@ -82,10 +72,13 @@ function buildSubstitutionExportEntry(bundleName, lookups, sourceFilePath) {
|
|
|
82
72
|
}
|
|
83
73
|
const content = findBundleContent(bundleName, lookups.contentBySourceFilePath, sourceFilePath);
|
|
84
74
|
const jsTargetFilePath = content.fileDescription.targetFilePath;
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
75
|
+
if (isDeclarationCompanionFilePath(jsTargetFilePath)) {
|
|
76
|
+
return [
|
|
77
|
+
`./${jsTargetFilePath}`,
|
|
78
|
+
{ types: toImportTarget(jsTargetFilePath) }
|
|
79
|
+
];
|
|
88
80
|
}
|
|
81
|
+
const declarationTargetFilePath = declarationTargetFilePathFor(bundleName, lookups, jsTargetFilePath);
|
|
89
82
|
return [
|
|
90
83
|
`./${jsTargetFilePath}`,
|
|
91
84
|
pickBy({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"substitution-exports.js","sourceRoot":"","sources":["../../../../source/package-surface/substitution-exports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EACH,8BAA8B,EAC9B,8BAA8B,EACjC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,cAAc,EAAqC,MAAM,oBAAoB,CAAC;AAevF,SAAS,0BAA0B,CAAC,MAA0B;IAC1D,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE9C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7C,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC;IAED,OAAO,mBAAmB,CAAC;AAC/B,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA0B;IACnD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI;QAClD,OAAO,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC;IAC9C,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,2BAA2B,CAAC,MAA0B;IAC3D,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAyB,CAAC;IACjE,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC;QAEjE,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YAC/C,uBAAuB,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACvD,CAAC;QAED,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,+BAA+B,CAAC,MAA0B;IAC/D,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;IAEzF,OAAO;QACH,uBAAuB;QACvB,mBAAmB,EAAE,mBAAmB,CAAC,MAAM,CAAC;QAChD,eAAe;QACf,mBAAmB,EAAE,0BAA0B,CAAC,MAAM,CAAC;KAC1D,CAAC;AACN,CAAC;AAED,SAAS,iBAAiB,CACtB,UAAkB,EAClB,uBAA2D,EAC3D,cAAsB;IAEtB,MAAM,OAAO,GAAG,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC5D,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,6BAA6B,cAAc,GAAG,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS
|
|
1
|
+
{"version":3,"file":"substitution-exports.js","sourceRoot":"","sources":["../../../../source/package-surface/substitution-exports.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/sbom.cdx.json
CHANGED
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"component": {
|
|
17
17
|
"type": "library",
|
|
18
18
|
"name": "packtory",
|
|
19
|
-
"version": "0.0.
|
|
20
|
-
"bom-ref": "pkg:npm/packtory@0.0.
|
|
21
|
-
"purl": "pkg:npm/packtory@0.0.
|
|
19
|
+
"version": "0.0.69",
|
|
20
|
+
"bom-ref": "pkg:npm/packtory@0.0.69",
|
|
21
|
+
"purl": "pkg:npm/packtory@0.0.69"
|
|
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.
|
|
382
|
+
"ref": "pkg:npm/packtory@0.0.69",
|
|
383
383
|
"dependsOn": [
|
|
384
384
|
"pkg:npm/@arethetypeswrong/core@0.18.5",
|
|
385
385
|
"pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",
|