@akanjs/devkit 0.0.92 → 0.0.94

package/README.md

@@ -0,0 +1,11 @@
+# akan
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build akan` to build the library.
+
+## Running unit tests
+
+Run `nx test akan` to execute the unit tests via [Jest](https://jestjs.io).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.0.92",
+  "version": "0.0.94",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -37,5 +37,8 @@
       "require": "./index.js",
       "import": "./index.mjs"
     }
+  },
+  "esbuild": {
+    "platform": "node"
   }
 }

package/src/builder.d.ts

@@ -1,7 +1,10 @@
-import { PackageJson } from "./types";
 import { Executor } from "./executors";
+import { PackageJson } from "./types";
+interface BuildOptions {
+    bundle?: boolean;
+    additionalEntryPoints?: string[];
+}
 interface BuilderOptions {
-    name: string;
     executor: Executor;
     distExecutor: Executor;
     pkgJson: PackageJson;
@@ -9,8 +12,7 @@ interface BuilderOptions {
 }
 export declare class Builder {
     #private;
-    name: string;
-    constructor({ name, executor, distExecutor, pkgJson, rootPackageJson }: BuilderOptions);
-    build(): Promise<void>;
+    constructor({ executor, distExecutor, pkgJson, rootPackageJson }: BuilderOptions);
+    build(options?: BuildOptions): Promise<void>;
 }
 export {};

package/src/builder.js

@@ -32,61 +32,61 @@ __export(builder_exports, {
 module.exports = __toCommonJS(builder_exports);
 var esbuild = __toESM(require("esbuild"));
 var import_esbuild_plugin_d = require("esbuild-plugin-d.ts");
+var import_fs = __toESM(require("fs"));
 var import_extractDeps = require("./extractDeps");
 class Builder {
-  name;
   #executor;
   #distExecutor;
   #pkgJson;
   #rootPackageJson;
-  constructor({ name, executor, distExecutor, pkgJson, rootPackageJson }) {
-    this.name = name;
+  constructor({ executor, distExecutor, pkgJson, rootPackageJson }) {
     this.#executor = executor;
     this.#distExecutor = distExecutor;
     this.#pkgJson = pkgJson;
     this.#rootPackageJson = rootPackageJson;
   }
-  async build() {
-    let buildResult;
-    const platform = [
-      "@akanjs/devkit",
-      "@akanjs/document",
-      "@akanjs/lint",
-      "@akanjs/nest",
-      "@akanjs/server",
-      "@akanjs/service"
-    ].includes(this.name) ? "node" : ["@akanjs/client", "@akanjs/next", "@akanjs/store", "@akanjs/ui"].includes(this.name) ? "browser" : "neutral";
-    buildResult = await esbuild.build({
-      write: false,
-      entryPoints: [`${this.#executor.cwdPath}/**/*.ts`, `${this.#executor.cwdPath}/**/*.tsx`],
-      bundle: false,
+  #getBuildOptions(format, { bundle = false, additionalEntryPoints = [] } = {}) {
+    return {
+      entryPoints: [
+        ...bundle ? [`${this.#executor.cwdPath}/index.ts`] : [`${this.#executor.cwdPath}/**/*.ts`, `${this.#executor.cwdPath}/**/*.tsx`],
+        ...additionalEntryPoints
+      ],
+      bundle,
       packages: "external",
       splitting: false,
-      platform,
-      format: "cjs",
+      platform: this.#pkgJson.esbuild?.platform,
+      format,
       outdir: this.#distExecutor.cwdPath,
-      outExtension: { ".js": this.#pkgJson.type === "module" ? ".cjs" : ".js" },
-      logLevel: "error",
-      plugins: [(0, import_esbuild_plugin_d.dtsPlugin)({ tsconfig: `${this.#executor.cwdPath}/tsconfig.json` })]
-    });
-    await esbuild.build({
+      outExtension: format === "cjs" ? { ".js": this.#pkgJson.type === "module" ? ".cjs" : ".js" } : { ".js": this.#pkgJson.type === "module" ? ".js" : ".mjs" },
+      logLevel: "error"
+    };
+  }
+  #getAssetBuildOptions() {
+    return {
       write: true,
-      entryPoints: [`${this.#executor.cwdPath}/**/*.ts`, `${this.#executor.cwdPath}/**/*.tsx`],
       bundle: false,
-      packages: "external",
-      splitting: false,
-      platform,
-      format: "esm",
+      entryPoints: [
+        `${this.#executor.cwdPath}/**/*.css`,
+        `${this.#executor.cwdPath}/**/*.md`,
+        `${this.#executor.cwdPath}/**/*.template`,
+        `${this.#executor.cwdPath}/**/*.js`
+      ],
       outdir: this.#distExecutor.cwdPath,
-      outExtension: { ".js": this.#pkgJson.type === "module" ? ".js" : ".mjs" },
       logLevel: "error",
-      plugins: []
-    });
-    const dependencies = buildResult.outputFiles ? (0, import_extractDeps.extractDependencies)(
-      buildResult.outputFiles,
-      this.#rootPackageJson,
-      Object.keys(this.#pkgJson.dependencies ?? {})
-    ) : {};
+      loader: { ".css": "copy", ".md": "copy", ".template": "copy", ".js": "copy" }
+    };
+  }
+  async build(options = {}) {
+    if (import_fs.default.existsSync(this.#distExecutor.cwdPath))
+      await this.#distExecutor.exec(`rm -rf ${this.#distExecutor.cwdPath}`);
+    const plugins = [(0, import_esbuild_plugin_d.dtsPlugin)({ tsconfig: `${this.#executor.cwdPath}/tsconfig.json` })];
+    const [buildResult] = await Promise.all([
+      esbuild.build({ ...this.#getBuildOptions("cjs", options), write: false, plugins }),
+      esbuild.build({ write: true, ...this.#getBuildOptions("esm", options) }),
+      esbuild.build({ ...this.#getAssetBuildOptions() })
+    ]);
+    const existingDeps = Object.keys(this.#pkgJson.dependencies ?? {});
+    const dependencies = (0, import_extractDeps.extractDependencies)(buildResult.outputFiles, this.#rootPackageJson, existingDeps);
     const pkgPackageJson = {
       ...this.#pkgJson,
       main: "./index.js",
@@ -100,8 +100,7 @@ class Builder {
         ...this.#pkgJson.exports ?? {}
       }
     };
-    if (buildResult.outputFiles)
-      buildResult.outputFiles.map((file) => this.#distExecutor.writeFile(file.path, file.text));
+    buildResult.outputFiles.map((file) => this.#distExecutor.writeFile(file.path, file.text));
     this.#distExecutor.writeJson("package.json", pkgPackageJson);
   }
 }

package/src/builder.mjs

@@ -1,60 +1,60 @@
 import * as esbuild from "esbuild";
 import { dtsPlugin } from "esbuild-plugin-d.ts";
+import fs from "fs";
 import { extractDependencies } from "./extractDeps";
 class Builder {
-  name;
   #executor;
   #distExecutor;
   #pkgJson;
   #rootPackageJson;
-  constructor({ name, executor, distExecutor, pkgJson, rootPackageJson }) {
-    this.name = name;
+  constructor({ executor, distExecutor, pkgJson, rootPackageJson }) {
     this.#executor = executor;
     this.#distExecutor = distExecutor;
     this.#pkgJson = pkgJson;
     this.#rootPackageJson = rootPackageJson;
   }
-  async build() {
-    let buildResult;
-    const platform = [
-      "@akanjs/devkit",
-      "@akanjs/document",
-      "@akanjs/lint",
-      "@akanjs/nest",
-      "@akanjs/server",
-      "@akanjs/service"
-    ].includes(this.name) ? "node" : ["@akanjs/client", "@akanjs/next", "@akanjs/store", "@akanjs/ui"].includes(this.name) ? "browser" : "neutral";
-    buildResult = await esbuild.build({
-      write: false,
-      entryPoints: [`${this.#executor.cwdPath}/**/*.ts`, `${this.#executor.cwdPath}/**/*.tsx`],
-      bundle: false,
+  #getBuildOptions(format, { bundle = false, additionalEntryPoints = [] } = {}) {
+    return {
+      entryPoints: [
+        ...bundle ? [`${this.#executor.cwdPath}/index.ts`] : [`${this.#executor.cwdPath}/**/*.ts`, `${this.#executor.cwdPath}/**/*.tsx`],
+        ...additionalEntryPoints
+      ],
+      bundle,
       packages: "external",
       splitting: false,
-      platform,
-      format: "cjs",
+      platform: this.#pkgJson.esbuild?.platform,
+      format,
       outdir: this.#distExecutor.cwdPath,
-      outExtension: { ".js": this.#pkgJson.type === "module" ? ".cjs" : ".js" },
-      logLevel: "error",
-      plugins: [dtsPlugin({ tsconfig: `${this.#executor.cwdPath}/tsconfig.json` })]
-    });
-    await esbuild.build({
+      outExtension: format === "cjs" ? { ".js": this.#pkgJson.type === "module" ? ".cjs" : ".js" } : { ".js": this.#pkgJson.type === "module" ? ".js" : ".mjs" },
+      logLevel: "error"
+    };
+  }
+  #getAssetBuildOptions() {
+    return {
       write: true,
-      entryPoints: [`${this.#executor.cwdPath}/**/*.ts`, `${this.#executor.cwdPath}/**/*.tsx`],
       bundle: false,
-      packages: "external",
-      splitting: false,
-      platform,
-      format: "esm",
+      entryPoints: [
+        `${this.#executor.cwdPath}/**/*.css`,
+        `${this.#executor.cwdPath}/**/*.md`,
+        `${this.#executor.cwdPath}/**/*.template`,
+        `${this.#executor.cwdPath}/**/*.js`
+      ],
       outdir: this.#distExecutor.cwdPath,
-      outExtension: { ".js": this.#pkgJson.type === "module" ? ".js" : ".mjs" },
       logLevel: "error",
-      plugins: []
-    });
-    const dependencies = buildResult.outputFiles ? extractDependencies(
-      buildResult.outputFiles,
-      this.#rootPackageJson,
-      Object.keys(this.#pkgJson.dependencies ?? {})
-    ) : {};
+      loader: { ".css": "copy", ".md": "copy", ".template": "copy", ".js": "copy" }
+    };
+  }
+  async build(options = {}) {
+    if (fs.existsSync(this.#distExecutor.cwdPath))
+      await this.#distExecutor.exec(`rm -rf ${this.#distExecutor.cwdPath}`);
+    const plugins = [dtsPlugin({ tsconfig: `${this.#executor.cwdPath}/tsconfig.json` })];
+    const [buildResult] = await Promise.all([
+      esbuild.build({ ...this.#getBuildOptions("cjs", options), write: false, plugins }),
+      esbuild.build({ write: true, ...this.#getBuildOptions("esm", options) }),
+      esbuild.build({ ...this.#getAssetBuildOptions() })
+    ]);
+    const existingDeps = Object.keys(this.#pkgJson.dependencies ?? {});
+    const dependencies = extractDependencies(buildResult.outputFiles, this.#rootPackageJson, existingDeps);
     const pkgPackageJson = {
       ...this.#pkgJson,
       main: "./index.js",
@@ -68,8 +68,7 @@ class Builder {
         ...this.#pkgJson.exports ?? {}
       }
     };
-    if (buildResult.outputFiles)
-      buildResult.outputFiles.map((file) => this.#distExecutor.writeFile(file.path, file.text));
+    buildResult.outputFiles.map((file) => this.#distExecutor.writeFile(file.path, file.text));
     this.#distExecutor.writeJson("package.json", pkgPackageJson);
   }
 }

package/src/commandDecorators/command.js

@@ -30,14 +30,14 @@ __export(command_exports, {
   runCommands: () => runCommands
 });
 module.exports = __toCommonJS(command_exports);
+var import_common = require("@akanjs/common");
 var import_prompts = require("@inquirer/prompts");
+var import_chalk = __toESM(require("chalk"));
 var import_commander = require("commander");
 var import_fs = __toESM(require("fs"));
-var import_chalk = __toESM(require("chalk"));
 var import_executors = require("../executors");
 var import_argMeta = require("./argMeta");
 var import_targetMeta = require("./targetMeta");
-var import_common = require("@akanjs/common");
 const camelToKebabCase = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();
 const handleOption = (programCommand, argMeta) => {
   const {

package/src/commandDecorators/command.mjs

@@ -1,11 +1,11 @@
+import { Logger } from "@akanjs/common";
 import { confirm, input, select } from "@inquirer/prompts";
+import chalk from "chalk";
 import { program } from "commander";
 import fs from "fs";
-import chalk from "chalk";
 import { AppExecutor, LibExecutor, PkgExecutor, WorkspaceExecutor } from "../executors";
 import { getArgMetas } from "./argMeta";
 import { getTargetMetas } from "./targetMeta";
-import { Logger } from "@akanjs/common";
 const camelToKebabCase = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();
 const handleOption = (programCommand, argMeta) => {
   const {

package/src/executors.d.ts

@@ -52,7 +52,7 @@ export declare class WorkspaceExecutor extends Executor {
     getBaseDevEnv(): {
         repoName: string;
         serveDomain: string;
-        env: "debug" | "testing" | "local" | "develop" | "main";
+        env: "testing" | "local" | "debug" | "develop" | "main";
         name?: string | undefined;
     };
     scan(): Promise<WorkspaceScanResult>;

package/src/executors.js

@@ -37,12 +37,12 @@ __export(executors_exports, {
 module.exports = __toCommonJS(executors_exports);
 var import_common = require("@akanjs/common");
 var import_config = require("@akanjs/config");
+var import_chalk = __toESM(require("chalk"));
 var import_child_process = require("child_process");
 var import_dotenv = __toESM(require("dotenv"));
 var import_fs = __toESM(require("fs"));
 var import_promises = __toESM(require("fs/promises"));
 var import_path = __toESM(require("path"));
-var import_chalk = __toESM(require("chalk"));
 var import_dependencyScanner = require("./dependencyScanner");
 class Executor {
   logger;
@@ -72,8 +72,11 @@ class Executor {
   }
   spawn(command, args = [], options = {}) {
     const proc = (0, import_child_process.spawn)(command, args, { cwd: this.cwdPath, stdio: "inherit", ...options });
+    proc.stdout?.on("data", (data) => {
+      import_common.Logger.raw(import_chalk.default.dim(data.toString()));
+    });
     proc.stderr?.on("data", (data) => {
-      import_common.Logger.raw(import_chalk.default.red(data.toString()));
+      import_common.Logger.raw(import_chalk.default.dim(data.toString()));
     });
     return new Promise((resolve, reject) => {
       proc.on("exit", (code, signal) => {
@@ -188,7 +191,7 @@ class Executor {
     overwrite = true
   }, dict = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
-      const getContent = await import(templatePath);
+      const getContent = require(templatePath);
       const result = getContent.default(scanResult ?? null, dict);
       if (result === null)
         return;

package/src/executors.mjs

@@ -4,12 +4,12 @@ import {
   getDefaultFileScan,
   getLibConfig
 } from "@akanjs/config";
+import chalk from "chalk";
 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 chalk from "chalk";
 import { TypeScriptDependencyScanner } from "./dependencyScanner";
 class Executor {
   logger;
@@ -39,8 +39,11 @@ class Executor {
   }
   spawn(command, args = [], options = {}) {
     const proc = spawn(command, args, { cwd: this.cwdPath, stdio: "inherit", ...options });
+    proc.stdout?.on("data", (data) => {
+      Logger.raw(chalk.dim(data.toString()));
+    });
     proc.stderr?.on("data", (data) => {
-      Logger.raw(chalk.red(data.toString()));
+      Logger.raw(chalk.dim(data.toString()));
     });
     return new Promise((resolve, reject) => {
       proc.on("exit", (code, signal) => {
@@ -155,7 +158,7 @@ class Executor {
     overwrite = true
   }, dict = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
-      const getContent = await import(templatePath);
+      const getContent = require(templatePath);
       const result = getContent.default(scanResult ?? null, dict);
       if (result === null)
         return;

package/src/index.d.ts

@@ -14,3 +14,4 @@ export * from "./capacitorApp";
 export * from "./extractDeps";
 export * from "./commandDecorators";
 export * from "./aiEditor";
+export * from "./builder";

package/src/index.js

@@ -30,6 +30,7 @@ __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("./aiEditor"), module.exports);
+__reExport(src_exports, require("./builder"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./createTunnel"),
@@ -47,5 +48,6 @@ __reExport(src_exports, require("./aiEditor"), module.exports);
   ...require("./capacitorApp"),
   ...require("./extractDeps"),
   ...require("./commandDecorators"),
-  ...require("./aiEditor")
+  ...require("./aiEditor"),
+  ...require("./builder")
 });

package/src/index.mjs

@@ -14,3 +14,4 @@ export * from "./capacitorApp";
 export * from "./extractDeps";
 export * from "./commandDecorators";
 export * from "./aiEditor";
+export * from "./builder";

package/src/types.d.ts

@@ -10,6 +10,9 @@ export interface PackageJson {
     peerDependencies?: Record<string, string>;
     engines?: Record<string, string>;
     exports?: Record<string, Record<string, string>>;
+    esbuild?: {
+        platform?: "node" | "browser" | "neutral";
+    };
 }
 export interface TsConfigJson {
     extends?: string;