pogi 2.10.1 → 3.0.0-beta

package/lib/src/queryWhere.js

@@ -0,0 +1,245 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const pgDbOperators_1 = require("./pgDbOperators");
+const pgDb_1 = require("./pgDb");
+const _ = require("lodash");
+const util = require("util");
+const pgUtils_1 = require("./pgUtils");
+function generateWhere(conditions, fieldTypes, tableName, placeholderOffset = 0, skipUndefined) {
+    let result = generate({
+        params: [],
+        predicates: [],
+        offset: placeholderOffset,
+    }, conditions, fieldTypes, tableName, skipUndefined);
+    return {
+        where: result.predicates.length > 0 ? ' WHERE ' + result.predicates.join(' AND ') : '',
+        params: result.params
+    };
+}
+function generate(result, conditions, fieldTypes, tableName, skipUndefined) {
+    _.each(conditions, (value, key) => {
+        let fieldAndOperator = parseKey(key);
+        if (value === undefined) {
+            if (skipUndefined === true)
+                return;
+            throw new Error('Invalid conditions! Field value undefined: "' + fieldAndOperator.field + '". Either delete the field, set it to null or use the options.skipUndefined parameter.');
+        }
+        else if (fieldAndOperator.field === 'or' || fieldAndOperator.field === 'and') {
+            result = handleOrAnd(result, fieldAndOperator, value, fieldTypes, tableName, skipUndefined);
+        }
+        else if (value === null) {
+            result = handleNullValue(result, fieldAndOperator, value);
+        }
+        else if (Array.isArray(value)) {
+            result = handleArrayValue(result, fieldAndOperator, value, fieldTypes);
+        }
+        else {
+            result = handleSingleValue(result, fieldAndOperator, value, fieldTypes, tableName);
+        }
+    });
+    return result;
+}
+function handleOrAnd(result, fieldAndOperator, value, fieldTypes, tableName, skipUndefined) {
+    if (!Array.isArray(value)) {
+        value = [value];
+    }
+    let groupResult = _.reduce(value, (acc, v) => {
+        let subResult = generate({
+            params: [],
+            predicates: [],
+            offset: result.params.length + acc.offset
+        }, v, fieldTypes, tableName, skipUndefined);
+        acc.predicates.push('(' + subResult.predicates.join(' AND ') + ')');
+        acc.params = acc.params.concat(subResult.params);
+        acc.offset += subResult.params.length;
+        return acc;
+    }, {
+        params: [],
+        predicates: [],
+        offset: result.offset
+    });
+    result.params = result.params.concat(groupResult.params);
+    if (groupResult.predicates.length) {
+        if (fieldAndOperator.field === 'and') {
+            result.predicates.push(util.format('(%s)', groupResult.predicates.join(' AND ')));
+        }
+        else {
+            result.predicates.push(util.format('(%s)', groupResult.predicates.join(' OR ')));
+        }
+    }
+    return result;
+}
+function handleNullValue(result, fieldAndOperator, value) {
+    fieldAndOperator.operator = fieldAndOperator.operator === '=' ? 'IS' : 'IS NOT';
+    result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, value));
+    return result;
+}
+function handleArrayValue(result, fieldAndOperator, value, fieldTypes) {
+    if (fieldAndOperator.mutator) {
+        value = value.map((v) => fieldAndOperator.mutator(v));
+    }
+    let fieldType = fieldTypes[fieldAndOperator.field];
+    let position = '$' + (result.params.length + 1 + result.offset);
+    if (fieldType == pgDb_1.FieldType.JSON &&
+        ['?|', '?&'].indexOf(fieldAndOperator.operator) != -1) {
+        result.params.push(value);
+        result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
+        return result;
+    }
+    else if (fieldType == pgDb_1.FieldType.JSON &&
+        ['@>', '<@', '&&'].indexOf(fieldAndOperator.operator) != -1) {
+        result.params.push(JSON.stringify(value));
+        result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
+        return result;
+    }
+    else if ((!fieldType || fieldType == pgDb_1.FieldType.TIME) &&
+        ['=', '<>', 'IN', 'NOT IN'].includes(fieldAndOperator.operator)) {
+        if (fieldAndOperator.operator === '=' || fieldAndOperator.operator === 'IN') {
+            fieldAndOperator.operator = '= ANY';
+        }
+        else {
+            fieldAndOperator.operator = '<> ALL';
+        }
+        if (value.length === 0) {
+            throw new Error('Invalid conditions! empty array for field:"' + fieldAndOperator.field + '" and operator:"' + fieldAndOperator.operator + '"');
+        }
+        result.params.push(value
+            .map(v => (fieldType == pgDb_1.FieldType.TIME && !(v instanceof Date)) ? new Date(v) : v));
+        result.predicates.push(util.format('%s %s (%s)', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
+        return result;
+    }
+    else if (!fieldType && ['LIKE', 'ILIKE', 'SIMILAR TO', '~', '~*'].indexOf(fieldAndOperator.operator) != -1) {
+        result.params.push(value);
+        result.predicates.push(util.format('%s %s ANY(%s)', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
+        return result;
+    }
+    else if (!fieldType && ['NOT LIKE', 'NOT ILIKE', 'NOT SIMILAR TO', '!~', '!~*'].indexOf(fieldAndOperator.operator) != -1) {
+        result.params.push(value);
+        result.predicates.push(util.format('%s %s ALL(%s)', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
+        return result;
+    }
+    else if (fieldType == pgDb_1.FieldType.ARRAY &&
+        ['=', '<>', '<', '>', '<=', '>=', '@>', '<@', '&&'].indexOf(fieldAndOperator.operator) != -1) {
+        result.params.push(value);
+        result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, position));
+        return result;
+    }
+    throw new Error('[325] Not implemented operator: "' + fieldAndOperator.operator + '" for field ' + fieldAndOperator.field + ' with type ' + fieldType);
+}
+function handleSingleValue(result, fieldAndOperator, value, fieldTypes, tableName) {
+    if (fieldAndOperator.mutator) {
+        value = fieldAndOperator.mutator(value);
+    }
+    let fieldType = fieldTypes[fieldAndOperator.field];
+    if (fieldAndOperator.operator === '@@') {
+        if (typeof value == 'object') {
+            if (!(value.lang || value.language) || !(value.query || value.plainquery)) {
+                throw new Error('[499] only "lang"/"language" and "query/plainquery" properties are supported!');
+            }
+            if (fieldType == pgDb_1.FieldType.TSVECTOR) {
+                result.params.push(value.lang || value.language);
+                result.params.push(value.query || value.plainquery);
+                let template = value.query ? "%s %s to_tsquery($%s, $%s)" : "%s %s plainto_tsquery($%s, $%s)";
+                result.predicates.push(util.format(template, fieldAndOperator.quotedField, fieldAndOperator.operator, result.params.length - 1 + result.offset, result.params.length + result.offset));
+            }
+            else {
+                result.params.push(value.lang || value.language);
+                result.params.push(value.lang || value.language);
+                result.params.push(value.query || value.plainquery);
+                let template = value.query ? "to_tsvector($%s, %s) %s to_tsquery($%s, $%s)" : "to_tsvector($%s, %s) %s plainto_tsquery($%s, $%s)";
+                result.predicates.push(util.format(template, result.params.length - 2 + result.offset, fieldAndOperator.quotedField, fieldAndOperator.operator, result.params.length - 1 + result.offset, result.params.length + result.offset));
+            }
+        }
+        else {
+            result.params.push(value);
+            let template = fieldType == pgDb_1.FieldType.TSVECTOR ? "%s %s plainto_tsquery($%s)" : "to_tsvector(%s) %s plainto_tsquery($%s)";
+            result.predicates.push(util.format(template, fieldAndOperator.quotedField, fieldAndOperator.operator, result.params.length + result.offset));
+        }
+    }
+    else if (fieldType == pgDb_1.FieldType.ARRAY) {
+        if (['=', '<>'].indexOf(fieldAndOperator.operator) != -1) {
+            if (fieldAndOperator.originalOp == '=*') {
+                result.params.push([value]);
+                value = util.format("$%s", result.params.length + result.offset);
+                result.predicates.push(util.format('%s && %s', fieldAndOperator.quotedField, value));
+            }
+            else {
+                result.params.push(value);
+                value = util.format("$%s", result.params.length + result.offset);
+                result.predicates.push(util.format('%s %s ANY(%s)', value, fieldAndOperator.operator, fieldAndOperator.quotedField));
+            }
+        }
+        else if (['LIKE', 'ILIKE', 'NOT LIKE', 'NOT ILIKE', 'SIMILAR TO', 'NOT SIMILAR TO'].indexOf(fieldAndOperator.operator) != -1) {
+            result.params.push(value);
+            value = util.format("$%s", result.params.length + result.offset);
+            let q = 'EXISTS (SELECT * FROM (SELECT UNNEST(' + tableName + '.%s) _el) _arr WHERE _arr._el %s %s)';
+            result.predicates.push(util.format(q, fieldAndOperator.quotedField, fieldAndOperator.operator, value));
+        }
+        else {
+            throw new Error('[326] Not implemented operator: "' + fieldAndOperator.operator + '" for type ' + fieldType);
+        }
+    }
+    else {
+        result.params.push((fieldType == pgDb_1.FieldType.TIME && !(value instanceof Date)) ? new Date(value) : value);
+        value = util.format("$%s", result.params.length + result.offset);
+        result.predicates.push(util.format('%s %s %s', fieldAndOperator.quotedField, fieldAndOperator.operator, value));
+    }
+    return result;
+}
+function strip(arr) {
+    return arr.map((s) => s.trim()).filter(v => v != '');
+}
+function getOp(str) {
+    for (let i = 0; i < str.length; i++) {
+        if (pgDbOperators_1.default[str.substr(i)]) {
+            return str.substr(i);
+        }
+    }
+    return '';
+}
+function parseKey(key) {
+    var _a;
+    key = key.trim();
+    let userOp = getOp(key);
+    if (userOp) {
+        key = key.substr(0, key.length - userOp.length);
+    }
+    let operation = pgDbOperators_1.default[userOp] || {};
+    let jsonRegexp = /(->[^>]|->>|#>[^>]|#>>)/;
+    let field;
+    let quotedField;
+    let quotedByUser = key.indexOf('"') > -1;
+    if (quotedByUser) {
+        quotedField = key;
+        field = (_a = /[^"]*"([^"]*)".*/.exec(key)) === null || _a === void 0 ? void 0 : _a[1];
+        if (!quotedField || !field) {
+            throw new Error('Invalid field:' + key);
+        }
+    }
+    else {
+        let parts = strip(key.split(jsonRegexp));
+        field = parts.shift();
+        if (!field) {
+            throw new Error('Invalid field:' + key);
+        }
+        quotedField = pgUtils_1.pgUtils.quoteFieldName(field);
+        if (parts.length > 1) {
+            let jsonOp = parts.shift();
+            let jsonKey = parts.shift();
+            jsonKey = pgUtils_1.pgUtils.quoteFieldNameJsonbOrPosition(jsonKey);
+            quotedField = util.format('%s%s%s', quotedField, jsonOp, jsonKey);
+        }
+    }
+    if (operation.fieldMutator) {
+        quotedField = operation.fieldMutator(field, quotedField);
+    }
+    return {
+        field: field,
+        quotedField: quotedField,
+        operator: (operation.operator || '=').toUpperCase(),
+        mutator: operation.mutator,
+        originalOp: userOp
+    };
+}
+exports.default = generateWhere;
+//# sourceMappingURL=queryWhere.js.map

package/lib/src/queryWhere.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryWhere.js","sourceRoot":"","sources":["../../src/queryWhere.ts"],"names":[],"mappings":"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"}

package/mkdocs.yml

@@ -12,6 +12,7 @@ pages:
 - Mapping database types : mappingDatabaseTypes.md
 - Transaction : transaction.md
 - Stream : streams.md
+- Notification : notification.md
 - FAQ : faq.md
 - Known pitfalls : pitfalls.md
 - API :

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "pogi",
-  "version": "2.10.1",
+  "version": "3.0.0-beta",
   "description": "An easy PostgreSQL query handler on top of pg.js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc -p src/tsconfig.json",
+    "build": "tsc -p ./tsconfig.json",
     "test": "node spec/run.js",
     "test_debug": "node --inspect-brk=9229 spec/run.js",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post",
@@ -26,21 +26,30 @@
     "pg"
   ],
   "dependencies": {
-    "handlebars": "^4.7.3",
-    "lodash": "^4.17.15",
+    "handlebars": "^4.7.6",
+    "lodash": "^4.17.20",
     "minimatch": "^3.0.4",
-    "moment": "^2.15.1",
-    "pg": "8.2.1",
-    "pg-query-stream": "^3.1.1",
+    "moment": "^2.29.1",
+    "pg": "^8.7.1",
+    "pg-query-stream": "^4.2.1",
     "through": "~2.3.8",
-    "tslib": "^1.11.0"
+    "tslib": "^2.3.1"
   },
   "devDependencies": {
-    "@types/jasmine": "~2.5.35",
-    "@types/node": "^11.15.7",
-    "jasmine": "^3.5.0",
-    "semantic-release": "^17.2.3",
-    "typescript": "^3.9.3"
+    "@types/jasmine": "^3.10.3",
+    "@types/lodash": "^4.14.178",
+    "@types/node": "^17.0.12",
+    "@types/pg": "^8.6.4",
+    "@types/through": "^0.0.30",
+    "@types/yargs": "^17.0.8",
+    "dotenv": "^14.3.2",
+    "jasmine": "^4.0.2",
+    "jest": "^27.4.7",
+    "semantic-release": "^19.0.2",
+    "shelljs": "^0.8.5",
+    "ts-jest": "^27.1.3",
+    "typescript": "^4.5.5",
+    "yargs": "^17.3.1"
   },
   "author": "Laszlo Radics<laszlo.radics@labcup.net>, Geza Radics<radicsge@protonmail.com>",
   "license": "MIT",
@@ -59,4 +68,4 @@
       "path": "./node_modules/semantic-release/src/lib/plugin-noop.js"
     }
   }
-}
+}

package/src/bin/generateInterface.ts

@@ -16,7 +16,7 @@ import {PgTable} from "../pgTable";
 
         for (let schemaName in pgdb.schemas) {
             if (!(pgdb[schemaName] instanceof PgSchema)) {
-                throw Error('Already existing property: ' + schemaName + '!');
+                throw new Error('Already existing property: ' + schemaName + '!');
             }
             console.log(`    '${schemaName}': PgSchema_${schemaName};`); //need to add a PgSchema_ prefix in order to handle schemas starting with number
         }
@@ -32,7 +32,7 @@ import {PgTable} from "../pgTable";
             console.log(`export interface PgSchema_${schemaName} extends PgSchema {`);
             for (let tableName in pgdb.schemas[schemaName].tables) {
                 if (!(pgdb[schemaName][tableName] instanceof PgTable)) {
-                    throw Error('Already existing property: ' + tableName + ' on schema:' + schemaName + '!');
+                    throw new Error('Already existing property: ' + tableName + ' on schema:' + schemaName + '!');
                 }
                 console.log(`    '${tableName}': PgTable<any>;`);
             }

package/src/connectionOptions.ts

@@ -1,8 +1,8 @@
-import {PgDbLogger} from './pgDbLogger';
+import { PgDbLogger } from './pgDbLogger';
 
 /**
  * @property connectionString e.g.: "postgres://user@localhost/database"
- * @property user can be specified through PGHOST env variable
+ * @property host can be specified through PGHOST env variable
  * @property user can be specified through PGUSER env variable (defaults USER env var)
  * @property database can be specified through PGDATABASE env variable (defaults USER env var)
  * @property password can be specified through PGPASSWORD env variable
@@ -12,18 +12,35 @@ import {PgDbLogger} from './pgDbLogger';
  * @property logSQLDetailsOnError - log sql and params in case of sql error (this might contain sensitive information)
  */
 export interface ConnectionOptions {
-    host?: string; //host can be specified through PGHOST env variable (defaults USER env var)
-    user?: string; //user can be specified through PGUSER env variable (defaults USER env var)
-    database?: string; // can be specified through PGDATABASE env variable (defaults USER env var)
-    password?: string; // can be specified through PGPASSWORD env variable
-    port?: number; // can be specified through PGPORT env variable
+    /** host can be specified through PGHOST env variable (defaults USER env var) */
+    host?: string;
+    /** user can be specified through PGUSER env variable (defaults USER env var) */
+    user?: string;
+    /** can be specified through PGDATABASE env variable (defaults USER env var) */
+    database?: string;
+    /** can be specified through PGPASSWORD env variable */
+    password?: string;
+    /** can be specified through PGPORT env variable */
+    port?: number;
     poolSize?: number;
 
+    /**
+     * Turn on some basic sql injection protection
+     */
+    forceEscapeColumns?: boolean | {
+        select?: boolean
+        where?: boolean
+        orderBy?: boolean
+        groupBy?: boolean
+        //warningOnly?: boolean
+    }
+
     //number of rows to return at a time from a prepared statement's portal. 0 will return all rows at once
     rows?: number;
-
-    min?: number; //set min pool size
-    max?: number; //set pool max size
+    /** set min pool size */
+    min?: number;
+    /** set pool max size */
+    max?: number;
 
     binary?: boolean;
     poolIdleTimeout?: number;
@@ -31,12 +48,28 @@ export interface ConnectionOptions {
     poolLog?: boolean;
     client_encoding?: string;
     ssl?: boolean | any; //| TlsOptions;
-    application_name?: string; //default:process.env.PGAPPNAME - name displayed in the pg_stat_activity view and included in CSV log entries
+    /** default:process.env.PGAPPNAME - name displayed in the pg_stat_activity view and included in CSV log entries */
+    application_name?: string;
     fallback_application_name?: string;
     parseInputDatesAsUTC?: boolean;
+    /** e.g.: "postgres://user@localhost/database" */
     connectionString?: string;
-    idleTimeoutMillis?: number; // how long a client is allowed to remain idle before being closed
+    /** how long a client is allowed to remain idle before being closed */
+    idleTimeoutMillis?: number;
 
     logger?: PgDbLogger;
-    skipUndefined?: 'all' | 'select' | 'none'; // if there is a undefined value in the condition, what should pogi do. Default is 'none', meaning raise error if a value is undefined.
+    /** if there is a undefined value in the condition, what should pogi do. Default is 'none', meaning raise error if a value is undefined. */
+    skipUndefined?: 'all' | 'select' | 'none';
+
+    /** 
+     * escape all ddl parameter (select, from, where, order by, group by, ...), default: true 
+     * notes:
+     * - insert statements columns are always quoted
+     * - update statements "SET" columns are always quoted
+     * */
+    strictDdl?: boolean,
+    /** escape all "SELECT" ddl parameter, default: true */
+    strictDdlSelect?: boolean,
+    /** escape all "WHERE" ddl parameter, default: true */
+    strictDdlWhere?: boolean,
 }

package/src/index.d.ts

@@ -0,0 +1,7 @@
+import * as pg from 'pg';
+
+declare module 'pg' {
+    export interface PoolClient {
+        processID: string,
+    }
+}

package/src/pgConverters.test.ts

@@ -0,0 +1,10 @@
+import { parseArray } from "./pgConverters";
+
+describe("pgConverters.test", () => {
+    it("parseArray", async () => {
+        expect(parseArray('{}')).toEqual([]);
+        expect(parseArray('{1,2}')).toEqual(['1', '2']);
+        expect(parseArray('{NULL,""}')).toEqual([null, '']);
+        expect(parseArray('{"\\\\","\\""}')).toEqual(['\\', '"']);
+    });
+});

package/src/pgConverters.ts

@@ -1,46 +1,58 @@
 import * as moment from 'moment';
 
 //--- add parsing for array types --------------------------------
-export let arraySplit = (str) => {
-    if (str == "{}") return [];
-    str = str.substring(1, str.length - 1); //cut off {}
+export function parseArray(s: string): (string | null)[] {
+    if (!s || s[0] !== '{' || s[s.length - 1] !== '}') throw new Error('Invalid array value:' + s);
+    if (s == "{}") return [];
+    s = s.slice(1, s.length - 1); //cut off {}
     let e = /(?:("(?:[^"\\]|\\.)*")|([^,"]*))(?:,|$)/g; //has to be mutable because of exec
-    let valList = [];
+    let valList: (string | null)[] = [];
     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])); // for string parsing, escape \
         valList.push(valStr);
-    } while (e.lastIndex < str.length);
+    } while (e.lastIndex < s.length);
     return valList;
 };
-export let numWithValidation = val => {
-    if (val === 'NULL'){
+
+export function parseNumberWithValidation(s: string): number | null {
+    if (s === 'NULL') {
         return null;
     }
-    let v = +val;
+    let v = +s;
     if (v > Number.MAX_SAFE_INTEGER || v < Number.MIN_SAFE_INTEGER) {
-        throw Error("Number can't be represented in javascript precisely: " + val);
+        throw new Error("Number can't be represented in javascript precisely: " + s);
     }
     return v;
 };
-export let numberOrNull = val => {
-    if (val === 'NULL'){
+
+export function parseNumberOrNull(s: string): number | null {
+    if (s === 'NULL') {
         return null;
     }
-    return +val;
+    return +s;
 };
-export let arraySplitToNum = val => val == "{}" ? [] : val.substring(1, val.length - 1).split(',').map(numberOrNull);
-export let arraySplitToNumWithValidation = val => val == "{}" ? [] : val.substring(1, val.length - 1).split(',').map(numWithValidation);
-export let stringArrayToNumWithValidation = val => val.map(numWithValidation);
-export let arraySplitToDate = val => val == "{}" ? [] : val.substring(1, val.length - 1).split(',').map(d => d == 'NULL' ? null : moment(d.substring(1, d.length - 1)).toDate());
-export let arraySplitToJson = (str) => {
-    let vals = arraySplit(str);
-    return vals.map(s=> typeof s === 'string' ? JSON.parse(s) : s);
+
+export function parseBoolOrNull(s: string): boolean | null {
+    if (s === 'NULL') {
+        return null;
+    }
+    return s == 't';
+}
+
+export let parseBooleanArray = (s: string): (boolean | null)[] => s == "{}" ? [] : s.substring(1, s.length - 1).split(',').map(parseBoolOrNull);
+export let parseNumberArray = (s: string): (number | null)[] => s == "{}" ? [] : s.substring(1, s.length - 1).split(',').map(parseNumberOrNull);
+export let parseNumberArrayWithValidation = (s: string[]) => s.map(parseNumberWithValidation);
+export let parseDateArray = (s: string): (Date | null)[] => s == "{}" ? [] : s.substring(1, s.length - 1).split(',').map(d => d == 'NULL' ? null : moment(d.substring(1, d.length - 1)).toDate());
+export let parseJsonArray = (s: string): (Object | null)[] => {
+    let vals = parseArray(s);
+    return vals.map(s2 => typeof s2 === 'string' ? JSON.parse(s2) : s2);
 };
 
-function unescapeString(s) {
+function unescapeString(s: string): string {
     return s.slice(1, s.length - 1)    // cut the first and the last "
         .replace(/\\"/g, '"')          // \" -> "
         .replace(/\\\\/g, '\\')        // \\ -> \