repokeeper 0.4.6 → 0.4.7

package/dist/model.js

@@ -2,6 +2,8 @@ export const MANAGED_HEADER = "Managed by repokeeper (https://github.com/vannt-d
 /** Header of YAML files repokeeper creates but owns only in part. */
 export const YAML_HEADER = `${MANAGED_HEADER} Keys and jobs you add yourself are left alone.`;
 export function outputId(output) {
+    if (output.kind === "marker")
+        return `marker:${output.path}`;
     if (output.kind === "file")
         return `file:${output.path}`;
     if (output.kind === "seed")
@@ -13,6 +15,8 @@ export function outputId(output) {
     return `json:${output.path}#${JSON.stringify(output.keyPath)}`;
 }
 export function describeOutput(output) {
+    if (output.kind === "marker")
+        return `${output.path} (release-please version markers)`;
     if (output.kind === "file" || output.kind === "seed")
         return output.path;
     if (output.kind === "block")

package/dist/modules/release.js

@@ -6,5 +6,11 @@ export function pickRelease(stacks) {
 export const releaseModule = {
     id: "release",
     enabled: (config) => config.modules.release,
-    outputs: (ctx) => ctx.platform.releaseAutomation(ctx, pickRelease(ctx.stacks)),
+    outputs: (ctx) => {
+        const release = pickRelease(ctx.stacks);
+        const markers = release.versionLine
+            ? [{ kind: "marker", module: "release", path: release.versionLine.path, line: release.versionLine.line }]
+            : [];
+        return [...ctx.platform.releaseAutomation(ctx, release), ...markers];
+    },
 };

package/dist/stacks/gradle.js

@@ -10,7 +10,14 @@ export async function gradleBuild(root) {
     return {
         command: wrapper ? "./gradlew check" : "gradle check",
         wrapper,
-        // release-please's generic updater changes gradle.properties once it carries x-release-please markers
-        release: { type: "simple", version, ...(properties !== null ? { extraFiles: ["gradle.properties"] } : {}) },
+        // release-please's generic updater only edits gradle.properties between x-release-please markers,
+        // which the release module adds around the version line
+        release: {
+            type: "simple",
+            version,
+            ...(version !== null
+                ? { extraFiles: ["gradle.properties"], versionLine: { path: "gradle.properties", line: "^version\\s*=" } }
+                : {}),
+        },
     };
 }

package/dist/sync/apply.js

@@ -5,6 +5,7 @@ import { removeBlock, upsertBlock } from "./block.js";
 import { hashText } from "./hash.js";
 import { deleteAtPath, formatJson, setAtPath } from "./json.js";
 import { targetOf, writeLock } from "./lock.js";
+import { addMarkers } from "./marker.js";
 import { desiredText } from "./state.js";
 import { deleteYamlKey, setYamlKey } from "./yaml.js";
 async function readOrNull(path) {
@@ -26,6 +27,8 @@ async function write(root, output) {
     if (output.kind === "file" || output.kind === "seed")
         return put(path, output.content);
     const existing = await readOrNull(path);
+    if (output.kind === "marker")
+        return existing === null ? undefined : put(path, addMarkers(existing, output.line));
     if (output.kind === "block")
         return put(path, upsertBlock(existing, output.id, output.body, output.comment));
     if (output.kind === "yaml") {
@@ -37,7 +40,7 @@ async function write(root, output) {
 }
 async function remove(root, target) {
     const path = join(root, target.path);
-    if (target.kind === "seed")
+    if (target.kind === "seed" || target.kind === "marker")
         return;
     if (target.kind === "file")
         return rm(path, { force: true });

package/dist/sync/decide.js

@@ -7,6 +7,9 @@ export function decide(output, currentText, entry, adopt) {
     const current = hashText(currentText);
     if (current === hashText(desiredText(output)))
         return "unchanged";
+    // adding the two marker lines is always safe, so they are written without --adopt or --accept
+    if (output.kind === "marker")
+        return "write";
     if (entry)
         return current === entry.hash ? "write" : "conflict";
     return adopt ? "adopt" : "unmanaged";
@@ -15,7 +18,8 @@ export function decide(output, currentText, entry, adopt) {
 export function decideRemoval(entry, currentText) {
     if (currentText === null)
         return "gone";
-    if (entry.target.kind === "seed")
-        return "left"; // other tools own a seed once it exists
+    // other tools own a seed once it exists, and release-please uses the markers
+    if (entry.target.kind === "seed" || entry.target.kind === "marker")
+        return "left";
     return hashText(currentText) === entry.hash ? "delete" : "orphan-edited";
 }

package/dist/sync/lock.js

@@ -3,6 +3,8 @@ import { dirname, join } from "node:path";
 import { LockError } from "../errors.js";
 export const LOCK_FILE = ".repokeeper/lock.json";
 export function targetOf(output) {
+    if (output.kind === "marker")
+        return { kind: "marker", path: output.path, line: output.line };
     if (output.kind === "file")
         return { kind: "file", path: output.path };
     if (output.kind === "seed")

package/dist/sync/marker.js

@@ -0,0 +1,28 @@
+/** release-please's block markers for a version in a file its generic updater edits. */
+export const MARKER_START = "# x-release-please-start-version";
+export const MARKER_END = "# x-release-please-end";
+const HAS_MARKERS = /x-release-please-(start-version|version)\b/;
+const UNMARKED = "unmarked";
+function eolOf(text) {
+    return text.includes("\r\n") ? "\r\n" : "\n";
+}
+function lineIndex(lines, line) {
+    const pattern = new RegExp(line);
+    return lines.findIndex((l) => pattern.test(l));
+}
+/** "" when there is nothing to add (no file, no matching line, or markers already present), else "unmarked". */
+export function markerState(text, line) {
+    if (text === null || HAS_MARKERS.test(text))
+        return "";
+    return lineIndex(text.split(eolOf(text)), line) === -1 ? "" : UNMARKED;
+}
+/** The text with block markers around the first line matching `line`; unchanged when there is nothing to add. */
+export function addMarkers(text, line) {
+    if (markerState(text, line) === "")
+        return text;
+    const eol = eolOf(text);
+    const lines = text.split(eol);
+    const index = lineIndex(lines, line);
+    lines.splice(index, 1, MARKER_START, lines[index], MARKER_END);
+    return lines.join(eol);
+}

package/dist/sync/state.js

@@ -3,13 +3,14 @@ import { join } from "node:path";
 import { UsageError } from "../errors.js";
 import { readBlock } from "./block.js";
 import { getAtPath } from "./json.js";
+import { markerState } from "./marker.js";
 import { readYamlKey } from "./yaml.js";
 /** The text repokeeper compares and hashes for an output. */
 export function desiredText(output) {
     if (output.kind === "file")
         return output.content;
     // a seed only has to exist, so present content always compares equal
-    if (output.kind === "seed")
+    if (output.kind === "seed" || output.kind === "marker")
         return "";
     if (output.kind === "block")
         return output.body;
@@ -28,6 +29,9 @@ async function readText(root, path) {
 /** The same comparable text read from disk, or null when absent. */
 export async function readCurrent(root, target) {
     const text = await readText(root, target.path);
+    // markers are added to a file the user owns; a missing file or line means there is nothing to add
+    if (target.kind === "marker")
+        return markerState(text, target.line);
     if (text === null)
         return null;
     if (target.kind === "file")

package/dist/version.js

@@ -1,7 +1,7 @@
 import { readFileSync } from "node:fs";
 export const PACKAGE_VERSION = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
 /** The standard this build of repokeeper applies. Bump it whenever generated output changes. */
-export const STANDARD_VERSION = "1.4.2";
+export const STANDARD_VERSION = "1.4.3";
 export const TOOL_VERSIONS = {
     lefthook: "2.1.14",
     commitlintCli: "21.2.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repokeeper",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "Keep every repository on one maintained standard: commits, git hooks, CI, releases, dependency updates and repo settings.",
   "type": "module",
   "bin": {