nicot 1.1.32 → 1.1.33

package/dist/index.mjs

@@ -355,7 +355,8 @@ var BoolColumn = (options = {}) => MergePropertyDecorators2([
   }),
   Column("boolean", columnDecoratorOptions(options)),
   validatorDecorator(options),
-  swaggerDecorator(options, { type: Boolean })
+  swaggerDecorator(options, { type: Boolean }),
+  Metadata.set("boolColumn", true, "boolColumnFields")
 ]);
 var JsonColumn = (definition, options = {}) => {
   const cl = getClassFromClassOrArray2(definition);
@@ -475,12 +476,6 @@ var applyQueryMatchBoolean = createQueryCondition(
   }
 );
 
-// src/utility/rename-class.ts
-function RenameClass(cls, name) {
-  Object.defineProperty(cls, "name", { value: name });
-  return cls;
-}
-
 // src/decorators/query.ts
 import { MergePropertyDecorators as MergePropertyDecorators3 } from "nesties";
 
@@ -1701,7 +1696,8 @@ import {
   BlankReturnMessageDto as BlankReturnMessageDto3,
   MergeMethodDecorators,
   PaginatedReturnMessageDto as PaginatedReturnMessageDto2,
-  ReturnMessageDto as ReturnMessageDto2
+  ReturnMessageDto as ReturnMessageDto2,
+  getApiProperty as getApiProperty2
 } from "nesties";
 import {
   ApiBadRequestResponse,
@@ -1711,13 +1707,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 +1774,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: ["", "1"],
+      default: originalApiProp?.default === true ? "1" : originalApiProp?.default === false ? "" : 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 +1822,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 +1916,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]
@@ -2246,7 +2270,6 @@ export {
   QuerySearch,
   Relation,
   RelationComputed,
-  RenameClass,
   RestfulFactory,
   StringColumn,
   StringIdBase,