@rexeus/typeweaver-types 0.0.3 → 0.0.4

package/dist/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2025 Dennis Wentzien
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/NOTICE

@@ -0,0 +1,4 @@
+Copyright 2025 Dennis Wentzien
+
+This project is licensed under the Apache License, Version 2.0
+See LICENSE file for details.

package/dist/index.js

@@ -1,50 +1,18 @@
-import { Path, BasePlugin } from '@rexeus/typeweaver-gen';
 import path from 'path';
-import { HttpStatusCode } from '@rexeus/typeweaver-core';
-import Case from 'case';
 import { fileURLToPath } from 'url';
+import { Path, BasePlugin } from '@rexeus/typeweaver-gen';
 import { TsTypePrinter, TsTypeNode } from '@rexeus/typeweaver-zod-to-ts';
+import Case from 'case';
+import { HttpStatusCode } from '@rexeus/typeweaver-core';
 
 const __dirname$5 = path.dirname(fileURLToPath(import.meta.url));
-class SharedResponseGenerator {
-  static generate(context) {
-    const templateFile = path.join(
-      __dirname$5,
-      "templates",
-      "SharedResponse.ejs"
-    );
-    for (const sharedResponse of context.resources.sharedResponseResources) {
-      this.writeSharedResponse(templateFile, sharedResponse, context);
-    }
-  }
-  static writeSharedResponse(templateFile, sharedResponse, context) {
-    const headerTsType = sharedResponse.header ? TsTypePrinter.print(TsTypeNode.fromZod(sharedResponse.header)) : void 0;
-    const bodyTsType = sharedResponse.body ? TsTypePrinter.print(TsTypeNode.fromZod(sharedResponse.body)) : void 0;
-    const pascalCaseName = Case.pascal(sharedResponse.name);
-    const content = context.renderTemplate(templateFile, {
-      coreDir: context.coreDir,
-      httpStatusCode: HttpStatusCode,
-      headerTsType,
-      bodyTsType,
-      pascalCaseName,
-      sharedResponse
-    });
-    const relativePath = path.relative(
-      context.outputDir,
-      sharedResponse.outputFile
-    );
-    context.writeFile(relativePath, content);
-  }
-}
-
-const __dirname$4 = path.dirname(fileURLToPath(import.meta.url));
 class RequestGenerator {
   static generate(context) {
-    const templateFilePath = path.join(__dirname$4, "templates", "Request.ejs");
-    for (const [, operationResources] of Object.entries(
+    const templateFilePath = path.join(__dirname$5, "templates", "Request.ejs");
+    for (const [, entityResource] of Object.entries(
       context.resources.entityResources
     )) {
-      for (const definition of operationResources) {
+      for (const definition of entityResource.operations) {
         this.writeRequestType(templateFilePath, definition, context);
       }
     }
@@ -65,31 +33,41 @@ class RequestGenerator {
     const pascalCaseOperationId = Case.pascal(operationId);
     const sourcePath = Path.relative(
       outputDir,
-      `${operationResource.sourceDir}/${path.basename(operationResource.sourceFile, ".ts")}`
+      `${operationResource.sourceDir}/${path.relative(operationResource.sourceDir, operationResource.sourceFile).replace(/\.ts$/, "")}`
     );
     const ownSuccessResponses = [];
     const ownErrorResponses = [];
     const sharedSuccessResponses = [];
     const sharedErrorResponses = [];
     for (const response of responses) {
-      const { statusCode, name, isShared } = response;
-      if (isShared) {
+      const { statusCode, name, isReference } = response;
+      if (isReference) {
         const sharedResponse = context.resources.sharedResponseResources.find(
-          (resource) => {
-            return resource.name === name;
-          }
+          (resource) => resource.name === name
         );
+        let responsePath;
         if (!sharedResponse) {
-          throw new Error(
-            `Shared response '${response.name}' not found in shared resources`
+          const entityResponses = context.resources.entityResources[operationResource.entityName]?.responses;
+          const entityResponse = entityResponses?.find((r) => r.name === name);
+          if (entityResponse) {
+            responsePath = Path.relative(
+              outputDir,
+              `${entityResponse.outputDir}/${path.basename(entityResponse.outputFileName, ".ts")}`
+            );
+          } else {
+            throw new Error(
+              `Shared response '${response.name}' not found in shared or entity resources`
+            );
+          }
+        } else {
+          responsePath = Path.relative(
+            outputDir,
+            `${sharedResponse.outputDir}/${path.basename(sharedResponse.outputFileName, ".ts")}`
           );
         }
         const assembledResponse2 = {
           name,
-          path: Path.relative(
-            outputDir,
-            `${sharedResponse.outputDir}/${path.basename(sharedResponse.outputFileName, ".ts")}`
-          )
+          path: responsePath
         };
         if (statusCode >= 200 && statusCode < 300) {
           sharedSuccessResponses.push(assembledResponse2);
@@ -140,18 +118,18 @@ class RequestGenerator {
   }
 }
 
-const __dirname$3 = path.dirname(fileURLToPath(import.meta.url));
+const __dirname$4 = path.dirname(fileURLToPath(import.meta.url));
 class RequestValidationGenerator {
   static generate(context) {
     const templateFilePath = path.join(
-      __dirname$3,
+      __dirname$4,
       "templates",
       "RequestValidator.ejs"
     );
-    for (const [, operationResources] of Object.entries(
+    for (const [, entityResource] of Object.entries(
       context.resources.entityResources
     )) {
-      for (const definition of operationResources) {
+      for (const definition of entityResource.operations) {
         this.writeRequestValidator(templateFilePath, definition, context);
       }
     }
@@ -166,7 +144,7 @@ class RequestValidationGenerator {
       operationId,
       sourcePath: Path.relative(
         outputDir,
-        `${operationResource.sourceDir}/${path.basename(operationResource.sourceFile, ".ts")}`
+        `${operationResource.sourceDir}/${path.relative(operationResource.sourceDir, operationResource.sourceFile).replace(/\.ts$/, "")}`
       ),
       corePath: context.coreDir,
       requestFile: Path.relative(
@@ -178,21 +156,36 @@ class RequestValidationGenerator {
       param,
       header
     });
-    const relativePath = path.relative(context.outputDir, operationResource.outputRequestValidationFile);
+    const relativePath = path.relative(
+      context.outputDir,
+      operationResource.outputRequestValidationFile
+    );
     context.writeFile(relativePath, content);
   }
 }
 
-const __dirname$2 = path.dirname(fileURLToPath(import.meta.url));
+const __dirname$3 = path.dirname(fileURLToPath(import.meta.url));
 class ResponseGenerator {
   static generate(context) {
-    const templateFile = path.join(__dirname$2, "templates", "Response.ejs");
-    for (const [, operationResources] of Object.entries(
+    const templateFile = path.join(__dirname$3, "templates", "Response.ejs");
+    const sharedResponseTemplateFile = path.join(
+      __dirname$3,
+      "templates",
+      "SharedResponse.ejs"
+    );
+    for (const [, entityResource] of Object.entries(
       context.resources.entityResources
     )) {
-      for (const definition of operationResources) {
+      for (const definition of entityResource.operations) {
         this.writeResponseType(templateFile, definition, context);
       }
+      for (const responseResource of entityResource.responses) {
+        this.writeEntityResponseType(
+          sharedResponseTemplateFile,
+          responseResource,
+          context
+        );
+      }
     }
   }
   static writeResponseType(templateFile, resource, context) {
@@ -209,25 +202,35 @@ class ResponseGenerator {
     const ownResponses = [];
     const sharedResponses = [];
     for (const response of responses) {
-      const { statusCode, name, isShared, body, header } = response;
-      if (isShared) {
+      const { statusCode, name, body, header, isReference } = response;
+      if (isReference) {
         const sharedResponse = context.resources.sharedResponseResources.find(
-          (resource2) => {
-            return resource2.name === name;
-          }
+          (resource2) => resource2.name === name
         );
-        if (!sharedResponse) {
-          throw new Error(
-            `Shared response '${response.name}' not found in shared resources`
-          );
+        if (sharedResponse) {
+          sharedResponses.push({
+            name,
+            path: Path.relative(
+              outputDir,
+              `${sharedResponse.outputDir}/${path.basename(sharedResponse.outputFileName, ".ts")}`
+            )
+          });
+        } else {
+          const entityResponses = context.resources.entityResources[resource.entityName]?.responses;
+          const entityResponse = entityResponses?.find((r) => r.name === name);
+          if (!entityResponse) {
+            throw new Error(
+              `Response ${name} not found in shared or entity-specific responses`
+            );
+          }
+          sharedResponses.push({
+            name,
+            path: Path.relative(
+              outputDir,
+              `${entityResponse.outputDir}/${path.basename(entityResponse.outputFileName, ".ts")}`
+            )
+          });
         }
-        sharedResponses.push({
-          name,
-          path: Path.relative(
-            outputDir,
-            `${sharedResponse.outputDir}/${path.basename(sharedResponse.outputFileName, ".ts")}`
-          )
-        });
         continue;
       }
       ownResponses.push({
@@ -250,27 +253,48 @@ class ResponseGenerator {
       ),
       sourcePath: Path.relative(
         outputDir,
-        `${sourceDir}/${path.basename(sourceFile, ".ts")}`
+        `${sourceDir}/${path.relative(sourceDir, sourceFile).replace(/\.ts$/, "")}`
       )
     });
     const relativePath = path.relative(context.outputDir, outputResponseFile);
     context.writeFile(relativePath, content);
   }
+  static writeEntityResponseType(templateFile, resource, context) {
+    const { name, body, header, outputFile } = resource;
+    const pascalCaseName = Case.pascal(name);
+    const headerTsType = header ? TsTypePrinter.print(TsTypeNode.fromZod(header)) : void 0;
+    const bodyTsType = body ? TsTypePrinter.print(TsTypeNode.fromZod(body)) : void 0;
+    const content = context.renderTemplate(templateFile, {
+      coreDir: context.coreDir,
+      httpStatusCode: HttpStatusCode,
+      headerTsType,
+      bodyTsType,
+      pascalCaseName,
+      sharedResponse: resource
+      // The template expects this property name
+    });
+    const relativePath = path.relative(context.outputDir, outputFile);
+    context.writeFile(relativePath, content);
+  }
 }
 
-const __dirname$1 = path.dirname(fileURLToPath(import.meta.url));
+const __dirname$2 = path.dirname(fileURLToPath(import.meta.url));
 class ResponseValidationGenerator {
   static generate(context) {
     const templateFilePath = path.join(
-      __dirname$1,
+      __dirname$2,
       "templates",
       "ResponseValidator.ejs"
     );
-    for (const [, operationResources] of Object.entries(
+    for (const [, entityResource] of Object.entries(
       context.resources.entityResources
     )) {
-      for (const operationResource of operationResources) {
-        this.writeResponseValidator(templateFilePath, operationResource, context);
+      for (const operationResource of entityResource.operations) {
+        this.writeResponseValidator(
+          templateFilePath,
+          operationResource,
+          context
+        );
       }
     }
   }
@@ -289,7 +313,7 @@ class ResponseValidationGenerator {
     const sharedResponses = [];
     const allStatusCodes = [];
     for (const response of responses) {
-      const { statusCode, name, isShared, body, header, statusCodeName } = response;
+      const { statusCode, name, isReference, body, header, statusCodeName } = response;
       const index = responses.indexOf(response);
       const isStatusCodeIncluded = allStatusCodes.some((status) => {
         return status.statusCode === statusCode;
@@ -300,23 +324,33 @@ class ResponseValidationGenerator {
           name: statusCodeName
         });
       }
-      if (isShared) {
+      if (isReference) {
         const sharedResponse = context.resources.sharedResponseResources.find(
-          (resource2) => {
-            return resource2.name === name;
-          }
+          (resource2) => resource2.name === name
         );
+        let importPath;
         if (!sharedResponse) {
-          throw new Error(
-            `Shared response '${response.name}' not found in shared resources`
+          const entityResponses = context.resources.entityResources[resource.entityName]?.responses;
+          const entityResponse = entityResponses?.find((r) => r.name === name);
+          if (entityResponse) {
+            importPath = Path.relative(
+              outputDir,
+              `${entityResponse.outputDir}/${path.basename(entityResponse.outputFileName, ".ts")}`
+            );
+          } else {
+            throw new Error(
+              `Shared response '${response.name}' not found in shared or entity resources`
+            );
+          }
+        } else {
+          importPath = Path.relative(
+            outputDir,
+            `${sharedResponse.outputDir}/${path.basename(sharedResponse.outputFileName, ".ts")}`
           );
         }
         sharedResponses.push({
           name,
-          importPath: Path.relative(
-            outputDir,
-            `${sharedResponse.outputDir}/${path.basename(sharedResponse.outputFileName, ".ts")}`
-          ),
+          importPath,
           hasBody: !!body,
           hasHeader: !!header,
           statusCode,
@@ -340,13 +374,48 @@ class ResponseValidationGenerator {
       responseFile: `./${path.basename(outputResponseFileName, ".ts")}`,
       sourcePath: Path.relative(
         outputDir,
-        `${sourceDir}/${path.basename(sourceFile, ".ts")}`
+        `${sourceDir}/${path.relative(sourceDir, sourceFile).replace(/\.ts$/, "")}`
       ),
       sharedResponses,
       ownResponses,
       allStatusCodes
     });
-    const relativePath = path.relative(context.outputDir, outputResponseValidationFile);
+    const relativePath = path.relative(
+      context.outputDir,
+      outputResponseValidationFile
+    );
+    context.writeFile(relativePath, content);
+  }
+}
+
+const __dirname$1 = path.dirname(fileURLToPath(import.meta.url));
+class SharedResponseGenerator {
+  static generate(context) {
+    const templateFile = path.join(
+      __dirname$1,
+      "templates",
+      "SharedResponse.ejs"
+    );
+    for (const sharedResponse of context.resources.sharedResponseResources) {
+      this.writeSharedResponse(templateFile, sharedResponse, context);
+    }
+  }
+  static writeSharedResponse(templateFile, sharedResponse, context) {
+    const headerTsType = sharedResponse.header ? TsTypePrinter.print(TsTypeNode.fromZod(sharedResponse.header)) : void 0;
+    const bodyTsType = sharedResponse.body ? TsTypePrinter.print(TsTypeNode.fromZod(sharedResponse.body)) : void 0;
+    const pascalCaseName = Case.pascal(sharedResponse.name);
+    const content = context.renderTemplate(templateFile, {
+      coreDir: context.coreDir,
+      httpStatusCode: HttpStatusCode,
+      headerTsType,
+      bodyTsType,
+      pascalCaseName,
+      sharedResponse
+    });
+    const relativePath = path.relative(
+      context.outputDir,
+      sharedResponse.outputFile
+    );
     context.writeFile(relativePath, content);
   }
 }

package/dist/lib/RequestValidator.ts

@@ -1,8 +1,16 @@
+/**
+ * This file was automatically generated by typeweaver.
+ * DO NOT EDIT. Instead, modify the source definition file and generate again.
+ *
+ * @generated by @rexeus/typeweaver
+ */
+
 import type {
   IHttpRequest,
   IRequestValidator,
   SafeRequestValidationResult,
 } from "@rexeus/typeweaver-core";
+import { Validator } from "./Validator";
 
 /**
  * Abstract base class for HTTP request validation.
@@ -17,9 +25,12 @@ import type {
  * - Return validated data (for `validate`)
  * - Return success/error result (for `safeValidate`)
  */
-export abstract class RequestValidator implements IRequestValidator {
+export abstract class RequestValidator
+  extends Validator
+  implements IRequestValidator
+{
   public constructor() {
-    //
+    super();
   }
 
   /**