@expressive/sql 0.7.0 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/codecs.d.ts +16 -0
- package/dist/codecs.js +104 -0
- package/dist/codecs.js.map +1 -0
- package/dist/connection/Connection.d.ts +5 -0
- package/dist/connection/Connection.js +39 -24
- package/dist/connection/Connection.js.map +1 -1
- package/dist/connection/Generator.js +1 -1
- package/dist/connection/Generator.js.map +1 -1
- package/dist/datatypes.d.ts +5 -25
- package/dist/datatypes.js +0 -4
- package/dist/datatypes.js.map +1 -1
- package/dist/index.d.ts +2 -6
- package/dist/index.js +2 -6
- package/dist/sqlite/SQLiteConnection.d.ts +1 -0
- package/dist/sqlite/SQLiteConnection.js +15 -8
- package/dist/sqlite/SQLiteConnection.js.map +1 -1
- package/dist/sqlite/SQLiteGenerator.d.ts +2 -2
- package/dist/sqlite/SQLiteGenerator.js +0 -3
- package/dist/sqlite/SQLiteGenerator.js.map +1 -1
- package/package.json +2 -2
- package/skills/expressive-sql/SKILL.md +15 -29
- package/dist/columns/Bool.d.ts +0 -37
- package/dist/columns/Bool.js +0 -28
- package/dist/columns/Bool.js.map +0 -1
- package/dist/columns/Num.d.ts +0 -59
- package/dist/columns/Num.js +0 -42
- package/dist/columns/Num.js.map +0 -1
- package/dist/columns/One.d.ts +0 -25
- package/dist/columns/One.js +0 -15
- package/dist/columns/One.js.map +0 -1
- package/dist/columns/Str.d.ts +0 -36
- package/dist/columns/Str.js +0 -21
- package/dist/columns/Str.js.map +0 -1
- package/dist/columns/Time.d.ts +0 -52
- package/dist/columns/Time.js +0 -45
- package/dist/columns/Time.js.map +0 -1
package/README.md
CHANGED
|
@@ -49,6 +49,6 @@ await db.close();
|
|
|
49
49
|
- `Connection` - the SQL connection base: orm's floor implemented over `Query`, so a dialect supplies `prepare` (with a `Generator` subclass) and `sync`.
|
|
50
50
|
- `Generator` - renders a `Query` builder as SQL.
|
|
51
51
|
- Driver seams - `Builder`, `DataTable`, `DataField`, `Parameter`, `Computed`, `QueryTemplate`, `Where` - import from `@expressive/orm/driver`. A dialect package lists `@expressive/orm` as a direct dependency, at the range this package depends on.
|
|
52
|
-
- `
|
|
52
|
+
- `codecs` - how SQL stores each field helper's plain values, by helper; a dialect extends the map. `sql` - shorthand for orm's portable datatypes. See [Datatypes](https://github.com/gabeklein/expressive-orm#datatypes).
|
|
53
53
|
|
|
54
54
|
SQLite has no live rows - neither `node:sqlite` nor `bun:sqlite` exposes an update hook. For those, use [`@expressive/postgres`](https://github.com/gabeklein/expressive-orm/tree/main/packages/postgres).
|
package/dist/codecs.d.ts
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Connection } from "@expressive/orm";
|
|
2
|
+
|
|
3
|
+
//#region src/codecs.d.ts
|
|
4
|
+
type Codec = Connection.Codec;
|
|
5
|
+
/**
|
|
6
|
+
* How SQL stores each field helper's values - keyed by the helper.
|
|
7
|
+
*
|
|
8
|
+
* `str` as text, `num` as its numeric type, `bool` as boolean, `json` as JSON text.
|
|
9
|
+
* `date` as ISO 8601 text - a `timestamp` in UTC to the millisecond, a `time` as UTC `HH:MM:SS`.
|
|
10
|
+
* A `date` type is a calendar day: it arrives and leaves as `YYYY-MM-DD` and is stored as is; a driver's Date reads as its local day.
|
|
11
|
+
* A dialect replaces entries it stores differently.
|
|
12
|
+
*/
|
|
13
|
+
declare const codecs: ReadonlyMap<Function, Codec>;
|
|
14
|
+
//#endregion
|
|
15
|
+
export { codecs };
|
|
16
|
+
//# sourceMappingURL=codecs.d.ts.map
|
package/dist/codecs.js
ADDED
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { bool, date, json, num, str } from "@expressive/orm";
|
|
2
|
+
|
|
3
|
+
//#region src/codecs.ts
|
|
4
|
+
const text = {
|
|
5
|
+
types: [
|
|
6
|
+
"text",
|
|
7
|
+
"varchar",
|
|
8
|
+
"char",
|
|
9
|
+
"uuid"
|
|
10
|
+
],
|
|
11
|
+
datatype({ type, length, collate }) {
|
|
12
|
+
let datatype = type;
|
|
13
|
+
if (type.endsWith("char") && length) datatype += `(${length})`;
|
|
14
|
+
if (collate) datatype += ` COLLATE "${collate}"`;
|
|
15
|
+
return datatype;
|
|
16
|
+
},
|
|
17
|
+
encode: (_field, value) => value,
|
|
18
|
+
decode: (_field, value) => value
|
|
19
|
+
};
|
|
20
|
+
const number = {
|
|
21
|
+
types: [
|
|
22
|
+
"integer",
|
|
23
|
+
"smallint",
|
|
24
|
+
"bigint",
|
|
25
|
+
"real",
|
|
26
|
+
"double",
|
|
27
|
+
"numeric",
|
|
28
|
+
"decimal"
|
|
29
|
+
],
|
|
30
|
+
datatype({ type, precision, scale }) {
|
|
31
|
+
if (type === "double") return "double precision";
|
|
32
|
+
if (precision !== void 0) return type + (scale === void 0 ? `(${precision})` : `(${precision},${scale})`);
|
|
33
|
+
return type;
|
|
34
|
+
},
|
|
35
|
+
encode: (_field, value) => value,
|
|
36
|
+
decode: (_field, value) => typeof value == "number" ? value : parseFloat(value)
|
|
37
|
+
};
|
|
38
|
+
const boolean = {
|
|
39
|
+
types: ["boolean"],
|
|
40
|
+
datatype: () => "boolean",
|
|
41
|
+
encode: (_field, value) => value,
|
|
42
|
+
decode: (_field, value) => value === true || value === 1
|
|
43
|
+
};
|
|
44
|
+
const time = {
|
|
45
|
+
types: [
|
|
46
|
+
"timestamp",
|
|
47
|
+
"date",
|
|
48
|
+
"time"
|
|
49
|
+
],
|
|
50
|
+
datatype({ type, precision }) {
|
|
51
|
+
return precision === void 0 ? type : `${type}(${precision})`;
|
|
52
|
+
},
|
|
53
|
+
encode({ type }, value) {
|
|
54
|
+
if (type === "date") return value;
|
|
55
|
+
const iso = value.toISOString();
|
|
56
|
+
return type === "time" ? iso.slice(11, 19) : iso;
|
|
57
|
+
},
|
|
58
|
+
decode({ type }, value) {
|
|
59
|
+
if (type === "date") return typeof value === "string" ? value.slice(0, 10) : day(value);
|
|
60
|
+
if (typeof value === "string" && type === "time") return /* @__PURE__ */ new Date(`1970-01-01T${value}Z`);
|
|
61
|
+
if (typeof value === "string" && /^\d{4}-\d\d-\d\d \d\d:\d\d:\d\d(\.\d+)?$/.test(value)) return /* @__PURE__ */ new Date(value.replace(" ", "T") + "Z");
|
|
62
|
+
return new Date(value);
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
function day(date) {
|
|
66
|
+
return [
|
|
67
|
+
date.getFullYear(),
|
|
68
|
+
date.getMonth() + 1,
|
|
69
|
+
date.getDate()
|
|
70
|
+
].map(pad).join("-");
|
|
71
|
+
}
|
|
72
|
+
function pad(part, index) {
|
|
73
|
+
return String(part).padStart(index ? 2 : 4, "0");
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* How SQL stores each field helper's values - keyed by the helper.
|
|
77
|
+
*
|
|
78
|
+
* `str` as text, `num` as its numeric type, `bool` as boolean, `json` as JSON text.
|
|
79
|
+
* `date` as ISO 8601 text - a `timestamp` in UTC to the millisecond, a `time` as UTC `HH:MM:SS`.
|
|
80
|
+
* A `date` type is a calendar day: it arrives and leaves as `YYYY-MM-DD` and is stored as is; a driver's Date reads as its local day.
|
|
81
|
+
* A dialect replaces entries it stores differently.
|
|
82
|
+
*/
|
|
83
|
+
const codecs = new Map([
|
|
84
|
+
[str, text],
|
|
85
|
+
[num, number],
|
|
86
|
+
[bool, boolean],
|
|
87
|
+
[date, time],
|
|
88
|
+
[json, {
|
|
89
|
+
types: ["json"],
|
|
90
|
+
datatype: () => "text",
|
|
91
|
+
encode: (_field, value) => JSON.stringify(value),
|
|
92
|
+
decode(_field, value) {
|
|
93
|
+
try {
|
|
94
|
+
return JSON.parse(value);
|
|
95
|
+
} catch {
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}]
|
|
100
|
+
]);
|
|
101
|
+
|
|
102
|
+
//#endregion
|
|
103
|
+
export { codecs };
|
|
104
|
+
//# sourceMappingURL=codecs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codecs.js","names":[],"sources":["../src/codecs.ts"],"sourcesContent":["import { bool, date, json, num, str, type Connection, type Field } from '@expressive/orm';\n\ntype Codec = Connection.Codec;\n\ntype Sized = Field & { precision?: number, scale?: number, collate?: string };\n\nconst text: Codec = {\n types: [\"text\", \"varchar\", \"char\", \"uuid\"],\n datatype({ type, length, collate }: Sized){\n let datatype = type;\n\n if (type.endsWith(\"char\") && length)\n datatype += `(${length})`;\n\n if (collate)\n datatype += ` COLLATE \"${collate}\"`;\n\n return datatype;\n },\n encode: (_field, value) => value,\n decode: (_field, value) => value\n};\n\nconst number: Codec = {\n types: [\"integer\", \"smallint\", \"bigint\", \"real\", \"double\", \"numeric\", \"decimal\"],\n datatype({ type, precision, scale }: Sized){\n if (type === \"double\")\n return \"double precision\";\n\n if (precision !== undefined)\n return type + (scale === undefined ? `(${precision})` : `(${precision},${scale})`);\n\n return type;\n },\n encode: (_field, value) => value,\n decode: (_field, value) => typeof value == \"number\" ? value : parseFloat(value as string)\n};\n\nconst boolean: Codec = {\n types: [\"boolean\"],\n datatype: () => \"boolean\",\n encode: (_field, value) => value,\n decode: (_field, value) => value === true || value === 1\n};\n\nconst time: Codec = {\n types: [\"timestamp\", \"date\", \"time\"],\n datatype({ type, precision }: Sized){\n return precision === undefined ? type : `${type}(${precision})`;\n },\n encode({ type }, value){\n if (type === \"date\")\n return value;\n\n const iso = (value as Date).toISOString();\n\n return type === \"time\" ? iso.slice(11, 19) : iso;\n },\n decode({ type }, value){\n if (type === \"date\")\n return typeof value === \"string\" ? value.slice(0, 10) : day(value as Date);\n\n if (typeof value === \"string\" && type === \"time\")\n return new Date(`1970-01-01T${value}Z`);\n\n if (typeof value === \"string\" && /^\\d{4}-\\d\\d-\\d\\d \\d\\d:\\d\\d:\\d\\d(\\.\\d+)?$/.test(value))\n return new Date(value.replace(\" \", \"T\") + \"Z\");\n\n return new Date(value as string | Date);\n }\n};\n\nfunction day(date: Date){\n return [date.getFullYear(), date.getMonth() + 1, date.getDate()].map(pad).join(\"-\");\n}\n\nfunction pad(part: number, index: number){\n return String(part).padStart(index ? 2 : 4, \"0\");\n}\n\nconst object: Codec = {\n types: [\"json\"],\n datatype: () => \"text\",\n encode: (_field, value) => JSON.stringify(value),\n decode(_field, value){\n try {\n return JSON.parse(value as string);\n }\n catch {\n return undefined;\n }\n }\n};\n\n/**\n * How SQL stores each field helper's values - keyed by the helper.\n *\n * `str` as text, `num` as its numeric type, `bool` as boolean, `json` as JSON text.\n * `date` as ISO 8601 text - a `timestamp` in UTC to the millisecond, a `time` as UTC `HH:MM:SS`.\n * A `date` type is a calendar day: it arrives and leaves as `YYYY-MM-DD` and is stored as is; a driver's Date reads as its local day.\n * A dialect replaces entries it stores differently.\n */\nconst codecs: ReadonlyMap<Function, Codec> = new Map<Function, Codec>([\n [str, text],\n [num, number],\n [bool, boolean],\n [date, time],\n [json, object]\n]);\n\nexport { codecs };\n"],"mappings":";;;AAMA,MAAM,OAAc;CAClB,OAAO;EAAC;EAAQ;EAAW;EAAQ;EAAO;CAC1C,SAAS,EAAE,MAAM,QAAQ,WAAiB;EACxC,IAAI,WAAW;AAEf,MAAI,KAAK,SAAS,OAAO,IAAI,OAC3B,aAAY,IAAI,OAAO;AAEzB,MAAI,QACF,aAAY,aAAa,QAAQ;AAEnC,SAAO;;CAET,SAAS,QAAQ,UAAU;CAC3B,SAAS,QAAQ,UAAU;CAC5B;AAED,MAAM,SAAgB;CACpB,OAAO;EAAC;EAAW;EAAY;EAAU;EAAQ;EAAU;EAAW;EAAU;CAChF,SAAS,EAAE,MAAM,WAAW,SAAe;AACzC,MAAI,SAAS,SACX,QAAO;AAET,MAAI,cAAc,OAChB,QAAO,QAAQ,UAAU,SAAY,IAAI,UAAU,KAAK,IAAI,UAAU,GAAG,MAAM;AAEjF,SAAO;;CAET,SAAS,QAAQ,UAAU;CAC3B,SAAS,QAAQ,UAAU,OAAO,SAAS,WAAW,QAAQ,WAAW,MAAgB;CAC1F;AAED,MAAM,UAAiB;CACrB,OAAO,CAAC,UAAU;CAClB,gBAAgB;CAChB,SAAS,QAAQ,UAAU;CAC3B,SAAS,QAAQ,UAAU,UAAU,QAAQ,UAAU;CACxD;AAED,MAAM,OAAc;CAClB,OAAO;EAAC;EAAa;EAAQ;EAAO;CACpC,SAAS,EAAE,MAAM,aAAmB;AAClC,SAAO,cAAc,SAAY,OAAO,GAAG,KAAK,GAAG,UAAU;;CAE/D,OAAO,EAAE,QAAQ,OAAM;AACrB,MAAI,SAAS,OACX,QAAO;EAET,MAAM,MAAO,MAAe,aAAa;AAEzC,SAAO,SAAS,SAAS,IAAI,MAAM,IAAI,GAAG,GAAG;;CAE/C,OAAO,EAAE,QAAQ,OAAM;AACrB,MAAI,SAAS,OACX,QAAO,OAAO,UAAU,WAAW,MAAM,MAAM,GAAG,GAAG,GAAG,IAAI,MAAc;AAE5E,MAAI,OAAO,UAAU,YAAY,SAAS,OACxC,wBAAO,IAAI,KAAK,cAAc,MAAM,GAAG;AAEzC,MAAI,OAAO,UAAU,YAAY,2CAA2C,KAAK,MAAM,CACrF,wBAAO,IAAI,KAAK,MAAM,QAAQ,KAAK,IAAI,GAAG,IAAI;AAEhD,SAAO,IAAI,KAAK,MAAuB;;CAE1C;AAED,SAAS,IAAI,MAAW;AACtB,QAAO;EAAC,KAAK,aAAa;EAAE,KAAK,UAAU,GAAG;EAAG,KAAK,SAAS;EAAC,CAAC,IAAI,IAAI,CAAC,KAAK,IAAI;;AAGrF,SAAS,IAAI,MAAc,OAAc;AACvC,QAAO,OAAO,KAAK,CAAC,SAAS,QAAQ,IAAI,GAAG,IAAI;;;;;;;;;;AAyBlD,MAAM,SAAuC,IAAI,IAAqB;CACpE,CAAC,KAAK,KAAK;CACX,CAAC,KAAK,OAAO;CACb,CAAC,MAAM,QAAQ;CACf,CAAC,MAAM,KAAK;CACZ,CAAC,MA3BmB;EACpB,OAAO,CAAC,OAAO;EACf,gBAAgB;EAChB,SAAS,QAAQ,UAAU,KAAK,UAAU,MAAM;EAChD,OAAO,QAAQ,OAAM;AACnB,OAAI;AACF,WAAO,KAAK,MAAM,MAAgB;WAE9B;AACJ;;;EAGL,CAee;CACf,CAAC"}
|
|
@@ -8,6 +8,7 @@ declare namespace Connection {
|
|
|
8
8
|
type Change = Connection$1.Change;
|
|
9
9
|
type Conflict = Connection$1.Conflict;
|
|
10
10
|
type Key = Connection$1.Key;
|
|
11
|
+
type Codec = Connection$1.Codec;
|
|
11
12
|
/** An open transaction's journal. */
|
|
12
13
|
type Transaction = Connection$1.Journal;
|
|
13
14
|
/** One change `sync` would make. */
|
|
@@ -36,8 +37,10 @@ declare namespace Connection {
|
|
|
36
37
|
*
|
|
37
38
|
* A dialect supplies `schema`, `prepare`, `sync` and `plan`, and `transact` to enable `transaction`.
|
|
38
39
|
* Each statement throws when no bound or loaded class owns its table.
|
|
40
|
+
* The floor takes and returns plain values: it checks each with its field, then stores it through the dialect's codecs.
|
|
39
41
|
*/
|
|
40
42
|
declare abstract class Connection extends Connection$1 {
|
|
43
|
+
protected get codecs(): ReadonlyMap<Function, Connection$1.Codec<any>>;
|
|
41
44
|
/** DDL creating every bound class's table and indexes. */
|
|
42
45
|
abstract get schema(): string;
|
|
43
46
|
/**
|
|
@@ -55,6 +58,8 @@ declare abstract class Connection extends Connection$1 {
|
|
|
55
58
|
insert(table: string, data: Record<string, any>, returns?: boolean, conflict?: Connection.Conflict): Promise<any>;
|
|
56
59
|
update(table: string, id: Connection.Key, data: Record<string, any>): Promise<void>;
|
|
57
60
|
remove(table: string, id: Connection.Key): Promise<void>;
|
|
61
|
+
private identify;
|
|
62
|
+
private decode;
|
|
58
63
|
}
|
|
59
64
|
//#endregion
|
|
60
65
|
export { Connection };
|
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
import "../
|
|
2
|
-
import "../columns/Num.js";
|
|
3
|
-
import "../columns/One.js";
|
|
4
|
-
import "../columns/Str.js";
|
|
5
|
-
import "../columns/Time.js";
|
|
1
|
+
import { codecs } from "../codecs.js";
|
|
6
2
|
import { Connection as Connection$1 } from "@expressive/orm";
|
|
7
3
|
import { Builder, Parameter } from "@expressive/orm/driver";
|
|
8
4
|
|
|
@@ -17,57 +13,83 @@ function ref({ schema, table }) {
|
|
|
17
13
|
*
|
|
18
14
|
* A dialect supplies `schema`, `prepare`, `sync` and `plan`, and `transact` to enable `transaction`.
|
|
19
15
|
* Each statement throws when no bound or loaded class owns its table.
|
|
16
|
+
* The floor takes and returns plain values: it checks each with its field, then stores it through the dialect's codecs.
|
|
20
17
|
*/
|
|
21
18
|
var Connection = class extends Connection$1 {
|
|
19
|
+
get codecs() {
|
|
20
|
+
return codecs;
|
|
21
|
+
}
|
|
22
22
|
async select(table, constraints, limit, offset) {
|
|
23
23
|
const { builder, target, bind, run } = statement(this, table);
|
|
24
24
|
for (const [column, op, value] of constraints) {
|
|
25
25
|
const field = lookup(target, column);
|
|
26
|
+
const put = (value) => bind(op.includes("LIKE") ? value : this._encode(field, check(field, value, true)));
|
|
26
27
|
if (op === "asc" || op === "desc") builder.order.set(field, op);
|
|
27
28
|
else if (op === "IS NULL") builder.filters.add(field, "=", null);
|
|
28
29
|
else if (op === "IS NOT NULL") builder.filters.add(field, "<>", null);
|
|
29
30
|
else if (value === null) builder.filters.add(field, op, null);
|
|
30
|
-
else builder.filters.add(field, op, Array.isArray(value) ? value.map(
|
|
31
|
+
else builder.filters.add(field, op, Array.isArray(value) ? value.map(put) : put(value));
|
|
31
32
|
}
|
|
32
33
|
builder.limit = limit;
|
|
33
34
|
builder.offset = offset;
|
|
34
35
|
builder.commit(target.proxy);
|
|
35
|
-
return (await this.prepare(builder).all(run())).map((raw) => decode(builder, raw));
|
|
36
|
+
return (await this.prepare(builder).all(run())).map((raw) => this.decode(builder, raw));
|
|
36
37
|
}
|
|
37
38
|
async insert(table, data, returns, conflict) {
|
|
38
39
|
const { builder, target, bind, run } = statement(this, table);
|
|
39
40
|
const values = /* @__PURE__ */ new Map();
|
|
40
|
-
|
|
41
|
+
const put = (field, value) => bind(this._encode(field, check(field, value)));
|
|
42
|
+
for (const field of target.fields.values()) if (field.column in data) values.set(field, put(field, data[field.column]));
|
|
41
43
|
builder.inserts.set(target, values);
|
|
42
44
|
if (conflict) builder.conflict = {
|
|
43
45
|
on: conflict.on.map((column) => lookup(target, column)),
|
|
44
46
|
update: conflict.update?.map((column) => lookup(target, column)),
|
|
45
|
-
set: new Map(Object.entries(conflict.set || {}).map(([column, value]) =>
|
|
47
|
+
set: new Map(Object.entries(conflict.set || {}).map(([column, value]) => {
|
|
48
|
+
const field = lookup(target, column);
|
|
49
|
+
return [field, put(field, value)];
|
|
50
|
+
}))
|
|
46
51
|
};
|
|
47
52
|
if (!returns) return this.prepare(builder).run(run());
|
|
48
53
|
builder.commit(target.proxy);
|
|
49
54
|
const [row] = await this.prepare(builder).all(run());
|
|
50
|
-
return row && decode(builder, row);
|
|
55
|
+
return row && this.decode(builder, row);
|
|
51
56
|
}
|
|
52
57
|
async update(table, id, data) {
|
|
53
58
|
const { builder, target, bind, run } = statement(this, table);
|
|
54
59
|
const values = /* @__PURE__ */ new Map();
|
|
55
|
-
for (const column in data)
|
|
60
|
+
for (const column in data) {
|
|
61
|
+
const field = lookup(target, column);
|
|
62
|
+
values.set(field, bind(this._encode(field, check(field, data[column]))));
|
|
63
|
+
}
|
|
56
64
|
builder.updates.set(target, values);
|
|
57
|
-
identify(builder, target, id, bind);
|
|
65
|
+
this.identify(builder, target, id, bind);
|
|
58
66
|
await this.prepare(builder).run(run());
|
|
59
67
|
}
|
|
60
68
|
async remove(table, id) {
|
|
61
69
|
const { builder, target, bind, run } = statement(this, table);
|
|
62
70
|
builder.deletes.add(target);
|
|
63
|
-
identify(builder, target, id, bind);
|
|
71
|
+
this.identify(builder, target, id, bind);
|
|
64
72
|
await this.prepare(builder).run(run());
|
|
65
73
|
}
|
|
74
|
+
identify(builder, target, id, bind) {
|
|
75
|
+
const primary = target.fields.get("id");
|
|
76
|
+
const { parts = [primary] } = primary;
|
|
77
|
+
const ids = primary.parts ? id : [id];
|
|
78
|
+
parts.forEach((part, i) => {
|
|
79
|
+
const field = lookup(target, part.column);
|
|
80
|
+
builder.filters.add(field, "=", bind(this._encode(field, ids[i])));
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
decode(builder, raw) {
|
|
84
|
+
const row = {};
|
|
85
|
+
builder.returns.forEach((field, key) => {
|
|
86
|
+
row[field.column] = this._decode(field, raw[key]);
|
|
87
|
+
});
|
|
88
|
+
return row;
|
|
89
|
+
}
|
|
66
90
|
};
|
|
67
|
-
function
|
|
68
|
-
|
|
69
|
-
if (parts) parts.forEach((part, i) => builder.filters.add(lookup(target, part.column), "=", bind(id[i])));
|
|
70
|
-
else builder.filters.add(target.fields.get("id"), "=", bind(id));
|
|
91
|
+
function check(field, value, compare) {
|
|
92
|
+
return field.reference || value == null ? value : field.set(value, compare);
|
|
71
93
|
}
|
|
72
94
|
function statement(connection, table) {
|
|
73
95
|
const type = [...connection.using, ...connection._loaded.keys()].find((type) => ref(type) === table);
|
|
@@ -91,13 +113,6 @@ function lookup(table, column) {
|
|
|
91
113
|
for (const field of table.fields.values()) if (field.column === column) return field;
|
|
92
114
|
throw new Error(`Column ${column} does not exist in ${table.name}.`);
|
|
93
115
|
}
|
|
94
|
-
function decode(builder, raw) {
|
|
95
|
-
const row = {};
|
|
96
|
-
builder.returns.forEach((field, key) => {
|
|
97
|
-
row[field.column] = raw[key];
|
|
98
|
-
});
|
|
99
|
-
return row;
|
|
100
|
-
}
|
|
101
116
|
|
|
102
117
|
//#endregion
|
|
103
118
|
export { Connection };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Connection.js","names":["Base"],"sources":["../../src/connection/Connection.ts"],"sourcesContent":["import '../columns/Bool';\nimport '../columns/Num';\nimport '../columns/One';\nimport '../columns/Str';\nimport '../columns/Time';\n\nimport { Connection as Base, Field, Query, Type } from '@expressive/orm';\nimport { Builder, Parameter } from '@expressive/orm/driver';\n\ndeclare namespace Connection {\n type Types = Base.Types;\n\n type Ready<T extends Connection = Connection> = Base.Ready<T>;\n\n type Change = Base.Change;\n\n type Conflict = Base.Conflict;\n\n type Key = Base.Key;\n\n /** An open transaction's journal. */\n type Transaction = Base.Journal;\n\n /** One change `sync` would make. */\n interface Step {\n table: string;\n /** Column the step adds or indexes. Absent for a table step. */\n column?: string;\n /** What it does, like `create table user`. */\n action: string;\n /** The mismatch it resolves - what `sync(false)` reports. */\n reason: string;\n /** Statements applying it. */\n sql: string[];\n }\n\n /** What `sync` would do, and what stops it. */\n interface Plan {\n steps: Step[];\n /** Mismatches `sync` cannot fix. Any makes it throw. */\n problems: string[];\n }\n}\n\nfunction ref({ schema, table }: Query.Table){\n return schema ? `${schema}.${table}` : table;\n}\n\n/**\n * Base class of a SQL driver - implements orm's floor as queries through `prepare`.\n *\n * The floor is `select`, `insert`, `update` and `remove`.\n *\n * A dialect supplies `schema`, `prepare`, `sync` and `plan`, and `transact` to enable `transaction`.\n * Each statement throws when no bound or loaded class owns its table.\n */\nabstract class Connection extends Base {\n /** DDL creating every bound class's table and indexes. */\n abstract get schema(): string;\n\n /**\n * Bring the database in line with the bound classes, then mark the connection ready.\n *\n * Creates missing tables, columns and indexes. `fix` false changes nothing and throws for anything missing.\n * `force` also converts columns whose type or nullability drifted. Throws for any problem `plan` reports.\n */\n abstract sync(fix?: boolean, force?: boolean): Promise<this>;\n\n /** List what `sync` would change, and what it could not, without applying anything. */\n abstract plan(force?: boolean): Promise<Connection.Plan>;\n\n /** Compile a `Query` builder to a statement in this dialect. */\n abstract prepare(builder: Builder): Builder.Statement;\n\n async select(table: string, constraints: Type.Constraint[], limit?: number, offset?: number){\n const { builder, target, bind, run } = statement(this, table);\n\n for (const [column, op, value] of constraints) {\n const field = lookup(target, column);\n\n if (op === 'asc' || op === 'desc')\n builder.order.set(field, op);\n else if (op === 'IS NULL')\n builder.filters.add(field, '=', null);\n else if (op === 'IS NOT NULL')\n builder.filters.add(field, '<>', null);\n else if (value === null)\n builder.filters.add(field, op, null);\n else\n builder.filters.add(field, op, Array.isArray(value) ? value.map(bind) : bind(value));\n }\n\n builder.limit = limit;\n builder.offset = offset;\n builder.commit(target.proxy);\n\n const rows = await this.prepare(builder).all(run());\n\n return rows.map(raw => decode(builder, raw));\n }\n\n async insert(table: string, data: Record<string, any>, returns?: boolean, conflict?: Connection.Conflict){\n const { builder, target, bind, run } = statement(this, table);\n const values: Builder.Insert = new Map();\n\n for (const field of target.fields.values())\n if (field.column in data)\n values.set(field, bind(data[field.column]));\n\n builder.inserts.set(target, values);\n\n if (conflict)\n builder.conflict = {\n on: conflict.on.map(column => lookup(target, column)),\n update: conflict.update?.map(column => lookup(target, column)),\n set: new Map(Object.entries(conflict.set || {}).map(([column, value]) => [lookup(target, column), bind(value)]))\n };\n\n if (!returns)\n return this.prepare(builder).run(run());\n\n builder.commit(target.proxy);\n\n const [row] = await this.prepare(builder).all(run());\n\n return row && decode(builder, row);\n }\n\n async update(table: string, id: Connection.Key, data: Record<string, any>){\n const { builder, target, bind, run } = statement(this, table);\n const values: Builder.Insert = new Map();\n\n for (const column in data)\n values.set(lookup(target, column), bind(data[column]));\n\n builder.updates.set(target, values);\n identify(builder, target, id, bind);\n\n await this.prepare(builder).run(run());\n }\n\n async remove(table: string, id: Connection.Key){\n const { builder, target, bind, run } = statement(this, table);\n\n builder.deletes.add(target);\n identify(builder, target, id, bind);\n\n await this.prepare(builder).run(run());\n }\n}\n\nfunction identify(builder: Builder, target: Builder.ITable, id: Connection.Key, bind: (value: unknown) => Parameter){\n const { parts } = target.fields.get(\"id\")!;\n\n if (parts)\n parts.forEach((part, i) => builder.filters.add(lookup(target, part.column), '=', bind((id as unknown[])[i])));\n else\n builder.filters.add(target.fields.get(\"id\")!, '=', bind(id));\n}\n\nfunction statement(connection: Connection, table: string){\n const type = [...connection.using, ...connection._loaded.keys()].find(type => ref(type) === table);\n\n if (!type)\n throw new Error(`Table ${table} is not used by this connection.`);\n\n const builder = new Builder();\n const target = builder.tables.get(builder.use(type))!;\n const params: unknown[] = [];\n\n return {\n builder,\n target,\n bind(value: unknown){\n const param = new Parameter(params.length);\n\n params.push(value);\n builder.params.push(param);\n\n return param;\n },\n run: () => builder.accept(params)\n };\n}\n\nfunction lookup(table: Builder.ITable, column: string){\n for (const field of table.fields.values())\n if (field.column === column)\n return field;\n\n throw new Error(`Column ${column} does not exist in ${table.name}.`);\n}\n\nfunction decode(builder: Builder, raw: Record<string, any>){\n const row: Record<string, any> = {};\n\n (builder.returns as Map<string, Field>).forEach((field, key) => {\n row[field.column] = raw[key];\n });\n\n return row;\n}\n\nexport { Connection };\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Connection.js","names":["Base"],"sources":["../../src/connection/Connection.ts"],"sourcesContent":["import { Connection as Base, Field, Query, Type } from '@expressive/orm';\nimport { Builder, Parameter } from '@expressive/orm/driver';\n\nimport { codecs } from '../codecs';\n\ndeclare namespace Connection {\n type Types = Base.Types;\n\n type Ready<T extends Connection = Connection> = Base.Ready<T>;\n\n type Change = Base.Change;\n\n type Conflict = Base.Conflict;\n\n type Key = Base.Key;\n\n type Codec = Base.Codec;\n\n /** An open transaction's journal. */\n type Transaction = Base.Journal;\n\n /** One change `sync` would make. */\n interface Step {\n table: string;\n /** Column the step adds or indexes. Absent for a table step. */\n column?: string;\n /** What it does, like `create table user`. */\n action: string;\n /** The mismatch it resolves - what `sync(false)` reports. */\n reason: string;\n /** Statements applying it. */\n sql: string[];\n }\n\n /** What `sync` would do, and what stops it. */\n interface Plan {\n steps: Step[];\n /** Mismatches `sync` cannot fix. Any makes it throw. */\n problems: string[];\n }\n}\n\nfunction ref({ schema, table }: Query.Table){\n return schema ? `${schema}.${table}` : table;\n}\n\n/**\n * Base class of a SQL driver - implements orm's floor as queries through `prepare`.\n *\n * The floor is `select`, `insert`, `update` and `remove`.\n *\n * A dialect supplies `schema`, `prepare`, `sync` and `plan`, and `transact` to enable `transaction`.\n * Each statement throws when no bound or loaded class owns its table.\n * The floor takes and returns plain values: it checks each with its field, then stores it through the dialect's codecs.\n */\nabstract class Connection extends Base {\n protected get codecs(){\n return codecs;\n }\n\n /** DDL creating every bound class's table and indexes. */\n abstract get schema(): string;\n\n /**\n * Bring the database in line with the bound classes, then mark the connection ready.\n *\n * Creates missing tables, columns and indexes. `fix` false changes nothing and throws for anything missing.\n * `force` also converts columns whose type or nullability drifted. Throws for any problem `plan` reports.\n */\n abstract sync(fix?: boolean, force?: boolean): Promise<this>;\n\n /** List what `sync` would change, and what it could not, without applying anything. */\n abstract plan(force?: boolean): Promise<Connection.Plan>;\n\n /** Compile a `Query` builder to a statement in this dialect. */\n abstract prepare(builder: Builder): Builder.Statement;\n\n async select(table: string, constraints: Type.Constraint[], limit?: number, offset?: number){\n const { builder, target, bind, run } = statement(this, table);\n\n for (const [column, op, value] of constraints) {\n const field = lookup(target, column);\n const put = (value: unknown) => bind(op.includes(\"LIKE\") ? value : this._encode(field, check(field, value, true)));\n\n if (op === 'asc' || op === 'desc')\n builder.order.set(field, op);\n else if (op === 'IS NULL')\n builder.filters.add(field, '=', null);\n else if (op === 'IS NOT NULL')\n builder.filters.add(field, '<>', null);\n else if (value === null)\n builder.filters.add(field, op, null);\n else\n builder.filters.add(field, op, Array.isArray(value) ? value.map(put) : put(value));\n }\n\n builder.limit = limit;\n builder.offset = offset;\n builder.commit(target.proxy);\n\n const rows = await this.prepare(builder).all(run());\n\n return rows.map(raw => this.decode(builder, raw));\n }\n\n async insert(table: string, data: Record<string, any>, returns?: boolean, conflict?: Connection.Conflict){\n const { builder, target, bind, run } = statement(this, table);\n const values: Builder.Insert = new Map();\n const put = (field: Field, value: unknown) => bind(this._encode(field, check(field, value)));\n\n for (const field of target.fields.values())\n if (field.column in data)\n values.set(field, put(field, data[field.column]));\n\n builder.inserts.set(target, values);\n\n if (conflict)\n builder.conflict = {\n on: conflict.on.map(column => lookup(target, column)),\n update: conflict.update?.map(column => lookup(target, column)),\n set: new Map(Object.entries(conflict.set || {}).map(([column, value]) => {\n const field = lookup(target, column);\n return [field, put(field, value)];\n }))\n };\n\n if (!returns)\n return this.prepare(builder).run(run());\n\n builder.commit(target.proxy);\n\n const [row] = await this.prepare(builder).all(run());\n\n return row && this.decode(builder, row);\n }\n\n async update(table: string, id: Connection.Key, data: Record<string, any>){\n const { builder, target, bind, run } = statement(this, table);\n const values: Builder.Insert = new Map();\n\n for (const column in data) {\n const field = lookup(target, column);\n values.set(field, bind(this._encode(field, check(field, data[column]))));\n }\n\n builder.updates.set(target, values);\n this.identify(builder, target, id, bind);\n\n await this.prepare(builder).run(run());\n }\n\n async remove(table: string, id: Connection.Key){\n const { builder, target, bind, run } = statement(this, table);\n\n builder.deletes.add(target);\n this.identify(builder, target, id, bind);\n\n await this.prepare(builder).run(run());\n }\n\n private identify(builder: Builder, target: Builder.ITable, id: Connection.Key, bind: (value: unknown) => Parameter){\n const primary = target.fields.get(\"id\")!;\n const { parts = [primary] } = primary;\n const ids = primary.parts ? id as unknown[] : [id];\n\n parts.forEach((part, i) => {\n const field = lookup(target, part.column);\n builder.filters.add(field, '=', bind(this._encode(field, ids[i])));\n });\n }\n\n private decode(builder: Builder, raw: Record<string, any>){\n const row: Record<string, any> = {};\n\n (builder.returns as Map<string, Field>).forEach((field, key) => {\n row[field.column] = this._decode(field, raw[key]);\n });\n\n return row;\n }\n}\n\nfunction check(field: Field, value: unknown, compare?: boolean){\n return field.reference || value == null ? value : field.set(value, compare);\n}\n\nfunction statement(connection: Connection, table: string){\n const type = [...connection.using, ...connection._loaded.keys()].find(type => ref(type) === table);\n\n if (!type)\n throw new Error(`Table ${table} is not used by this connection.`);\n\n const builder = new Builder();\n const target = builder.tables.get(builder.use(type))!;\n const params: unknown[] = [];\n\n return {\n builder,\n target,\n bind(value: unknown){\n const param = new Parameter(params.length);\n\n params.push(value);\n builder.params.push(param);\n\n return param;\n },\n run: () => builder.accept(params)\n };\n}\n\nfunction lookup(table: Builder.ITable, column: string){\n for (const field of table.fields.values())\n if (field.column === column)\n return field;\n\n throw new Error(`Column ${column} does not exist in ${table.name}.`);\n}\n\nexport { Connection };\n"],"mappings":"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"}
|
|
@@ -197,7 +197,7 @@ var Generator = class {
|
|
|
197
197
|
}
|
|
198
198
|
/** One condition. `null` renders `IS` / `IS NOT`; an empty list a constant. */
|
|
199
199
|
filter(left, op, right) {
|
|
200
|
-
const raw = (value) => value === now ? this.now(left) : isValue(value) ? this.reference(value) : this.literal(op.includes("LIKE") ? value :
|
|
200
|
+
const raw = (value) => value === now ? this.now(left) : isValue(value) ? this.reference(value) : this.literal(op.includes("LIKE") ? value : this.query.encode(left, value));
|
|
201
201
|
if (right === null) {
|
|
202
202
|
if (op == "=") op = "IS";
|
|
203
203
|
else if (op == "<>" || op == "!=") op = "IS NOT";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Generator.js","names":[],"sources":["../../src/connection/Generator.ts"],"sourcesContent":["import { Field, now } from '@expressive/orm';\nimport { Builder, Computed, DataField, DataTable, Parameter, QueryTemplate } from '@expressive/orm/driver';\n\nimport { escape } from '../utils';\n\ntype Expression = Builder[\"filters\"];\n\nfunction isValue(input: unknown){\n return (\n input instanceof Field ||\n input instanceof Parameter ||\n input instanceof DataField ||\n input instanceof QueryTemplate ||\n input instanceof Computed\n );\n}\n\n/**\n * Renders a `Query` builder as one SQL statement - `String(generator)`.\n *\n * A dialect subclasses it and overrides the protected hooks. Literals render inline, escaped; parameters bind.\n */\nexport class Generator {\n constructor(public query: Builder){}\n\n toString() {\n const parts = [\n this.insert() || [\n this.with(),\n this.update() ||\n this.delete() ||\n this.select()\n ],\n this.where(),\n this.order(),\n this.limit(),\n this.upsert(),\n this.returning()\n ];\n\n return parts.flat(Infinity).filter(Boolean).join(' ');\n }\n\n /** Quote an identifier, each dotted part on its own. */\n escape(name: unknown){\n return String(name).split('.').map(x => `\\`${x}\\``).join('.');\n }\n\n /** `INSERT INTO`, or `false` when the query inserts nothing. */\n protected insert() {\n const { inserts, tables } = this.query;\n\n if (!inserts.size)\n return false;\n\n const [[table, data]] = inserts;\n\n const keys: string[] = [];\n const values: string[] = [];\n\n for (const [field, value] of data) {\n keys.push(this.escape(field.column));\n values.push(this.value(value, field));\n }\n\n if (!keys.length && tables.size > 1)\n throw new Error(`Insert into ${table.name} for each joined row needs at least one value.`);\n\n const into = ['INSERT INTO', this.escape(table.name)];\n\n if (!keys.length)\n return [this.with(), into, 'DEFAULT VALUES'];\n\n return this.insertWith(this.with(), [into, `(${keys})`], [\n `SELECT ${values}`,\n tables.size > 1 && this.from()\n ]);\n }\n\n /** Order an insert's data CTE, target and select - for a dialect placing `WITH` elsewhere. */\n protected insertWith(cte: string | undefined, into: unknown[], select: unknown[]): unknown[] {\n return [cte, into, select];\n }\n\n /** `ON CONFLICT` clause of an upsert. */\n protected upsert(){\n const { conflict } = this.query;\n\n if (!conflict)\n return;\n\n const on = `ON CONFLICT (${conflict.on.map(field => this.escape(field.column))})`;\n\n if (!conflict.update)\n return [on, 'DO NOTHING'];\n\n const set = conflict.update.map(({ column }) => `${this.escape(column)} = excluded.${this.escape(column)}`);\n\n for (const [field, value] of conflict.set)\n set.push(`${this.escape(field.column)} = ${this.value(value)}`);\n\n if (!set.length)\n set.push(...conflict.on.map(({ column }) => `${this.escape(column)} = excluded.${this.escape(column)}`));\n\n return [on, 'DO UPDATE SET', set.join(', ')];\n }\n\n /** `RETURNING` clause of an insert that selects. */\n protected returning(){\n const { inserts, returns } = this.query;\n\n if (!inserts.size || !returns)\n return;\n\n return 'RETURNING ' + (\n returns instanceof Map\n ? Array.from(returns, ([alias, field]) => `${this.value(field)} AS \"${alias}\"`).join(', ')\n : this.reference(returns)\n );\n }\n\n /** `WITH` clause over the query's data tables. */\n protected with(){\n const cte = [] as string[];\n\n this.query.tables.forEach((table) => {\n if (table instanceof DataTable)\n cte.push(`${this.escape(table.name)} AS (${this.jsonTable(table)})`);\n });\n\n if(cte.length)\n return 'WITH ' + cte.join();\n }\n\n /** A value - `now`, a reference, or a literal. */\n protected value(input: unknown, field?: Field){\n if(input === now)\n return this.now(field);\n\n if(isValue(input))\n return this.reference(input);\n\n return this.literal(input);\n }\n\n /** A literal - every literal in values, `SET` and `WHERE` passes through it. */\n protected literal(value: unknown){\n return String(escape(value));\n }\n\n /** A table with its alias - for `FROM`, joins, `UPDATE` and `DELETE`. */\n protected table({ name, alias }: Builder.ITable){\n return this.escape(name) + (alias ? ` ${this.escape(alias)}` : \"\");\n }\n\n /** The current time - `CURRENT_TIMESTAMP`; a dialect renders it per `field`'s storage. */\n protected now(_field?: Field){\n return \"CURRENT_TIMESTAMP\";\n }\n\n /** Select a data table's rows out of its bound parameter. The base throws - a dialect implements it. */\n protected jsonTable(_table: DataTable): string {\n throw new Error(\"Not implemented.\");\n }\n\n /** An arithmetic expression, parenthesized by operator rank. */\n protected computed(from: Computed<unknown>): string {\n const { left, operator, right, rank } = from;\n const side = (input: unknown, tight: boolean) => {\n if(!(input instanceof Computed))\n return this.value(input);\n\n const value = this.computed(input);\n\n return (tight ? input.rank <= rank : input.rank < rank) ? `(${value})` : value;\n }\n\n if(left === undefined)\n return operator + side(right, true);\n\n return `${side(left, false)} ${operator} ${side(right, true)}`;\n }\n\n /** `JOIN` clauses for every table but `main`. Throws for a table without a join condition. */\n protected joins(main: Builder.ITable){\n const output: string[] = [];\n\n for(const table of this.query.tables.values()){\n if(table === main)\n continue;\n\n const { name, optional } = table;\n\n if(table.joins.length === 0)\n throw new Error(`Table ${name} has no joins.`);\n\n const mode = optional ? \"LEFT\" : \"INNER\";\n const conds = table.joins.map(x => this.filter(x.left, x.op, x.right));\n\n output.push(`${mode} JOIN ${this.table(table)} ON ${conds.join(' AND ')}`);\n }\n\n if(output.length)\n return output.join(' ');\n }\n\n /** `SET` clause of an update. Throws without values. */\n protected set(updates: Map<Builder.ITable, Builder.Insert>){\n const sets: string[] = [];\n\n for(const [_table, data] of updates)\n for(const [field, value] of data)\n sets.push(`${this.escape(field.column)} = ${\n value === now ? this.now(field) :\n isValue(value) ? this.reference(value) :\n value === null ? 'NULL' :\n this.literal(value)\n }`);\n\n if(!sets.length)\n throw new Error('Update contains no values.');\n\n return `SET ${sets}`;\n }\n\n /** `UPDATE` head. Throws when the query updates more than one table. */\n protected update(){\n const { updates } = this.query;\n\n if(!updates.size)\n return;\n\n if(updates.size > 1)\n throw new Error('Engine does not support multi-table updates.');\n\n const [ main ] = updates.keys();\n\n return [\n 'UPDATE',\n this.table(main),\n this.joins(main),\n this.set(updates)\n ]\n }\n\n /** `DELETE FROM` head. */\n protected delete(){\n const { query } = this;\n const [ main ] = query.deletes;\n\n if(!main)\n return;\n\n const { alias, name } = main;\n const target = query.tables.size > 1 && (alias || name);\n\n return ['DELETE', target, 'FROM', this.table(main), this.joins(main)]\n }\n\n /** A column, parameter, data column, raw template or expression. */\n protected reference(from: unknown): string {\n if(from instanceof DataField)\n return this.escape(from.table.name + '.' + from.column);\n\n if(from instanceof QueryTemplate)\n return from.from;\n\n if(from instanceof Computed)\n return this.computed(from);\n\n if(from instanceof Parameter)\n return this.param(from);\n\n const { table, column } = from as Field;\n\n return this.escape(table!.alias || table!.name) + \".\" + this.escape(column);\n }\n\n /** `SELECT` head with joins - `COUNT(*)` when the query selects nothing. */\n protected select(){\n const { returns, tables } = this.query;\n const [ main ] = tables.values();\n\n const selection =\n returns instanceof Map ?\n Array.from(returns, ([alias, field]) => this.value(field) + ` AS \"${alias}\"`).join(', ') :\n returns ?\n this.reference(returns) :\n 'COUNT(*)';\n\n return [\n \"SELECT\",\n selection,\n this.from(),\n main && this.joins(main)\n ]\n }\n\n /** `FROM` clause of the main table. */\n protected from(){\n const [ main ] = this.query.tables.values();\n\n if(main)\n return [\"FROM\", this.table(main)]\n }\n\n /** A parameter placeholder. */\n protected param(_from: Parameter){\n return \"?\";\n }\n\n /** One condition. `null` renders `IS` / `IS NOT`; an empty list a constant. */\n protected filter(left: Field, op: string, right: unknown){\n const raw = (value: unknown) => (\n value === now ? this.now(left) :\n isValue(value) ? this.reference(value) :\n this.literal(op.includes(\"LIKE\") ? value : left.set(value))\n );\n\n if (right === null){\n if(op == '=')\n op = 'IS';\n else if(op == '<>' || op == '!=')\n op = 'IS NOT';\n else\n throw new Error('Cannot compare NULL with ' + op);\n\n right = 'NULL';\n }\n else if(right instanceof Array){\n if(!right.length)\n return op == 'NOT IN' ? '1 = 1' : '1 = 0';\n\n right = `(${right.map(raw)})`;\n }\n else\n right = raw(right);\n\n return `${this.reference(left)} ${op} ${right}`;\n }\n\n /** `WHERE` clause - top level joined with AND, alternating with OR by depth. */\n protected where() {\n const { filters } = this.query;\n\n if (!filters.size) return;\n\n const combine = (group: Expression, or?: boolean): string => {\n return Array\n .from(group.children, (cond, i) => {\n if (\"children\" in cond) {\n const inner = combine(cond, !or);\n const first = or !== false && i === 0;\n return cond.size === 1 || first ? inner : `(${inner})`;\n }\n\n return this.filter(cond.left, cond.op, cond.right);\n })\n .join(or ? ' OR ' : ' AND ');\n };\n\n return ['WHERE', combine(filters)];\n }\n\n /** `ORDER BY` clause. */\n protected order(){\n const { order } = this.query;\n\n if(order.size)\n return 'ORDER BY ' +\n Array.from(order, ([x, y]) => `${this.reference(x)} ${y}`);\n }\n\n /** `LIMIT` and `OFFSET` clauses. */\n protected limit(){\n const { limit, offset } = this.query;\n\n return [\n limit && `LIMIT ${limit}`,\n offset && `OFFSET ${offset}`\n ];\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Generator.js","names":[],"sources":["../../src/connection/Generator.ts"],"sourcesContent":["import { Field, now } from '@expressive/orm';\nimport { Builder, Computed, DataField, DataTable, Parameter, QueryTemplate } from '@expressive/orm/driver';\n\nimport { escape } from '../utils';\n\ntype Expression = Builder[\"filters\"];\n\nfunction isValue(input: unknown){\n return (\n input instanceof Field ||\n input instanceof Parameter ||\n input instanceof DataField ||\n input instanceof QueryTemplate ||\n input instanceof Computed\n );\n}\n\n/**\n * Renders a `Query` builder as one SQL statement - `String(generator)`.\n *\n * A dialect subclasses it and overrides the protected hooks. Literals render inline, escaped; parameters bind.\n */\nexport class Generator {\n constructor(public query: Builder){}\n\n toString() {\n const parts = [\n this.insert() || [\n this.with(),\n this.update() ||\n this.delete() ||\n this.select()\n ],\n this.where(),\n this.order(),\n this.limit(),\n this.upsert(),\n this.returning()\n ];\n\n return parts.flat(Infinity).filter(Boolean).join(' ');\n }\n\n /** Quote an identifier, each dotted part on its own. */\n escape(name: unknown){\n return String(name).split('.').map(x => `\\`${x}\\``).join('.');\n }\n\n /** `INSERT INTO`, or `false` when the query inserts nothing. */\n protected insert() {\n const { inserts, tables } = this.query;\n\n if (!inserts.size)\n return false;\n\n const [[table, data]] = inserts;\n\n const keys: string[] = [];\n const values: string[] = [];\n\n for (const [field, value] of data) {\n keys.push(this.escape(field.column));\n values.push(this.value(value, field));\n }\n\n if (!keys.length && tables.size > 1)\n throw new Error(`Insert into ${table.name} for each joined row needs at least one value.`);\n\n const into = ['INSERT INTO', this.escape(table.name)];\n\n if (!keys.length)\n return [this.with(), into, 'DEFAULT VALUES'];\n\n return this.insertWith(this.with(), [into, `(${keys})`], [\n `SELECT ${values}`,\n tables.size > 1 && this.from()\n ]);\n }\n\n /** Order an insert's data CTE, target and select - for a dialect placing `WITH` elsewhere. */\n protected insertWith(cte: string | undefined, into: unknown[], select: unknown[]): unknown[] {\n return [cte, into, select];\n }\n\n /** `ON CONFLICT` clause of an upsert. */\n protected upsert(){\n const { conflict } = this.query;\n\n if (!conflict)\n return;\n\n const on = `ON CONFLICT (${conflict.on.map(field => this.escape(field.column))})`;\n\n if (!conflict.update)\n return [on, 'DO NOTHING'];\n\n const set = conflict.update.map(({ column }) => `${this.escape(column)} = excluded.${this.escape(column)}`);\n\n for (const [field, value] of conflict.set)\n set.push(`${this.escape(field.column)} = ${this.value(value)}`);\n\n if (!set.length)\n set.push(...conflict.on.map(({ column }) => `${this.escape(column)} = excluded.${this.escape(column)}`));\n\n return [on, 'DO UPDATE SET', set.join(', ')];\n }\n\n /** `RETURNING` clause of an insert that selects. */\n protected returning(){\n const { inserts, returns } = this.query;\n\n if (!inserts.size || !returns)\n return;\n\n return 'RETURNING ' + (\n returns instanceof Map\n ? Array.from(returns, ([alias, field]) => `${this.value(field)} AS \"${alias}\"`).join(', ')\n : this.reference(returns)\n );\n }\n\n /** `WITH` clause over the query's data tables. */\n protected with(){\n const cte = [] as string[];\n\n this.query.tables.forEach((table) => {\n if (table instanceof DataTable)\n cte.push(`${this.escape(table.name)} AS (${this.jsonTable(table)})`);\n });\n\n if(cte.length)\n return 'WITH ' + cte.join();\n }\n\n /** A value - `now`, a reference, or a literal. */\n protected value(input: unknown, field?: Field){\n if(input === now)\n return this.now(field);\n\n if(isValue(input))\n return this.reference(input);\n\n return this.literal(input);\n }\n\n /** A literal - every literal in values, `SET` and `WHERE` passes through it. */\n protected literal(value: unknown){\n return String(escape(value));\n }\n\n /** A table with its alias - for `FROM`, joins, `UPDATE` and `DELETE`. */\n protected table({ name, alias }: Builder.ITable){\n return this.escape(name) + (alias ? ` ${this.escape(alias)}` : \"\");\n }\n\n /** The current time - `CURRENT_TIMESTAMP`; a dialect renders it per `field`'s storage. */\n protected now(_field?: Field){\n return \"CURRENT_TIMESTAMP\";\n }\n\n /** Select a data table's rows out of its bound parameter. The base throws - a dialect implements it. */\n protected jsonTable(_table: DataTable): string {\n throw new Error(\"Not implemented.\");\n }\n\n /** An arithmetic expression, parenthesized by operator rank. */\n protected computed(from: Computed<unknown>): string {\n const { left, operator, right, rank } = from;\n const side = (input: unknown, tight: boolean) => {\n if(!(input instanceof Computed))\n return this.value(input);\n\n const value = this.computed(input);\n\n return (tight ? input.rank <= rank : input.rank < rank) ? `(${value})` : value;\n }\n\n if(left === undefined)\n return operator + side(right, true);\n\n return `${side(left, false)} ${operator} ${side(right, true)}`;\n }\n\n /** `JOIN` clauses for every table but `main`. Throws for a table without a join condition. */\n protected joins(main: Builder.ITable){\n const output: string[] = [];\n\n for(const table of this.query.tables.values()){\n if(table === main)\n continue;\n\n const { name, optional } = table;\n\n if(table.joins.length === 0)\n throw new Error(`Table ${name} has no joins.`);\n\n const mode = optional ? \"LEFT\" : \"INNER\";\n const conds = table.joins.map(x => this.filter(x.left, x.op, x.right));\n\n output.push(`${mode} JOIN ${this.table(table)} ON ${conds.join(' AND ')}`);\n }\n\n if(output.length)\n return output.join(' ');\n }\n\n /** `SET` clause of an update. Throws without values. */\n protected set(updates: Map<Builder.ITable, Builder.Insert>){\n const sets: string[] = [];\n\n for(const [_table, data] of updates)\n for(const [field, value] of data)\n sets.push(`${this.escape(field.column)} = ${\n value === now ? this.now(field) :\n isValue(value) ? this.reference(value) :\n value === null ? 'NULL' :\n this.literal(value)\n }`);\n\n if(!sets.length)\n throw new Error('Update contains no values.');\n\n return `SET ${sets}`;\n }\n\n /** `UPDATE` head. Throws when the query updates more than one table. */\n protected update(){\n const { updates } = this.query;\n\n if(!updates.size)\n return;\n\n if(updates.size > 1)\n throw new Error('Engine does not support multi-table updates.');\n\n const [ main ] = updates.keys();\n\n return [\n 'UPDATE',\n this.table(main),\n this.joins(main),\n this.set(updates)\n ]\n }\n\n /** `DELETE FROM` head. */\n protected delete(){\n const { query } = this;\n const [ main ] = query.deletes;\n\n if(!main)\n return;\n\n const { alias, name } = main;\n const target = query.tables.size > 1 && (alias || name);\n\n return ['DELETE', target, 'FROM', this.table(main), this.joins(main)]\n }\n\n /** A column, parameter, data column, raw template or expression. */\n protected reference(from: unknown): string {\n if(from instanceof DataField)\n return this.escape(from.table.name + '.' + from.column);\n\n if(from instanceof QueryTemplate)\n return from.from;\n\n if(from instanceof Computed)\n return this.computed(from);\n\n if(from instanceof Parameter)\n return this.param(from);\n\n const { table, column } = from as Field;\n\n return this.escape(table!.alias || table!.name) + \".\" + this.escape(column);\n }\n\n /** `SELECT` head with joins - `COUNT(*)` when the query selects nothing. */\n protected select(){\n const { returns, tables } = this.query;\n const [ main ] = tables.values();\n\n const selection =\n returns instanceof Map ?\n Array.from(returns, ([alias, field]) => this.value(field) + ` AS \"${alias}\"`).join(', ') :\n returns ?\n this.reference(returns) :\n 'COUNT(*)';\n\n return [\n \"SELECT\",\n selection,\n this.from(),\n main && this.joins(main)\n ]\n }\n\n /** `FROM` clause of the main table. */\n protected from(){\n const [ main ] = this.query.tables.values();\n\n if(main)\n return [\"FROM\", this.table(main)]\n }\n\n /** A parameter placeholder. */\n protected param(_from: Parameter){\n return \"?\";\n }\n\n /** One condition. `null` renders `IS` / `IS NOT`; an empty list a constant. */\n protected filter(left: Field, op: string, right: unknown){\n const raw = (value: unknown) => (\n value === now ? this.now(left) :\n isValue(value) ? this.reference(value) :\n this.literal(op.includes(\"LIKE\") ? value : this.query.encode(left, value))\n );\n\n if (right === null){\n if(op == '=')\n op = 'IS';\n else if(op == '<>' || op == '!=')\n op = 'IS NOT';\n else\n throw new Error('Cannot compare NULL with ' + op);\n\n right = 'NULL';\n }\n else if(right instanceof Array){\n if(!right.length)\n return op == 'NOT IN' ? '1 = 1' : '1 = 0';\n\n right = `(${right.map(raw)})`;\n }\n else\n right = raw(right);\n\n return `${this.reference(left)} ${op} ${right}`;\n }\n\n /** `WHERE` clause - top level joined with AND, alternating with OR by depth. */\n protected where() {\n const { filters } = this.query;\n\n if (!filters.size) return;\n\n const combine = (group: Expression, or?: boolean): string => {\n return Array\n .from(group.children, (cond, i) => {\n if (\"children\" in cond) {\n const inner = combine(cond, !or);\n const first = or !== false && i === 0;\n return cond.size === 1 || first ? inner : `(${inner})`;\n }\n\n return this.filter(cond.left, cond.op, cond.right);\n })\n .join(or ? ' OR ' : ' AND ');\n };\n\n return ['WHERE', combine(filters)];\n }\n\n /** `ORDER BY` clause. */\n protected order(){\n const { order } = this.query;\n\n if(order.size)\n return 'ORDER BY ' +\n Array.from(order, ([x, y]) => `${this.reference(x)} ${y}`);\n }\n\n /** `LIMIT` and `OFFSET` clauses. */\n protected limit(){\n const { limit, offset } = this.query;\n\n return [\n limit && `LIMIT ${limit}`,\n offset && `OFFSET ${offset}`\n ];\n }\n}\n"],"mappings":"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"}
|
package/dist/datatypes.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { now } from "@expressive/orm";
|
|
|
4
4
|
interface Datatypes {
|
|
5
5
|
/** The current time - rendered by the database in the column's storage; statics take the app's clock. */
|
|
6
6
|
readonly now: typeof now;
|
|
7
|
-
/** `str` (default) - unbounded text.
|
|
7
|
+
/** `str` (default) - unbounded text. */
|
|
8
8
|
readonly text: {
|
|
9
9
|
readonly type: "text";
|
|
10
10
|
};
|
|
@@ -12,11 +12,7 @@ interface Datatypes {
|
|
|
12
12
|
readonly uuid: {
|
|
13
13
|
readonly type: "uuid";
|
|
14
14
|
};
|
|
15
|
-
/**
|
|
16
|
-
* 32-bit integer - for `num`, `one` (default), `bool` and `date`.
|
|
17
|
-
*
|
|
18
|
-
* On `num` a fraction or a value out of range throws on write. `bool` stores 1 or 0; `date`, epoch seconds.
|
|
19
|
-
*/
|
|
15
|
+
/** `num` (default) - 32-bit integer; a fraction or a value out of range throws on write. */
|
|
20
16
|
readonly integer: {
|
|
21
17
|
readonly type: "integer";
|
|
22
18
|
};
|
|
@@ -24,7 +20,7 @@ interface Datatypes {
|
|
|
24
20
|
readonly smallint: {
|
|
25
21
|
readonly type: "smallint";
|
|
26
22
|
};
|
|
27
|
-
/** `num
|
|
23
|
+
/** `num` - 64-bit integer; a fraction throws on write. */
|
|
28
24
|
readonly bigint: {
|
|
29
25
|
readonly type: "bigint";
|
|
30
26
|
};
|
|
@@ -32,23 +28,15 @@ interface Datatypes {
|
|
|
32
28
|
readonly real: {
|
|
33
29
|
readonly type: "real";
|
|
34
30
|
};
|
|
35
|
-
/** `num` - floating point. */
|
|
36
|
-
readonly float: {
|
|
37
|
-
readonly type: "float";
|
|
38
|
-
};
|
|
39
31
|
/** `num` - floating point, `double precision` in schema. */
|
|
40
32
|
readonly double: {
|
|
41
33
|
readonly type: "double";
|
|
42
34
|
};
|
|
43
|
-
/** `bool` (default). */
|
|
44
|
-
readonly boolean: {
|
|
45
|
-
readonly type: "boolean";
|
|
46
|
-
};
|
|
47
35
|
/** `date` (default) - date and time. */
|
|
48
36
|
readonly timestamp: {
|
|
49
37
|
readonly type: "timestamp";
|
|
50
38
|
};
|
|
51
|
-
/** `date` - a calendar day, `YYYY-MM-DD
|
|
39
|
+
/** `date` - a calendar day, stored `YYYY-MM-DD` from the local day and read as local midnight. */
|
|
52
40
|
readonly date: {
|
|
53
41
|
readonly type: "date";
|
|
54
42
|
};
|
|
@@ -56,15 +44,7 @@ interface Datatypes {
|
|
|
56
44
|
readonly time: {
|
|
57
45
|
readonly type: "time";
|
|
58
46
|
};
|
|
59
|
-
/** `
|
|
60
|
-
readonly ms: {
|
|
61
|
-
readonly type: "ms";
|
|
62
|
-
};
|
|
63
|
-
/** `date` - epoch seconds in an integer. */
|
|
64
|
-
readonly seconds: {
|
|
65
|
-
readonly type: "seconds";
|
|
66
|
-
};
|
|
67
|
-
/** `str` - text up to `length` characters; longer throws on write. `bool` - with `either`. */
|
|
47
|
+
/** `str` - text up to `length` characters; longer throws on write. */
|
|
68
48
|
readonly varchar: <N extends number>(length: N) => {
|
|
69
49
|
readonly type: "varchar";
|
|
70
50
|
readonly length: N;
|
package/dist/datatypes.js
CHANGED
|
@@ -14,14 +14,10 @@ const sql = {
|
|
|
14
14
|
smallint: { type: "smallint" },
|
|
15
15
|
bigint: { type: "bigint" },
|
|
16
16
|
real: { type: "real" },
|
|
17
|
-
float: { type: "float" },
|
|
18
17
|
double: { type: "double" },
|
|
19
|
-
boolean: { type: "boolean" },
|
|
20
18
|
timestamp: { type: "timestamp" },
|
|
21
19
|
date: { type: "date" },
|
|
22
20
|
time: { type: "time" },
|
|
23
|
-
ms: { type: "ms" },
|
|
24
|
-
seconds: { type: "seconds" },
|
|
25
21
|
varchar: (length) => ({
|
|
26
22
|
type: "varchar",
|
|
27
23
|
length
|
package/dist/datatypes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datatypes.js","names":[],"sources":["../src/datatypes.ts"],"sourcesContent":["import { now } from '@expressive/orm';\n\ninterface Datatypes {\n /** The current time - rendered by the database in the column's storage; statics take the app's clock. */\n readonly now: typeof now;\n /** `str` (default) - unbounded text.
|
|
1
|
+
{"version":3,"file":"datatypes.js","names":[],"sources":["../src/datatypes.ts"],"sourcesContent":["import { now } from '@expressive/orm';\n\ninterface Datatypes {\n /** The current time - rendered by the database in the column's storage; statics take the app's clock. */\n readonly now: typeof now;\n /** `str` (default) - unbounded text. */\n readonly text: { readonly type: \"text\" };\n /** `str` - a UUID. As `key(sql.uuid)`, a UUIDv7 is generated on insert when absent. */\n readonly uuid: { readonly type: \"uuid\" };\n /** `num` (default) - 32-bit integer; a fraction or a value out of range throws on write. */\n readonly integer: { readonly type: \"integer\" };\n /** `num` - 16-bit integer; a fraction or a value out of range throws on write. */\n readonly smallint: { readonly type: \"smallint\" };\n /** `num` - 64-bit integer; a fraction throws on write. */\n readonly bigint: { readonly type: \"bigint\" };\n /** `num` - floating point. */\n readonly real: { readonly type: \"real\" };\n /** `num` - floating point, `double precision` in schema. */\n readonly double: { readonly type: \"double\" };\n /** `date` (default) - date and time. */\n readonly timestamp: { readonly type: \"timestamp\" };\n /** `date` - a calendar day, stored `YYYY-MM-DD` from the local day and read as local midnight. */\n readonly date: { readonly type: \"date\" };\n /** `date` - time of day, `HH:MM:SS` UTC, read on 1970-01-01. */\n readonly time: { readonly type: \"time\" };\n /** `str` - text up to `length` characters; longer throws on write. */\n readonly varchar: <N extends number>(length: N) => { readonly type: \"varchar\"; readonly length: N };\n /** `str` - fixed-length text; longer than `length` throws on write. */\n readonly char: <N extends number>(length: N) => { readonly type: \"char\"; readonly length: N };\n /**\n * `num` - exact decimal of `precision` digits, `scale` (default 0) after the point.\n *\n * A value past either throws on write.\n */\n readonly numeric: (precision: number, scale?: number) => { readonly type: \"numeric\"; readonly precision: number; readonly scale: number };\n /** `num` - exact decimal, as `numeric`. */\n readonly decimal: (precision: number, scale?: number) => { readonly type: \"decimal\"; readonly precision: number; readonly scale: number };\n}\n\n/**\n * Column datatypes, passed to a field helper - `str(sql.varchar(255))`, `date(sql.ms)`.\n *\n * Each fits only the helpers named on it; elsewhere it is a type error.\n */\nconst sql: Datatypes = {\n now,\n text: { type: \"text\" },\n uuid: { type: \"uuid\" },\n integer: { type: \"integer\" },\n smallint: { type: \"smallint\" },\n bigint: { type: \"bigint\" },\n real: { type: \"real\" },\n double: { type: \"double\" },\n timestamp: { type: \"timestamp\" },\n date: { type: \"date\" },\n time: { type: \"time\" },\n varchar: <N extends number>(length: N) => ({ type: \"varchar\", length }) as const,\n char: <N extends number>(length: N) => ({ type: \"char\", length }) as const,\n numeric: (precision: number, scale = 0) => ({ type: \"numeric\", precision, scale }) as const,\n decimal: (precision: number, scale = 0) => ({ type: \"decimal\", precision, scale }) as const\n};\n\nexport { sql };\n"],"mappings":";;;;;;;;AA4CA,MAAM,MAAiB;CACrB;CACA,MAAM,EAAE,MAAM,QAAQ;CACtB,MAAM,EAAE,MAAM,QAAQ;CACtB,SAAS,EAAE,MAAM,WAAW;CAC5B,UAAU,EAAE,MAAM,YAAY;CAC9B,QAAQ,EAAE,MAAM,UAAU;CAC1B,MAAM,EAAE,MAAM,QAAQ;CACtB,QAAQ,EAAE,MAAM,UAAU;CAC1B,WAAW,EAAE,MAAM,aAAa;CAChC,MAAM,EAAE,MAAM,QAAQ;CACtB,MAAM,EAAE,MAAM,QAAQ;CACtB,UAA4B,YAAe;EAAE,MAAM;EAAW;EAAQ;CACtE,OAAyB,YAAe;EAAE,MAAM;EAAQ;EAAQ;CAChE,UAAU,WAAmB,QAAQ,OAAO;EAAE,MAAM;EAAW;EAAW;EAAO;CACjF,UAAU,WAAmB,QAAQ,OAAO;EAAE,MAAM;EAAW;EAAW;EAAO;CAClF"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { NumericColumn } from "./columns/Num.js";
|
|
3
|
-
import { ForeignColumn } from "./columns/One.js";
|
|
4
|
-
import { StringColumn } from "./columns/Str.js";
|
|
5
|
-
import { TimeColumn } from "./columns/Time.js";
|
|
1
|
+
import { codecs } from "./codecs.js";
|
|
6
2
|
import { Connection } from "./connection/Connection.js";
|
|
7
3
|
import { Generator } from "./connection/Generator.js";
|
|
8
4
|
import { sql } from "./datatypes.js";
|
|
9
5
|
import { Engine } from "./sqlite/engine.js";
|
|
10
6
|
import { SQLiteConnection } from "./sqlite/SQLiteConnection.js";
|
|
11
7
|
export * from "@expressive/orm";
|
|
12
|
-
export {
|
|
8
|
+
export { Connection, type Engine, Generator, SQLiteConnection, codecs, sql };
|
package/dist/index.js
CHANGED
|
@@ -1,13 +1,9 @@
|
|
|
1
|
+
import { codecs } from "./codecs.js";
|
|
1
2
|
import { sql } from "./datatypes.js";
|
|
2
|
-
import { BooleanColumn } from "./columns/Bool.js";
|
|
3
|
-
import { NumericColumn } from "./columns/Num.js";
|
|
4
|
-
import { ForeignColumn } from "./columns/One.js";
|
|
5
|
-
import { StringColumn } from "./columns/Str.js";
|
|
6
|
-
import { TimeColumn } from "./columns/Time.js";
|
|
7
3
|
import { Connection } from "./connection/Connection.js";
|
|
8
4
|
import { Generator } from "./connection/Generator.js";
|
|
9
5
|
import { SQLiteConnection } from "./sqlite/SQLiteConnection.js";
|
|
10
6
|
|
|
11
7
|
export * from "@expressive/orm"
|
|
12
8
|
|
|
13
|
-
export {
|
|
9
|
+
export { Connection, Generator, SQLiteConnection, codecs, sql };
|
|
@@ -21,6 +21,7 @@ type TableInfo = {
|
|
|
21
21
|
*/
|
|
22
22
|
declare class SQLiteConnection extends Connection$1 {
|
|
23
23
|
#private;
|
|
24
|
+
protected get codecs(): ReadonlyMap<Function, Connection$1.Codec>;
|
|
24
25
|
protected filename: string;
|
|
25
26
|
protected engine?: Promise<Engine>;
|
|
26
27
|
protected owned: boolean;
|