sonamu 0.2.7 → 0.2.9
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/database/base-model.js +1 -1
- package/dist/database/base-model.js.map +1 -1
- package/dist/database/upsert-builder.d.ts +1 -1
- package/dist/database/upsert-builder.d.ts.map +1 -1
- package/dist/database/upsert-builder.js +2 -2
- package/dist/database/upsert-builder.js.map +1 -1
- package/dist/templates/model.template.d.ts.map +1 -1
- package/dist/templates/model.template.js +4 -21
- package/dist/templates/model.template.js.map +1 -1
- package/package.json +1 -1
- package/src/database/base-model.ts +1 -1
- package/src/database/upsert-builder.ts +11 -3
- package/src/templates/model.template.ts +7 -32
|
@@ -211,7 +211,7 @@ class BaseModelClass {
|
|
|
211
211
|
if (queryMode === "list") {
|
|
212
212
|
return undefined;
|
|
213
213
|
}
|
|
214
|
-
const clonedQb = qb.clone().clear("order");
|
|
214
|
+
const clonedQb = qb.clone().clear("order").clear("offset").clear("limit");
|
|
215
215
|
const [, matched] = (_b = clonedQb
|
|
216
216
|
.toQuery()
|
|
217
217
|
.toLowerCase()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-model.js","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"base-model.js","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export declare class UpsertBuilder {
|
|
|
17
17
|
getTable(tableName: string): TableData;
|
|
18
18
|
hasTable(tableName: string): boolean;
|
|
19
19
|
register<T extends string>(tableName: string, row: {
|
|
20
|
-
[key in T]?: UBRef | string | number | boolean | bigint | null | object;
|
|
20
|
+
[key in T]?: UBRef | string | number | boolean | bigint | null | object | unknown;
|
|
21
21
|
}): UBRef;
|
|
22
22
|
upsert(wdb: Knex, tableName: string): Promise<number[]>;
|
|
23
23
|
insertOnly(wdb: Knex, tableName: string): Promise<number[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsert-builder.d.ts","sourceRoot":"","sources":["../../src/database/upsert-builder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,KAAK,SAAS,GAAG;IACf,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AACF,wBAAgB,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,KAAK,CAOrD;AAED,qBAAa,aAAa;IACxB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;;IAK/B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IAsBtC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIpC,QAAQ,CAAC,CAAC,SAAS,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE;SACF,GAAG,IAAI,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"upsert-builder.d.ts","sourceRoot":"","sources":["../../src/database/upsert-builder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,KAAK,SAAS,GAAG;IACf,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AACF,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AACF,wBAAgB,UAAU,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,KAAK,CAOrD;AAED,qBAAa,aAAa;IACxB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;;IAK/B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IAsBtC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAIpC,QAAQ,CAAC,CAAC,SAAS,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE;SACF,GAAG,IAAI,CAAC,CAAC,CAAC,EACP,KAAK,GACL,MAAM,GACN,MAAM,GACN,OAAO,GACP,MAAM,GACN,IAAI,GACJ,MAAM,GACN,OAAO;KACZ,GACA,KAAK;IAyDF,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAGvD,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAI3D,cAAc,CAClB,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,QAAQ,GAAG,QAAQ,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC;IAoGd,WAAW,CACf,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GACA,OAAO,CAAC,IAAI,CAAC;CAuBjB"}
|
|
@@ -126,9 +126,9 @@ class UpsertBuilder {
|
|
|
126
126
|
table.references.add(rowValue.of + "." + rowValue.use);
|
|
127
127
|
r[rowKey] = rowValue;
|
|
128
128
|
}
|
|
129
|
-
else if (typeof rowValue === "object"
|
|
129
|
+
else if (typeof rowValue === "object") {
|
|
130
130
|
// object인 경우 JSON으로 변환
|
|
131
|
-
r[rowKey] = JSON.stringify(rowValue);
|
|
131
|
+
r[rowKey] = rowValue === null ? null : JSON.stringify(rowValue);
|
|
132
132
|
}
|
|
133
133
|
else {
|
|
134
134
|
r[rowKey] = rowValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsert-builder.js","sourceRoot":"","sources":["../../src/database/upsert-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAoC;AACpC,iDAAqD;AAErD,6DAAyD;AAazD,SAAgB,UAAU,CAAC,KAAU;IACnC,OAAO,CACL,KAAK,KAAK,SAAS;QACnB,KAAK,KAAK,IAAI;QACd,KAAK,CAAC,EAAE,KAAK,SAAS;QACtB,KAAK,CAAC,IAAI,KAAK,SAAS,CACzB,CAAC;AACJ,CAAC;AAPD,gCAOC;AAED,MAAa,aAAa;IAExB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;IAC1B,CAAC;IAED,QAAQ,CAAC,SAAiB;;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;gBACtB,IAAI;oBACF,OAAO,8BAAa,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;iBAC9C;gBAAC,WAAM;oBACN,OAAO,IAAI,CAAC;iBACb;YACH,CAAC,CAAC,EAAE,CAAC;YAEL,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE;gBACzB,UAAU,EAAE,IAAI,GAAG,EAAE;gBACrB,IAAI,EAAE,EAAE;gBACR,aAAa,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,aAAa,mCAAI,EAAE;gBAC7C,UAAU,EAAE,IAAI,GAAG,EAAkB;aACtC,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;IACrC,CAAC;IAED,QAAQ,CAAC,SAAiB;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,QAAQ,CACN,SAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"upsert-builder.js","sourceRoot":"","sources":["../../src/database/upsert-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.template.d.ts","sourceRoot":"","sources":["../../src/templates/model.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAiB,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG3C,qBAAa,eAAgB,SAAQ,QAAQ;;IAK3C,gBAAgB,CAAC,KAAK,EAAE,iBAAiB;;;;IAOzC,MAAM,CACJ,EAAE,QAAQ,EAAE,EAAE,eAAe,CAAC,OAAO,CAAC,EACtC,YAAY,EAAE,aAAa,EAC3B,cAAc,EAAE,aAAa;;;;;;
|
|
1
|
+
{"version":3,"file":"model.template.d.ts","sourceRoot":"","sources":["../../src/templates/model.template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAiB,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG3C,qBAAa,eAAgB,SAAQ,QAAQ;;IAK3C,gBAAgB,CAAC,KAAK,EAAE,iBAAiB;;;;IAOzC,MAAM,CACJ,EAAE,QAAQ,EAAE,EAAE,eAAe,CAAC,OAAO,CAAC,EACtC,YAAY,EAAE,aAAa,EAC3B,cAAc,EAAE,aAAa;;;;;;CA0JhC"}
|
|
@@ -127,32 +127,15 @@ class ${entityId}ModelClass extends BaseModelClass {
|
|
|
127
127
|
|
|
128
128
|
@api({ httpMethod: "POST" })
|
|
129
129
|
async save(
|
|
130
|
-
|
|
130
|
+
spa: ${entityId}SaveParams[]
|
|
131
131
|
): Promise<number[]> {
|
|
132
132
|
const wdb = this.getDB("w");
|
|
133
133
|
const ub = this.getUpsertBuilder();
|
|
134
134
|
|
|
135
135
|
// register
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
return `saveParamsArray.map((saveParams) => {
|
|
140
|
-
ub.register("${entity.table}", saveParams);
|
|
141
|
-
});`;
|
|
142
|
-
}
|
|
143
|
-
else {
|
|
144
|
-
return `saveParamsArray.map(({${jsonProps
|
|
145
|
-
.map((prop) => prop.name)
|
|
146
|
-
.join(", ")}, ...saveParams}) => {
|
|
147
|
-
ub.register("${entity.table}", {
|
|
148
|
-
${jsonProps
|
|
149
|
-
.map((prop) => `${prop.name}: ${prop.name} === null ? null : JSON.stringify(${prop.name}),`)
|
|
150
|
-
.join(",\n")}
|
|
151
|
-
...saveParams
|
|
152
|
-
});
|
|
153
|
-
});`;
|
|
154
|
-
}
|
|
155
|
-
})()}
|
|
136
|
+
spa.map((sp) => {
|
|
137
|
+
ub.register("${entity.table}", sp);
|
|
138
|
+
});
|
|
156
139
|
|
|
157
140
|
// transaction
|
|
158
141
|
return wdb.transaction(async (trx) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.template.js","sourceRoot":"","sources":["../../src/templates/model.template.ts"],"names":[],"mappings":";;;AACA,6DAA4E;AAC5E,mDAA2C;AAC3C,6DAA2D;AAE3D,MAAa,eAAgB,SAAQ,wBAAQ;IAC3C;QACE,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;IAED,gBAAgB,CAAC,KAAwB;QACvC,OAAO;YACL,MAAM,EAAE,qBAAqB;YAC7B,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,WAAW;SACzC,CAAC;IACJ,CAAC;IAED,MAAM,CACJ,EAAE,QAAQ,EAA4B,EACtC,YAA2B,EAC3B,cAA6B;QAE7B,MAAM,KAAK,GAAG,8BAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,8BAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE3C,MAAM,KAAK,GAAG,IAAI,wCAAmB,EAAE,CAAC;QACxC,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,MAAK,SAAS,EAAE;YAC1C,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;SACtD;QACD,MAAM,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAEtD,uCACK,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAC/B,IAAI,EAAE;;;IAGR,QAAQ;IACR,QAAQ;;;IAGR,KAAK,CAAC,KAAK;;WAEJ,QAAQ,eAAe,QAAQ,
|
|
1
|
+
{"version":3,"file":"model.template.js","sourceRoot":"","sources":["../../src/templates/model.template.ts"],"names":[],"mappings":";;;AACA,6DAA4E;AAC5E,mDAA2C;AAC3C,6DAA2D;AAE3D,MAAa,eAAgB,SAAQ,wBAAQ;IAC3C;QACE,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;IAED,gBAAgB,CAAC,KAAwB;QACvC,OAAO;YACL,MAAM,EAAE,qBAAqB;YAC7B,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,WAAW;SACzC,CAAC;IACJ,CAAC;IAED,MAAM,CACJ,EAAE,QAAQ,EAA4B,EACtC,YAA2B,EAC3B,cAA6B;QAE7B,MAAM,KAAK,GAAG,8BAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,8BAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE3C,MAAM,KAAK,GAAG,IAAI,wCAAmB,EAAE,CAAC;QACxC,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,MAAK,SAAS,EAAE;YAC1C,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;SACtD;QACD,MAAM,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAEtD,uCACK,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAC/B,IAAI,EAAE;;;IAGR,QAAQ;IACR,QAAQ;;;IAGR,KAAK,CAAC,KAAK;;WAEJ,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,CAAC,EAAE;;;IAGtE,QAAQ;;QAEJ,QAAQ;iBACC,QAAQ;;wEAE+C,QAAQ;6BACnD,QAAQ;;;eAGtB,QAAQ;;;;;;;8CAOuB,KAAK,CAAC,OAAO;;;;;;4BAM/B,QAAQ;;kBAElB,QAAQ;eACX,QAAQ;;;;;;;;;;wEAUiD,KAAK,CAAC,aAAa;6BAC9D,QAAQ;;cAEvB,QAAQ;0BACI,QAAQ;;;;;iBAKjB,GAAG,CAAC,MAAM;kBACT,GAAG,CAAC,OAAO;;;;;;;;qBAQR,KAAK,CAAC,KAAK;;;;wBAIR,MAAM,CAAC,KAAK;;;;;;wBAMZ,MAAM,CAAC,KAAK;;2BAET,MAAM,CAAC,KAAK;;;;;;;;;;;;wBAYf,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;WAgBzB,QAAQ;;;;;;;qBAOE,MAAM,CAAC,KAAK;;;;;0CAKS,MAAM,CAAC,KAAK;;;;;;;;;;;;oBAYlC,MAAM,CAAC,KAAK,eAAe,MAAM,CAAC,KAAK;;;;;;;eAO5C,QAAQ,eAAe,QAAQ;OACvC,CAAC,IAAI,EAAE,EACR,UAAU,EAAE,EAAE,IACd;IACJ,CAAC;CACF;AAzKD,0CAyKC"}
|
package/package.json
CHANGED
|
@@ -58,7 +58,15 @@ export class UpsertBuilder {
|
|
|
58
58
|
register<T extends string>(
|
|
59
59
|
tableName: string,
|
|
60
60
|
row: {
|
|
61
|
-
[key in T]?:
|
|
61
|
+
[key in T]?:
|
|
62
|
+
| UBRef
|
|
63
|
+
| string
|
|
64
|
+
| number
|
|
65
|
+
| boolean
|
|
66
|
+
| bigint
|
|
67
|
+
| null
|
|
68
|
+
| object
|
|
69
|
+
| unknown;
|
|
62
70
|
}
|
|
63
71
|
): UBRef {
|
|
64
72
|
const table = this.getTable(tableName);
|
|
@@ -97,9 +105,9 @@ export class UpsertBuilder {
|
|
|
97
105
|
rowValue.use ??= "id";
|
|
98
106
|
table.references.add(rowValue.of + "." + rowValue.use);
|
|
99
107
|
r[rowKey] = rowValue;
|
|
100
|
-
} else if (typeof rowValue === "object"
|
|
108
|
+
} else if (typeof rowValue === "object") {
|
|
101
109
|
// object인 경우 JSON으로 변환
|
|
102
|
-
r[rowKey] = JSON.stringify(rowValue);
|
|
110
|
+
r[rowKey] = rowValue === null ? null : JSON.stringify(rowValue);
|
|
103
111
|
} else {
|
|
104
112
|
r[rowKey] = rowValue;
|
|
105
113
|
}
|
|
@@ -40,9 +40,7 @@ import {
|
|
|
40
40
|
import {
|
|
41
41
|
${names.camel}SubsetQueries,
|
|
42
42
|
} from "../sonamu.generated.sso";
|
|
43
|
-
import { ${entityId}ListParams, ${entityId}SaveParams } from "./${
|
|
44
|
-
names.fs
|
|
45
|
-
}.types";
|
|
43
|
+
import { ${entityId}ListParams, ${entityId}SaveParams } from "./${names.fs}.types";
|
|
46
44
|
|
|
47
45
|
/*
|
|
48
46
|
${entityId} Model
|
|
@@ -80,9 +78,7 @@ class ${entityId}ModelClass extends BaseModelClass {
|
|
|
80
78
|
return rows[0] ?? null;
|
|
81
79
|
}
|
|
82
80
|
|
|
83
|
-
@api({ httpMethod: "GET", clients: ["axios", "swr"], resourceName: "${
|
|
84
|
-
names.capitalPlural
|
|
85
|
-
}" })
|
|
81
|
+
@api({ httpMethod: "GET", clients: ["axios", "swr"], resourceName: "${names.capitalPlural}" })
|
|
86
82
|
async findMany<T extends ${entityId}SubsetKey>(
|
|
87
83
|
subset: T,
|
|
88
84
|
params: ${entityId}ListParams = {}
|
|
@@ -112,9 +108,7 @@ class ${entityId}ModelClass extends BaseModelClass {
|
|
|
112
108
|
if (params.search === "id") {
|
|
113
109
|
qb.where("${entity.table}.id", params.keyword);
|
|
114
110
|
// } else if (params.search === "field") {
|
|
115
|
-
// qb.where("${
|
|
116
|
-
entity.table
|
|
117
|
-
}.field", "like", \`%\${params.keyword}%\`);
|
|
111
|
+
// qb.where("${entity.table}.field", "like", \`%\${params.keyword}%\`);
|
|
118
112
|
} else {
|
|
119
113
|
throw new BadRequestException(
|
|
120
114
|
\`구현되지 않은 검색 필드 \${params.search}\`
|
|
@@ -142,34 +136,15 @@ class ${entityId}ModelClass extends BaseModelClass {
|
|
|
142
136
|
|
|
143
137
|
@api({ httpMethod: "POST" })
|
|
144
138
|
async save(
|
|
145
|
-
|
|
139
|
+
spa: ${entityId}SaveParams[]
|
|
146
140
|
): Promise<number[]> {
|
|
147
141
|
const wdb = this.getDB("w");
|
|
148
142
|
const ub = this.getUpsertBuilder();
|
|
149
143
|
|
|
150
144
|
// register
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
return `saveParamsArray.map((saveParams) => {
|
|
155
|
-
ub.register("${entity.table}", saveParams);
|
|
156
|
-
});`;
|
|
157
|
-
} else {
|
|
158
|
-
return `saveParamsArray.map(({${jsonProps
|
|
159
|
-
.map((prop) => prop.name)
|
|
160
|
-
.join(", ")}, ...saveParams}) => {
|
|
161
|
-
ub.register("${entity.table}", {
|
|
162
|
-
${jsonProps
|
|
163
|
-
.map(
|
|
164
|
-
(prop) =>
|
|
165
|
-
`${prop.name}: ${prop.name} === null ? null : JSON.stringify(${prop.name}),`
|
|
166
|
-
)
|
|
167
|
-
.join(",\n")}
|
|
168
|
-
...saveParams
|
|
169
|
-
});
|
|
170
|
-
});`;
|
|
171
|
-
}
|
|
172
|
-
})()}
|
|
145
|
+
spa.map((sp) => {
|
|
146
|
+
ub.register("${entity.table}", sp);
|
|
147
|
+
});
|
|
173
148
|
|
|
174
149
|
// transaction
|
|
175
150
|
return wdb.transaction(async (trx) => {
|