zyrk 0.6.6 → 0.6.8
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/README.md +57 -14
- package/VERSION +1 -1
- package/dist/cli/main.js +1 -1
- package/dist/fetch/registry.d.ts +8 -0
- package/dist/fetch/registry.d.ts.map +1 -1
- package/dist/fetch/registry.js +37 -3
- package/dist/install/budgets.d.ts +5 -0
- package/dist/install/budgets.d.ts.map +1 -1
- package/dist/install/budgets.js +11 -4
- package/dist/install/registry.d.ts.map +1 -1
- package/dist/install/registry.js +2 -0
- package/dist/install/run.d.ts.map +1 -1
- package/dist/install/run.js +4 -0
- package/dist/lockfile/write.d.ts.map +1 -1
- package/dist/lockfile/write.js +16 -0
- package/dist/resolve/resolver.d.ts +2 -1
- package/dist/resolve/resolver.d.ts.map +1 -1
- package/dist/resolve/resolver.js +33 -0
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -27,6 +27,14 @@ the shared store, exact dependency context, mutation rules, and cleanup contract
|
|
|
27
27
|
central to its design. Storage savings, speed, and framework compatibility will
|
|
28
28
|
be reported only after reproducible measurements and compatibility tests.
|
|
29
29
|
|
|
30
|
+
### The name and the idea
|
|
31
|
+
|
|
32
|
+
The project began as **snpm**, short for “space-efficient npm.” That name was
|
|
33
|
+
already in use, so it became **nexu**; npm's package-name similarity policy
|
|
34
|
+
then blocked publishing that name, and the project became **zyrk**. The names
|
|
35
|
+
changed, while the goal stayed the same: make shared package storage practical,
|
|
36
|
+
careful, and useful in everyday Node.js development.
|
|
37
|
+
|
|
30
38
|
## Try the current CLI
|
|
31
39
|
|
|
32
40
|
Install from npm:
|
|
@@ -46,11 +54,17 @@ From a checkout:
|
|
|
46
54
|
```bash
|
|
47
55
|
git clone https://github.com/kingjethro999/zyrk.git zyrk
|
|
48
56
|
cd zyrk
|
|
49
|
-
npm
|
|
50
|
-
|
|
51
|
-
|
|
57
|
+
npm install --global zyrk@0.6.6
|
|
58
|
+
zyrk install --frozen-lockfile
|
|
59
|
+
zyrk --help
|
|
60
|
+
zyrk --version
|
|
52
61
|
```
|
|
53
62
|
|
|
63
|
+
The global npm install bootstraps the `zyrk` executable. Project dependencies
|
|
64
|
+
are installed by zyrk itself. On a fresh checkout, use the published bootstrap
|
|
65
|
+
version first because the source checkout's own development dependencies are
|
|
66
|
+
needed to run its local CLI.
|
|
67
|
+
|
|
54
68
|
### One-line install (shell)
|
|
55
69
|
|
|
56
70
|
Linux / macOS:
|
|
@@ -359,15 +373,25 @@ own options and configuration.
|
|
|
359
373
|
## Develop and contribute
|
|
360
374
|
|
|
361
375
|
```bash
|
|
362
|
-
npm
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
376
|
+
npm install --global zyrk@0.6.6 # bootstrap the CLI, once per machine
|
|
377
|
+
zyrk install --frozen-lockfile
|
|
378
|
+
zyrk run setup:hooks
|
|
379
|
+
zyrk run typecheck
|
|
380
|
+
zyrk run test
|
|
381
|
+
zyrk run check
|
|
382
|
+
zyrk run format:check
|
|
383
|
+
zyrk run format
|
|
369
384
|
```
|
|
370
385
|
|
|
386
|
+
Linux and macOS development, CI, and release verification use zyrk to install
|
|
387
|
+
the repository's dependencies. The Windows contract job continues to use npm
|
|
388
|
+
while native Windows filesystem and link behavior is being validated. npm is
|
|
389
|
+
also used to publish the package; that is a registry operation, not a project
|
|
390
|
+
dependency install. Vercel deployments should set the install command to
|
|
391
|
+
the commands in [web/vercel.json](web/vercel.json) and set the Vercel project
|
|
392
|
+
root directory to `web/`. The included site uses zyrk for project dependencies
|
|
393
|
+
after npm bootstraps the CLI.
|
|
394
|
+
|
|
371
395
|
The commit hook runs the full check gate, increments the version in
|
|
372
396
|
`package.json`, `package-lock.json`, and `VERSION`, and creates a matching version
|
|
373
397
|
tag after the commit. Keep changes focused and never bypass the hooks.
|
|
@@ -412,10 +436,29 @@ lists each unique package/version linked after the project transaction commits.
|
|
|
412
436
|
Source counts differ from dependency contexts when peers split a package.
|
|
413
437
|
`--json` disables progress.
|
|
414
438
|
|
|
415
|
-
Install resolution has a five-minute deadline
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
439
|
+
Install resolution has a five-minute deadline, registry requests (including
|
|
440
|
+
archive downloads) have a fifteen-minute deadline, a complete fetch operation
|
|
441
|
+
has a fifteen-minute deadline, and each archive extraction has a two-minute
|
|
442
|
+
deadline. On a slow or unreliable connection, increase the request and complete
|
|
443
|
+
fetch deadlines together. For example, this gives a single request up to 30
|
|
444
|
+
minutes and the entire fetch phase up to 45 minutes:
|
|
445
|
+
|
|
446
|
+
```bash
|
|
447
|
+
ZYRK_REQUEST_TIMEOUT_MS=1800000 ZYRK_FETCH_TIMEOUT_MS=2700000 zyrk install
|
|
448
|
+
```
|
|
449
|
+
|
|
450
|
+
To keep the settings for future commands in the current shell, use
|
|
451
|
+
`export ZYRK_REQUEST_TIMEOUT_MS=1800000` and
|
|
452
|
+
`export ZYRK_FETCH_TIMEOUT_MS=2700000`. Both values are milliseconds.
|
|
453
|
+
Resolution and extraction timeouts accept `1` to `900000` (15 minutes); request
|
|
454
|
+
and whole-fetch timeouts accept `1` to `3600000` (60 minutes). For a very slow
|
|
455
|
+
connection, the largest supported combination is:
|
|
456
|
+
|
|
457
|
+
```bash
|
|
458
|
+
ZYRK_REQUEST_TIMEOUT_MS=3600000 ZYRK_FETCH_TIMEOUT_MS=3600000 zyrk install
|
|
459
|
+
```
|
|
460
|
+
|
|
461
|
+
These are finite deadlines; graph, archive-entry, and byte limits still apply.
|
|
419
462
|
|
|
420
463
|
Platform gates run the complete check on Ubuntu and macOS/Node 24 and a
|
|
421
464
|
Windows CLI/artifact contract suite, including paths with spaces and Unicode.
|
package/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
v0.6.
|
|
1
|
+
v0.6.8
|
package/dist/cli/main.js
CHANGED
|
@@ -100,7 +100,7 @@ export function helpText(version) {
|
|
|
100
100
|
}
|
|
101
101
|
lines.push("", "Registry publishing and account commands (via your npm):");
|
|
102
102
|
lines.push(...delegatedHelpLines());
|
|
103
|
-
lines.push("", "Install timeouts: ZYRK_RESOLVE_TIMEOUT_MS and ZYRK_EXTRACT_TIMEOUT_MS (1..900000 ms).", "zyrk never installs packages globally and never runs npm to do it.", "Need a global package? Run npm directly: npm install --global <package-spec>");
|
|
103
|
+
lines.push("", "Install timeouts: ZYRK_RESOLVE_TIMEOUT_MS and ZYRK_EXTRACT_TIMEOUT_MS (1..900000 ms); ZYRK_REQUEST_TIMEOUT_MS (1..3600000 ms); ZYRK_FETCH_TIMEOUT_MS (1..3600000 ms).", "zyrk never installs packages globally and never runs npm to do it.", "Need a global package? Run npm directly: npm install --global <package-spec>");
|
|
104
104
|
return `${lines.join("\n")}\n`;
|
|
105
105
|
}
|
|
106
106
|
function ok(stdout, parsed) {
|
package/dist/fetch/registry.d.ts
CHANGED
|
@@ -13,6 +13,10 @@ import type { Logger } from "../log.ts";
|
|
|
13
13
|
import { type HashedBytes } from "../util/integrity.ts";
|
|
14
14
|
/** 512 MiB: large for an npm package, small enough to bound mishaps. */
|
|
15
15
|
export declare const DEFAULT_MAX_TARBALL_BYTES: number;
|
|
16
|
+
/** Bounds the complete metadata closure while allowing large framework graphs. */
|
|
17
|
+
export declare const DEFAULT_MAX_TOTAL_METADATA_BYTES: number;
|
|
18
|
+
/** Fifteen minutes per registry operation, including archive transfer. */
|
|
19
|
+
export declare const DEFAULT_REQUEST_DEADLINE_MS = 900000;
|
|
16
20
|
/** Default registry for tool environments (SPEC 13.1). */
|
|
17
21
|
export declare const DEFAULT_REGISTRY = "https://registry.npmjs.org/";
|
|
18
22
|
export interface PackumentDist {
|
|
@@ -92,6 +96,10 @@ export declare class RegistryClient {
|
|
|
92
96
|
packument(name: string, options?: {
|
|
93
97
|
signal?: AbortSignal;
|
|
94
98
|
}): Promise<Packument>;
|
|
99
|
+
/** Fetch one exact version without transferring every release in a packument. */
|
|
100
|
+
versionManifest(name: string, version: string, options?: {
|
|
101
|
+
signal?: AbortSignal;
|
|
102
|
+
}): Promise<PackumentVersion>;
|
|
95
103
|
/** Registry advisory request; private names may never follow an external redirect. */
|
|
96
104
|
auditAdvisories(packages: Readonly<Record<string, readonly string[]>>, options?: {
|
|
97
105
|
signal?: AbortSignal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/fetch/registry.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/fetch/registry.ts"],"names":[],"mappings":"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"}
|
package/dist/fetch/registry.js
CHANGED
|
@@ -17,6 +17,10 @@ import { assertIntegrityOk, canonicalStrongSri, IntegrityHasher, base64FromHex,
|
|
|
17
17
|
const transport = createRequire(import.meta.url)("make-fetch-happen");
|
|
18
18
|
/** 512 MiB: large for an npm package, small enough to bound mishaps. */
|
|
19
19
|
export const DEFAULT_MAX_TARBALL_BYTES = 512 * 1024 * 1024;
|
|
20
|
+
/** Bounds the complete metadata closure while allowing large framework graphs. */
|
|
21
|
+
export const DEFAULT_MAX_TOTAL_METADATA_BYTES = 256 * 1024 * 1024;
|
|
22
|
+
/** Fifteen minutes per registry operation, including archive transfer. */
|
|
23
|
+
export const DEFAULT_REQUEST_DEADLINE_MS = 900_000;
|
|
20
24
|
/** Default registry for tool environments (SPEC 13.1). */
|
|
21
25
|
export const DEFAULT_REGISTRY = "https://registry.npmjs.org/";
|
|
22
26
|
/** npm's abbreviated packument media type, used for installs. */
|
|
@@ -66,9 +70,9 @@ export class RegistryClient {
|
|
|
66
70
|
(scope.pathname.startsWith(boundary.pathname) ||
|
|
67
71
|
boundary.pathname.startsWith(scope.pathname)));
|
|
68
72
|
this.#maxMetadataBytes = positiveLimit(options.maxMetadataBytes ?? 32 * 1024 * 1024, "maxMetadataBytes");
|
|
69
|
-
this.#maxTotalMetadataBytes = positiveLimit(options.maxTotalMetadataBytes ??
|
|
73
|
+
this.#maxTotalMetadataBytes = positiveLimit(options.maxTotalMetadataBytes ?? DEFAULT_MAX_TOTAL_METADATA_BYTES, "maxTotalMetadataBytes");
|
|
70
74
|
this.#maxMetadataVersions = positiveLimit(options.maxMetadataVersions ?? 100_000, "maxMetadataVersions");
|
|
71
|
-
this.#requestDeadlineMs = positiveLimit(options.requestDeadlineMs ??
|
|
75
|
+
this.#requestDeadlineMs = positiveLimit(options.requestDeadlineMs ?? DEFAULT_REQUEST_DEADLINE_MS, "requestDeadlineMs");
|
|
72
76
|
positiveLimit(this.#maxTarballBytes, "maxTarballBytes");
|
|
73
77
|
this.#signal = options.signal;
|
|
74
78
|
const { scopedRegistries, ...baseOptions } = options;
|
|
@@ -143,6 +147,33 @@ export class RegistryClient {
|
|
|
143
147
|
}
|
|
144
148
|
return validatePackument(raw, name, this.#origin, this.#maxMetadataVersions);
|
|
145
149
|
}
|
|
150
|
+
/** Fetch one exact version without transferring every release in a packument. */
|
|
151
|
+
async versionManifest(name, version, options = {}) {
|
|
152
|
+
const selected = this.forPackage(name);
|
|
153
|
+
if (selected !== this)
|
|
154
|
+
return selected.versionManifest(name, version, options);
|
|
155
|
+
const url = `${this.#registry}${escapePackageName(name)}/${encodeURIComponent(version)}`;
|
|
156
|
+
this.#logger?.debug("fetching exact version metadata", {
|
|
157
|
+
name,
|
|
158
|
+
version,
|
|
159
|
+
url,
|
|
160
|
+
});
|
|
161
|
+
let raw;
|
|
162
|
+
try {
|
|
163
|
+
raw = await this.#withRequest(url, `${INSTALL_V1_ACCEPT}, application/json`, (response) => this.#readMetadata(response), options.signal);
|
|
164
|
+
}
|
|
165
|
+
catch (error) {
|
|
166
|
+
throw mapFetchError(error, `fetch metadata for ${name}@${version}`);
|
|
167
|
+
}
|
|
168
|
+
const validated = validatePackument({ name, versions: { [version]: raw } }, name, this.#origin, 1);
|
|
169
|
+
const entry = validated.versions[version];
|
|
170
|
+
if (entry === undefined)
|
|
171
|
+
throw new ZyrkError("ZYRK_RESOLUTION_FAILED", `registry has no version ${version} of ${name}`, {
|
|
172
|
+
detail: { name, version },
|
|
173
|
+
remedy: "check the requested version exists in the configured registry",
|
|
174
|
+
});
|
|
175
|
+
return entry;
|
|
176
|
+
}
|
|
146
177
|
/** Registry advisory request; private names may never follow an external redirect. */
|
|
147
178
|
async auditAdvisories(packages, options = {}) {
|
|
148
179
|
for (const [name, versions] of Object.entries(packages)) {
|
|
@@ -414,7 +445,10 @@ export class RegistryClient {
|
|
|
414
445
|
throw resourceLimit("redirect count", 10, "registry redirect configuration");
|
|
415
446
|
}
|
|
416
447
|
catch (error) {
|
|
417
|
-
|
|
448
|
+
// A bounded body consumer can stop while the decoder still has source
|
|
449
|
+
// bytes arriving. Abort the transport before closing the exposed stream
|
|
450
|
+
// so compressed responses cannot write into a closed decompressor.
|
|
451
|
+
cancel();
|
|
418
452
|
if (timedOut || signals.some((source) => source.aborted))
|
|
419
453
|
throw resourceLimit("request deadline or cancellation", this.#requestDeadlineMs, "requestDeadlineMs");
|
|
420
454
|
throw error;
|
|
@@ -3,5 +3,10 @@ import type { ExtractionLimits } from "../extract/tarball.ts";
|
|
|
3
3
|
export declare function installBudgets(env: NodeJS.ProcessEnv): {
|
|
4
4
|
resolveBudget: Partial<ResolverLimits>;
|
|
5
5
|
extractBudget: Partial<ExtractionLimits>;
|
|
6
|
+
fetchBudget: {
|
|
7
|
+
deadlineMs: number;
|
|
8
|
+
};
|
|
6
9
|
};
|
|
10
|
+
/** Bound slow registry transfers while allowing large framework archives. */
|
|
11
|
+
export declare function registryRequestDeadline(env: NodeJS.ProcessEnv): number;
|
|
7
12
|
//# sourceMappingURL=budgets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"budgets.d.ts","sourceRoot":"","sources":["../../src/install/budgets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"budgets.d.ts","sourceRoot":"","sources":["../../src/install/budgets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAyB9D,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG;IACtD,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACvC,aAAa,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACzC,WAAW,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;CACrC,CAYA;AAED,6EAA6E;AAC7E,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAEtE"}
|
package/dist/install/budgets.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/** Public, bounded install timeout configuration. Node and byte limits stay intact. */
|
|
2
2
|
import { ZyrkError } from "../errors.js";
|
|
3
|
-
function timeout(env, key, fallback) {
|
|
3
|
+
function timeout(env, key, fallback, maximum = 900000) {
|
|
4
4
|
const raw = env[key];
|
|
5
5
|
if (raw === undefined)
|
|
6
6
|
return fallback;
|
|
7
7
|
if (!/^[0-9]+$/.test(raw) ||
|
|
8
8
|
!Number.isSafeInteger(Number(raw)) ||
|
|
9
9
|
Number(raw) < 1 ||
|
|
10
|
-
Number(raw) >
|
|
11
|
-
throw new ZyrkError("ZYRK_POLICY_DENIED", `Cannot configure install: ${key} must be an integer from 1 to
|
|
12
|
-
remedy: `Set ${key} to a timeout in milliseconds from 1 to
|
|
10
|
+
Number(raw) > maximum)
|
|
11
|
+
throw new ZyrkError("ZYRK_POLICY_DENIED", `Cannot configure install: ${key} must be an integer from 1 to ${maximum}.`, {
|
|
12
|
+
remedy: `Set ${key} to a timeout in milliseconds from 1 to ${maximum}, or unset it to use the default.`,
|
|
13
13
|
});
|
|
14
14
|
return Number(raw);
|
|
15
15
|
}
|
|
@@ -21,5 +21,12 @@ export function installBudgets(env) {
|
|
|
21
21
|
extractBudget: {
|
|
22
22
|
maxDurationMs: timeout(env, "ZYRK_EXTRACT_TIMEOUT_MS", 120000),
|
|
23
23
|
},
|
|
24
|
+
fetchBudget: {
|
|
25
|
+
deadlineMs: timeout(env, "ZYRK_FETCH_TIMEOUT_MS", 900000, 3600000),
|
|
26
|
+
},
|
|
24
27
|
};
|
|
25
28
|
}
|
|
29
|
+
/** Bound slow registry transfers while allowing large framework archives. */
|
|
30
|
+
export function registryRequestDeadline(env) {
|
|
31
|
+
return timeout(env, "ZYRK_REQUEST_TIMEOUT_MS", 900000, 3600000);
|
|
32
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/install/registry.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAoB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/install/registry.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAoB,MAAM,sBAAsB,CAAC;AAMxE,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,cAAc,CAAC,CAwI1B"}
|
package/dist/install/registry.js
CHANGED
|
@@ -8,6 +8,7 @@ import { RegistryClient, DEFAULT_REGISTRY } from "../fetch/registry.js";
|
|
|
8
8
|
import { isErrno } from "../util/fsx.js";
|
|
9
9
|
import { findProjectBoundary } from "../config/paths.js";
|
|
10
10
|
import { cleanUrl } from "./lock.js";
|
|
11
|
+
import { registryRequestDeadline } from "./budgets.js";
|
|
11
12
|
export async function installRegistry(options) {
|
|
12
13
|
let registry = DEFAULT_REGISTRY;
|
|
13
14
|
const auth = {};
|
|
@@ -97,6 +98,7 @@ export async function installRegistry(options) {
|
|
|
97
98
|
return new RegistryClient({
|
|
98
99
|
registry,
|
|
99
100
|
scopedRegistries,
|
|
101
|
+
requestDeadlineMs: registryRequestDeadline(options.env),
|
|
100
102
|
userAgent: `zyrk/${options.version}`,
|
|
101
103
|
fetchOptions: auth,
|
|
102
104
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/install/run.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/install/run.ts"],"names":[],"mappings":"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"}
|
package/dist/install/run.js
CHANGED
|
@@ -102,6 +102,7 @@ export async function installProject(options) {
|
|
|
102
102
|
...options,
|
|
103
103
|
resolveBudget: { ...budgets.resolveBudget, ...options.resolveBudget },
|
|
104
104
|
extractBudget: { ...budgets.extractBudget, ...options.extractBudget },
|
|
105
|
+
fetchBudget: { ...budgets.fetchBudget, ...options.fetchBudget },
|
|
105
106
|
};
|
|
106
107
|
if (await findWorkspaceRoot(options.projectDir)) {
|
|
107
108
|
const { installWorkspaceProject } = await import("./workspace-install.js");
|
|
@@ -272,6 +273,9 @@ export async function installProject(options) {
|
|
|
272
273
|
packument: (name) => options.registry.packument(name, {
|
|
273
274
|
signal: operation.operation.signal,
|
|
274
275
|
}),
|
|
276
|
+
versionManifest: (name, version) => options.registry.versionManifest(name, version, {
|
|
277
|
+
signal: operation.operation.signal,
|
|
278
|
+
}),
|
|
275
279
|
},
|
|
276
280
|
requirements: Object.entries(allDeps)
|
|
277
281
|
.map(([name, spec]) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../src/lockfile/write.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,OAAO,EAGL,KAAK,UAAU,EAGhB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC5B,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC1D,QAAQ,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,mBAAmB,CAAC;IAChC,YAAY,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACpE,eAAe,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;CACzB,CAAC;AAEF,wBAAsB,aAAa,CACjC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../src/lockfile/write.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,OAAO,EAGL,KAAK,UAAU,EAGhB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC5B,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC1D,QAAQ,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,mBAAmB,CAAC;IAChC,YAAY,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACpE,eAAe,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;CACzB,CAAC;AAEF,wBAAsB,aAAa,CACjC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,UAAU,CAAC,CAqPrB"}
|
package/dist/lockfile/write.js
CHANGED
|
@@ -94,7 +94,23 @@ export async function writeLockfile(options) {
|
|
|
94
94
|
: `npm:${target.name}@${target.version}`;
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
|
+
const npmMetadata = {};
|
|
98
|
+
const existingEntry = existingPackages[location];
|
|
99
|
+
if (existingEntry !== undefined) {
|
|
100
|
+
for (const field of [
|
|
101
|
+
"license",
|
|
102
|
+
"funding",
|
|
103
|
+
"deprecated",
|
|
104
|
+
"hasInstallScript",
|
|
105
|
+
"inBundle",
|
|
106
|
+
]) {
|
|
107
|
+
if (Object.hasOwn(existingEntry, field)) {
|
|
108
|
+
npmMetadata[field] = existingEntry[field];
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
97
112
|
packages[location] = {
|
|
113
|
+
...npmMetadata,
|
|
98
114
|
name: node.name,
|
|
99
115
|
version: node.version,
|
|
100
116
|
resolved: node.tarballUrl,
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { type Packument } from "../fetch/registry.ts";
|
|
1
|
+
import { type Packument, type PackumentVersion } from "../fetch/registry.ts";
|
|
2
2
|
import { type OverridePolicy } from "./overrides.ts";
|
|
3
3
|
export type MetadataProvider = {
|
|
4
4
|
readonly origin: string;
|
|
5
5
|
originFor?(name: string): string;
|
|
6
6
|
packument(name: string): Promise<Packument>;
|
|
7
|
+
versionManifest?(name: string, version: string): Promise<PackumentVersion>;
|
|
7
8
|
};
|
|
8
9
|
export type EdgeKind = "prod" | "optional" | "peer";
|
|
9
10
|
export type ResolvedEdge = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/resolve/resolver.ts"],"names":[],"mappings":"AAyBA,OAAO,EAEL,KAAK,SAAS,
|
|
1
|
+
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/resolve/resolver.ts"],"names":[],"mappings":"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"}
|
package/dist/resolve/resolver.js
CHANGED
|
@@ -70,6 +70,7 @@ class ResolverState {
|
|
|
70
70
|
provider;
|
|
71
71
|
overrides;
|
|
72
72
|
packuments = new Map();
|
|
73
|
+
versionManifests = new Map();
|
|
73
74
|
peerless = new Map();
|
|
74
75
|
peerBearing = new Map();
|
|
75
76
|
freshPeers = new Map();
|
|
@@ -142,6 +143,23 @@ class ResolverState {
|
|
|
142
143
|
this.packuments.set(name, pending);
|
|
143
144
|
return pending;
|
|
144
145
|
}
|
|
146
|
+
versionManifestOf(name, version) {
|
|
147
|
+
const key = `${name}\0${version}`;
|
|
148
|
+
const cached = this.versionManifests.get(key);
|
|
149
|
+
if (cached !== undefined)
|
|
150
|
+
return cached;
|
|
151
|
+
this.checkBudget();
|
|
152
|
+
let timer;
|
|
153
|
+
const deadline = new Promise((_resolve, reject) => {
|
|
154
|
+
timer = setTimeout(() => reject(budgetError("resolution deadline exceeded")), Math.max(1, this.expires - Date.now()));
|
|
155
|
+
});
|
|
156
|
+
const pending = Promise.race([
|
|
157
|
+
this.provider.versionManifest(name, version),
|
|
158
|
+
deadline,
|
|
159
|
+
]).finally(() => clearTimeout(timer));
|
|
160
|
+
this.versionManifests.set(key, pending);
|
|
161
|
+
return pending;
|
|
162
|
+
}
|
|
145
163
|
/**
|
|
146
164
|
* Build (or reuse) the occurrence for one dependency edge. Peerless
|
|
147
165
|
* packages share one occurrence per name@version; packages declaring
|
|
@@ -442,6 +460,21 @@ class ResolverState {
|
|
|
442
460
|
// Version selection
|
|
443
461
|
// ---------------------------------------------------------------------------
|
|
444
462
|
async function selectVersion(state, req) {
|
|
463
|
+
if (req.targetKind === "exact" && state.provider.versionManifest) {
|
|
464
|
+
try {
|
|
465
|
+
return {
|
|
466
|
+
version: req.targetSpec,
|
|
467
|
+
entry: await state.versionManifestOf(req.realName, req.targetSpec),
|
|
468
|
+
};
|
|
469
|
+
}
|
|
470
|
+
catch (error) {
|
|
471
|
+
// Registries and older test adapters may expose only packuments. Keep
|
|
472
|
+
// the optimization opportunistic when the exact endpoint is absent.
|
|
473
|
+
if (!(error instanceof ZyrkError) || error.detail?.status !== 404) {
|
|
474
|
+
throw error;
|
|
475
|
+
}
|
|
476
|
+
}
|
|
477
|
+
}
|
|
445
478
|
const packument = await state.packumentOf(req.realName);
|
|
446
479
|
const fail = (message, remedy) => new ZyrkError("ZYRK_RESOLUTION_FAILED", message, {
|
|
447
480
|
detail: { name: req.realName, spec: req.targetSpec },
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zyrk",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.8",
|
|
4
4
|
"description": "Storage-efficient Node package manager: one verified store per user, shared across projects through links.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"version:bump": "node scripts/bump-version.js",
|
|
21
21
|
"setup:hooks": "git config core.hooksPath .githooks",
|
|
22
22
|
"build": "tsc -p tsconfig.build.json",
|
|
23
|
-
"prepublishOnly": "
|
|
23
|
+
"prepublishOnly": "node bin/zyrk.js run build"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"make-fetch-happen": "16.0.1",
|