drizzle-orm 0.12.0-beta.9 → 0.13.1
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 → README.md} +11 -3
- package/alias.js.map +1 -1
- package/column.js.map +1 -1
- package/connection.d.ts +10 -0
- package/connection.js +25 -30
- package/connection.js.map +1 -1
- package/operations.d.ts +1 -2
- package/package.json +13 -32
- package/query-promise.d.ts +7 -0
- package/query-promise.js +27 -0
- package/query-promise.js.map +1 -0
- package/sql/expressions/conditions.d.ts +11 -11
- package/sql/expressions/conditions.js +2 -2
- package/sql/expressions/conditions.js.map +1 -1
- package/sql/index.d.ts +17 -5
- package/sql/index.js +34 -6
- package/sql/index.js.map +1 -1
- package/utils.d.ts +76 -2
- package/utils.js +20 -14
- package/utils.js.map +1 -1
- package/branded-types.d.ts +0 -18
- package/branded-types.js +0 -6
- package/branded-types.js.map +0 -1
package/{readme.md → README.md}
RENAMED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
##
|
|
1
|
+
## Drizzle ORM
|
|
2
2
|
DrizzleORM is a TypeScript ORM library with a [drizzle-kit](#migrations) CLI companion for automatic SQL migrations generation.
|
|
3
3
|
It's meant to be a library, not a framework, stay as an opt-in solution all the time at any levels.
|
|
4
4
|
We try to follow SQL-like syntax whenever possible, be strongly typed ground top and fail in compile time, not in runtime.
|
|
@@ -8,8 +8,8 @@ Library has almost zero dependencies and being battle tested on production proje
|
|
|
8
8
|
| database | support | |
|
|
9
9
|
|:-- | :---: | :-- |
|
|
10
10
|
| PostgreSQL | ✅ |[Docs](https://github.com/drizzle-team/drizzle-orm/tree/main/drizzle-orm-pg)|
|
|
11
|
-
| MySQL |
|
|
12
|
-
| SQLite |
|
|
11
|
+
| MySQL | ⏳ | |
|
|
12
|
+
| SQLite | ✅ |[Docs](https://github.com/drizzle-team/drizzle-orm/tree/main/drizzle-orm-sqlite)|
|
|
13
13
|
| DynamoDB | ⏳ | |
|
|
14
14
|
| MS SQL | ⏳ | |
|
|
15
15
|
| CockroachDB | ⏳ | |
|
|
@@ -19,4 +19,12 @@ Library has almost zero dependencies and being battle tested on production proje
|
|
|
19
19
|
// postgresql
|
|
20
20
|
npm install drizzle-orm drizzle-orm-pg
|
|
21
21
|
npm install -D drizzle-kit
|
|
22
|
+
|
|
23
|
+
// mysql
|
|
24
|
+
npm install drizzle-orm drizzle-orm-mysql
|
|
25
|
+
npm install -D drizzle-kit
|
|
26
|
+
|
|
27
|
+
// sqlite
|
|
28
|
+
npm install drizzle-orm drizzle-orm-sqlite
|
|
29
|
+
npm install -D drizzle-kit
|
|
22
30
|
```
|
package/alias.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../src/alias.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAC7C,mCAAgC;AAEhC,MAAa,uBAAuB;IACnC,
|
|
1
|
+
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../src/alias.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAC7C,mCAAgC;AAEhC,MAAa,uBAAuB;IACnC,YAAoB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;IAEpC,GAAG,CAAC,SAAkB,EAAE,IAAqB,EAAE,QAAa;QAC3D,IAAI,IAAI,KAAK,OAAO,EAAE;YACrB,OAAO,IAAI,CAAC,KAAK,CAAC;SAClB;QACD,OAAO,SAAS,CAAC,IAAqB,CAAC,CAAC;IACzC,CAAC;CACD;AATD,0DASC;AAED,MAAa,sBAAsB;IAClC,YAAoB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;IAErC,GAAG,CAAC,QAAe,EAAE,IAAqB,EAAE,QAAa;QACxD,IAAI,IAAI,KAAK,aAAK,CAAC,MAAM,CAAC,IAAI,EAAE;YAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;SAClB;QACD,IAAI,IAAI,KAAK,aAAK,CAAC,MAAM,CAAC,OAAO,EAAE;YAClC,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,OAAO,CAAC;aACf;YAED,MAAM,cAAc,GAA2B,EAAE,CAAC;YAElD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBAChC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,CAC9B,OAAO,CAAC,GAAG,CAAE,EACb,IAAI,uBAAuB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CACtD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,cAAc,CAAC;SACtB;QAED,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAmB,CAAC,CAAC;QAC5C,IAAI,KAAK,YAAY,eAAM,EAAE;YAC5B,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,uBAAuB,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;SAChF;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAhCD,wDAgCC"}
|
package/column.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"column.js","sourceRoot":"","sources":["../src/column.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"column.js","sourceRoot":"","sources":["../src/column.ts"],"names":[],"mappings":";;;AAcA,kCAAkC;AAClC,+BAA+B;AAC/B,8CAA8C;AAC9C,kDAAkD;AAElD;;;;EAIE;AACF,MAAsB,MAAM;IAe3B,YAAqB,KAA4B,EAAE,OAA4C;QAA1E,UAAK,GAAL,KAAK,CAAuB;QAChD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;IAC1C,CAAC;IAID,kBAAkB,CAAC,KAAuB;QACzC,OAAO,KAAY,CAAC;IACrB,CAAC;IAED,gBAAgB,CAAC,KAAgB;QAChC,OAAO,KAAY,CAAC;IACrB,CAAC;CACD;AA/BD,wBA+BC"}
|
package/connection.d.ts
CHANGED
|
@@ -6,7 +6,17 @@ export declare type MigrationMeta = {
|
|
|
6
6
|
export interface Logger {
|
|
7
7
|
logQuery(query: string, params: unknown[]): void;
|
|
8
8
|
}
|
|
9
|
+
export interface LogWriter {
|
|
10
|
+
write(message: string): void;
|
|
11
|
+
}
|
|
12
|
+
export declare class ConsoleLogWriter implements LogWriter {
|
|
13
|
+
write(message: string): void;
|
|
14
|
+
}
|
|
9
15
|
export declare class DefaultLogger implements Logger {
|
|
16
|
+
readonly writer: LogWriter;
|
|
17
|
+
constructor(config?: {
|
|
18
|
+
writer: LogWriter;
|
|
19
|
+
});
|
|
10
20
|
logQuery(query: string, params: unknown[]): void;
|
|
11
21
|
}
|
|
12
22
|
export declare class NoopLogger implements Logger {
|
package/connection.js
CHANGED
|
@@ -1,35 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.readMigrationFiles = exports.NoopLogger = exports.DefaultLogger = void 0;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
3
|
+
exports.readMigrationFiles = exports.NoopLogger = exports.DefaultLogger = exports.ConsoleLogWriter = void 0;
|
|
4
|
+
class ConsoleLogWriter {
|
|
5
|
+
write(message) {
|
|
6
|
+
console.log(message);
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
exports.ConsoleLogWriter = ConsoleLogWriter;
|
|
30
10
|
class DefaultLogger {
|
|
11
|
+
constructor(config = { writer: new ConsoleLogWriter() }) {
|
|
12
|
+
this.writer = config.writer;
|
|
13
|
+
}
|
|
31
14
|
logQuery(query, params) {
|
|
32
|
-
|
|
15
|
+
const stringifiedParams = params.map((p) => {
|
|
16
|
+
try {
|
|
17
|
+
return JSON.stringify(p);
|
|
18
|
+
}
|
|
19
|
+
catch (e) {
|
|
20
|
+
return String(p);
|
|
21
|
+
}
|
|
22
|
+
});
|
|
23
|
+
const paramsStr = stringifiedParams.length ? ` -- params: [${stringifiedParams.join(', ')}]` : '';
|
|
24
|
+
this.writer.write(`Query: ${query}${paramsStr}`);
|
|
33
25
|
}
|
|
34
26
|
}
|
|
35
27
|
exports.DefaultLogger = DefaultLogger;
|
|
@@ -38,6 +30,9 @@ class NoopLogger {
|
|
|
38
30
|
}
|
|
39
31
|
exports.NoopLogger = NoopLogger;
|
|
40
32
|
function readMigrationFiles(config) {
|
|
33
|
+
const fs = require('fs');
|
|
34
|
+
const crypto = require('crypto');
|
|
35
|
+
const path = require('path');
|
|
41
36
|
let migrationFolderTo;
|
|
42
37
|
if (typeof config === 'string') {
|
|
43
38
|
const configAsString = fs.readFileSync(path.resolve('.', config), 'utf8');
|
|
@@ -50,9 +45,9 @@ function readMigrationFiles(config) {
|
|
|
50
45
|
if (!migrationFolderTo) {
|
|
51
46
|
throw Error('no migration folder defined');
|
|
52
47
|
}
|
|
53
|
-
const
|
|
48
|
+
const files = fs.readdirSync(migrationFolderTo);
|
|
54
49
|
const migrationQueries = [];
|
|
55
|
-
for (const migrationFolder of
|
|
50
|
+
for (const migrationFolder of files) {
|
|
56
51
|
if (migrationFolder === '.DS_Store') {
|
|
57
52
|
continue;
|
|
58
53
|
}
|
package/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
|
package/operations.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "drizzle-orm",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.13.1",
|
|
4
4
|
"description": "Drizzle ORM package for SQL databases",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "index.d.ts",
|
|
@@ -24,53 +24,34 @@
|
|
|
24
24
|
"author": "",
|
|
25
25
|
"license": "Apache-2.0",
|
|
26
26
|
"bugs": {
|
|
27
|
-
"url": "https://github.com/
|
|
27
|
+
"url": "https://github.com/drizzle-team/drizzle-orm/issues"
|
|
28
28
|
},
|
|
29
|
-
"homepage": "https://github.com/
|
|
29
|
+
"homepage": "https://github.com/drizzle-team/drizzle-orm#readme",
|
|
30
30
|
"peerDependencies": {
|
|
31
31
|
"drizzle-orm-mysql": ">=0.12.0 <0.13.0 || >=0.12.0-beta.0 <0.13.0-beta.0",
|
|
32
|
-
"drizzle-orm-pg": ">=0.
|
|
33
|
-
"
|
|
34
|
-
"pg": ">=8 <9",
|
|
35
|
-
"sqlite3": ">=5 <6"
|
|
32
|
+
"drizzle-orm-pg": ">=0.13.0 <0.14.0 || >=0.13.0-beta.0 <0.14.0-beta.0",
|
|
33
|
+
"drizzle-orm-sqlite": ">=0.13.0 <0.14.0 || >=0.13.0-beta.0 <0.14.0-beta.0"
|
|
36
34
|
},
|
|
37
35
|
"peerDependenciesMeta": {
|
|
38
|
-
"
|
|
39
|
-
"optional": true
|
|
40
|
-
},
|
|
41
|
-
"pg": {
|
|
42
|
-
"optional": true
|
|
43
|
-
},
|
|
44
|
-
"sqlite3": {
|
|
36
|
+
"drizzle-orm-mysql": {
|
|
45
37
|
"optional": true
|
|
46
38
|
},
|
|
47
39
|
"drizzle-orm-pg": {
|
|
48
40
|
"optional": true
|
|
49
41
|
},
|
|
50
|
-
"drizzle-orm-
|
|
42
|
+
"drizzle-orm-sqlite": {
|
|
51
43
|
"optional": true
|
|
52
44
|
}
|
|
53
45
|
},
|
|
54
46
|
"devDependencies": {
|
|
55
|
-
"@types/node": "
|
|
56
|
-
"@types/pg": "^8.6.1",
|
|
57
|
-
"@types/sqlite3": "^3.1.8",
|
|
58
|
-
"mysql2": "^2.3.3",
|
|
59
|
-
"pg": "^8.6.0",
|
|
60
|
-
"resolve-tspaths": "^0.7.0",
|
|
61
|
-
"sqlite3": "^5.0.8",
|
|
62
|
-
"ts-node": "^10.8.2",
|
|
63
|
-
"typescript": "^4.8.4",
|
|
64
|
-
"uvu": "^0.5.6"
|
|
65
|
-
},
|
|
66
|
-
"dependencies": {
|
|
67
|
-
"type-fest": "^2.16.0"
|
|
47
|
+
"@types/node": "^18.11.9"
|
|
68
48
|
},
|
|
69
49
|
"scripts": {
|
|
70
|
-
"build": "tsc",
|
|
71
|
-
"
|
|
72
|
-
"
|
|
73
|
-
"release
|
|
50
|
+
"build": "tsc -p tsconfig.build.json",
|
|
51
|
+
"test:types": "echo WARN: No tests defined!",
|
|
52
|
+
"pack": "cp ../README.md package.json dist/ && (cd dist && pnpm pack --pack-destination ..) && rm -f package.tgz && mv *.tgz package.tgz",
|
|
53
|
+
"release": "pnpm build && pnpm run pack && pnpm run publish",
|
|
54
|
+
"release:beta": "pnpm build && pnpm run pack && pnpm run publish --tag beta",
|
|
74
55
|
"build:int": "pnpm build && pnpm run pack"
|
|
75
56
|
}
|
|
76
57
|
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export declare abstract class QueryPromise<T> implements Promise<T> {
|
|
2
|
+
[Symbol.toStringTag]: string;
|
|
3
|
+
catch<TResult = never>(onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null | undefined): Promise<T | TResult>;
|
|
4
|
+
finally(onFinally?: (() => void) | null | undefined): Promise<T>;
|
|
5
|
+
then<TResult1 = T, TResult2 = never>(onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
|
|
6
|
+
abstract execute(): Promise<T>;
|
|
7
|
+
}
|
package/query-promise.js
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var _a;
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.QueryPromise = void 0;
|
|
5
|
+
class QueryPromise {
|
|
6
|
+
constructor() {
|
|
7
|
+
this[_a] = 'QueryPromise';
|
|
8
|
+
}
|
|
9
|
+
catch(onRejected) {
|
|
10
|
+
return this.then(undefined, onRejected);
|
|
11
|
+
}
|
|
12
|
+
finally(onFinally) {
|
|
13
|
+
return this.then((value) => {
|
|
14
|
+
onFinally === null || onFinally === void 0 ? void 0 : onFinally();
|
|
15
|
+
return value;
|
|
16
|
+
}, (reason) => {
|
|
17
|
+
onFinally === null || onFinally === void 0 ? void 0 : onFinally();
|
|
18
|
+
return Promise.reject(reason);
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
then(onFulfilled, onRejected) {
|
|
22
|
+
return this.execute().then(onFulfilled, onRejected);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
exports.QueryPromise = QueryPromise;
|
|
26
|
+
_a = Symbol.toStringTag;
|
|
27
|
+
//# sourceMappingURL=query-promise.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"query-promise.js","sourceRoot":"","sources":["../src/query-promise.ts"],"names":[],"mappings":";;;;AAAA,MAAsB,YAAY;IAAlC;QACC,QAAoB,GAAG,cAAc,CAAC;IA6BvC,CAAC;IA3BA,KAAK,CACJ,UAAiF;QAEjF,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,CAAC,SAA2C;QAClD,OAAO,IAAI,CAAC,IAAI,CACf,CAAC,KAAK,EAAE,EAAE;YACT,SAAS,aAAT,SAAS,uBAAT,SAAS,EAAI,CAAC;YACd,OAAO,KAAK,CAAC;QACd,CAAC,EACD,CAAC,MAAM,EAAE,EAAE;YACV,SAAS,aAAT,SAAS,uBAAT,SAAS,EAAI,CAAC;YACd,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC,CACD,CAAC;IACH,CAAC;IAED,IAAI,CACH,WAAiF,EACjF,UAAmF;QAEnF,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;CAGD;AA9BD,oCA8BC;KA7BC,MAAM,CAAC,WAAW"}
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
import { AnyColumn, GetColumnData } from '../../column';
|
|
2
|
-
import { SQL, SQLWrapper } from '..';
|
|
3
|
-
export declare function eq<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn, 'raw'>): SQL;
|
|
2
|
+
import { Placeholder, SQL, SQLWrapper } from '..';
|
|
3
|
+
export declare function eq<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn, 'raw'> | Placeholder): SQL;
|
|
4
4
|
export declare function eq(left: AnyColumn, right: AnyColumn): SQL;
|
|
5
|
-
export declare function ne<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
|
|
5
|
+
export declare function ne<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn> | Placeholder): SQL;
|
|
6
6
|
export declare function ne(left: AnyColumn, right: AnyColumn): SQL;
|
|
7
7
|
export declare function and(...conditions: (SQL | undefined)[]): SQL | undefined;
|
|
8
8
|
export declare function or(...conditions: (SQL | undefined)[]): SQL | undefined;
|
|
9
9
|
export declare function not(condition: SQL): SQL;
|
|
10
|
-
export declare function gt<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
|
|
10
|
+
export declare function gt<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn> | Placeholder): SQL;
|
|
11
11
|
export declare function gt(left: AnyColumn, right: AnyColumn): SQL;
|
|
12
|
-
export declare function gte<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
|
|
12
|
+
export declare function gte<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn> | Placeholder): SQL;
|
|
13
13
|
export declare function gte(left: AnyColumn, right: AnyColumn): SQL;
|
|
14
|
-
export declare function lt<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
|
|
14
|
+
export declare function lt<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn> | Placeholder): SQL;
|
|
15
15
|
export declare function lt(left: AnyColumn, right: AnyColumn): SQL;
|
|
16
|
-
export declare function lte<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn>): SQL;
|
|
16
|
+
export declare function lte<TColumn extends AnyColumn>(column: TColumn, value: GetColumnData<TColumn> | Placeholder): SQL;
|
|
17
17
|
export declare function lte(left: AnyColumn, right: AnyColumn): SQL;
|
|
18
|
-
export declare function inArray<TColumn extends AnyColumn>(column: TColumn, values: GetColumnData<TColumn>[]): SQL;
|
|
18
|
+
export declare function inArray<TColumn extends AnyColumn>(column: TColumn, values: (GetColumnData<TColumn> | Placeholder)[]): SQL;
|
|
19
19
|
export declare function inArray(column: AnyColumn, subquery: SQLWrapper): SQL;
|
|
20
|
-
export declare function notInArray<TColumn extends AnyColumn>(column: TColumn, values: GetColumnData<TColumn>[]): SQL;
|
|
20
|
+
export declare function notInArray<TColumn extends AnyColumn>(column: TColumn, values: (GetColumnData<TColumn> | Placeholder)[]): SQL;
|
|
21
21
|
export declare function notInArray(column: AnyColumn, subquery: SQLWrapper): SQL;
|
|
22
22
|
export declare function isNull(column: AnyColumn<{
|
|
23
23
|
notNull: false;
|
|
@@ -25,8 +25,8 @@ export declare function isNull(column: AnyColumn<{
|
|
|
25
25
|
export declare function isNotNull(column: AnyColumn): SQL;
|
|
26
26
|
export declare function exists(subquery: SQLWrapper): SQL;
|
|
27
27
|
export declare function notExists(subquery: SQLWrapper): SQL;
|
|
28
|
-
export declare function between<TColumn extends AnyColumn>(column: TColumn, min: GetColumnData<TColumn, 'raw'
|
|
29
|
-
export declare function notBetween<TColumn extends AnyColumn>(column: TColumn, min: GetColumnData<TColumn, 'raw'
|
|
28
|
+
export declare function between<TColumn extends AnyColumn>(column: TColumn, min: GetColumnData<TColumn, 'raw'> | Placeholder, max: GetColumnData<TColumn, 'raw'> | Placeholder): SQL;
|
|
29
|
+
export declare function notBetween<TColumn extends AnyColumn>(column: TColumn, min: GetColumnData<TColumn, 'raw'> | Placeholder, max: GetColumnData<TColumn, 'raw'> | Placeholder): SQL;
|
|
30
30
|
export declare function like(column: AnyColumn, value: string): SQL;
|
|
31
31
|
export declare function notLike(column: AnyColumn, value: string): SQL;
|
|
32
32
|
export declare function ilike(column: AnyColumn, value: string): SQL;
|
|
@@ -4,7 +4,7 @@ exports.notIlike = exports.ilike = exports.notLike = exports.like = exports.notB
|
|
|
4
4
|
const column_1 = require("../../column");
|
|
5
5
|
const __1 = require("..");
|
|
6
6
|
function bindIfParam(value, column) {
|
|
7
|
-
if (value instanceof column_1.Column) {
|
|
7
|
+
if (value instanceof column_1.Column || value instanceof __1.Placeholder) {
|
|
8
8
|
return value;
|
|
9
9
|
}
|
|
10
10
|
else {
|
|
@@ -84,7 +84,7 @@ function inArray(column, values) {
|
|
|
84
84
|
if (values.length === 0) {
|
|
85
85
|
throw new Error('inArray requires at least one value');
|
|
86
86
|
}
|
|
87
|
-
return (0, __1.sql) `${column} in ${values.map((v) =>
|
|
87
|
+
return (0, __1.sql) `${column} in ${values.map((v) => bindIfParam(v, column))}`;
|
|
88
88
|
}
|
|
89
89
|
exports.inArray = inArray;
|
|
90
90
|
function notInArray(column, values) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../../src/sql/expressions/conditions.ts"],"names":[],"mappings":";;;AAAA,yCAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../../src/sql/expressions/conditions.ts"],"names":[],"mappings":"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"}
|
package/sql/index.d.ts
CHANGED
|
@@ -7,24 +7,24 @@ import { Table } from '../table';
|
|
|
7
7
|
*/
|
|
8
8
|
export declare class FakePrimitiveParam {
|
|
9
9
|
}
|
|
10
|
-
export declare type Chunk = string | Table | AnyColumn | Name | Param;
|
|
10
|
+
export declare type Chunk = string | Table | AnyColumn | Name | Param | Placeholder;
|
|
11
11
|
export interface BuildQueryConfig {
|
|
12
12
|
escapeName(name: string): string;
|
|
13
13
|
escapeParam(num: number, value: unknown): string;
|
|
14
14
|
}
|
|
15
|
-
export interface
|
|
15
|
+
export interface Query {
|
|
16
16
|
sql: string;
|
|
17
17
|
params: unknown[];
|
|
18
18
|
}
|
|
19
19
|
export interface SQLWrapper {
|
|
20
20
|
getSQL(): SQL;
|
|
21
21
|
}
|
|
22
|
-
export declare function isSQLWrapper(
|
|
22
|
+
export declare function isSQLWrapper(value: unknown): value is SQLWrapper;
|
|
23
23
|
export declare class SQL implements SQLWrapper {
|
|
24
24
|
readonly queryChunks: Chunk[];
|
|
25
25
|
protected $brand: 'SQL';
|
|
26
26
|
constructor(queryChunks: Chunk[]);
|
|
27
|
-
toQuery({ escapeName, escapeParam }: BuildQueryConfig):
|
|
27
|
+
toQuery({ escapeName, escapeParam }: BuildQueryConfig): Query;
|
|
28
28
|
getSQL(): SQL;
|
|
29
29
|
as<TDecoder extends DriverValueDecoder<any, any> | DriverValueDecoder<any, any>['mapFromDriverValue']>(decoder: TDecoder): SQLResponse<GetDecoderColumnData<TDecoder>>;
|
|
30
30
|
as<TData>(): SQLResponse<TData>;
|
|
@@ -38,6 +38,10 @@ export declare class Name {
|
|
|
38
38
|
protected brand: 'Name';
|
|
39
39
|
constructor(value: string);
|
|
40
40
|
}
|
|
41
|
+
/**
|
|
42
|
+
* Any DB name (table, column, index etc.)
|
|
43
|
+
*/
|
|
44
|
+
export declare function name(value: string): Name;
|
|
41
45
|
export interface DriverValueDecoder<TData, TDriverParam> {
|
|
42
46
|
mapFromDriverValue(value: TDriverParam): TData;
|
|
43
47
|
}
|
|
@@ -61,7 +65,7 @@ export declare class Param<TDataType = unknown, TDriverParamType = TDataType> {
|
|
|
61
65
|
constructor(value: TDataType, encoder?: DriverValueEncoder<TDataType, TDriverParamType>);
|
|
62
66
|
}
|
|
63
67
|
export declare function param<TData, TDriver>(value: TData, encoder?: DriverValueEncoder<TData, TDriver>): Param<TData, TDriver>;
|
|
64
|
-
export declare type SQLSourceParam = SQLSourceParam[] | SQLWrapper | SQL | Table | AnyColumn | Param | Name | undefined | FakePrimitiveParam;
|
|
68
|
+
export declare type SQLSourceParam = SQLSourceParam[] | SQLWrapper | SQL | Table | AnyColumn | Param | Name | undefined | FakePrimitiveParam | Placeholder;
|
|
65
69
|
export declare function sql(strings: TemplateStringsArray, ...params: any[]): SQL;
|
|
66
70
|
export declare namespace sql {
|
|
67
71
|
function empty(): SQL;
|
|
@@ -78,3 +82,11 @@ export declare class SQLResponse<TValue = unknown> {
|
|
|
78
82
|
protected $brand: 'SQLResponse';
|
|
79
83
|
constructor(sql: SQL, decoder: DriverValueDecoder<TValue, any>);
|
|
80
84
|
}
|
|
85
|
+
export declare class Placeholder<TName extends string = string, TValue = any> {
|
|
86
|
+
readonly name: TName;
|
|
87
|
+
protected $brand: 'Placeholder';
|
|
88
|
+
protected $type: TValue;
|
|
89
|
+
constructor(name: TName);
|
|
90
|
+
}
|
|
91
|
+
export declare function placeholder<TName extends string>(name: TName): Placeholder<TName>;
|
|
92
|
+
export declare function fillPlaceholders(params: unknown[], values: Record<string, unknown>): unknown[];
|
package/sql/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SQLResponse = exports.sql = exports.param = exports.Param = exports.noopMapper = exports.noopEncoder = exports.noopDecoder = exports.Name = exports.SQL = exports.isSQLWrapper = exports.FakePrimitiveParam = void 0;
|
|
3
|
+
exports.fillPlaceholders = exports.placeholder = exports.Placeholder = exports.SQLResponse = exports.sql = exports.param = exports.Param = exports.noopMapper = exports.noopEncoder = exports.noopDecoder = exports.name = exports.Name = exports.SQL = exports.isSQLWrapper = exports.FakePrimitiveParam = void 0;
|
|
4
4
|
const column_1 = require("../column");
|
|
5
5
|
const table_1 = require("../table");
|
|
6
6
|
/**
|
|
@@ -11,8 +11,9 @@ const table_1 = require("../table");
|
|
|
11
11
|
class FakePrimitiveParam {
|
|
12
12
|
}
|
|
13
13
|
exports.FakePrimitiveParam = FakePrimitiveParam;
|
|
14
|
-
function isSQLWrapper(
|
|
15
|
-
return
|
|
14
|
+
function isSQLWrapper(value) {
|
|
15
|
+
return typeof value === 'object' && value !== null && 'getSQL' in value
|
|
16
|
+
&& typeof value.getSQL === 'function';
|
|
16
17
|
}
|
|
17
18
|
exports.isSQLWrapper = isSQLWrapper;
|
|
18
19
|
class SQL {
|
|
@@ -46,9 +47,7 @@ class SQL {
|
|
|
46
47
|
});
|
|
47
48
|
const sqlString = chunks
|
|
48
49
|
.join('')
|
|
49
|
-
.trim()
|
|
50
|
-
.replace(/\s{2,}/g, ' ')
|
|
51
|
-
.replace(/\n+/g, '');
|
|
50
|
+
.trim();
|
|
52
51
|
return { sql: sqlString, params };
|
|
53
52
|
}
|
|
54
53
|
getSQL() {
|
|
@@ -68,6 +67,13 @@ class Name {
|
|
|
68
67
|
}
|
|
69
68
|
}
|
|
70
69
|
exports.Name = Name;
|
|
70
|
+
/**
|
|
71
|
+
* Any DB name (table, column, index etc.)
|
|
72
|
+
*/
|
|
73
|
+
function name(value) {
|
|
74
|
+
return new Name(value);
|
|
75
|
+
}
|
|
76
|
+
exports.name = name;
|
|
71
77
|
exports.noopDecoder = {
|
|
72
78
|
mapFromDriverValue: (value) => value,
|
|
73
79
|
};
|
|
@@ -163,4 +169,26 @@ class SQLResponse {
|
|
|
163
169
|
}
|
|
164
170
|
}
|
|
165
171
|
exports.SQLResponse = SQLResponse;
|
|
172
|
+
class Placeholder {
|
|
173
|
+
constructor(name) {
|
|
174
|
+
this.name = name;
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
exports.Placeholder = Placeholder;
|
|
178
|
+
function placeholder(name) {
|
|
179
|
+
return new Placeholder(name);
|
|
180
|
+
}
|
|
181
|
+
exports.placeholder = placeholder;
|
|
182
|
+
function fillPlaceholders(params, values) {
|
|
183
|
+
return params.map((p) => {
|
|
184
|
+
if (p instanceof Placeholder) {
|
|
185
|
+
if (!(p.name in values)) {
|
|
186
|
+
throw new Error(`No value for placeholder "${p.name}" was provided`);
|
|
187
|
+
}
|
|
188
|
+
return values[p.name];
|
|
189
|
+
}
|
|
190
|
+
return p;
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
exports.fillPlaceholders = fillPlaceholders;
|
|
166
194
|
//# sourceMappingURL=index.js.map
|
package/sql/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":";;;AAAA,sCAA8C;AAC9C,oCAAiC;AAEjC;;;;GAIG;AACH,MAAa,kBAAkB;CAAG;AAAlC,gDAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}
|
package/utils.d.ts
CHANGED
|
@@ -1,5 +1,79 @@
|
|
|
1
|
-
import { Simplify } from 'type-fest';
|
|
2
1
|
import { SelectFieldsOrdered } from './operations';
|
|
3
|
-
export declare function mapResultRow<TResult
|
|
2
|
+
export declare function mapResultRow<TResult>(columns: SelectFieldsOrdered, row: unknown[], joinsNotNullable?: Record<string, boolean>): TResult;
|
|
4
3
|
export declare type OneOrMany<T> = T | T[];
|
|
5
4
|
export declare type Update<T, TUpdate> = Simplify<Omit<T, keyof TUpdate> & TUpdate>;
|
|
5
|
+
/**
|
|
6
|
+
@see Simplify
|
|
7
|
+
*/
|
|
8
|
+
export interface SimplifyOptions {
|
|
9
|
+
/**
|
|
10
|
+
Do the simplification recursively.
|
|
11
|
+
|
|
12
|
+
@default false
|
|
13
|
+
*/
|
|
14
|
+
deep?: boolean;
|
|
15
|
+
}
|
|
16
|
+
declare type Flatten<AnyType, Options extends SimplifyOptions = {}> = Options['deep'] extends true ? {
|
|
17
|
+
[KeyType in keyof AnyType]: Simplify<AnyType[KeyType], Options>;
|
|
18
|
+
} : {
|
|
19
|
+
[KeyType in keyof AnyType]: AnyType[KeyType];
|
|
20
|
+
};
|
|
21
|
+
/**
|
|
22
|
+
Useful to flatten the type output to improve type hints shown in editors. And also to transform an interface into a type to aide with assignability.
|
|
23
|
+
|
|
24
|
+
@example
|
|
25
|
+
```
|
|
26
|
+
import type {Simplify} from 'type-fest';
|
|
27
|
+
|
|
28
|
+
type PositionProps = {
|
|
29
|
+
top: number;
|
|
30
|
+
left: number;
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
type SizeProps = {
|
|
34
|
+
width: number;
|
|
35
|
+
height: number;
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
// In your editor, hovering over `Props` will show a flattened object with all the properties.
|
|
39
|
+
type Props = Simplify<PositionProps & SizeProps>;
|
|
40
|
+
```
|
|
41
|
+
|
|
42
|
+
Sometimes it is desired to pass a value as a function argument that has a different type. At first inspection it may seem assignable, and then you discover it is not because the `value`'s type definition was defined as an interface. In the following example, `fn` requires an argument of type `Record<string, unknown>`. If the value is defined as a literal, then it is assignable. And if the `value` is defined as type using the `Simplify` utility the value is assignable. But if the `value` is defined as an interface, it is not assignable because the interface is not sealed and elsewhere a non-string property could be added to the interface.
|
|
43
|
+
|
|
44
|
+
If the type definition must be an interface (perhaps it was defined in a third-party npm package), then the `value` can be defined as `const value: Simplify<SomeInterface> = ...`. Then `value` will be assignable to the `fn` argument. Or the `value` can be cast as `Simplify<SomeInterface>` if you can't re-declare the `value`.
|
|
45
|
+
|
|
46
|
+
@example
|
|
47
|
+
```
|
|
48
|
+
import type {Simplify} from 'type-fest';
|
|
49
|
+
|
|
50
|
+
interface SomeInterface {
|
|
51
|
+
foo: number;
|
|
52
|
+
bar?: string;
|
|
53
|
+
baz: number | undefined;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
type SomeType = {
|
|
57
|
+
foo: number;
|
|
58
|
+
bar?: string;
|
|
59
|
+
baz: number | undefined;
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
const literal = {foo: 123, bar: 'hello', baz: 456};
|
|
63
|
+
const someType: SomeType = literal;
|
|
64
|
+
const someInterface: SomeInterface = literal;
|
|
65
|
+
|
|
66
|
+
function fn(object: Record<string, unknown>): void {}
|
|
67
|
+
|
|
68
|
+
fn(literal); // Good: literal object type is sealed
|
|
69
|
+
fn(someType); // Good: type is sealed
|
|
70
|
+
fn(someInterface); // Error: Index signature for type 'string' is missing in type 'someInterface'. Because `interface` can be re-opened
|
|
71
|
+
fn(someInterface as Simplify<SomeInterface>); // Good: transform an `interface` into a `type`
|
|
72
|
+
```
|
|
73
|
+
|
|
74
|
+
@link https://github.com/microsoft/TypeScript/issues/15300
|
|
75
|
+
|
|
76
|
+
@category Object
|
|
77
|
+
*/
|
|
78
|
+
export declare type Simplify<AnyType, Options extends SimplifyOptions = {}> = Flatten<AnyType> extends AnyType ? Flatten<AnyType, Options> : AnyType;
|
|
79
|
+
export {};
|
package/utils.js
CHANGED
|
@@ -4,30 +4,36 @@ exports.mapResultRow = void 0;
|
|
|
4
4
|
const column_1 = require("./column");
|
|
5
5
|
const sql_1 = require("./sql");
|
|
6
6
|
function mapResultRow(columns, row, joinsNotNullable) {
|
|
7
|
-
const result = columns.reduce((
|
|
7
|
+
const result = columns.reduce((result, { path, field }, columnIndex) => {
|
|
8
8
|
let decoder;
|
|
9
|
-
if (
|
|
10
|
-
decoder =
|
|
9
|
+
if (field instanceof column_1.Column) {
|
|
10
|
+
decoder = field;
|
|
11
11
|
}
|
|
12
|
-
else if (
|
|
12
|
+
else if (field instanceof sql_1.SQL) {
|
|
13
13
|
decoder = sql_1.noopDecoder;
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
|
-
decoder =
|
|
16
|
+
decoder = field.decoder;
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
18
|
+
let node = result;
|
|
19
|
+
path.forEach((pathChunk, pathChunkIndex) => {
|
|
20
|
+
if (pathChunkIndex < path.length - 1) {
|
|
21
|
+
if (!(pathChunk in node)) {
|
|
22
|
+
node[pathChunk] = {};
|
|
23
|
+
}
|
|
24
|
+
node = node[pathChunk];
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
const rawValue = row[columnIndex];
|
|
28
|
+
node[pathChunk] = rawValue === null ? null : decoder.mapFromDriverValue(rawValue);
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
return result;
|
|
24
32
|
}, {});
|
|
25
|
-
if (Object.keys(result).length === 1) {
|
|
26
|
-
return Object.values(result)[0];
|
|
27
|
-
}
|
|
28
33
|
if (!joinsNotNullable) {
|
|
29
34
|
return result;
|
|
30
35
|
}
|
|
36
|
+
// If all fields in a table are null, return null for the table
|
|
31
37
|
return Object.fromEntries(Object.entries(result).map(([tableName, tableResult]) => {
|
|
32
38
|
if (!joinsNotNullable[tableName]) {
|
|
33
39
|
const hasNotNull = Object.values(tableResult).some((value) => value !== null);
|
package/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAElC,+BAA6D;AAE7D,SAAgB,YAAY,CAC3B,OAA4B,EAC5B,GAAc,EACd,gBAA0C;IAE1C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAC5B,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE;QACxC,IAAI,OAA6C,CAAC;QAClD,IAAI,KAAK,YAAY,eAAM,EAAE;YAC5B,OAAO,GAAG,KAAK,CAAC;SAChB;aAAM,IAAI,KAAK,YAAY,SAAG,EAAE;YAChC,OAAO,GAAG,iBAAW,CAAC;SACtB;aAAM;YACN,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;SACxB;QACD,IAAI,IAAI,GAAG,MAAM,CAAC;QAClB,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE;YAC1C,IAAI,cAAc,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrC,IAAI,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE;oBACzB,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;iBACrB;gBACD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;aACvB;iBAAM;gBACN,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,CAAE,CAAC;gBACnC,IAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;aAClF;QACF,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC,EACD,EAAE,CACF,CAAC;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACtB,OAAO,MAAiB,CAAC;KACzB;IAED,+DAA+D;IAC/D,OAAO,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,EAAE;QACvD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;YACjC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;YAC9E,IAAI,CAAC,UAAU,EAAE;gBAChB,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;aACzB;SACD;QACD,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACjC,CAAC,CAAC,CACS,CAAC;AACd,CAAC;AAhDD,oCAgDC"}
|
package/branded-types.d.ts
DELETED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
export declare const brand: unique symbol;
|
|
2
|
-
export declare const value: unique symbol;
|
|
3
|
-
export declare type Brand<T, TName extends string> = T & {
|
|
4
|
-
[brand]: TName;
|
|
5
|
-
[value]: T;
|
|
6
|
-
};
|
|
7
|
-
export declare type AnyBrand = {
|
|
8
|
-
[brand]: any;
|
|
9
|
-
[value]: any;
|
|
10
|
-
};
|
|
11
|
-
export declare type Unwrap<T extends AnyBrand> = T extends {
|
|
12
|
-
[value]: infer TValue;
|
|
13
|
-
} ? TValue : never;
|
|
14
|
-
export declare type TableName<T extends string = string> = Brand<T, 'TableName'>;
|
|
15
|
-
export declare type ColumnData<T = unknown> = Brand<T, 'ColumnData'>;
|
|
16
|
-
export declare type ColumnDriverParam<T = unknown> = Brand<T, 'ColumnDriverParam'>;
|
|
17
|
-
export declare type ColumnNotNull<T extends boolean = boolean> = Brand<T, 'ColumnNotNull'>;
|
|
18
|
-
export declare type ColumnHasDefault<T extends boolean = boolean> = Brand<T, 'ColumnHasDefault'>;
|
package/branded-types.js
DELETED
package/branded-types.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"branded-types.js","sourceRoot":"","sources":["../src/branded-types.ts"],"names":[],"mappings":";;;AAAa,QAAA,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AACxB,QAAA,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC"}
|