nicot 1.1.29 → 1.1.30

package/dist/index.cjs

@@ -86,6 +86,7 @@ __export(index_exports, {
   StringIdBase: () => StringIdBase,
   TimeBase: () => TimeBase,
   UpdatePipe: () => UpdatePipe,
+  UuidColumn: () => UuidColumn,
   applyQueryMatchBoolean: () => applyQueryMatchBoolean,
   applyQueryProperty: () => applyQueryProperty,
   applyQueryPropertyLike: () => applyQueryPropertyLike,
@@ -257,6 +258,24 @@ var StringColumn = (length, options = {}) => {
     swaggerDecorator(options, { type: String, maxLength: length })
   ]);
 };
+var UuidColumn = (options = {}) => {
+  return (0, import_nesties3.MergePropertyDecorators)([
+    (0, import_typeorm.Column)("uuid", {
+      ...columnDecoratorOptions(options),
+      ...options.generated ? {
+        nullable: false,
+        generated: "uuid"
+      } : {}
+    }),
+    (0, import_class_validator3.IsUUID)(),
+    validatorDecorator(options),
+    swaggerDecorator(options, {
+      type: String,
+      format: "uuid",
+      example: "550e8400-e29b-41d4-a716-446655440000"
+    })
+  ]);
+};
 var IntColumn = (type, options = {}) => {
   const decs = [
     (0, import_typeorm.Column)(type, {
@@ -743,7 +762,6 @@ function IdBase(idOptions = {}) {
       if (!idOptions.noOrderById) {
         qb.orderBy(`${entityName}.id`, "DESC");
       }
-      applyQueryProperty(this, qb, entityName, "id");
     }
   };
   const dec = (0, import_nesties7.MergePropertyDecorators)([
@@ -754,7 +772,8 @@ function IdBase(idOptions = {}) {
       columnExtras: { nullable: false, primary: true }
     }),
     Reflect.metadata("design:type", Number),
-    (0, import_typeorm3.Generated)("increment")
+    (0, import_typeorm3.Generated)("increment"),
+    QueryEqual()
   ]);
   dec(cl.prototype, "id");
   return cl;
@@ -763,19 +782,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 ? void 0 : 255), {
-      required: !idOptions.uuid,
-      description: idOptions.description,
-      columnExtras: { primary: true, nullable: false }
-    }),
     Reflect.metadata("design:type", String),
-    ...idOptions.uuid ? [(0, import_typeorm3.Generated)("uuid"), NotWritable()] : [(0, import_class_validator6.IsString)(), (0, import_class_validator6.IsNotEmpty)(), NotChangeable()]
+    QueryEqual(),
+    ...idOptions.uuid ? [
+      UuidColumn({ ...columnOptions, generated: true }),
+      (0, import_typeorm3.Generated)("uuid"),
+      NotWritable()
+    ] : [
+      StringColumn(idOptions.length || 255, columnOptions),
+      (0, import_class_validator6.IsNotEmpty)(),
+      NotChangeable()
+    ]
   ];
   const dec = (0, import_nesties7.MergePropertyDecorators)(decs);
   dec(cl.prototype, "id");
@@ -2201,6 +2229,7 @@ var RestfulFactory = class _RestfulFactory {
   StringIdBase,
   TimeBase,
   UpdatePipe,
+  UuidColumn,
   applyQueryMatchBoolean,
   applyQueryProperty,
   applyQueryPropertyLike,