@oliphaunt/wasix-ts 0.1.0 → 0.2.1

package/lib/storage/opfs-pool.d.ts

@@ -1,5 +1,5 @@
-import { type WasixClusterSeedLoader, type WasixPhysicalIdentity, type WasixStorageSyncBoundary } from '../storage-provider.js';
-import { type StorageDelta, type StoredSnapshot } from '../storage-snapshot.js';
+import { type WasixClusterSeedLoader, type WasixPhysicalIdentity, type WasixStorageSyncBoundary } from './storage-provider.js';
+import { type StorageDelta, type StoredSnapshot } from './storage-snapshot.js';
 export declare const OPFS_POOL_ROOT = ".oliphaunt-wasix-pool-v1";
 export type PooledOpfsDatabase = Readonly<{
     snapshot: StoredSnapshot | undefined;

package/lib/storage/opfs-pool.js

@@ -1,7 +1,7 @@
-import { parseJsonWithUniqueObjectKeys } from '../database-root.js';
-import { composeWasixStorageFailure, WasixStorageError } from '../errors.js';
-import { assertWasixPhysicalIdentity, physicalIdentityMatches, } from '../storage-provider.js';
-import { splitStorageDeltaDeletes, VOLATILE_DATABASE_FILES, validateDirectoryEntryName, validateStoredSnapshot, } from '../storage-snapshot.js';
+import { parseJsonWithUniqueObjectKeys } from './database-root.js';
+import { composeWasixStorageFailure, WasixStorageError } from '../core/errors.js';
+import { assertWasixPhysicalIdentity, physicalIdentityMatches, } from './storage-provider.js';
+import { splitStorageDeltaDeletes, VOLATILE_DATABASE_FILES, validateDirectoryEntryName, validateStoredSnapshot, } from './storage-snapshot.js';
 export const OPFS_POOL_ROOT = '.oliphaunt-wasix-pool-v1';
 const STATE_FILE = 'state.json';
 const DATA_DIRECTORY = 'data';

package/lib/storage/opfs-provider.d.ts

@@ -1,4 +1,4 @@
-import type { WasixClusterSeedLoader, WasixPhysicalIdentity, WasixStorageLease } from '../storage-provider.js';
-import type { StoredSnapshot } from '../storage-snapshot.js';
+import type { WasixClusterSeedLoader, WasixPhysicalIdentity, WasixStorageLease } from './storage-provider.js';
+import type { StoredSnapshot } from './storage-snapshot.js';
 export declare function acquireOpfsStorage(name: string, loadClusterSeed: WasixClusterSeedLoader, physicalIdentity: WasixPhysicalIdentity): Promise<WasixStorageLease>;
 export declare function restoreOpfsStorage(name: string, snapshot: StoredSnapshot, physicalIdentity: WasixPhysicalIdentity): Promise<void>;

package/lib/storage/opfs-provider.js

@@ -1,4 +1,4 @@
-import { composeWasixStorageFailure, WasixStorageError } from '../errors.js';
+import { composeWasixStorageFailure, WasixStorageError } from '../core/errors.js';
 import { acquireIncrementalStorage } from './incremental-storage.js';
 import { applyPooledOpfsDelta, DirectOpfsPool, inspectPooledOpfsDatabase, openPooledDatabaseDirectory, openPooledOpfsRoot, preparePooledOpfsDatabase, } from './opfs-pool.js';
 import { releaseRestoreLock } from './restore-cleanup.js';

package/lib/storage/opfs.d.ts

@@ -1,8 +1,8 @@
-import { type PersistentWasixStorage } from '../storage.js';
+import { type PersistentWasixStorage } from './types.js';
 /**
  * Select an origin-private opaque database pool. Worker execution uses
  * same-realm synchronous exact-range I/O; other placements publish to the
  * same format through the portable journaled path.
  */
-export declare function opfs(name: string): PersistentWasixStorage;
+export declare function opfs(name: string): PersistentWasixStorage<'opfs'>;
 export default opfs;

package/lib/storage/opfs.js

@@ -1,4 +1,4 @@
-import { defineOpfsStorage } from '../storage.js';
+import { defineOpfsStorage } from './types.js';
 /**
  * Select an origin-private opaque database pool. Worker execution uses
  * same-realm synchronous exact-range I/O; other placements publish to the

package/lib/{physical-archive.js → storage/physical-archive.js}

@@ -1,8 +1,8 @@
 import { PHYSICAL_FORMAT as WASIX_PHYSICAL_FORMAT, POSTGRES_MAJOR as WASIX_POSTGRES_MAJOR, } from '@oliphaunt/liboliphaunt-wasix';
-import { extractTar } from './archive.js';
-import { WasixStorageError } from './errors.js';
-import { simpleQuery } from './protocol.js';
-import { PostgresError, parseSimpleQueryRawResponse } from './query.js';
+import { extractTar } from '../resources/archive.js';
+import { WasixStorageError } from '../core/errors.js';
+import { simpleQuery } from '../protocol/protocol.js';
+import { PostgresError, parseSimpleQueryRawResponse, } from '../protocol/query.js';
 import { snapshotStorageDirectory, validateStoredSnapshot, } from './storage-snapshot.js';
 const TAR_BLOCK_BYTES = 512;
 const ARCHIVE_MANIFEST_PATH = '.oliphaunt/backup-manifest.properties';

package/lib/storage/restore-cleanup.d.ts

@@ -1,4 +1,4 @@
-import { type WasixStorageCommitState } from '../errors.js';
+import { type WasixStorageCommitState } from '../core/errors.js';
 import type { ExclusiveStorageLock } from './incremental-storage.js';
 /** Preserve a restore failure while making ownership-release failure observable. */
 export declare function releaseRestoreLock(lock: ExclusiveStorageLock, label: string, commitState: WasixStorageCommitState, primary: unknown): Promise<unknown>;

package/lib/storage/restore-cleanup.js

@@ -1,4 +1,4 @@
-import { composeWasixStorageFailure, WasixStorageError, } from '../errors.js';
+import { composeWasixStorageFailure, WasixStorageError, } from '../core/errors.js';
 /** Preserve a restore failure while making ownership-release failure observable. */
 export async function releaseRestoreLock(lock, label, commitState, primary) {
     try {

package/lib/{storage-provider.d.ts → storage/storage-provider.d.ts}

@@ -1,15 +1,9 @@
-import type { WasixDirectoryMount } from './archive.js';
-import type { Directory } from './host/index.mjs';
-import type { SerializedWasixStorage } from './storage.js';
+import type { WasixDirectoryMount } from '../resources/archive.js';
+import { type WasixPhysicalIdentity } from './database-root.js';
+export { WASIX_PHYSICAL_IDENTITY, type WasixPhysicalIdentity } from './database-root.js';
+import type { Directory } from '../host/index.mjs';
+import type { SerializedWasixStorage } from './types.js';
 import type { StoredSnapshot } from './storage-snapshot.js';
-/** Stable fields that determine whether a WASIX runtime may open stored PGDATA. */
-export type WasixPhysicalIdentity = Readonly<{
-    schema: 'oliphaunt-physical-format-v1';
-    engineFamily: 'wasix';
-    postgresMajor: number;
-    physicalFormat: string;
-}>;
-export declare const WASIX_PHYSICAL_IDENTITY: WasixPhysicalIdentity;
 export type StorageDirectoryEntry = Readonly<{
     type: 'dir' | 'file' | 'unknown';
     name: string;

package/lib/{storage-provider.js → storage/storage-provider.js}

@@ -1,12 +1,7 @@
-import { DATABASE_ROOT_POSTGRES_MAJOR, WASIX_PHYSICAL_FORMAT } from './database-root.js';
-import { WasixStorageError } from './errors.js';
-import { validateIndexedDbDatabaseName, validateOpfsDatabaseName } from './storage.js';
-export const WASIX_PHYSICAL_IDENTITY = Object.freeze({
-    schema: 'oliphaunt-physical-format-v1',
-    engineFamily: 'wasix',
-    postgresMajor: DATABASE_ROOT_POSTGRES_MAJOR,
-    physicalFormat: WASIX_PHYSICAL_FORMAT,
-});
+import { WASIX_PHYSICAL_IDENTITY } from './database-root.js';
+export { WASIX_PHYSICAL_IDENTITY } from './database-root.js';
+import { WasixStorageError } from '../core/errors.js';
+import { validateIndexedDbDatabaseName, validateOpfsDatabaseName } from './types.js';
 /** Restore a validated snapshot into a closed, empty persistent destination. */
 export async function restoreWasixStorage(storage, snapshot, identity) {
     switch (storage.kind) {
@@ -17,12 +12,12 @@ export async function restoreWasixStorage(storage, snapshot, identity) {
             });
         case 'indexed-db': {
             validateIndexedDbDatabaseName(storage.name);
-            const { restoreIndexedDbStorage } = await import('./storage/indexed-db-provider.js');
+            const { restoreIndexedDbStorage } = await import('./indexed-db-provider.js');
             return restoreIndexedDbStorage(storage.name, snapshot, identity);
         }
         case 'opfs': {
             validateOpfsDatabaseName(storage.name);
-            const { restoreOpfsStorage } = await import('./storage/opfs-provider.js');
+            const { restoreOpfsStorage } = await import('./opfs-provider.js');
             return restoreOpfsStorage(storage.name, snapshot, identity);
         }
         case 'directory':
@@ -41,12 +36,12 @@ export async function acquireWasixStorage(storage, loadClusterSeed, identity) {
             return memoryLease(await loadClusterSeed());
         case 'indexed-db': {
             validateIndexedDbDatabaseName(storage.name);
-            const { acquireIndexedDbStorage } = await import('./storage/indexed-db-provider.js');
+            const { acquireIndexedDbStorage } = await import('./indexed-db-provider.js');
             return acquireIndexedDbStorage(storage.name, loadClusterSeed, identity);
         }
         case 'opfs': {
             validateOpfsDatabaseName(storage.name);
-            const { acquireOpfsStorage } = await import('./storage/opfs-provider.js');
+            const { acquireOpfsStorage } = await import('./opfs-provider.js');
             return acquireOpfsStorage(storage.name, loadClusterSeed, identity);
         }
         case 'directory':

package/lib/{storage-snapshot.d.ts → storage/storage-snapshot.d.ts}

@@ -1,5 +1,5 @@
-import type { WasixDirectoryMount } from './archive.js';
-import type { WasixStorageError } from './errors.js';
+import type { WasixDirectoryMount } from '../resources/archive.js';
+import type { WasixStorageError } from '../core/errors.js';
 import type { StorageDirectory } from './storage-provider.js';
 export declare const VOLATILE_DATABASE_FILES: Set<string>;
 export type StoredSnapshot = {

package/lib/{storage.d.ts → storage/types.d.ts}

@@ -4,11 +4,12 @@ declare const persistentStorageDescriptorBrand: unique symbol;
  * An opaque storage selection created by this package's storage factories.
  * The descriptor is deliberately not a bag of user-authored paths or assets.
  */
-export type WasixStorage = Readonly<{
-    [storageDescriptorBrand]: 'oliphaunt-wasix-storage';
+export type WasixStorageKind = 'memory' | 'directory' | 'indexed-db' | 'opfs';
+export type WasixStorage<Kind extends WasixStorageKind = WasixStorageKind> = Readonly<{
+    [storageDescriptorBrand]: Kind;
 }>;
 /** Opaque persistent storage accepted by static physical restore. */
-export type PersistentWasixStorage = WasixStorage & Readonly<{
+export type PersistentWasixStorage<Kind extends Exclude<WasixStorageKind, 'memory'> = Exclude<WasixStorageKind, 'memory'>> = WasixStorage<Kind> & Readonly<{
     [persistentStorageDescriptorBrand]: 'oliphaunt-wasix-persistent-storage';
 }>;
 export type SerializedWasixStorage = Readonly<{
@@ -31,13 +32,13 @@ export type SerializedWasixStorage = Readonly<{
  * Select a fresh in-memory database. This is also the default when `storage`
  * is omitted. Reusing the descriptor does not preserve data.
  */
-export declare function memory(): WasixStorage;
+export declare function memory(): WasixStorage<'memory'>;
 /** @internal Used by the selectively imported IndexedDB adapter. */
-export declare function defineIndexedDbStorage(name: string): PersistentWasixStorage;
+export declare function defineIndexedDbStorage(name: string): PersistentWasixStorage<'indexed-db'>;
 /** @internal Used by the selectively imported OPFS adapter. */
-export declare function defineOpfsStorage(name: string): PersistentWasixStorage;
+export declare function defineOpfsStorage(name: string): PersistentWasixStorage<'opfs'>;
 /** @internal Used by the selectively imported Node directory adapter. */
-export declare function defineDirectoryStorage(path: string): PersistentWasixStorage;
+export declare function defineDirectoryStorage(path: string): PersistentWasixStorage<'directory'>;
 /** @internal Validate and project the opaque main-thread value for the worker. */
 export declare function serializeWasixStorage(storage: WasixStorage | undefined): SerializedWasixStorage;
 export declare function validateIndexedDbDatabaseName(name: unknown): asserts name is string;

package/lib/storage/web-lock.js

@@ -1,4 +1,4 @@
-import { WasixStorageError } from '../errors.js';
+import { WasixStorageError } from '../core/errors.js';
 export async function acquireExclusiveWebLock(lockName, label) {
     const locks = globalThis.navigator.locks;
     if (locks === undefined) {

package/lib/worker-entry.bun.d.ts

@@ -1,2 +1,2 @@
-export { Oliphaunt, Oliphaunt as default } from './worker-node-client.js';
-export * from './public.js';
+export { Oliphaunt, Oliphaunt as default } from './hosts/node-api/worker-node-client.js';
+export * from './hosts/node-api/native-public.js';

package/lib/worker-entry.bun.js

@@ -1,2 +1,2 @@
-export { Oliphaunt, Oliphaunt as default } from './worker-node-client.js';
-export * from './public.js';
+export { Oliphaunt, Oliphaunt as default } from './hosts/node-api/worker-node-client.js';
+export * from './hosts/node-api/native-public.js';

package/lib/worker-entry.d.ts

@@ -1,2 +1,2 @@
-export { Oliphaunt, Oliphaunt as default } from './worker-client.js';
-export * from './public.js';
+export { Oliphaunt, Oliphaunt as default } from './hosts/browser/worker-client.js';
+export * from './hosts/browser/browser-public.js';

package/lib/worker-entry.deno.d.ts

@@ -1,2 +1,2 @@
-export { Oliphaunt, Oliphaunt as default } from './worker-node-client.js';
-export * from './public.js';
+export { Oliphaunt, Oliphaunt as default } from './hosts/node-api/worker-node-client.js';
+export * from './hosts/node-api/native-public.js';

package/lib/worker-entry.deno.js

@@ -1,2 +1,2 @@
-export { Oliphaunt, Oliphaunt as default } from './worker-node-client.js';
-export * from './public.js';
+export { Oliphaunt, Oliphaunt as default } from './hosts/node-api/worker-node-client.js';
+export * from './hosts/node-api/native-public.js';

package/lib/worker-entry.js

@@ -1,2 +1,2 @@
-export { Oliphaunt, Oliphaunt as default } from './worker-client.js';
-export * from './public.js';
+export { Oliphaunt, Oliphaunt as default } from './hosts/browser/worker-client.js';
+export * from './hosts/browser/browser-public.js';

package/lib/worker-entry.node.d.ts

@@ -1,2 +1,2 @@
-export { Oliphaunt, Oliphaunt as default } from './worker-node-client.js';
-export * from './public.js';
+export { Oliphaunt, Oliphaunt as default } from './hosts/node-api/worker-node-client.js';
+export * from './hosts/node-api/native-public.js';

package/lib/worker-entry.node.js

@@ -1,2 +1,2 @@
-export { Oliphaunt, Oliphaunt as default } from './worker-node-client.js';
-export * from './public.js';
+export { Oliphaunt, Oliphaunt as default } from './hosts/node-api/worker-node-client.js';
+export * from './hosts/node-api/native-public.js';

package/lib/{rpc.d.ts → workers/rpc.d.ts}

@@ -1,10 +1,10 @@
-import type { WasixPersistenceMode, WasixProtocolConnectionMode, WasixProtocolStreamOutcome } from './database.js';
-import { WasixStorageError } from './errors.js';
-import { type PostgresErrorField } from './query.js';
-import type { SerializedWasixStorage } from './storage.js';
-import type { WasixStorageSyncBoundary } from './storage-provider.js';
-import type { WasixProtocolConnection } from './pgwire-connection.js';
-import type { WasixToolDescriptor, WasixToolProcessOptions, WasixToolProcessResult } from './tool-runtime.js';
+import type { WasixPersistenceMode, WasixProtocolConnectionMode, WasixProtocolStreamOutcome } from '../core/database.js';
+import { WasixStorageError } from '../core/errors.js';
+import { type PostgresErrorField } from '../protocol/query.js';
+import type { SerializedWasixStorage } from '../storage/types.js';
+import type { WasixStorageSyncBoundary } from '../storage/storage-provider.js';
+import type { WasixProtocolConnection } from '../protocol/pgwire-connection.js';
+import type { WasixToolDescriptor, WasixToolProcessOptions, WasixToolProcessResult } from '../resources/tool-runtime.js';
 export type SerializedAssetSource = string | Uint8Array;
 export type SerializedExtensionCarrier = {
     product: string;
@@ -64,12 +64,6 @@ export type SerializedRuntimeDescriptor = {
     product: 'liboliphaunt-wasix';
     version: string;
     runtimeArchive: SerializedRuntimeArchive;
-    standardSeedArchive: SerializedRuntimeArchive;
-    standardSeedManifest: {
-        sha256: string;
-        size: number;
-        source: SerializedAssetSource;
-    };
     manifest: {
         sha256: string;
         size: number;
@@ -79,32 +73,18 @@ export type SerializedRuntimeDescriptor = {
 /** Runtime subset required by PostgreSQL frontend tools. */
 export type SerializedToolRuntimeDescriptor = Pick<SerializedRuntimeDescriptor, 'product' | 'version' | 'runtimeArchive' | 'manifest'>;
 export type SerializedIcuDescriptor = {
-    schema: 'oliphaunt-wasix-icu-v1';
-    runtime: 'wasix';
-    product: 'oliphaunt-icu';
-    version: string;
-    compatibility: {
-        runtimeProduct: 'liboliphaunt-wasix';
-        runtimeVersion: string;
-        postgresMajor: '18';
-        physicalFormat: 'wasix-pg18-v1';
-        compatibilityKey: 'wasix-pg18-datum32-v1';
-        dataVersion: '76.1';
-        dataForm: 'files-le';
-        dataTreeSha256: string;
-    };
-    dataArchive: SerializedRuntimeArchive;
-    clusterSeedArchive: SerializedRuntimeArchive;
-    clusterSeedManifest: {
-        sha256: string;
-        size: number;
-        source: SerializedAssetSource;
-    };
+    data: SerializedAssetSource;
+    manifest: SerializedAssetSource;
+};
+export type SerializedSeed = {
+    archive: SerializedAssetSource;
+    manifest: SerializedAssetSource;
 };
 /** Host-ready open options shared by both public execution surfaces. */
 export type SerializedOpenOptions = {
     runtime: SerializedRuntimeDescriptor;
     icu?: SerializedIcuDescriptor;
+    seed?: SerializedSeed;
     /** Exact imported carrier closure, keyed by PostgreSQL SQL name. */
     extensionCarriers: Record<string, SerializedExtensionCarrier>;
     extensions: string[];

package/lib/{rpc.js → workers/rpc.js}

@@ -1,5 +1,5 @@
-import { WasixStorageError } from './errors.js';
-import { PostgresError } from './query.js';
+import { WasixStorageError } from '../core/errors.js';
+import { PostgresError } from '../protocol/query.js';
 export function serializeWorkerError(error) {
     if (error instanceof WasixStorageError) {
         return {
@@ -52,7 +52,7 @@ export function deserializeWorkerError(error) {
         restored.name = error.name;
         return Object.assign(restored, {
             oliphauntWasixError: 'tool',
-            oliphauntWasixAddonAbi: 1,
+            oliphauntWasixAddonAbi: 3,
             code: error.code,
             tool: error.tool,
             exitCode: error.exitCode,
@@ -71,7 +71,7 @@ function nativeToolError(error) {
         return undefined;
     const candidate = error;
     if (candidate.oliphauntWasixError !== 'tool' ||
-        candidate.oliphauntWasixAddonAbi !== 1 ||
+        candidate.oliphauntWasixAddonAbi !== 3 ||
         candidate.code !== 'tool-error' ||
         typeof candidate.message !== 'string' ||
         typeof candidate.tool !== 'string' ||

package/lib/{worker-dispatch.d.ts → workers/worker-dispatch.d.ts}

@@ -1,4 +1,4 @@
-import { type WasixDatabaseSession } from './database.js';
+import { type WasixDatabaseSession } from '../core/database.js';
 import { type SerializedOpenOptions, type WorkerRequest, type WorkerResponse } from './rpc.js';
 export type WorkerResponder = (response: WorkerResponse, transfer?: readonly ArrayBuffer[]) => void;
 export type WorkerSessionOpener = (options: SerializedOpenOptions) => Promise<WasixDatabaseSession>;

package/lib/{worker-dispatch.js → workers/worker-dispatch.js}

@@ -1,5 +1,5 @@
-import { WASIX_PROTOCOL_CALLBACK_CHUNK_BYTES, } from './database.js';
-import { restoreWasixSerialized } from './client-common.js';
+import { WASIX_PROTOCOL_CALLBACK_CHUNK_BYTES, } from '../core/database.js';
+import { restoreWasixSerialized } from '../hosts/browser/client-common.js';
 import { serializeWorkerError, } from './rpc.js';
 import { prepareTransferableBytes } from './worker-transfer.js';
 class WorkerStreamCallbackAborted extends Error {

package/lib/{worker-rpc.d.ts → workers/worker-rpc.d.ts}

@@ -1,7 +1,7 @@
-import { type WasixDatabaseSessionTerminalState, type WasixPersistenceMode, type WasixProtocolStreamOutcome } from './database.js';
+import { type WasixDatabaseSessionTerminalState, type WasixPersistenceMode, type WasixProtocolStreamOutcome } from '../core/database.js';
 import type { SerializedOpenOptions, WorkerRequest, WorkerResponse } from './rpc.js';
-import type { BinaryInput, OliphauntDatabase, OpenConfig } from './types.js';
-import type { WasixToolProcessResult } from './tool-runtime.js';
+import type { BinaryInput, OliphauntDatabase, OpenConfig } from '../core/types.js';
+import type { WasixToolProcessResult } from '../resources/tool-runtime.js';
 type WorkerResponseValue = Uint8Array | WasixToolProcessResult | WasixProtocolStreamOutcome | undefined;
 type WorkerRequestWithoutId = WorkerRequest extends infer Request ? Request extends {
     id: number;

package/lib/{worker-rpc.js → workers/worker-rpc.js}

@@ -1,6 +1,6 @@
-import { WASIX_PROTOCOL_CALLBACK_CHUNK_BYTES, WasixDatabaseImpl, createWasixDeferred, normalizeWasixDatabaseIdentity, } from './database.js';
-import { serializeOpenConfig } from './client-common.js';
-import { toUint8Array } from './query.js';
+import { WASIX_PROTOCOL_CALLBACK_CHUNK_BYTES, WasixDatabaseImpl, createWasixDeferred, normalizeWasixDatabaseIdentity, } from '../core/database.js';
+import { serializeOpenConfig } from '../core/open-config.js';
+import { toUint8Array } from '../protocol/query.js';
 import { deserializeWorkerError } from './rpc.js';
 const STREAM_ACK = 0;
 const STREAM_FAILED = 1;
@@ -215,13 +215,12 @@ function assetTransfers(options) {
     appendAssetTransfer(options.runtime.runtimeArchive.source, transfer, seen);
     appendAssetTransfer(options.runtime.manifest.source, transfer, seen);
     if (options.icu !== undefined) {
-        appendAssetTransfer(options.icu.dataArchive.source, transfer, seen);
-        appendAssetTransfer(options.icu.clusterSeedArchive.source, transfer, seen);
-        appendAssetTransfer(options.icu.clusterSeedManifest.source, transfer, seen);
+        appendAssetTransfer(options.icu.data, transfer, seen);
+        appendAssetTransfer(options.icu.manifest, transfer, seen);
     }
-    else {
-        appendAssetTransfer(options.runtime.standardSeedArchive.source, transfer, seen);
-        appendAssetTransfer(options.runtime.standardSeedManifest.source, transfer, seen);
+    if (options.seed !== undefined) {
+        appendAssetTransfer(options.seed.archive, transfer, seen);
+        appendAssetTransfer(options.seed.manifest, transfer, seen);
     }
     for (const carrier of Object.values(options.extensionCarriers)) {
         appendAssetTransfer(carrier.source, transfer, seen);
@@ -316,9 +315,6 @@ class WorkerDatabaseSession {
             method: 'runTool',
             options: {
                 ...options,
-                // The release addon owns the verified tool payload. Preserve only
-                // the descriptor identity across the Worker boundary.
-                tool: { ...options.tool, source: 'oliphaunt:wasix-napi-embedded' },
                 args: [...options.args],
                 ...(stdin === undefined ? {} : { stdin }),
             },

package/package.json

@@ -1,14 +1,17 @@
 {
   "name": "@oliphaunt/wasix-ts",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Portable Oliphaunt WASIX TypeScript SDK for browsers, Node.js, Bun, Deno, and Electron.",
   "license": "MIT",
   "type": "module",
-  "sideEffects": false,
+  "sideEffects": [
+    "./lib/browser.js",
+    "./lib/native-only.js"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/f0rr0/oliphaunt.git",
-    "directory": "src/bindings/wasix-ts"
+    "directory": "src/wasix/sdks/ts"
   },
   "bugs": {
     "url": "https://github.com/f0rr0/oliphaunt/issues"
@@ -16,10 +19,10 @@
   "homepage": "https://oliphaunt.dev",
   "oliphaunt": {
     "runtimeProduct": "liboliphaunt-wasix",
-    "runtimeVersion": "0.2.0",
+    "runtimeVersion": "0.3.1",
     "wasixNapiProduct": "oliphaunt-wasix-napi",
-    "wasixNapiVersion": "0.1.0",
-    "wasixAddonAbiVersion": 1,
+    "wasixNapiVersion": "0.2.0",
+    "wasixAddonAbiVersion": 3,
     "nodeApiVersion": 8,
     "browserHost": "wasmer-js-patched",
     "serverHost": "wasix-rust-napi"
@@ -30,26 +33,56 @@
   },
   "exports": {
     ".": {
-      "types": "./lib/index.d.ts",
-      "deno": "./lib/index.deno.js",
-      "bun": "./lib/index.bun.js",
-      "node": "./lib/index.node.js",
-      "browser": "./lib/index.js",
-      "default": "./lib/index.js"
+      "deno": {
+        "types": "./lib/index.deno.d.ts",
+        "default": "./lib/index.deno.js"
+      },
+      "bun": {
+        "types": "./lib/index.bun.d.ts",
+        "default": "./lib/index.bun.js"
+      },
+      "node": {
+        "types": "./lib/index.node.d.ts",
+        "default": "./lib/index.node.js"
+      },
+      "browser": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      },
+      "default": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      }
     },
     "./worker": {
-      "types": "./lib/worker-entry.d.ts",
-      "deno": "./lib/worker-entry.deno.js",
-      "bun": "./lib/worker-entry.bun.js",
-      "node": "./lib/worker-entry.node.js",
-      "browser": "./lib/worker-entry.js",
-      "default": "./lib/worker-entry.js"
+      "deno": {
+        "types": "./lib/worker-entry.deno.d.ts",
+        "default": "./lib/worker-entry.deno.js"
+      },
+      "bun": {
+        "types": "./lib/worker-entry.bun.d.ts",
+        "default": "./lib/worker-entry.bun.js"
+      },
+      "node": {
+        "types": "./lib/worker-entry.node.d.ts",
+        "default": "./lib/worker-entry.node.js"
+      },
+      "browser": {
+        "types": "./lib/worker-entry.d.ts",
+        "default": "./lib/worker-entry.js"
+      },
+      "default": {
+        "types": "./lib/worker-entry.d.ts",
+        "default": "./lib/worker-entry.js"
+      }
     },
     "./direct": {
       "types": "./lib/direct.node.d.ts",
       "deno": "./lib/direct.node.js",
       "bun": "./lib/direct.node.js",
-      "node": "./lib/direct.node.js"
+      "node": "./lib/direct.node.js",
+      "browser": "./lib/native-only.js",
+      "default": "./lib/native-only.js"
     },
     "./internal/tools": {
       "types": "./lib/internal.d.ts",
@@ -63,7 +96,9 @@
       "types": "./lib/server.node.d.ts",
       "deno": "./lib/server.node.js",
       "bun": "./lib/server.node.js",
-      "node": "./lib/server.node.js"
+      "node": "./lib/server.node.js",
+      "browser": "./lib/native-only.js",
+      "default": "./lib/native-only.js"
     },
     "./storage/indexed-db": {
       "types": "./lib/storage/indexed-db.d.ts",
@@ -87,6 +122,10 @@
     },
     "./package.json": {
       "default": "./package.json"
+    },
+    "./browser": {
+      "types": "./lib/browser.d.ts",
+      "default": "./lib/browser.js"
     }
   },
   "main": "lib/index.js",
@@ -101,22 +140,19 @@
     "THIRD_PARTY_NOTICES.md"
   ],
   "dependencies": {
-    "@oliphaunt/js-core": "0.0.0",
-    "@oliphaunt/liboliphaunt-wasix": "0.2.0",
+    "@oliphaunt/liboliphaunt-wasix": "0.3.1",
+    "@oliphaunt/ts-query": "0.1.1",
     "fzstd": "0.1.1"
   },
-  "bundledDependencies": [
-    "@oliphaunt/js-core"
-  ],
   "optionalDependencies": {
-    "@oliphaunt/wasix-napi-darwin-arm64": "0.1.0",
-    "@oliphaunt/wasix-napi-linux-arm64-gnu": "0.1.0",
-    "@oliphaunt/wasix-napi-linux-x64-gnu": "0.1.0",
-    "@oliphaunt/wasix-napi-win32-x64-msvc": "0.1.0"
+    "@oliphaunt/wasix-napi-darwin-arm64": "0.2.0",
+    "@oliphaunt/wasix-napi-linux-arm64-gnu": "0.2.0",
+    "@oliphaunt/wasix-napi-linux-x64-gnu": "0.2.0",
+    "@oliphaunt/wasix-napi-win32-x64-msvc": "0.2.0"
   },
   "engines": {
     "node": ">=22.13 <25",
     "bun": ">=1.3.14",
     "deno": ">=2.8.1"
   }
-}
+}

package/lib/client-common.js

@@ -1,36 +0,0 @@
-import defaultWasixRuntime from '@oliphaunt/liboliphaunt-wasix';
-import { serializeWasixExtensionDescriptors } from './extension-descriptor.js';
-import { serializeWasixIcuDescriptor } from './icu-descriptor.js';
-import { decodePhysicalArchive } from './physical-archive.js';
-import { toUint8Array } from './query.js';
-import { serializeWasixRuntimeDescriptor } from './runtime-descriptor.js';
-import { serializeWasixStorage } from './storage.js';
-import { restoreWasixStorage, WASIX_PHYSICAL_IDENTITY } from './storage-provider.js';
-import { normalizeWasixStartupGUCs } from './startup-config.js';
-export function serializeOpenConfig(config = {}, runtimeDescriptor = defaultWasixRuntime) {
-    const extensions = serializeWasixExtensionDescriptors(config.extensions ?? []);
-    const runtime = serializeWasixRuntimeDescriptor(runtimeDescriptor);
-    const storage = serializeWasixStorage(config.storage);
-    return {
-        runtime,
-        ...(config.icu === undefined ? {} : { icu: serializeWasixIcuDescriptor(config.icu) }),
-        extensionCarriers: extensions.carriers,
-        extensions: extensions.selectedSqlNames,
-        username: config.username ?? 'postgres',
-        database: config.database ?? 'postgres',
-        startupGUCs: normalizeWasixStartupGUCs(config.startupGUCs ?? {}),
-        storage,
-    };
-}
-export async function restoreWasix(storage, bytes, validate) {
-    if (storage === undefined)
-        throw new TypeError('WASIX restore requires persistent storage');
-    const openOptions = serializeOpenConfig({ storage });
-    validate?.(openOptions);
-    await restoreWasixSerialized(openOptions.storage, toUint8Array(bytes).slice());
-}
-/** @internal Restore already-owned archive bytes inside the selected realm. */
-export async function restoreWasixSerialized(storage, bytes) {
-    const snapshot = decodePhysicalArchive(bytes);
-    await restoreWasixStorage(storage, snapshot, WASIX_PHYSICAL_IDENTITY);
-}

package/lib/icu-descriptor.d.ts

@@ -1,3 +0,0 @@
-import type { SerializedIcuDescriptor } from './rpc.js';
-/** Validate an explicitly imported ICU carrier before bytes cross a worker boundary. */
-export declare function serializeWasixIcuDescriptor(value: unknown): SerializedIcuDescriptor;