@akanjs/cli 0.0.68 → 0.0.70

package/index.js

@@ -905,7 +905,7 @@ var TypeScriptDependencyScanner = class {
               imports.push(arg.text);
           }
         }
-        if (ts2.isArrowFunction(node.expression) && node.expression.body) {
+        if (ts2.isArrowFunction(node.expression)) {
           const body = node.expression.body;
           if (ts2.isCallExpression(body) && body.expression.kind === ts2.SyntaxKind.ImportKeyword) {
             if (body.arguments.length > 0) {
@@ -1385,7 +1385,7 @@ var SysExecutor = class extends Executor {
       files,
       libDeps,
       pkgDeps,
-      dependencies: [...npmDepSet],
+      dependencies: [...npmDepSet].filter((dep) => !dep.startsWith("@akanjs")),
       libs: Object.fromEntries(libDeps.map((libName) => [libName, libScanResults[libName]]))
     };
     await this.applyTemplate({ basePath: "lib", template: "lib", scanResult });
@@ -1933,8 +1933,8 @@ var getArgumentValue = async (argMeta, value, workspace) => {
   if (argMeta.type === "Workspace")
     return workspace;
   const sysType = argMeta.type.toLowerCase();
+  const [appNames, libNames] = await workspace.getSyss();
   if (sysType === "sys") {
-    const [appNames, libNames] = await workspace.getSyss();
     const sysName = await (0, import_prompts3.select)({
       message: `Select the App or Lib name`,
       choices: [...appNames, ...libNames]
@@ -1944,21 +1944,19 @@ var getArgumentValue = async (argMeta, value, workspace) => {
     else
       return LibExecutor.from(workspace, sysName);
   } else if (sysType === "app") {
-    if (value)
+    if (value && appNames.includes(value))
       return AppExecutor.from(workspace, value);
-    const apps = await workspace.getApps();
-    const appName = await (0, import_prompts3.select)({ message: `Select the ${sysType} name`, choices: apps });
+    const appName = await (0, import_prompts3.select)({ message: `Select the ${sysType} name`, choices: appNames });
     return AppExecutor.from(workspace, appName);
   } else if (sysType === "lib") {
-    if (value)
+    if (value && libNames.includes(value))
       return LibExecutor.from(workspace, value);
-    const libs = await workspace.getLibs();
-    const libName = await (0, import_prompts3.select)({ message: `Select the ${sysType} name`, choices: libs });
+    const libName = await (0, import_prompts3.select)({ message: `Select the ${sysType} name`, choices: libNames });
     return LibExecutor.from(workspace, libName);
   } else if (sysType === "pkg") {
-    if (value)
-      return PkgExecutor.from(workspace, value);
     const pkgs = await workspace.getPkgs();
+    if (value && pkgs.includes(value))
+      return PkgExecutor.from(workspace, value);
     const pkgName = await (0, import_prompts3.select)({ message: `Select the ${sysType} name`, choices: pkgs });
     return PkgExecutor.from(workspace, pkgName);
   } else
@@ -2119,6 +2117,7 @@ var LibraryRunner = class {
     const newRootPackageJson = { ...rootPackageJson, dependencies, devDependencies };
     lib.workspace.writeJson("package.json", newRootPackageJson);
     await lib.workspace.spawn("pnpm", ["install"]);
+    await lib.workspace.commit(`Merge ${lib.name} library dependencies`);
   }
   async pushLibrary(lib, branch) {
     await lib.workspace.exec(
@@ -4044,7 +4043,7 @@ var PackageRunner = class {
       dependencies,
       ...pkgJson.peerDependencies ? {
         peerDependencies: Object.fromEntries(
-          Object.keys(pkgJson.peerDependencies).sort().map((dep) => [dep, allDependencies[dep] ?? pkgJson.peerDependencies?.[dep] ?? "0.0.0"])
+          Object.keys(pkgJson.peerDependencies).sort().map((dep) => [dep, allDependencies[dep] ?? pkgJson.peerDependencies?.[dep]])
         )
       } : {},
       ...["@akanjs/config", "@akanjs/cli"].includes(pkg.name) ? {} : {

package/package.json

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