@akanjs/cli 0.0.66 → 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";
@@ -2092,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];
@@ -4012,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: {
           ".": {
@@ -4031,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);
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.66",
+  "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;