@distilled.cloud/core 1.0.0-rc.7 → 1.0.0-rc.9

package/lib/codegen/spec-path.d.ts

@@ -0,0 +1,16 @@
+/** Set to a non-empty value to read specs from `specs/.local` instead. */
+export declare const LOCAL_ENV = "DISTILLED_SPECS_LOCAL";
+/** The local working copy of a mirror, relative to a package root. */
+export declare const LOCAL_DIR: string;
+/** Repository name of the mirror feeding `packages/<pkg>`. */
+export declare const mirrorRepositoryName: (pkg: string) => string;
+/** Whether this process reads specs from `specs/.local`. */
+export declare const isLocalSpecs: () => boolean;
+/**
+ * Resolve a package-relative spec path to an absolute one.
+ *
+ * @param root      absolute package root (`path.resolve(import.meta.dir, "..")`)
+ * @param specPath  the production path, relative to `root` (or absolute)
+ */
+export declare const resolveSpecPath: (root: string, specPath: string) => string;
+//# sourceMappingURL=spec-path.d.ts.map

package/lib/codegen/spec-path.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spec-path.d.ts","sourceRoot":"","sources":["../../src/codegen/spec-path.ts"],"names":[],"mappings":"AAoCA,0EAA0E;AAC1E,eAAO,MAAM,SAAS,0BAA0B,CAAC;AAEjD,sEAAsE;AACtE,eAAO,MAAM,SAAS,QAA+B,CAAC;AAEtD,8DAA8D;AAC9D,eAAO,MAAM,oBAAoB,QAAS,MAAM,WAAyB,CAAC;AAE1E,4DAA4D;AAC5D,eAAO,MAAM,YAAY,QAAO,OACc,CAAC;AAyB/C;;;;;GAKG;AACH,eAAO,MAAM,eAAe,SAAU,MAAM,YAAY,MAAM,KAAG,MAoChE,CAAC"}

package/lib/codegen/spec-path.js

@@ -0,0 +1,101 @@
+/**
+ * Spec path resolution — the seam between a production spec mirror and a
+ * local working copy of one (dev-time only).
+ *
+ * Every SDK package reads its specs from `packages/<pkg>/specs/`. In
+ * production that directory holds a submodule of the package's mirror
+ * repository, `distilled-mirror/spec-mirror-<pkg>`, whose layout is fixed:
+ *
+ *   packages/<pkg>/specs/spec-mirror-<pkg>/
+ *   ├── .meta/          fetch-specs.ts + its package.json
+ *   └── specs/          what the generator reads
+ *
+ * A contributor adding a provider cannot create that repository — it lives in
+ * an org they have no write access to, and it is only created once the
+ * `distilled-submodules` stack deploys on merge to main. So `pnpm specs:local
+ * <pkg>` runs the same `fetch-specs.ts` into a gitignored directory shaped
+ * exactly like the mirror:
+ *
+ *   packages/<pkg>/specs/.local/
+ *   ├── .meta/
+ *   └── specs/
+ *
+ * Setting {@link LOCAL_ENV} then re-roots every spec read into it. Nothing in
+ * the package's source changes — the `specPath` a `convert.ts` declares stays
+ * the production one — so there is no `.local` reference that could be
+ * committed by accident, and the switch is impossible to leave on: it lives
+ * in the environment of one command, never in a file.
+ *
+ * The opt-in is deliberate rather than a fallback-when-missing. A silent
+ * fallback would regenerate an SDK from a stale `.local` copy the moment a
+ * submodule failed to check out, and the result — committed, formatted,
+ * plausible — would be indistinguishable from a real regeneration.
+ */
+import * as fs from "node:fs";
+import * as path from "node:path";
+/** Set to a non-empty value to read specs from `specs/.local` instead. */
+export const LOCAL_ENV = "DISTILLED_SPECS_LOCAL";
+/** The local working copy of a mirror, relative to a package root. */
+export const LOCAL_DIR = path.join("specs", ".local");
+/** Repository name of the mirror feeding `packages/<pkg>`. */
+export const mirrorRepositoryName = (pkg) => `spec-mirror-${pkg}`;
+/** Whether this process reads specs from `specs/.local`. */
+export const isLocalSpecs = () => (process.env[LOCAL_ENV] ?? "").trim() !== "";
+let announced = false;
+/**
+ * The path within a mirror's `specs/` directory that `specPath` names.
+ *
+ * Spec paths take one of two shapes — `specs/<mirror>/specs/<tail>` for a
+ * submodule and `specs/<tail>` for a committed file — and in both the tail is
+ * everything after the LAST `specs` segment. That one rule covers the
+ * submodule form, the committed form, the nested forms
+ * (`specs/<mirror>/specs/models/<service>/...`) and the directory form
+ * (`specs/<mirror>/specs`, whose tail is empty — the mirror's `specs/`
+ * directory itself) without needing to know which it was handed.
+ *
+ * `undefined` means there is no `specs` segment at all, which local mode
+ * cannot interpret.
+ */
+const tailWithinSpecs = (specPath) => {
+    const segments = specPath.split(/[/\\]/).filter((s) => s !== "" && s !== ".");
+    const last = segments.lastIndexOf("specs");
+    if (last === -1)
+        return undefined;
+    return segments.slice(last + 1).join(path.sep);
+};
+/**
+ * Resolve a package-relative spec path to an absolute one.
+ *
+ * @param root      absolute package root (`path.resolve(import.meta.dir, "..")`)
+ * @param specPath  the production path, relative to `root` (or absolute)
+ */
+export const resolveSpecPath = (root, specPath) => {
+    const production = path.resolve(root, specPath);
+    if (!isLocalSpecs() || path.isAbsolute(specPath))
+        return production;
+    const tail = tailWithinSpecs(specPath);
+    if (tail === undefined) {
+        throw new Error(`${LOCAL_ENV} is set, but "${specPath}" has no \`specs/\` segment to ` +
+            `re-root. Local mode only understands paths under the package's ` +
+            `specs/ directory.`);
+    }
+    if (!announced) {
+        announced = true;
+        // stderr, not stdout: generate-all captures stdout per package and only
+        // prints it on failure, and this is exactly the line you need to see on
+        // a run that succeeded against the wrong specs.
+        console.error(`⚠  ${LOCAL_ENV} — reading specs from ${LOCAL_DIR}, not the mirror submodule.`);
+    }
+    const local = path.join(root, LOCAL_DIR, "specs", tail);
+    if (!fs.existsSync(local)) {
+        // A missing local spec is a setup mistake, not a generator bug, and the
+        // ENOENT the caller would otherwise raise names a path nobody recognises.
+        throw new Error(`${local} does not exist. Materialise this package's mirror first:\n` +
+            `  pnpm specs:local ${path.basename(root)}\n` +
+            `If that succeeds and this path is still missing, the package's ` +
+            `declared spec path (${specPath}) is not mirror-shaped yet — it must ` +
+            `read \`specs/<mirror>/specs/<file>\` for local mode to find it.`);
+    }
+    return local;
+};
+//# sourceMappingURL=spec-path.js.map

package/lib/codegen/spec-path.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spec-path.js","sourceRoot":"","sources":["../../src/codegen/spec-path.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,0EAA0E;AAC1E,MAAM,CAAC,MAAM,SAAS,GAAG,uBAAuB,CAAC;AAEjD,sEAAsE;AACtE,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAEtD,8DAA8D;AAC9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,eAAe,GAAG,EAAE,CAAC;AAE1E,4DAA4D;AAC5D,MAAM,CAAC,MAAM,YAAY,GAAG,GAAY,EAAE,CACxC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;AAE/C,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB;;;;;;;;;;;;;GAaG;AACH,MAAM,eAAe,GAAG,CAAC,QAAgB,EAAsB,EAAE;IAC/D,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IAC9E,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,IAAI,KAAK,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAClC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,QAAgB,EAAU,EAAE;IACxE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,YAAY,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,UAAU,CAAC;IAEpE,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,GAAG,SAAS,iBAAiB,QAAQ,iCAAiC;YACpE,iEAAiE;YACjE,mBAAmB,CACtB,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,SAAS,GAAG,IAAI,CAAC;QACjB,wEAAwE;QACxE,wEAAwE;QACxE,gDAAgD;QAChD,OAAO,CAAC,KAAK,CACX,MAAM,SAAS,yBAAyB,SAAS,6BAA6B,CAC/E,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACxD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,wEAAwE;QACxE,0EAA0E;QAC1E,MAAM,IAAI,KAAK,CACb,GAAG,KAAK,6DAA6D;YACnE,sBAAsB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI;YAC7C,iEAAiE;YACjE,uBAAuB,QAAQ,uCAAuC;YACtE,iEAAiE,CACpE,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/lib/json-patch.d.ts

@@ -1,10 +1,11 @@
 /**
  * JSON Patch (RFC 6902) Implementation
  *
- * Provides a unified spec patching system for all SDKs. Patches are applied to
- * generated intermediary specs (Smithy models, OpenAPI docs, …) before code
- * generation to add typed error shapes, rename operations, mark nullable
- * fields, etc. Ported from the distilled repo's `core/json-patch`.
+ * Provides a unified spec patching system for all SDKs. Patches apply in
+ * `convert` so `.generated-specs` is the patched Smithy model. generate does
+ * not patch. Prefer `operationNaming: "verbNoun"` for operationId renames —
+ * JSON pointers at `/paths/~1foo/operationId` go stale when upstream prefixes
+ * paths.
  *
  * Pure functions only — callers load patch files themselves (the generators
  * use Effect's FileSystem) and hand the parsed operations to `applyPatch`.
@@ -23,6 +24,13 @@ export interface PatchFile {
 /** Parse a JSON Pointer (RFC 6901) path into segments. */
 export declare function parseJsonPointer(pointer: string): string[];
 /** Get a value at a JSON Pointer path. */
+/**
+ * The target location of a patch operation is absent from the document —
+ * spec drift (renamed/removed upstream), not a malformed patch.
+ */
+export declare class StaleTargetError extends Error {
+    readonly name = "StaleTargetError";
+}
 export declare function getValueAtPath(obj: unknown, pointer: string): unknown;
 /** Set a value at a JSON Pointer path. */
 export declare function setValueAtPath(obj: unknown, pointer: string, value: unknown): void;
@@ -33,12 +41,11 @@ export declare function applyOperation(obj: unknown, operation: JsonPatchOperati
 /** Apply a JSON Patch to an object (mutates in place). */
 export declare function applyPatch(obj: unknown, patch: JsonPatch): void;
 /**
- * Whether a per-operation failure is caused by the target location being
- * absent from the spec (i.e. spec drift — the operation/shape the patch
- * targets was renamed or removed upstream) as opposed to a malformed patch.
- * Stale targets should be skipped with a warning rather than aborting the
- * whole generate; a patch that only adds an error to an operation that no
- * longer exists is harmless to drop.
+ * Whether a per-operation failure is a {@link StaleTargetError} (the
+ * operation/shape the patch targets was renamed or removed upstream) as
+ * opposed to a malformed patch. Accepts the thrown value or its message.
+ * Convert fails the run on these by default (`onStalePatch: "fail"`);
+ * `"warn"` restores skip-and-continue.
  */
-export declare function isStaleTargetError(message: string): boolean;
+export declare function isStaleTargetError(error: unknown): boolean;
 //# sourceMappingURL=json-patch.d.ts.map

package/lib/json-patch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-patch.d.ts","sourceRoot":"","sources":["../src/json-patch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAC;AAE7C,MAAM,WAAW,SAAS;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;CACpB;AAMD,0DAA0D;AAC1D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAS1D;AAED,0CAA0C;AAC1C,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAiBrE;AAED,0CAA0C;AAC1C,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,GACb,IAAI,CAoCN;AAED,6CAA6C;AAC7C,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAgCrE;AAMD,oEAAoE;AACpE,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,kBAAkB,GAC5B,IAAI,CA+CN;AAED,0DAA0D;AAC1D,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAI/D;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAK3D"}
+{"version":3,"file":"json-patch.d.ts","sourceRoot":"","sources":["../src/json-patch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAC;AAE7C,MAAM,WAAW,SAAS;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;CACpB;AAMD,0DAA0D;AAC1D,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAS1D;AAED,0CAA0C;AAC1C;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,SAAkB,IAAI,sBAAsB;CAC7C;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAkCrE;AAED,0CAA0C;AAC1C,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,GACb,IAAI,CAsCN;AAED,6CAA6C;AAC7C,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CA+CrE;AAMD,oEAAoE;AACpE,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,kBAAkB,GAC5B,IAAI,CAoDN;AAED,0DAA0D;AAC1D,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAI/D;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAe1D"}

package/lib/json-patch.js

@@ -1,10 +1,11 @@
 /**
  * JSON Patch (RFC 6902) Implementation
  *
- * Provides a unified spec patching system for all SDKs. Patches are applied to
- * generated intermediary specs (Smithy models, OpenAPI docs, …) before code
- * generation to add typed error shapes, rename operations, mark nullable
- * fields, etc. Ported from the distilled repo's `core/json-patch`.
+ * Provides a unified spec patching system for all SDKs. Patches apply in
+ * `convert` so `.generated-specs` is the patched Smithy model. generate does
+ * not patch. Prefer `operationNaming: "verbNoun"` for operationId renames —
+ * JSON pointers at `/paths/~1foo/operationId` go stale when upstream prefixes
+ * paths.
  *
  * Pure functions only — callers load patch files themselves (the generators
  * use Effect's FileSystem) and hand the parsed operations to `applyPatch`.
@@ -25,19 +26,35 @@ export function parseJsonPointer(pointer) {
         .map((segment) => segment.replace(/~1/g, "/").replace(/~0/g, "~"));
 }
 /** Get a value at a JSON Pointer path. */
+/**
+ * The target location of a patch operation is absent from the document —
+ * spec drift (renamed/removed upstream), not a malformed patch.
+ */
+export class StaleTargetError extends Error {
+    name = "StaleTargetError";
+}
 export function getValueAtPath(obj, pointer) {
     const segments = parseJsonPointer(pointer);
     let current = obj;
     for (const segment of segments) {
-        if (current === null || typeof current !== "object") {
-            throw new Error(`Cannot traverse path ${pointer}: not an object`);
+        if (current === null ||
+            current === undefined ||
+            typeof current !== "object") {
+            throw new StaleTargetError(`JSON pointer ${pointer} missing (at '${segment}'): not an object`);
         }
         if (Array.isArray(current)) {
             const index = segment === "-" ? current.length : parseInt(segment, 10);
+            if (index < 0 || index >= current.length) {
+                throw new StaleTargetError(`JSON pointer ${pointer} missing index '${segment}'`);
+            }
             current = current[index];
         }
         else {
-            current = current[segment];
+            const record = current;
+            if (!Object.prototype.hasOwnProperty.call(record, segment)) {
+                throw new StaleTargetError(`JSON pointer ${pointer} missing key '${segment}'`);
+            }
+            current = record[segment];
         }
     }
     return current;
@@ -52,7 +69,7 @@ export function setValueAtPath(obj, pointer, value) {
     for (let i = 0; i < segments.length - 1; i++) {
         const segment = segments[i];
         if (current === null || typeof current !== "object") {
-            throw new Error(`Cannot traverse path ${pointer}: not an object`);
+            throw new StaleTargetError(`Cannot traverse path ${pointer}: not an object`);
         }
         if (Array.isArray(current)) {
             current = current[parseInt(segment, 10)];
@@ -63,7 +80,7 @@ export function setValueAtPath(obj, pointer, value) {
     }
     const lastSegment = segments[segments.length - 1];
     if (current === null || typeof current !== "object") {
-        throw new Error(`Cannot set value at path ${pointer}: parent is not an object`);
+        throw new StaleTargetError(`Cannot set value at path ${pointer}: parent is not an object`);
     }
     if (Array.isArray(current)) {
         if (lastSegment === "-") {
@@ -87,7 +104,7 @@ export function removeValueAtPath(obj, pointer) {
     for (let i = 0; i < segments.length - 1; i++) {
         const segment = segments[i];
         if (current === null || typeof current !== "object") {
-            throw new Error(`Cannot traverse path ${pointer}: not an object`);
+            throw new StaleTargetError(`Cannot traverse path ${pointer}: not an object`);
         }
         if (Array.isArray(current)) {
             current = current[parseInt(segment, 10)];
@@ -98,13 +115,22 @@ export function removeValueAtPath(obj, pointer) {
     }
     const lastSegment = segments[segments.length - 1];
     if (current === null || typeof current !== "object") {
-        throw new Error(`Cannot remove at path ${pointer}: parent is not an object`);
+        throw new StaleTargetError(`Cannot remove at path ${pointer}: parent is not an object`);
     }
+    // RFC 6902 §4.2: the target location MUST exist.
     if (Array.isArray(current)) {
-        current.splice(parseInt(lastSegment, 10), 1);
+        const index = parseInt(lastSegment, 10);
+        if (Number.isNaN(index) || index < 0 || index >= current.length) {
+            throw new StaleTargetError(`JSON pointer ${pointer} missing index '${lastSegment}'`);
+        }
+        current.splice(index, 1);
     }
     else {
-        delete current[lastSegment];
+        const record = current;
+        if (!Object.prototype.hasOwnProperty.call(record, lastSegment)) {
+            throw new StaleTargetError(`JSON pointer ${pointer} missing key '${lastSegment}'`);
+        }
+        delete record[lastSegment];
     }
 }
 // ============================================================================
@@ -119,17 +145,20 @@ export function applyOperation(obj, operation) {
         case "remove":
             removeValueAtPath(obj, operation.path);
             break;
-        case "replace":
-            // For replace, the path must exist
-            getValueAtPath(obj, operation.path); // throws if doesn't exist
+        case "replace": {
+            const existing = getValueAtPath(obj, operation.path);
+            if (existing === undefined) {
+                throw new StaleTargetError(`JSON pointer ${operation.path} does not exist`);
+            }
             setValueAtPath(obj, operation.path, operation.value);
             break;
+        }
         case "move": {
             if (!operation.from)
                 throw new Error("move operation requires 'from'");
             const moveValue = getValueAtPath(obj, operation.from);
             if (moveValue === undefined) {
-                throw new Error(`Cannot move from path ${operation.from}: not an object`);
+                throw new StaleTargetError(`Cannot move from path ${operation.from}: not an object`);
             }
             removeValueAtPath(obj, operation.from);
             setValueAtPath(obj, operation.path, moveValue);
@@ -160,15 +189,24 @@ export function applyPatch(obj, patch) {
     }
 }
 /**
- * Whether a per-operation failure is caused by the target location being
- * absent from the spec (i.e. spec drift — the operation/shape the patch
- * targets was renamed or removed upstream) as opposed to a malformed patch.
- * Stale targets should be skipped with a warning rather than aborting the
- * whole generate; a patch that only adds an error to an operation that no
- * longer exists is harmless to drop.
+ * Whether a per-operation failure is a {@link StaleTargetError} (the
+ * operation/shape the patch targets was renamed or removed upstream) as
+ * opposed to a malformed patch. Accepts the thrown value or its message.
+ * Convert fails the run on these by default (`onStalePatch: "fail"`);
+ * `"warn"` restores skip-and-continue.
  */
-export function isStaleTargetError(message) {
+export function isStaleTargetError(error) {
+    if (error instanceof StaleTargetError)
+        return true;
+    const message = typeof error === "string"
+        ? error
+        : error instanceof Error
+            ? error.message
+            : "";
     return (message.includes("not an object") ||
-        message.includes("parent is not an object"));
+        message.includes("parent is not an object") ||
+        message.includes("missing key") ||
+        message.includes("missing index") ||
+        message.includes("does not exist"));
 }
 //# sourceMappingURL=json-patch.js.map

package/lib/json-patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-patch.js","sourceRoot":"","sources":["../src/json-patch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json-patch.js","sourceRoot":"","sources":["../src/json-patch.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/core",
-  "version": "1.0.0-rc.7",
+  "version": "1.0.0-rc.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -28,13 +28,13 @@
     }
   },
   "devDependencies": {
-    "@effect/platform-bun": ">=4.0.0-rc.111 || >=4.0.0",
+    "@effect/platform-bun": ">=4.0.0-rc.112 || >=4.0.0",
     "@types/bun": "latest",
     "@types/node": "latest",
-    "effect": ">=4.0.0-rc.111 || >=4.0.0"
+    "effect": ">=4.0.0-rc.112 || >=4.0.0"
   },
   "peerDependencies": {
-    "effect": ">=4.0.0-rc.111 || >=4.0.0"
+    "effect": ">=4.0.0-rc.112 || >=4.0.0"
   },
   "scripts": {
     "build": "tsc -b"

package/src/codegen/cli.ts

@@ -1,12 +1,11 @@
 /**
  * The generic generator CLI harness (dev-time only).
  *
- * Owns the smithy-model pipeline every SDK package shares: scan the model
- * directory (plus optional hand-authored manual specs), apply the RFC-6902
- * patch chain (`patches/<resource>/*.json`, `*.manual.json` last; stale
- * targets warn, malformed patches fail the run), compile each model through
- * {@link generateService} with the provider's {@link SdkSpec}, write the
- * service modules and the namespaced barrel.
+ * Owns the smithy→SDK pipeline every SDK package shares: scan the model
+ * directory (plus optional hand-authored manual specs), compile each model
+ * through {@link generateService} with the provider's {@link SdkSpec}, write
+ * the service modules and the namespaced barrel. RFC-6902 patches apply in
+ * convert so `.generated-specs` is already the patched model.
  *
  * A provider's `scripts/generate.ts` is: trait consts + an SdkSpec + a
  * `runGeneratorCli` call.
@@ -17,11 +16,6 @@ import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import { Flag } from "effect/unstable/cli";
 import { Command } from "effect/unstable/cli";
-import {
-  applyOperation,
-  isStaleTargetError,
-  type PatchFile,
-} from "../json-patch.ts";
 import { barrel } from "./emit.ts";
 import { formatGenerated } from "./format.ts";
 import { generateService, type SdkSpec } from "./generator.ts";
@@ -85,13 +79,15 @@ export interface GeneratorCliOptions {
   readonly continueOnModelError?: boolean;
   /** Directory of hand-authored models merged after the generated ones. */
   readonly manualSpecsDir?: string;
-  /** RFC-6902 patch chain root. Default `patches`; `false` disables. */
-  readonly patchesDir?: string | false;
   /**
-   * Model transform applied AFTER the patch chain, before generation —
-   * for whole-model rewrites that must see post-patch shape names (e.g.
-   * cloudflare's scope-twin structural dedup). May mutate the model;
-   * a returned log line is printed.
+   * RFC-6902 patches apply in convert, never here. Only `false` is accepted
+   * so a string is a type error rather than a silently ignored setting.
+   */
+  readonly patchesDir?: false;
+  /**
+   * Model transform applied before generation (e.g. AWS dropping
+   * unreachable foreign-namespace shapes from a vendored model). Does not
+   * write back to `.generated-specs` — convert owns the committed model.
    */
   readonly transformModel?: (model: any, resource: string) => string | void;
   /** The provider spec — built per model (metadata may vary per model). */
@@ -168,28 +164,6 @@ export const runGeneratorCli = (options: GeneratorCliOptions): void => {
         const written: string[] = [];
         const failedModels: string[] = [];
         let totalOps = 0;
-        let totalPatches = 0;
-        let staleOps = 0;
-        const badPatches: string[] = [];
-
-        // Orphan check: a patch directory matching no smithy model would be
-        // silently dropped — flag it instead.
-        const patchRoot =
-          options.patchesDir === false
-            ? undefined
-            : path.join(root, options.patchesDir ?? "patches");
-        if (patchRoot && (yield* fs.exists(patchRoot))) {
-          const resources = new Set(
-            entries.map((e) => e.file.replace(/\.json$/, "")),
-          );
-          for (const dir of yield* fs.readDirectory(patchRoot)) {
-            if (!resources.has(dir)) {
-              yield* Console.warn(
-                `⚠️  patches/${dir}/ matches no smithy model — orphaned?`,
-              );
-            }
-          }
-        }
 
         for (const { file, dir } of entries) {
           const model = JSON.parse(
@@ -202,43 +176,6 @@ export const runGeneratorCli = (options: GeneratorCliOptions): void => {
             file.replace(/\.json$/, "");
           if (config.resource && resource !== config.resource) continue;
 
-          // Apply the RFC-6902 patch chain before generating. Hand-written
-          // *.manual.json patches apply after the generated ones — they
-          // usually target post-rename shape names.
-          const patchDir = patchRoot && path.join(patchRoot, resource);
-          if (patchDir && (yield* fs.exists(patchDir))) {
-            const patchFiles = (yield* fs.readDirectory(patchDir))
-              .filter((f) => f.endsWith(".json"))
-              .sort(
-                (a, b) =>
-                  Number(a.endsWith(".manual.json")) -
-                    Number(b.endsWith(".manual.json")) || a.localeCompare(b),
-              );
-            for (const pf of patchFiles) {
-              const parsed = JSON.parse(
-                yield* fs.readFileString(path.join(patchDir, pf)),
-              ) as PatchFile;
-              for (const patchOp of parsed.patches ?? []) {
-                try {
-                  applyOperation(model, patchOp);
-                } catch (e) {
-                  const msg = e instanceof Error ? e.message : String(e);
-                  if (isStaleTargetError(msg)) {
-                    staleOps++;
-                    yield* Console.warn(
-                      `   ⚠️  stale: ${resource}/${pf} [${patchOp.op} ${patchOp.path}]`,
-                    );
-                  } else {
-                    badPatches.push(
-                      `${resource}/${pf} [${patchOp.op} ${patchOp.path}]: ${msg}`,
-                    );
-                  }
-                }
-              }
-              totalPatches++;
-            }
-          }
-
           if (options.transformModel) {
             const note = options.transformModel(model, resource);
             if (note) yield* Console.log(`   ${note}`);
@@ -267,17 +204,6 @@ export const runGeneratorCli = (options: GeneratorCliOptions): void => {
           totalOps += operations;
         }
 
-        if (badPatches.length) {
-          for (const b of badPatches) {
-            yield* Console.error(`❌ bad patch: ${b}`);
-          }
-          return yield* Effect.die(
-            new Error(
-              `${badPatches.length} malformed patch operation(s) — fix or remove them`,
-            ),
-          );
-        }
-
         // Barrel — namespace per resource to avoid op-name collisions.
         //
         // A FULL run is authoritative: the barrel is exactly what was
@@ -331,10 +257,7 @@ export const runGeneratorCli = (options: GeneratorCliOptions): void => {
         yield* (options.finalize ?? formatGenerated)(outDir);
 
         yield* Console.log(
-          `\n✅ Generated ${totalOps} operations across ${written.length} resource modules` +
-            (totalPatches
-              ? ` (${totalPatches} patch files applied${staleOps ? `, ${staleOps} stale op(s) skipped` : ""}).`
-              : "."),
+          `\n✅ Generated ${totalOps} operations across ${written.length} resource modules.`,
         );
         yield* Console.log(`   ${path.join(outDir, "index.ts")}`);
 

package/src/codegen/graphql.ts

@@ -39,6 +39,8 @@
  * out of packages/expo-eas.
  */
 
+import { toVerbNoun } from "./rewrite-operation-ids.ts";
+
 // ============================================================================
 // GraphQL introspection types (subset of the canonical spec)
 // ============================================================================
@@ -222,6 +224,12 @@ export interface GraphQLConvertOptions {
   readonly customScalars?: Record<string, string>;
   /** Relay connection pagination. Omit (or `false`) to emit no `paginated`. */
   readonly relay?: RelayOptions | false;
+  /**
+   * SDK operation name style. Default `"verbNoun"` (`projectCreate` →
+   * `createProject`). The GraphQL document's `operationName` stays the
+   * schema field name.
+   */
+  readonly operationNaming?: "as-is" | "verbNoun";
 }
 
 export interface GraphQLConvertResult {
@@ -917,6 +925,7 @@ export const convertGraphQLToSmithy = (
     skipRootField = () => false,
     customScalars = {},
     relay = false,
+    operationNaming = "verbNoun",
   } = options;
 
   const typeMap = new Map<string, IntrospectionType>();
@@ -950,11 +959,24 @@ export const convertGraphQLToSmithy = (
       );
       for (const opPath of paths) {
         const functionName = pathToFunctionName(opPath);
-        if (seenNames.has(functionName)) continue;
-        seenNames.add(functionName);
+        const sdkName =
+          operationNaming === "verbNoun"
+            ? toVerbNoun(functionName)
+            : functionName;
+        if (seenNames.has(sdkName)) {
+          // Two schema fields (or the same field under two paths) map to
+          // one SDK name; the first wins. Silent drops hide real ops.
+          if (sdkName !== functionName) {
+            console.warn(
+              `   ⚠️  verbNoun collision: ${functionName} → ${sdkName} already taken (dropped)`,
+            );
+          }
+          continue;
+        }
+        seenNames.add(sdkName);
         pending.push({
           functionName,
-          opName: toPascalCase(functionName),
+          opName: toPascalCase(sdkName),
           type,
           path: opPath,
           description: