@bytecodealliance/preview2-shim 0.0.9 → 0.0.11

package/lib/browser/cli-base.js

@@ -3,7 +3,7 @@ export function _setEnv (envObj) {
   _env = Object.entries(envObj);
 }
 
-export const cliBaseEnvironment = {
+export const environment = {
   getEnvironment () {
     if (!_env) _env = [];
     return _env;
@@ -17,41 +17,32 @@ class ComponentExit extends Error {
   }
 }
 
-export const cliBaseExit = {
+export const exit = {
   exit (status) {
     throw new ComponentExit(status.tag === 'err' ? 1 : 0);
   }
 };
 
-export const cliBasePreopens = {
+export const preopens = {
   getDirectories () {
     return [];
   }
 }
 
-export const cliBaseStdin = {
+export const stdin = {
   getStdin () {
     return 0;
   }
 };
 
-export const cliBaseStdout = {
+export const stdout = {
   getStdout () {
     return 1;
   }
 };
 
-export const cliBaseStderr = {
+export const stderr = {
   getStderr () {
     return 2;
   }
 };
-
-export {
-  cliBaseEnvironment as environment,
-  cliBaseExit as exit,
-  cliBasePreopens as preopens,
-  cliBaseStdin as stdin,
-  cliBaseStdout as stdout,
-  cliBaseStderr as stderr
-}

package/lib/browser/clocks.js

@@ -1,10 +1,11 @@
 function _hrtimeBigint () {
-  return BigInt(Math.floor(performance.now() * 1e9));
+  // performance.now() is in milliseconds, but we want nanoseconds
+  return BigInt(Math.floor(performance.now() * 1e6));
 }
 
 let _hrStart = _hrtimeBigint();
 
-export const clocksMonotonicClock = {
+export const monotonicClock = {
   resolution() {
     return 1n;
   },
@@ -16,7 +17,7 @@ export const clocksMonotonicClock = {
   }
 };
 
-export const clocksTimezone = {
+export const timezone = {
   display (timezone, when) {
     console.log(`[timezone] DISPLAY ${timezone} ${when}`);
   },
@@ -31,10 +32,11 @@ export const clocksTimezone = {
   }
 };
 
-export const clocksWallClock = {
+export const wallClock = {
   now() {
-    const seconds = BigInt(Math.floor(Date.now() / 1e3));
-    const nanoseconds = (Date.now() % 1e3) * 1e6;
+    let now = Date.now(); // in milliseconds
+    const seconds = BigInt(Math.floor(now / 1e3));
+    const nanoseconds = (now % 1e3) * 1e6;
     return { seconds, nanoseconds };
   },
 
@@ -42,9 +44,3 @@ export const clocksWallClock = {
     console.log(`[wall-clock] Wall clock resolution`);
   }
 };
-
-export {
-  clocksMonotonicClock as monotonicClock,
-  clocksTimezone as timezone,
-  clocksWallClock as wallClock
-}

package/lib/browser/http.js

@@ -34,19 +34,19 @@ export function send(req) {
   }
 }
 
-export const httpIncomingHandler = {
+export const incomingHandler = {
   handle () {
 
   }
 };
 
-export const httpOutgoingHandler = {
+export const outgoingHandler = {
   handle () {
 
   }
 };
 
-export const httpTypes = {
+export const types = {
   dropFields(_fields) {
     console.log("[types] Drop fields");
   },
@@ -147,9 +147,3 @@ export const httpTypes = {
     console.log("[types] Listen to future incoming response");
   }
 };
-
-export {
-  httpIncomingHandler as incomingHandler,
-  httpOutgoingHandler as outgoingHandler,
-  httpTypes as types
-}

package/lib/browser/io.js

@@ -1,4 +1,4 @@
-export const ioStreams = {
+export const streams = {
   read(s, len) {
     console.log(`[streams] Read ${s} ${len}`);
   },
@@ -18,26 +18,24 @@ export const ioStreams = {
     console.log(`[streams] Drop input stream ${s}`);
   },
   write(s, buf) {
+    streams.blockingWrite(s, buf);
+  },
+  blockingWrite(s, buf) {
     switch (s) {
       case 0:
         throw new Error(`TODO: write stdin`);
       case 1: {
-        const decoder = new TextDecoder();
-        console.log(decoder.decode(buf));
-        return BigInt(buf.byteLength);
+        process.stdout.write(buf);
+        return [BigInt(buf.byteLength), 'ended'];
       }
       case 2: {
-        const decoder = new TextDecoder();
-        console.error(decoder.decode(buf));
-        return BigInt(buf.byteLength);
+        process.stderr.write(buf);
+        return [BigInt(buf.byteLength), 'ended'];
       }
       default:
         throw new Error(`TODO: write ${s}`);
     }
   },
-  blockingWrite(s, _buf) {
-    console.log(`[streams] Blocking write ${s}`);
-  },
   writeZeroes(s, _len) {
     console.log(`[streams] Write zeroes ${s}`);
   },
@@ -60,5 +58,3 @@ export const ioStreams = {
     console.log(`[streams] Drop output stream ${s}`);
   }
 };
-
-export { ioStreams as streams }

package/lib/browser/logging.js

@@ -2,7 +2,7 @@ const levels = ["trace", "debug", "info", "warn", "error"];
 
 let logLevel = levels.indexOf("warn");
 
-export const loggingHandler = {
+export const handler = {
   log(level, context, msg) {
     if (logLevel > levels.indexOf(level)) return;
     console[level](`(${context}) ${msg}\n`);
@@ -12,5 +12,3 @@ export const loggingHandler = {
 export function setLevel(level) {
   logLevel = levels.indexOf(level);
 }
-
-export { loggingHandler as handler }

package/lib/browser/poll.js

@@ -1,4 +1,4 @@
-export const pollPoll = {
+export const poll = {
   dropPollable (pollable) {
     console.log(`[poll] Drop (${pollable})`);
   },
@@ -7,5 +7,3 @@ export const pollPoll = {
     return [];
   }
 };
-
-export { pollPoll as poll }

package/lib/browser/random.js

@@ -2,11 +2,28 @@ const MAX_BYTES = 65536;
 
 let insecureRandomValue1, insecureRandomValue2;
 
-function getRandomU64 () {
-  return crypto.getRandomValues(new BigUint64Array(1))[0];
-}
+export const insecure = {
+  getInsecureRandomBytes (len) {
+    return random.getRandomBytes(len);
+  },
+  getInsecureRandomU64 () {
+    return random.getRandomU64();
+  }
+};
+
+let insecureSeedValue1, insecureSeedValue2;
+
+export const insecureSeed = {
+  insecureSeed () {
+    if (insecureSeedValue1 === undefined) {
+      insecureSeedValue1 = random.getRandomU64();
+      insecureSeedValue2 = random.getRandomU64();
+    }
+    return [insecureSeedValue1, insecureSeedValue2];
+  }
+};
 
-export const randomRandom = {
+export const random = {
   getRandomBytes(len) {
     const bytes = new Uint8Array(Number(len));
 
@@ -25,15 +42,15 @@ export const randomRandom = {
     return bytes;
   },
 
-  getRandomU64: getRandomU64,
+  getRandomU64 () {
+    return crypto.getRandomValues(new BigUint64Array(1))[0];
+  },
 
   insecureRandom () {
     if (insecureRandomValue1 === undefined) {
-      insecureRandomValue1 = getRandomU64();
-      insecureRandomValue2 = getRandomU64();
+      insecureRandomValue1 = random.getRandomU64();
+      insecureRandomValue2 = random.getRandomU64();
     }
     return [insecureRandomValue1, insecureRandomValue2];
   }
 };
-
-export { randomRandom as random }

package/lib/browser/sockets.js

@@ -1,10 +1,10 @@
-export const socketsInstanceNetwork = {
+export const instanceNetwork = {
   instanceNetwork () {
     console.log(`[sockets] instance network`);
   }
 };
 
-export const socketsIpNameLookup = {
+export const ipNameLookup = {
   dropResolveAddressStream () {
 
   },
@@ -25,19 +25,19 @@ export const socketsIpNameLookup = {
   },
 };
 
-export const socketsNetwork = {
+export const network = {
   dropNetwork () {
 
   }
 };
 
-export const socketsTcpCreateSocket = {
+export const tcpCreateSocket = {
   createTcpSocket () {
 
   }
 };
 
-export const socketsTcp = {
+export const tcp = {
   subscribe () {
 
   },
@@ -115,7 +115,7 @@ export const socketsTcp = {
   }
 };
 
-export const socketsUdp = {
+export const udp = {
   subscribe () {
 
   },
@@ -193,11 +193,8 @@ export const socketsUdp = {
   }
 };
 
-export {
-  socketsInstanceNetwork as instanceNetwork,
-  socketsIpNameLookup as ipNameLookup,
-  socketsNetwork as network,
-  socketsTcpCreateSocket as tcpCreateSocket,
-  socketsTcp as tcp,
-  socketsUdp as udp
-}
+export const udpCreateSocket = {
+  createUdpSocket () {
+
+  }
+};

package/lib/nodejs/cli-base.js

@@ -61,48 +61,39 @@ export function _setEnv (envObj) {
   _env = Object.entries(envObj);
 }
 
-export const cliBaseEnvironment = {
+export const environment = {
   getEnvironment () {
     if (!_env) _setEnv(process.env);
     return _env;
   }
 };
 
-export const cliBaseExit = {
+export const exit = {
   exit (status) {
     process.exit(status.tag === 'err' ? 1 : 0);
   }
 };
 
-export const cliBasePreopens = {
+export const preopens = {
   getDirectories () {
     return directories;
   }
 }
 
-export const cliBaseStdin = {
+export const stdin = {
   getStdin () {
     return 0;
   }
 };
 
-export const cliBaseStdout = {
+export const stdout = {
   getStdout () {
     return 1;
   }
 };
 
-export const cliBaseStderr = {
+export const stderr = {
   getStderr () {
     return 2;
   }
 };
-
-export {
-  cliBaseEnvironment as environment,
-  cliBaseExit as exit,
-  cliBasePreopens as preopens,
-  cliBaseStdin as stdin,
-  cliBaseStdout as stdout,
-  cliBaseStderr as stderr
-}

package/lib/nodejs/clocks.js

@@ -2,7 +2,7 @@ import { hrtime } from "node:process";
 
 let _hrStart = hrtime.bigint();
 
-export const clocksMonotonicClock = {
+export const monotonicClock = {
   resolution () {
     return 1n;
   },
@@ -16,7 +16,7 @@ export const clocksMonotonicClock = {
   }
 };
 
-export const clocksTimezone = {
+export const timezone = {
   display (timezone, when) {
     console.log(`[timezone] DISPLAY ${timezone} ${when}`);
   },
@@ -31,7 +31,7 @@ export const clocksTimezone = {
   }
 };
 
-export const clocksWallClock = {
+export const wallClock = {
   now() {
     const seconds = BigInt(Math.floor(Date.now() / 1e3));
     const nanoseconds = (Date.now() % 1e3) * 1e6;
@@ -42,9 +42,3 @@ export const clocksWallClock = {
     console.log(`[wall-clock] Wall clock resolution`);
   }
 };
-
-export {
-  clocksMonotonicClock as monotonicClock,
-  clocksTimezone as timezone,
-  clocksWallClock as wallClock
-}

package/lib/nodejs/filesystem.js

@@ -1,8 +1,6 @@
 import { openSync, constants, statSync, lstatSync, fstatSync, closeSync, readdirSync } from 'node:fs';
 import { _descriptors, _addOpenedDescriptor, _removeOpenedDescriptor, _getDescriptorType, _setSubdescriptorType, _setDescriptorType, _getFullPath } from './cli-base.js';
-import { _createFileStream } from './io.js';
-
-let _dirStreams = [];
+import { _createFsStream, _dropFsStream, _getFsStreamContext } from './io.js';
 
 const nsMagnitude = 1_000_000_000_000n;
 function nsToDateTime (ns) {
@@ -75,7 +73,10 @@ function _lookupType (obj) {
 
 export const filesystem = {
   readViaStream(fd, offset) {
-    return _createFileStream(fd, offset);
+    if (Number(offset) !== 0)
+      throw new Error('Read streams with non-zero offset not currently supported');
+    const stream = _createFsStream(fd, 'file', { offset: 0 });
+    return stream;
   },
 
   writeViaStream(fd, offset) {
@@ -136,8 +137,7 @@ export const filesystem = {
     catch (e) {
       _convertFsError(e);
     }
-    _dirStreams.push({ fd, dirs, cursor: 0 });
-    return _dirStreams.length - 1;
+    return _createFsStream(fd, 'dir', { dirs, cursor: 0, fd });
   },
 
   sync(fd) {
@@ -296,7 +296,7 @@ export const filesystem = {
   },
 
   readDirectoryEntry(stream) {
-    const streamValue = _dirStreams[stream];
+    const streamValue = _getFsStreamContext(stream, 'dir');
     if (streamValue.cursor === streamValue.dirs.length)
       return null;
     const dir = streamValue.dirs[streamValue.cursor++];
@@ -306,8 +306,6 @@ export const filesystem = {
   },
 
   dropDirectoryEntryStream(stream) {
-    _dirStreams.splice(stream, 1);
+    _dropFsStream(stream);
   }
 };
-
-export { filesystem as filesystemFilesystem }

package/lib/nodejs/http.js

@@ -18,19 +18,19 @@ export function send(req) {
   throw new UnexpectedError(response);
 }
 
-export const httpIncomingHandler = {
+export const incomingHandler = {
   handle () {
 
   }
 };
 
-export const httpOutgoingHandler = {
+export const outgoingHandler = {
   handle () {
 
   }
 };
 
-export const httpTypes = {
+export const types = {
   dropFields(_fields) {
     console.log("[types] Drop fields");
   },
@@ -131,9 +131,3 @@ export const httpTypes = {
     console.log("[types] Listen to future incoming response");
   }
 };
-
-export {
-  httpIncomingHandler as incomingHandler,
-  httpOutgoingHandler as outgoingHandler,
-  httpTypes as types
-}

package/lib/nodejs/io.js

@@ -46,45 +46,53 @@ function _convertFsError (e) {
 
 export let _streams = {};
 let streamCnt = 0;
-export function _createFileStream(fd, offset) {
-  // note we only support offset 0
-  if (Number(offset) === 0)
-    _streams[streamCnt] = {
-      type: 'file',
-      fd: fd
-    };
+export function _createFsStream(fd, type, context) {
+  _streams[streamCnt] = {
+    type,
+    fd,
+    context
+  };
   return streamCnt++;
 }
 
-export const ioStreams = {
+export function _getFsStreamContext(stream, type) {
+  const entry = _streams[stream];
+  if (!entry)
+    throw new Error(`No '${type}' stream found at stream ${stream}`);
+  if (entry.type !== type)
+    throw new Error(`Unexpected '${entry.type}' stream found at stream ${stream}, expected '${type}'`);
+  return entry.context;
+}
+
+export function _dropFsStream(stream) {
+  // TODO: recycling?
+  delete _streams[stream];
+}
+
+export const streams = {
   read(s, len) {
-    switch (s) {
-      case 0:
-        return [process.stdin.read(len), true];
-      default:
-        throw new Error(`TODO: write ${s}`);
-    }
+    return streams.blockingRead(s, len);
   },
   blockingRead(s, len) {
     len = Number(len);
     const stream = _streams[s];
-    if (!stream) throw null;
-    switch (stream.type) {
+    switch (stream?.type) {
       case 'file': {
         const buf = Buffer.alloc(Number(len));
         try {
           const readBytes = fsReadSync(stream.fd, buf, 0, Number(len));
-          if (readBytes < Number(len))
-            return [new Uint8Array(), true];
-          return [new Uint8Array(buf.buffer, 0, readBytes), false];
+          if (readBytes < Number(len)) {
+            return [new Uint8Array(buf.buffer, 0, readBytes), 'ended'];
+          }
+          return [new Uint8Array(buf.buffer, 0, readBytes), 'open'];
         }
         catch (e) {
           _convertFsError(e);
         }
         break;
       }
-      default: throw null;
     }
+    throw null;
   },
   skip(s, _len) {
     console.log(`[streams] Skip ${s}`);
@@ -97,27 +105,26 @@ export const ioStreams = {
   },
   dropInputStream(s) {
     delete _streams[s];
-  
   },
   write(s, buf) {
+    return streams.blockingWrite(s, buf);
+  },
+  blockingWrite(s, buf) {
     switch (s) {
       case 0:
         throw new Error(`TODO: write stdin`);
       case 1: {
         process.stdout.write(buf);
-        return BigInt(buf.byteLength);
+        return [BigInt(buf.byteLength), 'ended'];
       }
       case 2: {
         process.stderr.write(buf);
-        return BigInt(buf.byteLength);
+        return [BigInt(buf.byteLength), 'ended'];
       }
       default:
         throw new Error(`TODO: write ${s}`);
     }
   },
-  blockingWrite(s, _buf) {
-    console.log(`[streams] Blocking write ${s}`);
-  },
   writeZeroes(s, _len) {
     console.log(`[streams] Write zeroes ${s}`);
   },
@@ -140,5 +147,3 @@ export const ioStreams = {
     console.log(`[streams] Drop output stream ${s}`);
   }
 };
-
-export { ioStreams as streams }

package/lib/nodejs/logging.js

@@ -2,7 +2,7 @@ const levels = ["trace", "debug", "info", "warn", "error"];
 
 let logLevel = levels.indexOf("warn");
 
-export const loggingHandler = {
+export const handler = {
   log(level, context, msg) {
     if (logLevel > levels.indexOf(level)) return;
     process.stdout.write(`${level}: (${context}) ${msg}\n`);
@@ -12,5 +12,3 @@ export const loggingHandler = {
 export function setLevel(level) {
   logLevel = levels.indexOf(level);
 }
-
-export { loggingHandler as handler }

package/lib/nodejs/poll.js

@@ -1,4 +1,4 @@
-export const pollPoll = {
+export const poll = {
   dropPollable (pollable) {
     console.log(`[poll] Drop (${pollable})`);
   },
@@ -7,5 +7,3 @@ export const pollPoll = {
     return [];
   }
 };
-
-export { pollPoll as poll }

package/lib/nodejs/random.js

@@ -1,23 +1,32 @@
 import { randomBytes } from "node:crypto";
 
-let insecureRandomValue1, insecureRandomValue2;
+export const insecure = {
+  getInsecureRandomBytes (len) {
+    return randomBytes(Number(len));
+  },
+  getInsecureRandomU64 () {
+    return new BigUint64Array(randomBytes(8).buffer)[0];
+  }
+};
+
+let insecureSeedValue1, insecureSeedValue2;
+
+export const insecureSeed = {
+  insecureSeed () {
+    if (insecureSeedValue1 === undefined) {
+      insecureSeedValue1 = random.getRandomU64();
+      insecureSeedValue2 = random.getRandomU64();
+    }
+    return [insecureSeedValue1, insecureSeedValue2];
+  }
+};
 
-export const randomRandom = {
+export const random = {
   getRandomBytes(len) {
     return randomBytes(Number(len));
   },
 
   getRandomU64 () {
     return new BigUint64Array(randomBytes(8).buffer)[0];
-  },
-
-  insecureRandom () {
-    if (insecureRandomValue1 === undefined) {
-      insecureRandomValue1 = randomRandom.getRandomU64();
-      insecureRandomValue2 = randomRandom.getRandomU64();
-    }
-    return [insecureRandomValue1, insecureRandomValue2];
   }
 };
-
-export { randomRandom as random }

package/lib/nodejs/sockets.js

@@ -1,10 +1,10 @@
-export const socketsInstanceNetwork = {
+export const instanceNetwork = {
   instanceNetwork () {
     console.log(`[sockets] instance network`);
   }
 };
 
-export const socketsIpNameLookup = {
+export const ipNameLookup = {
   dropResolveAddressStream () {
 
   },
@@ -25,19 +25,19 @@ export const socketsIpNameLookup = {
   },
 };
 
-export const socketsNetwork = {
+export const network = {
   dropNetwork () {
 
   }
 };
 
-export const socketsTcpCreateSocket = {
+export const tcpCreateSocket = {
   createTcpSocket () {
 
   }
 };
 
-export const socketsTcp = {
+export const tcp = {
   subscribe () {
 
   },
@@ -115,7 +115,7 @@ export const socketsTcp = {
   }
 };
 
-export const socketsUdp = {
+export const udp = {
   subscribe () {
 
   },
@@ -193,11 +193,8 @@ export const socketsUdp = {
   }
 };
 
-export {
-  socketsInstanceNetwork as instanceNetwork,
-  socketsIpNameLookup as ipNameLookup,
-  socketsNetwork as network,
-  socketsTcpCreateSocket as tcpCreateSocket,
-  socketsTcp as tcp,
-  socketsUdp as udp
-}
+export const udpCreateSocket = {
+  createTcpSocket () {
+
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/preview2-shim",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "WASI Preview2 shim for JS environments",
   "author": "Guy Bedford, Eduardo Rodrigues<16357187+eduardomourar@users.noreply.github.com>",
   "type": "module",

package/types/exports/{http-incoming-handler.d.ts → wasi-http-incoming-handler.d.ts}

@@ -1,4 +1,4 @@
-export namespace HttpIncomingHandler {
+export namespace ExportsWasiHttpIncomingHandler {
   export function handle(request: IncomingRequest, responseOut: ResponseOutparam): void;
 }
 import type { IncomingRequest } from '../imports/types';

package/types/imports/{cli-base-environment.d.ts → environment.d.ts}

@@ -1,4 +1,4 @@
-export namespace CliBaseEnvironment {
+export namespace ImportsEnvironment {
   /**
    * Get the POSIX-style environment variables.
    * 

package/types/imports/{cli-base-exit.d.ts → exit.d.ts}

@@ -1,4 +1,4 @@
-export namespace CliBaseExit {
+export namespace ImportsExit {
   /**
    * Exit the curerent instance and any linked instances.
    */

package/types/imports/{filesystem-filesystem.d.ts → filesystem.d.ts}

@@ -1,4 +1,4 @@
-export namespace FilesystemFilesystem {
+export namespace ImportsFilesystem {
   /**
    * Return a stream for reading from a file.
    * 

package/types/imports/{logging-handler.d.ts → handler.d.ts}

@@ -1,4 +1,4 @@
-export namespace LoggingHandler {
+export namespace ImportsHandler {
   /**
    * Emit a log message.
    * 

package/types/imports/{random-insecure-seed.d.ts → insecure-seed.d.ts}

@@ -1,4 +1,4 @@
-export namespace RandomInsecureSeed {
+export namespace ImportsInsecureSeed {
   /**
    * Return a 128-bit value that may contain a pseudo-random value.
    * 

package/types/imports/{random-insecure.d.ts → insecure.d.ts}

@@ -1,4 +1,4 @@
-export namespace RandomInsecure {
+export namespace ImportsInsecure {
   /**
    * Return `len` insecure pseudo-random bytes.
    * 

package/types/imports/{sockets-instance-network.d.ts → instance-network.d.ts}

@@ -1,4 +1,4 @@
-export namespace SocketsInstanceNetwork {
+export namespace ImportsInstanceNetwork {
   /**
    * Get a handle to the default network.
    */

package/types/imports/{sockets-ip-name-lookup.d.ts → ip-name-lookup.d.ts}

@@ -1,4 +1,4 @@
-export namespace SocketsIpNameLookup {
+export namespace ImportsIpNameLookup {
   /**
    * Resolve an internet host name to a list of IP addresses.
    * 

package/types/imports/{clocks-monotonic-clock.d.ts → monotonic-clock.d.ts}

@@ -1,4 +1,4 @@
-export namespace ClocksMonotonicClock {
+export namespace ImportsMonotonicClock {
   /**
    * Read the current value of the clock.
    * 

package/types/imports/{sockets-network.d.ts → network.d.ts}

@@ -1,4 +1,4 @@
-export namespace SocketsNetwork {
+export namespace ImportsNetwork {
   /**
    * Dispose of the specified `network`, after which it may no longer be used.
    * 

package/types/imports/{http-outgoing-handler.d.ts → outgoing-handler.d.ts}

@@ -1,4 +1,4 @@
-export namespace HttpOutgoingHandler {
+export namespace ImportsOutgoingHandler {
   export function handle(request: OutgoingRequest, options: RequestOptions | null): FutureIncomingResponse;
 }
 import type { OutgoingRequest } from '../imports/types';

package/types/imports/{poll-poll.d.ts → poll.d.ts}

@@ -1,4 +1,4 @@
-export namespace PollPoll {
+export namespace ImportsPoll {
   /**
    * Dispose of the specified `pollable`, after which it may no longer
    * be used.

package/types/imports/{cli-base-preopens.d.ts → preopens.d.ts}

@@ -1,4 +1,4 @@
-export namespace CliBasePreopens {
+export namespace ImportsPreopens {
   /**
    * Return the set of of preopened directories, and their path.
    */

package/types/imports/{random-random.d.ts → random.d.ts}

@@ -1,4 +1,4 @@
-export namespace RandomRandom {
+export namespace ImportsRandom {
   /**
    * Return `len` cryptographically-secure pseudo-random bytes.
    * 

package/types/imports/{cli-base-stderr.d.ts → stderr.d.ts}

@@ -1,4 +1,4 @@
-export namespace CliBaseStderr {
+export namespace ImportsStderr {
   export function getStderr(): OutputStream;
 }
 import type { OutputStream } from '../imports/streams';

package/types/imports/{cli-base-stdin.d.ts → stdin.d.ts}

@@ -1,4 +1,4 @@
-export namespace CliBaseStdin {
+export namespace ImportsStdin {
   export function getStdin(): InputStream;
 }
 import type { InputStream } from '../imports/streams';

package/types/imports/{cli-base-stdout.d.ts → stdout.d.ts}

@@ -1,4 +1,4 @@
-export namespace CliBaseStdout {
+export namespace ImportsStdout {
   export function getStdout(): OutputStream;
 }
 import type { OutputStream } from '../imports/streams';

package/types/imports/{io-streams.d.ts → streams.d.ts}

@@ -1,4 +1,4 @@
-export namespace IoStreams {
+export namespace ImportsStreams {
   /**
    * Read bytes from a stream.
    * 

package/types/imports/{sockets-tcp-create-socket.d.ts → tcp-create-socket.d.ts}

@@ -1,4 +1,4 @@
-export namespace SocketsTcpCreateSocket {
+export namespace ImportsTcpCreateSocket {
   /**
    * Create a new TCP socket.
    * 

package/types/imports/{sockets-tcp.d.ts → tcp.d.ts}

@@ -1,4 +1,4 @@
-export namespace SocketsTcp {
+export namespace ImportsTcp {
   /**
    * Bind the socket to a specific network on the provided IP address and port.
    * 

package/types/imports/{clocks-timezone.d.ts → timezone.d.ts}

@@ -1,4 +1,4 @@
-export namespace ClocksTimezone {
+export namespace ImportsTimezone {
   /**
    * Return information needed to display the given `datetime`. This includes
    * the UTC offset, the time zone name, and a flag indicating whether

package/types/imports/{http-types.d.ts → types.d.ts}

@@ -1,4 +1,4 @@
-export namespace HttpTypes {
+export namespace ImportsTypes {
   export function dropFields(fields: Fields): void;
   export function newFields(entries: [string, string][]): Fields;
   export function fieldsGet(fields: Fields, name: string): string[];

package/types/imports/{sockets-udp-create-socket.d.ts → udp-create-socket.d.ts}

@@ -1,4 +1,4 @@
-export namespace SocketsUdpCreateSocket {
+export namespace ImportsUdpCreateSocket {
   /**
    * Create a new UDP socket.
    * 

package/types/imports/{sockets-udp.d.ts → udp.d.ts}

@@ -1,4 +1,4 @@
-export namespace SocketsUdp {
+export namespace ImportsUdp {
   /**
    * Bind the socket to a specific network on the provided IP address and port.
    * 

package/types/imports/{clocks-wall-clock.d.ts → wall-clock.d.ts}

@@ -1,4 +1,4 @@
-export namespace ClocksWallClock {
+export namespace ImportsWallClock {
   /**
    * Read the current value of the clock.
    * 

package/types/wasi-command.d.ts

@@ -1,23 +1,23 @@
-import { CliBaseEnvironment as CliBaseEnvironmentImports } from './imports/cli-base-environment';
-import { CliBasePreopens as CliBasePreopensImports } from './imports/cli-base-preopens';
-import { CliBaseExit as CliBaseExitImports } from './imports/cli-base-exit';
-import { CliBaseStdin as CliBaseStdinImports } from './imports/cli-base-stdin';
-import { CliBaseStdout as CliBaseStdoutImports } from './imports/cli-base-stdout';
-import { CliBaseStderr as CliBaseStderrImports } from './imports/cli-base-stderr';
-import { ClocksWallClock as ClocksWallClockImports } from './imports/clocks-wall-clock';
-import { ClocksMonotonicClock as ClocksMonotonicClockImports } from './imports/clocks-monotonic-clock';
-import { ClocksTimezone as ClocksTimezoneImports } from './imports/clocks-timezone';
-import { FilesystemFilesystem as FilesystemFilesystemImports } from './imports/filesystem-filesystem';
-import { IoStreams as IoStreamsImports } from './imports/io-streams';
-import { PollPoll as PollPollImports } from './imports/poll-poll';
-import { RandomRandom as RandomRandomImports } from './imports/random-random';
-import { RandomInsecure as RandomInsecureImports } from './imports/random-insecure';
-import { RandomInsecureSeed as RandomInsecureSeedImports } from './imports/random-insecure-seed';
-import { SocketsNetwork as SocketsNetworkImports } from './imports/sockets-network';
-import { SocketsInstanceNetwork as SocketsInstanceNetworkImports } from './imports/sockets-instance-network';
-import { SocketsIpNameLookup as SocketsIpNameLookupImports } from './imports/sockets-ip-name-lookup';
-import { SocketsTcp as SocketsTcpImports } from './imports/sockets-tcp';
-import { SocketsTcpCreateSocket as SocketsTcpCreateSocketImports } from './imports/sockets-tcp-create-socket';
-import { SocketsUdp as SocketsUdpImports } from './imports/sockets-udp';
-import { SocketsUdpCreateSocket as SocketsUdpCreateSocketImports } from './imports/sockets-udp-create-socket';
+import { ImportsEnvironment } from './imports/environment';
+import { ImportsExit } from './imports/exit';
+import { ImportsPreopens } from './imports/preopens';
+import { ImportsStderr } from './imports/stderr';
+import { ImportsStdin } from './imports/stdin';
+import { ImportsStdout } from './imports/stdout';
+import { ImportsMonotonicClock } from './imports/monotonic-clock';
+import { ImportsTimezone } from './imports/timezone';
+import { ImportsWallClock } from './imports/wall-clock';
+import { ImportsFilesystem } from './imports/filesystem';
+import { ImportsStreams } from './imports/streams';
+import { ImportsPoll } from './imports/poll';
+import { ImportsInsecure } from './imports/insecure';
+import { ImportsInsecureSeed } from './imports/insecure-seed';
+import { ImportsRandom } from './imports/random';
+import { ImportsInstanceNetwork } from './imports/instance-network';
+import { ImportsIpNameLookup } from './imports/ip-name-lookup';
+import { ImportsNetwork } from './imports/network';
+import { ImportsTcp } from './imports/tcp';
+import { ImportsTcpCreateSocket } from './imports/tcp-create-socket';
+import { ImportsUdp } from './imports/udp';
+import { ImportsUdpCreateSocket } from './imports/udp-create-socket';
 export function run(): void;

package/types/wasi-proxy.d.ts

@@ -1,11 +1,10 @@
-import { HttpTypes as HttpTypesImports } from './imports/http-types';
-import { HttpOutgoingHandler as HttpOutgoingHandlerImports } from './imports/http-outgoing-handler';
-import { IoStreams as IoStreamsImports } from './imports/io-streams';
-import { LoggingHandler as LoggingHandlerImports } from './imports/logging-handler';
-import { PollPoll as PollPollImports } from './imports/poll-poll';
-import { RandomRandom as RandomRandomImports } from './imports/random-random';
-import { RandomInsecure as RandomInsecureImports } from './imports/random-insecure';
-import { RandomInsecureSeed as RandomInsecureSeedImports } from './imports/random-insecure-seed';
-import { HttpIncomingHandler as HttpIncomingHandlerExports } from './exports/http-incoming-handler';
-export const httpIncomingHandler: typeof HttpIncomingHandlerExports;
-export const incomingHandler: typeof HttpIncomingHandlerExports;
+import { ImportsOutgoingHandler } from './imports/outgoing-handler';
+import { ImportsTypes } from './imports/types';
+import { ImportsStreams } from './imports/streams';
+import { ImportsHandler } from './imports/handler';
+import { ImportsPoll } from './imports/poll';
+import { ImportsInsecure } from './imports/insecure';
+import { ImportsInsecureSeed } from './imports/insecure-seed';
+import { ImportsRandom } from './imports/random';
+import { ExportsWasiHttpIncomingHandler } from './exports/wasi-http-incoming-handler';
+export const incomingHandler: typeof ExportsWasiHttpIncomingHandler;

package/types/wasi-reactor.d.ts

@@ -1,23 +1,23 @@
-import { CliBaseEnvironment as CliBaseEnvironmentImports } from './imports/cli-base-environment';
-import { CliBasePreopens as CliBasePreopensImports } from './imports/cli-base-preopens';
-import { CliBaseExit as CliBaseExitImports } from './imports/cli-base-exit';
-import { CliBaseStdin as CliBaseStdinImports } from './imports/cli-base-stdin';
-import { CliBaseStdout as CliBaseStdoutImports } from './imports/cli-base-stdout';
-import { CliBaseStderr as CliBaseStderrImports } from './imports/cli-base-stderr';
-import { ClocksWallClock as ClocksWallClockImports } from './imports/clocks-wall-clock';
-import { ClocksMonotonicClock as ClocksMonotonicClockImports } from './imports/clocks-monotonic-clock';
-import { ClocksTimezone as ClocksTimezoneImports } from './imports/clocks-timezone';
-import { FilesystemFilesystem as FilesystemFilesystemImports } from './imports/filesystem-filesystem';
-import { HttpTypes as HttpTypesImports } from './imports/http-types';
-import { HttpOutgoingHandler as HttpOutgoingHandlerImports } from './imports/http-outgoing-handler';
-import { IoStreams as IoStreamsImports } from './imports/io-streams';
-import { LoggingHandler as LoggingHandlerImports } from './imports/logging-handler';
-import { PollPoll as PollPollImports } from './imports/poll-poll';
-import { RandomRandom as RandomRandomImports } from './imports/random-random';
-import { SocketsNetwork as SocketsNetworkImports } from './imports/sockets-network';
-import { SocketsInstanceNetwork as SocketsInstanceNetworkImports } from './imports/sockets-instance-network';
-import { SocketsIpNameLookup as SocketsIpNameLookupImports } from './imports/sockets-ip-name-lookup';
-import { SocketsTcp as SocketsTcpImports } from './imports/sockets-tcp';
-import { SocketsTcpCreateSocket as SocketsTcpCreateSocketImports } from './imports/sockets-tcp-create-socket';
-import { SocketsUdp as SocketsUdpImports } from './imports/sockets-udp';
-import { SocketsUdpCreateSocket as SocketsUdpCreateSocketImports } from './imports/sockets-udp-create-socket';
+import { ImportsEnvironment } from './imports/environment';
+import { ImportsExit } from './imports/exit';
+import { ImportsPreopens } from './imports/preopens';
+import { ImportsStderr } from './imports/stderr';
+import { ImportsStdin } from './imports/stdin';
+import { ImportsStdout } from './imports/stdout';
+import { ImportsMonotonicClock } from './imports/monotonic-clock';
+import { ImportsTimezone } from './imports/timezone';
+import { ImportsWallClock } from './imports/wall-clock';
+import { ImportsFilesystem } from './imports/filesystem';
+import { ImportsOutgoingHandler } from './imports/outgoing-handler';
+import { ImportsTypes } from './imports/types';
+import { ImportsStreams } from './imports/streams';
+import { ImportsHandler } from './imports/handler';
+import { ImportsPoll } from './imports/poll';
+import { ImportsRandom } from './imports/random';
+import { ImportsInstanceNetwork } from './imports/instance-network';
+import { ImportsIpNameLookup } from './imports/ip-name-lookup';
+import { ImportsNetwork } from './imports/network';
+import { ImportsTcp } from './imports/tcp';
+import { ImportsTcpCreateSocket } from './imports/tcp-create-socket';
+import { ImportsUdp } from './imports/udp';
+import { ImportsUdpCreateSocket } from './imports/udp-create-socket';