[#134] Update dist and version

akvo · Dec 6, 2023 · f2f0ab9 · f2f0ab9
1 parent 4a191c6
commit f2f0ab9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -37699,18 +37699,20 @@ var getFnMetadata = function getFnMetadata(fnString) {
   }
   return false;
 };
+
+var fnToArray = function fnToArray(fnString) {
+  var regex = /\#\d+|[(),?;&.'":]|\w+| /g;
+  return fnString.match(regex);
+};
 var generateFnBody = function generateFnBody(fnMetadata, getFieldValue) {
   if (!fnMetadata) {
     return false;
   }
-  var fnMetadataTemp = fnMetadata.trim().split(' ').map(function (f) {
-    return f = f.trim();
-  });
+  var fnMetadataTemp = fnToArray(fnMetadata);
 
   var fnBodyTemp = [];
 
   var fnBody = fnMetadataTemp.map(function (f) {
-    f = f.trim();
     var meta = f.match(metaRegex);
     if (meta) {
       fnBodyTemp.push(f);
@@ -37755,7 +37757,7 @@ var generateFnBody = function generateFnBody(fnMetadata, getFieldValue) {
   if (!fnBody.filter(function (x) {
     return !x;
   }).length) {
-    return fnBody.join(' ');
+    return fnBody.join('');
   }
 
   if (fnBody.filter(function (x) {

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/index.modern.js b/dist/index.modern.js
@@ -37696,18 +37696,20 @@ var getFnMetadata = function getFnMetadata(fnString) {
   }
   return false;
 };
+
+var fnToArray = function fnToArray(fnString) {
+  var regex = /\#\d+|[(),?;&.'":]|\w+| /g;
+  return fnString.match(regex);
+};
 var generateFnBody = function generateFnBody(fnMetadata, getFieldValue) {
   if (!fnMetadata) {
     return false;
   }
-  var fnMetadataTemp = fnMetadata.trim().split(' ').map(function (f) {
-    return f = f.trim();
-  });
+  var fnMetadataTemp = fnToArray(fnMetadata);
 
   var fnBodyTemp = [];
 
   var fnBody = fnMetadataTemp.map(function (f) {
-    f = f.trim();
     var meta = f.match(metaRegex);
     if (meta) {
       fnBodyTemp.push(f);
@@ -37752,7 +37754,7 @@ var generateFnBody = function generateFnBody(fnMetadata, getFieldValue) {
   if (!fnBody.filter(function (x) {
     return !x;
   }).length) {
-    return fnBody.join(' ');
+    return fnBody.join('');
   }
 
   if (fnBody.filter(function (x) {

diff --git a/dist/index.modern.js.map b/dist/index.modern.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "akvo-react-form",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "Simple react component for building webforms",
   "license": "AGPL-3.0",
   "repository": "akvo/akvo-react-form",