diff --git a/.changeset/unlucky-ants-burn.md b/.changeset/unlucky-ants-burn.md new file mode 100644 index 000000000..e0c63a6a5 --- /dev/null +++ b/.changeset/unlucky-ants-burn.md @@ -0,0 +1,9 @@ +--- +"vscode-ui5-language-assistant": patch +"@ui5-language-assistant/test-utils": patch +"@ui5-language-assistant/binding": patch +"@ui5-language-assistant/context": patch +"@ui5-language-assistant/fe": patch +--- + +fix: support `minUI5Version` as an array diff --git a/packages/binding/package.json b/packages/binding/package.json index 11a37ba0d..95ee1f708 100644 --- a/packages/binding/package.json +++ b/packages/binding/package.json @@ -26,7 +26,7 @@ "lodash": "4.17.21" }, "devDependencies": { - "@sap-ux/vocabularies-types": "0.7.4", + "@sap-ux/vocabularies-types": "0.10.14", "@types/lodash": "4.14.168", "@ui5-language-assistant/semantic-model-types": "4.0.10", "@ui5-language-assistant/test-framework": "4.0.12", diff --git a/packages/context/package.json b/packages/context/package.json index b742f5b61..6bcc3a50e 100644 --- a/packages/context/package.json +++ b/packages/context/package.json @@ -18,7 +18,7 @@ "dependencies": { "@sap-ux/annotation-converter": "0.5.20", "@sap-ux/edmx-parser": "0.5.13", - "@sap-ux/project-access": "1.9.1", + "@sap-ux/project-access": "1.25.5", "@ui5-language-assistant/logger": "0.0.1", "@ui5-language-assistant/logic-utils": "4.0.18", "@ui5-language-assistant/settings": "4.0.9", @@ -31,7 +31,7 @@ "vscode-uri": "2.1.2" }, "devDependencies": { - "@sap-ux/vocabularies-types": "0.6.8", + "@sap-ux/vocabularies-types": "0.10.14", "@types/js-yaml": "4.0.5", "@types/lodash": "4.14.168", "@types/node-fetch": "2.5.10", diff --git a/packages/context/src/api.ts b/packages/context/src/api.ts index 5ab1526c5..f5f481f91 100644 --- a/packages/context/src/api.ts +++ b/packages/context/src/api.ts @@ -1,4 +1,9 @@ -import { getCustomViewId, getManifestDetails } from "./manifest"; +import { getMinimumUI5Version } from "@sap-ux/project-access"; +import { + getCustomViewId, + getManifestDetails, + getUI5Manifest, +} from "./manifest"; import { getServices } from "./services"; import { Context } from "./types"; import { getSemanticModel } from "./ui5-model"; @@ -37,11 +42,17 @@ export async function getContext( ): Promise { try { const manifestDetails = await getManifestDetails(documentPath); + const manifest = await getUI5Manifest(manifestDetails.manifestPath); + let minUI5Version = manifestDetails.minUI5Version; + if (manifest) { + minUI5Version = getMinimumUI5Version(manifest); + } + const yamlDetails = await getYamlDetails(documentPath); const ui5Model = await getSemanticModel( modelCachePath, yamlDetails.framework, - manifestDetails.minUI5Version + minUI5Version ); const services = await getServices(documentPath); const customViewId = await getCustomViewId(documentPath); diff --git a/packages/context/src/types.ts b/packages/context/src/types.ts index 29b1115de..af603f6cb 100644 --- a/packages/context/src/types.ts +++ b/packages/context/src/types.ts @@ -7,7 +7,7 @@ import type { Manifest } from "@sap-ux/project-access"; import { FetchResponse } from "@ui5-language-assistant/logic-utils"; export const DEFAULT_UI5_FRAMEWORK = "SAPUI5"; -export const DEFAULT_UI5_VERSION = "1.71.61"; +export const DEFAULT_UI5_VERSION = "1.71.69"; export const DEFAULT_UI5_VERSION_BASE = "1.71"; export const UI5_VERSION_S4_PLACEHOLDER = "${sap.ui5.dist.version}"; export const UI5_FRAMEWORK_CDN_BASE_URL = { diff --git a/packages/context/test/unit/api.test.ts b/packages/context/test/unit/api.test.ts index 21b9715ec..6e737a35d 100644 --- a/packages/context/test/unit/api.test.ts +++ b/packages/context/test/unit/api.test.ts @@ -5,6 +5,7 @@ import * as services from "../../src/services"; import { UI5SemanticModel } from "@ui5-language-assistant/semantic-model-types"; import { getContext, isContext } from "../../src/api"; import type { Context } from "../../src/types"; +import * as projectAccess from "@sap-ux/project-access"; describe("context", () => { afterEach(() => { @@ -13,6 +14,7 @@ describe("context", () => { describe("getContext", () => { it("get context", async () => { + // arrange const getManifestDetailsStub = jest .spyOn(manifest, "getManifestDetails") .mockResolvedValue({ @@ -23,6 +25,14 @@ describe("context", () => { flexEnabled: false, minUI5Version: undefined, }); + const getManifestStub = jest + .spyOn(manifest, "getUI5Manifest") + .mockResolvedValue({ + minUI5Version: ["2.0.0", "1.126.0"], + }); + const getMinimumUI5VersionSub = jest + .spyOn(projectAccess, "getMinimumUI5Version") + .mockReturnValue("1.126.0"); const getCustomViewIdStub = jest .spyOn(manifest, "getCustomViewId") .mockResolvedValue("customViewId"); @@ -38,8 +48,12 @@ describe("context", () => { const getServicesStub = jest .spyOn(services, "getServices") .mockResolvedValue({}); + // act const result = await getContext("path/to/xml/file"); + // assert expect(getManifestDetailsStub).toHaveBeenCalled(); + expect(getManifestStub).toHaveBeenCalled(); + expect(getMinimumUI5VersionSub).toHaveBeenCalled(); expect(getCustomViewIdStub).toHaveBeenCalled(); expect(getYamlDetailsStub).toHaveBeenCalled(); expect(getSemanticModelStub).toHaveBeenCalled(); diff --git a/packages/context/test/unit/ui5-model.test.ts b/packages/context/test/unit/ui5-model.test.ts index b04f691a7..9d50a5db9 100644 --- a/packages/context/test/unit/ui5-model.test.ts +++ b/packages/context/test/unit/ui5-model.test.ts @@ -44,7 +44,7 @@ import { Response } from "node-fetch"; const GET_MODEL_TIMEOUT = 30000; const FRAMEWORK = "SAPUI5"; const OPEN_FRAMEWORK = "OpenUI5"; -const FALLBACK_VERSION = "1.71.61"; +const FALLBACK_VERSION = "1.71.69"; const FALLBACK_VERSION_BASE = "1.71"; const UI5_VERSION_S4_PLACEHOLDER = "${sap.ui5.dist.version}"; const NO_CACHE_FOLDER = undefined; diff --git a/packages/fe/package.json b/packages/fe/package.json index d06f9383e..ac011d539 100644 --- a/packages/fe/package.json +++ b/packages/fe/package.json @@ -24,7 +24,7 @@ "lodash": "4.17.21" }, "devDependencies": { - "@sap-ux/vocabularies-types": "0.6.8", + "@sap-ux/vocabularies-types": "0.10.14", "@types/lodash": "4.14.168", "@ui5-language-assistant/semantic-model-types": "4.0.10", "@ui5-language-assistant/test-framework": "4.0.12", diff --git a/packages/fe/test/unit/utils/metadata.test.ts b/packages/fe/test/unit/utils/metadata.test.ts index 71b202430..7c4aaf2aa 100644 --- a/packages/fe/test/unit/utils/metadata.test.ts +++ b/packages/fe/test/unit/utils/metadata.test.ts @@ -14,12 +14,12 @@ import { getRootElements, } from "../../../src/utils"; -const entityContainer: EntityContainer = { +const entityContainer = { _type: "EntityContainer", annotations: {}, fullyQualifiedName: "TravelService.EntityContainer", name: "EntityContainer", -}; +} as EntityContainer; const bookingEntityType: EntityType = { _type: "EntityType", name: "Booking", diff --git a/packages/fe/test/unit/utils/path.test.ts b/packages/fe/test/unit/utils/path.test.ts index 23f366448..3228b2211 100644 --- a/packages/fe/test/unit/utils/path.test.ts +++ b/packages/fe/test/unit/utils/path.test.ts @@ -13,12 +13,12 @@ import { } from "../../../src/utils"; describe("path utils (exotic cases to achieve full code coverage)", () => { - const entityContainer: EntityContainer = { + const entityContainer = { _type: "EntityContainer", annotations: {}, fullyQualifiedName: "TravelService.EntityContainer", name: "EntityContainer", - }; + } as EntityContainer; const bookingEntityType: EntityType = { _type: "EntityType", name: "Booking", diff --git a/packages/vscode-ui5-language-assistant/src/manifest/schema.json b/packages/vscode-ui5-language-assistant/src/manifest/schema.json index 868540e2b..497afc761 100644 --- a/packages/vscode-ui5-language-assistant/src/manifest/schema.json +++ b/packages/vscode-ui5-language-assistant/src/manifest/schema.json @@ -76,7 +76,9 @@ "1.60.0", "1.61.0", "1.62.0", - "1.63.0" + "1.63.0", + "1.64.0", + "1.65.0" ] }, "start_url": { @@ -539,8 +541,8 @@ "required": ["minUI5Version"], "properties": { "minUI5Version": { - "description": "Represents the minimum version of SAP UI5 that your component requires", - "$ref": "#/definitions/version" + "description": "Represents the minimum version of SAP UI5 that your component requires. It is either a specific version or an array of versions where each major version can only be included once. If array contains more than one version and if version 1 is included it must be at least 1.120.x.", + "$ref": "#/definitions/minUI5Version" }, "libs": { "description": "Represents the id (namespace) of the libraries that should be loaded by UI5 Core to be used in your component", @@ -1792,7 +1794,9 @@ "1.41.0", "1.42.0", "1.43.0", - "1.44.0" + "1.44.0", + "1.45.0", + "1.46.0" ] }, "designtime": { @@ -1812,6 +1816,10 @@ "description": "Markdown enablement for Adaptive Content", "type": "boolean" }, + "helpId": { + "description": "[Experimental] The help-id which will be rendered as data-help-id on the base element of the card.", + "type": "string" + }, "modelSizeLimit": { "description": "[Experimental] Represents the maximum number of entries that are used for list bindings.", "oneOf": [ @@ -2665,7 +2673,7 @@ } } }, - "Microchart.StackedBar.Bar": { + "MicroChart.StackedBar.Bar": { "type": "object", "additionalProperties": false, "properties": { @@ -2702,7 +2710,7 @@ } } }, - "Microchart.Bullet.Threshold": { + "MicroChart.Bullet.Threshold": { "type": "object", "additionalProperties": false, "properties": { @@ -2731,13 +2739,13 @@ } } }, - "Microchart.StackedBar": { + "MicroChart.StackedBar": { "type": "object", "additionalProperties": false, "required": ["type"], "properties": { "type": { - "description": "Represents the type of the Microchart", + "description": "Represents the type of the MicroChart", "type": "string", "const": "StackedBar" }, @@ -2756,11 +2764,23 @@ "description": "The value, which will be displayed as a text next to the bar", "type": "string" }, + "displayZeroValue": { + "description": "Defines whether bars with zero values are displayed", + "oneOf": [ + { + "type": "boolean", + "default": true + }, + { + "$ref": "#/definitions/simpleBinding" + } + ] + }, "bars": { "description": "The bars of the chart", "type": "array", "items": { - "$ref": "#/definitions/Microchart.StackedBar.Bar" + "$ref": "#/definitions/MicroChart.StackedBar.Bar" } }, "visible": { @@ -2769,13 +2789,13 @@ } } }, - "Microchart.Bullet": { + "MicroChart.Bullet": { "type": "object", "additionalProperties": false, "required": ["type"], "properties": { "type": { - "description": "Represents the type of the Microchart", + "description": "Represents the type of the MicroChart", "type": "string", "const": "Bullet" }, @@ -2847,7 +2867,7 @@ "description": "The thresholds indicators of the bar", "type": "array", "items": { - "$ref": "#/definitions/Microchart.Bullet.Threshold" + "$ref": "#/definitions/MicroChart.Bullet.Threshold" } }, "visible": { @@ -2856,6 +2876,18 @@ } } }, + "MicroChart.Generic": { + "type": "object", + "additionalProperties": true, + "required": ["type"], + "properties": { + "type": { + "description": "Represents the type of the MicroChart", + "type": "string", + "enum": ["Line", "Column", "HarveyBall", "Radial"] + } + } + }, "Configuration.Filter.ComboBoxItem": { "description": "A single Combo Box filter selection option", "type": "object", @@ -4394,17 +4426,6 @@ } } }, - "Microchart": { - "description": "[Experimental] Describes Microchart attributes", - "oneOf": [ - { - "$ref": "#/definitions/Microchart.Bullet" - }, - { - "$ref": "#/definitions/Microchart.StackedBar" - } - ] - }, "icon": { "description": "Represents icon attributes", "type": "object", @@ -4450,6 +4471,18 @@ } ] }, + "fitType": { + "description": "Defines how the image fits in the icon area", + "oneOf": [ + { + "enum": ["Cover", "Contain"], + "default": "Cover" + }, + { + "$ref": "#/definitions/simpleBinding" + } + ] + }, "backgroundColor": { "$ref": "#/definitions/iconBackgroundColor" }, @@ -4640,7 +4673,7 @@ } }, "chart": { - "$ref": "#/definitions/Microchart" + "$ref": "#/definitions/MicroChart" }, "actionsStrip": { "description": "Describes actions strip", @@ -4666,6 +4699,20 @@ "enum": ["Critical", "Error", "Good", "Neutral"], "default": "Neutral" }, + "MicroChart": { + "description": "[Experimental] Describes MicroChart attributes", + "oneOf": [ + { + "$ref": "#/definitions/MicroChart.Generic" + }, + { + "$ref": "#/definitions/MicroChart.Bullet" + }, + { + "$ref": "#/definitions/MicroChart.StackedBar" + } + ] + }, "HeaderType.Numeric.SideIndicator": { "description": "Represents side indicator attributes which are used for additional information about the main indicator", "type": "object", @@ -5098,6 +5145,9 @@ "visible": { "description": "[Experimental] Visibility of the header", "$ref": "#/definitions/visibility" + }, + "chart": { + "$ref": "#/definitions/MicroChart" } } }, @@ -5201,6 +5251,34 @@ "sandbox": { "description": "Sandbox attribute of the iframe", "type": "string" + }, + "allow": { + "description": "Allow attribute of the iframe", + "type": "string" + }, + "allowfullscreen": { + "description": "Allowfullscreen attribute of the iframe", + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "#/definitions/simpleBinding" + } + ] + }, + "omitSandbox": { + "description": "If set to 'true' the 'sandbox' attribute will not be added to the iframe.", + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "#/definitions/simpleBinding" + } + ] } } }, @@ -5447,33 +5525,7 @@ "ContentType.AnalyticsCloud": { "description": "Represents SAP Analytics Cloud content attributes", "type": "object", - "additionalProperties": false, - "properties": { - "data": { - "$ref": "#/definitions/data" - }, - "minHeight": { - "$ref": "#/definitions/minHeight" - }, - "actions": { - "description": "Defines actions that can be applied on the content", - "type": "array", - "items": { - "$ref": "#/definitions/action" - } - }, - "options": { - "description": "Options of the chart", - "oneOf": [ - { - "type": "object" - }, - { - "$ref": "#/definitions/simpleBinding" - } - ] - } - } + "additionalProperties": true }, "ContentType.Analytical": { "description": "Represents analytical content attributes", @@ -7865,6 +7917,9 @@ } } }, + "version": { + "type": "string" + }, "id_def_0": { "type": "string" }, @@ -7951,8 +8006,18 @@ } } }, - "version": { - "type": "string" + "minUI5Version": { + "oneOf": [ + { + "type": "string" + }, + { + "type": "array", + "items": { + "type": "string" + } + } + ] }, "componentUsages": { "description": "Represents component name for usage", diff --git a/test-packages/test-utils/api.d.ts b/test-packages/test-utils/api.d.ts index 567c605ef..68d16aa42 100644 --- a/test-packages/test-utils/api.d.ts +++ b/test-packages/test-utils/api.d.ts @@ -88,7 +88,7 @@ export function buildUI5Model>( opts: Partial ): UI5SemanticModel & Pick; -export const DEFAULT_UI5_VERSION = "1.71.67"; +export const DEFAULT_UI5_VERSION = "1.71.69"; // TODO: list should be updated continuously! export type TestModelVersion = diff --git a/test-packages/test-utils/src/api.ts b/test-packages/test-utils/src/api.ts index 962d33a0a..2471ffbb6 100644 --- a/test-packages/test-utils/src/api.ts +++ b/test-packages/test-utils/src/api.ts @@ -31,4 +31,4 @@ export { } from "./utils/expect"; export { getFallbackPatchVersions } from "./utils/download-ui5-resources"; -export const DEFAULT_UI5_VERSION = "1.71.67"; +export const DEFAULT_UI5_VERSION = "1.71.69"; diff --git a/test-packages/test-utils/src/utils/semantic-model-provider.ts b/test-packages/test-utils/src/utils/semantic-model-provider.ts index e1c3a208b..d4fed1e5c 100644 --- a/test-packages/test-utils/src/utils/semantic-model-provider.ts +++ b/test-packages/test-utils/src/utils/semantic-model-provider.ts @@ -14,7 +14,7 @@ const MODEL_CACHE: Record = Object.create(null); const fixes: Record = { - "1.71.67": { + "1.71.69": { array: "any[]", Array: "any[]", bloolean: undefined, @@ -258,7 +258,7 @@ type LibraryFix = (content: Json) => void; // Library version -> library name -> fix function const libraryFixes: Record> = { - "1.71.67": {}, + "1.71.69": {}, "1.84.41": {}, "1.96.27": { "sap.ui.mdc": [ diff --git a/yarn.lock b/yarn.lock index 79833ff63..09639d108 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1633,39 +1633,47 @@ dependencies: xml-js "1.6.11" -"@sap-ux/project-access@1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@sap-ux/project-access/-/project-access-1.9.1.tgz#0d03683f7d8d0a444d19a9fe8a6927d1615ff728" - integrity sha512-ObLlzem77Vpe7C6I8UimPPQW7LrSq4zQ2PaYfUaLqamrG2cu9Knl+/xRBZz51ZbHWbN/2I2cdZRBfG695PewXw== +"@sap-ux/i18n@0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@sap-ux/i18n/-/i18n-0.1.0.tgz#aeeecb19fd220a4c923d6cbc4dfed0a2d4a7270f" + integrity sha512-v16e/m+DShlqQELz6/VQZ454FeHYr/JbQA20xGT62yKjuvhG1tSKHwBrss8NYT0A9Lr8XxrKZpUZghD0iqY1/A== + dependencies: + jsonc-parser "3.2.0" + vscode-languageserver-textdocument "1.0.7" + vscode-languageserver-types "3.17.2" + +"@sap-ux/project-access@1.25.5": + version "1.25.5" + resolved "https://registry.yarnpkg.com/@sap-ux/project-access/-/project-access-1.25.5.tgz#7ffe13d83a88d35159d11ce83034c28f1d9889ea" + integrity sha512-ZBUneSOIoX8jRUUf+ffmD37wuIBikKOjmjfmMZ0dn6dp+HoQSSXhnObsP5//51d3stPZ27y40HOHkdOon3CmrQ== dependencies: - "@sap-ux/ui5-config" "0.18.2" + "@sap-ux/i18n" "0.1.0" + "@sap-ux/ui5-config" "0.23.1" + fast-xml-parser "4.2.7" findit2 "2.2.3" + json-parse-even-better-errors "3.0.2" mem-fs "2.1.0" mem-fs-editor "9.4.0" + semver "7.5.4" -"@sap-ux/ui5-config@0.18.2": - version "0.18.2" - resolved "https://registry.yarnpkg.com/@sap-ux/ui5-config/-/ui5-config-0.18.2.tgz#ef5f5257c39e8e9895b16e265487b52ade180d65" - integrity sha512-s/UsykJXbQIMmpcNjI2ChAIYBnQvnjJlp5n5QpT4XRHHwstExz2YCWz2vThXuF1GmwsCMzSjmhF+zTmGbTJ11w== +"@sap-ux/ui5-config@0.23.1": + version "0.23.1" + resolved "https://registry.yarnpkg.com/@sap-ux/ui5-config/-/ui5-config-0.23.1.tgz#5e45b4217e0292cb0a812c65117c8577a7486b2c" + integrity sha512-2pfA5GX+Oho1SpRKgWdIiY6tW8L812Jjr/zNiDm27hmua0GKifIUxt5CanN11MB+YAwkg0rJwHH/2aWLeoFiuA== dependencies: - "@sap-ux/yaml" "0.13.7" + "@sap-ux/yaml" "0.16.0" lodash "4.17.21" - semver "7.5.3" - -"@sap-ux/vocabularies-types@0.6.8": - version "0.6.8" - resolved "https://registry.yarnpkg.com/@sap-ux/vocabularies-types/-/vocabularies-types-0.6.8.tgz#abcdebfd986c249f7131d5e9085b6ff4bffb4876" - integrity sha512-58b1/E9hxSsIit9NMQ9oXCYNUaOT7kbQU1OKhAPVp3Pg2BMbkRo5p1SX6BSan4XmONUpao7yRUVZEG0dspR5qg== + semver "7.5.4" -"@sap-ux/vocabularies-types@0.7.4": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@sap-ux/vocabularies-types/-/vocabularies-types-0.7.4.tgz#66388bc5368be7edee2502a726e019cd8638c5c3" - integrity sha512-JC2s7P7EOYvnubxqDIJYdZXA/aNvK78XqvB1sMyI4z+rf/mgTTID7mIf/2J3rSwHw+GjVrDK+UvSX3vJhomKew== +"@sap-ux/vocabularies-types@0.10.14": + version "0.10.14" + resolved "https://registry.yarnpkg.com/@sap-ux/vocabularies-types/-/vocabularies-types-0.10.14.tgz#014544baf56da4ac818f0904ad4917b57f4cbb15" + integrity sha512-PtjyRBQbjCFHE1TAXz3DXuyD46eoobAK3BmOsjS60o2dNHMU9EVL1/sbbeiB2917ZV0ARezd3C1BNEict5VXfg== -"@sap-ux/yaml@0.13.7": - version "0.13.7" - resolved "https://registry.yarnpkg.com/@sap-ux/yaml/-/yaml-0.13.7.tgz#b3316c665e15ff48510abdac8cbf7b9fd7739986" - integrity sha512-4638D6TyaBA43lnhWtkXVM2xFwgDh3u8DEsTmCEvvbh6SQsE09t/eheRSoBD1ryZVG9NmmasY2tMgy3JxEPV5A== +"@sap-ux/yaml@0.16.0": + version "0.16.0" + resolved "https://registry.yarnpkg.com/@sap-ux/yaml/-/yaml-0.16.0.tgz#4a29553a0e5879ed0d9c45239dd4366b7505f691" + integrity sha512-jojo+NDZyuguUmTznj+yof2luSRarfqR2x09jRoVhS0CT2oJaAxyd60yXRtuCUFW7FbuEii+jSf+aeBU7QSPVw== dependencies: lodash "4.17.21" yaml "2.2.2" @@ -4617,6 +4625,13 @@ fast-safe-stringify@2.0.7: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== +fast-xml-parser@4.2.7: + version "4.2.7" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.2.7.tgz#871f2ca299dc4334b29f8da3658c164e68395167" + integrity sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig== + dependencies: + strnum "^1.0.5" + fastq@^1.6.0: version "1.15.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" @@ -6598,6 +6613,11 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da" + integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ== + json-parse-even-better-errors@^2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" @@ -8995,6 +9015,13 @@ semver@7.5.3, semver@^7.3.8: dependencies: lru-cache "^6.0.0" +semver@7.5.4, semver@^7.5.3: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: version "7.5.1" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" @@ -9007,13 +9034,6 @@ semver@^6.0.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.5.3: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -9556,6 +9576,11 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1. resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +strnum@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" + integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== + strong-log-transformer@2.1.0, strong-log-transformer@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -10306,6 +10331,11 @@ vscode-languageserver-textdocument@1.0.1: resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f" integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA== +vscode-languageserver-textdocument@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz#16df468d5c2606103c90554ae05f9f3d335b771b" + integrity sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg== + vscode-languageserver-textdocument@^1.0.7: version "1.0.8" resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz#9eae94509cbd945ea44bca8dcfe4bb0c15bb3ac0"