packtory 0.0.70 → 0.0.72
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/bundle-emitter/fetch-published-artifacts.d.ts.map +1 -1
- package/bundle-emitter/fetch-published-artifacts.js +1 -1
- package/bundle-emitter/fetch-published-artifacts.js.map +1 -1
- package/bundle-emitter/registry/package-metadata-fetcher.d.ts +3 -0
- package/bundle-emitter/registry/package-metadata-fetcher.d.ts.map +1 -1
- package/bundle-emitter/registry/package-metadata-fetcher.js +25 -2
- package/bundle-emitter/registry/package-metadata-fetcher.js.map +1 -1
- package/bundle-emitter/registry/registry-client.d.ts +2 -1
- package/bundle-emitter/registry/registry-client.d.ts.map +1 -1
- package/bundle-emitter/registry/registry-client.js +2 -2
- package/bundle-emitter/registry/registry-client.js.map +1 -1
- package/bundle-emitter/registry/registry-response-schemas.js +3 -1
- package/bundle-emitter/registry/registry-response-schemas.js.map +1 -1
- package/bundle-emitter/registry/tarball-integrity.d.ts +5 -0
- package/bundle-emitter/registry/tarball-integrity.d.ts.map +1 -0
- package/bundle-emitter/registry/tarball-integrity.js +32 -0
- package/bundle-emitter/registry/tarball-integrity.js.map +1 -0
- package/checks/rules/type-script-declaration-integrity.js +18 -8
- package/checks/rules/type-script-declaration-integrity.js.map +1 -1
- package/checks/rules/type-script-declaration-project.js +93 -5
- package/checks/rules/type-script-declaration-project.js.map +1 -1
- package/checks/rules/type-script-declaration-roots.js +11 -12
- package/checks/rules/type-script-declaration-roots.js.map +1 -1
- package/linker/linker.js +5 -4
- package/linker/linker.js.map +1 -1
- package/linker/replacement-lookup.js +139 -22
- package/linker/replacement-lookup.js.map +1 -1
- package/linker/substitute-bundles.js +39 -26
- package/linker/substitute-bundles.js.map +1 -1
- package/package-surface/package-surface-index.js +1 -1
- package/package-surface/package-surface-index.js.map +1 -1
- package/package.json +3 -2
- package/packtory/package-processor-build.js +2 -1
- package/packtory/package-processor-build.js.map +1 -1
- package/sbom.cdx.json +21 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-published-artifacts.d.ts","sourceRoot":"","sources":["../../../../source/bundle-emitter/fetch-published-artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,MAAM,MAAM,yBAAyB,GAAG;IACpC,QAAQ,CAAC,WAAW,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,SAAS,eAAe,EAAE,CAAC;CAC9C,CAAC;AAEF,wBAAsB,uBAAuB,CACzC,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,gBAAgB,GACnC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"fetch-published-artifacts.d.ts","sourceRoot":"","sources":["../../../../source/bundle-emitter/fetch-published-artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,MAAM,MAAM,yBAAyB,GAAG;IACpC,QAAQ,CAAC,WAAW,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,SAAS,eAAe,EAAE,CAAC;CAC9C,CAAC;AAEF,wBAAsB,uBAAuB,CACzC,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,gBAAgB,GACnC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAiB3C"}
|
|
@@ -5,7 +5,7 @@ export async function fetchPublishedArtifacts(registryClient, name, registrySett
|
|
|
5
5
|
if (latestVersion.isNothing) {
|
|
6
6
|
return Maybe.nothing();
|
|
7
7
|
}
|
|
8
|
-
const tarball = await registryClient.fetchTarball(latestVersion.value.tarballUrl, registrySettings);
|
|
8
|
+
const tarball = await registryClient.fetchTarball(latestVersion.value.tarballUrl, latestVersion.value.tarballIntegrity, registrySettings);
|
|
9
9
|
const files = await extractPackageTarball(tarball);
|
|
10
10
|
return Maybe.just({
|
|
11
11
|
version: latestVersion.value.version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-published-artifacts.js","sourceRoot":"","sources":["../../../../source/bundle-emitter/fetch-published-artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAUrE,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,cAA8B,EAC9B,IAAY,EACZ,gBAAkC;IAElC,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,0BAA0B,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC9F,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"fetch-published-artifacts.js","sourceRoot":"","sources":["../../../../source/bundle-emitter/fetch-published-artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAUrE,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,cAA8B,EAC9B,IAAY,EACZ,gBAAkC;IAElC,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,0BAA0B,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC9F,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,YAAY,CAC7C,aAAa,CAAC,KAAK,CAAC,UAAU,EAC9B,aAAa,CAAC,KAAK,CAAC,gBAAgB,EACpC,gBAAgB,CACnB,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACnD,OAAO,KAAK,CAAC,IAAI,CAAC;QACd,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO;QACpC,KAAK;QACL,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW;QAC5C,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO;KACvC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -2,14 +2,17 @@ import type _npmFetch from 'npm-registry-fetch';
|
|
|
2
2
|
import { Maybe } from 'true-myth';
|
|
3
3
|
import type { RegistrySettings } from '../../config/registry-settings.ts';
|
|
4
4
|
import { type NpmFetchOptions } from './registry-auth-config.ts';
|
|
5
|
+
import { type TarballIntegrity } from './tarball-integrity.ts';
|
|
5
6
|
export type PackageVersionDetails = {
|
|
6
7
|
readonly version: string;
|
|
7
8
|
readonly tarballUrl: string;
|
|
9
|
+
readonly tarballIntegrity: TarballIntegrity;
|
|
8
10
|
readonly gitHead: string | undefined;
|
|
9
11
|
};
|
|
10
12
|
export type PackageReleaseMetadata = {
|
|
11
13
|
readonly publishedAt?: Date | undefined;
|
|
12
14
|
readonly tarballUrl: string;
|
|
15
|
+
readonly tarballIntegrity: TarballIntegrity;
|
|
13
16
|
readonly version: string;
|
|
14
17
|
readonly gitHead: string | undefined;
|
|
15
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-metadata-fetcher.d.ts","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/package-metadata-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,oBAAoB;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW;AACjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC;AAGzE,OAAO,EAIH,KAAK,eAAe,EACvB,MAAM,2BAA2B;
|
|
1
|
+
{"version":3,"file":"package-metadata-fetcher.d.ts","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/package-metadata-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,oBAAoB;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW;AACjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC;AAGzE,OAAO,EAIH,KAAK,eAAe,EACvB,MAAM,2BAA2B;AAOlC,OAAO,EAA0B,KAAK,gBAAgB,EAAE,MAAM,wBAAwB;AAQtF,MAAM,MAAM,qBAAqB,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC;AAED,MAAM,MAAM,sBAAsB,GAAG;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC"}
|
|
@@ -3,6 +3,7 @@ import { retryWithFallbackAuth } from "./metadata-auth-retry.js";
|
|
|
3
3
|
import { toRegistryPackagePath } from "./registry-package-path.js";
|
|
4
4
|
import { resolveMetadataAuthOptions, resolveStageListingAuthOptions } from "./registry-auth-config.js";
|
|
5
5
|
import { parseAbbreviatedPackageResponse, parseFullPackageResponse } from "./registry-response-schemas.js";
|
|
6
|
+
import { assertTarballIntegrity } from "./tarball-integrity.js";
|
|
6
7
|
import { assertTarballOriginMatchesRegistry } from "./validate-tarball-host.js";
|
|
7
8
|
const notFoundStatusCode = 404;
|
|
8
9
|
const forbiddenStatusCode = 403;
|
|
@@ -91,6 +92,21 @@ async function fetchAndParsePackageMetadata(npmFetch, packageName, registrySetti
|
|
|
91
92
|
throw error;
|
|
92
93
|
}
|
|
93
94
|
}
|
|
95
|
+
function readTarballDigestField(value, fieldName, packageName, version) {
|
|
96
|
+
if (value === undefined) {
|
|
97
|
+
return undefined;
|
|
98
|
+
}
|
|
99
|
+
if (typeof value === 'string' && value.length > 0) {
|
|
100
|
+
return value;
|
|
101
|
+
}
|
|
102
|
+
throw new Error(`Registry returned invalid ${fieldName} for package "${packageName}" version "${version}"`);
|
|
103
|
+
}
|
|
104
|
+
function readTarballIntegrity(dist, packageName, version) {
|
|
105
|
+
return {
|
|
106
|
+
integrity: readTarballDigestField(dist.integrity, 'dist.integrity', packageName, version),
|
|
107
|
+
shasum: readTarballDigestField(dist.shasum, 'dist.shasum', packageName, version)
|
|
108
|
+
};
|
|
109
|
+
}
|
|
94
110
|
function extractLatestVersionDetails(packageResponse, packageName) {
|
|
95
111
|
const latestVersion = packageResponse['dist-tags'].latest;
|
|
96
112
|
if (latestVersion === undefined) {
|
|
@@ -100,7 +116,12 @@ function extractLatestVersionDetails(packageResponse, packageName) {
|
|
|
100
116
|
if (versionData === undefined) {
|
|
101
117
|
throw new Error(`Version "${latestVersion}" for package "${packageName}" has no entry in the registry response`);
|
|
102
118
|
}
|
|
103
|
-
return Maybe.just({
|
|
119
|
+
return Maybe.just({
|
|
120
|
+
version: latestVersion,
|
|
121
|
+
tarballUrl: versionData.dist.tarball,
|
|
122
|
+
tarballIntegrity: readTarballIntegrity(versionData.dist, packageName, latestVersion),
|
|
123
|
+
gitHead: versionData.gitHead
|
|
124
|
+
});
|
|
104
125
|
}
|
|
105
126
|
export async function fetchLatestPackageVersion(npmFetch, packageName, registrySettings) {
|
|
106
127
|
const packageResponse = await fetchAndParsePackageMetadata(npmFetch, packageName, registrySettings, abbreviatedPackageMetadataRequest);
|
|
@@ -122,6 +143,7 @@ export async function fetchLatestPackageReleaseMetadata(npmFetch, packageName, r
|
|
|
122
143
|
return Maybe.just({
|
|
123
144
|
version: latestVersion.value.version,
|
|
124
145
|
tarballUrl: latestVersion.value.tarballUrl,
|
|
146
|
+
tarballIntegrity: latestVersion.value.tarballIntegrity,
|
|
125
147
|
publishedAt: publishedAtTimestamp === undefined ? undefined : parseTimestamp(publishedAtTimestamp),
|
|
126
148
|
gitHead: latestVersion.value.gitHead
|
|
127
149
|
});
|
|
@@ -151,7 +173,7 @@ export async function fetchStagedPackageVersions(npmFetch, packageName, registry
|
|
|
151
173
|
}
|
|
152
174
|
throw new Error(`Staged package listing exceeded ${maximumStageListPages} pages`);
|
|
153
175
|
}
|
|
154
|
-
export async function fetchPackageTarball(npmFetch, tarballUrl, registrySettings) {
|
|
176
|
+
export async function fetchPackageTarball(npmFetch, tarballUrl, tarballIntegrity, registrySettings) {
|
|
155
177
|
assertTarballOriginMatchesRegistry(tarballUrl, registrySettings);
|
|
156
178
|
const auth = resolveMetadataAuthOptions(registrySettings);
|
|
157
179
|
const response = await retryWithFallbackAuth(registrySettings, auth, async function (options) {
|
|
@@ -160,6 +182,7 @@ export async function fetchPackageTarball(npmFetch, tarballUrl, registrySettings
|
|
|
160
182
|
assertContentLengthWithinDownloadLimit(response);
|
|
161
183
|
const tarball = await response.buffer();
|
|
162
184
|
assertDownloadedTarballSize(tarball.length);
|
|
185
|
+
assertTarballIntegrity(tarball, tarballIntegrity);
|
|
163
186
|
return tarball;
|
|
164
187
|
}
|
|
165
188
|
//# sourceMappingURL=package-metadata-fetcher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-metadata-fetcher.js","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/package-metadata-fetcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EACH,0BAA0B,EAC1B,8BAA8B,EAGjC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACH,+BAA+B,EAC/B,wBAAwB,EAG3B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kCAAkC,EAAE,MAAM,4BAA4B,CAAC;AAEhF,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAC/B,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAChC,MAAM,+BAA+B,GAAG,qCAAqC,CAAC;AAC9E,MAAM,yBAAyB,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"package-metadata-fetcher.js","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/package-metadata-fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import type { PublishSettings } from '../../config/publish-settings.ts';
|
|
|
5
5
|
import type { NpmOidcPublishAuth, RegistrySettings } from '../../config/registry-settings.ts';
|
|
6
6
|
import { type PublicationOutcome } from '../publication-outcome.ts';
|
|
7
7
|
import { type PackageReleaseMetadata, type PackageVersionDetails } from './package-metadata-fetcher.ts';
|
|
8
|
+
import type { TarballIntegrity } from './tarball-integrity.ts';
|
|
8
9
|
type PublishManifest = Readonly<Record<string, unknown>> & {
|
|
9
10
|
readonly name: string;
|
|
10
11
|
readonly version: string;
|
|
@@ -21,7 +22,7 @@ export type RegistryClient = {
|
|
|
21
22
|
fetchLatestVersion: (packageName: string, config: RegistrySettings) => Promise<Maybe<PackageVersionDetails>>;
|
|
22
23
|
fetchStagedVersions: (packageName: string, config: RegistrySettings) => Promise<readonly string[]>;
|
|
23
24
|
publishPackage: (...publishArguments: PublishPackageArguments) => Promise<PublicationOutcome>;
|
|
24
|
-
fetchTarball: (tarballUrl: string, config: RegistrySettings) => Promise<Buffer>;
|
|
25
|
+
fetchTarball: (tarballUrl: string, tarballIntegrity: TarballIntegrity, config: RegistrySettings) => Promise<Buffer>;
|
|
25
26
|
};
|
|
26
27
|
export {};
|
|
27
28
|
//# sourceMappingURL=registry-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry-client.d.ts","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/registry-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,oBAAoB;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW;AACtC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC;AAC7F,OAAO,EAA0C,KAAK,kBAAkB,EAAE,MAAM,2BAA2B;AAE3G,OAAO,EAKH,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC7B,MAAM,+BAA+B;
|
|
1
|
+
{"version":3,"file":"registry-client.d.ts","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/registry-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,oBAAoB;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,WAAW;AACtC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC;AAC7F,OAAO,EAA0C,KAAK,kBAAkB,EAAE,MAAM,2BAA2B;AAE3G,OAAO,EAKH,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC7B,MAAM,+BAA+B;AAEtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB;AAE9D,KAAK,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG;IACvD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC5B;AASD,KAAK,uBAAuB,GAAG,SAAS;IACpC,QAAQ,EAAE,eAAe;IACzB,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,gBAAgB;IACxB,eAAe,EAAE,eAAe;IAChC,KAAK,EAAE,OAAO;CACjB;AAWD,MAAM,MAAM,cAAc,GAAG;IACzB,0BAA0B,EAAE,CACxB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,gBAAgB,KACvB,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAC5C,kBAAkB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC7G,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;IACnG,cAAc,EAAE,CAAC,GAAG,gBAAgB,EAAE,uBAAuB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC9F,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACvH"}
|
|
@@ -35,8 +35,8 @@ export function createRegistryClient(dependencies) {
|
|
|
35
35
|
const { npmFetch, publish, fetch: fetchImplementation, clock, promptForOneTimePassword, resolveIdToken } = dependencies;
|
|
36
36
|
const oidcExchanger = createOidcTokenExchanger({ fetch: fetchImplementation, clock, resolveIdToken });
|
|
37
37
|
return {
|
|
38
|
-
async fetchTarball(tarballUrl, registrySettings) {
|
|
39
|
-
return fetchPackageTarball(npmFetch, tarballUrl, registrySettings);
|
|
38
|
+
async fetchTarball(tarballUrl, tarballIntegrity, registrySettings) {
|
|
39
|
+
return fetchPackageTarball(npmFetch, tarballUrl, tarballIntegrity, registrySettings);
|
|
40
40
|
},
|
|
41
41
|
async publishPackage(...[manifest, tarData, registrySettings, publishSettings, stage]) {
|
|
42
42
|
const authOptions = await oidcExchanger.resolveWriteAuthOptions(manifest.name, registrySettings);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry-client.js","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/registry-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAA2B,MAAM,2BAA2B,CAAC;AAC5G,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EACH,iCAAiC,EACjC,mBAAmB,EACnB,yBAAyB,EACzB,0BAA0B,EAG7B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,qCAAqC,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"registry-client.js","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/registry-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,9 @@ import { z } from 'zod/mini';
|
|
|
2
2
|
import { safeParse } from "../../common/schema-validation.js";
|
|
3
3
|
const packageVersionDetailsSchema = z.object({
|
|
4
4
|
dist: z.object({
|
|
5
|
-
tarball: z.string()
|
|
5
|
+
tarball: z.string(),
|
|
6
|
+
integrity: z.optional(z.unknown()),
|
|
7
|
+
shasum: z.optional(z.unknown())
|
|
6
8
|
}),
|
|
7
9
|
gitHead: z.optional(z.string())
|
|
8
10
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry-response-schemas.js","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/registry-response-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACX,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"registry-response-schemas.js","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/registry-response-schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tarball-integrity.d.ts","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/tarball-integrity.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,GAAG;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import ssri from 'ssri';
|
|
2
|
+
const sha1HexPattern = /^[a-f0-9]{40}$/u;
|
|
3
|
+
function assertIntegrityMetadataMatches(tarball, integrity) {
|
|
4
|
+
try {
|
|
5
|
+
ssri.checkData(tarball, integrity, { strict: true, error: true });
|
|
6
|
+
}
|
|
7
|
+
catch (error) {
|
|
8
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
9
|
+
throw new Error(`Downloaded tarball failed dist.integrity verification: ${message}`, { cause: error });
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
function assertShasumMetadataMatches(tarball, shasum) {
|
|
13
|
+
if (!sha1HexPattern.test(shasum)) {
|
|
14
|
+
throw new Error(`Registry returned invalid dist.shasum "${shasum}"`);
|
|
15
|
+
}
|
|
16
|
+
try {
|
|
17
|
+
ssri.checkData(tarball, ssri.fromHex(shasum, 'sha1'), { error: true });
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
21
|
+
throw new Error(`Downloaded tarball failed dist.shasum verification: ${message}`, { cause: error });
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
export function assertTarballIntegrity(tarball, tarballIntegrity) {
|
|
25
|
+
if (tarballIntegrity.integrity !== undefined) {
|
|
26
|
+
assertIntegrityMetadataMatches(tarball, tarballIntegrity.integrity);
|
|
27
|
+
}
|
|
28
|
+
if (tarballIntegrity.shasum !== undefined) {
|
|
29
|
+
assertShasumMetadataMatches(tarball, tarballIntegrity.shasum);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=tarball-integrity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tarball-integrity.js","sourceRoot":"","sources":["../../../../../source/bundle-emitter/registry/tarball-integrity.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAOxB,MAAM,cAAc,GAAG,iBAAiB,CAAC;AAEzC,SAAS,8BAA8B,CAAC,OAAe,EAAE,SAAiB;IACtE,IAAI,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,0DAA0D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3G,CAAC;AACL,CAAC;AAED,SAAS,2BAA2B,CAAC,OAAe,EAAE,MAAc;IAChE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,GAAG,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,uDAAuD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACxG,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAe,EAAE,gBAAkC;IACtF,IAAI,gBAAgB,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAC3C,8BAA8B,CAAC,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,gBAAgB,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACxC,2BAA2B,CAAC,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;AACL,CAAC"}
|
|
@@ -35,15 +35,20 @@ function collectResolutionPackageFiles(packageName, publishedPackages) {
|
|
|
35
35
|
};
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
|
-
function checkedDeclarationPaths(
|
|
38
|
+
function checkedDeclarationPaths(input) {
|
|
39
|
+
const { project, declarationPaths, rootPaths, declarationMode } = input;
|
|
40
|
+
const { publicEntrypointPaths } = project;
|
|
39
41
|
if (declarationMode === 'all') {
|
|
40
|
-
return declarationPaths;
|
|
42
|
+
return new Set([...declarationPaths, ...publicEntrypointPaths]);
|
|
41
43
|
}
|
|
42
|
-
return
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
return new Set([
|
|
45
|
+
...reachableDeclarationPaths({
|
|
46
|
+
declarationPaths,
|
|
47
|
+
rootPaths,
|
|
48
|
+
moduleSpecifiersOf: project.moduleSpecifiersOf
|
|
49
|
+
}),
|
|
50
|
+
...publicEntrypointPaths
|
|
51
|
+
]);
|
|
47
52
|
}
|
|
48
53
|
function formatDeclarationDiagnostic(packageName, modeLabel, diagnostic) {
|
|
49
54
|
return (`Package "${packageName}" failed TypeScript integrity in ${modeLabel}: ` +
|
|
@@ -57,7 +62,12 @@ export function createDeclarationIntegritySummarizer(dependencies) {
|
|
|
57
62
|
const rootPaths = declarationRootsFromManifest(publishedPackage.manifestFile.content);
|
|
58
63
|
const resolutionPackageFiles = collectResolutionPackageFiles(packageName, resolutionPackages);
|
|
59
64
|
return createDeclarationProjects(packageName, packageFiles, resolutionPackageFiles).flatMap(function (project) {
|
|
60
|
-
const checkedPaths = checkedDeclarationPaths(
|
|
65
|
+
const checkedPaths = checkedDeclarationPaths({
|
|
66
|
+
project,
|
|
67
|
+
declarationPaths,
|
|
68
|
+
rootPaths,
|
|
69
|
+
declarationMode
|
|
70
|
+
});
|
|
61
71
|
return project
|
|
62
72
|
.listDiagnostics()
|
|
63
73
|
.filter(function (diagnostic) {
|
|
@@ -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;AAQvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,4BAA4B,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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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { ModuleKind, ModuleResolutionKind, ScriptKind, ScriptTarget, ts as typescript } from 'ts-morph';
|
|
3
|
+
import { isPackageManifestRecord, parsePackageManifest } from "./type-script-declaration-roots.js";
|
|
3
4
|
function declarationCompilerModes() {
|
|
4
5
|
return [
|
|
5
6
|
{
|
|
@@ -14,6 +15,78 @@ function declarationCompilerModes() {
|
|
|
14
15
|
}
|
|
15
16
|
];
|
|
16
17
|
}
|
|
18
|
+
function isPackageExportKey(key) {
|
|
19
|
+
return key === '.' || key.startsWith('./');
|
|
20
|
+
}
|
|
21
|
+
function hasConditionalRootExports(exportKeys) {
|
|
22
|
+
return exportKeys.length > 0 && !exportKeys.some(isPackageExportKey);
|
|
23
|
+
}
|
|
24
|
+
function publicExportSubpaths(exportsField) {
|
|
25
|
+
if (typeof exportsField === 'string' || Array.isArray(exportsField)) {
|
|
26
|
+
return ['.'];
|
|
27
|
+
}
|
|
28
|
+
if (!isPackageManifestRecord(exportsField)) {
|
|
29
|
+
return [];
|
|
30
|
+
}
|
|
31
|
+
const exportKeys = Object.keys(exportsField);
|
|
32
|
+
const subpaths = exportKeys.filter(function (key) {
|
|
33
|
+
return isPackageExportKey(key) && !key.includes('*') && exportsField[key] !== null;
|
|
34
|
+
});
|
|
35
|
+
if (subpaths.length > 0) {
|
|
36
|
+
return subpaths;
|
|
37
|
+
}
|
|
38
|
+
return hasConditionalRootExports(exportKeys) ? ['.'] : [];
|
|
39
|
+
}
|
|
40
|
+
function publicEntrypointSpecifiers(packageName, manifestContent) {
|
|
41
|
+
const manifest = parsePackageManifest(manifestContent);
|
|
42
|
+
const exportSubpaths = publicExportSubpaths(manifest.exports);
|
|
43
|
+
if (exportSubpaths.length > 0) {
|
|
44
|
+
return exportSubpaths.map(function (subpath) {
|
|
45
|
+
return subpath === '.' ? packageName : `${packageName}/${subpath.slice('./'.length)}`;
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
return manifest.types !== undefined || manifest.typings !== undefined || manifest.main !== undefined
|
|
49
|
+
? [packageName]
|
|
50
|
+
: [];
|
|
51
|
+
}
|
|
52
|
+
function importSource(specifiers) {
|
|
53
|
+
return Array
|
|
54
|
+
.from(new Set(specifiers), function (specifier) {
|
|
55
|
+
return `import ${JSON.stringify(specifier)};`;
|
|
56
|
+
})
|
|
57
|
+
.join('\n');
|
|
58
|
+
}
|
|
59
|
+
function publicEntrypointSource(packageName, packageFiles) {
|
|
60
|
+
const manifestFile = packageFiles.find(function (packageFile) {
|
|
61
|
+
return packageFile.filePath === 'package.json';
|
|
62
|
+
});
|
|
63
|
+
const specifiers = manifestFile === undefined ? [] : publicEntrypointSpecifiers(packageName, manifestFile.content);
|
|
64
|
+
return importSource(specifiers);
|
|
65
|
+
}
|
|
66
|
+
function isJavaScriptPath(filePath) {
|
|
67
|
+
return /\.(?:cjs|js|mjs)$/u.test(filePath);
|
|
68
|
+
}
|
|
69
|
+
function isPackageImportSpecifier(specifier) {
|
|
70
|
+
return !specifier.startsWith('./') &&
|
|
71
|
+
!specifier.startsWith('../') &&
|
|
72
|
+
!specifier.startsWith('/') &&
|
|
73
|
+
!specifier.startsWith('#') &&
|
|
74
|
+
!specifier.startsWith('node:');
|
|
75
|
+
}
|
|
76
|
+
function javaScriptPackageImportSource(packageFiles) {
|
|
77
|
+
const specifiers = packageFiles
|
|
78
|
+
.filter(function (packageFile) {
|
|
79
|
+
return isJavaScriptPath(packageFile.filePath);
|
|
80
|
+
})
|
|
81
|
+
.flatMap(function (packageFile) {
|
|
82
|
+
return typescript.preProcessFile(packageFile.content).importedFiles;
|
|
83
|
+
})
|
|
84
|
+
.map(function (importedFile) {
|
|
85
|
+
return importedFile.fileName;
|
|
86
|
+
})
|
|
87
|
+
.filter(isPackageImportSpecifier);
|
|
88
|
+
return importSource(specifiers);
|
|
89
|
+
}
|
|
17
90
|
function moduleSpecifiersIn(sourceFile) {
|
|
18
91
|
return [
|
|
19
92
|
...sourceFile.getImportDeclarations(),
|
|
@@ -51,9 +124,10 @@ function toDeclarationDiagnostic(packageFolder, diagnostic) {
|
|
|
51
124
|
function isDeclarationDiagnostic(diagnostic) {
|
|
52
125
|
return diagnostic !== undefined;
|
|
53
126
|
}
|
|
54
|
-
function createModeProject(project, packageFolder, modeLabel) {
|
|
127
|
+
function createModeProject(project, packageFolder, modeLabel, publicEntrypointPaths) {
|
|
55
128
|
return {
|
|
56
129
|
modeLabel,
|
|
130
|
+
publicEntrypointPaths,
|
|
57
131
|
moduleSpecifiersOf(declarationPath) {
|
|
58
132
|
return moduleSpecifiersIn(project.getSourceFileOrThrow(declarationProjectPackageFilePath(packageFolder, declarationPath)));
|
|
59
133
|
},
|
|
@@ -84,9 +158,8 @@ export function createDeclarationProjectFactory(dependencies) {
|
|
|
84
158
|
}
|
|
85
159
|
}
|
|
86
160
|
}
|
|
87
|
-
function
|
|
88
|
-
|
|
89
|
-
const project = new Project({
|
|
161
|
+
function createCompilerProject(compilerMode) {
|
|
162
|
+
return new Project({
|
|
90
163
|
fileSystem: fileSystemHost,
|
|
91
164
|
skipAddingFilesFromTsConfig: true,
|
|
92
165
|
compilerOptions: {
|
|
@@ -99,12 +172,27 @@ export function createDeclarationProjectFactory(dependencies) {
|
|
|
99
172
|
target: ScriptTarget.ESNext
|
|
100
173
|
}
|
|
101
174
|
});
|
|
175
|
+
}
|
|
176
|
+
function addGeneratedFile(project, packageFolder, filePath, source) {
|
|
177
|
+
if (source.length === 0) {
|
|
178
|
+
return [];
|
|
179
|
+
}
|
|
180
|
+
project.createSourceFile(declarationProjectPackageFilePath(packageFolder, filePath), `${source}\n`);
|
|
181
|
+
return [filePath];
|
|
182
|
+
}
|
|
183
|
+
function createProjectForMode(packageName, packageFiles, resolutionPackages, compilerMode) {
|
|
184
|
+
const packageFolder = declarationProjectPackageFolder(packageResolutionBaseFolder, packageName);
|
|
185
|
+
const project = createCompilerProject(compilerMode);
|
|
102
186
|
const createdFilePaths = new Set();
|
|
103
187
|
addPackageFiles(project, packageName, packageFiles, createdFilePaths);
|
|
188
|
+
const publicEntrypointPaths = [
|
|
189
|
+
...addGeneratedFile(project, packageFolder, '.packtory-consumer-entrypoints.ts', publicEntrypointSource(packageName, packageFiles)),
|
|
190
|
+
...addGeneratedFile(project, packageFolder, '.packtory-javascript-imports.ts', javaScriptPackageImportSource(packageFiles))
|
|
191
|
+
];
|
|
104
192
|
for (const resolutionPackage of resolutionPackages) {
|
|
105
193
|
addPackageFiles(project, resolutionPackage.packageName, resolutionPackage.packageFiles, createdFilePaths);
|
|
106
194
|
}
|
|
107
|
-
return createModeProject(project, packageFolder, compilerMode.label);
|
|
195
|
+
return createModeProject(project, packageFolder, compilerMode.label, publicEntrypointPaths);
|
|
108
196
|
}
|
|
109
197
|
return function createDeclarationProjects(packageName, packageFiles, resolutionPackages) {
|
|
110
198
|
return declarationCompilerModes().map(function (compilerMode) {
|
|
@@ -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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"}
|
|
@@ -1,11 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
function isRecord(value) {
|
|
1
|
+
export function isPackageManifestRecord(value) {
|
|
3
2
|
return Object.prototype.toString.call(value) === '[object Object]';
|
|
4
3
|
}
|
|
4
|
+
export function parsePackageManifest(manifestContent) {
|
|
5
|
+
const manifest = JSON.parse(manifestContent);
|
|
6
|
+
if (!isPackageManifestRecord(manifest)) {
|
|
7
|
+
return {};
|
|
8
|
+
}
|
|
9
|
+
return manifest;
|
|
10
|
+
}
|
|
5
11
|
function packagePathsIn(value) {
|
|
6
12
|
if (typeof value === 'string') {
|
|
7
|
-
return value.startsWith(
|
|
8
|
-
? [value.slice(
|
|
13
|
+
return value.startsWith('./')
|
|
14
|
+
? [value.slice('./'.length)]
|
|
9
15
|
: [value];
|
|
10
16
|
}
|
|
11
17
|
if (typeof value === 'object' && value !== null) {
|
|
@@ -13,15 +19,8 @@ function packagePathsIn(value) {
|
|
|
13
19
|
}
|
|
14
20
|
return [];
|
|
15
21
|
}
|
|
16
|
-
function parseManifestContent(manifestContent) {
|
|
17
|
-
const manifest = JSON.parse(manifestContent);
|
|
18
|
-
if (!isRecord(manifest)) {
|
|
19
|
-
return {};
|
|
20
|
-
}
|
|
21
|
-
return manifest;
|
|
22
|
-
}
|
|
23
22
|
export function declarationRootsFromManifest(manifestContent) {
|
|
24
|
-
const manifest =
|
|
23
|
+
const manifest = parsePackageManifest(manifestContent);
|
|
25
24
|
return new Set([
|
|
26
25
|
...packagePathsIn(manifest.exports),
|
|
27
26
|
...packagePathsIn(manifest.types),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-script-declaration-roots.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-roots.ts"],"names":[],"mappings":"AAAA,MAAM,uBAAuB,
|
|
1
|
+
{"version":3,"file":"type-script-declaration-roots.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-declaration-roots.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,uBAAuB,CAAC,KAAc;IAClD,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,iBAAiB,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,eAAuB;IACxD,MAAM,QAAQ,GAAY,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACtD,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrC,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;YACzB,CAAC,CAAC,CAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAE;YAC9B,CAAC,CAAC,CAAE,KAAK,CAAE,CAAC;IACpB,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC9C,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,EAAE,CAAC;AACd,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,eAAuB;IAChE,MAAM,QAAQ,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACvD,OAAO,IAAI,GAAG,CAAC;QACX,GAAG,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;QACnC,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC;QACjC,GAAG,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;KACtC,CAAC,CAAC;AACP,CAAC"}
|
package/linker/linker.js
CHANGED
|
@@ -25,7 +25,7 @@ function declarationCompanionRoots(contents, bundleDependencies) {
|
|
|
25
25
|
return [];
|
|
26
26
|
}
|
|
27
27
|
return declarationCompanionCandidates(content.fileDescription.sourceFilePath).filter(function (candidate) {
|
|
28
|
-
return sourceFilePaths.has(candidate);
|
|
28
|
+
return sourceFilePaths.has(candidate) && !isSubstitutedBundleSourcePath(candidate, bundleDependencies);
|
|
29
29
|
});
|
|
30
30
|
});
|
|
31
31
|
}
|
|
@@ -35,11 +35,12 @@ function flattenRootFilePaths(bundle, bundleDependencies) {
|
|
|
35
35
|
export function createBundleLinker() {
|
|
36
36
|
return {
|
|
37
37
|
async linkBundle(options) {
|
|
38
|
-
const { bundle, bundleDependencies } = options;
|
|
38
|
+
const { bundle, bundleDependencies, bundlePeerDependencies } = options;
|
|
39
|
+
const substitutionSources = [...bundleDependencies, ...bundlePeerDependencies];
|
|
39
40
|
const resourceGraph = createGraphFromResolvedBundle(bundle);
|
|
40
|
-
const substitutedGraph = substituteDependencies(resourceGraph, bundleDependencies);
|
|
41
|
+
const substitutedGraph = substituteDependencies(resourceGraph, bundleDependencies, bundlePeerDependencies);
|
|
41
42
|
return {
|
|
42
|
-
...substitutedGraph.flatten(flattenRootFilePaths(bundle,
|
|
43
|
+
...substitutedGraph.flatten(flattenRootFilePaths(bundle, substitutionSources)),
|
|
43
44
|
name: bundle.name,
|
|
44
45
|
exportPackageJson: bundle.exportPackageJson,
|
|
45
46
|
roots: bundle.roots,
|
package/linker/linker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linker.js","sourceRoot":"","sources":["../../../../source/linker/linker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAuB,MAAM,yCAAyC,CAAC;AACtG,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"linker.js","sourceRoot":"","sources":["../../../../source/linker/linker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAuB,MAAM,yCAAyC,CAAC;AACtG,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAYzD,SAAS,YAAY,CAAC,KAA8B;IAChD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI;QAC9C,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAE,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAE,CAAC;QAC3E,CAAC;QACD,OAAO,CAAE,IAAI,CAAC,EAAE,CAAC,cAAc,CAAE,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,6BAA6B,CAClC,cAAsB,EACtB,kBAAuD;IAEvD,OAAO,kBAAkB,CAAC,IAAI,CAAC,UAAU,gBAAgB;QACrD,OAAO,cAAc,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,yBAAyB,CAC9B,QAAoC,EACpC,kBAAuD;IAEvD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,OAAO;QAC1D,OAAO,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC;IAClD,CAAC,CAAC,CAAC,CAAC;IACJ,OAAO,QAAQ,CAAC,OAAO,CAAC,UAAU,OAAO;QACrC,IAAI,6BAA6B,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE,kBAAkB,CAAC,EAAE,CAAC;YAC5F,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,8BAA8B,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,UAAU,SAAS;YACpG,OAAO,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,6BAA6B,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QAC3G,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,oBAAoB,CACzB,MAAsB,EACtB,kBAAuD;IAEvD,OAAO,CAAE,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,yBAAyB,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAE,CAAC;AAChH,CAAC;AAED,MAAM,UAAU,kBAAkB;IAC9B,OAAO;QACH,KAAK,CAAC,UAAU,CAAC,OAAO;YACpB,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC;YACvE,MAAM,mBAAmB,GAAG,CAAE,GAAG,kBAAkB,EAAE,GAAG,sBAAsB,CAAE,CAAC;YACjF,MAAM,aAAa,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,aAAa,EAAE,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;YAE3G,OAAO;gBACH,GAAG,gBAAgB,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;gBAC9E,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;gBAC3C,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;aAC1B,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -1,41 +1,158 @@
|
|
|
1
|
-
import
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import { isDefined } from 'remeda';
|
|
3
|
+
import { ts as typescript } from 'ts-morph';
|
|
4
|
+
import { declarationCompanionCandidates } from "../common/declaration-companion-paths.js";
|
|
5
|
+
import { rootSourceFilePaths } from "../package-surface/package-surface-index.js";
|
|
2
6
|
import { getPublicModuleSpecifierForSourcePath } from "../package-surface/public-specifiers.js";
|
|
7
|
+
import { getRoot } from "../package-surface/root-registry.js";
|
|
8
|
+
import { toPackageSpecifier } from "../package-surface/specifier-syntax.js";
|
|
3
9
|
export function ownsSourcePath(file, bundle) {
|
|
4
10
|
return bundle.contents.some(function (content) {
|
|
5
11
|
return content.fileDescription.sourceFilePath === file;
|
|
6
12
|
});
|
|
7
13
|
}
|
|
8
|
-
function
|
|
9
|
-
|
|
10
|
-
|
|
14
|
+
function needsImportReplacement(file) {
|
|
15
|
+
return !file.endsWith('.map');
|
|
16
|
+
}
|
|
17
|
+
function createContentLookup(bundle) {
|
|
18
|
+
const contentBySourcePath = new Map();
|
|
19
|
+
const sourcePathByTargetPath = new Map();
|
|
20
|
+
for (const content of bundle.contents) {
|
|
21
|
+
contentBySourcePath.set(content.fileDescription.sourceFilePath, content);
|
|
22
|
+
sourcePathByTargetPath.set(content.fileDescription.targetFilePath, content.fileDescription.sourceFilePath);
|
|
23
|
+
}
|
|
24
|
+
return { contentBySourcePath, sourcePathByTargetPath };
|
|
25
|
+
}
|
|
26
|
+
function exportDeclarationModuleSpecifier(statement) {
|
|
27
|
+
if (!typescript.isExportDeclaration(statement)) {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
return statement;
|
|
31
|
+
}
|
|
32
|
+
function moduleSpecifierText(statement) {
|
|
33
|
+
const { moduleSpecifier } = statement;
|
|
34
|
+
if (moduleSpecifier === undefined) {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
return typescript.isStringLiteral(moduleSpecifier) ? moduleSpecifier.text : undefined;
|
|
38
|
+
}
|
|
39
|
+
function exportedModuleSpecifiers(content) {
|
|
40
|
+
const sourceFile = typescript.createSourceFile(content, content, typescript.ScriptTarget.Latest);
|
|
41
|
+
return sourceFile
|
|
42
|
+
.statements
|
|
43
|
+
.map(exportDeclarationModuleSpecifier)
|
|
44
|
+
.filter(isDefined)
|
|
45
|
+
.map(moduleSpecifierText)
|
|
46
|
+
.filter(isDefined);
|
|
47
|
+
}
|
|
48
|
+
function exportedTargetPath(currentTargetFilePath, specifier) {
|
|
49
|
+
if (!specifier.startsWith('.')) {
|
|
50
|
+
return undefined;
|
|
51
|
+
}
|
|
52
|
+
return path.posix.normalize(path.posix.join(path.posix.dirname(currentTargetFilePath), specifier));
|
|
53
|
+
}
|
|
54
|
+
function enqueueExportedSourceFilePaths(lookup, pending, currentTargetFilePath, specifier) {
|
|
55
|
+
const targetPath = exportedTargetPath(currentTargetFilePath, specifier);
|
|
56
|
+
if (targetPath === undefined) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const sourcePaths = [targetPath, ...declarationCompanionCandidates(targetPath)]
|
|
60
|
+
.map(function (candidate) {
|
|
61
|
+
return lookup.sourcePathByTargetPath.get(candidate);
|
|
62
|
+
})
|
|
63
|
+
.filter(isDefined);
|
|
64
|
+
for (const sourcePath of sourcePaths) {
|
|
65
|
+
pending.push(sourcePath);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
function publicExportedSourceFilePaths(initialSourceFilePaths, lookup) {
|
|
69
|
+
const pending = Array.from(initialSourceFilePaths);
|
|
70
|
+
const visited = new Set();
|
|
71
|
+
function visitSourceFilePath(sourceFilePath) {
|
|
72
|
+
const content = lookup.contentBySourcePath.get(sourceFilePath);
|
|
73
|
+
if (content !== undefined && !visited.has(sourceFilePath)) {
|
|
74
|
+
visited.add(sourceFilePath);
|
|
75
|
+
for (const specifier of exportedModuleSpecifiers(content.fileDescription.content)) {
|
|
76
|
+
enqueueExportedSourceFilePaths(lookup, pending, content.fileDescription.targetFilePath, specifier);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
for (let next = pending.pop(); next !== undefined; next = pending.pop()) {
|
|
81
|
+
visitSourceFilePath(next);
|
|
82
|
+
}
|
|
83
|
+
return visited;
|
|
84
|
+
}
|
|
85
|
+
function recordShortestSpecifier(specifiersBySourcePath, sourceFilePaths, specifier) {
|
|
86
|
+
for (const sourceFilePath of sourceFilePaths) {
|
|
87
|
+
const current = specifiersBySourcePath.get(sourceFilePath);
|
|
88
|
+
if (current === undefined || specifier.length < current.length) {
|
|
89
|
+
specifiersBySourcePath.set(sourceFilePath, specifier);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
function getExplicitPublicModuleSpecifierForSourcePath(bundle, surface, sourceFilePath) {
|
|
94
|
+
const lookup = createContentLookup(bundle);
|
|
95
|
+
const specifiersBySourcePath = new Map();
|
|
96
|
+
const moduleEntries = surface.packageInterface.modules ?? [];
|
|
97
|
+
for (const moduleEntry of moduleEntries) {
|
|
98
|
+
const root = getRoot(bundle, moduleEntry.root);
|
|
99
|
+
const rootPaths = rootSourceFilePaths(root);
|
|
100
|
+
recordShortestSpecifier(specifiersBySourcePath, publicExportedSourceFilePaths(rootPaths, lookup), toPackageSpecifier(bundle.name, moduleEntry.export));
|
|
101
|
+
}
|
|
102
|
+
return specifiersBySourcePath.get(sourceFilePath);
|
|
103
|
+
}
|
|
104
|
+
function getImplicitPublicModuleSpecifierForSourcePath(bundle, surface, sourceFilePath) {
|
|
105
|
+
const lookup = createContentLookup(bundle);
|
|
106
|
+
const specifiersBySourcePath = new Map();
|
|
107
|
+
const defaultRoot = getRoot(bundle, surface.defaultModuleRoot);
|
|
108
|
+
recordShortestSpecifier(specifiersBySourcePath, publicExportedSourceFilePaths(rootSourceFilePaths(defaultRoot), lookup), bundle.name);
|
|
109
|
+
for (const root of Object.values(bundle.roots)) {
|
|
110
|
+
recordShortestSpecifier(specifiersBySourcePath, publicExportedSourceFilePaths(rootSourceFilePaths(root), lookup), toPackageSpecifier(bundle.name, `./${root.js.targetFilePath}`));
|
|
111
|
+
}
|
|
112
|
+
return specifiersBySourcePath.get(sourceFilePath) ?? getPublicModuleSpecifierForSourcePath(bundle, sourceFilePath);
|
|
113
|
+
}
|
|
114
|
+
function getExistingPublicModuleSpecifierForSourcePath(bundle, sourceFilePath) {
|
|
115
|
+
const { surface } = bundle;
|
|
116
|
+
if (surface.mode === 'implicit') {
|
|
117
|
+
return getImplicitPublicModuleSpecifierForSourcePath(bundle, surface, sourceFilePath);
|
|
118
|
+
}
|
|
119
|
+
return getExplicitPublicModuleSpecifierForSourcePath(bundle, surface, sourceFilePath);
|
|
120
|
+
}
|
|
121
|
+
function findReplacementInBundles(file, bundles, getTargetPath) {
|
|
122
|
+
for (const bundle of bundles) {
|
|
123
|
+
const targetPath = getTargetPath(bundle, file);
|
|
11
124
|
if (targetPath !== undefined) {
|
|
12
|
-
return
|
|
125
|
+
return {
|
|
13
126
|
targetPath,
|
|
14
127
|
packageName: bundle.name
|
|
15
|
-
}
|
|
128
|
+
};
|
|
16
129
|
}
|
|
17
|
-
if (ownsSourcePath(file, bundle)) {
|
|
130
|
+
if (needsImportReplacement(file) && ownsSourcePath(file, bundle)) {
|
|
18
131
|
throw new Error(`Package "${bundle.name}" does not expose "${file}" for cross-package substitution`);
|
|
19
132
|
}
|
|
20
133
|
}
|
|
21
|
-
return
|
|
134
|
+
return undefined;
|
|
22
135
|
}
|
|
23
|
-
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
136
|
+
function findReplacement(file, bundleDependencies, bundlePeerDependencies) {
|
|
137
|
+
const dependencyReplacement = findReplacementInBundles(file, bundleDependencies, getPublicModuleSpecifierForSourcePath);
|
|
138
|
+
if (dependencyReplacement !== undefined) {
|
|
139
|
+
return dependencyReplacement;
|
|
140
|
+
}
|
|
141
|
+
return findReplacementInBundles(file, bundlePeerDependencies, getExistingPublicModuleSpecifierForSourcePath);
|
|
142
|
+
}
|
|
143
|
+
export function findAllPathReplacements(files, bundleDependencies, bundlePeerDependencies) {
|
|
144
|
+
const importPathReplacements = new Map();
|
|
145
|
+
const matchedBundleDependencies = [];
|
|
146
|
+
for (const file of files) {
|
|
147
|
+
const replacement = findReplacement(file, bundleDependencies, bundlePeerDependencies);
|
|
148
|
+
if (replacement !== undefined) {
|
|
149
|
+
importPathReplacements.set(file, replacement.targetPath);
|
|
150
|
+
matchedBundleDependencies.push(replacement.packageName);
|
|
28
151
|
}
|
|
29
|
-
|
|
30
|
-
return [{ file, targetPath, packageName }];
|
|
31
|
-
});
|
|
152
|
+
}
|
|
32
153
|
return {
|
|
33
|
-
importPathReplacements
|
|
34
|
-
|
|
35
|
-
})),
|
|
36
|
-
bundleDependencies: matched.map(function (entry) {
|
|
37
|
-
return entry.packageName;
|
|
38
|
-
})
|
|
154
|
+
importPathReplacements,
|
|
155
|
+
bundleDependencies: matchedBundleDependencies
|
|
39
156
|
};
|
|
40
157
|
}
|
|
41
158
|
//# sourceMappingURL=replacement-lookup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replacement-lookup.js","sourceRoot":"","sources":["../../../../source/linker/replacement-lookup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"replacement-lookup.js","sourceRoot":"","sources":["../../../../source/linker/replacement-lookup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,39 +1,52 @@
|
|
|
1
|
-
import { findAllPathReplacements } from "./replacement-lookup.js";
|
|
1
|
+
import { findAllPathReplacements, ownsSourcePath } from "./replacement-lookup.js";
|
|
2
2
|
import { replaceImportPaths } from "./source-modifier/import-paths.js";
|
|
3
3
|
import { createSubstitutedResourceGraph } from "./substituted-resource-graph.js";
|
|
4
|
-
|
|
4
|
+
function isSubstitutionSourcePath(sourceFilePath, substitutionSources) {
|
|
5
|
+
return substitutionSources.some(function (bundle) {
|
|
6
|
+
return ownsSourcePath(sourceFilePath, bundle);
|
|
7
|
+
});
|
|
8
|
+
}
|
|
9
|
+
function recordUnreplacedConnections(outstandingConnections, fromNodeId, directDependencies, replacedPaths) {
|
|
10
|
+
for (const file of directDependencies) {
|
|
11
|
+
if (!replacedPaths.has(file)) {
|
|
12
|
+
outstandingConnections.push({ from: fromNodeId, to: file });
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
function contentWithReplacements(node, replacements) {
|
|
17
|
+
return replaceImportPaths(node.data.project, node.data.fileDescription.sourceFilePath, node.data.fileDescription.content, replacements.importPathReplacements);
|
|
18
|
+
}
|
|
19
|
+
function addNodeWithReplacements(substitutedGraph, node, replacements) {
|
|
20
|
+
const isSubstituted = replacements.importPathReplacements.size > 0;
|
|
21
|
+
const content = contentWithReplacements(node, replacements);
|
|
22
|
+
substitutedGraph.add(node.id, {
|
|
23
|
+
fileDescription: { ...node.data.fileDescription, content },
|
|
24
|
+
externalDependencies: node.data.externalDependencies,
|
|
25
|
+
bundleDependencies: isSubstituted ? replacements.bundleDependencies : [],
|
|
26
|
+
isSubstituted,
|
|
27
|
+
isExplicitlyIncluded: node.data.isExplicitlyIncluded,
|
|
28
|
+
...node.data.isGeneratedManifest ? { isGeneratedManifest: true } : {}
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
export function substituteDependencies(resourceGraph, bundleDependencies, bundlePeerDependencies) {
|
|
5
32
|
const substitutedGraph = createSubstitutedResourceGraph();
|
|
6
33
|
const outstandingConnections = [];
|
|
7
34
|
const visited = new Set();
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
if (!replacedPaths.has(file)) {
|
|
11
|
-
outstandingConnections.push({ from: fromNodeId, to: file });
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
function contentWithReplacements(node, replacements) {
|
|
16
|
-
return replaceImportPaths(node.data.project, node.data.fileDescription.sourceFilePath, node.data.fileDescription.content, replacements.importPathReplacements);
|
|
17
|
-
}
|
|
18
|
-
resourceGraph.traverse(function (node) {
|
|
35
|
+
const substitutionSources = [...bundleDependencies, ...bundlePeerDependencies];
|
|
36
|
+
function substituteNode(node) {
|
|
19
37
|
if (visited.has(node.id)) {
|
|
20
38
|
return;
|
|
21
39
|
}
|
|
22
40
|
visited.add(node.id);
|
|
41
|
+
if (isSubstitutionSourcePath(node.id, substitutionSources)) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
23
44
|
const directDependencies = Array.from(node.adjacentNodeIds);
|
|
24
|
-
const replacements = findAllPathReplacements(directDependencies, bundleDependencies);
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
fileDescription: { ...node.data.fileDescription, content },
|
|
30
|
-
externalDependencies: node.data.externalDependencies,
|
|
31
|
-
bundleDependencies: isSubstituted ? replacements.bundleDependencies : [],
|
|
32
|
-
isSubstituted,
|
|
33
|
-
isExplicitlyIncluded: node.data.isExplicitlyIncluded,
|
|
34
|
-
...node.data.isGeneratedManifest ? { isGeneratedManifest: true } : {}
|
|
35
|
-
});
|
|
36
|
-
});
|
|
45
|
+
const replacements = findAllPathReplacements(directDependencies, bundleDependencies, bundlePeerDependencies);
|
|
46
|
+
recordUnreplacedConnections(outstandingConnections, node.id, directDependencies, replacements.importPathReplacements);
|
|
47
|
+
addNodeWithReplacements(substitutedGraph, node, replacements);
|
|
48
|
+
}
|
|
49
|
+
resourceGraph.traverse(substituteNode);
|
|
37
50
|
for (const connection of outstandingConnections) {
|
|
38
51
|
substitutedGraph.connect(connection.from, connection.to);
|
|
39
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAqB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-surface-index.js","sourceRoot":"","sources":["../../../../source/package-surface/package-surface-index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,8BAA8B,EACjC,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAsC3D,SAAS,8BAA8B;IACnC,MAAM,yBAAyB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5D,MAAM,yBAAyB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE5D,SAAS,yBAAyB,CAAC,cAAsB,EAAE,kBAA0B;QACjF,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACvE,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACjC,yBAAyB,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IAED,SAAS,iCAAiC,CAAC,cAAsB,EAAE,kBAA0B;QACzF,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACvE,IAAI,gBAAgB,KAAK,SAAS,IAAI,kBAAkB,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC;YACxF,yBAAyB,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IAED,SAAS,0BAA0B,CAAC,KAA4B;QAC5D,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC1E,IAAI,CAAC,kBAAkB,IAAI,KAAK,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;YAClE,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC/E,CAAC;IACL,CAAC;IAED,OAAO;QACH,KAAK;YACD,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;QACpE,CAAC;QACD,iCAAiC,CAAC,KAAK;YACnC,KAAK,MAAM,cAAc,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;gBACjD,yBAAyB,CAAC,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YAC/D,CAAC;YACD,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QACD,oCAAoC,CAAC,KAAK;YACtC,KAAK,MAAM,cAAc,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;gBACjD,iCAAiC,CAAC,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YACvE,CAAC;YACD,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;KACJ,CAAC;AACN,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"package-surface-index.js","sourceRoot":"","sources":["../../../../source/package-surface/package-surface-index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -24,6 +24,7 @@
|
|
|
24
24
|
"remeda": "2.39.0",
|
|
25
25
|
"semver": "7.8.5",
|
|
26
26
|
"spdx-expression-parse": "5.0.0",
|
|
27
|
+
"ssri": "14.0.0",
|
|
27
28
|
"tar-stream": "3.2.0",
|
|
28
29
|
"true-myth": "9.4.0",
|
|
29
30
|
"ts-morph": "28.0.0",
|
|
@@ -34,7 +35,7 @@
|
|
|
34
35
|
},
|
|
35
36
|
"description": "Enable customized npm package bundling and publishing using packtory’s versatile API.",
|
|
36
37
|
"engines": {
|
|
37
|
-
"node": "^24 ||
|
|
38
|
+
"node": "^24.15.0 || >=26.0.0"
|
|
38
39
|
},
|
|
39
40
|
"exports": {
|
|
40
41
|
".": {
|
|
@@ -128,5 +129,5 @@
|
|
|
128
129
|
"./tar/tarball-builder.js"
|
|
129
130
|
],
|
|
130
131
|
"type": "module",
|
|
131
|
-
"version": "0.0.
|
|
132
|
+
"version": "0.0.72"
|
|
132
133
|
}
|
|
@@ -37,7 +37,8 @@ export function createResolveAndBuildOperations(dependencies) {
|
|
|
37
37
|
dependencies.progressBroadcaster.emit('linking', { packageName: options.name });
|
|
38
38
|
const linkedBundle = await dependencies.linker.linkBundle({
|
|
39
39
|
bundle: resolvedBundle,
|
|
40
|
-
bundleDependencies:
|
|
40
|
+
bundleDependencies: options.bundleDependencies,
|
|
41
|
+
bundlePeerDependencies: options.bundlePeerDependencies
|
|
41
42
|
});
|
|
42
43
|
maybeEmitLinkingCompleted(dependencies, options.name, linkedBundle);
|
|
43
44
|
return linkedBundle;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-processor-build.js","sourceRoot":"","sources":["../../../../source/packtory/package-processor-build.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAE1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAA4B,MAAM,8CAA8C,CAAC;AAe5G,SAAS,wBAAwB,CAAC,eAAqC;IACnE,IAAI,eAAe,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAC3B,YAAsE,EACtE,WAAmB,EACnB,QAA6B;IAE7B,IAAI,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC;QACnE,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7G,CAAC;AACL,CAAC;AAED,SAAS,yBAAyB,CAC9B,YAAsE,EACtE,WAAmB,EACnB,MAAoB;IAEpB,IAAI,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtE,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,kBAAkB,EAAE;YACtD,WAAW;YACX,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC;SAC1C,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAED,KAAK,UAAU,UAAU,CACrB,YAAqE,EACrE,YAA0B,EAC1B,sBAA+B,EAC/B,mBAA4D;IAE5D,MAAM,CAAE,cAAc,CAAE,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC;QACvE,EAAE,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,mBAAmB,EAAE;KACxE,CAAC,CAAC;IACH,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,gDAAgD,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,cAAc,CAAC;AAC1B,CAAC;AAOD,MAAM,UAAU,+BAA+B,CAAC,YAAyC;IACrF,KAAK,UAAU,cAAc,CAAC,OAA8B;QACxD,wBAAwB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAClD,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAClF,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5E,sBAAsB,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnE,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAChF,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC;YACtD,MAAM,EAAE,cAAc;YACtB,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"package-processor-build.js","sourceRoot":"","sources":["../../../../source/packtory/package-processor-build.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAE1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAA4B,MAAM,8CAA8C,CAAC;AAe5G,SAAS,wBAAwB,CAAC,eAAqC;IACnE,IAAI,eAAe,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAC3B,YAAsE,EACtE,WAAmB,EACnB,QAA6B;IAE7B,IAAI,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC;QACnE,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7G,CAAC;AACL,CAAC;AAED,SAAS,yBAAyB,CAC9B,YAAsE,EACtE,WAAmB,EACnB,MAAoB;IAEpB,IAAI,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtE,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,kBAAkB,EAAE;YACtD,WAAW;YACX,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC;SAC1C,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAED,KAAK,UAAU,UAAU,CACrB,YAAqE,EACrE,YAA0B,EAC1B,sBAA+B,EAC/B,mBAA4D;IAE5D,MAAM,CAAE,cAAc,CAAE,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC;QACvE,EAAE,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,mBAAmB,EAAE;KACxE,CAAC,CAAC;IACH,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,gDAAgD,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,cAAc,CAAC;AAC1B,CAAC;AAOD,MAAM,UAAU,+BAA+B,CAAC,YAAyC;IACrF,KAAK,UAAU,cAAc,CAAC,OAA8B;QACxD,wBAAwB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAClD,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAClF,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5E,sBAAsB,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnE,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAChF,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC;YACtD,MAAM,EAAE,cAAc;YACtB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;SACzD,CAAC,CAAC;QACH,yBAAyB,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACpE,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,KAAK,UAAU,KAAK,CAAC,OAAqB;QACtC,wBAAwB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAClD,MAAM,EACF,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,IAAI,EACJ,aAAa,EAChB,GAAG,OAAO,CAAC;QACZ,MAAM,uBAAuB,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC;YACtC,IAAI;YACJ,aAAa;YACb,KAAK,EAAE,uBAAuB,CAAC,KAAK;YACpC,OAAO,EAAE,uBAAuB,CAAC,OAAO;YACxC,qBAAqB;YACrB,eAAe;YACf,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,8BAA8B,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACrE,+BAA+B,EAAE,OAAO,CAAC,+BAA+B;YACxE,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;YACtD,kBAAkB;YAClB,sBAAsB;SACzB,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,OAAO,CAAC,mBAAmB,EAAE,OAAO,IAAI,IAAI,CAAC;QAC5E,MAAM,cAAc,GAAG,MAAM,UAAU,CACnC,YAAY,EACZ,YAAY,EACZ,sBAAsB,EACtB,OAAO,CAAC,mBAAmB,CAC9B,CAAC;QACF,OAAO,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC;YAC1C,MAAM,EAAE,cAAc;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;YACtD,+BAA+B,EAAE,OAAO,CAAC,+BAA+B;YACxE,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;SACzD,CAAC,CAAC;IACP,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;AACrC,CAAC"}
|
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.72",
|
|
20
|
+
"bom-ref": "pkg:npm/packtory@0.0.72",
|
|
21
|
+
"purl": "pkg:npm/packtory@0.0.72"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -243,6 +243,19 @@
|
|
|
243
243
|
],
|
|
244
244
|
"purl": "pkg:npm/spdx-expression-parse@5.0.0"
|
|
245
245
|
},
|
|
246
|
+
{
|
|
247
|
+
"type": "library",
|
|
248
|
+
"name": "ssri",
|
|
249
|
+
"version": "14.0.0",
|
|
250
|
+
"bom-ref": "pkg:npm/ssri@14.0.0",
|
|
251
|
+
"scope": "required",
|
|
252
|
+
"licenses": [
|
|
253
|
+
{
|
|
254
|
+
"expression": "ISC"
|
|
255
|
+
}
|
|
256
|
+
],
|
|
257
|
+
"purl": "pkg:npm/ssri@14.0.0"
|
|
258
|
+
},
|
|
246
259
|
{
|
|
247
260
|
"type": "library",
|
|
248
261
|
"name": "tar-stream",
|
|
@@ -379,7 +392,7 @@
|
|
|
379
392
|
"ref": "pkg:npm/npm-registry-fetch@20.0.1"
|
|
380
393
|
},
|
|
381
394
|
{
|
|
382
|
-
"ref": "pkg:npm/packtory@0.0.
|
|
395
|
+
"ref": "pkg:npm/packtory@0.0.72",
|
|
383
396
|
"dependsOn": [
|
|
384
397
|
"pkg:npm/@arethetypeswrong/core@0.18.5",
|
|
385
398
|
"pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",
|
|
@@ -398,6 +411,7 @@
|
|
|
398
411
|
"pkg:npm/remeda@2.39.0",
|
|
399
412
|
"pkg:npm/semver@7.8.5",
|
|
400
413
|
"pkg:npm/spdx-expression-parse@5.0.0",
|
|
414
|
+
"pkg:npm/ssri@14.0.0",
|
|
401
415
|
"pkg:npm/tar-stream@3.2.0",
|
|
402
416
|
"pkg:npm/true-myth@9.4.0",
|
|
403
417
|
"pkg:npm/ts-morph@28.0.0",
|
|
@@ -416,6 +430,9 @@
|
|
|
416
430
|
{
|
|
417
431
|
"ref": "pkg:npm/spdx-expression-parse@5.0.0"
|
|
418
432
|
},
|
|
433
|
+
{
|
|
434
|
+
"ref": "pkg:npm/ssri@14.0.0"
|
|
435
|
+
},
|
|
419
436
|
{
|
|
420
437
|
"ref": "pkg:npm/tar-stream@3.2.0"
|
|
421
438
|
},
|