kea-typegen 3.6.5 → 3.6.8

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 3.6.8 - 2026-03-24
+
+Fix a memory leak.
+
+## 3.6.7 - 2026-03-24
+
+Fix a memory leak.
+
+## 3.6.6 - 2026-03-05
+
+Upgrade to TypeScript 5.9
+
 ## 3.6.5 - 2026-03-05
 
 Upgrade to TypeScript 5.8

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kea-typegen",
-    "version": "3.6.5",
+    "version": "3.6.8",
     "description": "Generate type definitions for kea logic",
     "scripts": {
         "start": "ts-node ./src/cli/typegen.ts",
@@ -13,7 +13,7 @@
         "samples:write": "ts-node ./src/cli/typegen.ts write -r ./samples --write-paths --delete",
         "samples:convert": "ts-node ./src/cli/typegen.ts write -r ./samples --convert-to-builders",
         "samples:watch": "ts-node ./src/cli/typegen.ts watch -r ./samples --delete",
-        "samples:write:posthog": "ts-node ./src/cli/typegen.ts write --show-ts-errors -c",
+        "samples:write:posthog": "NODE_OPTIONS=\"--max-old-space-size=16384\" ts-node ./src/cli/typegen.ts write --show-ts-errors -c",
         "form-plugin:build": "cd form-plugin && yarn && yarn build && cd ..",
         "form-plugin:rebuild": "yarn form-plugin:build && rm -rf node_modules && yarn"
     },
@@ -53,10 +53,10 @@
         "rimraf": "^3.0.2",
         "ts-jest": "^28.0.8",
         "ts-node": "^10.7.0",
-        "typescript": "5.8.2"
+        "typescript": "5.9.3"
     },
     "peerDependencies": {
-        "typescript": ">=5.8.0"
+        "typescript": ">=5.9.0"
     },
     "jest": {
         "testPathIgnorePatterns": [

package/dist/src/__tests__/typegen.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/__tests__/typegen.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const typegen_1 = require("../typegen");
+test('replaceProgram clears the previous Program reference before allocating the next one', () => {
+    let currentProgram = {};
+    const nextProgram = {};
+    let sawClearedReference = false;
+    const returnedProgram = (0, typegen_1.replaceProgram)(() => {
+        sawClearedReference = typeof currentProgram === 'undefined';
+        return nextProgram;
+    }, (program) => {
+        currentProgram = program;
+    });
+    expect(sawClearedReference).toBe(true);
+    expect(returnedProgram).toBe(nextProgram);
+    expect(currentProgram).toBe(nextProgram);
+});
+//# sourceMappingURL=typegen.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../../src/__tests__/typegen.ts"],"names":[],"mappings":";;AACA,wCAA2C;AAE3C,IAAI,CAAC,qFAAqF,EAAE,GAAG,EAAE;IAC7F,IAAI,cAAc,GAAwB,EAAa,CAAA;IACvD,MAAM,WAAW,GAAG,EAAa,CAAA;IACjC,IAAI,mBAAmB,GAAG,KAAK,CAAA;IAE/B,MAAM,eAAe,GAAG,IAAA,wBAAc,EAClC,GAAG,EAAE;QACD,mBAAmB,GAAG,OAAO,cAAc,KAAK,WAAW,CAAA;QAC3D,OAAO,WAAW,CAAA;IACtB,CAAC,EACD,CAAC,OAAO,EAAE,EAAE;QACR,cAAc,GAAG,OAAO,CAAA;IAC5B,CAAC,CACJ,CAAA;IAED,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACtC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACzC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;AAC5C,CAAC,CAAC,CAAA"}

package/dist/src/__tests__/watch.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/__tests__/watch.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const path = require("path");
+test('watch mode does not overlap successive typegen passes', async () => {
+    const repoRoot = path.resolve(__dirname, '..', '..');
+    const scriptPath = path.join(repoRoot, 'src/test-support/watch-mode-smoke.js');
+    const result = await new Promise((resolve, reject) => {
+        const child = (0, child_process_1.spawn)(process.execPath, [scriptPath], {
+            cwd: repoRoot,
+            env: { ...process.env, FORCE_COLOR: '0' },
+        });
+        let stdout = '';
+        let stderr = '';
+        child.stdout.on('data', (chunk) => {
+            stdout += chunk.toString();
+        });
+        child.stderr.on('data', (chunk) => {
+            stderr += chunk.toString();
+        });
+        child.on('error', reject);
+        child.on('close', (code, signal) => resolve({ code, signal, stdout, stderr }));
+    });
+    expect(result.signal).toBeNull();
+    expect(result.code).toBe(0);
+    const payload = JSON.parse(result.stdout.trim());
+    expect(payload.started).toBeGreaterThan(1);
+    expect(payload.completed).toBeGreaterThan(0);
+    expect(payload.maxActive).toBe(1);
+    expect(result.stderr).toBe('');
+}, 30000);
+//# sourceMappingURL=watch.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../../src/__tests__/watch.ts"],"names":[],"mappings":";;AAAA,iDAAqC;AACrC,6BAA4B;AAE5B,IAAI,CACA,uDAAuD,EACvD,KAAK,IAAI,EAAE;IACP,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IACpD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,sCAAsC,CAAC,CAAA;IAE9E,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAC5B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAChB,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,EAAE;YAChD,GAAG,EAAE,QAAQ;YACb,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE;SAC5C,CAAC,CAAA;QAEF,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,IAAI,MAAM,GAAG,EAAE,CAAA;QAEf,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC9B,CAAC,CAAC,CAAA;QAEF,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC9B,CAAC,CAAC,CAAA;QAEF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QACzB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;IAClF,CAAC,CACJ,CAAA;IAED,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAA;IAChC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAE3B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAEhD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAC1C,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAC5C,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAClC,CAAC,EACD,KAAK,CACR,CAAA"}

package/dist/src/__tests__/write.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/__tests__/write.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const ts = require("typescript");
+const visit_1 = require("../visit/visit");
+const writeTypeImports_1 = require("../write/writeTypeImports");
+test('write mode recreates the TypeScript program from scratch between passes', async () => {
+    const repoRoot = path.resolve(__dirname, '..', '..');
+    const scriptPath = path.join(repoRoot, 'src/test-support/write-mode-smoke.js');
+    const result = await new Promise((resolve, reject) => {
+        const child = (0, child_process_1.spawn)(process.execPath, [scriptPath], {
+            cwd: repoRoot,
+            env: { ...process.env, FORCE_COLOR: '0' },
+        });
+        let stdout = '';
+        let stderr = '';
+        child.stdout.on('data', (chunk) => {
+            stdout += chunk.toString();
+        });
+        child.stderr.on('data', (chunk) => {
+            stderr += chunk.toString();
+        });
+        child.on('error', reject);
+        child.on('close', (code, signal) => resolve({ code, signal, stdout, stderr }));
+    });
+    expect(result.signal).toBeNull();
+    expect(result.code).toBe(0);
+    const payload = JSON.parse(result.stdout.trim());
+    expect(payload.createProgramCalls).toBeGreaterThan(1);
+    expect(payload.reusedOldProgram).toBe(false);
+    expect(result.stderr).toBe('');
+}, 30000);
+test('writeTypeImports adds missing type import and kea generic', async () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'kea-typegen-write-imports-'));
+    try {
+        const logicDir = path.join(tempDir, 'src');
+        const logicPath = path.join(logicDir, 'logic.ts');
+        const keaDtsPath = path.join(tempDir, 'node_modules', 'kea', 'index.d.ts');
+        fs.mkdirSync(path.dirname(keaDtsPath), { recursive: true });
+        fs.mkdirSync(logicDir, { recursive: true });
+        fs.writeFileSync(keaDtsPath, 'export function kea<T = any>(input: any): T\n');
+        fs.writeFileSync(logicPath, [
+            "import { kea } from 'kea'",
+            '',
+            'export const logic = kea({',
+            '    actions: () => ({',
+            '        setValue: (value: string) => ({ value }),',
+            '    }),',
+            '})',
+            '',
+        ].join('\n'));
+        const program = ts.createProgram([logicPath], {
+            module: ts.ModuleKind.CommonJS,
+            moduleResolution: ts.ModuleResolutionKind.NodeJs,
+            target: ts.ScriptTarget.ES2020,
+            skipLibCheck: true,
+        });
+        const appOptions = {
+            rootPath: logicDir,
+            typesPath: logicDir,
+            log: () => { },
+        };
+        const [parsedLogic] = (0, visit_1.visitProgram)(program, appOptions);
+        await (0, writeTypeImports_1.writeTypeImports)(appOptions, program, logicPath, [parsedLogic], [parsedLogic]);
+        const writtenLogic = fs.readFileSync(logicPath, 'utf8');
+        expect(writtenLogic).toMatch(/import type \{ logicType \} from ['"]\.\/logicType['"]/);
+        expect(writtenLogic).toContain('export const logic = kea<logicType>({');
+    }
+    finally {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+});
+test('writeTypeImports replaces existing kea generic without leaving a trailing >', async () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'kea-typegen-write-existing-generic-'));
+    try {
+        const logicDir = path.join(tempDir, 'src');
+        const logicPath = path.join(logicDir, 'logic.ts');
+        const logicTypePath = path.join(logicDir, 'logicType.ts');
+        const keaDtsPath = path.join(tempDir, 'node_modules', 'kea', 'index.d.ts');
+        fs.mkdirSync(path.dirname(keaDtsPath), { recursive: true });
+        fs.mkdirSync(logicDir, { recursive: true });
+        fs.writeFileSync(keaDtsPath, 'export function kea<T = any>(input: any): T\n');
+        fs.writeFileSync(logicTypePath, 'export interface logicType {}\n');
+        fs.writeFileSync(logicPath, [
+            "import type { logicType } from './logicType'",
+            "import { kea, actions } from 'kea'",
+            '',
+            'export const logic = kea<logicType<string>>([',
+            '    actions({',
+            '        setValue: (value: string) => ({ value }),',
+            '    }),',
+            '])',
+            '',
+        ].join('\n'));
+        const program = ts.createProgram([logicPath], {
+            module: ts.ModuleKind.CommonJS,
+            moduleResolution: ts.ModuleResolutionKind.NodeJs,
+            target: ts.ScriptTarget.ES2020,
+            skipLibCheck: true,
+        });
+        const appOptions = {
+            rootPath: logicDir,
+            typesPath: logicDir,
+            log: () => { },
+        };
+        const [parsedLogic] = (0, visit_1.visitProgram)(program, appOptions);
+        await (0, writeTypeImports_1.writeTypeImports)(appOptions, program, logicPath, [parsedLogic], [parsedLogic]);
+        const writtenLogic = fs.readFileSync(logicPath, 'utf8');
+        expect(writtenLogic).toMatch(/import type \{ logicType \} from ['"]\.\/logicType['"]/);
+        expect(writtenLogic).toContain('export const logic = kea<logicType>([');
+        expect(writtenLogic).not.toContain('kea<logicType>>([');
+    }
+    finally {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+});
+//# sourceMappingURL=write.js.map

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

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

package/dist/src/typegen.d.ts

@@ -1,2 +1,4 @@
 import { AppOptions } from './types';
+import { Program } from 'typescript';
 export declare function runTypeGen(appOptions: AppOptions): Promise<void>;
+export declare function replaceProgram(createProgram: () => Program, setProgram: (program?: Program) => void): Program;

package/dist/src/typegen.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTypeGen = runTypeGen;
+exports.replaceProgram = replaceProgram;
 const ts = require("typescript");
 const path = require("path");
 const visit_1 = require("./visit/visit");
@@ -19,11 +20,13 @@ async function runTypeGen(appOptions) {
     if (appOptions.sourceFilePath) {
         log(`❇️ Loading file: ${appOptions.sourceFilePath}`);
         resetProgram = () => {
-            program = ts.createProgram([appOptions.sourceFilePath], {
+            program = replaceProgram(() => ts.createProgram([appOptions.sourceFilePath], {
                 target: ts.ScriptTarget.ES5,
                 module: ts.ModuleKind.CommonJS,
                 noEmit: true,
                 noErrorTruncation: true,
+            }), (nextProgram) => {
+                program = nextProgram;
             });
         };
         resetProgram();
@@ -59,22 +62,50 @@ async function runTypeGen(appOptions) {
                 };
                 console.info(codes[diagnostic.code] || `🥚 ${ts.formatDiagnostic(diagnostic, formatHost).trim()}`);
             }
-            const origCreateProgram = host.createProgram;
-            host.createProgram = (rootNames, options, host, oldProgram) => {
-                return origCreateProgram(rootNames, options, host, oldProgram);
-            };
             const origPostProgramCreate = host.afterProgramCreate;
-            host.afterProgramCreate = async (prog) => {
+            let scheduledProgram;
+            let runningTypegen = false;
+            const runScheduledTypegen = async () => {
+                if (runningTypegen) {
+                    return;
+                }
+                runningTypegen = true;
+                try {
+                    while (scheduledProgram) {
+                        const nextProgram = scheduledProgram;
+                        scheduledProgram = undefined;
+                        try {
+                            await goThroughAllTheFiles(nextProgram, appOptions);
+                        }
+                        catch (error) {
+                            console.error('⛔ Error running kea-typegen in watch mode');
+                            console.error(error);
+                        }
+                    }
+                }
+                finally {
+                    runningTypegen = false;
+                    if (scheduledProgram) {
+                        void runScheduledTypegen();
+                    }
+                }
+            };
+            host.afterProgramCreate = (prog) => {
                 program = prog.getProgram();
-                origPostProgramCreate(prog);
-                await goThroughAllTheFiles(program, appOptions);
+                origPostProgramCreate === null || origPostProgramCreate === void 0 ? void 0 : origPostProgramCreate(prog);
+                scheduledProgram = program;
+                void runScheduledTypegen();
             };
             ts.createWatchProgram(host);
         }
         else {
-            const host = ts.createCompilerHost(compilerOptions.options);
             resetProgram = () => {
-                program = ts.createProgram(compilerOptions.fileNames, compilerOptions.options, host, program);
+                program = replaceProgram(() => {
+                    const host = ts.createCompilerHost(compilerOptions.options);
+                    return ts.createProgram(compilerOptions.fileNames, compilerOptions.options, host);
+                }, (nextProgram) => {
+                    program = nextProgram;
+                });
             };
             resetProgram();
         }
@@ -117,4 +148,10 @@ async function runTypeGen(appOptions) {
         }
     }
 }
+function replaceProgram(createProgram, setProgram) {
+    setProgram(undefined);
+    const nextProgram = createProgram();
+    setProgram(nextProgram);
+    return nextProgram;
+}
 //# sourceMappingURL=typegen.js.map

package/dist/src/typegen.js.map

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

package/dist/src/write/writeTypeImports.js

@@ -1,55 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeTypeImports = writeTypeImports;
-const recast_1 = require("recast");
+const ts = require("typescript");
 const osPath = require("path");
 const print_1 = require("../print/print");
 const fs = require("fs");
-const utils_1 = require("./utils");
+function applyTextEdits(source, edits) {
+    return edits
+        .sort((a, b) => b.start - a.start || b.end - a.end)
+        .reduce((output, { start, end, text }) => output.slice(0, start) + text + output.slice(end), source);
+}
+function getImportPath(importDeclaration) {
+    return ts.isStringLiteralLike(importDeclaration.moduleSpecifier) ? importDeclaration.moduleSpecifier.text : null;
+}
+function getImportInsertPosition(sourceFile, rawCode) {
+    const importDeclarations = sourceFile.statements.filter(ts.isImportDeclaration);
+    if (importDeclarations.length > 0) {
+        return importDeclarations[importDeclarations.length - 1].getEnd();
+    }
+    const shebangMatch = rawCode.match(/^#!.*(?:\r?\n|$)/);
+    return shebangMatch ? shebangMatch[0].length : 0;
+}
+function getTypeArgumentInsertEnd(callExpression, sourceFile) {
+    const openParenToken = callExpression
+        .getChildren(sourceFile)
+        .find((child) => child.kind === ts.SyntaxKind.OpenParenToken);
+    return openParenToken ? openParenToken.getStart(sourceFile) : callExpression.expression.getEnd();
+}
 async function writeTypeImports(appOptions, program, filename, logicsNeedingImports, parsedLogics) {
     const { log } = appOptions;
     const sourceFile = program.getSourceFile(filename);
-    const rawCode = sourceFile.getText();
-    const ast = (0, utils_1.getAst)(filename, rawCode);
+    if (!sourceFile) {
+        throw new Error(`Could not find source file: ${filename}`);
+    }
+    const rawCode = fs.readFileSync(filename, 'utf8');
     let importLocation = osPath
         .relative(osPath.dirname(filename), logicsNeedingImports[0].typeFileName)
         .replace(/\.[tj]sx?$/, '');
     if (!importLocation.startsWith('.')) {
         importLocation = `./${importLocation}`;
     }
-    let foundImport = false;
-    (0, recast_1.visit)(ast, {
-        visitImportDeclaration(path) {
-            const importPath = path.value.source && utils_1.t.StringLiteral.check(path.value.source) ? path.value.source.value : null;
-            if (utils_1.t.ImportDeclaration.check(path.value) &&
-                importPath &&
-                osPath.resolve(osPath.dirname(filename), importPath) ===
-                    osPath.resolve(osPath.dirname(filename), importLocation)) {
-                foundImport = true;
-                path.value.importKind = 'type';
-                path.value.specifiers = parsedLogics.map((l) => utils_1.b.importSpecifier(utils_1.b.identifier(l.logicTypeName), utils_1.b.identifier(l.logicTypeName)));
-            }
-            return false;
-        },
+    const desiredImport = `import type { ${parsedLogics.map((l) => l.logicTypeName).join(', ')} } from '${importLocation}'`;
+    const importDeclarations = sourceFile.statements.filter(ts.isImportDeclaration);
+    const matchingImport = importDeclarations.find((importDeclaration) => {
+        const importPath = getImportPath(importDeclaration);
+        return (importPath !== null &&
+            osPath.resolve(osPath.dirname(filename), importPath) ===
+                osPath.resolve(osPath.dirname(filename), importLocation));
     });
-    if (!foundImport) {
-        (0, recast_1.visit)(ast, {
-            visitProgram(path) {
-                path.value.body = [
-                    ...path.value.body.filter((n) => utils_1.t.ImportDeclaration.check(n)),
-                    utils_1.b.importDeclaration(parsedLogics.map((l) => utils_1.b.importSpecifier(utils_1.b.identifier(l.logicTypeName), utils_1.b.identifier(l.logicTypeName))), utils_1.b.stringLiteral(importLocation), 'type'),
-                    ...path.value.body.filter((n) => !utils_1.t.ImportDeclaration.check(n)),
-                ];
-                return false;
-            },
+    const edits = [];
+    if (matchingImport) {
+        edits.push({
+            start: matchingImport.getStart(sourceFile),
+            end: matchingImport.getEnd(),
+            text: desiredImport,
         });
     }
-    (0, utils_1.visitAllKeaCalls)(ast, logicsNeedingImports, filename, ({ path, parsedLogic }) => {
-        path.node.typeParameters = utils_1.b.tsTypeParameterInstantiation([
-            utils_1.b.tsTypeReference(utils_1.b.identifier(parsedLogic.logicTypeName)),
-        ]);
-    });
-    const newText = await (0, print_1.runThroughPrettier)((0, recast_1.print)(ast).code, filename);
+    else {
+        const insertPos = getImportInsertPosition(sourceFile, rawCode);
+        const hasExistingImports = importDeclarations.length > 0;
+        const importText = hasExistingImports
+            ? `\n${desiredImport}${rawCode.slice(insertPos, insertPos + 1) === '\n' ? '' : '\n'}`
+            : `${desiredImport}\n`;
+        edits.push({
+            start: insertPos,
+            end: insertPos,
+            text: importText,
+        });
+    }
+    for (const parsedLogic of logicsNeedingImports) {
+        const callExpression = parsedLogic.node.parent;
+        if (!ts.isCallExpression(callExpression)) {
+            continue;
+        }
+        const typeArgumentStart = callExpression.expression.getEnd();
+        const typeArgumentEnd = callExpression.typeArguments
+            ? getTypeArgumentInsertEnd(callExpression, sourceFile)
+            : typeArgumentStart;
+        edits.push({
+            start: typeArgumentStart,
+            end: typeArgumentEnd,
+            text: `<${parsedLogic.logicTypeName}>`,
+        });
+    }
+    const newText = await (0, print_1.runThroughPrettier)(applyTextEdits(rawCode, edits), filename);
     fs.writeFileSync(filename, newText);
     log(`🔥 Import added: ${osPath.relative(process.cwd(), filename)}`);
 }

package/dist/src/write/writeTypeImports.js.map

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