@narrative.io/data-collaboration-sdk-ts 0.0.67 → 0.0.69

package/build/attributes/index.d.ts

@@ -1,6 +1,6 @@
 import { type ApiRecords } from '../types';
 import { BaseApi } from '../base-api';
-import { type Attribute } from './types';
+import { type Attribute, type RefAttribute, type SubAttribute } from './types';
 /**
  * A class for accessing the Attribute API.
  * @extends BaseApi
@@ -34,4 +34,4 @@ declare class AttributeApi extends BaseApi {
      */
     createAttribute(data: Attribute): Promise<Attribute>;
 }
-export { AttributeApi, type Attribute };
+export { AttributeApi, type Attribute, type RefAttribute, type SubAttribute };

package/build/index.d.ts

@@ -8,7 +8,7 @@ import { type HealthCheckResult } from './health/types';
 import { type SampleRecords } from './rosetta-stone/types';
 import { AttributeApi } from './attributes';
 import { type Resource, ResourceApi, type BucketCreationRequest, type UpdateAccessTypeRequest } from './resources';
-import { type Attribute } from './attributes/types';
+import { type Attribute, type RefAttribute, type SubAttribute } from './attributes/types';
 import { PingApi } from './ping';
 import { UploadsApi } from './uploads';
 import { type UploadsResponse } from './uploads/types';
@@ -29,4 +29,4 @@ declare class NarrativeApi extends BaseApi {
 }
 interface NarrativeApi extends BaseApi, HealthCheckApi, DatasetApi, RosettaStoneApi, AttributeApi, PingApi, CompanyInfoApi, InstallationsApi, UploadsApi, ResourceApi, NqlApi, DataStreamsApi, ForecastApi, ContractsApi, AuthenticationApi {
 }
-export { NarrativeApi, AttributeApi, HealthCheckApi, DatasetApi, PingApi, ProductsApi, CompanyInfoApi, InstallationsApi, UploadsApi, ResourceApi, NqlApi, DataStreamsApi, ForecastApi, ContractsApi, AuthenticationApi, AppsApi, type App, type Resource, type UploadsResponse, type PingStatus, type Attribute, type Environment, type Config, type ApiRecords, type Dataset, type HealthCheckResult, type SampleRecords, type DatasetTableSummary, type DatasetTableSummaryAPIResponse, type Product, type MonetaryAmount, type CompanyInfo, type Installation, type FilePerSnapshotResponse, type BucketCreationRequest, type UpdateAccessTypeRequest, type Nql, type NqlField, type NqlResult, type NqlQueryInput, type NqlCompileResult, type NqlExpression, type NqlWhere, type NqlFilterExpression, type NqlBooleanExpression, type NqlFilterBinaryExpression, type NqlFilterUnaryExpression, type DataStream, type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type JobState, type ContractDetails, type CustomerContract, type PaymentMethod, type ContractRateView, type LoginRequest, type LoginResponse, type RegisterRequest, type RegisterResponse, type LoggedInUser, type StytchToken, getNqlObject, buildNql, convertNqlObjectToForecastBody, type ForecastBody };
+export { NarrativeApi, AttributeApi, HealthCheckApi, DatasetApi, PingApi, ProductsApi, CompanyInfoApi, InstallationsApi, UploadsApi, ResourceApi, NqlApi, DataStreamsApi, ForecastApi, ContractsApi, AuthenticationApi, AppsApi, type App, type Resource, type UploadsResponse, type PingStatus, type Attribute, type RefAttribute, type SubAttribute, type Environment, type Config, type ApiRecords, type Dataset, type HealthCheckResult, type SampleRecords, type DatasetTableSummary, type DatasetTableSummaryAPIResponse, type Product, type MonetaryAmount, type CompanyInfo, type Installation, type FilePerSnapshotResponse, type BucketCreationRequest, type UpdateAccessTypeRequest, type Nql, type NqlField, type NqlResult, type NqlQueryInput, type NqlCompileResult, type NqlExpression, type NqlWhere, type NqlFilterExpression, type NqlBooleanExpression, type NqlFilterBinaryExpression, type NqlFilterUnaryExpression, type DataStream, type ForecastRequest, type ForecastResponse, type CostForecastRequest, type CostForecastResponse, type JobState, type ContractDetails, type CustomerContract, type PaymentMethod, type ContractRateView, type LoginRequest, type LoginResponse, type RegisterRequest, type RegisterResponse, type LoggedInUser, type StytchToken, getNqlObject, buildNql, convertNqlObjectToForecastBody, type ForecastBody };

package/build/nql/DataRulesConverter.js

@@ -41,7 +41,7 @@ async function getAttributesFromFields(fields) {
         attributesArray.push({
             attribute_id: attributeId,
             fields: fields.filter((field) => field.field.split('.')[0] === att),
-            optional: fields.some(field => field.field.startsWith(att + '.') && field.filter !== undefined)
+            optional: fields.some(field => field.field.startsWith(att + '.') && field.filter === undefined)
         });
     });
     ensureAtLeastOneRequired(attributesArray);
@@ -65,10 +65,11 @@ async function getAttributesFromFields(fields) {
  * // The array is now guaranteed to have at least one object with `optional` set to `false`.
  */
 function ensureAtLeastOneRequired(dataRulesAttributes) {
-    const hasMandatory = dataRulesAttributes.some(item => !item.optional);
+    const exportedAttributes = dataRulesAttributes.filter(item => item.fields.filter(field => field.exported).length > 0);
+    const hasMandatory = exportedAttributes.some(item => !item.optional);
     if (!hasMandatory) {
-        const randomIndex = Math.floor(Math.random() * dataRulesAttributes.length);
-        dataRulesAttributes[randomIndex].optional = false;
+        const randomIndex = Math.floor(Math.random() * exportedAttributes.length);
+        exportedAttributes[randomIndex].optional = false;
     }
 }
 /**
@@ -174,7 +175,7 @@ function constructBinaryFilterExpression(filter) {
  */
 function expressionToString(expr) {
     if (typeof expr === 'string') {
-        return "'expr'";
+        return `${expr}`;
     }
     else if (typeof expr === 'number') {
         return expr.toString();

package/build/nql/types.d.ts

@@ -1304,10 +1304,34 @@ export interface DataRulesAttributes {
 }
 export interface DataRulesAttributesField {
     field: string;
-    filter?: unknown;
+    filter?: FilterDefinition;
     exported: boolean;
 }
 export interface DataRulesAttributesFieldFilter {
     expression: string[];
 }
+export type FilterDefinition = 'include_all_values_including_nulls_filter' | 'include_only_if_not_null_filter' | EnumFilter | IntervalFilter | TimestampFilter | SparkSqlConstraintFilter;
+export interface EnumFilter {
+    type: InclusionType;
+    list: string[];
+}
+export interface IntervalFilter {
+    min?: IntervalEnd;
+    max?: IntervalEnd;
+}
+export interface TimestampFilter {
+    recency?: string;
+    from?: IntervalEnd;
+    to?: IntervalEnd;
+}
+export interface SparkSqlConstraintFilter {
+    expressions: string[];
+}
+export type IntervalEndType = 'inclusive' | 'exclusive';
+export interface IntervalEnd {
+    type: IntervalEndType;
+    value: string;
+}
+export type SpatialPredicate = 'contains' | 'intersects';
+export type InclusionType = 'include' | 'exclude';
 export {};

package/package.json

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