@sqb/builder 4.0.1-beta.7 → 4.0.2

package/dist/{sql-objects/sqlobject.initializers.d.ts → sqlobject.initializers.d.ts}

@@ -1,14 +1,15 @@
-import { DataType } from '../enums';
-import { Serializable } from '../Serializable';
-import { SelectQuery } from '../query/SelectQuery';
-import { InsertQuery } from '../query/InsertQuery';
-import { UpdateQuery } from '../query/UpdateQuery';
-import { DeleteQuery } from '../query/DeleteQuery';
-import { RawStatement } from './RawStatement';
-import { JoinStatement } from './JoinStatement';
-import { CaseStatement } from './CaseStatement';
-import { CountStatement } from './CountStatement';
-import { ParamExpression } from './ParamExpression';
+import { DataType } from './enums';
+import { Serializable } from './Serializable';
+import { SelectQuery } from './query/SelectQuery';
+import { InsertQuery } from './query/InsertQuery';
+import { UpdateQuery } from './query/UpdateQuery';
+import { DeleteQuery } from './query/DeleteQuery';
+import { RawStatement } from './sql-objects/RawStatement';
+import { JoinStatement } from './sql-objects/JoinStatement';
+import { CaseStatement } from './sql-objects/CaseStatement';
+import { CountStatement } from './sql-objects/CountStatement';
+import { ParamExpression } from './sql-objects/ParamExpression';
+import { FieldExpression } from './sql-objects/FieldExpression';
 export declare function Raw(text: string): RawStatement;
 export declare function Select(...column: (string | string[] | Serializable)[]): SelectQuery;
 export declare function Insert(tableName: string | RawStatement, input: any): InsertQuery;
@@ -24,8 +25,15 @@ export declare function OuterJoin(table: string | SelectQuery | RawStatement): J
 export declare function FullOuterJoin(table: string | SelectQuery | RawStatement): JoinStatement;
 export declare function Case(): CaseStatement;
 export declare function Count(): CountStatement;
-export declare function Param(arg: string | {
+export declare function Param(name: string, dataType?: DataType, isArray?: boolean): ParamExpression;
+export declare function Param(args: {
     name: string;
     dataType?: DataType;
     isArray?: boolean;
 }): ParamExpression;
+export declare function Field(name: string, dataType?: DataType, isArray?: boolean): FieldExpression;
+export declare function Field(args: {
+    name: string;
+    dataType?: DataType;
+    isArray?: boolean;
+}): FieldExpression;

package/dist/{sql-objects/sqlobject.initializers.js → sqlobject.initializers.js}

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Param = exports.Count = exports.Case = exports.FullOuterJoin = exports.OuterJoin = exports.RightOuterJoin = exports.RightJoin = exports.LeftOuterJoin = exports.LeftJoin = exports.InnerJoin = exports.Join = exports.Delete = exports.Update = exports.Insert = exports.Select = exports.Raw = void 0;
-const enums_1 = require("../enums");
-const SelectQuery_1 = require("../query/SelectQuery");
-const InsertQuery_1 = require("../query/InsertQuery");
-const UpdateQuery_1 = require("../query/UpdateQuery");
-const DeleteQuery_1 = require("../query/DeleteQuery");
-const RawStatement_1 = require("./RawStatement");
-const JoinStatement_1 = require("./JoinStatement");
-const CaseStatement_1 = require("./CaseStatement");
-const CountStatement_1 = require("./CountStatement");
-const ParamExpression_1 = require("./ParamExpression");
+exports.Field = exports.Param = exports.Count = exports.Case = exports.FullOuterJoin = exports.OuterJoin = exports.RightOuterJoin = exports.RightJoin = exports.LeftOuterJoin = exports.LeftJoin = exports.InnerJoin = exports.Join = exports.Delete = exports.Update = exports.Insert = exports.Select = exports.Raw = void 0;
+const enums_1 = require("./enums");
+const SelectQuery_1 = require("./query/SelectQuery");
+const InsertQuery_1 = require("./query/InsertQuery");
+const UpdateQuery_1 = require("./query/UpdateQuery");
+const DeleteQuery_1 = require("./query/DeleteQuery");
+const RawStatement_1 = require("./sql-objects/RawStatement");
+const JoinStatement_1 = require("./sql-objects/JoinStatement");
+const CaseStatement_1 = require("./sql-objects/CaseStatement");
+const CountStatement_1 = require("./sql-objects/CountStatement");
+const ParamExpression_1 = require("./sql-objects/ParamExpression");
+const FieldExpression_1 = require("./sql-objects/FieldExpression");
 function Raw(text) {
     return new RawStatement_1.RawStatement(text);
 }
@@ -71,7 +72,19 @@ function Count() {
     return new CountStatement_1.CountStatement();
 }
 exports.Count = Count;
-function Param(arg) {
-    return new ParamExpression_1.ParamExpression(arg);
+function Param(arg0, arg1, arg2) {
+    if (typeof arg0 === 'object')
+        return new ParamExpression_1.ParamExpression(arg0);
+    return new ParamExpression_1.ParamExpression({
+        name: arg0,
+        dataType: arg1,
+        isArray: arg2
+    });
 }
 exports.Param = Param;
+function Field(arg0, arg1, arg2) {
+    if (typeof arg0 === 'object')
+        return new FieldExpression_1.FieldExpression(arg0);
+    return new FieldExpression_1.FieldExpression(arg0, arg1, arg2);
+}
+exports.Field = Field;

package/dist/typeguards.d.ts

@@ -9,7 +9,7 @@ import type { CaseStatement } from './sql-objects/CaseStatement';
 import type { ParamExpression } from './sql-objects/ParamExpression';
 import type { LogicalOperator } from './sql-objects/operators/LogicalOperator';
 import type { CompOperator } from './sql-objects/operators/CompOperator';
-import type { SelectColumn } from './sql-objects/SelectColumn';
+import type { FieldExpression } from './sql-objects/FieldExpression';
 import type { OrderColumn } from './sql-objects/OrderColumn';
 import type { GroupColumn } from './sql-objects/GroupColumn';
 import type { ReturningColumn } from './sql-objects/ReturningColumn';
@@ -27,7 +27,7 @@ export declare function isCountStatement(value: any): value is CountStatement;
 export declare function isParamExpression(value: any): value is ParamExpression;
 export declare function isLogicalOperator(value: any): value is LogicalOperator;
 export declare function isCompOperator(value: any): value is CompOperator;
-export declare function isSelectColumn(value: any): value is SelectColumn;
+export declare function isSelectColumn(value: any): value is FieldExpression;
 export declare function isOrderColumn(value: any): value is OrderColumn;
 export declare function isGroupColumn(value: any): value is GroupColumn;
 export declare function isReturningColumn(value: any): value is ReturningColumn;

package/dist/types.d.ts

@@ -1,4 +1,8 @@
-import { SerializationType } from './enums';
+import { DataType, SerializationType } from './enums';
+import type { SerializeContext } from './SerializeContext';
+export declare type SerializeFunction = (ctx: SerializeContext, type: SerializationType | string, obj: any, defFn: DefaultSerializeFunction) => string | undefined;
+export declare type DefaultSerializeFunction = (ctx: SerializeContext, o: any) => string;
+export declare type IsReservedWordFunction = (ctx: SerializeContext, s: string) => boolean;
 export interface SerializerExtension {
     dialect: string;
     serialize?: SerializeFunction;
@@ -14,23 +18,16 @@ export interface GenerateOptions {
     dialectVersion?: string;
     strictParams?: boolean;
 }
-export interface SerializeContext extends GenerateOptions {
-    serializeHooks?: Function[];
-    queryParams?: Record<string, any> | any[];
-    returningFields?: {
-        field: string;
-        alias?: string;
-    }[];
-    strictParamGenId?: number;
+export interface ParamOptions {
+    dataType?: DataType;
+    isArray?: boolean;
 }
 export interface GenerateResult {
     sql: string;
     params?: any;
+    paramOptions?: Record<string, ParamOptions> | ParamOptions[];
     returningFields?: {
         field: string;
         alias?: string;
     }[];
 }
-export declare type SerializeFunction = (ctx: SerializeContext, type: SerializationType | string, obj: any, defFn: DefaultSerializeFunction) => string | undefined;
-export declare type DefaultSerializeFunction = (ctx: SerializeContext, o: any) => string;
-export declare type IsReservedWordFunction = (ctx: SerializeContext, s: string) => boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/builder",
   "description": "Extensible multi-dialect SQL query builder written with TypeScript",
-  "version": "4.0.1-beta.7",
+  "version": "4.0.2",
   "author": "Panates Ltd.",
   "private": false,
   "contributors": [
@@ -25,19 +25,19 @@
     "database"
   ],
   "dependencies": {
-    "debug": "^4.3.1",
+    "debug": "^4.3.2",
     "putil-flattentext": "^2.1.0",
-    "putil-isplainobject": "^1.1.3",
-    "putil-merge": "^3.6.2",
-    "putil-varhelpers": "^1.6.0"
+    "putil-isplainobject": "^1.1.4",
+    "putil-merge": "^3.7.0",
+    "putil-varhelpers": "^1.6.1"
   },
   "devDependencies": {
-    "@types/debug": "^4.1.5"
+    "@types/debug": "^4.1.6"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">= 10.0"
+    "node": ">= 14.0"
   },
   "directories": {
     "lib": "dist",
@@ -52,7 +52,7 @@
     "temp-dir": "./coverage/.nyc_output"
   },
   "scripts": {
-    "test": "ts-mocha -p test/tsconfig.json --paths --reporter spec test/**/*.spec.ts",
+    "test": "TS_NODE_PROJECT='./test/tsconfig.json' mocha -r ts-node/register -r tsconfig-paths/register --reporter spec test/**/*.spec.ts",
     "cover": "nyc --reporter=cobertura --reporter html --reporter text npm run test",
     "build": "tsc -b tsconfig-build.json",
     "compile": "tsc -b tsconfig.json",

package/dist/sql-objects/Column.d.ts

@@ -1,7 +0,0 @@
-import { Serializable } from '../Serializable';
-export declare abstract class Column extends Serializable {
-    _field: string;
-    _schema?: string;
-    _table?: string;
-    _descending?: boolean;
-}

package/dist/sql-objects/SelectColumn.d.ts

@@ -1,9 +0,0 @@
-import { SerializationType } from '../enums';
-import { Column } from './Column';
-import { SerializeContext } from '../types';
-export declare class SelectColumn extends Column {
-    _alias?: string;
-    constructor(value: string);
-    get _type(): SerializationType;
-    _serialize(ctx: SerializeContext): string;
-}

package/dist/sql-objects/SelectColumn.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SelectColumn = void 0;
-const Serializable_1 = require("../Serializable");
-const enums_1 = require("../enums");
-const Column_1 = require("./Column");
-const TABLE_COLUMN_PATTERN = /^((?:[a-zA-Z_][\w$_]*\.){0,2}) *([0-9a-zA-Z_][\w$_]*|\*) *(?:as)? *([a-zA-Z_][\w$_]*)?$/;
-class SelectColumn extends Column_1.Column {
-    constructor(value) {
-        super();
-        const m = value.match(TABLE_COLUMN_PATTERN);
-        if (!m)
-            throw new TypeError(`${value} does not match table column format`);
-        this._field = m[2];
-        if (m[1]) {
-            const a = m[1].split(/\./g);
-            a.pop();
-            this._table = a.pop();
-            this._schema = a.pop();
-        }
-        this._alias = this._field !== '*' ? m[3] : '';
-    }
-    get _type() {
-        return enums_1.SerializationType.SELECT_COLUMN;
-    }
-    _serialize(ctx) {
-        const o = {
-            schema: this._schema,
-            table: this._table,
-            field: this._field,
-            alias: this._alias,
-            isReservedWord: !!(this._field && Serializable_1.isReservedWord(ctx, this._field))
-        };
-        return Serializable_1.serializeFallback(ctx, this._type, o, () => {
-            return (this._schema ? this._schema + '.' : '') +
-                (this._table ? this._table + '.' : '') +
-                (o.isReservedWord ? '"' + this._field + '"' : this._field) +
-                (this._alias ? ' as ' + this._alias : '');
-        });
-    }
-}
-exports.SelectColumn = SelectColumn;