@shys/crud 1.0.1-beta.8 → 1.0.1-beta.9

package/dist/generator.js

@@ -251,25 +251,6 @@ export function buildFiles(params) {
             idxCount: idxFields.length,
         }),
     });
-    if (onlyEntity) {
-        return {
-            files: resultFiles,
-            Pascal,
-            pluralKebab,
-            Camel,
-            sortable: [],
-            filterable: [],
-            searchable: [],
-        };
-    }
-    const createFields = fields.filter(f => {
-        if (finalBaseFieldNames.includes(f.camel))
-            return false;
-        if (f.pk && f.auto)
-            return false;
-        return true;
-    });
-    const writable = createFields.filter(f => !excludeWritableRegex.test(f.name));
     const isSensitive = (f) => /password|passwd|salt|token|secret|private_key/i.test(f.name + f.camel);
     const pkCamel = originalPkInfo?.camel || '';
     const pkCamels = pkFields.map(f => f.camel);
@@ -300,6 +281,25 @@ export function buildFiles(params) {
                 searchable = hookResult.searchable;
         }
     }
+    if (onlyEntity) {
+        return {
+            files: resultFiles,
+            Pascal,
+            pluralKebab,
+            Camel,
+            sortable,
+            filterable,
+            searchable,
+        };
+    }
+    const createFields = fields.filter(f => {
+        if (finalBaseFieldNames.includes(f.camel))
+            return false;
+        if (f.pk && f.auto)
+            return false;
+        return true;
+    });
+    const writable = createFields.filter(f => !excludeWritableRegex.test(f.name));
     const enhancedCreateFields = createFields.map(f => enhanceField(f));
     const enhancedWritable = writable.map(f => enhanceField(f));
     const enhancedFilterable = filterableArr.map(f => enhanceField(f));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shys/crud",
-  "version": "1.0.1-beta.8",
+  "version": "1.0.1-beta.9",
   "description": "MidwayJS v4 模块化 CRUD CLI 生成器",
   "license": "MIT",
   "author": {

package/templates/controller.njk

@@ -1,65 +1,65 @@
-import { Inject } from '@midwayjs/core';
-import { YSController, CrudPiped } from '@shys/core';
-import { {{ Pascal }} } from '../entity/{{ Camel }}.entity';
-import { {{ ServiceName }} } from '../service/{{ Camel }}.service';
-import {
-  {{ CreateName }},
-  {{ UpdateName }},
-  {{ ReplaceName }},
-  {{ QueryName }},
-} from '../dto/{{ Camel }}';
-import { {{ VOName }}, {{ ListVOName }} } from '../vo/{{ Camel }}';
-
-@YSController({
-  tagName: {{ tagName | json }},
-  description: {{ desc | json }},
-})
-@CrudPiped({
-  model: {{ Pascal }},
-  service: {{ ServiceName }},
-  id: {{ idField | json }},
-  dto: {
-    create: {{ CreateName }},
-    update: {{ UpdateName }},
-    replace: {{ ReplaceName }},
-    query: {{ QueryName }},
-  },
-  serialize: {
-    get: {{ VOName }},
-    list: {{ ListVOName }},
-    create: {{ VOName }},
-    update: {{ VOName }},
-  },
-  routes: {
-    only: ['list', 'detail', 'create', 'update', 'replace', 'delete'],
-  },
-  query: {
-    maxLimit: 100,
-    defaultLimit: 10,
-    sortable: [{{ sortable }}],
-    filterable: [{{ filterable }}],
-    searchable: [{{ searchable }}],
-    defaultSort: {{ defaultSort }},
-  },
-  piped: {
-    create: {
-      enabled: true,
-      stages: ['deserialize', 'sanitize', 'mapFields', 'transform', 'validate'],
-      validate: { enabled: true, errorStatus: 422 },
-    },
-    update: {
-      enabled: true,
-      stages: ['deserialize', 'sanitize', 'mapFields', 'transform', 'validate'],
-      validate: { enabled: true, errorStatus: 422 },
-    },
-    replace: {
-      enabled: true,
-      stages: ['deserialize', 'sanitize', 'mapFields', 'transform', 'validate'],
-      validate: { enabled: true, errorStatus: 422 },
-    },
-  },
-})
-export class {{ CtrlName }} {
-  @Inject()
-  crudService: {{ ServiceName }};
-}
+import { Inject } from '@midwayjs/core';
+import { YSController, CrudPiped } from '@shys/core';
+import { {{ Pascal }} } from '../entity/{{ Camel }}.entity';
+import { {{ ServiceName }} } from '../service/{{ Camel }}.service';
+import {
+  {{ CreateName }},
+  {{ UpdateName }},
+  {{ ReplaceName }},
+  {{ QueryName }},
+} from '../dto/{{ Camel }}';
+import { {{ VOName }}, {{ ListVOName }} } from '../vo/{{ Camel }}';
+
+@YSController({
+  tagName: {{ tagName | json }},
+  description: {{ desc | json }},
+})
+@CrudPiped({
+  model: {{ Pascal }},
+  service: {{ ServiceName }},
+  id: {{ idField | json }},
+  dto: {
+    create: {{ CreateName }},
+    update: {{ UpdateName }},
+    replace: {{ ReplaceName }},
+    query: {{ QueryName }},
+  },
+  serialize: {
+    get: {{ VOName }},
+    list: {{ ListVOName }},
+    create: {{ VOName }},
+    update: {{ VOName }},
+  },
+  routes: {
+    only: ['list', 'detail', 'create', 'update', 'replace', 'delete'],
+  },
+  query: {
+    maxLimit: 100,
+    defaultLimit: 10,
+    sortable: [{{ sortable }}],
+    filterable: [{{ filterable }}],
+    searchable: [{{ searchable }}],
+    defaultSort: {{ defaultSort }},
+  },
+  piped: {
+    create: {
+      enabled: true,
+      stages: ['deserialize', 'sanitize', 'mapFields', 'transform', 'validate'],
+      validate: { enabled: true, errorStatus: 422 },
+    },
+    update: {
+      enabled: true,
+      stages: ['deserialize', 'sanitize', 'mapFields', 'transform', 'validate'],
+      validate: { enabled: true, errorStatus: 422 },
+    },
+    replace: {
+      enabled: true,
+      stages: ['deserialize', 'sanitize', 'mapFields', 'transform', 'validate'],
+      validate: { enabled: true, errorStatus: 422 },
+    },
+  },
+})
+export class {{ CtrlName }} {
+  @Inject()
+  crudService: {{ ServiceName }};
+}

package/templates/dto-index.njk

@@ -1,4 +1,4 @@
-export * from './create.dto';
-export * from './update.dto';
-export * from './replace.dto';
-export * from './query.dto';
+export * from './create.dto';
+export * from './update.dto';
+export * from './replace.dto';
+export * from './query.dto';

package/templates/dto-query.njk

@@ -1,17 +1,17 @@
-import { ApiPropertyOptional } from '@midwayjs/swagger';
-import { Rule } from '@midwayjs/validation';
-import * as Joi from 'joi';
-import { CrudBaseQueryDto } from '../../../../framework/dto/base.query.dto';
-
-export class {{ QueryName }} extends CrudBaseQueryDto {
-{% for f in filterable -%}
-  @ApiPropertyOptional({
-    type: {{ f.swagType | json }},
-{% if f.len %}    maxLength: {{ f.len }},
-{% endif %}    description: {{ (f.comment or f.camel) | json }},
-  })
-  @Rule({{ f.joiRule }}.optional())
-  {{ f.camel }}?: {{ f.jsType }};
-
-{% endfor -%}
-}
+import { ApiPropertyOptional } from '@midwayjs/swagger';
+import { Rule } from '@midwayjs/validation';
+import * as Joi from 'joi';
+import { CrudBaseQueryDto } from '../../../../framework/dto/base.query.dto';
+
+export class {{ QueryName }} extends CrudBaseQueryDto {
+{% for f in filterable -%}
+  @ApiPropertyOptional({
+    type: {{ f.swagType | json }},
+{% if f.len %}    maxLength: {{ f.len }},
+{% endif %}    description: {{ (f.comment or f.camel) | json }},
+  })
+  @Rule({{ f.joiRule }}.optional())
+  {{ f.camel }}?: {{ f.jsType }};
+
+{% endfor -%}
+}

package/templates/service.njk

@@ -1,20 +1,20 @@
-{% if ormInfo.orm === 'typeorm' -%}
-import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
-import { InjectEntityModel } from '@midwayjs/typeorm';
-import { Repository } from 'typeorm';
-import { BaseTypeOrmCrudService } from '@shys/core';
-import { {{ Pascal }} } from '../entity/{{ Camel }}.entity';
-
-@Provide()
-@Scope(ScopeEnum.Request, { allowDowngrade: true })
-export class {{ ServiceName }} extends BaseTypeOrmCrudService<{{ Pascal }}> {
-  @InjectEntityModel({{ Pascal }})
-  repo: Repository<{{ Pascal }}>;
-}
-{%- else -%}
-// {{ ormInfo.orm }} Service 模板（请按项目注入方式调整）
-import { Provide } from '@midwayjs/core';
-
-@Provide()
-export class {{ ServiceName }} {}
-{%- endif %}
+{% if ormInfo.orm === 'typeorm' -%}
+import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
+import { InjectEntityModel } from '@midwayjs/typeorm';
+import { Repository } from 'typeorm';
+import { BaseTypeOrmCrudService } from '@shys/core';
+import { {{ Pascal }} } from '../entity/{{ Camel }}.entity';
+
+@Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class {{ ServiceName }} extends BaseTypeOrmCrudService<{{ Pascal }}> {
+  @InjectEntityModel({{ Pascal }})
+  repo: Repository<{{ Pascal }}>;
+}
+{%- else -%}
+// {{ ormInfo.orm }} Service 模板（请按项目注入方式调整）
+import { Provide } from '@midwayjs/core';
+
+@Provide()
+export class {{ ServiceName }} {}
+{%- endif %}