@akanjs/devkit 2.1.1-rc.2 → 2.1.2-rc.0

package/aiEditor.test.ts

@@ -0,0 +1,68 @@
+import { describe, expect, test } from "bun:test";
+import {
+  parseTypescriptFileBlocks,
+  preserveTypescriptResponseContent,
+} from "./aiEditor";
+
+describe("parseTypescriptFileBlocks", () => {
+  test("parses TypeScript file blocks with common fence variants", () => {
+    const writes = parseTypescriptFileBlocks(`
+\`\`\`ts
+
+// File: lib/car/car.constant.ts
+
+export const car = "car";
+\`\`\`
+
+\`\`\`tsx
+  // File: lib/car/Car.Unit.tsx
+export const CarUnit = () => null;
+\`\`\`
+`);
+
+    expect(writes).toEqual([
+      {
+        filePath: "lib/car/car.constant.ts",
+        content: 'export const car = "car";',
+      },
+      {
+        filePath: "lib/car/Car.Unit.tsx",
+        content: "export const CarUnit = () => null;",
+      },
+    ]);
+  });
+
+  test("keeps previous code response when validation responds with prose only", () => {
+    const previousContent = `
+\`\`\`typescript
+// File: lib/car/car.constant.ts
+export const car = "car";
+\`\`\`
+`;
+    const nextContent =
+      "The generated file meets all specified requirements. No rewrite is necessary.";
+
+    expect(
+      preserveTypescriptResponseContent(previousContent, nextContent),
+    ).toBe(previousContent);
+  });
+
+  test("uses next code response when validation rewrites with parseable files", () => {
+    const previousContent = `
+\`\`\`typescript
+// File: lib/car/car.constant.ts
+export const car = "car";
+\`\`\`
+`;
+    const nextContent = `
+\`\`\`typescript
+// File: lib/car/car.constant.ts
+export const car = "updated";
+\`\`\`
+`;
+
+    expect(
+      preserveTypescriptResponseContent(previousContent, nextContent),
+    ).toBe(nextContent);
+  });
+});

package/aiEditor.ts

@@ -31,8 +31,41 @@ interface EditOptions {
   maxTry?: number;
   validate?: string[];
   approve?: boolean;
+  fallbackToPreviousTypescript?: boolean;
 }
 
+export const parseTypescriptFileBlocks = (text: string): FileContent[] => {
+  const fileBlocks: FileContent[] = [];
+  const codeBlockRegex = /```(?:typescript|ts|tsx)\s*\n([\s\S]*?)```/gi;
+  const filePathRegex = /^\s*\/\/\s*File:\s*(.+?)\s*$/im;
+
+  for (const codeBlock of text.matchAll(codeBlockRegex)) {
+    const content = codeBlock[1]?.trim();
+    if (!content) continue;
+
+    const filePath = filePathRegex.exec(content)?.[1]?.trim();
+    if (!filePath) continue;
+
+    fileBlocks.push({
+      filePath,
+      content: content.replace(filePathRegex, "").trim(),
+    });
+  }
+
+  return fileBlocks;
+};
+
+export const preserveTypescriptResponseContent = (
+  previousContent: string,
+  nextContent: string,
+) => {
+  const previousWrites = parseTypescriptFileBlocks(previousContent);
+  const nextWrites = parseTypescriptFileBlocks(nextContent);
+  if (previousWrites.length > 0 && nextWrites.length === 0)
+    return previousContent;
+  return nextContent;
+};
+
 export class AiSession {
   static #cacheDir = "node_modules/.cache/akan/aiSession";
   static #chat: ChatDeepSeek | ChatOpenAI | null = null;
@@ -189,8 +222,7 @@ export class AiSession {
       this.messageHistory.push(humanMessage);
       const stream = await AiSession.#chat.stream(this.messageHistory);
       let reasoningResponse = "",
-        fullResponse = "",
-        tokenIdx = 0;
+        fullResponse = "";
       for await (const chunk of stream) {
         if (loader.isSpinning())
           loader.succeed(`${AiSession.#chat.model} responded`);
@@ -214,13 +246,12 @@ export class AiSession {
           fullResponse += content;
           onChunk(content); // Send individual chunks to callback
         }
-        tokenIdx++;
       }
       fullResponse += "\n";
       onChunk("\n");
       this.messageHistory.push(new AIMessage(fullResponse));
       return { content: fullResponse, messageHistory: this.messageHistory };
-    } catch (error) {
+    } catch {
       loader.fail(`${AiSession.#chat.model} failed to respond`);
       throw new Error("Failed to stream response");
     }
@@ -233,6 +264,7 @@ export class AiSession {
       maxTry = MAX_ASK_TRY,
       validate,
       approve,
+      fallbackToPreviousTypescript,
     }: EditOptions = {},
   ) {
     for (let tryCount = 0; tryCount < maxTry; tryCount++) {
@@ -240,7 +272,19 @@ export class AiSession {
       if (validate?.length && tryCount === 0) {
         const validateQuestion = `Double check if the response meets the requirements and conditions, and follow the instructions. If not, rewrite it.
 ${validate.map((v) => `- ${v}`).join("\n")}`;
-        response = await this.ask(validateQuestion, { onChunk, onReasoning });
+        const validateResponse = await this.ask(validateQuestion, {
+          onChunk,
+          onReasoning,
+        });
+        response = {
+          ...validateResponse,
+          content: fallbackToPreviousTypescript
+            ? preserveTypescriptResponseContent(
+                response.content,
+                validateResponse.content,
+              )
+            : validateResponse.content,
+        };
       }
       const isConfirmed = approve
         ? true
@@ -287,15 +331,35 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
     executor: Executor,
     options: EditOptions = {},
   ) {
-    const content = await this.edit(question, options);
+    const content = await this.edit(question, {
+      ...options,
+      fallbackToPreviousTypescript: true,
+    });
     const writes = this.#getTypescriptCodes(content);
+    if (!writes.length)
+      throw new Error(
+        "No parseable TypeScript file blocks were found in the AI response. Include `// File: <path>` in each code block.",
+      );
     for (const write of writes)
       await executor.writeFile(write.filePath, write.content);
     return await this.#tryFixTypescripts(writes, executor, options);
   }
-  async #editTypescripts(question: string, options: EditOptions = {}) {
-    const content = await this.edit(question, options);
-    return this.#getTypescriptCodes(content);
+  async #editTypescripts(
+    question: string,
+    options: EditOptions = {},
+    fallbackWrites?: FileContent[],
+  ) {
+    const content = await this.edit(question, {
+      ...options,
+      fallbackToPreviousTypescript: true,
+    });
+    const writes = this.#getTypescriptCodes(content);
+    if (!writes.length && fallbackWrites?.length) return fallbackWrites;
+    if (!writes.length)
+      throw new Error(
+        "No parseable TypeScript file blocks were found in the AI response. Include `// File: <path>` in each code block.",
+      );
+    return writes;
   }
   async #tryFixTypescripts(
     writes: FileContent[],
@@ -309,15 +373,16 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
       }).start();
       const fileChecks = await Promise.all(
         writes.map(async ({ filePath }) => {
-          const typeCheckResult = executor.typeCheck(filePath);
-          const lintResult = await executor.lint(filePath);
-          const needFix =
-            !!typeCheckResult.fileErrors.length || !!lintResult.errors.length;
+          const lintResult = await executor.lint(filePath, { fix: true });
+          const typeCheckResult = await executor.typeCheckAsync(filePath);
+          const hasTypeErrors = typeCheckResult.fileErrors.length > 0;
+          const hasLintErrors = lintResult.errors.length > 0;
+          const needFix = hasTypeErrors || hasLintErrors;
           return { filePath, typeCheckResult, lintResult, needFix };
         }),
       );
-      const needFix = fileChecks.some((fileCheck) => fileCheck.needFix);
-      if (needFix) {
+      const hasAnyFix = fileChecks.some((fileCheck) => fileCheck.needFix);
+      if (hasAnyFix) {
         loader.fail(
           "Type checking and linting has some errors, try to fix them",
         );
@@ -337,6 +402,7 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
             validate: undefined,
             approve: true,
           },
+          writes,
         );
         for (const write of writes)
           await executor.writeFile(write.filePath, write.content);
@@ -348,19 +414,7 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
     throw new Error("Failed to create scalar");
   }
   #getTypescriptCodes(text: string): FileContent[] {
-    const codes = text.match(/```(typescript|tsx)([\s\S]*?)```/g);
-    if (!codes) return [];
-    const result = codes.map((code) => {
-      const content = /```(typescript|tsx)([\s\S]*?)```/.exec(code)?.[2];
-      if (!content) return null;
-      const filePath = /\/\/ File: (.*?)(?:\n|$)/.exec(content)?.[1]?.trim();
-      if (!filePath) return null;
-      const contentWithoutFilepath = content
-        .replace(`// File: ${filePath}\n`, "")
-        .trim();
-      return { filePath, content: contentWithoutFilepath };
-    });
-    return result.filter((code) => code !== null) as FileContent[];
+    return parseTypescriptFileBlocks(text);
   }
   async editMarkdown(request: string, options: EditOptions = {}) {
     const content = await this.edit(request, options);

package/akanConfig/akanConfig.test.ts

@@ -7,7 +7,13 @@ import { AkanAppConfig, AkanLibConfig } from "./akanConfig";
 import type { DeepPartial, LibConfigResult } from "./types";
 
 const akanPackageJson = JSON.parse(
-  fs.readFileSync(path.join(path.dirname(fileURLToPath(import.meta.url)), "../../../akanjs/package.json"), "utf8"),
+  fs.readFileSync(
+    path.join(
+      path.dirname(fileURLToPath(import.meta.url)),
+      "../../../akanjs/package.json",
+    ),
+    "utf8",
+  ),
 ) as PackageJson;
 
 const packageJson: PackageJson = {
@@ -34,7 +40,13 @@ const baseDevEnv = {
 
 describe("AkanAppConfig", () => {
   test("applies defaults for route domains, i18n, image, mobile, and imports", () => {
-    const config = new AkanAppConfig(app, ["shared"], packageJson, {}, baseDevEnv);
+    const config = new AkanAppConfig(
+      app,
+      ["shared"],
+      packageJson,
+      {},
+      baseDevEnv,
+    );
 
     expect([...config.domains].sort()).toEqual([
       "portal-debug.akanjs.com",
@@ -61,7 +73,11 @@ describe("AkanAppConfig", () => {
       },
     });
     expect(config.barrelImports).toEqual(
-      expect.arrayContaining(["@apps/portal/ui", "@libs/shared/server", "akanjs/common"]),
+      expect.arrayContaining([
+        "@apps/portal/ui",
+        "@libs/shared/server",
+        "akanjs/common",
+      ]),
     );
     expect(config.docker.content).toContain("ENV AKAN_PUBLIC_APP_NAME=portal");
     expect(process.env.AKAN_PUBLIC_DEFAULT_LOCALE).toBe("en");
@@ -75,10 +91,21 @@ describe("AkanAppConfig", () => {
       {
         routes: [
           { domains: { debug: ["Root.Local:8282"], qa: ["QA.Root.Local"] } },
-          { basePath: "/admin/", domains: { debug: ["Admin.Local:8282"], main: ["Admin.Main.Local"] } },
+          {
+            basePath: "/admin/",
+            domains: {
+              debug: ["Admin.Local:8282"],
+              main: ["Admin.Main.Local"],
+            },
+          },
         ],
         i18n: { locales: ["ko", "en"], defaultLocale: "ko" },
-        mobile: { appName: "Portal App", appId: "com.portal.mobile", version: "1.2.3", buildNum: 7 },
+        mobile: {
+          appName: "Portal App",
+          appId: "com.portal.mobile",
+          version: "1.2.3",
+          buildNum: 7,
+        },
         images: { qualities: [80, 90], dangerouslyAllowSVG: true },
         docker: {
           image: { amd64: "oven/bun:amd64", arm64: "oven/bun:arm64" },
@@ -102,7 +129,12 @@ describe("AkanAppConfig", () => {
       "admin.local",
       "admin.main.local",
     ]);
-    expect([...config.branches].sort()).toEqual(["debug", "develop", "main", "qa"]);
+    expect([...config.branches].sort()).toEqual([
+      "debug",
+      "develop",
+      "main",
+      "qa",
+    ]);
     expect(config.i18n.defaultLocale).toBe("ko");
     expect(config.images.qualities).toEqual([80, 90]);
     expect(config.images.dangerouslyAllowSVG).toBe(true);
@@ -122,9 +154,17 @@ describe("AkanAppConfig", () => {
   });
 
   test("creates production package json and reports missing external versions", () => {
-    const config = new AkanAppConfig(app, [], packageJson, { externalLibs: ["@external/runtime"] }, baseDevEnv);
+    const config = new AkanAppConfig(
+      app,
+      [],
+      packageJson,
+      { externalLibs: ["@external/runtime"] },
+      baseDevEnv,
+    );
 
-    expect(config.getProductionPackageJson({ scripts: { start: "bun main.js" } })).toMatchObject({
+    expect(
+      config.getProductionPackageJson({ scripts: { start: "bun main.js" } }),
+    ).toMatchObject({
       name: "portal",
       main: "./main.js",
       scripts: { start: "bun main.js" },
@@ -145,11 +185,16 @@ describe("AkanAppConfig", () => {
       { externalLibs: ["missing-lib"] },
       baseDevEnv,
     );
-    expect(() => brokenConfig.getProductionPackageJson()).toThrow("Dependency missing-lib not found");
+    expect(() => brokenConfig.getProductionPackageJson()).toThrow(
+      "Dependency missing-lib not found",
+    );
   });
 
   test("falls back to akanjs package versions for built-in runtime dependencies", () => {
-    const runtimeDependencies = { ...akanPackageJson.dependencies, ...akanPackageJson.peerDependencies };
+    const runtimeDependencies = {
+      ...akanPackageJson.dependencies,
+      ...akanPackageJson.peerDependencies,
+    };
     const config = new AkanAppConfig(
       app,
       [],
@@ -168,44 +213,130 @@ describe("AkanAppConfig", () => {
     expect(config.getProductionPackageJson().dependencies).toEqual({
       react: runtimeDependencies.react,
       "react-dom": runtimeDependencies["react-dom"],
-      "react-server-dom-webpack": runtimeDependencies["react-server-dom-webpack"],
+      "react-server-dom-webpack":
+        runtimeDependencies["react-server-dom-webpack"],
       croner: runtimeDependencies.croner,
       sharp: runtimeDependencies.sharp,
     });
   });
 
   test("adds backend runtime packages by database mode", () => {
-    const runtimeDependencies = { ...akanPackageJson.dependencies, ...akanPackageJson.peerDependencies };
-    const singleConfig = new AkanAppConfig(app, [], packageJson, { defaultDatabaseMode: "single" }, baseDevEnv);
-    const multipleConfig = new AkanAppConfig(app, [], packageJson, { defaultDatabaseMode: "multiple" }, baseDevEnv);
-    const clusterConfig = new AkanAppConfig(app, [], packageJson, { defaultDatabaseMode: "cluster" }, baseDevEnv);
+    const runtimeDependencies = {
+      ...akanPackageJson.dependencies,
+      ...akanPackageJson.peerDependencies,
+    };
+    const singleConfig = new AkanAppConfig(
+      app,
+      [],
+      packageJson,
+      { defaultDatabaseMode: "single" },
+      baseDevEnv,
+    );
+    const multipleConfig = new AkanAppConfig(
+      app,
+      [],
+      packageJson,
+      { defaultDatabaseMode: "multiple" },
+      baseDevEnv,
+    );
+    const clusterConfig = new AkanAppConfig(
+      app,
+      [],
+      packageJson,
+      { defaultDatabaseMode: "cluster" },
+      baseDevEnv,
+    );
 
     expect(singleConfig.getProductionPackageJson().dependencies).toMatchObject({
       croner: runtimeDependencies.croner,
     });
-    expect(singleConfig.getProductionPackageJson().dependencies).not.toHaveProperty("ioredis");
-    expect(singleConfig.getProductionPackageJson().dependencies).not.toHaveProperty("bullmq");
-    expect(singleConfig.getProductionPackageJson().dependencies).not.toHaveProperty("@libsql/client");
-    expect(singleConfig.getProductionPackageJson().dependencies).not.toHaveProperty("postgres");
-    expect(singleConfig.getProductionPackageJson().dependencies).not.toHaveProperty("protobufjs");
+    expect(
+      singleConfig.getProductionPackageJson().dependencies,
+    ).not.toHaveProperty("ioredis");
+    expect(
+      singleConfig.getProductionPackageJson().dependencies,
+    ).not.toHaveProperty("bullmq");
+    expect(
+      singleConfig.getProductionPackageJson().dependencies,
+    ).not.toHaveProperty("@libsql/client");
+    expect(
+      singleConfig.getProductionPackageJson().dependencies,
+    ).not.toHaveProperty("postgres");
+    expect(
+      singleConfig.getProductionPackageJson().dependencies,
+    ).not.toHaveProperty("protobufjs");
 
-    expect(multipleConfig.getProductionPackageJson().dependencies).toMatchObject({
+    expect(
+      multipleConfig.getProductionPackageJson().dependencies,
+    ).toMatchObject({
       "@libsql/client": runtimeDependencies["@libsql/client"],
       bullmq: runtimeDependencies.bullmq,
       croner: runtimeDependencies.croner,
       ioredis: runtimeDependencies.ioredis,
       protobufjs: runtimeDependencies.protobufjs,
     });
-    expect(multipleConfig.getProductionPackageJson().dependencies).not.toHaveProperty("postgres");
+    expect(
+      multipleConfig.getProductionPackageJson().dependencies,
+    ).not.toHaveProperty("postgres");
 
-    expect(clusterConfig.getProductionPackageJson().dependencies).toMatchObject({
-      bullmq: runtimeDependencies.bullmq,
-      croner: runtimeDependencies.croner,
-      ioredis: runtimeDependencies.ioredis,
-      postgres: runtimeDependencies.postgres,
-      protobufjs: runtimeDependencies.protobufjs,
-    });
-    expect(clusterConfig.getProductionPackageJson().dependencies).not.toHaveProperty("@libsql/client");
+    expect(clusterConfig.getProductionPackageJson().dependencies).toMatchObject(
+      {
+        bullmq: runtimeDependencies.bullmq,
+        croner: runtimeDependencies.croner,
+        ioredis: runtimeDependencies.ioredis,
+        postgres: runtimeDependencies.postgres,
+        protobufjs: runtimeDependencies.protobufjs,
+      },
+    );
+    expect(
+      clusterConfig.getProductionPackageJson().dependencies,
+    ).not.toHaveProperty("@libsql/client");
+  });
+
+  test("resolves database mode runtime packages and missing install specs", () => {
+    const runtimeDependencies = {
+      ...akanPackageJson.dependencies,
+      ...akanPackageJson.peerDependencies,
+    };
+    const config = new AkanAppConfig(
+      app,
+      [],
+      {
+        name: "repo",
+        version: "1.0.0",
+        description: "repo",
+        dependencies: {
+          bullmq: "5.0.0",
+        },
+        devDependencies: {
+          ioredis: "5.0.0",
+        },
+      },
+      {},
+      baseDevEnv,
+    );
+
+    expect(config.getDatabaseModeRuntimePackages("single")).toEqual([]);
+    expect(config.getDatabaseModeRuntimePackages("multiple")).toEqual([
+      "@libsql/client",
+      "bullmq",
+      "ioredis",
+      "protobufjs",
+    ]);
+    expect(config.getDatabaseModeRuntimePackages("cluster")).toEqual([
+      "bullmq",
+      "ioredis",
+      "postgres",
+      "protobufjs",
+    ]);
+    expect(config.getMissingDatabaseModeDependencySpecs("multiple")).toEqual([
+      `@libsql/client@${runtimeDependencies["@libsql/client"]}`,
+      `protobufjs@${runtimeDependencies.protobufjs}`,
+    ]);
+    expect(config.getMissingDatabaseModeDependencySpecs("cluster")).toEqual([
+      `postgres@${runtimeDependencies.postgres}`,
+      `protobufjs@${runtimeDependencies.protobufjs}`,
+    ]);
   });
 
   test("normalizes multiple mobile targets and validates base paths", () => {
@@ -266,7 +397,11 @@ describe("AkanLibConfig", () => {
     const lib = { name: "shared" } as never;
     expect(new AkanLibConfig(lib, {}).externalLibs).toEqual([]);
 
-    const config: DeepPartial<LibConfigResult> = { externalLibs: ["firebase-admin"] };
-    expect(new AkanLibConfig(lib, config).externalLibs).toEqual(["firebase-admin"]);
+    const config: DeepPartial<LibConfigResult> = {
+      externalLibs: ["firebase-admin"],
+    };
+    expect(new AkanLibConfig(lib, config).externalLibs).toEqual([
+      "firebase-admin",
+    ]);
   });
 });