pray-cli 1.9.0 → 1.9.1
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 +4 -1
- package/dist/cli/commands/update-latest.d.ts +1 -1
- package/dist/cli/commands/update-latest.d.ts.map +1 -1
- package/dist/cli/commands/update-latest.js +13 -6
- package/dist/cli/commands/update-latest.js.map +1 -1
- package/dist/cli/commands/update.js +4 -4
- package/dist/cli/commands/update.js.map +1 -1
- package/dist/lockfile/types.d.ts +2 -2
- package/dist/lockfile/types.js +1 -1
- package/dist/manifest/package-constraint.d.ts +2 -0
- package/dist/manifest/package-constraint.d.ts.map +1 -0
- package/dist/manifest/package-constraint.js +61 -0
- package/dist/manifest/package-constraint.js.map +1 -0
- package/dist/manifest/package-declaration.d.ts.map +1 -1
- package/dist/manifest/package-declaration.js +9 -5
- package/dist/manifest/package-declaration.js.map +1 -1
- package/package.json +6 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
# CHANGELOG
|
|
2
2
|
|
|
3
|
-
##
|
|
3
|
+
## 1.9.1 (2026-08-29)
|
|
4
|
+
|
|
5
|
+
- Rewrite every matching `pray` line when `pray update --latest` moves a package constraint, keeping indent and extra keywords.
|
|
6
|
+
- Preview those constraint moves with `pray update --latest --dry-run` without writing Prayfile.
|
|
4
7
|
|
|
5
8
|
## 1.7.0 (2026-07-29)
|
|
6
9
|
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function updateLatestCommand(packageName: string | undefined, json: boolean): Promise<void>;
|
|
1
|
+
export declare function updateLatestCommand(packageName: string | undefined, json: boolean, dryRun?: boolean): Promise<void>;
|
|
2
2
|
//# sourceMappingURL=update-latest.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-latest.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update-latest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update-latest.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/update-latest.ts"],"names":[],"mappings":"AAoBA,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,IAAI,EAAE,OAAO,EACb,MAAM,UAAQ,GACb,OAAO,CAAC,IAAI,CAAC,CAoFf"}
|
|
@@ -2,11 +2,12 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
|
2
2
|
import { latestConstraintForPackage, versionSatisfies, } from "../../constraint.js";
|
|
3
3
|
import { PrayError } from "../../errors.js";
|
|
4
4
|
import { readLockfile } from "../../lockfile/index.js";
|
|
5
|
+
import { parseManifest } from "../../manifest/index.js";
|
|
5
6
|
import { replacePackageDeclaration } from "../../manifest/package-declaration.js";
|
|
6
7
|
import { defaultResolveOptions } from "../../resolve/context.js";
|
|
7
8
|
import { lockfilePath, manifestPath, resolveCurrentProject, } from "../invocation.js";
|
|
8
9
|
import { printUpdateJsonReport, updateWithManifestConstraints, } from "./update-core.js";
|
|
9
|
-
export async function updateLatestCommand(packageName, json) {
|
|
10
|
+
export async function updateLatestCommand(packageName, json, dryRun = false) {
|
|
10
11
|
const path = manifestPath();
|
|
11
12
|
let manifestText = readFileSync(path, "utf8");
|
|
12
13
|
const project = await resolveCurrentProject({
|
|
@@ -55,12 +56,18 @@ export async function updateLatestCommand(packageName, json) {
|
|
|
55
56
|
}
|
|
56
57
|
process.stdout.write("All package constraints already allow registry latest versions\n");
|
|
57
58
|
}
|
|
58
|
-
else {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
process.stdout.write(`Prayfile: ${update.name} constraint ${update.from_constraint} -> ${update.to_constraint} (registry latest ${update.registry_latest_version})\n`);
|
|
62
|
-
}
|
|
59
|
+
else if (!json) {
|
|
60
|
+
for (const update of manifestUpdates) {
|
|
61
|
+
process.stdout.write(`Prayfile: ${update.name} constraint ${update.from_constraint} -> ${update.to_constraint} (registry latest ${update.registry_latest_version})\n`);
|
|
63
62
|
}
|
|
63
|
+
}
|
|
64
|
+
if (manifestUpdates.length > 0) {
|
|
65
|
+
parseManifest(manifestText);
|
|
66
|
+
}
|
|
67
|
+
if (dryRun) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
if (manifestUpdates.length > 0) {
|
|
64
71
|
writeFileSync(path, manifestText, "utf8");
|
|
65
72
|
}
|
|
66
73
|
await updateWithManifestConstraints(packageName, json, manifestUpdates);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-latest.js","sourceRoot":"","sources":["../../../src/cli/commands/update-latest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EACL,0BAA0B,EAC1B,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,qBAAqB,EACrB,6BAA6B,GAC9B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAA+B,EAC/B,IAAa;
|
|
1
|
+
{"version":3,"file":"update-latest.js","sourceRoot":"","sources":["../../../src/cli/commands/update-latest.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,14 +45,14 @@ export async function runUpdateCommand(argumentsList) {
|
|
|
45
45
|
if (flags.dryRun) {
|
|
46
46
|
throw PrayError.unsupported("major updates are not supported with --dry-run");
|
|
47
47
|
}
|
|
48
|
-
await updateLatestCommand(flags.packageName, flags.json);
|
|
48
|
+
await updateLatestCommand(flags.packageName, flags.json, false);
|
|
49
49
|
return;
|
|
50
50
|
}
|
|
51
51
|
if (flags.latest) {
|
|
52
|
-
if (flags.dryRun) {
|
|
53
|
-
throw PrayError.unsupported("--
|
|
52
|
+
if (flags.dryRun && flags.json) {
|
|
53
|
+
throw PrayError.unsupported("--json is not supported with --dry-run");
|
|
54
54
|
}
|
|
55
|
-
await updateLatestCommand(flags.packageName, flags.json);
|
|
55
|
+
await updateLatestCommand(flags.packageName, flags.json, flags.dryRun);
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
58
58
|
if (flags.dryRun) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,oBAAoB,EACpB,6BAA6B,GAC9B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAUzD,MAAM,UAAU,oBAAoB,CAAC,aAAuB;IAC1D,IAAI,WAA+B,CAAC;IACpC,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;QACrC,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,SAAS;gBACZ,KAAK,GAAG,IAAI,CAAC;gBACb,MAAM;YACR,KAAK,UAAU;gBACb,MAAM,GAAG,IAAI,CAAC;gBACd,MAAM;YACR,KAAK,WAAW;gBACd,MAAM,GAAG,IAAI,CAAC;gBACd,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,GAAG,IAAI,CAAC;gBACZ,MAAM;YACR;gBACE,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,MAAM,SAAS,CAAC,WAAW,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAC;gBAClE,CAAC;gBACD,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,SAAS,CAAC,WAAW,CACzB,+BAA+B,QAAQ,EAAE,CAC1C,CAAC;gBACJ,CAAC;gBACD,WAAW,GAAG,QAAQ,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACtD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,aAAuB;IAC5D,MAAM,KAAK,GAAG,oBAAoB,CAAC,aAAa,CAAC,CAAC;IAClD,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,SAAS,CAAC,WAAW,CAAC,0CAA0C,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChB,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACvB,MAAM,SAAS,CAAC,WAAW,CAAC,sCAAsC,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,SAAS,CAAC,WAAW,CACzB,gDAAgD,CACjD,CAAC;QACJ,CAAC;QACD,MAAM,mBAAmB,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/cli/commands/update.ts"],"names":[],"mappings":"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"}
|
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.9.
|
|
48
|
-
export declare const GENERATED_BY = "pray 1.9.
|
|
47
|
+
export declare const PACKAGE_VERSION = "1.9.1";
|
|
48
|
+
export declare const GENERATED_BY = "pray 1.9.1 (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.9.
|
|
14
|
+
export const PACKAGE_VERSION = "1.9.1";
|
|
15
15
|
export const GENERATED_BY = `pray ${PACKAGE_VERSION} (typescript)`;
|
|
16
16
|
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-constraint.d.ts","sourceRoot":"","sources":["../../src/manifest/package-constraint.ts"],"names":[],"mappings":"AAIA,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GACjB,MAAM,CAoCR"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { PrayError } from "../errors.js";
|
|
2
|
+
const PACKAGE_KEYWORDS = ["pray", "use", "include", "agent", "package"];
|
|
3
|
+
export function rewriteConstraintOnLine(line, constraint) {
|
|
4
|
+
const indentLength = line.length - line.trimStart().length;
|
|
5
|
+
const indent = line.slice(0, indentLength);
|
|
6
|
+
const trimmed = line.trimStart();
|
|
7
|
+
const afterKeyword = skipPackageKeyword(trimmed);
|
|
8
|
+
if (afterKeyword === undefined) {
|
|
9
|
+
throw PrayError.manifest("package declaration is missing a keyword");
|
|
10
|
+
}
|
|
11
|
+
const afterKeywordTrimmed = afterKeyword.trimStart();
|
|
12
|
+
const parsedName = parseQuoted(afterKeywordTrimmed);
|
|
13
|
+
if (!parsedName) {
|
|
14
|
+
throw PrayError.manifest("package declaration is missing a quoted name");
|
|
15
|
+
}
|
|
16
|
+
const [name, afterName] = parsedName;
|
|
17
|
+
const quotedConstraint = `"${constraint}"`;
|
|
18
|
+
const keywordAndName = trimmed.slice(0, trimmed.length - afterName.length);
|
|
19
|
+
const remainder = afterName.trimStart();
|
|
20
|
+
if (remainder.length === 0) {
|
|
21
|
+
return `${indent}${keywordAndName}, ${quotedConstraint}`;
|
|
22
|
+
}
|
|
23
|
+
if (!remainder.startsWith(",")) {
|
|
24
|
+
throw PrayError.manifest(`package ${name} declaration is missing a comma after the name`);
|
|
25
|
+
}
|
|
26
|
+
const afterComma = remainder.slice(1).trimStart();
|
|
27
|
+
if (afterComma.startsWith('"') || afterComma.startsWith("'")) {
|
|
28
|
+
const parsedConstraint = parseQuoted(afterComma);
|
|
29
|
+
if (!parsedConstraint) {
|
|
30
|
+
throw PrayError.manifest(`package ${name} declaration has an unclosed constraint`);
|
|
31
|
+
}
|
|
32
|
+
return `${indent}${keywordAndName}, ${quotedConstraint}${parsedConstraint[1]}`;
|
|
33
|
+
}
|
|
34
|
+
return `${indent}${keywordAndName}, ${quotedConstraint}, ${afterComma}`;
|
|
35
|
+
}
|
|
36
|
+
function skipPackageKeyword(input) {
|
|
37
|
+
for (const keyword of PACKAGE_KEYWORDS) {
|
|
38
|
+
if (!input.startsWith(keyword)) {
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
const rest = input.slice(keyword.length);
|
|
42
|
+
const next = rest[0];
|
|
43
|
+
if (next === undefined || next === '"' || next === "'" || /\s/.test(next)) {
|
|
44
|
+
return rest;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
function parseQuoted(input) {
|
|
50
|
+
const quote = input[0];
|
|
51
|
+
if (quote !== '"' && quote !== "'") {
|
|
52
|
+
return undefined;
|
|
53
|
+
}
|
|
54
|
+
const rest = input.slice(1);
|
|
55
|
+
const end = rest.indexOf(quote);
|
|
56
|
+
if (end === -1) {
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
return [rest.slice(0, end), rest.slice(end + 1)];
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=package-constraint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-constraint.js","sourceRoot":"","sources":["../../src/manifest/package-constraint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-declaration.d.ts","sourceRoot":"","sources":["../../src/manifest/package-declaration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package-declaration.d.ts","sourceRoot":"","sources":["../../src/manifest/package-declaration.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAMlD,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,eAAe,GAC5B,MAAM,CA8CR;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,eAAe,GAC5B,MAAM,CA6BR"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { PrayError } from "../errors.js";
|
|
2
|
+
import { rewriteConstraintOnLine } from "./package-constraint.js";
|
|
2
3
|
function formatStringKeywordList(values) {
|
|
3
4
|
return values.map((value) => `"${value}"`).join(", ");
|
|
4
5
|
}
|
|
@@ -63,14 +64,17 @@ export function replacePackageDeclaration(text, packageEntry) {
|
|
|
63
64
|
`package '${name}'`,
|
|
64
65
|
];
|
|
65
66
|
const lines = text.split(/\r?\n/);
|
|
66
|
-
|
|
67
|
+
let replaced = 0;
|
|
68
|
+
for (const [index, line] of lines.entries()) {
|
|
67
69
|
const trimmed = line.trimStart();
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
70
|
+
if (prefixes.some((prefix) => trimmed.startsWith(prefix))) {
|
|
71
|
+
lines[index] = rewriteConstraintOnLine(line, packageEntry.constraint);
|
|
72
|
+
replaced += 1;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
if (replaced === 0) {
|
|
71
76
|
throw PrayError.manifest(`package ${name} not found in manifest`);
|
|
72
77
|
}
|
|
73
|
-
lines[index] = formatPackageDeclaration(packageEntry);
|
|
74
78
|
let output = lines.join("\n");
|
|
75
79
|
if (text.endsWith("\n") && !output.endsWith("\n")) {
|
|
76
80
|
output += "\n";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-declaration.js","sourceRoot":"","sources":["../../src/manifest/package-declaration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"package-declaration.js","sourceRoot":"","sources":["../../src/manifest/package-declaration.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pray-cli",
|
|
3
|
-
"version": "1.9.
|
|
3
|
+
"version": "1.9.1",
|
|
4
4
|
"description": "Package manager for the language placed before inference — TypeScript Prayfile CLI and library",
|
|
5
5
|
"author": "Andrei Makarov <contact@kiskolabs.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -55,10 +55,13 @@
|
|
|
55
55
|
"@types/semver": "^7.7.0",
|
|
56
56
|
"libyear": "^0.9.3",
|
|
57
57
|
"madge": "^8.0.0",
|
|
58
|
-
"typescript": "
|
|
58
|
+
"typescript": "~5.9.3"
|
|
59
59
|
},
|
|
60
60
|
"overrides": {
|
|
61
|
-
"brace-expansion": ">=5.0.8"
|
|
61
|
+
"brace-expansion": ">=5.0.8",
|
|
62
|
+
"js-yaml": ">=4.3.2",
|
|
63
|
+
"nanoid": ">=3.3.18",
|
|
64
|
+
"postcss": ">=8.5.23"
|
|
62
65
|
},
|
|
63
66
|
"keywords": [
|
|
64
67
|
"pray",
|