@tgrv/void-cli 1.0.7 → 1.0.9

package/bin/void.js

@@ -10,7 +10,22 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const cliRoot = path.resolve(__dirname, "..");
 const isLocalDev = fs.existsSync(path.join(cliRoot, "../../packages/void-runtime"));
-const workspaceDir = isLocalDev ? path.resolve(cliRoot, "../..") : process.cwd();
+
+function findWorkspaceRoot(dir) {
+  const checkPath = path.join(dir, "packages", "void-runtime");
+  if (fs.existsSync(checkPath)) {
+    return dir;
+  }
+  const parent = path.dirname(dir);
+  if (parent === dir) {
+    return null;
+  }
+  return findWorkspaceRoot(parent);
+}
+
+const workspaceRoot = findWorkspaceRoot(process.cwd());
+const workspaceDir = workspaceRoot || (isLocalDev ? path.resolve(cliRoot, "../..") : process.cwd());
+
 
 // ANSI Color formatting codes
 const colors = {
@@ -85,6 +100,50 @@ function copyFolderRecursive(src, dest, replacements = {}) {
   }
 }
 
+function copyNonSourceFiles(src, dest, buildOutputDir) {
+  ensureDir(dest);
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+    
+    // Prevent copying the build output directory into itself
+    if (srcPath === buildOutputDir || srcPath.startsWith(buildOutputDir + path.sep)) {
+      continue;
+    }
+    
+    // Skip standard build/dev folders
+    if (entry.name === "@void" || 
+        entry.name === "@tgrv" || 
+        entry.name === "target" || 
+        entry.name === ".git" || 
+        entry.name === "node_modules") {
+      continue;
+    }
+    
+    if (entry.isDirectory()) {
+      copyNonSourceFiles(srcPath, destPath, buildOutputDir);
+    } else {
+      const ext = path.extname(entry.name).toLowerCase();
+      const filename = entry.name.toLowerCase();
+      
+      // Exclude Go/Rust/Cargo files and build binaries/configs
+      if (ext === ".go" || 
+          ext === ".rs" || 
+          filename === "cargo.toml" || 
+          filename === "cargo.lock" || 
+          filename === "go.mod" || 
+          filename === "go.sum" || 
+          filename === "void.json" ||
+          filename === "plugin.wasm") {
+        continue;
+      }
+      
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
 const args = process.argv.slice(2);
 const command = args[0];
 
@@ -243,6 +302,7 @@ const plugin = await runtime.load(
 export default plugin;
 `;
   fs.writeFileSync(path.join(buildOutputDir, "index.js"), indexJsContent);
+  copyNonSourceFiles(absolutePluginDir, buildOutputDir, buildOutputDir);
   console.log(`${tick} ${colors.green}Successfully completed compilation & packaging!${colors.reset}`);
   return buildOutputDir;
 }
@@ -268,48 +328,99 @@ function runAdd(pluginNameInput, appDir) {
     process.exit(1);
   }
 
-  const { name: pluginName, version: requestedVersion } = parsePackageSpec(pluginNameInput);
-  const config = JSON.parse(fs.readFileSync(configInfo.configPath, "utf8"));
-  
-  // Look up local build directory
+  let pluginName = pluginNameInput;
+  let requestedVersion = null;
   let localBuildDir = null;
 
-  const scanLocations = [
-    path.join(workspaceDir, "plugins"),
-    path.join(workspaceDir, "packages"),
-    path.join(workspaceDir, "sdk")
-  ];
-
-  for (const root of scanLocations) {
-    if (fs.existsSync(root)) {
-      const subdirs = fs.readdirSync(root);
-      for (const subdir of subdirs) {
-        const pPath = path.join(root, subdir);
-        if (fs.statSync(pPath).isDirectory()) {
-          // Scans nested scopes (e.g. plugins/math/@tgrv/void-math)
-          const entries = fs.readdirSync(pPath);
-          for (const entry of entries) {
-            if (entry.startsWith("@")) {
-              const scopePath = path.join(pPath, entry);
-              const subfolders = fs.readdirSync(scopePath);
-              for (const name of subfolders) {
-                const pkgPath = path.join(scopePath, name, "package.json");
-                if (fs.existsSync(pkgPath)) {
-                  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-                  if (pkg.name === pluginName) {
-                    localBuildDir = path.join(scopePath, name);
-                    break;
+  // Check if input is a local path
+  const isPath = pluginNameInput.startsWith(".") || 
+                 pluginNameInput.startsWith("/") || 
+                 pluginNameInput.startsWith("\\") || 
+                 pluginNameInput.includes(":\\");
+
+  if (isPath) {
+    const absolutePath = path.resolve(appDir, pluginNameInput);
+    if (fs.existsSync(absolutePath)) {
+      const stats = fs.statSync(absolutePath);
+      const searchDir = stats.isDirectory() ? absolutePath : path.dirname(absolutePath);
+      
+      const voidJsonPath = path.join(searchDir, "void.json");
+      const packageJsonPath = path.join(searchDir, "package.json");
+
+      if (fs.existsSync(voidJsonPath)) {
+        try {
+          const manifest = JSON.parse(fs.readFileSync(voidJsonPath, "utf8"));
+          pluginName = manifest.name;
+          if (manifest.buildDir) {
+            const buildPath = path.join(searchDir, manifest.buildDir);
+            if (fs.existsSync(buildPath)) {
+              localBuildDir = buildPath;
+            }
+          } else {
+            localBuildDir = searchDir;
+          }
+        } catch (e) {
+          console.error(`${cross} ${colors.red}Error parsing void.json at path: ${voidJsonPath}${colors.reset}`);
+        }
+      } else if (fs.existsSync(packageJsonPath)) {
+        try {
+          const pkg = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+          pluginName = pkg.name;
+          localBuildDir = searchDir;
+        } catch (e) {
+          console.error(`${cross} ${colors.red}Error parsing package.json at path: ${packageJsonPath}${colors.reset}`);
+        }
+      } else {
+        pluginName = path.basename(searchDir);
+        localBuildDir = searchDir;
+      }
+    }
+  } else {
+    const parsed = parsePackageSpec(pluginNameInput);
+    pluginName = parsed.name;
+    requestedVersion = parsed.version;
+  }
+
+  const config = JSON.parse(fs.readFileSync(configInfo.configPath, "utf8"));
+
+  if (!localBuildDir) {
+    const scanLocations = [
+      path.join(workspaceDir, "plugins"),
+      path.join(workspaceDir, "packages"),
+      path.join(workspaceDir, "sdk")
+    ];
+
+    for (const root of scanLocations) {
+      if (fs.existsSync(root)) {
+        const subdirs = fs.readdirSync(root);
+        for (const subdir of subdirs) {
+          const pPath = path.join(root, subdir);
+          if (fs.statSync(pPath).isDirectory()) {
+            // Scans nested scopes (e.g. plugins/math/@tgrv/void-math)
+            const entries = fs.readdirSync(pPath);
+            for (const entry of entries) {
+              if (entry.startsWith("@")) {
+                const scopePath = path.join(pPath, entry);
+                const subfolders = fs.readdirSync(scopePath);
+                for (const name of subfolders) {
+                  const pkgPath = path.join(scopePath, name, "package.json");
+                  if (fs.existsSync(pkgPath)) {
+                    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+                    if (pkg.name === pluginName) {
+                      localBuildDir = path.join(scopePath, name);
+                      break;
+                    }
                   }
                 }
               }
+              if (localBuildDir) break;
             }
-            if (localBuildDir) break;
           }
+          if (localBuildDir) break;
         }
-        if (localBuildDir) break;
       }
+      if (localBuildDir) break;
     }
-    if (localBuildDir) break;
   }
 
   const targetPluginDir = path.join(appDir, "node_modules", pluginName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tgrv/void-cli",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "type": "module",
   "bin": {
     "void": "./bin/void.js"