@akanjs/devkit 0.0.87 → 0.0.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/src/executors.cjs

@@ -28,9 +28,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var executors_exports = {};
 __export(executors_exports, {
   AppExecutor: () => AppExecutor,
-  DistAppExecutor: () => DistAppExecutor,
-  DistLibExecutor: () => DistLibExecutor,
-  DistPkgExecutor: () => DistPkgExecutor,
   Executor: () => Executor,
   LibExecutor: () => LibExecutor,
   PkgExecutor: () => PkgExecutor,
@@ -41,10 +38,10 @@ module.exports = __toCommonJS(executors_exports);
 var import_common = require("@akanjs/common");
 var import_config = require("@akanjs/config");
 var import_child_process = require("child_process");
+var import_dotenv = __toESM(require("dotenv"), 1);
 var import_fs = __toESM(require("fs"), 1);
 var import_promises = __toESM(require("fs/promises"), 1);
 var import_path = __toESM(require("path"), 1);
-var import_dotenv = __toESM(require("dotenv"), 1);
 var import_dependencyScanner = require("./dependencyScanner");
 class Executor {
   logger;
@@ -278,7 +275,7 @@ class WorkspaceExecutor extends Executor {
     const env = process.env.NEXT_PUBLIC_ENV ?? envFile.NEXT_PUBLIC_ENV ?? "debug";
     if (!env)
       throw new Error("NEXT_PUBLIC_ENV is not set");
-    return { ...appName ? { appName } : {}, repoName, serveDomain, env };
+    return { ...appName ? { name: appName } : {}, repoName, serveDomain, env };
   }
   async scan() {
     const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
@@ -335,10 +332,10 @@ class WorkspaceExecutor extends Executor {
   }
   async commit(message, { init = false, add = true } = {}) {
     if (init)
-      await this.exec(`git init`);
+      await this.exec(`git init --quiet`);
     if (add)
       await this.exec(`git add .`);
-    await this.exec(`git commit -m "${message}"`);
+    await this.exec(`git commit --quiet -m "${message}"`);
   }
   async #getDirHasFile(basePath, targetFilename) {
     const AVOID_DIRS = ["node_modules", "dist", "public", "./next"];
@@ -382,7 +379,7 @@ class SysExecutor extends Executor {
     this.type = type;
   }
   async getConfig(command) {
-    return this.type === "app" ? await (0, import_config.getAppConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), appName: this.name, command }) : await (0, import_config.getLibConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), appName: this.name, command });
+    return this.type === "app" ? await (0, import_config.getAppConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name, command }) : await (0, import_config.getLibConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "lib", name: this.name, command });
   }
   async scan({
     tsconfig = this.getTsConfig(`${this.cwdPath}/tsconfig.json`),
@@ -498,6 +495,8 @@ class SysExecutor extends Executor {
     const scanResult = {
       name: this.name,
       type: this.type,
+      repoName: this.workspace.repoName,
+      serveDomain: this.workspace.getBaseDevEnv().serveDomain,
       akanConfig,
       files,
       libDeps,
@@ -571,8 +570,10 @@ class SysExecutor extends Executor {
   }
 }
 class AppExecutor extends SysExecutor {
+  dist;
   constructor({ workspace, name }) {
     super({ workspace, name, type: "app" });
+    this.dist = new Executor(`${name} Dist App Executor`, `${this.workspace.workspaceRoot}/dist/apps/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -580,7 +581,12 @@ class AppExecutor extends SysExecutor {
     return new AppExecutor({ workspace: executor.workspace, name });
   }
   async getConfig(command) {
-    return await (0, import_config.getAppConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), appName: this.name, command });
+    return await (0, import_config.getAppConfig)(this.cwdPath, {
+      ...this.workspace.getBaseDevEnv(),
+      type: "app",
+      name: this.name,
+      command
+    });
   }
   async syncAssets(libDeps) {
     const projectPublicLibPath = `${this.cwdPath}/public/libs`;
@@ -597,23 +603,13 @@ class AppExecutor extends SysExecutor {
     );
   }
 }
-class DistAppExecutor extends Executor {
-  name;
-  constructor({ workspace, name }) {
-    super(`${name} Dist App Executor`, `${workspace.workspaceRoot}/dist/apps/${name}`);
-    this.name = name;
-  }
-  static from(executor, name) {
-    if (executor instanceof WorkspaceExecutor)
-      return new DistAppExecutor({ workspace: executor, name });
-    return new DistAppExecutor({ workspace: executor.workspace, name });
-  }
-}
 class LibExecutor extends SysExecutor {
   workspaceRoot;
   repoName;
+  dist;
   constructor({ workspace, name }) {
     super({ workspace, name, type: "lib" });
+    this.dist = new Executor(`${name} Dist Lib Executor`, `${this.workspace.workspaceRoot}/dist/libs/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -621,28 +617,23 @@ class LibExecutor extends SysExecutor {
     return new LibExecutor({ workspace: executor.workspace, name });
   }
   async getConfig(command) {
-    return await (0, import_config.getLibConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), appName: this.name, command });
-  }
-}
-class DistLibExecutor extends Executor {
-  name;
-  constructor({ workspace, name }) {
-    super(`${name} Dist Lib Executor`, `${workspace.workspaceRoot}/dist/libs/${name}`);
-    this.name = name;
-  }
-  static from(executor, name) {
-    if (executor instanceof WorkspaceExecutor)
-      return new DistAppExecutor({ workspace: executor, name });
-    return new DistLibExecutor({ workspace: executor.workspace, name });
+    return await (0, import_config.getLibConfig)(this.cwdPath, {
+      ...this.workspace.getBaseDevEnv(),
+      type: "lib",
+      name: this.name,
+      command
+    });
   }
 }
 class PkgExecutor extends Executor {
   workspace;
   name;
+  dist;
   constructor({ workspace = WorkspaceExecutor.fromRoot(), name }) {
     super(`${name} Pkg Executor`, `${workspace.workspaceRoot}/pkgs/${name}`);
     this.workspace = workspace;
     this.name = name;
+    this.dist = new Executor(`${name} Dist Pkg Executor`, `${this.workspace.workspaceRoot}/dist/pkgs/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -672,30 +663,9 @@ class PkgExecutor extends Executor {
     return pkgScanResult;
   }
 }
-class DistPkgExecutor extends Executor {
-  workspaceRoot;
-  repoName;
-  name;
-  constructor({ workspaceRoot, repoName, name }) {
-    super(`${name} Dist Pkg Executor`, `${workspaceRoot}/dist/pkgs/${name}`);
-    this.workspaceRoot = workspaceRoot;
-    this.repoName = repoName;
-    this.name = name;
-  }
-  static from(workspaceExecutor, name) {
-    return new DistPkgExecutor({
-      workspaceRoot: workspaceExecutor.workspaceRoot,
-      repoName: workspaceExecutor.repoName,
-      name
-    });
-  }
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AppExecutor,
-  DistAppExecutor,
-  DistLibExecutor,
-  DistPkgExecutor,
   Executor,
   LibExecutor,
   PkgExecutor,

package/src/executors.d.ts

@@ -53,7 +53,7 @@ export declare class WorkspaceExecutor extends Executor {
         repoName: string;
         serveDomain: string;
         env: "debug" | "testing" | "develop" | "main";
-        appName?: string | undefined;
+        name?: string | undefined;
     };
     scan(): Promise<WorkspaceScanResult>;
     getApps(): Promise<string[]>;
@@ -110,20 +110,12 @@ interface AppExecutorOptions {
     name: string;
 }
 export declare class AppExecutor extends SysExecutor {
+    dist: Executor;
     constructor({ workspace, name }: AppExecutorOptions);
     static from(executor: SysExecutor | WorkspaceExecutor, name: string): AppExecutor;
     getConfig(command?: string): Promise<AppConfigResult>;
     syncAssets(libDeps: string[]): Promise<void>;
 }
-interface DistAppExecutorOptions {
-    workspace: WorkspaceExecutor;
-    name: string;
-}
-export declare class DistAppExecutor extends Executor {
-    name: string;
-    constructor({ workspace, name }: DistAppExecutorOptions);
-    static from(executor: SysExecutor | WorkspaceExecutor, name: string): DistAppExecutor;
-}
 interface LibExecutorOptions {
     workspace?: WorkspaceExecutor;
     name: string;
@@ -131,19 +123,11 @@ interface LibExecutorOptions {
 export declare class LibExecutor extends SysExecutor {
     workspaceRoot: string;
     repoName: string;
+    dist: Executor;
     constructor({ workspace, name }: LibExecutorOptions);
     static from(executor: SysExecutor | WorkspaceExecutor, name: string): LibExecutor;
     getConfig(command?: string): Promise<LibConfigResult>;
 }
-interface DistLibExecutorOptions {
-    workspace: WorkspaceExecutor;
-    name: string;
-}
-export declare class DistLibExecutor extends Executor {
-    name: string;
-    constructor({ workspace, name }: DistLibExecutorOptions);
-    static from(executor: SysExecutor | WorkspaceExecutor, name: string): DistAppExecutor | DistLibExecutor;
-}
 interface PkgExecutorOptions {
     workspace?: WorkspaceExecutor;
     name: string;
@@ -151,6 +135,7 @@ interface PkgExecutorOptions {
 export declare class PkgExecutor extends Executor {
     workspace: WorkspaceExecutor;
     name: string;
+    dist: Executor;
     constructor({ workspace, name }: PkgExecutorOptions);
     static from(executor: SysExecutor | WorkspaceExecutor, name: string): PkgExecutor;
     scan({ packageJson, tsconfig, }?: {
@@ -158,16 +143,4 @@ export declare class PkgExecutor extends Executor {
         tsconfig?: TsConfigJson;
     }): Promise<PkgScanResult>;
 }
-interface DistPkgExecutorOptions {
-    workspaceRoot: string;
-    repoName: string;
-    name: string;
-}
-export declare class DistPkgExecutor extends Executor {
-    workspaceRoot: string;
-    repoName: string;
-    name: string;
-    constructor({ workspaceRoot, repoName, name }: DistPkgExecutorOptions);
-    static from(workspaceExecutor: WorkspaceExecutor, name: string): DistPkgExecutor;
-}
 export {};

package/src/executors.js

@@ -5,10 +5,10 @@ import {
   getLibConfig
 } from "@akanjs/config";
 import { exec, fork, spawn } from "child_process";
+import dotenv from "dotenv";
 import fs from "fs";
 import fsPromise from "fs/promises";
 import path from "path";
-import dotenv from "dotenv";
 import { TypeScriptDependencyScanner } from "./dependencyScanner";
 class Executor {
   logger;
@@ -242,7 +242,7 @@ class WorkspaceExecutor extends Executor {
     const env = process.env.NEXT_PUBLIC_ENV ?? envFile.NEXT_PUBLIC_ENV ?? "debug";
     if (!env)
       throw new Error("NEXT_PUBLIC_ENV is not set");
-    return { ...appName ? { appName } : {}, repoName, serveDomain, env };
+    return { ...appName ? { name: appName } : {}, repoName, serveDomain, env };
   }
   async scan() {
     const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
@@ -299,10 +299,10 @@ class WorkspaceExecutor extends Executor {
   }
   async commit(message, { init = false, add = true } = {}) {
     if (init)
-      await this.exec(`git init`);
+      await this.exec(`git init --quiet`);
     if (add)
       await this.exec(`git add .`);
-    await this.exec(`git commit -m "${message}"`);
+    await this.exec(`git commit --quiet -m "${message}"`);
   }
   async #getDirHasFile(basePath, targetFilename) {
     const AVOID_DIRS = ["node_modules", "dist", "public", "./next"];
@@ -346,7 +346,7 @@ class SysExecutor extends Executor {
     this.type = type;
   }
   async getConfig(command) {
-    return this.type === "app" ? await getAppConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), appName: this.name, command }) : await getLibConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), appName: this.name, command });
+    return this.type === "app" ? await getAppConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name, command }) : await getLibConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "lib", name: this.name, command });
   }
   async scan({
     tsconfig = this.getTsConfig(`${this.cwdPath}/tsconfig.json`),
@@ -462,6 +462,8 @@ class SysExecutor extends Executor {
     const scanResult = {
       name: this.name,
       type: this.type,
+      repoName: this.workspace.repoName,
+      serveDomain: this.workspace.getBaseDevEnv().serveDomain,
       akanConfig,
       files,
       libDeps,
@@ -535,8 +537,10 @@ class SysExecutor extends Executor {
   }
 }
 class AppExecutor extends SysExecutor {
+  dist;
   constructor({ workspace, name }) {
     super({ workspace, name, type: "app" });
+    this.dist = new Executor(`${name} Dist App Executor`, `${this.workspace.workspaceRoot}/dist/apps/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -544,7 +548,12 @@ class AppExecutor extends SysExecutor {
     return new AppExecutor({ workspace: executor.workspace, name });
   }
   async getConfig(command) {
-    return await getAppConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), appName: this.name, command });
+    return await getAppConfig(this.cwdPath, {
+      ...this.workspace.getBaseDevEnv(),
+      type: "app",
+      name: this.name,
+      command
+    });
   }
   async syncAssets(libDeps) {
     const projectPublicLibPath = `${this.cwdPath}/public/libs`;
@@ -561,23 +570,13 @@ class AppExecutor extends SysExecutor {
     );
   }
 }
-class DistAppExecutor extends Executor {
-  name;
-  constructor({ workspace, name }) {
-    super(`${name} Dist App Executor`, `${workspace.workspaceRoot}/dist/apps/${name}`);
-    this.name = name;
-  }
-  static from(executor, name) {
-    if (executor instanceof WorkspaceExecutor)
-      return new DistAppExecutor({ workspace: executor, name });
-    return new DistAppExecutor({ workspace: executor.workspace, name });
-  }
-}
 class LibExecutor extends SysExecutor {
   workspaceRoot;
   repoName;
+  dist;
   constructor({ workspace, name }) {
     super({ workspace, name, type: "lib" });
+    this.dist = new Executor(`${name} Dist Lib Executor`, `${this.workspace.workspaceRoot}/dist/libs/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -585,28 +584,23 @@ class LibExecutor extends SysExecutor {
     return new LibExecutor({ workspace: executor.workspace, name });
   }
   async getConfig(command) {
-    return await getLibConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), appName: this.name, command });
-  }
-}
-class DistLibExecutor extends Executor {
-  name;
-  constructor({ workspace, name }) {
-    super(`${name} Dist Lib Executor`, `${workspace.workspaceRoot}/dist/libs/${name}`);
-    this.name = name;
-  }
-  static from(executor, name) {
-    if (executor instanceof WorkspaceExecutor)
-      return new DistAppExecutor({ workspace: executor, name });
-    return new DistLibExecutor({ workspace: executor.workspace, name });
+    return await getLibConfig(this.cwdPath, {
+      ...this.workspace.getBaseDevEnv(),
+      type: "lib",
+      name: this.name,
+      command
+    });
   }
 }
 class PkgExecutor extends Executor {
   workspace;
   name;
+  dist;
   constructor({ workspace = WorkspaceExecutor.fromRoot(), name }) {
     super(`${name} Pkg Executor`, `${workspace.workspaceRoot}/pkgs/${name}`);
     this.workspace = workspace;
     this.name = name;
+    this.dist = new Executor(`${name} Dist Pkg Executor`, `${this.workspace.workspaceRoot}/dist/pkgs/${name}`);
   }
   static from(executor, name) {
     if (executor instanceof WorkspaceExecutor)
@@ -636,29 +630,8 @@ class PkgExecutor extends Executor {
     return pkgScanResult;
   }
 }
-class DistPkgExecutor extends Executor {
-  workspaceRoot;
-  repoName;
-  name;
-  constructor({ workspaceRoot, repoName, name }) {
-    super(`${name} Dist Pkg Executor`, `${workspaceRoot}/dist/pkgs/${name}`);
-    this.workspaceRoot = workspaceRoot;
-    this.repoName = repoName;
-    this.name = name;
-  }
-  static from(workspaceExecutor, name) {
-    return new DistPkgExecutor({
-      workspaceRoot: workspaceExecutor.workspaceRoot,
-      repoName: workspaceExecutor.repoName,
-      name
-    });
-  }
-}
 export {
   AppExecutor,
-  DistAppExecutor,
-  DistLibExecutor,
-  DistPkgExecutor,
   Executor,
   LibExecutor,
   PkgExecutor,

package/src/index.cjs

@@ -29,7 +29,6 @@ __reExport(src_exports, require("./types"), module.exports);
 __reExport(src_exports, require("./capacitorApp"), module.exports);
 __reExport(src_exports, require("./extractDeps"), module.exports);
 __reExport(src_exports, require("./commandDecorators"), module.exports);
-__reExport(src_exports, require("./installExternalLib"), module.exports);
 __reExport(src_exports, require("./aiEditor"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -48,6 +47,5 @@ __reExport(src_exports, require("./aiEditor"), module.exports);
   ...require("./capacitorApp"),
   ...require("./extractDeps"),
   ...require("./commandDecorators"),
-  ...require("./installExternalLib"),
   ...require("./aiEditor")
 });

package/src/index.d.ts

@@ -13,5 +13,4 @@ export * from "./types";
 export * from "./capacitorApp";
 export * from "./extractDeps";
 export * from "./commandDecorators";
-export * from "./installExternalLib";
 export * from "./aiEditor";

package/src/index.js

@@ -13,5 +13,4 @@ export * from "./types";
 export * from "./capacitorApp";
 export * from "./extractDeps";
 export * from "./commandDecorators";
-export * from "./installExternalLib";
 export * from "./aiEditor";

package/src/installExternalLib.cjs

@@ -1,33 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var installExternalLib_exports = {};
-__export(installExternalLib_exports, {
-  installExternalLib: () => installExternalLib
-});
-module.exports = __toCommonJS(installExternalLib_exports);
-const utilGitRepo = "git@github.com:akan-team/util.git";
-const sharedGitRepo = "git@github.com:akan-team/shared.git";
-const installExternalLib = async (libName, workspace) => {
-  workspace.log(`Installing ${libName} library as git subtree...`);
-  await workspace.exec(`git remote add ${libName} git@github.com:akan-team/${libName}.git`);
-  await workspace.exec(`git subtree add --prefix=libs/${libName} ${libName} main`);
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  installExternalLib
-});

package/src/installExternalLib.d.ts

@@ -1,2 +0,0 @@
-import { type WorkspaceExecutor } from "@akanjs/devkit";
-export declare const installExternalLib: (libName: string, workspace: WorkspaceExecutor) => Promise<void>;

package/src/installExternalLib.js

@@ -1,10 +0,0 @@
-const utilGitRepo = "git@github.com:akan-team/util.git";
-const sharedGitRepo = "git@github.com:akan-team/shared.git";
-const installExternalLib = async (libName, workspace) => {
-  workspace.log(`Installing ${libName} library as git subtree...`);
-  await workspace.exec(`git remote add ${libName} git@github.com:akan-team/${libName}.git`);
-  await workspace.exec(`git subtree add --prefix=libs/${libName} ${libName} main`);
-};
-export {
-  installExternalLib
-};