@gct-paas/cli 0.1.5-dev.7 → 0.1.5-dev.8

package/dist/core/handlebars/helpers/format-js-type/format-js-type.cjs

@@ -9,33 +9,42 @@ class HelperFormatJsType extends _helperBase.HelperBase {
   constructor() {
     super("formatJsType");
   }
-  onExecute(param, cfg) {
-    if (!param) {
+  onExecute(config) {
+    if (!config) {
       return "unknown";
     }
-    if (param === "array") {
+    const {
+      type,
+      items: cfg,
+      originalRef
+    } = config;
+    const fieldType = type || originalRef;
+    if (!fieldType) {
+      return "unknown";
+    }
+    if (fieldType === "array") {
       if (cfg) {
-        let type = cfg.type || cfg.originalRef;
-        if (type) {
-          if (type === "integer") {
-            type = "number";
-          } else if (type.startsWith("Triple\xAB")) {
-            type = "unknown";
+        let type2 = cfg.type || cfg.originalRef;
+        if (type2) {
+          if (type2 === "integer") {
+            type2 = "number";
+          } else if (type2.startsWith("Triple\xAB")) {
+            type2 = type2.replace("Triple\xAB", "ITripleObject<").replace("\xBB", ">");
           }
         } else {
-          type = "unknown";
+          type2 = "unknown";
         }
-        return type + "[]";
+        return type2 + "[]";
       }
       return "unknown[]";
     }
-    if (param === "integer") {
+    if (fieldType === "integer") {
       return "number";
     }
-    if (param === "object") {
-      return "Record<string, unknown>";
+    if (fieldType === "object") {
+      return "IObject";
     }
-    return param;
+    return fieldType;
   }
 }
 exports.HelperFormatJsType = HelperFormatJsType;

package/dist/core/handlebars/helpers/format-js-type/format-js-type.d.ts

@@ -10,5 +10,5 @@ import { HelperBase } from '../helper-base';
  */
 export declare class HelperFormatJsType extends HelperBase {
     constructor();
-    onExecute(param: string, cfg?: IObject): string;
+    onExecute(config: IObject): string;
 }

package/es/core/handlebars/helpers/format-js-type/format-js-type.d.ts

@@ -10,5 +10,5 @@ import { HelperBase } from '../helper-base';
  */
 export declare class HelperFormatJsType extends HelperBase {
     constructor();
-    onExecute(param: string, cfg?: IObject): string;
+    onExecute(config: IObject): string;
 }

package/es/core/handlebars/helpers/format-js-type/format-js-type.mjs

@@ -3,32 +3,37 @@ export class HelperFormatJsType extends HelperBase {
   constructor() {
     super("formatJsType");
   }
-  onExecute(param, cfg) {
-    if (!param) {
+  onExecute(config) {
+    if (!config) {
       return "unknown";
     }
-    if (param === "array") {
+    const { type, items: cfg, originalRef } = config;
+    const fieldType = type || originalRef;
+    if (!fieldType) {
+      return "unknown";
+    }
+    if (fieldType === "array") {
       if (cfg) {
-        let type = cfg.type || cfg.originalRef;
-        if (type) {
-          if (type === "integer") {
-            type = "number";
-          } else if (type.startsWith("Triple\xAB")) {
-            type = "unknown";
+        let type2 = cfg.type || cfg.originalRef;
+        if (type2) {
+          if (type2 === "integer") {
+            type2 = "number";
+          } else if (type2.startsWith("Triple\xAB")) {
+            type2 = type2.replace("Triple\xAB", "ITripleObject<").replace("\xBB", ">");
           }
         } else {
-          type = "unknown";
+          type2 = "unknown";
         }
-        return type + "[]";
+        return type2 + "[]";
       }
       return "unknown[]";
     }
-    if (param === "integer") {
+    if (fieldType === "integer") {
       return "number";
     }
-    if (param === "object") {
-      return "Record<string, unknown>";
+    if (fieldType === "object") {
+      return "IObject";
     }
-    return param;
+    return fieldType;
   }
 }

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import type { AxiosRequestConfig } from 'axios';
 {{#gt entityRefs.length 0}}
 import type { {{formatImport entityRefs}} } from '../entities';
@@ -13,9 +14,9 @@ export interface {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase met
    */
 {{/neq}}
   {{#eq query.name "requestParam"}}
-  [key: string]: unknown;
+  [key: any]: any;
   {{else}}
-  {{camelCase query.name}}{{#if query.required}}{{else}}?{{/if}}: {{#if query.items}}{{formatJsType query.items.type}}{{else}}{{formatJsType query.type}}{{/if}};
+  {{camelCase query.name}}{{#if query.required}}{{else}}?{{/if}}: {{#if query.items}}{{formatJsType query}}{{else}}{{formatJsType query}}{{/if}};
   {{/eq}}
 {{/each}}
 }
@@ -33,6 +34,6 @@ export interface {{pascalCase (camelCase entityName) }}Service {
   /**
    * {{ method.model.summary }}
    */
-  {{ 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}}>;
+  {{ 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}}any{{/if}}>;
 {{/each}}
 }

package/hbs-temp/entities.d.ts.hbs

@@ -7,9 +7,9 @@ export interface {{ entity.title }} {
   /**
    * {{ property.description }}
    *
-   * @type {{{formatJsType property.type property.items }}}
+   * @type {{{formatJsType property }}}
    */
-  {{ key }}{{#if property.required}}{{else}}?{{/if}}: {{formatJsType property.type property.items }};
+  {{ key }}{{#if property.required}}{{else}}?{{/if}}: {{formatJsType property }};
   {{/each}}
 {{else}}
   // 暂无属性

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/cli",
-  "version": "0.1.5-dev.7",
+  "version": "0.1.5-dev.8",
   "type": "module",
   "description": "paas 平台核心包",
   "bin": {