versionary 0.6.0 → 0.7.0

package/README.md

@@ -125,6 +125,8 @@ Current rust auto-update behavior (phase scope):
 - updates crate versions in each targeted crate `[package].version`
 - updates internal workspace dependency versions when the dependency name
   matches another targeted crate name
+- refreshes `Cargo.lock` via `cargo generate-lockfile` when `Cargo.lock` exists
+  in repo root
 - applies dependency version rewrites in:
   - `[dependencies]`, `[dev-dependencies]`, `[build-dependencies]`
   - `[target.*.dependencies]`, `[target.*.dev-dependencies]`,
@@ -137,6 +139,8 @@ Current rust non-goals/limits:
 - does not add missing `version = ...` fields to dependency inline tables
 - does not perform Cargo publish/release to crates.io
 
+If `Cargo.lock` exists, `cargo` must be available in PATH during PR preparation.
+
 ### Monorepo release names and tag naming
 
 For independent monorepo targets, Versionary derives release tags as:

package/dist/app/release/artifact-rules.js

@@ -11,25 +11,25 @@ const yaml_1 = __importDefault(require("yaml"));
 function isRecord(value) {
     return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
-function parseJsonPath(jsonpath) {
-    if (!jsonpath.startsWith("$")) {
-        throw new Error(`Invalid jsonpath "${jsonpath}". Must start with "$".`);
+function parseFieldPath(fieldPath) {
+    if (!fieldPath.startsWith("$")) {
+        throw new Error(`Invalid field-path "${fieldPath}". Must start with "$".`);
     }
     const tokens = [];
     let index = 1;
-    while (index < jsonpath.length) {
-        const current = jsonpath[index];
+    while (index < fieldPath.length) {
+        const current = fieldPath[index];
         if (current === ".") {
-            const keyMatch = jsonpath.slice(index + 1).match(/^[A-Za-z0-9_-]+/u);
+            const keyMatch = fieldPath.slice(index + 1).match(/^[A-Za-z0-9_-]+/u);
             if (!keyMatch) {
-                throw new Error(`Invalid jsonpath "${jsonpath}" near index ${index}.`);
+                throw new Error(`Invalid field-path "${fieldPath}" near index ${index}.`);
             }
             tokens.push(keyMatch[0]);
             index += 1 + keyMatch[0].length;
             continue;
         }
         if (current === "[") {
-            const rest = jsonpath.slice(index + 1);
+            const rest = fieldPath.slice(index + 1);
             const numberMatch = rest.match(/^(\d+)\]/u);
             if (numberMatch) {
                 tokens.push(Number(numberMatch[1]));
@@ -42,53 +42,60 @@ function parseJsonPath(jsonpath) {
                 index += 4 + keyMatch[1].length;
                 continue;
             }
-            throw new Error(`Invalid jsonpath "${jsonpath}" near index ${index}.`);
+            throw new Error(`Invalid field-path "${fieldPath}" near index ${index}.`);
         }
-        throw new Error(`Invalid jsonpath "${jsonpath}" near index ${index}.`);
+        throw new Error(`Invalid field-path "${fieldPath}" near index ${index}.`);
     }
     if (tokens.length === 0) {
-        throw new Error(`Invalid jsonpath "${jsonpath}". Path must target a field.`);
+        throw new Error(`Invalid field-path "${fieldPath}". Path must target a field.`);
     }
     return tokens;
 }
-function setVersionAtJsonPath(document, jsonpath, version) {
-    const tokens = parseJsonPath(jsonpath);
+function setVersionAtJsonPath(document, fieldPath, version) {
+    const tokens = parseFieldPath(fieldPath);
     let cursor = document;
     for (let index = 0; index < tokens.length - 1; index += 1) {
         const token = tokens[index];
         if (typeof token === "number") {
             if (!Array.isArray(cursor) || token >= cursor.length) {
-                throw new Error(`jsonpath "${jsonpath}" does not resolve to an existing field.`);
+                throw new Error(`field-path "${fieldPath}" does not resolve to an existing field.`);
             }
             cursor = cursor[token];
             continue;
         }
         if (!isRecord(cursor) || !(token in cursor)) {
-            throw new Error(`jsonpath "${jsonpath}" does not resolve to an existing field.`);
+            throw new Error(`field-path "${fieldPath}" does not resolve to an existing field.`);
         }
         cursor = cursor[token];
     }
     const leaf = tokens.at(-1);
     if (typeof leaf === "number") {
         if (!Array.isArray(cursor) || leaf >= cursor.length) {
-            throw new Error(`jsonpath "${jsonpath}" does not resolve to an existing field.`);
+            throw new Error(`field-path "${fieldPath}" does not resolve to an existing field.`);
         }
         const current = cursor[leaf];
         if (typeof current !== "string" && typeof current !== "number") {
-            throw new Error(`jsonpath "${jsonpath}" must point to a string or number field for version updates.`);
+            throw new Error(`field-path "${fieldPath}" must point to a string or number field for version updates.`);
         }
         cursor[leaf] = version;
         return;
     }
     if (!isRecord(cursor) || !(leaf in cursor)) {
-        throw new Error(`jsonpath "${jsonpath}" does not resolve to an existing field.`);
+        throw new Error(`field-path "${fieldPath}" does not resolve to an existing field.`);
     }
     const current = cursor[leaf];
     if (typeof current !== "string" && typeof current !== "number") {
-        throw new Error(`jsonpath "${jsonpath}" must point to a string or number field for version updates.`);
+        throw new Error(`field-path "${fieldPath}" must point to a string or number field for version updates.`);
     }
     cursor[leaf] = version;
 }
+function resolveFieldPath(rule) {
+    const fieldPath = rule["field-path"] ?? rule.jsonpath;
+    if (!fieldPath) {
+        throw new Error(`${rule.type} artifact rules require "field-path" (or deprecated "jsonpath").`);
+    }
+    return fieldPath;
+}
 function parseRegexPattern(pattern) {
     const slashPattern = pattern.match(/^\/((?:\\\/|[^/])+)\/([a-z]*)$/u);
     if (slashPattern) {
@@ -116,22 +123,36 @@ function applyRegexRule(content, pattern, version) {
     const replacement = typeof groupOne === "string" ? full.replace(groupOne, version) : version;
     return `${content.slice(0, start)}${replacement}${content.slice(start + full.length)}`;
 }
+function applyTomlRulePreservingFormatting(content, fieldPath, version) {
+    const simplePath = fieldPath.match(/^\$\.([A-Za-z0-9_-]+)$/u);
+    if (!simplePath) {
+        const parsed = toml_1.default.parse(content);
+        setVersionAtJsonPath(parsed, fieldPath, version);
+        return `${toml_1.default.stringify(parsed)}\n`;
+    }
+    const key = simplePath[1];
+    const linePattern = new RegExp(`^(\\s*${key}\\s*=\\s*)(["'])([^"']*)(\\2)(\\s*(?:#.*)?)$`, "mu");
+    const match = content.match(linePattern);
+    if (!match) {
+        throw new Error(`field-path "${fieldPath}" does not resolve to an existing field.`);
+    }
+    const [, prefix = "", quote = '"', , , suffix = ""] = match;
+    return content.replace(linePattern, `${prefix}${quote}${version}${quote}${suffix}`);
+}
 function applyArtifactRuleToContent(content, rule, version) {
     if (rule.type === "regex") {
         return applyRegexRule(content, rule.pattern, version);
     }
     if (rule.type === "json") {
         const parsed = JSON.parse(content);
-        setVersionAtJsonPath(parsed, rule.jsonpath, version);
+        setVersionAtJsonPath(parsed, resolveFieldPath(rule), version);
         return `${JSON.stringify(parsed, null, 2)}\n`;
     }
     if (rule.type === "toml") {
-        const parsed = toml_1.default.parse(content);
-        setVersionAtJsonPath(parsed, rule.jsonpath, version);
-        return `${toml_1.default.stringify(parsed)}\n`;
+        return applyTomlRulePreservingFormatting(content, resolveFieldPath(rule), version);
     }
     const parsed = yaml_1.default.parse(content);
-    setVersionAtJsonPath(parsed, rule.jsonpath, version);
+    setVersionAtJsonPath(parsed, resolveFieldPath(rule), version);
     return `${yaml_1.default.stringify(parsed)}`;
 }
 function normalizeRelative(base, target) {

package/dist/app/release/pr.js

@@ -70,6 +70,25 @@ function ensureCleanWorktree(cwd, logger) {
         logger?.warn(`Ignoring safe tracked changes before versionary pr:\n${ignored.join("\n")}`);
     }
 }
+function ensureCargoLockUpToDate(cwd) {
+    const lockfilePath = node_path_1.default.join(cwd, "Cargo.lock");
+    if (!node_fs_1.default.existsSync(lockfilePath)) {
+        return [];
+    }
+    const before = node_fs_1.default.readFileSync(lockfilePath, "utf8");
+    try {
+        (0, node_child_process_1.execFileSync)("cargo", ["generate-lockfile"], {
+            cwd,
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Failed to refresh Cargo.lock via "cargo generate-lockfile". Ensure cargo is installed and available in PATH. Details: ${message}`);
+    }
+    const after = node_fs_1.default.readFileSync(lockfilePath, "utf8");
+    return after !== before ? ["Cargo.lock"] : [];
+}
 function normalizeReleaseNameForTag(releaseName) {
     return releaseName
         .trim()
@@ -195,6 +214,7 @@ function prepareSimpleReleasePr(cwd = process.cwd(), options = {}) {
         updatedVersionFiles.push(...strategy.writeVersion(cwd, loaded.config, plan.nextVersion));
     }
     const updatedArtifactFiles = (0, artifact_rules_js_1.applyConfiguredArtifactRules)(cwd, loaded.config, plan);
+    const updatedRustLockFiles = ensureCargoLockUpToDate(cwd);
     const section = (0, changelog_js_1.renderSimpleChangelog)(plan);
     (0, changelog_js_1.prependChangelog)(cwd, plan.changelogFile, section);
     const releaseTargets = buildReleaseTargets(cwd, plan, loaded.config);
@@ -208,6 +228,7 @@ function prepareSimpleReleasePr(cwd = process.cwd(), options = {}) {
         ...new Set([
             ...updatedVersionFiles,
             ...updatedArtifactFiles,
+            ...updatedRustLockFiles,
             plan.changelogFile,
         ]),
     ];
@@ -307,5 +328,5 @@ function pushReleaseBranch(cwd, branch) {
     });
 }
 function isReleaseCommitMessage(subject) {
-    return /^chore\(release\):\s+(?:v\d+\.\d+\.\d+|\S+-v\d+\.\d+\.\d+)(?:,\s+(?:v\d+\.\d+\.\d+|\S+-v\d+\.\d+\.\d+))*$/u.test(subject);
+    return /^chore\(release\):\s+(?:v\d+\.\d+\.\d+|\S+-v\d+\.\d+\.\d+)(?:,\s+(?:v\d+\.\d+\.\d+|\S+-v\d+\.\d+\.\d+))*(?:\s+\(#\d+\))?$/u.test(subject);
 }

package/dist/config/schema.d.ts

@@ -31,6 +31,7 @@ export declare const configSchema: z.ZodObject<{
                 regex: "regex";
             }>;
             path: z.ZodString;
+            "field-path": z.ZodOptional<z.ZodString>;
             jsonpath: z.ZodOptional<z.ZodString>;
             pattern: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>>;

package/dist/config/schema.js

@@ -6,16 +6,18 @@ const artifactRuleSchema = zod_1.z
     .object({
     type: zod_1.z.enum(["json", "toml", "yaml", "regex"]),
     path: zod_1.z.string().min(1),
+    "field-path": zod_1.z.string().optional(),
     jsonpath: zod_1.z.string().optional(),
     pattern: zod_1.z.string().optional(),
 })
     .superRefine((value, ctx) => {
     const needsJsonPath = value.type === "json" || value.type === "toml" || value.type === "yaml";
-    if (needsJsonPath && !value.jsonpath) {
+    const hasFieldPath = Boolean(value["field-path"] ?? value.jsonpath);
+    if (needsJsonPath && !hasFieldPath) {
         ctx.addIssue({
             code: zod_1.z.ZodIssueCode.custom,
-            message: `${value.type} artifact rules require "jsonpath".`,
-            path: ["jsonpath"],
+            message: `${value.type} artifact rules require "field-path" (or deprecated "jsonpath").`,
+            path: ["field-path"],
         });
     }
     if (needsJsonPath && value.pattern) {
@@ -25,6 +27,13 @@ const artifactRuleSchema = zod_1.z
             path: ["pattern"],
         });
     }
+    if (value["field-path"] && value.jsonpath) {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            message: 'Specify only one of "field-path" or deprecated "jsonpath".',
+            path: ["field-path"],
+        });
+    }
     if (value.type === "regex" && !value.pattern) {
         ctx.addIssue({
             code: zod_1.z.ZodIssueCode.custom,
@@ -32,11 +41,11 @@ const artifactRuleSchema = zod_1.z
             path: ["pattern"],
         });
     }
-    if (value.type === "regex" && value.jsonpath) {
+    if (value.type === "regex" && (value["field-path"] || value.jsonpath)) {
         ctx.addIssue({
             code: zod_1.z.ZodIssueCode.custom,
-            message: 'regex artifact rules do not support "jsonpath".',
-            path: ["jsonpath"],
+            message: 'regex artifact rules do not support "field-path" or deprecated "jsonpath".',
+            path: ["field-path"],
         });
     }
 });

package/dist/types/config.d.ts

@@ -2,6 +2,7 @@ export type ConfigFileFormat = "jsonc" | "json" | "toml" | "js";
 export interface VersionaryArtifactRule {
     type: "json" | "toml" | "yaml" | "regex";
     path: string;
+    "field-path"?: string;
     jsonpath?: string;
     pattern?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "versionary",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Automatic release framework based on conventional commits and semantic versioning",
   "keywords": [
     "releasing",