@sap/ux-ui5-tooling 1.20.3 → 1.20.4

package/dist/cli/index.js

@@ -58563,6 +58563,18 @@ var require_ui5config = __commonJS({
         }
         return this;
       }
+      /**
+       * Determines whether the UI5 configuration document contains the builder key.
+       *
+       * @returns True if the configuration contains builder key at root level otherwise false.
+       */
+      hasBuilderKey() {
+        try {
+          return !!this.document.getNode({ path: "builder" });
+        } catch {
+          return false;
+        }
+      }
       /**
        * Remove a middleware form the UI5 config.
        *
@@ -59027,7 +59039,7 @@ var require_search = __commonJS({
       extensions: [constants_1.FileName.ExtConfigJson],
       libraries: [constants_1.FileName.Library, constants_1.FileName.Manifest]
     };
-    var excludeFolders = [".git", "node_modules", "dist"];
+    var excludeFolders = [".git", "node_modules", "dist", ".adp"];
     function isWorkspaceFolder(value) {
       return value && value.length > 0 && value[0].uri !== void 0;
     }
@@ -71779,9 +71791,10 @@ var require_cap = __commonJS({
     var globalCdsModulePromise;
     async function loadGlobalCdsModule() {
       globalCdsModulePromise = globalCdsModulePromise ?? new Promise((resolve2, reject2) => {
-        return getCdsVersionInfo().then((versions) => {
-          if (versions.home) {
-            resolve2((0, module_loader_1.loadModuleFromProject)(versions.home, "@sap/cds"));
+        return getCdsEnvData().then((data) => {
+          const home = data["_home_cds-dk"];
+          if (home) {
+            resolve2((0, module_loader_1.loadModuleFromProject)((0, node_path_1.join)(home, "node_modules", "@sap", "cds"), "@sap/cds"));
           } else {
             reject2(new Error("Can not find global installation of module @sap/cds, which should be part of @sap/cds-dk"));
           }
@@ -71792,21 +71805,20 @@ var require_cap = __commonJS({
     function clearGlobalCdsModulePromiseCache() {
       globalCdsModulePromise = void 0;
     }
-    async function getCdsVersionInfo(cwd) {
+    async function getCdsEnvData(cwd) {
       return new Promise((resolve2, reject2) => {
         let out = "";
-        const cdsVersionInfo = (0, node_child_process_1.spawn)("cds", ["--version"], { cwd, shell: true });
+        const cdsVersionInfo = (0, node_child_process_1.spawn)("cds", ["env", "--json"], { cwd, shell: true });
         cdsVersionInfo.stdout.on("data", (data) => {
           out += data.toString();
         });
         cdsVersionInfo.on("close", () => {
           if (out) {
-            const versions = {};
-            for (const line of out.split("\n").filter((v) => v)) {
-              const [key, value] = line.split(": ");
-              versions[key] = value;
+            try {
+              resolve2(JSON.parse(out));
+            } catch (e) {
+              reject2(new Error(`Unexpected output of "cds env --json": ${e.message}`));
             }
-            resolve2(versions);
           } else {
             reject2(new Error("Module path not found"));
           }
@@ -84924,16 +84936,16 @@ var require_types6 = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/stream.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/stream.js
 var require_stream6 = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/stream.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/stream.js"(exports2, module2) {
     module2.exports = require("stream");
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/destroy.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/destroy.js
 var require_destroy2 = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/destroy.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/destroy.js"(exports2, module2) {
     "use strict";
     function destroy2(err, cb) {
       var _this = this;
@@ -85020,9 +85032,9 @@ var require_destroy2 = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/errors.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/errors.js
 var require_errors5 = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/errors.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/errors.js"(exports2, module2) {
     "use strict";
     var codes = {};
     function createErrorType(code, message, Base) {
@@ -85120,9 +85132,9 @@ var require_errors5 = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/state.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/state.js
 var require_state3 = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/state.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/state.js"(exports2, module2) {
     "use strict";
     var ERR_INVALID_OPT_VALUE = require_errors5().codes.ERR_INVALID_OPT_VALUE;
     function highWaterMarkFrom(options2, isDuplex, duplexKey) {
@@ -85145,9 +85157,9 @@ var require_state3 = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/buffer_list.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/buffer_list.js
 var require_buffer_list = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/buffer_list.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/buffer_list.js"(exports2, module2) {
     "use strict";
     function ownKeys2(object, enumerableOnly) {
       var keys = Object.keys(object);
@@ -85676,9 +85688,9 @@ var require_string_decoder2 = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/end-of-stream.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/end-of-stream.js
 var require_end_of_stream = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/end-of-stream.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/end-of-stream.js"(exports2, module2) {
     "use strict";
     var ERR_STREAM_PREMATURE_CLOSE = require_errors5().codes.ERR_STREAM_PREMATURE_CLOSE;
     function once2(callback) {
@@ -85765,9 +85777,9 @@ var require_end_of_stream = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/async_iterator.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/async_iterator.js
 var require_async_iterator = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/async_iterator.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/async_iterator.js"(exports2, module2) {
     "use strict";
     var _Object$setPrototypeO;
     function _defineProperty(obj, key, value) {
@@ -85933,9 +85945,9 @@ var require_async_iterator = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/from.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/from.js
 var require_from = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/internal/streams/from.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/internal/streams/from.js"(exports2, module2) {
     "use strict";
     function asyncGeneratorStep(gen, resolve2, reject2, _next, _throw, key, arg) {
       try {
@@ -86046,9 +86058,9 @@ var require_from = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/_stream_readable.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/_stream_readable.js
 var require_stream_readable2 = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/_stream_readable.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/_stream_readable.js"(exports2, module2) {
     "use strict";
     module2.exports = Readable3;
     var Duplex;
@@ -86783,9 +86795,9 @@ var require_stream_readable2 = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/_stream_duplex.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/_stream_duplex.js
 var require_stream_duplex2 = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/_stream_duplex.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/_stream_duplex.js"(exports2, module2) {
     "use strict";
     var objectKeys = Object.keys || function(obj) {
       var keys2 = [];
@@ -86878,9 +86890,9 @@ var require_stream_duplex2 = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/node_modules/readable-stream/lib/_stream_writable.js
+// ../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/_stream_writable.js
 var require_stream_writable2 = __commonJS({
-  "../../node_modules/winston-transport/node_modules/readable-stream/lib/_stream_writable.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/readable-stream/lib/_stream_writable.js"(exports2, module2) {
     "use strict";
     module2.exports = Writable;
     function CorkedRequest(state) {
@@ -87467,9 +87479,9 @@ var require_triple_beam = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/modern.js
+// ../../node_modules/@sap-ux/logger/node_modules/winston-transport/modern.js
 var require_modern = __commonJS({
-  "../../node_modules/winston-transport/modern.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/winston-transport/modern.js"(exports2, module2) {
     "use strict";
     var util5 = require("util");
     var Writable = require_stream_writable2();
@@ -87579,9 +87591,9 @@ var require_modern = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/legacy.js
+// ../../node_modules/@sap-ux/logger/node_modules/winston-transport/legacy.js
 var require_legacy = __commonJS({
-  "../../node_modules/winston-transport/legacy.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/winston-transport/legacy.js"(exports2, module2) {
     "use strict";
     var util5 = require("util");
     var { LEVEL } = require_triple_beam();
@@ -87645,9 +87657,9 @@ var require_legacy = __commonJS({
   }
 });
 
-// ../../node_modules/winston-transport/index.js
+// ../../node_modules/@sap-ux/logger/node_modules/winston-transport/index.js
 var require_winston_transport = __commonJS({
-  "../../node_modules/winston-transport/index.js"(exports2, module2) {
+  "../../node_modules/@sap-ux/logger/node_modules/winston-transport/index.js"(exports2, module2) {
     "use strict";
     module2.exports = require_modern();
     module2.exports.LegacyTransportStream = require_legacy();
@@ -184931,8 +184943,11 @@ var require_utils18 = __commonJS({
     function getEntityFileName(entityName) {
       return toPersistenceName(entityName) + ".json";
     }
-    function isMatch(obj, attrs) {
-      return Object.entries(attrs).every(([key, val]) => {
+    function isMatch(obj, filter3) {
+      return Object.entries(filter3).every(([key, val]) => {
+        if (Array.isArray(val)) {
+          return val.includes(obj[key]);
+        }
         if (val && typeof val === "object") {
           return isMatch(obj[key], val);
         }
@@ -186580,11 +186595,7 @@ var require_backend_system2 = __commonJS({
             includeSensitiveData
           });
         }
-        const systemList = Object.values(systems);
-        if (!backendSystemFilter) {
-          return systemList;
-        }
-        return this.applyFilters(systemList, backendSystemFilter);
+        return this.applyFilters(Object.values(systems), backendSystemFilter);
       }
       /**
        * Determines whether a migration is required based on a local marker file.
@@ -186603,6 +186614,9 @@ var require_backend_system2 = __commonJS({
        * Applies filter objects to a list of backend systems.
        */
       applyFilters(systems, filters = {}) {
+        if (!filters.connectionType) {
+          filters.connectionType = "abap_catalog";
+        }
         return systems.filter((system) => (0, utils_1.isMatch)(system, filters));
       }
       /**
@@ -186729,6 +186743,13 @@ var require_backend_system3 = __commonJS({
       async delete(entity) {
         return this.dataProvider.delete(entity);
       }
+      /**
+       * Retrieves all backend systems from the store. Can be filtered by providing retrieval options.
+       * N.B. if no `connectionType` is provided in the options, only systems with `abap_catalog` connection type will be returned.
+       *
+       * @param options - backend service retrieval options
+       * @returns - list of backend systems
+       */
       async getAll(options2) {
         return this.dataProvider.getAll(options2);
       }
@@ -186750,6 +186771,9 @@ var require_backend_system3 = __commonJS({
       const legacySystemsPath = (0, node_path_1.join)((0, utils_1.getFioriToolsDirectory)(), systemFileName);
       const newSystemsPath = (0, node_path_1.join)((0, utils_1.getSapToolsDirectory)(), systemFileName);
       const migrationFlag = (0, node_path_1.join)((0, utils_1.getSapToolsDirectory)(), ".systemsMigrated");
+      if (!(0, node_fs_1.existsSync)(legacySystemsPath)) {
+        return;
+      }
       const legacyData = JSON.parse((0, node_fs_1.readFileSync)(legacySystemsPath, "utf-8")).systems;
       if ((0, node_fs_1.existsSync)(migrationFlag)) {
         migrateNewLegacyPathEntries(newSystemsPath, legacyData);
@@ -264478,10 +264502,12 @@ var require_utils24 = __commonJS({
           entitySets: this._entitySets,
           singletons: this._singletons,
           complexTypes: this._complexTypes,
+          enumTypes: this._enumTypes,
           typeDefinitions: this._typeDefinitions,
           actions: this._actions,
           actionImports: this._actionImports,
-          entityTypes: this._entityTypes
+          entityTypes: this._entityTypes,
+          entityContainers: this._entityContainers
         };
       }
       /**
@@ -264503,7 +264529,9 @@ var require_utils24 = __commonJS({
         };
         this._entityTypes = [];
         this._complexTypes = [];
+        this._enumTypes = [];
         this._typeDefinitions = [];
+        this._entityContainers = {};
         this.identification = "mergedParserInstance";
         this.version = initialParserOutput.version;
         this._namespace = initialParserOutput.schema.namespace;
@@ -264523,6 +264551,7 @@ var require_utils24 = __commonJS({
         this._actionImports = this._actionImports.concat(parserOutput.schema.actionImports);
         this._entityTypes = this._entityTypes.concat(parserOutput.schema.entityTypes);
         this._complexTypes = this._complexTypes.concat(parserOutput.schema.complexTypes);
+        this._enumTypes = this._enumTypes.concat(parserOutput.schema.enumTypes);
         this._typeDefinitions = this._typeDefinitions.concat(parserOutput.schema.typeDefinitions);
         if (parserOutput.schema.entityContainer.fullyQualifiedName.length > 0) {
           this._entityContainer = Object.assign(this._entityContainer, parserOutput.schema.entityContainer);
@@ -267421,6 +267450,7 @@ var require_parser7 = __commonJS({
     }
     function parseProperties(entityProperties, entityKeys, entityTypeFQN, annotationLists) {
       return entityProperties.reduce((outObject, entityProperty) => {
+        var _a15, _b13, _c6, _d4;
         const edmProperty = {
           _type: "Property",
           name: entityProperty._attributes.Name,
@@ -267428,13 +267458,17 @@ var require_parser7 = __commonJS({
           type: unaliasType(entityProperty._attributes.Type).type
         };
         if (entityProperty._attributes.MaxLength) {
-          edmProperty.maxLength = parseInt(entityProperty._attributes.MaxLength, 10);
+          edmProperty.maxLength = ((_b13 = (_a15 = entityProperty._attributes.MaxLength) === null || _a15 === void 0 ? void 0 : _a15.toLowerCase) === null || _b13 === void 0 ? void 0 : _b13.call(_a15)) === "max" ? 5e3 : parseInt(entityProperty._attributes.MaxLength, 10);
         }
         if (entityProperty._attributes.Precision) {
           edmProperty.precision = parseInt(entityProperty._attributes.Precision, 10);
         }
         if (entityProperty._attributes.Scale) {
-          edmProperty.scale = parseInt(entityProperty._attributes.Scale, 10);
+          if (((_d4 = (_c6 = entityProperty._attributes.Scale) === null || _c6 === void 0 ? void 0 : _c6.toLowerCase) === null || _d4 === void 0 ? void 0 : _d4.call(_c6)) === "variable") {
+            edmProperty.scale = "variable";
+          } else {
+            edmProperty.scale = parseInt(entityProperty._attributes.Scale, 10);
+          }
         }
         edmProperty.nullable = entityProperty._attributes.Nullable !== "false";
         if (entityProperty._attributes.DefaultValue) {
@@ -267613,6 +267647,47 @@ var require_parser7 = __commonJS({
         return outArray;
       }, []);
     }
+    function parseEnumMembers(enumMembers, annotationLists, namespace, isFlags) {
+      const allHaveValue = enumMembers.every((enumMember) => enumMember._attributes.Value !== void 0);
+      return enumMembers.reduce((outObject, enumMember) => {
+        const enumMemberFQN = `${namespace}/${enumMember._attributes.Name}`;
+        const enumMemberAnnotations = parseAnnotations((0, utils_1.ensureArray)(enumMember.Annotation), enumMemberFQN, annotationLists);
+        if (enumMemberAnnotations && enumMemberAnnotations.length > 0) {
+          annotationLists.push(createAnnotationList(enumMemberFQN, enumMemberAnnotations));
+        }
+        let value;
+        if (allHaveValue) {
+          value = Number.parseInt(enumMember._attributes.Value.toString(), 10);
+        } else if (isFlags) {
+          value = 1 << outObject.length;
+        } else {
+          value = outObject.length;
+        }
+        outObject.push({
+          _type: "EnumMember",
+          fullyQualifiedName: enumMemberFQN,
+          name: enumMember._attributes.Name,
+          value
+        });
+        return outObject;
+      }, []);
+    }
+    function parseEnumTypes(enumTypes, annotationLists, namespace) {
+      return enumTypes.reduce((outArray, enumType) => {
+        var _a15;
+        const enumTypeFQN = `${namespace}.${enumType._attributes.Name}`;
+        const members = parseEnumMembers((0, utils_1.ensureArray)(enumType.Member), annotationLists, enumTypeFQN, enumType._attributes.IsFlags === true);
+        outArray.push({
+          _type: "EnumType",
+          name: enumType._attributes.Name,
+          underlyingType: (_a15 = enumType._attributes.UnderlyingType) !== null && _a15 !== void 0 ? _a15 : "Edm.Int32",
+          isFlags: enumType._attributes.IsFlags === true,
+          fullyQualifiedName: enumTypeFQN,
+          members
+        });
+        return outArray;
+      }, []);
+    }
     function parseTypeDefinitions(typeDefinitions, namespace) {
       return typeDefinitions.reduce((outArray, typeDefinition) => {
         const typeDefinitionFQN = `${namespace}.${typeDefinition._attributes.Name}`;
@@ -267691,6 +267766,7 @@ var require_parser7 = __commonJS({
           fullyQualifiedName,
           isFunction: isFunction4,
           parameters: parameters.map((param) => {
+            var _a15, _b13, _c6, _d4;
             const { isCollection, type } = unaliasType(param._attributes.Type);
             const edmActionParameter = {
               _type: "ActionParameter",
@@ -267700,13 +267776,17 @@ var require_parser7 = __commonJS({
               isCollection
             };
             if (param._attributes.MaxLength) {
-              edmActionParameter.maxLength = parseInt(param._attributes.MaxLength, 10);
+              edmActionParameter.maxLength = ((_b13 = (_a15 = param._attributes.MaxLength) === null || _a15 === void 0 ? void 0 : _a15.toLowerCase) === null || _b13 === void 0 ? void 0 : _b13.call(_a15)) === "max" ? 5e3 : parseInt(param._attributes.MaxLength, 10);
             }
             if (param._attributes.Precision) {
               edmActionParameter.precision = parseInt(param._attributes.Precision, 10);
             }
             if (param._attributes.Scale) {
-              edmActionParameter.scale = parseInt(param._attributes.Scale, 10);
+              if (((_d4 = (_c6 = param._attributes.Scale) === null || _c6 === void 0 ? void 0 : _c6.toLowerCase) === null || _d4 === void 0 ? void 0 : _d4.call(_c6)) === "variable") {
+                edmActionParameter.scale = "variable";
+              } else {
+                edmActionParameter.scale = parseInt(param._attributes.Scale, 10);
+              }
             }
             edmActionParameter.nullable = param._attributes.Nullable !== "false";
             return edmActionParameter;
@@ -267716,26 +267796,39 @@ var require_parser7 = __commonJS({
         };
       });
     }
-    function parseV2FunctionImport(actions, entitySets, namespace) {
+    function parseV2FunctionImport(actions, entitySets, entityTypes, namespace, outAnnotationLists) {
       return actions.map((action) => {
         const targetEntitySet = entitySets.find((et) => et.name === action._attributes.EntitySet);
         const actionFQN = `${namespace}/${action._attributes.Name}`;
+        let sourceEntityType = targetEntitySet === null || targetEntitySet === void 0 ? void 0 : targetEntitySet.entityTypeName;
+        if (action._attributes["sap:action-for"]) {
+          const foundEntityType = entityTypes.find((et) => et.fullyQualifiedName === action._attributes["sap:action-for"]);
+          if (foundEntityType) {
+            sourceEntityType = foundEntityType.fullyQualifiedName;
+          }
+        }
+        const parameters = (0, utils_1.ensureArray)(action.Parameter).map((param) => {
+          const v2Annotations = (0, v2annotationsSupport_1.convertV2Annotations)(param._attributes, "ActionParameter", param._attributes.Name);
+          const actionParamFQN = `${actionFQN}/${param._attributes.Name}`;
+          if (v2Annotations.length > 0) {
+            outAnnotationLists.push(createAnnotationList(actionParamFQN, v2Annotations));
+          }
+          return {
+            _type: "ActionParameter",
+            name: param._attributes.Name,
+            fullyQualifiedName: actionParamFQN,
+            type: param._attributes.Type,
+            isCollection: param._attributes.Type.match(/^Collection\(.+\)$/) !== null
+          };
+        });
         return {
           _type: "Action",
           name: action._attributes.Name,
           isBound: false,
-          sourceType: targetEntitySet ? targetEntitySet.entityTypeName : "",
+          sourceType: sourceEntityType !== null && sourceEntityType !== void 0 ? sourceEntityType : "",
           fullyQualifiedName: actionFQN,
           isFunction: false,
-          parameters: (0, utils_1.ensureArray)(action.Parameter).map((param) => {
-            return {
-              _type: "ActionParameter",
-              name: param._attributes.Name,
-              fullyQualifiedName: `${actionFQN}/${param._attributes.Name}`,
-              type: param._attributes.Type,
-              isCollection: param._attributes.Type.match(/^Collection\(.+\)$/) !== null
-            };
-          }),
+          parameters,
           returnType: action._attributes.ReturnType ? action._attributes.ReturnType : "",
           returnCollection: action._attributes.ReturnType ? action._attributes.ReturnType.match(collectionRegexp) !== null : false
         };
@@ -267978,6 +268071,51 @@ var require_parser7 = __commonJS({
             type: "If",
             $If: parseChildren(expression.If)
           };
+        case "Has":
+          return {
+            type: "Has",
+            $Has: parseChildren(expression.Has)
+          };
+        case "In":
+          return {
+            type: "In",
+            $In: parseChildren(expression.In)
+          };
+        case "Add":
+          return {
+            type: "Add",
+            $Add: parseChildren(expression.Add)
+          };
+        case "Sub":
+          return {
+            type: "Sub",
+            $Sub: parseChildren(expression.Sub)
+          };
+        case "Div":
+          return {
+            type: "Div",
+            $Div: parseChildren(expression.Div)
+          };
+        case "DivBy":
+          return {
+            type: "DivBy",
+            $DivBy: parseChildren(expression.DivBy)
+          };
+        case "Mul":
+          return {
+            type: "Mul",
+            $Mul: parseChildren(expression.Mul)
+          };
+        case "Mod":
+          return {
+            type: "Mod",
+            $Mod: parseChildren(expression.Mod)
+          };
+        case "Neg":
+          return {
+            type: "Neg",
+            $Neg: parseChildren(expression.Neg)
+          };
         case "Null":
           return {
             type: "Null"
@@ -267990,7 +268128,7 @@ var require_parser7 = __commonJS({
       }
     }
     function parseExpression(expression, currentTarget, annotationsLists, simplifyPrimitive) {
-      const expressionKeys = Object.keys(expression);
+      const expressionKeys = Object.keys(expression).filter((value) => value !== "_text");
       if (expressionKeys.length > 1) {
         throw new Error(`Too many expressions defined on a single object ${JSON.stringify(expression)}`);
       }
@@ -268140,6 +268278,51 @@ var require_parser7 = __commonJS({
             type: "Le",
             $Le: parseChildren(expression.Le)
           };
+        case "Has":
+          return {
+            type: "Has",
+            $Has: parseChildren(expression.Has)
+          };
+        case "In":
+          return {
+            type: "In",
+            $In: parseChildren(expression.In)
+          };
+        case "Add":
+          return {
+            type: "Add",
+            $Add: parseChildren(expression.Add)
+          };
+        case "Sub":
+          return {
+            type: "Sub",
+            $Sub: parseChildren(expression.Sub)
+          };
+        case "Div":
+          return {
+            type: "Div",
+            $Div: parseChildren(expression.Div)
+          };
+        case "DivBy":
+          return {
+            type: "DivBy",
+            $DivBy: parseChildren(expression.DivBy)
+          };
+        case "Mul":
+          return {
+            type: "Mul",
+            $Mul: parseChildren(expression.Mul)
+          };
+        case "Mod":
+          return {
+            type: "Mod",
+            $Mod: parseChildren(expression.Mod)
+          };
+        case "Neg":
+          return {
+            type: "Neg",
+            $Neg: parseChildren(expression.Neg)
+          };
         default:
           console.error("Unsupported expression type " + expressionKey);
           return {
@@ -268197,6 +268380,7 @@ var require_parser7 = __commonJS({
       const annotations = [];
       const entityTypes = parseEntityTypes((0, utils_1.ensureArray)(edmSchema.EntityType), annotations, namespace);
       const complexTypes = parseComplexTypes((0, utils_1.ensureArray)(edmSchema.ComplexType), annotations, namespace);
+      const enumTypes = parseEnumTypes((0, utils_1.ensureArray)(edmSchema.EnumType), annotations, namespace);
       const typeDefinitions = parseTypeDefinitions((0, utils_1.ensureArray)(edmSchema.TypeDefinition), namespace);
       let entitySets = [];
       let singletons = [];
@@ -268217,7 +268401,7 @@ var require_parser7 = __commonJS({
           fullyQualifiedName: `${namespace}.${edmSchema.EntityContainer._attributes.Name}`
         };
         if (edmVersion === "1.0") {
-          actions = actions.concat(parseV2FunctionImport((0, utils_1.ensureArray)(edmSchema.EntityContainer.FunctionImport), entitySets, entityContainer.fullyQualifiedName));
+          actions = actions.concat(parseV2FunctionImport((0, utils_1.ensureArray)(edmSchema.EntityContainer.FunctionImport), entitySets, entityTypes, entityContainer.fullyQualifiedName, annotations));
         } else if (edmVersion.startsWith("4.")) {
           actionImports = actionImports.concat(parseActionImports((0, utils_1.ensureArray)(edmSchema.EntityContainer.FunctionImport), entityContainer.fullyQualifiedName));
           actionImports = actionImports.concat(parseActionImports((0, utils_1.ensureArray)(edmSchema.EntityContainer.ActionImport), entityContainer.fullyQualifiedName));
@@ -268242,6 +268426,7 @@ var require_parser7 = __commonJS({
         entitySets,
         singletons,
         complexTypes,
+        enumTypes,
         typeDefinitions,
         actions,
         actionImports,
@@ -268321,6 +268506,9 @@ var require_parser7 = __commonJS({
       const complexTypes = schemas.reduce((complexTypesToReduces, schema) => {
         return complexTypesToReduces.concat(schema.complexTypes);
       }, []);
+      const enumTypes = schemas.reduce((enumTypeToReduces, schema) => {
+        return enumTypeToReduces.concat(schema.enumTypes);
+      }, []);
       const typeDefinitions = schemas.reduce((typeDefinitionsToReduce, schema) => {
         return typeDefinitionsToReduce.concat(schema.typeDefinitions);
       }, []);
@@ -268378,6 +268566,7 @@ var require_parser7 = __commonJS({
         entitySets,
         singletons,
         complexTypes,
+        enumTypes,
         typeDefinitions,
         actions,
         actionImports,
@@ -272697,7 +272886,7 @@ var init_package = __esm({
     package_default = {
       name: "@sap/ux-ui5-tooling",
       displayName: "SAP Fiori Tools \u2013 UI5 Tooling",
-      version: "1.20.3",
+      version: "1.20.4",
       description: "SAP Fiori Tools \u2013 UI5 Tooling",
       publisher: "SAPSE",
       license: "SEE LICENSE IN LICENSE",
@@ -272760,10 +272949,10 @@ var init_package = __esm({
         "@sap-ux/store": "1.5.5",
         "@sap-ux/system-access": "0.6.54",
         "@sap-ux/telemetry": "0.6.74",
-        "@sap-ux/ui5-config": "0.29.16",
+        "@sap-ux/ui5-config": "0.29.17",
         "@sap-ux/ui5-info": "0.13.12",
         "@sap-ux/ui5-proxy-middleware": "1.6.16",
-        "@sap/ux-app-templates": "1.20.3",
+        "@sap/ux-app-templates": "1.20.4",
         "@sap/ux-specification": "1.142.1",
         "@types/fs-extra": "11.0.4",
         "@types/marked": "4.0.1",