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

package/build/forecast/index.d.ts

@@ -1,5 +1,5 @@
 import { BaseApi } from "../base-api";
-import { type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type ForecastResult, type ForecastResultFailure, type JobState } from "./types";
+import { type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type CostForecastResult, type ForecastResult, type ForecastResultFailure, type JobState } from "./types";
 /**
  * @module ForecastApi
  * @description This module provides methods for generating forecasts from a subscription
@@ -49,4 +49,4 @@ declare class ForecastApi extends BaseApi {
      */
     getPublicForecast(forecastId: string): Promise<ForecastResponse>;
 }
-export { ForecastApi, type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type ForecastResult, type ForecastResultFailure, type JobState, };
+export { ForecastApi, type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type ForecastResult, type CostForecastResult, type ForecastResultFailure, type JobState, };

package/build/index.d.ts

@@ -23,7 +23,7 @@ import { CompanyInfoApi, type CompanyInfo } from "./company-info";
 import { InstallationsApi, type Installation, type Profile } from "./installations";
 import { NqlApi, type CompiledNql, type CreateMaterializedView, type Deduplication, type Explain, type Expression, type Raw, type Select, type Statement, type Table, type Nql, type NqlAst, type NqlField, type NqlResult, type NqlQueryInput, type NqlCompileResult, type NqlExpression, type NqlWhere, type NqlFilterExpression, type NqlBooleanExpression, type NqlFilterBinaryExpression, type NqlFilterUnaryExpression, compileStatement, parseStatement } from "./nql";
 import { DataStreamsApi, type DataStream, type DataRules, type ColumnSet, type ColumnWithFilterAndExport, type AttributeSet } from "./data-streams";
-import { ForecastApi, type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type ForecastResult, type ForecastResultFailure, type JobState } from "./forecast";
+import { ForecastApi, type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type CostForecastResult, type ForecastResult, type ForecastResultFailure, type JobState } from "./forecast";
 import { ContractsApi, type ContractDetails, type CustomerContract, type PaymentMethod, type ContractRateView } from "./contracts";
 import { getNqlObject, buildNql } from "./nql/NQLParser";
 import { convertNqlObjectToForecastBody } from "./nql/DataRulesConverter";
@@ -43,4 +43,4 @@ declare class NarrativeApi extends BaseApi {
 }
 interface NarrativeApi extends BaseApi, HealthCheckApi, AccessTokensApi, DataPlaneApi, DatasetApi, RosettaStoneApi, AttributeApi, PingApi, CompanyInfoApi, InstallationsApi, ConnectionsApi, UploadsApi, ResourceApi, NqlApi, DataStreamsApi, ForecastApi, ContractsApi, AuthenticationApi, MappingsApi, AccessRulesApi, AppsApi, SubscriptionsApi, JobsApi, WhoAmIApi {
 }
-export { NarrativeApi, AttributeApi, AccessTokensApi, DataPlaneApi, HealthCheckApi, DatasetApi, PingApi, ProductsApi, CompanyInfoApi, InstallationsApi, ConnectionsApi, UploadsApi, ResourceApi, NqlApi, DataStreamsApi, ForecastApi, ContractsApi, AuthenticationApi, AppsApi, MappingsApi, AccessRulesApi, SubscriptionsApi, JobsApi, WhoAmIApi, getNqlObject, buildNql, convertNqlObjectToForecastBody, isConversationAssistantMessage, isConversationFunctionMessage, isConversationInputMessage, isConversationMessage, isConversationMessageName, isConversationMessageRole, isConversationMessages, isConversationSystemMessage, isConversationUserMessage, isType, isConversationMessageFunctionCall, isConversationAssistantMessageWithFunctionCall, isRosettaRequestMessage, isConversationAssistantMessageWithoutFunctionCall, resources, type DataPlane, type AccessTokenMetadata, type CreateSystemAccessTokenRequest, type CreateSystemAccessTokenResponse, type UpdateSystemAccessTokenRequest, type App, type Resource, type AccessRuleV2, type GetAccessRulesParameters, type UploadsResponse, type PingStatus, type Attribute, type ShallowAttribute, type Connection, type RefAttribute, type SubAttribute, type PrimitiveAttribute, type ArrayAttribute, type ObjectAttribute, type Environment, type Config, type ApiRecords, type ApiRecordsV2, type Dataset, type HealthCheckResult, type SampleRecords, type Permission, type DatasetTableSummary, type DatasetTableSummaryAPIResponse, type UpdateDatasetRequest, type SchemaFileConfigType, type SchemaPropertiesType, type DatasetStatus, type DatasetWriteMode, type SchemaFileConfig, type SchemaProperties, type SchemaProperty, type SchemaPrimitiveProperty, type SchemaObjectProperty, type SchemaArrayProperty, type SchemaArrayItems, type SchemaArrayItemsPrimitive, type SchemaArrayItemsObject, type SchemaArrayItemsArray, type Schema, type AdvancedStatisticsMetadata, type SnapshotRange, type Configuration, type Columns, type ColumnSummary, type ColumnStatistics, type BasicStatistics, type AdvancedStatistics, type Histogram, type Value, type CreateDatasetRequest, type IngestDatasetFileRequest, type Product, type MonetaryAmount, type CompanyInfo, type Installation, type Profile, type FilePerSnapshotResponse, type BucketCreationRequest, type UpdateAccessTypeRequest, type CompiledNql, type CreateMaterializedView, type GetJobsParameters, type Deduplication, type Explain, type Expression, type Raw, type Select, type Statement, type Table, type Nql, type NqlAst, type NqlField, type NqlResult, type NqlQueryInput, type NqlCompileResult, type NqlExpression, type NqlWhere, type NqlFilterExpression, type NqlBooleanExpression, type NqlFilterBinaryExpression, type NqlFilterUnaryExpression, type DataStream, type DataRules, type ColumnSet, type ColumnWithFilterAndExport, type AttributeSet, type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type ForecastResult, type ForecastResultFailure, type JobState, type ContractDetails, type CustomerContract, type PaymentMethod, type ContractRateView, type LoginRequest, type LoginResponse, type RegisterRequest, type RegisterResponse, type LoggedInUser, type StytchToken, type ApiToken, type UserRole, type RegistrationStatus, type RegistrationStatusRequest, type RegistrationStatusResponse, type ForecastBody, type SharedAccessRule, type OwnedAccessRule, type ConversationAssistantMessage, type ConversationFunctionMessage, type ConversationIOMessage, type ConversationMessage, type ConversationMessageName, type ConversationMessageRole, type AccessRuleSchema, type ConversationMessages, type ConversationSystemMessage, type ConversationUserMessage, type RosettaRequestMessage, type ConversationMessageFunctionCall, type ConversationAssistantMessageWithFunctionCall, type RosettaResponseMessage, type ConversationAssistantMessageWithoutFunctionCall, type RetentionPolicy, type AccessRule, type Subscription, type SubscriptionDetails, type DataStreamSubscriptionDetails, type MarketplaceSubscriptionDetails, type SubscriptionOutput, type SubscriptionType, type SubscriptionStatus, type SubscriptionBudget, type Job, type User, type Mapping, type MappingTestResult, type ValueMapping, type ObjectMapping, type CreateMapping, compileStatement, parseStatement, };
+export { NarrativeApi, AttributeApi, AccessTokensApi, DataPlaneApi, HealthCheckApi, DatasetApi, PingApi, ProductsApi, CompanyInfoApi, InstallationsApi, ConnectionsApi, UploadsApi, ResourceApi, NqlApi, DataStreamsApi, ForecastApi, ContractsApi, AuthenticationApi, AppsApi, MappingsApi, AccessRulesApi, SubscriptionsApi, JobsApi, WhoAmIApi, getNqlObject, buildNql, convertNqlObjectToForecastBody, isConversationAssistantMessage, isConversationFunctionMessage, isConversationInputMessage, isConversationMessage, isConversationMessageName, isConversationMessageRole, isConversationMessages, isConversationSystemMessage, isConversationUserMessage, isType, isConversationMessageFunctionCall, isConversationAssistantMessageWithFunctionCall, isRosettaRequestMessage, isConversationAssistantMessageWithoutFunctionCall, resources, type DataPlane, type AccessTokenMetadata, type CreateSystemAccessTokenRequest, type CreateSystemAccessTokenResponse, type UpdateSystemAccessTokenRequest, type App, type Resource, type AccessRuleV2, type GetAccessRulesParameters, type UploadsResponse, type PingStatus, type Attribute, type ShallowAttribute, type Connection, type RefAttribute, type SubAttribute, type PrimitiveAttribute, type ArrayAttribute, type ObjectAttribute, type Environment, type Config, type ApiRecords, type ApiRecordsV2, type Dataset, type HealthCheckResult, type SampleRecords, type Permission, type DatasetTableSummary, type DatasetTableSummaryAPIResponse, type UpdateDatasetRequest, type SchemaFileConfigType, type SchemaPropertiesType, type DatasetStatus, type DatasetWriteMode, type SchemaFileConfig, type SchemaProperties, type SchemaProperty, type SchemaPrimitiveProperty, type SchemaObjectProperty, type SchemaArrayProperty, type SchemaArrayItems, type SchemaArrayItemsPrimitive, type SchemaArrayItemsObject, type SchemaArrayItemsArray, type Schema, type AdvancedStatisticsMetadata, type SnapshotRange, type Configuration, type Columns, type ColumnSummary, type ColumnStatistics, type BasicStatistics, type AdvancedStatistics, type Histogram, type Value, type CreateDatasetRequest, type IngestDatasetFileRequest, type Product, type MonetaryAmount, type CompanyInfo, type Installation, type Profile, type FilePerSnapshotResponse, type BucketCreationRequest, type UpdateAccessTypeRequest, type CompiledNql, type CreateMaterializedView, type GetJobsParameters, type Deduplication, type Explain, type Expression, type Raw, type Select, type Statement, type Table, type Nql, type NqlAst, type NqlField, type NqlResult, type NqlQueryInput, type NqlCompileResult, type NqlExpression, type NqlWhere, type NqlFilterExpression, type NqlBooleanExpression, type NqlFilterBinaryExpression, type NqlFilterUnaryExpression, type DataStream, type DataRules, type ColumnSet, type ColumnWithFilterAndExport, type AttributeSet, type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type ForecastResult, type CostForecastResult, type ForecastResultFailure, type JobState, type ContractDetails, type CustomerContract, type PaymentMethod, type ContractRateView, type LoginRequest, type LoginResponse, type RegisterRequest, type RegisterResponse, type LoggedInUser, type StytchToken, type ApiToken, type UserRole, type RegistrationStatus, type RegistrationStatusRequest, type RegistrationStatusResponse, type ForecastBody, type SharedAccessRule, type OwnedAccessRule, type ConversationAssistantMessage, type ConversationFunctionMessage, type ConversationIOMessage, type ConversationMessage, type ConversationMessageName, type ConversationMessageRole, type AccessRuleSchema, type ConversationMessages, type ConversationSystemMessage, type ConversationUserMessage, type RosettaRequestMessage, type ConversationMessageFunctionCall, type ConversationAssistantMessageWithFunctionCall, type RosettaResponseMessage, type ConversationAssistantMessageWithoutFunctionCall, type RetentionPolicy, type AccessRule, type Subscription, type SubscriptionDetails, type DataStreamSubscriptionDetails, type MarketplaceSubscriptionDetails, type SubscriptionOutput, type SubscriptionType, type SubscriptionStatus, type SubscriptionBudget, type Job, type User, type Mapping, type MappingTestResult, type ValueMapping, type ObjectMapping, type CreateMapping, compileStatement, parseStatement, };

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.24.0",
+  "version": "0.27.0",
   "main": "build/index.js",
   "repository": "github:narrative-io/data-collaboration-sdk-ts",
   "source": "src/index.ts",