@rexeus/typeweaver-types 0.8.0 → 0.9.1

package/dist/lib/definitionLookup.d.ts

@@ -0,0 +1,29 @@
+import type {
+  ResponseDefinition,
+  SpecDefinition,
+} from "@rexeus/typeweaver-core";
+
+type MatchedOperationDefinition<
+  TSpec extends SpecDefinition,
+  TResourceName extends keyof TSpec["resources"] & string,
+> = NonNullable<TSpec["resources"][TResourceName]>["operations"][number];
+
+type MatchedResponseDefinition<
+  TResponses extends readonly ResponseDefinition[],
+> = TResponses[number];
+
+export declare const getOperationDefinition: <
+  TSpec extends SpecDefinition,
+  TResourceName extends keyof TSpec["resources"] & string,
+>(
+  spec: TSpec,
+  resourceName: TResourceName,
+  operationId: string
+) => MatchedOperationDefinition<TSpec, TResourceName>;
+
+export declare const getResponseDefinition: <
+  TResponses extends readonly ResponseDefinition[],
+>(
+  responses: TResponses,
+  responseName: string
+) => MatchedResponseDefinition<TResponses>;

package/dist/lib/definitionLookup.js

@@ -0,0 +1,14 @@
+export const getOperationDefinition = (spec, resourceName, operationId) => {
+	const operation = spec.resources[resourceName]?.operations.find((candidate) => candidate.operationId === operationId);
+	if (operation === undefined) {
+		throw new Error(`Missing operation definition '${String(resourceName)}.${String(operationId)}'.`);
+	}
+	return operation;
+};
+export const getResponseDefinition = (responses, responseName) => {
+	const response = responses.find((candidate) => candidate.name === responseName);
+	if (response === undefined) {
+		throw new Error(`Missing response definition '${String(responseName)}'.`);
+	}
+	return response;
+};

package/dist/lib/index.ts

@@ -5,7 +5,7 @@
  * @generated by @rexeus/typeweaver
  */
 
-export * from "./assert";
+export * from "./definitionLookup";
 export * from "./RequestValidator";
 export * from "./ResponseValidator";
 export * from "./Validator";

package/dist/templates/RequestValidator.ejs

@@ -6,15 +6,17 @@
  * @generated by @rexeus/typeweaver
  */
 
-import definition from "<%= sourcePath %>";
+import spec from "<%= specPath %>";
 import { 
   type IHttpRequest,
   type SafeRequestValidationResult,
   RequestValidationError
 } from "@rexeus/typeweaver-core";
-import { RequestValidator } from "../lib/types";
+import { getOperationDefinition, RequestValidator } from "../lib/types";
 import type { I<%= pascalCaseOperationId %>Request } from "<%= requestFile %>";
 
+const definition = getOperationDefinition(spec, "<%= resourceName %>", "<%= operationId %>");
+
 export class <%= pascalCaseOperationId %>RequestValidator extends RequestValidator {
     public safeValidate(request: IHttpRequest): SafeRequestValidationResult<I<%= pascalCaseOperationId %>Request> {
         const error = new RequestValidationError();
@@ -41,17 +43,13 @@ export class <%= pascalCaseOperationId %>RequestValidator extends RequestValidat
 
         <% if(header) { %>
             if (definition.request.header) {
-                <% if(header instanceof z.ZodObject) { %>
-                const coercedHeader = this.coerceHeaderToSchema(request.header, definition.request.header.shape);
-                <% } else { %>
-                const coercedHeader = this.coerceHeaderToSchema(request.header, definition.request.header.unwrap().shape);
-                <% } %>  
+                const coercedHeader = this.coerceHeaderToSchema(request.header, this.getSchema(definition.request.header));
                 const result = definition.request.header.safeParse(coercedHeader);
           
                 if (!result.success) {
                   error.addHeaderIssues(result.error.issues);
                 } else {
-                  validatedRequest.header = result.data;
+                  validatedRequest.header = result.data as IHttpRequest["header"];
                 }
             }
         <% } %>
@@ -70,17 +68,13 @@ export class <%= pascalCaseOperationId %>RequestValidator extends RequestValidat
 
         <% if(query) { %>
             if (definition.request.query) {
-                <% if(query instanceof z.ZodObject) { %>
-                const coercedQuery = this.coerceQueryToSchema(request.query, definition.request.query.shape);
-                <% } else { %>
-                const coercedQuery = this.coerceQueryToSchema(request.query, definition.request.query.unwrap().shape);
-                <% } %>
+                const coercedQuery = this.coerceQueryToSchema(request.query, this.getSchema(definition.request.query));
                 const result = definition.request.query.safeParse(coercedQuery);
           
                 if (!result.success) {
                   error.addQueryIssues(result.error.issues);
                 } else {
-                  validatedRequest.query = result.data;
+                  validatedRequest.query = result.data as IHttpRequest["query"];
                 }
             }
         <% } %>
@@ -107,4 +101,4 @@ export class <%= pascalCaseOperationId %>RequestValidator extends RequestValidat
     
         return result.data;
       }
-}
+}

package/dist/templates/Response.ejs

@@ -6,8 +6,10 @@
  * @generated by @rexeus/typeweaver
  */
 
+<% if (ownResponses.length > 0) { %>
 import { HttpStatusCode } from "<%= coreDir %>";
 import type { ITypedHttpResponse } from "<%= coreDir %>";
+<% } %>
 <% for (const shared of sharedResponses) { %>
 import type { I<%= shared.name %>Response } from "<%= shared.path %>";
 <% } %>

package/dist/templates/ResponseValidator.ejs

@@ -6,13 +6,23 @@
  * @generated by @rexeus/typeweaver
  */
 
-import definition from "<%= sourcePath %>";
+import spec from "<%= specPath %>";
 import {
+    getOperationDefinition,
+    getResponseDefinition,
     type ResponseEntry,
     ResponseValidator,
 } from "../lib/types";
 import type { <%= pascalCaseOperationId %>Response } from "<%= responseFile %>";
 
+const definition = getOperationDefinition(spec, "<%= resourceName %>", "<%= operationId %>");
+<% for (const response of [...ownResponses, ...sharedResponses]) { %>
+const <%= response.definitionVariableName %> = getResponseDefinition(
+    definition.responses,
+    "<%= response.name %>"
+);
+<% } %>
+
 export class <%= pascalCaseOperationId %>ResponseValidator extends ResponseValidator<<%= pascalCaseOperationId %>Response> {
     protected override readonly expectedStatusCodes = [
         <% const sortedStatusCodes = allStatusCodes.map(statusCode => statusCode.statusCode).sort() %>
@@ -21,7 +31,7 @@ export class <%= pascalCaseOperationId %>ResponseValidator extends ResponseValid
 
     protected override readonly responseEntries: readonly ResponseEntry[] = [
         <% for (const response of [...ownResponses, ...sharedResponses]) { %>
-        { name: "<%= response.name.replace(/Response$/, '') %>", statusCode: <%= response.statusCode %>, headerSchema: definition.responses[<%= response.index %>]?.header, bodySchema: definition.responses[<%= response.index %>]?.body },
+        { name: "<%= response.name %>", statusCode: <%= response.statusCode %>, headerSchema: <%= response.definitionVariableName %>.header, bodySchema: <%= response.definitionVariableName %>.body },
         <% } %>
     ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexeus/typeweaver-types",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "Generates request and response types plus validators aligned with your API contract. Powered by Typeweaver 🧵✨",
   "type": "module",
   "sideEffects": false,
@@ -47,18 +47,18 @@
   },
   "homepage": "https://github.com/rexeus/typeweaver#readme",
   "peerDependencies": {
-    "@rexeus/typeweaver-core": "^0.8.0",
-    "@rexeus/typeweaver-gen": "^0.8.0"
+    "@rexeus/typeweaver-core": "^0.9.1",
+    "@rexeus/typeweaver-gen": "^0.9.1"
   },
   "devDependencies": {
-    "oxc-transform": "^0.115.0",
+    "oxc-transform": "^0.121.0",
     "test-utils": "file:../test-utils",
-    "@rexeus/typeweaver-core": "^0.8.0",
-    "@rexeus/typeweaver-gen": "^0.8.0"
+    "@rexeus/typeweaver-core": "^0.9.1",
+    "@rexeus/typeweaver-gen": "^0.9.1"
   },
   "dependencies": {
     "case": "^1.6.3",
-    "@rexeus/typeweaver-zod-to-ts": "^0.8.0"
+    "@rexeus/typeweaver-zod-to-ts": "^0.9.1"
   },
   "scripts": {
     "typecheck": "tsc --noEmit -p tsconfig.typecheck.json",

package/dist/lib/assert.d.ts

@@ -1 +0,0 @@
-export declare function assert(value: unknown, message?: string): asserts value;

package/dist/lib/assert.js

@@ -1,11 +0,0 @@
-/**
-* This file was automatically generated by typeweaver.
-* DO NOT EDIT. Instead, modify the source definition file and generate again.
-*
-* @generated by @rexeus/typeweaver
-*/
-export function assert(value, message) {
-	if (!value) {
-		throw new Error(message || "Assertion failed");
-	}
-}