@genesislcap/event-type-codegen 15.19.4 → 15.19.5

package/README.md

@@ -54,6 +54,11 @@ In the showcase server Gradle build, `generateDao` is `finalizedBy` `generateEve
 - Class-based handler sources named `*EventHandler.kt` under a `dto/` path are skipped. The `dto/**` glob is for input `data class`es only; those files are usually `SyncValidatingEventHandler` implementations and are not PAL `eventHandler { }` scripts. PAL handlers in `*-eventhandler.kts` (and other `handlerScan` paths) are still discovered.
 - Generate DAO sources (Gradle) before client codegen in CI if the trees are not committed.
 - Dictionary **ENUM** fields: string literal unions when `enum class` and/or companion `Field.Type.ENUM` `values = "…"` appear under `generatedDaoSources` (`gen/dao/**/*.kt`).
+- Enum exports are named after the Kotlin enum, and are qualified with the owning table only
+  when tables disagree. Genesis generates one enum package per table, so several tables can
+  declare `Status`: identical value sets share a single `Status` export, differing ones are
+  emitted as `AxeStatus` / `RfqStatus` / `OrderStatus` so no table's fields point at another's
+  values. A field's own enum is resolved through its DAO file's `import`, not by simple name.
 
 ## Typed commits
 

package/dist/kotlin-parse-utils.d.ts

@@ -1,6 +1,11 @@
-import type { KotlinProperty } from './types';
+import type { KotlinFileScope, KotlinProperty } from './types';
 /** Strip Kotlin line and block comments from source before structural parsing. */
 export declare const stripKotlinComments: (content: string) => string;
+/**
+ * Read a file's `package` and `import` header. Genesis generates one enum package per table, so
+ * the imports are what tell `Status` in Axe.kt apart from `Status` in Rfq.kt.
+ */
+export declare const parseKotlinFileScope: (content: string) => KotlinFileScope;
 /**
  * Strip annotations including use-site targets (field:/param:/get: prefixes).
  * Nested call args in annotations are not fully balanced (secondary limitation).

package/dist/kotlin-parse-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kotlin-parse-utils.d.ts","sourceRoot":"","sources":["../src/kotlin-parse-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,kFAAkF;AAClF,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,KAAG,MACa,CAAC;AAEpE;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GAAI,SAAS,MAAM,KAAG,MAI9C,CAAC;AAEZ,2FAA2F;AAC3F,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MAAM,EAgBtD,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,gFAAgF;IAChF,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAcF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EACf,UAAS,0BAA+B,KACvC,cAAc,GAAG,IAcnB,CAAC"}
+{"version":3,"file":"kotlin-parse-utils.d.ts","sourceRoot":"","sources":["../src/kotlin-parse-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE/D,kFAAkF;AAClF,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,KAAG,MACa,CAAC;AAOpE;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,KAAG,eAqBtD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GAAI,SAAS,MAAM,KAAG,MAI9C,CAAC;AAEZ,2FAA2F;AAC3F,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MAAM,EAgBtD,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,gFAAgF;IAChF,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAcF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EACf,UAAS,0BAA+B,KACvC,cAAc,GAAG,IAcnB,CAAC"}

package/dist/kotlin-parse-utils.js

@@ -1,9 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseKotlinProperty = exports.splitTopLevelArgs = exports.stripKotlinAnnotations = exports.stripKotlinComments = void 0;
+exports.parseKotlinProperty = exports.splitTopLevelArgs = exports.stripKotlinAnnotations = exports.parseKotlinFileScope = exports.stripKotlinComments = void 0;
 /** Strip Kotlin line and block comments from source before structural parsing. */
 const stripKotlinComments = (content) => content.replace(/\/\*[\s\S]*?\*\//g, '').replace(/\/\/.*$/gm, '');
 exports.stripKotlinComments = stripKotlinComments;
+const STAR_IMPORT_SUFFIX = '.*';
+const PACKAGE_REGEX = /(?:^|\n)\s*package\s+([\w.]+)/;
+const IMPORT_REGEX = /(?:^|\n)\s*import\s+((?:\w+\.)*(?:\w+|\*))(?:\s+as\s+(\w+))?/g;
+/**
+ * Read a file's `package` and `import` header. Genesis generates one enum package per table, so
+ * the imports are what tell `Status` in Axe.kt apart from `Status` in Rfq.kt.
+ */
+const parseKotlinFileScope = (content) => {
+    var _a, _b, _c;
+    const imports = new Map();
+    const starImports = [];
+    IMPORT_REGEX.lastIndex = 0;
+    let match;
+    while ((match = IMPORT_REGEX.exec(content)) !== null) {
+        const target = match[1];
+        if (target.endsWith(STAR_IMPORT_SUFFIX)) {
+            starImports.push(target.slice(0, -STAR_IMPORT_SUFFIX.length));
+            continue;
+        }
+        const simpleName = (_a = match[2]) !== null && _a !== void 0 ? _a : target.split('.').pop();
+        imports.set(simpleName, target);
+    }
+    return {
+        packageName: (_c = (_b = content.match(PACKAGE_REGEX)) === null || _b === void 0 ? void 0 : _b[1]) !== null && _c !== void 0 ? _c : '',
+        imports,
+        starImports,
+    };
+};
+exports.parseKotlinFileScope = parseKotlinFileScope;
 /**
  * Strip annotations including use-site targets (field:/param:/get: prefixes).
  * Nested call args in annotations are not fully balanced (secondary limitation).

package/dist/kotlin-parse-utils.js.map

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

package/dist/naming.d.ts

@@ -15,4 +15,10 @@ export declare const dtoToDetailsInterfaceName: (dtoName: string) => string;
 export declare const handlerInputToDetailsInterfaceName: (inputType: string) => string;
 /** Per-event class carrying MESSAGE_TYPE and DETAILS (one per PAL handler). */
 export declare const eventNameToEventClassName: (eventName: string) => string;
+/**
+ * `…enums.fi_portal.order_fill` → `['OrderFill', 'FiPortalOrderFill', …]`, widest last.
+ * Used to disambiguate a Kotlin identifier declared under more than one package (e.g. an enum
+ * simple name Genesis emits once per table) by qualifying it with its owning table/dictionary.
+ */
+export declare const ownerPrefixes: (packageName: string) => string[];
 //# sourceMappingURL=naming.d.ts.map

package/dist/naming.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"naming.d.ts","sourceRoot":"","sources":["../src/naming.ts"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,GAAI,MAAM,MAAM,KAAG,MAwC5D,CAAC;AAEF,6EAA6E;AAC7E,eAAO,MAAM,yBAAyB,GAAI,cAAc,MAAM,KAAG,MACpB,CAAC;AAE9C,uEAAuE;AACvE,eAAO,MAAM,yBAAyB,GAAI,SAAS,MAAM,KAAG,MACC,CAAC;AAE9D,6EAA6E;AAC7E,eAAO,MAAM,kCAAkC,GAAI,WAAW,MAAM,KAAG,MAMtE,CAAC;AAEF,+EAA+E;AAC/E,eAAO,MAAM,yBAAyB,GAAI,WAAW,MAAM,KAAG,MAG7D,CAAC"}
+{"version":3,"file":"naming.d.ts","sourceRoot":"","sources":["../src/naming.ts"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,GAAI,MAAM,MAAM,KAAG,MAwC5D,CAAC;AAEF,6EAA6E;AAC7E,eAAO,MAAM,yBAAyB,GAAI,cAAc,MAAM,KAAG,MACpB,CAAC;AAE9C,uEAAuE;AACvE,eAAO,MAAM,yBAAyB,GAAI,SAAS,MAAM,KAAG,MACC,CAAC;AAE9D,6EAA6E;AAC7E,eAAO,MAAM,kCAAkC,GAAI,WAAW,MAAM,KAAG,MAMtE,CAAC;AAEF,+EAA+E;AAC/E,eAAO,MAAM,yBAAyB,GAAI,WAAW,MAAM,KAAG,MAG7D,CAAC;AAaF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,aAAa,MAAM,KAAG,MAAM,EAOzD,CAAC"}

package/dist/naming.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eventNameToEventClassName = exports.handlerInputToDetailsInterfaceName = exports.dtoToDetailsInterfaceName = exports.kotlinPropertyToWireField = exports.toUpperUnderscoreWithAcronyms = void 0;
+exports.ownerPrefixes = exports.eventNameToEventClassName = exports.handlerInputToDetailsInterfaceName = exports.dtoToDetailsInterfaceName = exports.kotlinPropertyToWireField = exports.toUpperUnderscoreWithAcronyms = void 0;
 const change_case_1 = require("change-case");
 /**
  * Convert camelCase / PascalCase to UPPER_UNDERSCORE, inserting `_` before digits and
@@ -70,4 +70,27 @@ const eventNameToEventClassName = (eventName) => {
     return `Event${(0, change_case_1.pascalCase)(base)}`;
 };
 exports.eventNameToEventClassName = eventNameToEventClassName;
+/** How many trailing package segments a qualifier may grow to before falling back to a number. */
+const MAX_OWNER_SEGMENTS = 3;
+/**
+ * Package segments that are an artefact of the generated tree's layout, not a Genesis dictionary
+ * or table name — dropped so a widened qualifier still reads as an owner rather than a file path.
+ * `global.genesis.gen.dao.enums` is the fixed prefix every Genesis-generated enum package starts
+ * with (see genesis-server `DAOGenerator.ENUM_PACKAGE`); only what follows it varies per table.
+ */
+const OWNER_SEGMENT_STOPWORDS = new Set(['global', 'genesis', 'gen', 'dao', 'enums']);
+/**
+ * `…enums.fi_portal.order_fill` → `['OrderFill', 'FiPortalOrderFill', …]`, widest last.
+ * Used to disambiguate a Kotlin identifier declared under more than one package (e.g. an enum
+ * simple name Genesis emits once per table) by qualifying it with its owning table/dictionary.
+ */
+const ownerPrefixes = (packageName) => {
+    const segments = packageName.split('.').filter((s) => s && !OWNER_SEGMENT_STOPWORDS.has(s));
+    const prefixes = [];
+    for (let take = 1; take <= Math.min(segments.length, MAX_OWNER_SEGMENTS); take += 1) {
+        prefixes.push((0, change_case_1.pascalCase)(segments.slice(segments.length - take).join('_')));
+    }
+    return prefixes;
+};
+exports.ownerPrefixes = ownerPrefixes;
 //# sourceMappingURL=naming.js.map

package/dist/naming.js.map

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

package/dist/parse-dao.d.ts

@@ -1,4 +1,4 @@
-import type { KotlinDto } from './types';
+import type { KotlinDto, KotlinFileScope } from './types';
 /**
  * Generated Genesis DAO entities use a primary constructor with annotated
  * `public var` parameters (and sometimes bare params for sequenced PKs).
@@ -8,11 +8,11 @@ export declare const isGeneratedDaoEntityFile: (filePath: string) => boolean;
 /**
  * Nested `data class By*` index types inside generated entity Kotlin (e.g. Trade.ById).
  */
-export declare const extractGeneratedDaoIndices: (content: string, filePath: string) => KotlinDto[];
+export declare const extractGeneratedDaoIndices: (content: string, filePath: string, fileScope: KotlinFileScope) => KotlinDto[];
 /**
  * Extract table entity classes from generated DAO Kotlin sources.
  * Prefer entities that look like Genesis table DAOs (constructor + TableEntity).
  */
-export declare const extractGeneratedDaoEntities: (content: string, filePath: string) => KotlinDto[];
+export declare const extractGeneratedDaoEntities: (content: string, filePath: string, fileScope: KotlinFileScope) => KotlinDto[];
 export declare const parseGeneratedDaosFromSources: (files: string[]) => Map<string, KotlinDto>;
 //# sourceMappingURL=parse-dao.d.ts.map

package/dist/parse-dao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-dao.d.ts","sourceRoot":"","sources":["../src/parse-dao.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,SAAS,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GAAI,UAAU,MAAM,KAAG,OAG3D,CAAC;AAUF;;GAEG;AACH,eAAO,MAAM,0BAA0B,GAAI,SAAS,MAAM,EAAE,UAAU,MAAM,KAAG,SAAS,EAyCvF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,GAAI,SAAS,MAAM,EAAE,UAAU,MAAM,KAAG,SAAS,EAmCxF,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,OAAO,MAAM,EAAE,KAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAmBpF,CAAC"}
+{"version":3,"file":"parse-dao.d.ts","sourceRoot":"","sources":["../src/parse-dao.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAkB,MAAM,SAAS,CAAC;AAE1E;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GAAI,UAAU,MAAM,KAAG,OAG3D,CAAC;AAUF;;GAEG;AACH,eAAO,MAAM,0BAA0B,GACrC,SAAS,MAAM,EACf,UAAU,MAAM,EAChB,WAAW,eAAe,KACzB,SAAS,EA0CX,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,UAAU,MAAM,EAChB,WAAW,eAAe,KACzB,SAAS,EAmCX,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,OAAO,MAAM,EAAE,KAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAoBpF,CAAC"}

package/dist/parse-dao.js

@@ -23,7 +23,7 @@ const entityNameFromDaoFile = (filePath) => {
 /**
  * Nested `data class By*` index types inside generated entity Kotlin (e.g. Trade.ById).
  */
-const extractGeneratedDaoIndices = (content, filePath) => {
+const extractGeneratedDaoIndices = (content, filePath, fileScope) => {
     const entityName = entityNameFromDaoFile(filePath);
     if (!entityName)
         return [];
@@ -59,6 +59,7 @@ const extractGeneratedDaoIndices = (content, filePath) => {
             name: `${entityName}.${indexName}`,
             properties,
             filePath,
+            fileScope,
         });
     }
     return results;
@@ -68,7 +69,7 @@ exports.extractGeneratedDaoIndices = extractGeneratedDaoIndices;
  * Extract table entity classes from generated DAO Kotlin sources.
  * Prefer entities that look like Genesis table DAOs (constructor + TableEntity).
  */
-const extractGeneratedDaoEntities = (content, filePath) => {
+const extractGeneratedDaoEntities = (content, filePath, fileScope) => {
     const results = [];
     // Matches: public class Trade public constructor( ... ) :
     const classRegex = /(?:^|\n)\s*(?:public\s+)?class\s+(\w+)\s+(?:public\s+)?constructor\s*\(/gm;
@@ -97,7 +98,7 @@ const extractGeneratedDaoEntities = (content, filePath) => {
             .map((segment) => (0, kotlin_parse_utils_1.parseKotlinProperty)(segment, { allowBareParams: true }))
             .filter((p) => p != null);
         if (properties.length > 0) {
-            results.push({ name, properties, filePath });
+            results.push({ name, properties, filePath, fileScope });
         }
     }
     return results;
@@ -109,12 +110,13 @@ const parseGeneratedDaosFromSources = (files) => {
         if (!(0, exports.isGeneratedDaoEntityFile)(filePath))
             continue;
         const content = (0, kotlin_parse_utils_1.stripKotlinComments)((0, node_fs_1.readFileSync)(filePath, 'utf8'));
-        for (const entity of (0, exports.extractGeneratedDaoEntities)(content, filePath)) {
+        const fileScope = (0, kotlin_parse_utils_1.parseKotlinFileScope)(content);
+        for (const entity of (0, exports.extractGeneratedDaoEntities)(content, filePath, fileScope)) {
             if (!daos.has(entity.name)) {
                 daos.set(entity.name, entity);
             }
         }
-        for (const index of (0, exports.extractGeneratedDaoIndices)(content, filePath)) {
+        for (const index of (0, exports.extractGeneratedDaoIndices)(content, filePath, fileScope)) {
             if (!daos.has(index.name)) {
                 daos.set(index.name, index);
             }

package/dist/parse-dao.js.map

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

package/dist/parse-enums.d.ts

@@ -1,16 +1,55 @@
-export type KotlinEnumMap = Map<string, readonly string[]>;
+import type { KotlinFileScope } from './types';
+/** One `enum class` declaration, identified by its fully-qualified Kotlin name. */
+export type KotlinEnumDef = {
+    /** Simple Kotlin name, e.g. `Status`. */
+    name: string;
+    /** Declaring package, e.g. `global.genesis.gen.dao.enums.fi_portal.axe` ('' when absent). */
+    packageName: string;
+    /** `<packageName>.<name>`, or just `name` when the file declares no package. */
+    fqn: string;
+    values: readonly string[];
+};
+/**
+ * Declared enums keyed by FULLY-QUALIFIED name. Genesis generates one enum package per table
+ * (`…enums.fi_portal.axe.Status`, `…enums.fi_portal.rfq.Status`), so the simple name alone is
+ * not a key — keying by it let one table's values silently stand in for another's.
+ */
+export type KotlinEnumMap = Map<string, KotlinEnumDef>;
 /** Any generated DAO tree Kotlin (entities, enums, xref, etc.). */
 export declare const isGeneratedDaoTreeFile: (filePath: string) => boolean;
 /** `enum class Side { BUY, SELL }` in generated DAO sources. */
-export declare const extractEnumClassesFromContent: (content: string) => KotlinEnumMap;
+export declare const extractEnumClassesFromContent: (content: string, scope?: KotlinFileScope) => KotlinEnumMap;
 /**
  * Companion `Field` metadata on generated entities, e.g.
  * `values = "STANDARD PREMIUM TRIAL"` on `NonNullable<Tier>(Field(… type = Field.Type.ENUM …))`.
+ * The entity file imports the enum from its own table package (real generated code never
+ * declares the enum inline), so an explicit `import` is what turns `Tier` into the
+ * fully-qualified name this map is keyed by. Without one, we cannot know which package the
+ * type actually belongs to — qualifying it with the ENTITY's own package would invent an FQN
+ * nothing declares, and that phantom entry could then wrongly stand in for (or split apart) a
+ * real declaration in `resolveEnumExportNames`. So we skip it, the same way `uniqueBySimpleName`
+ * refuses to guess an ambiguous reference.
  */
-export declare const extractCompanionFieldEnumValues: (content: string) => KotlinEnumMap;
+export declare const extractCompanionFieldEnumValues: (content: string, scope?: KotlinFileScope) => KotlinEnumMap;
 export declare const parseGeneratedEnumsFromSources: (files: string[]) => KotlinEnumMap;
-export declare const kotlinEnumSimpleName: (kotlinType: string) => string;
-export declare const kotlinEnumTypeToTs: (kotlinType: string, enums: KotlinEnumMap) => string | null;
-/** Use generated enum type name when declared (paired with `renderEnumExports`). */
-export declare const kotlinEnumTypeRef: (kotlinType: string, enums: KotlinEnumMap) => string | null;
+/**
+ * Resolve a type name AS WRITTEN in the file described by `scope` to the enum it declares.
+ * Kotlin resolution order: explicit import (incl. aliases) → same package → star import. `scope`
+ * is required rather than optional: every real `KotlinDto` (from either generated-DAO or custom
+ * DTO parsing) always carries its declaring file's scope, so a caller with none to give us would
+ * itself be a bug worth surfacing at the call site — not something to paper over with a
+ * global simple-name guess. That guess is exactly the collision this resolver exists to prevent,
+ * just reached one level removed (a hand-written DTO field using an unrelated type that happens
+ * to share a name with a generated enum).
+ */
+export declare const resolveKotlinEnum: (kotlinType: string, enums: KotlinEnumMap, scope: KotlinFileScope) => KotlinEnumDef | null;
+/**
+ * Assign every declared enum the name it is exported under.
+ *
+ * A simple name declared by exactly one table — or by several that agree on the values — keeps
+ * it (`Direction`). When tables disagree, EVERY declaration of that name is qualified with its
+ * owning table (`AxeStatus`, `RfqStatus`, `OrderStatus`) so no table's values can be exported
+ * under a bare name that another table's fields also point at.
+ */
+export declare const resolveEnumExportNames: (enums: KotlinEnumMap) => Map<string, string>;
 //# sourceMappingURL=parse-enums.d.ts.map

package/dist/parse-enums.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-enums.d.ts","sourceRoot":"","sources":["../src/parse-enums.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC;AAI3D,mEAAmE;AACnE,eAAO,MAAM,sBAAsB,GAAI,UAAU,MAAM,KAAG,OAGzD,CAAC;AASF,gEAAgE;AAChE,eAAO,MAAM,6BAA6B,GAAI,SAAS,MAAM,KAAG,aAc/D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,+BAA+B,GAAI,SAAS,MAAM,KAAG,aAyBjE,CAAC;AAUF,eAAO,MAAM,8BAA8B,GAAI,OAAO,MAAM,EAAE,KAAG,aAWhE,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,YAAY,MAAM,KAAG,MAGzD,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,YAAY,MAAM,EAAE,OAAO,aAAa,KAAG,MAAM,GAAG,IAKtF,CAAC;AAEF,oFAAoF;AACpF,eAAO,MAAM,iBAAiB,GAAI,YAAY,MAAM,EAAE,OAAO,aAAa,KAAG,MAAM,GAAG,IAGrF,CAAC"}
+{"version":3,"file":"parse-enums.d.ts","sourceRoot":"","sources":["../src/parse-enums.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,mFAAmF;AACnF,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,6FAA6F;IAC7F,WAAW,EAAE,MAAM,CAAC;IACpB,gFAAgF;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AASvD,mEAAmE;AACnE,eAAO,MAAM,sBAAsB,GAAI,UAAU,MAAM,KAAG,OAGzD,CAAC;AASF,gEAAgE;AAChE,eAAO,MAAM,6BAA6B,GACxC,SAAS,MAAM,EACf,QAAO,eAA6B,KACnC,aAeF,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,+BAA+B,GAC1C,SAAS,MAAM,EACf,QAAO,eAA6B,KACnC,aAgCF,CAAC;AAUF,eAAO,MAAM,8BAA8B,GAAI,OAAO,MAAM,EAAE,KAAG,aAmBhE,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,GAC5B,YAAY,MAAM,EAClB,OAAO,aAAa,EACpB,OAAO,eAAe,KACrB,aAAa,GAAG,IAmBlB,CAAC;AASF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,aAAa,KAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CA2C/E,CAAC"}

package/dist/parse-enums.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kotlinEnumTypeRef = exports.kotlinEnumTypeToTs = exports.kotlinEnumSimpleName = exports.parseGeneratedEnumsFromSources = exports.extractCompanionFieldEnumValues = exports.extractEnumClassesFromContent = exports.isGeneratedDaoTreeFile = void 0;
+exports.resolveEnumExportNames = exports.resolveKotlinEnum = exports.parseGeneratedEnumsFromSources = exports.extractCompanionFieldEnumValues = exports.extractEnumClassesFromContent = exports.isGeneratedDaoTreeFile = void 0;
 const node_fs_1 = require("node:fs");
+const kotlin_parse_utils_1 = require("./kotlin-parse-utils");
+const naming_1 = require("./naming");
 const KOTLIN_FILE_EXTENSION = '.kt';
+const EMPTY_SCOPE = { packageName: '', imports: new Map(), starImports: [] };
+const qualify = (packageName, name) => packageName ? `${packageName}.${name}` : name;
 /** Any generated DAO tree Kotlin (entities, enums, xref, etc.). */
 const isGeneratedDaoTreeFile = (filePath) => {
     const normalized = filePath.replace(/\\/g, '/');
@@ -15,15 +19,16 @@ const parseEnumMembers = (body) => body
     .map((part) => { var _a, _b; return (_b = (_a = part.split(/\s+/)[0]) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : ''; })
     .filter((name) => /^\w+$/.test(name));
 /** `enum class Side { BUY, SELL }` in generated DAO sources. */
-const extractEnumClassesFromContent = (content) => {
+const extractEnumClassesFromContent = (content, scope = EMPTY_SCOPE) => {
     const enums = new Map();
     const enumRegex = /(?:^|\n)\s*(?:public\s+)?enum\s+class\s+(\w+)\s*\{([^}]*)\}/gm;
     let match;
     while ((match = enumRegex.exec(content)) !== null) {
         const name = match[1];
-        const members = parseEnumMembers(match[2]);
-        if (members.length > 0) {
-            enums.set(name, members);
+        const values = parseEnumMembers(match[2]);
+        if (values.length > 0) {
+            const fqn = qualify(scope.packageName, name);
+            enums.set(fqn, { name, packageName: scope.packageName, fqn, values });
         }
     }
     return enums;
@@ -32,10 +37,17 @@ exports.extractEnumClassesFromContent = extractEnumClassesFromContent;
 /**
  * Companion `Field` metadata on generated entities, e.g.
  * `values = "STANDARD PREMIUM TRIAL"` on `NonNullable<Tier>(Field(… type = Field.Type.ENUM …))`.
+ * The entity file imports the enum from its own table package (real generated code never
+ * declares the enum inline), so an explicit `import` is what turns `Tier` into the
+ * fully-qualified name this map is keyed by. Without one, we cannot know which package the
+ * type actually belongs to — qualifying it with the ENTITY's own package would invent an FQN
+ * nothing declares, and that phantom entry could then wrongly stand in for (or split apart) a
+ * real declaration in `resolveEnumExportNames`. So we skip it, the same way `uniqueBySimpleName`
+ * refuses to guess an ambiguous reference.
  */
-const extractCompanionFieldEnumValues = (content) => {
+const extractCompanionFieldEnumValues = (content, scope = EMPTY_SCOPE) => {
     const enums = new Map();
-    const blockRegex = /public\s+val\s+\w+:\s*NonNullable<(\w+)>\s*=\s*NonNullable<\1>\(Field\(([\s\S]*?)\)\)/g;
+    const blockRegex = /public\s+val\s+\w+:\s*(?:NonNullable|Nullable)<(\w+)>\s*=\s*(?:NonNullable|Nullable)<\1>\(Field\(([\s\S]*?)\)\)/g;
     let match;
     while ((match = blockRegex.exec(content)) !== null) {
         const enumTypeName = match[1];
@@ -45,54 +57,140 @@ const extractCompanionFieldEnumValues = (content) => {
         const valuesMatch = fieldBody.match(/values\s*=\s*"([^"]+)"/);
         if (!valuesMatch)
             continue;
-        const literals = valuesMatch[1]
+        const values = valuesMatch[1]
             .trim()
             .split(/\s+/)
             .filter((value) => value.length > 0);
-        if (literals.length > 0) {
-            enums.set(enumTypeName, literals);
+        const fqn = scope.imports.get(enumTypeName);
+        if (values.length > 0 && fqn) {
+            const dot = fqn.lastIndexOf('.');
+            enums.set(fqn, {
+                name: dot === -1 ? fqn : fqn.slice(dot + 1),
+                packageName: dot === -1 ? '' : fqn.slice(0, dot),
+                fqn,
+                values,
+            });
         }
     }
     return enums;
 };
 exports.extractCompanionFieldEnumValues = extractCompanionFieldEnumValues;
 const mergeEnumMaps = (into, from) => {
-    for (const [name, values] of from) {
-        if (!into.has(name)) {
-            into.set(name, values);
+    for (const [fqn, def] of from) {
+        if (!into.has(fqn)) {
+            into.set(fqn, def);
         }
     }
 };
 const parseGeneratedEnumsFromSources = (files) => {
-    const enums = new Map();
+    const declaredEnums = new Map();
+    const companionEnums = new Map();
     for (const filePath of files) {
         if (!(0, exports.isGeneratedDaoTreeFile)(filePath))
             continue;
-        const content = (0, node_fs_1.readFileSync)(filePath, 'utf8');
-        mergeEnumMaps(enums, (0, exports.extractEnumClassesFromContent)(content));
-        mergeEnumMaps(enums, (0, exports.extractCompanionFieldEnumValues)(content));
+        const content = (0, kotlin_parse_utils_1.stripKotlinComments)((0, node_fs_1.readFileSync)(filePath, 'utf8'));
+        const scope = (0, kotlin_parse_utils_1.parseKotlinFileScope)(content);
+        mergeEnumMaps(declaredEnums, (0, exports.extractEnumClassesFromContent)(content, scope));
+        mergeEnumMaps(companionEnums, (0, exports.extractCompanionFieldEnumValues)(content, scope));
     }
-    return enums;
+    // An `enum class` body is the enum's actual declaration; companion `Field` metadata is a
+    // second, redundant encoding of the same values on the entity referencing it. Precedence
+    // between the two must not depend on which file the glob happens to visit first, so the
+    // declaration always wins and the companion map only fills gaps it didn't cover.
+    mergeEnumMaps(declaredEnums, companionEnums);
+    return declaredEnums;
 };
 exports.parseGeneratedEnumsFromSources = parseGeneratedEnumsFromSources;
-const kotlinEnumSimpleName = (kotlinType) => {
+/**
+ * Resolve a type name AS WRITTEN in the file described by `scope` to the enum it declares.
+ * Kotlin resolution order: explicit import (incl. aliases) → same package → star import. `scope`
+ * is required rather than optional: every real `KotlinDto` (from either generated-DAO or custom
+ * DTO parsing) always carries its declaring file's scope, so a caller with none to give us would
+ * itself be a bug worth surfacing at the call site — not something to paper over with a
+ * global simple-name guess. That guess is exactly the collision this resolver exists to prevent,
+ * just reached one level removed (a hand-written DTO field using an unrelated type that happens
+ * to share a name with a generated enum).
+ */
+const resolveKotlinEnum = (kotlinType, enums, scope) => {
     var _a;
     const bare = kotlinType.replace(/\?$/, '').trim();
-    return bare.includes('.') ? ((_a = bare.split('.').pop()) !== null && _a !== void 0 ? _a : bare) : bare;
-};
-exports.kotlinEnumSimpleName = kotlinEnumSimpleName;
-const kotlinEnumTypeToTs = (kotlinType, enums) => {
-    const simpleName = (0, exports.kotlinEnumSimpleName)(kotlinType);
-    const values = enums.get(simpleName);
-    if (!values || values.length === 0)
+    if (!bare)
         return null;
-    return values.map((value) => `'${value}'`).join(' | ');
+    if (bare.includes('.')) {
+        return (_a = enums.get(bare)) !== null && _a !== void 0 ? _a : null;
+    }
+    const candidates = [
+        scope.imports.get(bare),
+        qualify(scope.packageName, bare),
+        ...scope.starImports.map((pkg) => `${pkg}.${bare}`),
+    ];
+    for (const fqn of candidates) {
+        const hit = fqn ? enums.get(fqn) : undefined;
+        if (hit)
+            return hit;
+    }
+    return null;
 };
-exports.kotlinEnumTypeToTs = kotlinEnumTypeToTs;
-/** Use generated enum type name when declared (paired with `renderEnumExports`). */
-const kotlinEnumTypeRef = (kotlinType, enums) => {
-    const simpleName = (0, exports.kotlinEnumSimpleName)(kotlinType);
-    return enums.has(simpleName) ? simpleName : null;
+exports.resolveKotlinEnum = resolveKotlinEnum;
+/**
+ * Order-insensitive identity for a value set. Two declarations listing the same values in a
+ * different order (the same dictionary enum reached via a summary view, say) produce identical
+ * TypeScript, so qualifying them apart would be churn with nothing behind it.
+ */
+const valuesKey = (values) => [...values].sort().join('\0');
+/**
+ * Assign every declared enum the name it is exported under.
+ *
+ * A simple name declared by exactly one table — or by several that agree on the values — keeps
+ * it (`Direction`). When tables disagree, EVERY declaration of that name is qualified with its
+ * owning table (`AxeStatus`, `RfqStatus`, `OrderStatus`) so no table's values can be exported
+ * under a bare name that another table's fields also point at.
+ */
+const resolveEnumExportNames = (enums) => {
+    var _a;
+    const bySimpleName = new Map();
+    for (const def of enums.values()) {
+        const group = bySimpleName.get(def.name);
+        if (group)
+            group.push(def);
+        else
+            bySimpleName.set(def.name, [def]);
+    }
+    const exportNames = new Map();
+    const taken = new Set();
+    const ambiguous = [];
+    // Unambiguous names claim the bare simple name first, so a qualified name can never steal it.
+    // An ambiguous group reserves its OWN bare name too: `ownerPrefixes` never actually returns an
+    // empty prefix for a real Genesis package, but nothing structural stops it — reserving here
+    // means a degenerate qualifier falls to the numbered suffix instead of silently handing one
+    // arbitrary member of the group the bare name, which is the exact bug this function exists to
+    // prevent, just reached from an edge case instead of the common path.
+    for (const [simpleName, group] of bySimpleName) {
+        const agree = group.every((def) => valuesKey(def.values) === valuesKey(group[0].values));
+        if (agree) {
+            for (const def of group)
+                exportNames.set(def.fqn, simpleName);
+            taken.add(simpleName);
+        }
+        else {
+            taken.add(simpleName);
+            ambiguous.push(group);
+        }
+    }
+    for (const group of ambiguous) {
+        for (const def of group) {
+            const candidates = (0, naming_1.ownerPrefixes)(def.packageName).map((prefix) => `${prefix}${def.name}`);
+            let chosen = candidates.find((candidate) => !taken.has(candidate));
+            for (let n = 2; !chosen; n += 1) {
+                const numbered = `${(_a = candidates[candidates.length - 1]) !== null && _a !== void 0 ? _a : def.name}${n}`;
+                if (!taken.has(numbered))
+                    chosen = numbered;
+            }
+            taken.add(chosen);
+            exportNames.set(def.fqn, chosen);
+        }
+    }
+    return exportNames;
 };
-exports.kotlinEnumTypeRef = kotlinEnumTypeRef;
+exports.resolveEnumExportNames = resolveEnumExportNames;
 //# sourceMappingURL=parse-enums.js.map

package/dist/parse-enums.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-enums.js","sourceRoot":"","sources":["../src/parse-enums.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAIvC,MAAM,qBAAqB,GAAG,KAAK,CAAC;AAEpC,mEAAmE;AAC5D,MAAM,sBAAsB,GAAG,CAAC,QAAgB,EAAW,EAAE;IAClE,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAChD,OAAO,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;AACxF,CAAC,CAAC;AAHW,QAAA,sBAAsB,0BAGjC;AAEF,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAY,EAAE,CAClD,IAAI;KACD,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;KACjD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,eAAC,OAAA,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,0CAAE,IAAI,EAAE,mCAAI,EAAE,CAAA,EAAA,CAAC;KACjD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAE1C,gEAAgE;AACzD,MAAM,6BAA6B,GAAG,CAAC,OAAe,EAAiB,EAAE;IAC9E,MAAM,KAAK,GAAkB,IAAI,GAAG,EAAE,CAAC;IACvC,MAAM,SAAS,GAAG,+DAA+D,CAAC;IAClF,IAAI,KAA6B,CAAC;IAElC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAdW,QAAA,6BAA6B,iCAcxC;AAEF;;;GAGG;AACI,MAAM,+BAA+B,GAAG,CAAC,OAAe,EAAiB,EAAE;IAChF,MAAM,KAAK,GAAkB,IAAI,GAAG,EAAE,CAAC;IACvC,MAAM,UAAU,GACd,wFAAwF,CAAC;IAC3F,IAAI,KAA6B,CAAC;IAElC,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACnD,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YAAE,SAAS;QAErD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC9D,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3B,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC;aAC5B,IAAI,EAAE;aACN,KAAK,CAAC,KAAK,CAAC;aACZ,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAEvC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAzBW,QAAA,+BAA+B,mCAyB1C;AAEF,MAAM,aAAa,GAAG,CAAC,IAAmB,EAAE,IAAmB,EAAQ,EAAE;IACvE,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,8BAA8B,GAAG,CAAC,KAAe,EAAiB,EAAE;IAC/E,MAAM,KAAK,GAAkB,IAAI,GAAG,EAAE,CAAC;IAEvC,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAA,8BAAsB,EAAC,QAAQ,CAAC;YAAE,SAAS;QAChD,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC/C,aAAa,CAAC,KAAK,EAAE,IAAA,qCAA6B,EAAC,OAAO,CAAC,CAAC,CAAC;QAC7D,aAAa,CAAC,KAAK,EAAE,IAAA,uCAA+B,EAAC,OAAO,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAXW,QAAA,8BAA8B,kCAWzC;AAEK,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAU,EAAE;;IACjE,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,mCAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACrE,CAAC,CAAC;AAHW,QAAA,oBAAoB,wBAG/B;AAEK,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,KAAoB,EAAiB,EAAE;IAC5F,MAAM,UAAU,GAAG,IAAA,4BAAoB,EAAC,UAAU,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACrC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAChD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACzD,CAAC,CAAC;AALW,QAAA,kBAAkB,sBAK7B;AAEF,oFAAoF;AAC7E,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,KAAoB,EAAiB,EAAE;IAC3F,MAAM,UAAU,GAAG,IAAA,4BAAoB,EAAC,UAAU,CAAC,CAAC;IACpD,OAAO,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;AACnD,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B"}
+{"version":3,"file":"parse-enums.js","sourceRoot":"","sources":["../src/parse-enums.ts"],"names":[],"mappings":"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"}

package/dist/parse-kotlin.d.ts

@@ -1,5 +1,5 @@
 import type { KotlinEnumMap } from './parse-enums';
-import type { KotlinDto, KotlinProperty, MappedHandler, UnmappedHandler } from './types';
+import type { KotlinDto, KotlinFileScope, KotlinProperty, MappedHandler, UnmappedHandler } from './types';
 declare const DATA_CLASS_START: RegExp;
 declare const extractDataClasses: (content: string) => {
     name: string;
@@ -10,6 +10,14 @@ export declare const parseHandlersFromSources: (files: string[], dtos: Map<strin
     mapped: MappedHandler[];
     unmapped: UnmappedHandler[];
 };
-export declare const kotlinTypeToTs: (kotlinType: string, dtos: Map<string, KotlinDto>, enums?: KotlinEnumMap) => string;
+/** What a property's declared type is resolved against: the enums, and the file that wrote it. */
+export type EnumRefContext = {
+    enums: KotlinEnumMap;
+    /** Fully-qualified enum name → the name it is exported under (see resolveEnumExportNames). */
+    exportNames: Map<string, string>;
+    /** Package + imports of the file declaring the property. */
+    fileScope: KotlinFileScope;
+};
+export declare const kotlinTypeToTs: (kotlinType: string, dtos: Map<string, KotlinDto>, enumContext?: EnumRefContext) => string;
 export { extractDataClasses, DATA_CLASS_START };
 //# sourceMappingURL=parse-kotlin.d.ts.map

package/dist/parse-kotlin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-kotlin.d.ts","sourceRoot":"","sources":["../src/parse-kotlin.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAmBzF,QAAA,MAAM,gBAAgB,QAAsE,CAAC;AAE7F,QAAA,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,cAAc,EAAE,CAAA;CAAE,EAkC3F,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,MAAM,EAAE,KAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAe3E,CAAC;AAeF,eAAO,MAAM,wBAAwB,GACnC,OAAO,MAAM,EAAE,EACf,MAAM,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,KAC3B;IAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IAAC,QAAQ,EAAE,eAAe,EAAE,CAAA;CAwDxD,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,YAAY,MAAM,EAClB,MAAM,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAC5B,QAAO,aAAyB,KAC/B,MAoBF,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"parse-kotlin.d.ts","sourceRoot":"","sources":["../src/parse-kotlin.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EACf,cAAc,EACd,aAAa,EACb,eAAe,EAChB,MAAM,SAAS,CAAC;AAmBjB,QAAA,MAAM,gBAAgB,QAAsE,CAAC;AAE7F,QAAA,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,cAAc,EAAE,CAAA;CAAE,EAkC3F,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,MAAM,EAAE,KAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAiB3E,CAAC;AAeF,eAAO,MAAM,wBAAwB,GACnC,OAAO,MAAM,EAAE,EACf,MAAM,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,KAC3B;IAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IAAC,QAAQ,EAAE,eAAe,EAAE,CAAA;CAwDxD,CAAC;AAEF,kGAAkG;AAClG,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,8FAA8F;IAC9F,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,4DAA4D;IAC5D,SAAS,EAAE,eAAe,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,YAAY,MAAM,EAClB,MAAM,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAC5B,cAAc,cAAc,KAC3B,MAuBF,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/parse-kotlin.js

@@ -61,11 +61,13 @@ const parseDtosFromSources = (files) => {
     const dtos = new Map();
     for (const filePath of files) {
         const content = (0, kotlin_parse_utils_1.stripKotlinComments)((0, node_fs_1.readFileSync)(filePath, 'utf8'));
+        const fileScope = (0, kotlin_parse_utils_1.parseKotlinFileScope)(content);
         for (const parsed of extractDataClasses(content)) {
             dtos.set(parsed.name, {
                 name: parsed.name,
                 properties: parsed.properties,
                 filePath,
+                fileScope,
             });
         }
     }
@@ -134,17 +136,20 @@ const parseHandlersFromSources = (files, dtos) => {
     return { mapped, unmapped };
 };
 exports.parseHandlersFromSources = parseHandlersFromSources;
-const kotlinTypeToTs = (kotlinType, dtos, enums = new Map()) => {
+const kotlinTypeToTs = (kotlinType, dtos, enumContext) => {
     const listMatch = kotlinType.match(/^(?:List|MutableList|Set|MutableSet)<(.+)>$/);
     if (listMatch) {
-        return `${(0, exports.kotlinTypeToTs)(listMatch[1].trim(), dtos, enums)}[]`;
+        return `${(0, exports.kotlinTypeToTs)(listMatch[1].trim(), dtos, enumContext)}[]`;
     }
     if (PRIMITIVE_TS[kotlinType]) {
         return PRIMITIVE_TS[kotlinType];
     }
-    const enumTs = (0, parse_enums_1.kotlinEnumTypeRef)(kotlinType, enums);
-    if (enumTs) {
-        return enumTs;
+    if (enumContext) {
+        const enumDef = (0, parse_enums_1.resolveKotlinEnum)(kotlinType, enumContext.enums, enumContext.fileScope);
+        const exported = enumDef && enumContext.exportNames.get(enumDef.fqn);
+        if (exported) {
+            return exported;
+        }
     }
     if (dtos.has(kotlinType)) {
         return (0, naming_1.handlerInputToDetailsInterfaceName)(kotlinType);

package/dist/parse-kotlin.js.map

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

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;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"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AAKA,OAAO,EAA6C,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9F,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AA6HzE,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,MA4BF,CAAC"}

package/dist/render.js

@@ -31,11 +31,11 @@ const expandUsedDtoNames = (mapped, dtos) => {
     }
     return used;
 };
-const renderInterface = (dto, dtos, enums) => {
+const renderInterface = (dto, dtos, enumContext) => {
     const interfaceName = (0, naming_1.handlerInputToDetailsInterfaceName)(dto.name);
     const lines = dto.properties.map((prop) => {
         const wireName = (0, naming_1.kotlinPropertyToWireField)(prop.name);
-        const tsType = (0, parse_kotlin_1.kotlinTypeToTs)(prop.kotlinType, dtos, enums);
+        const tsType = (0, parse_kotlin_1.kotlinTypeToTs)(prop.kotlinType, dtos, Object.assign(Object.assign({}, enumContext), { fileScope: dto.fileScope }));
         const optional = prop.optional ? '?' : '';
         return `  ${wireName}${optional}: ${tsType};`;
     });
@@ -64,40 +64,51 @@ const renderUnmappedComment = (unmapped) => {
     const lines = unmapped.map((entry) => ` * - ${entry.handlerName} (${entry.inputType}): ${entry.reason} [${entry.sourceFile.split(/[/\\]/).pop()}]`);
     return `/**\n * Unmapped handlers (not included in EventDetailsMap):\n${lines.join('\n')}\n */\n\n`;
 };
-const renderEnumExports = (enums, usedEnumNames) => {
-    const blocks = [];
-    for (const name of [...usedEnumNames].sort()) {
-        const values = enums.get(name);
-        if (!(values === null || values === void 0 ? void 0 : values.length))
+const renderEnumExports = (enums, usedEnumFqns, exportNames) => {
+    var _a;
+    // Several declarations can share an export name only when their values agree; take the
+    // first by qualified name so the emitted order does not depend on handler declaration order.
+    const byExportName = new Map();
+    for (const fqn of [...usedEnumFqns].sort()) {
+        const exportName = exportNames.get(fqn);
+        const values = (_a = enums.get(fqn)) === null || _a === void 0 ? void 0 : _a.values;
+        if (!exportName || !(values === null || values === void 0 ? void 0 : values.length) || byExportName.has(exportName))
             continue;
-        const entries = values.map((value) => `  ${value}: '${value}',`).join('\n');
-        blocks.push(`export const ${name} = {\n${entries}\n} as const;\n\nexport type ${name} = (typeof ${name})[keyof typeof ${name}];`);
+        byExportName.set(exportName, values);
     }
+    const blocks = [...byExportName.entries()]
+        .sort(([a], [b]) => a.localeCompare(b))
+        .map(([name, values]) => {
+        const entries = values.map((value) => `  ${value}: '${value}',`).join('\n');
+        return `export const ${name} = {\n${entries}\n} as const;\n\nexport type ${name} = (typeof ${name})[keyof typeof ${name}];`;
+    });
     return blocks.length > 0 ? `${blocks.join('\n\n')}\n\n` : '';
 };
-const collectUsedEnumNames = (usedDtoNames, dtos, enums) => {
+/** Fully-qualified names of the enums the emitted interfaces actually reference. */
+const collectUsedEnums = (usedDtoNames, dtos, enums) => {
     const used = new Set();
     for (const dtoName of usedDtoNames) {
         const dto = dtos.get(dtoName);
         if (!dto)
             continue;
         for (const prop of dto.properties) {
-            const ref = (0, parse_enums_1.kotlinEnumTypeRef)(kotlinTypeRoot(prop.kotlinType), enums);
+            const ref = (0, parse_enums_1.resolveKotlinEnum)(kotlinTypeRoot(prop.kotlinType), enums, dto.fileScope);
             if (ref)
-                used.add(ref);
+                used.add(ref.fqn);
         }
     }
     return used;
 };
 const renderEventTypesFile = (mapped, unmapped, dtos, enums = new Map()) => {
     const usedDtos = expandUsedDtoNames(mapped, dtos);
+    const exportNames = (0, parse_enums_1.resolveEnumExportNames)(enums);
     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(usedDtos, dtos, enums);
-    const enumExports = renderEnumExports(enums, usedEnumNames);
+        .map((dto) => renderInterface(dto, dtos, { enums, exportNames }));
+    const usedEnums = collectUsedEnums(usedDtos, dtos, enums);
+    const enumExports = renderEnumExports(enums, usedEnums, exportNames);
     const mapEntries = mapped.map((m) => `  ${m.eventName}: ${m.detailsInterface};`).join('\n');
     const eventClasses = renderEventClasses(mapped);
     const foundationCommsImport = mapped.length > 0 ? `import { GenesisEvent } from '@genesislcap/foundation-comms';\n\n` : '';

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/dist/types.d.ts

@@ -25,10 +25,24 @@ export type KotlinProperty = {
     kotlinType: string;
     optional: boolean;
 };
+/**
+ * Package + import context of one Kotlin file, so a simple type name written inside it can be
+ * resolved to the declaration it actually refers to (table-scoped enums reuse simple names).
+ */
+export type KotlinFileScope = {
+    /** Declared package, '' when the file has none. */
+    packageName: string;
+    /** Simple name (or alias) → fully-qualified name, from explicit `import` lines. */
+    imports: Map<string, string>;
+    /** Packages brought in wholesale by `import pkg.*`. */
+    starImports: string[];
+};
 export type KotlinDto = {
     name: string;
     properties: KotlinProperty[];
     filePath: string;
+    /** Scope of the declaring file — every producer parses this from real source. */
+    fileScope: KotlinFileScope;
 };
 export type MappedHandler = {
     eventName: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,mDAAmD;IACnD,WAAW,EAAE,MAAM,CAAC;IACpB,mFAAmF;IACnF,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,uDAAuD;IACvD,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,iFAAiF;IACjF,SAAS,EAAE,eAAe,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/event-type-codegen",
   "description": "Build-time TypeScript codegen from Kotlin event handler DTOs",
-  "version": "15.19.4",
+  "version": "15.19.5",
   "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": "15.19.4",
+    "@genesislcap/foundation-testing": "15.19.5",
     "@types/node": "^22.10.2",
     "tsx": "^4.7.0",
     "uvu": "0.5.4"

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

@@ -7,6 +7,22 @@
 
 import { GenesisEvent } from '@genesislcap/foundation-comms';
 
+export const AxeStatus = {
+  LIVE: 'LIVE',
+  TRADED: 'TRADED',
+  WITHDRAWN: 'WITHDRAWN',
+  EXPIRED: 'EXPIRED',
+} as const;
+
+export type AxeStatus = (typeof AxeStatus)[keyof typeof AxeStatus];
+
+export const Direction = {
+  BUY: 'BUY',
+  SELL: 'SELL',
+} as const;
+
+export type Direction = (typeof Direction)[keyof typeof Direction];
+
 export const Priority = {
   LOW: 'LOW',
   HIGH: 'HIGH',
@@ -14,6 +30,16 @@ export const Priority = {
 
 export type Priority = (typeof Priority)[keyof typeof Priority];
 
+export const RfqStatus = {
+  PRICE_REQUEST: 'PRICE_REQUEST',
+  LIVE_PRICE: 'LIVE_PRICE',
+  EXECUTED: 'EXECUTED',
+  PASSED: 'PASSED',
+  EXPIRED: 'EXPIRED',
+} as const;
+
+export type RfqStatus = (typeof RfqStatus)[keyof typeof RfqStatus];
+
 export const Side = {
   BUY: 'BUY',
   SELL: 'SELL',
@@ -32,6 +58,13 @@ export interface AnnotatedInputDetails {
   IGNORED_HINT?: string;
 }
 
+export interface AxeDetails {
+  AXE_ID?: string;
+  INSTRUMENT_ID: string;
+  DIRECTION?: Direction;
+  STATUS?: AxeStatus;
+}
+
 export interface BulkSideInputDetails {
   PRIORITIES: Priority[];
 }
@@ -54,6 +87,13 @@ export interface NestedInputDetails {
   ITEMS: FooInputDetails[];
 }
 
+export interface RfqDetails {
+  RFQ_ID?: string;
+  INSTRUMENT_ID: string;
+  DIRECTION?: Direction;
+  STATUS?: RfqStatus;
+}
+
 export interface TradeDetails {
   TRADE_ID?: string;
   INSTRUMENT_ID: string;
@@ -71,12 +111,14 @@ export interface TradeByIdDetails {
 
 export interface EventDetailsMap {
   EVENT_ANNOTATED: AnnotatedInputDetails;
+  EVENT_AXE_INSERT: AxeDetails;
   EVENT_BAR_BAZ: NestedInputDetails;
   EVENT_BULK_SIDE: BulkSideInputDetails;
   EVENT_CHARGE_AMEND: ChargeAmendInputDetails;
   EVENT_CONTEXT_FOO: FooInputDetails;
   EVENT_DAO_HANDLER: InstrumentByIdDetails;
   EVENT_FOO: FooInputDetails;
+  EVENT_RFQ_INSERT: RfqDetails;
   EVENT_TRADE_DELETE: TradeByIdDetails;
   EVENT_TRADE_INSERT: TradeDetails;
 }
@@ -91,6 +133,14 @@ export class EventAnnotated extends GenesisEvent<'EVENT_ANNOTATED', AnnotatedInp
   }
 }
 
+export class EventAxeInsert extends GenesisEvent<'EVENT_AXE_INSERT', AxeDetails> {
+  readonly MESSAGE_TYPE = 'EVENT_AXE_INSERT' as const;
+
+  constructor(details: AxeDetails) {
+    super(details);
+  }
+}
+
 export class EventBarBaz extends GenesisEvent<'EVENT_BAR_BAZ', NestedInputDetails> {
   readonly MESSAGE_TYPE = 'EVENT_BAR_BAZ' as const;
 
@@ -139,6 +189,14 @@ export class EventFoo extends GenesisEvent<'EVENT_FOO', FooInputDetails> {
   }
 }
 
+export class EventRfqInsert extends GenesisEvent<'EVENT_RFQ_INSERT', RfqDetails> {
+  readonly MESSAGE_TYPE = 'EVENT_RFQ_INSERT' as const;
+
+  constructor(details: RfqDetails) {
+    super(details);
+  }
+}
+
 export class EventTradeDelete extends GenesisEvent<'EVENT_TRADE_DELETE', TradeByIdDetails> {
   readonly MESSAGE_TYPE = 'EVENT_TRADE_DELETE' as const;
 

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

@@ -7,6 +7,22 @@
 
 import { GenesisEvent } from '@genesislcap/foundation-comms';
 
+export const AxeStatus = {
+  LIVE: 'LIVE',
+  TRADED: 'TRADED',
+  WITHDRAWN: 'WITHDRAWN',
+  EXPIRED: 'EXPIRED',
+} as const;
+
+export type AxeStatus = (typeof AxeStatus)[keyof typeof AxeStatus];
+
+export const Direction = {
+  BUY: 'BUY',
+  SELL: 'SELL',
+} as const;
+
+export type Direction = (typeof Direction)[keyof typeof Direction];
+
 export const Priority = {
   LOW: 'LOW',
   HIGH: 'HIGH',
@@ -14,6 +30,16 @@ export const Priority = {
 
 export type Priority = (typeof Priority)[keyof typeof Priority];
 
+export const RfqStatus = {
+  PRICE_REQUEST: 'PRICE_REQUEST',
+  LIVE_PRICE: 'LIVE_PRICE',
+  EXECUTED: 'EXECUTED',
+  PASSED: 'PASSED',
+  EXPIRED: 'EXPIRED',
+} as const;
+
+export type RfqStatus = (typeof RfqStatus)[keyof typeof RfqStatus];
+
 export const Side = {
   BUY: 'BUY',
   SELL: 'SELL',
@@ -32,6 +58,13 @@ export interface AnnotatedInputDetails {
   IGNORED_HINT?: string;
 }
 
+export interface AxeDetails {
+  AXE_ID?: string;
+  INSTRUMENT_ID: string;
+  DIRECTION?: Direction;
+  STATUS?: AxeStatus;
+}
+
 export interface BulkSideInputDetails {
   PRIORITIES: Priority[];
 }
@@ -54,6 +87,13 @@ export interface NestedInputDetails {
   ITEMS: FooInputDetails[];
 }
 
+export interface RfqDetails {
+  RFQ_ID?: string;
+  INSTRUMENT_ID: string;
+  DIRECTION?: Direction;
+  STATUS?: RfqStatus;
+}
+
 export interface TradeDetails {
   TRADE_ID?: string;
   INSTRUMENT_ID: string;
@@ -71,12 +111,14 @@ export interface TradeByIdDetails {
 
 export interface EventDetailsMap {
   EVENT_ANNOTATED: AnnotatedInputDetails;
+  EVENT_AXE_INSERT: AxeDetails;
   EVENT_BAR_BAZ: NestedInputDetails;
   EVENT_BULK_SIDE: BulkSideInputDetails;
   EVENT_CHARGE_AMEND: ChargeAmendInputDetails;
   EVENT_CONTEXT_FOO: FooInputDetails;
   EVENT_DAO_HANDLER: InstrumentByIdDetails;
   EVENT_FOO: FooInputDetails;
+  EVENT_RFQ_INSERT: RfqDetails;
   EVENT_TRADE_DELETE: TradeByIdDetails;
   EVENT_TRADE_INSERT: TradeDetails;
 }
@@ -91,6 +133,14 @@ export class EventAnnotated extends GenesisEvent<'EVENT_ANNOTATED', AnnotatedInp
   }
 }
 
+export class EventAxeInsert extends GenesisEvent<'EVENT_AXE_INSERT', AxeDetails> {
+  readonly MESSAGE_TYPE = 'EVENT_AXE_INSERT' as const;
+
+  constructor(details: AxeDetails) {
+    super(details);
+  }
+}
+
 export class EventBarBaz extends GenesisEvent<'EVENT_BAR_BAZ', NestedInputDetails> {
   readonly MESSAGE_TYPE = 'EVENT_BAR_BAZ' as const;
 
@@ -139,6 +189,14 @@ export class EventFoo extends GenesisEvent<'EVENT_FOO', FooInputDetails> {
   }
 }
 
+export class EventRfqInsert extends GenesisEvent<'EVENT_RFQ_INSERT', RfqDetails> {
+  readonly MESSAGE_TYPE = 'EVENT_RFQ_INSERT' as const;
+
+  constructor(details: RfqDetails) {
+    super(details);
+  }
+}
+
 export class EventTradeDelete extends GenesisEvent<'EVENT_TRADE_DELETE', TradeByIdDetails> {
   readonly MESSAGE_TYPE = 'EVENT_TRADE_DELETE' as const;
 

package/test/fixtures/mini-server/generated-dao/global/genesis/gen/dao/Axe.kt

@@ -0,0 +1,38 @@
+package global.genesis.gen.dao
+
+import global.genesis.db.entity.TableEntity
+import global.genesis.dictionary.Field
+import global.genesis.dictionary.annotation.GenesisType
+import global.genesis.gen.dao.enums.example.axe.Direction
+import global.genesis.gen.dao.enums.example.axe.Status
+import global.genesis.message.core.annotation.Title
+import java.io.Serializable
+
+/**
+ * Fixture stand-in for a generated Axe DAO. Its STATUS enum shares a simple name with Rfq's
+ * but not its values — the collision this file exists to pin down.
+ */
+@Title("Axe")
+public class Axe public constructor(
+  axeId: String? = null,
+  @Title("Instrument Id")
+  @GenesisType(Field.Type.STRING)
+  public var instrumentId: String,
+  @Title("Direction")
+  @GenesisType(Field.Type.ENUM)
+  public var direction: Direction = Direction.BUY,
+  @Title("Status")
+  @GenesisType(Field.Type.ENUM)
+  public var status: Status = Status.LIVE,
+) : Serializable, TableEntity {
+  public var axeId: String = axeId ?: ""
+
+  public companion object {
+    public val STATUS: NonNullable<Status> = NonNullable<Status>(Field(
+            name = "STATUS",
+            type = Field.Type.ENUM,
+            values = "LIVE TRADED WITHDRAWN EXPIRED",
+            scope = "example.axe.Status",
+        ))
+  }
+}

package/test/fixtures/mini-server/generated-dao/global/genesis/gen/dao/Rfq.kt

@@ -0,0 +1,26 @@
+package global.genesis.gen.dao
+
+import global.genesis.db.entity.TableEntity
+import global.genesis.dictionary.Field
+import global.genesis.dictionary.annotation.GenesisType
+import global.genesis.gen.dao.enums.example.rfq.Direction
+import global.genesis.gen.dao.enums.example.rfq.Status
+import global.genesis.message.core.annotation.Title
+import java.io.Serializable
+
+/** Fixture stand-in for a generated Rfq DAO — same STATUS simple name, different values. */
+@Title("Rfq")
+public class Rfq public constructor(
+  rfqId: String? = null,
+  @Title("Instrument Id")
+  @GenesisType(Field.Type.STRING)
+  public var instrumentId: String,
+  @Title("Direction")
+  @GenesisType(Field.Type.ENUM)
+  public var direction: Direction = Direction.BUY,
+  @Title("Status")
+  @GenesisType(Field.Type.ENUM)
+  public var status: Status = Status.PRICE_REQUEST,
+) : Serializable, TableEntity {
+  public var rfqId: String = rfqId ?: ""
+}

package/test/fixtures/mini-server/generated-dao/global/genesis/gen/dao/enums/example/axe/Direction.kt

@@ -0,0 +1,6 @@
+package global.genesis.gen.dao.enums.example.axe
+
+public enum class Direction {
+  BUY,
+  SELL,
+}

package/test/fixtures/mini-server/generated-dao/global/genesis/gen/dao/enums/example/axe/Status.kt

@@ -0,0 +1,8 @@
+package global.genesis.gen.dao.enums.example.axe
+
+public enum class Status {
+  LIVE,
+  TRADED,
+  WITHDRAWN,
+  EXPIRED,
+}

package/test/fixtures/mini-server/generated-dao/global/genesis/gen/dao/enums/example/rfq/Direction.kt

@@ -0,0 +1,6 @@
+package global.genesis.gen.dao.enums.example.rfq
+
+public enum class Direction {
+  BUY,
+  SELL,
+}

package/test/fixtures/mini-server/generated-dao/global/genesis/gen/dao/enums/example/rfq/Status.kt

@@ -0,0 +1,9 @@
+package global.genesis.gen.dao.enums.example.rfq
+
+public enum class Status {
+  PRICE_REQUEST,
+  LIVE_PRICE,
+  EXECUTED,
+  PASSED,
+  EXPIRED,
+}