libshv-js 3.1.1 → 3.1.3

package/.github/workflows/test.yml

@@ -18,6 +18,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Install dependencies
+        run: npm install
+
       - name: Compile
         run: npx tsc
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Typescript implementation of libshv",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -21,10 +21,12 @@
     "./cpon.ts": "./src/cpon.ts",
     "./rpcmessage.ts": "./src/rpcmessage.ts",
     "./rpcvalue.ts": "./src/rpcvalue.ts",
-    "./ws-client.ts": "./src/ws-client.ts"
+    "./ws-client.ts": "./src/ws-client.ts",
+    "./zod.ts": "./src/zod.ts"
   },
   "devDependencies": {
     "typescript": "^5.5.4",
-    "xo": "^0.59.3"
+    "xo": "^0.59.3",
+    "zod": "^3.23.8"
   }
 }

package/src/rpcmessage.ts

@@ -166,7 +166,7 @@ class RpcMessage {
             return new ErrorType(this.value.value[KeyError] as ErrorMap);
         }
 
-        if (Object.hasOwn(this.value.value.hasOwnProperty, KeyResult)) {
+        if (Object.hasOwn(this.value.value, KeyResult)) {
             return this.value.value[KeyResult];
         }
 

package/src/zod.ts

@@ -0,0 +1,8 @@
+import {z, type ZodType} from 'zod';
+import {IMap, Int, type RpcValue, ShvMap} from './rpcvalue';
+
+export const map = <T extends Record<string, ZodType<any, any, any>>>(schema: T) => z.custom<ShvMap<{[K in keyof T]: z.infer<T[K]>}>>((data: RpcValue) => data instanceof ShvMap && z.object(schema).safeParse(data.value).success);
+export const imap = <T extends Record<string, ZodType<any, any, any>>>(schema: T) => z.custom<IMap<{[K in keyof T]: z.infer<T[K]>}>>((data: RpcValue) => data instanceof IMap && z.object(schema).safeParse(data.value).success);
+export const int = () => z.custom<Int>((data: RpcValue) => data instanceof Int);
+
+export * from 'zod';