swarpc 0.14.0 → 0.15.0

package/README.md

@@ -12,6 +12,7 @@ RPC for Service Workers -- move that heavy computation off of your UI thread!
 ## Features
 
 - Fully typesafe
+- Supports any [Standard Schema](https://standardschema.dev)-compliant validation library (ArkType, Zod, Valibot, etc.)
 - Cancelable requests
 - Parallelization with multiple worker instances
 - Automatic [transfer](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Transferable_objects) of transferable values from- and to- worker code
@@ -21,13 +22,19 @@ RPC for Service Workers -- move that heavy computation off of your UI thread!
 ## Installation
 
 ```bash
-npm add swarpc arktype
+npm add swarpc
 ```
 
- <details>
+Also add a [Standard-Schema-compliant validation library](https://standardschema.dev/#what-schema-libraries-implement-the-spec) of your choosing
+
+```bash
+# For example
+npm add arktype
+```
+
+<details>
 <summary>
 Bleeding edge
-
 </summary>
 
 If you want to use the latest commit instead of a published version, you can, either by using the Git URL:
@@ -50,6 +57,10 @@ This works thanks to the fact that `dist/` is published on the repository (and k
 
 ## Usage
 
+> [!NOTE]
+> We use [ArkType](https://arktype.io) in the following examples, but, as stated above, any validation library
+> is a-okay (provided that it is [Standard Schema v1](https://standardschema.dev)-compliant)
+
 ### 1. Declare your procedures in a shared file
 
 ```typescript

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAEL,kBAAkB,EAClB,KAAK,MAAM,EACX,KAAK,QAAQ,EACd,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,YAAY,EACZ,KAAK,EACL,OAAO,EAEP,iBAAiB,EACjB,WAAW,EACX,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAGpB;;;;GAIG;AACH,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;CAC3B,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF;;GAEG;AACH,KAAK,OAAO,CAAC,UAAU,SAAS,aAAa,IAAI;IAC/C,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACxC,gCAAgC;IAChC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,kCAAkC;IAClC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACzB,0EAA0E;IAC1E,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACnC,CAAC;AAQF,MAAM,MAAM,cAAc,GAAG;IAC3B,sFAAsF;IACtF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7B,UAAU,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;IACpC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC,CAAC;AAKF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EACE,MAAM,EACN,KAAK,EAAE,SAAS,EAChB,QAAkB,EAClB,eAAuB,EACvB,KAAU,EACV,YAAiB,GAClB,GAAE;IACD,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC/B,GACL,YAAY,CAAC,UAAU,CAAC,CA2K1B;AAiCD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,SAAS,aAAa,EAC9D,CAAC,EAAE,kBAAkB,EACrB,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,EACzC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAC5B,OAAO,CAAC,EAAE,0BAA0B,GACnC,IAAI,CAiBN;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,UAAU,SAAS,aAAa,EACxE,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,iBAsFzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAEL,kBAAkB,EAClB,KAAK,MAAM,EACX,KAAK,QAAQ,EACd,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,YAAY,EACZ,KAAK,EACL,OAAO,EAEP,iBAAiB,EACjB,WAAW,EACX,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAGpB;;;;GAIG;AACH,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;CAC3B,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF;;GAEG;AACH,KAAK,OAAO,CAAC,UAAU,SAAS,aAAa,IAAI;IAC/C,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACxC,gCAAgC;IAChC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,kCAAkC;IAClC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACzB,0EAA0E;IAC1E,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACnC,CAAC;AAQF,MAAM,MAAM,cAAc,GAAG;IAC3B,sFAAsF;IACtF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7B,UAAU,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;IACpC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC,CAAC;AAKF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EACE,MAAM,EACN,KAAK,EAAE,SAAS,EAChB,QAAkB,EAClB,eAAuB,EACvB,KAAU,EACV,YAAiB,GAClB,GAAE;IACD,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC/B,GACL,YAAY,CAAC,UAAU,CAAC,CAgL1B;AAiCD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,SAAS,aAAa,EAC9D,CAAC,EAAE,kBAAkB,EACrB,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,EACzC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAC5B,OAAO,CAAC,EAAE,0BAA0B,GACnC,IAAI,CAiBN;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,UAAU,SAAS,aAAa,EACxE,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,iBAsFzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC"}

package/dist/client.js

@@ -75,7 +75,11 @@ export function Client(procedures, { worker, nodes: nodeCount, loglevel = "debug
         // Set the method on the instance
         const _runProcedure = async (input, onProgress = () => { }, reqid, nodeId) => {
             // Validate the input against the procedure's input schema
-            procedures[functionName].input.assert(input);
+            const validation = procedures[functionName].input["~standard"].validate(input);
+            if (validation instanceof Promise)
+                throw new Error("Validations must not be async");
+            if (validation.issues)
+                throw new Error(`Invalid input: ${validation.issues}`);
             const requestId = reqid ?? makeRequestId();
             // Choose which node to use
             nodeId ??= whoToSendTo(nodes, pendingRequests);
@@ -217,7 +221,7 @@ export async function startClientListener(ctx) {
         // Ignore other messages that aren't for us
         if (eventData?.by !== "sw&rpc")
             return;
-        // We don't use a arktype schema here, we trust the server to send valid data
+        // We don't use a schema here, we trust the server to send valid data
         const payload = eventData;
         // Ignore #initialize request, it's client->server only
         if ("isInitializeRequest" in payload) {

package/dist/nodes.d.ts

@@ -9,7 +9,7 @@ export declare function nodeIdFromScope(scope: WorkerGlobalScope, _scopeType?: "
  * @source
  */
 export declare function makeNodeId(): string;
-export declare const serviceWorkerNodeId: "(SW)";
-export declare function isServiceWorkerNodeId(id: string): id is "(SW)";
+declare const serviceWorkerNodeId: "(SW)";
 export declare function nodeIdOrSW(id: string | undefined): string | typeof serviceWorkerNodeId;
+export {};
 //# sourceMappingURL=nodes.d.ts.map

package/dist/nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../src/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7C;;GAEG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1C,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACpC,SAAS,GAAG,MAAM,CA0BpB;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,GAC9C,MAAM,CAMR;AAED;;;GAGG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,eAAO,MAAM,mBAAmB,EAAG,MAAe,CAAC;AAEnD,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,MAAM,gBAE/C;AAED,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,GAAG,SAAS,GACrB,MAAM,GAAG,OAAO,mBAAmB,CAErC"}
+{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../src/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7C;;GAEG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1C,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACpC,SAAS,GAAG,MAAM,CA0BpB;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,GAC9C,MAAM,CAMR;AAED;;;GAGG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,QAAA,MAAM,mBAAmB,EAAG,MAAe,CAAC;AAE5C,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,GAAG,SAAS,GACrB,MAAM,GAAG,OAAO,mBAAmB,CAErC"}

package/dist/nodes.js

@@ -34,10 +34,7 @@ export function nodeIdFromScope(scope, _scopeType) {
 export function makeNodeId() {
     return "N" + Math.random().toString(16).substring(2, 5).toUpperCase();
 }
-export const serviceWorkerNodeId = "(SW)"; // Fixed ID for the service worker, as there's only one
-export function isServiceWorkerNodeId(id) {
-    return id === serviceWorkerNodeId;
-}
+const serviceWorkerNodeId = "(SW)"; // Fixed ID for the service worker, as there's only one
 export function nodeIdOrSW(id) {
     return id ?? serviceWorkerNodeId;
 }

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAChF,OAAO,EACL,kBAAkB,EAMlB,uBAAuB,EACvB,gBAAgB,EAChB,WAAW,EACX,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAMpB;;;GAGG;AACH,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;IAC1B,CAAC,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACnD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,CACvB,IAAI,EAAE,uBAAuB,CAC3B,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EACtB,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EACzB,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CACzB,KACE,IAAI;CACV,CAAC;AAKF;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EACE,QAAkB,EAClB,KAAK,EACL,UAAU,GACX,GAAE;IACD,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;CAC5C,GACL,YAAY,CAAC,UAAU,CAAC,CA6M1B"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAChF,OAAO,EACL,kBAAkB,EAKlB,uBAAuB,EAEvB,gBAAgB,EAChB,WAAW,EACX,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAMpB;;;GAGG;AACH,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;IAC1B,CAAC,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACnD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,CACvB,IAAI,EAAE,uBAAuB,CAC3B,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EACtB,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EACzB,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CACzB,KACE,IAAI;CACV,CAAC;AAKF;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EACE,QAAkB,EAClB,KAAK,EACL,UAAU,GACX,GAAE;IACD,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;CAC5C,GACL,YAAY,CAAC,UAAU,CAAC,CAwM1B"}

package/dist/server.js

@@ -5,7 +5,7 @@
 /// <reference lib="webworker" />
 import { type } from "arktype";
 import { createLogger, injectIntoConsoleGlobal } from "./log.js";
-import { PayloadHeaderSchema, PayloadInitializeSchema, PayloadSchema, zImplementations, zProcedures, } from "./types.js";
+import { PayloadHeaderSchema, PayloadInitializeSchema, validatePayloadCore as validatePayloadCore, zImplementations, zProcedures, } from "./types.js";
 import { findTransferables } from "./utils.js";
 import { FauxLocalStorage } from "./localstorage.js";
 import { scopeIsDedicated, scopeIsShared, scopeIsService } from "./scopes.js";
@@ -120,11 +120,11 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
                 return;
             }
             // Define payload schema for incoming messages
-            const payload = PayloadSchema(type(`"${functionName}"`), schemas.input, schemas.progress, schemas.success).assert(event.data);
+            const payload = validatePayloadCore(schemas, event.data);
             if ("isInitializeRequest" in payload)
                 throw "Unreachable: #initialize request payload should've been handled already";
             // Handle abortion requests (pro-choice ftw!!)
-            if (payload.abort) {
+            if ("abort" in payload) {
                 const controller = abortControllers.get(requestId);
                 if (!controller)
                     await postError("No abort controller found for request");
@@ -133,7 +133,7 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
             }
             // Set up the abort controller for this request
             abortControllers.set(requestId, new AbortController());
-            if (!payload.input) {
+            if (!("input" in payload)) {
                 await postError("No input provided");
                 return;
             }

package/dist/standardschema.d.ts

@@ -0,0 +1,56 @@
+/** The Standard Schema interface. */
+export interface StandardSchemaV1<Input = unknown, Output = Input> {
+    /** The Standard Schema properties. */
+    readonly "~standard": StandardSchemaV1.Props<Input, Output>;
+}
+export declare namespace StandardSchemaV1 {
+    /** The Standard Schema properties interface. */
+    interface Props<Input = unknown, Output = Input> {
+        /** The version number of the standard. */
+        readonly version: 1;
+        /** The vendor name of the schema library. */
+        readonly vendor: string;
+        /** Validates unknown input values. */
+        readonly validate: (value: unknown) => Result<Output> | Promise<Result<Output>>;
+        /** Inferred types associated with the schema. */
+        readonly types?: Types<Input, Output> | undefined;
+    }
+    /** The result interface of the validate function. */
+    type Result<Output> = SuccessResult<Output> | FailureResult;
+    /** The result interface if validation succeeds. */
+    interface SuccessResult<Output> {
+        /** The typed output value. */
+        readonly value: Output;
+        /** The non-existent issues. */
+        readonly issues?: undefined;
+    }
+    /** The result interface if validation fails. */
+    interface FailureResult {
+        /** The issues of failed validation. */
+        readonly issues: ReadonlyArray<Issue>;
+    }
+    /** The issue interface of the failure output. */
+    interface Issue {
+        /** The error message of the issue. */
+        readonly message: string;
+        /** The path of the issue, if any. */
+        readonly path?: ReadonlyArray<PropertyKey | PathSegment> | undefined;
+    }
+    /** The path segment interface of the issue. */
+    interface PathSegment {
+        /** The key representing a path segment. */
+        readonly key: PropertyKey;
+    }
+    /** The Standard Schema types interface. */
+    interface Types<Input = unknown, Output = Input> {
+        /** The input type of the schema. */
+        readonly input: Input;
+        /** The output type of the schema. */
+        readonly output: Output;
+    }
+    /** Infers the input type of a Standard Schema. */
+    type InferInput<Schema extends StandardSchemaV1> = NonNullable<Schema["~standard"]["types"]>["input"];
+    /** Infers the output type of a Standard Schema. */
+    type InferOutput<Schema extends StandardSchemaV1> = NonNullable<Schema["~standard"]["types"]>["output"];
+}
+//# sourceMappingURL=standardschema.d.ts.map

package/dist/standardschema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"standardschema.d.ts","sourceRoot":"","sources":["../src/standardschema.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,MAAM,WAAW,gBAAgB,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK;IAC/D,sCAAsC;IACtC,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC7D;AAED,MAAM,CAAC,OAAO,WAAW,gBAAgB,CAAC;IACxC,gDAAgD;IAChD,UAAiB,KAAK,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK;QACpD,0CAA0C;QAC1C,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QACpB,6CAA6C;QAC7C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,sCAAsC;QACtC,QAAQ,CAAC,QAAQ,EAAE,CACjB,KAAK,EAAE,OAAO,KACX,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,iDAAiD;QACjD,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;KACnD;IAED,qDAAqD;IACrD,KAAY,MAAM,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;IAEnE,mDAAmD;IACnD,UAAiB,aAAa,CAAC,MAAM;QACnC,8BAA8B;QAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,+BAA+B;QAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;KAC7B;IAED,gDAAgD;IAChD,UAAiB,aAAa;QAC5B,uCAAuC;QACvC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;KACvC;IAED,iDAAiD;IACjD,UAAiB,KAAK;QACpB,sCAAsC;QACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,qCAAqC;QACrC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,SAAS,CAAC;KACtE;IAED,+CAA+C;IAC/C,UAAiB,WAAW;QAC1B,2CAA2C;QAC3C,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC;KAC3B;IAED,2CAA2C;IAC3C,UAAiB,KAAK,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,KAAK;QACpD,oCAAoC;QACpC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;QACtB,qCAAqC;QACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACzB;IAED,kDAAkD;IAClD,KAAY,UAAU,CAAC,MAAM,SAAS,gBAAgB,IAAI,WAAW,CACnE,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAC7B,CAAC,OAAO,CAAC,CAAC;IAEX,mDAAmD;IACnD,KAAY,WAAW,CAAC,MAAM,SAAS,gBAAgB,IAAI,WAAW,CACpE,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAC7B,CAAC,QAAQ,CAAC,CAAC;CACb"}

package/dist/standardschema.js

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

package/dist/types.d.ts

@@ -2,12 +2,12 @@
  * @module
  * @mergeModuleWith <project>
  */
-import { type Type } from "arktype";
+import type { StandardSchemaV1 as Schema } from "./standardschema.js";
 import { RequestBoundLogger } from "./log.js";
 /**
  * A procedure declaration
  */
-export type Procedure<I extends Type, P extends Type, S extends Type> = {
+export type Procedure<I extends Schema, P extends Schema, S extends Schema> = {
     /**
      * ArkType type for the input (first argument) of the procedure, when calling it from the client.
      */
@@ -53,15 +53,15 @@ export type CancelablePromise<T = unknown> = {
 /**
  * An implementation of a procedure
  */
-export type ProcedureImplementation<I extends Type, P extends Type, S extends Type> = (
+export type ProcedureImplementation<I extends Schema, P extends Schema, S extends Schema> = (
 /**
  * Input data for the procedure
  */
-input: I["inferOut"], 
+input: Schema.InferInput<I>, 
 /**
  * Callback to call with progress updates.
  */
-onProgress: (progress: P["inferIn"]) => void, 
+onProgress: (progress: Schema.InferInput<P>) => void, 
 /**
  * Additional tools useful when implementing the procedure.
  */
@@ -78,14 +78,14 @@ tools: {
      * ID of the Node the request is being processed on.
      */
     nodeId: string;
-}) => Promise<S["inferIn"]>;
+}) => Promise<Schema.InferInput<S>>;
 /**
  * Declarations of procedures by name.
  *
  * An example of declaring procedures:
  * {@includeCode ../example/src/lib/procedures.ts}
  */
-export type ProceduresMap = Record<string, Procedure<Type, Type, Type>>;
+export type ProceduresMap = Record<string, Procedure<Schema, Schema, Schema>>;
 /**
  * Implementations of procedures by name
  */
@@ -99,7 +99,7 @@ export type Hooks<Procedures extends ProceduresMap> = {
     /**
      * Called when a procedure call has been successful.
      */
-    success?: <Procedure extends keyof ProceduresMap>(procedure: Procedure, data: Procedures[Procedure]["success"]["inferOut"]) => void;
+    success?: <Procedure extends keyof ProceduresMap>(procedure: Procedure, data: Schema.InferOutput<Procedures[Procedure]["success"]>) => void;
     /**
      * Called when a procedure call has failed.
      */
@@ -107,9 +107,9 @@ export type Hooks<Procedures extends ProceduresMap> = {
     /**
      * Called when a procedure call sends progress updates.
      */
-    progress?: <Procedure extends keyof ProceduresMap>(procedure: Procedure, data: Procedures[Procedure]["progress"]["inferOut"]) => void;
+    progress?: <Procedure extends keyof ProceduresMap>(procedure: Procedure, data: Schema.InferOutput<Procedures[Procedure]["progress"]>) => void;
 };
-export declare const PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
+export declare const PayloadInitializeSchema: import("arktype/internal/variants/object.ts").ObjectType<{
     by: "sw&rpc";
     functionName: "#initialize";
     isInitializeRequest: true;
@@ -145,11 +145,11 @@ export declare const PayloadCoreSchema: import("arktype").Generic<[["I", unknown
     };
 }, {}, {}>;
 export type PayloadCore<PM extends ProceduresMap, Name extends keyof PM = keyof PM> = {
-    input: PM[Name]["input"]["inferOut"];
+    input: Schema.InferOutput<PM[Name]["input"]>;
 } | {
-    progress: PM[Name]["progress"]["inferOut"];
+    progress: Schema.InferOutput<PM[Name]["progress"]>;
 } | {
-    result: PM[Name]["success"]["inferOut"];
+    result: Schema.InferOutput<PM[Name]["success"]>;
 } | {
     abort: {
         reason: string;
@@ -162,183 +162,7 @@ export type PayloadCore<PM extends ProceduresMap, Name extends keyof PM = keyof
 /**
  * @source
  */
-export declare const PayloadSchema: import("arktype").Generic<[["Name", string], ["I", unknown], ["P", unknown], ["S", unknown]], readonly [readonly ["PayloadHeaderSchema<Name>", "&", "PayloadCoreSchema<I, P, S>"], "|", "PayloadInitializeSchema"], {
-    PayloadCoreSchema: import("arktype/internal/scope.ts").bindGenericToScope<import("@ark/schema").GenericAst<[["I", unknown], ["P", unknown], ["S", unknown]], {
-        readonly "input?": "I";
-        readonly "progress?": "P";
-        readonly "result?": "S";
-        readonly "abort?": {
-            readonly reason: "string";
-        };
-        readonly "error?": {
-            readonly message: "string";
-        };
-    }, {}, {}>, {
-        PayloadCoreSchema: import("@ark/schema").GenericAst<[["I", unknown], ["P", unknown], ["S", unknown]], {
-            readonly "input?": "I";
-            readonly "progress?": "P";
-            readonly "result?": "S";
-            readonly "abort?": {
-                readonly reason: "string";
-            };
-            readonly "error?": {
-                readonly message: "string";
-            };
-        }, {}, {}>;
-        PayloadHeaderSchema: import("@ark/schema").GenericAst<[["Name", string]], {
-            readonly by: "\"sw&rpc\"";
-            readonly functionName: "Name";
-            readonly requestId: "string >= 1";
-        }, {}, {}>;
-        PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
-            by: "sw&rpc";
-            functionName: "#initialize";
-            isInitializeRequest: true;
-            localStorageData: Record<string, unknown>;
-            nodeId: string;
-        }, {}> & {
-            readonly " brand": [import("arktype/internal/methods/object.ts").ObjectType<{
-                by: "sw&rpc";
-                functionName: "#initialize";
-                isInitializeRequest: true;
-                localStorageData: Record<string, unknown>;
-                nodeId: string;
-            }, {}>, "unparsed"];
-        };
-    } & {}>;
-    PayloadHeaderSchema: import("arktype/internal/scope.ts").bindGenericToScope<import("@ark/schema").GenericAst<[["Name", string]], {
-        readonly by: "\"sw&rpc\"";
-        readonly functionName: "Name";
-        readonly requestId: "string >= 1";
-    }, {}, {}>, {
-        PayloadCoreSchema: import("@ark/schema").GenericAst<[["I", unknown], ["P", unknown], ["S", unknown]], {
-            readonly "input?": "I";
-            readonly "progress?": "P";
-            readonly "result?": "S";
-            readonly "abort?": {
-                readonly reason: "string";
-            };
-            readonly "error?": {
-                readonly message: "string";
-            };
-        }, {}, {}>;
-        PayloadHeaderSchema: import("@ark/schema").GenericAst<[["Name", string]], {
-            readonly by: "\"sw&rpc\"";
-            readonly functionName: "Name";
-            readonly requestId: "string >= 1";
-        }, {}, {}>;
-        PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
-            by: "sw&rpc";
-            functionName: "#initialize";
-            isInitializeRequest: true;
-            localStorageData: Record<string, unknown>;
-            nodeId: string;
-        }, {}> & {
-            readonly " brand": [import("arktype/internal/methods/object.ts").ObjectType<{
-                by: "sw&rpc";
-                functionName: "#initialize";
-                isInitializeRequest: true;
-                localStorageData: Record<string, unknown>;
-                nodeId: string;
-            }, {}>, "unparsed"];
-        };
-    } & {}>;
-    PayloadInitializeSchema: {
-        by: "sw&rpc";
-        functionName: "#initialize";
-        isInitializeRequest: true;
-        localStorageData: Record<string, unknown>;
-        nodeId: string;
-    };
-}, {
-    PayloadCoreSchema: import("arktype/internal/scope.ts").bindGenericToScope<import("@ark/schema").GenericAst<[["I", unknown], ["P", unknown], ["S", unknown]], {
-        readonly "input?": "I";
-        readonly "progress?": "P";
-        readonly "result?": "S";
-        readonly "abort?": {
-            readonly reason: "string";
-        };
-        readonly "error?": {
-            readonly message: "string";
-        };
-    }, {}, {}>, {
-        PayloadCoreSchema: import("@ark/schema").GenericAst<[["I", unknown], ["P", unknown], ["S", unknown]], {
-            readonly "input?": "I";
-            readonly "progress?": "P";
-            readonly "result?": "S";
-            readonly "abort?": {
-                readonly reason: "string";
-            };
-            readonly "error?": {
-                readonly message: "string";
-            };
-        }, {}, {}>;
-        PayloadHeaderSchema: import("@ark/schema").GenericAst<[["Name", string]], {
-            readonly by: "\"sw&rpc\"";
-            readonly functionName: "Name";
-            readonly requestId: "string >= 1";
-        }, {}, {}>;
-        PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
-            by: "sw&rpc";
-            functionName: "#initialize";
-            isInitializeRequest: true;
-            localStorageData: Record<string, unknown>;
-            nodeId: string;
-        }, {}> & {
-            readonly " brand": [import("arktype/internal/methods/object.ts").ObjectType<{
-                by: "sw&rpc";
-                functionName: "#initialize";
-                isInitializeRequest: true;
-                localStorageData: Record<string, unknown>;
-                nodeId: string;
-            }, {}>, "unparsed"];
-        };
-    } & {}>;
-    PayloadHeaderSchema: import("arktype/internal/scope.ts").bindGenericToScope<import("@ark/schema").GenericAst<[["Name", string]], {
-        readonly by: "\"sw&rpc\"";
-        readonly functionName: "Name";
-        readonly requestId: "string >= 1";
-    }, {}, {}>, {
-        PayloadCoreSchema: import("@ark/schema").GenericAst<[["I", unknown], ["P", unknown], ["S", unknown]], {
-            readonly "input?": "I";
-            readonly "progress?": "P";
-            readonly "result?": "S";
-            readonly "abort?": {
-                readonly reason: "string";
-            };
-            readonly "error?": {
-                readonly message: "string";
-            };
-        }, {}, {}>;
-        PayloadHeaderSchema: import("@ark/schema").GenericAst<[["Name", string]], {
-            readonly by: "\"sw&rpc\"";
-            readonly functionName: "Name";
-            readonly requestId: "string >= 1";
-        }, {}, {}>;
-        PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
-            by: "sw&rpc";
-            functionName: "#initialize";
-            isInitializeRequest: true;
-            localStorageData: Record<string, unknown>;
-            nodeId: string;
-        }, {}> & {
-            readonly " brand": [import("arktype/internal/methods/object.ts").ObjectType<{
-                by: "sw&rpc";
-                functionName: "#initialize";
-                isInitializeRequest: true;
-                localStorageData: Record<string, unknown>;
-                nodeId: string;
-            }, {}>, "unparsed"];
-        };
-    } & {}>;
-    PayloadInitializeSchema: {
-        by: "sw&rpc";
-        functionName: "#initialize";
-        isInitializeRequest: true;
-        localStorageData: Record<string, unknown>;
-        nodeId: string;
-    };
-}>;
+export declare function validatePayloadCore<PM extends ProceduresMap, Name extends keyof PM>(procedure: PM[Name], payload: unknown): PayloadCore<PM, keyof PM>;
 /**
  * The effective payload as sent by the server to the client
  */
@@ -346,21 +170,21 @@ export type Payload<PM extends ProceduresMap, Name extends keyof PM = keyof PM>
 /**
  * A procedure's corresponding method on the client instance -- used to call the procedure. If you want to be able to cancel the request, you can use the `cancelable` method instead of running the procedure directly.
  */
-export type ClientMethod<P extends Procedure<Type, Type, Type>> = ((input: P["input"]["inferIn"], onProgress?: (progress: P["progress"]["inferOut"]) => void) => Promise<P["success"]["inferOut"]>) & {
+export type ClientMethod<P extends Procedure<Schema, Schema, Schema>> = ((input: Schema.InferInput<P["input"]>, onProgress?: (progress: Schema.InferOutput<P["progress"]>) => void) => Promise<Schema.InferOutput<P["success"]>>) & {
     /**
      * A method that returns a `CancelablePromise`. Cancel it by calling `.cancel(reason)` on it, and wait for the request to resolve by awaiting the `request` property on the returned object.
      */
-    cancelable: (input: P["input"]["inferIn"], onProgress?: (progress: P["progress"]["inferOut"]) => void, requestId?: string) => CancelablePromise<P["success"]["inferOut"]>;
+    cancelable: (input: Schema.InferInput<P["input"]>, onProgress?: (progress: Schema.InferOutput<P["progress"]>) => void, requestId?: string) => CancelablePromise<Schema.InferOutput<P["success"]>>;
     /**
      * Send the request to specific nodes, or all nodes.
      * Returns an array of results, one for each node the request was sent to.
      * Each result is a {@link PromiseSettledResult}, with also an additional property, the node ID of the request
      */
-    broadcast: (input: P["input"]["inferIn"], onProgress?: (
+    broadcast: (input: Schema.InferInput<P["input"]>, onProgress?: (
     /** Map of node IDs to their progress updates */
-    progresses: Map<string, P["progress"]["inferOut"]>) => void, 
+    progresses: Map<string, Schema.InferOutput<P["progress"]>>) => void, 
     /** Number of nodes to send the request to. Leave undefined to send to all nodes */
-    nodes?: number) => Promise<Array<PromiseSettledResult<P["success"]["inferOut"]> & {
+    nodes?: number) => Promise<Array<PromiseSettledResult<Schema.InferOutput<P["success"]>> & {
         node: string;
     }>>;
 };

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.js

@@ -2,7 +2,7 @@
  * @module
  * @mergeModuleWith <project>
  */
-import { type } from "arktype";
+import { ArkErrors, type } from "arktype";
 export const PayloadInitializeSchema = type({
     by: '"sw&rpc"',
     functionName: '"#initialize"',
@@ -28,16 +28,36 @@ export const PayloadCoreSchema = type("<I, P, S>", {
     "abort?": { reason: "string" },
     "error?": { message: "string" },
 });
+const AbortOrError = type.or({ abort: { reason: "string" } }, { error: { message: "string" } });
 /**
  * @source
  */
-export const PayloadSchema = type
-    .scope({ PayloadCoreSchema, PayloadHeaderSchema, PayloadInitializeSchema })
-    .type("<Name extends string, I, P, S>", [
-    ["PayloadHeaderSchema<Name>", "&", "PayloadCoreSchema<I, P, S>"],
-    "|",
-    "PayloadInitializeSchema",
-]);
+export function validatePayloadCore(procedure, payload) {
+    if (typeof payload !== "object")
+        throw new Error("payload is not an object");
+    if (payload === null)
+        throw new Error("payload is null");
+    if ("input" in payload) {
+        const input = procedure.input["~standard"].validate(payload.input);
+        if ("value" in input)
+            return { input: input.value };
+    }
+    if ("progress" in payload) {
+        const progress = procedure.progress["~standard"].validate(payload.progress);
+        if ("value" in progress)
+            return { progress: progress.value };
+    }
+    if ("result" in payload) {
+        const result = procedure.success["~standard"].validate(payload.result);
+        if ("value" in result)
+            return { result: result.value };
+    }
+    const abortOrError = AbortOrError(payload);
+    if (!(abortOrError instanceof ArkErrors)) {
+        return abortOrError;
+    }
+    throw new Error("invalid payload");
+}
 /**
  * Symbol used as the key for the procedures map on the server instance
  * @internal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swarpc",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Full type-safe RPC library for service worker -- move things off of the UI thread with ease!",
   "keywords": [
     "service-workers",
@@ -40,42 +40,42 @@
     "typedoc:withplugins": "npm run typedoc:plugins && npm run typedoc",
     "prepare": "husky"
   },
-  "peerDependencies": {
-    "arktype": "^2.1.22"
-  },
   "devDependencies": {
     "@8hobbies/typedoc-plugin-plausible": "^2.2.0",
-    "@playwright/test": "^1.55.0",
-    "@vitest/web-worker": "^3.2.4",
+    "@playwright/test": "^1.56.1",
+    "@vitest/web-worker": "^4.0.6",
     "date-fns": "^4.1.0",
     "husky": "^9.1.7",
     "kacl": "^1.1.1",
-    "knip": "^5.63.1",
-    "lint-staged": "^16.1.6",
+    "knip": "^5.67.0",
+    "lint-staged": "^16.2.6",
     "nodemon": "^3.1.10",
-    "oxlint": "^1.14.0",
-    "pkg-pr-new": "^0.0.59",
+    "oxlint": "^1.25.0",
+    "pkg-pr-new": "^0.0.60",
     "prettier": "^3.6.2",
     "sirv-cli": "^3.0.1",
-    "typedoc": "^0.28.12",
-    "typedoc-material-theme": "^1.4.0",
-    "typedoc-plugin-dt-links": "^2.0.18",
+    "typedoc": "^0.28.14",
+    "typedoc-material-theme": "^1.4.1",
+    "typedoc-plugin-dt-links": "^2.0.27",
     "typedoc-plugin-extras": "^4.0.1",
     "typedoc-plugin-inline-sources": "^1.3.0",
-    "typedoc-plugin-mdn-links": "^5.0.9",
-    "typedoc-plugin-redirect": "^1.2.0",
-    "typescript": "^5.9.2",
-    "vite": "^7.1.4",
-    "vitest": "^3.2.4"
+    "typedoc-plugin-mdn-links": "^5.0.10",
+    "typedoc-plugin-redirect": "^1.2.1",
+    "typescript": "^5.9.3",
+    "vite": "^7.1.12",
+    "vitest": "^4.0.6"
   },
   "volta": {
-    "node": "24.7.0",
-    "npm": "11.6.0"
+    "node": "24.11.0",
+    "npm": "11.6.2"
   },
   "lint-staged": {
     "*.{ts,js,md,json,yaml,yml}": [
       "oxlint --fix",
       "prettier --write"
     ]
+  },
+  "dependencies": {
+    "arktype": "^2.1.25"
   }
 }

package/src/client.ts

@@ -178,7 +178,12 @@ export function Client<Procedures extends ProceduresMap>(
       nodeId?: string,
     ) => {
       // Validate the input against the procedure's input schema
-      procedures[functionName].input.assert(input);
+      const validation =
+        procedures[functionName].input["~standard"].validate(input);
+      if (validation instanceof Promise)
+        throw new Error("Validations must not be async");
+      if (validation.issues)
+        throw new Error(`Invalid input: ${validation.issues}`);
 
       const requestId = reqid ?? makeRequestId();
 
@@ -374,7 +379,7 @@ export async function startClientListener<Procedures extends ProceduresMap>(
     // Ignore other messages that aren't for us
     if (eventData?.by !== "sw&rpc") return;
 
-    // We don't use a arktype schema here, we trust the server to send valid data
+    // We don't use a schema here, we trust the server to send valid data
     const payload = eventData as Payload<Procedures>;
 
     // Ignore #initialize request, it's client->server only

package/src/nodes.ts

@@ -54,11 +54,7 @@ export function makeNodeId(): string {
   return "N" + Math.random().toString(16).substring(2, 5).toUpperCase();
 }
 
-export const serviceWorkerNodeId = "(SW)" as const; // Fixed ID for the service worker, as there's only one
-
-export function isServiceWorkerNodeId(id: string) {
-  return id === serviceWorkerNodeId;
-}
+const serviceWorkerNodeId = "(SW)" as const; // Fixed ID for the service worker, as there's only one
 
 export function nodeIdOrSW(
   id: string | undefined,

package/src/server.ts

@@ -12,8 +12,8 @@ import {
   PayloadCore,
   PayloadHeaderSchema,
   PayloadInitializeSchema,
-  PayloadSchema,
   ProcedureImplementation,
+  validatePayloadCore as validatePayloadCore,
   zImplementations,
   zProcedures,
   type ProceduresMap,
@@ -188,18 +188,13 @@ export function Server<Procedures extends ProceduresMap>(
       }
 
       // Define payload schema for incoming messages
-      const payload = PayloadSchema(
-        type(`"${functionName}"`),
-        schemas.input,
-        schemas.progress,
-        schemas.success,
-      ).assert(event.data);
+      const payload = validatePayloadCore(schemas, event.data);
 
       if ("isInitializeRequest" in payload)
         throw "Unreachable: #initialize request payload should've been handled already";
 
       // Handle abortion requests (pro-choice ftw!!)
-      if (payload.abort) {
+      if ("abort" in payload) {
         const controller = abortControllers.get(requestId);
 
         if (!controller)
@@ -212,7 +207,7 @@ export function Server<Procedures extends ProceduresMap>(
       // Set up the abort controller for this request
       abortControllers.set(requestId, new AbortController());
 
-      if (!payload.input) {
+      if (!("input" in payload)) {
         await postError("No input provided");
         return;
       }

package/src/standardschema.ts

@@ -0,0 +1,70 @@
+/** The Standard Schema interface. */
+export interface StandardSchemaV1<Input = unknown, Output = Input> {
+  /** The Standard Schema properties. */
+  readonly "~standard": StandardSchemaV1.Props<Input, Output>;
+}
+
+export declare namespace StandardSchemaV1 {
+  /** The Standard Schema properties interface. */
+  export interface Props<Input = unknown, Output = Input> {
+    /** The version number of the standard. */
+    readonly version: 1;
+    /** The vendor name of the schema library. */
+    readonly vendor: string;
+    /** Validates unknown input values. */
+    readonly validate: (
+      value: unknown,
+    ) => Result<Output> | Promise<Result<Output>>;
+    /** Inferred types associated with the schema. */
+    readonly types?: Types<Input, Output> | undefined;
+  }
+
+  /** The result interface of the validate function. */
+  export type Result<Output> = SuccessResult<Output> | FailureResult;
+
+  /** The result interface if validation succeeds. */
+  export interface SuccessResult<Output> {
+    /** The typed output value. */
+    readonly value: Output;
+    /** The non-existent issues. */
+    readonly issues?: undefined;
+  }
+
+  /** The result interface if validation fails. */
+  export interface FailureResult {
+    /** The issues of failed validation. */
+    readonly issues: ReadonlyArray<Issue>;
+  }
+
+  /** The issue interface of the failure output. */
+  export interface Issue {
+    /** The error message of the issue. */
+    readonly message: string;
+    /** The path of the issue, if any. */
+    readonly path?: ReadonlyArray<PropertyKey | PathSegment> | undefined;
+  }
+
+  /** The path segment interface of the issue. */
+  export interface PathSegment {
+    /** The key representing a path segment. */
+    readonly key: PropertyKey;
+  }
+
+  /** The Standard Schema types interface. */
+  export interface Types<Input = unknown, Output = Input> {
+    /** The input type of the schema. */
+    readonly input: Input;
+    /** The output type of the schema. */
+    readonly output: Output;
+  }
+
+  /** Infers the input type of a Standard Schema. */
+  export type InferInput<Schema extends StandardSchemaV1> = NonNullable<
+    Schema["~standard"]["types"]
+  >["input"];
+
+  /** Infers the output type of a Standard Schema. */
+  export type InferOutput<Schema extends StandardSchemaV1> = NonNullable<
+    Schema["~standard"]["types"]
+  >["output"];
+}

package/src/types.ts

@@ -3,13 +3,17 @@
  * @mergeModuleWith <project>
  */
 
-import { type, type Type } from "arktype";
+import type {
+  StandardSchemaV1 as Schema,
+  StandardSchemaV1,
+} from "./standardschema.js";
+import { ArkErrors, type } from "arktype";
 import { RequestBoundLogger } from "./log.js";
 
 /**
  * A procedure declaration
  */
-export type Procedure<I extends Type, P extends Type, S extends Type> = {
+export type Procedure<I extends Schema, P extends Schema, S extends Schema> = {
   /**
    * ArkType type for the input (first argument) of the procedure, when calling it from the client.
    */
@@ -58,18 +62,18 @@ export type CancelablePromise<T = unknown> = {
  * An implementation of a procedure
  */
 export type ProcedureImplementation<
-  I extends Type,
-  P extends Type,
-  S extends Type,
+  I extends Schema,
+  P extends Schema,
+  S extends Schema,
 > = (
   /**
    * Input data for the procedure
    */
-  input: I["inferOut"],
+  input: Schema.InferInput<I>,
   /**
    * Callback to call with progress updates.
    */
-  onProgress: (progress: P["inferIn"]) => void,
+  onProgress: (progress: Schema.InferInput<P>) => void,
   /**
    * Additional tools useful when implementing the procedure.
    */
@@ -87,7 +91,7 @@ export type ProcedureImplementation<
      */
     nodeId: string;
   },
-) => Promise<S["inferIn"]>;
+) => Promise<Schema.InferInput<S>>;
 
 /**
  * Declarations of procedures by name.
@@ -95,7 +99,7 @@ export type ProcedureImplementation<
  * An example of declaring procedures:
  * {@includeCode ../example/src/lib/procedures.ts}
  */
-export type ProceduresMap = Record<string, Procedure<Type, Type, Type>>;
+export type ProceduresMap = Record<string, Procedure<Schema, Schema, Schema>>;
 
 /**
  * Implementations of procedures by name
@@ -117,7 +121,7 @@ export type Hooks<Procedures extends ProceduresMap> = {
    */
   success?: <Procedure extends keyof ProceduresMap>(
     procedure: Procedure,
-    data: Procedures[Procedure]["success"]["inferOut"],
+    data: Schema.InferOutput<Procedures[Procedure]["success"]>,
   ) => void;
   /**
    * Called when a procedure call has failed.
@@ -131,7 +135,7 @@ export type Hooks<Procedures extends ProceduresMap> = {
    */
   progress?: <Procedure extends keyof ProceduresMap>(
     procedure: Procedure,
-    data: Procedures[Procedure]["progress"]["inferOut"],
+    data: Schema.InferOutput<Procedures[Procedure]["progress"]>,
   ) => void;
 };
 
@@ -179,13 +183,13 @@ export type PayloadCore<
   Name extends keyof PM = keyof PM,
 > =
   | {
-      input: PM[Name]["input"]["inferOut"];
+      input: Schema.InferOutput<PM[Name]["input"]>;
     }
   | {
-      progress: PM[Name]["progress"]["inferOut"];
+      progress: Schema.InferOutput<PM[Name]["progress"]>;
     }
   | {
-      result: PM[Name]["success"]["inferOut"];
+      result: Schema.InferOutput<PM[Name]["success"]>;
     }
   | {
       abort: { reason: string };
@@ -194,16 +198,43 @@ export type PayloadCore<
       error: { message: string };
     };
 
+const AbortOrError = type.or(
+  { abort: { reason: "string" } },
+  { error: { message: "string" } },
+);
+
 /**
  * @source
  */
-export const PayloadSchema = type
-  .scope({ PayloadCoreSchema, PayloadHeaderSchema, PayloadInitializeSchema })
-  .type("<Name extends string, I, P, S>", [
-    ["PayloadHeaderSchema<Name>", "&", "PayloadCoreSchema<I, P, S>"],
-    "|",
-    "PayloadInitializeSchema",
-  ]);
+export function validatePayloadCore<
+  PM extends ProceduresMap,
+  Name extends keyof PM,
+>(procedure: PM[Name], payload: unknown): PayloadCore<PM, keyof PM> {
+  if (typeof payload !== "object") throw new Error("payload is not an object");
+  if (payload === null) throw new Error("payload is null");
+
+  if ("input" in payload) {
+    const input = procedure.input["~standard"].validate(payload.input);
+    if ("value" in input) return { input: input.value };
+  }
+
+  if ("progress" in payload) {
+    const progress = procedure.progress["~standard"].validate(payload.progress);
+    if ("value" in progress) return { progress: progress.value };
+  }
+
+  if ("result" in payload) {
+    const result = procedure.success["~standard"].validate(payload.result);
+    if ("value" in result) return { result: result.value };
+  }
+
+  const abortOrError = AbortOrError(payload);
+  if (!(abortOrError instanceof ArkErrors)) {
+    return abortOrError;
+  }
+
+  throw new Error("invalid payload");
+}
 
 /**
  * The effective payload as sent by the server to the client
@@ -216,33 +247,35 @@ export type Payload<
 /**
  * A procedure's corresponding method on the client instance -- used to call the procedure. If you want to be able to cancel the request, you can use the `cancelable` method instead of running the procedure directly.
  */
-export type ClientMethod<P extends Procedure<Type, Type, Type>> = ((
-  input: P["input"]["inferIn"],
-  onProgress?: (progress: P["progress"]["inferOut"]) => void,
-) => Promise<P["success"]["inferOut"]>) & {
+export type ClientMethod<P extends Procedure<Schema, Schema, Schema>> = ((
+  input: Schema.InferInput<P["input"]>,
+  onProgress?: (progress: Schema.InferOutput<P["progress"]>) => void,
+) => Promise<Schema.InferOutput<P["success"]>>) & {
   /**
    * A method that returns a `CancelablePromise`. Cancel it by calling `.cancel(reason)` on it, and wait for the request to resolve by awaiting the `request` property on the returned object.
    */
   cancelable: (
-    input: P["input"]["inferIn"],
-    onProgress?: (progress: P["progress"]["inferOut"]) => void,
+    input: Schema.InferInput<P["input"]>,
+    onProgress?: (progress: Schema.InferOutput<P["progress"]>) => void,
     requestId?: string,
-  ) => CancelablePromise<P["success"]["inferOut"]>;
+  ) => CancelablePromise<Schema.InferOutput<P["success"]>>;
   /**
    * Send the request to specific nodes, or all nodes.
    * Returns an array of results, one for each node the request was sent to.
    * Each result is a {@link PromiseSettledResult}, with also an additional property, the node ID of the request
    */
   broadcast: (
-    input: P["input"]["inferIn"],
+    input: Schema.InferInput<P["input"]>,
     onProgress?: (
       /** Map of node IDs to their progress updates */
-      progresses: Map<string, P["progress"]["inferOut"]>,
+      progresses: Map<string, Schema.InferOutput<P["progress"]>>,
     ) => void,
     /** Number of nodes to send the request to. Leave undefined to send to all nodes */
     nodes?: number,
   ) => Promise<
-    Array<PromiseSettledResult<P["success"]["inferOut"]> & { node: string }>
+    Array<
+      PromiseSettledResult<Schema.InferOutput<P["success"]>> & { node: string }
+    >
   >;
 };