From 5b9fa1f32fbed31d27a0bcb2d9e51a6b5b5ddc15 Mon Sep 17 00:00:00 2001 From: Maruf Rasully <100434800+marufrasully@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:38:11 +0200 Subject: [PATCH 1/6] fix: add manual test case (#706) --- .changeset/calm-pears-train.md | 6 ++ .../test/manual-tests/navigation.md | 66 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 .changeset/calm-pears-train.md create mode 100644 packages/vscode-ui5-language-assistant/test/manual-tests/navigation.md diff --git a/.changeset/calm-pears-train.md b/.changeset/calm-pears-train.md new file mode 100644 index 000000000..1c2dd73f9 --- /dev/null +++ b/.changeset/calm-pears-train.md @@ -0,0 +1,6 @@ +--- +"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch +"vscode-ui5-language-assistant": patch +--- + +fix: add manual test case diff --git a/packages/vscode-ui5-language-assistant/test/manual-tests/navigation.md b/packages/vscode-ui5-language-assistant/test/manual-tests/navigation.md new file mode 100644 index 000000000..f904a2699 --- /dev/null +++ b/packages/vscode-ui5-language-assistant/test/manual-tests/navigation.md @@ -0,0 +1,66 @@ +# Navigation + +## Associated user stories: + +[#702](https://github.com/SAP/ui5-language-assistant/issues/702) Enable navigation to controller files + +## Install latest UI5 Language Assistant + +[UI5 Language Assistant](https://marketplace.visualstudio.com/items?itemName=SAPOSS.vscode-ui5-language-assistant) + +## Instructions on how to use `Go to Definition` and `Peek Definition` feature + +### Go to Definition: + +The Go To Definition feature helps you to navigate to the file and opens the result in a new tab. + +Place cursor somewhere inside value of XML attribute where navigation is supported and + +- keyboard: press `F12` (in Visual Studio Code), or `Ctrl` + `F11` (in SAP Business Application Studio) + +- mouse: right click and select `Go To Definition`, or. + +- keyboard and mouse: `CTRL` + `Click` (Win), `command ⌘` + `Click` (Mac) + +### Peek Definition: + +The Peek Definition feature lets you preview file without switching away from the code that you're editing. + +Place cursor somewhere inside value of XML attribute where navigation is supported and + +- keyboard: press `Alt` + `F12` (Win), `Option ⌥ ` + `F12` (Mac), or + +- mouse: right click and select `Peek Definition` + +## Test project + +1. Prepare an UI5 Project + - Your project or + - Clone [ui5-language-assistant](https://github.com/SAP/ui5-language-assistant) repo and open `test-packages/framework/projects/cap` +2. Launch VSCode and open project root folder +3. Install project dependencies using command `npm install` + +**Note:** For this manual test, we use `test-packages/framework/projects/cap` project + +## Navigate to controller files + +1. Open `Main.view.xml` file which is located under `app/manage_travels/webapp/ext/main` folder +2. Place cursor anywhere on `"sap.fe.demo.managetravels.ext.main.Main"` +3. Peek Definition (as described above). + - Observe `Main.controller.js` is peeked +4. Go to Definition (as described above). + - Observe navigation to `Main.controller.js` + +**Note:** +This feature is supported for value of following xml attributes + +- `controllerName` +- `core:require` +- `template:require` + +and it can navigate to local file with following extension. + +- `.controller.js` +- `.js` +- `.controller.ts` +- `.ts` From 49d45ee96ca3afbd2ee2a7d70d1871e43083bcd5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 11 Apr 2024 08:48:04 +0000 Subject: [PATCH 2/6] chore: apply latest changesets --- .changeset/calm-pears-train.md | 6 ------ packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md | 6 ++++++ packages/vscode-ui5-language-assistant-bas-ext/package.json | 4 ++-- packages/vscode-ui5-language-assistant/CHANGELOG.md | 6 ++++++ packages/vscode-ui5-language-assistant/package.json | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 .changeset/calm-pears-train.md diff --git a/.changeset/calm-pears-train.md b/.changeset/calm-pears-train.md deleted file mode 100644 index 1c2dd73f9..000000000 --- a/.changeset/calm-pears-train.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch -"vscode-ui5-language-assistant": patch ---- - -fix: add manual test case diff --git a/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md b/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md index 4528ea8ae..05f4d3e15 100644 --- a/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md +++ b/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.0.60 + +### Patch Changes + +- 5b9fa1f: fix: add manual test case + ## 4.0.59 ### Patch Changes diff --git a/packages/vscode-ui5-language-assistant-bas-ext/package.json b/packages/vscode-ui5-language-assistant-bas-ext/package.json index a48f7e784..5ba408c86 100644 --- a/packages/vscode-ui5-language-assistant-bas-ext/package.json +++ b/packages/vscode-ui5-language-assistant-bas-ext/package.json @@ -2,7 +2,7 @@ "name": "@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext", "description": "A wrapper module for BAS simple extension around Language Support For SAPUI5", "license": "Apache-2.0", - "version": "4.0.59", + "version": "4.0.60", "private": false, "repository": { "type": "git", @@ -13,7 +13,7 @@ }, "devDependencies": { "fs-extra": "10.1.0", - "vscode-ui5-language-assistant": "4.0.59" + "vscode-ui5-language-assistant": "4.0.60" }, "files": [ "*.vsix", diff --git a/packages/vscode-ui5-language-assistant/CHANGELOG.md b/packages/vscode-ui5-language-assistant/CHANGELOG.md index 77a332874..9385cbd80 100644 --- a/packages/vscode-ui5-language-assistant/CHANGELOG.md +++ b/packages/vscode-ui5-language-assistant/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.0.60 + +### Patch Changes + +- 5b9fa1f: fix: add manual test case + ## 4.0.59 ### Patch Changes diff --git a/packages/vscode-ui5-language-assistant/package.json b/packages/vscode-ui5-language-assistant/package.json index 83fce4193..bb1c325a2 100644 --- a/packages/vscode-ui5-language-assistant/package.json +++ b/packages/vscode-ui5-language-assistant/package.json @@ -3,7 +3,7 @@ "displayName": "UI5 Language Assistant", "private": true, "description": "Language Support For SAPUI5", - "version": "4.0.59", + "version": "4.0.60", "publisher": "SAPOSS", "icon": "resources/ui5-language-assistant.png", "keywords": [ From 98c33e71e2b042b5c1a39089ff8ac3acd92eeb18 Mon Sep 17 00:00:00 2001 From: Maruf Rasully <100434800+marufrasully@users.noreply.github.com> Date: Tue, 23 Apr 2024 14:10:17 +0200 Subject: [PATCH 3/6] fix: relax diagnostic for special property (#708) * fix: relax diagnostic for special property * fix: default fallback version --- .changeset/fluffy-llamas-do.md | 7 +++++++ packages/binding/src/definition/definition.ts | 5 +---- .../diagnostics/validators/check-required.ts | 14 +++++++++++--- .../diagnostics/validators/issue-collector.ts | 2 +- packages/binding/src/utils/index.ts | 10 ++++++++++ .../aggregation-binding-validator.test.ts | 6 ++++++ test-packages/test-utils/api.d.ts | 2 +- test-packages/test-utils/src/api.ts | 2 +- .../src/utils/semantic-model-provider.ts | 4 ++-- 9 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 .changeset/fluffy-llamas-do.md diff --git a/.changeset/fluffy-llamas-do.md b/.changeset/fluffy-llamas-do.md new file mode 100644 index 000000000..53afc7929 --- /dev/null +++ b/.changeset/fluffy-llamas-do.md @@ -0,0 +1,7 @@ +--- +"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch +"vscode-ui5-language-assistant": patch +"@ui5-language-assistant/binding": patch +--- + +fix: relax diagnostic for property which can be used with both aggregation binding info or property binding info diff --git a/packages/binding/src/definition/definition.ts b/packages/binding/src/definition/definition.ts index 45b0dd600..c861b2be1 100644 --- a/packages/binding/src/definition/definition.ts +++ b/packages/binding/src/definition/definition.ts @@ -18,7 +18,7 @@ import { } from "../types"; import { ui5NodeToFQN } from "@ui5-language-assistant/logic-utils"; import { forOwn } from "lodash"; -import { getDocumentation } from "../utils"; +import { getAltTypesPrime, getDocumentation } from "../utils"; import { getFallBackElements } from "./fall-back-definition"; import { getSorterPossibleElement } from "./sorter"; import { getFiltersPossibleElement } from "./filter"; @@ -383,9 +383,6 @@ const buildType = (param: { return propertyType; }; -const getAltTypesPrime = (aggregation?: UI5Aggregation) => - aggregation?.altTypes?.find((i) => i.kind === "PrimitiveType"); - const removeDuplicate = (builtType: PropertyType[]): PropertyType[] => { const result = builtType.reduce( (previous: PropertyType[], current: PropertyType) => { diff --git a/packages/binding/src/services/diagnostics/validators/check-required.ts b/packages/binding/src/services/diagnostics/validators/check-required.ts index ebd49fd9d..95d143bfb 100644 --- a/packages/binding/src/services/diagnostics/validators/check-required.ts +++ b/packages/binding/src/services/diagnostics/validators/check-required.ts @@ -1,4 +1,4 @@ -import { findRange } from "../../../utils"; +import { findRange, getAltTypesPrime } from "../../../utils"; import { BindingIssue, BINDING_ISSUE_TYPE, @@ -6,19 +6,27 @@ import { } from "../../../types"; import { BindingParserTypes as BindingTypes } from "@ui5-language-assistant/binding-parser"; import { t } from "../../../i18n"; +import { UI5Aggregation } from "@ui5-language-assistant/semantic-model-types"; export const checkRequiredElement = ( element: BindingTypes.StructureValue, - bindingElements: BindingInfoElement[] + bindingElements: BindingInfoElement[], + aggregation: UI5Aggregation | undefined ): BindingIssue[] => { // check required element const reqEl = bindingElements.find((i) => i.required); if (reqEl) { // check required element is applied - const usedRequiredEl = element.elements.find( + let usedRequiredEl = element.elements.find( /* istanbul ignore next */ (i) => i.key?.text === reqEl.name ); + const altTypes = getAltTypesPrime(aggregation); + if (!usedRequiredEl && altTypes) { + // some property e.g `tooltip` can be used with both `aggregation binding info` or `property binding info`. Therefore `altTypes` is defined in design time. + // if `altTypes` is present, check if any element is used. This is a very broad check to avoid false diagnostic. + usedRequiredEl = element.elements[0]; + } if (!usedRequiredEl) { return [ { diff --git a/packages/binding/src/services/diagnostics/validators/issue-collector.ts b/packages/binding/src/services/diagnostics/validators/issue-collector.ts index af4bc2c84..5c96004e3 100644 --- a/packages/binding/src/services/diagnostics/validators/issue-collector.ts +++ b/packages/binding/src/services/diagnostics/validators/issue-collector.ts @@ -101,6 +101,6 @@ export const checkBinding = ( issues.push(...checkDependents(bindingElements, binding)); issues.push(...checkNestedParts(binding)); issues.push(...checkBrackets(binding)); - issues.push(...checkRequiredElement(binding, bindingElements)); + issues.push(...checkRequiredElement(binding, bindingElements, aggregation)); return issues; }; diff --git a/packages/binding/src/utils/index.ts b/packages/binding/src/utils/index.ts index bc0cf5ebc..6009d302a 100644 --- a/packages/binding/src/utils/index.ts +++ b/packages/binding/src/utils/index.ts @@ -1,3 +1,8 @@ +import type { + UI5Aggregation, + UI5Type, +} from "@ui5-language-assistant/semantic-model-types"; + export { typesToValue, valueTypeMap, @@ -14,3 +19,8 @@ export { getCursorContext } from "./cursor"; export { getLogger } from "./logger"; export { getDocumentation } from "./documentation"; + +export const getAltTypesPrime = ( + aggregation?: UI5Aggregation +): UI5Type | undefined => + aggregation?.altTypes?.find((i) => i.kind === "PrimitiveType"); diff --git a/packages/binding/test/unit/services/diagnostics/validators/aggregation-binding-validator.test.ts b/packages/binding/test/unit/services/diagnostics/validators/aggregation-binding-validator.test.ts index 98fd3a1b2..6127533f2 100644 --- a/packages/binding/test/unit/services/diagnostics/validators/aggregation-binding-validator.test.ts +++ b/packages/binding/test/unit/services/diagnostics/validators/aggregation-binding-validator.test.ts @@ -234,4 +234,10 @@ describe("aggregation binding", () => { const result = await validateView(snippet); expect(result.map((item) => issueToSnapshot(item))).toStrictEqual([]); }); + it("tooltip [altTypes] - no diagnostics if any element used", async () => { + const snippet = ` + `; + const result = await validateView(snippet); + expect(result.map((item) => issueToSnapshot(item))).toStrictEqual([]); + }); }); diff --git a/test-packages/test-utils/api.d.ts b/test-packages/test-utils/api.d.ts index 75c7ddb75..567c605ef 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.64"; +export const DEFAULT_UI5_VERSION = "1.71.67"; // 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 636b0763c..962d33a0a 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.64"; +export const DEFAULT_UI5_VERSION = "1.71.67"; 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 8a4370bcb..e1c3a208b 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.64": { + "1.71.67": { 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.64": {}, + "1.71.67": {}, "1.84.41": {}, "1.96.27": { "sap.ui.mdc": [ From 182301bc85539f224be6cb06fa8d5332c6aa80ba Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 23 Apr 2024 12:20:21 +0000 Subject: [PATCH 4/6] chore: apply latest changesets --- .changeset/fluffy-llamas-do.md | 7 ------- packages/binding/CHANGELOG.md | 6 ++++++ packages/binding/package.json | 2 +- packages/language-server/CHANGELOG.md | 7 +++++++ packages/language-server/package.json | 4 ++-- .../vscode-ui5-language-assistant-bas-ext/CHANGELOG.md | 6 ++++++ .../vscode-ui5-language-assistant-bas-ext/package.json | 4 ++-- packages/vscode-ui5-language-assistant/CHANGELOG.md | 7 +++++++ packages/vscode-ui5-language-assistant/package.json | 4 ++-- 9 files changed, 33 insertions(+), 14 deletions(-) delete mode 100644 .changeset/fluffy-llamas-do.md diff --git a/.changeset/fluffy-llamas-do.md b/.changeset/fluffy-llamas-do.md deleted file mode 100644 index 53afc7929..000000000 --- a/.changeset/fluffy-llamas-do.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch -"vscode-ui5-language-assistant": patch -"@ui5-language-assistant/binding": patch ---- - -fix: relax diagnostic for property which can be used with both aggregation binding info or property binding info diff --git a/packages/binding/CHANGELOG.md b/packages/binding/CHANGELOG.md index bffb18fe7..6dabc197f 100644 --- a/packages/binding/CHANGELOG.md +++ b/packages/binding/CHANGELOG.md @@ -1,5 +1,11 @@ # @ui5-language-assistant/binding +## 1.0.29 + +### Patch Changes + +- 98c33e7: fix: relax diagnostic for property which can be used with both aggregation binding info or property binding info + ## 1.0.28 ### Patch Changes diff --git a/packages/binding/package.json b/packages/binding/package.json index 999087d62..11a37ba0d 100644 --- a/packages/binding/package.json +++ b/packages/binding/package.json @@ -1,6 +1,6 @@ { "name": "@ui5-language-assistant/binding", - "version": "1.0.28", + "version": "1.0.29", "private": true, "description": "UI5 LSP server extension for binding", "keywords": [], diff --git a/packages/language-server/CHANGELOG.md b/packages/language-server/CHANGELOG.md index ae4e51800..dc6bda265 100644 --- a/packages/language-server/CHANGELOG.md +++ b/packages/language-server/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 4.0.47 + +### Patch Changes + +- Updated dependencies [98c33e7] + - @ui5-language-assistant/binding@1.0.29 + ## 4.0.46 ### Patch Changes diff --git a/packages/language-server/package.json b/packages/language-server/package.json index be5d2a9f1..24d20f0a4 100644 --- a/packages/language-server/package.json +++ b/packages/language-server/package.json @@ -1,6 +1,6 @@ { "name": "@ui5-language-assistant/language-server", - "version": "4.0.46", + "version": "4.0.47", "private": true, "description": "UI5 Language Server", "keywords": [ @@ -26,7 +26,7 @@ }, "dependencies": { "@ui5-language-assistant/xml-views-definition": "0.0.3", - "@ui5-language-assistant/binding": "1.0.28", + "@ui5-language-assistant/binding": "1.0.29", "@sap/swa-for-sapbas-vsx": "1.1.9", "@ui5-language-assistant/logger": "0.0.1", "@ui5-language-assistant/context": "4.0.25", diff --git a/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md b/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md index 05f4d3e15..c78a7e0a8 100644 --- a/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md +++ b/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.0.61 + +### Patch Changes + +- 98c33e7: fix: relax diagnostic for property which can be used with both aggregation binding info or property binding info + ## 4.0.60 ### Patch Changes diff --git a/packages/vscode-ui5-language-assistant-bas-ext/package.json b/packages/vscode-ui5-language-assistant-bas-ext/package.json index 5ba408c86..3d34ef5a0 100644 --- a/packages/vscode-ui5-language-assistant-bas-ext/package.json +++ b/packages/vscode-ui5-language-assistant-bas-ext/package.json @@ -2,7 +2,7 @@ "name": "@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext", "description": "A wrapper module for BAS simple extension around Language Support For SAPUI5", "license": "Apache-2.0", - "version": "4.0.60", + "version": "4.0.61", "private": false, "repository": { "type": "git", @@ -13,7 +13,7 @@ }, "devDependencies": { "fs-extra": "10.1.0", - "vscode-ui5-language-assistant": "4.0.60" + "vscode-ui5-language-assistant": "4.0.61" }, "files": [ "*.vsix", diff --git a/packages/vscode-ui5-language-assistant/CHANGELOG.md b/packages/vscode-ui5-language-assistant/CHANGELOG.md index 9385cbd80..66157f605 100644 --- a/packages/vscode-ui5-language-assistant/CHANGELOG.md +++ b/packages/vscode-ui5-language-assistant/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 4.0.61 + +### Patch Changes + +- 98c33e7: fix: relax diagnostic for property which can be used with both aggregation binding info or property binding info + - @ui5-language-assistant/language-server@4.0.47 + ## 4.0.60 ### Patch Changes diff --git a/packages/vscode-ui5-language-assistant/package.json b/packages/vscode-ui5-language-assistant/package.json index bb1c325a2..bd3d7b8ef 100644 --- a/packages/vscode-ui5-language-assistant/package.json +++ b/packages/vscode-ui5-language-assistant/package.json @@ -3,7 +3,7 @@ "displayName": "UI5 Language Assistant", "private": true, "description": "Language Support For SAPUI5", - "version": "4.0.60", + "version": "4.0.61", "publisher": "SAPOSS", "icon": "resources/ui5-language-assistant.png", "keywords": [ @@ -155,7 +155,7 @@ "update:schema": "ts-node --project tsconfig.cli.json scripts/manifest/run-update.ts" }, "dependencies": { - "@ui5-language-assistant/language-server": "4.0.46", + "@ui5-language-assistant/language-server": "4.0.47", "vscode-languageclient": "8.0.2", "@prettier/plugin-xml": "2.2.0", "prettier": "2.8.7" From fdbf071383f0d5725ce3d261c9fe2646a10a0eb5 Mon Sep 17 00:00:00 2001 From: Maruf Rasully <100434800+marufrasully@users.noreply.github.com> Date: Tue, 23 Apr 2024 15:59:23 +0200 Subject: [PATCH 5/6] Chore: update schema (#709) * chore: update schema.json * fix: add change set --- .changeset/smooth-socks-raise.md | 6 + .../src/manifest/schema.json | 202 ++++++++++++------ 2 files changed, 143 insertions(+), 65 deletions(-) create mode 100644 .changeset/smooth-socks-raise.md diff --git a/.changeset/smooth-socks-raise.md b/.changeset/smooth-socks-raise.md new file mode 100644 index 000000000..4e9801314 --- /dev/null +++ b/.changeset/smooth-socks-raise.md @@ -0,0 +1,6 @@ +--- +"vscode-ui5-language-assistant": patch +"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch +--- + +chore: update schema.json file diff --git a/packages/vscode-ui5-language-assistant/src/manifest/schema.json b/packages/vscode-ui5-language-assistant/src/manifest/schema.json index 8afd29497..868540e2b 100644 --- a/packages/vscode-ui5-language-assistant/src/manifest/schema.json +++ b/packages/vscode-ui5-language-assistant/src/manifest/schema.json @@ -75,7 +75,8 @@ "1.59.0", "1.60.0", "1.61.0", - "1.62.0" + "1.62.0", + "1.63.0" ] }, "start_url": { @@ -513,7 +514,8 @@ "1.14.0", "1.15.0", "1.16.0", - "1.17.0" + "1.17.0", + "1.18.0" ] }, "resources": { @@ -7106,6 +7108,81 @@ } } }, + "actualTargetAdditionComponentUsage": { + "type": "object", + "required": ["usage", "type"], + "properties": { + "usage": { + "description": "Represents the componentUsage of the component that will be created", + "type": "string" + }, + "id": { + "description": "Represents the id of the created view or component", + "type": "string" + }, + "type": { + "description": "Represents the type of the type Component", + "type": "string", + "enum": ["Component"] + }, + "level": { + "description": "Represents the level of the current component which is used to define the transition direction when navigate to this component", + "type": "number", + "multipleOf": 1 + } + } + }, + "actualTargetAdditionStandard": { + "type": "object", + "required": ["name"], + "properties": { + "name": { + "description": "Represents the name of a view or component that will be created", + "type": "string" + }, + "id": { + "description": "Represents the id of the created view or component", + "type": "string" + }, + "path": { + "description": "Represents a prefix that is prepended in front of the view or component name", + "type": "string" + }, + "type": { + "description": "Represents the type of the type View or Component", + "type": "string", + "enum": ["View", "Component"] + }, + "level": { + "description": "Represents the level of the current view/component which is used to define the transition direction when navigate to this view/component", + "type": "number", + "multipleOf": 1 + } + } + }, + "legacyTargetAddition": { + "type": "object", + "required": ["viewName"], + "properties": { + "viewName": { + "description": "Represents the name of a view that will be created", + "type": "string" + }, + "viewId": { + "description": "Represents the id of the created view", + "type": "string" + }, + "viewPath": { + "description": "Represents a prefix that is prepended in front of the viewName", + "type": "string" + }, + "viewLevel": { + "description": "Represents the level of the current view which is used to define the transition direction when navigate to this view", + "type": "number", + "multipleOf": 1 + } + } + }, "routeWithoutName": { "description": "Represents the definition of route without the option 'name'. This is used when routes are defined in an object.", "type": "object", @@ -7146,6 +7223,55 @@ } ] }, + "actualTargetAdditionStandardWithoutRequiredProp": { + "type": "object", + "properties": { + "name": { + "description": "Represents the name of a view or component that will be created", + "type": "string" + }, + "id": { + "description": "Represents the id of the created view or component", + "type": "string" + }, + "path": { + "description": "Represents a prefix that is prepended in front of the view or component name", + "type": "string" + }, + "type": { + "description": "Represents the type of the type View or Component", + "type": "string", + "enum": ["View", "Component"] + }, + "level": { + "description": "Represents the level of the current view/component which is used to define the transition direction when navigate to this view/component", + "type": "number", + "multipleOf": 1 + } + } + }, + "legacyTargetAdditionWithoutRequiredProp": { + "type": "object", + "properties": { + "viewName": { + "description": "Represents the name of a view that will be created", + "type": "string" + }, + "viewId": { + "description": "Represents the id of the created view", + "type": "string" + }, + "viewPath": { + "description": "Represents a prefix that is prepended in front of the viewName", + "type": "string" + }, + "viewLevel": { + "description": "Represents the level of the current view which is used to define the transition direction when navigate to this view", + "type": "number", + "multipleOf": 1 + } + } + }, "target": { "description": "Represents the definition of each target", "type": "object", @@ -7179,11 +7305,6 @@ "description": "Represents the name of another target which will also be displayed once this target is displayed", "type": "string" }, - "viewLevel": { - "description": "Represents the level of the current view which is used to define the transition direction when navigate to this view", - "type": "number", - "multipleOf": 1 - }, "transition": { "description": "Represents the type of transition when navigating from previous view to this view", "anyOf": [ @@ -7349,15 +7470,17 @@ "$ref": "#/definitions/routeTarget" } } - }, - "viewPath": { - "description": "Represents a prefix that is prepended in front of the viewName", - "type": "string" } } }, { "$ref": "#/definitions/target" + }, + { + "$ref": "#/definitions/legacyTargetAdditionWithoutRequiredProp" + }, + { + "$ref": "#/definitions/actualTargetAdditionStandardWithoutRequiredProp" } ] }, @@ -7393,22 +7516,7 @@ "$ref": "#/definitions/target" }, { - "type": "object", - "required": ["viewName"], - "properties": { - "viewName": { - "description": "Represents the name of a view that will be created", - "type": "string" - }, - "viewId": { - "description": "Represents the id of the created view", - "type": "string" - }, - "viewPath": { - "description": "Represents a prefix that is prepended in front of the viewName", - "type": "string" - } - } + "$ref": "#/definitions/legacyTargetAddition" } ] }, @@ -7420,46 +7528,10 @@ { "oneOf": [ { - "type": "object", - "required": ["name"], - "properties": { - "name": { - "description": "Represents the name of a view or component that will be created", - "type": "string" - }, - "id": { - "description": "Represents the id of the created view or component", - "type": "string" - }, - "path": { - "description": "Represents a prefix that is prepended in front of the view or component name", - "type": "string" - }, - "type": { - "description": "Represents the type of the type View or Component", - "type": "string", - "enum": ["View", "Component"] - } - } + "$ref": "#/definitions/actualTargetAdditionStandard" }, { - "type": "object", - "required": ["usage", "type"], - "properties": { - "usage": { - "description": "Represents the componentUsage of the component that will be created", - "type": "string" - }, - "id": { - "description": "Represents the id of the created view or component", - "type": "string" - }, - "type": { - "description": "Represents the type of the type Component", - "type": "string", - "enum": ["Component"] - } - } + "$ref": "#/definitions/actualTargetAdditionComponentUsage" } ] } From 1dfdebf0aafb11e540976d5810c34373ed7b8f2a Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 23 Apr 2024 14:09:26 +0000 Subject: [PATCH 6/6] chore: apply latest changesets --- .changeset/smooth-socks-raise.md | 6 ------ packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md | 6 ++++++ packages/vscode-ui5-language-assistant-bas-ext/package.json | 4 ++-- packages/vscode-ui5-language-assistant/CHANGELOG.md | 6 ++++++ packages/vscode-ui5-language-assistant/package.json | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 .changeset/smooth-socks-raise.md diff --git a/.changeset/smooth-socks-raise.md b/.changeset/smooth-socks-raise.md deleted file mode 100644 index 4e9801314..000000000 --- a/.changeset/smooth-socks-raise.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"vscode-ui5-language-assistant": patch -"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch ---- - -chore: update schema.json file diff --git a/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md b/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md index c78a7e0a8..76acecedd 100644 --- a/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md +++ b/packages/vscode-ui5-language-assistant-bas-ext/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.0.62 + +### Patch Changes + +- fdbf071: chore: update schema.json file + ## 4.0.61 ### Patch Changes diff --git a/packages/vscode-ui5-language-assistant-bas-ext/package.json b/packages/vscode-ui5-language-assistant-bas-ext/package.json index 3d34ef5a0..bdd92c656 100644 --- a/packages/vscode-ui5-language-assistant-bas-ext/package.json +++ b/packages/vscode-ui5-language-assistant-bas-ext/package.json @@ -2,7 +2,7 @@ "name": "@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext", "description": "A wrapper module for BAS simple extension around Language Support For SAPUI5", "license": "Apache-2.0", - "version": "4.0.61", + "version": "4.0.62", "private": false, "repository": { "type": "git", @@ -13,7 +13,7 @@ }, "devDependencies": { "fs-extra": "10.1.0", - "vscode-ui5-language-assistant": "4.0.61" + "vscode-ui5-language-assistant": "4.0.62" }, "files": [ "*.vsix", diff --git a/packages/vscode-ui5-language-assistant/CHANGELOG.md b/packages/vscode-ui5-language-assistant/CHANGELOG.md index 66157f605..a45c876fa 100644 --- a/packages/vscode-ui5-language-assistant/CHANGELOG.md +++ b/packages/vscode-ui5-language-assistant/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.0.62 + +### Patch Changes + +- fdbf071: chore: update schema.json file + ## 4.0.61 ### Patch Changes diff --git a/packages/vscode-ui5-language-assistant/package.json b/packages/vscode-ui5-language-assistant/package.json index bd3d7b8ef..20072f152 100644 --- a/packages/vscode-ui5-language-assistant/package.json +++ b/packages/vscode-ui5-language-assistant/package.json @@ -3,7 +3,7 @@ "displayName": "UI5 Language Assistant", "private": true, "description": "Language Support For SAPUI5", - "version": "4.0.61", + "version": "4.0.62", "publisher": "SAPOSS", "icon": "resources/ui5-language-assistant.png", "keywords": [