@clairejs/server 3.19.0 → 3.19.1

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.19.0:
+#### 3.19.1:
 
+-   fix ModelRepository getMany
 -   adapt interface with new claire orm
 
 #### 3.18.2:

package/dist/http/controller/CrudHttpController.js

@@ -197,7 +197,6 @@ export class CrudHttpController extends AbstractHttpController {
     async getMany(req) {
         const result = await this.crudRepository.getMany({
             queries: req.getQuery(),
-            queryProvider: this.db,
         });
         return ResponseBuilder.json(result).get();
     }

package/dist/http/repository/DtoRepository.d.ts

@@ -1,8 +1,8 @@
-import { AbstractLogger, AbstractModel, Constructor, CreateManyRequestBody, CreateManyResponseBody, DeepPartial, GetManyQueries, GetManyResponseBody, Identifiable, UpdateManyBody, UpdateManyQueries, UpdateManyResponse } from "@clairejs/core";
-import { AbstractDbAdapter, IQueryProvider, ITransaction, QueryCondition } from "@clairejs/orm";
-import { IPrincipal } from "../../common/auth/IPrincipal";
+import { type Identifiable, type Constructor, type CreateManyRequestBody, type CreateManyResponseBody, type DeepPartial, type GetManyQueries, type GetManyResponseBody, type UpdateManyBody, type UpdateManyQueries, type UpdateManyResponse, AbstractLogger, AbstractModel } from "@clairejs/core";
+import { type ITransaction, type QueryCondition, AbstractDbAdapter } from "@clairejs/orm";
+import { type IPrincipal } from "../../common/auth/IPrincipal";
 import { AbstractRepository } from "./AbstractRepository";
-import { ICrudRepository } from "./ICrudRepository";
+import { type ICrudRepository } from "./ICrudRepository";
 export type DtoDissolver<R extends Identifiable, K extends Identifiable> = (t: DeepPartial<K>) => MappingMetadata<R, any>[];
 export interface MappingMetadata<R extends Identifiable, K extends AbstractModel> {
     multiple: boolean;
@@ -37,7 +37,7 @@ export declare class DtoRepository<T extends Identifiable> extends AbstractRepos
     createMany({ principal, body, tx, logger, }: {
         principal?: IPrincipal | undefined;
         body: CreateManyRequestBody<T>;
-        tx: ITransaction & IQueryProvider;
+        tx: ITransaction;
         logger?: AbstractLogger;
     }): Promise<CreateManyResponseBody<T>>;
     updateMany({ principal, queries, ops, body, tx, logger, }: {
@@ -45,13 +45,13 @@ export declare class DtoRepository<T extends Identifiable> extends AbstractRepos
         queries?: UpdateManyQueries<T>;
         ops?: QueryCondition<T>[];
         body: UpdateManyBody<T>;
-        tx: ITransaction & IQueryProvider;
+        tx: ITransaction;
         logger?: AbstractLogger;
     }): Promise<UpdateManyResponse<T>>;
-    getMany({ queries, ops, queryProvider, logger, }: {
+    getMany({ queries, ops, tx, logger, }: {
         queries?: GetManyQueries<T>;
         ops?: QueryCondition<T>[];
-        queryProvider: IQueryProvider;
+        tx?: ITransaction;
         logger?: AbstractLogger;
     }): Promise<GetManyResponseBody<T>>;
     deleteMany({ queries, ops, tx, logger, }: {

package/dist/http/repository/DtoRepository.js

@@ -61,7 +61,7 @@ export class DtoRepository extends AbstractRepository {
                 const repo = new ModelRepository(mapper.modelClass, this.db);
                 const currentInstances = await repo.getMany({
                     ops: mapper.forwardOps(),
-                    queryProvider: tx,
+                    tx,
                     logger,
                 });
                 return currentInstances.records;
@@ -123,7 +123,7 @@ export class DtoRepository extends AbstractRepository {
             const repo = new ModelRepository(mapper.modelClass, this.db);
             const currentInstances = await repo.getMany({
                 ops: mapper.forwardOps(ops),
-                queryProvider: tx,
+                tx,
                 logger,
             });
             return currentInstances.records;
@@ -173,7 +173,7 @@ export class DtoRepository extends AbstractRepository {
         }
         return { modified: result.id ? this.project([result], projection) : [] };
     }
-    async getMany({ queries, ops, queryProvider, logger, }) {
+    async getMany({ queries, ops, tx, logger, }) {
         //-- check queries for id field
         if (!queries?.fields?.id || queries.fields.id.length !== 1) {
             throw Errors.VALIDATION_ERROR("Missing required id field in query");
@@ -184,7 +184,7 @@ export class DtoRepository extends AbstractRepository {
             //-- forward get
             const instances = await repo.getMany({
                 ops: mapper.forwardOps(ops),
-                queryProvider,
+                tx,
                 logger,
             });
             return instances.records;

package/dist/http/repository/ICrudRepository.d.ts

@@ -1,5 +1,5 @@
 import { type AbstractLogger, type CreateManyRequestBody, type CreateManyResponseBody, type GetManyQueries, type GetManyResponseBody, type UpdateManyBody, type UpdateManyQueries, type UpdateManyResponse } from "@clairejs/core";
-import { type IQueryProvider, type ITransaction, type QueryCondition } from "@clairejs/orm";
+import { type ITransaction, type QueryCondition } from "@clairejs/orm";
 import { type IPrincipal } from "../../common/auth/IPrincipal";
 export interface ICrudRepository<T> {
     createMany({ principal, body, tx, logger, }: {
@@ -8,10 +8,10 @@ export interface ICrudRepository<T> {
         logger?: AbstractLogger;
         principal?: IPrincipal;
     }): Promise<CreateManyResponseBody<T>>;
-    getMany({ queries, ops, queryProvider, logger, }: {
+    getMany({ queries, ops, tx, logger, }: {
         queries?: GetManyQueries<T>;
         ops?: QueryCondition<T>[];
-        queryProvider: IQueryProvider;
+        tx?: ITransaction;
         logger?: AbstractLogger;
     }): Promise<GetManyResponseBody<T>>;
     updateMany({ principal, queries, ops, body, tx, logger, }: {

package/dist/http/repository/ModelRepository.d.ts

@@ -1,5 +1,5 @@
 import { AbstractModel, Constructor, CreateManyRequestBody, CreateManyResponseBody, GetManyQueries, GetManyResponseBody, UpdateManyBody, UpdateManyQueries, UpdateManyResponse, AbstractLogger } from "@clairejs/core";
-import { AbstractDbAdapter, IQueryProvider, ITransaction, QueryCondition } from "@clairejs/orm";
+import { AbstractDbAdapter, ITransaction, QueryCondition } from "@clairejs/orm";
 import { IPrincipal } from "../../common/auth/IPrincipal";
 import { ICrudRepository } from "./ICrudRepository";
 import { AbstractRepository } from "./AbstractRepository";
@@ -27,10 +27,10 @@ export declare class ModelRepository<T extends AbstractModel> extends AbstractRe
         tx: ITransaction;
         logger?: AbstractLogger;
     }): Promise<UpdateManyResponse<T>>;
-    getMany({ queries, ops, queryProvider, logger, }: {
+    getMany({ queries, ops, tx, logger, }: {
         queries?: GetManyQueries<T>;
         ops?: QueryCondition<T>[];
-        queryProvider: IQueryProvider;
+        tx?: ITransaction;
         logger?: AbstractLogger;
     }): Promise<GetManyResponseBody<T>>;
     deleteMany({ queries, ops, tx, logger, }: {

package/dist/http/repository/ModelRepository.js

@@ -1,5 +1,5 @@
 import { DataType, getModelById, getServiceProvider, RangeQueryDto, uniqueReducer, leanData, getSystemLocale, Errors, omitData, } from "@clairejs/core";
-import { getDirectFields } from "@clairejs/orm";
+import { getDirectFields, } from "@clairejs/orm";
 import { AbstractFileUploadHandler } from "../file-upload/AbstractFileUploadHandler";
 import { AbstractRepository } from "./AbstractRepository";
 import { LocaleTranslation } from "../../system/locale/LocaleTranslation";
@@ -280,7 +280,9 @@ export class ModelRepository extends AbstractRepository {
             return data;
         });
         await this.beforeCreating(principal, body.records);
-        let records = body.records.length ? await this.db.use(this.model, tx).createMany(body.records) : [];
+        let records = body.records.length
+            ? await this.db.use(this.model, tx).createMany(body.records)
+            : [];
         await this.beforeReturning(records);
         const projection = this.modelMetadata.fields
             .filter((field) => !field.multiLocaleColumn && (field.pk || field.serverValue || field.mimeProps))
@@ -364,7 +366,9 @@ export class ModelRepository extends AbstractRepository {
         let modified = [];
         let updatedRecords = [];
         if (nestedQueries.length) {
-            const tobeUpdated = await this.db.use(this.model, tx).getMany(condition, { projection: ["id"] }, nestedQueries);
+            const tobeUpdated = await this.db
+                .use(this.model, tx)
+                .getMany(condition, { projection: ["id"] }, nestedQueries);
             modified = tobeUpdated.records.map((r) => r.id);
             if (modified.length) {
                 if (directUpdateFields.length) {
@@ -405,7 +409,9 @@ export class ModelRepository extends AbstractRepository {
                 field: field.name,
             })))
                 .flatMap((arr) => arr);
-            const missingEntries = !missing.length ? [] : await this.db.use(LocaleEntry, tx).createMany(missing.map(() => ({})));
+            const missingEntries = !missing.length
+                ? []
+                : await this.db.use(LocaleEntry, tx).createMany(missing.map(() => ({})));
             const updateEntryRecords = [];
             missingEntries.forEach((entry, index) => {
                 const missingData = missing[index];
@@ -512,7 +518,7 @@ export class ModelRepository extends AbstractRepository {
         await this.beforeReturning(records);
         return { modified: this.project(records, projection) };
     }
-    async getMany({ queries, ops, queryProvider, logger: _logger, }) {
+    async getMany({ queries, ops, tx, logger: _logger, }) {
         const conditions = ops || [];
         if (queries?.fields) {
             conditions.push(...this.getRequestQueryConditionFromQuery(queries.fields, this.modelMetadata));
@@ -535,7 +541,7 @@ export class ModelRepository extends AbstractRepository {
             ...queries.projection.filter((fieldName) => !this.modelMetadata.fields.find((f) => f.name === fieldName && !!f.hasMany)),
             ...localeOfFields.map((f) => f.name),
         ];
-        const result = await queryProvider.use(this.model).getMany(conditions.length ? { _and: conditions } : {}, {
+        const result = await this.db.use(this.model, tx).getMany(conditions.length ? { _and: conditions } : {}, {
             limit: queries?.limit,
             page: queries?.page,
             projection: finalProjection,
@@ -553,12 +559,12 @@ export class ModelRepository extends AbstractRepository {
             ? []
             : !queries?.locale
                 ? //-- if locale is not specified then get translation for all locales
-                    await queryProvider.use(LocaleTranslation).getRecords({
+                    await this.db.use(LocaleTranslation, tx).getRecords({
                         _in: { entryId: allLocaleEntries },
                     }, { projection: ["entryId", "localeCode", "translation"] })
                 : //-- if locale is specified then get only the translation of that locale
                     queries.locale.toLowerCase() !== systemLocale
-                        ? await queryProvider.use(LocaleTranslation).getRecords({
+                        ? await this.db.use(LocaleTranslation, tx).getRecords({
                             _in: { entryId: allLocaleEntries },
                             _eq: { localeCode: queries.locale },
                         }, { projection: ["entryId", "localeCode", "translation"] })
@@ -600,7 +606,7 @@ export class ModelRepository extends AbstractRepository {
                 ? { records: [] }
                 : await service.getMany({
                     queries: { fields: { [field.hasMany.column]: recordIds }, limit: field.hasMany.single ? 1 : 0 },
-                    queryProvider,
+                    tx,
                 });
             //-- filter corresponding inner records for each master record
             for (const record of result.records) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.19.0",
+    "version": "3.19.1",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",