primitive-admin 1.1.0-alpha.71 → 1.1.0-alpha.73

package/dist/src/commands/sync.d.ts

@@ -5,6 +5,7 @@ import { type FieldForm } from "../lib/toml-native-form.js";
 import { type PushMode } from "../lib/config-payload.js";
 import { type ConfigObjectSurface, type ConfigTable } from "../lib/generated-config-surfaces.js";
 import { type PresenceOutcome, type TestBlockType } from "../lib/sync-resource-types.js";
+export { resolveSlugCollisions, slugifyTestCaseName, testCaseFileBasenames, } from "../lib/test-case-file-names.js";
 import type { SyncState } from "../types/index.js";
 import { type SyncSelection } from "../lib/sync-selectors.js";
 /**
@@ -1806,17 +1807,6 @@ export declare function unselectedRuleSetIds(params: {
     /** The `ruleSet.name` a file declares — the name references use. */
     nameForFile: (file: string) => string | undefined;
 }): Map<string, string>;
-export declare function slugifyTestCaseName(name: string): string;
-/**
- * The name to use for `slug`, given the names already taken.
- *
- * `occupy` decides what "already taken" means, and `usedSlugs` holds names in
- * that form (#2896): a file name is occupied CASE-INSENSITIVELY on the
- * filesystems most of these trees live on, so `Foo` and `foo` are one file even
- * though they are two strings. The returned name keeps its own casing — only
- * the occupancy check is normalized.
- */
-export declare function resolveSlugCollisions(slug: string, usedSlugs: Set<string>, occupy?: (name: string) => string): string;
 export declare function getTestsDir(configDir: string, blockType: string, blockKey: string): string;
 export interface TestCaseLookupMaps {
     configIdToName: Map<string, string>;
@@ -2091,25 +2081,6 @@ export declare function pushTestCasesForBlock(params: {
 }): Promise<{
     skipped: number;
 }>;
-/**
- * The file name each live test case belongs in (#2896).
- *
- * A KEYED case is named by its key: that is what the key is — the basename the
- * committed tree carries. An unkeyed one (created by web-admin, an older CLI or
- * the raw API) keeps the slug-of-name naming, with the collision suffixes
- * resolved only AFTER the keys have claimed theirs, so a slug can never take a
- * name a key owns.
- *
- * One function for pull, for pairing's adoption pass and for the diff's
- * remote-only rows, because three commands that name a case's file differently
- * is the disagreement this issue reports.
- *
- * Two names that differ only by CASE are one file on a case-insensitive
- * filesystem, so occupancy is tracked the way the server's key constraint
- * normalizes: a keyed `Foo` and an unkeyed case named "foo" get `Foo.toml` and
- * `foo-2.toml`, rather than one pull silently overwriting the other's sidecar.
- */
-export declare function testCaseFileBasenames(liveCases: any[], onUnusableKey?: (live: any, reason: string) => void, isSafeName?: (name: string) => boolean): Map<any, string>;
 /**
  * Whether a sidecar and a live case say the same thing (#2896).
  *
@@ -2320,4 +2291,3 @@ export declare function applyTestCasePrune(params: {
  * are internal identifiers, deliberately left alone (#2759 scope).
  */
 export declare function registerConfigSyncCommands(sync: Command): void;
-export {};

package/dist/src/commands/sync.js

@@ -35,6 +35,11 @@ import { CONFIG_SURFACES, isEmptyForEmit, } from "../lib/generated-config-surfac
 import { detectLayout, migrateLegacyToV2 } from "../lib/block-layout.js";
 import { ABSENT_FROM_EXPORT, LOCAL_ONLY_ABSENT, LOCAL_ONLY_NEW, PUSH_PRUNE_SPECS, REMOTE_ONLY_UNMANAGED, REMOTE_ONLY_WILL_DELETE, SYNC_RESOURCE_TYPES, VALIDATION_ERROR, applyPrune, attachmentWritePath, attemptFetch, classifyLocalOnly, classifyPruneDeleteFailure, classifyRemoteOnly, collectPushPruneCandidates, decidePushPruneCandidate, formatPrunePlan, hasUncommittedChanges, isSafeAttachmentFilename, isSafeSyncFilename, planPrune, preserveUnwrittenEntries, removePrunedSidecar, ruleSetFileKey, } from "../lib/sync-resource-types.js";
 import { normalizeTestCaseKey, testCaseKeyError, } from "../lib/test-case-keys.js";
+import { slugifyTestCaseName, testCaseFileBasenames, } from "../lib/test-case-file-names.js";
+// The sidecar naming rules moved to `lib/` so `scripts tests` can read them
+// without loading the sync tree (#3061); re-exported here because pull, push,
+// diff and their tests have always imported them from this module.
+export { resolveSlugCollisions, slugifyTestCaseName, testCaseFileBasenames, } from "../lib/test-case-file-names.js";
 import { success, error, printApiError, info, warn, keyValue, json, divider, } from "../lib/output.js";
 import { filterFilesBySelection, parseSyncSelectors, SelectorError, selectionIncludesKey, selectionIncludesType, selectionIncludesApp, selectionIncludesAnyVar, unmatchedSelectors, } from "../lib/sync-selectors.js";
 import { confirmPrompt, ConfirmPromptError } from "../lib/confirm-prompt.js";
@@ -4335,37 +4340,6 @@ export function unselectedRuleSetIds(params) {
     }
     return seeded;
 }
-// Test case helpers (exported for unit testing)
-export function slugifyTestCaseName(name) {
-    return name
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, "-")
-        .replace(/^-+|-+$/g, "")
-        || "test";
-}
-/**
- * The name to use for `slug`, given the names already taken.
- *
- * `occupy` decides what "already taken" means, and `usedSlugs` holds names in
- * that form (#2896): a file name is occupied CASE-INSENSITIVELY on the
- * filesystems most of these trees live on, so `Foo` and `foo` are one file even
- * though they are two strings. The returned name keeps its own casing — only
- * the occupancy check is normalized.
- */
-export function resolveSlugCollisions(slug, usedSlugs, occupy = (name) => name) {
-    const taken = (candidate) => usedSlugs.has(occupy(candidate));
-    if (!taken(slug)) {
-        usedSlugs.add(occupy(slug));
-        return slug;
-    }
-    let counter = 2;
-    while (taken(`${slug}-${counter}`)) {
-        counter++;
-    }
-    const resolved = `${slug}-${counter}`;
-    usedSlugs.add(occupy(resolved));
-    return resolved;
-}
 export function getTestsDir(configDir, blockType, blockKey) {
     // Scripts (blockType "script") live under `transforms/` on disk (their
     // bodies are `transforms/<name>.rhai`), so their test cases sit alongside at
@@ -5478,54 +5452,6 @@ export async function pushTestCasesForBlock(params) {
     }
     return { skipped };
 }
-/**
- * The file name each live test case belongs in (#2896).
- *
- * A KEYED case is named by its key: that is what the key is — the basename the
- * committed tree carries. An unkeyed one (created by web-admin, an older CLI or
- * the raw API) keeps the slug-of-name naming, with the collision suffixes
- * resolved only AFTER the keys have claimed theirs, so a slug can never take a
- * name a key owns.
- *
- * One function for pull, for pairing's adoption pass and for the diff's
- * remote-only rows, because three commands that name a case's file differently
- * is the disagreement this issue reports.
- *
- * Two names that differ only by CASE are one file on a case-insensitive
- * filesystem, so occupancy is tracked the way the server's key constraint
- * normalizes: a keyed `Foo` and an unkeyed case named "foo" get `Foo.toml` and
- * `foo-2.toml`, rather than one pull silently overwriting the other's sidecar.
- */
-export function testCaseFileBasenames(liveCases, onUnusableKey, isSafeName) {
-    const used = new Set();
-    const occupy = (name) => normalizeTestCaseKey(name);
-    const names = new Map();
-    const unkeyed = [];
-    for (const live of liveCases) {
-        const key = typeof live?.key === "string" ? live.key : "";
-        if (!key) {
-            unkeyed.push(live);
-            continue;
-        }
-        // The key is SERVER data on its way to becoming a path. A server that
-        // stored one this CLI would not have sent must not be able to name a file
-        // outside the sidecar directory.
-        const reason = testCaseKeyError(key) ??
-            (isSafeName && !isSafeName(key)
-                ? `test case key "${key}" is not a safe file name here`
-                : null);
-        if (reason) {
-            onUnusableKey?.(live, reason);
-            unkeyed.push(live);
-            continue;
-        }
-        names.set(live, resolveSlugCollisions(key, used, occupy));
-    }
-    for (const live of unkeyed) {
-        names.set(live, resolveSlugCollisions(slugifyTestCaseName(live?.name || "unnamed"), used, occupy));
-    }
-    return names;
-}
 /**
  * Whether a sidecar and a live case say the same thing (#2896).
  *