@entity-access/entity-access 1.2.6 → 1.2.10
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/dist/.tsbuildinfo +1 -0
- package/dist/common/JsonGenerator.js +1 -1
- package/dist/common/JsonGenerator.js.map +1 -1
- package/dist/common/cloner.js +1 -1
- package/dist/common/cloner.js.map +1 -1
- package/dist/compiler/ISqlHelpers.js +2 -2
- package/dist/compiler/ISqlHelpers.js.map +1 -1
- package/dist/decorators/Column.js +1 -1
- package/dist/decorators/Column.js.map +1 -1
- package/dist/di/di.js +1 -1
- package/dist/di/di.js.map +1 -1
- package/dist/drivers/base/BaseDriver.js +3 -3
- package/dist/drivers/base/BaseDriver.js.map +1 -1
- package/dist/model/EntitySource.d.ts +1 -0
- package/dist/model/EntitySource.d.ts.map +1 -1
- package/dist/model/EntitySource.js +11 -8
- package/dist/model/EntitySource.js.map +1 -1
- package/dist/model/events/FilteredExpression.d.ts.map +1 -1
- package/dist/model/events/FilteredExpression.js +1 -2
- package/dist/model/events/FilteredExpression.js.map +1 -1
- package/dist/query/ast/Expressions.js +2 -2
- package/dist/query/ast/Expressions.js.map +1 -1
- package/dist/query/ast/ReplaceParameter.js +1 -1
- package/dist/query/ast/ReplaceParameter.js.map +1 -1
- package/package.json +3 -3
- package/src/common/JsonGenerator.ts +1 -1
- package/src/common/cloner.ts +1 -1
- package/src/compiler/ISqlHelpers.ts +2 -2
- package/src/decorators/Column.ts +1 -1
- package/src/di/di.ts +1 -1
- package/src/drivers/base/BaseDriver.ts +3 -3
- package/src/model/EntitySource.ts +11 -8
- package/src/model/events/FilteredExpression.ts +1 -2
- package/src/query/ast/Expressions.ts +2 -2
- package/src/query/ast/ReplaceParameter.ts +1 -1
- package/tsconfig.json +1 -0
- package/tsconfig.tsbuildinfo +0 -1
|
@@ -10,7 +10,7 @@ const removeUndefined = (obj) => {
|
|
|
10
10
|
}
|
|
11
11
|
const r = {};
|
|
12
12
|
for (const key in obj) {
|
|
13
|
-
if (Object.
|
|
13
|
+
if (Object.hasOwn(obj, key)) {
|
|
14
14
|
const element = obj[key];
|
|
15
15
|
if (element === void 0) {
|
|
16
16
|
continue;
|
|
@@ -39,7 +39,7 @@ export class EntityStatements {
|
|
|
39
39
|
const result = r.rows[0];
|
|
40
40
|
if (result) {
|
|
41
41
|
for (const key in result) {
|
|
42
|
-
if (Object.
|
|
42
|
+
if (Object.hasOwn(result, key)) {
|
|
43
43
|
const element = result[key];
|
|
44
44
|
entity[key] = element;
|
|
45
45
|
}
|
|
@@ -66,7 +66,7 @@ export class EntityStatements {
|
|
|
66
66
|
const result = r.rows[0];
|
|
67
67
|
if (result) {
|
|
68
68
|
for (const key in result) {
|
|
69
|
-
if (Object.
|
|
69
|
+
if (Object.hasOwn(result, key)) {
|
|
70
70
|
const element = result[key];
|
|
71
71
|
entity[key] = element;
|
|
72
72
|
}
|
|
@@ -93,7 +93,7 @@ export class EntityStatements {
|
|
|
93
93
|
const result = r.rows[0];
|
|
94
94
|
if (result) {
|
|
95
95
|
for (const key in result) {
|
|
96
|
-
if (Object.
|
|
96
|
+
if (Object.hasOwn(result, key)) {
|
|
97
97
|
const element = result[key];
|
|
98
98
|
entity[key] = element;
|
|
99
99
|
}
|
|
@@ -146,7 +146,7 @@ export class EntityStatements {
|
|
|
146
146
|
if (existing) {
|
|
147
147
|
existing = updateAfterSelect(existing);
|
|
148
148
|
for (const key in existing) {
|
|
149
|
-
if (Object.
|
|
149
|
+
if (Object.hasOwn(existing, key)) {
|
|
150
150
|
entity[key] = existing[key];
|
|
151
151
|
}
|
|
152
152
|
}
|
|
@@ -215,6 +215,9 @@ export class EntitySource {
|
|
|
215
215
|
updateOrInsert(changes) {
|
|
216
216
|
return s.statements.upsert({ ...keys, ...changes }, (x) => ({ ...x, ...changes }), keys);
|
|
217
217
|
},
|
|
218
|
+
delete() {
|
|
219
|
+
return s.statements.delete(keys);
|
|
220
|
+
}
|
|
218
221
|
};
|
|
219
222
|
}
|
|
220
223
|
async saveDirect({ keys, mode, changes, updateAfterSelect }, retry = 2) {
|
|
@@ -239,7 +242,7 @@ export class EntitySource {
|
|
|
239
242
|
if (er.rows?.[0]) {
|
|
240
243
|
const fr = er.rows[0];
|
|
241
244
|
for (const key in fr) {
|
|
242
|
-
if (Object.
|
|
245
|
+
if (Object.hasOwn(fr, key)) {
|
|
243
246
|
const element = fr[key];
|
|
244
247
|
const name = this.model.getColumn(key).name;
|
|
245
248
|
returnEntity[name] = element;
|
|
@@ -253,7 +256,7 @@ export class EntitySource {
|
|
|
253
256
|
const original = { ...returnEntity, ...changes };
|
|
254
257
|
const updates = updateAfterSelect(original);
|
|
255
258
|
for (const key in updates) {
|
|
256
|
-
if (Object.
|
|
259
|
+
if (Object.hasOwn(updates, key)) {
|
|
257
260
|
const element = updates[key];
|
|
258
261
|
changes[key] = element;
|
|
259
262
|
}
|
|
@@ -280,7 +283,7 @@ export class EntitySource {
|
|
|
280
283
|
if (r.rows?.length) {
|
|
281
284
|
const first = r.rows[0];
|
|
282
285
|
for (const key in first) {
|
|
283
|
-
if (Object.
|
|
286
|
+
if (Object.hasOwn(first, key)) {
|
|
284
287
|
const element = first[key];
|
|
285
288
|
const name = this.model.getColumn(key).name;
|
|
286
289
|
returnEntity[name] ??= element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntitySource.js","sourceRoot":"","sources":["../../src/model/EntitySource.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EntitySource.js","sourceRoot":"","sources":["../../src/model/EntitySource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilteredExpression.d.ts","sourceRoot":"","sources":["../../../src/model/events/FilteredExpression.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,eAAO,MAAM,cAAc,eAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"FilteredExpression.d.ts","sourceRoot":"","sources":["../../../src/model/events/FilteredExpression.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,eAAO,MAAM,cAAc,eAAqB,CAAC;AAGjD,eAAO,MAAM,kBAAkB;yBACX,OAAO;;CAmB1B,CAAC"}
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
* nested filtering.
|
|
5
5
|
*/
|
|
6
6
|
export const filteredSymbol = Symbol("filtered");
|
|
7
|
-
const hasOwnProperty = Object.prototype.hasOwnProperty;
|
|
8
7
|
export const FilteredExpression = {
|
|
9
8
|
isFiltered(fx) {
|
|
10
9
|
return fx[filteredSymbol];
|
|
@@ -18,7 +17,7 @@ export const FilteredExpression = {
|
|
|
18
17
|
}
|
|
19
18
|
fx[filteredSymbol] = true;
|
|
20
19
|
for (const key in fx) {
|
|
21
|
-
if (
|
|
20
|
+
if (Object.hasOwn(fx, key)) {
|
|
22
21
|
const element = fx[key];
|
|
23
22
|
FilteredExpression.markAsFiltered(element);
|
|
24
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilteredExpression.js","sourceRoot":"","sources":["../../../src/model/events/FilteredExpression.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"FilteredExpression.js","sourceRoot":"","sources":["../../../src/model/events/FilteredExpression.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAGjD,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,UAAU,CAAC,EAAE;QACT,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC;IAC9B,CAAC;IACD,cAAc,CAAC,EAAE;QACb,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,EAAE,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;QAC1B,KAAK,MAAM,GAAG,IAAI,EAAE,EAAE,CAAC;YACnB,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;gBACxB,kBAAkB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC/C,CAAC;QACL,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAC"}
|
|
@@ -106,7 +106,7 @@ export class Expression {
|
|
|
106
106
|
const r = {};
|
|
107
107
|
Object.setPrototypeOf(r, Object.getPrototypeOf(expression));
|
|
108
108
|
for (const key in expression) {
|
|
109
|
-
if (Object.
|
|
109
|
+
if (Object.hasOwn(expression, key)) {
|
|
110
110
|
const element = expression[key];
|
|
111
111
|
if (Array.isArray(element)) {
|
|
112
112
|
r[key] = element.map((x) => this.clone(x));
|
|
@@ -121,7 +121,7 @@ export class Expression {
|
|
|
121
121
|
static shallowCopy(expression, constants) {
|
|
122
122
|
const copy = {};
|
|
123
123
|
for (const key in expression) {
|
|
124
|
-
if (Object.
|
|
124
|
+
if (Object.hasOwn(expression, key)) {
|
|
125
125
|
const element = expression[key];
|
|
126
126
|
if (key === "type" || key === "is") {
|
|
127
127
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Expressions.js","sourceRoot":"","sources":["../../../src/query/ast/Expressions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Expressions.js","sourceRoot":"","sources":["../../../src/query/ast/Expressions.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export default class ReplaceParameter {
|
|
|
22
22
|
}
|
|
23
23
|
const treeCopy = {};
|
|
24
24
|
for (const key in tree) {
|
|
25
|
-
if (Object.
|
|
25
|
+
if (Object.hasOwn(tree, key)) {
|
|
26
26
|
const element = tree[key];
|
|
27
27
|
if (element && typeof element === "object") {
|
|
28
28
|
treeCopy[key] = this.replace(element, from, to);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReplaceParameter.js","sourceRoot":"","sources":["../../../src/query/ast/ReplaceParameter.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAI1B,MAAM,CAAC,OAAO,CAAI,IAAa,EAAE,IAAgB,EAAE,EAAc;QACpE,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,EAAE,CAAC;YAChB,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;gBAC1B,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;oBAC5C,SAAS;gBACb,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxB,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,CAAE,IAAY,CAAC,IAAI,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,QAAQ,GAAG,EAAS,CAAC;QAC3B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"ReplaceParameter.js","sourceRoot":"","sources":["../../../src/query/ast/ReplaceParameter.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAI1B,MAAM,CAAC,OAAO,CAAI,IAAa,EAAE,IAAgB,EAAE,EAAc;QACpE,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,EAAE,CAAC;YAChB,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;gBAC1B,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;oBAC5C,SAAS;gBACb,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxB,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,CAAE,IAAY,CAAC,IAAI,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,QAAQ,GAAG,EAAS,CAAC;QAC3B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,MAAM,CAAC,MAAM,CAAC,IAAW,EAAE,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC1B,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;oBACzC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;oBAChD,SAAS;gBACb,CAAC;gBACD,QAAQ,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;YAC5B,CAAC;QACL,CAAC;QACD,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,OAAO,QAAQ,CAAC;IACpB,CAAC;CAEJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@entity-access/entity-access",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.10",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/mssql": "^8.1.2",
|
|
39
|
-
"@types/node": "^
|
|
39
|
+
"@types/node": "^25.9.1",
|
|
40
40
|
"@types/pg": "^8.15.6",
|
|
41
41
|
"@types/pg-cursor": "^2.7.2",
|
|
42
42
|
"@types/pg-pool": "^2.0.6",
|
|
@@ -55,6 +55,6 @@
|
|
|
55
55
|
"eslint-plugin-prefer-arrow": "^1.2.3",
|
|
56
56
|
"eslint-plugin-promise": "^6.1.1",
|
|
57
57
|
"eslint-plugin-react": "^7.32.2",
|
|
58
|
-
"typescript": "^
|
|
58
|
+
"typescript": "^6.0.3"
|
|
59
59
|
}
|
|
60
60
|
}
|
package/src/common/cloner.ts
CHANGED
|
@@ -2,7 +2,7 @@ export const cloner = {
|
|
|
2
2
|
clone<T>(obj: T, symbols = false): T {
|
|
3
3
|
const copy = {} as T;
|
|
4
4
|
for (const key in obj) {
|
|
5
|
-
if (Object.
|
|
5
|
+
if (Object.hasOwn(obj as any, key)) {
|
|
6
6
|
const element = obj[key];
|
|
7
7
|
if (element && Array.isArray(element)) {
|
|
8
8
|
copy[key] = [].concat(element) as any;
|
|
@@ -17,7 +17,7 @@ export type ISqlHelpers = transformed<ISql>;
|
|
|
17
17
|
|
|
18
18
|
export const flattenHelpers = (f, name, target = {}) => {
|
|
19
19
|
for (const key in f) {
|
|
20
|
-
if (Object.
|
|
20
|
+
if (Object.hasOwn(f, key)) {
|
|
21
21
|
const element = f[key];
|
|
22
22
|
if (typeof element === "function") {
|
|
23
23
|
target[name + "." + key] = element;
|
|
@@ -38,7 +38,7 @@ export const flattenMethods = (m: any): ISqlMethodTransformer => {
|
|
|
38
38
|
|
|
39
39
|
const fillMap = (target, root = "Sql") => {
|
|
40
40
|
for (const key in target) {
|
|
41
|
-
if (Object.
|
|
41
|
+
if (Object.hasOwn(target, key)) {
|
|
42
42
|
const element = target[key];
|
|
43
43
|
if (typeof element === "object") {
|
|
44
44
|
fillMap(element, root + "." + key);
|
package/src/decorators/Column.ts
CHANGED
|
@@ -19,7 +19,7 @@ export default function Column<T>(cfg: IColumnDefinition<T> = {} as any): ((targ
|
|
|
19
19
|
const model = SchemaRegistry.model(cn);
|
|
20
20
|
const c = model[addOrCreateColumnSymbol](key);
|
|
21
21
|
for (const k in cfg) {
|
|
22
|
-
if (Object.
|
|
22
|
+
if (Object.hasOwn(cfg, k)) {
|
|
23
23
|
const element = cfg[k];
|
|
24
24
|
c[k] = element;
|
|
25
25
|
}
|
package/src/di/di.ts
CHANGED
|
@@ -163,7 +163,7 @@ export class ServiceProvider implements IDisposable {
|
|
|
163
163
|
const keys = type.prototype[injectServiceKeysSymbol];
|
|
164
164
|
if (keys) {
|
|
165
165
|
for (const key in keys) {
|
|
166
|
-
if (Object.
|
|
166
|
+
if (Object.hasOwn(keys, key)) {
|
|
167
167
|
const element = keys[key];
|
|
168
168
|
instance[key] ??= this.resolve(element);
|
|
169
169
|
}
|
|
@@ -417,7 +417,7 @@ export abstract class BaseDriver {
|
|
|
417
417
|
createSelectWithKeysExpression(type: EntityType, check: any, returnFields: Expression[] ) {
|
|
418
418
|
let where = null as Expression;
|
|
419
419
|
for (const key in check) {
|
|
420
|
-
if (Object.
|
|
420
|
+
if (Object.hasOwn(check, key)) {
|
|
421
421
|
const element = check[key];
|
|
422
422
|
const column = type.getField(key).quotedColumnNameExp;
|
|
423
423
|
const condition = Expression.equal(column, Expression.constant(element));
|
|
@@ -448,7 +448,7 @@ export abstract class BaseDriver {
|
|
|
448
448
|
if (mode === "delete") {
|
|
449
449
|
let where = null as Expression;
|
|
450
450
|
for (const key in test) {
|
|
451
|
-
if (Object.
|
|
451
|
+
if (Object.hasOwn(test, key)) {
|
|
452
452
|
const element = test[key];
|
|
453
453
|
const { quotedColumnNameExp } = type.getField(key);
|
|
454
454
|
const compare = Expression.equal(quotedColumnNameExp, Expression.constant(element));
|
|
@@ -520,7 +520,7 @@ export abstract class BaseDriver {
|
|
|
520
520
|
|
|
521
521
|
if(test) {
|
|
522
522
|
for (const key in test) {
|
|
523
|
-
if (Object.
|
|
523
|
+
if (Object.hasOwn(test, key)) {
|
|
524
524
|
const element = test[key];
|
|
525
525
|
const { quotedColumnNameExp } = type.getField(key);
|
|
526
526
|
keys.push(Expression.equal(quotedColumnNameExp, Expression.constant(element)));
|
|
@@ -16,7 +16,7 @@ const removeUndefined = (obj) => {
|
|
|
16
16
|
}
|
|
17
17
|
const r = {};
|
|
18
18
|
for (const key in obj) {
|
|
19
|
-
if (Object.
|
|
19
|
+
if (Object.hasOwn(obj, key)) {
|
|
20
20
|
const element = obj[key];
|
|
21
21
|
if (element === void 0) {
|
|
22
22
|
continue;
|
|
@@ -77,7 +77,7 @@ export class EntityStatements<T = any> {
|
|
|
77
77
|
const result = r.rows[0];
|
|
78
78
|
if (result) {
|
|
79
79
|
for (const key in result) {
|
|
80
|
-
if (Object.
|
|
80
|
+
if (Object.hasOwn(result, key)) {
|
|
81
81
|
const element = result[key];
|
|
82
82
|
entity[key] = element;
|
|
83
83
|
}
|
|
@@ -105,7 +105,7 @@ export class EntityStatements<T = any> {
|
|
|
105
105
|
const result = r.rows[0];
|
|
106
106
|
if (result) {
|
|
107
107
|
for (const key in result) {
|
|
108
|
-
if (Object.
|
|
108
|
+
if (Object.hasOwn(result, key)) {
|
|
109
109
|
const element = result[key];
|
|
110
110
|
entity[key] = element;
|
|
111
111
|
}
|
|
@@ -133,7 +133,7 @@ export class EntityStatements<T = any> {
|
|
|
133
133
|
const result = r.rows[0];
|
|
134
134
|
if (result) {
|
|
135
135
|
for (const key in result) {
|
|
136
|
-
if (Object.
|
|
136
|
+
if (Object.hasOwn(result, key)) {
|
|
137
137
|
const element = result[key];
|
|
138
138
|
entity[key] = element;
|
|
139
139
|
}
|
|
@@ -189,7 +189,7 @@ export class EntityStatements<T = any> {
|
|
|
189
189
|
if (existing) {
|
|
190
190
|
existing = updateAfterSelect(existing);
|
|
191
191
|
for (const key in existing) {
|
|
192
|
-
if (Object.
|
|
192
|
+
if (Object.hasOwn(existing as any, key)) {
|
|
193
193
|
entity[key] = existing[key];
|
|
194
194
|
}
|
|
195
195
|
}
|
|
@@ -265,6 +265,9 @@ export class EntitySource<T = any> {
|
|
|
265
265
|
updateOrInsert(changes: Partial<T>) {
|
|
266
266
|
return s.statements.upsert({ ... keys, ... changes }, (x) => ({ ... x, ... changes }), keys);
|
|
267
267
|
},
|
|
268
|
+
delete() {
|
|
269
|
+
return s.statements.delete(keys);
|
|
270
|
+
}
|
|
268
271
|
};
|
|
269
272
|
}
|
|
270
273
|
|
|
@@ -300,7 +303,7 @@ export class EntitySource<T = any> {
|
|
|
300
303
|
if (er.rows?.[0]) {
|
|
301
304
|
const fr = er.rows[0];
|
|
302
305
|
for (const key in fr) {
|
|
303
|
-
if (Object.
|
|
306
|
+
if (Object.hasOwn(fr, key)) {
|
|
304
307
|
const element = fr[key];
|
|
305
308
|
const name = this.model.getColumn(key).name;
|
|
306
309
|
returnEntity[name] = element;
|
|
@@ -314,7 +317,7 @@ export class EntitySource<T = any> {
|
|
|
314
317
|
const original = { ... returnEntity, ... changes };
|
|
315
318
|
const updates = updateAfterSelect(original);
|
|
316
319
|
for (const key in updates) {
|
|
317
|
-
if (Object.
|
|
320
|
+
if (Object.hasOwn(updates as any, key)) {
|
|
318
321
|
const element = updates[key];
|
|
319
322
|
changes[key] = element;
|
|
320
323
|
}
|
|
@@ -341,7 +344,7 @@ export class EntitySource<T = any> {
|
|
|
341
344
|
if(r.rows?.length) {
|
|
342
345
|
const first = r.rows[0];
|
|
343
346
|
for (const key in first) {
|
|
344
|
-
if (Object.
|
|
347
|
+
if (Object.hasOwn(first, key)) {
|
|
345
348
|
const element = first[key];
|
|
346
349
|
const name = this.model.getColumn(key).name;
|
|
347
350
|
returnEntity[name] ??= element;
|
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
|
|
7
7
|
export const filteredSymbol = Symbol("filtered");
|
|
8
8
|
|
|
9
|
-
const hasOwnProperty = Object.prototype.hasOwnProperty;
|
|
10
9
|
|
|
11
10
|
export const FilteredExpression = {
|
|
12
11
|
isFiltered(fx): boolean {
|
|
@@ -21,7 +20,7 @@ export const FilteredExpression = {
|
|
|
21
20
|
}
|
|
22
21
|
fx[filteredSymbol] = true;
|
|
23
22
|
for (const key in fx) {
|
|
24
|
-
if (
|
|
23
|
+
if (Object.hasOwn(fx, key)) {
|
|
25
24
|
const element = fx[key];
|
|
26
25
|
FilteredExpression.markAsFiltered(element);
|
|
27
26
|
}
|
|
@@ -134,7 +134,7 @@ export abstract class Expression {
|
|
|
134
134
|
const r = {} as any;
|
|
135
135
|
Object.setPrototypeOf(r, Object.getPrototypeOf(expression));
|
|
136
136
|
for (const key in expression) {
|
|
137
|
-
if (Object.
|
|
137
|
+
if (Object.hasOwn(expression, key)) {
|
|
138
138
|
const element = expression[key];
|
|
139
139
|
if(Array.isArray(element)) {
|
|
140
140
|
r[key] = element.map((x) => this.clone(x));
|
|
@@ -149,7 +149,7 @@ export abstract class Expression {
|
|
|
149
149
|
private static shallowCopy(expression, constants: Expression[]) {
|
|
150
150
|
const copy = {} as any;
|
|
151
151
|
for (const key in expression) {
|
|
152
|
-
if (Object.
|
|
152
|
+
if (Object.hasOwn(expression, key)) {
|
|
153
153
|
const element = expression[key];
|
|
154
154
|
if (key === "type" || key === "is") {
|
|
155
155
|
continue;
|
|
@@ -27,7 +27,7 @@ export default class ReplaceParameter {
|
|
|
27
27
|
}
|
|
28
28
|
const treeCopy = {} as any;
|
|
29
29
|
for (const key in tree) {
|
|
30
|
-
if (Object.
|
|
30
|
+
if (Object.hasOwn(tree as any, key)) {
|
|
31
31
|
const element = tree[key];
|
|
32
32
|
if (element && typeof element === "object") {
|
|
33
33
|
treeCopy[key] = this.replace(element, from, to);
|