@gct-paas/cli 0.1.5-dev.3 → 0.1.5-dev.6

package/dist/actions/gen-api/model-manage.cjs

@@ -72,22 +72,15 @@ class ModelManage {
               return param2;
             }
           });
-          if (methodName === "{id}") {
-            queries.push({
-              name: "id",
-              in: "query",
-              description: "\u6570\u636E\u4E3B\u952E",
-              required: true,
-              type: "string"
-            });
-          }
+          const matches = [...config.requestPath.matchAll(/\{([^}]*)\}/g)].map(m => m[1]);
           methods.push({
             name: methodName !== "undefined" ? methodName : "",
             mode,
             model: config,
             requestEntity,
             responseEntity,
-            queries
+            queries,
+            pathParams: matches
           });
         }
         this.entities.set(entityName, {

package/dist/actions/gen-api/model-manage.d.ts

@@ -42,6 +42,12 @@ export interface IMethodModel {
      * @type {IObject[]}
      */
     queries: IObject[];
+    /**
+     * 路径参数, 路径示例：/gct-apaas/api/model-comprehensive/model/{key}/{mode}/{modelCategory}
+     *
+     * @type {string[]}
+     */
+    pathParams?: string[];
 }
 /**
  * 实体模型

package/es/actions/gen-api/model-manage.d.ts

@@ -42,6 +42,12 @@ export interface IMethodModel {
      * @type {IObject[]}
      */
     queries: IObject[];
+    /**
+     * 路径参数, 路径示例：/gct-apaas/api/model-comprehensive/model/{key}/{mode}/{modelCategory}
+     *
+     * @type {string[]}
+     */
+    pathParams?: string[];
 }
 /**
  * 实体模型

package/es/actions/gen-api/model-manage.mjs

@@ -76,22 +76,17 @@ export class ModelManage {
               }
             }
           );
-          if (methodName === "{id}") {
-            queries.push({
-              name: "id",
-              in: "query",
-              description: "\u6570\u636E\u4E3B\u952E",
-              required: true,
-              type: "string"
-            });
-          }
+          const matches = [...config.requestPath.matchAll(/\{([^}]*)\}/g)].map(
+            (m) => m[1]
+          );
           methods.push({
             name: methodName !== "undefined" ? methodName : "",
             mode,
             model: config,
             requestEntity,
             responseEntity,
-            queries
+            queries,
+            pathParams: matches
           });
         }
         this.entities.set(entityName, {

package/hbs-temp/api-config.ts.hbs

@@ -10,8 +10,9 @@ export const apiConfig: any[] = [
         mode: '{{ method.mode }}',
         method: '{{ method.mode }}{{#if method.name}}{{pascalCase (camelCase method.name) }}{{/if}}',
         path: '{{#eq method.name '{id}'}}{{else}}{{method.model.requestPath}}{{/eq}}',
-        hasQuery: {{#gt method.queries.length 0}}true{{else}}false{{/gt}},
-        hasData: {{#if method.requestEntity}}true{{else}}false{{/if}}
+        {{#gt method.pathParams.length 0}}hasPathParams: true,{{/gt}}
+        {{#gt method.queries.length 0}}hasQuery: true,{{/gt}}
+        {{#if method.requestEntity}}hasData: true{{/if}}
       },
 {{/each}}
     ]

package/hbs-temp/apis/{{api}}.service.d.ts.hbs

@@ -11,10 +11,17 @@ export interface {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase met
 {{/each}}
 }
 {{/gt}}
+{{#gt method.pathParams.length 0}}
+export interface {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase method.name) }}{{/if}}PathParams {
+{{#each method.pathParams as |param|}}
+  {{camelCase param}}: string;
+{{/each}}
+}
+{{/gt}}
 {{/each}}
 export interface {{pascalCase (camelCase entityName) }}Service {
 {{#each methods as |method|}}
   // {{ method.model.summary }}
-  {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase method.name) }}{{/if}}({{#gt method.queries.length 0}}query: {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase method.name) }}{{/if}}Query, {{/gt}}{{#if method.requestEntity}}data: {{method.requestEntity.title}}, {{/if}}config?: Partial<AxiosRequestConfig>): Promise<IHttpResponse<{{#if method.responseEntity}}{{formatImportItem method.responseEntity.title}}{{else}}unknown{{/if}}>>;
+  {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase method.name) }}{{/if}}({{#gt method.pathParams.length 0}}path: {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase method.name) }}{{/if}}PathParams, {{/gt}}{{#gt method.queries.length 0}}query: {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase method.name) }}{{/if}}Query, {{/gt}}{{#if method.requestEntity}}data: {{method.requestEntity.title}}, {{/if}}config?: Partial<AxiosRequestConfig>): Promise<{{#if method.responseEntity}}{{formatImportItem method.responseEntity.title}}{{else}}unknown{{/if}}>;
 {{/each}}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/cli",
-  "version": "0.1.5-dev.3",
+  "version": "0.1.5-dev.6",
   "type": "module",
   "description": "paas 平台核心包",
   "bin": {
@@ -66,5 +66,5 @@
     "typescript": "^5.9.3",
     "unbuild": "^3.6.1"
   },
-  "gitHead": "694dd0de8927d3cb6ae87d3b8b4ce0902e878ddc"
+  "gitHead": "2f73ef719a7c5e53eb9c9ebc1f5f46148fda4831"
 }