nicot 1.1.28 → 1.1.30

package/dist/index.mjs

@@ -117,6 +117,7 @@ import {
   IsNumber,
   IsOptional as IsOptional2,
   IsString,
+  IsUUID,
   MaxLength,
   Min,
   ValidateNested as ValidateNested2
@@ -195,6 +196,24 @@ var StringColumn = (length, options = {}) => {
     swaggerDecorator(options, { type: String, maxLength: length })
   ]);
 };
+var UuidColumn = (options = {}) => {
+  return MergePropertyDecorators2([
+    Column("uuid", {
+      ...columnDecoratorOptions(options),
+      ...options.generated ? {
+        nullable: false,
+        generated: "uuid"
+      } : {}
+    }),
+    IsUUID(),
+    validatorDecorator(options),
+    swaggerDecorator(options, {
+      type: String,
+      format: "uuid",
+      example: "550e8400-e29b-41d4-a716-446655440000"
+    })
+  ]);
+};
 var IntColumn = (type, options = {}) => {
   const decs = [
     Column(type, {
@@ -677,8 +696,8 @@ __decorateClass([
 ], TimeBase.prototype, "deleteTime", 2);
 
 // src/bases/id-base.ts
-import { Generated } from "typeorm";
-import { IsNotEmpty as IsNotEmpty2, IsString as IsString3 } from "class-validator";
+import { Generated as Generated2 } from "typeorm";
+import { IsNotEmpty as IsNotEmpty2 } from "class-validator";
 import { MergePropertyDecorators as MergePropertyDecorators4 } from "nesties";
 function IdBase(idOptions = {}) {
   const cl = class IdBase extends TimeBase {
@@ -687,7 +706,6 @@ function IdBase(idOptions = {}) {
       if (!idOptions.noOrderById) {
         qb.orderBy(`${entityName}.id`, "DESC");
       }
-      applyQueryProperty(this, qb, entityName, "id");
     }
   };
   const dec = MergePropertyDecorators4([
@@ -698,7 +716,8 @@ function IdBase(idOptions = {}) {
       columnExtras: { nullable: false, primary: true }
     }),
     Reflect.metadata("design:type", Number),
-    Generated("increment")
+    Generated2("increment"),
+    QueryEqual()
   ]);
   dec(cl.prototype, "id");
   return cl;
@@ -707,19 +726,28 @@ function StringIdBase(idOptions) {
   const cl = class StringIdBase extends TimeBase {
     applyQuery(qb, entityName) {
       super.applyQuery(qb, entityName);
-      console.log("idbase order by");
-      qb.orderBy(`${entityName}.id`, "ASC");
-      applyQueryProperty(this, qb, entityName, "id");
+      if (!idOptions.noOrderById) {
+        qb.orderBy(`${entityName}.id`, "ASC");
+      }
     }
   };
+  const columnOptions = {
+    required: !idOptions.uuid,
+    description: idOptions.description,
+    columnExtras: { primary: true, nullable: false }
+  };
   const decs = [
-    StringColumn(idOptions.length || (idOptions.uuid ? 36 : 255), {
-      required: !idOptions.uuid,
-      description: idOptions.description,
-      columnExtras: { primary: true, nullable: false }
-    }),
     Reflect.metadata("design:type", String),
-    ...idOptions.uuid ? [Generated("uuid"), NotWritable()] : [IsString3(), IsNotEmpty2(), NotChangeable()]
+    QueryEqual(),
+    ...idOptions.uuid ? [
+      UuidColumn({ ...columnOptions, generated: true }),
+      Generated2("uuid"),
+      NotWritable()
+    ] : [
+      StringColumn(idOptions.length || 255, columnOptions),
+      IsNotEmpty2(),
+      NotChangeable()
+    ]
   ];
   const dec = MergePropertyDecorators4(decs);
   dec(cl.prototype, "id");
@@ -2175,6 +2203,7 @@ export {
   StringIdBase,
   TimeBase,
   UpdatePipe,
+  UuidColumn,
   applyQueryMatchBoolean,
   applyQueryProperty,
   applyQueryPropertyLike,