nicot 1.1.32 → 1.1.34

package/dist/index.mjs

@@ -118,6 +118,7 @@ import {
   IsOptional as IsOptional2,
   IsString,
   IsUUID,
+  Max,
   MaxLength,
   Min,
   ValidateNested as ValidateNested2
@@ -212,6 +213,47 @@ 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 = {}) {
@@ -241,13 +283,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 +319,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 +348,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,30 +434,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 })
+  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({
@@ -465,21 +555,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`);
     }
   }
 );
-
-// src/utility/rename-class.ts
-function RenameClass(cls, name) {
-  Object.defineProperty(cls, "name", { value: name });
-  return cls;
-}
+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";
@@ -524,6 +619,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;
@@ -748,7 +844,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 = {}) {
@@ -768,7 +864,7 @@ function IdBase(idOptions = {}) {
       columnExtras: { nullable: false, primary: true }
     }),
     Reflect.metadata("design:type", Number),
-    Generated2("increment"),
+    Generated("increment"),
     QueryEqual()
   ]);
   dec(cl.prototype, "id");
@@ -1701,7 +1797,8 @@ import {
   BlankReturnMessageDto as BlankReturnMessageDto3,
   MergeMethodDecorators,
   PaginatedReturnMessageDto as PaginatedReturnMessageDto2,
-  ReturnMessageDto as ReturnMessageDto2
+  ReturnMessageDto as ReturnMessageDto2,
+  getApiProperty as getApiProperty2
 } from "nesties";
 import {
   ApiBadRequestResponse,
@@ -1711,13 +1808,13 @@ import {
   ApiOkResponse,
   ApiOperation,
   ApiParam,
-  ApiProperty as ApiProperty5,
+  ApiProperty as ApiProperty6,
   IntersectionType,
   OmitType as OmitType2,
   PartialType
 } from "@nestjs/swagger";
 import _4, { upperFirst } from "lodash";
-import { DECORATORS } from "@nestjs/swagger/dist/constants";
+import { RenameClass } from "nesties";
 
 // src/bases/base-restful-controller.ts
 var RestfulMethods = [
@@ -1778,6 +1875,27 @@ var OmitTypeExclude = (cl, keys) => {
   return omitted;
 };
 
+// src/utility/patch-column-in-get.ts
+import { ApiProperty as ApiProperty5 } from "@nestjs/swagger";
+import { getApiProperty } from "nesties";
+var PatchColumnsInGet = (cl, originalCl = cl, fieldsToOmit = []) => {
+  const omit2 = new Set(fieldsToOmit);
+  const boolFields = getSpecificFields(originalCl || cl, "boolColumn").filter(
+    (f) => !omit2.has(f)
+  );
+  for (const field of boolFields) {
+    const originalApiProp = getApiProperty(originalCl, field);
+    ApiProperty5({
+      ...originalApiProp,
+      type: String,
+      required: false,
+      enum: ["0", "1"],
+      default: originalApiProp?.default === true ? "1" : originalApiProp?.default === false ? "0" : void 0
+    })(cl.prototype, field);
+  }
+  return cl;
+};
+
 // src/restful.ts
 var getCurrentLevelRelations = (relations) => relations.filter((r) => !r.includes("."));
 var getNextLevelRelations = (relations, enteringField) => relations.filter((r) => r.includes(".") && r.startsWith(`${enteringField}.`)).map((r) => r.split(".").slice(1).join("."));
@@ -1805,14 +1923,22 @@ var RestfulFactory = class _RestfulFactory {
       `Create${this.entityClass.name}Dto`
     );
     this.importDto = ImportDataDto(this.createDto);
+    this.fieldsInGetToOmit = _4.uniq([
+      ...this.fieldsToOmit,
+      ...getSpecificFields(this.entityClass, "notQueryable")
+    ]);
     this.findAllDto = RenameClass(
       PartialType(
-        OmitTypeExclude(
-          this.entityClass instanceof PageSettingsDto ? this.basicInputDto : IntersectionType(
-            this.basicInputDto,
-            PageSettingsDto
+        PatchColumnsInGet(
+          OmitTypeExclude(
+            this.entityClass instanceof PageSettingsDto ? this.entityClass : IntersectionType(
+              this.entityClass,
+              PageSettingsDto
+            ),
+            this.fieldsInGetToOmit
           ),
-          getSpecificFields(this.entityClass, "notQueryable")
+          this.entityClass,
+          this.fieldsInGetToOmit
         )
       ),
       `Find${this.entityClass.name}Dto`
@@ -1891,12 +2017,11 @@ var RestfulFactory = class _RestfulFactory {
       if (outputFieldsToOmit.has(relation.propertyName)) continue;
       if (nonTransformableTypes.has(relation.propertyClass)) continue;
       const replace = (useClass) => {
-        const oldApiProperty = Reflect.getMetadata(
-          DECORATORS.API_MODEL_PROPERTIES,
-          this.entityClass.prototype,
+        const oldApiProperty = getApiProperty2(
+          this.entityClass,
           relation.propertyName
-        ) || {};
-        ApiProperty5({
+        );
+        ApiProperty6({
           ...oldApiProperty,
           required: false,
           type: () => relation.isArray ? [useClass[0]] : useClass[0]
@@ -2016,8 +2141,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([
@@ -2241,19 +2375,23 @@ export {
   QueryLessEqual,
   QueryLike,
   QueryMatchBoolean,
+  QueryMatchBooleanMySQL,
   QueryNotEqual,
   QueryOperator,
   QuerySearch,
   Relation,
   RelationComputed,
-  RenameClass,
   RestfulFactory,
+  SimpleJsonColumn,
   StringColumn,
   StringIdBase,
+  StringJsonColumn,
+  TextColumn,
   TimeBase,
   UpdatePipe,
   UuidColumn,
   applyQueryMatchBoolean,
+  applyQueryMatchBooleanMySQL,
   applyQueryProperty,
   applyQueryPropertyLike,
   applyQueryPropertySearch,