kea-typegen 1.2.1 → 1.4.1

package/form-plugin/tsconfig.json

@@ -10,7 +10,6 @@
         "outDir": "./lib",
         "baseUrl": "./src",
         "incremental": true,
-        "types": ["jest", "node"],
         "esModuleInterop": true,
         "resolveJsonModule": true,
         "jsx": "react"

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.1",
+    "version": "1.4.1",
     "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/samples/.kearc

@@ -0,0 +1,3 @@
+{
+    "ignoreImportPaths": ["./donotimport.ts"]
+}

package/samples/autoImportLogic.ts

@@ -1,9 +1,10 @@
 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 { Bla } from './donotimport'
+import type { autoImportLogicType } from './autoImportLogicType'
 
 type L1 = 'haha'
 type L2 = {
@@ -12,6 +13,7 @@ type L2 = {
 interface RandomAPI extends ExportedApi.RandomThing {}
 
 export const autoImportLogic = kea<autoImportLogicType<L1, L2, RandomAPI>>({
+    path: ['autoImportLogic'],
     props: {} as {
         asd: D3
     },
@@ -40,10 +42,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 }),
@@ -56,6 +64,7 @@ export const autoImportLogic = kea<autoImportLogicType<L1, L2, RandomAPI>>({
     defaults: {
         bla: { bla: 'asd' } as D1,
         asd: {} as D6,
+        notimported: {} as Bla,
     },
     reducers: {
         rbla: [{ bla: 'asd' } as R1, {}],

package/samples/autoImportLogicType.ts

@@ -1,11 +1,10 @@
-// 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 13:31:25 GMT. DO NOT EDIT THIS FILE MANUALLY.
 
 import { Logic } from 'kea'
 
 import { A1, A2, A3, A4, A5, A7, D1, D3, D6, EventIndex, ExportedApi, R1, R6, RandomThing, S6, S7 } from './autoImportTypes'
 import { KeaPlugin } from '../node_modules/kea/lib/index.d'
 import { HTMLElement } from '../node_modules/@types/react/global.d'
-import { NodeJS, Timeout } from '../node_modules/@types/node/globals.d'
 import { Dashboard, Repository } from './types'
 
 export interface autoImportLogicType<L1, L2, RandomAPI> extends Logic {
@@ -135,6 +134,7 @@ export interface autoImportLogicType<L1, L2, RandomAPI> extends Logic {
     defaults: {
         bla: D1
         asd: D6
+        notimported: Bla
         rbla: R1
         rasd: R6
         then: null | ExportedApi.RandomThing
@@ -154,6 +154,7 @@ export interface autoImportLogicType<L1, L2, RandomAPI> extends Logic {
     ) => {
         bla: D1
         asd: D6
+        notimported: Bla
         rbla: R1
         rasd: R6
         then: null | ExportedApi.RandomThing
@@ -162,6 +163,7 @@ export interface autoImportLogicType<L1, L2, RandomAPI> extends Logic {
     reducers: {
         bla: (state: D1, action: any, fullState: any) => D1
         asd: (state: D6, action: any, fullState: any) => D6
+        notimported: (state: Bla, action: any, fullState: any) => Bla
         rbla: (state: R1, action: any, fullState: any) => R1
         rasd: (state: R6, action: any, fullState: any) => R6
         then: (state: null | ExportedApi.RandomThing, action: any, fullState: any) => null | ExportedApi.RandomThing
@@ -169,6 +171,7 @@ export interface autoImportLogicType<L1, L2, RandomAPI> extends Logic {
     selector: (state: any) => {
         bla: D1
         asd: D6
+        notimported: Bla
         rbla: R1
         rasd: R6
         then: null | ExportedApi.RandomThing
@@ -176,6 +179,7 @@ export interface autoImportLogicType<L1, L2, RandomAPI> extends Logic {
     selectors: {
         bla: (state: any, props?: any) => D1
         asd: (state: any, props?: any) => D6
+        notimported: (state: any, props?: any) => Bla
         rbla: (state: any, props?: any) => R1
         rasd: (state: any, props?: any) => R6
         then: (state: any, props?: any) => null | ExportedApi.RandomThing
@@ -191,6 +195,7 @@ export interface autoImportLogicType<L1, L2, RandomAPI> extends Logic {
     values: {
         bla: D1
         asd: D6
+        notimported: Bla
         rbla: R1
         rasd: R6
         then: null | ExportedApi.RandomThing

package/samples/complexLogic.ts

@@ -45,8 +45,9 @@ function newAction(element: HTMLElement | null): Partial<ActionType> {
 export const complexLogic = kea<
     complexLogicType<ActionForm, ActionType, AntdFieldData, DashboardItemType, FormInstance>
 >({
+    path: ['complexLogic'],
     props: {} as AntdFieldData,
-    
+
     actions: {
         setForm: (form: FormInstance) => ({ form }),
         selectAction: (id: string | null) => ({ id: id || null }),
@@ -155,8 +156,8 @@ export const complexLogic = kea<
                 const a = {} as DashboardItemType
                 const result = { ...a, bla: true }
                 return result
-            }
-        ]
+            },
+        ],
     },
 
     listeners: ({ actions, values }) => ({

package/samples/donotimport.ts

@@ -0,0 +1 @@
+export type Bla = 123

package/samples/githubConnectLogic.ts

@@ -4,6 +4,7 @@ import { githubLogic } from './githubLogic'
 import { githubConnectLogicType } from './githubConnectLogicType'
 
 export const githubConnectLogic = kea<githubConnectLogicType>({
+    path: ['githubConnectLogic'],
     connect: {
         values: [githubLogic, ['repositories', 'this-one-does-not-exist'], githubLogic(), ['isLoading']],
         actions: [githubLogic, ['setRepositories', 'will-not-be-imported']],

package/samples/githubImportLogic.ts

@@ -5,6 +5,7 @@ import { githubImportLogicType } from './githubImportLogicType'
 import { Repository } from './types'
 
 export const githubImportLogic = kea<githubImportLogicType>({
+    path: ['githubImportLogic'],
     reducers: () => ({
         repositoryReducerCopy: [
             [] as Repository[],

package/samples/githubLogic.ts

@@ -5,6 +5,7 @@ import { Repository } from './types'
 const API_URL = 'https://api.github.com'
 
 export const githubLogic = kea<githubLogicType>({
+    path: ['githubLogic'],
     actions: {
         setUsername: (username: string) => ({ username }),
         setRepositories: (repositories: Repository[]) => ({ repositories }),

package/samples/loadersLogic.ts

@@ -4,6 +4,7 @@ import { loadersLogicType } from './loadersLogicType'
 import { Dashboard } from './types'
 
 export const loadersLogic = kea<loadersLogicType>({
+    path: ['loadersLogic'],
     actions: {
         addDashboard: (name: string) => ({ name }),
     },

package/samples/loadersLogicType.ts

@@ -1,4 +1,4 @@
-// Generated by kea-typegen on Thu, 14 Oct 2021 12:25:24 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,7 +72,7 @@ export interface loadersLogicType extends Logic {
         }
         loadItSuccess: (
             misc: { id: number; name: void; pinned: boolean },
-            payload: any,
+            payload?: any,
         ) => {
             type: 'load it success (loadersLogic)'
             payload: {
@@ -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/samples/pluginLogic.ts

@@ -4,6 +4,7 @@ import { inlinePlugin } from './inline-plugin'
 import { pluginLogicType, anotherPluginLogicType } from './pluginLogicType'
 
 export const pluginLogic = kea<pluginLogicType>({
+    path: ['pluginLogic'],
     inline: { bla: true },
 
     form: {
@@ -19,6 +20,7 @@ export const pluginLogic = kea<pluginLogicType>({
 })
 
 export const anotherPluginLogic = kea<anotherPluginLogicType>({
+    path: ['pluginLogic'],
     form: ({ values }) => ({
         default: {
             name: 'john',

package/samples/propsLogic.ts

@@ -2,6 +2,7 @@ import { kea } from 'kea'
 import { propsLogicType } from './propsLogicType'
 
 const propsLogic = kea<propsLogicType>({
+    path: (key) => ['propsLogic', key],
     props: {
         /* TODO for 3.0: set default props here */
     } as {

package/samples/propsLogicType.ts

@@ -1,29 +1,29 @@
-// Generated by kea-typegen on Wed, 23 Jun 2021 09:53:33 GMT. DO NOT EDIT THIS FILE MANUALLY.
+// Generated by kea-typegen on Sun, 12 Dec 2021 13:38:14 GMT. DO NOT EDIT THIS FILE MANUALLY.
 
 import { Logic } from 'kea'
 
 export interface propsLogicType extends Logic {
     actionCreators: {
         setPage: (page: string) => {
-            type: 'set page (propsLogic)'
+            type: 'set page (propsLogic.*)'
             payload: {
                 page: string
             }
         }
         setId: (id: number) => {
-            type: 'set id (propsLogic)'
+            type: 'set id (propsLogic.*)'
             payload: {
                 id: number
             }
         }
     }
     actionKeys: {
-        'set page (propsLogic)': 'setPage'
-        'set id (propsLogic)': 'setId'
+        'set page (propsLogic.*)': 'setPage'
+        'set id (propsLogic.*)': 'setId'
     }
     actionTypes: {
-        setPage: 'set page (propsLogic)'
-        setId: 'set id (propsLogic)'
+        setPage: 'set page (propsLogic.*)'
+        setId: 'set id (propsLogic.*)'
     }
     actions: {
         setPage: (page: string) => void
@@ -36,8 +36,8 @@ export interface propsLogicType extends Logic {
     events: {}
     key: number
     listeners: {}
-    path: ['propsLogic']
-    pathString: 'propsLogic'
+    path: ['propsLogic', '*']
+    pathString: 'propsLogic.*'
     props: {
         page: string
         id: number

package/samples/windowValuesLogic.ts

@@ -1,6 +1,7 @@
 import { kea } from 'kea'
 import { windowValuesLogicType } from './windowValuesLogicType'
 export const windowValuesLogic = kea<windowValuesLogicType>({
+    path: ['windowValuesLogic'],
     windowValues: () => ({
         windowHeight: (window) => window.innerHeight,
         windowWidth: (window) => Math.min(window.innerWidth, window.document.body.clientWidth),

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,7 +179,7 @@ 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[];
@@ -197,7 +197,7 @@ 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[];
@@ -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 {')
-})
+})