@akanjs/cli 0.0.65 → 0.0.67

package/index.js

@@ -897,10 +897,29 @@ var TypeScriptDependencyScanner = class {
         if (ts2.isStringLiteral(moduleSpecifier))
           imports.push(moduleSpecifier.text);
       }
+      if (ts2.isCallExpression(node)) {
+        if (node.expression.kind === ts2.SyntaxKind.ImportKeyword) {
+          if (node.arguments.length > 0) {
+            const arg = node.arguments[0];
+            if (ts2.isStringLiteral(arg))
+              imports.push(arg.text);
+          }
+        }
+        if (ts2.isArrowFunction(node.expression) && node.expression.body) {
+          const body = node.expression.body;
+          if (ts2.isCallExpression(body) && body.expression.kind === ts2.SyntaxKind.ImportKeyword) {
+            if (body.arguments.length > 0) {
+              const arg = body.arguments[0];
+              if (ts2.isStringLiteral(arg))
+                imports.push(arg.text);
+            }
+          }
+        }
+      }
       ts2.forEachChild(node, visit);
     };
     visit(sourceFile);
-    return imports;
+    return [...new Set(imports)];
   }
   generateDependencyGraph() {
     let graph = "Dependency Graph:\n\n";
@@ -1856,6 +1875,7 @@ var Target = {
 // pkgs/@akanjs/devkit/src/commandDecorators/command.ts
 var import_prompts3 = require("@inquirer/prompts");
 var import_commander = require("commander");
+var import_fs10 = __toESM(require("fs"), 1);
 var camelToKebabCase = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();
 var handleOption = (programCommand, argMeta) => {
   const {
@@ -1945,7 +1965,9 @@ var getArgumentValue = async (argMeta, value, workspace) => {
     throw new Error(`Invalid system type: ${argMeta.type}`);
 };
 var runCommands = async (...commands) => {
-  import_commander.program.version("0.0.1").description("An example CLI for managing a directory");
+  const hasPackageJson = import_fs10.default.existsSync("package.json");
+  const version = hasPackageJson ? JSON.parse(import_fs10.default.readFileSync("package.json", "utf8")).version : "0.0.1";
+  import_commander.program.version(version).description("Akan CLI");
   for (const command of commands) {
     const targetMetas = getTargetMetas(command);
     for (const targetMeta of targetMetas) {
@@ -2089,7 +2111,7 @@ var LibraryRunner = class {
       })
     );
     Object.keys(allDependencies).sort().forEach((dep) => {
-      if (!!rootDependencies[dep] || !!libDependencies[dep])
+      if (!!libPackageJson.dependencies?.[dep] || !!rootPackageJson.dependencies?.[dep])
         dependencies[dep] = allDependencies[dep];
       else
         devDependencies[dep] = allDependencies[dep];
@@ -2138,6 +2160,7 @@ var LibraryScript = class {
   }
   async pullLibrary(lib, branch) {
     await this.#runner.pullLibrary(lib, branch);
+    await this.#runner.mergeLibraryDependencies(lib);
   }
 };
 
@@ -2150,7 +2173,7 @@ var import_openai3 = require("@langchain/openai");
 var import_plugin_react = __toESM(require("@vitejs/plugin-react"));
 var import_dotenv = __toESM(require("dotenv"));
 var esbuild = __toESM(require("esbuild"));
-var import_fs10 = __toESM(require("fs"));
+var import_fs11 = __toESM(require("fs"));
 var import_promises2 = __toESM(require("fs/promises"));
 var import_js_yaml2 = __toESM(require("js-yaml"));
 var import_ora2 = __toESM(require("ora"));
@@ -3319,7 +3342,7 @@ var ApplicationRunner = class {
     app.log(`CSR server is running on http://localhost:4201`);
   }
   async #prepareIos(app) {
-    const isAdded = import_fs10.default.existsSync(`${app.cwdPath}/ios/App/Podfile`);
+    const isAdded = import_fs11.default.existsSync(`${app.cwdPath}/ios/App/Podfile`);
     if (!isAdded) {
       await app.spawn("npx", ["cap", "add", "ios"]);
       await app.spawn("npx", ["@capacitor/assets", "generate"]);
@@ -3354,7 +3377,7 @@ var ApplicationRunner = class {
     await capacitorApp.releaseIos();
   }
   async #prepareAndroid(app) {
-    const isAdded = import_fs10.default.existsSync(`${app.cwdPath}/android/app/build.gradle`);
+    const isAdded = import_fs11.default.existsSync(`${app.cwdPath}/android/app/build.gradle`);
     if (!isAdded) {
       await app.spawn("npx", ["cap", "add", "android"]);
       await app.spawn("npx", ["@capacitor/assets", "generate"]);
@@ -3437,14 +3460,14 @@ var ApplicationRunner = class {
     const buildRoot = `${app.workspace.workspaceRoot}/releases/builds/${app.name}`;
     const appVersionInfo = import_js_yaml2.default.load(app.readFile("config.yaml"));
     const platformVersion = appVersionInfo.platforms.android.versionName;
-    if (import_fs10.default.existsSync(buildRoot))
+    if (import_fs11.default.existsSync(buildRoot))
       await import_promises2.default.rm(buildRoot, { recursive: true, force: true });
     await import_promises2.default.mkdir(buildRoot, { recursive: true });
-    if (rebuild || !import_fs10.default.existsSync(`${distApp.cwdPath}/backend`))
+    if (rebuild || !import_fs11.default.existsSync(`${distApp.cwdPath}/backend`))
       await this.buildBackend(app, distApp);
-    if (rebuild || !import_fs10.default.existsSync(`${distApp.cwdPath}/frontend`))
+    if (rebuild || !import_fs11.default.existsSync(`${distApp.cwdPath}/frontend`))
       await this.buildFrontend(app, distApp);
-    if (rebuild || !import_fs10.default.existsSync(`${distApp.cwdPath}/csr`))
+    if (rebuild || !import_fs11.default.existsSync(`${distApp.cwdPath}/csr`))
       await this.buildCsr(app, distApp);
     const buildVersion = `${platformVersion}-${buildNum}`;
     const buildPath = `${buildRoot}/${buildVersion}`;
@@ -3459,7 +3482,7 @@ var ApplicationRunner = class {
       buildRoot,
       "./"
     ]);
-    if (import_fs10.default.existsSync(`${distApp.cwdPath}/csr`)) {
+    if (import_fs11.default.existsSync(`${distApp.cwdPath}/csr`)) {
       await import_promises2.default.cp(`${distApp.cwdPath}/csr`, "./csr", { recursive: true });
       await app.workspace.spawn("zip", [
         "-r",
@@ -3469,7 +3492,7 @@ var ApplicationRunner = class {
       await import_promises2.default.rm("./csr", { recursive: true, force: true });
     }
     const sourceRoot = `${app.workspace.workspaceRoot}/releases/sources/${app.name}`;
-    if (import_fs10.default.existsSync(sourceRoot)) {
+    if (import_fs11.default.existsSync(sourceRoot)) {
       const MAX_RETRY = 3;
       for (let i = 0; i < MAX_RETRY; i++) {
         try {
@@ -3489,7 +3512,7 @@ var ApplicationRunner = class {
     await Promise.all(
       [".next", "ios", "android", "public/libs"].map(async (path7) => {
         const targetPath = `${sourceRoot}/apps/${app.name}/${path7}`;
-        if (import_fs10.default.existsSync(targetPath))
+        if (import_fs11.default.existsSync(targetPath))
           await import_promises2.default.rm(targetPath, { recursive: true, force: true });
       })
     );
@@ -3517,8 +3540,8 @@ var ApplicationRunner = class {
         []
       )
     ]);
-    import_fs10.default.writeFileSync(`${sourceRoot}/tsconfig.json`, JSON.stringify(tsconfig, null, 2));
-    import_fs10.default.writeFileSync(
+    import_fs11.default.writeFileSync(`${sourceRoot}/tsconfig.json`, JSON.stringify(tsconfig, null, 2));
+    import_fs11.default.writeFileSync(
       `${sourceRoot}/README.md`,
       `# ${app.name}
   \uBCF8 \uD504\uB85C\uC81D\uD2B8\uC758 \uC18C\uC2A4\uCF54\uB4DC \uBC0F \uAD00\uB828\uC790\uB8CC\uB294 \uBAA8\uB450 \uBE44\uBC00\uC815\uBCF4\uB85C \uAD00\uB9AC\uB429\uB2C8\uB2E4.
@@ -3911,6 +3934,7 @@ ApplicationCommand = __decorateClass([
 // pkgs/@akanjs/cli/src/package/package.runner.ts
 var esbuild2 = __toESM(require("esbuild"));
 var import_esbuild_plugin_d = require("esbuild-plugin-d.ts");
+var import_fs12 = __toESM(require("fs"));
 var import_promises3 = __toESM(require("fs/promises"));
 var PackageRunner = class {
   async version(workspace) {
@@ -3932,8 +3956,8 @@ var PackageRunner = class {
   async buildPackage(pkg, distPkg) {
     const rootPackageJson = pkg.workspace.readJson("package.json");
     const pkgJson = pkg.readJson("package.json");
-    await pkg.workspace.exec(`rm -rf dist/${pkg.name}`);
-    await import_promises3.default.rm(`dist/pkgs/${pkg.name}`, { force: true, recursive: true });
+    if (import_fs12.default.existsSync(distPkg.cwdPath))
+      await pkg.workspace.exec(`rm -rf ${distPkg.cwdPath}`);
     let buildResult;
     if (pkg.name === "@akanjs/config") {
       buildResult = await esbuild2.build({
@@ -4007,12 +4031,22 @@ var PackageRunner = class {
         plugins: []
       });
     }
+    const allDependencies = {
+      ...rootPackageJson.dependencies,
+      ...rootPackageJson.devDependencies,
+      ...rootPackageJson.peerDependencies
+    };
     const dependencies = buildResult.outputFiles ? extractDependencies(buildResult.outputFiles, rootPackageJson) : {};
     const pkgPackageJson = {
       ...pkgJson,
       main: "./index.js",
       engines: { node: ">=22" },
       dependencies,
+      ...pkgJson.peerDependencies ? {
+        peerDependencies: Object.fromEntries(
+          Object.keys(pkgJson.peerDependencies).sort().map((dep) => [dep, allDependencies[dep] ?? pkgJson.peerDependencies?.[dep] ?? "0.0.0"])
+        )
+      } : {},
       ...["@akanjs/config", "@akanjs/cli"].includes(pkg.name) ? {} : {
         exports: {
           ".": {
@@ -4026,6 +4060,7 @@ var PackageRunner = class {
     if (buildResult.outputFiles)
       buildResult.outputFiles.map((file) => distPkg.writeFile(file.path, file.text));
     distPkg.writeJson("package.json", pkgPackageJson);
+    pkg.writeJson("package.json", pkgPackageJson);
   }
 };
 
@@ -4279,14 +4314,14 @@ var import_output_parsers2 = require("@langchain/core/output_parsers");
 var import_prompts8 = require("@langchain/core/prompts");
 var import_runnables3 = require("@langchain/core/runnables");
 var import_openai4 = require("@langchain/openai");
-var import_fs11 = __toESM(require("fs"));
+var import_fs13 = __toESM(require("fs"));
 var ModuleRunner = class {
   async createModule(workspace, moduleName) {
     const openAIApiKey = process.env.OPENAI_API_KEY;
     if (!openAIApiKey)
       throw new Error("OPENAI_API_KEY is not set");
     const chatModel = new import_openai4.ChatOpenAI({ modelName: "gpt-4o", openAIApiKey });
-    const projectConfig = JSON.parse(import_fs11.default.readFileSync(`rootPath/projectConfig.json`, "utf-8"));
+    const projectConfig = JSON.parse(import_fs13.default.readFileSync(`rootPath/projectConfig.json`, "utf-8"));
     const mainPrompt = import_prompts8.PromptTemplate.fromTemplate(requestModule());
     const chain = import_runnables3.RunnableSequence.from([mainPrompt, chatModel, new import_output_parsers2.StringOutputParser()]);
     const resultOne = await chain.invoke({
@@ -4340,7 +4375,7 @@ ${paths ? new Array(paths.size).fill(0).map((_, index) => {
       if (!filePath)
         throw new Error("filePath is undefined");
       return `${key}
-\`\`\`${import_fs11.default.readFileSync(filePath, "utf8")}\`\`\`\`
+\`\`\`${import_fs13.default.readFileSync(filePath, "utf8")}\`\`\`\`
 
 `;
     }) : ""}
@@ -4355,11 +4390,11 @@ css\uB77C\uC774\uBE0C\uB7EC\uB9AC\uB294 DaisyUI\uB97C \uAE30\uBC18\uC73C\uB85C \
 ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C \uB514\uC790\uC778\uD574\uC11C \uC791\uC131\uD574\uC918.
 `;
     try {
-      import_fs11.default.writeFileSync("./local/prompt.txt", prompt);
+      import_fs13.default.writeFileSync("./local/prompt.txt", prompt);
       const { content } = await streamAi(prompt, (chunk) => {
         process.stdout.write(chunk);
       });
-      import_fs11.default.writeFileSync("./local/result.txt", content);
+      import_fs13.default.writeFileSync("./local/result.txt", content);
     } catch (error) {
     }
   }
@@ -4386,7 +4421,7 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
       if (!filePath)
         throw new Error("filePath is undefined");
       return `${key}
-\`\`\`${import_fs11.default.readFileSync(filePath, "utf8")}\`\`\`\`
+\`\`\`${import_fs13.default.readFileSync(filePath, "utf8")}\`\`\`\`
 
 `;
     }) : ""}
@@ -4401,11 +4436,11 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
   ${names.Model}.View.General \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C \uB514\uC790\uC778\uD574\uC11C \uC791\uC131\uD574\uC918.
   `;
     try {
-      import_fs11.default.writeFileSync("./local/prompt.txt", prompt);
+      import_fs13.default.writeFileSync("./local/prompt.txt", prompt);
       const { content } = await streamAi(prompt, (chunk) => {
         process.stdout.write(chunk);
       });
-      import_fs11.default.writeFileSync("./local/result.txt", content);
+      import_fs13.default.writeFileSync("./local/result.txt", content);
     } catch (error) {
     }
   }
@@ -4727,7 +4762,7 @@ WorkspaceCommand = __decorateClass([
 ], WorkspaceCommand);
 
 // pkgs/@akanjs/cli/index.ts
-require("dotenv").config();
+require("dotenv").config({ path: `${process.cwd()}/.env` });
 void runCommands(
   WorkspaceCommand,
   ApplicationCommand,

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.65",
+  "version": "0.0.67",
   "bin": {
     "akan": "index.js"
   },

package/pkgs/@akanjs/devkit/src/dependencyScanner.d.ts

@@ -1,4 +1,3 @@
-#!/usr/bin/env ts-node
 export declare class TypeScriptDependencyScanner {
     #private;
     readonly directory: string;