@akanjs/cli 2.1.0-rc.5 → 2.1.0-rc.7

package/incrementalBuilder.proc.js

@@ -3,7 +3,6 @@ var __require = import.meta.require;
 
 // pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts
 import path36 from "path";
-import { Logger as Logger12 } from "akanjs/common";
 
 // pkgs/@akanjs/devkit/aiEditor.ts
 import { input, select } from "@inquirer/prompts";
@@ -5950,12 +5949,7 @@ class CssImportResolver {
     }
   }
   #resolutionBases(fromBase) {
-    return [
-      fromBase,
-      this.#workspaceRoot,
-      path22.dirname(Bun.main),
-      path22.resolve(path22.dirname(Bun.main), "../..")
-    ];
+    return [fromBase, this.#workspaceRoot, path22.dirname(Bun.main), path22.resolve(path22.dirname(Bun.main), "../..")];
   }
   #packageJsonCandidates(pkgName) {
     return [
@@ -7087,20 +7081,15 @@ class SsrBaseArtifactBuilder {
     return { rscClientUrl, vendorMap };
   }
   async#resolveAkanServerPath() {
-    const candidates = [
-      path30.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"),
-      path30.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"),
-      path30.join(path30.dirname(Bun.main), "node_modules/akanjs/server"),
-      path30.join(path30.dirname(Bun.main), "../../akanjs/server"),
-      path30.resolve(import.meta.dir, "../../server"),
-      path30.resolve(import.meta.dir, "../server")
-    ];
+    const candidates = [];
     try {
-      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
+      candidates.push(path30.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
     } catch {}
+    candidates.push(path30.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"), path30.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"));
     try {
-      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", path30.dirname(Bun.main))));
+      candidates.push(path30.dirname(Bun.resolveSync("akanjs/server", path30.dirname(Bun.main))));
     } catch {}
+    candidates.push(path30.join(path30.dirname(Bun.main), "node_modules/akanjs/server"), path30.join(path30.dirname(Bun.main), "../../akanjs/server"), path30.resolve(import.meta.dir, "../../server"), path30.resolve(import.meta.dir, "../server"));
     for (const candidate of candidates) {
       if (await Bun.file(path30.join(candidate, "rscClient.tsx")).exists())
         return candidate;
@@ -7182,22 +7171,6 @@ var SSR_RENDER_EXTERNALS = [
   "react-server-dom-webpack/client.node",
   "react-server-dom-webpack/client.browser"
 ];
-var TYPECHECK_WORKER_CODE = `
-import { TypeChecker } from "@akanjs/devkit";
-
-try {
-  const configPath = process.env.AKAN_TYPECHECK_TSCONFIG;
-  if (!configPath) throw new Error("AKAN_TYPECHECK_TSCONFIG is required");
-  const result = TypeChecker.checkProject(configPath);
-  if (result.errors.length > 0) {
-    console.error(result.message);
-    process.exit(1);
-  }
-} catch (error) {
-  console.error(error instanceof Error ? error.message : String(error));
-  process.exit(1);
-}
-`;
 
 class ApplicationBuildRunner {
   #app;
@@ -7341,7 +7314,8 @@ class ApplicationBuildRunner {
     return { typecheckDir, tsconfigPath };
   }
   async#checkProjectInChildProcess(tsconfigPath) {
-    const proc = Bun.spawn([process.execPath, "--eval", TYPECHECK_WORKER_CODE], {
+    const entry = await this.#resolveTypecheckWorkerEntry();
+    const proc = Bun.spawn([process.execPath, entry], {
       cwd: this.#app.workspace.workspaceRoot,
       env: this.#app.getCommandEnv({
         AKAN_COMMAND_TYPE: "typecheck",
@@ -7358,6 +7332,18 @@ class ApplicationBuildRunner {
     if (exitCode !== 0)
       throw new Error((stderr || stdout).trim() || `Typecheck failed with exit code ${exitCode}`);
   }
+  async#resolveTypecheckWorkerEntry() {
+    const candidates = [
+      path32.join(this.#app.workspace.workspaceRoot, "pkgs/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path32.join(this.#app.workspace.workspaceRoot, "node_modules/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path32.join(import.meta.dir, "typecheck.proc.js"),
+      path32.join(import.meta.dir, "typecheck.proc.ts")
+    ];
+    for (const candidate of candidates)
+      if (await Bun.file(candidate).exists())
+        return candidate;
+    throw new Error(`[cli] typecheck worker entry not found; looked in: ${candidates.join(", ")}`);
+  }
   async#buildOrThrow(label, config) {
     const result = await Bun.build(config);
     if (!result.success)
@@ -8126,7 +8112,7 @@ class CapacitorApp {
     await mkdir10(this.targetRoot, { recursive: true });
     const appInfoPath = path34.relative(this.app.cwdPath, path34.join(this.app.cwdPath, "akan.app.json")).split(path34.sep).join("/");
     const content = `import type { AppScanResult } from "akanjs";
-import { withBase } from "@akanjs/devkit/capacitor.base.config";
+import { withBase } from "akanjs/capacitor.base.config";
 import appInfo from "${appInfoPath.startsWith(".") ? appInfoPath : `./${appInfoPath}`}";
 
 export default withBase(
@@ -9369,6 +9355,8 @@ import { useEffect as useEffect3, useState as useState3 } from "react";
 import { jsxDEV as jsxDEV2, Fragment as Fragment2 } from "react/jsx-dev-runtime";
 "use client";
 // pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts
+import { Logger as Logger12 } from "akanjs/common";
+
 class IncrementalBuilder {
   #logger = new Logger12("IncrementalBuilder");
   #app;

package/index.js

@@ -5947,12 +5947,7 @@ class CssImportResolver {
     }
   }
   #resolutionBases(fromBase) {
-    return [
-      fromBase,
-      this.#workspaceRoot,
-      path22.dirname(Bun.main),
-      path22.resolve(path22.dirname(Bun.main), "../..")
-    ];
+    return [fromBase, this.#workspaceRoot, path22.dirname(Bun.main), path22.resolve(path22.dirname(Bun.main), "../..")];
   }
   #packageJsonCandidates(pkgName) {
     return [
@@ -7084,20 +7079,15 @@ class SsrBaseArtifactBuilder {
     return { rscClientUrl, vendorMap };
   }
   async#resolveAkanServerPath() {
-    const candidates = [
-      path30.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"),
-      path30.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"),
-      path30.join(path30.dirname(Bun.main), "node_modules/akanjs/server"),
-      path30.join(path30.dirname(Bun.main), "../../akanjs/server"),
-      path30.resolve(import.meta.dir, "../../server"),
-      path30.resolve(import.meta.dir, "../server")
-    ];
+    const candidates = [];
     try {
-      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
+      candidates.push(path30.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
     } catch {}
+    candidates.push(path30.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"), path30.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"));
     try {
-      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", path30.dirname(Bun.main))));
+      candidates.push(path30.dirname(Bun.resolveSync("akanjs/server", path30.dirname(Bun.main))));
     } catch {}
+    candidates.push(path30.join(path30.dirname(Bun.main), "node_modules/akanjs/server"), path30.join(path30.dirname(Bun.main), "../../akanjs/server"), path30.resolve(import.meta.dir, "../../server"), path30.resolve(import.meta.dir, "../server"));
     for (const candidate of candidates) {
       if (await Bun.file(path30.join(candidate, "rscClient.tsx")).exists())
         return candidate;
@@ -7179,22 +7169,6 @@ var SSR_RENDER_EXTERNALS = [
   "react-server-dom-webpack/client.node",
   "react-server-dom-webpack/client.browser"
 ];
-var TYPECHECK_WORKER_CODE = `
-import { TypeChecker } from "@akanjs/devkit";
-
-try {
-  const configPath = process.env.AKAN_TYPECHECK_TSCONFIG;
-  if (!configPath) throw new Error("AKAN_TYPECHECK_TSCONFIG is required");
-  const result = TypeChecker.checkProject(configPath);
-  if (result.errors.length > 0) {
-    console.error(result.message);
-    process.exit(1);
-  }
-} catch (error) {
-  console.error(error instanceof Error ? error.message : String(error));
-  process.exit(1);
-}
-`;
 
 class ApplicationBuildRunner {
   #app;
@@ -7338,7 +7312,8 @@ class ApplicationBuildRunner {
     return { typecheckDir, tsconfigPath };
   }
   async#checkProjectInChildProcess(tsconfigPath) {
-    const proc = Bun.spawn([process.execPath, "--eval", TYPECHECK_WORKER_CODE], {
+    const entry = await this.#resolveTypecheckWorkerEntry();
+    const proc = Bun.spawn([process.execPath, entry], {
       cwd: this.#app.workspace.workspaceRoot,
       env: this.#app.getCommandEnv({
         AKAN_COMMAND_TYPE: "typecheck",
@@ -7355,6 +7330,18 @@ class ApplicationBuildRunner {
     if (exitCode !== 0)
       throw new Error((stderr || stdout).trim() || `Typecheck failed with exit code ${exitCode}`);
   }
+  async#resolveTypecheckWorkerEntry() {
+    const candidates = [
+      path32.join(this.#app.workspace.workspaceRoot, "pkgs/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path32.join(this.#app.workspace.workspaceRoot, "node_modules/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path32.join(import.meta.dir, "typecheck.proc.js"),
+      path32.join(import.meta.dir, "typecheck.proc.ts")
+    ];
+    for (const candidate of candidates)
+      if (await Bun.file(candidate).exists())
+        return candidate;
+    throw new Error(`[cli] typecheck worker entry not found; looked in: ${candidates.join(", ")}`);
+  }
   async#buildOrThrow(label, config) {
     const result = await Bun.build(config);
     if (!result.success)
@@ -8123,7 +8110,7 @@ class CapacitorApp {
     await mkdir10(this.targetRoot, { recursive: true });
     const appInfoPath = path34.relative(this.app.cwdPath, path34.join(this.app.cwdPath, "akan.app.json")).split(path34.sep).join("/");
     const content = `import type { AppScanResult } from "akanjs";
-import { withBase } from "@akanjs/devkit/capacitor.base.config";
+import { withBase } from "akanjs/capacitor.base.config";
 import appInfo from "${appInfoPath.startsWith(".") ? appInfoPath : `./${appInfoPath}`}";
 
 export default withBase(
@@ -10157,7 +10144,9 @@ class PackageRunner extends runner("package") {
     await pkg.dist.mkdir(pkg.dist.cwdPath);
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
-    const packageRuntimeDependencies = { "@akanjs/devkit": ["daisyui", "tailwind-scrollbar"] };
+    const packageRuntimeDependencies = {
+      "@akanjs/devkit": ["daisyui", "tailwind-scrollbar"]
+    };
     const packageRuntimeDevDependencies = { akanjs: ["@biomejs/biome", "@types/bun"] };
     if (pkg.name === "@akanjs/cli") {
       const devkitPackageJson = await pkg.workspace.readJson("pkgs/@akanjs/devkit/package.json");
@@ -10472,6 +10461,7 @@ class CloudCommand extends command("cloud", [CloudScript], ({ public: target })
 
 // pkgs/@akanjs/cli/guideline/guideline.prompt.ts
 import { randomPicks } from "akanjs/common";
+
 class GuidelinePrompt extends Prompter {
   workspace;
   name;
@@ -11573,7 +11563,7 @@ class ScalarScript extends script("scalar", [ScalarRunner]) {
 
 // pkgs/@akanjs/cli/scalar/scalar.command.ts
 class ScalarCommand extends command("scalar", [ScalarScript], ({ public: target }) => ({
-  createScalar: target({ desc: "Create a new scalar type (simple data model without DB)" }).arg("scalarName", String, { desc: "name of scalar" }).option("ai", Boolean, { default: false, desc: "use ai to create scalar" }).with(Sys).exec(async function(scalarName, ai, sys3) {
+  createScalar: target({ desc: "Create a new scalar type (simple data model without DB)" }).arg("scalarName", String, { desc: "name of scalar" }).with(Sys).option("ai", Boolean, { default: false, desc: "use ai to create scalar" }).exec(async function(scalarName, sys3, ai) {
     const name = lowerlize2(scalarName.replace(/ /g, ""));
     if (ai)
       await this.scalarScript.createScalarWithAi(sys3, name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.1.0-rc.5",
+  "version": "2.1.0-rc.7",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -34,7 +34,7 @@
     "@langchain/deepseek": "^1.0.26",
     "@langchain/openai": "^1.4.6",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.1.0-rc.5",
+    "akanjs": "2.1.0-rc.6",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",

package/templates/facetIndex/index.ts

@@ -1,5 +1,5 @@
-import type { AppInfo, LibInfo } from "akanjs";
 import type { SysExecutor } from "@akanjs/devkit";
+import type { AppInfo, LibInfo } from "akanjs";
 
 interface Dict {
   [key: string]: string;

package/typecheck.proc.js

@@ -0,0 +1,208 @@
+// @bun
+var __require = import.meta.require;
+
+// pkgs/@akanjs/devkit/typeChecker.ts
+import { readFileSync } from "fs";
+import * as path from "path";
+import chalk from "chalk";
+import * as ts from "typescript";
+
+class TypeChecker {
+  configPath;
+  configFile;
+  config;
+  constructor(executor) {
+    const configPath = this.#findConfigFile(executor.cwdPath);
+    if (!configPath)
+      throw new Error("No tsconfig.json found in the project");
+    this.configPath = configPath;
+    this.configFile = ts.readConfigFile(this.configPath, (fileName) => ts.sys.readFile(fileName));
+    const parsedConfig = ts.parseJsonConfigFileContent(this.configFile.config, ts.sys, path.dirname(this.configPath), undefined, this.configPath);
+    if (parsedConfig.errors.length > 0) {
+      const errorMessages = parsedConfig.errors.map((error) => ts.flattenDiagnosticMessageText(error.messageText, `
+`)).join(`
+`);
+      throw new Error(`Error parsing tsconfig.json:
+${errorMessages}`);
+    }
+    this.config = parsedConfig;
+  }
+  #findConfigFile(searchPath) {
+    return ts.findConfigFile(searchPath, (fileName) => ts.sys.fileExists(fileName), "tsconfig.json");
+  }
+  check(filePath) {
+    const program = ts.createProgram([filePath], this.config.options);
+    const diagnostics = [
+      ...program.getSemanticDiagnostics(),
+      ...program.getSyntacticDiagnostics(),
+      ...this.config.options.declaration ? program.getDeclarationDiagnostics() : []
+    ];
+    const errors = diagnostics.filter((diagnostic) => diagnostic.category === ts.DiagnosticCategory.Error);
+    const warnings = diagnostics.filter((diagnostic) => diagnostic.category === ts.DiagnosticCategory.Warning);
+    const fileDiagnostics = diagnostics.filter((diagnostic) => diagnostic.file?.fileName === filePath);
+    const fileErrors = fileDiagnostics.filter((diagnostic) => diagnostic.category === ts.DiagnosticCategory.Error);
+    const fileWarnings = fileDiagnostics.filter((diagnostic) => diagnostic.category === ts.DiagnosticCategory.Warning);
+    return { diagnostics, errors, warnings, fileDiagnostics, fileErrors, fileWarnings };
+  }
+  formatDiagnostics(diagnostics) {
+    if (diagnostics.length === 0)
+      return chalk.bold("\u2705 No type errors found");
+    const output = [];
+    let errorCount = 0;
+    let warningCount = 0;
+    let suggestionCount = 0;
+    const diagnosticsByFile = new Map;
+    diagnostics.forEach((diagnostic) => {
+      if (diagnostic.category === ts.DiagnosticCategory.Error)
+        errorCount++;
+      else if (diagnostic.category === ts.DiagnosticCategory.Warning)
+        warningCount++;
+      else if (diagnostic.category === ts.DiagnosticCategory.Suggestion)
+        suggestionCount++;
+      if (diagnostic.file) {
+        const fileName = diagnostic.file.fileName;
+        if (!diagnosticsByFile.has(fileName))
+          diagnosticsByFile.set(fileName, []);
+        const fileDiagnostics = diagnosticsByFile.get(fileName);
+        if (fileDiagnostics)
+          fileDiagnostics.push(diagnostic);
+      } else {
+        if (!diagnosticsByFile.has(""))
+          diagnosticsByFile.set("", []);
+        const fileDiagnostics = diagnosticsByFile.get("");
+        if (fileDiagnostics)
+          fileDiagnostics.push(diagnostic);
+      }
+    });
+    diagnosticsByFile.forEach((fileDiagnostics, fileName) => {
+      if (fileName)
+        output.push(`
+${chalk.cyan(fileName)}`);
+      fileDiagnostics.forEach((diagnostic) => {
+        const categoryText = diagnostic.category === ts.DiagnosticCategory.Error ? "error" : diagnostic.category === ts.DiagnosticCategory.Warning ? "warning" : "suggestion";
+        const categoryColor = diagnostic.category === ts.DiagnosticCategory.Error ? chalk.red : diagnostic.category === ts.DiagnosticCategory.Warning ? chalk.yellow : chalk.blue;
+        const icon = diagnostic.category === ts.DiagnosticCategory.Error ? "\u274C" : diagnostic.category === ts.DiagnosticCategory.Warning ? "\u26A0\uFE0F" : "\uD83D\uDCA1";
+        const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, `
+`);
+        const tsCode = chalk.dim(`(TS${diagnostic.code})`);
+        if (diagnostic.file && diagnostic.start !== undefined) {
+          const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+          output.push(`
+  ${icon} ${categoryColor(categoryText)}: ${message} ${tsCode}`);
+          output.push(`     ${chalk.gray("at")} ${fileName}:${chalk.bold(`${line + 1}:${character + 1}`)}`);
+          const sourceLines = diagnostic.file.text.split(`
+`);
+          if (line < sourceLines.length) {
+            const sourceLine = sourceLines[line];
+            const lineNumber = (line + 1).toString().padStart(5, " ");
+            output.push(`
+${chalk.dim(`${lineNumber} |`)} ${sourceLine}`);
+            const underlinePrefix = " ".repeat(character);
+            const length = diagnostic.length ?? 1;
+            const underline = "~".repeat(Math.max(1, length));
+            output.push(`${chalk.dim(`${" ".repeat(lineNumber.length)} |`)} ${underlinePrefix}${categoryColor(underline)}`);
+          }
+        } else
+          output.push(`
+  ${icon} ${categoryColor(categoryText)}: ${message} ${tsCode}`);
+      });
+    });
+    const summary = [];
+    if (errorCount > 0)
+      summary.push(chalk.red(`${errorCount} error(s)`));
+    if (warningCount > 0)
+      summary.push(chalk.yellow(`${warningCount} warning(s)`));
+    if (suggestionCount > 0)
+      summary.push(chalk.blue(`${suggestionCount} suggestion(s)`));
+    return `
+${summary.join(", ")} found${output.join(`
+`)}`;
+  }
+  getDetailedDiagnostics(filePath) {
+    const { diagnostics } = this.check(filePath);
+    const sourceFile = ts.createSourceFile(filePath, readFileSync(filePath, "utf8"), ts.ScriptTarget.Latest, true);
+    const details = diagnostics.map((diagnostic) => {
+      if (diagnostic.file && diagnostic.start !== undefined) {
+        const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+        const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, `
+`);
+        const lines = sourceFile.text.split(`
+`);
+        const codeSnippet = line < lines.length ? lines[line] : undefined;
+        return { line: line + 1, column: character + 1, message, code: diagnostic.code, codeSnippet };
+      }
+      return {
+        line: 0,
+        column: 0,
+        message: ts.flattenDiagnosticMessageText(diagnostic.messageText, `
+`),
+        code: diagnostic.code
+      };
+    });
+    return { diagnostics, details };
+  }
+  hasNoTypeErrors(filePath) {
+    try {
+      const { diagnostics } = this.check(filePath);
+      return diagnostics.length === 0;
+    } catch (error) {
+      return false;
+    }
+  }
+  static checkProject(configPath) {
+    const parsedConfig = TypeChecker.parseConfig(configPath);
+    const host = ts.createIncrementalCompilerHost(parsedConfig.options);
+    const builderProgram = ts.createIncrementalProgram({
+      rootNames: parsedConfig.fileNames,
+      options: parsedConfig.options,
+      projectReferences: parsedConfig.projectReferences,
+      configFileParsingDiagnostics: parsedConfig.errors,
+      host
+    });
+    const program = builderProgram.getProgram();
+    const diagnostics = [...ts.getPreEmitDiagnostics(program), ...builderProgram.emit().diagnostics];
+    const errors = diagnostics.filter((diagnostic) => diagnostic.category === ts.DiagnosticCategory.Error);
+    const warnings = diagnostics.filter((diagnostic) => diagnostic.category === ts.DiagnosticCategory.Warning);
+    return {
+      configPath,
+      diagnostics,
+      errors,
+      warnings,
+      message: TypeChecker.formatDiagnosticMessages(diagnostics)
+    };
+  }
+  static parseConfig(configPath) {
+    const configFile = ts.readConfigFile(configPath, (fileName) => ts.sys.readFile(fileName));
+    const configDiagnostics = configFile.error ? [configFile.error] : [];
+    if (!configFile.config) {
+      const message = TypeChecker.formatDiagnosticMessages(configDiagnostics);
+      throw new Error(message || `Error reading tsconfig.json: ${configPath}`);
+    }
+    const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath), undefined, configPath);
+    if (parsedConfig.errors.length > 0)
+      throw new Error(TypeChecker.formatDiagnosticMessages(parsedConfig.errors));
+    return parsedConfig;
+  }
+  static formatDiagnosticMessages(diagnostics) {
+    return ts.formatDiagnosticsWithColorAndContext(diagnostics, {
+      getCanonicalFileName: (fileName) => fileName,
+      getCurrentDirectory: () => process.cwd(),
+      getNewLine: () => ts.sys.newLine
+    });
+  }
+}
+
+// pkgs/@akanjs/devkit/typecheck/typecheck.proc.ts
+try {
+  const configPath = process.env.AKAN_TYPECHECK_TSCONFIG;
+  if (!configPath)
+    throw new Error("AKAN_TYPECHECK_TSCONFIG is required");
+  const result = TypeChecker.checkProject(configPath);
+  if (result.errors.length > 0) {
+    console.error(result.message);
+    process.exit(1);
+  }
+} catch (error) {
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exit(1);
+}