@tuyau/core 0.1.4 → 0.2.1

package/build/{chunk-3KNDPG6Y.js → chunk-ADS4GRIL.js}

@@ -5,8 +5,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   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);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 

package/build/commands/commands.json

@@ -1 +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}
+{"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"}],"version":1}

package/build/commands/generate.js

@@ -1,6 +1,6 @@
 import {
   __decorateClass
-} from "../chunk-3KNDPG6Y.js";
+} from "../chunk-ADS4GRIL.js";
 
 // commands/generate.ts
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -11,6 +11,7 @@ import { BaseCommand, flags } from "@adonisjs/core/ace";
 import { Node } from "ts-morph";
 import matchit from "@poppinss/matchit";
 import { fileURLToPath } from "node:url";
+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";
@@ -22,6 +23,7 @@ var ApiTypesGenerator = class {
   #config;
   #routes;
   #destination;
+  #isTuyauInertiaInstalledCached;
   constructor(options) {
     this.#config = options.config;
     this.#routes = options.routes;
@@ -30,6 +32,24 @@ 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;
+    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;
+    } catch (error) {
+      throw new Error("Unable to read the package.json file", { cause: error });
+    }
+  }
   #getDestinationDirectory() {
     return dirname(this.#destination);
   }
@@ -48,14 +68,11 @@ var ApiTypesGenerator = class {
    */
   #extractClassHandlerData(file, routeHandler) {
     const classDef = file.getClasses().find((c) => c.isDefaultExport());
-    if (!classDef)
-      return;
+    if (!classDef) return;
     const method = classDef.getMethod(routeHandler.method);
-    if (!method)
-      return;
+    if (!method) return;
     const body = method.getBody();
-    if (!body)
-      return;
+    if (!body) return;
     return { method, body, file };
   }
   /**
@@ -71,17 +88,13 @@ var ApiTypesGenerator = class {
       return false;
     });
     const defaultImport = sourceFile.getImportDeclaration((importNode) => {
-      if (importNode.getDefaultImport()?.getText() === identifier.getText())
-        return true;
+      if (importNode.getDefaultImport()?.getText() === identifier.getText()) return true;
       return false;
     });
     const isValidFile = (namedImport || defaultImport)?.getModuleSpecifierSourceFile();
-    if (!isValidFile)
-      return void 0;
-    if (namedImport)
-      return "named";
-    if (defaultImport)
-      return "default";
+    if (!isValidFile) return void 0;
+    if (namedImport) return "named";
+    if (defaultImport) return "default";
     return void 0;
   }
   /**
@@ -94,8 +107,7 @@ var ApiTypesGenerator = class {
    */
   #extractRequest(handlerData) {
     const validateUsingCallNode = handlerData.method.forEachDescendant((node) => {
-      if (!Node.isCallExpression(node))
-        return false;
+      if (!Node.isCallExpression(node)) return false;
       if (node.getExpression().getText().includes("validateUsing")) {
         return node;
       }
@@ -103,11 +115,11 @@ var ApiTypesGenerator = class {
     });
     if (validateUsingCallNode) {
       const schema = validateUsingCallNode.getArguments()[0];
-      if (!Node.isIdentifier(schema))
-        return;
+      if (!Node.isIdentifier(schema)) return;
       const definition = schema.getDefinitions().at(0);
       const importType = this.#getIdentifierImportType(schema);
-      if (!definition || !importType) {
+      const isReExportedFromThisFile = definition ? handlerData.file.getExportedDeclarations().has(definition.getNode().getText()) : false;
+      if (!importType && !isReExportedFromThisFile) {
         this.#logger.warning(`Unable to find the schema file for ${schema.getText()}`);
         return;
       }
@@ -142,28 +154,21 @@ var ApiTypesGenerator = class {
    */
   #filterRoutes(routes, mode) {
     const config = this.#config.codegen?.[mode];
-    if (!config || !config.only && !config.except)
-      return routes;
+    if (!config || !config.only && !config.except) return routes;
     return routes.filter((route) => {
-      if (typeof config.only === "function")
-        return config.only(route);
-      if (typeof config.except === "function")
-        return !config.except(route);
+      if (typeof config.only === "function") return config.only(route);
+      if (typeof config.except === "function") return !config.except(route);
       if (config.only) {
         for (const pattern of config.only) {
-          if (pattern instanceof RegExp && pattern.test(route.pattern))
-            return true;
-          if (route.pattern === pattern)
-            return true;
+          if (pattern instanceof RegExp && pattern.test(route.pattern)) return true;
+          if (route.pattern === pattern) return true;
         }
         return false;
       }
       if (config.except) {
         for (const pattern of config.except) {
-          if (pattern instanceof RegExp && pattern.test(route.pattern))
-            return false;
-          if (route.pattern === pattern)
-            return false;
+          if (pattern instanceof RegExp && pattern.test(route.pattern)) return false;
+          if (route.pattern === pattern) return false;
         }
         return true;
       }
@@ -184,15 +189,14 @@ var ApiTypesGenerator = class {
     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";
+      if (!typesByPattern[typeName]) typeName = "unknown";
       return { params, name, path: pattern, method: methods, types: typeName };
     }).filter((route) => !!route.name);
   }
   async #writeApiFile(options) {
     const file = this.#project.createSourceFile(this.#destination, "", { overwrite: true });
-    if (!file)
-      throw new Error("Unable to create the api.ts file");
+    if (!file) throw new Error("Unable to create the api.ts file");
+    const isTuyauInertiaInstalled = await this.#isTuyauInertiaInstalled();
     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]) => {
@@ -214,10 +218,12 @@ var ApiTypesGenerator = class {
       }
       writer.writeLine(`] as const;`);
       writer.writeLine(`export const api = {`).writeLine(`  routes,`).writeLine(`  definition: {} as ApiDefinition`).writeLine(`}`);
-      writer.writeLine(`declare module '@tuyau/inertia/types' {`);
-      writer.writeLine(`  type ApiDefinition = typeof api`);
-      writer.writeLine(`  export interface Api extends ApiDefinition {}`);
-      writer.writeLine(`}`);
+      if (isTuyauInertiaInstalled) {
+        writer.writeLine(`declare module '@tuyau/inertia/types' {`);
+        writer.writeLine(`  type InertiaApi = typeof api`);
+        writer.writeLine(`  export interface Api extends InertiaApi {}`);
+        writer.writeLine(`}`);
+      }
     });
     await file.save();
   }
@@ -227,8 +233,7 @@ var ApiTypesGenerator = class {
     const sourcesFiles = this.#project.getSourceFiles();
     const routes = this.#filterRoutes(this.#routes, "definitions");
     for (const route of routes) {
-      if (typeof route.handler === "function")
-        continue;
+      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`)
@@ -249,19 +254,16 @@ var ApiTypesGenerator = class {
       let currentLevel = definition;
       const relativePath = slash(relative(this.#getDestinationDirectory(), file.getFilePath()));
       segments.forEach((segment, i) => {
-        if (!currentLevel[segment])
-          currentLevel[segment] = {};
+        if (!currentLevel[segment]) currentLevel[segment] = {};
         currentLevel = currentLevel[segment];
-        if (i !== segments.length - 1)
-          return;
+        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] = typeName;
+        for (const method of methods) currentLevel[method] = typeName;
       });
     }
     const routesNameArray = this.#generateRoutesNameArray(

package/build/index.js

@@ -1,4 +1,4 @@
-import "./chunk-3KNDPG6Y.js";
+import "./chunk-ADS4GRIL.js";
 
 // stubs/main.ts
 import { getDirname } from "@adonisjs/core/helpers";

package/build/providers/tuyau_provider.js

@@ -1,4 +1,4 @@
-import "../chunk-3KNDPG6Y.js";
+import "../chunk-ADS4GRIL.js";
 
 // providers/tuyau_provider.ts
 var TuyauProvider = class {

package/build/src/hooks/build_hook.js

@@ -1,4 +1,4 @@
-import "../../chunk-3KNDPG6Y.js";
+import "../../chunk-ADS4GRIL.js";
 
 // src/hooks/build_hook.ts
 import util from "node:util";
@@ -7,8 +7,7 @@ var exec = util.promisify(cpExec);
 async function tuyauBuildHook({ logger }) {
   logger.info("generating tuyau codegen file", { suffix: "tuyau" });
   const { stderr } = await exec("node ace tuyau:generate");
-  if (stderr)
-    throw new Error(stderr);
+  if (stderr) throw new Error(stderr);
 }
 export {
   tuyauBuildHook as default

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tuyau/core",
   "type": "module",
-  "version": "0.1.4",
+  "version": "0.2.1",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -23,15 +23,15 @@
     "@adonisjs/core": "^6.2.0"
   },
   "dependencies": {
-    "ts-morph": "^22.0.0"
+    "ts-morph": "^23.0.0"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^7.5.1",
-    "@adonisjs/core": "^6.8.0",
+    "@adonisjs/assembler": "^7.8.2",
+    "@adonisjs/core": "^6.14.0",
     "@julr/tooling-configs": "^2.2.0",
     "@poppinss/cliui": "^6.4.1",
     "@poppinss/matchit": "^3.1.2",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.16.5",
     "@tuyau/client": "0.1.2",
     "@tuyau/utils": "0.0.4"
   },