@squiz/db-lib 1.12.0-alpha.22 → 1.12.0-alpha.24

package/.npm/_logs/{2023-02-10T04_46_24_264Z-debug-0.log → 2023-02-13T04_16_48_199Z-debug-0.log}

@@ -1,39 +1,39 @@
 0 verbose cli /usr/local/bin/node /usr/local/bin/npm
 1 info using npm@8.19.3
 2 info using node@v16.19.0
-3 timing npm:load:whichnode Completed in 1ms
+3 timing npm:load:whichnode Completed in 0ms
 4 timing config:load:defaults Completed in 2ms
 5 timing config:load:file:/usr/local/lib/node_modules/npm/npmrc Completed in 1ms
 6 timing config:load:builtin Completed in 1ms
-7 timing config:load:cli Completed in 1ms
-8 timing config:load:env Completed in 2ms
+7 timing config:load:cli Completed in 2ms
+8 timing config:load:env Completed in 1ms
 9 info found workspace root at /builds/developer-experience/cmp
-10 timing config:load:file:/builds/developer-experience/cmp/.npmrc Completed in 0ms
-11 timing config:load:project Completed in 29ms
+10 timing config:load:file:/builds/developer-experience/cmp/.npmrc Completed in 1ms
+11 timing config:load:project Completed in 25ms
 12 timing config:load:file:/root/.npmrc Completed in 1ms
 13 timing config:load:user Completed in 1ms
 14 timing config:load:file:/usr/local/etc/npmrc Completed in 0ms
 15 timing config:load:global Completed in 0ms
-16 timing config:load:validate Completed in 2ms
-17 timing config:load:credentials Completed in 1ms
+16 timing config:load:validate Completed in 1ms
+17 timing config:load:credentials Completed in 2ms
 18 timing config:load:setEnvs Completed in 1ms
-19 timing config:load Completed in 41ms
-20 timing npm:load:configload Completed in 41ms
+19 timing config:load Completed in 36ms
+20 timing npm:load:configload Completed in 38ms
 21 timing npm:load:mkdirpcache Completed in 1ms
-22 timing npm:load:mkdirplogs Completed in 0ms
+22 timing npm:load:mkdirplogs Completed in 1ms
 23 verbose title npm run compile
 24 verbose argv "run" "compile" "--"
 25 timing npm:load:setTitle Completed in 2ms
-26 timing config:load:flatten Completed in 4ms
-27 timing npm:load:display Completed in 5ms
+26 timing config:load:flatten Completed in 5ms
+27 timing npm:load:display Completed in 7ms
 28 verbose logfile logs-max:10 dir:/builds/developer-experience/cmp/packages/db-lib/.npm/_logs
-29 verbose logfile /builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-02-10T04_46_24_264Z-debug-0.log
+29 verbose logfile /builds/developer-experience/cmp/packages/db-lib/.npm/_logs/2023-02-13T04_16_48_199Z-debug-0.log
 30 timing npm:load:logFile Completed in 4ms
-31 timing npm:load:timers Completed in 0ms
+31 timing npm:load:timers Completed in 1ms
 32 timing npm:load:configScope Completed in 0ms
-33 timing npm:load Completed in 55ms
+33 timing npm:load Completed in 54ms
 34 silly logfile done cleaning log files
-35 timing command:run Completed in 3518ms
+35 timing command:run Completed in 3627ms
 36 verbose exit 0
-37 timing npm Completed in 3582ms
+37 timing npm Completed in 3691ms
 38 info ok

package/jest.config.ts

@@ -1,10 +1,13 @@
-import type { Config } from 'jest';
-
 import { config as configFunc } from 'dotenv';
-configFunc();
+if ('error' in configFunc()) {
+  configFunc({ path: 'test.env' });
+}
 
 // Sync object
-const config: Config = {
+/**
+ * @type {import('jest').Config}
+ */
+const config: import('jest').Config = {
   preset: 'ts-jest',
   testTimeout: 60_000,
   testEnvironment: 'node',

package/lib/AbstractRepository.d.ts

@@ -17,39 +17,39 @@ export type PageResult<T> = {
 };
 export type SortDirection = 'desc' | 'asc';
 export declare const DEFAULT_PAGE_SIZE = 20;
-export declare abstract class AbstractRepository<T extends object, ObjT extends T> implements Reader<T>, Writer<T> {
+export declare abstract class AbstractRepository<SHAPE extends object, DATA_CLASS extends SHAPE> implements Reader<SHAPE>, Writer<SHAPE> {
     protected repositories: Repositories;
     protected pool: Pool;
     protected classRef: {
-        new (data?: Record<string, unknown>): ObjT;
+        new (data?: Record<string, unknown>): DATA_CLASS;
     };
     protected tableName: string;
     /** object where the key is the model property name amd the value is sql column name */
     protected modelPropertyToSqlColumn: {
-        [key in keyof T]: string;
+        [key in keyof SHAPE]: string;
     };
     /** object where the key is the sql column name and the value is the model property name */
     protected sqlColumnToModelProperty: {
         [key: string]: string;
     };
     constructor(repositories: Repositories, pool: Pool, tableName: string, mapping: {
-        [key in keyof T]: string;
+        [key in keyof SHAPE]: string;
     }, classRef: {
-        new (data?: Record<string, unknown>): ObjT;
+        new (data?: Record<string, unknown>): DATA_CLASS;
     });
     protected getConnection(): Promise<PoolClient>;
-    create(value: ObjT, transactionClient?: PoolClient | null): Promise<T>;
-    update(where: Partial<T>, newValue: Partial<T>, transactionClient?: PoolClient | null): Promise<T[]>;
-    delete(where: Partial<T>, transactionClient?: PoolClient | null): Promise<number>;
-    protected createWhereStringFromPartialModel(values: Partial<T>, initialIndex?: number): string;
+    create(value: DATA_CLASS, transactionClient?: PoolClient | null): Promise<SHAPE>;
+    update(where: Partial<SHAPE>, newValue: Partial<SHAPE>, transactionClient?: PoolClient | null): Promise<SHAPE[]>;
+    delete(where: Partial<SHAPE>, transactionClient?: PoolClient | null): Promise<number>;
+    protected createWhereStringFromPartialModel(values: Partial<SHAPE>, initialIndex?: number): string;
     protected executeQueryRaw(query: string, values: any[], transactionClient?: PoolClient | null): Promise<any[]>;
-    protected executeQuery(query: string, values: any[], transactionClient?: PoolClient | null): Promise<T[]>;
-    protected createAndHydrateModel(row: any): T;
-    findOne(item: Partial<T>): Promise<T | undefined>;
-    find(item: Partial<T>): Promise<T[]>;
-    findAll(): Promise<T[]>;
-    getCount(item?: Partial<T> | null): Promise<number>;
-    getPage(pageNumber: number, sortBy?: (keyof T)[], direction?: SortDirection, pageSize?: number | null, item?: Partial<T> | null): Promise<PageResult<T>>;
+    protected executeQuery(query: string, values: any[], transactionClient?: PoolClient | null): Promise<SHAPE[]>;
+    protected createAndHydrateModel(row: any): SHAPE;
+    findOne(item: Partial<SHAPE>): Promise<SHAPE | undefined>;
+    find(item: Partial<SHAPE>): Promise<SHAPE[]>;
+    findAll(): Promise<SHAPE[]>;
+    getCount(item?: Partial<SHAPE> | null): Promise<number>;
+    getPage(pageNumber: number, sortBy?: (keyof SHAPE)[], direction?: SortDirection, pageSize?: number | null, item?: Partial<SHAPE> | null): Promise<PageResult<SHAPE>>;
     getCountRaw(whereClause?: string, values?: any[], tableRef?: string): Promise<number>;
-    getPageRaw(pageNumber: number, sortBy?: (keyof T)[], direction?: SortDirection, whereClause?: string, tableRef?: string, values?: any[], pageSize?: number | null): Promise<PageResult<T>>;
+    getPageRaw(pageNumber: number, sortBy?: (keyof SHAPE)[], direction?: SortDirection, whereClause?: string, tableRef?: string, values?: any[], pageSize?: number | null): Promise<PageResult<SHAPE>>;
 }

package/lib/AbstractRepository.integration.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/index.js

@@ -35405,36 +35405,19 @@ var AbstractRepository = class {
     return this.getCountRaw(whereClause, item ? Object.values(item) : []);
   }
   async getPage(pageNumber, sortBy = [], direction = "asc", pageSize = null, item = null) {
-    if (pageSize === null) {
-      pageSize = DEFAULT_PAGE_SIZE;
-    }
-    if (pageNumber <= 0) {
-      throw new Error(`Page number value cannot be less than 1`);
-    }
-    if (pageSize <= 0) {
-      throw new Error(`Page size value cannot be less than 1`);
-    }
     let whereClause = "";
     if (item) {
       whereClause = `WHERE ${this.createWhereStringFromPartialModel(item)}`;
     }
-    let orderByClause = "";
-    if (sortBy.length) {
-      orderByClause = `ORDER BY ${sortBy.map((a) => this.modelPropertyToSqlColumn[a]).join(",")} ${direction}`;
-    }
-    const offset = (pageNumber - 1) * pageSize;
-    const items = await this.executeQuery(
-      `SELECT *
-      FROM ${this.tableName} ${whereClause} ${orderByClause}
-      OFFSET ${offset}
-      LIMIT ${pageSize}`,
-      item ? Object.values(item) : []
-    );
-    return {
-      items,
-      totalCount: await this.getCount(item),
+    return this.getPageRaw(
+      pageNumber,
+      sortBy,
+      direction,
+      whereClause,
+      this.tableName,
+      Object.values(item ?? {}),
       pageSize
-    };
+    );
   }
   async getCountRaw(whereClause = "", values = [], tableRef = "") {
     const result = await this.executeQueryRaw(
@@ -35455,7 +35438,7 @@ var AbstractRepository = class {
     }
     let orderByClause = "";
     if (sortBy.length) {
-      orderByClause = `ORDER BY ${sortBy.join(",")} ${direction}`;
+      orderByClause = `ORDER BY ${sortBy.map((a) => this.modelPropertyToSqlColumn[a]).join(",")} ${direction}`;
     }
     const offset = (pageNumber - 1) * pageSize;
     const query = `