@specverse/engines 6.42.3 → 6.60.1

package/dist/normalise/rules/crud-into-curved.js

@@ -0,0 +1,303 @@
+/**
+ * Normalise rule: `crud-into-curved`.
+ *
+ * Phase 3 of `2026-05-13-NORMALISE-PHASE.md` §5 Rule 2. Lifts Service
+ * operations that match the canonical CRUD shape onto their target
+ * entity's Controller `cured:` block. This eliminates redundant service
+ * shells for plain CRUD wrappers — SpecVerse generates
+ * `cured.retrieve/create/update/delete` from a controller's cured
+ * declaration, so an explicit `Service.getClub` that just does
+ * "look up by id" is duplicating convention.
+ *
+ * Schema note: CURVED operations live on Controllers, NOT on Models.
+ * If the target entity has no Controller declared, the rule synthesises
+ * a `<Entity>Controller` (with `model: <Entity>`) in the same component
+ * as the Model. The cured op lands there.
+ *
+ * Before (post-Rule-1 / cluster-module-functions):
+ *
+ *   components:
+ *     App:
+ *       models:
+ *         Club:
+ *           attributes: [...]
+ *       services:
+ *         ClubsService:
+ *           operations:
+ *             getClub:
+ *               steps: [Look up Club by id, Return Club or null]
+ *               requires: [id is provided]
+ *             getClubPositions:                 # NOT lifted (filtered query)
+ *               steps: [...]
+ *
+ * After:
+ *
+ *   components:
+ *     App:
+ *       models:
+ *         Club:
+ *           attributes: [...]
+ *       controllers:
+ *         ClubController:                       # synthesised by this rule
+ *           model: Club
+ *           cured:
+ *             retrieve:
+ *               steps: [Look up Club by id, Return Club or null]
+ *               requires: [id is provided]
+ *       services:
+ *         ClubsService:
+ *           operations:
+ *             getClubPositions: { ... }        # remains
+ *
+ * If the service becomes empty after lifting, it is dropped entirely.
+ *
+ * Conservative matching:
+ *   - Op name must be EXACTLY `<verb><EntityName>` — no trailing suffix
+ *     (`getRound` ✓, `getRoundsForUser` ✗, `getRoundStatus` ✗)
+ *   - Target Entity name must resolve UNIQUELY to ONE model across all
+ *     components (the cured block goes to whichever component the model
+ *     lives in — cross-component lifts are fine since the cured: lives
+ *     ON the model, not at the service site)
+ *   - Skip when the entity name is declared in multiple components (rare,
+ *     but ambiguous — caller can rename the duplicate)
+ *   - Target model's `cured.<curvedOp>` must NOT already be declared
+ *     (don't overwrite spec-author intent)
+ *   - Verb patterns recognised:
+ *       get / retrieve / find → retrieve
+ *       create / add          → create   (Phase 3: only `create` to stay safe)
+ *       update                → update
+ *       delete / remove       → delete   (Phase 3: only `delete` to stay safe)
+ *
+ * NOT in Phase 3 scope:
+ *   - retrieve_many (list / getAll / search — naming varies too widely)
+ *   - Evolve transitions (would need lifecycle state-machine signal)
+ *   - Cross-component lifts (target model in a different component)
+ *   - Multi-arg create variants (createClubWithPositions)
+ */
+/** Verb → CURVED op mapping. Order matters for prefix matching (longer first). */
+const VERB_MAP = [
+    { verb: 'retrieve', curved: 'retrieve' },
+    { verb: 'create', curved: 'create' },
+    { verb: 'update', curved: 'update' },
+    { verb: 'delete', curved: 'delete' },
+    { verb: 'find', curved: 'retrieve' },
+    { verb: 'get', curved: 'retrieve' },
+];
+/**
+ * Parse an operation name into (verb, entityName) if it matches the
+ * exact `<verb><PascalCaseEntity>` shape. Returns null otherwise.
+ *
+ * The entity portion must be PascalCase, contain no further uppercase
+ * boundaries after the leading letter (i.e. single PascalCase word),
+ * AND must end at the end of the string (no trailing qualifier like
+ * `getRoundStatus` or `getClubsForUser`).
+ */
+function parseCrudOpName(opName) {
+    for (const { verb, curved } of VERB_MAP) {
+        if (!opName.startsWith(verb))
+            continue;
+        const rest = opName.slice(verb.length);
+        if (rest.length === 0)
+            continue;
+        // First character must be uppercase (start of entity name).
+        if (!(rest[0] >= 'A' && rest[0] <= 'Z'))
+            continue;
+        // Rest must be a SINGLE PascalCase word — no further capital letters
+        // after the first character. This rules out compound names like
+        // `getClubPositions` (Positions is a 2nd PascalCase token →
+        // domain-filtered query, NOT plain retrieve).
+        let hasSecondCapital = false;
+        for (let i = 1; i < rest.length; i++) {
+            const c = rest[i];
+            if (c >= 'A' && c <= 'Z') {
+                hasSecondCapital = true;
+                break;
+            }
+        }
+        if (hasSecondCapital)
+            continue;
+        return { verb, curved, entity: rest };
+    }
+    return null;
+}
+/**
+ * Build a model-name → component-name index across all components. Used
+ * by the cross-component target lookup. When an entity name is declared
+ * in multiple components, it's recorded as ambiguous (the rule then
+ * skips matches against that name).
+ */
+function buildModelIndex(spec) {
+    const out = new Map();
+    const components = spec.components;
+    if (!components)
+        return out;
+    for (const [componentName, componentBody] of Object.entries(components)) {
+        const models = componentBody?.models;
+        if (!models)
+            continue;
+        for (const modelName of Object.keys(models)) {
+            const existing = out.get(modelName);
+            if (existing === undefined)
+                out.set(modelName, componentName);
+            else if (existing !== componentName)
+                out.set(modelName, 'ambiguous');
+        }
+    }
+    return out;
+}
+function detectMatchesInComponent(spec, modelIndex, componentName, componentBody) {
+    const out = [];
+    const services = componentBody.services;
+    if (!services)
+        return out;
+    for (const [serviceName, serviceBody] of Object.entries(services)) {
+        if (!serviceBody || typeof serviceBody !== 'object')
+            continue;
+        const ops = serviceBody.operations;
+        if (!ops || typeof ops !== 'object')
+            continue;
+        for (const opName of Object.keys(ops)) {
+            const parsed = parseCrudOpName(opName);
+            if (!parsed)
+                continue;
+            const targetComponent = modelIndex.get(parsed.entity);
+            if (!targetComponent || targetComponent === 'ambiguous')
+                continue;
+            // Look up the target controller's cured block (if a controller
+            // already exists for this model). Skip if the op is already
+            // declared. Controllers may be missing — that's fine; the
+            // transform will synthesise one.
+            const components = spec.components;
+            const targetComponentBody = components[targetComponent];
+            const existingController = findControllerForModel(targetComponentBody, parsed.entity);
+            if (existingController) {
+                const existingCured = existingController.cured;
+                if (existingCured && parsed.curved in existingCured)
+                    continue;
+            }
+            out.push({
+                sourceComponentName: componentName,
+                targetComponentName: targetComponent,
+                modelName: parsed.entity,
+                serviceName,
+                operationName: opName,
+                curvedOp: parsed.curved,
+            });
+        }
+    }
+    return out;
+}
+/**
+ * Find the controller in `componentBody` whose `model:` field references
+ * the given entity name. Returns the controller body, or null if none.
+ * The controller's KEY in the controllers object is the controller name
+ * (e.g. ClubController); the `model:` field declares which model it
+ * operates on.
+ */
+function findControllerForModel(componentBody, modelName) {
+    const controllers = componentBody.controllers;
+    if (!controllers || typeof controllers !== 'object')
+        return null;
+    for (const ctrlBody of Object.values(controllers)) {
+        if (!ctrlBody || typeof ctrlBody !== 'object')
+            continue;
+        if (ctrlBody.model === modelName) {
+            return ctrlBody;
+        }
+    }
+    return null;
+}
+function applyCrudMatch(spec, data) {
+    const components = spec.components;
+    const sourceComponent = components[data.sourceComponentName];
+    const targetComponent = components[data.targetComponentName];
+    const services = sourceComponent.services;
+    const serviceBody = services[data.serviceName];
+    const ops = serviceBody.operations;
+    const opBody = ops[data.operationName];
+    // Locate the target controller (synthesise one if absent).
+    let targetController = findControllerForModel(targetComponent, data.modelName);
+    let targetControllerName = null;
+    if (!targetController) {
+        targetControllerName = `${data.modelName}Controller`;
+        targetController = { model: data.modelName };
+        // Insert into the component's controllers map. Create the map if
+        // it doesn't exist (preserving the standard position in the
+        // component — models then controllers then services).
+        const existingControllers = targetComponent.controllers ?? {};
+        existingControllers[targetControllerName] = targetController;
+        targetComponent.controllers = existingControllers;
+    }
+    else {
+        // Find the key of the existing controller (we have its body, need its name for description).
+        const allControllers = targetComponent.controllers;
+        for (const [k, v] of Object.entries(allControllers)) {
+            if (v === targetController) {
+                targetControllerName = k;
+                break;
+            }
+        }
+    }
+    // Insert under controller.cured.<curvedOp>. Preserve standard order.
+    const existingCured = targetController.cured ?? {};
+    const newCured = {};
+    const STANDARD_ORDER = ['create', 'update', 'retrieve', 'retrieve_many', 'validate', 'evolve', 'delete'];
+    const allKeys = new Set([...Object.keys(existingCured), data.curvedOp]);
+    for (const k of STANDARD_ORDER) {
+        if (allKeys.has(k)) {
+            newCured[k] = k === data.curvedOp ? opBody : existingCured[k];
+        }
+    }
+    for (const [k, v] of Object.entries(existingCured)) {
+        if (!STANDARD_ORDER.includes(k))
+            newCured[k] = v;
+    }
+    targetController.cured = newCured;
+    // Remove operation from service.
+    delete ops[data.operationName];
+    // If the service has no remaining operations, drop the service. If
+    // doing so leaves an empty services map, drop that too.
+    if (Object.keys(ops).length === 0) {
+        delete services[data.serviceName];
+        if (Object.keys(services).length === 0) {
+            delete sourceComponent.services;
+        }
+    }
+    return spec;
+}
+export const CRUD_INTO_CURVED_RULE = {
+    id: 'crud-into-curved',
+    summary: 'Lift Service operations matching <verb><Entity> exactly (where Entity is a model in the same component) to the model\'s cured: block. Drop service if empty.',
+    ordering: 10,
+    enabledByDefault: true,
+    appliesWhen: (ctx) => ctx.source !== 'hand-authored',
+    detect: (spec) => {
+        const matches = [];
+        const components = spec.components;
+        if (!components || typeof components !== 'object')
+            return matches;
+        const modelIndex = buildModelIndex(spec);
+        for (const [componentName, componentBody] of Object.entries(components)) {
+            if (!componentBody || typeof componentBody !== 'object')
+                continue;
+            const found = detectMatchesInComponent(spec, modelIndex, componentName, componentBody);
+            for (const data of found) {
+                const crossComp = data.sourceComponentName !== data.targetComponentName;
+                matches.push({
+                    description: `${data.sourceComponentName}.${data.serviceName}.${data.operationName} → ${data.targetComponentName}.${data.modelName}.cured.${data.curvedOp}${crossComp ? ' (cross-component)' : ''}`,
+                    data,
+                });
+            }
+        }
+        return matches;
+    },
+    transform: (spec, match) => {
+        return applyCrudMatch(spec, match.data);
+    },
+};
+export const __internal = {
+    parseCrudOpName,
+    buildModelIndex,
+    detectMatchesInComponent,
+};
+//# sourceMappingURL=crud-into-curved.js.map

package/dist/normalise/rules/crud-into-curved.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crud-into-curved.js","sourceRoot":"","sources":["../../../src/normalise/rules/crud-into-curved.ts"],"names":[],"mappings":"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"}

package/dist/normalise/rules/drop-trivial-passthrough.d.ts

@@ -0,0 +1,92 @@
+/**
+ * Normalise rule: `drop-trivial-passthrough`.
+ *
+ * Phase 4 of `2026-05-13-NORMALISE-PHASE.md` §5 Rule 3. Removes
+ * Controller.cured operations whose declared body is just the framework
+ * default — a single look-up / insert / update / delete with no
+ * preconditions, no published events, and no branching.
+ *
+ * Rationale: SpecVerse's realize phase auto-emits standard CURVED
+ * implementations for every Model. When an explicit `cured.retrieve:`
+ * block exists in the spec, realize uses it INSTEAD of the framework
+ * default. If the explicit body is semantically identical to the
+ * default ("Look up X by id, return X or null"), declaring it is
+ * noise — drop it and let inference fill in the default at realize
+ * time.
+ *
+ * Before (post-Rule-2):
+ *
+ *   ClubController:
+ *     model: Club
+ *     cured:
+ *       retrieve:
+ *         steps:
+ *           - Look up Club by id
+ *           - Return Club or null
+ *         requires: [id is provided]
+ *
+ * After:
+ *
+ *   (Whole ClubController removed — synthesised by Rule 2,
+ *    body was trivial, no other content remains.)
+ *
+ * Triviality criteria (ALL must hold):
+ *   - `steps:` has ≤ 2 entries
+ *   - No `publishes:` field, or `publishes: []`
+ *   - Step text matches the operation's verb pattern:
+ *       retrieve  →  look up / find / fetch / retrieve / select
+ *       create    →  create / insert / store / persist
+ *       update    →  update / set / modify
+ *       delete    →  delete / remove
+ *
+ * Cleanup after dropping ops:
+ *   - If `cured` becomes empty, delete it
+ *   - If the Controller is now empty except for `model:` (i.e. we
+ *     synthesised it via Rule 2 and there's nothing else), drop the
+ *     whole controller. Be conservative: keep controllers that have
+ *     `actions:`, `subscriptions:`, `path:`, or other content the user
+ *     might have added.
+ *   - If the component's controllers map is empty, delete it.
+ *
+ * NOT in scope:
+ *   - Service operations (would require knowing the inference default
+ *     applies, which it doesn't for filtered/predicate queries)
+ *   - retrieve_many / list operations (default inference may or may not
+ *     match the explicit body)
+ *   - Bodies with non-trivial preconditions/postconditions (those carry
+ *     real spec intent worth preserving even when steps look default)
+ */
+import type { NormaliseRule, NormaliseSpec } from '../normalise-rules.js';
+interface DropMatchData {
+    componentName: string;
+    controllerName: string;
+    curvedOp: string;
+}
+/**
+ * Is the body of a cured op trivial enough to drop? Examines steps +
+ * publishes + the keyword match for the curved op.
+ *
+ * Trivial rules:
+ *   - No `publishes:` (event-driven side effect = non-trivial)
+ *   - ≤2 steps
+ *   - 0 steps → trivial (already minimal)
+ *   - 1 step → trivial as long as it doesn't contain FORBIDDEN keywords
+ *     (a single step IS the operation; verb-keyword check is meaningless
+ *     because LLMs often collapse "look up X / return X" into one step
+ *     like "Return Club by id")
+ *   - 2 steps → require at least one step matches the verb keyword AND
+ *     the other matches TRIVIAL_FOLLOWUP (e.g. "Return X or null"); no
+ *     step may match FORBIDDEN
+ */
+declare function isTrivialBody(body: unknown, curvedOp: string): boolean;
+/**
+ * Detect drop candidates by walking spec.components[*].controllers[*].cured[*].
+ */
+declare function detectDropMatches(spec: NormaliseSpec): DropMatchData[];
+export declare const DROP_TRIVIAL_PASSTHROUGH_RULE: NormaliseRule;
+export declare const __internal: {
+    isTrivialBody: typeof isTrivialBody;
+    detectDropMatches: typeof detectDropMatches;
+};
+export {};
+//# sourceMappingURL=drop-trivial-passthrough.d.ts.map

package/dist/normalise/rules/drop-trivial-passthrough.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"drop-trivial-passthrough.d.ts","sourceRoot":"","sources":["../../../src/normalise/rules/drop-trivial-passthrough.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AAEH,OAAO,KAAK,EACV,aAAa,EAGb,aAAa,EACd,MAAM,uBAAuB,CAAC;AAE/B,UAAU,aAAa;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB;AA2BD;;;;;;;;;;;;;;;GAeG;AACH,iBAAS,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAqC/D;AAED;;GAEG;AACH,iBAAS,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,aAAa,EAAE,CAsB/D;AAkCD,eAAO,MAAM,6BAA6B,EAAE,aAsB3C,CAAC;AAEF,eAAO,MAAM,UAAU;;;CAGtB,CAAC"}

package/dist/normalise/rules/drop-trivial-passthrough.js

@@ -0,0 +1,217 @@
+/**
+ * Normalise rule: `drop-trivial-passthrough`.
+ *
+ * Phase 4 of `2026-05-13-NORMALISE-PHASE.md` §5 Rule 3. Removes
+ * Controller.cured operations whose declared body is just the framework
+ * default — a single look-up / insert / update / delete with no
+ * preconditions, no published events, and no branching.
+ *
+ * Rationale: SpecVerse's realize phase auto-emits standard CURVED
+ * implementations for every Model. When an explicit `cured.retrieve:`
+ * block exists in the spec, realize uses it INSTEAD of the framework
+ * default. If the explicit body is semantically identical to the
+ * default ("Look up X by id, return X or null"), declaring it is
+ * noise — drop it and let inference fill in the default at realize
+ * time.
+ *
+ * Before (post-Rule-2):
+ *
+ *   ClubController:
+ *     model: Club
+ *     cured:
+ *       retrieve:
+ *         steps:
+ *           - Look up Club by id
+ *           - Return Club or null
+ *         requires: [id is provided]
+ *
+ * After:
+ *
+ *   (Whole ClubController removed — synthesised by Rule 2,
+ *    body was trivial, no other content remains.)
+ *
+ * Triviality criteria (ALL must hold):
+ *   - `steps:` has ≤ 2 entries
+ *   - No `publishes:` field, or `publishes: []`
+ *   - Step text matches the operation's verb pattern:
+ *       retrieve  →  look up / find / fetch / retrieve / select
+ *       create    →  create / insert / store / persist
+ *       update    →  update / set / modify
+ *       delete    →  delete / remove
+ *
+ * Cleanup after dropping ops:
+ *   - If `cured` becomes empty, delete it
+ *   - If the Controller is now empty except for `model:` (i.e. we
+ *     synthesised it via Rule 2 and there's nothing else), drop the
+ *     whole controller. Be conservative: keep controllers that have
+ *     `actions:`, `subscriptions:`, `path:`, or other content the user
+ *     might have added.
+ *   - If the component's controllers map is empty, delete it.
+ *
+ * NOT in scope:
+ *   - Service operations (would require knowing the inference default
+ *     applies, which it doesn't for filtered/predicate queries)
+ *   - retrieve_many / list operations (default inference may or may not
+ *     match the explicit body)
+ *   - Bodies with non-trivial preconditions/postconditions (those carry
+ *     real spec intent worth preserving even when steps look default)
+ */
+const VERB_KEYWORDS = {
+    retrieve: /\b(look\s*up|find|fetch|retrieve|select|get|read|query|load|pull)\b/i,
+    create: /\b(create|insert|store|persist|add|save)\b/i,
+    update: /\b(update|set|modify|change|patch)\b/i,
+    delete: /\b(delete|remove|destroy|drop|erase)\b/i,
+};
+/**
+ * Patterns indicating that a step is a pure description of default
+ * behavior — "Return X", "Throw NotFoundError", "Yield records". Steps
+ * matching this MAY appear alongside a verb-keyword step without
+ * disqualifying the body from being trivial. Used to allow common
+ * second-step language like "Return Club or null".
+ */
+const TRIVIAL_FOLLOWUP_RE = /^\s*(return|throw|yield|raise)\b/i;
+/**
+ * Patterns indicating non-default behavior — side effects, validation
+ * logic, business operations. Any step matching one of these
+ * disqualifies the body. The intent is to catch real spec content
+ * (`Validate permissions`, `Notify subscribers`, `Audit access`) that
+ * a developer wouldn't want silently discarded.
+ */
+const FORBIDDEN_STEP_RE = /\b(validate|notify|publish|log|audit|check|verify|ensure|calculate|compute|enrich|transform|merge|join|filter|sort|paginate)\b/i;
+/**
+ * Is the body of a cured op trivial enough to drop? Examines steps +
+ * publishes + the keyword match for the curved op.
+ *
+ * Trivial rules:
+ *   - No `publishes:` (event-driven side effect = non-trivial)
+ *   - ≤2 steps
+ *   - 0 steps → trivial (already minimal)
+ *   - 1 step → trivial as long as it doesn't contain FORBIDDEN keywords
+ *     (a single step IS the operation; verb-keyword check is meaningless
+ *     because LLMs often collapse "look up X / return X" into one step
+ *     like "Return Club by id")
+ *   - 2 steps → require at least one step matches the verb keyword AND
+ *     the other matches TRIVIAL_FOLLOWUP (e.g. "Return X or null"); no
+ *     step may match FORBIDDEN
+ */
+function isTrivialBody(body, curvedOp) {
+    if (!body || typeof body !== 'object') {
+        return true;
+    }
+    const b = body;
+    const publishes = b.publishes;
+    if (Array.isArray(publishes) && publishes.length > 0)
+        return false;
+    const steps = b.steps;
+    if (!steps)
+        return true;
+    if (!Array.isArray(steps))
+        return false;
+    if (steps.length > 2)
+        return false;
+    if (steps.length === 0)
+        return true;
+    const verbRe = VERB_KEYWORDS[curvedOp];
+    if (!verbRe)
+        return false;
+    // Quick guard: any step containing forbidden business-logic keywords
+    // disqualifies the body regardless of step count.
+    for (const step of steps) {
+        if (typeof step !== 'string')
+            return false;
+        if (FORBIDDEN_STEP_RE.test(step))
+            return false;
+    }
+    // Single-step body — trivial as long as no forbidden keywords appear.
+    if (steps.length === 1)
+        return true;
+    // Two-step body — require ≥1 verb-keyword match, others must be
+    // trivial follow-ups (Return / Throw etc).
+    let sawVerb = false;
+    for (const step of steps) {
+        const s = step;
+        if (verbRe.test(s))
+            sawVerb = true;
+        else if (TRIVIAL_FOLLOWUP_RE.test(s))
+            continue;
+        else
+            return false;
+    }
+    return sawVerb;
+}
+/**
+ * Detect drop candidates by walking spec.components[*].controllers[*].cured[*].
+ */
+function detectDropMatches(spec) {
+    const out = [];
+    const components = spec.components;
+    if (!components)
+        return out;
+    for (const [componentName, componentBody] of Object.entries(components)) {
+        const controllers = componentBody?.controllers;
+        if (!controllers)
+            continue;
+        for (const [controllerName, controllerBody] of Object.entries(controllers)) {
+            const cured = controllerBody?.cured;
+            if (!cured)
+                continue;
+            for (const [curvedOp, body] of Object.entries(cured)) {
+                if (isTrivialBody(body, curvedOp)) {
+                    out.push({ componentName, controllerName, curvedOp });
+                }
+            }
+        }
+    }
+    return out;
+}
+function applyDropMatch(spec, data) {
+    const components = spec.components;
+    const component = components[data.componentName];
+    const controllers = component.controllers;
+    const controller = controllers[data.controllerName];
+    const cured = controller.cured;
+    delete cured[data.curvedOp];
+    // Clean up empty cured.
+    if (Object.keys(cured).length === 0) {
+        delete controller.cured;
+    }
+    // Drop the controller only when its remaining content is just `model:`
+    // (a synthesised shell from Rule 2). Conservatively keep controllers
+    // that have any of: actions, subscriptions, path, description, or
+    // other fields the user might have authored.
+    const remainingKeys = Object.keys(controller);
+    const isJustModelShell = remainingKeys.length === 1 && remainingKeys[0] === 'model';
+    const isEmpty = remainingKeys.length === 0;
+    if (isJustModelShell || isEmpty) {
+        delete controllers[data.controllerName];
+        if (Object.keys(controllers).length === 0) {
+            delete component.controllers;
+        }
+    }
+    return spec;
+}
+export const DROP_TRIVIAL_PASSTHROUGH_RULE = {
+    id: 'drop-trivial-passthrough',
+    summary: 'Remove explicit cured: operations whose body is just the framework default (≤2 steps, verb-keyword match, no events). Inference re-emits the default at realize time.',
+    ordering: 20,
+    enabledByDefault: true,
+    appliesWhen: (ctx) => ctx.source !== 'hand-authored',
+    detect: (spec) => {
+        const matches = [];
+        for (const data of detectDropMatches(spec)) {
+            matches.push({
+                description: `${data.componentName}.${data.controllerName}.cured.${data.curvedOp} — trivial body, drop (inference will emit framework default)`,
+                data,
+            });
+        }
+        return matches;
+    },
+    transform: (spec, match) => {
+        return applyDropMatch(spec, match.data);
+    },
+};
+export const __internal = {
+    isTrivialBody,
+    detectDropMatches,
+};
+//# sourceMappingURL=drop-trivial-passthrough.js.map

package/dist/normalise/rules/drop-trivial-passthrough.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"drop-trivial-passthrough.js","sourceRoot":"","sources":["../../../src/normalise/rules/drop-trivial-passthrough.ts"],"names":[],"mappings":"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"}