bunosh 0.3.2 → 0.4.0

package/src/tasks/shell.js

@@ -4,13 +4,45 @@ import Printer from "../printer.js";
 const isBun = typeof Bun !== 'undefined' && typeof Bun.spawn === 'function';
 
 export default function shell(strings, ...values) {
+  let envs = null;
+  let cwd = null;
+  
+  // Check if called as regular function instead of template literal
+  if (!Array.isArray(strings)) {
+    // If first argument is a string, treat it as the command
+    if (typeof strings === 'string') {
+      // For Bun shell, we need to create a template literal-like call
+      // But since we can't, fall back to exec
+      console.log('Note: shell() with string argument falls back to exec()');
+      const cmdPromise = (async () => {
+        const { default: exec } = await import("./exec.js");
+        let execPromise = exec(strings);
+        if (envs) execPromise = execPromise.env(envs);
+        if (cwd) execPromise = execPromise.cwd(cwd);
+        return execPromise;
+      })();
+      
+      // Add .env and .cwd methods
+      cmdPromise.env = (newEnvs) => {
+        envs = newEnvs;
+        return cmdPromise;
+      };
+      
+      cmdPromise.cwd = (newCwd) => {
+        cwd = newCwd;
+        return cmdPromise;
+      };
+      
+      return cmdPromise;
+    } else {
+      throw new Error('shell() must be called as a template literal: shell`command`');
+    }
+  }
+  
   const cmd = strings.reduce((accumulator, str, i) => {
     return accumulator + str + (values[i] || "");
   }, "");
 
-  let envs = null;
-  let cwd = null;
-
   const cmdPromise = new Promise(async (resolve, reject) => {
     const extraInfo = {};
     if (cwd) extraInfo.cwd = cwd;
@@ -18,7 +50,7 @@ export default function shell(strings, ...values) {
 
     if (!isBun) {
       const { default: exec } = await import("./exec.js");
-      let execPromise = exec(strings, ...values);
+      let execPromise = exec([cmd]);
       if (envs) execPromise = execPromise.env(envs);
       if (cwd) execPromise = execPromise.cwd(cwd);
       const result = await execPromise;
@@ -64,7 +96,7 @@ export default function shell(strings, ...values) {
           finishTaskInfo(taskInfo, true, null, "fallback to exec");
           
           const { default: exec } = await import("./exec.js");
-          let execPromise = exec`${cmd}`;
+          let execPromise = exec([cmd]);
           if (envs) execPromise = execPromise.env(envs);
           if (cwd) execPromise = execPromise.cwd(cwd);
           const result = await execPromise;

package/src/open-editor.js

@@ -1,95 +0,0 @@
-import { spawn } from 'child_process';
-import path from 'path';
-
-export default function openEditor(files, options = {}) {
-  if (!Array.isArray(files) || files.length === 0) {
-    throw new Error('Files array is required and cannot be empty');
-  }
-
-  const editor = options.editor || getDefaultEditor();
-  const fileArgs = buildEditorArgs(editor, files);
-
-  return new Promise((resolve, reject) => {
-    const child = spawn(editor, fileArgs, {
-      stdio: 'inherit',
-      detached: true
-    });
-
-    child.on('error', (err) => {
-      reject(new Error(`Failed to open editor '${editor}': ${err.message}`));
-    });
-
-    child.on('spawn', () => {
-      resolve();
-    });
-
-    if (child.pid) {
-      child.unref();
-    }
-  });
-}
-
-function getDefaultEditor() {
-  if (process.env.EDITOR) {
-    return process.env.EDITOR;
-  }
-
-  const editors = ['code', 'subl', 'atom', 'vim', 'nvim', 'nano', 'gedit'];
-  
-  for (const editor of editors) {
-    if (isCommandAvailable(editor)) {
-      return editor;
-    }
-  }
-
-  return process.platform === 'win32' ? 'notepad' : 'vi';
-}
-
-function isCommandAvailable(command) {
-  try {
-    const { execSync } = require('child_process');
-    execSync(`which ${command}`, { stdio: 'ignore' });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function buildEditorArgs(editor, files) {
-  const editorName = path.basename(editor);
-  const args = [];
-
-  for (const fileInfo of files) {
-    const filePath = typeof fileInfo === 'string' ? fileInfo : fileInfo.file;
-    
-    if (!filePath) {
-      continue;
-    }
-
-    if (fileInfo.line && typeof fileInfo === 'object') {
-      switch (editorName) {
-        case 'code':
-        case 'code-insiders':
-          args.push('--goto', `${filePath}:${fileInfo.line}:${fileInfo.column || 1}`);
-          break;
-        case 'subl':
-        case 'sublime_text':
-          args.push(`${filePath}:${fileInfo.line}:${fileInfo.column || 1}`);
-          break;
-        case 'vim':
-        case 'nvim':
-          args.push(`+${fileInfo.line}`, filePath);
-          break;
-        case 'nano':
-          args.push(`+${fileInfo.line}`, filePath);
-          break;
-        default:
-          args.push(filePath);
-      }
-    } else {
-      args.push(filePath);
-    }
-  }
-
-  return args;
-}