remult 0.14.7 → 0.14.8
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/LICENSE +21 -0
- package/esm/assign.d.ts +1 -0
- package/esm/assign.js +5 -0
- package/esm/classType.d.ts +3 -0
- package/esm/classType.js +1 -0
- package/esm/graphql.d.ts +5 -0
- package/esm/graphql.js +102 -0
- package/esm/index.d.ts +36 -0
- package/esm/index.js +30 -0
- package/esm/inputTypes.d.ts +9 -0
- package/esm/inputTypes.js +9 -0
- package/esm/postgres/index.d.ts +2 -0
- package/esm/postgres/index.js +2 -0
- package/esm/postgres/postgres-data-provider.d.ts +28 -0
- package/esm/postgres/postgres-data-provider.js +97 -0
- package/esm/postgres/schema-builder.d.ts +15 -0
- package/esm/postgres/schema-builder.js +128 -0
- package/esm/remult-express.d.ts +5 -0
- package/esm/remult-express.js +16 -0
- package/esm/remult-knex/index.d.ts +51 -0
- package/esm/remult-knex/index.js +381 -0
- package/esm/remult-middleware.d.ts +2 -0
- package/esm/remult-middleware.js +63 -0
- package/esm/remult-mongo.d.ts +9 -0
- package/esm/remult-mongo.js +220 -0
- package/esm/server/JsonEntityFileStorage.d.ts +7 -0
- package/esm/server/JsonEntityFileStorage.js +20 -0
- package/esm/server/expressBridge.d.ts +140 -0
- package/esm/server/expressBridge.js +668 -0
- package/esm/server/index.d.ts +4 -0
- package/esm/server/index.js +4 -0
- package/esm/server/register-actions-on-server.d.ts +3 -0
- package/esm/server/register-actions-on-server.js +24 -0
- package/esm/server/register-entities-on-server.d.ts +3 -0
- package/esm/server/register-entities-on-server.js +15 -0
- package/esm/src/__EntityValueProvider.d.ts +10 -0
- package/esm/src/__EntityValueProvider.js +1 -0
- package/esm/src/__RowsOfDataForTesting.d.ts +3 -0
- package/esm/src/__RowsOfDataForTesting.js +1 -0
- package/esm/src/backend-tests/backend-database-test-setup.backend-spec.d.ts +5 -0
- package/esm/src/backend-tests/backend-database-test-setup.backend-spec.js +113 -0
- package/esm/src/backend-tests/my-test.backend-spec.d.ts +1 -0
- package/esm/src/backend-tests/my-test.backend-spec.js +49 -0
- package/esm/src/column-interfaces.d.ts +95 -0
- package/esm/src/column-interfaces.js +7 -0
- package/esm/src/column.d.ts +49 -0
- package/esm/src/column.js +133 -0
- package/esm/src/context.d.ts +124 -0
- package/esm/src/context.js +285 -0
- package/esm/src/data-api.d.ts +33 -0
- package/esm/src/data-api.js +204 -0
- package/esm/src/data-interfaces.d.ts +37 -0
- package/esm/src/data-interfaces.js +12 -0
- package/esm/src/data-providers/array-entity-data-provider.d.ts +22 -0
- package/esm/src/data-providers/array-entity-data-provider.js +264 -0
- package/esm/src/data-providers/in-memory-database.d.ts +9 -0
- package/esm/src/data-providers/in-memory-database.js +16 -0
- package/esm/src/data-providers/json-data-provider.d.ts +12 -0
- package/esm/src/data-providers/json-data-provider.js +52 -0
- package/esm/src/data-providers/rest-data-provider.d.ts +35 -0
- package/esm/src/data-providers/rest-data-provider.js +188 -0
- package/esm/src/data-providers/sql-database.d.ts +16 -0
- package/esm/src/data-providers/sql-database.js +261 -0
- package/esm/src/data-providers/web-sql-data-provider.d.ts +18 -0
- package/esm/src/data-providers/web-sql-data-provider.js +121 -0
- package/esm/src/entity.d.ts +82 -0
- package/esm/src/entity.js +1 -0
- package/esm/src/filter/filter-consumer-bridge-to-sql-request.d.ts +50 -0
- package/esm/src/filter/filter-consumer-bridge-to-sql-request.js +139 -0
- package/esm/src/filter/filter-consumer-bridge-to-url-builder.d.ts +1 -0
- package/esm/src/filter/filter-consumer-bridge-to-url-builder.js +1 -0
- package/esm/src/filter/filter-interfaces.d.ts +85 -0
- package/esm/src/filter/filter-interfaces.js +467 -0
- package/esm/src/id-entity.d.ts +4 -0
- package/esm/src/id-entity.js +8 -0
- package/esm/src/remult3/RepositoryImplementation.d.ts +326 -0
- package/esm/src/remult3/RepositoryImplementation.js +1806 -0
- package/esm/src/remult3/index.d.ts +2 -0
- package/esm/src/remult3/index.js +2 -0
- package/esm/src/remult3/remult3.d.ts +312 -0
- package/esm/src/remult3/remult3.js +1 -0
- package/esm/src/server-action.d.ts +70 -0
- package/esm/src/server-action.js +365 -0
- package/esm/src/shared-tests/db-tests-setup.d.ts +23 -0
- package/esm/src/shared-tests/db-tests-setup.js +66 -0
- package/esm/src/shared-tests/db-tests.db-tests.d.ts +26 -0
- package/esm/src/shared-tests/db-tests.db-tests.js +723 -0
- package/esm/src/shared-tests/deleteAll.d.ts +2 -0
- package/esm/src/shared-tests/deleteAll.js +4 -0
- package/esm/src/shared-tests/entityWithValidations.d.ts +14 -0
- package/esm/src/shared-tests/entityWithValidations.js +53 -0
- package/esm/src/shared-tests/index.d.ts +4 -0
- package/esm/src/shared-tests/index.js +4 -0
- package/esm/src/shared-tests/test-custom-id-column.spec.d.ts +1 -0
- package/esm/src/shared-tests/test-custom-id-column.spec.js +62 -0
- package/esm/src/shared-tests/test-special-value.spec.d.ts +10 -0
- package/esm/src/shared-tests/test-special-value.spec.js +88 -0
- package/esm/src/shared-tests/test-update-with-null.spec.d.ts +1 -0
- package/esm/src/shared-tests/test-update-with-null.spec.js +47 -0
- package/esm/src/sort.d.ts +15 -0
- package/esm/src/sort.js +82 -0
- package/esm/src/sql-command.d.ts +15 -0
- package/esm/src/sql-command.js +1 -0
- package/esm/src/tests/Done.d.ts +5 -0
- package/esm/src/tests/Done.js +11 -0
- package/esm/src/tests/TestDataApiResponse.d.ts +10 -0
- package/esm/src/tests/TestDataApiResponse.js +22 -0
- package/esm/src/tests/c.d.ts +8 -0
- package/esm/src/tests/c.js +22 -0
- package/esm/src/tests/createData.d.ts +7 -0
- package/esm/src/tests/createData.js +22 -0
- package/esm/src/tests/d.d.ts +6 -0
- package/esm/src/tests/d.js +19 -0
- package/esm/src/tests/dWithPrefilter.d.ts +7 -0
- package/esm/src/tests/dWithPrefilter.js +32 -0
- package/esm/src/tests/entityForCustomFilter.d.ts +16 -0
- package/esm/src/tests/entityForCustomFilter.js +44 -0
- package/esm/src/tests/entityWithValidationsOnColumn.d.ts +5 -0
- package/esm/src/tests/entityWithValidationsOnColumn.js +21 -0
- package/esm/src/tests/frontend-database-tests-setup.spec.d.ts +4 -0
- package/esm/src/tests/frontend-database-tests-setup.spec.js +38 -0
- package/esm/src/tests/h.d.ts +6 -0
- package/esm/src/tests/h.js +35 -0
- package/esm/src/tests/remult-3-entities.d.ts +23 -0
- package/esm/src/tests/remult-3-entities.js +72 -0
- package/esm/src/tests/tasks.d.ts +6 -0
- package/esm/src/tests/tasks.js +24 -0
- package/esm/src/tests/testHelper.spec.d.ts +34 -0
- package/esm/src/tests/testHelper.spec.js +217 -0
- package/esm/src/tests/testModel/models.d.ts +16 -0
- package/esm/src/tests/testModel/models.js +31 -0
- package/esm/src/validators.d.ts +14 -0
- package/esm/src/validators.js +33 -0
- package/esm/urlBuilder.d.ts +6 -0
- package/esm/urlBuilder.js +19 -0
- package/esm/valueConverters.d.ts +12 -0
- package/esm/valueConverters.js +169 -0
- package/index.d.ts +1 -0
- package/index.js +1 -0
- package/package.json +22 -1
- package/postgres/index.d.ts +1 -0
- package/postgres/index.js +1 -0
- package/postgres/postgres-data-provider.d.ts +1 -13
- package/postgres/postgres-data-provider.js +28 -262
- package/postgres/schema-builder.d.ts +15 -0
- package/postgres/schema-builder.js +270 -0
- package/readme.md +68 -30
- package/src/data-providers/web-sql-data-provider.js +4 -3
- package/src/entity.d.ts +9 -2
- package/src/remult3/RepositoryImplementation.js +11 -3
- package/src/shared-tests/test-update-with-null.spec.js +38 -0
- package/valueConverters.js +4 -0
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { ValueConverter } from "./src/column-interfaces";
|
|
2
|
+
export declare class ValueConverters {
|
|
3
|
+
static readonly Date: ValueConverter<Date>;
|
|
4
|
+
static readonly DateOnly: ValueConverter<Date>;
|
|
5
|
+
static readonly DateOnlyString: ValueConverter<Date>;
|
|
6
|
+
static readonly Boolean: ValueConverter<Boolean>;
|
|
7
|
+
static readonly Number: ValueConverter<number>;
|
|
8
|
+
static readonly Integer: ValueConverter<number>;
|
|
9
|
+
static readonly Default: ValueConverter<any>;
|
|
10
|
+
static readonly JsonString: ValueConverter<any>;
|
|
11
|
+
static readonly JsonValue: ValueConverter<any>;
|
|
12
|
+
}
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { InputTypes } from "./inputTypes";
|
|
2
|
+
export class ValueConverters {
|
|
3
|
+
}
|
|
4
|
+
ValueConverters.Date = {
|
|
5
|
+
toJson: (val) => {
|
|
6
|
+
if (!val)
|
|
7
|
+
return '';
|
|
8
|
+
if (typeof (val) === "string")
|
|
9
|
+
val = new Date(val);
|
|
10
|
+
if (val instanceof Date) {
|
|
11
|
+
return val.toISOString();
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
console.log("ToJsonError", val);
|
|
15
|
+
throw new Error("Expected date but got val");
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
fromJson: (val) => {
|
|
19
|
+
if (val == undefined)
|
|
20
|
+
return undefined;
|
|
21
|
+
if (val == '')
|
|
22
|
+
return undefined;
|
|
23
|
+
if (val.startsWith('0000-00-00'))
|
|
24
|
+
return undefined;
|
|
25
|
+
return new Date(Date.parse(val));
|
|
26
|
+
},
|
|
27
|
+
toDb: x => x,
|
|
28
|
+
fromDb: x => x,
|
|
29
|
+
fromInput: x => ValueConverters.Date.fromJson(x),
|
|
30
|
+
toInput: x => ValueConverters.Date.toJson(x),
|
|
31
|
+
displayValue: (val) => {
|
|
32
|
+
if (!val)
|
|
33
|
+
return '';
|
|
34
|
+
return val.toLocaleString();
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
ValueConverters.DateOnly = {
|
|
38
|
+
fromInput: x => ValueConverters.DateOnly.fromJson(x),
|
|
39
|
+
toInput: x => ValueConverters.DateOnly.toJson(x),
|
|
40
|
+
toJson: (val) => {
|
|
41
|
+
var d = val;
|
|
42
|
+
if (typeof d === "string" || typeof (d) === "number")
|
|
43
|
+
d = new Date(d);
|
|
44
|
+
if (!d || d == null)
|
|
45
|
+
return null;
|
|
46
|
+
if (d.getHours() == 0)
|
|
47
|
+
return new Date(d.valueOf() - d.getTimezoneOffset() * 60000).toISOString().substring(0, 10);
|
|
48
|
+
else
|
|
49
|
+
return d.toISOString().substring(0, 10);
|
|
50
|
+
},
|
|
51
|
+
fromJson: (value) => {
|
|
52
|
+
if (!value || value == '' || value == '0000-00-00')
|
|
53
|
+
return null;
|
|
54
|
+
let d = new Date(Date.parse(value));
|
|
55
|
+
d.setMinutes(d.getMinutes() + d.getTimezoneOffset());
|
|
56
|
+
return d;
|
|
57
|
+
},
|
|
58
|
+
inputType: InputTypes.date,
|
|
59
|
+
toDb: (val) => {
|
|
60
|
+
if (!val)
|
|
61
|
+
return null;
|
|
62
|
+
return ValueConverters.DateOnly.fromJson(ValueConverters.DateOnly.toJson(val));
|
|
63
|
+
} //when using date storage, the database expects and returns a date local and every where else we reflect on date iso
|
|
64
|
+
,
|
|
65
|
+
fromDb: (val) => {
|
|
66
|
+
var d = val;
|
|
67
|
+
if (!d)
|
|
68
|
+
return null;
|
|
69
|
+
return val;
|
|
70
|
+
},
|
|
71
|
+
fieldTypeInDb: 'date',
|
|
72
|
+
displayValue: (value) => {
|
|
73
|
+
if (!value)
|
|
74
|
+
return '';
|
|
75
|
+
return value.toLocaleDateString(undefined);
|
|
76
|
+
}
|
|
77
|
+
};
|
|
78
|
+
ValueConverters.DateOnlyString = {
|
|
79
|
+
...ValueConverters.DateOnly,
|
|
80
|
+
toDb: (d) => {
|
|
81
|
+
let val = ValueConverters.DateOnly.toJson(d);
|
|
82
|
+
if (!val)
|
|
83
|
+
return undefined;
|
|
84
|
+
return val.replace(/-/g, '');
|
|
85
|
+
},
|
|
86
|
+
fromDb: (val) => {
|
|
87
|
+
if (val === null)
|
|
88
|
+
return null;
|
|
89
|
+
if (!val)
|
|
90
|
+
return undefined;
|
|
91
|
+
return new Date(val.substring(0, 4) + '-' + val.substring(4, 6) + '-' + val.substring(6, 8));
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
ValueConverters.Boolean = {
|
|
95
|
+
toDb: (val) => val,
|
|
96
|
+
inputType: InputTypes.checkbox,
|
|
97
|
+
fromDb: (value) => {
|
|
98
|
+
return ValueConverters.Boolean.fromJson(value);
|
|
99
|
+
},
|
|
100
|
+
fromJson: value => {
|
|
101
|
+
if (typeof value === "boolean")
|
|
102
|
+
return value;
|
|
103
|
+
if (value !== undefined && value !== null) {
|
|
104
|
+
return value.toString().trim().toLowerCase() == 'true';
|
|
105
|
+
}
|
|
106
|
+
return value;
|
|
107
|
+
},
|
|
108
|
+
toJson: x => x,
|
|
109
|
+
fromInput: x => ValueConverters.Boolean.fromJson(x),
|
|
110
|
+
toInput: x => ValueConverters.Boolean.toJson(x)
|
|
111
|
+
};
|
|
112
|
+
ValueConverters.Number = {
|
|
113
|
+
fromDb: value => {
|
|
114
|
+
if (value === null)
|
|
115
|
+
return null;
|
|
116
|
+
if (value !== undefined)
|
|
117
|
+
return +value;
|
|
118
|
+
return undefined;
|
|
119
|
+
},
|
|
120
|
+
toDb: value => value,
|
|
121
|
+
fromJson: value => ValueConverters.Number.fromDb(value),
|
|
122
|
+
toJson: value => ValueConverters.Number.toDb(value),
|
|
123
|
+
fromInput: (x, type) => {
|
|
124
|
+
let r = +x;
|
|
125
|
+
if (!x)
|
|
126
|
+
return undefined;
|
|
127
|
+
return r;
|
|
128
|
+
},
|
|
129
|
+
toInput: (x, type) => {
|
|
130
|
+
return x?.toString();
|
|
131
|
+
},
|
|
132
|
+
inputType: InputTypes.number
|
|
133
|
+
};
|
|
134
|
+
ValueConverters.Integer = {
|
|
135
|
+
...ValueConverters.Number,
|
|
136
|
+
toJson: value => {
|
|
137
|
+
let val = ValueConverters.Number.toDb(value);
|
|
138
|
+
if (!val)
|
|
139
|
+
return val;
|
|
140
|
+
return +(+val).toFixed(0);
|
|
141
|
+
},
|
|
142
|
+
toDb: value => ValueConverters.Integer.toJson(value),
|
|
143
|
+
fieldTypeInDb: 'integer'
|
|
144
|
+
};
|
|
145
|
+
ValueConverters.Default = {
|
|
146
|
+
fromJson: x => x,
|
|
147
|
+
toJson: x => x,
|
|
148
|
+
fromDb: x => ValueConverters.JsonString.fromDb(x),
|
|
149
|
+
toDb: x => ValueConverters.JsonString.toDb(x),
|
|
150
|
+
fromInput: x => ValueConverters.Default.fromJson(x),
|
|
151
|
+
toInput: x => ValueConverters.Default.toJson(x)
|
|
152
|
+
};
|
|
153
|
+
ValueConverters.JsonString = {
|
|
154
|
+
fromJson: x => x,
|
|
155
|
+
toJson: x => x,
|
|
156
|
+
fromDb: x => x == null ? null : x ? JSON.parse(ValueConverters.JsonString.fromJson(x)) : undefined,
|
|
157
|
+
toDb: x => x !== undefined ? x === null ? null : JSON.stringify(ValueConverters.JsonString.toJson(x)) : undefined,
|
|
158
|
+
fromInput: x => ValueConverters.JsonString.fromJson(x),
|
|
159
|
+
toInput: x => ValueConverters.JsonString.toJson(x)
|
|
160
|
+
};
|
|
161
|
+
ValueConverters.JsonValue = {
|
|
162
|
+
fromJson: x => x,
|
|
163
|
+
toJson: x => x,
|
|
164
|
+
fromDb: x => x,
|
|
165
|
+
toDb: x => x,
|
|
166
|
+
fromInput: x => ValueConverters.JsonString.fromJson(x),
|
|
167
|
+
toInput: x => ValueConverters.JsonString.toJson(x),
|
|
168
|
+
fieldTypeInDb: 'json'
|
|
169
|
+
};
|
package/index.d.ts
CHANGED
|
@@ -33,3 +33,4 @@ export { Action, classBackendMethodsArray, serverActionField } from "./src/serve
|
|
|
33
33
|
export { actionInfo } from "./src/server-action";
|
|
34
34
|
export { registerActionsOnServer } from './server/register-actions-on-server';
|
|
35
35
|
export { registerEntitiesOnServer } from './server/register-entities-on-server';
|
|
36
|
+
/** db implementation required */
|
package/index.js
CHANGED
|
@@ -75,3 +75,4 @@ var register_actions_on_server_1 = require("./server/register-actions-on-server"
|
|
|
75
75
|
Object.defineProperty(exports, "registerActionsOnServer", { enumerable: true, get: function () { return register_actions_on_server_1.registerActionsOnServer; } });
|
|
76
76
|
var register_entities_on_server_1 = require("./server/register-entities-on-server");
|
|
77
77
|
Object.defineProperty(exports, "registerEntitiesOnServer", { enumerable: true, get: function () { return register_entities_on_server_1.registerEntitiesOnServer; } });
|
|
78
|
+
/** db implementation required */
|
package/package.json
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "remult",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.8",
|
|
4
4
|
"description": "A CRUD framework for full-stack TypeScript",
|
|
5
|
+
"main": "index.js",
|
|
6
|
+
"types": "index.d.ts",
|
|
7
|
+
"module": "esm/index.js",
|
|
5
8
|
"homepage": "https://remult.dev/",
|
|
6
9
|
"repository": {
|
|
7
10
|
"type": "git",
|
|
@@ -15,5 +18,23 @@
|
|
|
15
18
|
"uuid": "^8.3.2",
|
|
16
19
|
"reflect-metadata": "^0.1.13",
|
|
17
20
|
"tslib": "^2.3.1"
|
|
21
|
+
},
|
|
22
|
+
"exports": {
|
|
23
|
+
".": {
|
|
24
|
+
"require": "./index.js",
|
|
25
|
+
"import": "./esm/index.js"
|
|
26
|
+
},
|
|
27
|
+
"./remult-express": {
|
|
28
|
+
"require": "./remult-express.js",
|
|
29
|
+
"import": "./esm/remult-express.js"
|
|
30
|
+
},
|
|
31
|
+
"./remult-middleware": {
|
|
32
|
+
"require": "./remult-middleware.js",
|
|
33
|
+
"import": "./esm/remult-middleware.js"
|
|
34
|
+
},
|
|
35
|
+
"./postgres/schema-builder": {
|
|
36
|
+
"require": "./postgres/schema-builder",
|
|
37
|
+
"import": "./esm/postgres/schema-builder"
|
|
38
|
+
}
|
|
18
39
|
}
|
|
19
40
|
}
|
package/postgres/index.d.ts
CHANGED
package/postgres/index.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { PoolConfig, QueryResult } from 'pg';
|
|
2
|
-
import { Remult } from '../src/context';
|
|
3
2
|
import { EntityMetadata } from '../src/remult3';
|
|
4
3
|
import { SqlCommand, SqlImplementation } from '../src/sql-command';
|
|
5
4
|
import { SqlDatabase } from '../src/data-providers/sql-database';
|
|
6
|
-
import { FieldMetadata } from '../src/column-interfaces';
|
|
7
5
|
export interface PostgresPool extends PostgresCommandSource {
|
|
8
6
|
connect(): Promise<PostgresClient>;
|
|
9
7
|
}
|
|
@@ -21,20 +19,10 @@ export declare class PostgresDataProvider implements SqlImplementation {
|
|
|
21
19
|
export interface PostgresCommandSource {
|
|
22
20
|
query(queryText: string, values?: any[]): Promise<QueryResult>;
|
|
23
21
|
}
|
|
24
|
-
export declare function verifyStructureOfAllEntities(db: SqlDatabase, remult: Remult): Promise<void>;
|
|
25
|
-
export declare class PostgresSchemaBuilder {
|
|
26
|
-
private pool;
|
|
27
|
-
verifyStructureOfAllEntities(remult: Remult): Promise<void>;
|
|
28
|
-
createIfNotExist(entity: EntityMetadata): Promise<void>;
|
|
29
|
-
addColumnIfNotExist<T extends EntityMetadata>(entity: T, c: ((e: T) => FieldMetadata)): Promise<void>;
|
|
30
|
-
verifyAllColumns<T extends EntityMetadata>(entity: T): Promise<void>;
|
|
31
|
-
additionalWhere: string;
|
|
32
|
-
constructor(pool: SqlDatabase, schema?: string);
|
|
33
|
-
}
|
|
34
|
-
export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/expressBridge").EntityQueueStorage>;
|
|
35
22
|
export declare function createPostgresConnection(options?: {
|
|
36
23
|
connectionString?: string;
|
|
37
24
|
sslInDev?: boolean;
|
|
38
25
|
configuration?: "heroku" | PoolConfig;
|
|
39
26
|
autoCreateTables?: boolean;
|
|
40
27
|
}): Promise<SqlDatabase>;
|
|
28
|
+
export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/expressBridge").EntityQueueStorage>;
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.preparePostgresQueueStorage = exports.createPostgresConnection = exports.PostgresDataProvider = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var pg_1 = require("pg");
|
|
6
6
|
var context_1 = require("../src/context");
|
|
7
|
-
var
|
|
8
|
-
var filter_consumer_bridge_to_sql_request_1 = require("../src/filter/filter-consumer-bridge-to-sql-request");
|
|
9
|
-
var remult3_1 = require("../src/remult3");
|
|
7
|
+
var schema_builder_1 = require("./schema-builder");
|
|
10
8
|
var sql_database_1 = require("../src/data-providers/sql-database");
|
|
11
9
|
var PostgresDataProvider = /** @class */ (function () {
|
|
12
10
|
function PostgresDataProvider(pool) {
|
|
@@ -93,263 +91,6 @@ var PostgresBridgeToSQLQueryResult = /** @class */ (function () {
|
|
|
93
91
|
};
|
|
94
92
|
return PostgresBridgeToSQLQueryResult;
|
|
95
93
|
}());
|
|
96
|
-
function verifyStructureOfAllEntities(db, remult) {
|
|
97
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
98
|
-
return tslib_1.__generator(this, function (_a) {
|
|
99
|
-
switch (_a.label) {
|
|
100
|
-
case 0: return [4 /*yield*/, new PostgresSchemaBuilder(db).verifyStructureOfAllEntities(remult)];
|
|
101
|
-
case 1: return [2 /*return*/, _a.sent()];
|
|
102
|
-
}
|
|
103
|
-
});
|
|
104
|
-
});
|
|
105
|
-
}
|
|
106
|
-
exports.verifyStructureOfAllEntities = verifyStructureOfAllEntities;
|
|
107
|
-
var PostgresSchemaBuilder = /** @class */ (function () {
|
|
108
|
-
function PostgresSchemaBuilder(pool, schema) {
|
|
109
|
-
this.pool = pool;
|
|
110
|
-
this.additionalWhere = '';
|
|
111
|
-
if (schema) {
|
|
112
|
-
this.additionalWhere = ' and table_schema=\'' + schema + '\'';
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
PostgresSchemaBuilder.prototype.verifyStructureOfAllEntities = function (remult) {
|
|
116
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
117
|
-
var allEntities_1, allEntities_1_1, entityClass, entity, e, err_2, e_1_1;
|
|
118
|
-
var e_1, _a;
|
|
119
|
-
return tslib_1.__generator(this, function (_b) {
|
|
120
|
-
switch (_b.label) {
|
|
121
|
-
case 0:
|
|
122
|
-
console.log("start verify structure");
|
|
123
|
-
_b.label = 1;
|
|
124
|
-
case 1:
|
|
125
|
-
_b.trys.push([1, 12, 13, 14]);
|
|
126
|
-
allEntities_1 = tslib_1.__values(context_1.allEntities), allEntities_1_1 = allEntities_1.next();
|
|
127
|
-
_b.label = 2;
|
|
128
|
-
case 2:
|
|
129
|
-
if (!!allEntities_1_1.done) return [3 /*break*/, 11];
|
|
130
|
-
entityClass = allEntities_1_1.value;
|
|
131
|
-
entity = remult.repo(entityClass).metadata;
|
|
132
|
-
return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
|
|
133
|
-
case 3:
|
|
134
|
-
e = _b.sent();
|
|
135
|
-
_b.label = 4;
|
|
136
|
-
case 4:
|
|
137
|
-
_b.trys.push([4, 9, , 10]);
|
|
138
|
-
if (!!entity.options.sqlExpression) return [3 /*break*/, 8];
|
|
139
|
-
return [4 /*yield*/, e.entityName];
|
|
140
|
-
case 5:
|
|
141
|
-
if (!((_b.sent()).toLowerCase().indexOf('from ') < 0)) return [3 /*break*/, 8];
|
|
142
|
-
return [4 /*yield*/, this.createIfNotExist(entity)];
|
|
143
|
-
case 6:
|
|
144
|
-
_b.sent();
|
|
145
|
-
return [4 /*yield*/, this.verifyAllColumns(entity)];
|
|
146
|
-
case 7:
|
|
147
|
-
_b.sent();
|
|
148
|
-
_b.label = 8;
|
|
149
|
-
case 8: return [3 /*break*/, 10];
|
|
150
|
-
case 9:
|
|
151
|
-
err_2 = _b.sent();
|
|
152
|
-
console.log("failed verify structure of " + e.entityName + " ", err_2);
|
|
153
|
-
return [3 /*break*/, 10];
|
|
154
|
-
case 10:
|
|
155
|
-
allEntities_1_1 = allEntities_1.next();
|
|
156
|
-
return [3 /*break*/, 2];
|
|
157
|
-
case 11: return [3 /*break*/, 14];
|
|
158
|
-
case 12:
|
|
159
|
-
e_1_1 = _b.sent();
|
|
160
|
-
e_1 = { error: e_1_1 };
|
|
161
|
-
return [3 /*break*/, 14];
|
|
162
|
-
case 13:
|
|
163
|
-
try {
|
|
164
|
-
if (allEntities_1_1 && !allEntities_1_1.done && (_a = allEntities_1.return)) _a.call(allEntities_1);
|
|
165
|
-
}
|
|
166
|
-
finally { if (e_1) throw e_1.error; }
|
|
167
|
-
return [7 /*endfinally*/];
|
|
168
|
-
case 14: return [2 /*return*/];
|
|
169
|
-
}
|
|
170
|
-
});
|
|
171
|
-
});
|
|
172
|
-
};
|
|
173
|
-
PostgresSchemaBuilder.prototype.createIfNotExist = function (entity) {
|
|
174
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
175
|
-
var c, e;
|
|
176
|
-
var _this = this;
|
|
177
|
-
return tslib_1.__generator(this, function (_a) {
|
|
178
|
-
switch (_a.label) {
|
|
179
|
-
case 0:
|
|
180
|
-
c = this.pool.createCommand();
|
|
181
|
-
return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
|
|
182
|
-
case 1:
|
|
183
|
-
e = _a.sent();
|
|
184
|
-
return [4 /*yield*/, c.execute("select 1 from information_Schema.tables where table_name=" + c.addParameterAndReturnSqlToken((e.entityName).toLowerCase()) + this.additionalWhere).then(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
185
|
-
var result, _a, _b, x, sql;
|
|
186
|
-
var e_2, _c;
|
|
187
|
-
return tslib_1.__generator(this, function (_d) {
|
|
188
|
-
switch (_d.label) {
|
|
189
|
-
case 0:
|
|
190
|
-
if (!(r.rows.length == 0)) return [3 /*break*/, 2];
|
|
191
|
-
result = '';
|
|
192
|
-
try {
|
|
193
|
-
for (_a = tslib_1.__values(entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
|
|
194
|
-
x = _b.value;
|
|
195
|
-
if (!e.isDbReadonly(x) || remult3_1.isAutoIncrement(x)) {
|
|
196
|
-
if (result.length != 0)
|
|
197
|
-
result += ',';
|
|
198
|
-
result += '\r\n ';
|
|
199
|
-
if (remult3_1.isAutoIncrement(x))
|
|
200
|
-
result += e.nameOf(x) + ' serial';
|
|
201
|
-
else {
|
|
202
|
-
result += postgresColumnSyntax_1.postgresColumnSyntax(x, e.nameOf(x));
|
|
203
|
-
if (x == entity.idMetadata.field)
|
|
204
|
-
result += ' primary key';
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
210
|
-
finally {
|
|
211
|
-
try {
|
|
212
|
-
if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
|
|
213
|
-
}
|
|
214
|
-
finally { if (e_2) throw e_2.error; }
|
|
215
|
-
}
|
|
216
|
-
sql = 'create table ' + e.entityName + ' (' + result + '\r\n)';
|
|
217
|
-
//console.log(sql);
|
|
218
|
-
return [4 /*yield*/, this.pool.execute(sql)];
|
|
219
|
-
case 1:
|
|
220
|
-
//console.log(sql);
|
|
221
|
-
_d.sent();
|
|
222
|
-
_d.label = 2;
|
|
223
|
-
case 2: return [2 /*return*/];
|
|
224
|
-
}
|
|
225
|
-
});
|
|
226
|
-
}); })];
|
|
227
|
-
case 2:
|
|
228
|
-
_a.sent();
|
|
229
|
-
return [2 /*return*/];
|
|
230
|
-
}
|
|
231
|
-
});
|
|
232
|
-
});
|
|
233
|
-
};
|
|
234
|
-
PostgresSchemaBuilder.prototype.addColumnIfNotExist = function (entity, c) {
|
|
235
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
236
|
-
var e, cmd, colName, sql, err_3;
|
|
237
|
-
return tslib_1.__generator(this, function (_a) {
|
|
238
|
-
switch (_a.label) {
|
|
239
|
-
case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
|
|
240
|
-
case 1:
|
|
241
|
-
e = _a.sent();
|
|
242
|
-
if (e.isDbReadonly(c(entity)))
|
|
243
|
-
return [2 /*return*/];
|
|
244
|
-
_a.label = 2;
|
|
245
|
-
case 2:
|
|
246
|
-
_a.trys.push([2, 6, , 7]);
|
|
247
|
-
cmd = this.pool.createCommand();
|
|
248
|
-
colName = e.nameOf(c(entity));
|
|
249
|
-
return [4 /*yield*/, cmd.execute("select 1 \n FROM information_schema.columns \n WHERE table_name=" + cmd.addParameterAndReturnSqlToken((e.entityName).toLocaleLowerCase()) + " and column_name=" + cmd.addParameterAndReturnSqlToken((colName).toLocaleLowerCase()) + this.additionalWhere)];
|
|
250
|
-
case 3:
|
|
251
|
-
if (!((_a.sent()).rows.length == 0)) return [3 /*break*/, 5];
|
|
252
|
-
sql = "alter table " + e.entityName + " add column " + postgresColumnSyntax_1.postgresColumnSyntax(c(entity), colName);
|
|
253
|
-
//console.log(sql);
|
|
254
|
-
return [4 /*yield*/, this.pool.execute(sql)];
|
|
255
|
-
case 4:
|
|
256
|
-
//console.log(sql);
|
|
257
|
-
_a.sent();
|
|
258
|
-
_a.label = 5;
|
|
259
|
-
case 5: return [3 /*break*/, 7];
|
|
260
|
-
case 6:
|
|
261
|
-
err_3 = _a.sent();
|
|
262
|
-
console.log(err_3);
|
|
263
|
-
return [3 /*break*/, 7];
|
|
264
|
-
case 7: return [2 /*return*/];
|
|
265
|
-
}
|
|
266
|
-
});
|
|
267
|
-
});
|
|
268
|
-
};
|
|
269
|
-
PostgresSchemaBuilder.prototype.verifyAllColumns = function (entity) {
|
|
270
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
271
|
-
var cmd, e, cols, _a, _b, col, sql, e_3_1, err_4;
|
|
272
|
-
var e_3, _c;
|
|
273
|
-
return tslib_1.__generator(this, function (_d) {
|
|
274
|
-
switch (_d.label) {
|
|
275
|
-
case 0:
|
|
276
|
-
_d.trys.push([0, 11, , 12]);
|
|
277
|
-
cmd = this.pool.createCommand();
|
|
278
|
-
return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
|
|
279
|
-
case 1:
|
|
280
|
-
e = _d.sent();
|
|
281
|
-
return [4 /*yield*/, cmd.execute("select column_name \n FROM information_schema.columns \n WHERE table_name=" + cmd.addParameterAndReturnSqlToken((e.entityName).toLocaleLowerCase()) + " " + this.additionalWhere)];
|
|
282
|
-
case 2:
|
|
283
|
-
cols = (_d.sent()).rows.map(function (x) { return x.column_name; });
|
|
284
|
-
_d.label = 3;
|
|
285
|
-
case 3:
|
|
286
|
-
_d.trys.push([3, 8, 9, 10]);
|
|
287
|
-
_a = tslib_1.__values(entity.fields), _b = _a.next();
|
|
288
|
-
_d.label = 4;
|
|
289
|
-
case 4:
|
|
290
|
-
if (!!_b.done) return [3 /*break*/, 7];
|
|
291
|
-
col = _b.value;
|
|
292
|
-
if (!!e.isDbReadonly(col)) return [3 /*break*/, 6];
|
|
293
|
-
if (!!cols.includes(e.nameOf(col).toLocaleLowerCase())) return [3 /*break*/, 6];
|
|
294
|
-
sql = "alter table " + e.entityName + " add column " + postgresColumnSyntax_1.postgresColumnSyntax(col, e.nameOf(col));
|
|
295
|
-
//console.log(sql);
|
|
296
|
-
return [4 /*yield*/, this.pool.execute(sql)];
|
|
297
|
-
case 5:
|
|
298
|
-
//console.log(sql);
|
|
299
|
-
_d.sent();
|
|
300
|
-
_d.label = 6;
|
|
301
|
-
case 6:
|
|
302
|
-
_b = _a.next();
|
|
303
|
-
return [3 /*break*/, 4];
|
|
304
|
-
case 7: return [3 /*break*/, 10];
|
|
305
|
-
case 8:
|
|
306
|
-
e_3_1 = _d.sent();
|
|
307
|
-
e_3 = { error: e_3_1 };
|
|
308
|
-
return [3 /*break*/, 10];
|
|
309
|
-
case 9:
|
|
310
|
-
try {
|
|
311
|
-
if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
|
|
312
|
-
}
|
|
313
|
-
finally { if (e_3) throw e_3.error; }
|
|
314
|
-
return [7 /*endfinally*/];
|
|
315
|
-
case 10: return [3 /*break*/, 12];
|
|
316
|
-
case 11:
|
|
317
|
-
err_4 = _d.sent();
|
|
318
|
-
console.log(err_4);
|
|
319
|
-
return [3 /*break*/, 12];
|
|
320
|
-
case 12: return [2 /*return*/];
|
|
321
|
-
}
|
|
322
|
-
});
|
|
323
|
-
});
|
|
324
|
-
};
|
|
325
|
-
return PostgresSchemaBuilder;
|
|
326
|
-
}());
|
|
327
|
-
exports.PostgresSchemaBuilder = PostgresSchemaBuilder;
|
|
328
|
-
function preparePostgresQueueStorage(sql) {
|
|
329
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
330
|
-
var c, JobsInQueueEntity, e;
|
|
331
|
-
return tslib_1.__generator(this, function (_a) {
|
|
332
|
-
switch (_a.label) {
|
|
333
|
-
case 0:
|
|
334
|
-
c = new context_1.Remult();
|
|
335
|
-
c.setDataProvider(sql);
|
|
336
|
-
return [4 /*yield*/, Promise.resolve().then(function () { return require('../server/expressBridge'); })];
|
|
337
|
-
case 1:
|
|
338
|
-
JobsInQueueEntity = (_a.sent()).JobsInQueueEntity;
|
|
339
|
-
e = c.repo(JobsInQueueEntity);
|
|
340
|
-
return [4 /*yield*/, new PostgresSchemaBuilder(sql).createIfNotExist(e.metadata)];
|
|
341
|
-
case 2:
|
|
342
|
-
_a.sent();
|
|
343
|
-
return [4 /*yield*/, new PostgresSchemaBuilder(sql).verifyAllColumns(e.metadata)];
|
|
344
|
-
case 3:
|
|
345
|
-
_a.sent();
|
|
346
|
-
return [4 /*yield*/, Promise.resolve().then(function () { return require('../server/expressBridge'); })];
|
|
347
|
-
case 4: return [2 /*return*/, new (_a.sent()).EntityQueueStorage(c.repo(JobsInQueueEntity))];
|
|
348
|
-
}
|
|
349
|
-
});
|
|
350
|
-
});
|
|
351
|
-
}
|
|
352
|
-
exports.preparePostgresQueueStorage = preparePostgresQueueStorage;
|
|
353
94
|
function createPostgresConnection(options) {
|
|
354
95
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
355
96
|
var config, db, remult;
|
|
@@ -381,7 +122,7 @@ function createPostgresConnection(options) {
|
|
|
381
122
|
remult = new context_1.Remult();
|
|
382
123
|
remult.setDataProvider(db);
|
|
383
124
|
if (!(options.autoCreateTables === undefined || options.autoCreateTables)) return [3 /*break*/, 2];
|
|
384
|
-
return [4 /*yield*/, verifyStructureOfAllEntities(db, remult)];
|
|
125
|
+
return [4 /*yield*/, schema_builder_1.verifyStructureOfAllEntities(db, remult)];
|
|
385
126
|
case 1:
|
|
386
127
|
_a.sent();
|
|
387
128
|
_a.label = 2;
|
|
@@ -391,3 +132,28 @@ function createPostgresConnection(options) {
|
|
|
391
132
|
});
|
|
392
133
|
}
|
|
393
134
|
exports.createPostgresConnection = createPostgresConnection;
|
|
135
|
+
function preparePostgresQueueStorage(sql) {
|
|
136
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
137
|
+
var c, JobsInQueueEntity, e;
|
|
138
|
+
return tslib_1.__generator(this, function (_a) {
|
|
139
|
+
switch (_a.label) {
|
|
140
|
+
case 0:
|
|
141
|
+
c = new context_1.Remult();
|
|
142
|
+
c.setDataProvider(sql);
|
|
143
|
+
return [4 /*yield*/, Promise.resolve().then(function () { return require('../server/expressBridge'); })];
|
|
144
|
+
case 1:
|
|
145
|
+
JobsInQueueEntity = (_a.sent()).JobsInQueueEntity;
|
|
146
|
+
e = c.repo(JobsInQueueEntity);
|
|
147
|
+
return [4 /*yield*/, new schema_builder_1.PostgresSchemaBuilder(sql).createIfNotExist(e.metadata)];
|
|
148
|
+
case 2:
|
|
149
|
+
_a.sent();
|
|
150
|
+
return [4 /*yield*/, new schema_builder_1.PostgresSchemaBuilder(sql).verifyAllColumns(e.metadata)];
|
|
151
|
+
case 3:
|
|
152
|
+
_a.sent();
|
|
153
|
+
return [4 /*yield*/, Promise.resolve().then(function () { return require('../server/expressBridge'); })];
|
|
154
|
+
case 4: return [2 /*return*/, new (_a.sent()).EntityQueueStorage(c.repo(JobsInQueueEntity))];
|
|
155
|
+
}
|
|
156
|
+
});
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
exports.preparePostgresQueueStorage = preparePostgresQueueStorage;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { FieldMetadata } from '../src/column-interfaces';
|
|
2
|
+
import { Remult } from '../src/context';
|
|
3
|
+
import { SqlDatabase } from '../src/data-providers/sql-database';
|
|
4
|
+
import { EntityMetadata } from '../src/remult3';
|
|
5
|
+
export declare function postgresColumnSyntax(x: FieldMetadata, dbName: string): string;
|
|
6
|
+
export declare function verifyStructureOfAllEntities(db: SqlDatabase, remult: Remult): Promise<void>;
|
|
7
|
+
export declare class PostgresSchemaBuilder {
|
|
8
|
+
private pool;
|
|
9
|
+
verifyStructureOfAllEntities(remult: Remult): Promise<void>;
|
|
10
|
+
createIfNotExist(entity: EntityMetadata): Promise<void>;
|
|
11
|
+
addColumnIfNotExist<T extends EntityMetadata>(entity: T, c: ((e: T) => FieldMetadata)): Promise<void>;
|
|
12
|
+
verifyAllColumns<T extends EntityMetadata>(entity: T): Promise<void>;
|
|
13
|
+
additionalWhere: string;
|
|
14
|
+
constructor(pool: SqlDatabase, schema?: string);
|
|
15
|
+
}
|