@akanjs/devkit 0.9.58 → 0.9.60-canary.0

package/cjs/src/aiEditor.js

@@ -111,7 +111,7 @@ class AiSession {
   }
   messageHistory = [];
   sessionKey;
-  isCacheLoaded;
+  isCacheLoaded = false;
   workspace;
   constructor(type, { workspace, cacheKey, isContinued }) {
     this.workspace = workspace;

package/cjs/src/auth.js

@@ -50,7 +50,7 @@ const getHostConfig = (host = import_constants.akanCloudHost) => {
 };
 const setHostConfig = (host = import_constants.akanCloudHost, config = {}) => {
   const akanConfig = getAkanGlobalConfig();
-  akanConfig[host] = config;
+  akanConfig.cloudHost[host] = config;
   setAkanGlobalConfig(akanConfig);
 };
 const getSelf = async (token) => {

package/cjs/src/capacitorApp.js

@@ -37,24 +37,24 @@ var import_fileEditor = require("./fileEditor");
 class CapacitorApp {
   constructor(app) {
     this.app = app;
+    this.project = new import_project.MobileProject(this.app.cwdPath, {
+      android: { path: "android" },
+      ios: { path: "ios/App" }
+    });
   }
   project;
   iosTargetName = "App";
   async init() {
-    const project = new import_project.MobileProject(this.app.cwdPath, {
-      android: { path: "android" },
-      ios: { path: "ios/App" }
-    });
-    await project.load();
+    const project = this.project;
+    await this.project.load();
     if (!project.android) {
       await this.app.spawn("npx", ["cap", "add", "android"]);
-      await project.load();
+      await this.project.load();
     }
     if (!project.ios) {
       await this.app.spawn("npx", ["cap", "add", "ios"]);
-      await project.load();
+      await this.project.load();
     }
-    this.project = project;
     return this;
   }
   async save() {

package/cjs/src/commandDecorators/command.js

@@ -47,13 +47,16 @@ const handleOption = (programCommand, argMeta) => {
     flag = argMeta.name.slice(0, 1).toLowerCase(),
     desc = argMeta.name,
     example,
-    enum: choices,
+    enum: enumChoices,
     ask
   } = argMeta.argsOption;
   const kebabName = camelToKebabCase(argMeta.name);
+  const choices = enumChoices?.map(
+    (choice) => typeof choice === "object" ? { value: choice.value, name: choice.label } : { value: choice, name: choice.toString() }
+  );
   programCommand.option(
     `-${flag}, --${kebabName}${type === "boolean" ? " [boolean]" : ` <${kebabName}>`}`,
-    `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.join(", ")})` : ""}`
+    `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.map((choice) => choice.name).join(", ")})` : ""}`
   );
   return programCommand;
 };
@@ -78,7 +81,7 @@ const convertOptionValue = (value, type) => {
 const getOptionValue = async (argMeta, opt) => {
   const {
     name,
-    argsOption: { enum: choices, default: defaultValue, type, desc, nullable, example, ask }
+    argsOption: { enum: enumChoices, default: defaultValue, type, desc, nullable, example, ask }
   } = argMeta;
   if (opt[argMeta.name] !== void 0)
     return convertOptionValue(opt[argMeta.name], type ?? "string");
@@ -86,11 +89,11 @@ const getOptionValue = async (argMeta, opt) => {
     return defaultValue;
   else if (nullable)
     return null;
-  if (choices) {
-    const choice = await (0, import_prompts.select)({
-      message: ask ?? desc ?? `Select the ${name} value`,
-      choices: choices.map((choice2) => choice2.toString())
-    });
+  if (enumChoices) {
+    const choices = enumChoices.map(
+      (choice2) => typeof choice2 === "object" ? { value: choice2.value, name: choice2.label } : { value: choice2, name: choice2.toString() }
+    );
+    const choice = await (0, import_prompts.select)({ message: ask ?? desc ?? `Select the ${name} value`, choices });
     return choice;
   } else if (type === "boolean") {
     const message = ask ?? desc ?? `Do you want to set ${name}? ${desc ? ` (${desc})` : ""}: `;

package/cjs/src/executors.js

@@ -330,10 +330,10 @@ class Executor {
     targetPath,
     scanInfo,
     overwrite = true
-  }, dict = {}) {
+  }, dict = {}, options = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
       const getContent = await import(templatePath);
-      const result = getContent.default(scanInfo ?? null, dict);
+      const result = 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");
@@ -365,6 +365,7 @@ class Executor {
     template,
     scanInfo,
     dict = {},
+    options = {},
     overwrite = true
   }) {
     const templatePath = `${(0, import_getDirname.getDirname)(import_meta.url)}/src/templates${template ? `/${template}` : ""}`;
@@ -373,7 +374,8 @@ class Executor {
       const filename = import_path.default.basename(prefixTemplatePath);
       const fileContent = await this.#applyTemplateFile(
         { templatePath: prefixTemplatePath, targetPath: import_path.default.join(basePath, filename), scanInfo, overwrite },
-        dict
+        dict,
+        options
       );
       return fileContent ? [fileContent] : [];
     } else {
@@ -384,7 +386,8 @@ class Executor {
           if (import_fs.default.statSync(subpath).isFile()) {
             const fileContent = await this.#applyTemplateFile(
               { templatePath: subpath, targetPath: import_path.default.join(basePath, subdir), scanInfo, overwrite },
-              dict
+              dict,
+              options
             );
             return fileContent ? [fileContent] : [];
           } else
@@ -393,7 +396,8 @@ class Executor {
               template: import_path.default.join(template, subdir),
               scanInfo,
               dict,
-              overwrite
+              overwrite,
+              options
             });
         })
       )).flat();
@@ -634,6 +638,7 @@ class SysExecutor extends Executor {
     const scanInfo = this.type === "app" ? await import_scanInfo.AppInfo.fromExecutor(this, { refresh }) : await import_scanInfo.LibInfo.fromExecutor(this, { refresh });
     if (write) {
       await Promise.all([
+        this._applyTemplate({ basePath: "env", template: "env", scanInfo }),
         this._applyTemplate({ basePath: "lib", template: "lib", scanInfo }),
         this._applyTemplate({ basePath: ".", template: "server.ts", scanInfo }),
         this._applyTemplate({ basePath: ".", template: "client.ts", scanInfo }),
@@ -662,6 +667,7 @@ class SysExecutor extends Executor {
         const libInfos = [...scanInfo.getLibInfos().values()];
         await Promise.all(
           libInfos.map((libInfo) => [
+            libInfo.exec._applyTemplate({ basePath: "env", template: "env", scanInfo: libInfo }),
             libInfo.exec._applyTemplate({ basePath: "lib", template: "lib", scanInfo: libInfo }),
             libInfo.exec._applyTemplate({ basePath: ".", template: "server.ts", scanInfo: libInfo }),
             libInfo.exec._applyTemplate({ basePath: ".", template: "client.ts", scanInfo: libInfo }),
@@ -859,8 +865,6 @@ class AppExecutor extends SysExecutor {
   }
 }
 class LibExecutor extends SysExecutor {
-  workspaceRoot;
-  repoName;
   dist;
   emoji = execEmoji.lib;
   constructor({ workspace, name }) {

package/cjs/src/scanInfo.js

@@ -206,32 +206,31 @@ class ScanInfo {
   constructor(scanResult) {
     this.name = scanResult.name;
     this.scanResult = scanResult;
-    Object.entries(scanResult.files).forEach(
-      ([key, value]) => {
-        const { databases, services, scalars } = value;
-        databases.forEach((modelName) => {
-          const model = this.database.get(modelName) ?? /* @__PURE__ */ new Set();
-          model.add(key);
-          this.database.set(modelName, model);
-          this.file[key].all.add(modelName);
-          this.file[key].databases.add(modelName);
-        });
-        services?.forEach((serviceName) => {
-          const service = this.service.get(serviceName) ?? /* @__PURE__ */ new Set();
-          service.add(key);
-          this.service.set(serviceName, service);
-          this.file[key].all.add(serviceName);
-          this.file[key].services.add(serviceName);
-        });
-        scalars?.forEach((scalarName) => {
-          const scalar = this.scalar.get(scalarName) ?? /* @__PURE__ */ new Set();
-          scalar.add(key);
-          this.scalar.set(scalarName, scalar);
-          this.file[key].all.add(scalarName);
-          this.file[key].scalars.add(scalarName);
-        });
-      }
-    );
+    Object.entries(scanResult.files).forEach(([_key, value]) => {
+      const key = _key;
+      const { databases, services, scalars } = value;
+      databases.forEach((modelName) => {
+        const model = this.database.get(modelName) ?? /* @__PURE__ */ new Set();
+        model.add(key);
+        this.database.set(modelName, model);
+        this.file[key].all.add(modelName);
+        this.file[key].databases.add(modelName);
+      });
+      services?.forEach((serviceName) => {
+        const service = this.service.get(serviceName) ?? /* @__PURE__ */ new Set();
+        service.add(key);
+        this.service.set(serviceName, service);
+        this.file[key].all.add(serviceName);
+        this.file[key].services.add(serviceName);
+      });
+      scalars?.forEach((scalarName) => {
+        const scalar = this.scalar.get(scalarName) ?? /* @__PURE__ */ new Set();
+        scalar.add(key);
+        this.scalar.set(scalarName, scalar);
+        this.file[key].all.add(scalarName);
+        this.file[key].scalars.add(scalarName);
+      });
+    });
   }
   getScanResult() {
     return this.scanResult;

package/cjs/src/spinner.js

@@ -34,8 +34,8 @@ var import_ora = __toESM(require("ora"));
 class Spinner {
   static padding = 12;
   spinner;
-  stopWatch;
-  startAt;
+  stopWatch = null;
+  startAt = /* @__PURE__ */ new Date();
   prefix;
   message;
   enableSpin;

package/esm/src/aiEditor.js

@@ -83,7 +83,7 @@ class AiSession {
   }
   messageHistory = [];
   sessionKey;
-  isCacheLoaded;
+  isCacheLoaded = false;
   workspace;
   constructor(type, { workspace, cacheKey, isContinued }) {
     this.workspace = workspace;

package/esm/src/auth.js

@@ -21,7 +21,7 @@ const getHostConfig = (host = akanCloudHost) => {
 };
 const setHostConfig = (host = akanCloudHost, config = {}) => {
   const akanConfig = getAkanGlobalConfig();
-  akanConfig[host] = config;
+  akanConfig.cloudHost[host] = config;
   setAkanGlobalConfig(akanConfig);
 };
 const getSelf = async (token) => {

package/esm/src/capacitorApp.js

@@ -5,24 +5,24 @@ import { FileEditor } from "./fileEditor";
 class CapacitorApp {
   constructor(app) {
     this.app = app;
+    this.project = new MobileProject(this.app.cwdPath, {
+      android: { path: "android" },
+      ios: { path: "ios/App" }
+    });
   }
   project;
   iosTargetName = "App";
   async init() {
-    const project = new MobileProject(this.app.cwdPath, {
-      android: { path: "android" },
-      ios: { path: "ios/App" }
-    });
-    await project.load();
+    const project = this.project;
+    await this.project.load();
     if (!project.android) {
       await this.app.spawn("npx", ["cap", "add", "android"]);
-      await project.load();
+      await this.project.load();
     }
     if (!project.ios) {
       await this.app.spawn("npx", ["cap", "add", "ios"]);
-      await project.load();
+      await this.project.load();
     }
-    this.project = project;
     return this;
   }
   async save() {

package/esm/src/commandDecorators/command.js

@@ -14,13 +14,16 @@ const handleOption = (programCommand, argMeta) => {
     flag = argMeta.name.slice(0, 1).toLowerCase(),
     desc = argMeta.name,
     example,
-    enum: choices,
+    enum: enumChoices,
     ask
   } = argMeta.argsOption;
   const kebabName = camelToKebabCase(argMeta.name);
+  const choices = enumChoices?.map(
+    (choice) => typeof choice === "object" ? { value: choice.value, name: choice.label } : { value: choice, name: choice.toString() }
+  );
   programCommand.option(
     `-${flag}, --${kebabName}${type === "boolean" ? " [boolean]" : ` <${kebabName}>`}`,
-    `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.join(", ")})` : ""}`
+    `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.map((choice) => choice.name).join(", ")})` : ""}`
   );
   return programCommand;
 };
@@ -45,7 +48,7 @@ const convertOptionValue = (value, type) => {
 const getOptionValue = async (argMeta, opt) => {
   const {
     name,
-    argsOption: { enum: choices, default: defaultValue, type, desc, nullable, example, ask }
+    argsOption: { enum: enumChoices, default: defaultValue, type, desc, nullable, example, ask }
   } = argMeta;
   if (opt[argMeta.name] !== void 0)
     return convertOptionValue(opt[argMeta.name], type ?? "string");
@@ -53,11 +56,11 @@ const getOptionValue = async (argMeta, opt) => {
     return defaultValue;
   else if (nullable)
     return null;
-  if (choices) {
-    const choice = await select({
-      message: ask ?? desc ?? `Select the ${name} value`,
-      choices: choices.map((choice2) => choice2.toString())
-    });
+  if (enumChoices) {
+    const choices = enumChoices.map(
+      (choice2) => typeof choice2 === "object" ? { value: choice2.value, name: choice2.label } : { value: choice2, name: choice2.toString() }
+    );
+    const choice = await select({ message: ask ?? desc ?? `Select the ${name} value`, choices });
     return choice;
   } else if (type === "boolean") {
     const message = ask ?? desc ?? `Do you want to set ${name}? ${desc ? ` (${desc})` : ""}: `;

package/esm/src/executors.js

@@ -295,10 +295,10 @@ class Executor {
     targetPath,
     scanInfo,
     overwrite = true
-  }, dict = {}) {
+  }, dict = {}, options = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
       const getContent = await import(templatePath);
-      const result = getContent.default(scanInfo ?? null, dict);
+      const result = getContent.default(scanInfo ?? null, dict, options);
       if (result === null)
         return null;
       const filename = typeof result === "object" ? result.filename : path.basename(targetPath).replace(".js", ".ts");
@@ -330,6 +330,7 @@ class Executor {
     template,
     scanInfo,
     dict = {},
+    options = {},
     overwrite = true
   }) {
     const templatePath = `${getDirname(import.meta.url)}/src/templates${template ? `/${template}` : ""}`;
@@ -338,7 +339,8 @@ class Executor {
       const filename = path.basename(prefixTemplatePath);
       const fileContent = await this.#applyTemplateFile(
         { templatePath: prefixTemplatePath, targetPath: path.join(basePath, filename), scanInfo, overwrite },
-        dict
+        dict,
+        options
       );
       return fileContent ? [fileContent] : [];
     } else {
@@ -349,7 +351,8 @@ class Executor {
           if (fs.statSync(subpath).isFile()) {
             const fileContent = await this.#applyTemplateFile(
               { templatePath: subpath, targetPath: path.join(basePath, subdir), scanInfo, overwrite },
-              dict
+              dict,
+              options
             );
             return fileContent ? [fileContent] : [];
           } else
@@ -358,7 +361,8 @@ class Executor {
               template: path.join(template, subdir),
               scanInfo,
               dict,
-              overwrite
+              overwrite,
+              options
             });
         })
       )).flat();
@@ -599,6 +603,7 @@ class SysExecutor extends Executor {
     const scanInfo = this.type === "app" ? await AppInfo.fromExecutor(this, { refresh }) : await LibInfo.fromExecutor(this, { refresh });
     if (write) {
       await Promise.all([
+        this._applyTemplate({ basePath: "env", template: "env", scanInfo }),
         this._applyTemplate({ basePath: "lib", template: "lib", scanInfo }),
         this._applyTemplate({ basePath: ".", template: "server.ts", scanInfo }),
         this._applyTemplate({ basePath: ".", template: "client.ts", scanInfo }),
@@ -627,6 +632,7 @@ class SysExecutor extends Executor {
         const libInfos = [...scanInfo.getLibInfos().values()];
         await Promise.all(
           libInfos.map((libInfo) => [
+            libInfo.exec._applyTemplate({ basePath: "env", template: "env", scanInfo: libInfo }),
             libInfo.exec._applyTemplate({ basePath: "lib", template: "lib", scanInfo: libInfo }),
             libInfo.exec._applyTemplate({ basePath: ".", template: "server.ts", scanInfo: libInfo }),
             libInfo.exec._applyTemplate({ basePath: ".", template: "client.ts", scanInfo: libInfo }),
@@ -824,8 +830,6 @@ class AppExecutor extends SysExecutor {
   }
 }
 class LibExecutor extends SysExecutor {
-  workspaceRoot;
-  repoName;
   dist;
   emoji = execEmoji.lib;
   constructor({ workspace, name }) {

package/esm/src/scanInfo.js

@@ -171,32 +171,31 @@ class ScanInfo {
   constructor(scanResult) {
     this.name = scanResult.name;
     this.scanResult = scanResult;
-    Object.entries(scanResult.files).forEach(
-      ([key, value]) => {
-        const { databases, services, scalars } = value;
-        databases.forEach((modelName) => {
-          const model = this.database.get(modelName) ?? /* @__PURE__ */ new Set();
-          model.add(key);
-          this.database.set(modelName, model);
-          this.file[key].all.add(modelName);
-          this.file[key].databases.add(modelName);
-        });
-        services?.forEach((serviceName) => {
-          const service = this.service.get(serviceName) ?? /* @__PURE__ */ new Set();
-          service.add(key);
-          this.service.set(serviceName, service);
-          this.file[key].all.add(serviceName);
-          this.file[key].services.add(serviceName);
-        });
-        scalars?.forEach((scalarName) => {
-          const scalar = this.scalar.get(scalarName) ?? /* @__PURE__ */ new Set();
-          scalar.add(key);
-          this.scalar.set(scalarName, scalar);
-          this.file[key].all.add(scalarName);
-          this.file[key].scalars.add(scalarName);
-        });
-      }
-    );
+    Object.entries(scanResult.files).forEach(([_key, value]) => {
+      const key = _key;
+      const { databases, services, scalars } = value;
+      databases.forEach((modelName) => {
+        const model = this.database.get(modelName) ?? /* @__PURE__ */ new Set();
+        model.add(key);
+        this.database.set(modelName, model);
+        this.file[key].all.add(modelName);
+        this.file[key].databases.add(modelName);
+      });
+      services?.forEach((serviceName) => {
+        const service = this.service.get(serviceName) ?? /* @__PURE__ */ new Set();
+        service.add(key);
+        this.service.set(serviceName, service);
+        this.file[key].all.add(serviceName);
+        this.file[key].services.add(serviceName);
+      });
+      scalars?.forEach((scalarName) => {
+        const scalar = this.scalar.get(scalarName) ?? /* @__PURE__ */ new Set();
+        scalar.add(key);
+        this.scalar.set(scalarName, scalar);
+        this.file[key].all.add(scalarName);
+        this.file[key].scalars.add(scalarName);
+      });
+    });
   }
   getScanResult() {
     return this.scanResult;

package/esm/src/spinner.js

@@ -2,8 +2,8 @@ import ora from "ora";
 class Spinner {
   static padding = 12;
   spinner;
-  stopWatch;
-  startAt;
+  stopWatch = null;
+  startAt = /* @__PURE__ */ new Date();
   prefix;
   message;
   enableSpin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.9.58",
+  "version": "0.9.60-canary.0",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/commandDecorators/argMeta.d.ts

@@ -12,7 +12,10 @@ interface ArgsOption {
     default?: string | number | boolean;
     nullable?: boolean;
     example?: string | number | boolean;
-    enum?: (string | number)[] | readonly (string | number)[];
+    enum?: (string | number)[] | readonly (string | number)[] | {
+        label: string;
+        value: string | number | boolean;
+    }[];
     ask?: string;
 }
 export interface ArgMeta {

package/src/executors.d.ts

@@ -69,13 +69,16 @@ export declare class Executor {
         refresh?: boolean;
     }): PackageJson;
     setPackageJson(packageJson: PackageJson): void;
-    _applyTemplate({ basePath, template, scanInfo, dict, overwrite, }: {
+    _applyTemplate({ basePath, template, scanInfo, dict, options, overwrite, }: {
         basePath: string;
         template: string;
         scanInfo?: AppInfo | LibInfo | null;
         dict?: {
             [key: string]: string;
         };
+        options?: {
+            [key: string]: any;
+        };
         overwrite?: boolean;
     }): Promise<FileContent[]>;
     applyTemplate(options: {
@@ -84,6 +87,9 @@ export declare class Executor {
         dict?: {
             [key: string]: string;
         };
+        options?: {
+            [key: string]: any;
+        };
         overwrite?: boolean;
     }): Promise<FileContent[]>;
     getTypeChecker(): TypeChecker;
@@ -252,8 +258,6 @@ interface LibExecutorOptions {
 }
 export declare class LibExecutor extends SysExecutor {
     #private;
-    workspaceRoot: string;
-    repoName: string;
     dist: Executor;
     emoji: string;
     constructor({ workspace, name }: LibExecutorOptions);