diff --git a/src/api/json/catalog.json b/src/api/json/catalog.json index 7264bbed1aa..cac63294cb8 100644 --- a/src/api/json/catalog.json +++ b/src/api/json/catalog.json @@ -2965,7 +2965,7 @@ ".gitversion.yml", ".gitversion.yaml" ], - "url": "https://gitversion.net/schemas/6.4/GitVersion.configuration.json", + "url": "https://gitversion.net/schemas/6.6/GitVersion.configuration.json", "versions": { "5.12": "https://gitversion.net/schemas/5.12/GitVersion.configuration.json", "6.0": "https://gitversion.net/schemas/6.0/GitVersion.configuration.json", @@ -2973,7 +2973,8 @@ "6.2": "https://gitversion.net/schemas/6.2/GitVersion.configuration.json", "6.3": "https://gitversion.net/schemas/6.3/GitVersion.configuration.json", "6.4": "https://gitversion.net/schemas/6.4/GitVersion.configuration.json", - "6.5": "https://gitversion.net/schemas/6.5/GitVersion.configuration.json" + "6.5": "https://gitversion.net/schemas/6.5/GitVersion.configuration.json", + "6.6": "https://gitversion.net/schemas/6.6/GitVersion.configuration.json" } }, { @@ -7765,7 +7766,12 @@ { "name": "Shopware CLI Project Store Configuration", "description": "Shopware CLI Project Store Configuration", - "fileMatch": [".shopware-project.yml", ".shopware-project.yaml"], + "fileMatch": [ + ".shopware-project.yml", + ".shopware-project.yaml", + ".shopware-project.local.yml", + ".shopware-project.local.yaml" + ], "url": "https://raw.githubusercontent.com/shopware/shopware-cli/main/shopware-project-schema.json" }, { diff --git a/src/schemas/json/gitversion.json b/src/schemas/json/gitversion.json index ce15954717c..a5710a565a5 100644 --- a/src/schemas/json/gitversion.json +++ b/src/schemas/json/gitversion.json @@ -1,5 +1,5 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$ref": "https://gitversion.net/schemas/6.5/GitVersion.configuration.json", + "$ref": "https://gitversion.net/schemas/6.6/GitVersion.configuration.json", "title": "GitVersion configuration schema" } diff --git a/src/schemas/json/minecraft-pack-mcmeta.json b/src/schemas/json/minecraft-pack-mcmeta.json index 122713b0125..e5cda520ad8 100644 --- a/src/schemas/json/minecraft-pack-mcmeta.json +++ b/src/schemas/json/minecraft-pack-mcmeta.json @@ -8,7 +8,27 @@ "description": "https://minecraft.wiki/w/Pack_format", "type": "integer", "minimum": 1, - "maximum": 81 + "maximum": 101 + }, + "packFormatMajorMinor": { + "description": "A pack format version, specified as a single integer (major version) or an array of one or two integers ([major] or [major, minor]). Omitting the minor version is equal to specifying minor version 0.\nhttps://minecraft.wiki/w/Pack_format", + "oneOf": [ + { + "type": "integer", + "description": "Major version as an integer. Interpreted as [major, 0].", + "minimum": 1 + }, + { + "type": "array", + "description": "An array of [major] or [major, minor] version integers. The minor version is optional and assumed to be 0 if not specified.", + "items": { + "type": "integer", + "minimum": 0 + }, + "minItems": 1, + "maxItems": 2 + } + ] }, "packFormatRange": { "anyOf": [ @@ -38,6 +58,17 @@ } ] }, + "textComponent": { + "description": "A Minecraft text component (raw JSON text).\nhttps://minecraft.wiki/w/Raw_JSON_text_format", + "oneOf": [ + { + "type": "string" + }, + { + "type": "object" + } + ] + }, "resourceLocation": { "description": "An identifier of a game object\nhttps://minecraft.wiki/w/Resource_location", "type": "string", @@ -50,21 +81,44 @@ "type": "object", "properties": { "description": { + "$ref": "#/definitions/textComponent", "title": "description", - "description": "A text component that appears when hovering over the pack's name in the list given by the `/datapack list` command, or when viewing the pack in the Create World screen.", - "type": "string" + "description": "A text component that appears when hovering over the pack's name in the list given by the `/datapack list` command, or when viewing the pack in the Create World screen." }, "pack_format": { "$ref": "#/definitions/packFormat", - "description": "Determines the version(s) of Minecraft that this pack is compatible with." + "description": "Determines the version(s) of Minecraft that this pack is compatible with. Optional when supported formats do not include 82 (data pack) or 65 (resource pack) or below, but required otherwise." + }, + "min_format": { + "$ref": "#/definitions/packFormatMajorMinor", + "description": "Describes the minimum supported pack format version. Can be an integer or an array of one or two integers ([major] or [major, minor])." + }, + "max_format": { + "$ref": "#/definitions/packFormatMajorMinor", + "description": "Describes the maximum supported pack format version. Can be an integer or an array of one or two integers ([major] or [major, minor])." }, "supported_formats": { "$ref": "#/definitions/packFormatRange", - "description": "Describes a range for pack formats that this pack supports. The range has to include the value of `pack.pack_format`." + "description": "DEPRECATED. The major versions this pack supports. Has to match the major versions specified in min_format and max_format.\nRequired when the pack declares support for versions either below data pack format 82 or resource pack format 65.\nMust be absent otherwise." } }, "additionalProperties": false, - "required": ["description", "pack_format"] + "required": ["description"], + "anyOf": [ + { + "properties": { + "pack_format": {} + }, + "required": ["pack_format"] + }, + { + "properties": { + "min_format": {}, + "max_format": {} + }, + "required": ["min_format", "max_format"] + } + ] }, "features": { "description": "Section for selecting experimental features.", @@ -121,18 +175,41 @@ "description": "An overlay.", "type": "object", "properties": { - "formats": { - "$ref": "#/definitions/packFormatRange", - "description": "A range of pack formats when this overlay should be active." - }, "directory": { "description": "The directory to overlay for the respective versions.", "type": "string", "pattern": "[a-z0-9_-]+" + }, + "min_format": { + "$ref": "#/definitions/packFormatMajorMinor", + "description": "Describes the minimum pack format version to which this overlay applies. As integer or one or two element integer array." + }, + "max_format": { + "$ref": "#/definitions/packFormatMajorMinor", + "description": "Describes the minimum pack format version to which this overlay applies. As integer or one or two element integer array." + }, + "formats": { + "$ref": "#/definitions/packFormatRange", + "description": "DEPRECATED. A range of major pack format versions to which this overlay applies. Has to match the major versions specified in min_format and max_format.\nRequired when the pack declares support for versions either below data pack format 82 or resource pack format 65.\nMust be absent otherwise." } }, "additionalProperties": false, - "required": ["formats", "directory"] + "required": ["directory"], + "anyOf": [ + { + "properties": { + "formats": {} + }, + "required": ["formats"] + }, + { + "properties": { + "min_format": {}, + "max_format": {} + }, + "required": ["min_format", "max_format"] + } + ] } } }, diff --git a/src/schemas/json/starlake.json b/src/schemas/json/starlake.json index 0a411f8e7ba..9ac150bfebf 100644 --- a/src/schemas/json/starlake.json +++ b/src/schemas/json/starlake.json @@ -1161,7 +1161,7 @@ }, "sql": { "$ref": "#/definitions/ConvertibleToString", - "description": "Main SQL request to execute (do not forget to prefix table names with the database name to avoid conflicts)" + "description": "Used internally. The SQL should always be written in a separate file named after the transform name. If the transform is named transf.sl.yml then then the sql should be stored in the file transf.sql. It will contain the main SQL request to execute" }, "streams": { "type": "array", @@ -1983,6 +1983,19 @@ } } }, + "GizmoV1": { + "type": "object", + "properties": { + "url": { + "type": "string", + "description": "Gizmo server URL. Default is 'http://localhost:10900'" + }, + "apiKey": { + "type": "string", + "description": "API key for authenticating with the Gizmo server" + } + } + }, "HttpV1": { "type": "object", "properties": { @@ -2362,6 +2375,14 @@ "onExceptionRetries": { "description": "Number of retries on transient exceptions", "type": "integer" + }, + "pythonLibsDir": { + "description": "Directory containing python libraries to use instead of pip install", + "type": "string" + }, + "gizmosql": { + "$ref": "#/definitions/GizmoV1", + "description": "Gizmo server configuration" } } }, diff --git a/src/schemas/json/ty.json b/src/schemas/json/ty.json index 121e1a55bd8..47cdcb3fa5d 100644 --- a/src/schemas/json/ty.json +++ b/src/schemas/json/ty.json @@ -1192,8 +1192,8 @@ }, "possibly-missing-attribute": { "title": "detects references to possibly missing attributes", - "description": "## What it does\nChecks for possibly missing attributes.\n\n## Why is this bad?\nAttempting to access a missing attribute will raise an `AttributeError` at runtime.\n\n## Examples\n```python\nclass A:\n if b:\n c = 0\n\nA.c # AttributeError: type object 'A' has no attribute 'c'\n```", - "default": "warn", + "description": "## What it does\nChecks for possibly missing attributes.\n\n## Why is this bad?\nAttempting to access a missing attribute will raise an `AttributeError` at runtime.\n\n## Rule status\nThis rule is currently disabled by default because of the number of\nfalse positives it can produce.\n\n## Examples\n```python\nclass A:\n if b:\n c = 0\n\nA.c # AttributeError: type object 'A' has no attribute 'c'\n```", + "default": "ignore", "oneOf": [ { "$ref": "#/definitions/Level" @@ -1220,6 +1220,16 @@ } ] }, + "possibly-missing-submodule": { + "title": "detects accesses of submodules that may not be available as attributes on their parent module", + "description": "## What it does\nChecks for accesses of submodules that might not've been imported.\n\n## Why is this bad?\nWhen module `a` has a submodule `b`, `import a` isn't generally enough to let you access\n`a.b.` You either need to explicitly `import a.b`, or else you need the `__init__.py` file\nof `a` to include `from . import b`. Without one of those, `a.b` is an `AttributeError`.\n\n## Examples\n```python\nimport html\nhtml.parser # AttributeError: module 'html' has no attribute 'parser'\n```", + "default": "warn", + "oneOf": [ + { + "$ref": "#/definitions/Level" + } + ] + }, "possibly-unresolved-reference": { "title": "detects references to possibly undefined names", "description": "## What it does\nChecks for references to names that are possibly not defined.\n\n## Why is this bad?\nUsing an undefined variable will raise a `NameError` at runtime.\n\n## Rule status\nThis rule is currently disabled by default because of the number of\nfalse positives it can produce.\n\n## Example\n\n```python\nfor i in range(0):\n x = i\n\nprint(x) # NameError: name 'x' is not defined\n```",