angular-odata 0.140.0 → 0.140.1

package/fesm2022/angular-odata.mjs

@@ -497,21 +497,19 @@ const SUPPORTED_EXPAND_PROPERTIES = [
 ];
 const FUNCTION_REGEX = /\((.*)\)/;
 const INDEXOF_REGEX = /(?!indexof)\((\w+)\)/;
-var StandardAggregateMethods;
-(function (StandardAggregateMethods) {
-    StandardAggregateMethods["sum"] = "sum";
-    StandardAggregateMethods["min"] = "min";
-    StandardAggregateMethods["max"] = "max";
-    StandardAggregateMethods["average"] = "average";
-    StandardAggregateMethods["countdistinct"] = "countdistinct";
-})(StandardAggregateMethods || (StandardAggregateMethods = {}));
-var QueryCustomTypes;
-(function (QueryCustomTypes) {
-    QueryCustomTypes[QueryCustomTypes["Raw"] = 0] = "Raw";
-    QueryCustomTypes[QueryCustomTypes["Alias"] = 1] = "Alias";
-    QueryCustomTypes[QueryCustomTypes["Duration"] = 2] = "Duration";
-    QueryCustomTypes[QueryCustomTypes["Binary"] = 3] = "Binary";
-})(QueryCustomTypes || (QueryCustomTypes = {}));
+const StandardAggregateMethods = {
+    sum: 'sum',
+    min: 'min',
+    max: 'max',
+    average: 'average',
+    countdistinct: 'countdistinct'
+};
+const QueryCustomTypes = {
+    Raw: 'Raw',
+    Alias: 'Alias',
+    Duration: 'Duration',
+    Binary: 'Binary'
+};
 //https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#sec_QueryOptions
 const raw = (value) => ({
     type: QueryCustomTypes.Raw,
@@ -887,10 +885,8 @@ function buildFilter(filters = {}, { aliases, propPrefix, escape, }) {
     }
 }
 function getStringCollectionClause(lambdaParameter, value, collectionOperator, propName) {
-    let clause = '';
     const conditionOperator = collectionOperator == 'all' ? 'ne' : 'eq';
-    clause = `${propName}/${collectionOperator}(${lambdaParameter}: ${lambdaParameter} ${conditionOperator} '${value}')`;
-    return clause;
+    return `${propName}/${collectionOperator}(${lambdaParameter}: ${lambdaParameter} ${conditionOperator} '${value}')`;
 }
 function escapeIllegalChars(string) {
     string = string.replace(/%/g, '%25');
@@ -1028,27 +1024,40 @@ function buildTransforms(transforms, { aliases, escape = false }) {
     // Wrap single object an array for simplified processing
     const transformsArray = Array.isArray(transforms) ? transforms : [transforms];
     const transformsResult = transformsArray.reduce((result, transform) => {
-        const { aggregate, filter, groupBy, ...rest } = transform;
-        // TODO: support as many of the following:
-        //   topcount, topsum, toppercent,
-        //   bottomsum, bottomcount, bottompercent,
-        //   identity, concat, expand, search, compute, isdefined
-        const unsupportedKeys = Object.keys(rest);
-        if (unsupportedKeys.length) {
-            throw new Error(`Unsupported transform(s): ${unsupportedKeys}`);
-        }
-        if (aggregate) {
-            result.push(`aggregate(${buildAggregate(aggregate)})`);
-        }
-        if (filter) {
-            const builtFilter = buildFilter(filter, { aliases, escape });
-            if (builtFilter) {
-                result.push(`filter(${buildFilter(builtFilter, { aliases, escape })})`);
+        for (const key of Object.keys(transform)) {
+            switch (key) {
+                // TODO: support as many of the following:
+                //   topcount, topsum, toppercent,
+                //   bottomsum, bottomcount, bottompercent,
+                //   identity, concat, expand, search, compute, isdefined
+                case 'aggregate': {
+                    const aggregate = transform[key];
+                    if (aggregate) {
+                        result.push(`aggregate(${buildAggregate(aggregate)})`);
+                    }
+                    break;
+                }
+                case 'filter': {
+                    const filter = transform[key];
+                    if (filter) {
+                        const builtFilter = buildFilter(filter, { aliases, escape });
+                        if (builtFilter) {
+                            result.push(`filter(${builtFilter})`);
+                        }
+                    }
+                    break;
+                }
+                case 'groupBy': {
+                    const groupBy = transform[key];
+                    if (groupBy) {
+                        result.push(`groupby(${buildGroupBy(groupBy, { aliases, escape })})`);
+                    }
+                    break;
+                }
+                default:
+                    throw new Error(`Unsupported transform(s): ${key}`);
             }
         }
-        if (groupBy) {
-            result.push(`groupby(${buildGroupBy(groupBy, { aliases, escape })})`);
-        }
         return result;
     }, []);
     return transformsResult.join('/') || undefined;