bare-stow 0.1.3 → 0.1.5

package/index.d.ts

@@ -1,4 +1,5 @@
 import URL from 'bare-url'
+import { PackOptions } from 'bare-pack'
 
 interface Artifact {
   extension?: string
@@ -46,11 +47,9 @@ interface RPCClient {
   type: string
 }
 
-interface StowOptions {
+interface StowOptions extends Omit<PackOptions, 'offload' | 'linked' | 'resolve' | 'aliases'> {
   client?: RPC | RPCName
   server?: RPC | RPCName
-  base?: URL | string
-  hosts?: string[]
   resolveTarget?(name: string): Target
   resolveRPC?(name: string): RPC
 }

package/index.js

@@ -3,11 +3,11 @@ const { fileURLToPath } = require('url')
 const pack = require('bare-pack')
 const id = require('bare-bundle-id')
 const strip = require('bare-type-stripper')
+const { resolve } = require('bare-module-traverse')
 const fs = require('./lib/fs')
 const shim = require('./lib/shim')
 const harness = require('./lib/target')
 const rpc = require('./lib/rpc')
-const resolve = require('./lib/resolve')
 
 module.exports = async function* stow(entry, target, out, opts = {}) {
   if (!target) throw new Error("'target' is required")
@@ -69,7 +69,7 @@ module.exports = async function* stow(entry, target, out, opts = {}) {
     shimURL,
     {
       ...packOpts,
-      resolve,
+      resolve: resolve.bare,
       aliases: {
         '.ts': '.js',
         '.mts': '.mjs',

package/lib/protocol.d.ts

@@ -1,9 +1,15 @@
-import { Duplex } from 'bare-stream'
+import { Duplex, DuplexEvents } from 'bare-stream'
 
 declare const CONTROL: number
 declare const USER: number
 
-interface Protocol extends Duplex {
+interface ProtocolEvents extends DuplexEvents {
+  ready: []
+  terminate: []
+  exit: [code: number]
+}
+
+interface Protocol<E extends ProtocolEvents = ProtocolEvents> extends Duplex<E> {
   send(type: string, payload?: object): Promise<void>
 }
 
@@ -13,4 +19,4 @@ declare class Protocol {
 
 declare function attach(stream: Duplex): Protocol
 
-export { type Protocol, attach, CONTROL, USER }
+export { type Protocol, ProtocolEvents, attach, CONTROL, USER }

package/lib/protocol.js

@@ -1,4 +1,5 @@
 const { Duplex, Writable } = require('bare-stream')
+const b4a = require('b4a')
 
 const CONTROL = 0x00
 const USER = 0x01
@@ -25,7 +26,7 @@ class Protocol extends Duplex {
   }
 
   send(type, payload) {
-    const frame = encodeFrame(CONTROL, Buffer.from(JSON.stringify({ type, ...payload })))
+    const frame = encodeFrame(CONTROL, b4a.from(JSON.stringify({ type, ...payload })))
 
     this._stream.write(frame)
 
@@ -58,10 +59,10 @@ class Protocol extends Duplex {
   _onbeforeframe() {
     if (this._buffered < 4) return
 
-    const buffer = this._buffer.length === 1 ? this._buffer[0] : Buffer.concat(this._buffer)
+    const buffer = this._buffer.length === 1 ? this._buffer[0] : b4a.concat(this._buffer)
 
     this._buffer = [buffer]
-    this._frame = 4 + buffer.readUInt32LE(0)
+    this._frame = 4 + b4a.readUInt32LE(buffer, 0)
 
     this._onafterframe()
   }
@@ -69,7 +70,7 @@ class Protocol extends Duplex {
   _onafterframe() {
     if (this._buffered < this._frame) return
 
-    const buffer = this._buffer.length === 1 ? this._buffer[0] : Buffer.concat(this._buffer)
+    const buffer = this._buffer.length === 1 ? this._buffer[0] : b4a.concat(this._buffer)
     const frame = this._frame
 
     this._buffered -= frame
@@ -81,16 +82,16 @@ class Protocol extends Duplex {
   }
 
   _onframe(frame) {
-    const tag = frame.readUInt8(4)
+    const tag = frame[4]
     const payload = frame.subarray(HEADER_LENGTH)
 
     if (tag === USER) {
-      this.push(Buffer.from(payload))
+      this.push(b4a.from(payload))
     } else if (tag === CONTROL) {
       let message
 
       try {
-        message = JSON.parse(payload.toString())
+        message = JSON.parse(b4a.toString(payload))
       } catch {
         return
       }
@@ -118,12 +119,12 @@ exports.attach = function attach(stream) {
 
 function encodeFrame(tag, data) {
   const length = data.length + 1
-  const frame = Buffer.alloc(HEADER_LENGTH + data.length)
+  const frame = b4a.alloc(HEADER_LENGTH + data.length)
 
-  frame.writeUInt32LE(length, 0)
-  frame.writeUInt8(tag, 4)
+  b4a.writeUInt32LE(frame, length, 0)
+  frame[4] = tag
 
-  data.copy(frame, HEADER_LENGTH)
+  b4a.copy(data, frame, HEADER_LENGTH)
 
   return frame
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-stow",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Module bundling and harness generation for Bare",
   "exports": {
     "./package": "./package.json",
@@ -62,12 +62,13 @@
   },
   "homepage": "https://github.com/holepunchto/bare-stow#readme",
   "dependencies": {
+    "b4a": "^1.6.0",
     "bare-bundle": "^1.8.3",
     "bare-bundle-id": "^1.0.0",
     "bare-fs": "^4.2.1",
-    "bare-module-lexer": "^1.5.2",
-    "bare-module-traverse": "^2.1.1",
-    "bare-pack": "^2.1.0",
+    "bare-module-lexer": "^1.6.0",
+    "bare-module-traverse": "^2.2.0",
+    "bare-pack": "^2.2.0",
     "bare-path": "^3.0.0",
     "bare-stream": "^2.13.1",
     "bare-type-stripper": "^0.1.2",

package/lib/resolve.js

@@ -1,40 +0,0 @@
-const lex = require('bare-module-lexer')
-const { resolve } = require('bare-module-traverse')
-
-module.exports = function bare(entry, parentURL, opts = {}) {
-  const { linked = false, hosts } = opts
-
-  let extensions
-  let conditions = hosts.map((host) => ['bare', 'node', ...host.split('-')])
-
-  if (entry.type & lex.constants.ADDON) {
-    extensions = linked ? [] : ['.bare', '.node']
-    conditions = conditions.map((conditions) => ['addon', ...conditions])
-
-    return resolve.addon(entry.specifier || '.', parentURL, {
-      ...opts,
-      extensions,
-      conditions,
-      hosts,
-      linked
-    })
-  }
-
-  if (entry.type & lex.constants.ASSET) {
-    conditions = conditions.map((conditions) => ['asset', ...conditions])
-  } else {
-    extensions = ['.js', '.cjs', '.mjs', '.ts', '.cts', '.mts', '.json', '.bare', '.node']
-
-    if (entry.type & lex.constants.REQUIRE) {
-      conditions = conditions.map((conditions) => ['require', ...conditions])
-    } else if (entry.type & lex.constants.IMPORT) {
-      conditions = conditions.map((conditions) => ['import', ...conditions])
-    }
-  }
-
-  return resolve.module(entry.specifier, parentURL, {
-    ...opts,
-    extensions,
-    conditions
-  })
-}