@tuyau/core 0.0.6 → 0.1.1

package/build/commands/generate.js

@@ -8,9 +8,11 @@ import { BaseCommand, flags } from "@adonisjs/core/ace";
 
 // src/codegen/api_types_generator.ts
 import { Node } from "ts-morph";
+import matchit from "@poppinss/matchit";
 import { fileURLToPath } from "node:url";
 import { dirname, relative } from "node:path";
 import { existsSync, mkdirSync } from "node:fs";
+import string from "@adonisjs/core/helpers/string";
 import { parseBindingReference } from "@adonisjs/core/helpers";
 var ApiTypesGenerator = class {
   #appRoot;
@@ -34,7 +36,7 @@ var ApiTypesGenerator = class {
    * Create the destination directory if it does not exists
    */
   #prepareDestination() {
-    this.#destination = new URL("./.adonisjs/types/api.d.ts", this.#appRoot);
+    this.#destination = new URL("./.adonisjs/api.ts", this.#appRoot);
     const directory = this.#getDestinationDirectory();
     if (!existsSync(directory)) {
       mkdirSync(directory, { recursive: true });
@@ -90,13 +92,13 @@ var ApiTypesGenerator = class {
   /**
    * Generate the final interface containing all routes, request, and response
    */
-  #generateFinalInterface(types, indent = "  ") {
+  #generateDefinitionInterface(types, indent = "  ") {
     let interfaceContent = "";
     Object.entries(types).forEach(([key, value]) => {
       if (typeof value === "object") {
         interfaceContent += `${indent}'${key}': {
 `;
-        interfaceContent += this.#generateFinalInterface(value, indent + "  ");
+        interfaceContent += this.#generateDefinitionInterface(value, indent + "  ");
         interfaceContent += `${indent}};
 `;
       } else {
@@ -106,22 +108,6 @@ var ApiTypesGenerator = class {
     });
     return interfaceContent;
   }
-  /**
-   * Write the final interface containing all routes, request, and response
-   * in a routes.d.ts file
-   */
-  async #writeFinalInterface(types) {
-    const file = this.#project.createSourceFile(fileURLToPath(this.#destination), "", {
-      overwrite: true
-    });
-    if (!file)
-      throw new Error("Unable to create the api.d.ts file");
-    file?.removeText();
-    file.insertText(0, (writer) => {
-      writer.writeLine(`import type { MakeTuyauRequest, MakeTuyauResponse } from '@tuyau/utils/types'`).writeLine(`import type { InferInput } from '@vinejs/vine/types'`).newLine().writeLine(`export interface AdonisApi {`).write(this.#generateFinalInterface(types, "  ")).writeLine(`}`);
-    });
-    await file.save();
-  }
   /**
    * Filter routes to generate based on the ignoreRoutes config
    */
@@ -141,8 +127,57 @@ var ApiTypesGenerator = class {
       return true;
     });
   }
+  /**
+   * Generate a type name based on the route pattern and methods
+   *
+   * GET /users/:id => UsersIdGet
+   */
+  #generateTypeName(route) {
+    const remappedSegments = route.pattern.split("/").filter(Boolean).map((segment) => segment.startsWith(":") ? "id" : segment).join(" ");
+    const methods = string.pascalCase(route.methods.join(" "));
+    return string.pascalCase(remappedSegments) + methods;
+  }
+  #generateRoutesNameArray(routes, typesByPattern) {
+    return routes.map(({ name, pattern, methods }) => {
+      const params = matchit.parse(pattern).filter((node) => node.type !== 0).map((node) => node.val);
+      let typeName = this.#generateTypeName({ pattern, methods });
+      if (!typesByPattern[typeName])
+        typeName = "unknown";
+      return { params, name, path: pattern, method: methods, types: typeName };
+    }).filter((route) => !!route.name);
+  }
+  async #writeApiFile(options) {
+    const path = fileURLToPath(this.#destination);
+    const file = this.#project.createSourceFile(path, "", { overwrite: true });
+    if (!file)
+      throw new Error("Unable to create the api.ts file");
+    file.removeText().insertText(0, (writer) => {
+      writer.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}`);
+        writer.writeLine(`  response: ${value.response}`);
+        writer.writeLine(`}`);
+      });
+      writer.writeLine(`interface AdonisApi {`).write(this.#generateDefinitionInterface(options.definition, "  ")).writeLine(`}`);
+      writer.writeLine(`const routes = [`);
+      for (const route of options.routesNameArray) {
+        writer.writeLine(`  {`);
+        writer.writeLine(`    params: ${JSON.stringify(route.params)},`);
+        writer.writeLine(`    name: '${route.name}',`);
+        writer.writeLine(`    path: '${route.path}',`);
+        writer.writeLine(`    method: ${JSON.stringify(route.method)},`);
+        writer.writeLine(`    types: {} as ${route.types},`);
+        writer.writeLine(`  },`);
+      }
+      writer.writeLine(`] as const;`);
+      writer.writeLine(`export const api = {`).writeLine(`  routes,`).writeLine(`  definition: {} as AdonisApi`).writeLine(`}`);
+    });
+    await file.save();
+  }
   async generate() {
-    const types = {};
+    const definition = {};
+    const typesByPattern = {};
     const sourcesFiles = this.#project.getSourceFiles();
     const routes = this.#filterRoutesToGenerate(this.#routes);
     for (const route of routes) {
@@ -165,25 +200,29 @@ var ApiTypesGenerator = class {
       const schemaImport = this.#extractRequest(handlerData);
       const methods = route.methods.map((method) => "$" + method.toLowerCase()).filter((method) => method !== "head");
       const segments = route.pattern.split("/").filter(Boolean);
-      let currentLevel = types;
+      let currentLevel = definition;
       const relativePath = relative(this.#getDestinationDirectory(), file.getFilePath());
       segments.forEach((segment, i) => {
-        if (!currentLevel[segment]) {
+        if (!currentLevel[segment])
           currentLevel[segment] = {};
-        }
         currentLevel = currentLevel[segment];
         if (i !== segments.length - 1)
           return;
+        const typeName = this.#generateTypeName(route);
+        typesByPattern[typeName] = {
+          request: schemaImport ? `MakeTuyauRequest<${schemaImport}>` : "unknown",
+          response: `MakeTuyauResponse<import('${relativePath}').default['${routeHandler.method}']>`
+        };
         currentLevel.$url = {};
-        for (const method of methods) {
-          currentLevel[method] = {
-            request: schemaImport ? `MakeTuyauRequest<${schemaImport}>` : "unknown",
-            response: `MakeTuyauResponse<import('${relativePath}').default['${routeHandler.method}']>`
-          };
-        }
+        for (const method of methods)
+          currentLevel[method] = typeName;
       });
     }
-    await this.#writeFinalInterface(types);
+    await this.#writeApiFile({
+      definition,
+      typesByPattern,
+      routesNameArray: this.#generateRoutesNameArray(routes, typesByPattern)
+    });
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tuyau/core",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.1.1",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -31,8 +31,8 @@
     "@poppinss/cliui": "^6.4.1",
     "@poppinss/matchit": "^3.1.2",
     "@types/node": "^20.12.7",
-    "@tuyau/client": "0.0.11",
-    "@tuyau/utils": "0.0.3"
+    "@tuyau/utils": "0.0.4",
+    "@tuyau/client": "0.1.0"
   },
   "publishConfig": {
     "access": "public",
@@ -62,7 +62,7 @@
   },
   "scripts": {
     "clean": "del-cli build",
-    "copy:templates": "copyfiles \"stubs/**/*.stub\" build",
+    "copy:templates": "copyfiles --up 1 \"stubs/**/*.stub\" build",
     "typecheck": "tsc --noEmit",
     "format": "prettier --write .",
     "quick:test": "node --import=./tsnode.esm.js --enable-source-maps bin/test.ts",