@malloydata/malloy 0.0.95 → 0.0.96-dev231025173405

package/dist/malloy.d.ts

@@ -1122,8 +1122,10 @@ export declare class Result extends PreparedResult {
 export type DataColumn = DataArray | DataRecord | DataString | DataBoolean | DataNumber | DataDate | DataTimestamp | DataNull | DataBytes | DataJSON | DataUnsupported;
 export type DataArrayOrRecord = DataArray | DataRecord;
 declare abstract class Data<T> {
+    readonly parent: DataArrayOrRecord | undefined;
+    readonly parentRecord: DataRecord | undefined;
     protected _field: Field | Explore;
-    constructor(field: Field | Explore);
+    constructor(field: Field | Explore, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     get field(): Field | Explore;
     abstract get value(): T;
     isString(): this is DataString;
@@ -1151,7 +1153,7 @@ declare abstract class Data<T> {
 declare abstract class ScalarData<T> extends Data<T> {
     protected _value: T;
     protected _field: AtomicField;
-    constructor(value: T, field: AtomicField);
+    constructor(value: T, field: AtomicField, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     get value(): T;
     get field(): AtomicField;
     abstract get key(): string;
@@ -1160,42 +1162,42 @@ declare abstract class ScalarData<T> extends Data<T> {
 }
 declare class DataString extends ScalarData<string> {
     protected _field: StringField;
-    constructor(value: string, field: StringField);
+    constructor(value: string, field: StringField, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     get field(): StringField;
     get key(): string;
     compareTo(other: ScalarData<string>): number;
 }
 declare class DataUnsupported extends ScalarData<unknown> {
     protected _field: UnsupportedField;
-    constructor(value: unknown, field: UnsupportedField);
+    constructor(value: unknown, field: UnsupportedField, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     get field(): UnsupportedField;
     get key(): string;
     compareTo(_other: ScalarData<unknown>): number;
 }
 declare class DataBoolean extends ScalarData<boolean> {
     protected _field: BooleanField;
-    constructor(value: boolean, field: BooleanField);
+    constructor(value: boolean, field: BooleanField, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     get field(): BooleanField;
     get key(): string;
     compareTo(other: ScalarData<boolean>): 0 | 1 | -1;
 }
 declare class DataJSON extends ScalarData<string> {
     protected _field: JSONField;
-    constructor(value: string, field: JSONField);
+    constructor(value: string, field: JSONField, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     get field(): JSONField;
     get key(): string;
     compareTo(other: ScalarData<string>): 0 | 1 | -1;
 }
 declare class DataNumber extends ScalarData<number> {
     protected _field: NumberField;
-    constructor(value: number, field: NumberField);
+    constructor(value: number, field: NumberField, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     get field(): NumberField;
     get key(): string;
     compareTo(other: ScalarData<number>): 0 | 1 | -1;
 }
 declare class DataTimestamp extends ScalarData<Date> {
     protected _field: TimestampField;
-    constructor(value: Date, field: TimestampField);
+    constructor(value: Date, field: TimestampField, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     get value(): Date;
     get field(): TimestampField;
     get key(): string;
@@ -1203,7 +1205,7 @@ declare class DataTimestamp extends ScalarData<Date> {
 }
 declare class DataDate extends ScalarData<Date> {
     protected _field: DateField;
-    constructor(value: Date, field: DateField);
+    constructor(value: Date, field: DateField, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     get value(): Date;
     get field(): DateField;
     get key(): string;
@@ -1218,10 +1220,9 @@ declare class DataNull extends Data<null> {
     get key(): string;
 }
 export declare class DataArray extends Data<QueryData> implements Iterable<DataRecord> {
-    readonly parent: DataArrayOrRecord | undefined;
     private queryData;
     protected _field: Explore;
-    constructor(queryData: QueryData, field: Explore, parent: DataArrayOrRecord | undefined);
+    constructor(queryData: QueryData, field: Explore, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     /**
      * @return The `Explore` that describes the structure of this data.
      */
@@ -1240,11 +1241,10 @@ export declare class DataArray extends Data<QueryData> implements Iterable<DataR
 export declare class DataRecord extends Data<{
     [fieldName: string]: DataColumn;
 }> {
-    readonly parent: DataArrayOrRecord | undefined;
     private queryDataRow;
     protected _field: Explore;
     readonly index: number | undefined;
-    constructor(queryDataRow: QueryDataRow, index: number | undefined, field: Explore, parent: DataArrayOrRecord | undefined);
+    constructor(queryDataRow: QueryDataRow, index: number | undefined, field: Explore, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     toObject(): QueryDataRow;
     path(...path: (number | string)[]): DataColumn;
     cell(fieldOrName: string | Field): DataColumn;

package/dist/malloy.js

@@ -282,7 +282,7 @@ class Malloy {
         }
         let index = 0;
         for await (const row of connection.runSQLStream(sql, options)) {
-            yield new DataRecord(row, index, resultExplore, undefined);
+            yield new DataRecord(row, index, resultExplore, undefined, undefined);
             index += 1;
         }
     }
@@ -2195,7 +2195,7 @@ class Result extends PreparedResult {
      * @return The result data.
      */
     get data() {
-        return new DataArray(this.inner.result, this.resultExplore, undefined);
+        return new DataArray(this.inner.result, this.resultExplore, undefined, undefined);
     }
     get totalRows() {
         return this.inner.totalRows;
@@ -2212,7 +2212,9 @@ class Result extends PreparedResult {
 }
 exports.Result = Result;
 class Data {
-    constructor(field) {
+    constructor(field, parent, parentRecord) {
+        this.parent = parent;
+        this.parentRecord = parentRecord;
         this._field = field;
     }
     get field() {
@@ -2313,8 +2315,8 @@ class Data {
     }
 }
 class ScalarData extends Data {
-    constructor(value, field) {
-        super(field);
+    constructor(value, field, parent, parentRecord) {
+        super(field, parent, parentRecord);
         this._value = value;
         this._field = field;
     }
@@ -2329,8 +2331,8 @@ class ScalarData extends Data {
     }
 }
 class DataString extends ScalarData {
-    constructor(value, field) {
-        super(value, field);
+    constructor(value, field, parent, parentRecord) {
+        super(value, field, parent, parentRecord);
         this._field = field;
     }
     get field() {
@@ -2346,8 +2348,8 @@ class DataString extends ScalarData {
     }
 }
 class DataUnsupported extends ScalarData {
-    constructor(value, field) {
-        super(value, field);
+    constructor(value, field, parent, parentRecord) {
+        super(value, field, parent, parentRecord);
         this._field = field;
     }
     get field() {
@@ -2361,8 +2363,8 @@ class DataUnsupported extends ScalarData {
     }
 }
 class DataBoolean extends ScalarData {
-    constructor(value, field) {
-        super(value, field);
+    constructor(value, field, parent, parentRecord) {
+        super(value, field, parent, parentRecord);
         this._field = field;
     }
     get field() {
@@ -2382,8 +2384,8 @@ class DataBoolean extends ScalarData {
     }
 }
 class DataJSON extends ScalarData {
-    constructor(value, field) {
-        super(value, field);
+    constructor(value, field, parent, parentRecord) {
+        super(value, field, parent, parentRecord);
         this._field = field;
     }
     get field() {
@@ -2407,8 +2409,8 @@ class DataJSON extends ScalarData {
     }
 }
 class DataNumber extends ScalarData {
-    constructor(value, field) {
-        super(value, field);
+    constructor(value, field, parent, parentRecord) {
+        super(value, field, parent, parentRecord);
         this._field = field;
     }
     get field() {
@@ -2457,8 +2459,8 @@ function valueToDate(value) {
     }
 }
 class DataTimestamp extends ScalarData {
-    constructor(value, field) {
-        super(value, field);
+    constructor(value, field, parent, parentRecord) {
+        super(value, field, parent, parentRecord);
         this._field = field;
     }
     get value() {
@@ -2481,8 +2483,8 @@ class DataTimestamp extends ScalarData {
     }
 }
 class DataDate extends ScalarData {
-    constructor(value, field) {
-        super(value, field);
+    constructor(value, field, parent, parentRecord) {
+        super(value, field, parent, parentRecord);
         this._field = field;
     }
     get value() {
@@ -2531,9 +2533,8 @@ class DataNull extends Data {
     }
 }
 class DataArray extends Data {
-    constructor(queryData, field, parent) {
-        super(field);
-        this.parent = parent;
+    constructor(queryData, field, parent, parentRecord) {
+        super(field, parent, parentRecord);
         this.queryData = queryData;
         this._field = field;
     }
@@ -2553,7 +2554,7 @@ class DataArray extends Data {
         return getPath(this, path);
     }
     row(index) {
-        return new DataRecord(this.queryData[index], index, this.field, this);
+        return new DataRecord(this.queryData[index], index, this.field, this, this.parentRecord);
     }
     get rowCount() {
         return this.queryData.length;
@@ -2595,9 +2596,8 @@ function getPath(data, path) {
     return data;
 }
 class DataRecord extends Data {
-    constructor(queryDataRow, index, field, parent) {
-        super(field);
-        this.parent = parent;
+    constructor(queryDataRow, index, field, parent, parentRecord) {
+        super(field, parent, parentRecord);
         this.queryDataRow = queryDataRow;
         this._field = field;
         this.index = index;
@@ -2613,37 +2613,37 @@ class DataRecord extends Data {
         const field = this._field.getFieldByName(fieldName);
         const value = this.queryDataRow[fieldName];
         if (value === null) {
-            return new DataNull(field);
+            return new DataNull(field, this, this);
         }
         if (field.isAtomicField()) {
             if (field.isBoolean()) {
-                return new DataBoolean(value, field);
+                return new DataBoolean(value, field, this, this);
             }
             else if (field.isDate()) {
-                return new DataDate(value, field);
+                return new DataDate(value, field, this, this);
             }
             else if (field.isJSON()) {
-                return new DataJSON(value, field);
+                return new DataJSON(value, field, this, this);
             }
             else if (field.isTimestamp()) {
-                return new DataTimestamp(value, field);
+                return new DataTimestamp(value, field, this, this);
             }
             else if (field.isNumber()) {
-                return new DataNumber(value, field);
+                return new DataNumber(value, field, this, this);
             }
             else if (field.isString()) {
-                return new DataString(value, field);
+                return new DataString(value, field, this, this);
             }
             else if (field.isUnsupported()) {
-                return new DataUnsupported(value, field);
+                return new DataUnsupported(value, field, this, this);
             }
         }
         else if (field.isExploreField()) {
             if (Array.isArray(value)) {
-                return new DataArray(value, field, this);
+                return new DataArray(value, field, this, this);
             }
             else {
-                return new DataRecord(value, undefined, field, this);
+                return new DataRecord(value, undefined, field, this, this);
             }
         }
         throw new Error(`Internal Error: could not construct data column for field '${fieldName}'.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.95",
+  "version": "0.0.96-dev231025173405",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",