@tuyau/core 0.3.1 → 0.4.0

package/build/commands/generate.js

@@ -15,6 +15,7 @@ import { readFile } from "node:fs/promises";
 import { dirname, relative } from "node:path";
 import { existsSync, mkdirSync } from "node:fs";
 import string from "@adonisjs/core/helpers/string";
+import { assertExists } from "@adonisjs/core/helpers/assert";
 import { parseBindingReference, slash } from "@adonisjs/core/helpers";
 var ApiTypesGenerator = class {
   #appRoot;
@@ -23,7 +24,7 @@ var ApiTypesGenerator = class {
   #config;
   #routes;
   #destination;
-  #isTuyauInertiaInstalledCached;
+  #cachedPkgJson;
   constructor(options) {
     this.#config = options.config;
     this.#routes = options.routes;
@@ -32,24 +33,26 @@ var ApiTypesGenerator = class {
     this.#appRoot = options.appRoot;
     this.#prepareDestination();
   }
-  /**
-   * Check if the @tuyau/inertia package is installed.
-   */
-  async #isTuyauInertiaInstalled() {
-    if (this.#isTuyauInertiaInstalledCached !== void 0)
-      return this.#isTuyauInertiaInstalledCached;
+  async #loadPkgJson() {
+    if (this.#cachedPkgJson) return this.#cachedPkgJson;
     try {
       const pkgJsonText = await readFile(
         fileURLToPath(new URL("./package.json", this.#appRoot)),
         "utf-8"
       );
-      const pkgJson = JSON.parse(pkgJsonText);
-      this.#isTuyauInertiaInstalledCached = !!pkgJson.dependencies?.["@tuyau/inertia"];
-      return this.#isTuyauInertiaInstalledCached;
+      this.#cachedPkgJson = JSON.parse(pkgJsonText);
+      return this.#cachedPkgJson;
     } catch (error) {
       throw new Error("Unable to read the package.json file", { cause: error });
     }
   }
+  #isPackageInstalled(name) {
+    assertExists(
+      this.#cachedPkgJson,
+      "package.json should be loaded before checking if a package is installed"
+    );
+    return !!this.#cachedPkgJson.dependencies?.[name];
+  }
   #getDestinationDirectory() {
     return dirname(this.#destination);
   }
@@ -218,12 +221,23 @@ var ApiTypesGenerator = class {
     });
     await file.save();
   }
+  /**
+   * If @tuyau/superjson is installed then we must use a special
+   * type that will not type-serialize the response
+   */
+  #getMakeTuyauResponseType() {
+    const isSuperJsonInstalled = this.#isPackageInstalled("@tuyau/superjson");
+    return isSuperJsonInstalled ? "MakeNonSerializedTuyauResponse" : "MakeTuyauResponse";
+  }
   async #writeApiFile(options) {
     const file = this.#project.createSourceFile(this.#destination, "", { overwrite: true });
     if (!file) throw new Error("Unable to create the api.ts file");
-    const isTuyauInertiaInstalled = await this.#isTuyauInertiaInstalled();
+    const isTuyauInertiaInstalled = this.#isPackageInstalled("@tuyau/inertia");
+    const makeTuyauResponseType = this.#getMakeTuyauResponseType();
     file.removeText().insertText(0, (writer) => {
-      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();
+      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, ${makeTuyauResponseType} } 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}`);
@@ -257,12 +271,19 @@ var ApiTypesGenerator = class {
     const typesByPattern = {};
     const sourcesFiles = this.#project.getSourceFiles();
     const routes = this.#filterRoutes(this.#routes, "definitions");
+    await this.#loadPkgJson();
     for (const route of routes) {
       if (typeof route.handler === "function") continue;
       const routeHandler = await parseBindingReference(route.handler.reference);
-      const file = sourcesFiles.find(
-        (sf) => sf.getFilePath().endsWith(`${routeHandler.moduleNameOrPath.replace("#", "")}.ts`)
-      );
+      const file = sourcesFiles.find((sf) => {
+        const filePath = sf.getFilePath();
+        if (routeHandler.moduleNameOrPath.startsWith("./")) {
+          return filePath.endsWith(
+            routeHandler.moduleNameOrPath.replace("./", "").replace(".js", ".ts")
+          );
+        }
+        return filePath.endsWith(`${routeHandler.moduleNameOrPath.replace("#", "")}.ts`);
+      });
       if (!file) {
         this.#logger.warning(`Unable to find the controller file for ${route.pattern}`);
         continue;
@@ -283,9 +304,10 @@ var ApiTypesGenerator = class {
         currentLevel = currentLevel[segment];
         if (i !== segments.length - 1) return;
         const typeName = this.#generateTypeName(route);
+        const makeTuyauResponseType = this.#getMakeTuyauResponseType();
         typesByPattern[typeName] = {
           request: schemaImport ? `MakeTuyauRequest<${schemaImport}>` : "unknown",
-          response: `MakeTuyauResponse<import('${relativePath}').default['${routeHandler.method}'], ${!!schemaImport}>`
+          response: `${makeTuyauResponseType}<import('${relativePath}').default['${routeHandler.method}'], ${!!schemaImport}>`
         };
         currentLevel.$url = {};
         for (const method of methods) currentLevel[method] = typeName;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tuyau/core",
   "type": "module",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -24,15 +24,15 @@
   },
   "dependencies": {
     "ts-morph": "^25.0.0",
-    "@tuyau/utils": "0.0.6"
+    "@tuyau/utils": "0.0.7"
   },
   "devDependencies": {
     "@adonisjs/assembler": "^7.8.2",
     "@adonisjs/core": "^6.17.1",
     "@poppinss/cliui": "^6.4.2",
     "@poppinss/matchit": "^3.1.2",
-    "@types/node": "^22.10.7",
-    "@tuyau/client": "0.2.4"
+    "@types/node": "^22.13.0",
+    "@tuyau/client": "0.2.7"
   },
   "publishConfig": {
     "access": "public",