alignfirst 0.1.0-beta.6 → 0.1.0-beta.7

package/dist/commands/plans.js

@@ -5,6 +5,7 @@ import { CliError } from "../cli-error.js";
 import { assertMainWorktreeRoot } from "../git.js";
 import { parseBareCommandArgs, parseCommandArgs } from "../parse-args.js";
 import { archiveEntry, archiveThresholdDays, autoArchive } from "../plans/archive.js";
+import { isTicketName } from "../plans/layout.js";
 import { linkPlans } from "../plans/link.js";
 import { resolvePlansMode } from "../plans/mode.js";
 import { findStoppedRebase, renderStoppedRebase } from "../plans/rebase.js";
@@ -156,9 +157,10 @@ function resolveArchiveTarget(ctx, args, usage) {
     const stats = statSync(target, { throwIfNoEntry: false });
     if (!stats?.isDirectory() || realpathSync(dirname(target)) !== realpathSync(plansDir))
         throw new CliError(`${argument} must be an existing directory directly under .plans.`);
-    if (basename(target).startsWith("_"))
+    const name = basename(target);
+    if (!isTicketName(name))
         throw new CliError(`${argument}: names starting with _ are not tickets.`);
-    return target;
+    return join(plansDir, name);
 }
 function isPathArgument(argument) {
     return argument.includes("/") || argument.includes("\\");

package/dist/commands/ticket.js

@@ -16,11 +16,11 @@ Files over 64 KiB are listed without content. Above 30 KiB of output, only the e
 list is printed.
 `;
 export function runTicket(ctx, args) {
-    assertPlansGate(ctx.cwd, ctx.form);
     const usage = renderUsage(ctx);
     const parsed = parseTicketArgs(ctx, args, usage);
     if (parsed === undefined)
         return 0;
+    assertPlansGate(ctx.cwd, ctx.form);
     const result = resolveTicket(ctx, parsed);
     if (parsed.catchup) {
         ctx.stdout.write(renderCatchup(ctx.cwd, result, renderReport(ctx, parsed, result)));

package/dist/conventions.js

@@ -1,6 +1,7 @@
 import { existsSync, lstatSync } from "node:fs";
 import { join } from "node:path";
 import { renderDefaultBranchLine, resolveDefaultBranch } from "./default-branch.js";
+import { errorMessage } from "./errors.js";
 import { gitOutputOrUndefined, gitSucceeds } from "./git.js";
 import { resolvePlansMode } from "./plans/mode.js";
 export function renderConventions(ctx) {
@@ -59,8 +60,7 @@ function renderPlans(ctx) {
         return `${base}${archival}`;
     }
     catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        return `Plans: ${message.split("\n", 1)[0]}`;
+        return `Plans: ${errorMessage(error).split("\n", 1)[0]}`;
     }
 }
 function plansEntryExists(cwd) {

package/dist/plans/catchup.js

@@ -1,6 +1,7 @@
 import { readFileSync } from "node:fs";
 import { join, relative } from "node:path";
 import { CliError } from "../cli-error.js";
+import { errorMessage } from "../errors.js";
 import { formatLocalTimestamp, formatSize } from "../format.js";
 const MAX_FILE_BYTES = 64 * 1024;
 const MAX_OUTPUT_BYTES = 30 * 1024;
@@ -49,7 +50,6 @@ function readBody(cwd, file) {
         return readFileSync(join(cwd, file.path), "utf-8");
     }
     catch (error) {
-        const detail = error instanceof Error ? error.message : String(error);
-        throw new CliError(`Cannot load catchup file ${file.path}: ${detail}`);
+        throw new CliError(`Cannot load catchup file ${file.path}: ${errorMessage(error)}`);
     }
 }

package/dist/plans/layout.d.ts

@@ -1,9 +1,11 @@
+import { type Stats } from "node:fs";
 import { CliError } from "../cli-error.js";
 export declare const PLANS_DIR = ".plans";
 export declare const ARCHIVES_DIR = "_archives";
 export declare function isTicketName(name: string): boolean;
 export declare function plansDir(cwd: string): string;
 export declare function archivesDir(cwd: string): string;
-export declare function assertPlansGate(cwd: string, form: string): void;
+/** Returns the lstat of `.plans`, so callers can tell a symlink from a directory. */
+export declare function assertPlansGate(cwd: string, form: string): Stats;
 export declare function missingPlansMessage(form: string): string;
 export declare function missingPlansError(form: string): CliError;

package/dist/plans/layout.js

@@ -1,4 +1,4 @@
-import { existsSync } from "node:fs";
+import { existsSync, lstatSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { CliError } from "../cli-error.js";
 export const PLANS_DIR = ".plans";
@@ -12,10 +12,17 @@ export function plansDir(cwd) {
 export function archivesDir(cwd) {
     return join(plansDir(cwd), ARCHIVES_DIR);
 }
+/** Returns the lstat of `.plans`, so callers can tell a symlink from a directory. */
 export function assertPlansGate(cwd, form) {
-    if (existsSync(plansDir(cwd)))
-        return;
-    throw missingPlansError(form);
+    const path = plansDir(cwd);
+    const stats = lstatSync(path, { throwIfNoEntry: false });
+    if (!stats)
+        throw missingPlansError(form);
+    if (stats.isSymbolicLink() && !existsSync(path))
+        throw new CliError(`The .plans symlink is broken. Re-run ${form} plans setup with the clone location.`);
+    if (!statSync(path).isDirectory())
+        throw new CliError(`.plans is not a directory. Remove it, then run ${form} plans setup (see the project documentation).`);
+    return stats;
 }
 export function missingPlansMessage(form) {
     return `No .plans/ directory in the current directory.\nLocal plans:  mkdir .plans && echo .plans >> .gitignore\nTeam plans:   ${form} plans setup <clone-dir>`;

package/dist/plans/mode.js

@@ -1,17 +1,11 @@
-import { existsSync, lstatSync, realpathSync, statSync } from "node:fs";
+import { realpathSync } from "node:fs";
 import { join } from "node:path";
 import { CliError } from "../cli-error.js";
 import { gitOutput } from "../git.js";
-import { missingPlansError } from "./layout.js";
+import { assertPlansGate } from "./layout.js";
 export function resolvePlansMode(cwd, form) {
     const plansPath = join(cwd, ".plans");
-    const stats = lstatSync(plansPath, { throwIfNoEntry: false });
-    if (!stats)
-        throw missingPlansError(form);
-    if (stats.isSymbolicLink() && !existsSync(plansPath))
-        throw new CliError(`The .plans symlink is broken. Re-run ${form} plans setup with the clone location.`);
-    if (!statSync(plansPath).isDirectory())
-        throw new CliError(`.plans is not a directory. Remove it, then run ${form} plans setup (see the project documentation).`);
+    const stats = assertPlansGate(cwd, form);
     if (plansRepositoryId(plansPath, stats.isSymbolicLink(), form) === repositoryId(cwd))
         return { kind: "local" };
     return { kind: "shared", repoToplevel: gitOutput(plansPath, "rev-parse", "--show-toplevel") };

package/dist/plans/ticket.js

@@ -105,7 +105,7 @@ export function isPathSafeTicketId(id) {
     return id !== "." && !id.includes("..") && PATH_SAFE_TICKET.test(id);
 }
 export function validateTicketId(id, pattern) {
-    if (!isPathSafeTicketId(id))
+    if (!isPathSafeTicketId(id) || !isTicketName(id))
         throw new CliError(`Invalid ticket id: ${id}`);
     if (pattern !== undefined && !new RegExp(pattern).test(id) && !SIDE_TICKET.test(id))
         throw new CliError(`Ticket id "${id}" does not match ticketIdPattern "${pattern}".`);

package/dist/project-config.js

@@ -75,6 +75,26 @@ function assertValidPattern(pattern, label) {
     catch (error) {
         throw invalidConfig(label, `ticketIdPattern is not a valid regular expression: ${errorMessage(error)}`);
     }
+    if (hasInnerAnchor(pattern))
+        throw invalidConfig(label, "ticketIdPattern must be one anchored expression; group alternatives: ^(ABC|XYZ)-\\d+$");
+}
+/** Branch detection unanchors the pattern by trimming its ends, so inner anchors never match. */
+function hasInnerAnchor(pattern) {
+    let inClass = false;
+    for (let i = 0; i < pattern.length; ++i) {
+        const char = pattern[i];
+        if (char === "\\")
+            ++i;
+        else if (inClass)
+            inClass = char !== "]";
+        else if (char === "[")
+            inClass = true;
+        else if (char === "^" && i !== 0)
+            return true;
+        else if (char === "$" && i !== pattern.length - 1)
+            return true;
+    }
+    return false;
 }
 function assertValidPortRange(range, label) {
     if (range.first > range.last)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alignfirst",
-  "version": "0.1.0-beta.6",
+  "version": "0.1.0-beta.7",
   "license": "CC0-1.0",
   "author": "Thomas MUR",
   "description": "The AlignFirst CLI: protocols, plans and docs in one command.",