pogi 3.0.0-beta → 3.0.0-beta2

package/lib/bin/generateInterface.js

@@ -5,7 +5,7 @@ const pgDb_1 = require("../pgDb");
 const pgSchema_1 = require("../pgSchema");
 const pgTable_1 = require("../pgTable");
 (function () {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         try {
             let pgdb = yield pgDb_1.PgDb.connect({
                 logger: {

package/lib/connectionOptions.d.ts

@@ -1,4 +1,10 @@
 import { PgDbLogger } from './pgDbLogger';
+export interface ForceEscapeColumnsOptions {
+    select?: boolean;
+    where?: boolean;
+    orderBy?: boolean;
+    groupBy?: boolean;
+}
 export interface ConnectionOptions {
     host?: string;
     user?: string;
@@ -6,6 +12,7 @@ export interface ConnectionOptions {
     password?: string;
     port?: number;
     poolSize?: number;
+    forceEscapeColumns?: boolean | ForceEscapeColumnsOptions;
     rows?: number;
     min?: number;
     max?: number;
@@ -22,4 +29,7 @@ export interface ConnectionOptions {
     idleTimeoutMillis?: number;
     logger?: PgDbLogger;
     skipUndefined?: 'all' | 'select' | 'none';
+    strictDdl?: boolean;
+    strictDdlSelect?: boolean;
+    strictDdlWhere?: boolean;
 }

package/lib/index.d.ts

@@ -3,4 +3,4 @@ export { ConnectionOptions } from './connectionOptions';
 export { PgDbLogger } from './pgDbLogger';
 export { PgTable } from './pgTable';
 export { PgSchema } from './pgSchema';
-export { QueryOptions } from './queryAble';
+export { QueryOptions } from './queryAbleInterface';

package/lib/pgConverters.d.ts

@@ -1,10 +1,9 @@
-export declare let arraySplit: (str: any) => any[];
-export declare let numWithValidation: (val: any) => number;
-export declare let numberOrNull: (val: any) => number;
-export declare let boolOrNull: (val: any) => boolean;
-export declare let arraySplitToBool: (val: any) => any;
-export declare let arraySplitToNum: (val: any) => any;
-export declare let arraySplitToNumWithValidation: (val: any) => any;
-export declare let stringArrayToNumWithValidation: (val: any) => any;
-export declare let arraySplitToDate: (val: any) => any;
-export declare let arraySplitToJson: (str: any) => any[];
+export declare function parseArray(s: string): (string | null)[];
+export declare function parseNumberWithValidation(s: string): number | null;
+export declare function parseNumberOrNull(s: string): number | null;
+export declare function parseBoolOrNull(s: string): boolean | null;
+export declare let parseBooleanArray: (s: string) => (boolean | null)[];
+export declare let parseNumberArray: (s: string) => (number | null)[];
+export declare let parseNumberArrayWithValidation: (s: string[]) => (number | null)[];
+export declare let parseDateArray: (s: string) => (Date | null)[];
+export declare let parseJsonArray: (s: string) => (Object | null)[];

package/lib/pgConverters.js

@@ -1,63 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.arraySplitToJson = exports.arraySplitToDate = exports.stringArrayToNumWithValidation = exports.arraySplitToNumWithValidation = exports.arraySplitToNum = exports.arraySplitToBool = exports.boolOrNull = exports.numberOrNull = exports.numWithValidation = exports.arraySplit = void 0;
+exports.parseJsonArray = exports.parseDateArray = exports.parseNumberArrayWithValidation = exports.parseNumberArray = exports.parseBooleanArray = exports.parseBoolOrNull = exports.parseNumberOrNull = exports.parseNumberWithValidation = exports.parseArray = void 0;
 const moment = require("moment");
-let arraySplit = (str) => {
-    if (str == "{}")
+function parseArray(s) {
+    if (!s || s[0] !== '{' || s[s.length - 1] !== '}')
+        throw new Error('Invalid array value:' + s);
+    if (s == "{}")
         return [];
-    str = str.substring(1, str.length - 1);
+    s = s.slice(1, s.length - 1);
     let e = /(?:("(?:[^"\\]|\\.)*")|([^,"]*))(?:,|$)/g;
     let valList = [];
     let parsingResult;
     do {
-        parsingResult = e.exec(str);
-        let valStr = (parsingResult[2] == 'NULL') ? null :
+        parsingResult = e.exec(s);
+        if (!parsingResult)
+            throw new Error('Invalid array value:' + s);
+        let valStr = (parsingResult[2] === 'NULL') ? null :
             (parsingResult[1] == null ? parsingResult[2] : unescapeString(parsingResult[1]));
         valList.push(valStr);
-    } while (e.lastIndex < str.length);
+    } while (e.lastIndex < s.length);
     return valList;
-};
-exports.arraySplit = arraySplit;
-let numWithValidation = val => {
-    if (val === 'NULL') {
+}
+exports.parseArray = parseArray;
+;
+function parseNumberWithValidation(s) {
+    if (s === 'NULL') {
         return null;
     }
-    let v = +val;
+    let v = +s;
     if (v > Number.MAX_SAFE_INTEGER || v < Number.MIN_SAFE_INTEGER) {
-        throw new Error("Number can't be represented in javascript precisely: " + val);
+        throw new Error("Number can't be represented in javascript precisely: " + s);
     }
     return v;
-};
-exports.numWithValidation = numWithValidation;
-let numberOrNull = val => {
-    if (val === 'NULL') {
+}
+exports.parseNumberWithValidation = parseNumberWithValidation;
+;
+function parseNumberOrNull(s) {
+    if (s === 'NULL') {
         return null;
     }
-    return +val;
-};
-exports.numberOrNull = numberOrNull;
-let boolOrNull = val => {
-    if (val === 'NULL') {
+    return +s;
+}
+exports.parseNumberOrNull = parseNumberOrNull;
+;
+function parseBoolOrNull(s) {
+    if (s === 'NULL') {
         return null;
     }
-    return val == 't';
-};
-exports.boolOrNull = boolOrNull;
-let arraySplitToBool = val => val == "{}" ? [] : val.substring(1, val.length - 1).split(',').map(exports.boolOrNull);
-exports.arraySplitToBool = arraySplitToBool;
-let arraySplitToNum = val => val == "{}" ? [] : val.substring(1, val.length - 1).split(',').map(exports.numberOrNull);
-exports.arraySplitToNum = arraySplitToNum;
-let arraySplitToNumWithValidation = val => val == "{}" ? [] : val.substring(1, val.length - 1).split(',').map(exports.numWithValidation);
-exports.arraySplitToNumWithValidation = arraySplitToNumWithValidation;
-let stringArrayToNumWithValidation = val => val.map(exports.numWithValidation);
-exports.stringArrayToNumWithValidation = stringArrayToNumWithValidation;
-let arraySplitToDate = val => val == "{}" ? [] : val.substring(1, val.length - 1).split(',').map(d => d == 'NULL' ? null : moment(d.substring(1, d.length - 1)).toDate());
-exports.arraySplitToDate = arraySplitToDate;
-let arraySplitToJson = (str) => {
-    let vals = exports.arraySplit(str);
-    return vals.map(s => typeof s === 'string' ? JSON.parse(s) : s);
+    return s == 't';
+}
+exports.parseBoolOrNull = parseBoolOrNull;
+let parseBooleanArray = (s) => s == "{}" ? [] : s.substring(1, s.length - 1).split(',').map(parseBoolOrNull);
+exports.parseBooleanArray = parseBooleanArray;
+let parseNumberArray = (s) => s == "{}" ? [] : s.substring(1, s.length - 1).split(',').map(parseNumberOrNull);
+exports.parseNumberArray = parseNumberArray;
+let parseNumberArrayWithValidation = (s) => s.map(parseNumberWithValidation);
+exports.parseNumberArrayWithValidation = parseNumberArrayWithValidation;
+let parseDateArray = (s) => s == "{}" ? [] : s.substring(1, s.length - 1).split(',').map(d => d == 'NULL' ? null : moment(d.substring(1, d.length - 1)).toDate());
+exports.parseDateArray = parseDateArray;
+let parseJsonArray = (s) => {
+    let vals = parseArray(s);
+    return vals.map(s2 => typeof s2 === 'string' ? JSON.parse(s2) : s2);
 };
-exports.arraySplitToJson = arraySplitToJson;
+exports.parseJsonArray = parseJsonArray;
 function unescapeString(s) {
     return s.slice(1, s.length - 1)
         .replace(/\\"/g, '"')

package/lib/pgConverters.js.map

@@ -1 +1 @@
-{"version":3,"file":"pgConverters.js","sourceRoot":"","sources":["../src/pgConverters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pgConverters.js","sourceRoot":"","sources":["../src/pgConverters.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAGjC,SAAgB,UAAU,CAAC,CAAS;IAChC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,CAAC,CAAC;IAC/F,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,EAAE,CAAC;IACzB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7B,IAAI,CAAC,GAAG,0CAA0C,CAAC;IACnD,IAAI,OAAO,GAAsB,EAAE,CAAC;IACpC,IAAI,aAAa,CAAC;IAClB,GAAG;QACC,aAAa,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,CAAC,CAAC;QAChE,IAAI,MAAM,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACxB,QAAQ,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,MAAM,EAAE;IACjC,OAAO,OAAO,CAAC;AACnB,CAAC;AAfD,gCAeC;AAAA,CAAC;AAEF,SAAgB,yBAAyB,CAAC,CAAS;IAC/C,IAAI,CAAC,KAAK,MAAM,EAAE;QACd,OAAO,IAAI,CAAC;KACf;IACD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACX,IAAI,CAAC,GAAG,MAAM,CAAC,gBAAgB,IAAI,CAAC,GAAG,MAAM,CAAC,gBAAgB,EAAE;QAC5D,MAAM,IAAI,KAAK,CAAC,uDAAuD,GAAG,CAAC,CAAC,CAAC;KAChF;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AATD,8DASC;AAAA,CAAC;AAEF,SAAgB,iBAAiB,CAAC,CAAS;IACvC,IAAI,CAAC,KAAK,MAAM,EAAE;QACd,OAAO,IAAI,CAAC;KACf;IACD,OAAO,CAAC,CAAC,CAAC;AACd,CAAC;AALD,8CAKC;AAAA,CAAC;AAEF,SAAgB,eAAe,CAAC,CAAS;IACrC,IAAI,CAAC,KAAK,MAAM,EAAE;QACd,OAAO,IAAI,CAAC;KACf;IACD,OAAO,CAAC,IAAI,GAAG,CAAC;AACpB,CAAC;AALD,0CAKC;AAEM,IAAI,iBAAiB,GAAG,CAAC,CAAS,EAAsB,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAArI,QAAA,iBAAiB,qBAAoH;AACzI,IAAI,gBAAgB,GAAG,CAAC,CAAS,EAAqB,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAArI,QAAA,gBAAgB,oBAAqH;AACzI,IAAI,8BAA8B,GAAG,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AAAnF,QAAA,8BAA8B,kCAAqD;AACvF,IAAI,cAAc,GAAG,CAAC,CAAS,EAAmB,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;AAAvL,QAAA,cAAc,kBAAyK;AAC3L,IAAI,cAAc,GAAG,CAAC,CAAS,EAAqB,EAAE;IACzD,IAAI,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACzB,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACxE,CAAC,CAAC;AAHS,QAAA,cAAc,kBAGvB;AAEF,SAAS,cAAc,CAAC,CAAS;IAC7B,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAC/B,CAAC"}

package/lib/pgConverters.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pgConverters.test.js","sourceRoot":"","sources":["../src/pgConverters.test.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAE5C,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,YAAY,EAAE,GAAS,EAAE;QACxB,MAAM,CAAC,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrC,MAAM,CAAC,IAAA,yBAAU,EAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,IAAA,yBAAU,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,IAAA,yBAAU,EAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/lib/pgDb.d.ts

@@ -1,6 +1,8 @@
-import { QueryAble, ResultFieldType, IPgDb, PostProcessResultFunc } from "./queryAble";
+import { QueryAble } from "./queryAble";
+import { IPgDb, ResultFieldType, PostProcessResultFunc, Notification, TranzactionIsolationLevel } from "./pgDbInterface";
 import { PgTable } from "./pgTable";
 import { PgSchema } from "./pgSchema";
+import * as pg from 'pg';
 import { PgDbLogger } from './pgDbLogger';
 import { ConnectionOptions } from './connectionOptions';
 export declare enum FieldType {
@@ -9,26 +11,15 @@ export declare enum FieldType {
     TIME = 2,
     TSVECTOR = 3
 }
-export declare enum TranzactionIsolationLevel {
-    serializable = "SERIALIZABLE",
-    repeatableRead = "REPEATABLE READ",
-    readCommitted = "READ COMMITTED",
-    readUncommitted = "READ UNCOMMITTED"
-}
-export interface Notification {
-    processId: number;
-    channel: string;
-    payload?: string;
-}
 export declare class PgDb extends QueryAble implements IPgDb {
     protected static instances: {
         [index: string]: Promise<PgDb>;
     };
-    pool: any;
-    connection: any;
+    pool: pg.Pool;
+    connection: pg.PoolClient | null;
     config: ConnectionOptions;
-    defaultSchemas: any;
-    db: PgDb;
+    defaultSchemas: string[];
+    db: IPgDb;
     schemas: {
         [name: string]: PgSchema;
     };
@@ -36,14 +27,14 @@ export declare class PgDb extends QueryAble implements IPgDb {
         [name: string]: PgTable<any>;
     };
     fn: {
-        [name: string]: (...any: any[]) => any;
+        [name: string]: (...args: any[]) => any;
     };
     [name: string]: any | PgSchema;
-    pgdbTypeParsers: Record<string, (string: any) => any>;
+    pgdbTypeParsers: Record<string, (s: any) => any>;
     knownOids: Record<number, boolean>;
-    postProcessResult: PostProcessResultFunc;
+    postProcessResult: PostProcessResultFunc | undefined | null;
     private constructor();
-    setPostProcessResult(f: (res: any[], fields: ResultFieldType[], logger: PgDbLogger) => void): void;
+    setPostProcessResult(f: null | ((res: any[], fields: ResultFieldType[], logger: PgDbLogger) => void)): void;
     static getInstance(config: ConnectionOptions): Promise<PgDb>;
     close(): Promise<void>;
     static connect(config: ConnectionOptions): Promise<PgDb>;
@@ -52,9 +43,9 @@ export declare class PgDb extends QueryAble implements IPgDb {
     private initSchemasAndTables;
     private setDefaultTablesAndFunctions;
     private initFieldTypes;
-    setTypeParser(typeName: string, parser: (string: any) => any, schemaName?: string): Promise<void>;
-    setPgDbTypeParser(typeName: string, parser: (string: any) => any, schemaName?: string): Promise<void>;
-    resetMissingParsers(connection: any, oidList: number[]): Promise<void>;
+    setTypeParser(typeName: string, parser: (s: string) => any, schemaName?: string): Promise<void>;
+    setPgDbTypeParser(typeName: string, parser: (s: string) => any, schemaName?: string): Promise<void>;
+    resetMissingParsers(connection: pg.PoolClient, oidList: number[]): Promise<void>;
     dedicatedConnectionBegin(): Promise<PgDb>;
     dedicatedConnectionEnd(): Promise<PgDb>;
     savePoint(name: string): Promise<PgDb>;
@@ -69,19 +60,19 @@ export declare class PgDb extends QueryAble implements IPgDb {
         savePoint?: string;
     }): Promise<PgDb>;
     isTransactionActive(): boolean;
-    execute(fileName: string, statementTransformerFunction?: (string: any) => string): Promise<void>;
+    execute(fileName: string, statementTransformerFunction?: (s: string) => string): Promise<void>;
     private listeners;
     private connectionForListen;
     private _needToRestartConnectionForListen;
     private restartConnectionForListen;
     listen(channel: string, callback: (notification: Notification) => void): Promise<void>;
-    unlisten(channel: string, callback?: (Notification: any) => void): Promise<void>;
+    unlisten(channel: string, callback?: (notification: Notification) => void): Promise<void>;
     notify(channel: string, payload?: string): Promise<any[]>;
-    runRestartConnectionForListen(): Promise<Error>;
+    runRestartConnectionForListen(): Promise<Error | null>;
     needToFixConnectionForListen(): boolean;
     private tryToFixConnectionForListenActively;
     notificationListener: (notification: Notification) => boolean;
-    errorListener: (e: any) => void;
+    errorListener: (e: Error) => void;
     private initConnectionForListen;
 }
 export default PgDb;