@tuyau/core 0.0.5 → 0.1.0

package/LICENSE.md

@@ -0,0 +1,9 @@
+# The MIT License
+
+Copyright (c) 2023
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/build/chunk-3KNDPG6Y.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result)
+    __defProp(target, key, result);
+  return result;
+};
+
+export {
+  __decorateClass
+};

package/build/commands/commands.json

@@ -1 +1 @@
-{"commands":[{"commandName":"tuyau:generate","description":"Tuyau generator command","help":"","namespace":"tuyau","aliases":[],"flags":[],"args":[],"options":{"startApp":true},"filePath":"generate.js","absoluteFilePath":"/home/julien/code/adonis/tuyau/packages/core/build/commands/generate.js"}],"version":1}
+{"commands":[{"commandName":"tuyau:generate","description":"Tuyau generator command","help":"","namespace":"tuyau","aliases":[],"flags":[{"name":"verbose","flagName":"verbose","required":false,"type":"boolean","description":"Verbose logs","default":false,"alias":"v"}],"args":[],"options":{"startApp":true},"filePath":"generate.js","absoluteFilePath":"/home/julien/code/adonis/tuyau/packages/core/build/commands/generate.js"}],"version":1}

package/build/commands/generate.d.ts

@@ -6,6 +6,7 @@ declare class CodegenTypes extends BaseCommand {
     static commandName: string;
     static description: string;
     static options: CommandOptions;
+    verbose: boolean;
     /**
      * Execute command
      */

package/build/commands/generate.js

@@ -1,12 +1,18 @@
+import {
+  __decorateClass
+} from "../chunk-3KNDPG6Y.js";
+
 // commands/generate.ts
 import { Project, QuoteKind } from "ts-morph";
-import { BaseCommand } from "@adonisjs/core/ace";
+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;
@@ -30,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 });
@@ -72,7 +78,12 @@ var ApiTypesGenerator = class {
       const schema = validateUsingCallNode.getArguments()[0];
       if (!Node.isIdentifier(schema))
         return;
-      const importPath = schema.getImplementations()[0].getSourceFile().getFilePath();
+      const implementation = schema.getImplementations().at(0);
+      if (!implementation) {
+        this.#logger.warning(`Unable to find the schema file for ${schema.getText()}`);
+        return;
+      }
+      const importPath = implementation.getSourceFile().getFilePath();
       const relativeImportPath = relative(this.#getDestinationDirectory(), importPath);
       return `InferInput<typeof import('${relativeImportPath}')['${schema.getText()}']>`;
     }
@@ -81,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 {
@@ -97,24 +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 { MakeOptional, Serialize, Simplify, ConvertReturnTypeToRecordStatusResponse } 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
    */
@@ -134,8 +127,45 @@ var ApiTypesGenerator = class {
       return true;
     });
   }
+  #generateRoutesNameArray(routes) {
+    return routes.map(({ name, pattern, methods }) => {
+      const params = matchit.parse(pattern).filter((node) => node.type !== 0).map((node) => node.val);
+      const typeName = string.pascalCase(string.slug(pattern)) + string.pascalCase(methods.join(" "));
+      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) {
@@ -158,25 +188,30 @@ 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) {
-          currentLevel["$url"] = {};
-          for (const method of methods) {
-            currentLevel[method] = {
-              request: schemaImport ? `MakeOptional<${schemaImport}>` : "unknown",
-              response: `Simplify<Serialize<ConvertReturnTypeToRecordStatusResponse<Awaited<ReturnType<typeof import('${relativePath}').default['prototype']['${routeHandler.method}']>>>>>`
-            };
-          }
+        if (i !== segments.length - 1)
+          return;
+        const typeName = string.pascalCase(string.slug(route.pattern)) + string.pascalCase(methods.join(""));
+        typesByPattern[typeName] = {
+          request: schemaImport ? `MakeTuyauRequest<${schemaImport}>` : "unknown",
+          response: `MakeTuyauResponse<import('${relativePath}').default['${routeHandler.method}']>`
+        };
+        currentLevel.$url = {};
+        for (const method of methods) {
+          currentLevel[method] = `${string.pascalCase(typeName)}`;
         }
       });
     }
-    await this.#writeFinalInterface(types);
+    await this.#writeApiFile({
+      definition,
+      typesByPattern,
+      routesNameArray: this.#generateRoutesNameArray(routes)
+    });
   }
 };
 
@@ -212,6 +247,9 @@ var CodegenTypes = class extends BaseCommand {
     this.logger.success("Types generated successfully");
   }
 };
+__decorateClass([
+  flags.boolean({ description: "Verbose logs", default: false, alias: "v" })
+], CodegenTypes.prototype, "verbose", 2);
 export {
   CodegenTypes as default
 };

package/build/index.js

@@ -1,3 +1,5 @@
+import "./chunk-3KNDPG6Y.js";
+
 // stubs/main.ts
 import { getDirname } from "@adonisjs/core/helpers";
 var stubsRoot = getDirname(import.meta.url);

package/build/providers/tuyau_provider.js

@@ -1,3 +1,5 @@
+import "../chunk-3KNDPG6Y.js";
+
 // providers/tuyau_provider.ts
 var TuyauProvider = class {
   constructor(app) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tuyau/core",
   "type": "module",
-  "version": "0.0.5",
+  "version": "0.1.0",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -18,20 +18,6 @@
   "engines": {
     "node": ">=20.6.0"
   },
-  "scripts": {
-    "clean": "del-cli build",
-    "copy:templates": "copyfiles \"stubs/**/*.stub\" build",
-    "typecheck": "tsc --noEmit",
-    "format": "prettier --write .",
-    "quick:test": "node --import=./tsnode.esm.js --enable-source-maps bin/test.ts",
-    "test": "c8 npm run quick:test",
-    "index:commands": "adonis-kit index build/commands",
-    "prebuild": "npm run clean",
-    "build": "pnpm clean && tsup-node && pnpm copy:templates && pnpm index:commands",
-    "release": "pnpm build && pnpm release-it",
-    "version": "npm run build",
-    "prepublishOnly": "npm run build"
-  },
   "peerDependencies": {
     "@adonisjs/core": "^6.2.0"
   },
@@ -39,14 +25,14 @@
     "ts-morph": "^22.0.0"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^7.4.0",
-    "@adonisjs/core": "^6.5.0",
+    "@adonisjs/assembler": "^7.5.1",
+    "@adonisjs/core": "^6.8.0",
     "@julr/tooling-configs": "^2.2.0",
     "@poppinss/cliui": "^6.4.1",
     "@poppinss/matchit": "^3.1.2",
-    "@tuyau/client": "workspace:*",
-    "@tuyau/utils": "workspace:*",
-    "@types/node": "^20.12.7"
+    "@types/node": "^20.12.7",
+    "@tuyau/utils": "0.0.4",
+    "@tuyau/client": "0.1.0"
   },
   "publishConfig": {
     "access": "public",
@@ -61,18 +47,6 @@
       "tests/**"
     ]
   },
-  "release-it": {
-    "git": {
-      "commitMessage": "chore(release): @tuyau/core@${version}",
-      "tagAnnotation": "release ${version}",
-      "tagName": "@tuyau/core@${version}"
-    },
-    "github": {
-      "release": true,
-      "releaseName": "@tuyau/core@${version}",
-      "web": true
-    }
-  },
   "tsup": {
     "entry": [
       "./index.ts",
@@ -85,5 +59,17 @@
     "format": "esm",
     "dts": true,
     "target": "esnext"
+  },
+  "scripts": {
+    "clean": "del-cli build",
+    "copy:templates": "copyfiles \"stubs/**/*.stub\" build",
+    "typecheck": "tsc --noEmit",
+    "format": "prettier --write .",
+    "quick:test": "node --import=./tsnode.esm.js --enable-source-maps bin/test.ts",
+    "test": "c8 npm run quick:test",
+    "index:commands": "adonis-kit index build/commands",
+    "prebuild": "npm run clean",
+    "build": "pnpm clean && tsup-node && pnpm copy:templates && pnpm index:commands",
+    "version": "npm run build"
   }
-}
+}