@freestyle-sh/with-bun 0.2.0 → 0.2.2

package/README.md

@@ -57,6 +57,40 @@ type RunCodeResponse<Result> = {
 };
 ```
 
+### `vm.js.install(options?)`
+
+Installs npm packages using Bun.
+
+```typescript
+// Install from package.json in current directory
+await vm.js.install();
+
+// Install from package.json in specific directory
+await vm.js.install({ directory: "/app" });
+
+// Install specific packages
+await vm.js.install({ deps: ["lodash", "express"] });
+
+// Install with specific versions
+await vm.js.install({ deps: { "lodash": "^4.0.0", "express": "~5.0.0" } });
+
+// Install as dev dependencies
+await vm.js.install({ deps: ["typescript"], dev: true });
+
+// Install globally
+await vm.js.install({ global: true, deps: ["typescript"] });
+```
+
+**Returns:** `Promise<InstallResult>`
+
+```typescript
+type InstallResult = {
+  success: boolean;
+  stdout?: string;
+  stderr?: string;
+};
+```
+
 ## Documentation
 
 - [Freestyle Documentation](https://docs.freestyle.sh)

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { VmWith, VmWithInstance, CreateVmOptions } from 'freestyle-sandboxes';
-import { VmJavaScriptRuntimeInstance, JSONValue, RunCodeResponse, VmJavaScriptRuntime } from '@freestyle-sh/with-type-js';
+import { VmWith, VmWithInstance, VmSpec } from 'freestyle-sandboxes';
+import { VmJavaScriptRuntimeInstance, JSONValue, RunCodeResponse, InstallOptions, InstallResult, VmJavaScriptRuntime } from '@freestyle-sh/with-type-js';
 
 type BunJsOptions = {
     version?: string;
@@ -12,16 +12,20 @@ type BunJsResolvedOptions = {
 declare class VmBun extends VmWith<VmBunInstance> implements VmJavaScriptRuntime<VmJavaScriptRuntimeInstance> {
     options: BunJsResolvedOptions;
     constructor(options?: BunJsOptions);
-    configure(existingConfig: CreateVmOptions): CreateVmOptions | Promise<CreateVmOptions>;
+    configureSnapshotSpec(spec: VmSpec): VmSpec;
     createInstance(): VmBunInstance;
     installServiceName(): string;
 }
 declare class VmBunInstance extends VmWithInstance implements VmJavaScriptRuntimeInstance {
     builder: VmBun;
     constructor(builder: VmBun);
-    runCode<Result extends JSONValue = any>({ code, }: {
+    runCode<Result extends JSONValue = any>(args: string | {
         code: string;
+        argv?: string[];
+        env?: Record<string, string>;
+        workdir?: string;
     }): Promise<RunCodeResponse<Result>>;
+    install(options?: InstallOptions): Promise<InstallResult>;
 }
 
 export { VmBun };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { VmWith, VmTemplate, VmWithInstance } from 'freestyle-sandboxes';
+import { VmWith, VmSpec, VmWithInstance } from 'freestyle-sandboxes';
 
 class VmBun extends VmWith {
   options;
@@ -9,7 +9,7 @@ class VmBun extends VmWith {
       workdir: options?.workdir
     };
   }
-  configure(existingConfig) {
+  configureSnapshotSpec(spec) {
     const versionArg = this.options.version ? ` -s "bun-v${this.options.version}"` : "";
     const installScript = `#!/bin/bash
 set -e
@@ -20,8 +20,9 @@ $BUN_INSTALL/bin/bun --version
     const bunInit = `export BUN_INSTALL="/opt/bun"
 export PATH="$BUN_INSTALL/bin:$PATH"
 `;
-    const bunConfig = {
-      template: new VmTemplate({
+    return this.composeSpecs(
+      spec,
+      new VmSpec({
         additionalFiles: {
           "/opt/install-bun.sh": {
             content: installScript
@@ -42,8 +43,7 @@ export PATH="$BUN_INSTALL/bin:$PATH"
           ]
         }
       })
-    };
-    return this.compose(existingConfig, bunConfig);
+    );
   }
   createInstance() {
     return new VmBunInstance(this);
@@ -58,17 +58,26 @@ class VmBunInstance extends VmWithInstance {
     super();
     this.builder = builder;
   }
-  async runCode({
-    code
-  }) {
+  async runCode(args) {
+    const options = typeof args === "string" ? { code: args } : args;
+    const { code, argv, env, workdir } = options;
+    const shellEscape = (value) => `'${value.replace(/'/g, "'\\''")}'`;
+    const argvArgs = argv?.map(shellEscape).join(" ");
+    const envPrefix = env ? `${Object.entries(env).map(([key, value]) => `${key}=${shellEscape(value)}`).join(" ")} ` : "";
+    const cdPrefix = workdir ? `cd ${shellEscape(workdir)} && ` : "";
+    const command = `${cdPrefix}${envPrefix}/opt/bun/bin/bun -e "${code.replace(/"/g, '\\"')}"${argvArgs ? ` -- ${argvArgs}` : ""}`;
     const result = await this.vm.exec({
-      command: `/opt/bun/bin/bun -e "${code.replace(/"/g, '\\"')}"`
+      command
     });
     let parsedResult = void 0;
     if (result.stdout) {
-      try {
-        parsedResult = JSON.parse(result.stdout);
-      } catch (e) {
+      const lines = result.stdout.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
+      const lastLine = lines[lines.length - 1];
+      if (lastLine) {
+        try {
+          parsedResult = JSON.parse(lastLine);
+        } catch (e) {
+        }
       }
     }
     return {
@@ -78,6 +87,27 @@ class VmBunInstance extends VmWithInstance {
       statusCode: result.statusCode ?? -1
     };
   }
+  async install(options) {
+    let command;
+    if (options?.global) {
+      command = `/opt/bun/bin/bun add -g ${options.deps.join(" ")}`;
+    } else {
+      const cdPrefix = options?.directory ? `cd ${options.directory} && ` : "";
+      if (!options?.deps) {
+        command = `${cdPrefix}/opt/bun/bin/bun install`;
+      } else {
+        const deps = Array.isArray(options.deps) ? options.deps : Object.entries(options.deps).map(([pkg, ver]) => `${pkg}@${ver}`);
+        const devFlag = options.dev ? " -d" : "";
+        command = `${cdPrefix}/opt/bun/bin/bun add${devFlag} ${deps.join(" ")}`;
+      }
+    }
+    const result = await this.vm.exec({ command });
+    return {
+      success: result.statusCode === 0,
+      stdout: result.stdout ?? void 0,
+      stderr: result.stderr ?? void 0
+    };
+  }
 }
 
 export { VmBun };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@freestyle-sh/with-bun",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "private": false,
   "dependencies": {
-    "freestyle-sandboxes": "^0.1.2",
-    "@freestyle-sh/with-type-js": "^0.2.0"
+    "freestyle-sandboxes": "^0.1.8",
+    "@freestyle-sh/with-type-js": "^0.2.2"
   },
   "type": "module",
   "main": "./dist/index.js",