kea-typegen 1.2.0 → 1.4.0

package/form-plugin/yarn.lock

@@ -127,11 +127,11 @@ is-fullwidth-code-point@^3.0.0:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 "kea-typegen@file:..":
-  version "1.0.4"
+  version "1.3.0"
   dependencies:
     "@wessberg/ts-clone-node" "0.3.19"
     diff "^5.0.0"
-    prettier "^2.3.1"
+    prettier "^2.5.1"
     yargs "^16.2.0"
 
 kea@^2.4.5:
@@ -151,10 +151,10 @@ object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-prettier@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
-  integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
+prettier@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
+  integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
 
 prop-types@^15.7.2:
   version "15.7.2"
@@ -228,10 +228,10 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
-typescript@^4.3.5:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
-  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
+typescript@^4.5.3:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.3.tgz#afaa858e68c7103317d89eb90c5d8906268d353c"
+  integrity sha512-eVYaEHALSt+s9LbvgEv4Ef+Tdq7hBiIZgii12xXJnukryt3pMgJf6aKhoCZ3FWQsu6sydEnkg11fYXLzhLBjeQ==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kea-typegen",
-    "version": "1.2.0",
+    "version": "1.4.0",
     "description": "Generate type definitions for kea logic",
     "scripts": {
         "start": "ts-node ./src/cli/typegen.ts",
@@ -11,9 +11,10 @@
         "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:write:paths": "ts-node ./src/cli/typegen.ts write -c ./samples/tsconfig.json --write-paths",
         "samples:watch": "ts-node ./src/cli/typegen.ts watch -c ./samples/tsconfig.json",
         "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/samples/autoImportLogic.ts

@@ -1,9 +1,9 @@
 import { kea, KeaPlugin } from 'kea'
 
-import { autoImportLogicType } from './autoImportLogicType'
 import { A1, A2, A3, A4, A5, A7, D1, D3, D6, EventIndex, ExportedApi, R1, R6, S6 } from './autoImportTypes'
 import { githubLogic } from './githubLogic'
 import { loadersLogic } from './loadersLogic'
+import type { autoImportLogicType } from './autoImportLogicType'
 
 type L1 = 'haha'
 type L2 = {
@@ -40,10 +40,16 @@ export const autoImportLogic = kea<autoImportLogicType<L1, L2, RandomAPI>>({
         complexAction: (element: HTMLElement, timeout: NodeJS.Timeout) => ({ element, timeout }),
         combinedA6Action: (filter: A5) => ({ a6: filter.a6, bla: filter.bla }),
         valueAction: [] as A7,
-        miscActionWithType: (randomThing: ExportedApi.RandomThing): { randomThing: ExportedApi.RandomThing } => ({
+        miscActionWithType: (
+            randomThing: ExportedApi.RandomThing,
+        ): {
+            randomThing: ExportedApi.RandomThing
+        } => ({
             randomThing,
         }),
-        miscActionWithTypeConstants: (): { color: 'green' | 'blue' } => ({
+        miscActionWithTypeConstants: (): {
+            color: 'green' | 'blue'
+        } => ({
             color: 'blue',
         }),
         miscActionWithoutType: (randomThing: ExportedApi.RandomThing) => ({ randomThing }),

package/samples/autoImportLogicType.ts

@@ -1,4 +1,4 @@
-// Generated by kea-typegen on Sun, 11 Jul 2021 22:15:52 GMT. DO NOT EDIT THIS FILE MANUALLY.
+// Generated by kea-typegen on Sun, 12 Dec 2021 10:40:33 GMT. DO NOT EDIT THIS FILE MANUALLY.
 
 import { Logic } from 'kea'
 

package/samples/loadersLogicType.ts

@@ -1,4 +1,4 @@
-// Generated by kea-typegen on Thu, 14 Oct 2021 12:09:15 GMT. DO NOT EDIT THIS FILE MANUALLY.
+// Generated by kea-typegen on Thu, 14 Oct 2021 12:36:17 GMT. DO NOT EDIT THIS FILE MANUALLY.
 
 import { Logic } from 'kea'
 
@@ -14,14 +14,14 @@ export interface loadersLogicType extends Logic {
         }
         addDashboardSuccess: (
             dashboard: Dashboard,
-            payload: {
+            payload?: {
                 name: string
             },
         ) => {
             type: 'add dashboard success (loadersLogic)'
             payload: {
                 dashboard: Dashboard
-                payload: {
+                payload?: {
                     name: string
                 }
             }
@@ -44,14 +44,14 @@ export interface loadersLogicType extends Logic {
         }
         addDashboardNoTypeSuccess: (
             dashboard: Dashboard,
-            payload: {
+            payload?: {
                 name: string
             },
         ) => {
             type: 'add dashboard no type success (loadersLogic)'
             payload: {
                 dashboard: Dashboard
-                payload: {
+                payload?: {
                     name: string
                 }
             }
@@ -72,12 +72,12 @@ export interface loadersLogicType extends Logic {
         }
         loadItSuccess: (
             misc: { id: number; name: void; pinned: boolean },
-            payload: any,
+            payload?: any,
         ) => {
             type: 'load it success (loadersLogic)'
             payload: {
                 misc: { id: number; name: void; pinned: boolean }
-                payload: any
+                payload?: any
             }
         }
         loadItFailure: (
@@ -117,7 +117,7 @@ export interface loadersLogicType extends Logic {
         addDashboard: (name: string) => void
         addDashboardSuccess: (
             dashboard: Dashboard,
-            payload: {
+            payload?: {
                 name: string
             },
         ) => void
@@ -125,13 +125,13 @@ export interface loadersLogicType extends Logic {
         addDashboardNoType: ({ name }: { name: string }) => void
         addDashboardNoTypeSuccess: (
             dashboard: Dashboard,
-            payload: {
+            payload?: {
                 name: string
             },
         ) => void
         addDashboardNoTypeFailure: (error: string, errorObject?: any) => void
         loadIt: () => void
-        loadItSuccess: (misc: { id: number; name: void; pinned: boolean }, payload: any) => void
+        loadItSuccess: (misc: { id: number; name: void; pinned: boolean }, payload?: any) => void
         loadItFailure: (error: string, errorObject?: any) => void
     }
     constants: {}

package/samples/logicType.ts

@@ -1,4 +1,4 @@
-// Generated by kea-typegen on Thu, 14 Oct 2021 12:09:15 GMT. DO NOT EDIT THIS FILE MANUALLY.
+// Generated by kea-typegen on Thu, 14 Oct 2021 12:36:17 GMT. DO NOT EDIT THIS FILE MANUALLY.
 
 import { Logic, BreakPointFunction } from 'kea'
 
@@ -28,12 +28,12 @@ export interface logicType<Session> extends Logic {
         }
         loadSessionsSuccess: (
             sessions: Session[],
-            payload: string,
+            payload?: string,
         ) => {
             type: 'load sessions success (scenes.homepage.index.*)'
             payload: {
                 sessions: Session[]
-                payload: string
+                payload?: string
             }
         }
         loadSessionsFailure: (
@@ -68,7 +68,7 @@ export interface logicType<Session> extends Logic {
         updateConst: (name: 'John' | 'Bill') => void
         updateNumber: (number: number) => void
         loadSessions: (selectedDate: string) => void
-        loadSessionsSuccess: (sessions: Session[], payload: string) => void
+        loadSessionsSuccess: (sessions: Session[], payload?: string) => void
         loadSessionsFailure: (error: string, errorObject?: any) => void
     }
     constants: {

package/src/__tests__/e2e/__snapshots__/loaders.ts.snap

@@ -13,11 +13,11 @@ exports[`loaders - with a function 1`] = `
             type: \\"load sessions (logic)\\";
             payload: string;
         });
-        loadSessionsSuccess: (sessions: Session[], payload: string) => ({
+        loadSessionsSuccess: (sessions: Session[], payload?: string) => ({
             type: \\"load sessions success (logic)\\";
             payload: {
                 sessions: Session[];
-                payload: string;
+                payload?: string;
             };
         });
         loadSessionsFailure: (error: string, errorObject?: any) => ({
@@ -43,7 +43,7 @@ exports[`loaders - with a function 1`] = `
     actions: {
         updateName: (name: string) => void;
         loadSessions: (query: string) => void;
-        loadSessionsSuccess: (sessions: Session[], payload: string) => void;
+        loadSessionsSuccess: (sessions: Session[], payload?: string) => void;
         loadSessionsFailure: (error: string, errorObject?: any) => void;
     };
     constants: {};
@@ -99,11 +99,11 @@ exports[`loaders - with an array and default 1`] = `
             type: \\"load sessions (logic)\\";
             payload: string;
         });
-        loadSessionsSuccess: (sessions: Session[], payload: string) => ({
+        loadSessionsSuccess: (sessions: Session[], payload?: string) => ({
             type: \\"load sessions success (logic)\\";
             payload: {
                 sessions: Session[];
-                payload: string;
+                payload?: string;
             };
         });
         loadSessionsFailure: (error: string, errorObject?: any) => ({
@@ -129,7 +129,7 @@ exports[`loaders - with an array and default 1`] = `
     actions: {
         updateName: (name: string) => void;
         loadSessions: (query: string) => void;
-        loadSessionsSuccess: (sessions: Session[], payload: string) => void;
+        loadSessionsSuccess: (sessions: Session[], payload?: string) => void;
         loadSessionsFailure: (error: string, errorObject?: any) => void;
     };
     constants: {};
@@ -179,11 +179,11 @@ exports[`loaders - with no param 1`] = `
             type: \\"load sessions (logic)\\";
             payload: any;
         });
-        loadSessionsSuccess: (sessions: string[], payload: any) => ({
+        loadSessionsSuccess: (sessions: string[], payload?: any) => ({
             type: \\"load sessions success (logic)\\";
             payload: {
                 sessions: string[];
-                payload: any;
+                payload?: any;
             };
         });
         loadSessionsFailure: (error: string, errorObject?: any) => ({
@@ -197,11 +197,11 @@ exports[`loaders - with no param 1`] = `
             type: \\"load results (logic)\\";
             payload: any;
         });
-        loadResultsSuccess: (sessions: string[], payload: any) => ({
+        loadResultsSuccess: (sessions: string[], payload?: any) => ({
             type: \\"load results success (logic)\\";
             payload: {
                 sessions: string[];
-                payload: any;
+                payload?: any;
             };
         });
         loadResultsFailure: (error: string, errorObject?: any) => ({
@@ -230,10 +230,10 @@ exports[`loaders - with no param 1`] = `
     };
     actions: {
         loadSessions: () => void;
-        loadSessionsSuccess: (sessions: string[], payload: any) => void;
+        loadSessionsSuccess: (sessions: string[], payload?: any) => void;
         loadSessionsFailure: (error: string, errorObject?: any) => void;
         loadResults: () => void;
-        loadResultsSuccess: (sessions: string[], payload: any) => void;
+        loadResultsSuccess: (sessions: string[], payload?: any) => void;
         loadResultsFailure: (error: string, errorObject?: any) => void;
     };
     constants: {};

package/src/__tests__/utils.ts

@@ -1,16 +1,16 @@
 import { sourceToSourceFile, programFromSource, logicSourceToLogicType } from '../utils'
-import * as ts from 'typescript'
+import { SyntaxKind } from 'typescript'
 
 test('sourceToSourceFile', () => {
     const source = 'var foo = 5;'
-    const sourceFile1 = sourceToSourceFile(source, )
+    const sourceFile1 = sourceToSourceFile(source)
     const sourceFile2 = 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(SyntaxKind[sourceFile1.kind]).toEqual('SourceFile')
+    expect(SyntaxKind[sourceFile2.kind]).toEqual('SourceFile')
 })
 
 test('programFromSource', () => {
@@ -34,4 +34,4 @@ test('logicSourceToLogicType', () => {
     const string = logicSourceToLogicType(logicSource)
 
     expect(string).toContain('export interface myRandomLogicType extends Logic {')
-})
+})

package/src/cli/typegen.ts

@@ -46,6 +46,7 @@ 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('verbose', { describe: 'Slightly more verbose output log', type: 'boolean' })
     .demandCommand()
     .help()
@@ -60,6 +61,7 @@ function parsedToAppOptions(parsedOptions) {
         quiet: parsedOptions.quiet,
         verbose: parsedOptions.verbose,
         noImport: parsedOptions.noImport,
+        writePaths: parsedOptions.writePaths,
         log: parsedOptions.quiet ? () => null : console.log.bind(console),
     } as AppOptions
 

package/src/print/print.ts

@@ -1,4 +1,16 @@
-import * as ts from 'typescript'
+import {
+    createPrinter,
+    createSourceFile,
+    EmitHint,
+    factory,
+    Node,
+    NewLineKind,
+    Program,
+    ScriptKind,
+    ScriptTarget,
+    SyntaxKind,
+    TypeParameterDeclaration,
+} from 'typescript'
 import * as fs from 'fs'
 import * as path from 'path'
 import * as prettier from 'prettier'
@@ -23,7 +35,7 @@ import { printReducerOptions } from './printReducerOptions'
 import { printEvents } from './printEvents'
 import { printSharedListeners } from './printSharedListeners'
 import { printListeners } from './printListeners'
-import { writeLogicTypeImports } from '../import/writeLogicTypeImports'
+import { writePaths, writeTypeImports } from '../write/write'
 import { printInternalExtraInput } from './printInternalExtraInput'
 
 export function runThroughPrettier(sourceText: string, filePath: string): string {
@@ -43,10 +55,10 @@ export function runThroughPrettier(sourceText: string, filePath: string): string
 
 // returns files to write
 export function printToFiles(
-    program: ts.Program,
+    program: Program,
     appOptions: AppOptions,
     parsedLogics: ParsedLogic[],
-): { filesToWrite: number; writtenFiles: number; importsToModify: number } {
+): { filesToWrite: number; writtenFiles: number; filesToModify: number } {
     const { log } = appOptions
 
     const groupedByFile: Record<string, ParsedLogic[]> = {}
@@ -56,13 +68,13 @@ export function printToFiles(
         }
         groupedByFile[parsedLogic.fileName].push(parsedLogic)
 
-        // create the ts.Nodes and gather referenced types
+        // create the Nodes and gather referenced types
         printLogicType(parsedLogic, appOptions)
     }
 
     let writtenFiles = 0
     let filesToWrite = 0
-    let importsToModify = 0
+    let filesToModify = 0
 
     Object.entries(groupedByFile).forEach(([fileName, parsedLogics]) => {
         const typeFileName = parsedLogics[0].typeFileName
@@ -129,19 +141,19 @@ export function printToFiles(
             }
         }
 
+        const parsedLogicNeedsTypeImport = (pl: ParsedLogic) =>
+            // reload if logic type not imported
+            (pl.logicTypeImported === false ||
+                // reload if don't have the right types in arguments
+                pl.logicTypeArguments.join(', ') !== [...pl.typeReferencesInLogicInput].sort().join(', ')) &&
+            pl.fileName.match(/\.tsx?$/)
+
         // write the type into the logic itself
-        const logicsNeedingImports = parsedLogics.filter(
-            (pl) =>
-                // reload if logic type not imported
-                (pl.logicTypeImported === false ||
-                    // reload if don't have the right types in arguments
-                    pl.logicTypeArguments.join(', ') !== [...pl.typeReferencesInLogicInput].sort().join(', ')) &&
-                pl.fileName.match(/\.tsx?$/),
-        )
+        const logicsNeedingImports = parsedLogics.filter(parsedLogicNeedsTypeImport)
         if (logicsNeedingImports.length > 0) {
             if (appOptions.write && !appOptions.noImport) {
-                writeLogicTypeImports(appOptions, program, fileName, logicsNeedingImports, parsedLogics)
-                importsToModify = logicsNeedingImports.length
+                writeTypeImports(appOptions, program, fileName, logicsNeedingImports, parsedLogics)
+                filesToModify += logicsNeedingImports.length
             } else {
                 log(
                     `❌ Will not write ${logicsNeedingImports.length} logic type import${
@@ -150,28 +162,43 @@ export function printToFiles(
                 )
             }
         }
+
+        const parsedLogicNeedsPath = appOptions.writePaths ? (pl: ParsedLogic) => !pl.hasPathInLogic : () => false
+        const logicsNeedingPaths = parsedLogics.filter(parsedLogicNeedsPath)
+        if (logicsNeedingPaths.length > 0) {
+            if (appOptions.write && !appOptions.noImport) {
+                writePaths(appOptions, program, fileName, logicsNeedingPaths)
+                filesToModify += logicsNeedingPaths.length
+            } else {
+                log(
+                    `❌ Will not write ${logicsNeedingPaths.length} logic path${
+                        logicsNeedingPaths.length === 1 ? '' : 's'
+                    }`,
+                )
+            }
+        }
     })
 
-    if (writtenFiles === 0 && importsToModify === 0) {
+    if (writtenFiles === 0 && filesToModify === 0) {
         if (appOptions.write) {
             log(`💚 ${parsedLogics.length} logic type${parsedLogics.length === 1 ? '' : 's'} up to date!`)
             log('')
-        } else if (filesToWrite > 0 || importsToModify > 0) {
+        } else if (filesToWrite > 0 || filesToModify > 0) {
             log(
-                `🚨 Run "kea-typegen write" to save ${filesToWrite + importsToModify} file${
+                `🚨 Run "kea-typegen write" to save ${filesToWrite + filesToModify} file${
                     filesToWrite === 1 ? '' : 's'
                 } to disk`,
             )
         }
     }
 
-    return { filesToWrite, writtenFiles, importsToModify }
+    return { filesToWrite, writtenFiles, filesToModify }
 }
 
-export function nodeToString(node: ts.Node): string {
-    const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed })
-    const sourceFile = ts.createSourceFile('logic.ts', '', ts.ScriptTarget.Latest, false, ts.ScriptKind.TS)
-    return printer.printNode(ts.EmitHint.Unspecified, node, sourceFile)
+export function nodeToString(node: Node): string {
+    const printer = createPrinter({ newLine: NewLineKind.LineFeed })
+    const sourceFile = createSourceFile('logic.ts', '', ScriptTarget.Latest, false, ScriptKind.TS)
+    return printer.printNode(EmitHint.Unspecified, node, sourceFile)
 }
 
 export function parsedLogicToTypeString(parsedLogic: ParsedLogic, appOptions?: AppOptions): string {
@@ -179,15 +206,15 @@ export function parsedLogicToTypeString(parsedLogic: ParsedLogic, appOptions?: A
     return nodeToString(parsedLogic.interfaceDeclaration)
 }
 
-export function getLogicTypeArguments(parsedLogic: ParsedLogic): ts.TypeParameterDeclaration[] {
+export function getLogicTypeArguments(parsedLogic: ParsedLogic): TypeParameterDeclaration[] {
     return [...parsedLogic.typeReferencesInLogicInput]
         .sort()
-        .map((text) => ts.createTypeParameterDeclaration(ts.createIdentifier(text), undefined))
+        .map((text) => factory.createTypeParameterDeclaration(factory.createIdentifier(text), undefined))
 }
 
 export function printLogicType(parsedLogic: ParsedLogic, appOptions?: AppOptions): void {
     const printProperty = (name, typeNode) =>
-        ts.createPropertySignature(undefined, ts.createIdentifier(name), undefined, typeNode, undefined)
+        factory.createPropertySignature(undefined, factory.createIdentifier(name), undefined, typeNode)
 
     const addSelectorTypeHelp = parsedLogic.selectors.filter((s) => s.functionTypes.length > 0).length > 0
 
@@ -203,9 +230,11 @@ export function printLogicType(parsedLogic: ParsedLogic, appOptions?: AppOptions
         printProperty('listeners', printListeners(parsedLogic)),
         printProperty(
             'path',
-            ts.createTupleTypeNode(parsedLogic.path.map((p) => ts.createLiteralTypeNode(ts.createStringLiteral(p)))),
+            factory.createTupleTypeNode(
+                parsedLogic.path.map((p) => factory.createLiteralTypeNode(factory.createStringLiteral(p))),
+            ),
         ),
-        printProperty('pathString', ts.createStringLiteral(parsedLogic.pathString)),
+        printProperty('pathString', factory.createStringLiteral(parsedLogic.pathString)),
         printProperty('props', printProps(parsedLogic)),
         printProperty('reducer', printReducer(parsedLogic)),
         printProperty('reducerOptions', printReducerOptions(parsedLogic)),
@@ -214,8 +243,8 @@ export function printLogicType(parsedLogic: ParsedLogic, appOptions?: AppOptions
         printProperty('selectors', printSelectors(parsedLogic)),
         printProperty('sharedListeners', printSharedListeners(parsedLogic)),
         printProperty('values', printValues(parsedLogic)),
-        printProperty('_isKea', ts.createTrue()),
-        printProperty('_isKeaWithKey', parsedLogic.keyType ? ts.createTrue() : ts.createFalse()),
+        printProperty('_isKea', factory.createTrue()),
+        printProperty('_isKeaWithKey', parsedLogic.keyType ? factory.createTrue() : factory.createFalse()),
         addSelectorTypeHelp
             ? printProperty('__keaTypeGenInternalSelectorTypes', printInternalSelectorTypes(parsedLogic))
             : null,
@@ -229,14 +258,14 @@ export function printLogicType(parsedLogic: ParsedLogic, appOptions?: AppOptions
 
     const logicTypeArguments = getLogicTypeArguments(parsedLogic)
 
-    parsedLogic.interfaceDeclaration = ts.createInterfaceDeclaration(
+    parsedLogic.interfaceDeclaration = factory.createInterfaceDeclaration(
         undefined,
-        [ts.createModifier(ts.SyntaxKind.ExportKeyword)],
-        ts.createIdentifier(`${parsedLogic.logicName}Type`),
+        [factory.createModifier(SyntaxKind.ExportKeyword)],
+        factory.createIdentifier(`${parsedLogic.logicName}Type`),
         logicTypeArguments,
         [
-            ts.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [
-                ts.createExpressionWithTypeArguments(undefined, ts.createIdentifier('Logic')),
+            factory.createHeritageClause(SyntaxKind.ExtendsKeyword, [
+                factory.createExpressionWithTypeArguments(factory.createIdentifier('Logic'), undefined),
             ]),
         ],
         logicProperties,

package/src/print/printActionCreators.ts

@@ -1,39 +1,36 @@
-import * as ts from 'typescript'
+import { factory } from 'typescript'
 import { AppOptions, ParsedLogic } from '../types'
 import { getActionTypeCreator } from '../utils'
 
 export function printActionCreators(parsedLogic: ParsedLogic, appOptions?: AppOptions) {
     const getActionType = getActionTypeCreator(parsedLogic)
 
-    return ts.createTypeLiteralNode(
+    return factory.createTypeLiteralNode(
         parsedLogic.actions.map(({ name, parameters, returnTypeNode }) => {
-            return ts.createPropertySignature(
+            return factory.createPropertySignature(
                 undefined,
-                ts.createIdentifier(name),
+                factory.createIdentifier(name),
                 undefined,
-                ts.createFunctionTypeNode(
+                factory.createFunctionTypeNode(
                     undefined,
                     parameters,
-                    ts.createParenthesizedType(
-                        ts.createTypeLiteralNode([
-                            ts.createPropertySignature(
+                    factory.createParenthesizedType(
+                        factory.createTypeLiteralNode([
+                            factory.createPropertySignature(
                                 undefined,
-                                ts.createIdentifier('type'),
-                                undefined,
-                                ts.createLiteralTypeNode(ts.createStringLiteral(getActionType(name))),
+                                factory.createIdentifier('type'),
                                 undefined,
+                                factory.createLiteralTypeNode(factory.createStringLiteral(getActionType(name))),
                             ),
-                            ts.createPropertySignature(
+                            factory.createPropertySignature(
                                 undefined,
-                                ts.createIdentifier('payload'),
+                                factory.createIdentifier('payload'),
                                 undefined,
                                 returnTypeNode,
-                                undefined,
                             ),
                         ]),
                     ),
                 ),
-                undefined,
             )
         }),
     )