@akanjs/cli 1.0.7-canary.2 → 1.0.7-canary.3

package/cjs/index.js

@@ -1480,6 +1480,7 @@ var AppInfo = class _AppInfo extends ScanInfo {
   type = "app";
   exec;
   akanConfig;
+  libDeps;
   static appInfos = /* @__PURE__ */ new Map();
   static async fromExecutor(exec2, options = {}) {
     const existingAppInfo = this.appInfos.get(exec2.name);
@@ -1493,24 +1494,41 @@ var AppInfo = class _AppInfo extends ScanInfo {
         LibInfo.libInfos.set(libName, await LibInfo.fromExecutor(libExecutor));
       })
     );
-    const appInfo = new _AppInfo(exec2, scanResult);
+    const libDeps = await this.#getAllLibDeps(exec2, scanResult.libDeps);
+    const appInfo = new _AppInfo(exec2, scanResult, libDeps);
     this.appInfos.set(exec2.name, appInfo);
     return appInfo;
   }
-  constructor(exec2, scanResult) {
+  constructor(exec2, scanResult, libDeps) {
     super(scanResult);
     this.exec = exec2;
     this.akanConfig = scanResult.akanConfig;
+    this.libDeps = libDeps;
   }
   getScanResult() {
     return this.scanResult;
   }
+  static async #getAllLibDeps(exec2, libDeps, libSet = /* @__PURE__ */ new Set()) {
+    await Promise.all(
+      libDeps.map(async (libName) => {
+        if (libSet.has(libName))
+          return;
+        libSet.add(libName);
+        const libExecutor = LibExecutor.from(exec2, libName);
+        const libInfo = await LibInfo.fromExecutor(libExecutor);
+        const libScanResult = libInfo.getScanResult();
+        if (libScanResult.libDeps.length > 0)
+          await this.#getAllLibDeps(exec2, libScanResult.libDeps, libSet);
+      })
+    );
+    return [...libSet];
+  }
   #sortedLibs = null;
   #getSortedLibs() {
     if (this.#sortedLibs)
       return this.#sortedLibs;
     const libIndices = LibInfo.getSortedLibIndices();
-    this.#sortedLibs = this.getScanResult().libDeps.sort((libNameA, libNameB) => {
+    this.#sortedLibs = this.libDeps.sort((libNameA, libNameB) => {
       const indexA = libIndices.get(libNameA);
       const indexB = libIndices.get(libNameB);
       if (indexA === void 0 || indexB === void 0)
@@ -1522,12 +1540,6 @@ var AppInfo = class _AppInfo extends ScanInfo {
   getLibs() {
     return this.#getSortedLibs();
   }
-  getLibInfo(libName) {
-    const libSet = new Set(this.#getSortedLibs());
-    if (!libSet.has(libName))
-      throw new Error(`LibInfo is invalid: ${libName}`);
-    return LibInfo.libInfos.get(libName);
-  }
   getLibInfos() {
     return new Map(
       this.#getSortedLibs().map((libName) => {
@@ -2170,7 +2182,7 @@ var Executor = class _Executor {
   }, dict = {}, options = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
       const getContent = await import(templatePath);
-      const result = getContent.default(scanInfo ?? null, dict, options);
+      const result = await getContent.default(scanInfo ?? null, dict, options);
       if (result === null)
         return null;
       const filename = typeof result === "object" ? result.filename : import_path4.default.basename(targetPath).replace(".js", ".ts");
@@ -2619,8 +2631,9 @@ var SysExecutor = class extends Executor {
     const scanInfo = this.type === "app" ? await AppInfo.fromExecutor(this) : await LibInfo.fromExecutor(this);
     const sysContantFiles = await this.getConstantFiles();
     const sysScalarConstantFiles = await this.getScalarConstantFiles();
+    const libDeps = scanInfo.getLibs();
     const libConstantFiles = await Promise.all(
-      scanInfo.getLibs().map(async (lib) => [
+      libDeps.map(async (lib) => [
         ...await LibExecutor.from(this, lib).getConstantFiles(),
         ...await LibExecutor.from(this, lib).getScalarConstantFiles()
       ])

package/cjs/src/guidelines/modelStore/modelStore.instruction.md

@@ -35,7 +35,7 @@ Model stores follow a consistent architecture pattern:
 ```typescript
 import { stateOf, Store } from "@akanjs/store";
 import * as cnst from "../cnst";
-import { fetch } from "../sig";
+import { fetch } from "../useServer";
 
 export class ProductStore extends stateOf(fetch.productGql, {
   // Custom state properties
@@ -437,19 +437,16 @@ initProductChat(productId: string) {
 ## Best Practices
 
 1. **Naming Conventions**:
-
    - Use `modelList{Context}` for slice names (e.g., `productListByCategory`)
    - Use camelCase for state properties
    - Use action verbs for method names
 
 2. **State Management**:
-
    - Keep UI state (loading, selected items) in the store
    - Use `this.pick()` for accessing multiple properties
    - Create new references for objects/arrays when updating
 
 3. **Performance**:
-
    - Use selective subscriptions in components:
      ```typescript
      // Subscribe to specific state properties
@@ -459,13 +456,11 @@ initProductChat(productId: string) {
    - Clean up subscriptions when components unmount
 
 4. **Error Handling**:
-
    - Use the `@Toast` decorator for user notifications
    - Always reset loading states in finally blocks
    - Implement retry logic for critical operations
 
 5. **Testing**:
-
    - Mock stores with initial state for unit tests
 
      ```typescript
@@ -485,7 +480,7 @@ initProductChat(productId: string) {
 ```typescript
 import { stateOf, Store, Toast } from "@akanjs/store";
 import * as cnst from "../cnst";
-import { fetch } from "../sig";
+import { fetch } from "../useServer";
 import { msg } from "../msg";
 
 export class ProductStore extends stateOf(fetch.productGql, {

package/cjs/src/templates/lib/__lib/lib.constant.js

@@ -26,8 +26,7 @@ var capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 function getContent(scanInfo, dict = {}) {
   if (!scanInfo)
     return null;
-  const scanResult = scanInfo.getScanResult();
-  const libs = scanResult.libDeps;
+  const libs = scanInfo.getLibs();
   const libInfos = scanInfo.getLibInfos();
   const extendedModels = Object.fromEntries(
     [...scanInfo.file.constant.databases].map(

package/cjs/src/templates/lib/__lib/lib.dictionary.js

@@ -25,8 +25,7 @@ module.exports = __toCommonJS(lib_dictionary_exports);
 function getContent(scanInfo, dict = {}) {
   if (!scanInfo)
     return null;
-  const scanResult = scanInfo.getScanResult();
-  const libs = scanResult.libDeps;
+  const libs = scanInfo.getLibs();
   const libInfos = scanInfo.getLibInfos();
   const extendedModels = Object.fromEntries(
     [...scanInfo.file.dictionary.databases].map(

package/esm/index.js

@@ -1459,6 +1459,7 @@ var AppInfo = class _AppInfo extends ScanInfo {
   type = "app";
   exec;
   akanConfig;
+  libDeps;
   static appInfos = /* @__PURE__ */ new Map();
   static async fromExecutor(exec2, options = {}) {
     const existingAppInfo = this.appInfos.get(exec2.name);
@@ -1472,24 +1473,41 @@ var AppInfo = class _AppInfo extends ScanInfo {
         LibInfo.libInfos.set(libName, await LibInfo.fromExecutor(libExecutor));
       })
     );
-    const appInfo = new _AppInfo(exec2, scanResult);
+    const libDeps = await this.#getAllLibDeps(exec2, scanResult.libDeps);
+    const appInfo = new _AppInfo(exec2, scanResult, libDeps);
     this.appInfos.set(exec2.name, appInfo);
     return appInfo;
   }
-  constructor(exec2, scanResult) {
+  constructor(exec2, scanResult, libDeps) {
     super(scanResult);
     this.exec = exec2;
     this.akanConfig = scanResult.akanConfig;
+    this.libDeps = libDeps;
   }
   getScanResult() {
     return this.scanResult;
   }
+  static async #getAllLibDeps(exec2, libDeps, libSet = /* @__PURE__ */ new Set()) {
+    await Promise.all(
+      libDeps.map(async (libName) => {
+        if (libSet.has(libName))
+          return;
+        libSet.add(libName);
+        const libExecutor = LibExecutor.from(exec2, libName);
+        const libInfo = await LibInfo.fromExecutor(libExecutor);
+        const libScanResult = libInfo.getScanResult();
+        if (libScanResult.libDeps.length > 0)
+          await this.#getAllLibDeps(exec2, libScanResult.libDeps, libSet);
+      })
+    );
+    return [...libSet];
+  }
   #sortedLibs = null;
   #getSortedLibs() {
     if (this.#sortedLibs)
       return this.#sortedLibs;
     const libIndices = LibInfo.getSortedLibIndices();
-    this.#sortedLibs = this.getScanResult().libDeps.sort((libNameA, libNameB) => {
+    this.#sortedLibs = this.libDeps.sort((libNameA, libNameB) => {
       const indexA = libIndices.get(libNameA);
       const indexB = libIndices.get(libNameB);
       if (indexA === void 0 || indexB === void 0)
@@ -1501,12 +1519,6 @@ var AppInfo = class _AppInfo extends ScanInfo {
   getLibs() {
     return this.#getSortedLibs();
   }
-  getLibInfo(libName) {
-    const libSet = new Set(this.#getSortedLibs());
-    if (!libSet.has(libName))
-      throw new Error(`LibInfo is invalid: ${libName}`);
-    return LibInfo.libInfos.get(libName);
-  }
   getLibInfos() {
     return new Map(
       this.#getSortedLibs().map((libName) => {
@@ -2148,7 +2160,7 @@ var Executor = class _Executor {
   }, dict = {}, options = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
       const getContent = await import(templatePath);
-      const result = getContent.default(scanInfo ?? null, dict, options);
+      const result = await getContent.default(scanInfo ?? null, dict, options);
       if (result === null)
         return null;
       const filename = typeof result === "object" ? result.filename : path7.basename(targetPath).replace(".js", ".ts");
@@ -2597,8 +2609,9 @@ var SysExecutor = class extends Executor {
     const scanInfo = this.type === "app" ? await AppInfo.fromExecutor(this) : await LibInfo.fromExecutor(this);
     const sysContantFiles = await this.getConstantFiles();
     const sysScalarConstantFiles = await this.getScalarConstantFiles();
+    const libDeps = scanInfo.getLibs();
     const libConstantFiles = await Promise.all(
-      scanInfo.getLibs().map(async (lib) => [
+      libDeps.map(async (lib) => [
         ...await LibExecutor.from(this, lib).getConstantFiles(),
         ...await LibExecutor.from(this, lib).getScalarConstantFiles()
       ])

package/esm/src/guidelines/modelStore/modelStore.instruction.md

@@ -35,7 +35,7 @@ Model stores follow a consistent architecture pattern:
 ```typescript
 import { stateOf, Store } from "@akanjs/store";
 import * as cnst from "../cnst";
-import { fetch } from "../sig";
+import { fetch } from "../useServer";
 
 export class ProductStore extends stateOf(fetch.productGql, {
   // Custom state properties
@@ -437,19 +437,16 @@ initProductChat(productId: string) {
 ## Best Practices
 
 1. **Naming Conventions**:
-
    - Use `modelList{Context}` for slice names (e.g., `productListByCategory`)
    - Use camelCase for state properties
    - Use action verbs for method names
 
 2. **State Management**:
-
    - Keep UI state (loading, selected items) in the store
    - Use `this.pick()` for accessing multiple properties
    - Create new references for objects/arrays when updating
 
 3. **Performance**:
-
    - Use selective subscriptions in components:
      ```typescript
      // Subscribe to specific state properties
@@ -459,13 +456,11 @@ initProductChat(productId: string) {
    - Clean up subscriptions when components unmount
 
 4. **Error Handling**:
-
    - Use the `@Toast` decorator for user notifications
    - Always reset loading states in finally blocks
    - Implement retry logic for critical operations
 
 5. **Testing**:
-
    - Mock stores with initial state for unit tests
 
      ```typescript
@@ -485,7 +480,7 @@ initProductChat(productId: string) {
 ```typescript
 import { stateOf, Store, Toast } from "@akanjs/store";
 import * as cnst from "../cnst";
-import { fetch } from "../sig";
+import { fetch } from "../useServer";
 import { msg } from "../msg";
 
 export class ProductStore extends stateOf(fetch.productGql, {

package/esm/src/templates/lib/__lib/lib.constant.js

@@ -3,8 +3,7 @@ var capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 function getContent(scanInfo, dict = {}) {
   if (!scanInfo)
     return null;
-  const scanResult = scanInfo.getScanResult();
-  const libs = scanResult.libDeps;
+  const libs = scanInfo.getLibs();
   const libInfos = scanInfo.getLibInfos();
   const extendedModels = Object.fromEntries(
     [...scanInfo.file.constant.databases].map(

package/esm/src/templates/lib/__lib/lib.dictionary.js

@@ -2,8 +2,7 @@
 function getContent(scanInfo, dict = {}) {
   if (!scanInfo)
     return null;
-  const scanResult = scanInfo.getScanResult();
-  const libs = scanResult.libDeps;
+  const libs = scanInfo.getLibs();
   const libInfos = scanInfo.getLibInfos();
   const extendedModels = Object.fromEntries(
     [...scanInfo.file.dictionary.databases].map(

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "sourceType": "module",
   "name": "@akanjs/cli",
-  "version": "1.0.7-canary.2",
+  "version": "1.0.7-canary.3",
   "bin": {
     "akan": "esm/index.js"
   },

package/src/guidelines/modelStore/modelStore.instruction.md

@@ -35,7 +35,7 @@ Model stores follow a consistent architecture pattern:
 ```typescript
 import { stateOf, Store } from "@akanjs/store";
 import * as cnst from "../cnst";
-import { fetch } from "../sig";
+import { fetch } from "../useServer";
 
 export class ProductStore extends stateOf(fetch.productGql, {
   // Custom state properties
@@ -437,19 +437,16 @@ initProductChat(productId: string) {
 ## Best Practices
 
 1. **Naming Conventions**:
-
    - Use `modelList{Context}` for slice names (e.g., `productListByCategory`)
    - Use camelCase for state properties
    - Use action verbs for method names
 
 2. **State Management**:
-
    - Keep UI state (loading, selected items) in the store
    - Use `this.pick()` for accessing multiple properties
    - Create new references for objects/arrays when updating
 
 3. **Performance**:
-
    - Use selective subscriptions in components:
      ```typescript
      // Subscribe to specific state properties
@@ -459,13 +456,11 @@ initProductChat(productId: string) {
    - Clean up subscriptions when components unmount
 
 4. **Error Handling**:
-
    - Use the `@Toast` decorator for user notifications
    - Always reset loading states in finally blocks
    - Implement retry logic for critical operations
 
 5. **Testing**:
-
    - Mock stores with initial state for unit tests
 
      ```typescript
@@ -485,7 +480,7 @@ initProductChat(productId: string) {
 ```typescript
 import { stateOf, Store, Toast } from "@akanjs/store";
 import * as cnst from "../cnst";
-import { fetch } from "../sig";
+import { fetch } from "../useServer";
 import { msg } from "../msg";
 
 export class ProductStore extends stateOf(fetch.productGql, {