kea-typegen 3.4.0 → 3.4.2

package/samples/complexLogic.ts

@@ -34,6 +34,26 @@ export type DashboardItemType = {
     key17: string
     key18: string
     key19: string
+    key20: string
+    key21: string
+    key22: string
+    key23: string
+    key24: string
+    key25: string
+    key26: string
+    key27: string
+    key28: string
+    key29: string
+    key30: string
+    key31: string
+    key32: string
+    key33: string
+    key34: string
+    key35: string
+    key36: string
+    key37: string
+    key38: string
+    key39: string
 }
 function newAction(element: HTMLElement | null): Partial<ActionType> {
     return {

package/samples/complexLogicType.ts

@@ -1,4 +1,4 @@
-// Generated by kea-typegen on Wed, 19 Mar 2025 16:25:33 GMT. DO NOT EDIT THIS FILE MANUALLY.
+// Generated by kea-typegen on Fri, 13 Jun 2025 10:53:30 GMT. DO NOT EDIT THIS FILE MANUALLY.
 
 import type { Logic } from 'kea'
 
@@ -101,7 +101,27 @@ export interface complexLogicType extends Logic {
                 key18: string
                 key19: string
                 key2: string
+                key20: string
+                key21: string
+                key22: string
+                key23: string
+                key24: string
+                key25: string
+                key26: string
+                key27: string
+                key28: string
+                key29: string
                 key3: string
+                key30: string
+                key31: string
+                key32: string
+                key33: string
+                key34: string
+                key35: string
+                key36: string
+                key37: string
+                key38: string
+                key39: string
                 key4: string
                 key5: string
                 key6: string
@@ -269,7 +289,27 @@ export interface complexLogicType extends Logic {
             key18: string
             key19: string
             key2: string
+            key20: string
+            key21: string
+            key22: string
+            key23: string
+            key24: string
+            key25: string
+            key26: string
+            key27: string
+            key28: string
+            key29: string
             key3: string
+            key30: string
+            key31: string
+            key32: string
+            key33: string
+            key34: string
+            key35: string
+            key36: string
+            key37: string
+            key38: string
+            key39: string
             key4: string
             key5: string
             key6: string
@@ -305,7 +345,27 @@ export interface complexLogicType extends Logic {
             key18: string
             key19: string
             key2: string
+            key20: string
+            key21: string
+            key22: string
+            key23: string
+            key24: string
+            key25: string
+            key26: string
+            key27: string
+            key28: string
+            key29: string
             key3: string
+            key30: string
+            key31: string
+            key32: string
+            key33: string
+            key34: string
+            key35: string
+            key36: string
+            key37: string
+            key38: string
+            key39: string
             key4: string
             key5: string
             key6: string
@@ -317,17 +377,14 @@ export interface complexLogicType extends Logic {
     _isKea: true
     _isKeaWithKey: false
     __keaTypeGenInternalSelectorTypes: {
-        selectedAction: (
-            selectedActionId: number | 'new' | null,
-            newActionForElement: HTMLElement | null,
-        ) => ActionType | null
-        initialValuesForForm: (selectedAction: ActionType | null) => ActionForm
+        selectedAction: (selectedActionId: number | 'new', newActionForElement: HTMLElement) => ActionType | null
+        initialValuesForForm: (selectedAction: ActionType) => ActionForm
         selectedEditedAction: (
-            selectedAction: ActionType | null,
+            selectedAction: ActionType,
             initialValuesForForm: ActionForm,
-            form: FormInstance | null,
-            editingFields: AntdFieldData[] | null,
-            inspectingElement: number | null,
+            form: FormInstance,
+            editingFields: AntdFieldData[],
+            inspectingElement: number,
             counter: number,
         ) => ActionForm
     }

package/samples/inline-plugin/typegen.ts

@@ -1,5 +1,6 @@
 import { Plugin } from '../../src/types'
 import * as ts from 'typescript'
+import { factory } from 'typescript'
 
 export default {
     visitKeaProperty({ name, parsedLogic, type }) {
@@ -10,12 +11,12 @@ export default {
             parsedLogic.actions.push({
                 name: 'inlineAction',
                 parameters: [],
-                returnTypeNode: ts.factory.createTypeLiteralNode([
-                    ts.factory.createPropertySignature(
+                returnTypeNode: factory.createTypeLiteralNode([
+                    factory.createPropertySignature(
                         undefined,
-                        ts.factory.createIdentifier('value'),
+                        factory.createIdentifier('value'),
                         undefined,
-                        ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword),
+                        factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword),
                     ),
                 ]),
             })
@@ -23,12 +24,12 @@ export default {
             // add reducer "form" to parsedLogic
             parsedLogic.reducers.push({
                 name: 'inlineReducer',
-                typeNode: ts.factory.createTypeLiteralNode([
-                    ts.factory.createPropertySignature(
+                typeNode: factory.createTypeLiteralNode([
+                    factory.createPropertySignature(
                         undefined,
-                        ts.factory.createIdentifier('asd'),
+                        factory.createIdentifier('asd'),
                         undefined,
-                        ts.factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword),
+                        factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword),
                     ),
                 ]),
             })

package/samples/pluginLogic.ts

@@ -20,7 +20,7 @@ export const pluginLogic = kea<pluginLogicType>({
 })
 
 export const anotherPluginLogic = kea<anotherPluginLogicType>({
-    path: ['pluginLogic'],
+    path: ['anotherPluginLogic'],
     form: ({ values }) => ({
         default: {
             name: 'john',

package/samples/pluginLogicType.ts

@@ -1,4 +1,4 @@
-// Generated by kea-typegen on Fri, 10 Jan 2025 11:14:06 GMT. DO NOT EDIT THIS FILE MANUALLY.
+// Generated by kea-typegen on Thu, 19 Jun 2025 09:28:06 GMT. DO NOT EDIT THIS FILE MANUALLY.
 
 import type { Logic, NotReallyHereButImportedBecausePlugin } from 'kea'
 
@@ -136,17 +136,17 @@ export interface pluginLogicType extends Logic {
 export interface anotherPluginLogicType extends Logic {
     actionCreators: {
         submitForm: () => {
-            type: 'submit form (pluginLogic)'
+            type: 'submit form (anotherPluginLogic)'
             payload: {
                 value: boolean
             }
         }
     }
     actionKeys: {
-        'submit form (pluginLogic)': 'submitForm'
+        'submit form (anotherPluginLogic)': 'submitForm'
     }
     actionTypes: {
-        submitForm: 'submit form (pluginLogic)'
+        submitForm: 'submit form (anotherPluginLogic)'
     }
     actions: {
         submitForm: () => void
@@ -163,8 +163,8 @@ export interface anotherPluginLogicType extends Logic {
     events: {}
     key: undefined
     listeners: {}
-    path: ['pluginLogic']
-    pathString: 'pluginLogic'
+    path: ['anotherPluginLogic']
+    pathString: 'anotherPluginLogic'
     props: Record<string, unknown>
     reducer: (
         state: any,

package/samples/typed-builder/typedForm.typegen.ts

@@ -74,7 +74,7 @@ export function typedForm({ parsedLogic, node, getTypeNodeForNode, prepareForPri
                     undefined,
                     [
                         factory.createParameterDeclaration(
-                            undefined,
+                            [],
                             undefined,
                             factory.createIdentifier('form'),
                             undefined,

package/src/utils.ts

@@ -70,7 +70,7 @@ export function getTypeNodeForNode(node: ts.Node, checker: ts.TypeChecker): ts.T
         } else if (ts.isArrayLiteralExpression(node) && node.elements.length === 0) {
             typeNode = factory.createArrayTypeNode(factory.createKeywordTypeNode(SyntaxKind.AnyKeyword))
         } else {
-            typeNode = checker.typeToTypeNode(checker.getTypeAtLocation(node), undefined, undefined)
+            typeNode = checker.typeToTypeNode(checker.getTypeAtLocation(node), undefined, NodeBuilderFlags.NoTruncation)
         }
     } else {
         typeNode = factory.createKeywordTypeNode(SyntaxKind.AnyKeyword)

package/src/visit/visit.ts

@@ -25,6 +25,7 @@ import { visitEvents } from './visitEvents'
 import { visitDefaults } from './visitDefaults'
 import { visitSharedListeners } from './visitSharedListeners'
 import { cloneNode } from 'ts-clone-node'
+import {NodeBuilderFlags} from "typescript";
 
 const visitFunctions = {
     actions: visitActions,
@@ -34,6 +35,7 @@ const visitFunctions = {
     key: visitKey,
     listeners: visitListeners,
     loaders: visitLoaders,
+    lazyLoaders: visitLoaders,
     path: visitPath,
     props: visitProps,
     reducers: visitReducers,
@@ -259,7 +261,7 @@ export function visitKeaCalls(
                 }
                 const name = symbol.getName()
                 const type = checker.getTypeOfSymbolAtLocation(symbol, symbol.valueDeclaration)
-                const typeNode = type ? checker.typeToTypeNode(type, undefined, undefined) : null
+                const typeNode = type ? checker.typeToTypeNode(type, undefined, NodeBuilderFlags.NoTruncation) : null
                 calls.push({ name, type, typeNode, expression: inputProperty.initializer, typeBuilders: [] })
             }
         } else if (ts.isArrayLiteralExpression(input)) {
@@ -271,7 +273,7 @@ export function visitKeaCalls(
                 const builderName = callExpression.expression.getText()
                 const argument = callExpression.arguments[0]
                 const type = checker.getTypeAtLocation(argument)
-                const typeNode = type ? checker.typeToTypeNode(type, undefined, undefined) : null
+                const typeNode = type ? checker.typeToTypeNode(type, undefined, NodeBuilderFlags.NoTruncation) : null
 
                 const identifier = callExpression.expression
                 const symbol = checker.getSymbolAtLocation(identifier)
@@ -363,7 +365,7 @@ export function visitKeaCalls(
 
             if (typeNode && ts.isFunctionTypeNode(typeNode)) {
                 type = type.getCallSignatures()[0].getReturnType()
-                typeNode = type ? checker.typeToTypeNode(type, undefined, undefined) : null
+                typeNode = type ? checker.typeToTypeNode(type, undefined, NodeBuilderFlags.NoTruncation) : null
             }
 
             visitFunctions[name]?.(parsedLogic, type, expression)

package/src/visit/visitKey.ts

@@ -1,10 +1,10 @@
 import { ParsedLogic } from '../types'
 import { cloneNodeSorted, gatherImports } from '../utils'
-import { Expression, Type } from 'typescript'
+import {Expression, NodeBuilderFlags, Type} from 'typescript'
 
 export function visitKey(parsedLogic: ParsedLogic, type: Type, expression: Expression) {
     const { checker } = parsedLogic
-    const typeNode = checker.typeToTypeNode(type, undefined, undefined)
+    const typeNode = checker.typeToTypeNode(type, undefined, NodeBuilderFlags.NoTruncation)
     gatherImports(typeNode, checker, parsedLogic)
 
     parsedLogic.keyType = cloneNodeSorted(typeNode)

package/src/visit/visitSharedListeners.ts

@@ -1,7 +1,7 @@
 import { ParsedLogic } from '../types'
 import * as ts from 'typescript'
 import { cloneNodeSorted, gatherImports } from '../utils'
-import { Expression, Type } from 'typescript'
+import {Expression, NodeBuilderFlags, Type} from 'typescript'
 
 export function visitSharedListeners(parsedLogic: ParsedLogic, type: Type, expression: Expression) {
     const { checker } = parsedLogic
@@ -15,7 +15,7 @@ export function visitSharedListeners(parsedLogic: ParsedLogic, type: Type, expre
             const firstParameter = value.parameters[0]
             if (firstParameter) {
                 typeNode = cloneNodeSorted(
-                    checker.typeToTypeNode(checker.getTypeAtLocation(firstParameter), undefined, undefined),
+                    checker.typeToTypeNode(checker.getTypeAtLocation(firstParameter), undefined, NodeBuilderFlags.NoTruncation),
                 )
                 gatherImports(typeNode, checker, parsedLogic)
             }

package/src/visit/visitWindowValues.ts

@@ -1,7 +1,7 @@
 import { ParsedLogic } from '../types'
 import * as ts from 'typescript'
 import { gatherImports } from '../utils'
-import { Expression, Type } from 'typescript'
+import {Expression, NodeBuilderFlags, Type} from 'typescript'
 
 export function visitWindowValues(parsedLogic: ParsedLogic, type: Type, expression: Expression) {
     const { checker } = parsedLogic
@@ -14,7 +14,7 @@ export function visitWindowValues(parsedLogic: ParsedLogic, type: Type, expressi
             if (value && ts.isFunctionLike(value)) {
                 const type = checker.getTypeOfSymbolAtLocation(property, value)
                 const signature = type.getCallSignatures()[0]
-                const typeNode = checker.typeToTypeNode(signature.getReturnType(), undefined, undefined)
+                const typeNode = checker.typeToTypeNode(signature.getReturnType(), undefined, NodeBuilderFlags.NoTruncation)
                 gatherImports(typeNode, checker, parsedLogic)
 
                 parsedLogic.reducers.push({ name, typeNode })

package/src/write/convertToBuilders.ts

@@ -69,7 +69,7 @@ export function convertToBuilders(
         const arg = stmt.arguments[0]
 
         if (t.ObjectExpression.check(arg)) {
-            const propertiesMap: Record<string, typeof t.ObjectProperty> = Object.fromEntries(
+            const propertiesMap = Object.fromEntries(
                 arg.properties
                     .map((p) => [t.ObjectProperty.check(p) && t.Identifier.check(p.key) ? p.key.name : null, p])
                     .filter(([key]) => key !== null),
@@ -84,7 +84,7 @@ export function convertToBuilders(
                     const renameTo =
                         Array.isArray(importFromOrArray) && importFromOrArray.length > 1 ? importFromOrArray[1] : key
 
-                    newEntries.push(b.callExpression(b.identifier(renameTo), [propertiesMap[key].value as any]))
+                    newEntries.push(b.callExpression(b.identifier(renameTo), [propertiesMap[key].value]))
                     neededImports[importFrom] ??= []
                     if (!neededImports[importFrom].find(([l]) => l === renameTo)) {
                         neededImports[importFrom].push([renameTo, renameTo])
@@ -95,14 +95,16 @@ export function convertToBuilders(
             const unsupported = propertyKeys.filter((p) => !supportedProperties[p])
             if (unsupported.length > 0) {
                 console.warn(
-                    `❗ Logic "${parsedLogic.logicName}", has unsupported keys: ${unsupported.join(', ')}`,
+                    `❗ Logic "${parsedLogic.logicName}", converted unsupported keys (${unsupported.join(
+                        ', ',
+                    )}) to builders without imports`,
                 )
             }
-            // for (const key of unsupported) {
-            //     if (propertiesMap[key] && t.ObjectProperty.check(propertiesMap[key])) {
-            //         newEntries.push(b.callExpression(b.identifier(key), [propertiesMap[key]]))
-            //     }
-            // }
+            for (const key of unsupported) {
+                if (propertiesMap[key] && t.ObjectProperty.check(propertiesMap[key])) {
+                    newEntries.push(b.callExpression(b.identifier(key), [propertiesMap[key].value]))
+                }
+            }
 
             stmt.arguments[0] = b.arrayExpression(newEntries)
         }