@akanjs/cli 3.0.0-beta.19 → 3.0.0-beta.20

package/{index-4m929vvn.js → index-3sq321ak.js}

@@ -2,12 +2,12 @@
 import {
   runner,
   script
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
   generatedFilesForSync,
   createPassedPrimitiveReport,
   scalarChangedFiles
-} from "./index-2446k7b4.js";
+} from "./index-myhc3c1j.js";
 import {
   pluralizeName
 } from "./index-nz8prx9g.js";
@@ -21,23 +21,15 @@ class ScalarRunner extends runner("scalar") {
       dict: { model: scalarName, models: pluralizeName(scalarName), sysName: sys.name },
       overwrite: false
     });
+    const read = async (suffix) => {
+      const filename = `${scalarName}.${suffix}`;
+      return { filename, content: await sys.readFile(`lib/__scalar/${scalarName}/${filename}`) };
+    };
     return {
-      abstract: {
-        filename: `${scalarName}.abstract.md`,
-        content: await sys.readFile(`lib/__scalar/${scalarName}/${scalarName}.abstract.md`)
-      },
-      constant: {
-        filename: `${scalarName}.constant.ts`,
-        content: await sys.readFile(`lib/__scalar/${scalarName}/${scalarName}.constant.ts`)
-      },
-      dictionary: {
-        filename: `${scalarName}.dictionary.ts`,
-        content: await sys.readFile(`lib/__scalar/${scalarName}/${scalarName}.dictionary.ts`)
-      },
-      document: {
-        filename: `${scalarName}.document.ts`,
-        content: await sys.readFile(`lib/__scalar/${scalarName}/${scalarName}.document.ts`)
-      }
+      abstract: await read("abstract.md"),
+      constant: await read("constant.ts"),
+      dictionary: await read("dictionary.ts"),
+      document: await read("document.ts")
     };
   }
 }

package/{index-bhtmj233.js → index-3t7g9e4r.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
-  FileSys
-} from "./index-q0y2jq9j.js";
+  FileSys2
+} from "./index-5b6tavv3.js";
 
 // pkgs/@akanjs/devkit/dependencyScanner.ts
 import { builtinModules } from "module";
@@ -57,24 +57,21 @@ class TypeScriptDependencyScanner2 {
   async getPackageBuildDependencies(projectName) {
     const runtimeDeps = new Set;
     const devDeps = new Set;
-    const sourceFiles = await this.#findTypeScriptFiles(this.#directory, {
-      excludeBuildFiles: true,
-      excludeTestFiles: true
-    });
-    const cssFiles = await this.#findCssFiles(this.#directory);
+    const sourceFiles = await this.#findFiles("**/*.{ts,tsx}", { excludeBuildFiles: true, excludeTestFiles: true });
+    const cssFiles = await this.#findFiles("**/*.css");
     for (const filePath of sourceFiles) {
-      const fileContent = await FileSys.readText(filePath);
+      const fileContent = await FileSys2.readText(filePath);
       const { imports, typeImports } = this.#extractImports(fileContent, filePath);
       this.#addNormalizedImports(runtimeDeps, imports, projectName);
       this.#addNormalizedImports(devDeps, typeImports, projectName);
     }
     for (const filePath of cssFiles) {
-      const fileContent = await FileSys.readText(filePath);
+      const fileContent = await FileSys2.readText(filePath);
       this.#addNormalizedImports(runtimeDeps, this.#extractCssPluginImports(fileContent), projectName);
     }
     const buildFilePath = path.join(this.#directory, "build.ts");
-    if (await FileSys.fileExists(buildFilePath)) {
-      const fileContent = await FileSys.readText(buildFilePath);
+    if (await FileSys2.fileExists(buildFilePath)) {
+      const fileContent = await FileSys2.readText(buildFilePath);
       const { imports, typeImports } = this.#extractImports(fileContent, buildFilePath);
       this.#addNormalizedImports(devDeps, [...imports, ...typeImports], projectName);
     }
@@ -98,7 +95,7 @@ class TypeScriptDependencyScanner2 {
     if (!await Bun.file(packageJsonPath).exists())
       return false;
     try {
-      const packageJson = await FileSys.readJson(packageJsonPath);
+      const packageJson = await FileSys2.readJson(packageJsonPath);
       return packageJson.name === dep && !!packageJson.version;
     } catch {
       return false;
@@ -109,27 +106,21 @@ class TypeScriptDependencyScanner2 {
     return this.#getImportSetsFromDependencies(depSets, fileDependencies);
   }
   #getImportSetsFromDependencies(depSets, fileDependencies) {
-    const importedDepSets = new Array(depSets.length);
-    for (let i = 0;i < depSets.length; i++)
-      importedDepSets[i] = new Set;
-    fileDependencies.forEach((imps) => {
-      imps.forEach((imp) => {
+    const importedDepSets = depSets.map(() => new Set);
+    for (const imps of fileDependencies.values())
+      for (const imp of imps) {
         if (imp.startsWith("."))
-          return;
-        const moduleName = imp;
-        const moduleNameParts = moduleName.split("/");
-        const subModuleLength = moduleNameParts.length;
-        for (let i = 0;i < subModuleLength; i++) {
-          const importName = moduleNameParts.slice(0, i + 1).join("/");
-          for (let j = 0;j < depSets.length; j++) {
-            if (depSets[j]?.has(importName)) {
-              importedDepSets[j]?.add(importName);
-              return;
-            }
-          }
+          continue;
+        const parts = imp.split("/");
+        for (let length = 1;length <= parts.length; length++) {
+          const importName = parts.slice(0, length).join("/");
+          const setIndex = depSets.findIndex((depSet) => depSet.has(importName));
+          if (setIndex === -1)
+            continue;
+          importedDepSets[setIndex]?.add(importName);
+          break;
         }
-      });
-    });
+      }
     return importedDepSets;
   }
   async getDependencies() {
@@ -137,43 +128,25 @@ class TypeScriptDependencyScanner2 {
     this.#fileRuntimeDependencies.clear();
     this.#fileTypeDependencies.clear();
     this.#visitedFiles.clear();
-    const files = await this.#findTypeScriptFiles(this.#directory);
-    for (const file of files)
+    for (const file of await this.#findFiles("**/*.{ts,tsx}"))
       await this.#analyzeFile(file, this.#directory);
     return this.#fileDependencies;
   }
-  async#findTypeScriptFiles(directory, {
+  async#findFiles(pattern, {
     excludeBuildFiles = false,
     excludeTestFiles = false
   } = {}) {
     const files = [];
-    const glob = new Bun.Glob("**/*.{ts,tsx}");
-    for await (const filePath of glob.scan({ cwd: directory, onlyFiles: true })) {
+    for await (const filePath of new Bun.Glob(pattern).scan({ cwd: this.#directory, onlyFiles: true })) {
       if (isSkippedPath(filePath))
         continue;
       if (excludeBuildFiles && filePath === "build.ts")
         continue;
       if (excludeTestFiles && testFileRegex.test(filePath))
         continue;
-      const fullPath = path.join(directory, filePath);
-      const relativePath = path.relative(this.#workspaceRoot, fullPath);
-      if (this.#ig.ignores(relativePath))
-        continue;
-      files.push(fullPath);
-    }
-    return files;
-  }
-  async#findCssFiles(directory) {
-    const files = [];
-    const glob = new Bun.Glob("**/*.css");
-    for await (const filePath of glob.scan({ cwd: directory, onlyFiles: true })) {
-      if (isSkippedPath(filePath))
-        continue;
-      const fullPath = path.join(directory, filePath);
-      const relativePath = path.relative(this.#workspaceRoot, fullPath);
-      if (this.#ig.ignores(relativePath))
-        continue;
-      files.push(fullPath);
+      const fullPath = path.join(this.#directory, filePath);
+      if (!this.#ig.ignores(path.relative(this.#workspaceRoot, fullPath)))
+        files.push(fullPath);
     }
     return files;
   }
@@ -182,7 +155,7 @@ class TypeScriptDependencyScanner2 {
       return;
     this.#visitedFiles.add(filePath);
     try {
-      const fileContent = await FileSys.readText(filePath);
+      const fileContent = await FileSys2.readText(filePath);
       const { imports, typeImports } = this.#extractImports(fileContent, filePath);
       const resolvedImports = await this.#resolveImports(imports, filePath, baseDir);
       const resolvedTypeImports = await this.#resolveImports(typeImports, filePath, baseDir);
@@ -194,19 +167,17 @@ class TypeScriptDependencyScanner2 {
   }
   async#resolveImports(imports, filePath, baseDir) {
     return await Promise.all(imports.map(async (importPath) => {
-      if (importPath.startsWith(".")) {
-        const resolvedPath = `./${path.join(path.relative(baseDir, filePath), importPath)}`;
-        return await this.#ensureExtension(resolvedPath);
-      }
-      return importPath;
+      if (!importPath.startsWith("."))
+        return importPath;
+      return await this.#ensureExtension(`./${path.join(path.relative(baseDir, filePath), importPath)}`);
     }));
   }
   async#ensureExtension(filePath) {
-    if (await FileSys.fileExists(`${filePath}.ts`))
+    if (await FileSys2.fileExists(`${filePath}.ts`))
       return `${filePath}.ts`;
-    else if (await FileSys.fileExists(`${filePath}.tsx`))
+    else if (await FileSys2.fileExists(`${filePath}.tsx`))
       return `${filePath}.tsx`;
-    else if (await FileSys.fileExists(filePath))
+    else if (await FileSys2.fileExists(filePath))
       return filePath;
     return `${filePath}.ts`;
   }
@@ -265,22 +236,14 @@ class TypeScriptDependencyScanner2 {
 `;
       const projectImports = imports.filter((i) => !i.startsWith("react") && !i.startsWith("@"));
       const externalImports = imports.filter((i) => i.startsWith("react") || i.startsWith("@"));
-      if (projectImports.length > 0) {
+      if (projectImports.length > 0)
         graph += `  Project dependencies:
-`;
-        projectImports.forEach((imp) => {
-          graph += `    \u2192 ${imp}
-`;
-        });
-      }
-      if (externalImports.length > 0) {
+${projectImports.map((imp) => `    \u2192 ${imp}
+`).join("")}`;
+      if (externalImports.length > 0)
         graph += `  External dependencies:
-`;
-        externalImports.forEach((imp) => {
-          graph += `    \u2192 ${imp}
-`;
-        });
-      }
+${externalImports.map((imp) => `    \u2192 ${imp}
+`).join("")}`;
       graph += `
 `;
     }

package/{index-q0y2jq9j.js → index-5b6tavv3.js}

@@ -1,9 +1,12 @@
 // @bun
 // pkgs/@akanjs/devkit/fileSys.ts
 import { lstat, rename, rm, stat } from "fs/promises";
+import nodePath from "path";
+import { fileURLToPath } from "url";
 import { Logger } from "akanjs/common";
+var getDirname2 = (url) => nodePath.dirname(fileURLToPath(url));
 
-class FileSys {
+class FileSys2 {
   static logger = new Logger("FileSys");
   static async fileExists(path) {
     return await Bun.file(path).exists();
@@ -24,7 +27,7 @@ class FileSys {
     try {
       return await Bun.file(path).json();
     } catch (error) {
-      FileSys.logger.error(`Failed to read JSON file: ${path}`);
+      FileSys2.logger.error(`Failed to read JSON file: ${path}`);
       throw error;
     }
   }
@@ -52,4 +55,4 @@ class FileSys {
   }
 }
 
-export { FileSys };
+export { getDirname2, FileSys2 };

package/{index-47pj3aee.js → index-5e0n4hqx.js}

@@ -1,5 +1,6 @@
 // @bun
 // pkgs/@akanjs/devkit/mobile/mobileTarget.ts
+var trimSlashes = (value) => value.replace(/^\/+|\/+$/g, "");
 var getMobileTargets = async (app) => {
   const config = await app.getConfig();
   return Object.entries(config.mobile.targets).map(([name, target]) => ({ name, config: target }));
@@ -9,12 +10,11 @@ var getMobileTargetChoices = async (app) => {
   const targetNames = Object.keys(config.mobile.targets);
   if (targetNames.length > 0)
     return targetNames;
-  const basePaths = [...config.basePaths];
-  return basePaths;
+  return [...config.basePaths];
 };
 var resolveMobileTargetByBasePath = (targets, basePath) => {
-  const normalizedBasePath = basePath.replace(/^\/+|\/+$/g, "");
-  const byBasePath = targets.find((target) => target.config.basePath?.replace(/^\/+|\/+$/g, "") === normalizedBasePath);
+  const normalizedBasePath = trimSlashes(basePath);
+  const byBasePath = targets.find(({ config }) => config.basePath !== undefined && trimSlashes(config.basePath) === normalizedBasePath);
   if (byBasePath)
     return byBasePath;
   const [template] = targets;
@@ -22,11 +22,7 @@ var resolveMobileTargetByBasePath = (targets, basePath) => {
     return;
   return {
     name: normalizedBasePath,
-    config: {
-      ...template.config,
-      name: normalizedBasePath,
-      basePath: normalizedBasePath
-    }
+    config: { ...template.config, name: normalizedBasePath, basePath: normalizedBasePath }
   };
 };
 var resolveMobileTargets = async (app, selection) => {
@@ -58,13 +54,13 @@ var resolveMobileTargets = async (app, selection) => {
   if (target)
     return [target];
   const basePathTarget = resolveMobileTargetByBasePath(targets, selection);
-  if (basePathTarget && config.basePaths.has(selection.replace(/^\/+|\/+$/g, "")))
+  if (basePathTarget && config.basePaths.has(trimSlashes(selection)))
     return [basePathTarget];
   const choices = await getMobileTargetChoices(app);
   throw new Error(`Mobile target '${selection}' was not found. Available: ${choices.join(", ")}`);
 };
 var resolveMobilePath = (target, pathname) => {
-  const basePath = target.basePath?.replace(/^\/+|\/+$/g, "");
+  const basePath = trimSlashes(target.basePath ?? "");
   const normalizedPath = `/${pathname.replace(/^\/+/, "")}`;
   if (!basePath)
     return normalizedPath;
@@ -72,5 +68,8 @@ var resolveMobilePath = (target, pathname) => {
     return normalizedPath;
   return `/${basePath}${normalizedPath === "/" ? "" : normalizedPath}`;
 };
-var targetHtmlFilename = (target) => target.basePath?.replace(/^\/+|\/+$/g, "") ? `${target.basePath.replace(/^\/+|\/+$/g, "")}.html` : "index.html";
+var targetHtmlFilename = (target) => {
+  const basePath = trimSlashes(target.basePath ?? "");
+  return basePath ? `${basePath}.html` : "index.html";
+};
 export { getMobileTargets, getMobileTargetChoices, resolveMobileTargets, resolveMobilePath, targetHtmlFilename };

package/{index-7ep8qtvp.js → index-5pc1qrbv.js}

@@ -2,23 +2,21 @@
 import {
   runner,
   script
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
   LibExecutor
-} from "./index-crmeqnmf.js";
+} from "./index-9d9bgcx4.js";
 import {
   LibSource,
   formatLibStatuses
-} from "./index-3d9y066c.js";
+} from "./index-bjwxs904.js";
 
 // pkgs/@akanjs/cli/library/library.script.ts
 import { Logger } from "akanjs/common";
 
 // pkgs/@akanjs/devkit/semver.ts
 var stripRangeOperator = (version) => version.replace(/^[\s^~>=<v]+/, "").trim();
-var parseVersion = (version) => {
-  return version.replace(/^[^\d]*/, "").split(/[.-]/).map((part) => Number.parseInt(part, 10)).map((part) => Number.isFinite(part) ? part : 0);
-};
+var parseVersion = (version) => version.replace(/^[^\d]*/, "").split(/[.-]/).map((part) => Number.parseInt(part, 10)).map((part) => Number.isFinite(part) ? part : 0);
 var compareNumeric = (a, b) => {
   const left = parseVersion(a);
   const right = parseVersion(b);
@@ -44,8 +42,7 @@ class LibraryRunner extends runner("library") {
   async createLibrary(libName, workspace) {
     await workspace.mkdir(`libs/${libName}`);
     await workspace.applyTemplate({ basePath: `libs/${libName}`, template: "libRoot", dict: { libName } });
-    const lib = LibExecutor.from(workspace, libName);
-    return lib;
+    return LibExecutor.from(workspace, libName);
   }
   async removeLibrary(lib) {
     await lib.workspace.removeDir(`libs/${lib.name}`);

package/{index-esk82rvk.js → index-8mna0947.js}

@@ -2,10 +2,10 @@
 import {
   runner,
   script
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
   ModuleExecutor
-} from "./index-crmeqnmf.js";
+} from "./index-9d9bgcx4.js";
 import {
   sourceFile,
   moduleSourcePaths,
@@ -13,10 +13,10 @@ import {
   createPassedPrimitiveReport,
   bilingualLabelForField,
   bilingualDescriptionForField
-} from "./index-2446k7b4.js";
+} from "./index-myhc3c1j.js";
 import {
   PageScript
-} from "./index-22xtgmhn.js";
+} from "./index-dzf3r49a.js";
 import {
   pluralizeName
 } from "./index-nz8prx9g.js";
@@ -44,7 +44,19 @@ ${purpose}
 - Removal is soft: a removed ${noun} keeps its row with \`removedAt\` set.
 `;
 };
-var localModuleFilename = (moduleName, pathKey) => moduleSourcePaths(moduleName)[pathKey].replace(`lib/${moduleName}/`, "");
+var moduleFileKeys = [
+  "abstract",
+  "constant",
+  "dictionary",
+  "service",
+  "store",
+  "signal",
+  "unit",
+  "view",
+  "template",
+  "zone",
+  "util"
+];
 
 class ModuleRunner extends runner("module") {
   async createService(module) {
@@ -54,20 +66,20 @@ class ModuleRunner extends runner("module") {
       template: "service",
       dict: { model: serviceName, sysName: module.sys.name }
     });
-    const [abstractContent, dictionaryContent, serviceContent, signalContent, storeContent] = await Promise.all([
-      module.readFile(`${serviceName}.abstract.md`),
-      module.readFile(`${serviceName}.dictionary.ts`),
-      module.readFile(`${serviceName}.service.ts`),
-      module.readFile(`${serviceName}.signal.ts`),
-      module.readFile(`${serviceName}.store.ts`)
-    ]);
-    return {
-      abstract: { filename: `${serviceName}.abstract.md`, content: abstractContent },
-      dictionary: { filename: `${serviceName}.dictionary.ts`, content: dictionaryContent },
-      service: { filename: `${serviceName}.service.ts`, content: serviceContent },
-      signal: { filename: `${serviceName}.signal.ts`, content: signalContent },
-      store: { filename: `${serviceName}.store.ts`, content: storeContent }
-    };
+    return await this.#readFiles(module, {
+      abstract: `${serviceName}.abstract.md`,
+      dictionary: `${serviceName}.dictionary.ts`,
+      service: `${serviceName}.service.ts`,
+      signal: `${serviceName}.signal.ts`,
+      store: `${serviceName}.store.ts`
+    });
+  }
+  async#readFiles(module, filenames) {
+    const files = await Promise.all(Object.entries(filenames).map(async ([key, filename]) => [
+      key,
+      { filename, content: await module.readFile(filename) }
+    ]));
+    return Object.fromEntries(files);
   }
   async removeModule(module) {
     await module.sys.removeDir(`lib/${module.name}`);
@@ -97,19 +109,8 @@ class ModuleRunner extends runner("module") {
     const names = pluralizeName(module.name);
     const modelLabel = bilingualLabelForField(module.name);
     const modelDescription = bilingualDescriptionForField(module.name);
-    const filenames = {
-      abstract: localModuleFilename(module.name, "abstract"),
-      constant: localModuleFilename(module.name, "constant"),
-      dictionary: localModuleFilename(module.name, "dictionary"),
-      service: localModuleFilename(module.name, "service"),
-      store: localModuleFilename(module.name, "store"),
-      signal: localModuleFilename(module.name, "signal"),
-      unit: localModuleFilename(module.name, "unit"),
-      view: localModuleFilename(module.name, "view"),
-      template: localModuleFilename(module.name, "template"),
-      zone: localModuleFilename(module.name, "zone"),
-      util: localModuleFilename(module.name, "util")
-    };
+    const paths = moduleSourcePaths(module.name);
+    const filenames = Object.fromEntries(moduleFileKeys.map((key) => [key, paths[key].replace(`lib/${module.name}/`, "")]));
     const sharedGuards = await this.#hasSharedGuards(module);
     await module.applyTemplate({
       basePath: `.`,
@@ -127,44 +128,7 @@ class ModuleRunner extends runner("module") {
       }
     });
     await module.writeFile(filenames.abstract, moduleAbstractContent(module.name, sharedGuards));
-    const [
-      abstractContent,
-      constantContent,
-      dictionaryContent,
-      serviceContent,
-      storeContent,
-      signalContent,
-      unitContent,
-      viewContent,
-      templateContent,
-      zoneContent,
-      utilContent
-    ] = await Promise.all([
-      module.readFile(filenames.abstract),
-      module.readFile(filenames.constant),
-      module.readFile(filenames.dictionary),
-      module.readFile(filenames.service),
-      module.readFile(filenames.store),
-      module.readFile(filenames.signal),
-      module.readFile(filenames.unit),
-      module.readFile(filenames.view),
-      module.readFile(filenames.template),
-      module.readFile(filenames.zone),
-      module.readFile(filenames.util)
-    ]);
-    return {
-      abstract: { filename: filenames.abstract, content: abstractContent },
-      constant: { filename: filenames.constant, content: constantContent },
-      dictionary: { filename: filenames.dictionary, content: dictionaryContent },
-      service: { filename: filenames.service, content: serviceContent },
-      store: { filename: filenames.store, content: storeContent },
-      signal: { filename: filenames.signal, content: signalContent },
-      unit: { filename: filenames.unit, content: unitContent },
-      view: { filename: filenames.view, content: viewContent },
-      template: { filename: filenames.template, content: templateContent },
-      zone: { filename: filenames.zone, content: zoneContent },
-      util: { filename: filenames.util, content: utilContent }
-    };
+    return await this.#readFiles(module, filenames);
   }
 }
 
@@ -199,7 +163,6 @@ class ModuleScript extends script("module", [ModuleRunner, PageScript]) {
       target: sys.name
     });
   }
-  async createTest(workspace, name) {}
   async createTemplate(mod) {
     return await this.#createComponent(mod, "template");
   }

package/{index-sq2dzkzm.js → index-8sf7wmdr.js}

@@ -2,22 +2,22 @@
 import {
   GlobalConfig,
   CloudApi
-} from "./index-srmay5jw.js";
+} from "./index-22d57v4c.js";
 import {
   script
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
   PkgExecutor
-} from "./index-crmeqnmf.js";
+} from "./index-9d9bgcx4.js";
 import {
   ApplicationScript
-} from "./index-bftkz6cp.js";
+} from "./index-ww4z397j.js";
 import {
   PackageScript
-} from "./index-ab0c38ea.js";
+} from "./index-as7xmyz8.js";
 import {
   CloudRunner
-} from "./index-bc88j1ry.js";
+} from "./index-axzjaqve.js";
 
 // pkgs/@akanjs/cli/cloud/cloud.script.ts
 import { Logger } from "akanjs/common";