Merge remote-tracking branch 'origin' into fix/678/tooltip

SAP · Jan 5, 2024 · 4317f41 · 4317f41
2 parents fcd37b7 + dda44b7
commit 4317f41
Show file tree

Hide file tree

Showing 114 changed files with 1,492 additions and 1,196 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -1,5 +1,3 @@
-const { join } = require("path");
-
 module.exports = {
   preset: "ts-jest",
   testEnvironment: "node",

diff --git a/jest.setup.js b/jest.setup.js
@@ -1,5 +1,4 @@
-jest.setTimeout(120000); // 2 min
-
+jest.setTimeout(420000); // 7 min
 // add all jest-extended matchers
 const matchers = require("jest-extended");
 expect.extend(matchers);
diff --git a/packages/binding/CHANGELOG.md b/packages/binding/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @ui5-language-assistant/binding
 
+## 1.0.22
+
+### Patch Changes
+
+- a9a2141: Add logger package
+- Updated dependencies [a9a2141]
+  - @ui5-language-assistant/logic-utils@4.0.16
+  - @ui5-language-assistant/context@4.0.22
+  - @ui5-language-assistant/xml-views-completion@4.0.22
+  - @ui5-language-assistant/xml-views-validation@4.0.17
+
+## 1.0.21
+
+### Patch Changes
+
+- Updated dependencies [910e437]
+  - @ui5-language-assistant/context@4.0.21
+  - @ui5-language-assistant/xml-views-completion@4.0.21
+  - @ui5-language-assistant/xml-views-validation@4.0.16
+  - @ui5-language-assistant/logic-utils@4.0.15
+
 ## 1.0.20
 
 ### Patch Changes

diff --git a/packages/binding/jest.config.js b/packages/binding/jest.config.js
@@ -3,7 +3,6 @@ const defaultConfig = require("../../jest.config");
 
 module.exports = {
   ...defaultConfig,
-  setupFilesAfterEnv: ["./jest.setup.js"],
   globals: {
     "ts-jest": {
       tsconfig: join(__dirname, "tsconfig-test.json"),

diff --git a/packages/binding/jest.setup.js b/packages/binding/jest.setup.js
diff --git a/packages/binding/package.json b/packages/binding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ui5-language-assistant/binding",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "private": true,
   "description": "UI5 LSP server extension for binding",
   "keywords": [],
@@ -16,10 +16,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@ui5-language-assistant/binding-parser": "1.0.6",
-    "@ui5-language-assistant/context": "4.0.20",
-    "@ui5-language-assistant/logic-utils": "4.0.14",
-    "@ui5-language-assistant/xml-views-completion": "4.0.20",
-    "@ui5-language-assistant/xml-views-validation": "4.0.15",
+    "@ui5-language-assistant/logger": "0.0.1",
+    "@ui5-language-assistant/context": "4.0.22",
+    "@ui5-language-assistant/logic-utils": "4.0.16",
+    "@ui5-language-assistant/xml-views-completion": "4.0.22",
+    "@ui5-language-assistant/xml-views-validation": "4.0.17",
     "@ui5-language-assistant/settings": "4.0.9",
     "deep-freeze-strict": "1.1.1",
     "lodash": "4.17.21"
@@ -28,8 +29,8 @@
     "@sap-ux/vocabularies-types": "0.7.4",
     "@types/lodash": "4.14.168",
     "@ui5-language-assistant/semantic-model-types": "4.0.9",
-    "@ui5-language-assistant/test-framework": "4.0.11",
-    "@ui5-language-assistant/test-utils": "4.0.9",
+    "@ui5-language-assistant/test-framework": "4.0.12",
+    "@ui5-language-assistant/test-utils": "4.0.11",
     "@xml-tools/ast": "5.0.0",
     "@xml-tools/parser": "1.0.7",
     "vscode-languageserver-protocol": "3.17.2",

diff --git a/packages/binding/src/constant.ts b/packages/binding/src/constant.ts
@@ -6,3 +6,4 @@ export const AGGREGATION_BINDING_INFO =
 export const Binding_Mode = "sap.ui.model.BindingMode";
 export const PARTS = "parts";
 export const FILTER_OPERATOR = "FilterOperator";
+export const PACKAGE_NAME = "@ui5-language-assistant/binding";
diff --git a/packages/binding/src/utils/logger.ts b/packages/binding/src/utils/logger.ts
@@ -1,24 +1,6 @@
-import {
-  getLogger as logger,
-  ILogger,
-} from "@ui5-language-assistant/logic-utils";
-
-const getPackageName = (): string => {
-  let meta: { name: string };
-  try {
-    meta = require("../../package.json");
-  } catch (e) {
-    meta = require("../../../package.json");
-  }
-
-  if (!meta) {
-    return "";
-  }
-  // eslint-disable-next-line @typescript-eslint/no-var-requires -- Using `require` for .json file as this gets bundled with webpack correctly.
-  return meta.name;
-};
+import { getLogger as logger, ILogger } from "@ui5-language-assistant/logger";
+import { PACKAGE_NAME } from "../constant";
 
 export const getLogger = (): ILogger => {
-  const name = getPackageName();
-  return logger(name);
+  return logger(PACKAGE_NAME);
 };