@gct-paas/cli 0.1.4-dev.1 → 0.1.4-dev.3

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

@@ -33,7 +33,7 @@ class ApiManage {
   add(pathStr, cfg) {
     const splits = pathStr.split("/");
     const entityName = splits[3];
-    const method = splits[4];
+    const method = splits.slice(4).join("_");
     const requestPath = splits.slice(4).join("/");
     if (!this.cache.has(entityName)) {
       this.cache.set(entityName, new EntityApiManage(entityName));

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

@@ -35,15 +35,19 @@ class GenApiAction {
    * @param {boolean} clean 是否清理输出目录后再生成
    */
   async run(baseUrl, tag, template, output, clean) {
-    const cwd = process.cwd();
-    const tempPath = _path.default.resolve(cwd, template);
-    const outPath = _path.default.resolve(cwd, output);
-    if (clean === true && _fsExtra.default.existsSync(outPath)) {
-      rm.sync(outPath);
+    try {
+      const cwd = process.cwd();
+      const tempPath = _path.default.resolve(cwd, template);
+      const outPath = _path.default.resolve(cwd, output);
+      if (clean === true && _fsExtra.default.existsSync(outPath)) {
+        rm.sync(outPath);
+      }
+      await this.registerMacros(tempPath, this.engine);
+      await this.registerTempFiles(tempPath, this.engine);
+      await this.write(tag, _path.default.join(baseUrl, this.configs[tag]), outPath, this.engine);
+    } catch (error) {
+      console.error(error);
     }
-    await this.registerMacros(tempPath, this.engine);
-    await this.registerTempFiles(tempPath, this.engine);
-    await this.write(tag, _path.default.join(baseUrl, this.configs[tag]), outPath, this.engine);
   }
   /**
    * 基于模型编译输出文件

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

@@ -26,7 +26,7 @@ export class ApiManage {
   add(pathStr, cfg) {
     const splits = pathStr.split("/");
     const entityName = splits[3];
-    const method = splits[4];
+    const method = splits.slice(4).join("_");
     const requestPath = splits.slice(4).join("/");
     if (!this.cache.has(entityName)) {
       this.cache.set(entityName, new EntityApiManage(entityName));

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

@@ -26,20 +26,24 @@ export class GenApiAction {
    * @param {boolean} clean 是否清理输出目录后再生成
    */
   async run(baseUrl, tag, template, output, clean) {
-    const cwd = process.cwd();
-    const tempPath = path.resolve(cwd, template);
-    const outPath = path.resolve(cwd, output);
-    if (clean === true && fse.existsSync(outPath)) {
-      rm.sync(outPath);
+    try {
+      const cwd = process.cwd();
+      const tempPath = path.resolve(cwd, template);
+      const outPath = path.resolve(cwd, output);
+      if (clean === true && fse.existsSync(outPath)) {
+        rm.sync(outPath);
+      }
+      await this.registerMacros(tempPath, this.engine);
+      await this.registerTempFiles(tempPath, this.engine);
+      await this.write(
+        tag,
+        path.join(baseUrl, this.configs[tag]),
+        outPath,
+        this.engine
+      );
+    } catch (error) {
+      console.error(error);
     }
-    await this.registerMacros(tempPath, this.engine);
-    await this.registerTempFiles(tempPath, this.engine);
-    await this.write(
-      tag,
-      path.join(baseUrl, this.configs[tag]),
-      outPath,
-      this.engine
-    );
   }
   /**
    * 基于模型编译输出文件

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

@@ -0,0 +1,20 @@
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const apiConfig: any[] = [
+{{#each entities as |entity|}}
+  {
+    name: '{{camelCase entity.entityName}}',
+    entityName: '{{entity.entityName}}',
+    apis: [
+{{#each methods as |method|}}
+      {
+        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}}
+      },
+{{/each}}
+    ]
+  },
+{{/each}}
+]

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

@@ -0,0 +1,19 @@
+{{#gt entityRefs.length 0}}
+import type { {{formatImport entityRefs}} } from '../entities';
+
+{{/gt}}
+{{#each methods as |method|}}
+{{#gt method.queries.length 0}}
+export interface {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase method.name) }}{{/if}}Query {
+{{#each method.queries as |query|}}
+  {{camelCase query.name}}{{#if query.required}}{{else}}?{{/if}}: {{#if query.items}}{{formatJsType query.items.type}}{{else}}{{formatJsType query.type}}{{/if}}; // {{query.description}}
+{{/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?: Record<string, string>): Promise<IHttpResponse<{{#if method.responseEntity}}{{formatImportItem method.responseEntity.title}}{{else}}unknown{{/if}}>>;
+{{/each}}
+}

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

@@ -0,0 +1,9 @@
+{{#each entities as |entity|}}
+import type { {{pascalCase (camelCase entity.entityName) }}Service } from './apis/{{entity.entityName}}.service';
+{{/each}}
+
+export interface ApiManage {
+{{#each entities as |entity|}}
+  readonly {{camelCase entity.entityName}}: {{pascalCase (camelCase entity.entityName)}}Service;
+{{/each}}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/cli",
-  "version": "0.1.4-dev.1",
+  "version": "0.1.4-dev.3",
   "type": "module",
   "description": "paas 平台核心包",
   "bin": {
@@ -34,6 +34,7 @@
   "license": "MIT",
   "author": "gct",
   "scripts": {
+    "run": "tsx src/bin.ts",
     "build": "npm run lint && unbuild",
     "lint": "eslint src/",
     "publish:next": "npm run build && npm publish --access public --tag=next --registry=https://registry.npmjs.org/",
@@ -64,5 +65,6 @@
     "tsx": "^4.20.4",
     "typescript": "^5.8.2",
     "unbuild": "^3.5.0"
-  }
+  },
+  "gitHead": "caa65b07a6bbfb27d41911da2f5459567db38b1d"
 }

package/hbs-temp/index.ts.hbs

@@ -1,9 +0,0 @@
-{{#each entities as |entity|}}
-import { {{pascalCase (camelCase entity.entityName) }}Service } from './{{entity.entityName}}.service';
-{{/each}}
-
-export class ApiManage {
-{{#each entities as |entity|}}
-  {{camelCase entity.entityName}}: {{pascalCase (camelCase entity.entityName)}}Service = new {{pascalCase (camelCase entity.entityName)}}Service();
-{{/each}}
-}

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

@@ -1,37 +0,0 @@
-import type { IHttpResponse } from '@gct-paas/base';
-{{#eq tag 'apaas'}}
-import { APaasBaseService } from '../base/apaas-base.service';
-{{/eq}}
-{{#eq tag 'ipaas'}}
-import { IPaasBaseService } from '../base/ipaas-base.service';
-{{/eq}}
-{{#eq tag 'platform'}}
-import { PlatformBaseService } from '../base/platform-base.service';
-{{/eq}}
-{{#eq tag 'rag'}}
-import { RagBaseService } from '../base/rag-base.service';
-{{/eq}}
-{{#gt entityRefs.length 0}}
-import type { {{formatImport entityRefs}} } from './entities';
-
-{{/gt}}
-{{#each methods as |method|}}
-{{#gt method.queries.length 0}}
-export interface {{ method.mode }}{{#if method.name}}{{pascalCase (camelCase method.name) }}{{/if}}Query {
-{{#each method.queries as |query|}}
-  {{camelCase query.name}}{{#if query.required}}{{else}}?{{/if}}: {{#if query.items}}{{formatJsType query.items.type}}{{else}}{{formatJsType query.type}}{{/if}}; // {{query.description}}
-{{/each}}
-}
-{{/gt}}
-{{/each}}
-export class {{pascalCase (camelCase entityName) }}Service extends {{#eq tag 'apaas'}}APaasBaseService{{/eq}}{{#eq tag 'platform'}}PlatformBaseService{{/eq}}{{#eq tag 'rag'}}RagBaseService{{/eq}}{{#eq tag 'ipaas'}}IPaasBaseService{{/eq}} {
-  constructor() {
-    super('{{ entityName }}');
-  }
-{{#each methods as |method|}}
-  // {{ method.model.summary }}
-  async {{ 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}}>> {
-    return this._{{ method.mode }}('{{#eq method.name '{id}'}}{{else}}{{method.model.requestPath}}{{/eq}}'{{#if method.requestEntity}}, data{{else}}, null{{/if}}{{#gt method.queries.length 0}}, query{{else}}, null{{/gt}}, config);
-  }
-{{/each}}
-}