@oliphaunt/wasix-ts 0.1.0 → 0.2.1

package/lib/{native-session.js → hosts/node-api/native-session.js}

@@ -1,18 +1,24 @@
-import { WasixStorageError, } from './errors.js';
-import { loadNativeWasixAddon, } from './native-addon.js';
-import { normalizeWasixDatabaseIdentity, } from './database.js';
-import { validateWasixToolDescriptor } from './tool-runtime.js';
+import { createRequire } from 'node:module';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { readFile } from 'node:fs/promises';
+import { installPackageAssetReader } from '../../resources/asset-source.js';
+import { loadAsset } from '../../resources/archive.js';
+import { assertSha256, loadIcuData, loadSeedBytes } from '../../resources/extensions.js';
+import { WasixStorageError, } from '../../core/errors.js';
+import { loadNativeWasixAddon, nativeTarget, } from './native-addon.js';
+import { normalizeWasixDatabaseIdentity, } from '../../core/database.js';
+import { validateWasixToolDescriptor } from '../../resources/tool-runtime.js';
+installPackageAssetReader(readFile);
 /** @internal A synchronous Rust Oliphaunt owned by the importing JavaScript realm. */
 export class NativeWasixSession {
     identity;
     terminalState;
-    #addon;
     #handle;
     #runtimeVersion;
     #closed = false;
     #closeAttempt;
-    constructor(addon, handle, identity, runtimeVersion) {
-        this.#addon = addon;
+    constructor(handle, identity, runtimeVersion) {
         this.#handle = handle;
         this.identity = identity;
         this.#runtimeVersion = runtimeVersion;
@@ -35,9 +41,12 @@ export class NativeWasixSession {
             throw new TypeError(`@oliphaunt/wasix-ts ${provider} storage is browser-only`);
         }
         try {
-            const handle = addon.NativeWasixDatabase.open(nativeOptions);
+            const handle = addon.NativeWasixDatabase.open({
+                ...nativeOptions,
+                ...(await loadNativeResources(options)),
+            });
             validateDatabaseHandle(handle);
-            return new NativeWasixSession(addon, handle, normalizeWasixDatabaseIdentity(options.username, options.database), options.runtime.version);
+            return new NativeWasixSession(handle, normalizeWasixDatabaseIdentity(options.username, options.database), options.runtime.version);
         }
         catch (error) {
             throw mapNativeError(error);
@@ -90,25 +99,20 @@ export class NativeWasixSession {
     }
     async runTool(options) {
         this.#assertOpen();
-        if (options.runtimeVersion !== '' && options.runtimeVersion !== this.#runtimeVersion) {
-            throw new Error(`WASIX tools runtime ${options.runtimeVersion} is incompatible with database runtime ${this.#runtimeVersion}`);
-        }
-        validateWasixToolDescriptor(options.tool);
-        const expectedIdentity = `${options.tool.sha256}:${options.tool.size}`;
-        if (this.#addon.toolIdentity(options.tool.name) !== expectedIdentity) {
-            throw new Error(`WASIX ${options.tool.name} descriptor does not match the tool embedded in the native addon`);
-        }
+        const assets = await loadNativeToolAssets(this.#runtimeVersion, options);
         if (options.tool.name === 'pg_dump') {
             try {
-                return toolProcessResult(this.#handle.pgDump(userPgDumpArguments(options.args, this.identity)));
+                return toolProcessResult(this.#handle.pgDump(options.args, assets));
             }
             catch (error) {
                 throw this.#mapFailure(error);
             }
         }
-        const parsed = userPsqlArguments(options.args, options.stdin, this.identity);
+        const script = options.stdin === undefined
+            ? undefined
+            : new TextDecoder('utf-8', { fatal: true }).decode(options.stdin);
         try {
-            return toolProcessResult(this.#handle.psql(parsed.args, parsed.command, parsed.script));
+            return toolProcessResult(this.#handle.psql(options.args, assets, options.command, script));
         }
         catch (error) {
             throw this.#mapFailure(error);
@@ -146,13 +150,11 @@ export class NativeWasixSession {
 export class NativeWasixActorSession {
     identity;
     terminalState;
-    #addon;
     #handle;
     #runtimeVersion;
     #closed = false;
     #closeAttempt;
-    constructor(addon, handle, identity, runtimeVersion) {
-        this.#addon = addon;
+    constructor(handle, identity, runtimeVersion) {
         this.#handle = handle;
         this.identity = identity;
         this.#runtimeVersion = runtimeVersion;
@@ -161,9 +163,12 @@ export class NativeWasixActorSession {
     static async open(options) {
         const addon = requireCompatibleNativeWasixAddon(options);
         try {
-            const handle = await addon.NativeWasixActorDatabase.open(nativeWasixOpenOptions(options, nativeStorage(options)));
+            const handle = await addon.NativeWasixActorDatabase.open({
+                ...nativeWasixOpenOptions(options, nativeStorage(options)),
+                ...(await loadNativeResources(options)),
+            });
             validateActorDatabaseHandle(handle);
-            return new NativeWasixActorSession(addon, handle, normalizeWasixDatabaseIdentity(options.username, options.database), options.runtime.version);
+            return new NativeWasixActorSession(handle, normalizeWasixDatabaseIdentity(options.username, options.database), options.runtime.version);
         }
         catch (error) {
             throw mapNativeError(error);
@@ -209,13 +214,15 @@ export class NativeWasixActorSession {
     }
     async runTool(options) {
         this.#assertOpen();
-        validateNativeToolCall(this.#addon, this.#runtimeVersion, options);
+        const assets = await loadNativeToolAssets(this.#runtimeVersion, options);
         try {
             if (options.tool.name === 'pg_dump') {
-                return toolProcessResult(await this.#handle.pgDump(userPgDumpArguments(options.args, this.identity)));
+                return toolProcessResult(await this.#handle.pgDump(options.args, assets));
             }
-            const parsed = userPsqlArguments(options.args, options.stdin, this.identity);
-            return toolProcessResult(await this.#handle.psql(parsed.args, parsed.command, parsed.script));
+            const script = options.stdin === undefined
+                ? undefined
+                : new TextDecoder('utf-8', { fatal: true }).decode(options.stdin);
+            return toolProcessResult(await this.#handle.psql(options.args, assets, options.command, script));
         }
         catch (error) {
             throw this.#mapFailure(error);
@@ -342,33 +349,29 @@ export function requireCompatibleNativeWasixAddon(options) {
         options.runtime.version !== addon.runtimeVersion()) {
         throw new Error(`WASIX runtime ${options.runtime.version} is incompatible with native runtime ${addon.runtimeVersion()}`);
     }
-    if (options.icu !== undefined &&
-        options.icu.compatibility.runtimeVersion !== options.runtime.version) {
-        throw new Error('WASIX ICU descriptor is incompatible with the selected native runtime');
-    }
-    requireEmbeddedPayloadIdentity(addon, 'runtimeArchive', options.runtime.runtimeArchive, 'runtime archive');
-    requireEmbeddedPayloadIdentity(addon, 'standardSeedArchive', options.runtime.standardSeedArchive, 'standard cluster seed archive');
-    requireEmbeddedPayloadIdentity(addon, 'standardSeedManifest', options.runtime.standardSeedManifest, 'standard cluster seed manifest');
-    if (options.icu !== undefined) {
-        requireEmbeddedPayloadIdentity(addon, 'icuDataArchive', options.icu.dataArchive, 'ICU data archive');
-        requireEmbeddedPayloadIdentity(addon, 'icuSeedArchive', options.icu.clusterSeedArchive, 'ICU cluster seed archive');
-        requireEmbeddedPayloadIdentity(addon, 'icuSeedManifest', options.icu.clusterSeedManifest, 'ICU cluster seed manifest');
-    }
     for (const [sqlName, carrier] of Object.entries(options.extensionCarriers)) {
         if (carrier.sqlName !== sqlName) {
             throw new Error(`WASIX extension carrier key ${sqlName} does not match ${carrier.sqlName}`);
         }
-        const expectedIdentity = `${carrier.sha256}:${carrier.size}`;
-        if (addon.extensionIdentity(sqlName) !== expectedIdentity) {
-            throw new Error(`WASIX extension ${sqlName} descriptor does not match the archive embedded in the native addon`);
+        if (carrier.product !== 'oliphaunt-extension-contrib-pg18')
+            continue;
+        if (carrier.version !== addon.runtimeVersion()) {
+            throw new Error(`WASIX contrib extension ${sqlName} version ${carrier.version} is incompatible with native runtime ${addon.runtimeVersion()}`);
         }
     }
     return addon;
 }
-function requireEmbeddedPayloadIdentity(addon, component, descriptor, label) {
-    if (addon.payloadIdentity(component) !== `${descriptor.sha256}:${descriptor.size}`) {
-        throw new Error(`WASIX ${label} descriptor does not match the native addon payload`);
-    }
+export async function loadNativeResources(options) {
+    const [seed, icuData] = await Promise.all([
+        options.seed === undefined ? undefined : loadSeedBytes(options.seed),
+        options.icu === undefined ? undefined : loadIcuData(options.icu),
+    ]);
+    return {
+        ...(seed === undefined ? {} : { seed }),
+        ...(icuData === undefined
+            ? {}
+            : { icuData: { data: icuData.data, manifest: icuData.manifest } }),
+    };
 }
 /** @internal Project already-validated TS config onto the narrow native ABI. */
 export function nativeWasixOpenOptions(options, storage) {
@@ -379,9 +382,37 @@ export function nativeWasixOpenOptions(options, storage) {
         username: identity.username,
         database: identity.database,
         startupGucs: { ...options.startupGUCs },
-        extensions: [...options.extensions],
+        extensions: [...new Set([...options.extensions, ...Object.keys(options.extensionCarriers)])],
+        extensionPackages: nativeExtensionPackages(options),
     };
 }
+function nativeExtensionPackages(options) {
+    return Object.values(options.extensionCarriers)
+        .filter((carrier) => carrier.product !== 'oliphaunt-extension-contrib-pg18')
+        .map((carrier) => {
+        if (typeof carrier.source !== 'string' || !carrier.source.startsWith('file:')) {
+            throw new Error(`WASIX extension ${carrier.sqlName} requires an installed package on native hosts`);
+        }
+        const archive = fileURLToPath(carrier.source);
+        // Generated portable carriers own extensions/<sql-name>/extension.tar.zst.
+        const packageJson = join(dirname(dirname(dirname(archive))), 'package.json');
+        const name = `@oliphaunt/${carrier.product.slice('oliphaunt-'.length)}-wasix`;
+        const needsAot = carrier.install.nativeModule !== null || carrier.install.nativeModules.length > 0;
+        const target = nativeTarget(process.platform, process.arch, 'glibc').id;
+        const aotPackageJson = needsAot
+            ? createRequire(packageJson).resolve(`${name}-${target}/package.json`)
+            : undefined;
+        return {
+            sqlName: carrier.sqlName,
+            product: carrier.product,
+            version: carrier.version,
+            archiveSha256: carrier.sha256,
+            archiveSize: carrier.size,
+            packageJson,
+            ...(aotPackageJson === undefined ? {} : { aotPackageJson }),
+        };
+    });
+}
 function nativeStorage(options) {
     if (options.storage.kind === 'memory')
         return { kind: 'memory' };
@@ -391,15 +422,22 @@ function nativeStorage(options) {
     const provider = options.storage.kind === 'indexed-db' ? 'IndexedDB' : 'OPFS';
     throw new TypeError(`@oliphaunt/wasix-ts ${provider} storage is browser-only`);
 }
-function validateNativeToolCall(addon, runtimeVersion, options) {
+async function loadNativeToolAssets(runtimeVersion, options) {
     if (options.runtimeVersion !== '' && options.runtimeVersion !== runtimeVersion) {
         throw new Error(`WASIX tools runtime ${options.runtimeVersion} is incompatible with database runtime ${runtimeVersion}`);
     }
     validateWasixToolDescriptor(options.tool);
-    const expectedIdentity = `${options.tool.sha256}:${options.tool.size}`;
-    if (addon.toolIdentity(options.tool.name) !== expectedIdentity) {
-        throw new Error(`WASIX ${options.tool.name} descriptor does not match the tool embedded in the native addon`);
-    }
+    if (!options.tool.aot)
+        throw new Error('WASIX native tools require the installed target AOT carrier');
+    const [wasm, aot, manifest] = await Promise.all([
+        loadAsset(options.tool.source, 'WASIX tool module'),
+        loadAsset(options.tool.aot.source, 'WASIX tool AOT'),
+        loadAsset(options.tool.aot.manifest, 'WASIX tools AOT manifest'),
+    ]);
+    if (wasm.length !== options.tool.size)
+        throw new Error('WASIX tool module size mismatch');
+    await assertSha256(wasm, options.tool.sha256, 'WASIX tool module');
+    return { wasm, aot, manifest: new TextDecoder('utf-8', { fatal: true }).decode(manifest) };
 }
 function validateDatabaseHandle(handle) {
     if (typeof handle !== 'object' ||
@@ -446,59 +484,6 @@ function toolProcessResult(result) {
         stderr: binaryView(result.stderr),
     };
 }
-function userPgDumpArguments(args, identity) {
-    const suffix = [
-        '--encoding=UTF8',
-        '--no-password',
-        `--username=${identity.username}`,
-        '--host=127.0.0.1',
-        '--port=65432',
-        `--dbname=${identity.database}`,
-    ];
-    return stripManagedSuffix('pg_dump', args, suffix);
-}
-function userPsqlArguments(args, stdin, identity) {
-    const managed = [
-        '--no-psqlrc',
-        '--no-password',
-        '--set=ON_ERROR_STOP=1',
-        `--username=${identity.username}`,
-        '--host=127.0.0.1',
-        '--port=65432',
-        `--dbname=${identity.database}`,
-    ];
-    const start = findExactSequence(args, managed);
-    if (start < 0)
-        throw new Error('Oliphaunt WASIX psql call has an invalid managed argument set');
-    const user = args.slice(0, start);
-    const input = args.slice(start + managed.length);
-    if (input.length === 0)
-        return { args: user };
-    if (input.length === 2 && input[0] === '--command' && input[1] !== undefined) {
-        return { args: user, command: input[1] };
-    }
-    if (input.length === 1 && input[0] === '--file=-' && stdin !== undefined) {
-        return {
-            args: user,
-            script: new TextDecoder('utf-8', { fatal: true }).decode(stdin),
-        };
-    }
-    throw new Error('Oliphaunt WASIX psql call has invalid managed input arguments');
-}
-function stripManagedSuffix(tool, args, suffix) {
-    if (args.length < suffix.length ||
-        !suffix.every((argument, index) => args[args.length - suffix.length + index] === argument)) {
-        throw new Error(`Oliphaunt WASIX ${tool} call has an invalid managed argument set`);
-    }
-    return args.slice(0, -suffix.length);
-}
-function findExactSequence(values, expected) {
-    for (let start = values.length - expected.length; start >= 0; start -= 1) {
-        if (expected.every((value, offset) => values[start + offset] === value))
-            return start;
-    }
-    return -1;
-}
 /** @internal Translate only the exact tagged native storage contract. */
 export function mapNativeError(error) {
     if (error instanceof WasixStorageError)
@@ -539,7 +524,7 @@ function nativeStorageError(error) {
         return undefined;
     const candidate = error;
     if (candidate.oliphauntWasixError !== 'storage' ||
-        candidate.oliphauntWasixAddonAbi !== 1 ||
+        candidate.oliphauntWasixAddonAbi !== 3 ||
         !memberOf(candidate.code, STORAGE_CODES) ||
         !memberOf(candidate.commitState, STORAGE_COMMIT_STATES) ||
         !memberOf(candidate.phase, STORAGE_PHASES)) {

package/lib/{node-actor.d.ts → hosts/node-api/node-actor.d.ts}

@@ -1,6 +1,6 @@
 import { NativeWasixActorSession } from './native-session.js';
-import type { SerializedOpenOptions } from './rpc.js';
-import type { OliphauntDatabase } from './types.js';
+import type { SerializedOpenOptions } from '../../workers/rpc.js';
+import type { OliphauntDatabase } from '../../core/types.js';
 /** @internal Open one Rust-owner actor without blocking the importing event loop. */
 export declare function openNodeActorSession(options: SerializedOpenOptions): Promise<NativeWasixActorSession>;
 /** @internal Open the public database contract over the native Rust owner. */

package/lib/{node-actor.js → hosts/node-api/node-actor.js}

@@ -1,4 +1,4 @@
-import { WasixDatabaseImpl } from './database.js';
+import { WasixDatabaseImpl } from '../../core/database.js';
 import { NativeWasixActorSession } from './native-session.js';
 /** @internal Open one Rust-owner actor without blocking the importing event loop. */
 export async function openNodeActorSession(options) {

package/lib/{node-client-common.d.ts → hosts/node-api/node-client-common.d.ts}

@@ -1,6 +1,6 @@
-import type { SerializedOpenOptions } from './rpc.js';
-import type { PersistentWasixStorage } from './storage.js';
-import type { BinaryInput } from './types.js';
+import type { SerializedOpenOptions } from '../../workers/rpc.js';
+import type { PersistentWasixStorage } from '../../storage/types.js';
+import type { BinaryInput } from '../../core/types.js';
 /** @internal Restore a physical archive through the Rust WASIX implementation. */
 export declare function restoreNodeWasix(storage: PersistentWasixStorage, bytes: BinaryInput): Promise<void>;
 /** @internal Restore synchronously in the importing realm for `/direct`. */

package/lib/{node-client-common.js → hosts/node-api/node-client-common.js}

@@ -1,20 +1,20 @@
 import { isAbsolute, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { serializeOpenConfig } from './client-common.js';
+import { serializeOpenConfig } from '../../core/open-config.js';
 import { hostRuntime } from './host-runtime.js';
 import { restoreNativeWasix, restoreNativeWasixDirect } from './native-session.js';
-import { toUint8Array } from './query.js';
+import { toUint8Array } from '../../protocol/query.js';
 /** @internal Restore a physical archive through the Rust WASIX implementation. */
 export async function restoreNodeWasix(storage, bytes) {
     const options = serializeOpenConfig({ storage });
     requireNodeStorage(options);
-    return restoreNativeWasix(options, toUint8Array(bytes).slice());
+    return restoreNativeWasix(options, toUint8Array(bytes));
 }
 /** @internal Restore synchronously in the importing realm for `/direct`. */
 export async function restoreNodeWasixDirect(storage, bytes) {
     const options = serializeOpenConfig({ storage });
     requireNodeStorage(options);
-    return restoreNativeWasixDirect(options, toUint8Array(bytes).slice());
+    return restoreNativeWasixDirect(options, toUint8Array(bytes));
 }
 /** @internal Validate and normalize storage shared by direct and Worker entrypoints. */
 export function requireNodeStorage(options) {

package/lib/{node-client.d.ts → hosts/node-api/node-client.d.ts}

@@ -1,4 +1,4 @@
-import type { OliphauntClient, OliphauntDatabase, OpenConfig } from './types.js';
+import type { OliphauntClient, OliphauntDatabase, OpenConfig } from './native-public.js';
 /** Open PostgreSQL on a dedicated Rust owner while keeping the caller event loop responsive. */
 export declare function openWasix(config?: OpenConfig): Promise<OliphauntDatabase>;
 export declare const Oliphaunt: OliphauntClient;

package/lib/{node-client.js → hosts/node-api/node-client.js}

@@ -1,4 +1,4 @@
-import { serializeOpenConfig } from './client-common.js';
+import { serializeOpenConfig } from '../../core/open-config.js';
 import { requireNodeStorage, restoreNodeWasix } from './node-client-common.js';
 import { openNodeActor } from './node-actor.js';
 /** Open PostgreSQL on a dedicated Rust owner while keeping the caller event loop responsive. */

package/lib/{node-direct.d.ts → hosts/node-api/node-direct.d.ts}

@@ -1,6 +1,6 @@
 import { NativeWasixSession } from './native-session.js';
-import type { SerializedOpenOptions } from './rpc.js';
-import type { OliphauntDatabase } from './types.js';
+import type { SerializedOpenOptions } from '../../workers/rpc.js';
+import type { OliphauntDatabase } from '../../core/types.js';
 /** @internal Own one synchronous Rust WASIX session in the current JS realm. */
 export declare function openNodeDirectSession(options: SerializedOpenOptions): Promise<NativeWasixSession>;
 /** @internal Open the public database contract in the current Node realm. */

package/lib/{node-direct.js → hosts/node-api/node-direct.js}

@@ -1,4 +1,4 @@
-import { WasixDatabaseImpl } from './database.js';
+import { WasixDatabaseImpl } from '../../core/database.js';
 import { NativeWasixSession } from './native-session.js';
 /** @internal Own one synchronous Rust WASIX session in the current JS realm. */
 export async function openNodeDirectSession(options) {

package/lib/{node-worker-port.d.ts → hosts/node-api/node-worker-port.d.ts}

@@ -1,4 +1,4 @@
 import type { Worker } from 'node:worker_threads';
-import type { WasixWorkerPort } from './worker-rpc.js';
+import type { WasixWorkerPort } from '../../workers/worker-rpc.js';
 /** @internal Adapt Node-compatible Worker events to the shared RPC transport. */
 export declare function nodeWorkerPort(worker: Worker, runtimeName?: string): WasixWorkerPort;

package/lib/{node-worker.js → hosts/node-api/node-worker.js}

@@ -2,7 +2,7 @@ import { parentPort } from 'node:worker_threads';
 import { hostRuntimeName } from './host-runtime.js';
 import { openNodeDirectSession } from './node-direct.js';
 import { restoreNativeWasixStorageDirect } from './native-session.js';
-import { createWorkerSessionDispatcher } from './worker-dispatch.js';
+import { createWorkerSessionDispatcher } from '../../workers/worker-dispatch.js';
 if (parentPort === null) {
     throw new Error(`@oliphaunt/wasix-ts ${hostRuntimeName()} host must run inside a Worker`);
 }

package/lib/{worker-node-client.d.ts → hosts/node-api/worker-node-client.d.ts}

@@ -1,4 +1,4 @@
-import type { OliphauntClient, OliphauntDatabase, OpenConfig } from './types.js';
+import type { OliphauntClient, OliphauntDatabase, OpenConfig } from './native-public.js';
 /** Open PostgreSQL in a package-owned Node-compatible Worker realm. */
 export declare function openWasix(config?: OpenConfig): Promise<OliphauntDatabase>;
 export declare const Oliphaunt: OliphauntClient;

package/lib/{worker-node-client.js → hosts/node-api/worker-node-client.js}

@@ -1,15 +1,14 @@
 import { Worker } from 'node:worker_threads';
-import { serializeOpenConfig } from './client-common.js';
+import { serializeOpenConfig } from '../../core/open-config.js';
 import { hostRuntimeName } from './host-runtime.js';
 import { requireNodeStorage } from './node-client-common.js';
 import { nodeWorkerExecArgv } from './node-worker-options.js';
 import { nodeWorkerPort } from './node-worker-port.js';
-import { openWasixWithWorker, restoreWasixWithWorker } from './worker-rpc.js';
+import { openWasixWithWorker, restoreWasixWithWorker, } from '../../workers/worker-rpc.js';
 /** Open PostgreSQL in a package-owned Node-compatible Worker realm. */
 export async function openWasix(config = {}) {
-    // The native Worker owns release-embedded runtime assets. Do not structured-
-    // clone caller-provided WebAssembly archives that the N-API path will never
-    // read; retain their exact identity metadata for compatibility validation.
+    // Runtime and contrib assets are embedded in the addon; external extensions
+    // still need their installed package URLs in the Worker.
     const openOptions = withoutNativeAssetPayloads(serializeOpenConfig(config));
     return openWasixWithWorker(createNodeWorker, openOptions, requireNodeStorage, false);
 }
@@ -33,23 +32,11 @@ function withoutNativeAssetPayloads(options) {
         runtime: {
             ...options.runtime,
             runtimeArchive: { ...options.runtime.runtimeArchive, source },
-            standardSeedArchive: { ...options.runtime.standardSeedArchive, source },
-            standardSeedManifest: { ...options.runtime.standardSeedManifest, source },
             manifest: { ...options.runtime.manifest, source },
         },
-        ...(options.icu === undefined
-            ? {}
-            : {
-                icu: {
-                    ...options.icu,
-                    dataArchive: { ...options.icu.dataArchive, source },
-                    clusterSeedArchive: { ...options.icu.clusterSeedArchive, source },
-                    clusterSeedManifest: { ...options.icu.clusterSeedManifest, source },
-                },
-            }),
         extensionCarriers: Object.fromEntries(Object.entries(options.extensionCarriers).map(([sqlName, carrier]) => [
             sqlName,
-            { ...carrier, source },
+            carrier.product === 'oliphaunt-extension-contrib-pg18' ? { ...carrier, source } : carrier,
         ])),
     };
 }

package/lib/index.bun.d.ts

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

package/lib/index.bun.js

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

package/lib/index.d.ts

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

package/lib/index.deno.d.ts

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

package/lib/index.deno.js

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

package/lib/index.js

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

package/lib/index.node.d.ts

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

package/lib/index.node.js

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

package/lib/internal.d.ts

@@ -1,5 +1,5 @@
-import type { OliphauntDatabase } from './types.js';
-import { type WasixToolProcessOptions, type WasixToolProcessResult } from './internal-common.js';
-export { getWasixDatabaseIdentity } from './database.js';
-export type { WasixToolDescriptor, WasixToolProcessOptions, WasixToolProcessResult, } from './internal-common.js';
+import type { OliphauntDatabase } from './core/types.js';
+import { type WasixToolProcessOptions, type WasixToolProcessResult } from './hosts/browser/internal-common.js';
+export { getWasixDatabaseIdentity } from './core/database.js';
+export type { WasixToolDescriptor, WasixToolProcessOptions, WasixToolProcessResult, } from './hosts/browser/internal-common.js';
 export declare function runWasixToolProcess(database: OliphauntDatabase, options: WasixToolProcessOptions): Promise<WasixToolProcessResult>;

package/lib/internal.js

@@ -1,13 +1,33 @@
-import { runWasixToolProcess as runTool, } from './internal-common.js';
-export { getWasixDatabaseIdentity } from './database.js';
+import { runWasixToolProcess as runTool, } from './hosts/browser/internal-common.js';
+import { getWasixDatabaseIdentity } from './core/database.js';
+export { getWasixDatabaseIdentity } from './core/database.js';
 export function runWasixToolProcess(database, options) {
-    return runTool(database, options, createBrowserToolWorker);
+    const identity = getWasixDatabaseIdentity(database);
+    const managed = options.tool.name === 'pg_dump'
+        ? ['--encoding=UTF8', '--no-password']
+        : ['--no-psqlrc', '--no-password', '--set=ON_ERROR_STOP=1'];
+    return runTool(database, {
+        ...options,
+        args: [
+            ...options.args,
+            ...managed,
+            `--username=${identity.username}`,
+            '--host=127.0.0.1',
+            '--port=65432',
+            `--dbname=${identity.database}`,
+            ...(options.command !== undefined
+                ? ['--command', options.command]
+                : options.stdin !== undefined
+                    ? ['--file=-']
+                    : []),
+        ],
+    }, createBrowserToolWorker);
 }
 function createBrowserToolWorker() {
     if (typeof Worker === 'undefined') {
         throw new Error('WASIX tools require Web Workers');
     }
-    const worker = new Worker(new URL('./tool-worker.js', import.meta.url), {
+    const worker = new Worker(new URL('./hosts/browser/tool-worker.js', import.meta.url), {
         type: 'module',
         name: 'oliphaunt-wasix-tool',
     });

package/lib/internal.node.d.ts

@@ -1,5 +1,5 @@
-import type { OliphauntDatabase } from './types.js';
-import type { WasixToolProcessOptions, WasixToolProcessResult } from './internal-common.js';
-export { getWasixDatabaseIdentity } from './database.js';
-export type { WasixToolDescriptor, WasixToolProcessOptions, WasixToolProcessResult, } from './internal-common.js';
+import type { OliphauntDatabase } from './core/types.js';
+import type { WasixToolProcessOptions, WasixToolProcessResult } from './hosts/browser/internal-common.js';
+export { getWasixDatabaseIdentity } from './core/database.js';
+export type { WasixToolDescriptor, WasixToolProcessOptions, WasixToolProcessResult, } from './hosts/browser/internal-common.js';
 export declare function runWasixToolProcess(database: OliphauntDatabase, options: WasixToolProcessOptions): Promise<WasixToolProcessResult>;

package/lib/internal.node.js

@@ -1,5 +1,5 @@
-import { tryRunWasixNativeToolProcess } from './database.js';
-export { getWasixDatabaseIdentity } from './database.js';
+import { tryRunWasixNativeToolProcess } from './core/database.js';
+export { getWasixDatabaseIdentity } from './core/database.js';
 export function runWasixToolProcess(database, options) {
     const native = tryRunWasixNativeToolProcess(database, options);
     if (native !== undefined)

package/lib/native-only.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/native-only.js

@@ -0,0 +1,2 @@
+throw new Error('This @oliphaunt/wasix-ts entrypoint requires Node.js, Bun, or Deno; use @oliphaunt/wasix-ts/browser in a browser');
+export {};

package/lib/protocol/protocol.d.ts

@@ -0,0 +1 @@
+export * from '@oliphaunt/ts-query/protocol';

package/lib/protocol/protocol.js

@@ -0,0 +1 @@
+export * from '@oliphaunt/ts-query/protocol';

package/lib/protocol/query.d.ts

@@ -0,0 +1 @@
+export * from '@oliphaunt/ts-query/query';

package/lib/protocol/query.js

@@ -0,0 +1 @@
+export * from '@oliphaunt/ts-query/query';

package/lib/{archive.d.ts → resources/archive.d.ts}

@@ -1,4 +1,4 @@
-import type { SerializedAssetSource } from './rpc.js';
+import type { SerializedAssetSource } from '../workers/rpc.js';
 export type DirectoryFiles = Record<string, Uint8Array>;
 export type ExtractedArchive = {
     files: Map<string, Uint8Array>;

package/lib/{descriptor-validation.d.ts → resources/descriptor-validation.d.ts}

@@ -1,5 +1,5 @@
-import type { SerializedAssetSource } from './rpc.js';
-import type { WasixAssetSource } from './types.js';
+import type { SerializedAssetSource } from '../workers/rpc.js';
+import type { WasixAssetSource } from '../core/types.js';
 export declare function requireExactObject(value: unknown, fields: readonly string[], label: string): Record<string, unknown>;
 export declare function requireString(value: unknown, label: string): string;
 export declare function requireVersion(value: unknown, label: string): string;