diff options
Diffstat (limited to 'common/jsonschema.js')
| -rw-r--r-- | common/jsonschema.js | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/common/jsonschema.js b/common/jsonschema.js index 3e99cd6..9c4a70c 100644 --- a/common/jsonschema.js +++ b/common/jsonschema.js @@ -57,6 +57,8 @@ #FROM common/jsonschema/scan.js IMPORT SchemaScanResult, scan +#FROM common/entities.js IMPORT haketilo_schema_name_regex + #EXPORT scan #EXPORT SchemaScanResult @@ -86,15 +88,6 @@ const haketilo_schemas = [ #INCLUDE schemas/2.x/common_definitions-2.schema.json ].reduce((ac, s) => Object.assign(ac, {[s.$id]: s}), {}); -const name_base_re = "(?<name_base>[^/]*)"; -const major_number_re = "(?<major>[1-9][0-9]*)"; -const minor_number_re = "(?:[1-9][0-9]*|0)"; -const numbers_rest_re = `(?:\\.${minor_number_re})*`; -const version_re = `(?<ver>${major_number_re}${numbers_rest_re})`; -const schema_name_re = `${name_base_re}-${version_re}\\.schema\\.json`; - -const haketilo_schema_name_regex = new RegExp(schema_name_re); - for (const [$id, schema] of [...Object.entries(haketilo_schemas)]) { const match = haketilo_schema_name_regex.exec($id); const schema_name = @@ -103,7 +96,6 @@ for (const [$id, schema] of [...Object.entries(haketilo_schemas)]) { } #EXPORT haketilo_schemas -#EXPORT haketilo_schema_name_regex const haketilo_validator = new Validator(); Object.values(haketilo_schemas) |