@payloadcms/db-postgres 0.7.0 → 3.0.0-alpha.19
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/connect.d.ts.map +1 -1
- package/dist/connect.js +30 -40
- package/dist/create.js +6 -21
- package/dist/createGlobal.js +6 -21
- package/dist/createGlobalVersion.js +10 -25
- package/dist/createMigration.js +11 -26
- package/dist/createVersion.js +10 -25
- package/dist/deleteMany.js +8 -23
- package/dist/deleteOne.js +10 -25
- package/dist/deleteVersions.js +10 -25
- package/dist/destroy.js +2 -12
- package/dist/find/buildFindManyArgs.js +6 -14
- package/dist/find/chainMethods.js +2 -11
- package/dist/find/findMany.js +14 -29
- package/dist/find/traverseFields.js +8 -23
- package/dist/find.js +6 -21
- package/dist/findGlobal.js +6 -21
- package/dist/findGlobalVersions.js +8 -23
- package/dist/findOne.js +6 -21
- package/dist/findVersions.js +8 -23
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +76 -88
- package/dist/init.js +17 -32
- package/dist/migrate.d.ts.map +1 -1
- package/dist/migrate.js +15 -33
- package/dist/migrateDown.d.ts.map +1 -1
- package/dist/migrateDown.js +12 -25
- package/dist/migrateFresh.d.ts.map +1 -1
- package/dist/migrateFresh.js +15 -31
- package/dist/migrateRefresh.d.ts.map +1 -1
- package/dist/migrateRefresh.js +18 -29
- package/dist/migrateReset.d.ts.map +1 -1
- package/dist/migrateReset.js +13 -24
- package/dist/migrateStatus.js +9 -19
- package/dist/queries/buildAndOrConditions.js +4 -14
- package/dist/queries/buildQuery.js +10 -20
- package/dist/queries/createJSONQuery/convertPathToJSONTraversal.js +4 -14
- package/dist/queries/createJSONQuery/formatJSONPathSegment.js +2 -12
- package/dist/queries/createJSONQuery/index.js +6 -16
- package/dist/queries/getTableColumnFromPath.js +38 -49
- package/dist/queries/operatorMap.js +17 -27
- package/dist/queries/parseParams.js +32 -42
- package/dist/queries/sanitizeQueryValue.js +8 -18
- package/dist/queryDrafts.js +10 -25
- package/dist/schema/build.js +49 -64
- package/dist/schema/createIndex.js +5 -15
- package/dist/schema/idToUUID.js +2 -12
- package/dist/schema/parentIDColumnMap.js +7 -17
- package/dist/schema/setColumnID.js +10 -20
- package/dist/schema/traverseFields.js +62 -77
- package/dist/schema/validateExistingBlockIsIdentical.js +9 -19
- package/dist/transactions/beginTransaction.js +4 -14
- package/dist/transactions/commitTransaction.js +2 -12
- package/dist/transactions/rollbackTransaction.js +2 -12
- package/dist/transform/read/hasManyNumber.js +2 -12
- package/dist/transform/read/hasManyText.js +2 -12
- package/dist/transform/read/index.js +12 -20
- package/dist/transform/read/relationship.js +2 -12
- package/dist/transform/read/traverseFields.js +15 -23
- package/dist/transform/write/array.js +6 -16
- package/dist/transform/write/blocks.js +6 -21
- package/dist/transform/write/index.js +4 -14
- package/dist/transform/write/numbers.js +2 -12
- package/dist/transform/write/relationships.js +4 -14
- package/dist/transform/write/selects.js +4 -14
- package/dist/transform/write/texts.js +2 -12
- package/dist/transform/write/traverseFields.js +30 -45
- package/dist/transform/write/types.js +2 -5
- package/dist/types.js +2 -5
- package/dist/update.js +11 -26
- package/dist/updateGlobal.js +6 -21
- package/dist/updateGlobalVersion.js +10 -25
- package/dist/updateVersion.js +10 -25
- package/dist/upsertRow/deleteExistingArrayRows.js +5 -15
- package/dist/upsertRow/deleteExistingRowsByPath.js +9 -19
- package/dist/upsertRow/index.d.ts.map +1 -1
- package/dist/upsertRow/index.js +25 -36
- package/dist/upsertRow/insertArrays.js +2 -12
- package/dist/upsertRow/types.js +2 -5
- package/dist/utilities/appendPrefixToKeys.js +2 -12
- package/dist/utilities/createBlocksMap.js +2 -12
- package/dist/utilities/createMigrationTable.js +4 -14
- package/dist/utilities/createRelationshipMap.js +2 -12
- package/dist/utilities/hasLocalesTable.js +5 -15
- package/dist/utilities/isArrayOfRows.js +2 -12
- package/dist/utilities/migrationTableExists.js +4 -14
- package/dist/utilities/parseError.js +6 -14
- package/package.json +6 -6
package/dist/migrateStatus.js
CHANGED
@@ -1,28 +1,18 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
Object.defineProperty(exports, "migrateStatus", {
|
6
|
-
enumerable: true,
|
7
|
-
get: function() {
|
8
|
-
return migrateStatus;
|
9
|
-
}
|
10
|
-
});
|
11
|
-
const _consoletableprinter = require("console-table-printer");
|
12
|
-
const _database = require("payload/database");
|
13
|
-
const _migrationTableExists = require("./utilities/migrationTableExists");
|
14
|
-
async function migrateStatus() {
|
1
|
+
import { Table } from 'console-table-printer';
|
2
|
+
import { getMigrations, readMigrationFiles } from 'payload/database';
|
3
|
+
import { migrationTableExists } from './utilities/migrationTableExists';
|
4
|
+
export async function migrateStatus() {
|
15
5
|
const { payload } = this;
|
16
|
-
const migrationFiles = await
|
6
|
+
const migrationFiles = await readMigrationFiles({
|
17
7
|
payload
|
18
8
|
});
|
19
9
|
payload.logger.debug({
|
20
10
|
msg: `Found ${migrationFiles.length} migration files.`
|
21
11
|
});
|
22
12
|
let existingMigrations = [];
|
23
|
-
const hasMigrationTable = await
|
13
|
+
const hasMigrationTable = await migrationTableExists(this.drizzle);
|
24
14
|
if (hasMigrationTable) {
|
25
|
-
({ existingMigrations } = await
|
15
|
+
({ existingMigrations } = await getMigrations({
|
26
16
|
payload
|
27
17
|
}));
|
28
18
|
}
|
@@ -42,7 +32,7 @@ async function migrateStatus() {
|
|
42
32
|
Ran: existingMigration ? 'Yes' : 'No'
|
43
33
|
};
|
44
34
|
});
|
45
|
-
const p = new
|
35
|
+
const p = new Table();
|
46
36
|
statuses.forEach((s)=>{
|
47
37
|
p.addRow(s, {
|
48
38
|
color: s.Ran === 'Yes' ? 'green' : 'red'
|
@@ -51,4 +41,4 @@ async function migrateStatus() {
|
|
51
41
|
p.printTable();
|
52
42
|
}
|
53
43
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9taWdyYXRlU3RhdHVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRhYmxlIH0gZnJvbSAnY29uc29sZS10YWJsZS1wcmludGVyJ1xuaW1wb3J0IHsgZ2V0TWlncmF0aW9ucywgcmVhZE1pZ3JhdGlvbkZpbGVzIH0gZnJvbSAncGF5bG9hZC9kYXRhYmFzZSdcblxuaW1wb3J0IHR5cGUgeyBQb3N0Z3Jlc0FkYXB0ZXIgfSBmcm9tICcuL3R5cGVzJ1xuXG5pbXBvcnQgeyBtaWdyYXRpb25UYWJsZUV4aXN0cyB9IGZyb20gJy4vdXRpbGl0aWVzL21pZ3JhdGlvblRhYmxlRXhpc3RzJ1xuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gbWlncmF0ZVN0YXR1cyh0aGlzOiBQb3N0Z3Jlc0FkYXB0ZXIpOiBQcm9taXNlPHZvaWQ+IHtcbiAgY29uc3QgeyBwYXlsb2FkIH0gPSB0aGlzXG4gIGNvbnN0IG1pZ3JhdGlvbkZpbGVzID0gYXdhaXQgcmVhZE1pZ3JhdGlvbkZpbGVzKHsgcGF5bG9hZCB9KVxuXG4gIHBheWxvYWQubG9nZ2VyLmRlYnVnKHtcbiAgICBtc2c6IGBGb3VuZCAke21pZ3JhdGlvbkZpbGVzLmxlbmd0aH0gbWlncmF0aW9uIGZpbGVzLmAsXG4gIH0pXG5cbiAgbGV0IGV4aXN0aW5nTWlncmF0aW9ucyA9IFtdXG4gIGNvbnN0IGhhc01pZ3JhdGlvblRhYmxlID0gYXdhaXQgbWlncmF0aW9uVGFibGVFeGlzdHModGhpcy5kcml6emxlKVxuXG4gIGlmIChoYXNNaWdyYXRpb25UYWJsZSkge1xuICAgIDsoeyBleGlzdGluZ01pZ3JhdGlvbnMgfSA9IGF3YWl0IGdldE1pZ3JhdGlvbnMoeyBwYXlsb2FkIH0pKVxuICB9XG5cbiAgaWYgKCFtaWdyYXRpb25GaWxlcy5sZW5ndGgpIHtcbiAgICBwYXlsb2FkLmxvZ2dlci5pbmZvKHsgbXNnOiAnTm8gbWlncmF0aW9ucyBmb3VuZC4nIH0pXG4gICAgcmV0dXJuXG4gIH1cblxuICAvLyBDb21wYXJlIG1pZ3JhdGlvbiBmaWxlcyB0byBleGlzdGluZyBtaWdyYXRpb25zXG4gIGNvbnN0IHN0YXR1c2VzID0gbWlncmF0aW9uRmlsZXMubWFwKChtaWdyYXRpb24pID0+IHtcbiAgICBjb25zdCBleGlzdGluZ01pZ3JhdGlvbiA9IGV4aXN0aW5nTWlncmF0aW9ucy5maW5kKChtKSA9PiBtLm5hbWUgPT09IG1pZ3JhdGlvbi5uYW1lKVxuICAgIHJldHVybiB7XG4gICAgICBOYW1lOiBtaWdyYXRpb24ubmFtZSxcbiAgICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBwZXJmZWN0aW9uaXN0L3NvcnQtb2JqZWN0c1xuICAgICAgQmF0Y2g6IGV4aXN0aW5nTWlncmF0aW9uPy5iYXRjaCxcbiAgICAgIFJhbjogZXhpc3RpbmdNaWdyYXRpb24gPyAnWWVzJyA6ICdObycsXG4gICAgfVxuICB9KVxuXG4gIGNvbnN0IHAgPSBuZXcgVGFibGUoKVxuXG4gIHN0YXR1c2VzLmZvckVhY2goKHMpID0+
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9taWdyYXRlU3RhdHVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRhYmxlIH0gZnJvbSAnY29uc29sZS10YWJsZS1wcmludGVyJ1xuaW1wb3J0IHsgZ2V0TWlncmF0aW9ucywgcmVhZE1pZ3JhdGlvbkZpbGVzIH0gZnJvbSAncGF5bG9hZC9kYXRhYmFzZSdcblxuaW1wb3J0IHR5cGUgeyBQb3N0Z3Jlc0FkYXB0ZXIgfSBmcm9tICcuL3R5cGVzJ1xuXG5pbXBvcnQgeyBtaWdyYXRpb25UYWJsZUV4aXN0cyB9IGZyb20gJy4vdXRpbGl0aWVzL21pZ3JhdGlvblRhYmxlRXhpc3RzJ1xuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gbWlncmF0ZVN0YXR1cyh0aGlzOiBQb3N0Z3Jlc0FkYXB0ZXIpOiBQcm9taXNlPHZvaWQ+IHtcbiAgY29uc3QgeyBwYXlsb2FkIH0gPSB0aGlzXG4gIGNvbnN0IG1pZ3JhdGlvbkZpbGVzID0gYXdhaXQgcmVhZE1pZ3JhdGlvbkZpbGVzKHsgcGF5bG9hZCB9KVxuXG4gIHBheWxvYWQubG9nZ2VyLmRlYnVnKHtcbiAgICBtc2c6IGBGb3VuZCAke21pZ3JhdGlvbkZpbGVzLmxlbmd0aH0gbWlncmF0aW9uIGZpbGVzLmAsXG4gIH0pXG5cbiAgbGV0IGV4aXN0aW5nTWlncmF0aW9ucyA9IFtdXG4gIGNvbnN0IGhhc01pZ3JhdGlvblRhYmxlID0gYXdhaXQgbWlncmF0aW9uVGFibGVFeGlzdHModGhpcy5kcml6emxlKVxuXG4gIGlmIChoYXNNaWdyYXRpb25UYWJsZSkge1xuICAgIDsoeyBleGlzdGluZ01pZ3JhdGlvbnMgfSA9IGF3YWl0IGdldE1pZ3JhdGlvbnMoeyBwYXlsb2FkIH0pKVxuICB9XG5cbiAgaWYgKCFtaWdyYXRpb25GaWxlcy5sZW5ndGgpIHtcbiAgICBwYXlsb2FkLmxvZ2dlci5pbmZvKHsgbXNnOiAnTm8gbWlncmF0aW9ucyBmb3VuZC4nIH0pXG4gICAgcmV0dXJuXG4gIH1cblxuICAvLyBDb21wYXJlIG1pZ3JhdGlvbiBmaWxlcyB0byBleGlzdGluZyBtaWdyYXRpb25zXG4gIGNvbnN0IHN0YXR1c2VzID0gbWlncmF0aW9uRmlsZXMubWFwKChtaWdyYXRpb24pID0+IHtcbiAgICBjb25zdCBleGlzdGluZ01pZ3JhdGlvbiA9IGV4aXN0aW5nTWlncmF0aW9ucy5maW5kKChtKSA9PiBtLm5hbWUgPT09IG1pZ3JhdGlvbi5uYW1lKVxuICAgIHJldHVybiB7XG4gICAgICBOYW1lOiBtaWdyYXRpb24ubmFtZSxcbiAgICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBwZXJmZWN0aW9uaXN0L3NvcnQtb2JqZWN0c1xuICAgICAgQmF0Y2g6IGV4aXN0aW5nTWlncmF0aW9uPy5iYXRjaCxcbiAgICAgIFJhbjogZXhpc3RpbmdNaWdyYXRpb24gPyAnWWVzJyA6ICdObycsXG4gICAgfVxuICB9KVxuXG4gIGNvbnN0IHAgPSBuZXcgVGFibGUoKVxuXG4gIHN0YXR1c2VzLmZvckVhY2goKHMpID0+IHtcbiAgICBwLmFkZFJvdyhzLCB7XG4gICAgICBjb2xvcjogcy5SYW4gPT09ICdZZXMnID8gJ2dyZWVuJyA6ICdyZWQnLFxuICAgIH0pXG4gIH0pXG4gIHAucHJpbnRUYWJsZSgpXG59XG4iXSwibmFtZXMiOlsiVGFibGUiLCJnZXRNaWdyYXRpb25zIiwicmVhZE1pZ3JhdGlvbkZpbGVzIiwibWlncmF0aW9uVGFibGVFeGlzdHMiLCJtaWdyYXRlU3RhdHVzIiwicGF5bG9hZCIsIm1pZ3JhdGlvbkZpbGVzIiwibG9nZ2VyIiwiZGVidWciLCJtc2ciLCJsZW5ndGgiLCJleGlzdGluZ01pZ3JhdGlvbnMiLCJoYXNNaWdyYXRpb25UYWJsZSIsImRyaXp6bGUiLCJpbmZvIiwic3RhdHVzZXMiLCJtYXAiLCJtaWdyYXRpb24iLCJleGlzdGluZ01pZ3JhdGlvbiIsImZpbmQiLCJtIiwibmFtZSIsIk5hbWUiLCJCYXRjaCIsImJhdGNoIiwiUmFuIiwicCIsImZvckVhY2giLCJzIiwiYWRkUm93IiwiY29sb3IiLCJwcmludFRhYmxlIl0sIm1hcHBpbmdzIjoiQUFBQSxTQUFTQSxLQUFLLFFBQVEsd0JBQXVCO0FBQzdDLFNBQVNDLGFBQWEsRUFBRUMsa0JBQWtCLFFBQVEsbUJBQWtCO0FBSXBFLFNBQVNDLG9CQUFvQixRQUFRLG1DQUFrQztBQUV2RSxPQUFPLGVBQWVDO0lBQ3BCLE1BQU0sRUFBRUMsT0FBTyxFQUFFLEdBQUcsSUFBSTtJQUN4QixNQUFNQyxpQkFBaUIsTUFBTUosbUJBQW1CO1FBQUVHO0lBQVE7SUFFMURBLFFBQVFFLE1BQU0sQ0FBQ0MsS0FBSyxDQUFDO1FBQ25CQyxLQUFLLENBQUMsTUFBTSxFQUFFSCxlQUFlSSxNQUFNLENBQUMsaUJBQWlCLENBQUM7SUFDeEQ7SUFFQSxJQUFJQyxxQkFBcUIsRUFBRTtJQUMzQixNQUFNQyxvQkFBb0IsTUFBTVQscUJBQXFCLElBQUksQ0FBQ1UsT0FBTztJQUVqRSxJQUFJRCxtQkFBbUI7UUFDbkIsQ0FBQSxFQUFFRCxrQkFBa0IsRUFBRSxHQUFHLE1BQU1WLGNBQWM7WUFBRUk7UUFBUSxFQUFDO0lBQzVEO0lBRUEsSUFBSSxDQUFDQyxlQUFlSSxNQUFNLEVBQUU7UUFDMUJMLFFBQVFFLE1BQU0sQ0FBQ08sSUFBSSxDQUFDO1lBQUVMLEtBQUs7UUFBdUI7UUFDbEQ7SUFDRjtJQUVBLGlEQUFpRDtJQUNqRCxNQUFNTSxXQUFXVCxlQUFlVSxHQUFHLENBQUMsQ0FBQ0M7UUFDbkMsTUFBTUMsb0JBQW9CUCxtQkFBbUJRLElBQUksQ0FBQyxDQUFDQyxJQUFNQSxFQUFFQyxJQUFJLEtBQUtKLFVBQVVJLElBQUk7UUFDbEYsT0FBTztZQUNMQyxNQUFNTCxVQUFVSSxJQUFJO1lBQ3BCLHNEQUFzRDtZQUN0REUsT0FBT0wsbUJBQW1CTTtZQUMxQkMsS0FBS1Asb0JBQW9CLFFBQVE7UUFDbkM7SUFDRjtJQUVBLE1BQU1RLElBQUksSUFBSTFCO0lBRWRlLFNBQVNZLE9BQU8sQ0FBQyxDQUFDQztRQUNoQkYsRUFBRUcsTUFBTSxDQUFDRCxHQUFHO1lBQ1ZFLE9BQU9GLEVBQUVILEdBQUcsS0FBSyxRQUFRLFVBQVU7UUFDckM7SUFDRjtJQUNBQyxFQUFFSyxVQUFVO0FBQ2QifQ==
|
@@ -1,15 +1,5 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
value: true
|
4
|
-
});
|
5
|
-
Object.defineProperty(exports, "buildAndOrConditions", {
|
6
|
-
enumerable: true,
|
7
|
-
get: function() {
|
8
|
-
return buildAndOrConditions;
|
9
|
-
}
|
10
|
-
});
|
11
|
-
const _parseParams = require("./parseParams");
|
12
|
-
async function buildAndOrConditions({ adapter, fields, joinAliases, joins, locale, selectFields, tableName, where }) {
|
1
|
+
import { parseParams } from './parseParams';
|
2
|
+
export async function buildAndOrConditions({ adapter, fields, joinAliases, joins, locale, selectFields, tableName, where }) {
|
13
3
|
const completedConditions = [];
|
14
4
|
// Loop over all AND / OR operations and add them to the AND / OR query param
|
15
5
|
// Operations should come through as an array
|
@@ -18,7 +8,7 @@ async function buildAndOrConditions({ adapter, fields, joinAliases, joins, local
|
|
18
8
|
// If the operation is properly formatted as an object
|
19
9
|
if (typeof condition === 'object') {
|
20
10
|
// eslint-disable-next-line no-await-in-loop
|
21
|
-
const result = await
|
11
|
+
const result = await parseParams({
|
22
12
|
adapter,
|
23
13
|
fields,
|
24
14
|
joinAliases,
|
@@ -36,4 +26,4 @@ async function buildAndOrConditions({ adapter, fields, joinAliases, joins, local
|
|
36
26
|
return completedConditions;
|
37
27
|
}
|
38
28
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWVyaWVzL2J1aWxkQW5kT3JDb25kaXRpb25zLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgU1FMIH0gZnJvbSAnZHJpenpsZS1vcm0nXG5pbXBvcnQgdHlwZSB7IEZpZWxkLCBXaGVyZSB9IGZyb20gJ3BheWxvYWQvdHlwZXMnXG5cbmltcG9ydCB0eXBlIHsgR2VuZXJpY0NvbHVtbiwgUG9zdGdyZXNBZGFwdGVyIH0gZnJvbSAnLi4vdHlwZXMnXG5pbXBvcnQgdHlwZSB7IEJ1aWxkUXVlcnlKb2luQWxpYXNlcywgQnVpbGRRdWVyeUpvaW5zIH0gZnJvbSAnLi9idWlsZFF1ZXJ5J1xuXG5pbXBvcnQgeyBwYXJzZVBhcmFtcyB9IGZyb20gJy4vcGFyc2VQYXJhbXMnXG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBidWlsZEFuZE9yQ29uZGl0aW9ucyh7XG4gIGFkYXB0ZXIsXG4gIGZpZWxkcyxcbiAgam9pbkFsaWFzZXMsXG4gIGpvaW5zLFxuICBsb2NhbGUsXG4gIHNlbGVjdEZpZWxkcyxcbiAgdGFibGVOYW1lLFxuICB3aGVyZSxcbn06IHtcbiAgYWRhcHRlcjogUG9zdGdyZXNBZGFwdGVyXG4gIGNvbGxlY3Rpb25TbHVnPzogc3RyaW5nXG4gIGZpZWxkczogRmllbGRbXVxuICBnbG9iYWxTbHVnPzogc3RyaW5nXG4gIGpvaW5BbGlhc2VzOiBCdWlsZFF1ZXJ5Sm9pbkFsaWFzZXNcbiAgam9pbnM6IEJ1aWxkUXVlcnlKb2luc1xuICBsb2NhbGU/OiBzdHJpbmdcbiAgc2VsZWN0RmllbGRzOiBSZWNvcmQ8c3RyaW5nLCBHZW5lcmljQ29sdW1uPlxuICB0YWJsZU5hbWU6IHN0cmluZ1xuICB3aGVyZTogV2hlcmVbXVxufSk6IFByb21pc2U8U1FMW10+
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWVyaWVzL2J1aWxkQW5kT3JDb25kaXRpb25zLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgU1FMIH0gZnJvbSAnZHJpenpsZS1vcm0nXG5pbXBvcnQgdHlwZSB7IEZpZWxkLCBXaGVyZSB9IGZyb20gJ3BheWxvYWQvdHlwZXMnXG5cbmltcG9ydCB0eXBlIHsgR2VuZXJpY0NvbHVtbiwgUG9zdGdyZXNBZGFwdGVyIH0gZnJvbSAnLi4vdHlwZXMnXG5pbXBvcnQgdHlwZSB7IEJ1aWxkUXVlcnlKb2luQWxpYXNlcywgQnVpbGRRdWVyeUpvaW5zIH0gZnJvbSAnLi9idWlsZFF1ZXJ5J1xuXG5pbXBvcnQgeyBwYXJzZVBhcmFtcyB9IGZyb20gJy4vcGFyc2VQYXJhbXMnXG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBidWlsZEFuZE9yQ29uZGl0aW9ucyh7XG4gIGFkYXB0ZXIsXG4gIGZpZWxkcyxcbiAgam9pbkFsaWFzZXMsXG4gIGpvaW5zLFxuICBsb2NhbGUsXG4gIHNlbGVjdEZpZWxkcyxcbiAgdGFibGVOYW1lLFxuICB3aGVyZSxcbn06IHtcbiAgYWRhcHRlcjogUG9zdGdyZXNBZGFwdGVyXG4gIGNvbGxlY3Rpb25TbHVnPzogc3RyaW5nXG4gIGZpZWxkczogRmllbGRbXVxuICBnbG9iYWxTbHVnPzogc3RyaW5nXG4gIGpvaW5BbGlhc2VzOiBCdWlsZFF1ZXJ5Sm9pbkFsaWFzZXNcbiAgam9pbnM6IEJ1aWxkUXVlcnlKb2luc1xuICBsb2NhbGU/OiBzdHJpbmdcbiAgc2VsZWN0RmllbGRzOiBSZWNvcmQ8c3RyaW5nLCBHZW5lcmljQ29sdW1uPlxuICB0YWJsZU5hbWU6IHN0cmluZ1xuICB3aGVyZTogV2hlcmVbXVxufSk6IFByb21pc2U8U1FMW10+IHtcbiAgY29uc3QgY29tcGxldGVkQ29uZGl0aW9ucyA9IFtdXG4gIC8vIExvb3Agb3ZlciBhbGwgQU5EIC8gT1Igb3BlcmF0aW9ucyBhbmQgYWRkIHRoZW0gdG8gdGhlIEFORCAvIE9SIHF1ZXJ5IHBhcmFtXG4gIC8vIE9wZXJhdGlvbnMgc2hvdWxkIGNvbWUgdGhyb3VnaCBhcyBhbiBhcnJheVxuICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgbm8tcmVzdHJpY3RlZC1zeW50YXhcbiAgZm9yIChjb25zdCBjb25kaXRpb24gb2Ygd2hlcmUpIHtcbiAgICAvLyBJZiB0aGUgb3BlcmF0aW9uIGlzIHByb3Blcmx5IGZvcm1hdHRlZCBhcyBhbiBvYmplY3RcbiAgICBpZiAodHlwZW9mIGNvbmRpdGlvbiA9PT0gJ29iamVjdCcpIHtcbiAgICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBuby1hd2FpdC1pbi1sb29wXG4gICAgICBjb25zdCByZXN1bHQgPSBhd2FpdCBwYXJzZVBhcmFtcyh7XG4gICAgICAgIGFkYXB0ZXIsXG4gICAgICAgIGZpZWxkcyxcbiAgICAgICAgam9pbkFsaWFzZXMsXG4gICAgICAgIGpvaW5zLFxuICAgICAgICBsb2NhbGUsXG4gICAgICAgIHNlbGVjdEZpZWxkcyxcbiAgICAgICAgdGFibGVOYW1lLFxuICAgICAgICB3aGVyZTogY29uZGl0aW9uLFxuICAgICAgfSlcbiAgICAgIGlmIChyZXN1bHQgJiYgT2JqZWN0LmtleXMocmVzdWx0KS5sZW5ndGggPiAwKSB7XG4gICAgICAgIGNvbXBsZXRlZENvbmRpdGlvbnMucHVzaChyZXN1bHQpXG4gICAgICB9XG4gICAgfVxuICB9XG4gIHJldHVybiBjb21wbGV0ZWRDb25kaXRpb25zXG59XG4iXSwibmFtZXMiOlsicGFyc2VQYXJhbXMiLCJidWlsZEFuZE9yQ29uZGl0aW9ucyIsImFkYXB0ZXIiLCJmaWVsZHMiLCJqb2luQWxpYXNlcyIsImpvaW5zIiwibG9jYWxlIiwic2VsZWN0RmllbGRzIiwidGFibGVOYW1lIiwid2hlcmUiLCJjb21wbGV0ZWRDb25kaXRpb25zIiwiY29uZGl0aW9uIiwicmVzdWx0IiwiT2JqZWN0Iiwia2V5cyIsImxlbmd0aCIsInB1c2giXSwibWFwcGluZ3MiOiJBQU1BLFNBQVNBLFdBQVcsUUFBUSxnQkFBZTtBQUUzQyxPQUFPLGVBQWVDLHFCQUFxQixFQUN6Q0MsT0FBTyxFQUNQQyxNQUFNLEVBQ05DLFdBQVcsRUFDWEMsS0FBSyxFQUNMQyxNQUFNLEVBQ05DLFlBQVksRUFDWkMsU0FBUyxFQUNUQyxLQUFLLEVBWU47SUFDQyxNQUFNQyxzQkFBc0IsRUFBRTtJQUM5Qiw2RUFBNkU7SUFDN0UsNkNBQTZDO0lBQzdDLGdEQUFnRDtJQUNoRCxLQUFLLE1BQU1DLGFBQWFGLE1BQU87UUFDN0Isc0RBQXNEO1FBQ3RELElBQUksT0FBT0UsY0FBYyxVQUFVO1lBQ2pDLDRDQUE0QztZQUM1QyxNQUFNQyxTQUFTLE1BQU1aLFlBQVk7Z0JBQy9CRTtnQkFDQUM7Z0JBQ0FDO2dCQUNBQztnQkFDQUM7Z0JBQ0FDO2dCQUNBQztnQkFDQUMsT0FBT0U7WUFDVDtZQUNBLElBQUlDLFVBQVVDLE9BQU9DLElBQUksQ0FBQ0YsUUFBUUcsTUFBTSxHQUFHLEdBQUc7Z0JBQzVDTCxvQkFBb0JNLElBQUksQ0FBQ0o7WUFDM0I7UUFDRjtJQUNGO0lBQ0EsT0FBT0Y7QUFDVCJ9
|
@@ -1,16 +1,6 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
});
|
5
|
-
Object.defineProperty(exports, "default", {
|
6
|
-
enumerable: true,
|
7
|
-
get: function() {
|
8
|
-
return _default;
|
9
|
-
}
|
10
|
-
});
|
11
|
-
const _drizzleorm = require("drizzle-orm");
|
12
|
-
const _getTableColumnFromPath = require("./getTableColumnFromPath");
|
13
|
-
const _parseParams = require("./parseParams");
|
1
|
+
import { asc, desc } from 'drizzle-orm';
|
2
|
+
import { getTableColumnFromPath } from './getTableColumnFromPath';
|
3
|
+
import { parseParams } from './parseParams';
|
14
4
|
const buildQuery = async function buildQuery({ adapter, fields, locale, sort, tableName, where: incomingWhere }) {
|
15
5
|
const selectFields = {
|
16
6
|
id: adapter.tables[tableName].id
|
@@ -25,13 +15,13 @@ const buildQuery = async function buildQuery({ adapter, fields, locale, sort, ta
|
|
25
15
|
let sortPath;
|
26
16
|
if (sort[0] === '-') {
|
27
17
|
sortPath = sort.substring(1);
|
28
|
-
orderBy.order =
|
18
|
+
orderBy.order = desc;
|
29
19
|
} else {
|
30
20
|
sortPath = sort;
|
31
|
-
orderBy.order =
|
21
|
+
orderBy.order = asc;
|
32
22
|
}
|
33
23
|
try {
|
34
|
-
const { columnName: sortTableColumnName, table: sortTable } =
|
24
|
+
const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({
|
35
25
|
adapter,
|
36
26
|
collectionPath: sortPath,
|
37
27
|
fields,
|
@@ -49,7 +39,7 @@ const buildQuery = async function buildQuery({ adapter, fields, locale, sort, ta
|
|
49
39
|
}
|
50
40
|
}
|
51
41
|
if (!orderBy?.column) {
|
52
|
-
orderBy.order =
|
42
|
+
orderBy.order = desc;
|
53
43
|
const createdAt = adapter.tables[tableName]?.createdAt;
|
54
44
|
if (createdAt) {
|
55
45
|
orderBy.column = createdAt;
|
@@ -62,7 +52,7 @@ const buildQuery = async function buildQuery({ adapter, fields, locale, sort, ta
|
|
62
52
|
}
|
63
53
|
let where;
|
64
54
|
if (incomingWhere && Object.keys(incomingWhere).length > 0) {
|
65
|
-
where = await
|
55
|
+
where = await parseParams({
|
66
56
|
adapter,
|
67
57
|
fields,
|
68
58
|
joinAliases,
|
@@ -81,6 +71,6 @@ const buildQuery = async function buildQuery({ adapter, fields, locale, sort, ta
|
|
81
71
|
where
|
82
72
|
};
|
83
73
|
};
|
84
|
-
|
74
|
+
export default buildQuery;
|
85
75
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWVyaWVzL2J1aWxkUXVlcnkudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBTUUwgfSBmcm9tICdkcml6emxlLW9ybSdcbmltcG9ydCB0eXBlIHsgUGdUYWJsZVdpdGhDb2x1bW5zIH0gZnJvbSAnZHJpenpsZS1vcm0vcGctY29yZSdcbmltcG9ydCB0eXBlIHsgRmllbGQsIFdoZXJlIH0gZnJvbSAncGF5bG9hZC90eXBlcydcblxuaW1wb3J0IHsgYXNjLCBkZXNjIH0gZnJvbSAnZHJpenpsZS1vcm0nXG5cbmltcG9ydCB0eXBlIHsgR2VuZXJpY0NvbHVtbiwgR2VuZXJpY1RhYmxlLCBQb3N0Z3Jlc0FkYXB0ZXIgfSBmcm9tICcuLi90eXBlcydcblxuaW1wb3J0IHsgZ2V0VGFibGVDb2x1bW5Gcm9tUGF0aCB9IGZyb20gJy4vZ2V0VGFibGVDb2x1bW5Gcm9tUGF0aCdcbmltcG9ydCB7IHBhcnNlUGFyYW1zIH0gZnJvbSAnLi9wYXJzZVBhcmFtcydcblxuZXhwb3J0IHR5cGUgQnVpbGRRdWVyeUpvaW5zID0gUmVjb3JkPHN0cmluZywgU1FMPlxuXG5leHBvcnQgdHlwZSBCdWlsZFF1ZXJ5Sm9pbkFsaWFzZXMgPSB7XG4gIGNvbmRpdGlvbjogU1FMXG4gIHRhYmxlOiBHZW5lcmljVGFibGUgfCBQZ1RhYmxlV2l0aENvbHVtbnM8YW55PlxufVtdXG5cbnR5cGUgQnVpbGRRdWVyeUFyZ3MgPSB7XG4gIGFkYXB0ZXI6IFBvc3RncmVzQWRhcHRlclxuICBmaWVsZHM6IEZpZWxkW11cbiAgbG9jYWxlPzogc3RyaW5nXG4gIHNvcnQ/OiBzdHJpbmdcbiAgdGFibGVOYW1lOiBzdHJpbmdcbiAgd2hlcmU6IFdoZXJlXG59XG5cbnR5cGUgUmVzdWx0ID0ge1xuICBqb2luQWxpYXNlczogQnVpbGRRdWVyeUpvaW5BbGlhc2VzXG4gIGpvaW5zOiBCdWlsZFF1ZXJ5Sm9pbnNcbiAgb3JkZXJCeToge1xuICAgIGNvbHVtbjogR2VuZXJpY0NvbHVtblxuICAgIG9yZGVyOiB0eXBlb2YgYXNjIHwgdHlwZW9mIGRlc2NcbiAgfVxuICBzZWxlY3RGaWVsZHM6IFJlY29yZDxzdHJpbmcsIEdlbmVyaWNDb2x1bW4+
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWVyaWVzL2J1aWxkUXVlcnkudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgeyBTUUwgfSBmcm9tICdkcml6emxlLW9ybSdcbmltcG9ydCB0eXBlIHsgUGdUYWJsZVdpdGhDb2x1bW5zIH0gZnJvbSAnZHJpenpsZS1vcm0vcGctY29yZSdcbmltcG9ydCB0eXBlIHsgRmllbGQsIFdoZXJlIH0gZnJvbSAncGF5bG9hZC90eXBlcydcblxuaW1wb3J0IHsgYXNjLCBkZXNjIH0gZnJvbSAnZHJpenpsZS1vcm0nXG5cbmltcG9ydCB0eXBlIHsgR2VuZXJpY0NvbHVtbiwgR2VuZXJpY1RhYmxlLCBQb3N0Z3Jlc0FkYXB0ZXIgfSBmcm9tICcuLi90eXBlcydcblxuaW1wb3J0IHsgZ2V0VGFibGVDb2x1bW5Gcm9tUGF0aCB9IGZyb20gJy4vZ2V0VGFibGVDb2x1bW5Gcm9tUGF0aCdcbmltcG9ydCB7IHBhcnNlUGFyYW1zIH0gZnJvbSAnLi9wYXJzZVBhcmFtcydcblxuZXhwb3J0IHR5cGUgQnVpbGRRdWVyeUpvaW5zID0gUmVjb3JkPHN0cmluZywgU1FMPlxuXG5leHBvcnQgdHlwZSBCdWlsZFF1ZXJ5Sm9pbkFsaWFzZXMgPSB7XG4gIGNvbmRpdGlvbjogU1FMXG4gIHRhYmxlOiBHZW5lcmljVGFibGUgfCBQZ1RhYmxlV2l0aENvbHVtbnM8YW55PlxufVtdXG5cbnR5cGUgQnVpbGRRdWVyeUFyZ3MgPSB7XG4gIGFkYXB0ZXI6IFBvc3RncmVzQWRhcHRlclxuICBmaWVsZHM6IEZpZWxkW11cbiAgbG9jYWxlPzogc3RyaW5nXG4gIHNvcnQ/OiBzdHJpbmdcbiAgdGFibGVOYW1lOiBzdHJpbmdcbiAgd2hlcmU6IFdoZXJlXG59XG5cbnR5cGUgUmVzdWx0ID0ge1xuICBqb2luQWxpYXNlczogQnVpbGRRdWVyeUpvaW5BbGlhc2VzXG4gIGpvaW5zOiBCdWlsZFF1ZXJ5Sm9pbnNcbiAgb3JkZXJCeToge1xuICAgIGNvbHVtbjogR2VuZXJpY0NvbHVtblxuICAgIG9yZGVyOiB0eXBlb2YgYXNjIHwgdHlwZW9mIGRlc2NcbiAgfVxuICBzZWxlY3RGaWVsZHM6IFJlY29yZDxzdHJpbmcsIEdlbmVyaWNDb2x1bW4+XG4gIHdoZXJlOiBTUUxcbn1cbmNvbnN0IGJ1aWxkUXVlcnkgPSBhc3luYyBmdW5jdGlvbiBidWlsZFF1ZXJ5KHtcbiAgYWRhcHRlcixcbiAgZmllbGRzLFxuICBsb2NhbGUsXG4gIHNvcnQsXG4gIHRhYmxlTmFtZSxcbiAgd2hlcmU6IGluY29taW5nV2hlcmUsXG59OiBCdWlsZFF1ZXJ5QXJncyk6IFByb21pc2U8UmVzdWx0PiB7XG4gIGNvbnN0IHNlbGVjdEZpZWxkczogUmVjb3JkPHN0cmluZywgR2VuZXJpY0NvbHVtbj4gPSB7XG4gICAgaWQ6IGFkYXB0ZXIudGFibGVzW3RhYmxlTmFtZV0uaWQsXG4gIH1cbiAgY29uc3Qgam9pbnM6IEJ1aWxkUXVlcnlKb2lucyA9IHt9XG4gIGNvbnN0IGpvaW5BbGlhc2VzOiBCdWlsZFF1ZXJ5Sm9pbkFsaWFzZXMgPSBbXVxuXG4gIGNvbnN0IG9yZGVyQnk6IFJlc3VsdFsnb3JkZXJCeSddID0ge1xuICAgIGNvbHVtbjogbnVsbCxcbiAgICBvcmRlcjogbnVsbCxcbiAgfVxuXG4gIGlmIChzb3J0KSB7XG4gICAgbGV0IHNvcnRQYXRoXG5cbiAgICBpZiAoc29ydFswXSA9PT0gJy0nKSB7XG4gICAgICBzb3J0UGF0aCA9IHNvcnQuc3Vic3RyaW5nKDEpXG4gICAgICBvcmRlckJ5Lm9yZGVyID0gZGVzY1xuICAgIH0gZWxzZSB7XG4gICAgICBzb3J0UGF0aCA9IHNvcnRcbiAgICAgIG9yZGVyQnkub3JkZXIgPSBhc2NcbiAgICB9XG5cbiAgICB0cnkge1xuICAgICAgY29uc3QgeyBjb2x1bW5OYW1lOiBzb3J0VGFibGVDb2x1bW5OYW1lLCB0YWJsZTogc29ydFRhYmxlIH0gPSBnZXRUYWJsZUNvbHVtbkZyb21QYXRoKHtcbiAgICAgICAgYWRhcHRlcixcbiAgICAgICAgY29sbGVjdGlvblBhdGg6IHNvcnRQYXRoLFxuICAgICAgICBmaWVsZHMsXG4gICAgICAgIGpvaW5BbGlhc2VzLFxuICAgICAgICBqb2lucyxcbiAgICAgICAgbG9jYWxlLFxuICAgICAgICBwYXRoU2VnbWVudHM6IHNvcnRQYXRoLnJlcGxhY2UoL19fL2csICcuJykuc3BsaXQoJy4nKSxcbiAgICAgICAgc2VsZWN0RmllbGRzLFxuICAgICAgICB0YWJsZU5hbWUsXG4gICAgICAgIHZhbHVlOiBzb3J0UGF0aCxcbiAgICAgIH0pXG4gICAgICBvcmRlckJ5LmNvbHVtbiA9IHNvcnRUYWJsZT8uW3NvcnRUYWJsZUNvbHVtbk5hbWVdXG4gICAgfSBjYXRjaCAoZXJyKSB7XG4gICAgICAvLyBjb250aW51ZVxuICAgIH1cbiAgfVxuXG4gIGlmICghb3JkZXJCeT8uY29sdW1uKSB7XG4gICAgb3JkZXJCeS5vcmRlciA9IGRlc2NcbiAgICBjb25zdCBjcmVhdGVkQXQgPSBhZGFwdGVyLnRhYmxlc1t0YWJsZU5hbWVdPy5jcmVhdGVkQXRcblxuICAgIGlmIChjcmVhdGVkQXQpIHtcbiAgICAgIG9yZGVyQnkuY29sdW1uID0gY3JlYXRlZEF0XG4gICAgfSBlbHNlIHtcbiAgICAgIG9yZGVyQnkuY29sdW1uID0gYWRhcHRlci50YWJsZXNbdGFibGVOYW1lXS5pZFxuICAgIH1cbiAgfVxuXG4gIGlmIChvcmRlckJ5LmNvbHVtbikge1xuICAgIHNlbGVjdEZpZWxkcy5zb3J0ID0gb3JkZXJCeS5jb2x1bW5cbiAgfVxuXG4gIGxldCB3aGVyZTogU1FMXG5cbiAgaWYgKGluY29taW5nV2hlcmUgJiYgT2JqZWN0LmtleXMoaW5jb21pbmdXaGVyZSkubGVuZ3RoID4gMCkge1xuICAgIHdoZXJlID0gYXdhaXQgcGFyc2VQYXJhbXMoe1xuICAgICAgYWRhcHRlcixcbiAgICAgIGZpZWxkcyxcbiAgICAgIGpvaW5BbGlhc2VzLFxuICAgICAgam9pbnMsXG4gICAgICBsb2NhbGUsXG4gICAgICBzZWxlY3RGaWVsZHMsXG4gICAgICB0YWJsZU5hbWUsXG4gICAgICB3aGVyZTogaW5jb21pbmdXaGVyZSxcbiAgICB9KVxuICB9XG5cbiAgcmV0dXJuIHtcbiAgICBqb2luQWxpYXNlcyxcbiAgICBqb2lucyxcbiAgICBvcmRlckJ5LFxuICAgIHNlbGVjdEZpZWxkcyxcbiAgICB3aGVyZSxcbiAgfVxufVxuXG5leHBvcnQgZGVmYXVsdCBidWlsZFF1ZXJ5XG4iXSwibmFtZXMiOlsiYXNjIiwiZGVzYyIsImdldFRhYmxlQ29sdW1uRnJvbVBhdGgiLCJwYXJzZVBhcmFtcyIsImJ1aWxkUXVlcnkiLCJhZGFwdGVyIiwiZmllbGRzIiwibG9jYWxlIiwic29ydCIsInRhYmxlTmFtZSIsIndoZXJlIiwiaW5jb21pbmdXaGVyZSIsInNlbGVjdEZpZWxkcyIsImlkIiwidGFibGVzIiwiam9pbnMiLCJqb2luQWxpYXNlcyIsIm9yZGVyQnkiLCJjb2x1bW4iLCJvcmRlciIsInNvcnRQYXRoIiwic3Vic3RyaW5nIiwiY29sdW1uTmFtZSIsInNvcnRUYWJsZUNvbHVtbk5hbWUiLCJ0YWJsZSIsInNvcnRUYWJsZSIsImNvbGxlY3Rpb25QYXRoIiwicGF0aFNlZ21lbnRzIiwicmVwbGFjZSIsInNwbGl0IiwidmFsdWUiLCJlcnIiLCJjcmVhdGVkQXQiLCJPYmplY3QiLCJrZXlzIiwibGVuZ3RoIl0sIm1hcHBpbmdzIjoiQUFJQSxTQUFTQSxHQUFHLEVBQUVDLElBQUksUUFBUSxjQUFhO0FBSXZDLFNBQVNDLHNCQUFzQixRQUFRLDJCQUEwQjtBQUNqRSxTQUFTQyxXQUFXLFFBQVEsZ0JBQWU7QUE0QjNDLE1BQU1DLGFBQWEsZUFBZUEsV0FBVyxFQUMzQ0MsT0FBTyxFQUNQQyxNQUFNLEVBQ05DLE1BQU0sRUFDTkMsSUFBSSxFQUNKQyxTQUFTLEVBQ1RDLE9BQU9DLGFBQWEsRUFDTDtJQUNmLE1BQU1DLGVBQThDO1FBQ2xEQyxJQUFJUixRQUFRUyxNQUFNLENBQUNMLFVBQVUsQ0FBQ0ksRUFBRTtJQUNsQztJQUNBLE1BQU1FLFFBQXlCLENBQUM7SUFDaEMsTUFBTUMsY0FBcUMsRUFBRTtJQUU3QyxNQUFNQyxVQUE2QjtRQUNqQ0MsUUFBUTtRQUNSQyxPQUFPO0lBQ1Q7SUFFQSxJQUFJWCxNQUFNO1FBQ1IsSUFBSVk7UUFFSixJQUFJWixJQUFJLENBQUMsRUFBRSxLQUFLLEtBQUs7WUFDbkJZLFdBQVdaLEtBQUthLFNBQVMsQ0FBQztZQUMxQkosUUFBUUUsS0FBSyxHQUFHbEI7UUFDbEIsT0FBTztZQUNMbUIsV0FBV1o7WUFDWFMsUUFBUUUsS0FBSyxHQUFHbkI7UUFDbEI7UUFFQSxJQUFJO1lBQ0YsTUFBTSxFQUFFc0IsWUFBWUMsbUJBQW1CLEVBQUVDLE9BQU9DLFNBQVMsRUFBRSxHQUFHdkIsdUJBQXVCO2dCQUNuRkc7Z0JBQ0FxQixnQkFBZ0JOO2dCQUNoQmQ7Z0JBQ0FVO2dCQUNBRDtnQkFDQVI7Z0JBQ0FvQixjQUFjUCxTQUFTUSxPQUFPLENBQUMsT0FBTyxLQUFLQyxLQUFLLENBQUM7Z0JBQ2pEakI7Z0JBQ0FIO2dCQUNBcUIsT0FBT1Y7WUFDVDtZQUNBSCxRQUFRQyxNQUFNLEdBQUdPLFdBQVcsQ0FBQ0Ysb0JBQW9CO1FBQ25ELEVBQUUsT0FBT1EsS0FBSztRQUNaLFdBQVc7UUFDYjtJQUNGO0lBRUEsSUFBSSxDQUFDZCxTQUFTQyxRQUFRO1FBQ3BCRCxRQUFRRSxLQUFLLEdBQUdsQjtRQUNoQixNQUFNK0IsWUFBWTNCLFFBQVFTLE1BQU0sQ0FBQ0wsVUFBVSxFQUFFdUI7UUFFN0MsSUFBSUEsV0FBVztZQUNiZixRQUFRQyxNQUFNLEdBQUdjO1FBQ25CLE9BQU87WUFDTGYsUUFBUUMsTUFBTSxHQUFHYixRQUFRUyxNQUFNLENBQUNMLFVBQVUsQ0FBQ0ksRUFBRTtRQUMvQztJQUNGO0lBRUEsSUFBSUksUUFBUUMsTUFBTSxFQUFFO1FBQ2xCTixhQUFhSixJQUFJLEdBQUdTLFFBQVFDLE1BQU07SUFDcEM7SUFFQSxJQUFJUjtJQUVKLElBQUlDLGlCQUFpQnNCLE9BQU9DLElBQUksQ0FBQ3ZCLGVBQWV3QixNQUFNLEdBQUcsR0FBRztRQUMxRHpCLFFBQVEsTUFBTVAsWUFBWTtZQUN4QkU7WUFDQUM7WUFDQVU7WUFDQUQ7WUFDQVI7WUFDQUs7WUFDQUg7WUFDQUMsT0FBT0M7UUFDVDtJQUNGO0lBRUEsT0FBTztRQUNMSztRQUNBRDtRQUNBRTtRQUNBTDtRQUNBRjtJQUNGO0FBQ0Y7QUFFQSxlQUFlTixXQUFVIn0=
|
@@ -1,24 +1,14 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
value: true
|
4
|
-
});
|
5
|
-
Object.defineProperty(exports, "convertPathToJSONTraversal", {
|
6
|
-
enumerable: true,
|
7
|
-
get: function() {
|
8
|
-
return convertPathToJSONTraversal;
|
9
|
-
}
|
10
|
-
});
|
11
|
-
const _formatJSONPathSegment = require("./formatJSONPathSegment");
|
12
|
-
const convertPathToJSONTraversal = (incomingSegments)=>{
|
1
|
+
import { formatJSONPathSegment } from './formatJSONPathSegment';
|
2
|
+
export const convertPathToJSONTraversal = (incomingSegments)=>{
|
13
3
|
const segments = [
|
14
4
|
...incomingSegments
|
15
5
|
];
|
16
6
|
segments.shift();
|
17
7
|
return segments.reduce((res, segment, i)=>{
|
18
|
-
const formattedSegment =
|
8
|
+
const formattedSegment = formatJSONPathSegment(segment);
|
19
9
|
if (i + 1 === segments.length) return `${res}->>${formattedSegment}`;
|
20
10
|
return `${res}->${formattedSegment}`;
|
21
11
|
}, '');
|
22
12
|
};
|
23
13
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9xdWVyaWVzL2NyZWF0ZUpTT05RdWVyeS9jb252ZXJ0UGF0aFRvSlNPTlRyYXZlcnNhbC50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmb3JtYXRKU09OUGF0aFNlZ21lbnQgfSBmcm9tICcuL2Zvcm1hdEpTT05QYXRoU2VnbWVudCdcblxuZXhwb3J0IGNvbnN0IGNvbnZlcnRQYXRoVG9KU09OVHJhdmVyc2FsID0gKGluY29taW5nU2VnbWVudHM6IHN0cmluZ1tdKSA9PiB7XG4gIGNvbnN0IHNlZ21lbnRzID0gWy4uLmluY29taW5nU2VnbWVudHNdXG4gIHNlZ21lbnRzLnNoaWZ0KClcblxuICByZXR1cm4gc2VnbWVudHMucmVkdWNlKChyZXMsIHNlZ21lbnQsIGkpID0+
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9xdWVyaWVzL2NyZWF0ZUpTT05RdWVyeS9jb252ZXJ0UGF0aFRvSlNPTlRyYXZlcnNhbC50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmb3JtYXRKU09OUGF0aFNlZ21lbnQgfSBmcm9tICcuL2Zvcm1hdEpTT05QYXRoU2VnbWVudCdcblxuZXhwb3J0IGNvbnN0IGNvbnZlcnRQYXRoVG9KU09OVHJhdmVyc2FsID0gKGluY29taW5nU2VnbWVudHM6IHN0cmluZ1tdKSA9PiB7XG4gIGNvbnN0IHNlZ21lbnRzID0gWy4uLmluY29taW5nU2VnbWVudHNdXG4gIHNlZ21lbnRzLnNoaWZ0KClcblxuICByZXR1cm4gc2VnbWVudHMucmVkdWNlKChyZXMsIHNlZ21lbnQsIGkpID0+IHtcbiAgICBjb25zdCBmb3JtYXR0ZWRTZWdtZW50ID0gZm9ybWF0SlNPTlBhdGhTZWdtZW50KHNlZ21lbnQpXG5cbiAgICBpZiAoaSArIDEgPT09IHNlZ21lbnRzLmxlbmd0aCkgcmV0dXJuIGAke3Jlc30tPj4ke2Zvcm1hdHRlZFNlZ21lbnR9YFxuICAgIHJldHVybiBgJHtyZXN9LT4ke2Zvcm1hdHRlZFNlZ21lbnR9YFxuICB9LCAnJylcbn1cbiJdLCJuYW1lcyI6WyJmb3JtYXRKU09OUGF0aFNlZ21lbnQiLCJjb252ZXJ0UGF0aFRvSlNPTlRyYXZlcnNhbCIsImluY29taW5nU2VnbWVudHMiLCJzZWdtZW50cyIsInNoaWZ0IiwicmVkdWNlIiwicmVzIiwic2VnbWVudCIsImkiLCJmb3JtYXR0ZWRTZWdtZW50IiwibGVuZ3RoIl0sIm1hcHBpbmdzIjoiQUFBQSxTQUFTQSxxQkFBcUIsUUFBUSwwQkFBeUI7QUFFL0QsT0FBTyxNQUFNQyw2QkFBNkIsQ0FBQ0M7SUFDekMsTUFBTUMsV0FBVztXQUFJRDtLQUFpQjtJQUN0Q0MsU0FBU0MsS0FBSztJQUVkLE9BQU9ELFNBQVNFLE1BQU0sQ0FBQyxDQUFDQyxLQUFLQyxTQUFTQztRQUNwQyxNQUFNQyxtQkFBbUJULHNCQUFzQk87UUFFL0MsSUFBSUMsSUFBSSxNQUFNTCxTQUFTTyxNQUFNLEVBQUUsT0FBTyxDQUFDLEVBQUVKLElBQUksR0FBRyxFQUFFRyxpQkFBaUIsQ0FBQztRQUNwRSxPQUFPLENBQUMsRUFBRUgsSUFBSSxFQUFFLEVBQUVHLGlCQUFpQixDQUFDO0lBQ3RDLEdBQUc7QUFDTCxFQUFDIn0=
|
@@ -1,15 +1,5 @@
|
|
1
|
-
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
3
|
-
value: true
|
4
|
-
});
|
5
|
-
Object.defineProperty(exports, "formatJSONPathSegment", {
|
6
|
-
enumerable: true,
|
7
|
-
get: function() {
|
8
|
-
return formatJSONPathSegment;
|
9
|
-
}
|
10
|
-
});
|
11
|
-
const formatJSONPathSegment = (segment)=>{
|
1
|
+
export const formatJSONPathSegment = (segment)=>{
|
12
2
|
return Number.isNaN(parseInt(segment)) ? `'${segment}'` : segment;
|
13
3
|
};
|
14
4
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9xdWVyaWVzL2NyZWF0ZUpTT05RdWVyeS9mb3JtYXRKU09OUGF0aFNlZ21lbnQudHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNvbnN0IGZvcm1hdEpTT05QYXRoU2VnbWVudCA9IChzZWdtZW50OiBzdHJpbmcpID0+
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9xdWVyaWVzL2NyZWF0ZUpTT05RdWVyeS9mb3JtYXRKU09OUGF0aFNlZ21lbnQudHMiXSwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNvbnN0IGZvcm1hdEpTT05QYXRoU2VnbWVudCA9IChzZWdtZW50OiBzdHJpbmcpID0+IHtcbiAgcmV0dXJuIE51bWJlci5pc05hTihwYXJzZUludChzZWdtZW50KSkgPyBgJyR7c2VnbWVudH0nYCA6IHNlZ21lbnRcbn1cbiJdLCJuYW1lcyI6WyJmb3JtYXRKU09OUGF0aFNlZ21lbnQiLCJzZWdtZW50IiwiTnVtYmVyIiwiaXNOYU4iLCJwYXJzZUludCJdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxNQUFNQSx3QkFBd0IsQ0FBQ0M7SUFDcEMsT0FBT0MsT0FBT0MsS0FBSyxDQUFDQyxTQUFTSCxZQUFZLENBQUMsQ0FBQyxFQUFFQSxRQUFRLENBQUMsQ0FBQyxHQUFHQTtBQUM1RCxFQUFDIn0=
|
@@ -1,15 +1,5 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
value: true
|
4
|
-
});
|
5
|
-
Object.defineProperty(exports, "createJSONQuery", {
|
6
|
-
enumerable: true,
|
7
|
-
get: function() {
|
8
|
-
return createJSONQuery;
|
9
|
-
}
|
10
|
-
});
|
11
|
-
const _convertPathToJSONTraversal = require("./convertPathToJSONTraversal");
|
12
|
-
const _formatJSONPathSegment = require("./formatJSONPathSegment");
|
1
|
+
import { convertPathToJSONTraversal } from './convertPathToJSONTraversal';
|
2
|
+
import { formatJSONPathSegment } from './formatJSONPathSegment';
|
13
3
|
const operatorMap = {
|
14
4
|
contains: '~*',
|
15
5
|
equals: '=',
|
@@ -19,7 +9,7 @@ const fromArray = ({ isRoot, operator, pathSegments, treatAsArray, value })=>{
|
|
19
9
|
const newPathSegments = pathSegments.slice(isRoot ? 1 : 2);
|
20
10
|
const alias = `${pathSegments[isRoot ? 0 : 1]}_alias_${newPathSegments.length}`;
|
21
11
|
newPathSegments.unshift(alias);
|
22
|
-
const arrayElements = isRoot ? pathSegments[0] : `${pathSegments[0]} -> ${
|
12
|
+
const arrayElements = isRoot ? pathSegments[0] : `${pathSegments[0]} -> ${formatJSONPathSegment(pathSegments[1])}`;
|
23
13
|
return `EXISTS (
|
24
14
|
SELECT 1
|
25
15
|
FROM jsonb_array_elements(${arrayElements}) AS ${alias}
|
@@ -32,10 +22,10 @@ const fromArray = ({ isRoot, operator, pathSegments, treatAsArray, value })=>{
|
|
32
22
|
)`;
|
33
23
|
};
|
34
24
|
const createConstraint = ({ operator, pathSegments, value })=>{
|
35
|
-
const jsonQuery =
|
25
|
+
const jsonQuery = convertPathToJSONTraversal(pathSegments);
|
36
26
|
return `${pathSegments[0]}${jsonQuery} ${operatorMap[operator]} '${value}'`;
|
37
27
|
};
|
38
|
-
const createJSONQuery = ({ operator, pathSegments, treatAsArray, treatRootAsArray, value })=>{
|
28
|
+
export const createJSONQuery = ({ operator, pathSegments, treatAsArray, treatRootAsArray, value })=>{
|
39
29
|
if (treatRootAsArray) {
|
40
30
|
return fromArray({
|
41
31
|
isRoot: true,
|
@@ -61,4 +51,4 @@ const createJSONQuery = ({ operator, pathSegments, treatAsArray, treatRootAsArra
|
|
61
51
|
});
|
62
52
|
};
|
63
53
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9xdWVyaWVzL2NyZWF0ZUpTT05RdWVyeS9pbmRleC50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjb252ZXJ0UGF0aFRvSlNPTlRyYXZlcnNhbCB9IGZyb20gJy4vY29udmVydFBhdGhUb0pTT05UcmF2ZXJzYWwnXG5pbXBvcnQgeyBmb3JtYXRKU09OUGF0aFNlZ21lbnQgfSBmcm9tICcuL2Zvcm1hdEpTT05QYXRoU2VnbWVudCdcblxuY29uc3Qgb3BlcmF0b3JNYXAgPSB7XG4gIGNvbnRhaW5zOiAnfionLFxuICBlcXVhbHM6ICc9JyxcbiAgbGlrZTogJ34qJyxcbn1cblxudHlwZSBGcm9tQXJyYXlBcmdzID0ge1xuICBpc1Jvb3Q/OiB0cnVlXG4gIG9wZXJhdG9yOiBzdHJpbmdcbiAgcGF0aFNlZ21lbnRzOiBzdHJpbmdbXVxuICB0cmVhdEFzQXJyYXk/OiBzdHJpbmdbXVxuICB2YWx1ZTogdW5rbm93blxufVxuXG5jb25zdCBmcm9tQXJyYXkgPSAoeyBpc1Jvb3QsIG9wZXJhdG9yLCBwYXRoU2VnbWVudHMsIHRyZWF0QXNBcnJheSwgdmFsdWUgfTogRnJvbUFycmF5QXJncykgPT4ge1xuICBjb25zdCBuZXdQYXRoU2VnbWVudHMgPSBwYXRoU2VnbWVudHMuc2xpY2UoaXNSb290ID8gMSA6IDIpXG4gIGNvbnN0IGFsaWFzID0gYCR7cGF0aFNlZ21lbnRzW2lzUm9vdCA/IDAgOiAxXX1fYWxpYXNfJHtuZXdQYXRoU2VnbWVudHMubGVuZ3RofWBcblxuICBuZXdQYXRoU2VnbWVudHMudW5zaGlmdChhbGlhcylcblxuICBjb25zdCBhcnJheUVsZW1lbnRzID0gaXNSb290XG4gICAgPyBwYXRoU2VnbWVudHNbMF1cbiAgICA6IGAke3BhdGhTZWdtZW50c1swXX0gLT4gJHtmb3JtYXRKU09OUGF0aFNlZ21lbnQocGF0aFNlZ21lbnRzWzFdKX1gXG5cbiAgcmV0dXJuIGBFWElTVFMgKFxuICAgIFNFTEVDVCAxXG4gICAgRlJPTSBqc29uYl9hcnJheV9lbGVtZW50cygke2FycmF5RWxlbWVudHN9KSBBUyAke2FsaWFzfVxuICAgIFdIRVJFICR7Y3JlYXRlSlNPTlF1ZXJ5KHtcbiAgICAgIG9wZXJhdG9yLFxuICAgICAgcGF0aFNlZ21lbnRzOiBuZXdQYXRoU2VnbWVudHMsXG4gICAgICB0cmVhdEFzQXJyYXksXG4gICAgICB2YWx1ZSxcbiAgICB9KX1cbiAgKWBcbn1cblxudHlwZSBDcmVhdGVDb25zdHJhaW50QXJncyA9IHtcbiAgb3BlcmF0b3I6IHN0cmluZ1xuICBwYXRoU2VnbWVudHM6IHN0cmluZ1tdXG4gIHRyZWF0QXNBcnJheT86IHN0cmluZ1tdXG4gIHZhbHVlOiB1bmtub3duXG59XG5cbmNvbnN0IGNyZWF0ZUNvbnN0cmFpbnQgPSAoeyBvcGVyYXRvciwgcGF0aFNlZ21lbnRzLCB2YWx1ZSB9OiBDcmVhdGVDb25zdHJhaW50QXJncyk6IHN0cmluZyA9PiB7XG4gIGNvbnN0IGpzb25RdWVyeSA9IGNvbnZlcnRQYXRoVG9KU09OVHJhdmVyc2FsKHBhdGhTZWdtZW50cylcbiAgcmV0dXJuIGAke3BhdGhTZWdtZW50c1swXX0ke2pzb25RdWVyeX0gJHtvcGVyYXRvck1hcFtvcGVyYXRvcl19ICcke3ZhbHVlfSdgXG59XG5cbnR5cGUgQXJncyA9IHtcbiAgb3BlcmF0b3I6IHN0cmluZ1xuICBwYXRoU2VnbWVudHM6IHN0cmluZ1tdXG4gIHRyZWF0QXNBcnJheT86IHN0cmluZ1tdXG4gIHRyZWF0Um9vdEFzQXJyYXk/
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9xdWVyaWVzL2NyZWF0ZUpTT05RdWVyeS9pbmRleC50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjb252ZXJ0UGF0aFRvSlNPTlRyYXZlcnNhbCB9IGZyb20gJy4vY29udmVydFBhdGhUb0pTT05UcmF2ZXJzYWwnXG5pbXBvcnQgeyBmb3JtYXRKU09OUGF0aFNlZ21lbnQgfSBmcm9tICcuL2Zvcm1hdEpTT05QYXRoU2VnbWVudCdcblxuY29uc3Qgb3BlcmF0b3JNYXAgPSB7XG4gIGNvbnRhaW5zOiAnfionLFxuICBlcXVhbHM6ICc9JyxcbiAgbGlrZTogJ34qJyxcbn1cblxudHlwZSBGcm9tQXJyYXlBcmdzID0ge1xuICBpc1Jvb3Q/OiB0cnVlXG4gIG9wZXJhdG9yOiBzdHJpbmdcbiAgcGF0aFNlZ21lbnRzOiBzdHJpbmdbXVxuICB0cmVhdEFzQXJyYXk/OiBzdHJpbmdbXVxuICB2YWx1ZTogdW5rbm93blxufVxuXG5jb25zdCBmcm9tQXJyYXkgPSAoeyBpc1Jvb3QsIG9wZXJhdG9yLCBwYXRoU2VnbWVudHMsIHRyZWF0QXNBcnJheSwgdmFsdWUgfTogRnJvbUFycmF5QXJncykgPT4ge1xuICBjb25zdCBuZXdQYXRoU2VnbWVudHMgPSBwYXRoU2VnbWVudHMuc2xpY2UoaXNSb290ID8gMSA6IDIpXG4gIGNvbnN0IGFsaWFzID0gYCR7cGF0aFNlZ21lbnRzW2lzUm9vdCA/IDAgOiAxXX1fYWxpYXNfJHtuZXdQYXRoU2VnbWVudHMubGVuZ3RofWBcblxuICBuZXdQYXRoU2VnbWVudHMudW5zaGlmdChhbGlhcylcblxuICBjb25zdCBhcnJheUVsZW1lbnRzID0gaXNSb290XG4gICAgPyBwYXRoU2VnbWVudHNbMF1cbiAgICA6IGAke3BhdGhTZWdtZW50c1swXX0gLT4gJHtmb3JtYXRKU09OUGF0aFNlZ21lbnQocGF0aFNlZ21lbnRzWzFdKX1gXG5cbiAgcmV0dXJuIGBFWElTVFMgKFxuICAgIFNFTEVDVCAxXG4gICAgRlJPTSBqc29uYl9hcnJheV9lbGVtZW50cygke2FycmF5RWxlbWVudHN9KSBBUyAke2FsaWFzfVxuICAgIFdIRVJFICR7Y3JlYXRlSlNPTlF1ZXJ5KHtcbiAgICAgIG9wZXJhdG9yLFxuICAgICAgcGF0aFNlZ21lbnRzOiBuZXdQYXRoU2VnbWVudHMsXG4gICAgICB0cmVhdEFzQXJyYXksXG4gICAgICB2YWx1ZSxcbiAgICB9KX1cbiAgKWBcbn1cblxudHlwZSBDcmVhdGVDb25zdHJhaW50QXJncyA9IHtcbiAgb3BlcmF0b3I6IHN0cmluZ1xuICBwYXRoU2VnbWVudHM6IHN0cmluZ1tdXG4gIHRyZWF0QXNBcnJheT86IHN0cmluZ1tdXG4gIHZhbHVlOiB1bmtub3duXG59XG5cbmNvbnN0IGNyZWF0ZUNvbnN0cmFpbnQgPSAoeyBvcGVyYXRvciwgcGF0aFNlZ21lbnRzLCB2YWx1ZSB9OiBDcmVhdGVDb25zdHJhaW50QXJncyk6IHN0cmluZyA9PiB7XG4gIGNvbnN0IGpzb25RdWVyeSA9IGNvbnZlcnRQYXRoVG9KU09OVHJhdmVyc2FsKHBhdGhTZWdtZW50cylcbiAgcmV0dXJuIGAke3BhdGhTZWdtZW50c1swXX0ke2pzb25RdWVyeX0gJHtvcGVyYXRvck1hcFtvcGVyYXRvcl19ICcke3ZhbHVlfSdgXG59XG5cbnR5cGUgQXJncyA9IHtcbiAgb3BlcmF0b3I6IHN0cmluZ1xuICBwYXRoU2VnbWVudHM6IHN0cmluZ1tdXG4gIHRyZWF0QXNBcnJheT86IHN0cmluZ1tdXG4gIHRyZWF0Um9vdEFzQXJyYXk/OiBib29sZWFuXG4gIHZhbHVlOiB1bmtub3duXG59XG5cbmV4cG9ydCBjb25zdCBjcmVhdGVKU09OUXVlcnkgPSAoe1xuICBvcGVyYXRvcixcbiAgcGF0aFNlZ21lbnRzLFxuICB0cmVhdEFzQXJyYXksXG4gIHRyZWF0Um9vdEFzQXJyYXksXG4gIHZhbHVlLFxufTogQXJncyk6IHN0cmluZyA9PiB7XG4gIGlmICh0cmVhdFJvb3RBc0FycmF5KSB7XG4gICAgcmV0dXJuIGZyb21BcnJheSh7XG4gICAgICBpc1Jvb3Q6IHRydWUsXG4gICAgICBvcGVyYXRvcixcbiAgICAgIHBhdGhTZWdtZW50cyxcbiAgICAgIHRyZWF0QXNBcnJheSxcbiAgICAgIHZhbHVlLFxuICAgIH0pXG4gIH1cblxuICBpZiAodHJlYXRBc0FycmF5LmluY2x1ZGVzKHBhdGhTZWdtZW50c1sxXSkpIHtcbiAgICByZXR1cm4gZnJvbUFycmF5KHtcbiAgICAgIG9wZXJhdG9yLFxuICAgICAgcGF0aFNlZ21lbnRzLFxuICAgICAgdHJlYXRBc0FycmF5LFxuICAgICAgdmFsdWUsXG4gICAgfSlcbiAgfVxuXG4gIHJldHVybiBjcmVhdGVDb25zdHJhaW50KHsgb3BlcmF0b3IsIHBhdGhTZWdtZW50cywgdHJlYXRBc0FycmF5LCB2YWx1ZSB9KVxufVxuIl0sIm5hbWVzIjpbImNvbnZlcnRQYXRoVG9KU09OVHJhdmVyc2FsIiwiZm9ybWF0SlNPTlBhdGhTZWdtZW50Iiwib3BlcmF0b3JNYXAiLCJjb250YWlucyIsImVxdWFscyIsImxpa2UiLCJmcm9tQXJyYXkiLCJpc1Jvb3QiLCJvcGVyYXRvciIsInBhdGhTZWdtZW50cyIsInRyZWF0QXNBcnJheSIsInZhbHVlIiwibmV3UGF0aFNlZ21lbnRzIiwic2xpY2UiLCJhbGlhcyIsImxlbmd0aCIsInVuc2hpZnQiLCJhcnJheUVsZW1lbnRzIiwiY3JlYXRlSlNPTlF1ZXJ5IiwiY3JlYXRlQ29uc3RyYWludCIsImpzb25RdWVyeSIsInRyZWF0Um9vdEFzQXJyYXkiLCJpbmNsdWRlcyJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsMEJBQTBCLFFBQVEsK0JBQThCO0FBQ3pFLFNBQVNDLHFCQUFxQixRQUFRLDBCQUF5QjtBQUUvRCxNQUFNQyxjQUFjO0lBQ2xCQyxVQUFVO0lBQ1ZDLFFBQVE7SUFDUkMsTUFBTTtBQUNSO0FBVUEsTUFBTUMsWUFBWSxDQUFDLEVBQUVDLE1BQU0sRUFBRUMsUUFBUSxFQUFFQyxZQUFZLEVBQUVDLFlBQVksRUFBRUMsS0FBSyxFQUFpQjtJQUN2RixNQUFNQyxrQkFBa0JILGFBQWFJLEtBQUssQ0FBQ04sU0FBUyxJQUFJO0lBQ3hELE1BQU1PLFFBQVEsQ0FBQyxFQUFFTCxZQUFZLENBQUNGLFNBQVMsSUFBSSxFQUFFLENBQUMsT0FBTyxFQUFFSyxnQkFBZ0JHLE1BQU0sQ0FBQyxDQUFDO0lBRS9FSCxnQkFBZ0JJLE9BQU8sQ0FBQ0Y7SUFFeEIsTUFBTUcsZ0JBQWdCVixTQUNsQkUsWUFBWSxDQUFDLEVBQUUsR0FDZixDQUFDLEVBQUVBLFlBQVksQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFUixzQkFBc0JRLFlBQVksQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUVyRSxPQUFPLENBQUM7OzhCQUVvQixFQUFFUSxjQUFjLEtBQUssRUFBRUgsTUFBTTtVQUNqRCxFQUFFSSxnQkFBZ0I7UUFDdEJWO1FBQ0FDLGNBQWNHO1FBQ2RGO1FBQ0FDO0lBQ0YsR0FBRztHQUNKLENBQUM7QUFDSjtBQVNBLE1BQU1RLG1CQUFtQixDQUFDLEVBQUVYLFFBQVEsRUFBRUMsWUFBWSxFQUFFRSxLQUFLLEVBQXdCO0lBQy9FLE1BQU1TLFlBQVlwQiwyQkFBMkJTO0lBQzdDLE9BQU8sQ0FBQyxFQUFFQSxZQUFZLENBQUMsRUFBRSxDQUFDLEVBQUVXLFVBQVUsQ0FBQyxFQUFFbEIsV0FBVyxDQUFDTSxTQUFTLENBQUMsRUFBRSxFQUFFRyxNQUFNLENBQUMsQ0FBQztBQUM3RTtBQVVBLE9BQU8sTUFBTU8sa0JBQWtCLENBQUMsRUFDOUJWLFFBQVEsRUFDUkMsWUFBWSxFQUNaQyxZQUFZLEVBQ1pXLGdCQUFnQixFQUNoQlYsS0FBSyxFQUNBO0lBQ0wsSUFBSVUsa0JBQWtCO1FBQ3BCLE9BQU9mLFVBQVU7WUFDZkMsUUFBUTtZQUNSQztZQUNBQztZQUNBQztZQUNBQztRQUNGO0lBQ0Y7SUFFQSxJQUFJRCxhQUFhWSxRQUFRLENBQUNiLFlBQVksQ0FBQyxFQUFFLEdBQUc7UUFDMUMsT0FBT0gsVUFBVTtZQUNmRTtZQUNBQztZQUNBQztZQUNBQztRQUNGO0lBQ0Y7SUFFQSxPQUFPUSxpQkFBaUI7UUFBRVg7UUFBVUM7UUFBY0M7UUFBY0M7SUFBTTtBQUN4RSxFQUFDIn0=
|