prostgles-server 2.0.20 → 2.0.21
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/TableConfig.js +1 -1
- package/dist/TableConfig.js.map +1 -1
- package/lib/TableConfig.ts +1 -1
- package/package.json +1 -1
- package/tests/server/DBoGenerated.d.ts +20 -1
- package/tests/server/index.js +24 -0
- package/tests/server/index.ts +24 -1
- package/tests/server/media/{36622e06-267e-459c-9824-6dfaa506ab6b.txt → 70c6fcb2-d6e4-454d-9558-523be0fb6c66.txt} +0 -0
- package/tests/server/media/{3736d339-2752-41d6-873e-ed4cf93ff302.txt → 8c51eef5-4b03-4265-96fa-6c285efefc8b.txt} +0 -0
- package/tests/server/media/{d35b02fa-d381-4159-a9fa-897a424a81f4.txt → 90463373-406a-4808-a94d-efd1a92d4c53.txt} +0 -0
- package/tests/server/media/{d77b688d-87a6-40c0-9970-8999d20391b0.txt → c855dc0b-60d0-48cd-9665-fbcdf822fa28.txt} +0 -0
- package/tests/server/package-lock.json +1 -1
package/dist/TableConfig.js
CHANGED
|
@@ -48,7 +48,7 @@ class TableConfigurator {
|
|
|
48
48
|
yield Promise.all(Object.keys(tConf).map((colName) => __awaiter(this, void 0, void 0, function* () {
|
|
49
49
|
var _d;
|
|
50
50
|
const colConf = tConf[colName];
|
|
51
|
-
const { firstValueAsDefault, values, nullable } = colConf.lookupValues;
|
|
51
|
+
const { firstValueAsDefault, values, nullable } = colConf.lookupValues || {};
|
|
52
52
|
if (values === null || values === void 0 ? void 0 : values.length) {
|
|
53
53
|
const keys = Object.keys(((_d = values[0]) === null || _d === void 0 ? void 0 : _d.i18n) || {});
|
|
54
54
|
const lookup_table_name = yield FileManager_1.asSQLIdentifier(`lookup_${tableName}_${colName}`, this.db);
|
package/dist/TableConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableConfig.js","sourceRoot":"","sources":["../lib/TableConfig.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qDAAoD;AAEpD,+CAAgD;AAEhD,mDAA0C;AAqC1C;;GAEG;AACH,MAAqB,iBAAiB;IAQlC,YAAY,SAAoB;QAOhC,eAAU,GAAG,CAAC,MAAoC,EAA4B,EAAE;;YAC5E,mBAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,0CAAG,MAAM,CAAC,GAAG,2CAAG,IAAI,CAAC;QACzD,CAAC,CAAA;QAED,gBAAW,GAAG,CAAC,MAAiD,EAAQ,EAAE;YACtE,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACrC,IAAG,IAAI,EAAC;gBACJ,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;gBACzB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;gBAC1B,IAAG,GAAG,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,GAAG,GAAG;oBAAE,MAAM,GAAG,MAAM,CAAC,GAAG,sBAAsB,GAAG,EAAE,CAAA;gBAC1G,IAAG,GAAG,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,GAAG,GAAG;oBAAE,MAAM,GAAG,MAAM,CAAC,GAAG,yBAAyB,GAAG,EAAE,CAAA;aAChH;QACL,CAAC,CAAA;QAlBG,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC;QACzC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC;QACzB,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAgBK,IAAI;;YACN,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAM,SAAS,EAAC,EAAE;;gBAC7D,IAAG,QAAC,IAAI,CAAC,GAAG,0CAAG,SAAS,EAAC;oBAAC,MAAM,mBAAmB,GAAG,SAAS,CAAC;gBAEhE,MAAM,KAAK,eAAG,IAAI,CAAC,GAAG,0CAAG,SAAS,2CAAG,OAAO,CAAC;gBAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAErC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAM,OAAO,EAAC,EAAE;;oBACrD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC/B,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"TableConfig.js","sourceRoot":"","sources":["../lib/TableConfig.ts"],"names":[],"mappings":"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"}
|
package/lib/TableConfig.ts
CHANGED
|
@@ -80,7 +80,7 @@ export default class TableConfigurator {
|
|
|
80
80
|
|
|
81
81
|
await Promise.all(Object.keys(tConf).map(async colName => {
|
|
82
82
|
const colConf = tConf[colName];
|
|
83
|
-
const { firstValueAsDefault, values, nullable } = colConf.lookupValues
|
|
83
|
+
const { firstValueAsDefault, values, nullable } = colConf.lookupValues || {}
|
|
84
84
|
|
|
85
85
|
if(values?.length){
|
|
86
86
|
|
package/package.json
CHANGED
|
@@ -101,6 +101,12 @@ export type Lookup_status = {
|
|
|
101
101
|
"en"?: string;
|
|
102
102
|
"fr"?: string;
|
|
103
103
|
}
|
|
104
|
+
export type Lookup_uuid_text_col1 = {
|
|
105
|
+
"id"?: string;
|
|
106
|
+
}
|
|
107
|
+
export type Lookup_uuid_text_col2 = {
|
|
108
|
+
"id"?: string;
|
|
109
|
+
}
|
|
104
110
|
export type Media = {
|
|
105
111
|
"id"?: string;
|
|
106
112
|
"name"?: string;
|
|
@@ -196,6 +202,8 @@ export type Usr = {
|
|
|
196
202
|
export type Uuid_text = {
|
|
197
203
|
"id"?: string;
|
|
198
204
|
"name"?: string;
|
|
205
|
+
"col1"?: string;
|
|
206
|
+
"col2"?: string;
|
|
199
207
|
}
|
|
200
208
|
export type V_items = {
|
|
201
209
|
"id"?: number;
|
|
@@ -222,6 +230,8 @@ export type JoinMakerTables = {
|
|
|
222
230
|
"items_with_one_media": JoinMaker<Items_with_one_media>;
|
|
223
231
|
"lookup_experience_types": JoinMaker<Lookup_experience_types>;
|
|
224
232
|
"lookup_status": JoinMaker<Lookup_status>;
|
|
233
|
+
"lookup_uuid_text_col1": JoinMaker<Lookup_uuid_text_col1>;
|
|
234
|
+
"lookup_uuid_text_col2": JoinMaker<Lookup_uuid_text_col2>;
|
|
225
235
|
"media": JoinMaker<Media>;
|
|
226
236
|
"prostgles_lookup_media_items_m1": JoinMaker<Prostgles_lookup_media_items_m1>;
|
|
227
237
|
"prostgles_lookup_media_items_with_media": JoinMaker<Prostgles_lookup_media_items_with_media>;
|
|
@@ -234,6 +244,7 @@ export type JoinMakerTables = {
|
|
|
234
244
|
"tt": JoinMaker<Tt>;
|
|
235
245
|
"tt1": JoinMaker<Tt1>;
|
|
236
246
|
"usr": JoinMaker<Usr>;
|
|
247
|
+
"uuid_text": JoinMaker<Uuid_text>;
|
|
237
248
|
};
|
|
238
249
|
|
|
239
250
|
/* DBO Definition. Isomorphic */
|
|
@@ -256,6 +267,8 @@ export type DBObj = {
|
|
|
256
267
|
"lookup_items_m1_name_type": TableHandler<Lookup_items_m1_name_type>
|
|
257
268
|
"lookup_settled_status": TableHandler<Lookup_settled_status>
|
|
258
269
|
"lookup_status": TableHandler<Lookup_status>
|
|
270
|
+
"lookup_uuid_text_col1": TableHandler<Lookup_uuid_text_col1>
|
|
271
|
+
"lookup_uuid_text_col2": TableHandler<Lookup_uuid_text_col2>
|
|
259
272
|
"media": TableHandler<Media>
|
|
260
273
|
"planes": TableHandler<Planes>
|
|
261
274
|
"prgll": TableHandler<Prgll>
|
|
@@ -343,6 +356,12 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
|
|
|
343
356
|
"lookup_status": {
|
|
344
357
|
[key in "id" | "en" | "fr"]: { [lang_id in keyof LANG_IDS]: string };
|
|
345
358
|
};
|
|
359
|
+
"lookup_uuid_text_col1": {
|
|
360
|
+
[key in "id"]: { [lang_id in keyof LANG_IDS]: string };
|
|
361
|
+
};
|
|
362
|
+
"lookup_uuid_text_col2": {
|
|
363
|
+
[key in "id"]: { [lang_id in keyof LANG_IDS]: string };
|
|
364
|
+
};
|
|
346
365
|
"media": {
|
|
347
366
|
[key in "id" | "name" | "extension" | "content_type" | "url" | "original_name" | "description" | "s3_url" | "signed_url" | "signed_url_expires" | "etag"]: { [lang_id in keyof LANG_IDS]: string };
|
|
348
367
|
};
|
|
@@ -398,7 +417,7 @@ export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = {
|
|
|
398
417
|
[key in "id" | "status" | "msg" | "added" | "is_active" | "age"]: { [lang_id in keyof LANG_IDS]: string };
|
|
399
418
|
};
|
|
400
419
|
"uuid_text": {
|
|
401
|
-
[key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string };
|
|
420
|
+
[key in "id" | "name" | "col1" | "col2"]: { [lang_id in keyof LANG_IDS]: string };
|
|
402
421
|
};
|
|
403
422
|
"v_items": {
|
|
404
423
|
[key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string };
|
package/tests/server/index.js
CHANGED
|
@@ -68,6 +68,30 @@ const dbConnection = {
|
|
|
68
68
|
transactions: true,
|
|
69
69
|
// DEBUG_MODE: true,
|
|
70
70
|
// onNotice: console.log,
|
|
71
|
+
tableConfig: {
|
|
72
|
+
uuid_text: {
|
|
73
|
+
col1: {
|
|
74
|
+
lookupValues: {
|
|
75
|
+
values: [
|
|
76
|
+
{ id: "a" },
|
|
77
|
+
{ id: "b" }
|
|
78
|
+
],
|
|
79
|
+
nullable: true,
|
|
80
|
+
firstValueAsDefault: true
|
|
81
|
+
}
|
|
82
|
+
},
|
|
83
|
+
col2: {
|
|
84
|
+
lookupValues: {
|
|
85
|
+
values: [
|
|
86
|
+
{ id: "a" },
|
|
87
|
+
{ id: "b" }
|
|
88
|
+
],
|
|
89
|
+
nullable: true,
|
|
90
|
+
firstValueAsDefault: false
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
},
|
|
71
95
|
fileTable: {
|
|
72
96
|
// awsS3Config: {
|
|
73
97
|
// accessKeyId: process.env.S3_KEY,
|
package/tests/server/index.ts
CHANGED
|
@@ -84,7 +84,30 @@ const dbConnection = {
|
|
|
84
84
|
|
|
85
85
|
// DEBUG_MODE: true,
|
|
86
86
|
// onNotice: console.log,
|
|
87
|
-
|
|
87
|
+
tableConfig: {
|
|
88
|
+
uuid_text: {
|
|
89
|
+
col1: {
|
|
90
|
+
lookupValues: {
|
|
91
|
+
values: [
|
|
92
|
+
{id: "a"},
|
|
93
|
+
{id: "b"}
|
|
94
|
+
],
|
|
95
|
+
nullable: true,
|
|
96
|
+
firstValueAsDefault: true
|
|
97
|
+
}
|
|
98
|
+
},
|
|
99
|
+
col2: {
|
|
100
|
+
lookupValues: {
|
|
101
|
+
values: [
|
|
102
|
+
{id: "a"},
|
|
103
|
+
{id: "b"}
|
|
104
|
+
],
|
|
105
|
+
nullable: true,
|
|
106
|
+
firstValueAsDefault: false
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
},
|
|
88
111
|
fileTable: {
|
|
89
112
|
// awsS3Config: {
|
|
90
113
|
// accessKeyId: process.env.S3_KEY,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|