@narrative.io/data-collaboration-sdk-ts 0.0.126 → 0.0.128

package/build/nql/DataRulesConverter.js

@@ -33,13 +33,14 @@ async function getAttributesFromFields(fields) {
     });
     const attributes = await attributesApi.getAttributes();
     const uniqueAttributes = [
-        ...new Set(fields.map((field) => field.field.split(".")[0])),
+        ...new Set(fields.map((field) => stripQuotes(field.field).split(".")[0])),
     ].filter((att) => !att.startsWith("_"));
     uniqueAttributes.forEach((att) => {
         const isObjectProperty = isObject(attributes.records, att);
         const relevantFields = isObjectProperty != null
-            ? fields.filter((field) => field.field.split(".")[0] === att && field.field !== att)
-            : fields.filter((field) => field.field.split(".")[0] === att);
+            ? fields.filter((field) => stripQuotes(field.field).split(".")[0] === att &&
+                field.field !== att)
+            : fields.filter((field) => stripQuotes(field.field).split(".")[0] === att);
         const attributeId = attributes.records.find((attribute) => attribute.name === att)?.id;
         if (attributeId === undefined) {
             throw new Error(`Attribute ${att} not found`);
@@ -89,10 +90,10 @@ function ensureAtLeastOneRequired(dataRulesAttributes) {
 function getPriceFromNql(nqlObject) {
     const priceFilter = nqlObject.where.filterExpressions.filter((expr) => ("left" in expr &&
         typeof expr.left === "object" &&
-        expr.left.field === "_price_cpm_usd") ||
+        stripQuotes(expr.left.field) === "_price_cpm_usd") ||
         ("right" in expr &&
             typeof expr.right === "object" &&
-            expr.right.field === "_price_cpm_usd"));
+            stripQuotes(expr.right.field) === "_price_cpm_usd"));
     if (priceFilter.length !== 1) {
         throw new Error("Expected exactly one price filter");
     }
@@ -120,7 +121,7 @@ function getFieldsFromNql(nqlObject) {
     // Extract all fields from the 'select' section and mark them as exported.
     nqlObject.select.forEach((field) => {
         fieldsArray.push({
-            field: field.field.replace('"value"', "value").replace('"type"', "type"),
+            field: stripQuotes(field.field),
             exported: true,
         });
     });
@@ -157,7 +158,7 @@ function handleFilterExpression(expression, fieldsArray) {
  * @param {any} filterExpression - The filter expression to add to the field.
  */
 function updateFieldsArray(field, fieldsArray, filterExpression) {
-    const existingEntry = fieldsArray.find((entry) => entry.field === field.field);
+    const existingEntry = fieldsArray.find((entry) => entry.field === stripQuotes(field.field));
     if (existingEntry !== undefined) {
         if (existingEntry.filter !== undefined &&
             typeof existingEntry.filter === "object" &&
@@ -173,7 +174,7 @@ function updateFieldsArray(field, fieldsArray, filterExpression) {
     else {
         // If this field does not exist in the fieldsArray, add it with the new filter expression.
         fieldsArray.push({
-            field: field.field,
+            field: stripQuotes(field.field),
             exported: false,
             filter: { expressions: [filterExpression] },
         });
@@ -185,7 +186,7 @@ function updateFieldsArray(field, fieldsArray, filterExpression) {
  * @returns {string} - Returns a string representation of the unary filter expression.
  */
 function constructUnaryFilterExpression(filter) {
-    return `${expressionToString(filter.field.field)} ${filter.operator}`;
+    return `${expressionToString(stripQuotes(filter.field.field))} ${filter.operator}`;
 }
 /**
  * Constructs a string representing a binary filter expression.
@@ -193,7 +194,7 @@ function constructUnaryFilterExpression(filter) {
  * @returns {string} - Returns a string representation of the binary filter expression.
  */
 function constructBinaryFilterExpression(filter) {
-    return `${expressionToString(filter.left)} ${filter.operator} ${expressionToString(filter.right)}`;
+    return `${stripQuotes(expressionToString(filter.left))} ${filter.operator} ${stripQuotes(expressionToString(filter.right))}`;
 }
 /**
  * Converts an expression to a string.
@@ -448,3 +449,12 @@ function generateWhereClause(dataRules) {
     }
     return `WHERE ${whereConditions.join(" AND ")}`;
 }
+/**
+ * Removes all double quotes from the given string.
+ *
+ * @param {string} str - The input string.
+ * @returns {string} The string without double quotes.
+ */
+function stripQuotes(str) {
+    return str.replace(/"/g, "");
+}

package/build/nql/NQLParser.js

@@ -93,7 +93,7 @@ function parseFieldFromString(fieldStr) {
         },
         field: f
             .map((field) => {
-            return field.replace("`value`", "value").replace("`type`", "type");
+            return field.replace('"value"', "value").replace('"type"', "type");
         })
             .join("."),
     };

package/build/nql/types.d.ts

@@ -69,7 +69,7 @@ export declare const NqlTableObject: z.ZodObject<{
 }>;
 export type NqlTable = z.infer<typeof NqlTableObject>;
 export declare const NqlFieldObj: z.ZodObject<{
-    field: z.ZodString;
+    field: z.ZodEffects<z.ZodString, string, string>;
     table: z.ZodObject<{
         database: z.ZodEffects<z.ZodString, string, string>;
         table: z.ZodEffects<z.ZodString, string, string>;
@@ -95,7 +95,7 @@ export declare const NqlFieldObj: z.ZodObject<{
 }>;
 export declare const NqlFilterUnaryExpressionObj: z.ZodObject<{
     field: z.ZodObject<{
-        field: z.ZodString;
+        field: z.ZodEffects<z.ZodString, string, string>;
         table: z.ZodObject<{
             database: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodEffects<z.ZodString, string, string>;
@@ -141,7 +141,7 @@ export declare const NqlFilterUnaryExpressionObj: z.ZodObject<{
 }>;
 export type NqlFilterUnaryExpression = z.infer<typeof NqlFilterUnaryExpressionObj>;
 declare const NqlExpressionObj: z.ZodUnion<[z.ZodObject<{
-    field: z.ZodString;
+    field: z.ZodEffects<z.ZodString, string, string>;
     table: z.ZodObject<{
         database: z.ZodEffects<z.ZodString, string, string>;
         table: z.ZodEffects<z.ZodString, string, string>;
@@ -168,7 +168,7 @@ declare const NqlExpressionObj: z.ZodUnion<[z.ZodObject<{
 export type NqlExpression = z.infer<typeof NqlExpressionObj>;
 export declare const NqlFilterBinaryExpressionObj: z.ZodObject<{
     left: z.ZodUnion<[z.ZodObject<{
-        field: z.ZodString;
+        field: z.ZodEffects<z.ZodString, string, string>;
         table: z.ZodObject<{
             database: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodEffects<z.ZodString, string, string>;
@@ -194,7 +194,7 @@ export declare const NqlFilterBinaryExpressionObj: z.ZodObject<{
     }>, z.ZodString, z.ZodNumber, z.ZodBoolean]>;
     operator: z.ZodEnum<["=", "!=", ">", "<", ">=", "<=", "IN", "NOT IN", "LIKE", "NOT LIKE"]>;
     right: z.ZodUnion<[z.ZodObject<{
-        field: z.ZodString;
+        field: z.ZodEffects<z.ZodString, string, string>;
         table: z.ZodObject<{
             database: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodEffects<z.ZodString, string, string>;
@@ -277,7 +277,7 @@ export declare const NqlFilterBinaryExpressionObj: z.ZodObject<{
 }>;
 export declare const NqlFilterExpressionObj: z.ZodUnion<[z.ZodObject<{
     field: z.ZodObject<{
-        field: z.ZodString;
+        field: z.ZodEffects<z.ZodString, string, string>;
         table: z.ZodObject<{
             database: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodEffects<z.ZodString, string, string>;
@@ -322,7 +322,7 @@ export declare const NqlFilterExpressionObj: z.ZodUnion<[z.ZodObject<{
     };
 }>, z.ZodObject<{
     left: z.ZodUnion<[z.ZodObject<{
-        field: z.ZodString;
+        field: z.ZodEffects<z.ZodString, string, string>;
         table: z.ZodObject<{
             database: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodEffects<z.ZodString, string, string>;
@@ -348,7 +348,7 @@ export declare const NqlFilterExpressionObj: z.ZodUnion<[z.ZodObject<{
     }>, z.ZodString, z.ZodNumber, z.ZodBoolean]>;
     operator: z.ZodEnum<["=", "!=", ">", "<", ">=", "<=", "IN", "NOT IN", "LIKE", "NOT LIKE"]>;
     right: z.ZodUnion<[z.ZodObject<{
-        field: z.ZodString;
+        field: z.ZodEffects<z.ZodString, string, string>;
         table: z.ZodObject<{
             database: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodEffects<z.ZodString, string, string>;
@@ -436,7 +436,7 @@ export declare const NqlWhereObj: z.ZodEffects<z.ZodObject<{
     booleanExpressions: z.ZodArray<z.ZodEnum<["AND", "OR"]>, "many">;
     filterExpressions: z.ZodArray<z.ZodUnion<[z.ZodObject<{
         field: z.ZodObject<{
-            field: z.ZodString;
+            field: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodObject<{
                 database: z.ZodEffects<z.ZodString, string, string>;
                 table: z.ZodEffects<z.ZodString, string, string>;
@@ -481,7 +481,7 @@ export declare const NqlWhereObj: z.ZodEffects<z.ZodObject<{
         };
     }>, z.ZodObject<{
         left: z.ZodUnion<[z.ZodObject<{
-            field: z.ZodString;
+            field: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodObject<{
                 database: z.ZodEffects<z.ZodString, string, string>;
                 table: z.ZodEffects<z.ZodString, string, string>;
@@ -507,7 +507,7 @@ export declare const NqlWhereObj: z.ZodEffects<z.ZodObject<{
         }>, z.ZodString, z.ZodNumber, z.ZodBoolean]>;
         operator: z.ZodEnum<["=", "!=", ">", "<", ">=", "<=", "IN", "NOT IN", "LIKE", "NOT LIKE"]>;
         right: z.ZodUnion<[z.ZodObject<{
-            field: z.ZodString;
+            field: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodObject<{
                 database: z.ZodEffects<z.ZodString, string, string>;
                 table: z.ZodEffects<z.ZodString, string, string>;
@@ -754,7 +754,7 @@ export type NqlFilterBinaryExpression = z.infer<typeof NqlFilterBinaryExpression
 export declare const NqlObj: z.ZodObject<{
     explain: z.ZodOptional<z.ZodEnum<["EXPLAIN"]>>;
     select: z.ZodArray<z.ZodObject<{
-        field: z.ZodString;
+        field: z.ZodEffects<z.ZodString, string, string>;
         table: z.ZodObject<{
             database: z.ZodEffects<z.ZodString, string, string>;
             table: z.ZodEffects<z.ZodString, string, string>;
@@ -792,7 +792,7 @@ export declare const NqlObj: z.ZodObject<{
         booleanExpressions: z.ZodArray<z.ZodEnum<["AND", "OR"]>, "many">;
         filterExpressions: z.ZodArray<z.ZodUnion<[z.ZodObject<{
             field: z.ZodObject<{
-                field: z.ZodString;
+                field: z.ZodEffects<z.ZodString, string, string>;
                 table: z.ZodObject<{
                     database: z.ZodEffects<z.ZodString, string, string>;
                     table: z.ZodEffects<z.ZodString, string, string>;
@@ -837,7 +837,7 @@ export declare const NqlObj: z.ZodObject<{
             };
         }>, z.ZodObject<{
             left: z.ZodUnion<[z.ZodObject<{
-                field: z.ZodString;
+                field: z.ZodEffects<z.ZodString, string, string>;
                 table: z.ZodObject<{
                     database: z.ZodEffects<z.ZodString, string, string>;
                     table: z.ZodEffects<z.ZodString, string, string>;
@@ -863,7 +863,7 @@ export declare const NqlObj: z.ZodObject<{
             }>, z.ZodString, z.ZodNumber, z.ZodBoolean]>;
             operator: z.ZodEnum<["=", "!=", ">", "<", ">=", "<=", "IN", "NOT IN", "LIKE", "NOT LIKE"]>;
             right: z.ZodUnion<[z.ZodObject<{
-                field: z.ZodString;
+                field: z.ZodEffects<z.ZodString, string, string>;
                 table: z.ZodObject<{
                     database: z.ZodEffects<z.ZodString, string, string>;
                     table: z.ZodEffects<z.ZodString, string, string>;

package/build/nql/types.js

@@ -50,13 +50,15 @@ export const NqlPreSelectExpressionObj = z
     .optional();
 export const NqlDatabaseObject = z
     .string()
-    .refine((x) => x.toLowerCase() === "narrative");
+    .refine((x) => x.replaceAll('"', "").toLowerCase() === "narrative", "Database must be `narrative`.");
 export const NqlTableObject = z.object({
     database: NqlDatabaseObject,
-    table: z.string().refine((x) => x.toLowerCase() === "rosetta_stone"),
+    table: z
+        .string()
+        .refine((x) => x.replaceAll('"', "").toLowerCase() === "rosetta_stone", "Table must be `rosetta_stone`."),
 });
 export const NqlFieldObj = z.object({
-    field: z.string().trim(),
+    field: z.string().refine((x) => x.replaceAll('"', "").trim()),
     table: NqlTableObject,
 });
 export const NqlFilterUnaryExpressionObj = z.object({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@narrative.io/data-collaboration-sdk-ts",
-  "version": "0.0.126",
+  "version": "0.0.128",
   "main": "build/index.js",
   "repository": "github:narrative-io/data-collaboration-sdk-ts",
   "source": "src/index.ts",