From 910e4376e770f6ffbf8c5bf2983dcecc0f587201 Mon Sep 17 00:00:00 2001 From: vadson71 Date: Fri, 5 Jan 2024 12:45:56 +0200 Subject: [PATCH] feat: updated ui5 maintenance versions (#686) * feat: updated ui5 maintenance versions * fix: linter issues and chage set * fix: build fix * fix: leftovers * fix: wrong change rollback * fix: pr comments * fix: linter --- .changeset/loud-cows-raise.md | 15 ++ packages/context/src/types.ts | 2 +- packages/context/test/unit/ui5-model.test.ts | 56 ++++--- .../unit/completion-items-classes.test.ts | 2 +- .../unit/completion-items-literals.test.ts | 2 +- .../test/unit/completion-items.test.ts | 2 +- .../test/unit/documentation.test.ts | 2 +- .../language-server/test/unit/hover.test.ts | 2 +- .../test/unit/quick-fix.test.ts | 2 +- .../xml-view-diagnostics/snapshots-utils.ts | 2 +- .../test/unit/xml-view-diagnostics.test_.ts | 2 +- .../test/unit/find-classes-matching.test.ts | 4 +- .../test/unit/get-super-class.test.ts | 2 +- .../test/unit/xml-node-to-ui5-node.test.ts | 12 +- .../test/unit/api-negative.test.ts | 51 +++--- packages/semantic-model/test/unit/api.test.ts | 12 +- .../semantic-model/test/unit/unit.test.ts | 6 +- .../semantic-model/test/unit/utils.test.ts | 2 +- .../test/unit/api.test.ts | 2 +- .../providers/attributeName/namespace.test.ts | 2 +- .../attributeName/prop-event-assoc.test.ts | 2 +- .../attributeValue/boolean-literal.test.ts | 2 +- .../providers/attributeValue/enum.test.ts | 2 +- .../attributeValue/namespace.test.ts | 2 +- .../providers/elementName/aggregation.test.ts | 2 +- .../providers/elementName/classes.test.ts | 2 +- .../test/unit/tooltip.test.ts | 2 +- .../test/unit/api.test.ts | 2 +- .../attributes/invalid-boolean-value.test.ts | 2 +- .../attributes/unknown-attribute-key.test.ts | 2 +- .../attributes/unknown-enum-value.test.ts | 2 +- .../unknown-xmlns-namespace.test.ts | 2 +- .../use-of-depracated-attribute.test.ts | 2 +- .../validators/document/non-unique-id.test.ts | 2 +- .../cardinality-of-aggregation.test.ts | 2 +- .../validators/element/non-stable-id.test.ts | 2 +- .../element/type-of-aggregation.test.ts | 2 +- .../use-of-deprecated-aggregation.test.ts | 2 +- .../element/use-of-deprecated-class.test.ts | 2 +- test-packages/test-utils/api.d.ts | 12 +- .../src/utils/semantic-model-provider.ts | 153 ++---------------- 41 files changed, 138 insertions(+), 247 deletions(-) create mode 100644 .changeset/loud-cows-raise.md diff --git a/.changeset/loud-cows-raise.md b/.changeset/loud-cows-raise.md new file mode 100644 index 000000000..2c65b54c3 --- /dev/null +++ b/.changeset/loud-cows-raise.md @@ -0,0 +1,15 @@ +--- +"@ui5-language-assistant/test-utils": patch +"@ui5-language-assistant/semantic-model": patch +"@ui5-language-assistant/context": patch +"@ui5-language-assistant/xml-views-completion": patch +"@ui5-language-assistant/xml-views-validation": patch +"@ui5-language-assistant/xml-views-tooltip": patch +"@ui5-language-assistant/language-server": patch +"@ui5-language-assistant/logic-utils": patch + +"vscode-ui5-language-assistant": patch +"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch +--- + +Adaptation to the latest UI5 maintenance changes diff --git a/packages/context/src/types.ts b/packages/context/src/types.ts index 88feb2903..b57eca129 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.60"; +export const DEFAULT_UI5_VERSION = "1.71.61"; export const UI5_VERSION_S4_PLACEHOLDER = "${sap.ui5.dist.version}"; export const UI5_FRAMEWORK_CDN_BASE_URL = { OpenUI5: "https://sdk.openui5.org/", diff --git a/packages/context/test/unit/ui5-model.test.ts b/packages/context/test/unit/ui5-model.test.ts index 00bac8712..e4b843279 100644 --- a/packages/context/test/unit/ui5-model.test.ts +++ b/packages/context/test/unit/ui5-model.test.ts @@ -41,12 +41,12 @@ describe("the UI5 language assistant ui5 model", () => { const GET_MODEL_TIMEOUT = 30000; const FRAMEWORK = "SAPUI5"; const OPEN_FRAMEWORK = "OpenUI5"; - const VERSION = "1.71.60"; + const DEFAULT_UI5_VERSION = "1.71.61"; const UI5_VERSION_S4_PLACEHOLDER = "${sap.ui5.dist.version}"; const NO_CACHE_FOLDER = undefined; function assertSemanticModel(ui5Model: UI5SemanticModel): void { - expect(ui5Model.version).toEqual(VERSION); + expect(ui5Model.version).toEqual(DEFAULT_UI5_VERSION); expect(Object.keys(ui5Model.classes).length).toBeGreaterThan(200); expect(Object.keys(ui5Model.namespaces).length).toBeGreaterThan(200); @@ -173,7 +173,7 @@ describe("the UI5 language assistant ui5 model", () => { async () => { // Create a folder with the file name so the file will not be written const cacheFilePath = getCacheFilePath( - getCacheFolder(cachePath, FRAMEWORK, VERSION), + getCacheFolder(cachePath, FRAMEWORK, DEFAULT_UI5_VERSION), "sap.m" ); expectExists(cacheFilePath, "cacheFilePath"); @@ -196,7 +196,11 @@ describe("the UI5 language assistant ui5 model", () => { "doesn't fail when file cannot be read from the cache", async () => { // Create a file with non-json content so the file will not be deserialized - const cacheFolder = getCacheFolder(cachePath, FRAMEWORK, VERSION); + const cacheFolder = getCacheFolder( + cachePath, + FRAMEWORK, + DEFAULT_UI5_VERSION + ); await mkdirs(cacheFolder); const cacheFilePath = getCacheFilePath(cacheFolder, "sap.m"); expectExists(cacheFilePath, "cacheFilePath"); @@ -270,7 +274,7 @@ describe("the UI5 language assistant ui5 model", () => { const versionMap = { SAPUI5: { latest: { - version: "1.105.0", + version: "1.120.3", support: "Maintenance", lts: true, }, @@ -280,17 +284,17 @@ describe("the UI5 language assistant ui5 model", () => { lts: true, }, "1.96": { - version: "1.96.11", + version: "1.96.27", support: "Maintenance", lts: true, }, "1.84": { - version: "1.84.27", + version: "1.84.41", support: "Maintenance", lts: true, }, "1.71": { - version: "1.71.50", + version: "1.71.70", support: "Maintenance", lts: true, }, @@ -307,7 +311,7 @@ describe("the UI5 language assistant ui5 model", () => { lts: true, }, "1.71": { - version: "1.71.50", + version: "1.71.70", support: "Maintenance", lts: true, }, @@ -348,9 +352,11 @@ describe("the UI5 language assistant ui5 model", () => { }, cachePath, FRAMEWORK, - VERSION + DEFAULT_UI5_VERSION + ); + expect(objNegotiatedVersionWithFetcher.version).toEqual( + DEFAULT_UI5_VERSION ); - expect(objNegotiatedVersionWithFetcher.version).toEqual(VERSION); }); it("resolve the default version open UI5", async () => { @@ -363,9 +369,11 @@ describe("the UI5 language assistant ui5 model", () => { }, cachePath, OPEN_FRAMEWORK, - VERSION + DEFAULT_UI5_VERSION + ); + expect(objNegotiatedVersionWithFetcher.version).toEqual( + DEFAULT_UI5_VERSION ); - expect(objNegotiatedVersionWithFetcher.version).toEqual(VERSION); }); it("resolve available concrete version OpenUI5 (1.106.0)", async () => { @@ -479,7 +487,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, "1.96" ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.96.11"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.96.27"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeFalse(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeTrue(); objNegotiatedVersionWithFetcher = await negotiateVersionWithFetcher( @@ -493,7 +501,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, "1.84" ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.84.27"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.84.41"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeFalse(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeTrue(); objNegotiatedVersionWithFetcher = await negotiateVersionWithFetcher( @@ -507,7 +515,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, "1.71" ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.50"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.70"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeFalse(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeTrue(); objNegotiatedVersionWithFetcher = await negotiateVersionWithFetcher( @@ -521,7 +529,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, "1.18" ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.50"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.70"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeFalse(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeTrue(); }); @@ -538,7 +546,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, "1" ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.50"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.70"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeFalse(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeTrue(); }); @@ -555,7 +563,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, "" ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.60"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.61"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeTrue(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeFalse(); objNegotiatedVersionWithFetcher = await negotiateVersionWithFetcher( @@ -569,7 +577,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, undefined ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.60"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.61"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeTrue(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeFalse(); }); @@ -586,7 +594,7 @@ describe("the UI5 language assistant ui5 model", () => { OPEN_FRAMEWORK, "" ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.60"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.61"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeTrue(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeFalse(); }); @@ -603,7 +611,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, "1.38" ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.50"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.70"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeFalse(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeTrue(); }); @@ -620,7 +628,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, "a.b" ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.50"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.71.70"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeFalse(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeTrue(); }); @@ -637,7 +645,7 @@ describe("the UI5 language assistant ui5 model", () => { FRAMEWORK, UI5_VERSION_S4_PLACEHOLDER ); - expect(objNegotiatedVersionWithFetcher.version).toEqual("1.105.0"); + expect(objNegotiatedVersionWithFetcher.version).toEqual("1.120.3"); expect(objNegotiatedVersionWithFetcher.isFallback).toBeFalse(); expect(objNegotiatedVersionWithFetcher.isIncorrectVersion).toBeTrue(); }); diff --git a/packages/language-server/test/unit/completion-items-classes.test.ts b/packages/language-server/test/unit/completion-items-classes.test.ts index 3d4f10de1..358806dac 100644 --- a/packages/language-server/test/unit/completion-items-classes.test.ts +++ b/packages/language-server/test/unit/completion-items-classes.test.ts @@ -26,7 +26,7 @@ describe("the UI5 language assistant Code Completion Services - classes", () => beforeAll(async function () { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/language-server/test/unit/completion-items-literals.test.ts b/packages/language-server/test/unit/completion-items-literals.test.ts index e8e5cbede..c975e8894 100644 --- a/packages/language-server/test/unit/completion-items-literals.test.ts +++ b/packages/language-server/test/unit/completion-items-literals.test.ts @@ -17,7 +17,7 @@ describe("the UI5 language assistant Code Completion Services", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/language-server/test/unit/completion-items.test.ts b/packages/language-server/test/unit/completion-items.test.ts index f1939ed7b..0bd14b47a 100644 --- a/packages/language-server/test/unit/completion-items.test.ts +++ b/packages/language-server/test/unit/completion-items.test.ts @@ -30,7 +30,7 @@ describe("the UI5 language assistant Code Completion Services", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/language-server/test/unit/documentation.test.ts b/packages/language-server/test/unit/documentation.test.ts index 270817fec..e7ecf5998 100644 --- a/packages/language-server/test/unit/documentation.test.ts +++ b/packages/language-server/test/unit/documentation.test.ts @@ -11,7 +11,7 @@ describe("The @ui5-language-assistant/language-server fun beforeAll(async function () { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); diff --git a/packages/language-server/test/unit/hover.test.ts b/packages/language-server/test/unit/hover.test.ts index 89c15c319..42e85721b 100644 --- a/packages/language-server/test/unit/hover.test.ts +++ b/packages/language-server/test/unit/hover.test.ts @@ -23,7 +23,7 @@ describe("the UI5 language assistant Hover Tooltip Service", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/language-server/test/unit/quick-fix.test.ts b/packages/language-server/test/unit/quick-fix.test.ts index 86274df32..93bf8c3c0 100644 --- a/packages/language-server/test/unit/quick-fix.test.ts +++ b/packages/language-server/test/unit/quick-fix.test.ts @@ -20,7 +20,7 @@ describe("The @ui5-language-assistant/language-server diagnostics quick fix func beforeAll(async function () { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/language-server/test/unit/snapshots/xml-view-diagnostics/snapshots-utils.ts b/packages/language-server/test/unit/snapshots/xml-view-diagnostics/snapshots-utils.ts index 200b6d4f8..304f122bb 100644 --- a/packages/language-server/test/unit/snapshots/xml-view-diagnostics/snapshots-utils.ts +++ b/packages/language-server/test/unit/snapshots/xml-view-diagnostics/snapshots-utils.ts @@ -96,7 +96,7 @@ export function readSnapshotDiagnosticsLSPResponse( const ui5ModelPromise = generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); let ui5Model: UI5SemanticModel | undefined = undefined; diff --git a/packages/language-server/test/unit/xml-view-diagnostics.test_.ts b/packages/language-server/test/unit/xml-view-diagnostics.test_.ts index 80b934a6f..3c08a6b3f 100644 --- a/packages/language-server/test/unit/xml-view-diagnostics.test_.ts +++ b/packages/language-server/test/unit/xml-view-diagnostics.test_.ts @@ -21,7 +21,7 @@ describe("the UI5 language assistant xml view diagnostics service", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.108.2", + version: "1.108.26", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/logic-utils/test/unit/find-classes-matching.test.ts b/packages/logic-utils/test/unit/find-classes-matching.test.ts index b7d9cc600..1842d233d 100644 --- a/packages/logic-utils/test/unit/find-classes-matching.test.ts +++ b/packages/logic-utils/test/unit/find-classes-matching.test.ts @@ -14,7 +14,7 @@ describe("The @ui5-language-assistant/logic-utils func beforeAll(async () => { ui5Model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); @@ -73,7 +73,7 @@ describe("The @ui5-language-assistant/logic-utils function", () let ui5Model: UI5SemanticModel; const beforeAllPromise = generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); diff --git a/packages/logic-utils/test/unit/get-super-class.test.ts b/packages/logic-utils/test/unit/get-super-class.test.ts index 137f8c32f..1ec07a933 100644 --- a/packages/logic-utils/test/unit/get-super-class.test.ts +++ b/packages/logic-utils/test/unit/get-super-class.test.ts @@ -36,7 +36,7 @@ describe("The @ui5-language-assistant/logic-utils function", ( const ui5Model = cloneDeep( await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }) ); diff --git a/packages/logic-utils/test/unit/xml-node-to-ui5-node.test.ts b/packages/logic-utils/test/unit/xml-node-to-ui5-node.test.ts index 99fd11eca..17acce924 100644 --- a/packages/logic-utils/test/unit/xml-node-to-ui5-node.test.ts +++ b/packages/logic-utils/test/unit/xml-node-to-ui5-node.test.ts @@ -22,7 +22,7 @@ describe("The @ui5-language-assistant/logic-utils func beforeAll(async () => { ui5Model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); @@ -105,7 +105,7 @@ describe("The @ui5-language-assistant/logic-utils { ui5Model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); @@ -187,7 +187,7 @@ describe("The @ui5-language-assistant/logic-utils { ui5Model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); @@ -337,7 +337,7 @@ describe("The @ui5-language-assistant/logic-utils fun beforeAll(async () => { ui5Model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); @@ -432,7 +432,7 @@ describe("The @ui5-language-assistant/logic-utils { ui5Model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); @@ -496,7 +496,7 @@ describe("The @ui5-language-assistant/logic-utils { ui5Model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); diff --git a/packages/semantic-model/test/unit/api-negative.test.ts b/packages/semantic-model/test/unit/api-negative.test.ts index ee77f16ad..e142d1898 100644 --- a/packages/semantic-model/test/unit/api-negative.test.ts +++ b/packages/semantic-model/test/unit/api-negative.test.ts @@ -7,6 +7,7 @@ import { import { forEachSymbol } from "../../src/utils"; import { generate } from "../../src/api"; +const DEFAULT_UI5_VERSION = "1.71.61"; describe("The ui5-language-assistant semantic model package API negative tests", () => { describe("generate from model with invalid library file", () => { const message = "not a valid library file"; @@ -17,12 +18,12 @@ describe("The ui5-language-assistant semantic model package API negative tests", ): () => UI5SemanticModel { const generateCall = (): UI5SemanticModel => { return generate({ - version: "1.71.49", + version: DEFAULT_UI5_VERSION, libraries: { validLib: { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "validLib", symbols: [ { @@ -78,7 +79,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const validLibNamespaces = ["sap.valid", "sap"]; const invalidLibValidNamespaces = ["sap.validNS"]; expect(model).not.toBeUndefined(); - expect(model.version).toEqual("1.71.49"); + expect(model.version).toEqual(DEFAULT_UI5_VERSION); expect(keys(model.namespaces)).toIncludeAllMembers(validLibNamespaces); if (onlyValidLibSymbols) { @@ -109,7 +110,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", describe("$schema-ref is not a string", () => { const fileContent = { "$schema-ref": 123, - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [validSymbolFromInvalidLib], }; @@ -145,7 +146,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", describe("library is not a string or undefined", () => { const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: 123, symbols: [validSymbolFromInvalidLib], }; @@ -163,7 +164,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", describe("symbols is not an array", () => { const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: 123, }; @@ -181,7 +182,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", describe("symbol with unknown kind exists", () => { const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -217,7 +218,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -248,7 +249,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -281,7 +282,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -314,7 +315,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -345,7 +346,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -378,7 +379,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -415,7 +416,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -446,7 +447,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -479,7 +480,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -514,7 +515,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -545,7 +546,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -578,7 +579,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -616,7 +617,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -660,7 +661,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -708,7 +709,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", describe("invalid extends for class", () => { const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -752,7 +753,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", describe("invalid implements for class", () => { const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -796,7 +797,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", describe("invalid defaultAggregation for class", () => { const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, @@ -837,7 +838,7 @@ describe("The ui5-language-assistant semantic model package API negative tests", describe("invalid type for class property", () => { const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: DEFAULT_UI5_VERSION, library: "invalidLib", symbols: [ validSymbolFromInvalidLib, diff --git a/packages/semantic-model/test/unit/api.test.ts b/packages/semantic-model/test/unit/api.test.ts index 03a835387..7f064ea9d 100644 --- a/packages/semantic-model/test/unit/api.test.ts +++ b/packages/semantic-model/test/unit/api.test.ts @@ -306,13 +306,7 @@ describe("The ui5-language-assistant semantic model package API", () => { } // TODO: old patches may be removed, should be updated continuously - const versions: TestModelVersion[] = [ - "1.60.44", - "1.71.49", - "1.84.27", - "1.96.11", - // "1.105.0", - ]; + const versions: TestModelVersion[] = ["1.71.61", "1.84.41", "1.96.27"]; for (const version of versions) { // TODO: consider also openui5? createModelConsistencyTests("SAPUI5", version); @@ -325,7 +319,7 @@ describe("The ui5-language-assistant semantic model package API", () => { beforeAll(async () => { model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); @@ -394,7 +388,7 @@ describe("The ui5-language-assistant semantic model package API", () => { beforeAll(async () => { model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); diff --git a/packages/semantic-model/test/unit/unit.test.ts b/packages/semantic-model/test/unit/unit.test.ts index 322c342aa..66b1f537a 100644 --- a/packages/semantic-model/test/unit/unit.test.ts +++ b/packages/semantic-model/test/unit/unit.test.ts @@ -70,7 +70,7 @@ describe("The ui5-language-assistant semantic model package unit tests", () => { describe("generate", () => { function generateSymbol(symbol: SymbolBase): UI5SemanticModel { return generate({ - version: "1.71.49", + version: "1.71.61", strict: true, typeNameFix: {}, libraries: { @@ -210,7 +210,7 @@ describe("The ui5-language-assistant semantic model package unit tests", () => { describe("symbols is undefined", () => { const fileContent = { "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0", - version: "1.71.49", + version: "1.71.61", library: "testLib", }; @@ -241,7 +241,7 @@ describe("The ui5-language-assistant semantic model package unit tests", () => { libraries: Record ): UI5SemanticModel { const result = generate({ - version: "1.71.49", + version: "1.71.61", strict: false, typeNameFix: {}, libraries: libraries, diff --git a/packages/semantic-model/test/unit/utils.test.ts b/packages/semantic-model/test/unit/utils.test.ts index 7d208c1d4..bf113fffd 100644 --- a/packages/semantic-model/test/unit/utils.test.ts +++ b/packages/semantic-model/test/unit/utils.test.ts @@ -12,7 +12,7 @@ describe("The semantic model utils", () => { beforeAll(async () => { model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); }); diff --git a/packages/xml-views-completion/test/unit/api.test.ts b/packages/xml-views-completion/test/unit/api.test.ts index 9f268526a..2857167e5 100644 --- a/packages/xml-views-completion/test/unit/api.test.ts +++ b/packages/xml-views-completion/test/unit/api.test.ts @@ -23,7 +23,7 @@ describe("The `getXMLViewCompletions()` api", () => { beforeAll(async function () { REAL_UI5_MODEL = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(REAL_UI5_MODEL); diff --git a/packages/xml-views-completion/test/unit/providers/attributeName/namespace.test.ts b/packages/xml-views-completion/test/unit/providers/attributeName/namespace.test.ts index b04b089c2..d173a6b44 100644 --- a/packages/xml-views-completion/test/unit/providers/attributeName/namespace.test.ts +++ b/packages/xml-views-completion/test/unit/providers/attributeName/namespace.test.ts @@ -154,7 +154,7 @@ describe("The ui5-language-assistant xml-views-completion", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-completion/test/unit/providers/attributeName/prop-event-assoc.test.ts b/packages/xml-views-completion/test/unit/providers/attributeName/prop-event-assoc.test.ts index 8b5bd7f31..cdbd88066 100644 --- a/packages/xml-views-completion/test/unit/providers/attributeName/prop-event-assoc.test.ts +++ b/packages/xml-views-completion/test/unit/providers/attributeName/prop-event-assoc.test.ts @@ -62,7 +62,7 @@ describe("The ui5-language-assistant xml-views-completion", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-completion/test/unit/providers/attributeValue/boolean-literal.test.ts b/packages/xml-views-completion/test/unit/providers/attributeValue/boolean-literal.test.ts index 23f213407..b84461608 100644 --- a/packages/xml-views-completion/test/unit/providers/attributeValue/boolean-literal.test.ts +++ b/packages/xml-views-completion/test/unit/providers/attributeValue/boolean-literal.test.ts @@ -17,7 +17,7 @@ describe("The ui5-language-assistant xml-views-completion", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-completion/test/unit/providers/attributeValue/enum.test.ts b/packages/xml-views-completion/test/unit/providers/attributeValue/enum.test.ts index 9f38bb3b7..64e8246b4 100644 --- a/packages/xml-views-completion/test/unit/providers/attributeValue/enum.test.ts +++ b/packages/xml-views-completion/test/unit/providers/attributeValue/enum.test.ts @@ -14,7 +14,7 @@ describe("The ui5-language-assistant xml-views-completion", () => { beforeAll(async function () { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-completion/test/unit/providers/attributeValue/namespace.test.ts b/packages/xml-views-completion/test/unit/providers/attributeValue/namespace.test.ts index 08154d9eb..75b9a411e 100644 --- a/packages/xml-views-completion/test/unit/providers/attributeValue/namespace.test.ts +++ b/packages/xml-views-completion/test/unit/providers/attributeValue/namespace.test.ts @@ -31,7 +31,7 @@ describe("The ui5-editor-tools xml-views-completion", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-completion/test/unit/providers/elementName/aggregation.test.ts b/packages/xml-views-completion/test/unit/providers/elementName/aggregation.test.ts index b33d19d69..333de587a 100644 --- a/packages/xml-views-completion/test/unit/providers/elementName/aggregation.test.ts +++ b/packages/xml-views-completion/test/unit/providers/elementName/aggregation.test.ts @@ -17,7 +17,7 @@ describe("The ui5-language-assistant xml-views-completion", () => { beforeAll(async () => { REAL_UI5_MODEL = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(REAL_UI5_MODEL); diff --git a/packages/xml-views-completion/test/unit/providers/elementName/classes.test.ts b/packages/xml-views-completion/test/unit/providers/elementName/classes.test.ts index 09fdc1bbb..642d3c975 100644 --- a/packages/xml-views-completion/test/unit/providers/elementName/classes.test.ts +++ b/packages/xml-views-completion/test/unit/providers/elementName/classes.test.ts @@ -25,7 +25,7 @@ describe("The ui5-language-assistant xml-views-completion", () => { beforeAll(async function () { ui5Model = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5Model); diff --git a/packages/xml-views-tooltip/test/unit/tooltip.test.ts b/packages/xml-views-tooltip/test/unit/tooltip.test.ts index 9dc728914..69b449855 100644 --- a/packages/xml-views-tooltip/test/unit/tooltip.test.ts +++ b/packages/xml-views-tooltip/test/unit/tooltip.test.ts @@ -21,7 +21,7 @@ describe("the UI5 language assistant Hover Tooltip Service", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/api.test.ts b/packages/xml-views-validation/test/unit/api.test.ts index 3fd1e34e7..c9212f02a 100644 --- a/packages/xml-views-validation/test/unit/api.test.ts +++ b/packages/xml-views-validation/test/unit/api.test.ts @@ -17,7 +17,7 @@ describe("the ui5 xml views validations API", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/attributes/invalid-boolean-value.test.ts b/packages/xml-views-validation/test/unit/validators/attributes/invalid-boolean-value.test.ts index bf23c1e2e..0493ef701 100644 --- a/packages/xml-views-validation/test/unit/validators/attributes/invalid-boolean-value.test.ts +++ b/packages/xml-views-validation/test/unit/validators/attributes/invalid-boolean-value.test.ts @@ -15,7 +15,7 @@ describe("the invalid boolean value validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/attributes/unknown-attribute-key.test.ts b/packages/xml-views-validation/test/unit/validators/attributes/unknown-attribute-key.test.ts index 008375ff2..934154411 100644 --- a/packages/xml-views-validation/test/unit/validators/attributes/unknown-attribute-key.test.ts +++ b/packages/xml-views-validation/test/unit/validators/attributes/unknown-attribute-key.test.ts @@ -21,7 +21,7 @@ describe("the unknown attribute name validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/attributes/unknown-enum-value.test.ts b/packages/xml-views-validation/test/unit/validators/attributes/unknown-enum-value.test.ts index d6496ed3b..ca15f36a0 100644 --- a/packages/xml-views-validation/test/unit/validators/attributes/unknown-enum-value.test.ts +++ b/packages/xml-views-validation/test/unit/validators/attributes/unknown-enum-value.test.ts @@ -15,7 +15,7 @@ describe("the unknown enum value validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/attributes/unknown-xmlns-namespace.test.ts b/packages/xml-views-validation/test/unit/validators/attributes/unknown-xmlns-namespace.test.ts index 57de2c498..c81f36b52 100644 --- a/packages/xml-views-validation/test/unit/validators/attributes/unknown-xmlns-namespace.test.ts +++ b/packages/xml-views-validation/test/unit/validators/attributes/unknown-xmlns-namespace.test.ts @@ -15,7 +15,7 @@ describe("the unknown namespace in xmlns attribute value validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/attributes/use-of-depracated-attribute.test.ts b/packages/xml-views-validation/test/unit/validators/attributes/use-of-depracated-attribute.test.ts index 840a4e1fc..dd29c3375 100644 --- a/packages/xml-views-validation/test/unit/validators/attributes/use-of-depracated-attribute.test.ts +++ b/packages/xml-views-validation/test/unit/validators/attributes/use-of-depracated-attribute.test.ts @@ -25,7 +25,7 @@ describe("the use of deprecated attribute validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/document/non-unique-id.test.ts b/packages/xml-views-validation/test/unit/validators/document/non-unique-id.test.ts index bd54d4faf..5b5470932 100644 --- a/packages/xml-views-validation/test/unit/validators/document/non-unique-id.test.ts +++ b/packages/xml-views-validation/test/unit/validators/document/non-unique-id.test.ts @@ -27,7 +27,7 @@ describe("the use of non unique id validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/element/cardinality-of-aggregation.test.ts b/packages/xml-views-validation/test/unit/validators/element/cardinality-of-aggregation.test.ts index 1950e8726..5e1a739e9 100644 --- a/packages/xml-views-validation/test/unit/validators/element/cardinality-of-aggregation.test.ts +++ b/packages/xml-views-validation/test/unit/validators/element/cardinality-of-aggregation.test.ts @@ -22,7 +22,7 @@ describe("the cardinality aggregation validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/element/non-stable-id.test.ts b/packages/xml-views-validation/test/unit/validators/element/non-stable-id.test.ts index 1ed80b5e4..652a14b37 100644 --- a/packages/xml-views-validation/test/unit/validators/element/non-stable-id.test.ts +++ b/packages/xml-views-validation/test/unit/validators/element/non-stable-id.test.ts @@ -22,7 +22,7 @@ describe("the use of non stable id validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/element/type-of-aggregation.test.ts b/packages/xml-views-validation/test/unit/validators/element/type-of-aggregation.test.ts index 5eba4e513..ba54992e9 100644 --- a/packages/xml-views-validation/test/unit/validators/element/type-of-aggregation.test.ts +++ b/packages/xml-views-validation/test/unit/validators/element/type-of-aggregation.test.ts @@ -25,7 +25,7 @@ describe("the type aggregation validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/element/use-of-deprecated-aggregation.test.ts b/packages/xml-views-validation/test/unit/validators/element/use-of-deprecated-aggregation.test.ts index 900bdd2e9..7d5d05936 100644 --- a/packages/xml-views-validation/test/unit/validators/element/use-of-deprecated-aggregation.test.ts +++ b/packages/xml-views-validation/test/unit/validators/element/use-of-deprecated-aggregation.test.ts @@ -20,7 +20,7 @@ describe("the use of deprecated aggregation validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/packages/xml-views-validation/test/unit/validators/element/use-of-deprecated-class.test.ts b/packages/xml-views-validation/test/unit/validators/element/use-of-deprecated-class.test.ts index 52358ef80..bba12c41b 100644 --- a/packages/xml-views-validation/test/unit/validators/element/use-of-deprecated-class.test.ts +++ b/packages/xml-views-validation/test/unit/validators/element/use-of-deprecated-class.test.ts @@ -15,7 +15,7 @@ describe("the use of deprecated class validation", () => { beforeAll(async () => { ui5SemanticModel = await generateModel({ framework: "SAPUI5", - version: "1.71.49", + version: "1.71.61", modelGenerator: generate, }); appContext = getDefaultContext(ui5SemanticModel); diff --git a/test-packages/test-utils/api.d.ts b/test-packages/test-utils/api.d.ts index 2cd83a143..12057b0ae 100644 --- a/test-packages/test-utils/api.d.ts +++ b/test-packages/test-utils/api.d.ts @@ -90,13 +90,11 @@ export function buildUI5Model>( // TODO: list should be updated continuously! export type TestModelVersion = - | "1.60.44" - | /* OOM */ "1.71.49" - | "1.84.27" - | "1.96.11" - | "1.105.0" - | "1.108.2" - | "1.109.1"; + | /* OOM */ "1.71.61" + | "1.84.41" + | "1.96.27" + | "1.108.26" + | "1.114.11"; /** * Return a UI5SemanticModel for the specified version. 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 68dc54de0..382a0ba4a 100644 --- a/test-packages/test-utils/src/utils/semantic-model-provider.ts +++ b/test-packages/test-utils/src/utils/semantic-model-provider.ts @@ -1,7 +1,7 @@ import { readdirSync } from "fs"; import { readJsonSync, readJson, existsSync } from "fs-extra"; import { resolve, dirname } from "path"; -import { filter, reduce, has, forEach, remove, get, find } from "lodash"; +import { filter, reduce, has, forEach, get } from "lodash"; import { FetchResponse } from "@ui5-language-assistant/language-server"; import { UI5Framework, @@ -14,46 +14,7 @@ const MODEL_CACHE: Record = Object.create(null); const fixes: Record = { - "1.60.44": { - "{sap.ui.layout.cssgrid.IGridConfigurable}": undefined, - "sap.m.IHyphenation": undefined, - "sap.ui.core.IDScope": undefined, - "sap.m.TimePickerSlider": undefined, - "sap.ui.layout.ResponsiveSplitterPage": undefined, - "sap.ui.layout.cssgrid.CSSGridTrack": undefined, - "sap.ui.layout.cssgrid.CSSGridGapShortHand": undefined, - "sap.ui.layout.cssgrid.CSSGridLine": undefined, - "sap.gantt.def.SvgDefs": undefined, - "sap.gantt.simple.UtilizationChart": undefined, - "sap.ui.suite.ui.commons.statusindicator.SimpleShape": undefined, - "sap.ui.fl.transport.FlTransportDialog": undefined, - "sap.ui.mdc.EditMode": undefined, - "sap.ui.mdc.base.FieldHelpBase": undefined, - "sap.ui.vk.TransformationMatrix": undefined, - "sap.ui.base.BaseObject": undefined, - "sap.ui.core.EventProvider": undefined, - "sap.ui.vk.": "sap.ui.vk.Material", - Service: undefined, - - Control: "sap.ui.core.Control", - Element: "sap.ui.core.Element", - array: "any[]", - Array: "any[]", - bloolean: "boolean", - "sap.gantt.misc.AxisTime": "sap.gantt.misc.AxisTimes", - "sap.gantt.control.Toolbar": undefined, - "sap.gantt.DragOrientation": undefined, - "sap.gantt.simple.GanttHeader": undefined, - "sap.gantt.simple.InnerGanttChart": undefined, - "sap.rules.ui.RuleBase": undefined, - "sap.ui.generic.app.transaction.BaseController": undefined, - "sap.ui.vk.tools.HitTestIdMode": undefined, - "sap.ui.vk.tools.CoordinateSystem": undefined, - "sap.ui.vk.SelectionMode": undefined, - "sap.viz.ui5.controls.VizRangeSlider": undefined, - any: "any", - }, - "1.71.49": { + "1.71.61": { array: "any[]", Array: "any[]", bloolean: undefined, @@ -66,6 +27,7 @@ const fixes: Record = { "sap.gantt.simple.GanttHeader": undefined, "sap.gantt.simple.InnerGanttChart": undefined, "sap.m.PlanningCalendarHeader": undefined, + "sap.m.IToolbarInteractiveControl": undefined, "sap.m.TimePickerSlider": undefined, "sap.rules.ui.RuleBase": undefined, "sap.ui.generic.app.transaction.BaseController": undefined, @@ -85,7 +47,7 @@ const fixes: Record = { "sap.viz.ui5.controls.VizRangeSlider": undefined, any: "any", }, - "1.84.27": { + "1.84.41": { array: "any[]", Array: "any[]", Control: "sap.ui.core.Control", @@ -102,6 +64,7 @@ const fixes: Record = { "sap.gantt.simple.InnerGanttChart": undefined, "sap.m.PlanningCalendarHeader": undefined, "sap.m.TimePickerSlider": undefined, + "sap.m.IToolbarInteractiveControl": undefined, "sap.rules.ui.RuleBase": undefined, "sap.ui.core.mvc.XMLProcessingMode": undefined, "sap.ui.fl.write._internal.transport.TransportDialog": undefined, @@ -118,7 +81,7 @@ const fixes: Record = { "QUnit.Assert": undefined, any: "any", }, - "1.96.11": { + "1.96.27": { array: "any[]", Array: "any[]", "object|string": "object", @@ -142,6 +105,7 @@ const fixes: Record = { "sap.m.p13n.AbstractContainer": undefined, "sap.m.PlanningCalendarHeader": undefined, "sap.m.internal.ToggleSpinButton": undefined, + "sap.m.IToolbarInteractiveControl": undefined, "sap.m.TimePickerClock": undefined, "sap.m.TimePickerSlider": undefined, "sap.rules.ui.RuleBase": undefined, @@ -159,59 +123,10 @@ const fixes: Record = { "sap.viz.ui5.controls.VizRangeSlider": undefined, "QUnit.Assert": undefined, }, - "1.105.0": { - array: "any[]", - Array: "any[]", - "object|string": "object", - "boolean|string": "boolean", - Promise: undefined, - - "function() : function": undefined, - "function() : boolean": undefined, - - Element: "sap.ui.core.Element", - - "sap.f.cards.NumericIndicators": undefined, - "sap.fe.core.TemplateComponent": undefined, - "sap.fe.macros.MacroMetadata": undefined, - "sap.fe.macros.NavigationType": undefined, - "sap.fe.navigation.NavError": undefined, - "sap.fe.navigation.NavigationHandler": undefined, - "sap.fe.navigation.PresentationVariant": undefined, - "sap.fe.navigation.SelectionVariant": undefined, - "sap.fe.templates.ExtensionAPI": undefined, - "sap.gantt.control.Toolbar": undefined, - "sap.gantt.simple.GanttSearchSidePanel": undefined, - "sap.gantt.simple.GanttHeader": undefined, - "sap.gantt.simple.InnerGanttChart": undefined, - "sap.m.PlanningCalendarHeader": undefined, - "sap.m.internal.ToggleSpinButton": undefined, - "sap.m.TimePickerClock": undefined, - "sap.m.TimePickerSlider": undefined, - "sap.rules.ui.RuleBase": undefined, - "sap.sac.df.DFKernel": undefined, - "sap.suite.ui.commons.FilePickerModes": undefined, - "sap.ui.core.mvc.XMLProcessingMode": undefined, - "Object": "object", - "sap.ui.integration.cards.filters.FilterBar": undefined, - "sap.ui.layout.ResponsiveSplitterPage": undefined, - "sap.ui.mdc.IxState": undefined, - "sap.ui.mdc.chart.ChartToolbar": undefined, - "sap.ui.mdc.field.FieldValueHelpTableWrapperBase": undefined, - "sap.ui.mdc.filterbar.IFilterContainer": undefined, - "sap.ui.mdc.TableType": undefined, - "sap.ui.vk.RedlineComment": undefined, - "sap.ui.vk.ToggleMenuItem": undefined, - "sap.ui.vk.ViewManager": undefined, - "sap.ushell.ui.tile.TileBase": undefined, - "sap.viz.ui5.controls.VizRangeSlider": undefined, - "QUnit.Assert": undefined, - any: "any", - }, - "1.108.2": { + "1.108.26": { any: "any", }, - "1.109.1": { + "1.114.11": { any: "any", }, }; @@ -343,49 +258,9 @@ type LibraryFix = (content: Json) => void; // Library version -> library name -> fix function const libraryFixes: Record> = { - "1.60.44": { - "sap.ushell": [ - (content: Json): void => { - const symbol = find( - get(content, "symbols"), - (symbol) => symbol.name === "sap.ushell.services.EndUserFeedback" - ); - const method = find( - get(symbol, "methods"), - (method) => method.name === "getLegalText" - ); - remove(method.parameters, (parameter) => get(parameter, "name") === ""); - }, - ], - }, - "1.71.49": {}, - "1.84.27": {}, - "1.96.11": { - "sap.ui.mdc": [ - (content: Json): void => { - forEach(get(content, "symbols"), (symbol) => { - const defaultAggregation = - symbol?.["ui5-metadata"]?.defaultAggregation; - if ( - defaultAggregation && - !symbol["ui5-metadata"].aggregations?.[defaultAggregation] - ) { - symbol["ui5-metadata"].aggregations = - symbol["ui5-metadata"].aggregations || []; - symbol["ui5-metadata"].aggregations.push({ - name: "content", - singularName: "content", - type: "sap.ui.core.Control", - cardinality: "0..1", - visibility: "public", - methods: ["getContent", "destroyContent", "setContent"], - }); - } - }); - }, - ], - }, - "1.105.0": { + "1.71.61": {}, + "1.84.41": {}, + "1.96.27": { "sap.ui.mdc": [ (content: Json): void => { forEach(get(content, "symbols"), (symbol) => { @@ -410,8 +285,8 @@ const libraryFixes: Record> = { }, ], }, - "1.108.2": {}, - "1.109.1": {}, + "1.108.26": {}, + "1.114.11": {}, }; function fixLibraries(