@contractkit/plugin-typescript 0.17.2 → 0.17.4

package/coverage/src/path-utils.ts.html

@@ -634,7 +634,7 @@ export function <span class="fstat-no" title="function not covered" >computePubl
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2026-05-01T18:49:14.623Z
+                at 2026-05-05T15:55:20.433Z
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/src/ts-render.ts.html

@@ -237,7 +237,7 @@
 <span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">165x</span>
+<span class="cline-any cline-yes">178x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -254,9 +254,9 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">330x</span>
+<span class="cline-any cline-yes">343x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">164x</span>
+<span class="cline-any cline-yes">170x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">20x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -273,7 +273,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -292,19 +292,19 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">164x</span>
+<span class="cline-any cline-yes">170x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">116x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -339,8 +339,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">89x</span>
-<span class="cline-any cline-yes">43x</span>
+<span class="cline-any cline-yes">92x</span>
+<span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -363,7 +363,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">16x</span>
+<span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -577,7 +577,7 @@ export function renderOutputTsType(type: ContractTypeNode, modelsWithOutput?: Se
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2026-05-01T18:49:14.623Z
+                at 2026-05-05T15:55:20.433Z
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/tests/helpers.ts.html

@@ -341,11 +341,11 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">847x</span>
+<span class="cline-any cline-yes">874x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">308x</span>
+<span class="cline-any cline-yes">318x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -365,7 +365,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -389,7 +389,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">242x</span>
+<span class="cline-any cline-yes">257x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -401,7 +401,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">166x</span>
+<span class="cline-any cline-yes">178x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -411,7 +411,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">132x</span>
+<span class="cline-any cline-yes">137x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -811,7 +811,7 @@ operation /users/{id}: {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2026-05-01T18:49:14.623Z
+                at 2026-05-05T15:55:20.433Z
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/tests/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2026-05-01T18:49:14.623Z
+                at 2026-05-05T15:55:20.433Z
             </div>
         <script src="../prettify.js"></script>
         <script>

package/dist/codegen-contract.d.ts

@@ -5,6 +5,7 @@ import type { ContractRootNode, ModelNode, ContractTypeNode, ObjectMode } from '
  * @returns `"z.strictObject"` | `"z.object"` | `"z.looseObject"`
  */
 export declare function modeToWrapper(mode: ObjectMode): string;
+/** Cross-file context passed to `generateContract` to wire up imports and Input/Output variant tracking. */
 export interface ContractCodegenContext {
     /** Map from model name → absolute output file path */
     modelOutPaths: Map<string, string>;
@@ -56,9 +57,13 @@ export declare function renderInputType(type: ContractTypeNode, modelsWithInput?
  * Also uses Input variants for model refs when modelsWithInput is provided.
  */
 export declare function renderQueryType(type: ContractTypeNode, modelsWithInput?: Set<string>, defaultMode?: ObjectMode): string;
+/** Returns true if `type` (recursively) contains a scalar with the given `name`. */
 export declare function typeNeedsScalar(type: ContractTypeNode, name: string): boolean;
+/** Returns true if any model in `root` uses a scalar with the given `name`. */
 export declare function rootNeedsScalar(root: ContractRootNode, name: string): boolean;
+/** Returns true if `type` (recursively) contains a `date`, `time`, or `datetime` scalar. */
 export declare function typeNeedsDateTime(type: ContractTypeNode): boolean;
+/** Collect model names referenced in `root` that are not defined locally (need to be imported). */
 export declare function collectExternalRefs(root: ContractRootNode): string[];
 /** Collect external Input variant refs needed for Input schema fields. */
 export declare function collectExternalInputRefs(root: ContractRootNode, modelsWithInput: Set<string>): string[];

package/dist/codegen-contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codegen-contract.d.ts","sourceRoot":"","sources":["../src/codegen-contract.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,gBAAgB,EAChB,SAAS,EAET,gBAAgB,EAWhB,UAAU,EACb,MAAM,mBAAmB,CAAC;AAO3B;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAStD;AAID,MAAM,WAAW,sBAAsB;IACnC,sDAAsD;IACtD,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,8DAA8D;IAC9D,cAAc,EAAE,MAAM,CAAC;IACvB,qFAAqF;IACrF,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,6GAA6G;IAC7G,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAChC;AAID;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,uBAAuB,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAsCzH;AAkBD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAkEjG;AA+RD;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,QAAQ,EAAE,WAAW,CAAC,EAAE,UAAU,GAAG,MAAM,CA6B5H;AA0ND;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,EAAE,UAAU,GAAG,MAAM,CAuDvH;AA2BD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,EAAE,UAAU,GAAG,MAAM,CAsCvH;AA0CD,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAuB7E;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7E;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAiBjE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,EAAE,CAcpE;AAED,0EAA0E;AAC1E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CA4BvG;AAmCD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CA6D/D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAgB3F;AAED,gGAAgG;AAChG,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD"}
+{"version":3,"file":"codegen-contract.d.ts","sourceRoot":"","sources":["../src/codegen-contract.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,gBAAgB,EAChB,SAAS,EAET,gBAAgB,EAWhB,UAAU,EACb,MAAM,mBAAmB,CAAC;AAO3B;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAStD;AAID,4GAA4G;AAC5G,MAAM,WAAW,sBAAsB;IACnC,sDAAsD;IACtD,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,8DAA8D;IAC9D,cAAc,EAAE,MAAM,CAAC;IACvB,qFAAqF;IACrF,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,6GAA6G;IAC7G,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAChC;AAID;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,uBAAuB,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAsCzH;AAkBD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAkEjG;AAsUD;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,QAAQ,EAAE,WAAW,CAAC,EAAE,UAAU,GAAG,MAAM,CA6B5H;AA0ND;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,EAAE,UAAU,GAAG,MAAM,CAuDvH;AA2BD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,EAAE,UAAU,GAAG,MAAM,CAsCvH;AA0CD,oFAAoF;AACpF,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAuB7E;AAED,+EAA+E;AAC/E,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7E;AAED,4FAA4F;AAC5F,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAiBjE;AAED,mGAAmG;AACnG,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,EAAE,CAcpE;AAED,0EAA0E;AAC1E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CA4BvG;AAmCD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CA6D/D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAgB3F;AAED,gGAAgG;AAChG,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD"}

package/dist/codegen-plain-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codegen-plain-types.d.ts","sourceRoot":"","sources":["../src/codegen-plain-types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAwB,MAAM,mBAAmB,CAAC;AAEhF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAapE;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAyCnG"}
+{"version":3,"file":"codegen-plain-types.d.ts","sourceRoot":"","sources":["../src/codegen-plain-types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAwB,MAAM,mBAAmB,CAAC;AAEhF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAapE;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CA2CnG"}

package/dist/index.js

@@ -159,7 +159,7 @@ function generateModel(model, outPath, modelsWithInput, modelsWithWriteonly, mod
   }
   const effective = modelMap ? flattenFormatChain(model, modelMap) : model;
   const needsInputSplit = effective.fields.some((f) => f.visibility !== "normal") || (modelsWithInput?.has(effective.name) ?? false);
-  const lines = needsInputSplit ? generateThreeSchemaModel(effective, outPath, modelsWithInput, modelsWithWriteonly) : generateSimpleModel(effective, outPath);
+  const lines = needsInputSplit ? generateThreeSchemaModel(effective, outPath, modelsWithInput, modelsWithWriteonly, modelMap) : generateSimpleModel(effective, outPath);
   if (modelsWithOutput?.has(effective.name)) {
     lines.push(`export type ${effective.name}Output = z.output<typeof ${effective.name}>;`);
   }
@@ -229,7 +229,21 @@ function buildExtendChain(bases, resolveName) {
   };
 }
 __name(buildExtendChain, "buildExtendChain");
-function generateThreeSchemaModel(model, outPath, modelsWithInput, modelsWithWriteonly) {
+function collectEffectiveWritableFieldNames(modelName, modelMap) {
+  const model = modelMap.get(modelName);
+  if (!model || model.type) return /* @__PURE__ */ new Set();
+  const result = /* @__PURE__ */ new Set();
+  for (const base of model.bases ?? []) {
+    for (const f of collectEffectiveWritableFieldNames(base, modelMap)) result.add(f);
+  }
+  for (const field of model.fields) {
+    if (field.visibility === "readonly") result.delete(field.name);
+    else result.add(field.name);
+  }
+  return result;
+}
+__name(collectEffectiveWritableFieldNames, "collectEffectiveWritableFieldNames");
+function generateThreeSchemaModel(model, outPath, modelsWithInput, modelsWithWriteonly, modelMap) {
   const lines = [];
   const name = model.name;
   lines.push(...generateComments(model, outPath));
@@ -263,9 +277,25 @@ function generateThreeSchemaModel(model, outPath, modelsWithInput, modelsWithWri
   lines.push("");
   const writeFields = allFields.filter((f) => f.visibility !== "readonly");
   const writeBody = modelsWithInput ? renderInputFields(writeFields, modelsWithInput, model.mode) : renderFields(writeFields, model.mode);
+  const fieldsToOmit = /* @__PURE__ */ new Set();
+  if (bases.length > 0 && modelMap) {
+    for (const field of allFields) {
+      if (field.visibility === "readonly") {
+        for (const base of bases) {
+          if (collectEffectiveWritableFieldNames(base, modelMap).has(field.name)) {
+            fieldsToOmit.add(field.name);
+            break;
+          }
+        }
+      }
+    }
+  }
+  const omitClause = fieldsToOmit.size > 0 ? `.omit({ ${[
+    ...fieldsToOmit
+  ].map((f) => `${quoteKey(f)}: true`).join(", ")} })` : "";
   if (bases.length > 0) {
     const { head, tail } = buildExtendChain(bases, (b) => modelsWithInput?.has(b) ? `${b}Input` : b);
-    lines.push(`export const ${name}Input = ${head}${tail}.extend({`);
+    lines.push(`export const ${name}Input = ${head}${tail}${omitClause}.extend({`);
   } else {
     lines.push(`export const ${name}Input = ${wrapper}({`);
   }
@@ -2551,19 +2581,23 @@ function generatePlainTypes(root, context) {
     }
     lines.push("");
   }
+  const modelMap = new Map(root.models.map((m) => [
+    m.name,
+    m
+  ]));
   for (const model of topoSortModels(root.models)) {
-    lines.push(...generateModel2(model, context?.currentOutPath, allModelsWithInput, allModelsWithOutput));
+    lines.push(...generateModel2(model, context?.currentOutPath, allModelsWithInput, allModelsWithOutput, modelMap));
     lines.push("");
   }
   return lines.join("\n");
 }
 __name(generatePlainTypes, "generatePlainTypes");
-function generateModel2(model, outPath, modelsWithInput, modelsWithOutput) {
+function generateModel2(model, outPath, modelsWithInput, modelsWithOutput, modelMap) {
   if (model.type) {
     return generateTypeAlias2(model, outPath, modelsWithInput, modelsWithOutput);
   }
   const needsInputSplit = model.fields.some((f) => f.visibility !== "normal") || (modelsWithInput?.has(model.name) ?? false);
-  const lines = needsInputSplit ? generateVisibilityModel(model, outPath, modelsWithInput) : generateSimpleModel2(model, outPath);
+  const lines = needsInputSplit ? generateVisibilityModel(model, outPath, modelsWithInput, modelMap) : generateSimpleModel2(model, outPath, modelMap);
   if (modelsWithOutput?.has(model.name)) {
     lines.push("");
     lines.push(...generateOutputModel(model, modelsWithOutput));
@@ -2571,6 +2605,23 @@ function generateModel2(model, outPath, modelsWithInput, modelsWithOutput) {
   return lines;
 }
 __name(generateModel2, "generateModel");
+function collectInheritedFieldNames(bases, modelMap) {
+  const result = /* @__PURE__ */ new Set();
+  const visit = /* @__PURE__ */ __name((name) => {
+    const m = modelMap.get(name);
+    if (!m || m.type) return;
+    for (const f of m.fields) result.add(f.name);
+    for (const b of m.bases ?? []) visit(b);
+  }, "visit");
+  for (const b of bases) visit(b);
+  return result;
+}
+__name(collectInheritedFieldNames, "collectInheritedFieldNames");
+function computeOverrideNames(model, modelMap) {
+  const inherited = modelMap ? collectInheritedFieldNames(model.bases ?? [], modelMap) : /* @__PURE__ */ new Set();
+  return model.fields.filter((f) => f.override || inherited.has(f.name)).map((f) => f.name);
+}
+__name(computeOverrideNames, "computeOverrideNames");
 function generateComments2(model, outPath) {
   const lines = [];
   lines.push("/**");
@@ -2607,11 +2658,11 @@ function buildExtendsClause(bases, overrideNames, baseNameResolver) {
   return ` extends ${wrapped.join(", ")}`;
 }
 __name(buildExtendsClause, "buildExtendsClause");
-function generateSimpleModel2(model, outPath) {
+function generateSimpleModel2(model, outPath, modelMap) {
   const lines = [];
   lines.push(...generateComments2(model, outPath));
   const bases = model.bases ?? [];
-  const overrideNames = model.fields.filter((f) => f.override).map((f) => f.name);
+  const overrideNames = computeOverrideNames(model, modelMap);
   lines.push(`export interface ${model.name}${buildExtendsClause(bases, overrideNames, (b) => b)} {`);
   for (const field of model.fields) {
     lines.push(`    ${renderField2(field)}`);
@@ -2620,11 +2671,11 @@ function generateSimpleModel2(model, outPath) {
   return lines;
 }
 __name(generateSimpleModel2, "generateSimpleModel");
-function generateVisibilityModel(model, outPath, modelsWithInput) {
+function generateVisibilityModel(model, outPath, modelsWithInput, modelMap) {
   const lines = [];
   lines.push(...generateComments2(model, outPath));
   const bases = model.bases ?? [];
-  const overrideNames = model.fields.filter((f) => f.override).map((f) => f.name);
+  const overrideNames = computeOverrideNames(model, modelMap);
   const readFields = model.fields.filter((f) => f.visibility !== "writeonly");
   lines.push(`export interface ${model.name}${buildExtendsClause(bases, overrideNames, (b) => b)} {`);
   for (const field of readFields) {