@akanjs/devkit 0.0.64 → 0.0.66

package/package.json

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

package/src/commandDecorators/command.cjs

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var command_exports = {};
 __export(command_exports, {
@@ -22,6 +32,7 @@ __export(command_exports, {
 module.exports = __toCommonJS(command_exports);
 var import_prompts = require("@inquirer/prompts");
 var import_commander = require("commander");
+var import_fs = __toESM(require("fs"), 1);
 var import_executors = require("../executors");
 var import_argMeta = require("./argMeta");
 var import_targetMeta = require("./targetMeta");
@@ -114,7 +125,9 @@ const getArgumentValue = async (argMeta, value, workspace) => {
     throw new Error(`Invalid system type: ${argMeta.type}`);
 };
 const runCommands = async (...commands) => {
-  import_commander.program.version("0.0.1").description("An example CLI for managing a directory");
+  const hasPackageJson = import_fs.default.existsSync("package.json");
+  const version = hasPackageJson ? JSON.parse(import_fs.default.readFileSync("package.json", "utf8")).version : "0.0.1";
+  import_commander.program.version(version).description("Akan CLI");
   for (const command of commands) {
     const targetMetas = (0, import_targetMeta.getTargetMetas)(command);
     for (const targetMeta of targetMetas) {

package/src/commandDecorators/command.js

@@ -1,5 +1,6 @@
 import { confirm, input, select } from "@inquirer/prompts";
 import { program } from "commander";
+import fs from "fs";
 import { AppExecutor, LibExecutor, PkgExecutor, WorkspaceExecutor } from "../executors";
 import { getArgMetas } from "./argMeta";
 import { getTargetMetas } from "./targetMeta";
@@ -92,7 +93,9 @@ const getArgumentValue = async (argMeta, value, workspace) => {
     throw new Error(`Invalid system type: ${argMeta.type}`);
 };
 const runCommands = async (...commands) => {
-  program.version("0.0.1").description("An example CLI for managing a directory");
+  const hasPackageJson = fs.existsSync("package.json");
+  const version = hasPackageJson ? JSON.parse(fs.readFileSync("package.json", "utf8")).version : "0.0.1";
+  program.version(version).description("Akan CLI");
   for (const command of commands) {
     const targetMetas = getTargetMetas(command);
     for (const targetMeta of targetMetas) {

package/src/executors.cjs

@@ -491,6 +491,25 @@ class SysExecutor extends Executor {
     if (this.type === "lib")
       await this.applyTemplate({ basePath: ".", template: "index.ts", scanResult });
     this.writeJson(`akan.${this.type}.json`, scanResult);
+    if (this.type === "app")
+      return scanResult;
+    const libPackageJson = this.readJson("package.json");
+    const libPkgJsonWithDeps = {
+      ...libPackageJson,
+      dependencies: {
+        ...libPackageJson.dependencies,
+        ...Object.fromEntries(
+          scanResult.dependencies.filter((dep) => rootPackageJson.dependencies?.[dep]).sort().map((dep) => [dep, rootPackageJson.dependencies?.[dep]])
+        )
+      },
+      devDependencies: {
+        ...libPackageJson.devDependencies,
+        ...Object.fromEntries(
+          scanResult.dependencies.filter((dep) => rootPackageJson.devDependencies?.[dep]).sort().map((dep) => [dep, rootPackageJson.devDependencies?.[dep]])
+        )
+      }
+    };
+    this.writeJson("package.json", libPkgJsonWithDeps);
     return scanResult;
   }
   getLocalFile(filePath) {

package/src/executors.js

@@ -455,6 +455,25 @@ class SysExecutor extends Executor {
     if (this.type === "lib")
       await this.applyTemplate({ basePath: ".", template: "index.ts", scanResult });
     this.writeJson(`akan.${this.type}.json`, scanResult);
+    if (this.type === "app")
+      return scanResult;
+    const libPackageJson = this.readJson("package.json");
+    const libPkgJsonWithDeps = {
+      ...libPackageJson,
+      dependencies: {
+        ...libPackageJson.dependencies,
+        ...Object.fromEntries(
+          scanResult.dependencies.filter((dep) => rootPackageJson.dependencies?.[dep]).sort().map((dep) => [dep, rootPackageJson.dependencies?.[dep]])
+        )
+      },
+      devDependencies: {
+        ...libPackageJson.devDependencies,
+        ...Object.fromEntries(
+          scanResult.dependencies.filter((dep) => rootPackageJson.devDependencies?.[dep]).sort().map((dep) => [dep, rootPackageJson.devDependencies?.[dep]])
+        )
+      }
+    };
+    this.writeJson("package.json", libPkgJsonWithDeps);
     return scanResult;
   }
   getLocalFile(filePath) {