@tuyau/core 0.1.0 → 0.1.1

package/build/commands/generate.js

@@ -127,10 +127,22 @@ var ApiTypesGenerator = class {
       return true;
     });
   }
-  #generateRoutesNameArray(routes) {
+  /**
+   * 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);
-      const typeName = string.pascalCase(string.slug(pattern)) + string.pascalCase(methods.join(" "));
+      let typeName = this.#generateTypeName({ pattern, methods });
+      if (!typesByPattern[typeName])
+        typeName = "unknown";
       return { params, name, path: pattern, method: methods, types: typeName };
     }).filter((route) => !!route.name);
   }
@@ -196,21 +208,20 @@ var ApiTypesGenerator = class {
         currentLevel = currentLevel[segment];
         if (i !== segments.length - 1)
           return;
-        const typeName = string.pascalCase(string.slug(route.pattern)) + string.pascalCase(methods.join(""));
+        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] = `${string.pascalCase(typeName)}`;
-        }
+        for (const method of methods)
+          currentLevel[method] = typeName;
       });
     }
     await this.#writeApiFile({
       definition,
       typesByPattern,
-      routesNameArray: this.#generateRoutesNameArray(routes)
+      routesNameArray: this.#generateRoutesNameArray(routes, typesByPattern)
     });
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tuyau/core",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -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",