diff --git a/src/api/json/catalog.json b/src/api/json/catalog.json index 05771485d2f..7113e84c9f1 100644 --- a/src/api/json/catalog.json +++ b/src/api/json/catalog.json @@ -181,6 +181,7 @@ "fileMatch": [".awc.yaml", ".awc.yml", ".awc.json", ".awc.jsonc", ".awc"], "url": "https://www.schemastore.org/anywork-ac-1.1.json", "versions": { + "1.1": "https://www.schemastore.org/anywork-ac-1.1.json", "1.0": "https://www.schemastore.org/anywork-ac-1.0.json" } }, diff --git a/src/schema-validation.jsonc b/src/schema-validation.jsonc index de4bb92d48f..27448a0efb4 100644 --- a/src/schema-validation.jsonc +++ b/src/schema-validation.jsonc @@ -1,8 +1,6 @@ { "$schema": "./schema-validation.schema.json", "ajvNotStrictMode": [ - "anywork-ac-1.0.json", - "anywork-ac-1.1.json", "appsettings.json", "asmdef.json", "aurora-1.0.json", diff --git a/src/schemas/json/anywork-ac-1.0.json b/src/schemas/json/anywork-ac-1.0.json index b82b73d7ab0..f45c9ac8f0d 100644 --- a/src/schemas/json/anywork-ac-1.0.json +++ b/src/schemas/json/anywork-ac-1.0.json @@ -21,43 +21,49 @@ "required": ["actions"], "properties": { "actions": { - "description": "Actions", - "type": ["string", "array"], - "default": "all", - "minItems": 1, - "uniqueItems": true, - "items": { - "description": "An action", - "type": ["string", "object"], - "oneOf": [ - { - "type": "string", - "enum": [ - "all", - "download", - "generate", - "correction", - "build", - "publish" - ] - }, - { - "title": "action", - "type": "object", - "required": ["target", "schema"], - "properties": { - "target": { - "$ref": "base.json#/definitions/path", - "description": "A path to repository including `node_modules` directory to install desired services" + "anyOf": [ + { + "type": "string" + }, + { + "type": "array", + "minItems": 1, + "uniqueItems": true, + "items": { + "description": "An action", + "oneOf": [ + { + "type": "string", + "enum": [ + "all", + "download", + "generate", + "correction", + "build", + "publish" + ] }, - "schema": { - "$ref": "#/definitions/schema" + { + "title": "action", + "type": "object", + "required": ["target", "schema"], + "properties": { + "target": { + "$ref": "base.json#/definitions/path", + "description": "A path to repository including `node_modules` directory to install desired services" + }, + "schema": { + "$ref": "#/definitions/schema" + } + }, + "additionalProperties": false } - }, - "additionalProperties": false + ] } - ] - } + } + ], + "description": "Actions", + "default": "all" }, "npm": { "title": "NPM specifications", diff --git a/src/schemas/json/anywork-ac-1.1.json b/src/schemas/json/anywork-ac-1.1.json index a48378c9c52..6597dbb6016 100644 --- a/src/schemas/json/anywork-ac-1.1.json +++ b/src/schemas/json/anywork-ac-1.1.json @@ -247,6 +247,7 @@ ], "definitions": { "version": { + "type": "string", "pattern": "^[\\^~]?(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$" }, "buildId": {