@tuyau/core 0.2.3 → 0.3.0

package/build/commands/generate.js

@@ -98,11 +98,6 @@ var ApiTypesGenerator = class {
     return void 0;
   }
   /**
-   * We have multiple ways to get the request payload :
-   * - First we check if a FormRequest is used
-   * - Other we check if we have a Single Action Controller
-   * - Otherwise, we check if a request.validateUsing is used
-   *
    * This method will returns the path to the schema file
    */
   #extractRequest(handlerData) {
@@ -113,9 +108,9 @@ var ApiTypesGenerator = class {
       }
       return false;
     });
-    if (validateUsingCallNode) {
-      const schema = validateUsingCallNode.getArguments()[0];
-      if (!Node.isIdentifier(schema)) return;
+    if (!validateUsingCallNode) return;
+    const schema = validateUsingCallNode.getArguments()[0];
+    if (Node.isIdentifier(schema)) {
       const definition = schema.getDefinitions().at(0);
       const importType = this.#getIdentifierImportType(schema);
       const isReExportedFromThisFile = definition ? handlerData.file.getExportedDeclarations().has(definition.getNode().getText()) : false;
@@ -128,7 +123,20 @@ var ApiTypesGenerator = class {
       const propName = importType === "default" ? "default" : schema.getText();
       return `InferInput<typeof import('${relativeImportPath}')['${propName}']>`;
     }
-    return void 0;
+    if (Node.isPropertyAccessExpression(schema)) {
+      const baseExpression = schema.getExpression();
+      const propertyName = schema.getName();
+      if (Node.isIdentifier(baseExpression)) {
+        const className = baseExpression.getText();
+        const classDeclaration = handlerData.file.getClass(className);
+        if (!classDeclaration) return;
+        const staticProperty = classDeclaration.getStaticMember(propertyName);
+        if (!staticProperty) return;
+        const importPath = classDeclaration.getSourceFile().getFilePath();
+        const relativeImportPath = slash(relative(this.#getDestinationDirectory(), importPath));
+        return `InferInput<typeof import('${relativeImportPath}').default['${propertyName}']>`;
+      }
+    }
   }
   /**
    * Generate the final interface containing all routes, request, and response
@@ -215,7 +223,7 @@ var ApiTypesGenerator = class {
     if (!file) throw new Error("Unable to create the api.ts file");
     const isTuyauInertiaInstalled = await this.#isTuyauInertiaInstalled();
     file.removeText().insertText(0, (writer) => {
-      writer.writeLine(`/* eslint-disable */`).writeLine("// --------------------------------------------------").writeLine("// This file is auto-generated by Tuyau. Do not edit manually !").writeLine("// --------------------------------------------------").writeLine("").writeLine(`import type { MakeTuyauRequest, MakeTuyauResponse } from '@tuyau/utils/types'`).writeLine(`import type { InferInput } from '@vinejs/vine/types'`).newLine();
+      writer.writeLine(`// @ts-nocheck`).writeLine(`/* eslint-disable */`).writeLine("// --------------------------------------------------").writeLine("// This file is auto-generated by Tuyau. Do not edit manually !").writeLine("// --------------------------------------------------").writeLine("").writeLine(`import type { MakeTuyauRequest, MakeTuyauResponse } from '@tuyau/utils/types'`).writeLine(`import type { InferInput } from '@vinejs/vine/types'`).newLine();
       Object.entries(options.typesByPattern).forEach(([key, value]) => {
         writer.writeLine(`type ${key} = {`);
         writer.writeLine(`  request: ${value.request}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tuyau/core",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -23,16 +23,16 @@
     "@adonisjs/core": "^6.2.0"
   },
   "dependencies": {
-    "ts-morph": "^23.0.0",
+    "ts-morph": "^25.0.0",
     "@tuyau/utils": "0.0.6"
   },
   "devDependencies": {
     "@adonisjs/assembler": "^7.8.2",
-    "@adonisjs/core": "^6.16.0",
-    "@poppinss/cliui": "^6.4.1",
+    "@adonisjs/core": "^6.17.1",
+    "@poppinss/cliui": "^6.4.2",
     "@poppinss/matchit": "^3.1.2",
-    "@types/node": "^22.10.1",
-    "@tuyau/client": "0.2.2"
+    "@types/node": "^22.10.7",
+    "@tuyau/client": "0.2.3"
   },
   "publishConfig": {
     "access": "public",