@gct-paas/cli 0.1.4 → 0.1.5-dev.2

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EntityApiManage = exports.ApiManage = void 0;
+var _specialEntities = require("./special-entities.config.cjs");
 class EntityApiManage {
   constructor(name) {
     this.name = name;
@@ -24,6 +25,25 @@ class EntityApiManage {
 exports.EntityApiManage = EntityApiManage;
 class ApiManage {
   cache = /* @__PURE__ */new Map();
+  constructor() {
+    this.specialTreatment();
+  }
+  /**
+   * 根据配置文件中的特殊实体映射来处理
+   *
+   * @protected
+   */
+  specialTreatment() {
+    _specialEntities.SPECIAL_ENTITIES.forEach(({
+      canonical,
+      aliases
+    }) => {
+      const manage = new EntityApiManage(canonical);
+      aliases.forEach(alias => {
+        this.cache.set(alias, manage);
+      });
+    });
+  }
   /**
    * 新增 api
    *
@@ -46,5 +66,23 @@ class ApiManage {
       entity.add(method, mode, _cfg);
     });
   }
+  /**
+   * 结束新增 api 后调用
+   *
+   */
+  done() {
+    _specialEntities.SPECIAL_ENTITIES.forEach(({
+      canonical,
+      aliases
+    }) => {
+      if (this.cache.has(canonical)) {
+        aliases.forEach(alias => {
+          if (alias !== canonical) {
+            this.cache.delete(alias);
+          }
+        });
+      }
+    });
+  }
 }
 exports.ApiManage = ApiManage;

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

@@ -26,6 +26,13 @@ export declare class EntityApiManage {
  */
 export declare class ApiManage {
     readonly cache: Map<string, EntityApiManage>;
+    constructor();
+    /**
+     * 根据配置文件中的特殊实体映射来处理
+     *
+     * @protected
+     */
+    protected specialTreatment(): void;
     /**
      * 新增 api
      *
@@ -33,4 +40,9 @@ export declare class ApiManage {
      * @param {IObject} cfg swagger 配置
      */
     add(pathStr: string, cfg: IObject): void;
+    /**
+     * 结束新增 api 后调用
+     *
+     */
+    done(): void;
 }

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

@@ -33,73 +33,76 @@ class ModelManage {
       const pathCfg = cfg.paths[pathStr];
       apiManage.add(pathStr, pathCfg);
     });
+    apiManage.done();
     const entityNames = apiManage.cache.keys();
     for (const entityName of entityNames) {
       const entitySet = /* @__PURE__ */new Set();
       const entityManage = apiManage.cache.get(entityName);
       const methods = [];
-      const tags = entityManage.cache.keys();
-      for (const tag2 of tags) {
-        const [methodName, mode] = tag2.split(":");
-        const config = entityManage.cache.get(tag2);
-        let requestEntity = void 0;
-        const param = config.parameters.find(param2 => {
-          if (param2.in === "body") {
-            return param2;
-          }
-        });
-        if (param && param.schema) {
-          const refKey = this.getOriginRef(param.schema);
-          requestEntity = cfg.definitions[refKey];
-          if (requestEntity && Object.keys(requestEntity).length > 0) {
-            this.definitions.set(refKey, requestEntity);
-            entitySet.add(refKey);
+      if (entityManage.cache.size > 0) {
+        const tags = entityManage.cache.keys();
+        for (const tag2 of tags) {
+          const [methodName, mode] = tag2.split(":");
+          const config = entityManage.cache.get(tag2);
+          let requestEntity = void 0;
+          const param = config.parameters.find(param2 => {
+            if (param2.in === "body") {
+              return param2;
+            }
+          });
+          if (param && param.schema) {
+            const refKey = this.getOriginRef(param.schema);
+            requestEntity = cfg.definitions[refKey];
+            if (requestEntity && Object.keys(requestEntity).length > 0) {
+              this.definitions.set(refKey, requestEntity);
+              entitySet.add(refKey);
+            }
           }
-        }
-        let responseEntity = void 0;
-        if (config.responses["200"].schema) {
-          const refKey = this.getOriginRef(config.responses["200"].schema);
-          responseEntity = cfg.definitions[refKey];
-          if (responseEntity && Object.keys(responseEntity).length > 0) {
-            this.definitions.set(refKey, responseEntity);
-            entitySet.add(refKey);
+          let responseEntity = void 0;
+          if (config.responses["200"].schema) {
+            const refKey = this.getOriginRef(config.responses["200"].schema);
+            responseEntity = cfg.definitions[refKey];
+            if (responseEntity && Object.keys(responseEntity).length > 0) {
+              this.definitions.set(refKey, responseEntity);
+              entitySet.add(refKey);
+            }
           }
-        }
-        const queries = config.parameters.filter(param2 => {
-          if (param2.in === "query") {
-            return param2;
+          const queries = config.parameters.filter(param2 => {
+            if (param2.in === "query") {
+              return param2;
+            }
+          });
+          if (methodName === "{id}") {
+            queries.push({
+              name: "id",
+              in: "query",
+              description: "\u6570\u636E\u4E3B\u952E",
+              required: true,
+              type: "string"
+            });
           }
-        });
-        if (methodName === "{id}") {
-          queries.push({
-            name: "id",
-            in: "query",
-            description: "\u6570\u636E\u4E3B\u952E",
-            required: true,
-            type: "string"
+          methods.push({
+            name: methodName !== "undefined" ? methodName : "",
+            mode,
+            model: config,
+            requestEntity,
+            responseEntity,
+            queries
           });
         }
-        methods.push({
-          name: methodName !== "undefined" ? methodName : "",
-          mode,
-          model: config,
-          requestEntity,
-          responseEntity,
-          queries
+        this.entities.set(entityName, {
+          tag,
+          entityName,
+          api: entityName,
+          model: cfg.definitions[entityName],
+          methods,
+          entityRefs: Array.from(entitySet.values()).filter(item => {
+            return this.basicDataType.findIndex(type => {
+              return item.indexOf(`\xAB${type}\xBB`) !== -1;
+            }) === -1 && !this.basicDataType.includes(item);
+          })
         });
       }
-      this.entities.set(entityName, {
-        tag,
-        entityName,
-        api: entityName,
-        model: cfg.definitions[entityName],
-        methods,
-        entityRefs: Array.from(entitySet.values()).filter(item => {
-          return this.basicDataType.findIndex(type => {
-            return item.indexOf(`\xAB${type}\xBB`) !== -1;
-          }) === -1 && !this.basicDataType.includes(item);
-        })
-      });
     }
   }
   /**

package/dist/actions/gen-api/special-entities.config.cjs

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SPECIAL_ENTITIES = void 0;
+const SPECIAL_ENTITIES = exports.SPECIAL_ENTITIES = [{
+  canonical: "med-pro",
+  aliases: ["medpro", "medPro", "med-pro"]
+}
+// 示例：如果后续有其他特殊映射，按照下面的格式添加
+// {
+//   canonical: 'some-entity',
+//   aliases: ['someEntity', 'someentity', 'some-entity'],
+// },
+];

package/dist/actions/gen-api/special-entities.config.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 特殊实体映射配置
+ * 用于处理 swagger 中存在的特殊命名或映射规则
+ */
+export interface SpecialEntityMapping {
+    /** 标准实体名称 */
+    canonical: string;
+    /** 别名映射列表 */
+    aliases: string[];
+}
+/**
+ * 特殊实体配置列表
+ * 当后续有类似的特殊处理需求时，直接在此列表中添加新条目即可
+ */
+export declare const SPECIAL_ENTITIES: SpecialEntityMapping[];

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

@@ -26,6 +26,13 @@ export declare class EntityApiManage {
  */
 export declare class ApiManage {
     readonly cache: Map<string, EntityApiManage>;
+    constructor();
+    /**
+     * 根据配置文件中的特殊实体映射来处理
+     *
+     * @protected
+     */
+    protected specialTreatment(): void;
     /**
      * 新增 api
      *
@@ -33,4 +40,9 @@ export declare class ApiManage {
      * @param {IObject} cfg swagger 配置
      */
     add(pathStr: string, cfg: IObject): void;
+    /**
+     * 结束新增 api 后调用
+     *
+     */
+    done(): void;
 }

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

@@ -1,3 +1,4 @@
+import { SPECIAL_ENTITIES } from "./special-entities.config.mjs";
 export class EntityApiManage {
   constructor(name) {
     this.name = name;
@@ -17,6 +18,22 @@ export class EntityApiManage {
 }
 export class ApiManage {
   cache = /* @__PURE__ */ new Map();
+  constructor() {
+    this.specialTreatment();
+  }
+  /**
+   * 根据配置文件中的特殊实体映射来处理
+   *
+   * @protected
+   */
+  specialTreatment() {
+    SPECIAL_ENTITIES.forEach(({ canonical, aliases }) => {
+      const manage = new EntityApiManage(canonical);
+      aliases.forEach((alias) => {
+        this.cache.set(alias, manage);
+      });
+    });
+  }
   /**
    * 新增 api
    *
@@ -39,4 +56,19 @@ export class ApiManage {
       entity.add(method, mode, _cfg);
     });
   }
+  /**
+   * 结束新增 api 后调用
+   *
+   */
+  done() {
+    SPECIAL_ENTITIES.forEach(({ canonical, aliases }) => {
+      if (this.cache.has(canonical)) {
+        aliases.forEach((alias) => {
+          if (alias !== canonical) {
+            this.cache.delete(alias);
+          }
+        });
+      }
+    });
+  }
 }

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

@@ -35,75 +35,78 @@ export class ModelManage {
       const pathCfg = cfg.paths[pathStr];
       apiManage.add(pathStr, pathCfg);
     });
+    apiManage.done();
     const entityNames = apiManage.cache.keys();
     for (const entityName of entityNames) {
       const entitySet = /* @__PURE__ */ new Set();
       const entityManage = apiManage.cache.get(entityName);
       const methods = [];
-      const tags = entityManage.cache.keys();
-      for (const tag2 of tags) {
-        const [methodName, mode] = tag2.split(":");
-        const config = entityManage.cache.get(tag2);
-        let requestEntity = void 0;
-        const param = config.parameters.find((param2) => {
-          if (param2.in === "body") {
-            return param2;
-          }
-        });
-        if (param && param.schema) {
-          const refKey = this.getOriginRef(param.schema);
-          requestEntity = cfg.definitions[refKey];
-          if (requestEntity && Object.keys(requestEntity).length > 0) {
-            this.definitions.set(refKey, requestEntity);
-            entitySet.add(refKey);
+      if (entityManage.cache.size > 0) {
+        const tags = entityManage.cache.keys();
+        for (const tag2 of tags) {
+          const [methodName, mode] = tag2.split(":");
+          const config = entityManage.cache.get(tag2);
+          let requestEntity = void 0;
+          const param = config.parameters.find((param2) => {
+            if (param2.in === "body") {
+              return param2;
+            }
+          });
+          if (param && param.schema) {
+            const refKey = this.getOriginRef(param.schema);
+            requestEntity = cfg.definitions[refKey];
+            if (requestEntity && Object.keys(requestEntity).length > 0) {
+              this.definitions.set(refKey, requestEntity);
+              entitySet.add(refKey);
+            }
           }
-        }
-        let responseEntity = void 0;
-        if (config.responses["200"].schema) {
-          const refKey = this.getOriginRef(config.responses["200"].schema);
-          responseEntity = cfg.definitions[refKey];
-          if (responseEntity && Object.keys(responseEntity).length > 0) {
-            this.definitions.set(refKey, responseEntity);
-            entitySet.add(refKey);
+          let responseEntity = void 0;
+          if (config.responses["200"].schema) {
+            const refKey = this.getOriginRef(config.responses["200"].schema);
+            responseEntity = cfg.definitions[refKey];
+            if (responseEntity && Object.keys(responseEntity).length > 0) {
+              this.definitions.set(refKey, responseEntity);
+              entitySet.add(refKey);
+            }
           }
-        }
-        const queries = config.parameters.filter(
-          (param2) => {
-            if (param2.in === "query") {
-              return param2;
+          const queries = config.parameters.filter(
+            (param2) => {
+              if (param2.in === "query") {
+                return param2;
+              }
             }
+          );
+          if (methodName === "{id}") {
+            queries.push({
+              name: "id",
+              in: "query",
+              description: "\u6570\u636E\u4E3B\u952E",
+              required: true,
+              type: "string"
+            });
           }
-        );
-        if (methodName === "{id}") {
-          queries.push({
-            name: "id",
-            in: "query",
-            description: "\u6570\u636E\u4E3B\u952E",
-            required: true,
-            type: "string"
+          methods.push({
+            name: methodName !== "undefined" ? methodName : "",
+            mode,
+            model: config,
+            requestEntity,
+            responseEntity,
+            queries
           });
         }
-        methods.push({
-          name: methodName !== "undefined" ? methodName : "",
-          mode,
-          model: config,
-          requestEntity,
-          responseEntity,
-          queries
+        this.entities.set(entityName, {
+          tag,
+          entityName,
+          api: entityName,
+          model: cfg.definitions[entityName],
+          methods,
+          entityRefs: Array.from(entitySet.values()).filter((item) => {
+            return this.basicDataType.findIndex((type) => {
+              return item.indexOf(`\xAB${type}\xBB`) !== -1;
+            }) === -1 && !this.basicDataType.includes(item);
+          })
         });
       }
-      this.entities.set(entityName, {
-        tag,
-        entityName,
-        api: entityName,
-        model: cfg.definitions[entityName],
-        methods,
-        entityRefs: Array.from(entitySet.values()).filter((item) => {
-          return this.basicDataType.findIndex((type) => {
-            return item.indexOf(`\xAB${type}\xBB`) !== -1;
-          }) === -1 && !this.basicDataType.includes(item);
-        })
-      });
     }
   }
   /**

package/es/actions/gen-api/special-entities.config.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 特殊实体映射配置
+ * 用于处理 swagger 中存在的特殊命名或映射规则
+ */
+export interface SpecialEntityMapping {
+    /** 标准实体名称 */
+    canonical: string;
+    /** 别名映射列表 */
+    aliases: string[];
+}
+/**
+ * 特殊实体配置列表
+ * 当后续有类似的特殊处理需求时，直接在此列表中添加新条目即可
+ */
+export declare const SPECIAL_ENTITIES: SpecialEntityMapping[];

package/es/actions/gen-api/special-entities.config.mjs

@@ -0,0 +1,11 @@
+export const SPECIAL_ENTITIES = [
+  {
+    canonical: "med-pro",
+    aliases: ["medpro", "medPro", "med-pro"]
+  }
+  // 示例：如果后续有其他特殊映射，按照下面的格式添加
+  // {
+  //   canonical: 'some-entity',
+  //   aliases: ['someEntity', 'someentity', 'some-entity'],
+  // },
+];

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

@@ -1,3 +1,4 @@
+import type { AxiosRequestConfig } from 'axios';
 {{#gt entityRefs.length 0}}
 import type { {{formatImport entityRefs}} } from '../entities';
 
@@ -14,6 +15,6 @@ export interface {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase met
 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?: Record<string, string>): Promise<IHttpResponse<{{#if method.responseEntity}}{{formatImportItem method.responseEntity.title}}{{else}}unknown{{/if}}>>;
+  {{ 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}}>>;
 {{/each}}
 }

package/package.json

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