kea-typegen 3.0.0-alpha.0 → 3.0.0-alpha.11

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.
Files changed (68) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/dist/package.json +11 -10
  3. package/dist/src/__tests__/e2e/actions.js +1 -2
  4. package/dist/src/__tests__/e2e/actions.js.map +1 -1
  5. package/dist/src/cli/typegen.js +13 -15
  6. package/dist/src/cli/typegen.js.map +1 -1
  7. package/dist/src/print/print.js +26 -6
  8. package/dist/src/print/print.js.map +1 -1
  9. package/dist/src/print/printEvents.js +4 -1
  10. package/dist/src/print/printEvents.js.map +1 -1
  11. package/dist/src/print/printListeners.js +2 -2
  12. package/dist/src/print/printListeners.js.map +1 -1
  13. package/dist/src/print/printSharedListeners.js +2 -2
  14. package/dist/src/print/printSharedListeners.js.map +1 -1
  15. package/dist/src/typegen.js +5 -2
  16. package/dist/src/typegen.js.map +1 -1
  17. package/dist/src/types.d.ts +9 -0
  18. package/dist/src/visit/visit.d.ts +2 -2
  19. package/dist/src/visit/visit.js +89 -13
  20. package/dist/src/visit/visit.js.map +1 -1
  21. package/dist/src/visit/visitActions.js +1 -3
  22. package/dist/src/visit/visitActions.js.map +1 -1
  23. package/dist/src/visit/visitConnect.js +8 -4
  24. package/dist/src/visit/visitConnect.js.map +1 -1
  25. package/dist/src/write/convertToBuilders.d.ts +3 -0
  26. package/dist/src/write/convertToBuilders.js +104 -0
  27. package/dist/src/write/convertToBuilders.js.map +1 -0
  28. package/dist/src/write/utils.d.ts +12 -0
  29. package/dist/src/write/utils.js +78 -0
  30. package/dist/src/write/utils.js.map +1 -0
  31. package/dist/src/write/{write.d.ts → writePaths.d.ts} +0 -1
  32. package/dist/src/write/writePaths.js +72 -0
  33. package/dist/src/write/writePaths.js.map +1 -0
  34. package/dist/src/write/writeTypeImports.d.ts +3 -0
  35. package/dist/src/write/writeTypeImports.js +60 -0
  36. package/dist/src/write/writeTypeImports.js.map +1 -0
  37. package/dist/tsconfig.tsbuildinfo +1 -1
  38. package/package.json +11 -10
  39. package/samples/autoImportLogic.ts +0 -1
  40. package/samples/autoImportLogicType.ts +1 -10
  41. package/samples/builderLogic.ts +3 -2
  42. package/samples/complexLogicType.ts +6 -6
  43. package/samples/github.tsx +5 -1
  44. package/samples/githubType.ts +25 -0
  45. package/samples/routerConnectLogicType.ts +5 -21
  46. package/samples/typed-builder/typedForm.ts +8 -0
  47. package/samples/typed-builder/typedForm.typegen.ts +95 -0
  48. package/samples/typed-builder/typedFormDemoLogic.ts +8 -0
  49. package/samples/typed-builder/typedFormDemoLogicType.ts +65 -0
  50. package/samples/windowValuesLogic.ts +13 -0
  51. package/src/__tests__/e2e/__snapshots__/actions.ts.snap +6 -15
  52. package/src/__tests__/e2e/__snapshots__/reducers.ts.snap +1 -1
  53. package/src/__tests__/e2e/actions.ts +1 -2
  54. package/src/cli/typegen.ts +10 -12
  55. package/src/print/print.ts +29 -3
  56. package/src/types.ts +12 -1
  57. package/src/visit/visit.ts +109 -13
  58. package/src/visit/visitActions.ts +7 -4
  59. package/src/visit/visitConnect.ts +6 -0
  60. package/src/write/convertToBuilders.ts +127 -0
  61. package/src/write/utils.ts +96 -0
  62. package/src/write/writePaths.ts +87 -0
  63. package/src/write/writeTypeImports.ts +91 -0
  64. package/tsconfig.json +1 -1
  65. package/dist/src/write/write.js +0 -158
  66. package/dist/src/write/write.js.map +0 -1
  67. package/samples/dist/tsconfig.tsbuildinfo +0 -1
  68. package/src/write/write.ts +0 -265
package/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 1.4.4 - 2022-05-07
2
+
3
+ - Add `--add-ts-nocheck` option.
4
+
1
5
  ## 1.4.3 - 2022-03-18
2
6
 
3
7
  - Internal: plugins can specify which types they want to import from 'kea'
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kea-typegen",
3
- "version": "3.0.0-alpha.0",
3
+ "version": "3.0.0-alpha.11",
4
4
  "description": "Generate type definitions for kea logic",
5
5
  "scripts": {
6
6
  "start": "ts-node ./src/cli/typegen.ts",
@@ -11,7 +11,7 @@
11
11
  "test": "jest",
12
12
  "samples:check": "ts-node ./src/cli/typegen.ts check -r ./samples",
13
13
  "samples:write": "ts-node ./src/cli/typegen.ts write -r ./samples --write-paths",
14
- "samples:write:paths": "ts-node ./src/cli/typegen.ts write -r ./samples --write-paths",
14
+ "samples:convert": "ts-node ./src/cli/typegen.ts write -r ./samples --convert-to-builders",
15
15
  "samples:watch": "ts-node ./src/cli/typegen.ts watch -r ./samples",
16
16
  "samples:write:posthog": "ts-node ./src/cli/typegen.ts write -c ../../PostHog/posthog/tsconfig.json",
17
17
  "form-plugin:build": "cd form-plugin && yarn && yarn build && cd ..",
@@ -25,13 +25,13 @@
25
25
  },
26
26
  "dependencies": {
27
27
  "@wessberg/ts-clone-node": "0.3.19",
28
- "diff": "^5.0.0",
29
28
  "prettier": "^2.5.1",
29
+ "recast": "^0.20.5",
30
30
  "yargs": "^16.2.0"
31
31
  },
32
32
  "devDependencies": {
33
- "@babel/core": "^7.16.0",
34
- "@babel/preset-env": "^7.16.4",
33
+ "@babel/core": "^7.17.9",
34
+ "@babel/preset-env": "^7.16.11",
35
35
  "@babel/preset-typescript": "^7.16.0",
36
36
  "@types/jest": "^26.0.20",
37
37
  "@types/node": "^14.14.31",
@@ -41,16 +41,17 @@
41
41
  "form-plugin": "file:./form-plugin",
42
42
  "husky": ">=4",
43
43
  "jest": "^27.0.5",
44
- "kea": "^3.0.0-alpha.0",
44
+ "kea": "^3.0.0-alpha.6",
45
+ "kea-router": "^3.0.0-alpha.0",
45
46
  "lint-staged": ">=12.1.2",
46
47
  "react": "^16.13.1",
47
48
  "react-redux": "^7.2.6",
48
- "redux": "^4.1.2",
49
+ "redux": "^4.2.0",
49
50
  "reselect": "^4.1.5",
50
51
  "rimraf": "^3.0.2",
51
- "ts-jest": "^27.0.3",
52
- "ts-node": "^10.4.0",
53
- "typescript": "^4.3.2"
52
+ "ts-jest": "^27.1.4",
53
+ "ts-node": "^10.7.0",
54
+ "typescript": "^4.6.3"
54
55
  },
55
56
  "peerDependencies": {
56
57
  "typescript": ">=4.5.3"
@@ -51,8 +51,7 @@ test('actions - with random values instead of functions', () => {
51
51
  updateName: (name?: string) => ({ name }),
52
52
  withDefaultValue: (name = "john") => ({ name }),
53
53
  withDefaultValueAndType: (name: string = "john") => ({ name }),
54
- withBool: true,
55
- withRandomPayload: { bla: 123 },
54
+ withTrue: true,
56
55
  }
57
56
  })
58
57
  `;
@@ -1 +1 @@
1
- {"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/actions.ts"],"names":[],"mappings":";;AAAA,uCAAoD;AAEpD,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,WAAW,GAAG;;;;;;;;;KASnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,WAAW,GAAG;;;;;;;;;KASnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,4CAA4C,EAAE,GAAG,EAAE;IACpD,MAAM,WAAW,GAAG;;;;;;;;;;;KAWnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC3D,MAAM,WAAW,GAAG;;;;;;;;;;;;KAYnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/actions.ts"],"names":[],"mappings":";;AAAA,uCAAoD;AAEpD,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,WAAW,GAAG;;;;;;;;;KASnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,WAAW,GAAG;;;;;;;;;KASnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,4CAA4C,EAAE,GAAG,EAAE;IACpD,MAAM,WAAW,GAAG;;;;;;;;;;;KAWnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC3D,MAAM,WAAW,GAAG;;;;;;;;;;;KAWnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}
@@ -8,13 +8,13 @@ const fs = require("fs");
8
8
  const typegen_1 = require("../typegen");
9
9
  yargs
10
10
  .command('check', '- check what should be done', (yargs) => { }, (argv) => {
11
- (0, typegen_1.runTypeGen)(Object.assign(Object.assign({}, includeKeaConfig(parsedToAppOptions(argv))), { write: false, watch: false }));
11
+ (0, typegen_1.runTypeGen)({ ...includeKeaConfig(parsedToAppOptions(argv)), write: false, watch: false });
12
12
  })
13
13
  .command('write', '- write logicType.ts files', (yargs) => { }, (argv) => {
14
- (0, typegen_1.runTypeGen)(Object.assign(Object.assign({}, includeKeaConfig(parsedToAppOptions(argv))), { write: true, watch: false }));
14
+ (0, typegen_1.runTypeGen)({ ...includeKeaConfig(parsedToAppOptions(argv)), write: true, watch: false });
15
15
  })
16
16
  .command('watch', '- watch for changes and write logicType.ts files', (yargs) => { }, (argv) => {
17
- (0, typegen_1.runTypeGen)(Object.assign(Object.assign({}, includeKeaConfig(parsedToAppOptions(argv))), { write: true, watch: true }));
17
+ (0, typegen_1.runTypeGen)({ ...includeKeaConfig(parsedToAppOptions(argv)), write: true, watch: true });
18
18
  })
19
19
  .option('config', { alias: 'c', describe: 'Path to tsconfig.json (otherwise auto-detected)', type: 'string' })
20
20
  .option('file', { alias: 'f', describe: "Single file to evaluate (can't be used with --config)", type: 'string' })
@@ -31,6 +31,8 @@ yargs
31
31
  .option('quiet', { alias: 'q', describe: 'Write nothing to stdout', type: 'boolean' })
32
32
  .option('no-import', { describe: 'Do not automatically import generated types in logic files', type: 'boolean' })
33
33
  .option('write-paths', { describe: 'Write paths into logic files that have none', type: 'boolean' })
34
+ .option('add-ts-nocheck', { describe: 'Add @ts-nocheck to top of logicType.ts files', type: 'boolean' })
35
+ .option('convert-to-builders', { describe: 'Convert Kea 2.0 inputs to Kea 3.0 logic builders', type: 'boolean' })
34
36
  .option('import-global-types', {
35
37
  describe: 'Add import statements in logicType.ts files for global types (e.g. @types/node)',
36
38
  type: 'boolean',
@@ -44,17 +46,13 @@ yargs
44
46
  .help()
45
47
  .wrap(80).argv;
46
48
  function parsedToAppOptions(parsedOptions) {
49
+ const { root, types, config, file, ...rest } = parsedOptions;
47
50
  const appOptions = {
48
- rootPath: parsedOptions.root,
49
- typesPath: parsedOptions.types,
50
- tsConfigPath: parsedOptions.config,
51
- sourceFilePath: parsedOptions.file,
52
- quiet: parsedOptions.quiet,
53
- verbose: parsedOptions.verbose,
54
- noImport: parsedOptions.noImport,
55
- writePaths: parsedOptions.writePaths,
56
- importGlobalTypes: parsedOptions.importGlobalTypes,
57
- ignoreImportPaths: parsedOptions.ignoreImportPaths,
51
+ rootPath: root,
52
+ typesPath: types,
53
+ tsConfigPath: config,
54
+ sourceFilePath: file,
55
+ ...rest,
58
56
  log: parsedOptions.quiet ? () => null : console.log.bind(console),
59
57
  };
60
58
  return appOptions;
@@ -63,8 +61,8 @@ function findKeaConfig(searchPath) {
63
61
  return ts.findConfigFile(searchPath, ts.sys.fileExists, '.kearc');
64
62
  }
65
63
  function includeKeaConfig(appOptions) {
66
- const configFilePath = findKeaConfig(appOptions.rootPath);
67
- const newOptions = Object.assign({}, appOptions);
64
+ const configFilePath = appOptions.rootPath ? findKeaConfig(appOptions.rootPath) : undefined;
65
+ const newOptions = { ...appOptions };
68
66
  let rawData, keaConfig;
69
67
  for (const key of Object.keys(appOptions)) {
70
68
  if (key.endsWith('Path') && appOptions[key]) {
@@ -1 +1 @@
1
- {"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../../src/cli/typegen.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../../src/cli/typegen.ts"],"names":[],"mappings":"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"}
@@ -22,13 +22,15 @@ const printDefaults_1 = require("./printDefaults");
22
22
  const printEvents_1 = require("./printEvents");
23
23
  const printSharedListeners_1 = require("./printSharedListeners");
24
24
  const printListeners_1 = require("./printListeners");
25
- const write_1 = require("../write/write");
25
+ const writePaths_1 = require("../write/writePaths");
26
+ const writeTypeImports_1 = require("../write/writeTypeImports");
26
27
  const printInternalExtraInput_1 = require("./printInternalExtraInput");
28
+ const convertToBuilders_1 = require("../write/convertToBuilders");
27
29
  function runThroughPrettier(sourceText, filePath) {
28
30
  const options = prettier.resolveConfig.sync(filePath);
29
31
  if (options) {
30
32
  try {
31
- return prettier.format(sourceText, Object.assign(Object.assign({}, options), { filepath: filePath }));
33
+ return prettier.format(sourceText, { ...options, filepath: filePath });
32
34
  }
33
35
  catch (e) {
34
36
  console.error(`!! Prettier: Error formatting "${filePath}"`);
@@ -94,7 +96,12 @@ function printToFiles(program, appOptions, parsedLogics) {
94
96
  .map(({ list, relativePath }) => `import { ${list.join(', ')} } from '${relativePath}'`)
95
97
  .join('\n');
96
98
  const finalOutput = [
97
- `// Generated by kea-typegen on ${new Date().toUTCString()}. DO NOT EDIT THIS FILE MANUALLY.`,
99
+ [
100
+ `// Generated by kea-typegen on ${new Date().toUTCString()}. DO NOT EDIT THIS FILE MANUALLY.`,
101
+ appOptions.addTsNocheck ? '// @ts-nocheck' : undefined,
102
+ ]
103
+ .filter((a) => !!a)
104
+ .join('\n'),
98
105
  `import { ${[...requiredKeys.values()].join(', ')} } from 'kea'`,
99
106
  otherimports,
100
107
  output,
@@ -131,24 +138,37 @@ function printToFiles(program, appOptions, parsedLogics) {
131
138
  const logicsNeedingImports = parsedLogics.filter(parsedLogicNeedsTypeImport);
132
139
  if (logicsNeedingImports.length > 0) {
133
140
  if (appOptions.write && !appOptions.noImport) {
134
- (0, write_1.writeTypeImports)(appOptions, program, fileName, logicsNeedingImports, parsedLogics);
141
+ (0, writeTypeImports_1.writeTypeImports)(appOptions, program, fileName, logicsNeedingImports, parsedLogics);
135
142
  filesToModify += logicsNeedingImports.length;
136
143
  }
137
144
  else {
138
145
  log(`❌ Will not write ${logicsNeedingImports.length} logic type import${logicsNeedingImports.length === 1 ? '' : 's'}`);
139
146
  }
140
147
  }
141
- const parsedLogicNeedsPath = appOptions.writePaths ? (pl) => !pl.hasPathInLogic && !pl.inputBuilderArray : () => false;
148
+ const parsedLogicNeedsPath = appOptions.writePaths ? (pl) => !pl.hasPathInLogic : () => false;
142
149
  const logicsNeedingPaths = parsedLogics.filter(parsedLogicNeedsPath);
143
150
  if (logicsNeedingPaths.length > 0) {
144
151
  if (appOptions.write && !appOptions.noImport) {
145
- (0, write_1.writePaths)(appOptions, program, fileName, logicsNeedingPaths);
152
+ (0, writePaths_1.writePaths)(appOptions, program, fileName, logicsNeedingPaths);
146
153
  filesToModify += logicsNeedingPaths.length;
147
154
  }
148
155
  else {
149
156
  log(`❌ Will not write ${logicsNeedingPaths.length} logic path${logicsNeedingPaths.length === 1 ? '' : 's'}`);
150
157
  }
151
158
  }
159
+ const parsedLogicNeedsConversion = appOptions.convertToBuilders
160
+ ? (pl) => !pl.inputBuilderArray
161
+ : () => false;
162
+ const logicsNeedingConversion = parsedLogics.filter(parsedLogicNeedsConversion);
163
+ if (logicsNeedingConversion.length > 0) {
164
+ if (appOptions.write && !appOptions.noImport) {
165
+ (0, convertToBuilders_1.convertToBuilders)(appOptions, program, fileName, logicsNeedingConversion);
166
+ filesToModify += logicsNeedingConversion.length;
167
+ }
168
+ else {
169
+ log(`❌ Will not write ${logicsNeedingConversion.length} logic path${logicsNeedingConversion.length === 1 ? '' : 's'}`);
170
+ }
171
+ }
152
172
  });
153
173
  if (writtenFiles === 0 && filesToModify === 0) {
154
174
  if (appOptions.write) {
@@ -1 +1 @@
1
- {"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/print/print.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"print.js","sourceRoot":"","sources":["../../../src/print/print.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,10 @@ exports.printEvents = void 0;
4
4
  const typescript_1 = require("typescript");
5
5
  function printEvents(parsedLogic) {
6
6
  return typescript_1.factory.createTypeLiteralNode(Object.keys(parsedLogic.events).map((name) => {
7
- return typescript_1.factory.createPropertySignature(undefined, typescript_1.factory.createIdentifier(name), undefined, typescript_1.factory.createFunctionTypeNode(undefined, [], Object.assign(Object.assign({}, typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword)), { _typeNodeBrand: true })));
7
+ return typescript_1.factory.createPropertySignature(undefined, typescript_1.factory.createIdentifier(name), undefined, typescript_1.factory.createFunctionTypeNode(undefined, [], {
8
+ ...typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword),
9
+ _typeNodeBrand: true,
10
+ }));
8
11
  }));
9
12
  }
10
13
  exports.printEvents = printEvents;
@@ -1 +1 @@
1
- {"version":3,"file":"printEvents.js","sourceRoot":"","sources":["../../../src/print/printEvents.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAGhD,SAAgB,WAAW,CAAC,WAAwB;IAChD,OAAO,oBAAO,CAAC,qBAAqB,CAChC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzC,OAAO,oBAAO,CAAC,uBAAuB,CAClC,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAC9B,SAAS,EACT,oBAAO,CAAC,sBAAsB,CAAC,SAAS,EAAE,EAAE,kCACrC,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAC9C,cAAc,EAAE,IAAI,IACtB,CACL,CAAA;IACL,CAAC,CAAC,CACL,CAAA;AACL,CAAC;AAdD,kCAcC"}
1
+ {"version":3,"file":"printEvents.js","sourceRoot":"","sources":["../../../src/print/printEvents.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAGhD,SAAgB,WAAW,CAAC,WAAwB;IAChD,OAAO,oBAAO,CAAC,qBAAqB,CAChC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzC,OAAO,oBAAO,CAAC,uBAAuB,CAClC,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAC9B,SAAS,EACT,oBAAO,CAAC,sBAAsB,CAAC,SAAS,EAAE,EAAE,EAAE;YAC1C,GAAG,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC;YAC9C,cAAc,EAAE,IAAI;SACvB,CAAC,CACL,CAAA;IACL,CAAC,CAAC,CACL,CAAA;AACL,CAAC;AAdD,kCAcC"}
@@ -7,9 +7,9 @@ function printListeners(parsedLogic) {
7
7
  typescript_1.factory.createParameterDeclaration(undefined, undefined, undefined, typescript_1.factory.createIdentifier('action'), undefined, action, undefined),
8
8
  typescript_1.factory.createParameterDeclaration(undefined, undefined, undefined, typescript_1.factory.createIdentifier('previousState'), undefined, typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.AnyKeyword), undefined),
9
9
  ], typescript_1.factory.createUnionTypeNode([
10
- Object.assign(Object.assign({}, typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword)), { _typeNodeBrand: true }),
10
+ { ...typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword), _typeNodeBrand: true },
11
11
  typescript_1.factory.createTypeReferenceNode(typescript_1.factory.createIdentifier('Promise'), [
12
- Object.assign(Object.assign({}, typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword)), { _typeNodeBrand: true }),
12
+ { ...typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword), _typeNodeBrand: true },
13
13
  ]),
14
14
  ])))))));
15
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"printListeners.js","sourceRoot":"","sources":["../../../src/print/printListeners.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAGhD,SAAgB,cAAc,CAAC,WAAwB;IACnD,OAAO,oBAAO,CAAC,qBAAqB,CAChC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,CACpD,oBAAO,CAAC,uBAAuB,CAC3B,SAAS,EACT,oBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EACjC,SAAS,EACT,oBAAO,CAAC,mBAAmB,CACvB,oBAAO,CAAC,uBAAuB,CAC3B,oBAAO,CAAC,sBAAsB,CAC1B,SAAS,EACT;QACI,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,SAAS,EACT,MAAM,EACN,SAAS,CACZ;QACD,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,SAAS,EACT,oBAAO,CAAC,qBAAqB,CAAC,uBAAU,CAAC,UAAU,CAAC,EACpD,SAAS,CACZ;KACJ,EACD,oBAAO,CAAC,mBAAmB,CAAC;wCACnB,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAE,cAAc,EAAE,IAAI;QACtE,oBAAO,CAAC,uBAAuB,CAAC,oBAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;4CAC5D,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAE,cAAc,EAAE,IAAI;SACzE,CAAC;KACL,CAAC,CACL,CACJ,CACJ,CACJ,CACJ,CACJ,CAAA;AACL,CAAC;AA3CD,wCA2CC"}
1
+ {"version":3,"file":"printListeners.js","sourceRoot":"","sources":["../../../src/print/printListeners.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAGhD,SAAgB,cAAc,CAAC,WAAwB;IACnD,OAAO,oBAAO,CAAC,qBAAqB,CAChC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,CACpD,oBAAO,CAAC,uBAAuB,CAC3B,SAAS,EACT,oBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EACjC,SAAS,EACT,oBAAO,CAAC,mBAAmB,CACvB,oBAAO,CAAC,uBAAuB,CAC3B,oBAAO,CAAC,sBAAsB,CAC1B,SAAS,EACT;QACI,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,SAAS,EACT,MAAM,EACN,SAAS,CACZ;QACD,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,SAAS,EACT,oBAAO,CAAC,qBAAqB,CAAC,uBAAU,CAAC,UAAU,CAAC,EACpD,SAAS,CACZ;KACJ,EACD,oBAAO,CAAC,mBAAmB,CAAC;QACxB,EAAE,GAAG,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE;QACxE,oBAAO,CAAC,uBAAuB,CAAC,oBAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;YACjE,EAAE,GAAG,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE;SAC3E,CAAC;KACL,CAAC,CACL,CACJ,CACJ,CACJ,CACJ,CACJ,CAAA;AACL,CAAC;AA3CD,wCA2CC"}
@@ -9,9 +9,9 @@ function printSharedListeners(parsedLogic) {
9
9
  typescript_1.factory.createParameterDeclaration(undefined, undefined, undefined, typescript_1.factory.createIdentifier('action'), undefined, action, undefined),
10
10
  typescript_1.factory.createParameterDeclaration(undefined, undefined, undefined, typescript_1.factory.createIdentifier('previousState'), undefined, typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.AnyKeyword), undefined),
11
11
  ], typescript_1.factory.createUnionTypeNode([
12
- Object.assign(Object.assign({}, typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword)), { _typeNodeBrand: true }),
12
+ { ...typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword), _typeNodeBrand: true },
13
13
  typescript_1.factory.createTypeReferenceNode(typescript_1.factory.createIdentifier('Promise'), [
14
- Object.assign(Object.assign({}, typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword)), { _typeNodeBrand: true }),
14
+ { ...typescript_1.factory.createToken(typescript_1.SyntaxKind.VoidKeyword), _typeNodeBrand: true },
15
15
  ]),
16
16
  ])))));
17
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"printSharedListeners.js","sourceRoot":"","sources":["../../../src/print/printSharedListeners.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAGhD,SAAgB,oBAAoB,CAAC,WAAwB;IACzD,OAAO,oBAAO,CAAC,qBAAqB,CAChC,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,CAC1D,oBAAO,CAAC,uBAAuB,CAC3B,SAAS,EACT,oBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EACjC,SAAS,EACT,oBAAO,CAAC,sBAAsB,CAC1B,SAAS,EACT;QACI,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,SAAS,EACT,OAAO,IAAI,oBAAO,CAAC,qBAAqB,CAAC,uBAAU,CAAC,UAAU,CAAC,EAC/D,SAAS,CACZ;QACD,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,EACtC,SAAS,EACT,oBAAO,CAAC,uBAAuB,CAAC,oBAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC,EAC1F,SAAS,CACZ;QACD,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,SAAS,EACT,MAAM,EACN,SAAS,CACZ;QACD,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,SAAS,EACT,oBAAO,CAAC,qBAAqB,CAAC,uBAAU,CAAC,UAAU,CAAC,EACpD,SAAS,CACZ;KACJ,EACD,oBAAO,CAAC,mBAAmB,CAAC;wCACnB,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAE,cAAc,EAAE,IAAI;QACtE,oBAAO,CAAC,uBAAuB,CAAC,oBAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;4CAC5D,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,KAAE,cAAc,EAAE,IAAI;SACzE,CAAC;KACL,CAAC,CACL,CACJ,CACJ,CACJ,CAAA;AACL,CAAC;AAzDD,oDAyDC"}
1
+ {"version":3,"file":"printSharedListeners.js","sourceRoot":"","sources":["../../../src/print/printSharedListeners.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAGhD,SAAgB,oBAAoB,CAAC,WAAwB;IACzD,OAAO,oBAAO,CAAC,qBAAqB,CAChC,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,CAC1D,oBAAO,CAAC,uBAAuB,CAC3B,SAAS,EACT,oBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EACjC,SAAS,EACT,oBAAO,CAAC,sBAAsB,CAC1B,SAAS,EACT;QACI,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EACnC,SAAS,EACT,OAAO,IAAI,oBAAO,CAAC,qBAAqB,CAAC,uBAAU,CAAC,UAAU,CAAC,EAC/D,SAAS,CACZ;QACD,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,EACtC,SAAS,EACT,oBAAO,CAAC,uBAAuB,CAAC,oBAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAAE,SAAS,CAAC,EAC1F,SAAS,CACZ;QACD,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAClC,SAAS,EACT,MAAM,EACN,SAAS,CACZ;QACD,oBAAO,CAAC,0BAA0B,CAC9B,SAAS,EACT,SAAS,EACT,SAAS,EACT,oBAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,EACzC,SAAS,EACT,oBAAO,CAAC,qBAAqB,CAAC,uBAAU,CAAC,UAAU,CAAC,EACpD,SAAS,CACZ;KACJ,EACD,oBAAO,CAAC,mBAAmB,CAAC;QACxB,EAAE,GAAG,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE;QACxE,oBAAO,CAAC,uBAAuB,CAAC,oBAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;YACjE,EAAE,GAAG,oBAAO,CAAC,WAAW,CAAC,uBAAU,CAAC,WAAW,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE;SAC3E,CAAC;KACL,CAAC,CACL,CACJ,CACJ,CACJ,CAAA;AACL,CAAC;AAzDD,oDAyDC"}
@@ -29,9 +29,12 @@ function runTypeGen(appOptions) {
29
29
  const compilerOptions = ts.parseJsonSourceFileConfigFileContent(configFile, ts.sys, rootFolder);
30
30
  if (appOptions.watch) {
31
31
  const createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
32
- const host = ts.createWatchCompilerHost(appOptions.tsConfigPath, compilerOptions.options, Object.assign(Object.assign({}, ts.sys), { writeFile(path, data, writeByteOrderMark) {
32
+ const host = ts.createWatchCompilerHost(appOptions.tsConfigPath, compilerOptions.options, {
33
+ ...ts.sys,
34
+ writeFile(path, data, writeByteOrderMark) {
33
35
  return null;
34
- } }), createProgram, reportDiagnostic, reportWatchStatusChanged);
36
+ },
37
+ }, createProgram, reportDiagnostic, reportWatchStatusChanged);
35
38
  console.info(`🥚 TypeScript Compiler API v${ts.version}`);
36
39
  const formatHost = {
37
40
  getCanonicalFileName: (path) => path,
@@ -1 +1 @@
1
- {"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/typegen.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/typegen.ts"],"names":[],"mappings":"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"}
@@ -68,6 +68,8 @@ export interface AppOptions {
68
68
  importGlobalTypes?: boolean;
69
69
  ignoreImportPaths?: string[];
70
70
  writePaths?: boolean;
71
+ addTsNocheck?: boolean;
72
+ convertToBuilders?: boolean;
71
73
  log: (message: string) => void;
72
74
  }
73
75
  export interface VisitKeaPropertyArguments {
@@ -83,10 +85,17 @@ export interface VisitKeaPropertyArguments {
83
85
  getTypeNodeForNode(node: ts.Node): ts.TypeNode;
84
86
  prepareForPrint<T extends ts.Node>(node: T): T;
85
87
  }
88
+ export declare type TypeBuilder = (args: VisitKeaPropertyArguments) => void;
89
+ export interface TypeBuilderModule {
90
+ name: string;
91
+ file: string;
92
+ typeBuilder?: TypeBuilder;
93
+ }
86
94
  export interface Plugin {
87
95
  visitKeaProperty?: (args: VisitKeaPropertyArguments) => void;
88
96
  }
89
97
  export interface PluginModule extends Plugin {
90
98
  name: string;
91
99
  file: string;
100
+ typeBuilder?: (args: VisitKeaPropertyArguments) => void;
92
101
  }
@@ -1,5 +1,5 @@
1
1
  import * as ts from 'typescript';
2
- import { AppOptions, ParsedLogic, PluginModule } from '../types';
2
+ import { AppOptions, ParsedLogic, PluginModule, TypeBuilderModule } from '../types';
3
3
  export declare function visitProgram(program: ts.Program, appOptions?: AppOptions): ParsedLogic[];
4
4
  export declare function visitResetContext(checker: ts.TypeChecker, pluginModules: PluginModule[]): (node: ts.Node) => void;
5
- export declare function visitKeaCalls(checker: ts.TypeChecker, parsedLogics: ParsedLogic[], sourceFile: ts.SourceFile, appOptions: AppOptions, pluginModules: PluginModule[]): (node: ts.Node) => void;
5
+ export declare function visitKeaCalls(checker: ts.TypeChecker, parsedLogics: ParsedLogic[], sourceFile: ts.SourceFile, appOptions: AppOptions, pluginModules: PluginModule[], typeBuilderModules: TypeBuilderModule[]): (node: ts.Node) => void;
@@ -37,6 +37,7 @@ function visitProgram(program, appOptions) {
37
37
  const checker = program.getTypeChecker();
38
38
  const parsedLogics = [];
39
39
  const pluginModules = [];
40
+ const typeBuilderModules = [];
40
41
  for (const sourceFile of program.getSourceFiles()) {
41
42
  if (!sourceFile.isDeclarationFile && !sourceFile.fileName.endsWith('Type.ts')) {
42
43
  ts.forEachChild(sourceFile, visitResetContext(checker, pluginModules));
@@ -47,7 +48,7 @@ function visitProgram(program, appOptions) {
47
48
  if (appOptions === null || appOptions === void 0 ? void 0 : appOptions.verbose) {
48
49
  appOptions.log(`👀 Visiting: ${path.relative(process.cwd(), sourceFile.fileName)}`);
49
50
  }
50
- ts.forEachChild(sourceFile, visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModules));
51
+ ts.forEachChild(sourceFile, visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModules, typeBuilderModules));
51
52
  }
52
53
  }
53
54
  return parsedLogics;
@@ -117,9 +118,9 @@ function visitResetContext(checker, pluginModules) {
117
118
  };
118
119
  }
119
120
  exports.visitResetContext = visitResetContext;
120
- function visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModules) {
121
+ function visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModules, typeBuilderModules) {
121
122
  return function visit(node) {
122
- var _a, _b, _c, _d;
123
+ var _a, _b, _c, _d, _e, _f;
123
124
  if (!(0, utils_1.isKeaCall)(node, checker)) {
124
125
  ts.forEachChild(node, visit);
125
126
  return;
@@ -179,7 +180,7 @@ function visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModu
179
180
  typeReferencesInLogicInput: new Set(),
180
181
  extraInput: {},
181
182
  importFromKeaInLogicType: new Set([]),
182
- inputBuilderArray: ts.isArrayLiteralExpression(input)
183
+ inputBuilderArray: ts.isArrayLiteralExpression(input),
183
184
  };
184
185
  const calls = [];
185
186
  if (ts.isObjectLiteralExpression(input)) {
@@ -194,7 +195,7 @@ function visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModu
194
195
  const name = symbol.getName();
195
196
  const type = checker.getTypeOfSymbolAtLocation(symbol, symbol.valueDeclaration);
196
197
  const typeNode = type ? checker.typeToTypeNode(type, undefined, undefined) : null;
197
- calls.push({ name, type, typeNode, expression: inputProperty.initializer });
198
+ calls.push({ name, type, typeNode, expression: inputProperty.initializer, typeBuilders: [] });
198
199
  }
199
200
  }
200
201
  else if (ts.isArrayLiteralExpression(input)) {
@@ -202,15 +203,79 @@ function visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModu
202
203
  if (!ts.isCallExpression(callExpression) || callExpression.arguments.length === 0) {
203
204
  continue;
204
205
  }
205
- const name = callExpression.expression.getText();
206
+ const builderName = callExpression.expression.getText();
206
207
  const argument = callExpression.arguments[0];
207
208
  const type = checker.getTypeAtLocation(argument);
208
209
  const typeNode = type ? checker.typeToTypeNode(type, undefined, undefined) : null;
209
- calls.push({ name, type, typeNode, expression: callExpression.arguments[0] });
210
+ const identifier = callExpression.expression;
211
+ const symbol = checker.getSymbolAtLocation(identifier);
212
+ let typeBuilders = [];
213
+ if (symbol) {
214
+ declarations: for (let declaration of symbol.getDeclarations()) {
215
+ let decNode = declaration;
216
+ while (decNode) {
217
+ if (ts.isImportDeclaration(decNode)) {
218
+ const filename = (0, utils_1.getFilenameForImportDeclaration)(checker, decNode);
219
+ if (!filename) {
220
+ break;
221
+ }
222
+ let typeBuilderModule = typeBuilderModules.find(({ file, name }) => file === filename && name === builderName);
223
+ if (typeBuilderModule) {
224
+ if (typeBuilderModule.typeBuilder) {
225
+ typeBuilders.push(typeBuilderModule);
226
+ }
227
+ break declarations;
228
+ }
229
+ const folder = path.dirname(filename);
230
+ const fileNoExt = path.basename(filename, path.extname(filename));
231
+ const pathsToTry = [
232
+ 'typegen.js',
233
+ 'typegen.ts',
234
+ `${fileNoExt}.typegen.js`,
235
+ `${fileNoExt}.typegen.ts`,
236
+ ].map((filename) => path.resolve(folder, filename));
237
+ for (const typegenFile of pathsToTry) {
238
+ try {
239
+ let typeBuilder = (_c = require(typegenFile)) === null || _c === void 0 ? void 0 : _c[builderName];
240
+ typeBuilderModule = {
241
+ name: builderName,
242
+ file: filename,
243
+ typeBuilder: typeBuilder,
244
+ };
245
+ typeBuilders.push(typeBuilderModule);
246
+ typeBuilderModules.push(typeBuilderModule);
247
+ break declarations;
248
+ }
249
+ catch (error) {
250
+ if (error.code !== 'MODULE_NOT_FOUND') {
251
+ console.error(`[KEA] Error loading type builder "${builderName}" in "${typegenFile}"`);
252
+ console.error(error);
253
+ }
254
+ }
255
+ }
256
+ typeBuilderModule = {
257
+ name: builderName,
258
+ file: filename,
259
+ typeBuilder: null,
260
+ };
261
+ typeBuilderModules.push(typeBuilderModule);
262
+ break declarations;
263
+ }
264
+ decNode = decNode.parent;
265
+ }
266
+ }
267
+ }
268
+ calls.push({
269
+ name: builderName,
270
+ type,
271
+ typeNode,
272
+ expression: callExpression.arguments[0],
273
+ typeBuilders: typeBuilders,
274
+ });
210
275
  }
211
276
  }
212
- for (let { name, type, typeNode, expression } of calls) {
213
- if (name === 'path') {
277
+ for (let { name, type, typeNode, expression, typeBuilders } of calls) {
278
+ if (name === 'path' || name === 'logicPath') {
214
279
  parsedLogic.hasPathInLogic = true;
215
280
  }
216
281
  if (name === 'key') {
@@ -220,7 +285,7 @@ function visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModu
220
285
  type = type.getCallSignatures()[0].getReturnType();
221
286
  typeNode = type ? checker.typeToTypeNode(type, undefined, undefined) : null;
222
287
  }
223
- (_c = visitFunctions[name]) === null || _c === void 0 ? void 0 : _c.call(visitFunctions, parsedLogic, type, expression);
288
+ (_d = visitFunctions[name]) === null || _d === void 0 ? void 0 : _d.call(visitFunctions, parsedLogic, type, expression);
224
289
  const visitKeaPropertyArguments = {
225
290
  name,
226
291
  appOptions,
@@ -237,15 +302,26 @@ function visitKeaCalls(checker, parsedLogics, sourceFile, appOptions, pluginModu
237
302
  return (0, ts_clone_node_1.cloneNode)(node);
238
303
  },
239
304
  };
240
- for (const pluginModule of Object.values(pluginModules)) {
305
+ for (const pluginModule of typeBuilders) {
241
306
  try {
242
- (_d = pluginModule.visitKeaProperty) === null || _d === void 0 ? void 0 : _d.call(pluginModule, visitKeaPropertyArguments);
307
+ (_e = pluginModule.typeBuilder) === null || _e === void 0 ? void 0 : _e.call(pluginModule, visitKeaPropertyArguments);
243
308
  }
244
309
  catch (e) {
245
- console.error(`!! Problem running "visitKeaProperty" on plugin "${pluginModule.name}" (${pluginModule.file})`);
310
+ console.error(`!! Problem running "typeBuilder" on plugin "${pluginModule.name}" (${pluginModule.file})`);
246
311
  console.error(e);
247
312
  }
248
313
  }
314
+ if (typeBuilders.length === 0) {
315
+ for (const pluginModule of Object.values(pluginModules)) {
316
+ try {
317
+ (_f = pluginModule.visitKeaProperty) === null || _f === void 0 ? void 0 : _f.call(pluginModule, visitKeaPropertyArguments);
318
+ }
319
+ catch (e) {
320
+ console.error(`!! Problem running "visitKeaProperty" on plugin "${pluginModule.name}" (${pluginModule.file})`);
321
+ console.error(e);
322
+ }
323
+ }
324
+ }
249
325
  }
250
326
  parsedLogics.push(parsedLogic);
251
327
  };