@akanjs/cli 3.0.0-alpha.9 → 3.0.0-alpha.90

package/index-3d9y066c.js

@@ -0,0 +1,76 @@
+// @bun
+// pkgs/@akanjs/devkit/libSource.ts
+class LibSource {
+  static manifestKey = "akan";
+  static unhashedDirs = ["env"];
+  #lib;
+  constructor(lib) {
+    this.#lib = lib;
+  }
+  get #prefix() {
+    return `libs/${this.#lib.name}/`;
+  }
+  #isHashed(file) {
+    const relative = file.slice(this.#prefix.length);
+    return !LibSource.unhashedDirs.includes(relative.split("/")[0] ?? "");
+  }
+  async#hashableContent(file) {
+    const content = await this.#lib.workspace.readFile(file);
+    if (file !== `${this.#prefix}package.json`)
+      return content;
+    const manifest = JSON.parse(content);
+    delete manifest[LibSource.manifestKey];
+    return JSON.stringify(manifest);
+  }
+  async computeHash() {
+    const files = (await this.#lib.workspace.listGitFiles([`libs/${this.#lib.name}`], { untracked: true })).filter((file) => this.#isHashed(file));
+    const hasher = new Bun.CryptoHasher("sha256");
+    for (const file of files) {
+      hasher.update(file);
+      hasher.update("\x00");
+      hasher.update(await this.#hashableContent(file));
+      hasher.update("\x00");
+    }
+    return hasher.digest("hex").slice(0, 32);
+  }
+  async read() {
+    const manifest = await this.#lib.getPackageJson();
+    const akan = manifest[LibSource.manifestKey];
+    return akan?.source ?? null;
+  }
+  async write({ origin, sha }) {
+    const [manifest, hash] = await Promise.all([this.#lib.getPackageJson(), this.computeHash()]);
+    const akan = manifest[LibSource.manifestKey] ?? {};
+    const stamp = { origin, sha, hash, syncedAt: new Date().toISOString() };
+    await this.#lib.setPackageJson({ ...manifest, [LibSource.manifestKey]: { ...akan, source: stamp } });
+    return stamp;
+  }
+  async syncStamp({ origin, sha }) {
+    const [current, hash] = await Promise.all([this.read(), this.computeHash()]);
+    if (current?.origin === origin && current.sha === sha && current.hash === hash)
+      return { stamp: current, changed: false };
+    return { stamp: await this.write({ origin, sha }), changed: true };
+  }
+  async status() {
+    const [stamp, hash] = await Promise.all([this.read(), this.computeHash()]);
+    const drift = !stamp ? "unstamped" : stamp.hash === hash ? "clean" : "drifted";
+    return { lib: this.#lib.name, drift, stamp, hash };
+  }
+}
+function formatLibStatuses(statuses) {
+  const marks = { clean: "clean    ", drifted: "DRIFTED  ", unstamped: "unstamped" };
+  const sections = [
+    "Akan Library Source Status",
+    "",
+    ...statuses.map((status) => {
+      const origin = status.stamp ? `${status.stamp.origin}@${status.stamp.sha}` : "no akan.source in package.json";
+      return `  ${marks[status.drift]} libs/${status.lib}  ${origin}`;
+    }),
+    "",
+    `drifted: ${statuses.filter((status) => status.drift === "drifted").length} / ${statuses.length}`
+  ];
+  return sections.join(`
+`);
+}
+
+export { LibSource, formatLibStatuses };

package/{index-3vta1tqa.js → index-3vvbv974.js}

@@ -1,48 +1,48 @@
 // @bun
 import {
-  ModuleScript
-} from "./index-jhpa13zj.js";
+  script
+} from "./index-cezy7yb3.js";
+import {
+  AppExecutor,
+  LibExecutor,
+  ModuleExecutor
+} from "./index-q8sn827n.js";
 import {
-  addFieldUiPolicyForType,
-  coerceFieldDefault,
   compactDiagnostics,
   createPrimitiveWriteReport,
+  sourceFile,
+  moduleComponentName,
+  moduleSourcePaths,
+  generatedFilesForSync,
+  validationCommandsForTarget,
+  nextActionsForTarget,
+  lowerlize,
+  normalizeFieldType,
   ensureBaseTypeImport,
-  ensureConstantTypeImport,
-  ensureEnumImport,
+  coerceFieldDefault,
   fieldExpression,
-  generatedFilesForSync,
-  hasClassMethod,
+  viaBuilderParameterName,
+  insertIntoObject,
+  insertLightProjectionField,
+  insertTemplateField,
+  ensureEnumImport,
+  insertEnumClass,
+  insertDictionaryModelField,
   hasConstantInputField,
   hasDictionaryModelField,
-  hasSignalFactoryEntry,
+  ensureConstantTypeImport,
+  insertDictionaryEnum,
+  parseValues,
   hasSourceParseErrors,
+  hasClassMethod,
   insertClassMethod,
-  insertDictionaryEnum,
-  insertDictionaryModelField,
-  insertEnumClass,
-  insertIntoObject,
-  insertLightProjectionField,
+  hasSignalFactoryEntry,
   insertSignalFactoryEntry,
-  insertTemplateField,
-  lowerlize,
-  moduleComponentName,
-  moduleSourcePaths,
-  nextActionsForTarget,
-  normalizeFieldType,
-  parseValues,
-  sourceFile,
-  validationCommandsForTarget,
-  viaBuilderParameterName
-} from "./index-rxkpk7n4.js";
+  addFieldUiPolicyForType
+} from "./index-e82dyeqy.js";
 import {
-  script
-} from "./index-kdh76j26.js";
-import {
-  AppExecutor,
-  LibExecutor,
-  ModuleExecutor
-} from "./index-z8ptfkzv.js";
+  ModuleScript
+} from "./index-9bwhxrqf.js";
 
 // pkgs/@akanjs/cli/primitive/primitive.script.ts
 import { capitalize } from "akanjs/common";

package/{index-76rn3g2c.js → index-47pj3aee.js}

@@ -37,10 +37,10 @@ var resolveMobileTargets = async (app, selection) => {
   if (!selection && targets.length === 1)
     return targets;
   if (!selection) {
-    const choices2 = await getMobileTargetChoices(app);
-    if (choices2.length === 1)
-      return resolveMobileTargets(app, choices2[0]);
-    throw new Error(`Multiple mobile targets found for ${app.name}. Pass --target <${choices2.join("|")}|all>.`);
+    const choices = await getMobileTargetChoices(app);
+    if (choices.length === 1)
+      return resolveMobileTargets(app, choices[0]);
+    throw new Error(`Multiple mobile targets found for ${app.name}. Pass --target <${choices.join("|")}|all>.`);
   }
   if (selection === "all") {
     if (Object.keys(config.mobile.targets).length > 1)

package/{index-y4vkyhvv.js → index-5xdqxbn9.js}

@@ -1,22 +1,22 @@
 // @bun
 import {
-  pluralizeName
-} from "./index-ss469dec.js";
-import {
-  AiSession
-} from "./index-0cj2zxbm.js";
+  runner,
+  script
+} from "./index-cezy7yb3.js";
 import {
-  createPassedPrimitiveReport,
   generatedFilesForSync,
+  createPassedPrimitiveReport,
   scalarChangedFiles
-} from "./index-rxkpk7n4.js";
+} from "./index-e82dyeqy.js";
+import {
+  AiSession
+} from "./index-n85fer99.js";
 import {
   Prompter
-} from "./index-j37qq1f2.js";
+} from "./index-h7yw2z9n.js";
 import {
-  runner,
-  script
-} from "./index-kdh76j26.js";
+  pluralizeName
+} from "./index-nz8prx9g.js";
 
 // pkgs/@akanjs/cli/scalar/scalar.prompt.ts
 import { input } from "@inquirer/prompts";
@@ -192,9 +192,9 @@ class ScalarRunner extends runner("scalar") {
     const { request, validate } = await prompt.requestUpdateDictonaryWithInstruction();
     await session.writeTypescripts(request, sys, { validate });
     for (const scalarName of followingScalarNames) {
-      const prompt2 = new ScalarPrompt(sys, scalarName);
-      const { request: request2, validate: validate2 } = await prompt2.requestUpdateDictonaryWithFollowing();
-      await session.writeTypescripts(request2, sys, { validate: validate2 });
+      const prompt = new ScalarPrompt(sys, scalarName);
+      const { request, validate } = await prompt.requestUpdateDictonaryWithFollowing();
+      await session.writeTypescripts(request, sys, { validate });
     }
   }
 }

package/{index-1577bej2.js → index-6wwzs1bc.js}

@@ -2,6 +2,6 @@
 // pkgs/@akanjs/devkit/getDirname.ts
 import path from "path";
 import { fileURLToPath } from "url";
-var getDirname = (url) => path.dirname(fileURLToPath(url));
+var getDirname2 = (url) => path.dirname(fileURLToPath(url));
 
-export { getDirname };
+export { getDirname2 };

package/{index-wnp7hwq7.js → index-92zztqy1.js}

@@ -5,7 +5,7 @@ import * as path from "path";
 import chalk from "chalk";
 import * as ts from "typescript";
 
-class TypeChecker {
+class TypeChecker2 {
   configPath;
   configFile;
   config;
@@ -143,12 +143,12 @@ ${summary.join(", ")} found${output.join(`
     try {
       const { diagnostics } = this.check(filePath);
       return diagnostics.length === 0;
-    } catch (error) {
+    } catch (_error) {
       return false;
     }
   }
   static checkProject(configPath) {
-    const parsedConfig = TypeChecker.parseConfig(configPath);
+    const parsedConfig = TypeChecker2.parseConfig(configPath);
     const host = ts.createIncrementalCompilerHost(parsedConfig.options);
     const builderProgram = ts.createIncrementalProgram({
       rootNames: parsedConfig.fileNames,
@@ -166,19 +166,19 @@ ${summary.join(", ")} found${output.join(`
       diagnostics,
       errors,
       warnings,
-      message: TypeChecker.formatDiagnosticMessages(diagnostics)
+      message: TypeChecker2.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);
+      const message = TypeChecker2.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));
+      throw new Error(TypeChecker2.formatDiagnosticMessages(parsedConfig.errors));
     return parsedConfig;
   }
   static formatDiagnosticMessages(diagnostics) {
@@ -190,4 +190,4 @@ ${summary.join(", ")} found${output.join(`
   }
 }
 
-export { TypeChecker };
+export { TypeChecker2 };

package/{index-jhpa13zj.js → index-9bwhxrqf.js}

@@ -1,34 +1,34 @@
 // @bun
 import {
-  pluralizeName
-} from "./index-ss469dec.js";
-import {
-  PageScript
-} from "./index-xmmzf150.js";
+  FileSys
+} from "./index-q0y2jq9j.js";
 import {
   AiSession
-} from "./index-0cj2zxbm.js";
+} from "./index-n85fer99.js";
 import {
-  bilingualDescriptionForField,
-  bilingualLabelForField,
-  createPassedPrimitiveReport,
-  generatedFilesForSync,
-  moduleSourcePaths,
-  sourceFile
-} from "./index-rxkpk7n4.js";
-import {
-  Prompter
-} from "./index-j37qq1f2.js";
+  ModuleExecutor
+} from "./index-q8sn827n.js";
 import {
   runner,
   script
-} from "./index-kdh76j26.js";
+} from "./index-cezy7yb3.js";
 import {
-  ModuleExecutor
-} from "./index-z8ptfkzv.js";
+  sourceFile,
+  moduleSourcePaths,
+  generatedFilesForSync,
+  createPassedPrimitiveReport,
+  bilingualLabelForField,
+  bilingualDescriptionForField
+} from "./index-e82dyeqy.js";
 import {
-  FileSys
-} from "./index-67546d0j.js";
+  PageScript
+} from "./index-mpmyqm1y.js";
+import {
+  Prompter
+} from "./index-h7yw2z9n.js";
+import {
+  pluralizeName
+} from "./index-nz8prx9g.js";
 
 // pkgs/@akanjs/devkit/getRelatedCnsts.ts
 import { readFileSync, realpathSync } from "fs";
@@ -662,39 +662,39 @@ class ModuleRunner extends runner("module") {
 }
 
 // pkgs/@akanjs/cli/module/module.script.ts
-var moduleChangedFiles = (sys2, moduleName, files) => Object.values(files).map((file) => sourceFile(sys2, `lib/${moduleName}/${file.filename}`, "create", "Module source file was created."));
+var moduleChangedFiles = (sys, moduleName, files) => Object.values(files).map((file) => sourceFile(sys, `lib/${moduleName}/${file.filename}`, "create", "Module source file was created."));
 
 class ModuleScript extends script("module", [ModuleRunner, PageScript]) {
-  async createModuleTemplate(sys2, name, { page = false } = {}) {
-    const mod = ModuleExecutor.from(sys2, name);
+  async createModuleTemplate(sys, name, { page = false } = {}) {
+    const mod = ModuleExecutor.from(sys, name);
     const files = await this.moduleRunner.createModuleTemplate(mod);
-    if (page && sys2.type === "app")
-      await this.pageScript.createCrudPage(mod, { app: sys2, basePath: null, single: false });
-    await sys2.scan();
+    if (page && sys.type === "app")
+      await this.pageScript.createCrudPage(mod, { app: sys, basePath: null, single: false });
+    await sys.scan();
     return createPassedPrimitiveReport({
       command: "create-module",
-      changedFiles: moduleChangedFiles(sys2, name, files),
-      generatedFiles: generatedFilesForSync(sys2, "Generated files were refreshed after module creation."),
-      target: sys2.name
+      changedFiles: moduleChangedFiles(sys, name, files),
+      generatedFiles: generatedFilesForSync(sys, "Generated files were refreshed after module creation."),
+      target: sys.name
     });
   }
-  async createModule(sys2, name, {
+  async createModule(sys, name, {
     page = false,
     description,
     schemaDescription
   } = {}) {
-    const isContinued = await sys2.exists(`lib/${name}/${name}.constant.ts`);
-    const session = new AiSession("createModule", { workspace: sys2.workspace, cacheKey: name, isContinued });
-    const moduleConstantExampleFiles = await sys2.workspace.getConstantFiles();
-    const executor = ModuleExecutor.from(sys2, name);
+    const isContinued = await sys.exists(`lib/${name}/${name}.constant.ts`);
+    const session = new AiSession("createModule", { workspace: sys.workspace, cacheKey: name, isContinued });
+    const moduleConstantExampleFiles = await sys.workspace.getConstantFiles();
+    const executor = ModuleExecutor.from(sys, name);
     const files = await this.moduleRunner.createModuleTemplate(executor);
     const { constant, dictionary } = files;
-    if (page && sys2.type === "app")
-      await this.pageScript.createCrudPage(executor, { app: sys2, basePath: null, single: false });
+    if (page && sys.type === "app")
+      await this.pageScript.createCrudPage(executor, { app: sys, basePath: null, single: false });
     const modelDesc = description ?? await input({ message: "description of module" });
     const modelSchemaDesign = schemaDescription ?? await input({ message: "schema description of module" });
-    const config = await sys2.getConfig();
-    const moduleRequest = new ModuleRequest({ sysType: sys2.type, sysName: sys2.name, modelName: name, config });
+    const config = await sys.getConfig();
+    const moduleRequest = new ModuleRequest({ sysType: sys.type, sysName: sys.name, modelName: name, config });
     const constantRequestPrompt = await moduleRequest.requestModelConstant({
       modelDesc,
       modelSchemaDesign,
@@ -702,38 +702,38 @@ class ModuleScript extends script("module", [ModuleRunner, PageScript]) {
       exampleFiles: randomPicks(moduleConstantExampleFiles, Math.min(10, moduleConstantExampleFiles.length))
     });
     const constantGuide = await ModuleRequest.getGuideJson("modelConstant");
-    const constantWrites = await session.writeTypescripts(constantRequestPrompt, sys2, {
+    const constantWrites = await session.writeTypescripts(constantRequestPrompt, sys, {
       validate: constantGuide.update.rules
     });
     for (const scalarName of this.#getCreatedScalarNames(constantWrites.map(({ filePath }) => filePath))) {
-      await sys2.applyTemplate({
+      await sys.applyTemplate({
         basePath: "./lib/__scalar",
         template: "__scalar",
-        dict: { model: scalarName, models: pluralizeName(scalarName), sysName: sys2.name },
+        dict: { model: scalarName, models: pluralizeName(scalarName), sysName: sys.name },
         overwrite: false
       });
     }
-    const constantContent = await sys2.readFile(`lib/${name}/${name}.constant.ts`);
+    const constantContent = await sys.readFile(`lib/${name}/${name}.constant.ts`);
     const dictionaryGuide = await ModuleRequest.getGuideJson("modelDictionary");
     await session.writeTypescripts(requestDictionary({
-      sysName: sys2.name,
+      sysName: sys.name,
       modelName: name,
       constant: constantContent,
       modelDesc,
       modelSchemaDesign,
       boilerplate: dictionary.content,
       exampleFiles: randomPicks(moduleConstantExampleFiles, Math.min(10, moduleConstantExampleFiles.length))
-    }), sys2, { validate: dictionaryGuide.update.rules });
-    await sys2.scan();
-    sys2.log(`Module ${name} created in ${sys2.type}s/${sys2.name}/lib/${name}`);
+    }), sys, { validate: dictionaryGuide.update.rules });
+    await sys.scan();
+    sys.log(`Module ${name} created in ${sys.type}s/${sys.name}/lib/${name}`);
     return createPassedPrimitiveReport({
       command: "create-module",
       changedFiles: [
-        ...moduleChangedFiles(sys2, name, files),
-        ...constantWrites.map((write) => sourceFile(sys2, write.filePath, "modify", "AI-assisted module constant source was updated."))
+        ...moduleChangedFiles(sys, name, files),
+        ...constantWrites.map((write) => sourceFile(sys, write.filePath, "modify", "AI-assisted module constant source was updated."))
       ],
-      generatedFiles: generatedFilesForSync(sys2, "Generated files were refreshed after module creation."),
-      target: sys2.name
+      generatedFiles: generatedFilesForSync(sys, "Generated files were refreshed after module creation."),
+      target: sys.name
     });
   }
   #getCreatedScalarNames(filePaths) {
@@ -744,15 +744,15 @@ class ModuleScript extends script("module", [ModuleRunner, PageScript]) {
   async removeModule(mod) {
     await this.moduleRunner.removeModule(mod);
   }
-  async createService(sys2, name) {
-    const service = ModuleExecutor.from(sys2, `_${name}`);
+  async createService(sys, name) {
+    const service = ModuleExecutor.from(sys, `_${name}`);
     const files = await this.moduleRunner.createService(service);
-    await sys2.scan();
+    await sys.scan();
     return createPassedPrimitiveReport({
       command: "create-service",
-      changedFiles: moduleChangedFiles(sys2, `_${name}`, files),
-      generatedFiles: generatedFilesForSync(sys2, "Generated files were refreshed after service creation."),
-      target: sys2.name
+      changedFiles: moduleChangedFiles(sys, `_${name}`, files),
+      generatedFiles: generatedFilesForSync(sys, "Generated files were refreshed after service creation."),
+      target: sys.name
     });
   }
   async createTest(workspace, name) {}

package/{index-bjpxzr6s.js → index-9wtbw98m.js}

@@ -422,7 +422,7 @@ class HmrWatcher {
     this.#unreportedChanges += unreported;
     if (!this.#reportedCompensating) {
       this.#reportedCompensating = true;
-      this.#logger.info(`[hmr] recovered ${unreported} change(s) that fs.watch did not report; Bun coalesces concurrent saves and drops all but one, so changes are resolved by mtime`);
+      this.#logger.verbose(`[hmr] recovered ${unreported} change(s) that fs.watch did not report; Bun coalesces concurrent saves and drops all but one, so changes are resolved by mtime`);
     }
     this.#logger.verbose(`[hmr] mtime scan found ${unreported} change(s) fs.watch never reported (${this.#unreportedChanges} total)`);
   }
@@ -472,6 +472,8 @@ class WatchRootResolver {
   }
   async resolve() {
     const tsconfig = await this.#app.getTsConfig();
+    const appDir = path4.resolve(this.#app.cwdPath);
+    const appsContainer = path4.dirname(appDir);
     const set = new Set;
     set.add(path4.resolve(`${this.#app.cwdPath}/page`));
     for (const targets of Object.values(tsconfig.compilerOptions.paths ?? {})) {
@@ -482,8 +484,9 @@ class WatchRootResolver {
           continue;
         const cleaned = target.replace(/\/?\*+.*$/, "").replace(/\/[^/]+\.[^/]+$/, "");
         const resolved = path4.resolve(this.#app.workspace.workspaceRoot, cleaned);
-        if (fs2.existsSync(resolved))
-          set.add(resolved);
+        const root = resolved === appsContainer ? appDir : resolved;
+        if (fs2.existsSync(root))
+          set.add(root);
       }
     }
     return [...set];

package/{index-fgc8r6dj.js → index-a5vmm6x4.js}

@@ -19,12 +19,14 @@ var prepareDevWatchBatch = ({
     generatedFiles: indexSync.changedFiles
   });
   if (indexSync.errors.length > 0 && !devPlan.actions.includes("report-error")) {
-    devPlan.actions = [...devPlan.actions, "report-error"].sort();
+    const withReport = [...devPlan.actions, "report-error"];
+    devPlan.actions = withReport.sort();
   }
   return {
     files,
     kinds,
     expandedBatch,
+    devPlan,
     event: { type: "invalidate", kinds, files, generation, devPlan },
     hasSyncErrors: indexSync.errors.length > 0
   };

package/{index-xys926f2.js → index-by5gpp8x.js}

@@ -2,7 +2,7 @@
 // pkgs/@akanjs/devkit/recipeScanner.ts
 import { readdir } from "fs/promises";
 import ts from "typescript";
-var collectRecipeSources = async (uiDirPath, importFrom, basename = "Recipe") => {
+var collectRecipeSources2 = async (uiDirPath, importFrom, basename = "Recipe") => {
   const read = async (filePath) => {
     const content = await Bun.file(filePath).text().catch(() => "");
     return content ? { path: filePath, content, importFrom } : null;
@@ -12,7 +12,7 @@ var collectRecipeSources = async (uiDirPath, importFrom, basename = "Recipe") =>
   const fromDir = await Promise.all(dirEntries.filter((entry) => entry.endsWith(".ts") && entry !== "index.ts" && !/\.(test|spec)\.ts$/.test(entry)).sort().map((entry) => read(`${uiDirPath}/${basename}/${entry}`)));
   return [flat, ...fromDir].filter((source) => !!source);
 };
-var scanRecipes = (sources) => {
+var scanRecipes2 = (sources) => {
   const recipes = [];
   for (const source of sources) {
     const sourceFile = ts.createSourceFile(source.path, source.content, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
@@ -87,7 +87,7 @@ var isNamed = (name) => ts.isIdentifier(name) || ts.isStringLiteral(name);
 var propName = (name) => name.text;
 var DUPLICATE_TOKEN_RATIO = 0.7;
 var MIN_FINGERPRINT_TOKENS = 3;
-var findInlineRecipeDuplicates = (recipes, files) => {
+var findInlineRecipeDuplicates2 = (recipes, files) => {
   const fingerprints = recipes.map((recipe) => ({ recipe: recipe.name, tokens: (recipe.base ?? "").split(/\s+/).filter(Boolean) })).filter((fingerprint) => fingerprint.tokens.length >= MIN_FINGERPRINT_TOKENS).map((fingerprint) => ({ ...fingerprint, needed: Math.ceil(fingerprint.tokens.length * DUPLICATE_TOKEN_RATIO) }));
   if (fingerprints.length === 0)
     return [];
@@ -133,4 +133,4 @@ var getLeadingDoc = (fullText, node) => {
   return line || undefined;
 };
 
-export { collectRecipeSources, scanRecipes, findInlineRecipeDuplicates };
+export { collectRecipeSources2, scanRecipes2, findInlineRecipeDuplicates2 };