@contractkit/plugin-csharp 0.1.2 → 0.1.3

package/.turbo/turbo-build$colon$ci.log

@@ -5,9 +5,9 @@ $ tsup src/index.ts --format esm --sourcemap --dts && tsc --emitDeclarationOnly
 CLI tsup v8.5.1
 CLI Target: esnext
 ESM Build start
-ESM dist/index.js     86.93 KB
-ESM dist/index.js.map 187.54 KB
-ESM ⚡️ Build success in 141ms
+ESM dist/index.js     87.30 KB
+ESM dist/index.js.map 188.87 KB
+ESM ⚡️ Build success in 180ms
 DTS Build start
-DTS ⚡️ Build success in 6474ms
+DTS ⚡️ Build success in 7420ms
 DTS dist/index.d.ts 1.50 KB

package/.turbo/turbo-test$colon$ci.log

@@ -3,27 +3,27 @@ $ vitest run --coverage
  RUN  v4.1.5 /home/runner/work/ContractKit/ContractKit/packages/plugin-csharp
       Coverage enabled with v8
 
- ✓ tests/codegen-client.test.ts (26 tests) 231ms
- ✓ tests/codegen-models.test.ts (63 tests) 272ms
- ✓ tests/index.test.ts (10 tests) 212ms
- ✓ tests/runtime.test.ts (14 tests) 67ms
- ✓ tests/naming.test.ts (19 tests) 76ms
- ✓ tests/scaffold.test.ts (5 tests) 28ms
- ✓ tests/hoist.test.ts (10 tests) 61ms
+ ✓ tests/codegen-client.test.ts (26 tests) 252ms
+ ✓ tests/codegen-models.test.ts (65 tests) 282ms
+ ✓ tests/index.test.ts (10 tests) 207ms
+ ✓ tests/naming.test.ts (19 tests) 88ms
+ ✓ tests/runtime.test.ts (14 tests) 51ms
+ ✓ tests/scaffold.test.ts (5 tests) 14ms
+ ✓ tests/hoist.test.ts (10 tests) 67ms
 
  Test Files  7 passed (7)
-      Tests  147 passed (147)
-   Start at  13:40:51
-   Duration  12.55s (transform 6.16s, setup 0ms, import 20.87s, tests 948ms, environment 18ms)
+      Tests  149 passed (149)
+   Start at  15:17:08
+   Duration  13.50s (transform 5.27s, setup 0ms, import 22.08s, tests 962ms, environment 10ms)
 
  % Coverage report from v8
 -------------------|---------|----------|---------|---------|-------------------
 File               | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s 
 -------------------|---------|----------|---------|---------|-------------------
-All files          |   87.99 |    76.98 |   89.44 |   90.79 |                   
- src               |   88.03 |    77.05 |   89.63 |   90.83 |                   
+All files          |   88.04 |    77.07 |   89.59 |   90.82 |                   
+ src               |   88.08 |    77.15 |   89.79 |   90.86 |                   
   ...gen-client.ts |   94.61 |    87.12 |   94.91 |   97.59 | ...94-496,513-514 
-  ...gen-models.ts |   91.19 |       75 |   96.42 |   92.97 | ...79,881,903-906 
+  ...gen-models.ts |   91.29 |    75.25 |   96.61 |   93.02 | ...05,907,929-932 
   codegen-sdk.ts   |     100 |      100 |     100 |     100 |                   
   hoist.ts         |   78.66 |     61.9 |    93.1 |   79.06 | ...13-322,350-362 
   index.ts         |   70.74 |    71.21 |   58.06 |   75.59 | ...25-329,350-369 

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @contractkit/plugin-csharp
 
+## 0.1.3
+
+### Patch Changes
+
+- ad6b72e: A default on a field whose property shares its enum's name now compiles. `rating?: Rating = neutral`
+  generated `public Rating? Rating { get; init; } = Rating.Neutral;`, and inside the record `Rating`
+  resolved to the property rather than the type, so the build failed with CS0236. C#'s rule that lets a
+  member share its type's name only applies when the member's type is exactly that type, and `Rating?`
+  is `Nullable<Rating>`. The initializer is now written from the global namespace whenever a property of
+  the same record would shadow the enum.
+
 ## 0.1.2
 
 ### Patch Changes

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

@@ -1 +1 @@
-{"version":3,"file":"codegen-models.d.ts","sourceRoot":"","sources":["../src/codegen-models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAa,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAElH,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,YAAY,CAAC;AAK3D,MAAM,WAAW,yBAAyB;IACtC,qFAAqF;IACrF,SAAS,EAAE,MAAM,CAAC;IAClB,gGAAgG;IAChG,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC;;;OAGG;IACH,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5C,kGAAkG;IAClG,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAiBD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,yBAAyB,GAAG,MAAM,CAwBpG;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,EAAE,QAAQ,GAAE,WAAW,CAAC,MAAM,CAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAG3H;AAID,UAAU,aAAa;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,oFAAoF;IACpF,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,6FAA6F;IAC7F,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED,2FAA2F;AAC3F,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,yBAAyB,GAAG;IAAE,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,GAAG,aAAa,CAS7H;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAYvI;AAID;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,EAAE,QAAQ,UAAQ,GAAG,MAAM,CAqDrG;AAqBD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,aAAa,GAAG,MAAM,CA2CrF;AAooBD,YAAY,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"codegen-models.d.ts","sourceRoot":"","sources":["../src/codegen-models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAa,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAElH,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,YAAY,CAAC;AAK3D,MAAM,WAAW,yBAAyB;IACtC,qFAAqF;IACrF,SAAS,EAAE,MAAM,CAAC;IAClB,gGAAgG;IAChG,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtC;;;OAGG;IACH,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5C,kGAAkG;IAClG,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAiBD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,yBAAyB,GAAG,MAAM,CAwBpG;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,EAAE,QAAQ,GAAE,WAAW,CAAC,MAAM,CAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAG3H;AAID,UAAU,aAAa;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,oFAAoF;IACpF,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,6FAA6F;IAC7F,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED,2FAA2F;AAC3F,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,yBAAyB,GAAG;IAAE,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,GAAG,aAAa,CAS7H;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAYvI;AAID;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,EAAE,QAAQ,UAAQ,GAAG,MAAM,CAqDrG;AAqBD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,aAAa,GAAG,MAAM,CA2CrF;AA8pBD,YAAY,EAAE,aAAa,EAAE,CAAC"}

package/dist/index.js

@@ -329,7 +329,8 @@ function literalCSharpType(value, ctx) {
   if (typeof value === "boolean") return qualify("bool", "System.Boolean", ctx);
   return Number.isInteger(value) ? qualify("long", "System.Int64", ctx) : qualify("double", "System.Double", ctx);
 }
-function renderDefault(value, type, ctx) {
+function renderDefault(value, type, ctx, memberNames = /* @__PURE__ */ new Set()) {
+  const enumType = (name) => memberNames.has(name) ? `global::${ctx.namespace}.Models.${name}` : name;
   const inner = type.kind === "lazy" ? type.inner : type;
   if (typeof value === "boolean") return String(value);
   if (typeof value === "number") {
@@ -350,13 +351,13 @@ function renderDefault(value, type, ctx) {
   if (inner.kind === "enum") {
     const decl = ctx.hoisted?.byNode.get(inner);
     if (!decl || !inner.values.includes(value)) return void 0;
-    return `${decl.name}.${enumMemberNames(inner.values).get(value)}`;
+    return `${enumType(decl.name)}.${enumMemberNames(inner.values).get(value)}`;
   }
   if (inner.kind === "ref") {
     const target = ctx.modelIndex.get(inner.name);
     const targetType = target?.type?.kind === "lazy" ? target.type.inner : target?.type;
     if (targetType?.kind !== "enum" || !targetType.values.includes(value)) return void 0;
-    return `${inner.name}.${enumMemberNames(targetType.values).get(value)}`;
+    return `${enumType(inner.name)}.${enumMemberNames(targetType.values).get(value)}`;
   }
   if (inner.kind === "scalar") {
     switch (inner.name) {
@@ -555,24 +556,28 @@ function renderRecord(name, fields, ctx, forInput, supertypes, description, depr
     lines.push(`public sealed record ${name}${implementsClause};`);
     return lines;
   }
+  const memberNames = new Set(fields.map((field) => memberName(field, name)));
   lines.push(`public sealed record ${name}${implementsClause}`);
   lines.push("{");
   fields.forEach((field, index) => {
     if (index > 0) lines.push("");
-    lines.push(...renderField(field, ctx, forInput, name, wireCase));
+    lines.push(...renderField(field, ctx, forInput, name, memberNames, wireCase));
   });
   lines.push("}");
   return lines;
 }
-function renderField(field, ctx, forInput, ownerTypeName, wireCase) {
-  const propName = safeMemberName(toCSharpPropertyName(field.name), ownerTypeName);
+function memberName(field, ownerTypeName) {
+  return safeMemberName(toCSharpPropertyName(field.name), ownerTypeName);
+}
+function renderField(field, ctx, forInput, ownerTypeName, memberNames, wireCase) {
+  const propName = memberName(field, ownerTypeName);
   const wireName = applyWireCase(field.name, wireCase);
   let typeStr = renderCSharpType(field.type, ctx, forInput);
   if ((field.optional || field.nullable) && !typeStr.endsWith("?")) typeStr += "?";
-  let initializer = field.default !== void 0 ? renderDefault(field.default, field.type, ctx) : void 0;
+  let initializer = field.default !== void 0 ? renderDefault(field.default, field.type, ctx, memberNames) : void 0;
   if (initializer === void 0 && !field.optional && !field.nullable) {
     const inner = field.type.kind === "lazy" ? field.type.inner : field.type;
-    if (inner.kind === "literal") initializer = renderDefault(inner.value, inner, ctx);
+    if (inner.kind === "literal") initializer = renderDefault(inner.value, inner, ctx, memberNames);
   }
   const isRequired = !field.optional && initializer === void 0;
   const lines = [];