@akanjs/devkit 1.0.7-canary.2 → 1.0.7-canary.4

package/cjs/src/executors.js

@@ -341,7 +341,7 @@ 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_path.default.basename(targetPath).replace(".js", ".ts");
@@ -790,8 +790,9 @@ class SysExecutor extends Executor {
     const scanInfo = this.type === "app" ? await import_scanInfo.AppInfo.fromExecutor(this) : await import_scanInfo.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/scanInfo.js

@@ -246,6 +246,7 @@ class AppInfo extends ScanInfo {
   type = "app";
   exec;
   akanConfig;
+  libDeps;
   static appInfos = /* @__PURE__ */ new Map();
   static async fromExecutor(exec, options = {}) {
     const existingAppInfo = this.appInfos.get(exec.name);
@@ -259,24 +260,41 @@ class AppInfo extends ScanInfo {
         LibInfo.libInfos.set(libName, await LibInfo.fromExecutor(libExecutor));
       })
     );
-    const appInfo = new AppInfo(exec, scanResult);
+    const libDeps = await this.#getAllLibDeps(exec, scanResult.libDeps);
+    const appInfo = new AppInfo(exec, scanResult, libDeps);
     this.appInfos.set(exec.name, appInfo);
     return appInfo;
   }
-  constructor(exec, scanResult) {
+  constructor(exec, scanResult, libDeps) {
     super(scanResult);
     this.exec = exec;
     this.akanConfig = scanResult.akanConfig;
+    this.libDeps = libDeps;
   }
   getScanResult() {
     return this.scanResult;
   }
+  static async #getAllLibDeps(exec, libDeps, libSet = /* @__PURE__ */ new Set()) {
+    await Promise.all(
+      libDeps.map(async (libName) => {
+        if (libSet.has(libName))
+          return;
+        libSet.add(libName);
+        const libExecutor = import_executors.LibExecutor.from(exec, libName);
+        const libInfo = await LibInfo.fromExecutor(libExecutor);
+        const libScanResult = libInfo.getScanResult();
+        if (libScanResult.libDeps.length > 0)
+          await this.#getAllLibDeps(exec, 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)
@@ -288,12 +306,6 @@ 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) => {

package/esm/src/executors.js

@@ -306,7 +306,7 @@ 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 : path.basename(targetPath).replace(".js", ".ts");
@@ -755,8 +755,9 @@ class SysExecutor 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/scanInfo.js

@@ -211,6 +211,7 @@ class AppInfo extends ScanInfo {
   type = "app";
   exec;
   akanConfig;
+  libDeps;
   static appInfos = /* @__PURE__ */ new Map();
   static async fromExecutor(exec, options = {}) {
     const existingAppInfo = this.appInfos.get(exec.name);
@@ -224,24 +225,41 @@ class AppInfo extends ScanInfo {
         LibInfo.libInfos.set(libName, await LibInfo.fromExecutor(libExecutor));
       })
     );
-    const appInfo = new AppInfo(exec, scanResult);
+    const libDeps = await this.#getAllLibDeps(exec, scanResult.libDeps);
+    const appInfo = new AppInfo(exec, scanResult, libDeps);
     this.appInfos.set(exec.name, appInfo);
     return appInfo;
   }
-  constructor(exec, scanResult) {
+  constructor(exec, scanResult, libDeps) {
     super(scanResult);
     this.exec = exec;
     this.akanConfig = scanResult.akanConfig;
+    this.libDeps = libDeps;
   }
   getScanResult() {
     return this.scanResult;
   }
+  static async #getAllLibDeps(exec, libDeps, libSet = /* @__PURE__ */ new Set()) {
+    await Promise.all(
+      libDeps.map(async (libName) => {
+        if (libSet.has(libName))
+          return;
+        libSet.add(libName);
+        const libExecutor = LibExecutor.from(exec, libName);
+        const libInfo = await LibInfo.fromExecutor(libExecutor);
+        const libScanResult = libInfo.getScanResult();
+        if (libScanResult.libDeps.length > 0)
+          await this.#getAllLibDeps(exec, 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)
@@ -253,12 +271,6 @@ 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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "1.0.7-canary.2",
+  "version": "1.0.7-canary.4",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/scanInfo.d.ts

@@ -26,14 +26,14 @@ export declare class AppInfo extends ScanInfo {
     readonly type = "app";
     readonly exec: AppExecutor;
     readonly akanConfig: AppConfigResult;
+    readonly libDeps: string[];
     static appInfos: Map<string, AppInfo>;
     static fromExecutor(exec: AppExecutor, options?: {
         refresh?: boolean;
     }): Promise<AppInfo>;
-    constructor(exec: AppExecutor, scanResult: AppScanResult);
+    constructor(exec: AppExecutor, scanResult: AppScanResult, libDeps: string[]);
     getScanResult(): AppScanResult;
     getLibs(): string[];
-    getLibInfo(libName: string): LibInfo | undefined;
     getLibInfos(): Map<string, LibInfo>;
 }
 export declare class LibInfo extends ScanInfo {