@akanjs/cli 0.0.123 → 0.0.125

package/cjs/index.js

@@ -1381,7 +1381,7 @@ var SysExecutor = class extends Executor {
       throw new Error(
         `Missing libs: ${missingLibDeps.join(", ")}, add these dependencies in akan.config.ts as { libs: [...other deps, ${missingLibDeps.join(", ")}] }`
       );
-    for (const libName of libDeps) {
+    for (const libName of akanConfig.libs) {
       if (libScanResults[libName])
         continue;
       const lib = new LibExecutor({ workspace: this.workspace, name: libName });
@@ -2122,7 +2122,9 @@ var AiSession = class _AiSession {
     }
   } = {}) {
     if (!_AiSession.#chat)
-      throw new Error("Please initialize the AI session first");
+      await _AiSession.init();
+    if (!_AiSession.#chat)
+      throw new Error("Failed to initialize the AI session");
     try {
       const humanMessage = new import_messages.HumanMessage(question);
       this.messageHistory.push(humanMessage);
@@ -2251,15 +2253,10 @@ var Builder = class {
 var import_compare_versions = require("compare-versions");
 var import_dotenv2 = __toESM(require("dotenv"));
 var LibraryRunner = class {
-  async scanSync(lib) {
-    const akanConfig = await lib.getConfig();
-    const scanResult = await lib.scan({ akanConfig });
-    return scanResult;
-  }
   async createLibrary(libName, workspace) {
     await workspace.exec(`mkdir -p libs/${libName}`);
     const lib = LibExecutor.from(workspace, libName);
-    await lib.applyTemplate({ basePath: ".", template: "libRoot", dict: { libName, Libname: capitalize(libName) } });
+    await lib.applyTemplate({ basePath: ".", template: "libRoot", dict: { libName, LibName: capitalize(libName) } });
     const rootTsConfig = workspace.readJson("tsconfig.json");
     rootTsConfig.compilerOptions.paths[`@${libName}`] = [`libs/${libName}/index.ts`];
     rootTsConfig.compilerOptions.paths[`@${libName}/*`] = [`libs/${libName}/*`];
@@ -2351,17 +2348,18 @@ var LibraryRunner = class {
 var LibraryScript = class {
   #runner = new LibraryRunner();
   async scanLibrary(lib, verbose = false) {
-    const scanResult = await this.#runner.scanSync(lib);
+    const akanConfig = await lib.getConfig();
+    const scanResult = await lib.scan({ akanConfig });
     if (verbose)
       lib.logger.rawLog(JSON.stringify(scanResult, null, 2));
     return scanResult;
   }
   async syncLibrary(lib, { recursive = true } = {}) {
-    const scanResult = await this.scanLibrary(lib);
-    if (!recursive)
-      return;
-    for (const libName of scanResult.akanConfig.libs)
-      await this.syncLibrary(LibExecutor.from(lib.workspace, libName), { recursive: false });
+    const akanConfig = await lib.getConfig();
+    if (recursive)
+      for (const libName of akanConfig.libs)
+        await this.syncLibrary(LibExecutor.from(lib.workspace, libName), { recursive: false });
+    return await lib.scan({ akanConfig });
   }
   async createLibrary(libName, workspace) {
     const lib = await this.#runner.createLibrary(libName, workspace);
@@ -4568,13 +4566,15 @@ var ApplicationRunner = class {
     await app.workspace.exec(`rm -rf apps/${app.name}`);
     app.log(`Application ${app.name} removed`);
   }
-  async scanSync(app) {
-    const akanConfig = await getAppConfig(app.cwdPath, {
+  async getConfig(app) {
+    return await getAppConfig(app.cwdPath, {
       ...app.workspace.getBaseDevEnv(),
       type: "app",
       name: app.name,
       command: "start"
     });
+  }
+  async scanSync(app, akanConfig) {
     const scanResult = await app.scan({ akanConfig });
     await app.syncAssets(scanResult.akanConfig.libs);
     return scanResult;
@@ -5077,17 +5077,18 @@ var ApplicationScript = class {
     await this.#runner.removeApplication(app);
   }
   async scanApplication(app, verbose = false) {
-    const scanResult = await this.#runner.scanSync(app);
+    const akanConfig = await this.#runner.getConfig(app);
+    const scanResult = await this.#runner.scanSync(app, akanConfig);
     if (verbose)
       app.logger.rawLog(JSON.stringify(scanResult, null, 2));
     return scanResult;
   }
   async syncApplication(app, { recursive = true } = {}) {
-    const scanResult = await this.#runner.scanSync(app);
-    if (!recursive)
-      return;
-    for (const libName of scanResult.akanConfig.libs)
-      await this.libraryScript.syncLibrary(LibExecutor.from(app, libName), { recursive: false });
+    const akanConfig = await this.#runner.getConfig(app);
+    if (recursive)
+      for (const libName of akanConfig.libs)
+        await this.libraryScript.syncLibrary(LibExecutor.from(app, libName), { recursive: false });
+    return await this.#runner.scanSync(app, akanConfig);
   }
   async build(app) {
     await this.syncApplication(app);
@@ -5778,7 +5779,7 @@ var ModuleRunner = class {
       basePath: "./lib/__scalar",
       template: "__scalar",
       scanResult,
-      dict: { model: name, Model: capitalize(name) }
+      dict: { model: name, Model: capitalize(name), sysName: sys2.name, SysName: capitalize(sys2.name) }
     });
     await sys2.scan({ akanConfig });
     return {

package/cjs/src/templates/libRoot/lib/___libName__/__libName__.service.js

@@ -24,19 +24,11 @@ __export(libName_service_exports, {
 module.exports = __toCommonJS(libName_service_exports);
 function getContent(scanResult, dict) {
   return `
-import { Cron } from "@akanjs/nest";
-import { LogService, Service, Srv } from "@akanjs/service";
+import { LogService, Service } from "@akanjs/service";
 
-import type * as srv from "../srv";
+// import type * as srv from "../srv";
 
 @Service("${dict.libName}Service", { serverMode: "batch" })
-export class ${dict.LibName}Service extends LogService("${dict.libName}Service") {
-  @Srv() protected readonly summaryService: srv.SummaryService;
-
-  @Cron("0 * * * *")
-  async takePeriodicSnapshot() {
-    await this.summaryService.makeSummary();
-  }
-}
+export class ${dict.LibName}Service extends LogService("${dict.libName}Service") {}
   `;
 }

package/cjs/src/templates/module/__Model__.Unit.js

@@ -30,7 +30,7 @@ import { ModelProps } from "@akanjs/client";
 import { cnst, ${dict.Model} } from "@${dict.sysName}/client";
 import { Link } from "@util/ui";
 
-export const Card = ({ ${dict.model}, href }: ModelProps<"${dict.model}", cnst.Light${dict.Model}>>) => {
+export const Card = ({ ${dict.model}, href }: ModelProps<"${dict.model}", cnst.Light${dict.Model}>) => {
   return (
     <Link href={href} className="animate-fadeIn w-full h-36 flex rounded-lg shadow-sm hover:shadow-lg duration-300">
       <div>{${dict.model}.id}</div>

package/cjs/src/templates/module/__Model__.Zone.js

@@ -32,7 +32,7 @@ import { ModelsProps } from "@akanjs/client";
 import { cnst, ${dict.Model} } from "@${dict.sysName}/client";
 import { ClientInit, ClientView, DefaultOf } from "@akanjs/signal";
 
-export const Admin = ({ sliceName = "${dict.model}", init, query }: ModelsProps<cnst.${dict.Model}>>) => {
+export const Admin = ({ sliceName = "${dict.model}", init, query }: ModelsProps<cnst.${dict.Model}>) => {
   return (
     <Data.ListContainer
       init={init}
@@ -42,8 +42,8 @@ export const Admin = ({ sliceName = "${dict.model}", init, query }: ModelsProps<
       renderDashboard={${dict.Model}.Util.Stat}
       renderInsight={${dict.Model}.Util.Insight}
       renderTemplate={${dict.Model}.Template.General}
-      renderTitle={(${dict.model}: DefaultOf<cnst.${dict.Model}>>) => \`${dict.Model} - \${${dict.model}.id ? ${dict.model}.id : "New"}\`}
-      renderView={(${dict.model}: cnst.${dict.Model}>) => <${dict.Model}.View.General ${dict.model}={${dict.model}} />}
+      renderTitle={(${dict.model}: DefaultOf<cnst.${dict.Model}>) => \`${dict.Model} - \${${dict.model}.id ? ${dict.model}.id : "New"}\`}
+      renderView={(${dict.model}: cnst.${dict.Model}) => <${dict.Model}.View.General ${dict.model}={${dict.model}} />}
       columns={[
         "id",
         "status",

package/esm/index.js

@@ -1368,7 +1368,7 @@ var SysExecutor = class extends Executor {
       throw new Error(
         `Missing libs: ${missingLibDeps.join(", ")}, add these dependencies in akan.config.ts as { libs: [...other deps, ${missingLibDeps.join(", ")}] }`
       );
-    for (const libName of libDeps) {
+    for (const libName of akanConfig.libs) {
       if (libScanResults[libName])
         continue;
       const lib = new LibExecutor({ workspace: this.workspace, name: libName });
@@ -2109,7 +2109,9 @@ var AiSession = class _AiSession {
     }
   } = {}) {
     if (!_AiSession.#chat)
-      throw new Error("Please initialize the AI session first");
+      await _AiSession.init();
+    if (!_AiSession.#chat)
+      throw new Error("Failed to initialize the AI session");
     try {
       const humanMessage = new HumanMessage(question);
       this.messageHistory.push(humanMessage);
@@ -2238,15 +2240,10 @@ var Builder = class {
 import { compareVersions } from "compare-versions";
 import dotenv2 from "dotenv";
 var LibraryRunner = class {
-  async scanSync(lib) {
-    const akanConfig = await lib.getConfig();
-    const scanResult = await lib.scan({ akanConfig });
-    return scanResult;
-  }
   async createLibrary(libName, workspace) {
     await workspace.exec(`mkdir -p libs/${libName}`);
     const lib = LibExecutor.from(workspace, libName);
-    await lib.applyTemplate({ basePath: ".", template: "libRoot", dict: { libName, Libname: capitalize(libName) } });
+    await lib.applyTemplate({ basePath: ".", template: "libRoot", dict: { libName, LibName: capitalize(libName) } });
     const rootTsConfig = workspace.readJson("tsconfig.json");
     rootTsConfig.compilerOptions.paths[`@${libName}`] = [`libs/${libName}/index.ts`];
     rootTsConfig.compilerOptions.paths[`@${libName}/*`] = [`libs/${libName}/*`];
@@ -2338,17 +2335,18 @@ var LibraryRunner = class {
 var LibraryScript = class {
   #runner = new LibraryRunner();
   async scanLibrary(lib, verbose = false) {
-    const scanResult = await this.#runner.scanSync(lib);
+    const akanConfig = await lib.getConfig();
+    const scanResult = await lib.scan({ akanConfig });
     if (verbose)
       lib.logger.rawLog(JSON.stringify(scanResult, null, 2));
     return scanResult;
   }
   async syncLibrary(lib, { recursive = true } = {}) {
-    const scanResult = await this.scanLibrary(lib);
-    if (!recursive)
-      return;
-    for (const libName of scanResult.akanConfig.libs)
-      await this.syncLibrary(LibExecutor.from(lib.workspace, libName), { recursive: false });
+    const akanConfig = await lib.getConfig();
+    if (recursive)
+      for (const libName of akanConfig.libs)
+        await this.syncLibrary(LibExecutor.from(lib.workspace, libName), { recursive: false });
+    return await lib.scan({ akanConfig });
   }
   async createLibrary(libName, workspace) {
     const lib = await this.#runner.createLibrary(libName, workspace);
@@ -4555,13 +4553,15 @@ var ApplicationRunner = class {
     await app.workspace.exec(`rm -rf apps/${app.name}`);
     app.log(`Application ${app.name} removed`);
   }
-  async scanSync(app) {
-    const akanConfig = await getAppConfig(app.cwdPath, {
+  async getConfig(app) {
+    return await getAppConfig(app.cwdPath, {
       ...app.workspace.getBaseDevEnv(),
       type: "app",
       name: app.name,
       command: "start"
     });
+  }
+  async scanSync(app, akanConfig) {
     const scanResult = await app.scan({ akanConfig });
     await app.syncAssets(scanResult.akanConfig.libs);
     return scanResult;
@@ -5064,17 +5064,18 @@ var ApplicationScript = class {
     await this.#runner.removeApplication(app);
   }
   async scanApplication(app, verbose = false) {
-    const scanResult = await this.#runner.scanSync(app);
+    const akanConfig = await this.#runner.getConfig(app);
+    const scanResult = await this.#runner.scanSync(app, akanConfig);
     if (verbose)
       app.logger.rawLog(JSON.stringify(scanResult, null, 2));
     return scanResult;
   }
   async syncApplication(app, { recursive = true } = {}) {
-    const scanResult = await this.#runner.scanSync(app);
-    if (!recursive)
-      return;
-    for (const libName of scanResult.akanConfig.libs)
-      await this.libraryScript.syncLibrary(LibExecutor.from(app, libName), { recursive: false });
+    const akanConfig = await this.#runner.getConfig(app);
+    if (recursive)
+      for (const libName of akanConfig.libs)
+        await this.libraryScript.syncLibrary(LibExecutor.from(app, libName), { recursive: false });
+    return await this.#runner.scanSync(app, akanConfig);
   }
   async build(app) {
     await this.syncApplication(app);
@@ -5765,7 +5766,7 @@ var ModuleRunner = class {
       basePath: "./lib/__scalar",
       template: "__scalar",
       scanResult,
-      dict: { model: name, Model: capitalize(name) }
+      dict: { model: name, Model: capitalize(name), sysName: sys2.name, SysName: capitalize(sys2.name) }
     });
     await sys2.scan({ akanConfig });
     return {

package/esm/src/templates/libRoot/lib/___libName__/__libName__.service.js

@@ -1,20 +1,12 @@
 // pkgs/@akanjs/cli/src/templates/libRoot/lib/___libName__/__libName__.service.ts
 function getContent(scanResult, dict) {
   return `
-import { Cron } from "@akanjs/nest";
-import { LogService, Service, Srv } from "@akanjs/service";
+import { LogService, Service } from "@akanjs/service";
 
-import type * as srv from "../srv";
+// import type * as srv from "../srv";
 
 @Service("${dict.libName}Service", { serverMode: "batch" })
-export class ${dict.LibName}Service extends LogService("${dict.libName}Service") {
-  @Srv() protected readonly summaryService: srv.SummaryService;
-
-  @Cron("0 * * * *")
-  async takePeriodicSnapshot() {
-    await this.summaryService.makeSummary();
-  }
-}
+export class ${dict.LibName}Service extends LogService("${dict.libName}Service") {}
   `;
 }
 export {

package/esm/src/templates/module/__Model__.Unit.js

@@ -7,7 +7,7 @@ import { ModelProps } from "@akanjs/client";
 import { cnst, ${dict.Model} } from "@${dict.sysName}/client";
 import { Link } from "@util/ui";
 
-export const Card = ({ ${dict.model}, href }: ModelProps<"${dict.model}", cnst.Light${dict.Model}>>) => {
+export const Card = ({ ${dict.model}, href }: ModelProps<"${dict.model}", cnst.Light${dict.Model}>) => {
   return (
     <Link href={href} className="animate-fadeIn w-full h-36 flex rounded-lg shadow-sm hover:shadow-lg duration-300">
       <div>{${dict.model}.id}</div>

package/esm/src/templates/module/__Model__.Zone.js

@@ -9,7 +9,7 @@ import { ModelsProps } from "@akanjs/client";
 import { cnst, ${dict.Model} } from "@${dict.sysName}/client";
 import { ClientInit, ClientView, DefaultOf } from "@akanjs/signal";
 
-export const Admin = ({ sliceName = "${dict.model}", init, query }: ModelsProps<cnst.${dict.Model}>>) => {
+export const Admin = ({ sliceName = "${dict.model}", init, query }: ModelsProps<cnst.${dict.Model}>) => {
   return (
     <Data.ListContainer
       init={init}
@@ -19,8 +19,8 @@ export const Admin = ({ sliceName = "${dict.model}", init, query }: ModelsProps<
       renderDashboard={${dict.Model}.Util.Stat}
       renderInsight={${dict.Model}.Util.Insight}
       renderTemplate={${dict.Model}.Template.General}
-      renderTitle={(${dict.model}: DefaultOf<cnst.${dict.Model}>>) => \`${dict.Model} - \${${dict.model}.id ? ${dict.model}.id : "New"}\`}
-      renderView={(${dict.model}: cnst.${dict.Model}>) => <${dict.Model}.View.General ${dict.model}={${dict.model}} />}
+      renderTitle={(${dict.model}: DefaultOf<cnst.${dict.Model}>) => \`${dict.Model} - \${${dict.model}.id ? ${dict.model}.id : "New"}\`}
+      renderView={(${dict.model}: cnst.${dict.Model}) => <${dict.Model}.View.General ${dict.model}={${dict.model}} />}
       columns={[
         "id",
         "status",

package/package.json

@@ -1,7 +1,7 @@
 {
   "sourceType": "module",
   "name": "@akanjs/cli",
-  "version": "0.0.123",
+  "version": "0.0.125",
   "bin": {
     "akan": "cjs/index.js"
   },

package/src/application/application.runner.d.ts

@@ -1,3 +1,4 @@
+import { type AppConfigResult } from "@akanjs/config";
 import { App, AppExecutor, type Workspace } from "@akanjs/devkit";
 export interface ReleaseSourceOptions {
     rebuild?: boolean;
@@ -9,7 +10,8 @@ export declare class ApplicationRunner {
     #private;
     createApplication(appName: string, workspace: Workspace): Promise<AppExecutor>;
     removeApplication(app: App): Promise<void>;
-    scanSync(app: App): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
+    getConfig(app: App): Promise<AppConfigResult>;
+    scanSync(app: App, akanConfig: AppConfigResult): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     buildBackend(app: App): Promise<void>;
     startBackend(app: App, { open }?: {
         open?: boolean;

package/src/application/application.script.d.ts

@@ -11,7 +11,7 @@ export declare class ApplicationScript {
     scanApplication(app: App, verbose?: boolean): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     syncApplication(app: App, { recursive }?: {
         recursive?: boolean;
-    }): Promise<void>;
+    }): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     build(app: App): Promise<void>;
     start(app: App, { open }?: {
         open?: boolean;

package/src/library/library.runner.d.ts

@@ -1,7 +1,6 @@
 import { Lib, LibExecutor, Workspace } from "@akanjs/devkit";
 export declare class LibraryRunner {
     #private;
-    scanSync(lib: Lib): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     createLibrary(libName: string, workspace: Workspace): Promise<LibExecutor>;
     removeLibrary(lib: Lib): Promise<void>;
     installLibrary(workspace: Workspace, libName: string): Promise<LibExecutor>;

package/src/library/library.script.d.ts

@@ -4,7 +4,7 @@ export declare class LibraryScript {
     scanLibrary(lib: Lib, verbose?: boolean): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     syncLibrary(lib: Lib, { recursive }?: {
         recursive?: boolean;
-    }): Promise<void>;
+    }): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     createLibrary(libName: string, workspace: Workspace): Promise<void>;
     removeLibrary(lib: Lib): Promise<void>;
     installLibrary(workspace: Workspace, libName: string): Promise<void>;