@genesislcap/event-type-codegen 14.489.0-canary.FUI-2574 → 14.491.0-canary.FUI-2574-2

package/dist/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AAKA,OAAO,EAAqB,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAEtE,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AA8EzE,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,aAAa,EAAE,EACvB,UAAU,eAAe,EAAE,EAC3B,MAAM,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAC5B,QAAO,aAAyB,KAC/B,MA2BF,CAAC"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AAKA,OAAO,EAAqB,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAEtE,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AA6GzE,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,aAAa,EAAE,EACvB,UAAU,eAAe,EAAE,EAC3B,MAAM,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAC5B,QAAO,aAAyB,KAC/B,MA2BF,CAAC"}

package/dist/render.js

@@ -4,6 +4,33 @@ exports.renderEventTypesFile = void 0;
 const naming_1 = require("./naming");
 const parse_enums_1 = require("./parse-enums");
 const parse_kotlin_1 = require("./parse-kotlin");
+const kotlinTypeRoot = (kotlinType) => {
+    const listMatch = kotlinType.match(/^(?:List|MutableList|Set|MutableSet)<(.+)>$/);
+    if (listMatch) {
+        return kotlinTypeRoot(listMatch[1].trim());
+    }
+    return kotlinType.replace(/\?$/, '').trim();
+};
+/** Handler inputs plus any nested custom DTOs referenced from their properties. */
+const expandUsedDtoNames = (mapped, dtos) => {
+    const used = new Set();
+    const visit = (dtoName) => {
+        if (used.has(dtoName) || !dtos.has(dtoName))
+            return;
+        used.add(dtoName);
+        const dto = dtos.get(dtoName);
+        for (const prop of dto.properties) {
+            const nested = kotlinTypeRoot(prop.kotlinType);
+            if (dtos.has(nested)) {
+                visit(nested);
+            }
+        }
+    };
+    for (const handler of mapped) {
+        visit(handler.inputType);
+    }
+    return used;
+};
 const renderInterface = (dto, dtos, enums) => {
     const interfaceName = (0, naming_1.handlerInputToDetailsInterfaceName)(dto.name);
     const lines = dto.properties.map((prop) => {
@@ -48,10 +75,10 @@ const renderEnumExports = (enums, usedEnumNames) => {
     }
     return blocks.length > 0 ? `${blocks.join('\n\n')}\n\n` : '';
 };
-const collectUsedEnumNames = (mapped, dtos, enums) => {
+const collectUsedEnumNames = (usedDtoNames, dtos, enums) => {
     const used = new Set();
-    for (const handler of mapped) {
-        const dto = dtos.get(handler.inputType);
+    for (const dtoName of usedDtoNames) {
+        const dto = dtos.get(dtoName);
         if (!dto)
             continue;
         for (const prop of dto.properties) {
@@ -63,13 +90,13 @@ const collectUsedEnumNames = (mapped, dtos, enums) => {
     return used;
 };
 const renderEventTypesFile = (mapped, unmapped, dtos, enums = new Map()) => {
-    const usedDtos = new Set(mapped.map((m) => m.inputType));
+    const usedDtos = expandUsedDtoNames(mapped, dtos);
     const interfaces = [...usedDtos]
         .map((name) => dtos.get(name))
         .filter((dto) => dto != null)
         .sort((a, b) => a.name.localeCompare(b.name))
         .map((dto) => renderInterface(dto, dtos, enums));
-    const usedEnumNames = collectUsedEnumNames(mapped, dtos, enums);
+    const usedEnumNames = collectUsedEnumNames(usedDtos, dtos, enums);
     const enumExports = renderEnumExports(enums, usedEnumNames);
     const mapEntries = mapped.map((m) => `  ${m.eventName}: ${m.detailsInterface};`).join('\n');
     const eventClasses = renderEventClasses(mapped);

package/dist/render.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/event-type-codegen",
   "description": "Build-time TypeScript codegen from Kotlin event handler DTOs",
-  "version": "14.489.0-canary.FUI-2574",
+  "version": "14.491.0-canary.FUI-2574-2",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "consola": "^3.0.2"
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.489.0-canary.FUI-2574",
+    "@genesislcap/foundation-testing": "14.491.0-canary.FUI-2574-2",
     "@types/node": "^22.10.2",
     "tsx": "^4.7.0",
     "uvu": "0.5.4"
@@ -34,5 +34,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "da63cfb010834163aafa1e46e6f0d33e133ade88"
+  "gitHead": "161356e51cd0fc95a59154009859d0c8481119c9"
 }

package/src/render.ts

@@ -7,6 +7,37 @@ import { kotlinEnumTypeRef, type KotlinEnumMap } from './parse-enums';
 import { kotlinTypeToTs } from './parse-kotlin';
 import type { KotlinDto, MappedHandler, UnmappedHandler } from './types';
 
+const kotlinTypeRoot = (kotlinType: string): string => {
+  const listMatch = kotlinType.match(/^(?:List|MutableList|Set|MutableSet)<(.+)>$/);
+  if (listMatch) {
+    return kotlinTypeRoot(listMatch[1].trim());
+  }
+  return kotlinType.replace(/\?$/, '').trim();
+};
+
+/** Handler inputs plus any nested custom DTOs referenced from their properties. */
+const expandUsedDtoNames = (mapped: MappedHandler[], dtos: Map<string, KotlinDto>): Set<string> => {
+  const used = new Set<string>();
+
+  const visit = (dtoName: string) => {
+    if (used.has(dtoName) || !dtos.has(dtoName)) return;
+    used.add(dtoName);
+    const dto = dtos.get(dtoName)!;
+    for (const prop of dto.properties) {
+      const nested = kotlinTypeRoot(prop.kotlinType);
+      if (dtos.has(nested)) {
+        visit(nested);
+      }
+    }
+  };
+
+  for (const handler of mapped) {
+    visit(handler.inputType);
+  }
+
+  return used;
+};
+
 const renderInterface = (
   dto: KotlinDto,
   dtos: Map<string, KotlinDto>,
@@ -67,13 +98,13 @@ const renderEnumExports = (enums: KotlinEnumMap, usedEnumNames: Set<string>): st
 };
 
 const collectUsedEnumNames = (
-  mapped: MappedHandler[],
+  usedDtoNames: Set<string>,
   dtos: Map<string, KotlinDto>,
   enums: KotlinEnumMap,
 ): Set<string> => {
   const used = new Set<string>();
-  for (const handler of mapped) {
-    const dto = dtos.get(handler.inputType);
+  for (const dtoName of usedDtoNames) {
+    const dto = dtos.get(dtoName);
     if (!dto) continue;
     for (const prop of dto.properties) {
       const ref = kotlinEnumTypeRef(prop.kotlinType, enums);
@@ -89,14 +120,14 @@ export const renderEventTypesFile = (
   dtos: Map<string, KotlinDto>,
   enums: KotlinEnumMap = new Map(),
 ): string => {
-  const usedDtos = new Set(mapped.map((m) => m.inputType));
+  const usedDtos = expandUsedDtoNames(mapped, dtos);
   const interfaces = [...usedDtos]
     .map((name) => dtos.get(name))
     .filter((dto): dto is KotlinDto => dto != null)
     .sort((a, b) => a.name.localeCompare(b.name))
     .map((dto) => renderInterface(dto, dtos, enums));
 
-  const usedEnumNames = collectUsedEnumNames(mapped, dtos, enums);
+  const usedEnumNames = collectUsedEnumNames(usedDtos, dtos, enums);
   const enumExports = renderEnumExports(enums, usedEnumNames);
 
   const mapEntries = mapped.map((m) => `  ${m.eventName}: ${m.detailsInterface};`).join('\n');

package/test/fixtures/client-out/genesis-event-types.ts

@@ -14,6 +14,16 @@ export const Side = {
 
 export type Side = (typeof Side)[keyof typeof Side];
 
+export interface AmendCellInputDetails {
+  MAX_SIZE: number;
+  MAX_INSTRUMENT_SCORE: number;
+}
+
+export interface ChargeAmendInputDetails {
+  CHARGE_ADDITION_ID: string;
+  CELLS: AmendCellInputDetails[];
+}
+
 export interface FooInputDetails {
   FOO_ID: string;
   BAR_ID?: string;
@@ -44,6 +54,7 @@ export interface TradeByIdDetails {
 
 export interface EventDetailsMap {
   EVENT_BAR_BAZ: NestedInputDetails;
+  EVENT_CHARGE_AMEND: ChargeAmendInputDetails;
   EVENT_CONTEXT_FOO: FooInputDetails;
   EVENT_DAO_HANDLER: InstrumentByIdDetails;
   EVENT_FOO: FooInputDetails;
@@ -61,6 +72,14 @@ export class EventBarBaz extends GenesisEvent<'EVENT_BAR_BAZ', NestedInputDetail
   }
 }
 
+export class EventChargeAmend extends GenesisEvent<'EVENT_CHARGE_AMEND', ChargeAmendInputDetails> {
+  readonly MESSAGE_TYPE = 'EVENT_CHARGE_AMEND' as const;
+
+  constructor(details: ChargeAmendInputDetails) {
+    super(details);
+  }
+}
+
 export class EventContextFoo extends GenesisEvent<'EVENT_CONTEXT_FOO', FooInputDetails> {
   readonly MESSAGE_TYPE = 'EVENT_CONTEXT_FOO' as const;
 

package/test/fixtures/golden/genesis-event-types.ts

@@ -14,6 +14,16 @@ export const Side = {
 
 export type Side = (typeof Side)[keyof typeof Side];
 
+export interface AmendCellInputDetails {
+  MAX_SIZE: number;
+  MAX_INSTRUMENT_SCORE: number;
+}
+
+export interface ChargeAmendInputDetails {
+  CHARGE_ADDITION_ID: string;
+  CELLS: AmendCellInputDetails[];
+}
+
 export interface FooInputDetails {
   FOO_ID: string;
   BAR_ID?: string;
@@ -44,6 +54,7 @@ export interface TradeByIdDetails {
 
 export interface EventDetailsMap {
   EVENT_BAR_BAZ: NestedInputDetails;
+  EVENT_CHARGE_AMEND: ChargeAmendInputDetails;
   EVENT_CONTEXT_FOO: FooInputDetails;
   EVENT_DAO_HANDLER: InstrumentByIdDetails;
   EVENT_FOO: FooInputDetails;
@@ -61,6 +72,14 @@ export class EventBarBaz extends GenesisEvent<'EVENT_BAR_BAZ', NestedInputDetail
   }
 }
 
+export class EventChargeAmend extends GenesisEvent<'EVENT_CHARGE_AMEND', ChargeAmendInputDetails> {
+  readonly MESSAGE_TYPE = 'EVENT_CHARGE_AMEND' as const;
+
+  constructor(details: ChargeAmendInputDetails) {
+    super(details);
+  }
+}
+
 export class EventContextFoo extends GenesisEvent<'EVENT_CONTEXT_FOO', FooInputDetails> {
   readonly MESSAGE_TYPE = 'EVENT_CONTEXT_FOO' as const;
 

package/test/fixtures/mini-server/src/main/kotlin/com/example/Handlers.kt

@@ -1,11 +1,13 @@
 package com.example
 
+import com.example.dto.ChargeAmendInput
 import com.example.dto.FooInput
 import com.example.dto.NestedInput
 
 fun register() {
     eventHandler<FooInput>("FOO")
     eventHandler<NestedInput>("BAR_BAZ")
+    eventHandler<ChargeAmendInput>("CHARGE_AMEND")
     contextEventHandler<FooInput, String>(name = "CONTEXT_FOO")
     // Full table DAO — resolved from generated-dao sources
     eventHandler<Trade>("TRADE_INSERT", transactional = true)

package/test/fixtures/mini-server/src/main/kotlin/com/example/dto/Samples.kt

@@ -5,6 +5,16 @@ data class FooInput(
     /* optional bar, with comma */ val barId: String? = null,
 )
 
+data class AmendCellInput(
+    val maxSize: Int,
+    val maxInstrumentScore: Int,
+)
+
+data class ChargeAmendInput(
+    val chargeAdditionId: String,
+    val cells: List<AmendCellInput>,
+)
+
 data class NestedInput(
     val items: List<FooInput>,
 )

package/test/generate.test.ts

@@ -31,7 +31,7 @@ suite('generates golden genesis-event-types.ts from fixture Kotlin module', asyn
   });
 
   assert.ok(result);
-  assert.equal(result?.eventCount, 6);
+  assert.equal(result?.eventCount, 7);
 
   const actual = readFileSync(outputPath, 'utf8').trim();
   const expected = readFileSync(goldenPath, 'utf8').trim();
@@ -85,4 +85,11 @@ suite('parses handlers with trailing named args (transactional)', async () => {
   assert.is(actual.includes('EVENT_TRADE_INSERT: TradeDetails'), true);
 });
 
+suite('emits nested DTO interfaces not used as handler inputs', async () => {
+  const actual = readFileSync(goldenPath, 'utf8');
+  assert.is(actual.includes('export interface AmendCellInputDetails'), true);
+  assert.is(actual.includes('CELLS: AmendCellInputDetails[]'), true);
+  assert.is(actual.includes('EVENT_CHARGE_AMEND: ChargeAmendInputDetails'), true);
+});
+
 suite.run();