@dhis2/expression-parser 1.1.4 → 1.1.5

package/expression-parser.mjs

@@ -85,10 +85,12 @@ import {
   coerceAtMost322komnqp70ag as coerceAtMost,
   IntRange1cx8zvxgibbj2 as IntRange,
   replace3le3ie7l9k8aq as replace,
-  endsWith3cq61xxngobwh as endsWith,
   startsWith26w8qjqapeeq6 as startsWith,
+  take9j4462mea726 as take,
+  dropLastlqc2oyv04br0 as dropLast,
+  endsWith3cq61xxngobwh as endsWith,
   Regex_init_$Create$xe1wdfnzfij1 as Regex_init_$Create$,
-  take3onnpy6q7ctcz as take,
+  take3onnpy6q7ctcz as take_0,
   copyToArray2j022khrow2yi as copyToArray,
   getProgressionLastElement2w30kdy2w5nkt as getProgressionLastElement,
   arrayCopytctsywo3h7gj as arrayCopy,
@@ -728,7 +730,7 @@ function d2_split(input, delimiter, index) {
         // Inline function 'kotlin.text.isEmpty' call
         var this_2 = iterator.j1();
         if (!(charSequenceLength(this_2) === 0)) {
-          tmp$ret$4 = take(this_1, iterator.i1() + 1 | 0);
+          tmp$ret$4 = take_0(this_1, iterator.i1() + 1 | 0);
           break $l$block;
         }
       }
@@ -5873,21 +5875,11 @@ protoOf(Companion_14).f19 = function (gs1Group) {
   var tmp0_iterator = get_entries_6().s();
   while (tmp0_iterator.t()) {
     var gs1Elements = tmp0_iterator.u();
-    var ai = gs1Elements.e19_1;
-    if (endsWith(ai, '*')) {
-      // Inline function 'kotlin.text.substring' call
-      var this_0 = ai;
-      var endIndex = ai.length - 1 | 0;
-      // Inline function 'kotlin.js.asDynamic' call
-      ai = this_0.substring(0, endIndex);
-    }
-    if (startsWith(gs1Group, ai) ? endsWith(ai, '*') : false) {
-      // Inline function 'kotlin.text.substring' call
-      var endIndex_0 = ai.length + 1 | 0;
-      // Inline function 'kotlin.js.asDynamic' call
-      return gs1Group.substring(0, endIndex_0);
-    } else if (startsWith(gs1Group, ai)) {
-      return ai;
+    var name = gs1Elements.e19_1;
+    if ((endsWith(name, '*') ? gs1Group.length >= name.length : false) ? startsWith(gs1Group, dropLast(name, 1)) : false) {
+      return take(gs1Group, name.length);
+    } else if (startsWith(gs1Group, name)) {
+      return name;
     }
   }
   throw IllegalArgumentException_init_$Create$('Could not retrieve ai from value');
@@ -6941,7 +6933,7 @@ function formatValue($this, value, valueToReturn) {
         // Inline function 'kotlin.text.isEmpty' call
         var this_3 = iterator.j1();
         if (!(charSequenceLength(this_3) === 0)) {
-          tmp$ret$4 = take(this_2, iterator.i1() + 1 | 0);
+          tmp$ret$4 = take_0(this_2, iterator.i1() + 1 | 0);
           break $l$block;
         }
       }
@@ -10143,7 +10135,7 @@ function dataItem($this, expr, ctx, name) {
         // Inline function 'kotlin.text.isEmpty' call
         var this_1 = iterator.j1();
         if (!(charSequenceLength(this_1) === 0)) {
-          tmp$ret$4 = take(this_0, iterator.i1() + 1 | 0);
+          tmp$ret$4 = take_0(this_0, iterator.i1() + 1 | 0);
           break $l$block;
         }
       }
@@ -10208,7 +10200,7 @@ function dataItem($this, expr, ctx, name) {
               // Inline function 'kotlin.text.isEmpty' call
               var this_5 = iterator_0.j1();
               if (!(charSequenceLength(this_5) === 0)) {
-                tmp$ret$16 = take(this_4, iterator_0.i1() + 1 | 0);
+                tmp$ret$16 = take_0(this_4, iterator_0.i1() + 1 | 0);
                 break $l$block_1;
               }
             }
@@ -10263,7 +10255,7 @@ function isTaggedUidGroup($this, expr) {
           // Inline function 'kotlin.text.isEmpty' call
           var this_1 = iterator.j1();
           if (!(charSequenceLength(this_1) === 0)) {
-            tmp$ret$6 = take(this_0, iterator.i1() + 1 | 0);
+            tmp$ret$6 = take_0(this_0, iterator.i1() + 1 | 0);
             break $l$block;
           }
         }