@fibery/expression-utils 9.5.6 → 9.5.8

package/lib/index.d.ts

@@ -7,7 +7,7 @@ declare const filterExpression: {
     findMatchedFilter: (filterExpression: import("./src/types").Expression, params: import("./src/tsfixme").$TSFixMe, operators: Array<import("./src/filter-expression/types").Operator>, schema: import("@fibery/schema").Schema | null, type: string) => {
         operator: import("./src/filter-expression/types").Operator;
         value: any;
-        expression: import("./src/types").Expression | undefined;
+        expression: import("./src/types").Expression;
         type: string;
         id: string;
     } | null;

package/lib/index.js

@@ -47,3 +47,4 @@ const patternToExpression_1 = require("./src/filter-expression/patternToExpressi
 const operators = __importStar(require("./src/filter-expression/operators"));
 const filterExpression = { findMatchedFilter: filter_expression_1.findMatchedFilter, operators, convertToExpression: patternToExpression_1.convertToExpression };
 exports.filterExpression = filterExpression;
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8EAAgE;AAWvC,gDAAkB;AAV3C,mDAAqC;AAU7B,sBAAK;AATb,yDAA2C;AAS5B,4BAAQ;AARvB,0EAA4D;AAQf,4CAAgB;AAN7D,+DAA0D;AAC1D,qFAAgF;AAChF,6EAA+D;AAE/D,MAAM,gBAAgB,GAAG,EAAC,iBAAiB,EAAjB,qCAAiB,EAAE,SAAS,EAAE,mBAAmB,EAAnB,yCAAmB,EAAC,CAAC;AAEd,4CAAgB"}

package/lib/src/context-variables.js

@@ -120,3 +120,4 @@ const getEntityQueryVariables = (schema) => {
     }));
 };
 exports.getEntityQueryVariables = getEntityQueryVariables;
+//# sourceMappingURL=context-variables.js.map

package/lib/src/context-variables.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context-variables.js","sourceRoot":"","sources":["../../src/context-variables.ts"],"names":[],"mappings":"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"}

package/lib/src/errors.js

@@ -13,3 +13,4 @@ class NotImplementedError extends Error {
     }
 }
 exports.NotImplementedError = NotImplementedError;
+//# sourceMappingURL=errors.js.map

package/lib/src/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":";;;AAEA,MAAM,SAAS,GAAG,CAAC,CAAW,EAAE,EAAE;IAChC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;QACpB,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAa,mBAAoB,SAAQ,KAAK;IAC5C,YAAY,KAAe,EAAE,QAAiB;QAC5C,KAAK,CAAC,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5G,CAAC;CACF;AAJD,kDAIC"}

package/lib/src/fieldExpressionVisitorTypeAware.js

@@ -131,3 +131,4 @@ const fieldAccessVisitorTypeAware = ({ typeObject, onField = defaultOnField, onF
     return fieldAccessVisitorTypeAwareInternal({ typeObject, rootTypeObject: typeObject, onField, onFieldNotFound });
 };
 exports.fieldAccessVisitorTypeAware = fieldAccessVisitorTypeAware;
+//# sourceMappingURL=fieldExpressionVisitorTypeAware.js.map

package/lib/src/fieldExpressionVisitorTypeAware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fieldExpressionVisitorTypeAware.js","sourceRoot":"","sources":["../../src/fieldExpressionVisitorTypeAware.js"],"names":[],"mappings":"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"}

package/lib/src/filter-expression/index.d.ts

@@ -5,7 +5,7 @@ import { $TSFixMe } from "../tsfixme";
 export declare const findMatchedFilter: (filterExpression: Expression, params: $TSFixMe, operators: Array<Operator>, schema: Schema | null, type: string) => {
     operator: Operator;
     value: any;
-    expression: Expression | undefined;
+    expression: Expression;
     type: string;
     id: string;
 } | null;

package/lib/src/filter-expression/index.js

@@ -11,9 +11,15 @@ const findMatchedFilter = (filterExpression, params, operators, schema, type) =>
     const typeObject = schema.typeObjectsByName[type];
     for (const operator of operators) {
         if (operator.customMatch) {
-            const { matchSuccess, value, expression } = operator.customMatch(filterExpression, params, typeObject);
-            if (matchSuccess) {
-                return { operator, value, expression, type, id: (0, uuid_1.v4)() };
+            const matchResult = operator.customMatch(filterExpression, params, typeObject);
+            if (matchResult.matchSuccess) {
+                return {
+                    operator,
+                    value: matchResult.value,
+                    expression: matchResult.expression,
+                    type,
+                    id: (0, uuid_1.v4)(),
+                };
             }
         }
         else {
@@ -40,3 +46,4 @@ const findMatchedFilter = (filterExpression, params, operators, schema, type) =>
     return null;
 };
 exports.findMatchedFilter = findMatchedFilter;
+//# sourceMappingURL=index.js.map

package/lib/src/filter-expression/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/filter-expression/index.ts"],"names":[],"mappings":";;;AAGA,mDAA+C;AAE/C,+BAAkC;AAClC,sCAA8C;AAEvC,MAAM,iBAAiB,GAAG,CAC/B,gBAA4B,EAC5B,MAAgB,EAChB,SAA0B,EAC1B,MAAqB,EACrB,IAAY,EACZ,EAAE;IACF,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAElD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzB,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YAC/E,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;gBAC7B,OAAO;oBACL,QAAQ;oBACR,KAAK,EAAE,WAAW,CAAC,KAAK;oBAExB,UAAU,EAAE,WAAW,CAAC,UAAU;oBAClC,IAAI;oBACJ,EAAE,EAAE,IAAA,SAAM,GAAE;iBACb,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,EAAC,YAAY,EAAE,OAAO,EAAC,GAAG,IAAA,8BAAc,EAAC,gBAAgB,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACvG,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,8BAA8B,CAAC,CAAC;gBAC3F,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,mCAAmC,CAAC,CAAC;gBACrG,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5B,MAAM,IAAI,4BAAmB,CAAC,kDAAkD,CAAC,CAAC;gBACpF,CAAC;gBACD,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACjC,MAAM,IAAI,4BAAmB,CAAC,uDAAuD,CAAC,CAAC;gBACzF,CAAC;gBAED,OAAO;oBACL,QAAQ;oBACR,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK;oBAC/C,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,KAAK;oBACtC,IAAI;oBACJ,EAAE,EAAE,IAAA,SAAM,GAAE;iBACb,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAjDW,QAAA,iBAAiB,qBAiD5B"}

package/lib/src/filter-expression/operator-utils.d.ts

@@ -0,0 +1,7 @@
+import { CustomMatchFn, Operator } from "./types";
+import { $TSFixMe } from "../tsfixme";
+import { Expression } from "../types";
+export declare const isDateTime: (dateString: string) => boolean;
+export declare const getCompareOperatorForDateTime: (id: string, title: string, operator: string, compareByStartInterval: boolean) => Operator;
+export declare const getWithinOperatorCustomConvertFn: (leftPartExcluded: boolean) => ((expression: Expression, value: $TSFixMe, getNextParamName: () => string) => $TSFixMe);
+export declare const getWithinOperatorCustomMatchFn: (fieldPlaceholder: $TSFixMe, leftPartExcluded: boolean) => CustomMatchFn;

package/lib/src/filter-expression/{operatorUtils.js → operator-utils.js}

@@ -24,24 +24,35 @@ const getCompareOperatorForDateTime = (id, title, operator, compareByStartInterv
             operator,
             patternMatchPlaceholders_1.dateTimeOrDateTimeRangeExpressionPlaceholder,
             (0, patternMatchPlaceholders_1.getParamPlaceholder)((x) => {
-                return params_placeholders_1.paramsPlaceholdersLookup[x] || (lodash_1.default.isString(x) && (0, exports.isDateTime)(x)) || (0, params_placeholders_1.parseRelativeDatePlaceholder)(x);
+                return (Boolean(params_placeholders_1.paramsPlaceholdersLookup[x]) ||
+                    (lodash_1.default.isString(x) && (0, exports.isDateTime)(x)) ||
+                    Boolean((0, params_placeholders_1.parseRelativeDatePlaceholder)(x)));
             }),
         ], typeObject);
         if (matchSuccess) {
-            const relativeDateInfo = (0, params_placeholders_1.parseRelativeDatePlaceholder)(paramMatch.value);
+            const paramValue = paramMatch.value;
+            const relativeDateInfo = (0, params_placeholders_1.parseRelativeDatePlaceholder)(paramValue);
             if (relativeDateInfo && relativeDateInfo.isStartOfInterval === compareByStartInterval) {
                 const value = (0, params_placeholders_1.toRelativeDatePlaceholder)({ ...relativeDateInfo, isStartOfInterval: undefined });
-                return { matchSuccess, expression: fieldMatch.value, value };
+                return {
+                    matchSuccess,
+                    expression: fieldMatch.value,
+                    value,
+                };
             }
-            else if (params_placeholders_1.paramsPlaceholdersLookup[paramMatch.value]) {
-                const value = lodash_1.default.findKey(params_placeholders_1.dateToDateTimeIntervalLookup, (val) => compareByStartInterval ? val.start === paramMatch.value : val.end === paramMatch.value);
-                return { matchSuccess, expression: fieldMatch.value, value };
+            else if (params_placeholders_1.paramsPlaceholdersLookup[paramValue]) {
+                const value = lodash_1.default.findKey(params_placeholders_1.dateToDateTimeIntervalLookup, (val) => compareByStartInterval ? val.start === paramValue : val.end === paramValue);
+                return {
+                    matchSuccess,
+                    expression: fieldMatch.value,
+                    value,
+                };
             }
             else {
                 return {
                     matchSuccess,
                     expression: fieldMatch.value,
-                    value: paramMatch.value,
+                    value: paramValue,
                 };
             }
         }
@@ -80,7 +91,7 @@ const getCompareOperatorForDateTime = (id, title, operator, compareByStartInterv
     type: ":operator-type/binary",
 });
 exports.getCompareOperatorForDateTime = getCompareOperatorForDateTime;
-const getWithinRangeParam = ({ withinRangeValue, getNextParamName }) => {
+const getWithinRangeParam = ({ withinRangeValue, getNextParamName, }) => {
     // check that it's a relative date.
     const withinRangeDateInfo = (0, params_placeholders_1.parseRelativeDatePlaceholder)(withinRangeValue);
     if (withinRangeValue && withinRangeDateInfo) {
@@ -95,12 +106,10 @@ const getWithinOperatorCustomConvertFn = (leftPartExcluded) => {
         const { key: startParamKey, value: startParamValue } = getWithinRangeParam({
             withinRangeValue: value.withinRangeStart,
             getNextParamName,
-            compareByStartInterval: true,
         });
         const { key: endParamKey, value: endParamValue } = getWithinRangeParam({
             withinRangeValue: value.withinRangeEnd,
             getNextParamName,
-            compareByStartInterval: false,
         });
         return {
             // See https://the.fibery.io/SoftDev/bug/The-left-part-of-'is-within'-condition-is-not-included-into-filter-12264
@@ -140,15 +149,19 @@ const getWithinRangeValue = (paramMatchValue) => {
 };
 const matchWithinOperator = (pattern, where, params, typeObject) => {
     const { matchSuccess, matches: [firstFieldMatch, firstParamMatch, secondFieldMatch, secondParamMatch], } = (0, pattern_match_1.doPatternMatch)(where, params, pattern, typeObject);
-    if (matchSuccess && lodash_1.default.isEqual(firstFieldMatch.value, secondFieldMatch.value)) {
-        return {
-            matchSuccess,
-            expression: firstFieldMatch.value,
-            value: {
-                withinRangeStart: getWithinRangeValue(firstParamMatch.value),
-                withinRangeEnd: getWithinRangeValue(secondParamMatch.value),
-            },
-        };
+    if (matchSuccess) {
+        const firstFieldValue = firstFieldMatch.value;
+        const secondFieldValue = secondFieldMatch.value;
+        if (lodash_1.default.isEqual(firstFieldValue, secondFieldValue)) {
+            return {
+                matchSuccess,
+                expression: firstFieldValue,
+                value: {
+                    withinRangeStart: getWithinRangeValue(firstParamMatch.value),
+                    withinRangeEnd: getWithinRangeValue(secondParamMatch.value),
+                },
+            };
+        }
     }
     return { matchSuccess: false };
 };
@@ -172,3 +185,4 @@ const getWithinOperatorCustomMatchFn = (fieldPlaceholder, leftPartExcluded) => {
     };
 };
 exports.getWithinOperatorCustomMatchFn = getWithinOperatorCustomMatchFn;
+//# sourceMappingURL=operator-utils.js.map

package/lib/src/filter-expression/operator-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operator-utils.js","sourceRoot":"","sources":["../../../src/filter-expression/operator-utils.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,gEAmBgC;AAChC,mDAA+C;AAC/C,yEAA6G;AAM7G,MAAM,iBAAiB,GAAG,0BAA0B,CAAC;AACrD,MAAM,aAAa,GAAG,YAAY,CAAC;AACnC,oEAAoE;AACpE,0FAA0F;AAC1F,8EAA8E;AAC9E,sDAAsD;AAC/C,MAAM,UAAU,GAAG,CAAC,UAAkB,EAAW,EAAE,CACxD,UAAU,CAAC,MAAM,KAAK,iBAAiB,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,CAAC;AADlF,QAAA,UAAU,cACwE;AAExF,MAAM,6BAA6B,GAAG,CAC3C,EAAU,EACV,KAAa,EACb,QAAgB,EAChB,sBAA+B,EACrB,EAAE,CAAC,CAAC;IACd,EAAE;IACF,KAAK;IACL,WAAW,EAAE,CAAC,KAAiB,EAAE,MAAgB,EAAE,UAAsB,EAAE,EAAE;QAC3E,MAAM,EACJ,YAAY,EACZ,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,GAClC,GAAG,IAAA,8BAAc,EAChB,KAAK,EACL,MAAM,EACN;YACE,QAAQ;YACR,uEAA4C;YAC5C,IAAA,8CAAmB,EAAC,CAAC,CAAC,EAAE,EAAE;gBACxB,OAAO,CACL,OAAO,CAAC,8CAAwB,CAAC,CAAC,CAAC,CAAC;oBACpC,CAAC,gBAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAA,kBAAU,EAAC,CAAC,CAAC,CAAC;oBAChC,OAAO,CAAC,IAAA,kDAA4B,EAAC,CAAC,CAAC,CAAC,CACzC,CAAC;YACJ,CAAC,CAAC;SACH,EACD,UAAU,CACX,CAAC;QACF,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC;YACpC,MAAM,gBAAgB,GAAG,IAAA,kDAA4B,EAAC,UAAU,CAAC,CAAC;YAClE,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,iBAAiB,KAAK,sBAAsB,EAAE,CAAC;gBACtF,MAAM,KAAK,GAAG,IAAA,+CAAyB,EAAC,EAAC,GAAG,gBAAgB,EAAE,iBAAiB,EAAE,SAAS,EAAC,CAAC,CAAC;gBAC7F,OAAO;oBACL,YAAY;oBACZ,UAAU,EAAE,UAAU,CAAC,KAAK;oBAC5B,KAAK;iBACN,CAAC;YACJ,CAAC;iBAAM,IAAI,8CAAwB,CAAC,UAAU,CAAC,EAAE,CAAC;gBAChD,MAAM,KAAK,GAAG,gBAAC,CAAC,OAAO,CAAC,kDAA4B,EAAE,CAAC,GAAG,EAAE,EAAE,CAC5D,sBAAsB,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,UAAU,CAC3E,CAAC;gBACF,OAAO;oBACL,YAAY;oBACZ,UAAU,EAAE,UAAU,CAAC,KAAK;oBAC5B,KAAK;iBACN,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO;oBACL,YAAY;oBACZ,UAAU,EAAE,UAAU,CAAC,KAAK;oBAC5B,KAAK,EAAE,UAAU;iBAClB,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,EAAC,YAAY,EAAE,KAAc,EAAC,CAAC;IACxC,CAAC;IACD,8BAA8B,EAAE,CAAC,UAAoB,EAAE,KAAe,EAAE,gBAA0B,EAAE,EAAE;QACpG,MAAM,oBAAoB,GAAG,kDAA4B,CAAC,KAAK,CAAC,CAAC;QACjE,IAAI,gBAAgB,GAAG,IAAI,CAAC;QAC5B,IAAI,oBAAoB,EAAE,CAAC;YACzB,MAAM,EAAC,KAAK,EAAE,GAAG,EAAC,GAAG,oBAAoB,CAAC;YAC1C,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;YAC/D,OAAO;gBACL,UAAU,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,iBAAiB,CAAC;gBACrD,MAAM,EAAE,EAAC,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,EAAC;aACjD,CAAC;QACJ,CAAC;aAAM,IAAI,CAAC,gBAAgB,GAAG,IAAA,kDAA4B,EAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACpE,MAAM,SAAS,GAAG,IAAA,+CAAyB,EAAC;gBAC1C,GAAG,gBAAgB;gBACnB,iBAAiB,EAAE,sBAAsB;gBACzC,YAAY,EAAE,KAAK;aACpB,CAAC,CAAC;YACH,OAAO;gBACL,UAAU,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC;gBAC7C,MAAM,EAAE,EAAC,CAAC,SAAS,CAAC,EAAE,SAAS,EAAC;aACjC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;YACzC,OAAO;gBACL,UAAU,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC;gBACjD,MAAM,EAAE,EAAC,CAAC,aAAa,CAAC,EAAE,KAAK,EAAC;aACjC,CAAC;QACJ,CAAC;IACH,CAAC;IACD,IAAI,EAAE,uBAAuB;CAC9B,CAAC,CAAC;AAtFU,QAAA,6BAA6B,iCAsFvC;AAEH,MAAM,mBAAmB,GAAG,CAAC,EAC3B,gBAAgB,EAChB,gBAAgB,GAIjB,EAAkC,EAAE;IACnC,mCAAmC;IACnC,MAAM,mBAAmB,GAAG,IAAA,kDAA4B,EAAC,gBAAgB,CAAC,CAAC;IAC3E,IAAI,gBAAgB,IAAI,mBAAmB,EAAE,CAAC;QAC5C,OAAO,EAAC,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,gBAAgB,EAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,OAAO,EAAC,GAAG,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,gCAAgC,GAAG,CAC9C,gBAAyB,EACgE,EAAE;IAC3F,OAAO,CAAC,UAAsB,EAAE,KAAe,EAAE,gBAA8B,EAAE,EAAE;QACjF,MAAM,EAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,eAAe,EAAC,GAAG,mBAAmB,CAAC;YACvE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,gBAAgB;SACjB,CAAC,CAAC;QACH,MAAM,EAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAC,GAAG,mBAAmB,CAAC;YACnE,gBAAgB,EAAE,KAAK,CAAC,cAAc;YACtC,gBAAgB;SACjB,CAAC,CAAC;QACH,OAAO;YACL,iHAAiH;YACjH,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAChH,MAAM,EAAE;gBACN,CAAC,aAAa,CAAC,EAAE,eAAe;gBAChC,CAAC,WAAW,CAAC,EAAE,aAAa;aAC7B;SACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,gCAAgC,oCAqB3C;AAEF,MAAM,wCAAwC,GAA2B;IACvE,6FAA6F;IAC7F,CAAC,iDAA2B,CAAC,EAAE,sCAAsC;IACrE,CAAC,kDAA4B,CAAC,EAAE,uCAAuC;IACvE,CAAC,iDAA2B,CAAC,EAAE,sCAAsC;IACrE,CAAC,qDAA+B,CAAC,EAAE,qCAAqC;IACxE,CAAC,sDAAgC,CAAC,EAAE,sCAAsC;IAC1E,CAAC,qDAA+B,CAAC,EAAE,qCAAqC;IACxE,CAAC,+CAAyB,CAAC,EAAE,mCAAmC;IAChE,CAAC,0DAAoC,CAAC,EAAE,2CAA2C;IACnF,CAAC,2DAAqC,CAAC,EAAE,4CAA4C;IACrF,CAAC,0DAAoC,CAAC,EAAE,2CAA2C;IACnF,CAAC,4DAAsC,CAAC,EAAE,0CAA0C;IACpF,CAAC,6DAAuC,CAAC,EAAE,2CAA2C;IACtF,CAAC,4DAAsC,CAAC,EAAE,0CAA0C;IACpF,CAAC,sDAAgC,CAAC,EAAE,wCAAwC;CAC7E,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,eAAuB,EAAU,EAAE;IAC9D,IAAI,MAAM,CAAC,MAAM,CAAC,wCAAwC,EAAE,eAAe,CAAC,EAAE,CAAC;QAC7E,OAAO,wCAAwC,CAAC,eAAe,CAAC,CAAC;IACnE,CAAC;SAAM,CAAC;QACN,OAAO,eAAe,CAAC;IACzB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAC1B,OAAiB,EACjB,KAAiB,EACjB,MAAgB,EAChB,UAAsB,EACH,EAAE;IACrB,MAAM,EACJ,YAAY,EACZ,OAAO,EAAE,CAAC,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,GAChF,GAAG,IAAA,8BAAc,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACvD,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,eAAe,GAAG,eAAe,CAAC,KAAK,CAAC;QAC9C,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAChD,IAAI,gBAAC,CAAC,OAAO,CAAC,eAAe,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACjD,OAAO;gBACL,YAAY;gBACZ,UAAU,EAAE,eAAe;gBAC3B,KAAK,EAAE;oBACL,gBAAgB,EAAE,mBAAmB,CAAC,eAAe,CAAC,KAAK,CAAC;oBAC5D,cAAc,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,KAAK,CAAC;iBAC5D;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,EAAC,YAAY,EAAE,KAAc,EAAC,CAAC;AACxC,CAAC,CAAC;AAEK,MAAM,8BAA8B,GAAG,CAC5C,gBAA0B,EAC1B,gBAAyB,EACV,EAAE;IACjB,OAAO,CAAC,KAAiB,EAAE,MAAgB,EAAE,UAAsB,EAAqB,EAAE;QACxF,MAAM,KAAK,GAAG,mBAAmB,CAC/B;YACE,KAAK;YACL,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAA,8CAAmB,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;YAC/D,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAA,8CAAmB,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;SACjE,EACD,KAAK,EACL,MAAM,EACN,UAAU,CACX,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC7C,iHAAiH;YACjH,iIAAiI;YACjI,OAAO,mBAAmB,CACxB;gBACE,KAAK;gBACL,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAA,8CAAmB,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;gBAChE,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAA,8CAAmB,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;aACjE,EACD,KAAK,EACL,MAAM,EACN,UAAU,CACX,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,8BAA8B,kCA+BzC"}