Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

fix(adapter-commons): clean up in sort.ts and select function #2492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daffl merged 1 commit into from
Nov 26, 2021
Merged

fix(adapter-commons): clean up in sort.ts and select function #2492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions 17 packages/adapter-commons/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,15 @@ export * from './sort';
// Return a function that filters a result object or array
// and picks only the fields passed as `params.query.$select`
// and additional `otherFields`
export function select (params: any, ...otherFields: any[]) {
const fields = params && params.query && params.query.$select;
export function select (params: any, ...otherFields: string[]) {
const queryFields: string[] | undefined = params?.query?.$select;

if (Array.isArray(fields) && otherFields.length) {
fields.push(...otherFields);
if (!queryFields) {
return (result: any) => result;
}

const convert = (result: any) => {
if (!Array.isArray(fields)) {
return result;
}

return _.pick(result, ...fields);
};
const resultFields = queryFields.concat(otherFields);
const convert = (result: any) => _.pick(result, ...resultFields);

return (result: any) => {
if (Array.isArray(result)) {
Expand Down
86 changes: 33 additions & 53 deletions 86 packages/adapter-commons/src/sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,102 +7,82 @@ export function compareNSB (a: any, b: any) {
return 0;
}

export function compareArrays (a: any, b: any) {
let i;
let comp;
export function compareArrays (a: any[], b: any[]) {
for (let i = 0, l = Math.min(a.length, b.length); i < l; i++) {
const comparison = compare(a[i], b[i]);

for (i = 0; i < Math.min(a.length, b.length); i += 1) {
comp = exports.compare(a[i], b[i]);

if (comp !== 0) { return comp; }
if (comparison !== 0) { return comparison; }
}

// Common section was identical, longest one wins
return exports.compareNSB(a.length, b.length);
return compareNSB(a.length, b.length);
}

export function compare (a: any, b: any, compareStrings: any = exports.compareNSB) {
const { compareNSB, compare, compareArrays } = exports;
export function compare (a: any, b: any, compareStrings: any = compareNSB): 0 | 1 | -1 {
if (a === b) { return 0; }

// undefined
if (a === undefined) { return b === undefined ? 0 : -1; }
if (b === undefined) { return a === undefined ? 0 : 1; }
if (a === undefined) { return -1; }
if (b === undefined) { return 1; }

// null
if (a === null) { return b === null ? 0 : -1; }
if (b === null) { return a === null ? 0 : 1; }
if (a === null) { return -1; }
if (b === null) { return 1; }

// Numbers
if (typeof a === 'number') { return typeof b === 'number' ? compareNSB(a, b) : -1; }
if (typeof b === 'number') { return typeof a === 'number' ? compareNSB(a, b) : 1; }
if (typeof b === 'number') { return 1; }

// Strings
if (typeof a === 'string') { return typeof b === 'string' ? compareStrings(a, b) : -1; }
if (typeof b === 'string') { return typeof a === 'string' ? compareStrings(a, b) : 1; }
if (typeof b === 'string') { return 1; }

// Booleans
if (typeof a === 'boolean') { return typeof b === 'boolean' ? compareNSB(a, b) : -1; }
if (typeof b === 'boolean') { return typeof a === 'boolean' ? compareNSB(a, b) : 1; }
if (typeof b === 'boolean') { return 1; }

// Dates
if (a instanceof Date) { return b instanceof Date ? compareNSB(a.getTime(), b.getTime()) : -1; }
if (b instanceof Date) { return a instanceof Date ? compareNSB(a.getTime(), b.getTime()) : 1; }
if (b instanceof Date) { return 1; }

// Arrays (first element is most significant and so on)
if (Array.isArray(a)) { return Array.isArray(b) ? compareArrays(a, b) : -1; }
if (Array.isArray(b)) { return Array.isArray(a) ? compareArrays(a, b) : 1; }
if (Array.isArray(b)) { return 1; }

// Objects
const aKeys = Object.keys(a).sort();
const bKeys = Object.keys(b).sort();
let comp = 0;

for (let i = 0; i < Math.min(aKeys.length, bKeys.length); i += 1) {
comp = compare(a[aKeys[i]], b[bKeys[i]]);
for (let i = 0, l = Math.min(aKeys.length, bKeys.length); i < l; i++) {
const comparison = compare(a[aKeys[i]], b[bKeys[i]]);

if (comp !== 0) { return comp; }
if (comparison !== 0) { return comparison; }
}

return compareNSB(aKeys.length, bKeys.length);
}

// An in-memory sorting function according to the
// $sort special query parameter
export function sorter ($sort: any) {
let sortLevels = 0; // > 0 if $sort has tags with '.' i.e. '{a: 1, b: -1, "c.x.z": 1}'

const getVal = (a: any, sortKeys: any[]) => {
let keys = sortKeys.map(key => key);
let val = a;
do {
let key = keys.shift();
val = val[key];
} while (keys.length);

return val;
};

const criteria = Object.keys($sort).map(key => {
const direction = $sort[key];
const keys = key.split('.');
sortLevels += (keys.length > 1) ? 1 : 0;

return { keys, direction };
});
export function sorter ($sort: { [key: string]: -1 | 1 }) {
const get = (value: any, path: string[]) => path.reduce((value, key) => value[key], value);

return function (a: any, b: any) {
let compare;
const compares = Object.keys($sort).map(key => {
const direction = $sort[key];
const path = key.split('.');

for (const criterion of criteria) {
if (sortLevels) {
compare = criterion.direction * exports.compare(getVal(a, criterion.keys), getVal(b, criterion.keys));
if (path.length === 1) {
return (a: any, b: any) => direction * compare(a[key], b[key]);
} else {
compare = criterion.direction * exports.compare(a[criterion.keys[0]], b[criterion.keys[0]]);
return (a: any, b: any) => direction * compare(get(a, path), get(b, path));
}
});

return function (a: any, b: any) {
for (const compare of compares) {
const comparasion = compare(a, b);

if (compare !== 0) {
return compare;
}
if (comparasion !== 0) { return comparasion; }
}

return 0;
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.