one-shared 1.1.1 → 1.1.2

package/client.ts

@@ -4,7 +4,8 @@ import {
   ApiSchemas,
   ProcedureName,
   OptionalParams,
-  ParsersByProcedure } from "./types";
+} from "./types";
+import { parseOutput } from "./schema";
 
 /*
 export const emptyParamsSchema = z.tuple([]).readonly()
@@ -39,7 +40,7 @@ export const apiSchemas = {
 export default async function client<P extends ProcedureName>(
   props: { procedure: P } & OptionalParams<ApiSchemas[P], "params"> &
     OptionalParams<ApiSchemas[P], "input">,
-): Promise<z.infer<ApiSchemas[P]['output']>> {
+): Promise<z.infer<ApiSchemas[P]["output"]>> {
   const base = "http://localhost:3000";
   const procedureSchemas = apiSchemas[props.procedure];
 
@@ -52,7 +53,7 @@ export default async function client<P extends ProcedureName>(
     const json = JSON.stringify(parsed);
     init.body = json;
   }
- 
+
   // URL
   const parts = [base, procedureSchemas.path];
   if ("params" in procedureSchemas) {
@@ -65,8 +66,12 @@ export default async function client<P extends ProcedureName>(
   const response = await fetch(url, init);
   const data: unknown = await response.json();
 
-  const parsers: ParsersByProcedure = apiSchemas;
-  const output = parsers[props.procedure].output.parse(data) 
+  // const parser: ParsersByProcedure[P] = apiSchemas[props.procedure];
+  // const output = parser.output.parse(data);
+
+  const output = parseOutput(apiSchemas[props.procedure], data)
 
   return output;
-}
+}
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one-shared",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "homepage": "https://github.com/eightseventeen/one-shared#readme",
   "bugs": {

package/schema.ts

@@ -11,6 +11,7 @@ import {
   boolean,
   varchar,
 } from "drizzle-orm/pg-core";
+import z from "zod";
 
 export const statusSignalEnum = pgEnum("status_signal", [
   "recovery",
@@ -209,3 +210,9 @@ export const relations = defineRelations(tables, (props) => {
   };
 });
 
+export function parseOutput<Parser extends { output: z.ZodType; }>(
+  parser: Parser,
+  data: unknown): z.infer<Parser["output"]> {
+  return z.parse<Parser["output"]>(parser.output, data);
+}
+

package/types.ts

@@ -170,14 +170,14 @@ export type OptionalParams<S, K extends PropertyKey> = S extends {
   ? { [P in K]: z.infer<T> }
   : { [P in K]?: never };
 
-export type OutputByProcedure = {
-  [Name in ProcedureName]: z.infer<ApiSchemas[Name]['output']>
-}
+// export type OutputByProcedure = {
+//   [Name in ProcedureName]: z.infer<ApiSchemas[Name]['output']>
+// }
 
 export type ParsersByProcedure = {
   [Name in ProcedureName]: {
     output: {
-      parse(data: unknown): OutputByProcedure[Name]
+      parse(data: unknown): z.infer<ApiSchemas[Name]['output']>
     }
   }
 }
@@ -240,4 +240,3 @@ export type ApiSchemas = typeof apiSchemas;
 export type ProcedureName = keyof ApiSchemas;
 // 'getHealth' | 'getIncidents' | 'getIncident' ...
 
-const a = await Promise<z.infer<ApiSchemas['getHealth']["output"]>>