pray-cli 1.11.0 → 1.12.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 +9 -0
- package/dist/cli/commands/plan.d.ts.map +1 -1
- package/dist/cli/commands/plan.js +4 -4
- package/dist/cli/commands/plan.js.map +1 -1
- package/dist/cli/commands/update-core.d.ts +1 -0
- package/dist/cli/commands/update-core.d.ts.map +1 -1
- package/dist/cli/commands/update-core.js +25 -10
- package/dist/cli/commands/update-core.js.map +1 -1
- package/dist/cli/commands/update-latest.d.ts.map +1 -1
- package/dist/cli/commands/update-latest.js +15 -23
- package/dist/cli/commands/update-latest.js.map +1 -1
- package/dist/cli/help.d.ts.map +1 -1
- package/dist/cli/help.js +5 -1
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/main.d.ts.map +1 -1
- package/dist/cli/main.js +150 -133
- package/dist/cli/main.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/lockfile/index.d.ts.map +1 -1
- package/dist/lockfile/index.js +4 -3
- package/dist/lockfile/index.js.map +1 -1
- package/dist/lockfile/types.d.ts +2 -2
- package/dist/lockfile/types.js +1 -1
- package/dist/manifest/edit.d.ts.map +1 -1
- package/dist/manifest/edit.js +3 -3
- package/dist/manifest/edit.js.map +1 -1
- package/dist/render/dest.d.ts +2 -1
- package/dist/render/dest.d.ts.map +1 -1
- package/dist/render/dest.js +46 -9
- package/dist/render/dest.js.map +1 -1
- package/dist/render/destination-io.d.ts +2 -0
- package/dist/render/destination-io.d.ts.map +1 -1
- package/dist/render/destination-io.js +27 -2
- package/dist/render/destination-io.js.map +1 -1
- package/dist/render/project.d.ts.map +1 -1
- package/dist/render/project.js +6 -1
- package/dist/render/project.js.map +1 -1
- package/dist/render/rendered-dest.d.ts.map +1 -1
- package/dist/render/rendered-dest.js +6 -3
- package/dist/render/rendered-dest.js.map +1 -1
- package/dist/resolve/project.d.ts +2 -1
- package/dist/resolve/project.d.ts.map +1 -1
- package/dist/resolve/project.js +1 -2
- package/dist/resolve/project.js.map +1 -1
- package/dist/transaction/hooks.d.ts +7 -0
- package/dist/transaction/hooks.d.ts.map +1 -0
- package/dist/transaction/hooks.js +10 -0
- package/dist/transaction/hooks.js.map +1 -0
- package/dist/transaction/index.d.ts +3 -0
- package/dist/transaction/index.d.ts.map +1 -0
- package/dist/transaction/index.js +81 -0
- package/dist/transaction/index.js.map +1 -0
- package/dist/transaction/journal.d.ts +19 -0
- package/dist/transaction/journal.d.ts.map +1 -0
- package/dist/transaction/journal.js +189 -0
- package/dist/transaction/journal.js.map +1 -0
- package/dist/transaction/owner.d.ts +5 -0
- package/dist/transaction/owner.d.ts.map +1 -0
- package/dist/transaction/owner.js +105 -0
- package/dist/transaction/owner.js.map +1 -0
- package/dist/transaction/records.d.ts +25 -0
- package/dist/transaction/records.d.ts.map +1 -0
- package/dist/transaction/records.js +79 -0
- package/dist/transaction/records.js.map +1 -0
- package/dist/verify/project.d.ts.map +1 -1
- package/dist/verify/project.js +4 -3
- package/dist/verify/project.js.map +1 -1
- package/dist/verify/provisioned.d.ts +2 -1
- package/dist/verify/provisioned.d.ts.map +1 -1
- package/dist/verify/provisioned.js +12 -5
- package/dist/verify/provisioned.js.map +1 -1
- package/package.json +1 -1
package/dist/verify/project.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { existsSync
|
|
1
|
+
import { existsSync } from "node:fs";
|
|
2
2
|
import { resolve } from "node:path";
|
|
3
3
|
import { PrayError } from "../errors.js";
|
|
4
4
|
import { normalizeLineEndings } from "../hashing.js";
|
|
5
|
+
import { readRegularBytes } from "../render/destination-io.js";
|
|
5
6
|
import { renderProject } from "../render/project.js";
|
|
6
7
|
import { missingLocalEmbedGuidance } from "../resolve/project.js";
|
|
7
8
|
import { markerPositions } from "./markers.js";
|
|
@@ -107,7 +108,7 @@ function collectVerificationReport(project, lockfile) {
|
|
|
107
108
|
});
|
|
108
109
|
continue;
|
|
109
110
|
}
|
|
110
|
-
const text =
|
|
111
|
+
const text = readRegularBytes(absolutePath, targetPath).toString("utf8");
|
|
111
112
|
renderedTargets.set(targetPath, text);
|
|
112
113
|
const lines = text.split("\n");
|
|
113
114
|
const markers = markerPositions(lines);
|
|
@@ -145,7 +146,7 @@ function collectVerificationReport(project, lockfile) {
|
|
|
145
146
|
}
|
|
146
147
|
}
|
|
147
148
|
}
|
|
148
|
-
pushProvisionedFindings(project, report);
|
|
149
|
+
pushProvisionedFindings(project, report, lockfile);
|
|
149
150
|
for (const local of project.localFiles) {
|
|
150
151
|
if (local.optional) {
|
|
151
152
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/verify/project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/verify/project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Lockfile } from "../lockfile/types.js";
|
|
1
2
|
import type { ResolvedProject } from "../resolve/types.js";
|
|
2
3
|
interface VerificationReport {
|
|
3
4
|
findings: Array<{
|
|
@@ -5,6 +6,6 @@ interface VerificationReport {
|
|
|
5
6
|
message: string;
|
|
6
7
|
}>;
|
|
7
8
|
}
|
|
8
|
-
export declare function pushProvisionedFindings(project: ResolvedProject, report: VerificationReport): void;
|
|
9
|
+
export declare function pushProvisionedFindings(project: ResolvedProject, report: VerificationReport, lockfile: Lockfile): void;
|
|
9
10
|
export {};
|
|
10
11
|
//# sourceMappingURL=provisioned.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisioned.d.ts","sourceRoot":"","sources":["../../src/verify/provisioned.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provisioned.d.ts","sourceRoot":"","sources":["../../src/verify/provisioned.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAMrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpD;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,QAAQ,GACjB,IAAI,CAkDN"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import { existsSync, lstatSync
|
|
1
|
+
import { existsSync, lstatSync } from "node:fs";
|
|
2
2
|
import { resolve } from "node:path";
|
|
3
3
|
import { sha256Prefixed } from "../hashing.js";
|
|
4
|
+
import { readRegularBytes } from "../render/destination-io.js";
|
|
4
5
|
import { expectedProvisionedBytes, plannedProvisionedFiles, } from "../render/provisioned.js";
|
|
5
|
-
export function pushProvisionedFindings(project, report) {
|
|
6
|
+
export function pushProvisionedFindings(project, report, lockfile) {
|
|
6
7
|
pushExclusiveFileExportFindings(project, report);
|
|
8
|
+
const previous = new Map(lockfile.provisioned?.map((record) => [record.path, record.content_hash]));
|
|
7
9
|
for (const file of plannedProvisionedFiles(project)) {
|
|
8
10
|
const pathText = file.path.replaceAll("\\", "/");
|
|
9
11
|
const absolute = resolve(project.projectRoot, file.path);
|
|
@@ -33,12 +35,17 @@ export function pushProvisionedFindings(project, report) {
|
|
|
33
35
|
});
|
|
34
36
|
continue;
|
|
35
37
|
}
|
|
36
|
-
const destinationBytes =
|
|
38
|
+
const destinationBytes = readRegularBytes(absolute, pathText);
|
|
37
39
|
const expectedBytes = expectedProvisionedBytes(file.source, project.manifest.symbols ?? {});
|
|
38
|
-
|
|
40
|
+
const destinationHash = sha256Prefixed(destinationBytes);
|
|
41
|
+
if (destinationHash !== sha256Prefixed(expectedBytes)) {
|
|
42
|
+
const owned = previous.get(pathText) === destinationHash;
|
|
43
|
+
const recovery = owned
|
|
44
|
+
? "Run `pray install` to restore it."
|
|
45
|
+
: "Inspect your changes and move the file aside, then run `pray install` to restore it.";
|
|
39
46
|
report.findings.push({
|
|
40
47
|
kind: "package_integrity",
|
|
41
|
-
message: `Provisioned file \`${pathText}\` no longer matches package \`${file.package}\`.
|
|
48
|
+
message: `Provisioned file \`${pathText}\` no longer matches package \`${file.package}\`. ${recovery}`,
|
|
42
49
|
});
|
|
43
50
|
}
|
|
44
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisioned.js","sourceRoot":"","sources":["../../src/verify/provisioned.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"provisioned.js","sourceRoot":"","sources":["../../src/verify/provisioned.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED