nicot 1.4.1 → 1.4.3

package/dist/index.mjs

@@ -853,15 +853,31 @@ function binaryToBuffer(value) {
   }
   return Buffer.from(new Uint8Array(value));
 }
+function binaryToPostgresByteaHex(value) {
+  return `\\x${binaryToBuffer(value).toString("hex")}`;
+}
+function base64OrBinaryToBuffer(value) {
+  if (isBinaryLike(value)) {
+    return binaryToBuffer(value);
+  }
+  return Buffer.from(String(value), "base64");
+}
+function base64OrBinaryToDatabaseValue(value, storage = "postgres-bytea") {
+  const buffer = base64OrBinaryToBuffer(value);
+  if (storage === "postgres-bytea") {
+    return binaryToPostgresByteaHex(buffer);
+  }
+  return buffer;
+}
 var Base64BinaryTransformer = class {
+  constructor(storage = "postgres-bytea") {
+    this.storage = storage;
+  }
   to(entValue) {
     if (entValue == null) {
       return entValue;
     }
-    if (isBinaryLike(entValue)) {
-      return binaryToBuffer(entValue);
-    }
-    return Buffer.from(String(entValue), "base64");
+    return base64OrBinaryToDatabaseValue(entValue, this.storage);
   }
   from(dbValue) {
     if (dbValue == null) {
@@ -870,7 +886,11 @@ var Base64BinaryTransformer = class {
     if (isBinaryLike(dbValue)) {
       return binaryToBuffer(dbValue).toString("base64");
     }
-    return Buffer.from(String(dbValue)).toString("base64");
+    const text = String(dbValue);
+    if (/^\\x[0-9a-f]*$/i.test(text)) {
+      return Buffer.from(text.slice(2), "hex").toString("base64");
+    }
+    return Buffer.from(text).toString("base64");
   }
 };
 
@@ -1113,7 +1133,9 @@ var Base64BinaryColumn = (options = {}) => MergePropertyDecorators2([
   Column(options.columnType || "bytea", {
     ...columnDecoratorOptions(options),
     default: void 0,
-    transformer: new Base64BinaryTransformer()
+    transformer: new Base64BinaryTransformer(
+      options.binaryStorage ?? (options.columnType && options.columnType !== "bytea" ? "binary" : "postgres-bytea")
+    )
   }),
   IsBase64OrBinary(),
   validatorDecorator(options),
@@ -1342,19 +1364,20 @@ var createQueryOperatorArrayify = (operator, singleFallback) => createQueryArray
 );
 var QueryIn = createQueryOperatorArrayify("IN", "=");
 var QueryNotIn = createQueryOperatorArrayify("NOT IN", "!=");
-var toBase64QueryBuffer = (value) => {
+var normalizeQueryBase64Options = (fieldOrOptions) => typeof fieldOrOptions === "string" ? { field: fieldOrOptions } : fieldOrOptions ?? {};
+var toBase64QueryValue = (value, storage = "postgres-bytea") => {
   if (value == null) {
     return value;
   }
-  if (isBinaryLike(value)) {
-    return binaryToBuffer(value);
-  }
-  return Buffer.from(String(value), "base64");
+  return base64OrBinaryToDatabaseValue(value, storage);
+};
+var createQueryBase64Operator = (operator) => (fieldOrOptions) => {
+  const options = normalizeQueryBase64Options(fieldOrOptions);
+  return QueryWrap((entityExpr, varExpr, info) => {
+    info.mutateValue(toBase64QueryValue(info.value, options.binaryStorage));
+    return `${entityExpr} ${operator} ${varExpr}`;
+  }, options.field);
 };
-var createQueryBase64Operator = (operator) => (field) => QueryWrap((entityExpr, varExpr, info) => {
-  info.mutateValue(toBase64QueryBuffer(info.value));
-  return `${entityExpr} ${operator} ${varExpr}`;
-}, field);
 var QueryBase64Equal = createQueryBase64Operator("=");
 var QueryBase64NotEqual = createQueryBase64Operator("!=");
 var QueryFullText = (options = {}) => {
@@ -3011,11 +3034,11 @@ import {
   MergeMethodDecorators,
   PaginatedReturnMessageDto as PaginatedReturnMessageDto2,
   ReturnMessageDto as ReturnMessageDto2,
-  getApiProperty as getApiProperty2,
   DataPipe,
   ApiTypeResponse,
   ApiBlankResponse,
-  ApiError
+  ApiError,
+  RenameClass
 } from "nesties";
 import {
   ApiBody,
@@ -3029,7 +3052,6 @@ import {
   PickType as PickType2
 } from "@nestjs/swagger";
 import _6, { upperFirst } from "lodash";
-import { RenameClass } from "nesties";
 
 // src/bases/base-restful-controller.ts
 var RestfulMethods = [
@@ -3095,9 +3117,64 @@ var OmitTypeExclude = (cl, keys) => {
 };
 
 // src/utility/patch-column-in-get.ts
-import { getApiProperty } from "nesties";
 import _5 from "lodash";
-import { DECORATORS } from "@nestjs/swagger/dist/constants";
+
+// src/utility/swagger-decorators.ts
+var DECORATORS_PREFIX = "swagger";
+var FALLBACK_DECORATORS = {
+  API_OPERATION: `${DECORATORS_PREFIX}/apiOperation`,
+  API_RESPONSE: `${DECORATORS_PREFIX}/apiResponse`,
+  API_PRODUCES: `${DECORATORS_PREFIX}/apiProduces`,
+  API_CONSUMES: `${DECORATORS_PREFIX}/apiConsumes`,
+  API_TAGS: `${DECORATORS_PREFIX}/apiUseTags`,
+  API_WEBHOOK: `${DECORATORS_PREFIX}/apiWebhook`,
+  API_CALLBACKS: `${DECORATORS_PREFIX}/apiCallbacks`,
+  API_PARAMETERS: `${DECORATORS_PREFIX}/apiParameters`,
+  API_HEADERS: `${DECORATORS_PREFIX}/apiHeaders`,
+  API_MODEL_PROPERTIES: `${DECORATORS_PREFIX}/apiModelProperties`,
+  API_MODEL_PROPERTIES_ARRAY: `${DECORATORS_PREFIX}/apiModelPropertiesArray`,
+  API_SECURITY: `${DECORATORS_PREFIX}/apiSecurity`,
+  API_EXCLUDE_ENDPOINT: `${DECORATORS_PREFIX}/apiExcludeEndpoint`,
+  API_INCLUDE_ENDPOINT: `${DECORATORS_PREFIX}/apiIncludeEndpoint`,
+  API_EXCLUDE_CONTROLLER: `${DECORATORS_PREFIX}/apiExcludeController`,
+  API_EXTRA_MODELS: `${DECORATORS_PREFIX}/apiExtraModels`,
+  API_EXTENSION: `${DECORATORS_PREFIX}/apiExtension`,
+  API_SCHEMA: `${DECORATORS_PREFIX}/apiSchema`,
+  API_DEFAULT_GETTER: `${DECORATORS_PREFIX}/apiDefaultGetter`,
+  API_LINK: `${DECORATORS_PREFIX}/apiLink`
+};
+function loadSwaggerDecorators() {
+  try {
+    const req = typeof __require === "function" ? __require : void 0;
+    const decorators = req?.("@nestjs/swagger/dist/constants")?.DECORATORS;
+    if (decorators) {
+      return {
+        ...FALLBACK_DECORATORS,
+        ...decorators
+      };
+    }
+  } catch {
+  }
+  return FALLBACK_DECORATORS;
+}
+var DECORATORS = loadSwaggerDecorators();
+
+// src/utility/get-api-property.ts
+var getApiProperty = (cls, key) => {
+  let proto = cls.prototype;
+  while (proto && proto !== Object.prototype) {
+    const meta = Reflect.getMetadata(
+      DECORATORS.API_MODEL_PROPERTIES,
+      proto,
+      key
+    );
+    if (meta) return meta;
+    proto = Object.getPrototypeOf(proto);
+  }
+  return {};
+};
+
+// src/utility/patch-column-in-get.ts
 var PatchColumnsInGet = (cl, originalCl = cl, fieldsToOmit = []) => {
   const omit2 = new Set(fieldsToOmit);
   const useCl = originalCl || cl;
@@ -3445,7 +3522,7 @@ var _RestfulFactory = class _RestfulFactory {
       if (outputFieldsToOmit.has(relation.propertyName)) continue;
       if (nonTransformableTypes.has(relation.propertyClass)) continue;
       const replace = (useClass) => {
-        const oldApiProperty = getApiProperty2(
+        const oldApiProperty = getApiProperty(
           this.entityClass,
           relation.propertyName
         );
@@ -3488,7 +3565,7 @@ var _RestfulFactory = class _RestfulFactory {
       "notRequiredButHasDefault"
     ).filter((f) => !outputFieldsToOmit.has(f));
     for (const field of notRequiredButHasDefaultFields) {
-      const oldApiProperty = getApiProperty2(resultDto, field);
+      const oldApiProperty = getApiProperty(resultDto, field);
       ApiProperty5({
         ...oldApiProperty,
         required: true
@@ -4275,7 +4352,10 @@ export {
   applyQueryPropertyLike,
   applyQueryPropertySearch,
   applyQueryPropertyZeroNullable,
+  base64OrBinaryToBuffer,
+  base64OrBinaryToDatabaseValue,
   binaryToBuffer,
+  binaryToPostgresByteaHex,
   createGetMutator,
   createQueryArrayify,
   createQueryBase64Operator,