@narrative.io/data-collaboration-sdk-ts 2.42.0 → 2.44.0

package/build/nql/AstParser.d.ts

@@ -48,7 +48,10 @@ export interface Deduplication {
 }
 export type ColumnRef = AttributeRef | DatasetColumnRef | RawRef;
 export type BooleanExpression = And | Between | Equals | NotEquals | Gt | Gte | In | IsNull | Like | Lt | Lte | Not | Or;
-export type Table = RosettaTable | DatasetTable | RawTable | ast.NqlPlaceholder<ast.NqlAstType>;
+export interface PlaceholderTable extends ast.NqlPlaceholder<ast.NqlAstType> {
+    join?: Join;
+}
+export type Table = RosettaTable | DatasetTable | RawTable | PlaceholderTable;
 export interface RosettaTable {
     type: "rosetta_stone";
     as?: string;

package/build/nql/AstParser.js

@@ -431,10 +431,7 @@ function parseJoin(n) {
         conditionType: n.condition_type,
         joinType: n.join_type,
     };
-    // ??? I'm not sure about this logic ??? - nj
-    if (right[0].type !== "placeholder") {
-        right[0].join = join;
-    }
+    right[0].join = join;
     return left.concat(right);
 }
 function parseTable(n) {

package/build/nql/NqlBuilder.js

@@ -122,6 +122,8 @@ function compileTableRefs(tables) {
                 return aliased("narrative.rosetta_stone", table.as, false);
             case "raw_table":
                 return aliased(table.nql, table.as, false);
+            case "placeholder":
+                return compilePlaceholder(table);
             default:
                 throw new Error("unreachable");
         }
@@ -358,6 +360,7 @@ export function compilePlaceholder(n) {
         case "boolean_literal":
         case "timestamp_literal":
         case "column":
+        case "table":
             return `{{${n.identifier}}}`;
         default:
             throw new Error("unsupported placeholder");

package/package.json

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