@triptease/sql-template 0.13.11 → 0.17.18

package/Expression.d.ts

@@ -0,0 +1,2 @@
+export declare class Expression {
+}

package/Expression.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Expression = void 0;
+class Expression {
+}
+exports.Expression = Expression;
+//# sourceMappingURL=Expression.js.map

package/Identifier.d.ts

@@ -0,0 +1,8 @@
+import { Expression } from "./Expression";
+import { Template } from "./Template";
+export declare class Identifier extends Expression {
+    identifier: string;
+    constructor(identifier: string);
+}
+export declare function id(identifier: string): Identifier;
+export declare function ids(identifiers: any[], separator?: string): Template;

package/Identifier.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ids = exports.id = exports.Identifier = void 0;
+const Expression_1 = require("./Expression");
+const Template_1 = require("./Template");
+const Text_1 = require("./Text");
+class Identifier extends Expression_1.Expression {
+    constructor(identifier) {
+        super();
+        this.identifier = identifier;
+    }
+}
+exports.Identifier = Identifier;
+function id(identifier) {
+    return new Identifier(identifier);
+}
+exports.id = id;
+function ids(identifiers, separator = ', ') {
+    return (0, Template_1.template)(...identifiers.flatMap((v, i) => i > 0 ? [(0, Text_1.text)(separator), id(v)] : [id(v)]));
+}
+exports.ids = ids;
+//# sourceMappingURL=Identifier.js.map

package/SQL.d.ts

@@ -1,4 +1,2 @@
-import { SqlTemplate } from "./api";
-export declare function SQL(text: TemplateStringsArray, ...values: any[]): SqlTemplate;
-export declare function spread(values: any[]): SqlTemplate;
-export declare function raw(value: string): SqlTemplate;
+import { Template } from "./Template";
+export declare function SQL(chunks: TemplateStringsArray, ...values: any[]): Template;

package/SQL.js

@@ -1,38 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.raw = exports.spread = exports.SQL = void 0;
-const CompositeTemplate_1 = require("./CompositeTemplate");
-const api_1 = require("./api");
-const placeholder = `?`;
-function calculateAdditionalText(value) {
-    if ((0, api_1.isSqlTemplate)(value))
-        return value.text;
-    return placeholder;
-}
-function calculateNewValues(value) {
-    if (value === undefined)
-        return [null];
-    if ((0, api_1.isSqlTemplate)(value))
-        return value.values;
-    return [value];
-}
-function SQL(text, ...values) {
-    return text.reduce((a, t, i) => {
-        if (i === values.length)
-            return (0, api_1.sqlTemplate)(a.text + t, a.values);
-        const value = values[i];
-        const newText = t + calculateAdditionalText(value);
-        const newValues = calculateNewValues(value);
-        return (0, api_1.sqlTemplate)(a.text + newText, [...a.values, ...newValues]);
-    }, (0, api_1.sqlTemplate)());
+exports.SQL = void 0;
+const Template_1 = require("./Template");
+const Text_1 = require("./Text");
+const Value_1 = require("./Value");
+function SQL(chunks, ...values) {
+    return (0, Template_1.template)(...chunks.flatMap((chunk, index) => {
+        if (index > (values.length - 1))
+            return [(0, Text_1.text)(chunk)];
+        return [(0, Text_1.text)(chunk), (0, Value_1.value)(values[index])];
+    }));
 }
 exports.SQL = SQL;
-function spread(values) {
-    return (0, CompositeTemplate_1.compose)(values.map(v => (0, api_1.sqlTemplate)(placeholder, calculateNewValues(v))));
-}
-exports.spread = spread;
-function raw(value) {
-    return (0, api_1.sqlTemplate)(value, []);
-}
-exports.raw = raw;
 //# sourceMappingURL=SQL.js.map

package/Template.d.ts

@@ -0,0 +1,6 @@
+import { Expression } from "./Expression";
+export declare class Template extends Expression {
+    expressions: Expression[];
+    constructor(expressions: Expression[]);
+}
+export declare function template(...expressions: Expression[]): Template;

package/Template.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.template = exports.Template = void 0;
+const Expression_1 = require("./Expression");
+const Text_1 = require("./Text");
+class Template extends Expression_1.Expression {
+    constructor(expressions) {
+        super();
+        this.expressions = expressions;
+    }
+}
+exports.Template = Template;
+function template(...expressions) {
+    return new Template(expressions.flatMap(e => {
+        if (e instanceof Text_1.Text && e.text === '')
+            return [];
+        if (e instanceof Template)
+            return e.expressions;
+        return [e];
+    }));
+}
+exports.template = template;
+//# sourceMappingURL=Template.js.map

package/Text.d.ts

@@ -0,0 +1,7 @@
+import { Expression } from "./Expression";
+export declare class Text extends Expression {
+    text: string;
+    constructor(text: string);
+}
+export declare function text(text: string): Text;
+export declare const raw: typeof text;

package/Text.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.raw = exports.text = exports.Text = void 0;
+const Expression_1 = require("./Expression");
+class Text extends Expression_1.Expression {
+    constructor(text) {
+        super();
+        this.text = text;
+    }
+}
+exports.Text = Text;
+function text(text) {
+    return new Text(text);
+}
+exports.text = text;
+exports.raw = text;
+//# sourceMappingURL=Text.js.map

package/Value.d.ts

@@ -0,0 +1,9 @@
+import { Expression } from "./Expression";
+import { Template } from "./Template";
+export declare class Value extends Expression {
+    value: any;
+    constructor(value: any);
+}
+export declare function value(value: any): Expression;
+export declare function values(values: any[], separator?: string): Template;
+export declare const spread: typeof values;

package/Value.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.spread = exports.values = exports.value = exports.Value = void 0;
+const Expression_1 = require("./Expression");
+const Template_1 = require("./Template");
+const Text_1 = require("./Text");
+class Value extends Expression_1.Expression {
+    constructor(value) {
+        super();
+        this.value = value;
+    }
+}
+exports.Value = Value;
+function value(value) {
+    if (value instanceof Expression_1.Expression)
+        return value;
+    if (value === undefined)
+        return new Value(null);
+    return new Value(value);
+}
+exports.value = value;
+function values(values, separator = ', ') {
+    return (0, Template_1.template)(...values.flatMap((v, i) => i > 0 ? [(0, Text_1.text)(separator), value(v)] : [value(v)]));
+}
+exports.values = values;
+exports.spread = values;
+//# sourceMappingURL=Value.js.map

package/index.d.ts

@@ -1,2 +1,6 @@
-export * from "./api";
-export { SQL, spread, raw } from "./SQL";
+export * from "./Expression";
+export * from "./Identifier";
+export * from "./SQL";
+export * from "./Template";
+export * from "./Text";
+export * from "./Value";

package/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.raw = exports.spread = exports.SQL = void 0;
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./api"), exports);
-var SQL_1 = require("./SQL");
-Object.defineProperty(exports, "SQL", { enumerable: true, get: function () { return SQL_1.SQL; } });
-Object.defineProperty(exports, "spread", { enumerable: true, get: function () { return SQL_1.spread; } });
-Object.defineProperty(exports, "raw", { enumerable: true, get: function () { return SQL_1.raw; } });
+(0, tslib_1.__exportStar)(require("./Expression"), exports);
+(0, tslib_1.__exportStar)(require("./Identifier"), exports);
+(0, tslib_1.__exportStar)(require("./SQL"), exports);
+(0, tslib_1.__exportStar)(require("./Template"), exports);
+(0, tslib_1.__exportStar)(require("./Text"), exports);
+(0, tslib_1.__exportStar)(require("./Value"), exports);
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triptease/sql-template",
-  "version": "0.13.11",
+  "version": "0.17.18",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/triptease/sql-template.git"

package/CompositeTemplate.d.ts

@@ -1,9 +0,0 @@
-import { SqlTemplate } from "./api";
-export declare class CompositeTemplate implements SqlTemplate {
-    private fragments;
-    private joiner;
-    constructor(fragments: SqlTemplate[], joiner: string);
-    get text(): string;
-    get values(): ReadonlyArray<any>;
-}
-export declare function compose(fragments: SqlTemplate[], joiner?: string): SqlTemplate;

package/CompositeTemplate.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.compose = exports.CompositeTemplate = void 0;
-class CompositeTemplate {
-    constructor(fragments, joiner) {
-        this.fragments = fragments;
-        this.joiner = joiner;
-    }
-    get text() {
-        return this.fragments.map(f => f.text).join(this.joiner);
-    }
-    get values() {
-        return this.fragments.flatMap(f => f.values);
-    }
-}
-exports.CompositeTemplate = CompositeTemplate;
-function compose(fragments, joiner = ', ') {
-    return new CompositeTemplate(fragments, joiner);
-}
-exports.compose = compose;
-//# sourceMappingURL=CompositeTemplate.js.map

package/api.d.ts

@@ -1,12 +0,0 @@
-export declare type SimpleObject = {
-    [key: string]: any;
-};
-export interface SqlClient {
-    query(template: SqlTemplate): Promise<SimpleObject[]>;
-}
-export interface SqlTemplate {
-    readonly text: string;
-    readonly values: ReadonlyArray<any>;
-}
-export declare function isSqlTemplate(value: any): value is SqlTemplate;
-export declare function sqlTemplate(text?: string, values?: ReadonlyArray<any>): SqlTemplate;

package/api.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sqlTemplate = exports.isSqlTemplate = void 0;
-function isSqlTemplate(value) {
-    return value && typeof value['text'] === 'string' && Array.isArray(value['values']);
-}
-exports.isSqlTemplate = isSqlTemplate;
-function sqlTemplate(text = '', values = []) {
-    return { text, values };
-}
-exports.sqlTemplate = sqlTemplate;
-//# sourceMappingURL=api.js.map