@narrative.io/data-collaboration-sdk-ts 0.0.70 → 0.0.71

package/build/nql/DataRulesConverter.js

@@ -141,14 +141,18 @@ function handleFilterExpression(expression, fieldsArray) {
  */
 function updateFieldsArray(field, fieldsArray, filterExpression) {
     const existingEntry = fieldsArray.find((entry) => entry.field === field.field);
-    if (existingEntry != null) {
-        const updatedEntry = {
-            ...existingEntry,
-            filter: { expressions: [filterExpression] }
-        };
-        fieldsArray[fieldsArray.indexOf(existingEntry)] = updatedEntry;
+    if (existingEntry !== undefined) {
+        if (existingEntry.filter !== undefined && typeof existingEntry.filter === 'object' && 'expressions' in existingEntry.filter) {
+            // If there are already filter expressions for this field, push the new one to the array.
+            existingEntry.filter.expressions.push(filterExpression);
+        }
+        else {
+            // If there is no filter object yet, create it with the new filter expression.
+            existingEntry.filter = { expressions: [filterExpression] };
+        }
     }
     else {
+        // If this field does not exist in the fieldsArray, add it with the new filter expression.
         fieldsArray.push({ field: field.field, exported: false, filter: { expressions: [filterExpression] } });
     }
 }
@@ -175,7 +179,7 @@ function constructBinaryFilterExpression(filter) {
  */
 function expressionToString(expr) {
     if (typeof expr === 'string') {
-        return `${expr}`;
+        return `${addParentheses(expr)}`;
     }
     else if (typeof expr === 'number') {
         return expr.toString();
@@ -187,3 +191,24 @@ function expressionToString(expr) {
         return expr.field;
     }
 }
+/**
+ * Adds parentheses to 'CURRENT_TIMESTAMP' or 'CURRENT_DATE' in the input string
+ * if they are not already followed by parentheses.
+ *
+ * @param {string} input - The input string to be processed.
+ * @return {string} The processed string with parentheses added where necessary.
+ *
+ * @example
+ * // returns "SELECT * FROM users WHERE timestamp > CURRENT_TIMESTAMP()"
+ * addParentheses("SELECT * FROM users WHERE timestamp > CURRENT_TIMESTAMP");
+ *
+ * @example
+ * // returns "SELECT * FROM users WHERE date = CURRENT_DATE()"
+ * addParentheses("SELECT * FROM users WHERE date = CURRENT_DATE");
+ */
+function addParentheses(input) {
+    // Regular expression that matches 'CURRENT_TIMESTAMP' or 'CURRENT_DATE' that is not followed by ()
+    const regex = /(CURRENT_TIMESTAMP|CURRENT_DATE)(?!\(\))/g;
+    // Replace matched string with itself followed by ()
+    return input.replace(regex, '$1()');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@narrative.io/data-collaboration-sdk-ts",
-  "version": "0.0.70",
+  "version": "0.0.71",
   "main": "build/index.js",
   "repository": "github:narrative-io/data-collaboration-sdk-ts",
   "source": "src/index.ts",
@@ -31,7 +31,7 @@
     "eslint": "^8.33.0",
     "eslint-config-standard-with-typescript": "^35.0.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^15.6.1",
+    "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-promise": "^6.1.1",
     "husky": "^8.0.0",
     "jest": "^29.4.3",