@genesislcap/event-type-codegen 15.23.1 → 15.23.2-alpha-fc1c00501.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/kotlin-parse-utils.d.ts +29 -1
- package/dist/kotlin-parse-utils.d.ts.map +1 -1
- package/dist/kotlin-parse-utils.js +37 -4
- package/dist/kotlin-parse-utils.js.map +1 -1
- package/dist/parse-enums.d.ts +3 -1
- package/dist/parse-enums.d.ts.map +1 -1
- package/dist/parse-enums.js +33 -2
- package/dist/parse-enums.js.map +1 -1
- package/dist/parse-kotlin.d.ts.map +1 -1
- package/dist/parse-kotlin.js +5 -1
- package/dist/parse-kotlin.js.map +1 -1
- package/package.json +2 -2
- package/test/fixtures/client-out/genesis-event-types.ts +23 -0
- package/test/fixtures/golden/genesis-event-types.ts +23 -0
- package/test/fixtures/mini-server/generated-dao/global/genesis/gen/dao/enums/FeeType.kt +11 -0
|
@@ -1,11 +1,39 @@
|
|
|
1
1
|
import type { KotlinFileScope, KotlinProperty } from './types';
|
|
2
2
|
/** Strip Kotlin line and block comments from source before structural parsing. */
|
|
3
3
|
export declare const stripKotlinComments: (content: string) => string;
|
|
4
|
+
/**
|
|
5
|
+
* Star imports every Genesis PAL script gets for free, from genesis-server's
|
|
6
|
+
* `genesisApplicationScriptConfig` (genesis-pal-execution, `GenesisApplicationScriptConfig.kt`).
|
|
7
|
+
* A PAL DETAILS data class can name `FeeType` with no import line of its own because the
|
|
8
|
+
* compiler already holds `global.genesis.gen.dao.enums.*` open for it.
|
|
9
|
+
*
|
|
10
|
+
* Kotlin star imports do NOT recurse into sub-packages, and that is load-bearing here: this
|
|
11
|
+
* reaches the flat `…gen.dao.enums.FeeType`, never the table-scoped
|
|
12
|
+
* `…gen.dao.enums.<dictionary>.<table>.Status`. A table-scoped enum still has to be imported
|
|
13
|
+
* explicitly — which is precisely what stops two tables' same-named enums colliding.
|
|
14
|
+
*
|
|
15
|
+
* This is the GENERATED-CODE subset of that config, which is all a scope can be resolved
|
|
16
|
+
* against statically. The rest of the PAL defaults are either product-scoped and only known at
|
|
17
|
+
* runtime (`global.genesis.<product>.message.<type>.*`) or message/coroutine helpers that
|
|
18
|
+
* declare no types we look up. Of the five, only the two `gen.dao` entries can currently hold
|
|
19
|
+
* an enum — a scope's star imports are read solely by `resolveKotlinEnum` — but the list
|
|
20
|
+
* mirrors the compiler config rather than second-guessing where Genesis may emit enums next.
|
|
21
|
+
*/
|
|
22
|
+
export declare const PAL_SCRIPT_DEFAULT_STAR_IMPORTS: readonly string[];
|
|
23
|
+
/**
|
|
24
|
+
* PAL scripts compile with the default imports above; a plain `.kt` source does not, so it only
|
|
25
|
+
* ever resolves through the imports it actually writes.
|
|
26
|
+
*/
|
|
27
|
+
export declare const isPalScriptFile: (filePath: string) => boolean;
|
|
28
|
+
export type ParseKotlinFileScopeOptions = {
|
|
29
|
+
/** Star imports the compiler supplies that the file itself never writes (see PAL defaults). */
|
|
30
|
+
defaultStarImports?: readonly string[];
|
|
31
|
+
};
|
|
4
32
|
/**
|
|
5
33
|
* Read a file's `package` and `import` header. Genesis generates one enum package per table, so
|
|
6
34
|
* the imports are what tell `Status` in Axe.kt apart from `Status` in Rfq.kt.
|
|
7
35
|
*/
|
|
8
|
-
export declare const parseKotlinFileScope: (content: string) => KotlinFileScope;
|
|
36
|
+
export declare const parseKotlinFileScope: (content: string, options?: ParseKotlinFileScopeOptions) => KotlinFileScope;
|
|
9
37
|
/**
|
|
10
38
|
* Strip annotations including use-site targets (field:/param:/get: prefixes).
|
|
11
39
|
* Nested call args in annotations are not fully balanced (secondary limitation).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,+BAA+B,EAAE,SAAS,MAAM,EAM5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,KAAG,OAAoC,CAAC;AAExF,MAAM,MAAM,2BAA2B,GAAG;IACxC,+FAA+F;IAC/F,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAC/B,SAAS,MAAM,EACf,UAAS,2BAAgC,KACxC,eAuBF,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"}
|
|
@@ -1,18 +1,49 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseKotlinProperty = exports.splitTopLevelArgs = exports.stripKotlinAnnotations = exports.parseKotlinFileScope = exports.stripKotlinComments = void 0;
|
|
3
|
+
exports.parseKotlinProperty = exports.splitTopLevelArgs = exports.stripKotlinAnnotations = exports.parseKotlinFileScope = exports.isPalScriptFile = exports.PAL_SCRIPT_DEFAULT_STAR_IMPORTS = exports.stripKotlinComments = void 0;
|
|
4
4
|
/** Strip Kotlin line and block comments from source before structural parsing. */
|
|
5
5
|
const stripKotlinComments = (content) => content.replace(/\/\*[\s\S]*?\*\//g, '').replace(/\/\/.*$/gm, '');
|
|
6
6
|
exports.stripKotlinComments = stripKotlinComments;
|
|
7
7
|
const STAR_IMPORT_SUFFIX = '.*';
|
|
8
8
|
const PACKAGE_REGEX = /(?:^|\n)\s*package\s+([\w.]+)/;
|
|
9
9
|
const IMPORT_REGEX = /(?:^|\n)\s*import\s+((?:\w+\.)*(?:\w+|\*))(?:\s+as\s+(\w+))?/g;
|
|
10
|
+
/**
|
|
11
|
+
* Star imports every Genesis PAL script gets for free, from genesis-server's
|
|
12
|
+
* `genesisApplicationScriptConfig` (genesis-pal-execution, `GenesisApplicationScriptConfig.kt`).
|
|
13
|
+
* A PAL DETAILS data class can name `FeeType` with no import line of its own because the
|
|
14
|
+
* compiler already holds `global.genesis.gen.dao.enums.*` open for it.
|
|
15
|
+
*
|
|
16
|
+
* Kotlin star imports do NOT recurse into sub-packages, and that is load-bearing here: this
|
|
17
|
+
* reaches the flat `…gen.dao.enums.FeeType`, never the table-scoped
|
|
18
|
+
* `…gen.dao.enums.<dictionary>.<table>.Status`. A table-scoped enum still has to be imported
|
|
19
|
+
* explicitly — which is precisely what stops two tables' same-named enums colliding.
|
|
20
|
+
*
|
|
21
|
+
* This is the GENERATED-CODE subset of that config, which is all a scope can be resolved
|
|
22
|
+
* against statically. The rest of the PAL defaults are either product-scoped and only known at
|
|
23
|
+
* runtime (`global.genesis.<product>.message.<type>.*`) or message/coroutine helpers that
|
|
24
|
+
* declare no types we look up. Of the five, only the two `gen.dao` entries can currently hold
|
|
25
|
+
* an enum — a scope's star imports are read solely by `resolveKotlinEnum` — but the list
|
|
26
|
+
* mirrors the compiler config rather than second-guessing where Genesis may emit enums next.
|
|
27
|
+
*/
|
|
28
|
+
exports.PAL_SCRIPT_DEFAULT_STAR_IMPORTS = [
|
|
29
|
+
'global.genesis.gen.dao.enums',
|
|
30
|
+
'global.genesis.gen.dao',
|
|
31
|
+
'global.genesis.gen.config.tables',
|
|
32
|
+
'global.genesis.gen.config.view',
|
|
33
|
+
'global.genesis.gen.view.entity',
|
|
34
|
+
];
|
|
35
|
+
/**
|
|
36
|
+
* PAL scripts compile with the default imports above; a plain `.kt` source does not, so it only
|
|
37
|
+
* ever resolves through the imports it actually writes.
|
|
38
|
+
*/
|
|
39
|
+
const isPalScriptFile = (filePath) => filePath.endsWith('.kts');
|
|
40
|
+
exports.isPalScriptFile = isPalScriptFile;
|
|
10
41
|
/**
|
|
11
42
|
* Read a file's `package` and `import` header. Genesis generates one enum package per table, so
|
|
12
43
|
* the imports are what tell `Status` in Axe.kt apart from `Status` in Rfq.kt.
|
|
13
44
|
*/
|
|
14
|
-
const parseKotlinFileScope = (content) => {
|
|
15
|
-
var _a, _b, _c;
|
|
45
|
+
const parseKotlinFileScope = (content, options = {}) => {
|
|
46
|
+
var _a, _b, _c, _d;
|
|
16
47
|
const imports = new Map();
|
|
17
48
|
const starImports = [];
|
|
18
49
|
IMPORT_REGEX.lastIndex = 0;
|
|
@@ -29,7 +60,9 @@ const parseKotlinFileScope = (content) => {
|
|
|
29
60
|
return {
|
|
30
61
|
packageName: (_c = (_b = content.match(PACKAGE_REGEX)) === null || _b === void 0 ? void 0 : _b[1]) !== null && _c !== void 0 ? _c : '',
|
|
31
62
|
imports,
|
|
32
|
-
|
|
63
|
+
// The file's own star imports come first: a compiler-supplied default is the last thing
|
|
64
|
+
// consulted, after everything the file said out loud.
|
|
65
|
+
starImports: [...starImports, ...((_d = options.defaultStarImports) !== null && _d !== void 0 ? _d : [])],
|
|
33
66
|
};
|
|
34
67
|
};
|
|
35
68
|
exports.parseKotlinFileScope = parseKotlinFileScope;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kotlin-parse-utils.js","sourceRoot":"","sources":["../src/kotlin-parse-utils.ts"],"names":[],"mappings":";;;AAEA,kFAAkF;AAC3E,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAU,EAAE,CAC7D,OAAO,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AADvD,QAAA,mBAAmB,uBACoC;AAEpE,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAM,aAAa,GAAG,+BAA+B,CAAC;AACtD,MAAM,YAAY,GAAG,+DAA+D,CAAC;AAErF;;;GAGG;AACI,MAAM,
|
|
1
|
+
{"version":3,"file":"kotlin-parse-utils.js","sourceRoot":"","sources":["../src/kotlin-parse-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/parse-enums.d.ts
CHANGED
|
@@ -34,7 +34,9 @@ export declare const extractCompanionFieldEnumValues: (content: string, scope?:
|
|
|
34
34
|
export declare const parseGeneratedEnumsFromSources: (files: string[]) => KotlinEnumMap;
|
|
35
35
|
/**
|
|
36
36
|
* Resolve a type name AS WRITTEN in the file described by `scope` to the enum it declares.
|
|
37
|
-
* Kotlin resolution order: explicit import (incl. aliases) → same package → star import
|
|
37
|
+
* Kotlin resolution order: explicit import (incl. aliases) → same package → star import, where
|
|
38
|
+
* the star imports may include ones the compiler supplied rather than the file (a PAL script's
|
|
39
|
+
* defaults — see `PAL_SCRIPT_DEFAULT_STAR_IMPORTS`), consulted after the file's own. `scope`
|
|
38
40
|
* is required rather than optional: every real `KotlinDto` (from either generated-DAO or custom
|
|
39
41
|
* DTO parsing) always carries its declaring file's scope, so a caller with none to give us would
|
|
40
42
|
* itself be a bug worth surfacing at the call site — not something to paper over with a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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
|
|
1
|
+
{"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;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,GAC5B,YAAY,MAAM,EAClB,OAAO,aAAa,EACpB,OAAO,eAAe,KACrB,aAAa,GAAG,IAmBlB,CAAC;AA6BF;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,aAAa,KAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAyD/E,CAAC"}
|
package/dist/parse-enums.js
CHANGED
|
@@ -103,7 +103,9 @@ const parseGeneratedEnumsFromSources = (files) => {
|
|
|
103
103
|
exports.parseGeneratedEnumsFromSources = parseGeneratedEnumsFromSources;
|
|
104
104
|
/**
|
|
105
105
|
* Resolve a type name AS WRITTEN in the file described by `scope` to the enum it declares.
|
|
106
|
-
* Kotlin resolution order: explicit import (incl. aliases) → same package → star import
|
|
106
|
+
* Kotlin resolution order: explicit import (incl. aliases) → same package → star import, where
|
|
107
|
+
* the star imports may include ones the compiler supplied rather than the file (a PAL script's
|
|
108
|
+
* defaults — see `PAL_SCRIPT_DEFAULT_STAR_IMPORTS`), consulted after the file's own. `scope`
|
|
107
109
|
* is required rather than optional: every real `KotlinDto` (from either generated-DAO or custom
|
|
108
110
|
* DTO parsing) always carries its declaring file's scope, so a caller with none to give us would
|
|
109
111
|
* itself be a bug worth surfacing at the call site — not something to paper over with a
|
|
@@ -138,6 +140,22 @@ exports.resolveKotlinEnum = resolveKotlinEnum;
|
|
|
138
140
|
* TypeScript, so qualifying them apart would be churn with nothing behind it.
|
|
139
141
|
*/
|
|
140
142
|
const valuesKey = (values) => [...values].sort().join('\0');
|
|
143
|
+
/**
|
|
144
|
+
* The one member of a disagreeing group whose package strictly encloses every other member's —
|
|
145
|
+
* `…gen.dao.enums` against `…gen.dao.enums.tam.client_trade_report`, say. Null when no single
|
|
146
|
+
* member encloses all the rest, which is the usual shape (sibling table packages enclose
|
|
147
|
+
* nothing), so this only fires for a genuine unscoped-vs-scoped clash.
|
|
148
|
+
*/
|
|
149
|
+
const outermostDeclaration = (group) => {
|
|
150
|
+
const enclosesAllOthers = (candidate) =>
|
|
151
|
+
// An enum with no package encloses nothing. Kotlin cannot import from the default package
|
|
152
|
+
// at all, so no PAL default import resolves a bare name to it and it has no claim on that
|
|
153
|
+
// name. Stated outright because `''.startsWith` would otherwise decide this by accident.
|
|
154
|
+
candidate.packageName !== '' &&
|
|
155
|
+
group.every((other) => other === candidate || other.packageName.startsWith(`${candidate.packageName}.`));
|
|
156
|
+
const enclosing = group.filter(enclosesAllOthers);
|
|
157
|
+
return enclosing.length === 1 ? enclosing[0] : null;
|
|
158
|
+
};
|
|
141
159
|
/**
|
|
142
160
|
* Assign every declared enum the name it is exported under.
|
|
143
161
|
*
|
|
@@ -171,9 +189,22 @@ const resolveEnumExportNames = (enums) => {
|
|
|
171
189
|
for (const def of group)
|
|
172
190
|
exportNames.set(def.fqn, simpleName);
|
|
173
191
|
taken.add(simpleName);
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
taken.add(simpleName);
|
|
195
|
+
// One member can still be the rightful owner of the bare name: the one declared in the
|
|
196
|
+
// package every other member nests UNDER. Genesis puts unscoped dictionary fields in the
|
|
197
|
+
// flat `…gen.dao.enums`, and scoped ones in `…gen.dao.enums.<dictionary>.<table>`, so the
|
|
198
|
+
// flat declaration is the one a PAL script's default import resolves a bare name to. Giving
|
|
199
|
+
// it that name beats numbering it `TradeStatus2` while the table-scoped sibling reads
|
|
200
|
+
// `ClientTradeReportTradeStatus`. Only the enclosing declaration is spared — every nested
|
|
201
|
+
// one is still qualified, so nothing can silently stand in for another table's values.
|
|
202
|
+
const enclosing = outermostDeclaration(group);
|
|
203
|
+
if (enclosing) {
|
|
204
|
+
exportNames.set(enclosing.fqn, simpleName);
|
|
205
|
+
ambiguous.push(group.filter((def) => def !== enclosing));
|
|
174
206
|
}
|
|
175
207
|
else {
|
|
176
|
-
taken.add(simpleName);
|
|
177
208
|
ambiguous.push(group);
|
|
178
209
|
}
|
|
179
210
|
}
|
package/dist/parse-enums.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-enums.js","sourceRoot":"","sources":["../src/parse-enums.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"parse-enums.js","sourceRoot":"","sources":["../src/parse-enums.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,6DAAiF;AACjF,qCAAyC;AAqBzC,MAAM,qBAAqB,GAAG,KAAK,CAAC;AAEpC,MAAM,WAAW,GAAoB,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;AAE9F,MAAM,OAAO,GAAG,CAAC,WAAmB,EAAE,IAAY,EAAU,EAAE,CAC5D,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAEhD,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,CAC3C,OAAe,EACf,QAAyB,WAAW,EACrB,EAAE;IACjB,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,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAC7C,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAlBW,QAAA,6BAA6B,iCAkBxC;AAEF;;;;;;;;;;GAUG;AACI,MAAM,+BAA+B,GAAG,CAC7C,OAAe,EACf,QAAyB,WAAW,EACrB,EAAE;IACjB,MAAM,KAAK,GAAkB,IAAI,GAAG,EAAE,CAAC;IACvC,MAAM,UAAU,GACd,kHAAkH,CAAC;IACrH,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,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC;aAC1B,IAAI,EAAE;aACN,KAAK,CAAC,KAAK,CAAC;aACZ,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAEvC,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;YAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACjC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;gBACb,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;gBAC3C,WAAW,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;gBAChD,GAAG;gBACH,MAAM;aACP,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAnCW,QAAA,+BAA+B,mCAmC1C;AAEF,MAAM,aAAa,GAAG,CAAC,IAAmB,EAAE,IAAmB,EAAQ,EAAE;IACvE,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,8BAA8B,GAAG,CAAC,KAAe,EAAiB,EAAE;IAC/E,MAAM,aAAa,GAAkB,IAAI,GAAG,EAAE,CAAC;IAC/C,MAAM,cAAc,GAAkB,IAAI,GAAG,EAAE,CAAC;IAEhD,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAA,8BAAsB,EAAC,QAAQ,CAAC;YAAE,SAAS;QAChD,MAAM,OAAO,GAAG,IAAA,wCAAmB,EAAC,IAAA,sBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACpE,MAAM,KAAK,GAAG,IAAA,yCAAoB,EAAC,OAAO,CAAC,CAAC;QAC5C,aAAa,CAAC,aAAa,EAAE,IAAA,qCAA6B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC5E,aAAa,CAAC,cAAc,EAAE,IAAA,uCAA+B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IACjF,CAAC;IAED,yFAAyF;IACzF,yFAAyF;IACzF,wFAAwF;IACxF,iFAAiF;IACjF,aAAa,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAE7C,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAnBW,QAAA,8BAA8B,kCAmBzC;AAEF;;;;;;;;;;;GAWG;AACI,MAAM,iBAAiB,GAAG,CAC/B,UAAkB,EAClB,KAAoB,EACpB,KAAsB,EACA,EAAE;;IACxB,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,MAAA,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAI,IAAI,CAAC;IACjC,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC;QAChC,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;KACpD,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7C,IAAI,GAAG;YAAE,OAAO,GAAG,CAAC;IACtB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B;AAEF;;;;GAIG;AACH,MAAM,SAAS,GAAG,CAAC,MAAyB,EAAU,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEvF;;;;;GAKG;AACH,MAAM,oBAAoB,GAAG,CAAC,KAA+B,EAAwB,EAAE;IACrF,MAAM,iBAAiB,GAAG,CAAC,SAAwB,EAAE,EAAE;IACrD,0FAA0F;IAC1F,0FAA0F;IAC1F,yFAAyF;IACzF,SAAS,CAAC,WAAW,KAAK,EAAE;QAC5B,KAAK,CAAC,KAAK,CACT,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,WAAW,GAAG,CAAC,CAC5F,CAAC;IAEJ,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAClD,OAAO,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACtD,CAAC,CAAC;AAEF;;;;;;;GAOG;AACI,MAAM,sBAAsB,GAAG,CAAC,KAAoB,EAAuB,EAAE;;IAClF,MAAM,YAAY,GAAG,IAAI,GAAG,EAA2B,CAAC;IACxD,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;;YACtB,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC9C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,MAAM,SAAS,GAAsB,EAAE,CAAC;IAExC,8FAA8F;IAC9F,+FAA+F;IAC/F,4FAA4F;IAC5F,4FAA4F;IAC5F,8FAA8F;IAC9F,sEAAsE;IACtE,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC;QAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACzF,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,MAAM,GAAG,IAAI,KAAK;gBAAE,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAC9D,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACtB,SAAS;QACX,CAAC;QAED,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACtB,uFAAuF;QACvF,yFAAyF;QACzF,0FAA0F;QAC1F,4FAA4F;QAC5F,sFAAsF;QACtF,0FAA0F;QAC1F,uFAAuF;QACvF,MAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,SAAS,EAAE,CAAC;YACd,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAC3C,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC9B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,IAAA,sBAAa,EAAC,GAAG,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1F,IAAI,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;YACnE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,MAAM,QAAQ,GAAG,GAAG,MAAA,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,mCAAI,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBACxE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAAE,MAAM,GAAG,QAAQ,CAAC;YAC9C,CAAC;YACD,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAClB,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAzDW,QAAA,sBAAsB,0BAyDjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-kotlin.d.ts","sourceRoot":"","sources":["../src/parse-kotlin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-kotlin.d.ts","sourceRoot":"","sources":["../src/parse-kotlin.ts"],"names":[],"mappings":"AAYA,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,CAqB3E,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
CHANGED
|
@@ -61,7 +61,11 @@ const parseDtosFromSources = (files) => {
|
|
|
61
61
|
const dtos = new Map();
|
|
62
62
|
for (const filePath of files) {
|
|
63
63
|
const content = (0, kotlin_parse_utils_1.stripKotlinComments)((0, node_fs_1.readFileSync)(filePath, 'utf8'));
|
|
64
|
-
|
|
64
|
+
// A DETAILS data class declared in a PAL script resolves against the compiler's default
|
|
65
|
+
// imports as well as its own — that is how `val feeType: FeeType` compiles with no import.
|
|
66
|
+
const fileScope = (0, kotlin_parse_utils_1.parseKotlinFileScope)(content, {
|
|
67
|
+
defaultStarImports: (0, kotlin_parse_utils_1.isPalScriptFile)(filePath) ? kotlin_parse_utils_1.PAL_SCRIPT_DEFAULT_STAR_IMPORTS : undefined,
|
|
68
|
+
});
|
|
65
69
|
for (const parsed of extractDataClasses(content)) {
|
|
66
70
|
dtos.set(parsed.name, {
|
|
67
71
|
name: parsed.name,
|
package/dist/parse-kotlin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-kotlin.js","sourceRoot":"","sources":["../src/parse-kotlin.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"parse-kotlin.js","sourceRoot":"","sources":["../src/parse-kotlin.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,6DAO8B;AAC9B,qCAA8D;AAC9D,+CAAkD;AAUlD,MAAM,YAAY,GAA2B;IAC3C,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,QAAQ;IACb,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,QAAQ;IACf,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,QAAQ;IACpB,sEAAsE;IACtE,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,QAAQ;IACjB,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,QAAQ;CACxB,CAAC;AAEF,MAAM,gBAAgB,GAAG,mEAAmE,CAAC;AA6KhE,4CAAgB;AA3K7C,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAoD,EAAE;IAC/F,MAAM,OAAO,GAAqD,EAAE,CAAC;IACrE,MAAM,UAAU,GAAG,6CAA6C,CAAC;IACjE,IAAI,KAA6B,CAAC;IAElC,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACzD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,cAAc,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACxD,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,EAAE,KAAK,GAAG;gBAAE,KAAK,IAAI,CAAC,CAAC;YAC3B,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBACf,KAAK,IAAI,CAAC,CAAC;gBACX,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;oBAChB,UAAU,GAAG,CAAC,CAAC;oBACf,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,UAAU,KAAK,CAAC,CAAC;YAAE,SAAS;QAEhC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,IAAA,sCAAiB,EAAC,IAAI,CAAC;aACvC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,wCAAmB,EAAC,OAAO,CAAC,CAAC;aAC9C,MAAM,CAAC,CAAC,CAAC,EAAuB,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;QAEjD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAyIO,gDAAkB;AAvIpB,MAAM,oBAAoB,GAAG,CAAC,KAAe,EAA0B,EAAE;IAC9E,MAAM,IAAI,GAAG,IAAI,GAAG,EAAqB,CAAC;IAE1C,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,IAAA,wCAAmB,EAAC,IAAA,sBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACpE,wFAAwF;QACxF,2FAA2F;QAC3F,MAAM,SAAS,GAAG,IAAA,yCAAoB,EAAC,OAAO,EAAE;YAC9C,kBAAkB,EAAE,IAAA,oCAAe,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,oDAA+B,CAAC,CAAC,CAAC,SAAS;SAC5F,CAAC,CAAC;QACH,KAAK,MAAM,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE;gBACpB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,QAAQ;gBACR,SAAS;aACV,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AArBW,QAAA,oBAAoB,wBAqB/B;AAEF,MAAM,aAAa,GACjB,qHAAqH,CAAC;AAExH,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAE/C,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAiB,EAAE;IAC1D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;IACjC,IAAI,OAAO,KAAK,MAAM;QAAE,OAAO,YAAY,CAAC;IAC5C,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,gDAAgD,CAAC;IACnF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,wBAAwB,GAAG,CACtC,KAAe,EACf,IAA4B,EAC8B,EAAE;IAC5D,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAsB,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAErC,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAA,wCAAmB,EAAC,IAAA,sBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAErE,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE;YACjC,IAAI,YAAoC,CAAC;YACzC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC;YACpB,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBACtD,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACzC,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC3C,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC;gBAE1F,MAAM,UAAU,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;gBAC7C,IAAI,UAAU,EAAE,CAAC;oBACf,QAAQ,CAAC,IAAI,CAAC;wBACZ,WAAW;wBACX,SAAS;wBACT,MAAM,EAAE,UAAU;wBAClB,UAAU,EAAE,QAAQ;qBACrB,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;oBACzB,QAAQ,CAAC,IAAI,CAAC;wBACZ,WAAW;wBACX,SAAS;wBACT,MAAM,EAAE,yCAAyC;wBACjD,UAAU,EAAE,QAAQ;qBACrB,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBAED,IAAI,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC;oBAAE,SAAS;gBACxC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAE1B,MAAM,CAAC,IAAI,CAAC;oBACV,SAAS;oBACT,SAAS;oBACT,gBAAgB,EAAE,IAAA,2CAAkC,EAAC,SAAS,CAAC;oBAC/D,UAAU,EAAE,QAAQ;iBACrB,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;QAEF,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9D,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IAEpE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC9B,CAAC,CAAC;AA3DW,QAAA,wBAAwB,4BA2DnC;AAWK,MAAM,cAAc,GAAG,CAC5B,UAAkB,EAClB,IAA4B,EAC5B,WAA4B,EACpB,EAAE;IACV,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAClF,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,GAAG,IAAA,sBAAc,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC;IACvE,CAAC;IAED,IAAI,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,IAAA,+BAAiB,EAAC,UAAU,EAAE,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QACxF,MAAM,QAAQ,GAAG,OAAO,IAAI,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrE,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QACzB,OAAO,IAAA,2CAAkC,EAAC,UAAU,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AA3BW,QAAA,cAAc,kBA2BzB"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@genesislcap/event-type-codegen",
|
|
3
3
|
"description": "Build-time TypeScript codegen from Kotlin event handler DTOs",
|
|
4
|
-
"version": "15.23.
|
|
4
|
+
"version": "15.23.2-alpha-fc1c00501.0",
|
|
5
5
|
"license": "SEE LICENSE IN license.txt",
|
|
6
6
|
"main": "dist/index.js",
|
|
7
7
|
"types": "dist/index.d.ts",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"consola": "^3.0.2"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"@genesislcap/foundation-testing": "15.23.
|
|
24
|
+
"@genesislcap/foundation-testing": "15.23.2-alpha-fc1c00501.0",
|
|
25
25
|
"@types/node": "^22.10.2",
|
|
26
26
|
"tsx": "^4.7.0",
|
|
27
27
|
"uvu": "0.5.4"
|
|
@@ -23,6 +23,14 @@ export const Direction = {
|
|
|
23
23
|
|
|
24
24
|
export type Direction = (typeof Direction)[keyof typeof Direction];
|
|
25
25
|
|
|
26
|
+
export const FeeType = {
|
|
27
|
+
BROKERAGE: 'BROKERAGE',
|
|
28
|
+
STAMP: 'STAMP',
|
|
29
|
+
TAX: 'TAX',
|
|
30
|
+
} as const;
|
|
31
|
+
|
|
32
|
+
export type FeeType = (typeof FeeType)[keyof typeof FeeType];
|
|
33
|
+
|
|
26
34
|
export const Priority = {
|
|
27
35
|
LOW: 'LOW',
|
|
28
36
|
HIGH: 'HIGH',
|
|
@@ -74,6 +82,12 @@ export interface ChargeAmendInputDetails {
|
|
|
74
82
|
CELLS: AmendCellInputDetails[];
|
|
75
83
|
}
|
|
76
84
|
|
|
85
|
+
export interface FeeEventInputDetails {
|
|
86
|
+
FEE_ID?: string;
|
|
87
|
+
FEE_TYPE: FeeType;
|
|
88
|
+
AXE_STATUS: AxeStatus;
|
|
89
|
+
}
|
|
90
|
+
|
|
77
91
|
export interface FooInputDetails {
|
|
78
92
|
FOO_ID: string;
|
|
79
93
|
BAR_ID?: string;
|
|
@@ -117,6 +131,7 @@ export interface EventDetailsMap {
|
|
|
117
131
|
EVENT_CHARGE_AMEND: ChargeAmendInputDetails;
|
|
118
132
|
EVENT_CONTEXT_FOO: FooInputDetails;
|
|
119
133
|
EVENT_DAO_HANDLER: InstrumentByIdDetails;
|
|
134
|
+
EVENT_FEE_INSERT: FeeEventInputDetails;
|
|
120
135
|
EVENT_FOO: FooInputDetails;
|
|
121
136
|
EVENT_RFQ_INSERT: RfqDetails;
|
|
122
137
|
EVENT_TRADE_DELETE: TradeByIdDetails;
|
|
@@ -181,6 +196,14 @@ export class EventDaoHandler extends GenesisEvent<'EVENT_DAO_HANDLER', Instrumen
|
|
|
181
196
|
}
|
|
182
197
|
}
|
|
183
198
|
|
|
199
|
+
export class EventFeeInsert extends GenesisEvent<'EVENT_FEE_INSERT', FeeEventInputDetails> {
|
|
200
|
+
readonly MESSAGE_TYPE = 'EVENT_FEE_INSERT' as const;
|
|
201
|
+
|
|
202
|
+
constructor(details: FeeEventInputDetails) {
|
|
203
|
+
super(details);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
|
|
184
207
|
export class EventFoo extends GenesisEvent<'EVENT_FOO', FooInputDetails> {
|
|
185
208
|
readonly MESSAGE_TYPE = 'EVENT_FOO' as const;
|
|
186
209
|
|
|
@@ -23,6 +23,14 @@ export const Direction = {
|
|
|
23
23
|
|
|
24
24
|
export type Direction = (typeof Direction)[keyof typeof Direction];
|
|
25
25
|
|
|
26
|
+
export const FeeType = {
|
|
27
|
+
BROKERAGE: 'BROKERAGE',
|
|
28
|
+
STAMP: 'STAMP',
|
|
29
|
+
TAX: 'TAX',
|
|
30
|
+
} as const;
|
|
31
|
+
|
|
32
|
+
export type FeeType = (typeof FeeType)[keyof typeof FeeType];
|
|
33
|
+
|
|
26
34
|
export const Priority = {
|
|
27
35
|
LOW: 'LOW',
|
|
28
36
|
HIGH: 'HIGH',
|
|
@@ -74,6 +82,12 @@ export interface ChargeAmendInputDetails {
|
|
|
74
82
|
CELLS: AmendCellInputDetails[];
|
|
75
83
|
}
|
|
76
84
|
|
|
85
|
+
export interface FeeEventInputDetails {
|
|
86
|
+
FEE_ID?: string;
|
|
87
|
+
FEE_TYPE: FeeType;
|
|
88
|
+
AXE_STATUS: AxeStatus;
|
|
89
|
+
}
|
|
90
|
+
|
|
77
91
|
export interface FooInputDetails {
|
|
78
92
|
FOO_ID: string;
|
|
79
93
|
BAR_ID?: string;
|
|
@@ -117,6 +131,7 @@ export interface EventDetailsMap {
|
|
|
117
131
|
EVENT_CHARGE_AMEND: ChargeAmendInputDetails;
|
|
118
132
|
EVENT_CONTEXT_FOO: FooInputDetails;
|
|
119
133
|
EVENT_DAO_HANDLER: InstrumentByIdDetails;
|
|
134
|
+
EVENT_FEE_INSERT: FeeEventInputDetails;
|
|
120
135
|
EVENT_FOO: FooInputDetails;
|
|
121
136
|
EVENT_RFQ_INSERT: RfqDetails;
|
|
122
137
|
EVENT_TRADE_DELETE: TradeByIdDetails;
|
|
@@ -181,6 +196,14 @@ export class EventDaoHandler extends GenesisEvent<'EVENT_DAO_HANDLER', Instrumen
|
|
|
181
196
|
}
|
|
182
197
|
}
|
|
183
198
|
|
|
199
|
+
export class EventFeeInsert extends GenesisEvent<'EVENT_FEE_INSERT', FeeEventInputDetails> {
|
|
200
|
+
readonly MESSAGE_TYPE = 'EVENT_FEE_INSERT' as const;
|
|
201
|
+
|
|
202
|
+
constructor(details: FeeEventInputDetails) {
|
|
203
|
+
super(details);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
|
|
184
207
|
export class EventFoo extends GenesisEvent<'EVENT_FOO', FooInputDetails> {
|
|
185
208
|
readonly MESSAGE_TYPE = 'EVENT_FOO' as const;
|
|
186
209
|
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
package global.genesis.gen.dao.enums
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Fixture stand-in for a dictionary field with no scope: Genesis puts those in the flat
|
|
5
|
+
* `…gen.dao.enums` package, which is what PAL scripts reach through their default imports.
|
|
6
|
+
*/
|
|
7
|
+
public enum class FeeType {
|
|
8
|
+
BROKERAGE,
|
|
9
|
+
STAMP,
|
|
10
|
+
TAX,
|
|
11
|
+
}
|