nicot 1.4.2 → 1.4.4

package/README-CN.md

@@ -207,8 +207,9 @@ OpenAPI 层面统统“伪装成”一个普通的 base64 `string` 字段：
 
 - 实体属性类型是 `string`（base64 字符串）。
 - OpenAPI 中以 `{ type: String, format: 'byte' }` 展示。
-- 通过 TypeORM `ValueTransformer`：写库时把 base64 字符串解码成 `Buffer`
-  （默认列类型 `bytea`），读取时再编码回 base64 字符串。
+- 通过 TypeORM `ValueTransformer`：写库时把 base64 字符串解码成
+  PostgreSQL 安全的 bytea 参数（默认列类型 `bytea`），读取时再编码回
+  base64 字符串。
 
 ```ts
 @Entity()
@@ -229,7 +230,7 @@ export class Attachment extends IdBase() {
 **查询。** base64 二进制列本身就是可查询字段（不需要 `GetMutator`）。想在
 `findAll` 中按它过滤，给它挂上 `@QueryBase64Equal()`（或
 `@QueryBase64NotEqual()`）即可：传入的 base64 查询串会在绑定参数前被解码成
-`Buffer`，从而与列里存的二进制匹配。
+PostgreSQL 安全的 bytea 参数，从而与列里存的二进制匹配。
 
 ```ts
 @Base64BinaryColumn()

package/README.md

@@ -309,8 +309,9 @@ entity / DTO / OpenAPI surface all behave like a plain **base64 `string`**:
 
 - The TS property type is `string` (a base64 string).
 - It is exposed to OpenAPI as `{ type: String, format: 'byte' }`.
-- A TypeORM `ValueTransformer` decodes the base64 string into a `Buffer` on the
-  way into the DB (`bytea` by default) and encodes it back to base64 on read.
+- A TypeORM `ValueTransformer` decodes the base64 string into a PostgreSQL-safe
+  bytea parameter on the way into the DB (`bytea` by default) and encodes it
+  back to base64 on read.
 
 ```ts
 @Entity()
@@ -333,8 +334,8 @@ API.
 **Querying.** A base64 binary column is a normal queryable field (no
 `GetMutator` required). To filter on it in `findAll`, attach
 `@QueryBase64Equal()` (or `@QueryBase64NotEqual()`); the incoming base64 query
-string is decoded to a `Buffer` right before it is bound, so it matches the
-binary stored in the column:
+string is decoded to a PostgreSQL-safe bytea parameter right before it is bound,
+so it matches the binary stored in the column:
 
 ```ts
 @Base64BinaryColumn()

package/dist/index.cjs

@@ -665,7 +665,10 @@ __export(index_exports, {
   applyQueryPropertyLike: () => applyQueryPropertyLike,
   applyQueryPropertySearch: () => applyQueryPropertySearch,
   applyQueryPropertyZeroNullable: () => applyQueryPropertyZeroNullable,
+  base64OrBinaryToBuffer: () => base64OrBinaryToBuffer,
+  base64OrBinaryToDatabaseValue: () => base64OrBinaryToDatabaseValue,
   binaryToBuffer: () => binaryToBuffer,
+  binaryToPostgresByteaHex: () => binaryToPostgresByteaHex,
   createGetMutator: () => createGetMutator,
   createQueryArrayify: () => createQueryArrayify,
   createQueryBase64Operator: () => createQueryBase64Operator,
@@ -935,15 +938,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) {
@@ -952,7 +971,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");
   }
 };
 
@@ -1158,12 +1181,30 @@ var BoolColumn = (options = {}) => (0, import_nesties4.MergePropertyDecorators)(
   swaggerDecorator(options, { type: Boolean }),
   GetMutatorBool()
 ]);
+var jsonColumnValidators = (definition) => {
+  const isArray = Array.isArray(definition);
+  const cl = (0, import_nesties5.getClassFromClassOrArray)(definition);
+  const validationOptions = isArray ? { each: true } : {};
+  const decorators = isArray ? [(0, import_class_validator3.IsArray)()] : [];
+  if (cl === String) {
+    decorators.push((0, import_class_validator3.IsString)(validationOptions));
+  } else if (cl === Number) {
+    decorators.push((0, import_class_validator3.IsNumber)({}, validationOptions));
+  } else if (cl === Boolean) {
+    decorators.push((0, import_class_validator3.IsBoolean)(validationOptions));
+  } else if (cl === Date) {
+    decorators.push((0, import_class_validator3.IsDate)(validationOptions));
+  } else {
+    decorators.push((0, import_class_validator3.ValidateNested)(validationOptions));
+  }
+  return decorators;
+};
 var createJsonColumnDef = (columnType = "jsonb", typeTransformerClass = TypeTransformer) => (definition, options = {}) => {
   const cl = (0, import_nesties5.getClassFromClassOrArray)(definition);
   return (0, import_nesties4.MergePropertyDecorators)([
     RequireGetMutator(),
     (0, import_class_transformer2.Type)(() => cl),
-    (0, import_class_validator3.ValidateNested)(),
+    ...jsonColumnValidators(definition),
     (0, import_typeorm.Column)(options.columnType || columnType, {
       ...columnDecoratorOptions(options),
       transformer: new typeTransformerClass(definition)
@@ -1195,7 +1236,9 @@ var Base64BinaryColumn = (options = {}) => (0, import_nesties4.MergePropertyDeco
   (0, import_typeorm.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),
@@ -1424,19 +1467,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 = {}) => {
@@ -4366,7 +4410,10 @@ TransactionalTypeOrmModule = __decorateClass([
   applyQueryPropertyLike,
   applyQueryPropertySearch,
   applyQueryPropertyZeroNullable,
+  base64OrBinaryToBuffer,
+  base64OrBinaryToDatabaseValue,
   binaryToBuffer,
+  binaryToPostgresByteaHex,
   createGetMutator,
   createQueryArrayify,
   createQueryBase64Operator,