nicot 1.3.8 → 1.4.1

package/dist/index.mjs

@@ -90,7 +90,7 @@ var require_typeorm_utils = __commonJS({
         throw new circular_dependency_exception_1.CircularDependencyException("@InjectRepository()");
       }
       const dataSourcePrefix = getDataSourcePrefix(dataSource);
-      if (entity instanceof Function && (entity.prototype instanceof typeorm_1.Repository || entity.prototype instanceof typeorm_1.AbstractRepository)) {
+      if (entity instanceof Function && (entity.prototype instanceof typeorm_1.Repository || typeorm_1.AbstractRepository && entity.prototype instanceof typeorm_1.AbstractRepository)) {
         if (!dataSourcePrefix) {
           return entity;
         }
@@ -108,7 +108,7 @@ var require_typeorm_utils = __commonJS({
       return repository.name;
     }
     function getDataSourceToken(dataSource = typeorm_constants_1.DEFAULT_DATA_SOURCE_NAME) {
-      return typeorm_constants_1.DEFAULT_DATA_SOURCE_NAME === dataSource ? typeorm_1.DataSource ?? typeorm_1.Connection : "string" === typeof dataSource ? `${dataSource}DataSource` : typeorm_constants_1.DEFAULT_DATA_SOURCE_NAME === dataSource.name || !dataSource.name ? typeorm_1.DataSource ?? typeorm_1.Connection : `${dataSource.name}DataSource`;
+      return typeorm_constants_1.DEFAULT_DATA_SOURCE_NAME === dataSource ? typeorm_1.DataSource : "string" === typeof dataSource ? `${dataSource}DataSource` : typeorm_constants_1.DEFAULT_DATA_SOURCE_NAME === dataSource.name || !dataSource.name ? typeorm_1.DataSource : `${dataSource.name}DataSource`;
     }
     exports.getConnectionToken = getDataSourceToken;
     function getDataSourcePrefix(dataSource = typeorm_constants_1.DEFAULT_DATA_SOURCE_NAME) {
@@ -313,7 +313,7 @@ var require_typeorm_core_module = __commonJS({
           typeOrmModuleOptions
         ];
         const exports2 = [entityManagerProvider, dataSourceProvider];
-        if (dataSourceProvider.provide === typeorm_1.DataSource) {
+        if (typeorm_1.Connection && dataSourceProvider.provide === typeorm_1.DataSource) {
           providers.push({
             provide: typeorm_1.Connection,
             useExisting: typeorm_1.DataSource
@@ -360,7 +360,7 @@ var require_typeorm_core_module = __commonJS({
           entityManagerProvider,
           dataSourceProvider
         ];
-        if (dataSourceProvider.provide === typeorm_1.DataSource) {
+        if (typeorm_1.Connection && dataSourceProvider.provide === typeorm_1.DataSource) {
           providers.push({
             provide: typeorm_1.Connection,
             useExisting: typeorm_1.DataSource
@@ -423,9 +423,7 @@ var require_typeorm_core_module = __commonJS({
       }
       static async createDataSourceFactory(options, dataSourceFactory) {
         const dataSourceToken = (0, typeorm_utils_1.getDataSourceName)(options);
-        const createTypeormDataSource = dataSourceFactory ?? ((options2) => {
-          return typeorm_1.DataSource === void 0 ? (0, typeorm_1.createConnection)(options2) : new typeorm_1.DataSource(options2);
-        });
+        const createTypeormDataSource = dataSourceFactory ?? ((options2) => new typeorm_1.DataSource(options2));
         return await (0, rxjs_1.lastValueFrom)((0, rxjs_1.defer)(async () => {
           let dataSource;
           if (!options.autoLoadEntities) {
@@ -442,7 +440,7 @@ var require_typeorm_core_module = __commonJS({
               entities
             });
           }
-          return dataSource.initialize && !dataSource.isInitialized && !options.manualInitialization ? dataSource.initialize() : dataSource;
+          return !dataSource.isInitialized && !options.manualInitialization ? dataSource.initialize() : dataSource;
         }).pipe((0, typeorm_utils_1.handleRetry)(options.retryAttempts, options.retryDelay, dataSourceToken, options.verboseRetryLog, options.toRetry)));
       }
     };
@@ -679,6 +677,7 @@ import { ApiProperty as ApiProperty2 } from "@nestjs/swagger";
 import { MergePropertyDecorators as MergePropertyDecorators2 } from "nesties";
 import { Column, Index } from "typeorm";
 import {
+  buildMessage,
   IsDate,
   IsEnum,
   IsInt,
@@ -689,7 +688,9 @@ import {
   Max,
   MaxLength,
   Min,
-  ValidateNested as ValidateNested2
+  ValidateBy,
+  ValidateNested as ValidateNested2,
+  isBase64
 } from "class-validator";
 import { Exclude, Transform, Type as Type2 } from "class-transformer";
 
@@ -839,6 +840,40 @@ var GetMutatorJson = createGetMutator((s) => JSON.parse(s), {
   example: `{"key1":"value1","key2":2,"key3":[1,2,3]}`
 });
 
+// src/utility/base64-binary.ts
+function isBinaryLike(value) {
+  return Buffer.isBuffer(value) || value instanceof Uint8Array || value instanceof ArrayBuffer;
+}
+function binaryToBuffer(value) {
+  if (Buffer.isBuffer(value)) {
+    return value;
+  }
+  if (value instanceof Uint8Array) {
+    return Buffer.from(value.buffer, value.byteOffset, value.byteLength);
+  }
+  return Buffer.from(new Uint8Array(value));
+}
+var Base64BinaryTransformer = class {
+  to(entValue) {
+    if (entValue == null) {
+      return entValue;
+    }
+    if (isBinaryLike(entValue)) {
+      return binaryToBuffer(entValue);
+    }
+    return Buffer.from(String(entValue), "base64");
+  }
+  from(dbValue) {
+    if (dbValue == null) {
+      return dbValue;
+    }
+    if (isBinaryLike(dbValue)) {
+      return binaryToBuffer(dbValue).toString("base64");
+    }
+    return Buffer.from(String(dbValue)).toString("base64");
+  }
+};
+
 // src/decorators/property.ts
 var NotRequiredButHasDefaultDec = () => Metadata.set(
   "notRequiredButHasDefault",
@@ -972,7 +1007,8 @@ var FloatColumn = (type, options = {}) => {
     }
   }
   return MergePropertyDecorators2([
-    Column(type, {
+    Column({
+      type,
       default: options.default,
       unsigned: options.unsigned,
       ...columnDecoratorOptions(options)
@@ -1060,6 +1096,29 @@ var StringJsonColumn = createJsonColumnDef(
   "text",
   TypeTransformerString
 );
+var IsBase64OrBinary = (validationOptions) => ValidateBy(
+  {
+    name: "isBase64OrBinary",
+    validator: {
+      validate: (value) => isBinaryLike(value) || typeof value === "string" && isBase64(value),
+      defaultMessage: buildMessage(
+        (eachPrefix) => `${eachPrefix}$property must be a base64 string or binary data (Buffer / Uint8Array / ArrayBuffer)`,
+        validationOptions
+      )
+    }
+  },
+  validationOptions
+);
+var Base64BinaryColumn = (options = {}) => MergePropertyDecorators2([
+  Column(options.columnType || "bytea", {
+    ...columnDecoratorOptions(options),
+    default: void 0,
+    transformer: new Base64BinaryTransformer()
+  }),
+  IsBase64OrBinary(),
+  validatorDecorator(options),
+  swaggerDecorator(options, { type: String, format: "byte" })
+]);
 var NotColumn = (options = {}, specials = {}) => MergePropertyDecorators2([
   Exclude(),
   swaggerDecorator({
@@ -1283,6 +1342,21 @@ var createQueryOperatorArrayify = (operator, singleFallback) => createQueryArray
 );
 var QueryIn = createQueryOperatorArrayify("IN", "=");
 var QueryNotIn = createQueryOperatorArrayify("NOT IN", "!=");
+var toBase64QueryBuffer = (value) => {
+  if (value == null) {
+    return value;
+  }
+  if (isBinaryLike(value)) {
+    return binaryToBuffer(value);
+  }
+  return Buffer.from(String(value), "base64");
+};
+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 = {}) => {
   const configurationName = options.parser ? `nicot_parser_${options.parser}` : options.configuration || "english";
   const tsQueryFunction = options.tsQueryFunction || "websearch_to_tsquery";
@@ -1994,6 +2068,7 @@ async function getPaginatedResult(qb, entityClass, entityAliasName, take, cursor
 
 // src/crud-base.ts
 import PQueue from "p-queue";
+var existingEntitySelect = () => ({ id: true, deleteTime: true });
 var Relation = (name, options = {}) => {
   return { name, inner: false, ...options };
 };
@@ -2199,7 +2274,7 @@ var CrudBase = class {
               where: {
                 id: In(chunk)
               },
-              select: this.crudOptions.createOrUpdate ? void 0 : ["id", "deleteTime"],
+              select: this.crudOptions.createOrUpdate ? void 0 : existingEntitySelect(),
               withDeleted: true
             })
           )
@@ -2304,7 +2379,7 @@ var CrudBase = class {
       if (ent.id != null) {
         const existingEnt = await repo.findOne({
           where: { id: ent.id },
-          select: this.crudOptions.createOrUpdate ? void 0 : ["id", "deleteTime"],
+          select: this.crudOptions.createOrUpdate ? void 0 : existingEntitySelect(),
           withDeleted: true,
           lock: {
             mode: "pessimistic_write",
@@ -4107,6 +4182,8 @@ TransactionalTypeOrmModule = __decorateClass([
   Module({})
 ], TransactionalTypeOrmModule);
 export {
+  Base64BinaryColumn,
+  Base64BinaryTransformer,
   BindingColumn,
   BindingValue,
   BlankCursorPaginationReturnMessageDto,
@@ -4139,6 +4216,7 @@ export {
   Inner,
   IntColumn,
   InternalColumn,
+  IsBase64OrBinary,
   JsonColumn,
   NotChangeable,
   NotColumn,
@@ -4152,6 +4230,8 @@ export {
   PageSettingsDto,
   PickPipe,
   QueryAnd,
+  QueryBase64Equal,
+  QueryBase64NotEqual,
   QueryColumn,
   QueryCondition,
   QueryEqual,
@@ -4195,8 +4275,10 @@ export {
   applyQueryPropertyLike,
   applyQueryPropertySearch,
   applyQueryPropertyZeroNullable,
+  binaryToBuffer,
   createGetMutator,
   createQueryArrayify,
+  createQueryBase64Operator,
   createQueryCondition,
   createQueryOperator,
   createQueryOperatorArrayify,
@@ -4204,6 +4286,7 @@ export {
   getTransactionalEntityManagerProvider,
   getTransactionalEntityManagerToken,
   getTransactionalRepositoryProvider,
-  getTransactionalRepositoryToken
+  getTransactionalRepositoryToken,
+  isBinaryLike
 };
 //# sourceMappingURL=index.mjs.map