fix: min ui5 version as array (#714)

* fix: min ui5 version as array * fix: adapt unit test and default ui5 version * chore: add change set * fix: update schema for offline mode
SAP · Jul 24, 2024 · fa811f5 · fa811f5
1 parent 488510e
commit fa811f5
Show file tree

Hide file tree

Showing 15 changed files with 229 additions and 100 deletions.
diff --git a/.changeset/unlucky-ants-burn.md 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
@@ -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
@@ -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
@@ -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<Context | Error> {
  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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",