@narrative.io/data-collaboration-sdk-ts 0.26.0 → 0.27.0

package/build/nql/NqlBuilder.d.ts

@@ -1,5 +1,5 @@
 import { type NqlBudget } from "./Ast";
-import { type CreateMaterializedView, type Deduplication, type Explain, type Expression, type Raw, type Select, type Statement, type Table } from "./AstParser";
+import { type Output, type CreateMaterializedView, type Deduplication, type Explain, type Expression, type Raw, type Select, type Statement, type Table } from "./AstParser";
 export type CompiledNql = string;
 export declare function compileStatement(n: Statement): CompiledNql;
 export declare function compileCreateMaterializedView(n: CreateMaterializedView): CompiledNql;
@@ -8,4 +8,5 @@ export declare function compileSelect(q: Select): CompiledNql;
 export declare function compileBudget(budget: NqlBudget): CompiledNql;
 export declare function compileDeduplication(d: Deduplication | Raw): CompiledNql;
 export declare function compileFrom(tables: Table[] | Raw): CompiledNql;
+export declare function compileOutput(n: Output): CompiledNql;
 export declare function compileExpression(n: Expression): CompiledNql;

package/build/nql/NqlBuilder.js

@@ -17,7 +17,7 @@ export function compileExplain(n) {
     return `EXPLAIN ${compileSelect(n.query)}`;
 }
 export function compileSelect(q) {
-    const columns = q.columns.map((e) => compileExpression(e));
+    const columns = q.columns.map((e) => compileOutput(e));
     const select = `SELECT ${columns.join(", ")}`;
     const budget = q.budget !== null ? compileBudget(q.budget) : "";
     const from = `FROM ${compileFrom(q.from)}`;
@@ -144,6 +144,21 @@ function compileTableRefs(tables) {
     }
     return nql;
 }
+export function compileOutput(n) {
+    switch (n.type) {
+        case "attribute_ref":
+            return compileAttributeRef(n.column, n.as, false);
+        case "dataset_column_ref":
+            return compileDatasetColumnRef(n.datasetId, n.column, n.as, false);
+        case "lit":
+            return compileLit(n.value, n.value_type, n.as);
+        case "raw_ref":
+            return compileRawRef(n.nql, n.as);
+        case "nql":
+            return raw(n);
+    }
+    return unreachable(n);
+}
 export function compileExpression(n) {
     switch (n.type) {
         case "=":
@@ -199,7 +214,7 @@ export function compileExpression(n) {
     }
     return unreachable(n);
 }
-function compileAttributeRef(column, as) {
+function compileAttributeRef(column, as, aliasParens) {
     const segments = column.split(".");
     const quotedSegments = segments.reduce((acc, segment, index) => {
         if (index === 0) {
@@ -209,7 +224,7 @@ function compileAttributeRef(column, as) {
             return `${acc}.${quote(segment)}`;
         }
     }, "");
-    return aliased(`narrative.rosetta_stone.${quotedSegments}`, as);
+    return aliased(`narrative.rosetta_stone.${quotedSegments}`, as, aliasParens);
 }
 function compileBetween(operand, lower, upper, as) {
     const operandNql = compileExpression(operand);
@@ -220,7 +235,7 @@ function compileBetween(operand, lower, upper, as) {
 function compileBinaryOperator(op, operands, as) {
     return aliased(`(${operands.map((e) => compileExpression(e)).join(` ${op} `)})`, as);
 }
-function compileDatasetColumnRef(datasetId, column, as) {
+function compileDatasetColumnRef(datasetId, column, as, aliasParen) {
     const formattedColumn = column
         .split(".")
         .reduce((acc, segment, index) => {
@@ -231,7 +246,7 @@ function compileDatasetColumnRef(datasetId, column, as) {
             return `${acc}.${quote(segment)}`;
         }
     }, "");
-    return aliased(`company_data.${quote(datasetId.toString())}.${formattedColumn}`, as);
+    return aliased(`company_data.${quote(datasetId.toString())}.${formattedColumn}`, as, false);
 }
 function compileFunctionCall(name, args, as) {
     // Calling convenions for functions are all over the place:

package/package.json

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