@contractkit/plugin-typescript 0.17.3 → 0.17.4

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-05T15:36:48.642Z
+                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">857x</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">313x</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">247x</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">171x</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">134x</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-05T15:36:48.642Z
+                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-05T15:36:48.642Z
+                at 2026-05-05T15:55:20.433Z
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -2581,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));
@@ -2601,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("/**");
@@ -2637,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)}`);
@@ -2650,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) {