prostgles-server 4.2.8 → 4.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/DboBuilder/TableHandler/DataValidator.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/DataValidator.js +3 -1
- package/dist/DboBuilder/TableHandler/DataValidator.js.map +1 -1
- package/lib/DboBuilder/TableHandler/DataValidator.ts +3 -1
- package/package.json +1 -1
- package/tests/client_only_queries.ts +1 -1
- package/tests/server/package-lock.json +1 -1
- package/tests/server/testPublish.ts +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataValidator.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/DataValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAA+F,MAAM,sBAAsB,CAAC;AAC1J,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAO,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAI/D,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,iBAAiB,CAAC;IAC1B,UAAU,EAAE,GAAG,CAAC;CACjB,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,GAAG,EAAE,CAAC;CACb,CAAA;AACD,KAAK,YAAY,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;AAE7D,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B,iBAAiB,EAAE;QACjB,WAAW,EAAE,SAAS,GAAG,WAAW,CAAC;QACrC,QAAQ,EAAE,SAAS,GAAG,gBAAgB,CAAC;KACxC,CAAA;CACF,CAAA;AAED,qBAAa,aAAa;IACxB,YAAY,CAAC,EAAE,YAAY,EAAE,EAAE,CAAC;IAChC,kBAAkB,CAAC,EAAE,kBAAkB,EAAE,EAAE,CAAC;IAC5C,YAAY,EAAE,YAAY,CAAC;gBACf,YAAY,EAAE,YAAY;IAItC,KAAK,SAAgB,aAAa;;;;;;OAcjC;CACF;AA2DD;;;;GAIG;AACH,eAAO,MAAM,cAAc,+FAA8G,eAAe;;;EA0BvJ,CAAA;
|
|
1
|
+
{"version":3,"file":"DataValidator.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/DataValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAA+F,MAAM,sBAAsB,CAAC;AAC1J,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAO,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAI/D,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,iBAAiB,CAAC;IAC1B,UAAU,EAAE,GAAG,CAAC;CACjB,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,GAAG,EAAE,CAAC;CACb,CAAA;AACD,KAAK,YAAY,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;AAE7D,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B,iBAAiB,EAAE;QACjB,WAAW,EAAE,SAAS,GAAG,WAAW,CAAC;QACrC,QAAQ,EAAE,SAAS,GAAG,gBAAgB,CAAC;KACxC,CAAA;CACF,CAAA;AAED,qBAAa,aAAa;IACxB,YAAY,CAAC,EAAE,YAAY,EAAE,EAAE,CAAC;IAChC,kBAAkB,CAAC,EAAE,kBAAkB,EAAE,EAAE,CAAC;IAC5C,YAAY,EAAE,YAAY,CAAC;gBACf,YAAY,EAAE,YAAY;IAItC,KAAK,SAAgB,aAAa;;;;;;OAcjC;CACF;AA2DD;;;;GAIG;AACH,eAAO,MAAM,cAAc,+FAA8G,eAAe;;;EA0BvJ,CAAA;AA6LD,qBAAa,MAAM;IACjB,IAAI,EAAE;QACJ,OAAO,EAAE,UAAU,EAAE,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;gBAEU,OAAO,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM;CA8ErD"}
|
|
@@ -114,14 +114,16 @@ const getValidatedRowFieldData = async ({ allowedCols, rows, validationOptions,
|
|
|
114
114
|
}
|
|
115
115
|
const rowFieldData = await Promise.all(rows.map(async (nonvalidatedRow) => {
|
|
116
116
|
let row = (0, dist_1.pickKeys)(nonvalidatedRow, allowedCols);
|
|
117
|
+
const initialRowKeys = Object.keys(row);
|
|
117
118
|
if (validationOptions.validate) {
|
|
118
119
|
if (!validationOptions.localParams) {
|
|
119
120
|
throw "localParams missing for validate";
|
|
120
121
|
}
|
|
121
122
|
row = await validationOptions.validate({ row, dbx: dbTx, localParams: validationOptions.localParams });
|
|
122
123
|
}
|
|
124
|
+
const keysAddedDuringValidate = Object.keys(row).filter(newKey => !initialRowKeys.includes(newKey));
|
|
123
125
|
const getColumn = (fieldName) => {
|
|
124
|
-
if (!allowedCols.includes(fieldName)) {
|
|
126
|
+
if (!allowedCols.concat(keysAddedDuringValidate).includes(fieldName)) {
|
|
125
127
|
throw `Unexpected/Dissallowed column name: ${fieldName}`;
|
|
126
128
|
}
|
|
127
129
|
const column = tableHandler.columns.find(c => c.name === fieldName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataValidator.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/DataValidator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DataValidator.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/DataValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -168,15 +168,17 @@ const getValidatedRowFieldData = async ({ allowedCols, rows, validationOptions,
|
|
|
168
168
|
rows.map(async nonvalidatedRow => {
|
|
169
169
|
|
|
170
170
|
let row = pickKeys(nonvalidatedRow, allowedCols);
|
|
171
|
+
const initialRowKeys = Object.keys(row);
|
|
171
172
|
if (validationOptions.validate) {
|
|
172
173
|
if(!validationOptions.localParams){
|
|
173
174
|
throw "localParams missing for validate";
|
|
174
175
|
}
|
|
175
176
|
row = await validationOptions.validate({ row, dbx: dbTx, localParams: validationOptions.localParams });
|
|
176
177
|
}
|
|
178
|
+
const keysAddedDuringValidate = Object.keys(row).filter(newKey => !initialRowKeys.includes(newKey));
|
|
177
179
|
|
|
178
180
|
const getColumn = (fieldName: string) => {
|
|
179
|
-
if (!allowedCols.includes(fieldName)) {
|
|
181
|
+
if (!allowedCols.concat(keysAddedDuringValidate).includes(fieldName)) {
|
|
180
182
|
throw `Unexpected/Dissallowed column name: ${fieldName}`;
|
|
181
183
|
}
|
|
182
184
|
const column = tableHandler.columns.find(c => c.name === fieldName);
|
package/package.json
CHANGED
|
@@ -477,7 +477,7 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
|
|
|
477
477
|
]);
|
|
478
478
|
|
|
479
479
|
const cols = await db.insert_rules.getColumns!();
|
|
480
|
-
assert.equal(cols.filter(({ insert, update: u, select: s, delete: d }) => insert && !u && s && !d).length,
|
|
480
|
+
assert.equal(cols.filter(({ insert, update: u, select: s, delete: d }) => insert && !u && s && !d).length, 2, "Validated getColumns failed")
|
|
481
481
|
|
|
482
482
|
/* Validated insert */
|
|
483
483
|
const expectB = await db.insert_rules.insert!({ name: "a" }, { returning: "*" });
|
|
@@ -93,10 +93,11 @@ export const testPublish: Publish<DBSchemaGenerated> = async ({ user, sid }) =>
|
|
|
93
93
|
insert_rules: {
|
|
94
94
|
select: "*",
|
|
95
95
|
insert: {
|
|
96
|
-
fields:
|
|
96
|
+
fields: { added: 0 },
|
|
97
97
|
returningFields: { name: 1 },
|
|
98
98
|
validate: async ({ row }) => {
|
|
99
|
-
if(row.name === "a") row.name = "b"
|
|
99
|
+
if(row.name === "a") row.name = "b";
|
|
100
|
+
row.added = (new Date()).toUTCString();
|
|
100
101
|
return row
|
|
101
102
|
},
|
|
102
103
|
checkFilter: {
|