pray-cli 1.8.0 → 1.9.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/README.md +3 -1
- package/dist/domain/types.d.ts +1 -1
- package/dist/domain/types.d.ts.map +1 -1
- package/dist/lockfile/types.d.ts +2 -2
- package/dist/lockfile/types.js +1 -1
- package/dist/manifest/parse-render-policy.d.ts +3 -0
- package/dist/manifest/parse-render-policy.d.ts.map +1 -0
- package/dist/manifest/parse-render-policy.js +32 -0
- package/dist/manifest/parse-render-policy.js.map +1 -0
- 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 +1 -23
- package/dist/manifest/parse-statements.js.map +1 -1
- package/dist/verify/markers.d.ts +6 -0
- package/dist/verify/markers.d.ts.map +1 -0
- package/dist/verify/markers.js +44 -0
- package/dist/verify/markers.js.map +1 -0
- package/dist/verify/position.d.ts +20 -0
- package/dist/verify/position.d.ts.map +1 -0
- package/dist/verify/position.js +126 -0
- package/dist/verify/position.js.map +1 -0
- package/dist/verify/project.d.ts.map +1 -1
- package/dist/verify/project.js +20 -59
- package/dist/verify/project.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -10,6 +10,8 @@ Resolve, lock, render, verify, publish, and serve shared instructions, policies,
|
|
|
10
10
|
|
|
11
11
|
**Repository:** [kiskolabs/pray](https://github.com/kiskolabs/pray)
|
|
12
12
|
|
|
13
|
+
**Package:** [npmjs.com/package/pray-cli](https://www.npmjs.com/package/pray-cli)
|
|
14
|
+
|
|
13
15
|
**Community docs:** [CHANGELOG.md](CHANGELOG.md) · [LICENSE.md](LICENSE.md) · [SECURITY.md](SECURITY.md)
|
|
14
16
|
|
|
15
17
|
## Install
|
|
@@ -66,4 +68,4 @@ node bin/pray.js version
|
|
|
66
68
|
|
|
67
69
|
Registry HTTP(S), git sources, local publish/serve/sync, vendor/tree, login (passkey and ssh-agent), upgrade, update/plan/outdated remote flags, and trust import paths are implemented. SSH registry (`pray+ssh://`) and `serve --stdio` remain planned.
|
|
68
70
|
|
|
69
|
-
See `
|
|
71
|
+
See `rfcs/` in the repository for the normative specification.
|
package/dist/domain/types.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export type SourceKind = "path" | "git" | "registry" | "pray_ssh" | "static index";
|
|
2
2
|
export type RenderMode = "managed" | "verbatim";
|
|
3
|
-
export type RenderConflict = "fail"
|
|
3
|
+
export type RenderConflict = "fail";
|
|
4
4
|
export type RenderChurn = "minimal" | "full";
|
|
5
5
|
export type LineEndings = "lf" | "crlf" | "native";
|
|
6
6
|
export type LocalPosition = "before" | "after";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/domain/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAClB,MAAM,GACN,KAAK,GACL,UAAU,GACV,UAAU,GACV,cAAc,CAAC;AAEnB,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,UAAU,CAAC;AAEhD,MAAM,MAAM,cAAc,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/domain/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAClB,MAAM,GACN,KAAK,GACL,UAAU,GACV,UAAU,GACV,cAAc,CAAC;AAEnB,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,UAAU,CAAC;AAEhD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,MAAM,CAAC;AAE7C,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC"}
|
package/dist/lockfile/types.d.ts
CHANGED
|
@@ -44,6 +44,6 @@ export interface Lockfile {
|
|
|
44
44
|
managed_span: ManagedSpanRecord[];
|
|
45
45
|
}
|
|
46
46
|
export declare function canonicalLockfile(lockfile: Lockfile): Lockfile;
|
|
47
|
-
export declare const PACKAGE_VERSION = "1.
|
|
48
|
-
export declare const GENERATED_BY = "pray 1.
|
|
47
|
+
export declare const PACKAGE_VERSION = "1.9.0";
|
|
48
|
+
export declare const GENERATED_BY = "pray 1.9.0 (typescript)";
|
|
49
49
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/lockfile/types.js
CHANGED
|
@@ -11,6 +11,6 @@ export function canonicalLockfile(lockfile) {
|
|
|
11
11
|
left.id.localeCompare(right.id)),
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
|
-
export const PACKAGE_VERSION = "1.
|
|
14
|
+
export const PACKAGE_VERSION = "1.9.0";
|
|
15
15
|
export const GENERATED_BY = `pray ${PACKAGE_VERSION} (typescript)`;
|
|
16
16
|
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-render-policy.d.ts","sourceRoot":"","sources":["../../src/manifest/parse-render-policy.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/C,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CA0C5D"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { PrayError } from "../errors.js";
|
|
2
|
+
import { keywordValue, parseCall, stringFromValue, } from "../literal/call-parser.js";
|
|
3
|
+
import { literalAsBool } from "../literal/types.js";
|
|
4
|
+
const PARSE_CONTEXT = "manifest";
|
|
5
|
+
export function parseRenderPolicy(rest) {
|
|
6
|
+
const { keywords } = parseCall(rest);
|
|
7
|
+
const conflict = keywords.has("conflict")
|
|
8
|
+
? stringFromValue(keywordValue(keywords, "conflict", PARSE_CONTEXT), PARSE_CONTEXT)
|
|
9
|
+
: "fail";
|
|
10
|
+
if (conflict !== "fail") {
|
|
11
|
+
throw PrayError.unsupported(`render conflict :${conflict} is not implemented; only :fail is supported`);
|
|
12
|
+
}
|
|
13
|
+
return {
|
|
14
|
+
mode: keywords.has("mode")
|
|
15
|
+
? stringFromValue(keywordValue(keywords, "mode", PARSE_CONTEXT), PARSE_CONTEXT)
|
|
16
|
+
: "managed",
|
|
17
|
+
conflict,
|
|
18
|
+
churn: keywords.has("churn")
|
|
19
|
+
? stringFromValue(keywordValue(keywords, "churn", PARSE_CONTEXT), PARSE_CONTEXT)
|
|
20
|
+
: "minimal",
|
|
21
|
+
header: keywords.has("header")
|
|
22
|
+
? (literalAsBool(keywordValue(keywords, "header", PARSE_CONTEXT)) ?? true)
|
|
23
|
+
: true,
|
|
24
|
+
sectionMarkers: keywords.has("section_markers")
|
|
25
|
+
? (literalAsBool(keywordValue(keywords, "section_markers", PARSE_CONTEXT)) ?? true)
|
|
26
|
+
: true,
|
|
27
|
+
lineEndings: keywords.has("line_endings")
|
|
28
|
+
? stringFromValue(keywordValue(keywords, "line_endings", PARSE_CONTEXT), PARSE_CONTEXT)
|
|
29
|
+
: "lf",
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=parse-render-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-render-policy.js","sourceRoot":"","sources":["../../src/manifest/parse-render-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,SAAS,EACT,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,aAAa,GAAG,UAAU,CAAC;AAEjC,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC;QACvC,CAAC,CAAC,eAAe,CACb,YAAY,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC,EACjD,aAAa,CACd;QACH,CAAC,CAAC,MAAM,CAAC;IACX,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;QACxB,MAAM,SAAS,CAAC,WAAW,CACzB,oBAAoB,QAAQ,8CAA8C,CAC3E,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;YACxB,CAAC,CAAE,eAAe,CACd,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAC7C,aAAa,CACW;YAC5B,CAAC,CAAC,SAAS;QACb,QAAQ;QACR,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;YAC1B,CAAC,CAAE,eAAe,CACd,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,EAC9C,aAAa,CACY;YAC7B,CAAC,CAAC,SAAS;QACb,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC5B,CAAC,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC;YAC1E,CAAC,CAAC,IAAI;QACR,cAAc,EAAE,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC;YAC7C,CAAC,CAAC,CAAC,aAAa,CACZ,YAAY,CAAC,QAAQ,EAAE,iBAAiB,EAAE,aAAa,CAAC,CACzD,IAAI,IAAI,CAAC;YACZ,CAAC,CAAC,IAAI;QACR,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC;YACvC,CAAC,CAAE,eAAe,CACd,YAAY,CAAC,QAAQ,EAAE,cAAc,EAAE,aAAa,CAAC,EACrD,aAAa,CACkB;YACnC,CAAC,CAAC,IAAI;KACT,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ManifestLocal, ManifestPackage, ManifestSource, ManifestTarget
|
|
1
|
+
import type { ManifestLocal, ManifestPackage, ManifestSource, ManifestTarget } from "./types.js";
|
|
2
2
|
export declare function parseSource(rest: string): ManifestSource;
|
|
3
3
|
export declare function parseTargetHeader(rest: string): {
|
|
4
4
|
target: ManifestTarget;
|
|
@@ -10,6 +10,6 @@ export declare function parseGroupHeader(rest: string): {
|
|
|
10
10
|
};
|
|
11
11
|
export declare function parsePackageDecl(rest: string): ManifestPackage;
|
|
12
12
|
export declare function parseLocalDecl(rest: string): ManifestLocal;
|
|
13
|
-
export
|
|
13
|
+
export { parseRenderPolicy } from "./parse-render-policy.js";
|
|
14
14
|
export declare function applyTargetStatement(target: ManifestTarget, statement: string): void;
|
|
15
15
|
//# sourceMappingURL=parse-statements.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-statements.d.ts","sourceRoot":"","sources":["../../src/manifest/parse-statements.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAEV,aAAa,EACb,eAAe,EACf,cAAc,EACd,cAAc,
|
|
1
|
+
{"version":3,"file":"parse-statements.d.ts","sourceRoot":"","sources":["../../src/manifest/parse-statements.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAEV,aAAa,EACb,eAAe,EACf,cAAc,EACd,cAAc,EACf,MAAM,YAAY,CAAC;AAIpB,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CA8DxD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG;IAC/C,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB,CA0BA;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG;IAC9C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;CAClB,CAWA;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CA+E9D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAe1D;AAED,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,GAChB,IAAI,CAmCN"}
|
|
@@ -163,29 +163,7 @@ export function parseLocalDecl(rest) {
|
|
|
163
163
|
: false,
|
|
164
164
|
};
|
|
165
165
|
}
|
|
166
|
-
export
|
|
167
|
-
const { keywords } = parseCall(rest);
|
|
168
|
-
return {
|
|
169
|
-
mode: keywords.has("mode")
|
|
170
|
-
? stringFromValue(keywordValue(keywords, "mode", PARSE_CONTEXT), PARSE_CONTEXT)
|
|
171
|
-
: "managed",
|
|
172
|
-
conflict: keywords.has("conflict")
|
|
173
|
-
? stringFromValue(keywordValue(keywords, "conflict", PARSE_CONTEXT), PARSE_CONTEXT)
|
|
174
|
-
: "fail",
|
|
175
|
-
churn: keywords.has("churn")
|
|
176
|
-
? stringFromValue(keywordValue(keywords, "churn", PARSE_CONTEXT), PARSE_CONTEXT)
|
|
177
|
-
: "minimal",
|
|
178
|
-
header: keywords.has("header")
|
|
179
|
-
? (literalAsBool(keywordValue(keywords, "header", PARSE_CONTEXT)) ?? true)
|
|
180
|
-
: true,
|
|
181
|
-
sectionMarkers: keywords.has("section_markers")
|
|
182
|
-
? (literalAsBool(keywordValue(keywords, "section_markers", PARSE_CONTEXT)) ?? true)
|
|
183
|
-
: true,
|
|
184
|
-
lineEndings: keywords.has("line_endings")
|
|
185
|
-
? stringFromValue(keywordValue(keywords, "line_endings", PARSE_CONTEXT), PARSE_CONTEXT)
|
|
186
|
-
: "lf",
|
|
187
|
-
};
|
|
188
|
-
}
|
|
166
|
+
export { parseRenderPolicy } from "./parse-render-policy.js";
|
|
189
167
|
export function applyTargetStatement(target, statement) {
|
|
190
168
|
if (statement.startsWith("output ")) {
|
|
191
169
|
target.outputs.push(stringFromLiteral(statement.slice("output ".length), PARSE_CONTEXT));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-statements.js","sourceRoot":"","sources":["../../src/manifest/parse-statements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,eAAe,GAChB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"parse-statements.js","sourceRoot":"","sources":["../../src/manifest/parse-statements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,eAAe,GAChB,MAAM,qBAAqB,CAAC;AAS7B,MAAM,aAAa,GAAG,UAAU,CAAC;AAEjC,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,wBAAwB,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QACvE,MAAM,SAAS,CAAC,KAAK,CACnB,aAAa,EACb,gDAAgD,CACjD,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,uBAAuB,CAAC,MAAM,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;IAC/D,IAAI,IAAgB,CAAC;IACrB,IAAI,GAAW,CAAC;IAChB,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,IAAI,GAAG,MAAM,CAAC;QACd,GAAG,GAAG,eAAe,CACnB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAC7C,aAAa,CACd,CAAC;IACJ,CAAC;SAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,GAAG,GAAG,eAAe,CACnB,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,CAAC,EAC5C,aAAa,CACd,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,GAAG,GAAG,OAAO,GAAG,EAAE,CAAC;QACrB,CAAC;QACD,IAAI,GAAG,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;QACxD,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,KAAK,CAAC;QACf,CAAC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAC1E,IAAI,GAAG,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACtE,OAAO;QACL,IAAI;QACJ,IAAI;QACJ,GAAG;QACH,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YACrB,CAAC,CAAC;gBACE,GAAG,EAAE,eAAe,CAClB,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,CAAC,EAC5C,aAAa,CACd;aACF;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YACrB,CAAC,CAAC;gBACE,GAAG,EAAE,eAAe,CAClB,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,CAAC,EAC5C,aAAa,CACd;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAI5C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1E,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,uBAAuB,CAAC,MAAM,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG;QACb,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC;QACnC,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC;KACpC,CAAC;IACF,OAAO;QACL,MAAM,EAAE;YACN,IAAI;YACJ,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC;YACzC,MAAM;YACN,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE,UAAU,CAAC;YAC5C,KAAK,EAAE,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;YACtC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC;gBAC3B,CAAC,CAAC;oBACE,QAAQ,EAAE,gBAAgB,CACxB,YAAY,CAAC,QAAQ,EAAE,WAAW,EAAE,aAAa,CAAC,CACnD;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,OAAO;KACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAI3C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1E,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IACrC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,oBAAoB,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACpE,OAAO;KACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,oBAAoB,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,IAAI,GAAG,uBAAuB,CAAC,MAAM,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,0BAA0B,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;QACvE,CAAC,CAAC,GAAG,CAAC;IACR,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAClD,IAAI,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,eAAe,CAC5B,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAChD,CAAC;QACF,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;QAC/B,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAChE,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,KAAK,GAAiB,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,OAAO;QACL,IAAI;QACJ,UAAU;QACV,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC5B,CAAC,CAAC,eAAe,CACb,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,EAC/C,aAAa,CACd;YACH,CAAC,CAAC,SAAS;QACb,OAAO;QACP,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC;QAC1C,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE,UAAU,CAAC;QAC5C,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC;YAChC,CAAC,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;gBACjE,KAAK,CAAC;YACR,CAAC,CAAC,KAAK;QACT,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;YACxB,CAAC,CAAC,eAAe,CACb,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAC7C,aAAa,CACd;YACH,CAAC,CAAC,SAAS;QACb,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YACtB,CAAC,CAAC,eAAe,CACb,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,CAAC,EAC5C,aAAa,CACd;YACH,CAAC,CAAC,SAAS;QACb,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YACtB,CAAC,CAAC,eAAe,CACb,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,CAAC,EAC5C,aAAa,CACd;YACH,CAAC,CAAC,SAAS;QACb,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YACtB,CAAC,CAAC,eAAe,CACb,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,CAAC,EAC5C,aAAa,CACd;YACH,CAAC,CAAC,SAAS;QACb,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC;YAC9B,CAAC,CAAC,eAAe,CACb,YAAY,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC,EAChD,aAAa,CACd;YACH,CAAC,CAAC,SAAS;QACb,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YACtB,CAAC,CAAC,eAAe,CACb,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,CAAC,EAC5C,aAAa,CACd;YACH,CAAC,CAAC,SAAS;QACb,IAAI;QACJ,KAAK;QACL,KAAK,EAAE,KAAK;KACb,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7C,OAAO;QACL,IAAI,EAAE,uBAAuB,CAAC,MAAM,EAAE,CAAC,EAAE,aAAa,CAAC;QACvD,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC;YAChC,CAAC,CAAE,eAAe,CACd,YAAY,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC,EACjD,aAAa,CACgB;YACjC,CAAC,CAAC,OAAO;QACX,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC;YAChC,CAAC,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;gBACjE,KAAK,CAAC;YACR,CAAC,CAAC,KAAK;KACV,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,UAAU,oBAAoB,CAClC,MAAsB,EACtB,SAAiB;IAEjB,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACpC,MAAM,CAAC,OAAO,CAAC,IAAI,CACjB,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,CACpE,CAAC;QACF,OAAO;IACT,CAAC;IACD,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC;YAC1C,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;YACnC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;QAC3D,OAAO;IACT,CAAC;IACD,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAClB,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,CACtE,CAAC;QACF,OAAO;IACT,CAAC;IACD,IAAI,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,CACnE,CAAC;QACF,OAAO;IACT,CAAC;IACD,IAAI,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,MAAM,CAAC,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC1C,OAAO;IACT,CAAC;IACD,MAAM,SAAS,CAAC,KAAK,CACnB,aAAa,EACb,kCAAkC,SAAS,EAAE,CAC9C,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"markers.d.ts","sourceRoot":"","sources":["../../src/verify/markers.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EAAE,GACd,GAAG,CAAC,MAAM,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAgCxE"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { checksumManagedBodyLineRefs } from "../hashing.js";
|
|
2
|
+
export function markerPositions(lines) {
|
|
3
|
+
const markers = new Map();
|
|
4
|
+
let active;
|
|
5
|
+
for (let index = 0; index < lines.length; index += 1) {
|
|
6
|
+
const line = lines[index];
|
|
7
|
+
const parsed = parseMarker(line);
|
|
8
|
+
if (!parsed) {
|
|
9
|
+
active?.body.push(line);
|
|
10
|
+
continue;
|
|
11
|
+
}
|
|
12
|
+
if (parsed === "ignore") {
|
|
13
|
+
continue;
|
|
14
|
+
}
|
|
15
|
+
if (!active) {
|
|
16
|
+
active = { id: parsed, openLine: index + 1, body: [] };
|
|
17
|
+
continue;
|
|
18
|
+
}
|
|
19
|
+
if (active.id === parsed) {
|
|
20
|
+
markers.set(active.id, {
|
|
21
|
+
openLine: active.openLine,
|
|
22
|
+
closeLine: index + 1,
|
|
23
|
+
checksum: checksumManagedBodyLineRefs(active.body),
|
|
24
|
+
});
|
|
25
|
+
active = undefined;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return markers;
|
|
29
|
+
}
|
|
30
|
+
function parseMarker(line) {
|
|
31
|
+
const trimmed = line.trim();
|
|
32
|
+
if (!trimmed.startsWith("<!-- pray:") || !trimmed.endsWith(" -->")) {
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
const id = trimmed.slice("<!-- pray:".length, -" -->".length);
|
|
36
|
+
if (id === "0 ignore-comments") {
|
|
37
|
+
return "ignore";
|
|
38
|
+
}
|
|
39
|
+
if (/^[a-z0-9]+$/.test(id)) {
|
|
40
|
+
return id;
|
|
41
|
+
}
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=markers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"markers.js","sourceRoot":"","sources":["../../src/verify/markers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAE5D,MAAM,UAAU,eAAe,CAC7B,KAAe;IAEf,MAAM,OAAO,GAAG,IAAI,GAAG,EAGpB,CAAC;IACJ,IAAI,MAAoE,CAAC;IAEzE,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,SAAS;QACX,CAAC;QACD,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;YACvD,SAAS;QACX,CAAC;QACD,IAAI,MAAM,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,SAAS,EAAE,KAAK,GAAG,CAAC;gBACpB,QAAQ,EAAE,2BAA2B,CAAC,MAAM,CAAC,IAAI,CAAC;aACnD,CAAC,CAAC;YACH,MAAM,GAAG,SAAS,CAAC;QACrB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACnE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9D,IAAI,EAAE,KAAK,mBAAmB,EAAE,CAAC;QAC/B,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { ManagedSpanRecord } from "../lockfile/types.js";
|
|
2
|
+
import type { ResolvedLocalFile } from "../resolve/types.js";
|
|
3
|
+
export interface PositionDriftSummary {
|
|
4
|
+
targetPath: string;
|
|
5
|
+
markerCount: number;
|
|
6
|
+
uniformDelta: number | undefined;
|
|
7
|
+
firstId: string;
|
|
8
|
+
lockOpen: number;
|
|
9
|
+
lockClose: number;
|
|
10
|
+
fileOpen: number;
|
|
11
|
+
fileClose: number;
|
|
12
|
+
cause: string | undefined;
|
|
13
|
+
}
|
|
14
|
+
export declare function summarizePositionDrift(targetPath: string, spans: ManagedSpanRecord[], markers: Map<string, {
|
|
15
|
+
openLine: number;
|
|
16
|
+
closeLine: number;
|
|
17
|
+
checksum: string;
|
|
18
|
+
}>, onDiskLines: string[], freshLines: string[] | undefined, localFiles: ResolvedLocalFile[]): PositionDriftSummary | undefined;
|
|
19
|
+
export declare function formatPositionDriftMessage(summary: PositionDriftSummary): string;
|
|
20
|
+
//# sourceMappingURL=position.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../src/verify/position.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAUD,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,iBAAiB,EAAE,EAC1B,OAAO,EAAE,GAAG,CACV,MAAM,EACN;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAC1D,EACD,WAAW,EAAE,MAAM,EAAE,EACrB,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,iBAAiB,EAAE,GAC9B,oBAAoB,GAAG,SAAS,CA+ClC;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAiBR"}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
export function summarizePositionDrift(targetPath, spans, markers, onDiskLines, freshLines, localFiles) {
|
|
2
|
+
const drifted = [];
|
|
3
|
+
for (const span of spans) {
|
|
4
|
+
const marker = markers.get(span.id);
|
|
5
|
+
if (!marker) {
|
|
6
|
+
continue;
|
|
7
|
+
}
|
|
8
|
+
if (marker.checksum !== span.ideal_checksum) {
|
|
9
|
+
continue;
|
|
10
|
+
}
|
|
11
|
+
if (marker.openLine === span.open_line &&
|
|
12
|
+
marker.closeLine === span.close_line) {
|
|
13
|
+
continue;
|
|
14
|
+
}
|
|
15
|
+
drifted.push({
|
|
16
|
+
id: span.id,
|
|
17
|
+
lockOpen: span.open_line,
|
|
18
|
+
lockClose: span.close_line,
|
|
19
|
+
fileOpen: marker.openLine,
|
|
20
|
+
fileClose: marker.closeLine,
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
if (drifted.length === 0) {
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
drifted.sort((left, right) => left.fileOpen - right.fileOpen);
|
|
27
|
+
const first = drifted[0];
|
|
28
|
+
const deltas = drifted.map((marker) => marker.fileOpen - marker.lockOpen);
|
|
29
|
+
const uniformDelta = deltas.every((delta) => delta === deltas[0])
|
|
30
|
+
? deltas[0]
|
|
31
|
+
: undefined;
|
|
32
|
+
const cause = freshLines
|
|
33
|
+
? unmarkedDriftCause(targetPath, onDiskLines, freshLines, localFiles)
|
|
34
|
+
: undefined;
|
|
35
|
+
return {
|
|
36
|
+
targetPath,
|
|
37
|
+
markerCount: drifted.length,
|
|
38
|
+
uniformDelta,
|
|
39
|
+
firstId: first.id,
|
|
40
|
+
lockOpen: first.lockOpen,
|
|
41
|
+
lockClose: first.lockClose,
|
|
42
|
+
fileOpen: first.fileOpen,
|
|
43
|
+
fileClose: first.fileClose,
|
|
44
|
+
cause,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
export function formatPositionDriftMessage(summary) {
|
|
48
|
+
const shift = summary.uniformDelta !== undefined && summary.uniformDelta !== 0
|
|
49
|
+
? ` (${summary.uniformDelta > 0 ? "+" : ""}${summary.uniformDelta} lines)`
|
|
50
|
+
: "";
|
|
51
|
+
const markerWord = summary.markerCount === 1 ? "marker" : "markers";
|
|
52
|
+
const parts = [
|
|
53
|
+
`\`${summary.targetPath}\` position drift${shift} across ${summary.markerCount} ${markerWord}`,
|
|
54
|
+
`first marker \`${summary.firstId}\` lock ${summary.lockOpen}:${summary.lockClose}, file ${summary.fileOpen}:${summary.fileClose}`,
|
|
55
|
+
];
|
|
56
|
+
if (summary.cause) {
|
|
57
|
+
parts.push(`cause: ${summary.cause}`);
|
|
58
|
+
}
|
|
59
|
+
parts.push("Align unmarked text with compose sources, or run `pray install` to refresh lock positions.");
|
|
60
|
+
return parts.join("; ");
|
|
61
|
+
}
|
|
62
|
+
function unmarkedDriftCause(targetPath, onDiskLines, freshLines, localFiles) {
|
|
63
|
+
const diskPreamble = preambleLines(onDiskLines);
|
|
64
|
+
const freshPreamble = preambleLines(freshLines);
|
|
65
|
+
const diff = firstLineDiff(diskPreamble, freshPreamble);
|
|
66
|
+
if (!diff) {
|
|
67
|
+
return undefined;
|
|
68
|
+
}
|
|
69
|
+
const [index, diskLine, freshLine] = diff;
|
|
70
|
+
const targetLine = index + 1;
|
|
71
|
+
const freshLocal = locateLineInLocals(localFiles, freshLine);
|
|
72
|
+
if (freshLocal) {
|
|
73
|
+
return `\`${targetPath}:${targetLine}\` unmarked text differs from \`${freshLocal.path}:${freshLocal.line}\``;
|
|
74
|
+
}
|
|
75
|
+
const diskLocal = locateLineInLocals(localFiles, diskLine);
|
|
76
|
+
if (diskLocal) {
|
|
77
|
+
return `\`${targetPath}:${targetLine}\` unmarked text differs from \`${diskLocal.path}:${diskLocal.line}\``;
|
|
78
|
+
}
|
|
79
|
+
return `\`${targetPath}:${targetLine}\` unmarked text differs from fresh composition`;
|
|
80
|
+
}
|
|
81
|
+
function preambleLines(lines) {
|
|
82
|
+
const preamble = [];
|
|
83
|
+
for (const line of lines) {
|
|
84
|
+
if (isManagedMarker(line)) {
|
|
85
|
+
break;
|
|
86
|
+
}
|
|
87
|
+
preamble.push(line);
|
|
88
|
+
}
|
|
89
|
+
return preamble;
|
|
90
|
+
}
|
|
91
|
+
function isManagedMarker(line) {
|
|
92
|
+
const trimmed = line.trim();
|
|
93
|
+
if (!trimmed.startsWith("<!-- pray:") || !trimmed.endsWith(" -->")) {
|
|
94
|
+
return false;
|
|
95
|
+
}
|
|
96
|
+
const id = trimmed.slice("<!-- pray:".length, -" -->".length);
|
|
97
|
+
return id !== "0 ignore-comments" && /^[a-z0-9]+$/.test(id);
|
|
98
|
+
}
|
|
99
|
+
function firstLineDiff(left, right) {
|
|
100
|
+
const shared = Math.min(left.length, right.length);
|
|
101
|
+
for (let index = 0; index < shared; index += 1) {
|
|
102
|
+
if (left[index] !== right[index]) {
|
|
103
|
+
return [index, left[index], right[index]];
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
if (left.length === right.length) {
|
|
107
|
+
return undefined;
|
|
108
|
+
}
|
|
109
|
+
const index = shared;
|
|
110
|
+
return [index, left[index] ?? "", right[index] ?? ""];
|
|
111
|
+
}
|
|
112
|
+
function locateLineInLocals(localFiles, line) {
|
|
113
|
+
if (line.length === 0) {
|
|
114
|
+
return undefined;
|
|
115
|
+
}
|
|
116
|
+
for (const local of localFiles) {
|
|
117
|
+
const lines = local.content.split("\n");
|
|
118
|
+
for (let index = 0; index < lines.length; index += 1) {
|
|
119
|
+
if (lines[index] === line) {
|
|
120
|
+
return { path: local.manifestPath, line: index + 1 };
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
return undefined;
|
|
125
|
+
}
|
|
126
|
+
//# sourceMappingURL=position.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"position.js","sourceRoot":"","sources":["../../src/verify/position.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/verify/project.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/verify/project.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAqB,MAAM,sBAAsB,CAAC;AAIxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAO3D,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,mBAAmB,EAAE,CAAC;CACjC;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,QAAQ,GACjB,kBAAkB,CAEpB;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,QAAQ,EAClB,MAAM,UAAQ,GACb,kBAAkB,CASpB;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,QAAQ,GACjB,kBAAkB,CA8BpB;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAI3E"}
|
package/dist/verify/project.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from "node:fs";
|
|
2
2
|
import { resolve } from "node:path";
|
|
3
3
|
import { PrayError } from "../errors.js";
|
|
4
|
-
import {
|
|
4
|
+
import { normalizeLineEndings, sha256Prefixed } from "../hashing.js";
|
|
5
5
|
import { renderProject } from "../render/project.js";
|
|
6
6
|
import { expectedProvisionedBytes } from "../render/provisioned.js";
|
|
7
7
|
import { missingLocalEmbedGuidance } from "../resolve/project.js";
|
|
8
|
+
import { markerPositions } from "./markers.js";
|
|
9
|
+
import { formatPositionDriftMessage, summarizePositionDrift, } from "./position.js";
|
|
8
10
|
export function inspectProject(project, lockfile) {
|
|
9
11
|
return collectVerificationReport(project, lockfile).report;
|
|
10
12
|
}
|
|
@@ -19,22 +21,21 @@ export function verifyProject(project, lockfile, strict = false) {
|
|
|
19
21
|
return report;
|
|
20
22
|
}
|
|
21
23
|
export function driftProject(project, lockfile) {
|
|
22
|
-
const { report, renderedTargets } = collectVerificationReport(project, lockfile);
|
|
23
|
-
const rendered = renderProject(project);
|
|
24
|
+
const { report, renderedTargets, freshTargets } = collectVerificationReport(project, lockfile);
|
|
24
25
|
const lockTargets = new Set(lockfile.target.flatMap((target) => target.outputs));
|
|
25
|
-
for (const
|
|
26
|
-
const normalizedFresh = normalizeLineEndings(
|
|
27
|
-
const onDisk = renderedTargets.get(
|
|
26
|
+
for (const [path, freshContent] of freshTargets.entries()) {
|
|
27
|
+
const normalizedFresh = normalizeLineEndings(freshContent);
|
|
28
|
+
const onDisk = renderedTargets.get(path);
|
|
28
29
|
if (!onDisk || normalizeLineEndings(onDisk) !== normalizedFresh) {
|
|
29
30
|
report.findings.push({
|
|
30
31
|
kind: "renderer_drift",
|
|
31
|
-
message: `${
|
|
32
|
+
message: `${path} differs from fresh render`,
|
|
32
33
|
});
|
|
33
34
|
}
|
|
34
|
-
if (!lockTargets.has(
|
|
35
|
+
if (!lockTargets.has(path)) {
|
|
35
36
|
report.findings.push({
|
|
36
37
|
kind: "renderer_drift",
|
|
37
|
-
message: `${
|
|
38
|
+
message: `${path} is not tracked in lockfile`,
|
|
38
39
|
});
|
|
39
40
|
}
|
|
40
41
|
}
|
|
@@ -54,6 +55,7 @@ function formatDriftReport(report) {
|
|
|
54
55
|
function collectVerificationReport(project, lockfile) {
|
|
55
56
|
const report = { findings: [] };
|
|
56
57
|
const renderedTargets = new Map();
|
|
58
|
+
const freshTargets = new Map(renderProject(project).map((target) => [target.path, target.content]));
|
|
57
59
|
if (project.manifestHash !== lockfile.manifest_hash) {
|
|
58
60
|
report.findings.push({
|
|
59
61
|
kind: "verify_error",
|
|
@@ -124,13 +126,14 @@ function collectVerificationReport(project, lockfile) {
|
|
|
124
126
|
message: `\`${targetPath}\` marker \`${span.id}\` (\`${span.package}::${span.export}\`) was edited. Restore the managed block or run \`pray install\` to regenerate it.`,
|
|
125
127
|
});
|
|
126
128
|
}
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
129
|
+
}
|
|
130
|
+
const fresh = freshTargets.get(targetPath);
|
|
131
|
+
const summary = summarizePositionDrift(targetPath, spans, markers, lines, fresh?.split("\n"), project.localFiles);
|
|
132
|
+
if (summary) {
|
|
133
|
+
report.findings.push({
|
|
134
|
+
kind: "position_drift",
|
|
135
|
+
message: formatPositionDriftMessage(summary),
|
|
136
|
+
});
|
|
134
137
|
}
|
|
135
138
|
const trackedIds = new Set(spans.map((span) => span.id));
|
|
136
139
|
for (const markerId of markers.keys()) {
|
|
@@ -156,7 +159,7 @@ function collectVerificationReport(project, lockfile) {
|
|
|
156
159
|
});
|
|
157
160
|
}
|
|
158
161
|
}
|
|
159
|
-
return { report, renderedTargets };
|
|
162
|
+
return { report, renderedTargets, freshTargets };
|
|
160
163
|
}
|
|
161
164
|
function verifyExclusiveFileBinding(packageEntry, project, report) {
|
|
162
165
|
const destination = packageEntry.declaration.file;
|
|
@@ -195,46 +198,4 @@ function verifyExclusiveFileBinding(packageEntry, project, report) {
|
|
|
195
198
|
function isWarning(finding) {
|
|
196
199
|
return finding.kind === "orphan_marker";
|
|
197
200
|
}
|
|
198
|
-
function markerPositions(lines) {
|
|
199
|
-
const markers = new Map();
|
|
200
|
-
let active;
|
|
201
|
-
for (let index = 0; index < lines.length; index += 1) {
|
|
202
|
-
const line = lines[index];
|
|
203
|
-
const parsed = parseMarker(line);
|
|
204
|
-
if (!parsed) {
|
|
205
|
-
active?.body.push(line);
|
|
206
|
-
continue;
|
|
207
|
-
}
|
|
208
|
-
if (parsed === "ignore") {
|
|
209
|
-
continue;
|
|
210
|
-
}
|
|
211
|
-
if (!active) {
|
|
212
|
-
active = { id: parsed, openLine: index + 1, body: [] };
|
|
213
|
-
continue;
|
|
214
|
-
}
|
|
215
|
-
if (active.id === parsed) {
|
|
216
|
-
markers.set(active.id, {
|
|
217
|
-
openLine: active.openLine,
|
|
218
|
-
closeLine: index + 1,
|
|
219
|
-
checksum: checksumManagedBodyLineRefs(active.body),
|
|
220
|
-
});
|
|
221
|
-
active = undefined;
|
|
222
|
-
}
|
|
223
|
-
}
|
|
224
|
-
return markers;
|
|
225
|
-
}
|
|
226
|
-
function parseMarker(line) {
|
|
227
|
-
const trimmed = line.trim();
|
|
228
|
-
if (!trimmed.startsWith("<!-- pray:") || !trimmed.endsWith(" -->")) {
|
|
229
|
-
return undefined;
|
|
230
|
-
}
|
|
231
|
-
const id = trimmed.slice("<!-- pray:".length, -" -->".length);
|
|
232
|
-
if (id === "0 ignore-comments") {
|
|
233
|
-
return "ignore";
|
|
234
|
-
}
|
|
235
|
-
if (/^[a-z0-9]+$/.test(id)) {
|
|
236
|
-
return id;
|
|
237
|
-
}
|
|
238
|
-
return undefined;
|
|
239
|
-
}
|
|
240
201
|
//# sourceMappingURL=project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/verify/project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/verify/project.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED