pray-cli 1.9.1 → 1.10.0
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/CHANGELOG.md +25 -0
- package/dist/archive/path-safety.d.ts +2 -0
- package/dist/archive/path-safety.d.ts.map +1 -0
- package/dist/archive/path-safety.js +18 -0
- package/dist/archive/path-safety.js.map +1 -0
- package/dist/archive/praypkg.d.ts.map +1 -1
- package/dist/archive/praypkg.js +35 -9
- package/dist/archive/praypkg.js.map +1 -1
- package/dist/archive/tar.d.ts +3 -0
- package/dist/archive/tar.d.ts.map +1 -0
- package/dist/archive/tar.js +157 -0
- package/dist/archive/tar.js.map +1 -0
- package/dist/auth/session.d.ts +1 -1
- package/dist/auth/session.d.ts.map +1 -1
- package/dist/auth/session.js +29 -4
- package/dist/auth/session.js.map +1 -1
- package/dist/cli/commands/init.js +1 -1
- package/dist/cli/commands/inspect.d.ts.map +1 -1
- package/dist/cli/commands/inspect.js +1 -0
- package/dist/cli/commands/inspect.js.map +1 -1
- package/dist/cli/commands/packages.d.ts.map +1 -1
- package/dist/cli/commands/packages.js +7 -2
- package/dist/cli/commands/packages.js.map +1 -1
- package/dist/cli/commands/plan.d.ts +3 -0
- package/dist/cli/commands/plan.d.ts.map +1 -1
- package/dist/cli/commands/plan.js +9 -0
- package/dist/cli/commands/plan.js.map +1 -1
- package/dist/cli/commands/update-core.d.ts.map +1 -1
- package/dist/cli/commands/update-core.js +4 -1
- package/dist/cli/commands/update-core.js.map +1 -1
- package/dist/cli/materialize.d.ts.map +1 -1
- package/dist/cli/materialize.js +5 -1
- package/dist/cli/materialize.js.map +1 -1
- package/dist/domain/types.d.ts +0 -1
- package/dist/domain/types.d.ts.map +1 -1
- package/dist/http/body.d.ts +2 -0
- package/dist/http/body.d.ts.map +1 -0
- package/dist/http/body.js +32 -0
- package/dist/http/body.js.map +1 -0
- package/dist/http/client.d.ts.map +1 -1
- package/dist/http/client.js +3 -2
- package/dist/http/client.js.map +1 -1
- package/dist/lockfile/index.d.ts +2 -1
- package/dist/lockfile/index.d.ts.map +1 -1
- package/dist/lockfile/index.js +7 -1
- package/dist/lockfile/index.js.map +1 -1
- package/dist/lockfile/parse.d.ts.map +1 -1
- package/dist/lockfile/parse.js +20 -0
- package/dist/lockfile/parse.js.map +1 -1
- package/dist/lockfile/serialize.d.ts.map +1 -1
- package/dist/lockfile/serialize.js +23 -0
- package/dist/lockfile/serialize.js.map +1 -1
- package/dist/lockfile/types.d.ts +9 -2
- package/dist/lockfile/types.d.ts.map +1 -1
- package/dist/lockfile/types.js +3 -1
- package/dist/lockfile/types.js.map +1 -1
- package/dist/manifest/deprecation.d.ts +17 -0
- package/dist/manifest/deprecation.d.ts.map +1 -1
- package/dist/manifest/deprecation.js +32 -0
- package/dist/manifest/deprecation.js.map +1 -1
- package/dist/manifest/destination.d.ts +2 -0
- package/dist/manifest/destination.d.ts.map +1 -1
- package/dist/manifest/destination.js +20 -0
- package/dist/manifest/destination.js.map +1 -1
- package/dist/manifest/format-serialize.d.ts.map +1 -1
- package/dist/manifest/format-serialize.js +7 -4
- package/dist/manifest/format-serialize.js.map +1 -1
- package/dist/manifest/index.d.ts.map +1 -1
- package/dist/manifest/index.js +4 -1
- package/dist/manifest/index.js.map +1 -1
- package/dist/manifest/parse-render-policy.d.ts.map +1 -1
- package/dist/manifest/parse-render-policy.js +20 -12
- package/dist/manifest/parse-render-policy.js.map +1 -1
- package/dist/manifest/parse-statements.d.ts +2 -2
- package/dist/manifest/parse-statements.d.ts.map +1 -1
- package/dist/manifest/parse-statements.js +6 -1
- package/dist/manifest/parse-statements.js.map +1 -1
- package/dist/manifest/parser.d.ts.map +1 -1
- package/dist/manifest/parser.js +14 -25
- package/dist/manifest/parser.js.map +1 -1
- package/dist/manifest/types.d.ts +3 -4
- package/dist/manifest/types.d.ts.map +1 -1
- package/dist/manifest/types.js +1 -4
- package/dist/manifest/types.js.map +1 -1
- package/dist/manifest/validate.d.ts +5 -0
- package/dist/manifest/validate.d.ts.map +1 -0
- package/dist/manifest/validate.js +43 -0
- package/dist/manifest/validate.js.map +1 -0
- package/dist/registry/cache.d.ts +2 -0
- package/dist/registry/cache.d.ts.map +1 -0
- package/dist/registry/cache.js +16 -0
- package/dist/registry/cache.js.map +1 -0
- package/dist/registry/index.d.ts +2 -2
- package/dist/registry/index.d.ts.map +1 -1
- package/dist/registry/index.js +18 -65
- package/dist/registry/index.js.map +1 -1
- package/dist/registry/install.d.ts +5 -0
- package/dist/registry/install.d.ts.map +1 -0
- package/dist/registry/install.js +55 -0
- package/dist/registry/install.js.map +1 -0
- package/dist/registry/signature.d.ts +4 -0
- package/dist/registry/signature.d.ts.map +1 -0
- package/dist/registry/signature.js +25 -0
- package/dist/registry/signature.js.map +1 -0
- package/dist/render/compose-dest.d.ts +5 -0
- package/dist/render/compose-dest.d.ts.map +1 -0
- package/dist/render/compose-dest.js +57 -0
- package/dist/render/compose-dest.js.map +1 -0
- package/dist/render/dest.d.ts +8 -0
- package/dist/render/dest.d.ts.map +1 -0
- package/dist/render/dest.js +120 -0
- package/dist/render/dest.js.map +1 -0
- package/dist/render/destination-io.d.ts +7 -0
- package/dist/render/destination-io.d.ts.map +1 -0
- package/dist/render/destination-io.js +67 -0
- package/dist/render/destination-io.js.map +1 -0
- package/dist/render/header.d.ts +2 -1
- package/dist/render/header.d.ts.map +1 -1
- package/dist/render/header.js +5 -10
- package/dist/render/header.js.map +1 -1
- package/dist/render/legacy.js +1 -1
- package/dist/render/legacy.js.map +1 -1
- package/dist/render/managed-export.d.ts.map +1 -1
- package/dist/render/managed-export.js +8 -2
- package/dist/render/managed-export.js.map +1 -1
- package/dist/render/patch.d.ts +4 -0
- package/dist/render/patch.d.ts.map +1 -0
- package/dist/render/patch.js +101 -0
- package/dist/render/patch.js.map +1 -0
- package/dist/render/path-guard.d.ts +2 -0
- package/dist/render/path-guard.d.ts.map +1 -0
- package/dist/render/path-guard.js +34 -0
- package/dist/render/path-guard.js.map +1 -0
- package/dist/render/project.d.ts +3 -1
- package/dist/render/project.d.ts.map +1 -1
- package/dist/render/project.js +26 -5
- package/dist/render/project.js.map +1 -1
- package/dist/render/provisioned.d.ts +2 -1
- package/dist/render/provisioned.d.ts.map +1 -1
- package/dist/render/provisioned.js +14 -15
- package/dist/render/provisioned.js.map +1 -1
- package/dist/render/rendered-dest.d.ts +3 -0
- package/dist/render/rendered-dest.d.ts.map +1 -0
- package/dist/render/rendered-dest.js +48 -0
- package/dist/render/rendered-dest.js.map +1 -0
- package/dist/render/scoped.js +1 -1
- package/dist/render/scoped.js.map +1 -1
- package/dist/resolve/exports.d.ts +5 -0
- package/dist/resolve/exports.d.ts.map +1 -0
- package/dist/resolve/exports.js +92 -0
- package/dist/resolve/exports.js.map +1 -0
- package/dist/resolve/project.d.ts.map +1 -1
- package/dist/resolve/project.js +4 -59
- package/dist/resolve/project.js.map +1 -1
- package/dist/resource-limits.d.ts +10 -0
- package/dist/resource-limits.d.ts.map +1 -0
- package/dist/resource-limits.js +10 -0
- package/dist/resource-limits.js.map +1 -0
- package/dist/serve/index.d.ts +2 -0
- package/dist/serve/index.d.ts.map +1 -1
- package/dist/serve/index.js +79 -29
- package/dist/serve/index.js.map +1 -1
- package/dist/sync/index.d.ts.map +1 -1
- package/dist/sync/index.js +27 -14
- package/dist/sync/index.js.map +1 -1
- package/dist/sync/path-safety.d.ts +5 -0
- package/dist/sync/path-safety.d.ts.map +1 -0
- package/dist/sync/path-safety.js +48 -0
- package/dist/sync/path-safety.js.map +1 -0
- package/dist/verify/project.d.ts.map +1 -1
- package/dist/verify/project.js +3 -39
- package/dist/verify/project.js.map +1 -1
- package/dist/verify/provisioned.d.ts +10 -0
- package/dist/verify/provisioned.d.ts.map +1 -0
- package/dist/verify/provisioned.js +69 -0
- package/dist/verify/provisioned.js.map +1 -0
- package/package.json +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,30 @@
|
|
|
1
1
|
# CHANGELOG
|
|
2
2
|
|
|
3
|
+
## 1.10.0 (2026-09-02)
|
|
4
|
+
|
|
5
|
+
- Refuse to overwrite exclusive `file:` and `tree:` destinations that already exist with other bytes.
|
|
6
|
+
- Fail when a provisioned or compose destination is a symbolic link.
|
|
7
|
+
- Record provisioned leaves in `Prayfile.lock` and delete a dropped leaf only when on-disk bytes still match the locked hash.
|
|
8
|
+
- Keep the previous lock when a provisioned destination write fails, so retry still has its ownership record.
|
|
9
|
+
- Keep TypeScript lockfiles readable when a generated top-level section is empty.
|
|
10
|
+
- Reject destination paths that start with `~`.
|
|
11
|
+
- Print every provisioned path in `pray plan`.
|
|
12
|
+
- BREAKING: Drop unused `render` fields `section_markers` and `line_endings`; reject them at parse.
|
|
13
|
+
- Inline a UTF-8 `file` export into `compose` as a marked span. Exclusive `file:` stays unmarked.
|
|
14
|
+
- Write the Agent context banner on `AGENTS.md` by default. Other compose destinations opt in with `header: true`.
|
|
15
|
+
- Fail compose of JSON, binary, or an unknown file type and name `file:` as the unmarked path.
|
|
16
|
+
- Warn when Prayfile uses deprecated `skills`, export type `skill`, or `spec.skills`; prefer `tree` / `folder`. These forms will be removed in version 2.
|
|
17
|
+
|
|
18
|
+
## 1.9.2 (2026-09-01)
|
|
19
|
+
|
|
20
|
+
- Align package version with the 1.9.2 release.
|
|
21
|
+
- Reject `.praypkg` members that escape the package root or exceed size limits; unpack through staging into cache.
|
|
22
|
+
- Move login sessions to the user Pray home with owner-only permissions and migrate legacy repository sessions.
|
|
23
|
+
- Reject manifest and federation paths outside their roots; require registry hashes and recheck cached package trees.
|
|
24
|
+
- Bound server requests, connections, timeouts, and federation peers; expose readiness and per-request identifiers.
|
|
25
|
+
- Cap registry downloads at 64 MiB; unpack `.praypkg` tar members without system tar; reject absolute artifact URLs and check a present registry signature.
|
|
26
|
+
- Enforce a measured line-coverage floor in CI.
|
|
27
|
+
|
|
3
28
|
## 1.9.1 (2026-08-29)
|
|
4
29
|
|
|
5
30
|
- Rewrite every matching `pray` line when `pray update --latest` moves a package constraint, keeping indent and extra keywords.
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"path-safety.d.ts","sourceRoot":"","sources":["../../src/archive/path-safety.ts"],"names":[],"mappings":"AAGA,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgB9D"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { isAbsolute, normalize } from "node:path";
|
|
2
|
+
import { PrayError } from "../errors.js";
|
|
3
|
+
export function validateArchiveMemberPath(path) {
|
|
4
|
+
const cleaned = path.replace(/^\.\//, "");
|
|
5
|
+
if (cleaned.length === 0 || isAbsolute(cleaned) || cleaned.startsWith("/")) {
|
|
6
|
+
throw PrayError.integrity(`package path must be relative: ${path}`);
|
|
7
|
+
}
|
|
8
|
+
for (const part of normalize(cleaned).split(/[/\\]/)) {
|
|
9
|
+
if (part === "" || part === ".") {
|
|
10
|
+
continue;
|
|
11
|
+
}
|
|
12
|
+
if (part === ".." || part.includes("\0")) {
|
|
13
|
+
throw PrayError.integrity(`package path escapes package root: ${path}`);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
return cleaned;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=path-safety.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"path-safety.js","sourceRoot":"","sources":["../../src/archive/path-safety.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,UAAU,yBAAyB,CAAC,IAAY;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC1C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3E,MAAM,SAAS,CAAC,SAAS,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACrD,IAAI,IAAI,KAAK,EAAE,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAChC,SAAS;QACX,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,MAAM,SAAS,CAAC,SAAS,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"praypkg.d.ts","sourceRoot":"","sources":["../../src/archive/praypkg.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"praypkg.d.ts","sourceRoot":"","sources":["../../src/archive/praypkg.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAK3D,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,eAAe,GAC5B,MAAM,CAuBR;AAED,wBAAgB,aAAa,CAC3B,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,GACtB,IAAI,CAgBN;AAED,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,CAGR;AAED,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,eAAe,EAC7B,UAAU,EAAE,MAAM,GACjB,IAAI,CAIN"}
|
package/dist/archive/praypkg.js
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { spawnSync } from "node:child_process";
|
|
2
|
-
import { copyFileSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync, } from "node:fs";
|
|
2
|
+
import { copyFileSync, lstatSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync, } from "node:fs";
|
|
3
3
|
import { tmpdir } from "node:os";
|
|
4
4
|
import { basename, dirname, join, resolve } from "node:path";
|
|
5
5
|
import { PrayError } from "../errors.js";
|
|
6
6
|
import { findPrayspecFile } from "../package-spec/index.js";
|
|
7
|
+
import { MAX_ARCHIVE_TOTAL_BYTES } from "../resource-limits.js";
|
|
8
|
+
import { validateArchiveMemberPath } from "./path-safety.js";
|
|
9
|
+
import { extractTarArchive } from "./tar.js";
|
|
7
10
|
export function buildPackageArchiveBytes(packageEntry) {
|
|
8
11
|
const prayspecPath = findPrayspecFile(packageEntry.root);
|
|
9
12
|
const staging = mkdtempSync(join(tmpdir(), "pray-package-"));
|
|
@@ -23,14 +26,15 @@ export function buildPackageArchiveBytes(packageEntry) {
|
|
|
23
26
|
}
|
|
24
27
|
}
|
|
25
28
|
export function unpackPraypkg(artifactBytes, outputDirectory) {
|
|
26
|
-
|
|
29
|
+
if (artifactBytes.byteLength > MAX_ARCHIVE_TOTAL_BYTES) {
|
|
30
|
+
throw PrayError.integrity(`package archive exceeds ${MAX_ARCHIVE_TOTAL_BYTES} bytes`);
|
|
31
|
+
}
|
|
27
32
|
const tarBytes = runCommand("zstd", ["-d", "-q", "-c"], artifactBytes);
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
});
|
|
31
|
-
if (result.status !== 0) {
|
|
32
|
-
throw PrayError.integrity("failed to unpack package archive");
|
|
33
|
+
if (tarBytes.byteLength > MAX_ARCHIVE_TOTAL_BYTES) {
|
|
34
|
+
throw PrayError.integrity(`package archive exceeds ${MAX_ARCHIVE_TOTAL_BYTES} decompressed bytes`);
|
|
33
35
|
}
|
|
36
|
+
extractTarArchive(tarBytes, outputDirectory);
|
|
37
|
+
rejectUnsafeExtractedTree(outputDirectory);
|
|
34
38
|
}
|
|
35
39
|
export function packageArchivePath(packageName, version) {
|
|
36
40
|
const slug = packageName.replaceAll("/", "-");
|
|
@@ -49,18 +53,40 @@ function packageMetadataJson(packageEntry) {
|
|
|
49
53
|
exports: packageEntry.selectedExports,
|
|
50
54
|
});
|
|
51
55
|
}
|
|
56
|
+
function rejectUnsafeExtractedTree(outputDirectory) {
|
|
57
|
+
const stack = [outputDirectory];
|
|
58
|
+
while (stack.length > 0) {
|
|
59
|
+
const current = stack.pop();
|
|
60
|
+
if (current === undefined) {
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
for (const entry of readdirSync(current, { withFileTypes: true })) {
|
|
64
|
+
const fullPath = join(current, entry.name);
|
|
65
|
+
if (entry.isDirectory()) {
|
|
66
|
+
stack.push(fullPath);
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
if (lstatSync(fullPath).isSymbolicLink()) {
|
|
70
|
+
throw PrayError.integrity("unsupported package archive entry type");
|
|
71
|
+
}
|
|
72
|
+
const relative = fullPath.slice(outputDirectory.length + 1);
|
|
73
|
+
validateArchiveMemberPath(relative);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
52
77
|
function runCommand(program, argumentsList, input) {
|
|
53
78
|
const result = spawnSync(program, argumentsList, {
|
|
54
79
|
input,
|
|
55
80
|
encoding: "buffer",
|
|
56
|
-
|
|
81
|
+
env: { ...process.env, COPYFILE_DISABLE: "1" },
|
|
82
|
+
maxBuffer: MAX_ARCHIVE_TOTAL_BYTES,
|
|
57
83
|
});
|
|
58
84
|
if (result.error?.code === "ENOENT") {
|
|
59
85
|
throw PrayError.unsupported(`${program} is required to build or unpack package archives`);
|
|
60
86
|
}
|
|
61
87
|
if (result.status !== 0) {
|
|
62
88
|
const message = result.stderr?.toString("utf8").trim();
|
|
63
|
-
throw PrayError.integrity(message.length > 0 ? message : `${program} failed`);
|
|
89
|
+
throw PrayError.integrity(message && message.length > 0 ? message : `${program} failed`);
|
|
64
90
|
}
|
|
65
91
|
return result.stdout;
|
|
66
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"praypkg.js","sourceRoot":"","sources":["../../src/archive/praypkg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,SAAS,EACT,WAAW,EACX,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"praypkg.js","sourceRoot":"","sources":["../../src/archive/praypkg.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tar.d.ts","sourceRoot":"","sources":["../../src/archive/tar.ts"],"names":[],"mappings":"AAYA,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAEtD;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,MAAM,GACtB,IAAI,CAGN"}
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import { mkdirSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { dirname, join } from "node:path";
|
|
3
|
+
import { PrayError } from "../errors.js";
|
|
4
|
+
import { MAX_ARCHIVE_ENTRIES, MAX_ARCHIVE_ENTRY_BYTES, MAX_ARCHIVE_TOTAL_BYTES, } from "../resource-limits.js";
|
|
5
|
+
import { validateArchiveMemberPath } from "./path-safety.js";
|
|
6
|
+
const TAR_BLOCK_BYTES = 512;
|
|
7
|
+
export function validateTarArchive(bytes) {
|
|
8
|
+
walkTarArchive(bytes);
|
|
9
|
+
}
|
|
10
|
+
export function extractTarArchive(bytes, outputDirectory) {
|
|
11
|
+
mkdirSync(outputDirectory, { recursive: true });
|
|
12
|
+
walkTarArchive(bytes, outputDirectory);
|
|
13
|
+
}
|
|
14
|
+
function walkTarArchive(bytes, outputDirectory) {
|
|
15
|
+
const paths = new Set();
|
|
16
|
+
let offset = 0;
|
|
17
|
+
let entryCount = 0;
|
|
18
|
+
let totalBytes = 0;
|
|
19
|
+
let pendingPath;
|
|
20
|
+
while (offset + TAR_BLOCK_BYTES <= bytes.length) {
|
|
21
|
+
const header = bytes.subarray(offset, offset + TAR_BLOCK_BYTES);
|
|
22
|
+
if (header.every((byte) => byte === 0))
|
|
23
|
+
return;
|
|
24
|
+
verifyChecksum(header);
|
|
25
|
+
const size = parseOctal(header.subarray(124, 136), "entry size");
|
|
26
|
+
const dataStart = offset + TAR_BLOCK_BYTES;
|
|
27
|
+
const dataEnd = dataStart + size;
|
|
28
|
+
if (dataEnd > bytes.length) {
|
|
29
|
+
throw PrayError.integrity("truncated package archive entry");
|
|
30
|
+
}
|
|
31
|
+
const type = String.fromCharCode(header[156] ?? 0);
|
|
32
|
+
const data = bytes.subarray(dataStart, dataEnd);
|
|
33
|
+
if (type === "x") {
|
|
34
|
+
pendingPath = paxPath(data);
|
|
35
|
+
}
|
|
36
|
+
else if (type === "L") {
|
|
37
|
+
pendingPath = cString(data).replace(/\n$/, "");
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
const rawPath = pendingPath ?? tarHeaderPath(header);
|
|
41
|
+
pendingPath = undefined;
|
|
42
|
+
if (type === "5" && (rawPath === "." || rawPath === "./")) {
|
|
43
|
+
offset =
|
|
44
|
+
dataStart + Math.ceil(size / TAR_BLOCK_BYTES) * TAR_BLOCK_BYTES;
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
const path = validateArchiveMemberPath(rawPath);
|
|
48
|
+
if (basenameStartsWithAppleDouble(path)) {
|
|
49
|
+
offset =
|
|
50
|
+
dataStart + Math.ceil(size / TAR_BLOCK_BYTES) * TAR_BLOCK_BYTES;
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
if (type === "5") {
|
|
54
|
+
if (outputDirectory !== undefined) {
|
|
55
|
+
mkdirSync(extractedDestination(outputDirectory, path), {
|
|
56
|
+
recursive: true,
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
if (type !== "0" && type !== "\0") {
|
|
62
|
+
throw PrayError.integrity("unsupported package archive entry type");
|
|
63
|
+
}
|
|
64
|
+
entryCount += 1;
|
|
65
|
+
if (entryCount > MAX_ARCHIVE_ENTRIES) {
|
|
66
|
+
throw PrayError.integrity(`package archive exceeds ${MAX_ARCHIVE_ENTRIES} entries`);
|
|
67
|
+
}
|
|
68
|
+
if (paths.has(path)) {
|
|
69
|
+
throw PrayError.integrity(`duplicate package archive path: ${path}`);
|
|
70
|
+
}
|
|
71
|
+
paths.add(path);
|
|
72
|
+
if (size > MAX_ARCHIVE_ENTRY_BYTES) {
|
|
73
|
+
throw PrayError.integrity(`package archive entry exceeds ${MAX_ARCHIVE_ENTRY_BYTES} bytes: ${path}`);
|
|
74
|
+
}
|
|
75
|
+
totalBytes += size;
|
|
76
|
+
if (totalBytes > MAX_ARCHIVE_TOTAL_BYTES) {
|
|
77
|
+
throw PrayError.integrity(`package archive exceeds ${MAX_ARCHIVE_TOTAL_BYTES} decompressed bytes`);
|
|
78
|
+
}
|
|
79
|
+
if (outputDirectory !== undefined) {
|
|
80
|
+
const destination = extractedDestination(outputDirectory, path);
|
|
81
|
+
mkdirSync(dirname(destination), { recursive: true });
|
|
82
|
+
writeFileSync(destination, data, { flag: "wx" });
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
offset = dataStart + Math.ceil(size / TAR_BLOCK_BYTES) * TAR_BLOCK_BYTES;
|
|
87
|
+
}
|
|
88
|
+
throw PrayError.integrity("package archive is missing its end marker");
|
|
89
|
+
}
|
|
90
|
+
function extractedDestination(outputDirectory, path) {
|
|
91
|
+
const destination = join(outputDirectory, path);
|
|
92
|
+
if (destination !== outputDirectory &&
|
|
93
|
+
!destination.startsWith(`${outputDirectory}/`) &&
|
|
94
|
+
!destination.startsWith(`${outputDirectory}\\`)) {
|
|
95
|
+
throw PrayError.integrity(`package path escapes package root: ${path}`);
|
|
96
|
+
}
|
|
97
|
+
return destination;
|
|
98
|
+
}
|
|
99
|
+
function basenameStartsWithAppleDouble(path) {
|
|
100
|
+
const parts = path.split(/[/\\]/);
|
|
101
|
+
const basename = parts[parts.length - 1] ?? "";
|
|
102
|
+
return basename.startsWith("._");
|
|
103
|
+
}
|
|
104
|
+
function verifyChecksum(header) {
|
|
105
|
+
const stored = parseOctal(header.subarray(148, 154), "checksum");
|
|
106
|
+
let sum = 0;
|
|
107
|
+
for (let index = 0; index < header.length; index += 1) {
|
|
108
|
+
sum += index >= 148 && index < 156 ? 32 : (header[index] ?? 0);
|
|
109
|
+
}
|
|
110
|
+
if (sum !== stored) {
|
|
111
|
+
throw PrayError.integrity("invalid package archive checksum");
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
function tarHeaderPath(header) {
|
|
115
|
+
const name = cString(header.subarray(0, 100));
|
|
116
|
+
const prefix = cString(header.subarray(345, 500));
|
|
117
|
+
return prefix.length > 0 ? `${prefix}/${name}` : name;
|
|
118
|
+
}
|
|
119
|
+
function cString(bytes) {
|
|
120
|
+
const end = bytes.indexOf(0);
|
|
121
|
+
return new TextDecoder("utf-8", { fatal: true }).decode(end >= 0 ? bytes.subarray(0, end) : bytes);
|
|
122
|
+
}
|
|
123
|
+
function parseOctal(bytes, label) {
|
|
124
|
+
const value = cString(bytes).trim();
|
|
125
|
+
if (!/^[0-7]+$/.test(value)) {
|
|
126
|
+
throw PrayError.integrity(`invalid package archive ${label}`);
|
|
127
|
+
}
|
|
128
|
+
const parsed = Number.parseInt(value, 8);
|
|
129
|
+
if (!Number.isSafeInteger(parsed)) {
|
|
130
|
+
throw PrayError.integrity(`invalid package archive ${label}`);
|
|
131
|
+
}
|
|
132
|
+
return parsed;
|
|
133
|
+
}
|
|
134
|
+
function paxPath(data) {
|
|
135
|
+
let cursor = 0;
|
|
136
|
+
let path;
|
|
137
|
+
while (cursor < data.length) {
|
|
138
|
+
const separator = data.indexOf(0x20, cursor);
|
|
139
|
+
const length = Number.parseInt(data.subarray(cursor, separator).toString("ascii"), 10);
|
|
140
|
+
const recordEnd = cursor + length;
|
|
141
|
+
if (separator < 0 ||
|
|
142
|
+
!Number.isSafeInteger(length) ||
|
|
143
|
+
length <= 0 ||
|
|
144
|
+
recordEnd > data.length) {
|
|
145
|
+
throw PrayError.integrity("invalid package archive pax header");
|
|
146
|
+
}
|
|
147
|
+
const record = data.subarray(separator + 1, recordEnd - 1);
|
|
148
|
+
const equals = record.indexOf(0x3d);
|
|
149
|
+
const key = equals < 0 ? "" : record.subarray(0, equals).toString("ascii");
|
|
150
|
+
if (key === "path") {
|
|
151
|
+
path = new TextDecoder("utf-8", { fatal: true }).decode(record.subarray(equals + 1));
|
|
152
|
+
}
|
|
153
|
+
cursor = recordEnd;
|
|
154
|
+
}
|
|
155
|
+
return path;
|
|
156
|
+
}
|
|
157
|
+
//# sourceMappingURL=tar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tar.js","sourceRoot":"","sources":["../../src/archive/tar.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/session.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export interface SessionFile {
|
|
|
5
5
|
kind: string;
|
|
6
6
|
signer_fingerprint?: string;
|
|
7
7
|
}
|
|
8
|
-
export declare function sessionFilePath(
|
|
8
|
+
export declare function sessionFilePath(_root: string): string;
|
|
9
9
|
export declare function persistSession(root: string, session: SessionFile): SessionFile;
|
|
10
10
|
export declare function loadSessions(path: string): SessionFile[] | undefined;
|
|
11
11
|
//# sourceMappingURL=session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAQD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,WAAW,GACnB,WAAW,CAiBb;AA2BD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,GAAG,SAAS,CAcpE"}
|
package/dist/auth/session.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
|
-
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
1
|
+
import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync, } from "node:fs";
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { PrayError } from "../errors.js";
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
import { trustHome } from "../trust/store.js";
|
|
5
|
+
export function sessionFilePath(_root) {
|
|
6
|
+
return join(trustHome(), "session.json");
|
|
6
7
|
}
|
|
7
8
|
export function persistSession(root, session) {
|
|
8
9
|
const path = sessionFilePath(root);
|
|
9
10
|
mkdirSync(join(path, ".."), { recursive: true });
|
|
11
|
+
migrateLegacySession(root, path);
|
|
10
12
|
const sessions = loadSessions(path) ?? [];
|
|
11
13
|
const existingIndex = sessions.findIndex((entry) => entry.server_url === session.server_url);
|
|
12
14
|
if (existingIndex >= 0) {
|
|
@@ -16,9 +18,32 @@ export function persistSession(root, session) {
|
|
|
16
18
|
sessions.push(session);
|
|
17
19
|
}
|
|
18
20
|
const document = sessions.length === 1 ? sessions[0] : { sessions };
|
|
19
|
-
|
|
21
|
+
writeSessionDocument(path, document);
|
|
20
22
|
return session;
|
|
21
23
|
}
|
|
24
|
+
function migrateLegacySession(root, path) {
|
|
25
|
+
const legacyPath = join(root, ".pray", "session.json");
|
|
26
|
+
if (!existsSync(legacyPath) || legacyPath === path)
|
|
27
|
+
return;
|
|
28
|
+
const sessions = loadSessions(path) ?? [];
|
|
29
|
+
for (const legacy of loadSessions(legacyPath) ?? []) {
|
|
30
|
+
if (!sessions.some((entry) => entry.server_url === legacy.server_url)) {
|
|
31
|
+
sessions.push(legacy);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
const document = sessions.length === 1 ? sessions[0] : { sessions };
|
|
35
|
+
writeSessionDocument(path, document);
|
|
36
|
+
rmSync(legacyPath);
|
|
37
|
+
}
|
|
38
|
+
function writeSessionDocument(path, document) {
|
|
39
|
+
const temporaryPath = `${path}.tmp-${process.pid}`;
|
|
40
|
+
writeFileSync(temporaryPath, `${JSON.stringify(document, null, 2)}\n`, {
|
|
41
|
+
encoding: "utf8",
|
|
42
|
+
mode: 0o600,
|
|
43
|
+
});
|
|
44
|
+
chmodSync(temporaryPath, 0o600);
|
|
45
|
+
renameSync(temporaryPath, path);
|
|
46
|
+
}
|
|
22
47
|
export function loadSessions(path) {
|
|
23
48
|
if (!existsSync(path)) {
|
|
24
49
|
return undefined;
|
package/dist/auth/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/inspect.ts"],"names":[],"mappings":"AAiBA,wBAAsB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAS7C;AAED,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG;IAC/D,MAAM,EAAE,OAAO,CAAC;CACjB,CAUA;AAED,wBAAsB,WAAW,CAAC,aAAa,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/inspect.ts"],"names":[],"mappings":"AAiBA,wBAAsB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAS7C;AAED,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG;IAC/D,MAAM,EAAE,OAAO,CAAC;CACjB,CAUA;AAED,wBAAsB,WAAW,CAAC,aAAa,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C7E;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCxE"}
|
|
@@ -52,6 +52,7 @@ export async function runOutdated(argumentsList = []) {
|
|
|
52
52
|
packages: project.packages,
|
|
53
53
|
sourceRevisions: project.sourceRevisions,
|
|
54
54
|
sourceHostKeys: project.sourceHostKeys,
|
|
55
|
+
project,
|
|
55
56
|
});
|
|
56
57
|
let reported = printUpdateSummary(previous, latest, undefined, project, "Outdated packages");
|
|
57
58
|
reported =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../../src/cli/commands/inspect.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../../src/cli/commands/inspect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packages.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/packages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"packages.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/packages.ts"],"names":[],"mappings":"AAmBA,wBAAsB,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBnE;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAMvE;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BvE"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { existsSync } from "node:fs";
|
|
1
2
|
import { PrayError } from "../../errors.js";
|
|
2
|
-
import { buildLockfile, writeLockfile } from "../../lockfile/index.js";
|
|
3
|
+
import { buildLockfile, readLockfile, writeLockfile, } from "../../lockfile/index.js";
|
|
3
4
|
import { defaultLockfilePath, defaultManifestPath, } from "../../lockfile/paths.js";
|
|
4
5
|
import { addPackageToManifest, removePackageFromManifest, } from "../../manifest/edit.js";
|
|
5
6
|
import { renderProject, writeRenderedTargets } from "../../render/project.js";
|
|
@@ -44,6 +45,9 @@ export async function runUnlock(name) {
|
|
|
44
45
|
throw PrayError.manifest(`package ${name} not found`);
|
|
45
46
|
}
|
|
46
47
|
const lockfilePath = defaultLockfilePath(project.projectRoot);
|
|
48
|
+
const previous = existsSync(lockfilePath)
|
|
49
|
+
? readLockfile(lockfilePath)
|
|
50
|
+
: undefined;
|
|
47
51
|
const rendered = renderProject(project);
|
|
48
52
|
const updatedLockfile = buildLockfile({
|
|
49
53
|
manifestHash: project.manifestHash,
|
|
@@ -54,9 +58,10 @@ export async function runUnlock(name) {
|
|
|
54
58
|
packages: project.packages,
|
|
55
59
|
sourceRevisions: project.sourceRevisions,
|
|
56
60
|
sourceHostKeys: project.sourceHostKeys,
|
|
61
|
+
project,
|
|
57
62
|
});
|
|
63
|
+
writeRenderedTargets(project, rendered, previous);
|
|
58
64
|
writeLockfile(lockfilePath, updatedLockfile);
|
|
59
|
-
writeRenderedTargets(project, rendered);
|
|
60
65
|
process.stdout.write(`Unlocked ${name}\n`);
|
|
61
66
|
}
|
|
62
67
|
//# sourceMappingURL=packages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packages.js","sourceRoot":"","sources":["../../../src/cli/commands/packages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"packages.js","sourceRoot":"","sources":["../../../src/cli/commands/packages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,5 @@
|
|
|
1
|
+
import { provisionedDestinationStatus } from "../../render/dest.js";
|
|
2
|
+
import type { ResolvedProject } from "../../resolve/types.js";
|
|
1
3
|
export declare function runPlanCommand(argumentsList: string[]): Promise<void>;
|
|
4
|
+
export declare function provisionedChange(project: ResolvedProject, file: Parameters<typeof provisionedDestinationStatus>[1], previous: Parameters<typeof provisionedDestinationStatus>[2]): string;
|
|
2
5
|
//# sourceMappingURL=plan.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/plan.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/plan.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAIpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAO9D,wBAAsB,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiD3E;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,UAAU,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAAC,CAAC,EACxD,QAAQ,EAAE,UAAU,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAAC,CAAC,GAC3D,MAAM,CAER"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { existsSync } from "node:fs";
|
|
2
2
|
import { PrayError } from "../../errors.js";
|
|
3
3
|
import { buildLockfile, readLockfile } from "../../lockfile/index.js";
|
|
4
|
+
import { provisionedDestinationStatus } from "../../render/dest.js";
|
|
4
5
|
import { renderProject } from "../../render/project.js";
|
|
6
|
+
import { plannedProvisionedFiles } from "../../render/provisioned.js";
|
|
5
7
|
import { defaultResolveOptions } from "../../resolve/context.js";
|
|
6
8
|
import { lockfilePath, resolveCurrentProject, resolveCurrentProjectWithGitRefreshFallback, } from "../invocation.js";
|
|
7
9
|
export async function runPlanCommand(argumentsList) {
|
|
@@ -23,6 +25,7 @@ export async function runPlanCommand(argumentsList) {
|
|
|
23
25
|
packages: project.packages,
|
|
24
26
|
sourceRevisions: project.sourceRevisions,
|
|
25
27
|
sourceHostKeys: project.sourceHostKeys,
|
|
28
|
+
project,
|
|
26
29
|
});
|
|
27
30
|
const previous = existsSync(lockfilePath())
|
|
28
31
|
? readLockfile(lockfilePath())
|
|
@@ -31,6 +34,9 @@ export async function runPlanCommand(argumentsList) {
|
|
|
31
34
|
for (const target of rendered) {
|
|
32
35
|
process.stdout.write(`would render ${target.path}\n`);
|
|
33
36
|
}
|
|
37
|
+
for (const file of plannedProvisionedFiles(project)) {
|
|
38
|
+
process.stdout.write(`Provisioned ${file.path}: ${provisionedChange(project, file, previous)}\n`);
|
|
39
|
+
}
|
|
34
40
|
if (!previous) {
|
|
35
41
|
return;
|
|
36
42
|
}
|
|
@@ -41,6 +47,9 @@ export async function runPlanCommand(argumentsList) {
|
|
|
41
47
|
}
|
|
42
48
|
}
|
|
43
49
|
}
|
|
50
|
+
export function provisionedChange(project, file, previous) {
|
|
51
|
+
return provisionedDestinationStatus(project, file, previous);
|
|
52
|
+
}
|
|
44
53
|
function parsePlanArguments(argumentsList) {
|
|
45
54
|
let remote = false;
|
|
46
55
|
for (const argument of argumentsList) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/cli/commands/plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/cli/commands/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-core.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update-core.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAU9D,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"update-core.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update-core.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAU9D,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,IAAI,EAAE,OAAO,EACb,yBAAyB,EAAE,KAAK,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;CACjC,CAAC,GACD,OAAO,CAAC,IAAI,CAAC,CA2Df;AAED,wBAAgB,qBAAqB,CACnC,yBAAyB,EAAE,KAAK,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;CACjC,CAAC,EACF,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAC9B,OAAO,EAAE,QAAQ,GAAG,SAAS,EAC7B,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,OAAO,EAAE,eAAe,GACvB,IAAI,CAoCN"}
|