kea-typegen 3.6.0 → 3.6.2-leakfix

package/src/typegen.ts

@@ -42,7 +42,9 @@ export async function runTypeGen(appOptions: AppOptions) {
         const compilerOptions = ts.parseJsonSourceFileConfigFileContent(configFile, ts.sys, rootFolder)
 
         if (appOptions.watch) {
-            const createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram
+            // We don't emit JavaScript files in typegen watch mode, so the semantic-only
+            // builder is enough and avoids extra emit-related work on every rebuild.
+            const createProgram = ts.createSemanticDiagnosticsBuilderProgram
 
             const host = ts.createWatchCompilerHost(
                 appOptions.tsConfigPath,
@@ -83,17 +85,43 @@ export async function runTypeGen(appOptions: AppOptions) {
                 console.info(codes[diagnostic.code] || `🥚 ${ts.formatDiagnostic(diagnostic, formatHost).trim()}`)
             }
 
-            const origCreateProgram = host.createProgram
-            host.createProgram = (rootNames: ReadonlyArray<string>, options, host, oldProgram) => {
-                return origCreateProgram(rootNames, options, host, oldProgram)
-            }
             const origPostProgramCreate = host.afterProgramCreate
+            let scheduledProgram: Program | undefined
+            let runningTypegen = false
 
-            host.afterProgramCreate = async (prog) => {
-                program = prog.getProgram()
-                origPostProgramCreate!(prog)
+            const runScheduledTypegen = async () => {
+                if (runningTypegen) {
+                    return
+                }
 
-                await goThroughAllTheFiles(program, appOptions)
+                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)
+                scheduledProgram = program
+                void runScheduledTypegen()
             }
 
             ts.createWatchProgram(host)

package/src/write/convertToBuilders.ts

@@ -84,7 +84,7 @@ export async function convertToBuilders(
                     const renameTo =
                         Array.isArray(importFromOrArray) && importFromOrArray.length > 1 ? importFromOrArray[1] : key
 
-                    newEntries.push(b.callExpression(b.identifier(renameTo), [propertiesMap[key].value]))
+                    newEntries.push(b.callExpression(b.identifier(renameTo), [propertiesMap[key].value as any]))
                     neededImports[importFrom] ??= []
                     if (!neededImports[importFrom].find(([l]) => l === renameTo)) {
                         neededImports[importFrom].push([renameTo, renameTo])
@@ -102,7 +102,7 @@ export async function convertToBuilders(
             }
             for (const key of unsupported) {
                 if (propertiesMap[key] && t.ObjectProperty.check(propertiesMap[key])) {
-                    newEntries.push(b.callExpression(b.identifier(key), [propertiesMap[key].value]))
+                    newEntries.push(b.callExpression(b.identifier(key), [propertiesMap[key].value as any]))
                 }
             }
 

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
         "module": "commonjs",
+        "allowSyntheticDefaultImports": true,
         "declaration": true,
         "removeComments": true,
         "emitDecoratorMetadata": true,
@@ -13,7 +14,10 @@
         "types": ["jest", "node"],
         "resolveJsonModule": true
     },
-    "exclude": ["node_modules", "dist", "samples",
-      "form-plugin"
+    "exclude": [
+        "node_modules",
+        "dist",
+        "samples",
+        "form-plugin"
     ]
 }