nicot 1.4.2 → 1.4.4

package/dist/index.mjs

@@ -678,6 +678,8 @@ import { MergePropertyDecorators as MergePropertyDecorators2 } from "nesties";
 import { Column, Index } from "typeorm";
 import {
   buildMessage,
+  IsArray,
+  IsBoolean,
   IsDate,
   IsEnum,
   IsInt,
@@ -853,15 +855,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 +888,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");
   }
 };
 
@@ -1076,12 +1098,30 @@ var BoolColumn = (options = {}) => MergePropertyDecorators2([
   swaggerDecorator(options, { type: Boolean }),
   GetMutatorBool()
 ]);
+var jsonColumnValidators = (definition) => {
+  const isArray = Array.isArray(definition);
+  const cl = getClassFromClassOrArray2(definition);
+  const validationOptions = isArray ? { each: true } : {};
+  const decorators = isArray ? [IsArray()] : [];
+  if (cl === String) {
+    decorators.push(IsString(validationOptions));
+  } else if (cl === Number) {
+    decorators.push(IsNumber({}, validationOptions));
+  } else if (cl === Boolean) {
+    decorators.push(IsBoolean(validationOptions));
+  } else if (cl === Date) {
+    decorators.push(IsDate(validationOptions));
+  } else {
+    decorators.push(ValidateNested2(validationOptions));
+  }
+  return decorators;
+};
 var createJsonColumnDef = (columnType = "jsonb", typeTransformerClass = TypeTransformer) => (definition, options = {}) => {
   const cl = getClassFromClassOrArray2(definition);
   return MergePropertyDecorators2([
     RequireGetMutator(),
     Type2(() => cl),
-    ValidateNested2(),
+    ...jsonColumnValidators(definition),
     Column(options.columnType || columnType, {
       ...columnDecoratorOptions(options),
       transformer: new typeTransformerClass(definition)
@@ -1113,7 +1153,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 +1384,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 = {}) => {
@@ -4329,7 +4372,10 @@ export {
   applyQueryPropertyLike,
   applyQueryPropertySearch,
   applyQueryPropertyZeroNullable,
+  base64OrBinaryToBuffer,
+  base64OrBinaryToDatabaseValue,
   binaryToBuffer,
+  binaryToPostgresByteaHex,
   createGetMutator,
   createQueryArrayify,
   createQueryBase64Operator,