Make engines required

jh-changes
Shin'ya Ueoka 5 years ago
parent 6c763aa14f
commit 5205da5729
  1. 2
      src/shared/settings/Settings.ts
  2. 3
      src/shared/settings/schema.json
  3. 14
      src/shared/settings/validate.js

@ -44,7 +44,7 @@ export default class Settings {
if (!valid) { if (!valid) {
let message = (validate as any).errors!! let message = (validate as any).errors!!
.map((err: Ajv.ErrorObject) => { .map((err: Ajv.ErrorObject) => {
return `'${err.dataPath}' of ${err.keyword} ${err.message}`; return `'${err.dataPath}' ${err.message}`;
}) })
.join('; '); .join('; ');
throw new TypeError(message); throw new TypeError(message);

@ -33,7 +33,8 @@
} }
}, },
"required": [ "required": [
"default" "default",
"engines"
] ]
}, },
"properties": { "properties": {

@ -143,7 +143,17 @@ var validate = (function() {
if (valid2) { if (valid2) {
var data2 = data1.engines; var data2 = data1.engines;
if (data2 === undefined) { if (data2 === undefined) {
valid2 = true; valid2 = false;
validate.errors = [{
keyword: 'required',
dataPath: (dataPath || '') + '.search',
schemaPath: '#/properties/search/required',
params: {
missingProperty: 'engines'
},
message: 'should have required property \'engines\''
}];
return false;
} else { } else {
var errs_2 = errors; var errs_2 = errors;
if ((data2 && typeof data2 === "object" && !Array.isArray(data2))) { if ((data2 && typeof data2 === "object" && !Array.isArray(data2))) {
@ -512,7 +522,7 @@ validate.schema = {
} }
} }
}, },
"required": ["default"] "required": ["default", "engines"]
}, },
"properties": { "properties": {
"type": "object", "type": "object",