Fix European trip return heuristic for weekend location tracking
Adjust European short trip heuristic from >3 days to >1 day to correctly detect when user has returned home from European trips. This fixes the April 29-30, 2023 case where the location incorrectly showed "Sankt Georg, Hamburg" instead of "Bristol" when the user was free (no events scheduled) after the foss-north trip ended on April 27. The previous logic required more than 3 days to pass before assuming return home from European countries, but for short European trips by rail/ferry, users typically return within 1-2 days. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
663dc479c2
commit
ea4980a5d7
6407 changed files with 1072847 additions and 18 deletions
1067
node_modules/schema-utils/dist/ValidationError.js
generated
vendored
Normal file
1067
node_modules/schema-utils/dist/ValidationError.js
generated
vendored
Normal file
File diff suppressed because it is too large
Load diff
16
node_modules/schema-utils/dist/index.js
generated
vendored
Normal file
16
node_modules/schema-utils/dist/index.js
generated
vendored
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
"use strict";
|
||||
|
||||
const {
|
||||
validate,
|
||||
ValidationError,
|
||||
enableValidation,
|
||||
disableValidation,
|
||||
needValidate
|
||||
} = require("./validate");
|
||||
module.exports = {
|
||||
validate,
|
||||
ValidationError,
|
||||
enableValidation,
|
||||
disableValidation,
|
||||
needValidate
|
||||
};
|
||||
88
node_modules/schema-utils/dist/keywords/absolutePath.js
generated
vendored
Normal file
88
node_modules/schema-utils/dist/keywords/absolutePath.js
generated
vendored
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
/** @typedef {import("ajv").default} Ajv */
|
||||
/** @typedef {import("ajv").SchemaValidateFunction} SchemaValidateFunction */
|
||||
/** @typedef {import("ajv").AnySchemaObject} AnySchemaObject */
|
||||
/** @typedef {import("../validate").SchemaUtilErrorObject} SchemaUtilErrorObject */
|
||||
|
||||
/**
|
||||
* @param {string} message
|
||||
* @param {object} schema
|
||||
* @param {string} data
|
||||
* @returns {SchemaUtilErrorObject}
|
||||
*/
|
||||
function errorMessage(message, schema, data) {
|
||||
return {
|
||||
// @ts-ignore
|
||||
// eslint-disable-next-line no-undefined
|
||||
dataPath: undefined,
|
||||
// @ts-ignore
|
||||
// eslint-disable-next-line no-undefined
|
||||
schemaPath: undefined,
|
||||
keyword: "absolutePath",
|
||||
params: {
|
||||
absolutePath: data
|
||||
},
|
||||
message,
|
||||
parentSchema: schema
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {boolean} shouldBeAbsolute
|
||||
* @param {object} schema
|
||||
* @param {string} data
|
||||
* @returns {SchemaUtilErrorObject}
|
||||
*/
|
||||
function getErrorFor(shouldBeAbsolute, schema, data) {
|
||||
const message = shouldBeAbsolute ? `The provided value ${JSON.stringify(data)} is not an absolute path!` : `A relative path is expected. However, the provided value ${JSON.stringify(data)} is an absolute path!`;
|
||||
return errorMessage(message, schema, data);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {Ajv} ajv
|
||||
* @returns {Ajv}
|
||||
*/
|
||||
function addAbsolutePathKeyword(ajv) {
|
||||
ajv.addKeyword({
|
||||
keyword: "absolutePath",
|
||||
type: "string",
|
||||
errors: true,
|
||||
/**
|
||||
* @param {boolean} schema
|
||||
* @param {AnySchemaObject} parentSchema
|
||||
* @returns {SchemaValidateFunction}
|
||||
*/
|
||||
compile(schema, parentSchema) {
|
||||
/** @type {SchemaValidateFunction} */
|
||||
const callback = data => {
|
||||
let passes = true;
|
||||
const isExclamationMarkPresent = data.includes("!");
|
||||
if (isExclamationMarkPresent) {
|
||||
callback.errors = [errorMessage(`The provided value ${JSON.stringify(data)} contains exclamation mark (!) which is not allowed because it's reserved for loader syntax.`, parentSchema, data)];
|
||||
passes = false;
|
||||
}
|
||||
|
||||
// ?:[A-Za-z]:\\ - Windows absolute path
|
||||
// \\\\ - Windows network absolute path
|
||||
// \/ - Unix-like OS absolute path
|
||||
const isCorrectAbsolutePath = schema === /^(?:[A-Za-z]:(\\|\/)|\\\\|\/)/.test(data);
|
||||
if (!isCorrectAbsolutePath) {
|
||||
callback.errors = [getErrorFor(schema, parentSchema, data)];
|
||||
passes = false;
|
||||
}
|
||||
return passes;
|
||||
};
|
||||
callback.errors = [];
|
||||
return callback;
|
||||
}
|
||||
});
|
||||
return ajv;
|
||||
}
|
||||
var _default = addAbsolutePathKeyword;
|
||||
exports.default = _default;
|
||||
37
node_modules/schema-utils/dist/keywords/undefinedAsNull.js
generated
vendored
Normal file
37
node_modules/schema-utils/dist/keywords/undefinedAsNull.js
generated
vendored
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
/** @typedef {import("ajv").default} Ajv */
|
||||
/** @typedef {import("ajv").SchemaValidateFunction} SchemaValidateFunction */
|
||||
/** @typedef {import("ajv").AnySchemaObject} AnySchemaObject */
|
||||
/** @typedef {import("ajv").ValidateFunction} ValidateFunction */
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {Ajv} ajv
|
||||
* @returns {Ajv}
|
||||
*/
|
||||
function addUndefinedAsNullKeyword(ajv) {
|
||||
ajv.addKeyword({
|
||||
keyword: "undefinedAsNull",
|
||||
before: "enum",
|
||||
modifying: true,
|
||||
/** @type {SchemaValidateFunction} */
|
||||
validate(kwVal, data, metadata, dataCxt) {
|
||||
if (kwVal && dataCxt && metadata && typeof metadata.enum !== "undefined") {
|
||||
const idx = dataCxt.parentDataProperty;
|
||||
if (typeof dataCxt.parentData[idx] === "undefined") {
|
||||
// eslint-disable-next-line no-param-reassign
|
||||
dataCxt.parentData[dataCxt.parentDataProperty] = null;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
});
|
||||
return ajv;
|
||||
}
|
||||
var _default = addUndefinedAsNullKeyword;
|
||||
exports.default = _default;
|
||||
143
node_modules/schema-utils/dist/util/Range.js
generated
vendored
Normal file
143
node_modules/schema-utils/dist/util/Range.js
generated
vendored
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
"use strict";
|
||||
|
||||
/**
|
||||
* @typedef {[number, boolean]} RangeValue
|
||||
*/
|
||||
|
||||
/**
|
||||
* @callback RangeValueCallback
|
||||
* @param {RangeValue} rangeValue
|
||||
* @returns {boolean}
|
||||
*/
|
||||
|
||||
class Range {
|
||||
/**
|
||||
* @param {"left" | "right"} side
|
||||
* @param {boolean} exclusive
|
||||
* @returns {">" | ">=" | "<" | "<="}
|
||||
*/
|
||||
static getOperator(side, exclusive) {
|
||||
if (side === "left") {
|
||||
return exclusive ? ">" : ">=";
|
||||
}
|
||||
return exclusive ? "<" : "<=";
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {number} value
|
||||
* @param {boolean} logic is not logic applied
|
||||
* @param {boolean} exclusive is range exclusive
|
||||
* @returns {string}
|
||||
*/
|
||||
static formatRight(value, logic, exclusive) {
|
||||
if (logic === false) {
|
||||
return Range.formatLeft(value, !logic, !exclusive);
|
||||
}
|
||||
return `should be ${Range.getOperator("right", exclusive)} ${value}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {number} value
|
||||
* @param {boolean} logic is not logic applied
|
||||
* @param {boolean} exclusive is range exclusive
|
||||
* @returns {string}
|
||||
*/
|
||||
static formatLeft(value, logic, exclusive) {
|
||||
if (logic === false) {
|
||||
return Range.formatRight(value, !logic, !exclusive);
|
||||
}
|
||||
return `should be ${Range.getOperator("left", exclusive)} ${value}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {number} start left side value
|
||||
* @param {number} end right side value
|
||||
* @param {boolean} startExclusive is range exclusive from left side
|
||||
* @param {boolean} endExclusive is range exclusive from right side
|
||||
* @param {boolean} logic is not logic applied
|
||||
* @returns {string}
|
||||
*/
|
||||
static formatRange(start, end, startExclusive, endExclusive, logic) {
|
||||
let result = "should be";
|
||||
result += ` ${Range.getOperator(logic ? "left" : "right", logic ? startExclusive : !startExclusive)} ${start} `;
|
||||
result += logic ? "and" : "or";
|
||||
result += ` ${Range.getOperator(logic ? "right" : "left", logic ? endExclusive : !endExclusive)} ${end}`;
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Array<RangeValue>} values
|
||||
* @param {boolean} logic is not logic applied
|
||||
* @return {RangeValue} computed value and it's exclusive flag
|
||||
*/
|
||||
static getRangeValue(values, logic) {
|
||||
let minMax = logic ? Infinity : -Infinity;
|
||||
let j = -1;
|
||||
const predicate = logic ? /** @type {RangeValueCallback} */
|
||||
([value]) => value <= minMax : /** @type {RangeValueCallback} */
|
||||
([value]) => value >= minMax;
|
||||
for (let i = 0; i < values.length; i++) {
|
||||
if (predicate(values[i])) {
|
||||
[minMax] = values[i];
|
||||
j = i;
|
||||
}
|
||||
}
|
||||
if (j > -1) {
|
||||
return values[j];
|
||||
}
|
||||
return [Infinity, true];
|
||||
}
|
||||
constructor() {
|
||||
/** @type {Array<RangeValue>} */
|
||||
this._left = [];
|
||||
/** @type {Array<RangeValue>} */
|
||||
this._right = [];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {number} value
|
||||
* @param {boolean=} exclusive
|
||||
*/
|
||||
left(value, exclusive = false) {
|
||||
this._left.push([value, exclusive]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {number} value
|
||||
* @param {boolean=} exclusive
|
||||
*/
|
||||
right(value, exclusive = false) {
|
||||
this._right.push([value, exclusive]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {boolean} logic is not logic applied
|
||||
* @return {string} "smart" range string representation
|
||||
*/
|
||||
format(logic = true) {
|
||||
const [start, leftExclusive] = Range.getRangeValue(this._left, logic);
|
||||
const [end, rightExclusive] = Range.getRangeValue(this._right, !logic);
|
||||
if (!Number.isFinite(start) && !Number.isFinite(end)) {
|
||||
return "";
|
||||
}
|
||||
const realStart = leftExclusive ? start + 1 : start;
|
||||
const realEnd = rightExclusive ? end - 1 : end;
|
||||
|
||||
// e.g. 5 < x < 7, 5 < x <= 6, 6 <= x <= 6
|
||||
if (realStart === realEnd) {
|
||||
return `should be ${logic ? "" : "!"}= ${realStart}`;
|
||||
}
|
||||
|
||||
// e.g. 4 < x < ∞
|
||||
if (Number.isFinite(start) && !Number.isFinite(end)) {
|
||||
return Range.formatLeft(start, logic, leftExclusive);
|
||||
}
|
||||
|
||||
// e.g. ∞ < x < 4
|
||||
if (!Number.isFinite(start) && Number.isFinite(end)) {
|
||||
return Range.formatRight(end, logic, rightExclusive);
|
||||
}
|
||||
return Range.formatRange(start, end, leftExclusive, rightExclusive, logic);
|
||||
}
|
||||
}
|
||||
module.exports = Range;
|
||||
85
node_modules/schema-utils/dist/util/hints.js
generated
vendored
Normal file
85
node_modules/schema-utils/dist/util/hints.js
generated
vendored
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
"use strict";
|
||||
|
||||
const Range = require("./Range");
|
||||
|
||||
/** @typedef {import("../validate").Schema} Schema */
|
||||
|
||||
/**
|
||||
* @param {Schema} schema
|
||||
* @param {boolean} logic
|
||||
* @return {string[]}
|
||||
*/
|
||||
module.exports.stringHints = function stringHints(schema, logic) {
|
||||
const hints = [];
|
||||
let type = "string";
|
||||
const currentSchema = {
|
||||
...schema
|
||||
};
|
||||
if (!logic) {
|
||||
const tmpLength = currentSchema.minLength;
|
||||
const tmpFormat = currentSchema.formatMinimum;
|
||||
currentSchema.minLength = currentSchema.maxLength;
|
||||
currentSchema.maxLength = tmpLength;
|
||||
currentSchema.formatMinimum = currentSchema.formatMaximum;
|
||||
currentSchema.formatMaximum = tmpFormat;
|
||||
}
|
||||
if (typeof currentSchema.minLength === "number") {
|
||||
if (currentSchema.minLength === 1) {
|
||||
type = "non-empty string";
|
||||
} else {
|
||||
const length = Math.max(currentSchema.minLength - 1, 0);
|
||||
hints.push(`should be longer than ${length} character${length > 1 ? "s" : ""}`);
|
||||
}
|
||||
}
|
||||
if (typeof currentSchema.maxLength === "number") {
|
||||
if (currentSchema.maxLength === 0) {
|
||||
type = "empty string";
|
||||
} else {
|
||||
const length = currentSchema.maxLength + 1;
|
||||
hints.push(`should be shorter than ${length} character${length > 1 ? "s" : ""}`);
|
||||
}
|
||||
}
|
||||
if (currentSchema.pattern) {
|
||||
hints.push(`should${logic ? "" : " not"} match pattern ${JSON.stringify(currentSchema.pattern)}`);
|
||||
}
|
||||
if (currentSchema.format) {
|
||||
hints.push(`should${logic ? "" : " not"} match format ${JSON.stringify(currentSchema.format)}`);
|
||||
}
|
||||
if (currentSchema.formatMinimum) {
|
||||
hints.push(`should be ${currentSchema.formatExclusiveMinimum ? ">" : ">="} ${JSON.stringify(currentSchema.formatMinimum)}`);
|
||||
}
|
||||
if (currentSchema.formatMaximum) {
|
||||
hints.push(`should be ${currentSchema.formatExclusiveMaximum ? "<" : "<="} ${JSON.stringify(currentSchema.formatMaximum)}`);
|
||||
}
|
||||
return [type].concat(hints);
|
||||
};
|
||||
|
||||
/**
|
||||
* @param {Schema} schema
|
||||
* @param {boolean} logic
|
||||
* @return {string[]}
|
||||
*/
|
||||
module.exports.numberHints = function numberHints(schema, logic) {
|
||||
const hints = [schema.type === "integer" ? "integer" : "number"];
|
||||
const range = new Range();
|
||||
if (typeof schema.minimum === "number") {
|
||||
range.left(schema.minimum);
|
||||
}
|
||||
if (typeof schema.exclusiveMinimum === "number") {
|
||||
range.left(schema.exclusiveMinimum, true);
|
||||
}
|
||||
if (typeof schema.maximum === "number") {
|
||||
range.right(schema.maximum);
|
||||
}
|
||||
if (typeof schema.exclusiveMaximum === "number") {
|
||||
range.right(schema.exclusiveMaximum, true);
|
||||
}
|
||||
const rangeFormat = range.format(logic);
|
||||
if (rangeFormat) {
|
||||
hints.push(rangeFormat);
|
||||
}
|
||||
if (typeof schema.multipleOf === "number") {
|
||||
hints.push(`should${logic ? "" : " not"} be multiple of ${schema.multipleOf}`);
|
||||
}
|
||||
return hints;
|
||||
};
|
||||
30
node_modules/schema-utils/dist/util/memorize.js
generated
vendored
Normal file
30
node_modules/schema-utils/dist/util/memorize.js
generated
vendored
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
/**
|
||||
* @template T
|
||||
* @param fn {(function(): any) | undefined}
|
||||
* @returns {function(): T}
|
||||
*/
|
||||
const memoize = fn => {
|
||||
let cache = false;
|
||||
/** @type {T} */
|
||||
let result;
|
||||
return () => {
|
||||
if (cache) {
|
||||
return result;
|
||||
}
|
||||
result = /** @type {function(): any} */fn();
|
||||
cache = true;
|
||||
// Allow to clean up memory for fn
|
||||
// and all dependent resources
|
||||
// eslint-disable-next-line no-undefined, no-param-reassign
|
||||
fn = undefined;
|
||||
return result;
|
||||
};
|
||||
};
|
||||
var _default = memoize;
|
||||
exports.default = _default;
|
||||
207
node_modules/schema-utils/dist/validate.js
generated
vendored
Normal file
207
node_modules/schema-utils/dist/validate.js
generated
vendored
Normal file
|
|
@ -0,0 +1,207 @@
|
|||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
Object.defineProperty(exports, "ValidationError", {
|
||||
enumerable: true,
|
||||
get: function () {
|
||||
return _ValidationError.default;
|
||||
}
|
||||
});
|
||||
exports.disableValidation = disableValidation;
|
||||
exports.enableValidation = enableValidation;
|
||||
exports.needValidate = needValidate;
|
||||
exports.validate = validate;
|
||||
var _ValidationError = _interopRequireDefault(require("./ValidationError"));
|
||||
var _memorize = _interopRequireDefault(require("./util/memorize"));
|
||||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
||||
const getAjv = (0, _memorize.default)(() => {
|
||||
// Use CommonJS require for ajv libs so TypeScript consumers aren't locked into esModuleInterop (see #110).
|
||||
// eslint-disable-next-line global-require
|
||||
const Ajv = require("ajv").default;
|
||||
// eslint-disable-next-line global-require
|
||||
const ajvKeywords = require("ajv-keywords").default;
|
||||
// eslint-disable-next-line global-require
|
||||
const addFormats = require("ajv-formats").default;
|
||||
|
||||
/**
|
||||
* @type {Ajv}
|
||||
*/
|
||||
const ajv = new Ajv({
|
||||
strict: false,
|
||||
allErrors: true,
|
||||
verbose: true,
|
||||
$data: true
|
||||
});
|
||||
ajvKeywords(ajv, ["instanceof", "patternRequired"]);
|
||||
addFormats(ajv, {
|
||||
keywords: true
|
||||
});
|
||||
|
||||
// Custom keywords
|
||||
// eslint-disable-next-line global-require
|
||||
const addAbsolutePathKeyword = require("./keywords/absolutePath").default;
|
||||
addAbsolutePathKeyword(ajv);
|
||||
const addUndefinedAsNullKeyword =
|
||||
// eslint-disable-next-line global-require
|
||||
require("./keywords/undefinedAsNull").default;
|
||||
addUndefinedAsNullKeyword(ajv);
|
||||
return ajv;
|
||||
});
|
||||
|
||||
/** @typedef {import("json-schema").JSONSchema4} JSONSchema4 */
|
||||
/** @typedef {import("json-schema").JSONSchema6} JSONSchema6 */
|
||||
/** @typedef {import("json-schema").JSONSchema7} JSONSchema7 */
|
||||
/** @typedef {import("ajv").ErrorObject} ErrorObject */
|
||||
|
||||
/**
|
||||
* @typedef {Object} Extend
|
||||
* @property {string=} formatMinimum
|
||||
* @property {string=} formatMaximum
|
||||
* @property {string=} formatExclusiveMinimum
|
||||
* @property {string=} formatExclusiveMaximum
|
||||
* @property {string=} link
|
||||
* @property {boolean=} undefinedAsNull
|
||||
*/
|
||||
|
||||
/** @typedef {(JSONSchema4 | JSONSchema6 | JSONSchema7) & Extend} Schema */
|
||||
|
||||
/** @typedef {ErrorObject & { children?: Array<ErrorObject> }} SchemaUtilErrorObject */
|
||||
|
||||
/**
|
||||
* @callback PostFormatter
|
||||
* @param {string} formattedError
|
||||
* @param {SchemaUtilErrorObject} error
|
||||
* @returns {string}
|
||||
*/
|
||||
|
||||
/**
|
||||
* @typedef {Object} ValidationErrorConfiguration
|
||||
* @property {string=} name
|
||||
* @property {string=} baseDataPath
|
||||
* @property {PostFormatter=} postFormatter
|
||||
*/
|
||||
|
||||
/**
|
||||
* @param {SchemaUtilErrorObject} error
|
||||
* @param {number} idx
|
||||
* @returns {SchemaUtilErrorObject}
|
||||
*/
|
||||
function applyPrefix(error, idx) {
|
||||
// eslint-disable-next-line no-param-reassign
|
||||
error.instancePath = `[${idx}]${error.instancePath}`;
|
||||
if (error.children) {
|
||||
error.children.forEach(err => applyPrefix(err, idx));
|
||||
}
|
||||
return error;
|
||||
}
|
||||
let skipValidation = false;
|
||||
|
||||
// We use `process.env.SKIP_VALIDATION` because you can have multiple `schema-utils` with different version,
|
||||
// so we want to disable it globally, `process.env` doesn't supported by browsers, so we have the local `skipValidation` variables
|
||||
|
||||
// Enable validation
|
||||
function enableValidation() {
|
||||
skipValidation = false;
|
||||
|
||||
// Disable validation for any versions
|
||||
if (process && process.env) {
|
||||
process.env.SKIP_VALIDATION = "n";
|
||||
}
|
||||
}
|
||||
|
||||
// Disable validation
|
||||
function disableValidation() {
|
||||
skipValidation = true;
|
||||
if (process && process.env) {
|
||||
process.env.SKIP_VALIDATION = "y";
|
||||
}
|
||||
}
|
||||
|
||||
// Check if we need to confirm
|
||||
function needValidate() {
|
||||
if (skipValidation) {
|
||||
return false;
|
||||
}
|
||||
if (process && process.env && process.env.SKIP_VALIDATION) {
|
||||
const value = process.env.SKIP_VALIDATION.trim();
|
||||
if (/^(?:y|yes|true|1|on)$/i.test(value)) {
|
||||
return false;
|
||||
}
|
||||
if (/^(?:n|no|false|0|off)$/i.test(value)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Schema} schema
|
||||
* @param {Array<object> | object} options
|
||||
* @param {ValidationErrorConfiguration=} configuration
|
||||
* @returns {void}
|
||||
*/
|
||||
function validate(schema, options, configuration) {
|
||||
if (!needValidate()) {
|
||||
return;
|
||||
}
|
||||
let errors = [];
|
||||
if (Array.isArray(options)) {
|
||||
for (let i = 0; i <= options.length - 1; i++) {
|
||||
errors.push(...validateObject(schema, options[i]).map(err => applyPrefix(err, i)));
|
||||
}
|
||||
} else {
|
||||
errors = validateObject(schema, options);
|
||||
}
|
||||
if (errors.length > 0) {
|
||||
throw new _ValidationError.default(errors, schema, configuration);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Schema} schema
|
||||
* @param {Array<object> | object} options
|
||||
* @returns {Array<SchemaUtilErrorObject>}
|
||||
*/
|
||||
function validateObject(schema, options) {
|
||||
// Not need to cache, because `ajv@8` has built-in cache
|
||||
const compiledSchema = getAjv().compile(schema);
|
||||
const valid = compiledSchema(options);
|
||||
if (valid) return [];
|
||||
return compiledSchema.errors ? filterErrors(compiledSchema.errors) : [];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Array<ErrorObject>} errors
|
||||
* @returns {Array<SchemaUtilErrorObject>}
|
||||
*/
|
||||
function filterErrors(errors) {
|
||||
/** @type {Array<SchemaUtilErrorObject>} */
|
||||
let newErrors = [];
|
||||
for (const error of /** @type {Array<SchemaUtilErrorObject>} */errors) {
|
||||
const {
|
||||
instancePath
|
||||
} = error;
|
||||
/** @type {Array<SchemaUtilErrorObject>} */
|
||||
let children = [];
|
||||
newErrors = newErrors.filter(oldError => {
|
||||
if (oldError.instancePath.includes(instancePath)) {
|
||||
if (oldError.children) {
|
||||
children = children.concat(oldError.children.slice(0));
|
||||
}
|
||||
|
||||
// eslint-disable-next-line no-undefined, no-param-reassign
|
||||
oldError.children = undefined;
|
||||
children.push(oldError);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
if (children.length) {
|
||||
error.children = children;
|
||||
}
|
||||
newErrors.push(error);
|
||||
}
|
||||
return newErrors;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue