kea-typegen 1.2.2 → 1.4.2

package/CHANGELOG.md

@@ -1,82 +1,126 @@
+## 1.4.2 - 2021-12-13
+
+-   Fix bug introduced with 1.4.1 if your `tsconfig.json` file does not contain a `types` array.
+
+## 1.4.1 - 2021-12-12
+
+-   Adds new option, `ignoreImportPaths`, to specify a list of files or folders that typegen will never import from, when adding imports inside `logicType.ts` files.
+-   Automatically skips adding imports for global types, as specified via the `types` array in `tsconfig.json`. Each entry in the array (e.g. `node`) will add an import ignore path for `./node_modules/@types/node`. To revert this, set `"importGlobalTypes": true` inside `.kearc` or via the CLI.
+
+## 1.4.0 - 2021-12-12
+
+-   Support TypeScript 4.5+.
+-   Now adds new type imports with `type`, such as: `import type { logicType } from './logicType`.
+-   Refactor internals to create nodes newer `ts.factory` methods.
+
+## 1.3.0 - 2021-11-08
+
+-   Write paths into logics with `--write-paths`. Can be configured in `.kearc` with `writePaths: true`
+
 ## 1.2.2 - 2021-10-14
-- Loaders: Make the `payload` parameter on the `Success` action optional.
+
+-   Loaders: Make the `payload` parameter on the `Success` action optional.
 
 ## 1.2.1 - 2021-10-14
-- Improve `kea-loaders` 0.5.0 support
+
+-   Improve `kea-loaders` 0.5.0 support
 
 ## 1.2.0 - 2021-10-14
-- Support `kea-loaders` 0.5.0, add `payload` to the success action and `errorObject` to the failure action.
+
+-   Support `kea-loaders` 0.5.0, add `payload` to the success action and `errorObject` to the failure action.
 
 ## 1.1.6 - 2021-10-07
-- Support reducers with actions like `[otherLogic().actionTypes.bla]`
+
+-   Support reducers with actions like `[otherLogic().actionTypes.bla]`
 
 ## 1.1.5 - 2021-07-14
-- [Fix bug](https://github.com/keajs/kea-typegen/issues/28) with string constant types in action properties when connected with `connect`. 
+
+-   [Fix bug](https://github.com/keajs/kea-typegen/issues/28) with string constant types in action properties when connected with `connect`.
 
 ## 1.1.4 - 2021-07-13
-- Support declaring `props: {} as SomeInterface`
+
+-   Support declaring `props: {} as SomeInterface`
 
 ## 1.1.3 - 2021-07-13
-- Bugfixes
+
+-   Bugfixes
 
 ## 1.1.2 - 2021-07-12
-- Export types and `runTypeGen` function
+
+-   Export types and `runTypeGen` function
 
 ## 1.1.1 - 2021-07-12
-- Fix main field in package.json
+
+-   Fix main field in package.json
 
 ## 1.1.0 - 2021-07-12
-- Experimental support for typegen plugins
+
+-   Experimental support for typegen plugins
 
 ## 1.0.4 - 2021-06-27
-- Fix regression
+
+-   Fix regression
 
 ## 1.0.3 - 2021-06-27
-- Fix regression
+
+-   Fix regression
 
 ## 1.0.2 - 2021-06-27
-- Use explicitly specified function return types if present for actions and selectors (vs detection via compiler api).
-- This helps with namespaced types like `This.That`, as the namespace information is lost in detected types.
+
+-   Use explicitly specified function return types if present for actions and selectors (vs detection via compiler api).
+-   This helps with namespaced types like `This.That`, as the namespace information is lost in detected types.
 
 ## 1.0.1 - 2021-06-27
-- Republish as 1.0.0 on npm is actually 0.7.2
-- Only import `A` when encountering complex types like `A.B`
+
+-   Republish as 1.0.0 on npm is actually 0.7.2
+-   Only import `A` when encountering complex types like `A.B`
 
 ## 1.0.0 - 2021-06-26
-- Support auto-importing referenced types into logic types
+
+-   Support auto-importing referenced types into logic types
 
 ## 0.7.2 - 2021-05-30
-- Support actions that return payloads with over 16 properties (fix ".. 4 more .." in the generated type).
+
+-   Support actions that return payloads with over 16 properties (fix ".. 4 more .." in the generated type).
 
 ## 0.7.1 - 2021-04-30
-- Improve error display, condense logs
+
+-   Improve error display, condense logs
 
 ## 0.7.0 - 2021-04-26
-- Fix various bugs from last version. 
-- Run with `--no-import` to skip automatically adding imports to logic types.
+
+-   Fix various bugs from last version.
+-   Run with `--no-import` to skip automatically adding imports to logic types.
 
 ## 0.6.2 - 2021-04-25
-- Automatically add `import { logicType } from './logicType'` statements
-- Automatically add the type to `kea<logicType>()`
-- 0.6.0 and 0.6.1 had some bugs, don't use.
+
+-   Automatically add `import { logicType } from './logicType'` statements
+-   Automatically add the type to `kea<logicType>()`
+-   0.6.0 and 0.6.1 had some bugs, don't use.
 
 ## 0.5.4 - 2021-03-30
-- Support reducers with selectors as defaults
+
+-   Support reducers with selectors as defaults
 
 ## 0.5.3 - 2021-02-23
-- Fix type bug with selectors
-- Skip first comment line in generated types when comparing for overwrites
-- Update deps
+
+-   Fix type bug with selectors
+-   Skip first comment line in generated types when comparing for overwrites
+-   Update deps
 
 ## 0.5.2 - 2021-02-23
-- Update and clean up copy
+
+-   Update and clean up copy
 
 ## 0.5.1 - 2021-01-22
-- Fix `kea-typegen write` recursive updates
+
+-   Fix `kea-typegen write` recursive updates
 
 ## 0.5.0 - 2021-01-22
-- Fix "Record<...>" style shortened types in selectors
-- Add names to selectors
+
+-   Fix "Record<...>" style shortened types in selectors
+-   Add names to selectors
 
 ## 0.4.0 - 2020-12-29
-- Fixed support for TypeScript 4.1
+
+-   Fixed support for TypeScript 4.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kea-typegen",
-    "version": "1.2.2",
+    "version": "1.4.2",
     "description": "Generate type definitions for kea logic",
     "scripts": {
         "start": "ts-node ./src/cli/typegen.ts",
@@ -9,11 +9,12 @@
         "prepublishOnly": "npm run test && npm run clean && npm run build",
         "run-built-cli": "node dist/src/cli/typegen.js",
         "test": "jest",
-        "samples:check": "ts-node ./src/cli/typegen.ts check -c ./samples/tsconfig.json",
-        "samples:write": "ts-node ./src/cli/typegen.ts write -c ./samples/tsconfig.json",
-        "samples:watch": "ts-node ./src/cli/typegen.ts watch -c ./samples/tsconfig.json",
+        "samples:check": "ts-node ./src/cli/typegen.ts check -r ./samples",
+        "samples:write": "ts-node ./src/cli/typegen.ts write -r ./samples --write-paths",
+        "samples:write:paths": "ts-node ./src/cli/typegen.ts write -r ./samples --write-paths",
+        "samples:watch": "ts-node ./src/cli/typegen.ts watch -r ./samples",
         "samples:write:posthog": "ts-node ./src/cli/typegen.ts write -c ../../PostHog/posthog/tsconfig.json",
-        "form-plugin:build": "cd form-plugin && yarn build && cd ..",
+        "form-plugin:build": "cd form-plugin && yarn && yarn build && cd ..",
         "form-plugin:rebuild": "yarn form-plugin:build && rm -rf node_modules && yarn"
     },
     "main": "dist/src/index.js",
@@ -25,13 +26,13 @@
     "dependencies": {
         "@wessberg/ts-clone-node": "0.3.19",
         "diff": "^5.0.0",
-        "prettier": "^2.3.1",
+        "prettier": "^2.5.1",
         "yargs": "^16.2.0"
     },
     "devDependencies": {
-        "@babel/core": "^7.13.1",
-        "@babel/preset-env": "^7.13.5",
-        "@babel/preset-typescript": "^7.13.0",
+        "@babel/core": "^7.16.0",
+        "@babel/preset-env": "^7.16.4",
+        "@babel/preset-typescript": "^7.16.0",
         "@types/jest": "^26.0.20",
         "@types/node": "^14.14.31",
         "@types/yargs": "^16.0.0",
@@ -40,19 +41,19 @@
         "form-plugin": "file:./form-plugin",
         "husky": ">=4",
         "jest": "^27.0.5",
-        "kea": "^2.4.6",
-        "lint-staged": ">=10.5.4",
+        "kea": "^2.5.6",
+        "lint-staged": ">=12.1.2",
         "react": "^16.13.1",
-        "react-redux": "^7.2.4",
-        "redux": "^4.1.0",
-        "reselect": "^4.0.0",
+        "react-redux": "^7.2.6",
+        "redux": "^4.1.2",
+        "reselect": "^4.1.5",
         "rimraf": "^3.0.2",
         "ts-jest": "^27.0.3",
-        "ts-node": "^10.0.0",
-        "typescript": "^4.3.4"
+        "ts-node": "^10.4.0",
+        "typescript": "^4.5.3"
     },
     "peerDependencies": {
-        "typescript": "*"
+        "typescript": ">=4.5.3"
     },
     "jest": {
         "testPathIgnorePatterns": [

package/dist/src/__tests__/e2e/actions.js

@@ -12,7 +12,7 @@ test('actions - with a function', () => {
             })
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('actions - as an object', () => {
     const logicSource = `
@@ -25,7 +25,7 @@ test('actions - as an object', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('actions - as a function returning a object', () => {
     const logicSource = `
@@ -40,7 +40,7 @@ test('actions - as a function returning a object', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('actions - with random values instead of functions', () => {
     const logicSource = `
@@ -56,6 +56,6 @@ test('actions - with random values instead of functions', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 //# sourceMappingURL=actions.js.map

package/dist/src/__tests__/e2e/actions.js.map

@@ -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,8BAAsB,CAAC,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,8BAAsB,CAAC,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,8BAAsB,CAAC,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,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}
+{"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"}

package/dist/src/__tests__/e2e/connect.js

@@ -44,7 +44,7 @@ test('connect actions from another logic', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('connect actions from multiple other logics', () => {
     const logicSource = `
@@ -91,7 +91,7 @@ test('connect actions from multiple other logics', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('connect actions and rename', () => {
     const logicSource = `
@@ -138,7 +138,7 @@ test('connect actions and rename', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('connect values from another logic', () => {
     const logicSource = `
@@ -187,7 +187,7 @@ test('connect values from another logic', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('connect props from another logic', () => {
     const logicSource = `
@@ -236,7 +236,7 @@ test('connect props from another logic', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('connect values and rename', () => {
     const logicSource = `
@@ -285,6 +285,6 @@ test('connect values and rename', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 //# sourceMappingURL=connect.js.map

package/dist/src/__tests__/e2e/connect.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/connect.ts"],"names":[],"mappings":";;AAAA,uCAAmD;AAEnD,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAC5C,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAyCnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAGF,IAAI,CAAC,4CAA4C,EAAE,GAAG,EAAE;IACpD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2CnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACpC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2CnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAC3C,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6CnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC1C,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6CnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6CnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/connect.ts"],"names":[],"mappings":";;AAAA,uCAAmD;AAEnD,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAC5C,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAyCnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAGF,IAAI,CAAC,4CAA4C,EAAE,GAAG,EAAE;IACpD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2CnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACpC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2CnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAC3C,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6CnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC1C,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6CnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6CnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}

package/dist/src/__tests__/e2e/loaders.js

@@ -23,7 +23,7 @@ test('loaders - with a function', () => {
             })
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('loaders - with an array and default', () => {
     const logicSource = `
@@ -49,7 +49,7 @@ test('loaders - with an array and default', () => {
             })
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('loaders - with no param', () => {
     const logicSource = `
@@ -68,6 +68,6 @@ test('loaders - with no param', () => {
             })
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 //# sourceMappingURL=loaders.js.map

package/dist/src/__tests__/e2e/loaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/loaders.ts"],"names":[],"mappings":";;AAAA,uCAAoD;AAEpD,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;KAoBnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAGF,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;IAC7C,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;KAsBnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACjC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;KAenB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/loaders.ts"],"names":[],"mappings":";;AAAA,uCAAoD;AAEpD,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;KAoBnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAGF,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;IAC7C,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;KAsBnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACjC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;KAenB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}

package/dist/src/__tests__/e2e/reducers.js

@@ -30,7 +30,7 @@ test('reducers - with a function', () => {
             })
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('reducers - as an object', () => {
     const logicSource = `
@@ -60,7 +60,7 @@ test('reducers - as an object', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('reducers - as a function returning a object', () => {
     const logicSource = `
@@ -93,7 +93,7 @@ test('reducers - as a function returning a object', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('reducers - with bool default', () => {
     const logicSource = `
@@ -115,6 +115,6 @@ test('reducers - with bool default', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 //# sourceMappingURL=reducers.js.map

package/dist/src/__tests__/e2e/reducers.js.map

@@ -1 +1 @@
-{"version":3,"file":"reducers.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/reducers.ts"],"names":[],"mappings":";;AAAA,uCAAoD;AAEpD,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACpC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2BnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACjC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;KA0BnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACrD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6BnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACtC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;KAkBnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"reducers.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/reducers.ts"],"names":[],"mappings":";;AAAA,uCAAoD;AAEpD,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACpC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2BnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACjC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;KA0BnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACrD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6BnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACtC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;KAkBnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}

package/dist/src/__tests__/e2e/selectors.js

@@ -33,7 +33,7 @@ test('selectors - with a function', () => {
             })
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('selectors - as an object', () => {
     const logicSource = `
@@ -67,7 +67,7 @@ test('selectors - as an object', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 test('selectors - as a function returning a object', () => {
     const logicSource = `
@@ -103,6 +103,6 @@ test('selectors - as a function returning a object', () => {
             }
         })
     `;
-    expect(utils_1.logicSourceToLogicType(logicSource)).toMatchSnapshot();
+    expect((0, utils_1.logicSourceToLogicType)(logicSource)).toMatchSnapshot();
 });
 //# sourceMappingURL=selectors.js.map

package/dist/src/__tests__/e2e/selectors.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/selectors.ts"],"names":[],"mappings":";;AAAA,uCAAoD;AAEpD,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;IACrC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA8BnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;IAClC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA8BnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;IACtD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgCnB,CAAA;IACD,MAAM,CAAC,8BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../src/__tests__/e2e/selectors.ts"],"names":[],"mappings":";;AAAA,uCAAoD;AAEpD,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;IACrC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA8BnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;IAClC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA8BnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;IACtD,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgCnB,CAAA;IACD,MAAM,CAAC,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;AACjE,CAAC,CAAC,CAAA"}

package/dist/src/__tests__/utils.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
-const ts = require("typescript");
+const typescript_1 = require("typescript");
 test('sourceToSourceFile', () => {
     const source = 'var foo = 5;';
-    const sourceFile1 = utils_1.sourceToSourceFile(source);
-    const sourceFile2 = utils_1.sourceToSourceFile(source, 'otherLogic.ts');
+    const sourceFile1 = (0, utils_1.sourceToSourceFile)(source);
+    const sourceFile2 = (0, utils_1.sourceToSourceFile)(source, 'otherLogic.ts');
     expect(sourceFile1.text).toEqual(source);
     expect(sourceFile2.text).toEqual(source);
     expect(sourceFile1.fileName).toEqual('logic.ts');
     expect(sourceFile2.fileName).toEqual('otherLogic.ts');
-    expect(ts.SyntaxKind[sourceFile1.kind]).toEqual('SourceFile');
-    expect(ts.SyntaxKind[sourceFile2.kind]).toEqual('SourceFile');
+    expect(typescript_1.SyntaxKind[sourceFile1.kind]).toEqual('SourceFile');
+    expect(typescript_1.SyntaxKind[sourceFile2.kind]).toEqual('SourceFile');
 });
 test('programFromSource', () => {
     const source = 'var foo = 5;';
-    const program = utils_1.programFromSource(source);
+    const program = (0, utils_1.programFromSource)(source);
     expect(program).toBeDefined;
     expect(typeof program.getSourceFile).toBe('function');
 });
@@ -30,7 +30,7 @@ test('logicSourceToLogicType', () => {
             })
         })
     `;
-    const string = utils_1.logicSourceToLogicType(logicSource);
+    const string = (0, utils_1.logicSourceToLogicType)(logicSource);
     expect(string).toContain('export interface myRandomLogicType extends Logic {');
 });
 //# sourceMappingURL=utils.js.map

package/dist/src/__tests__/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/__tests__/utils.ts"],"names":[],"mappings":";;AAAA,oCAAwF;AACxF,iCAAgC;AAEhC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC5B,MAAM,MAAM,GAAG,cAAc,CAAA;IAC7B,MAAM,WAAW,GAAG,0BAAkB,CAAC,MAAM,CAAG,CAAA;IAChD,MAAM,WAAW,GAAG,0BAAkB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC/D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAChD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;IACrD,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IAC7D,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;AACjE,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC3B,MAAM,MAAM,GAAG,cAAc,CAAA;IAC7B,MAAM,OAAO,GAAG,yBAAiB,CAAC,MAAM,CAAC,CAAA;IACzC,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,CAAA;IAC3B,MAAM,CAAC,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;AACzD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,WAAW,GAAG;;;;;;;;;KASnB,CAAA;IACD,MAAM,MAAM,GAAG,8BAAsB,CAAC,WAAW,CAAC,CAAA;IAElD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oDAAoD,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/__tests__/utils.ts"],"names":[],"mappings":";;AAAA,oCAAwF;AACxF,2CAAuC;AAEvC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC5B,MAAM,MAAM,GAAG,cAAc,CAAA;IAC7B,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAA;IAC9C,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC/D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAChD,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;IACrD,MAAM,CAAC,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IAC1D,MAAM,CAAC,uBAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;AAC9D,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC3B,MAAM,MAAM,GAAG,cAAc,CAAA;IAC7B,MAAM,OAAO,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;IACzC,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,CAAA;IAC3B,MAAM,CAAC,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;AACzD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,WAAW,GAAG;;;;;;;;;KASnB,CAAA;IACD,MAAM,MAAM,GAAG,IAAA,8BAAsB,EAAC,WAAW,CAAC,CAAA;IAElD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oDAAoD,CAAC,CAAA;AAClF,CAAC,CAAC,CAAA"}

package/dist/src/cli/typegen.js

@@ -8,13 +8,13 @@ const fs = require("fs");
 const typegen_1 = require("../typegen");
 yargs
     .command('check', '- check what should be done', (yargs) => { }, (argv) => {
-    typegen_1.runTypeGen(Object.assign(Object.assign({}, includeKeaConfig(parsedToAppOptions(argv))), { write: false, watch: false }));
+    (0, typegen_1.runTypeGen)(Object.assign(Object.assign({}, includeKeaConfig(parsedToAppOptions(argv))), { write: false, watch: false }));
 })
     .command('write', '- write logicType.ts files', (yargs) => { }, (argv) => {
-    typegen_1.runTypeGen(Object.assign(Object.assign({}, includeKeaConfig(parsedToAppOptions(argv))), { write: true, watch: false }));
+    (0, typegen_1.runTypeGen)(Object.assign(Object.assign({}, includeKeaConfig(parsedToAppOptions(argv))), { write: true, watch: false }));
 })
     .command('watch', '- watch for changes and write logicType.ts files', (yargs) => { }, (argv) => {
-    typegen_1.runTypeGen(Object.assign(Object.assign({}, includeKeaConfig(parsedToAppOptions(argv))), { write: true, watch: true }));
+    (0, typegen_1.runTypeGen)(Object.assign(Object.assign({}, includeKeaConfig(parsedToAppOptions(argv))), { write: true, watch: true }));
 })
     .option('config', { alias: 'c', describe: 'Path to tsconfig.json (otherwise auto-detected)', type: 'string' })
     .option('file', { alias: 'f', describe: "Single file to evaluate (can't be used with --config)", type: 'string' })
@@ -30,6 +30,15 @@ yargs
 })
     .option('quiet', { alias: 'q', describe: 'Write nothing to stdout', type: 'boolean' })
     .option('no-import', { describe: 'Do not automatically import generated types in logic files', type: 'boolean' })
+    .option('write-paths', { describe: 'Write paths into logic files that have none', type: 'boolean' })
+    .option('import-global-types', {
+    describe: 'Add import statements in logicType.ts files for global types (e.g. @types/node)',
+    type: 'boolean',
+})
+    .option('ignore-import-paths', {
+    describe: 'List of paths we will never import from inside logicType.ts files',
+    type: 'array',
+})
     .option('verbose', { describe: 'Slightly more verbose output log', type: 'boolean' })
     .demandCommand()
     .help()
@@ -43,15 +52,18 @@ function parsedToAppOptions(parsedOptions) {
         quiet: parsedOptions.quiet,
         verbose: parsedOptions.verbose,
         noImport: parsedOptions.noImport,
+        writePaths: parsedOptions.writePaths,
+        importGlobalTypes: parsedOptions.importGlobalTypes,
+        ignoreImportPaths: parsedOptions.ignoreImportPaths,
         log: parsedOptions.quiet ? () => null : console.log.bind(console),
     };
     return appOptions;
 }
-function findKeaConfig() {
-    return ts.findConfigFile('./', ts.sys.fileExists, '.kearc');
+function findKeaConfig(searchPath) {
+    return ts.findConfigFile(searchPath, ts.sys.fileExists, '.kearc');
 }
 function includeKeaConfig(appOptions) {
-    const configFilePath = findKeaConfig();
+    const configFilePath = findKeaConfig(appOptions.rootPath);
     const newOptions = Object.assign({}, appOptions);
     let rawData, keaConfig;
     for (const key of Object.keys(appOptions)) {
@@ -81,20 +93,34 @@ function includeKeaConfig(appOptions) {
             if (key.endsWith('Path')) {
                 newOptions[key] = path.resolve(process.cwd(), configDirPath, keaConfig[key]);
             }
+            else if (key.endsWith('Paths')) {
+                if (!Array.isArray(keaConfig[key])) {
+                    console.error(`Config "${key}" in ".kearc" is not an array`);
+                    process.exit(1);
+                }
+                newOptions[key] = keaConfig[key].map((value) => path.resolve(process.cwd(), configDirPath, value));
+            }
             else {
                 newOptions[key] = keaConfig[key];
             }
         });
     }
-    if (!newOptions.tsConfigPath) {
-        newOptions.tsConfigPath = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
-    }
     if (!newOptions.rootPath) {
         newOptions.rootPath = newOptions.tsConfigPath ? path.dirname(newOptions.tsConfigPath) : process.cwd();
     }
     if (!newOptions.typesPath) {
         newOptions.typesPath = newOptions.rootPath;
     }
+    if (!newOptions.tsConfigPath) {
+        newOptions.tsConfigPath =
+            ts.findConfigFile(newOptions.rootPath, ts.sys.fileExists, 'tsconfig.json') ||
+                ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
+    }
+    if (!newOptions.packageJsonPath) {
+        newOptions.packageJsonPath =
+            ts.findConfigFile(newOptions.rootPath, ts.sys.fileExists, 'package.json') ||
+                ts.findConfigFile('./', ts.sys.fileExists, 'package.json');
+    }
     return newOptions;
 }
 //# sourceMappingURL=typegen.js.map

package/dist/src/cli/typegen.js.map

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

package/dist/src/print/print.d.ts

@@ -1,12 +1,12 @@
-import * as ts from 'typescript';
+import { Node, Program, TypeParameterDeclaration } from 'typescript';
 import { AppOptions, ParsedLogic } from '../types';
 export declare function runThroughPrettier(sourceText: string, filePath: string): string;
-export declare function printToFiles(program: ts.Program, appOptions: AppOptions, parsedLogics: ParsedLogic[]): {
+export declare function printToFiles(program: Program, appOptions: AppOptions, parsedLogics: ParsedLogic[]): {
     filesToWrite: number;
     writtenFiles: number;
-    importsToModify: number;
+    filesToModify: number;
 };
-export declare function nodeToString(node: ts.Node): string;
+export declare function nodeToString(node: Node): string;
 export declare function parsedLogicToTypeString(parsedLogic: ParsedLogic, appOptions?: AppOptions): string;
-export declare function getLogicTypeArguments(parsedLogic: ParsedLogic): ts.TypeParameterDeclaration[];
+export declare function getLogicTypeArguments(parsedLogic: ParsedLogic): TypeParameterDeclaration[];
 export declare function printLogicType(parsedLogic: ParsedLogic, appOptions?: AppOptions): void;