nicot 1.1.33 → 1.1.35

package/dist/index.mjs

@@ -118,6 +118,7 @@ import {
   IsOptional as IsOptional2,
   IsString,
   IsUUID,
+  Max,
   MaxLength,
   Min,
   ValidateNested as ValidateNested2
@@ -212,10 +213,52 @@ var TypeTransformer = class {
     return entValue;
   }
 };
+var TypeTransformerString = class extends TypeTransformer {
+  from(dbValue) {
+    if (dbValue == null) {
+      return dbValue;
+    }
+    return super.from(JSON.parse(dbValue));
+  }
+  to(entValue) {
+    if (entValue == null) {
+      return entValue;
+    }
+    return JSON.stringify(super.to(entValue));
+  }
+};
+
+// src/utility/parse-bool.ts
+var parseBool = (value) => {
+  const trueValues = ["true", "1", "yes", "on", true, 1];
+  const falseValues = ["false", "0", "no", "off", false, 0];
+  if (trueValues.indexOf(value) !== -1) return true;
+  if (falseValues.indexOf(value) !== -1) return false;
+  if (!!value) {
+    return true;
+  }
+  return void 0;
+};
+var parseBoolObject = (obj, boolFields) => {
+  const newObj = { ...obj };
+  for (const field of boolFields) {
+    newObj[field] = parseBool(newObj[field]);
+  }
+  return newObj;
+};
+var ParseBoolObjectPipe = class {
+  constructor(boolFields) {
+    this.boolFields = boolFields;
+  }
+  transform(obj) {
+    return parseBoolObject(obj, this.boolFields);
+  }
+};
 
 // src/decorators/property.ts
 function swaggerDecorator(options, injected = {}) {
-  return ApiProperty2({
+  const notRequiredButHasDefault = options.required == null && options.default != null;
+  const apiPropertyDec = ApiProperty2({
     default: options.default,
     required: !!(options.required && options.default == null),
     example: options.default,
@@ -223,6 +266,18 @@ function swaggerDecorator(options, injected = {}) {
     ...injected,
     ...options.propertyExtras || {}
   });
+  if (notRequiredButHasDefault) {
+    return MergePropertyDecorators2([
+      apiPropertyDec,
+      Metadata.set(
+        "notRequiredButHasDefault",
+        true,
+        "notRequiredButHasDefaultFields"
+      )
+    ]);
+  } else {
+    return apiPropertyDec;
+  }
 }
 function validatorDecorator(options) {
   const decs = [];
@@ -241,13 +296,24 @@ function columnDecoratorOptions(options) {
 }
 var StringColumn = (length, options = {}) => {
   return MergePropertyDecorators2([
-    Column("varchar", { length, ...columnDecoratorOptions(options) }),
+    Column(options.columnType || "varchar", {
+      length,
+      ...columnDecoratorOptions(options)
+    }),
     IsString(),
     MaxLength(length),
     validatorDecorator(options),
     swaggerDecorator(options, { type: String, maxLength: length })
   ]);
 };
+var TextColumn = (options = {}) => {
+  return MergePropertyDecorators2([
+    Column(options.columnType || "text", columnDecoratorOptions(options)),
+    IsString(),
+    validatorDecorator(options),
+    swaggerDecorator(options, { type: String })
+  ]);
+};
 var UuidColumn = (options = {}) => {
   return MergePropertyDecorators2([
     Column("uuid", {
@@ -266,8 +332,28 @@ var UuidColumn = (options = {}) => {
     })
   ]);
 };
+var intMaxList = {
+  tinyint: 127,
+  smallint: 32767,
+  mediumint: 8388607,
+  int: 2147483647,
+  bigint: Number.MAX_SAFE_INTEGER
+};
 var IntColumn = (type, options = {}) => {
-  const decs = [
+  let max = intMaxList[type] || Number.MAX_SAFE_INTEGER;
+  if (max !== Number.MAX_SAFE_INTEGER && options.unsigned) {
+    max = max * 2 + 1;
+  }
+  let min = options.unsigned ? 0 : -max - 1;
+  if (options.range) {
+    if (typeof options.range.min === "number" && options.range.min > min) {
+      min = options.range.min;
+    }
+    if (typeof options.range.max === "number" && options.range.max < max) {
+      max = options.range.max;
+    }
+  }
+  return MergePropertyDecorators2([
     Column(type, {
       default: options.default,
       unsigned: options.unsigned,
@@ -275,39 +361,53 @@ var IntColumn = (type, options = {}) => {
       ...columnDecoratorOptions(options)
     }),
     IsInt(),
+    ...min > Number.MIN_SAFE_INTEGER ? [Min(min)] : [],
+    ...max < Number.MAX_SAFE_INTEGER ? [Max(max)] : [],
     validatorDecorator(options),
     swaggerDecorator(options, {
       type: Number,
-      minimum: options.unsigned ? 0 : void 0
+      minimum: min > Number.MIN_SAFE_INTEGER ? min : void 0,
+      maximum: max < Number.MAX_SAFE_INTEGER ? max : void 0
     })
-  ];
-  if (options.unsigned) {
-    decs.push(Min(0));
-  }
-  return MergePropertyDecorators2(decs);
+  ]);
 };
 var FloatColumn = (type, options = {}) => {
-  const decs = [
+  let min = options.unsigned ? 0 : Number.MIN_SAFE_INTEGER;
+  let max = Number.MAX_SAFE_INTEGER;
+  if (options.columnExtras?.precision != null && options.columnExtras?.scale != null) {
+    const precision = options.columnExtras.precision;
+    const scale = options.columnExtras.scale;
+    const intDigits = precision - scale;
+    if (intDigits > 0) {
+      const maxIntPart = Math.pow(10, intDigits) - 1;
+      const maxDecimalPart = scale > 0 ? (Math.pow(10, scale) - 1) / Math.pow(10, scale) : 0;
+      max = maxIntPart + maxDecimalPart;
+      min = options.unsigned ? 0 : -max;
+    }
+  }
+  return MergePropertyDecorators2([
     Column(type, {
       default: options.default,
       unsigned: options.unsigned,
       ...columnDecoratorOptions(options)
     }),
     IsNumber(),
+    ...min > Number.MIN_SAFE_INTEGER ? [Min(min)] : [],
+    ...max < Number.MAX_SAFE_INTEGER ? [Max(max)] : [],
     validatorDecorator(options),
     swaggerDecorator(options, {
       type: Number,
-      minimum: options.unsigned ? 0 : void 0
+      minimum: min > Number.MIN_SAFE_INTEGER ? min : void 0,
+      maximum: max < Number.MAX_SAFE_INTEGER ? max : void 0
     })
-  ];
-  if (options.unsigned) {
-    decs.push(Min(0));
-  }
-  return MergePropertyDecorators2(decs);
+  ]);
 };
 var DateColumn = (options = {}) => {
   return MergePropertyDecorators2([
-    Column("timestamp", columnDecoratorOptions(options)),
+    Column(
+      options.columnType || "timestamp",
+      columnDecoratorOptions(options)
+    ),
     IsDate(),
     Transform(
       (v) => {
@@ -347,31 +447,33 @@ var EnumColumn = (targetEnum, options = {}) => {
 var BoolColumn = (options = {}) => MergePropertyDecorators2([
   Index(),
   Transform((v) => {
-    const trueValues = ["true", "1", "yes", "on", true, 1];
-    const falseValues = ["false", "0", "no", "off", false, 0];
-    if (trueValues.indexOf(v.value) !== -1) return true;
-    if (falseValues.indexOf(v.value) !== -1) return false;
-    return void 0;
+    return parseBool(v.value);
   }),
   Column("boolean", columnDecoratorOptions(options)),
   validatorDecorator(options),
   swaggerDecorator(options, { type: Boolean }),
   Metadata.set("boolColumn", true, "boolColumnFields")
 ]);
-var JsonColumn = (definition, options = {}) => {
+var createJsonColumnDef = (columnType = "jsonb", typeTransformerClass = TypeTransformer) => (definition, options = {}) => {
   const cl = getClassFromClassOrArray2(definition);
   return MergePropertyDecorators2([
     NotQueryable(),
     Type2(() => cl),
     ValidateNested2(),
-    Column("jsonb", {
+    Column(options.columnType || columnType, {
       ...columnDecoratorOptions(options),
-      transformer: new TypeTransformer(definition)
+      transformer: new typeTransformerClass(definition)
     }),
     validatorDecorator(options),
     swaggerDecorator(options, { type: definition })
   ]);
 };
+var JsonColumn = createJsonColumnDef();
+var SimpleJsonColumn = createJsonColumnDef("json");
+var StringJsonColumn = createJsonColumnDef(
+  "text",
+  TypeTransformerString
+);
 var NotColumn = (options = {}, specials = {}) => MergePropertyDecorators2([
   Exclude(),
   swaggerDecorator({
@@ -466,15 +568,26 @@ var applyQueryPropertyZeroNullable = createQueryCondition(
 );
 var applyQueryMatchBoolean = createQueryCondition(
   (obj, qb, entityName, field) => {
-    const value = obj[field];
-    if (value === true || value === "true" || value === 1 || value === "1") {
+    const value = parseBool(obj[field]);
+    if (value === true) {
       qb.andWhere(`${entityName}.${field} = TRUE`);
     }
-    if (value === false || value === "false" || value === 0 || value === "0") {
+    if (value === false) {
       qb.andWhere(`${entityName}.${field} = FALSE`);
     }
   }
 );
+var applyQueryMatchBooleanMySQL = createQueryCondition(
+  (obj, qb, entityName, field) => {
+    const value = parseBool(obj[field]);
+    if (value === true) {
+      qb.andWhere(`${entityName}.${field} = 1`);
+    }
+    if (value === false) {
+      qb.andWhere(`${entityName}.${field} = 0`);
+    }
+  }
+);
 
 // src/decorators/query.ts
 import { MergePropertyDecorators as MergePropertyDecorators3 } from "nesties";
@@ -519,6 +632,7 @@ var QueryLike = () => QueryCondition(applyQueryPropertyLike);
 var QuerySearch = () => QueryCondition(applyQueryPropertySearch);
 var QueryEqualZeroNullable = () => QueryCondition(applyQueryPropertyZeroNullable);
 var QueryMatchBoolean = () => QueryCondition(applyQueryMatchBoolean);
+var QueryMatchBooleanMySQL = () => QueryCondition(applyQueryMatchBooleanMySQL);
 var QueryOperator = (operator, field) => QueryCondition((obj, qb, entityName, key) => {
   if (obj[key] == null) return;
   const fieldName = field || key;
@@ -743,7 +857,7 @@ __decorateClass([
 ], TimeBase.prototype, "deleteTime", 2);
 
 // src/bases/id-base.ts
-import { Generated as Generated2 } from "typeorm";
+import { Generated } from "typeorm";
 import { IsNotEmpty as IsNotEmpty2 } from "class-validator";
 import { MergePropertyDecorators as MergePropertyDecorators4 } from "nesties";
 function IdBase(idOptions = {}) {
@@ -763,7 +877,7 @@ function IdBase(idOptions = {}) {
       columnExtras: { nullable: false, primary: true }
     }),
     Reflect.metadata("design:type", Number),
-    Generated2("increment"),
+    Generated("increment"),
     QueryEqual()
   ]);
   dec(cl.prototype, "id");
@@ -1788,8 +1902,8 @@ var PatchColumnsInGet = (cl, originalCl = cl, fieldsToOmit = []) => {
       ...originalApiProp,
       type: String,
       required: false,
-      enum: ["", "1"],
-      default: originalApiProp?.default === true ? "1" : originalApiProp?.default === false ? "" : void 0
+      enum: ["0", "1"],
+      default: originalApiProp?.default === true ? "1" : originalApiProp?.default === false ? "0" : void 0
     })(cl.prototype, field);
   }
   return cl;
@@ -1954,6 +2068,17 @@ var RestfulFactory = class _RestfulFactory {
         }
       }
     }
+    const notRequiredButHasDefaultFields = getSpecificFields(
+      this.entityClass,
+      "notRequiredButHasDefault"
+    ).filter((f) => !outputFieldsToOmit.has(f));
+    for (const field of notRequiredButHasDefaultFields) {
+      const oldApiProperty = getApiProperty2(resultDto, field);
+      ApiProperty6({
+        ...oldApiProperty,
+        required: true
+      })(resultDto.prototype, field);
+    }
     const res = RenameClass(
       resultDto,
       `${this.getEntityClassName()}ResultDto`
@@ -2040,8 +2165,17 @@ var RestfulFactory = class _RestfulFactory {
       ApiOkResponse({ type: this.entityCursorPaginationReturnMessageDto })
     ]);
   }
+  getBoolColumns() {
+    const boolColumns = getSpecificFields(this.entityClass, "boolColumn");
+    return _4.difference(boolColumns, this.fieldsInGetToOmit);
+  }
   findAllParam() {
-    return Query(GetPipe());
+    const boolColumns = this.getBoolColumns();
+    if (boolColumns.length) {
+      return Query(new ParseBoolObjectPipe(boolColumns), GetPipe());
+    } else {
+      return Query(GetPipe());
+    }
   }
   update(extras = {}) {
     return MergeMethodDecorators([
@@ -2265,18 +2399,23 @@ export {
   QueryLessEqual,
   QueryLike,
   QueryMatchBoolean,
+  QueryMatchBooleanMySQL,
   QueryNotEqual,
   QueryOperator,
   QuerySearch,
   Relation,
   RelationComputed,
   RestfulFactory,
+  SimpleJsonColumn,
   StringColumn,
   StringIdBase,
+  StringJsonColumn,
+  TextColumn,
   TimeBase,
   UpdatePipe,
   UuidColumn,
   applyQueryMatchBoolean,
+  applyQueryMatchBooleanMySQL,
   applyQueryProperty,
   applyQueryPropertyLike,
   applyQueryPropertySearch,