nicot 1.3.7 → 1.4.0

package/README-CN.md

@@ -16,6 +16,25 @@ NICOT 是一个 *Entity-Driven* 的全自动 REST 后端框架。
 
 ---
 
+## 测试
+
+当前测试默认连接本机 PostgreSQL：
+
+- 地址：`localhost:5432`
+- 用户名：`postgres`
+- 密码：`postgres`
+- 数据库：`postgres`
+
+可以直接用项目内的测试 compose 启动：
+
+```bash
+docker compose -f tests/docker-compose.yml up -d
+```
+
+由于 `tests/fulltext.spec.ts` 会使用 `@QueryFullText({ parser: 'zhparser' })`，这里不是普通 `postgres` 镜像，而是带 `zhparser` 扩展的 `zhparser/zhparser:bookworm-16`。
+
+---
+
 ## 快速示例
 
 ```ts

package/README.md

@@ -52,6 +52,22 @@ NICOT targets:
 - NestJS ^9 / ^10 / ^11  
 - TypeORM ^0.3.x
 
+## Testing
+
+The test suite expects PostgreSQL on `localhost:5432` with:
+
+- username: `postgres`
+- password: `postgres`
+- database: `postgres`
+
+Bring up the test database with:
+
+```bash
+docker compose -f tests/docker-compose.yml up -d
+```
+
+This project's full-text tests use `@QueryFullText({ parser: 'zhparser' })`, so the test compose uses `zhparser/zhparser:bookworm-16` instead of the plain `postgres` image.
+
 ---
 
 ## Quick Start

package/dist/index.cjs

@@ -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`;
     }
     exports2.getConnectionToken = getDataSourceToken;
     function getDataSourcePrefix(dataSource = typeorm_constants_1.DEFAULT_DATA_SOURCE_NAME) {
@@ -313,7 +313,7 @@ var require_typeorm_core_module = __commonJS({
           typeOrmModuleOptions
         ];
         const exports3 = [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)));
       }
     };
@@ -674,6 +672,7 @@ __export(index_exports, {
   getTransactionalRepositoryToken: () => getTransactionalRepositoryToken
 });
 module.exports = __toCommonJS(index_exports);
+var import_reflect_metadata = require("reflect-metadata");
 __reExport(index_exports, require("nesties"), module.exports);
 
 // src/dto/import-entry.ts
@@ -1048,7 +1047,8 @@ var FloatColumn = (type, options = {}) => {
     }
   }
   return (0, import_nesties4.MergePropertyDecorators)([
-    (0, import_typeorm.Column)(type, {
+    (0, import_typeorm.Column)({
+      type,
       default: options.default,
       unsigned: options.unsigned,
       ...columnDecoratorOptions(options)
@@ -2059,6 +2059,7 @@ async function getPaginatedResult(qb, entityClass, entityAliasName, take, cursor
 
 // src/crud-base.ts
 var import_p_queue = __toESM(require("p-queue"));
+var existingEntitySelect = () => ({ id: true, deleteTime: true });
 var Relation = (name, options = {}) => {
   return { name, inner: false, ...options };
 };
@@ -2264,7 +2265,7 @@ var CrudBase = class {
               where: {
                 id: (0, import_typeorm8.In)(chunk)
               },
-              select: this.crudOptions.createOrUpdate ? void 0 : ["id", "deleteTime"],
+              select: this.crudOptions.createOrUpdate ? void 0 : existingEntitySelect(),
               withDeleted: true
             })
           )
@@ -2369,7 +2370,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",