@malloydata/malloy 0.0.105-dev231124203430 → 0.0.105-dev231127183208

package/dist/malloy.d.ts

@@ -1234,6 +1234,7 @@ declare class DataNull extends Data<null> {
 export declare class DataArray extends Data<QueryData> implements Iterable<DataRecord> {
     private queryData;
     protected _field: Explore;
+    private rowCache;
     constructor(queryData: QueryData, field: Explore, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     /**
      * @return The `Explore` that describes the structure of this data.
@@ -1256,6 +1257,7 @@ export declare class DataRecord extends Data<{
     private queryDataRow;
     protected _field: Explore;
     readonly index: number | undefined;
+    private cellCache;
     constructor(queryDataRow: QueryDataRow, index: number | undefined, field: Explore, parent: DataArrayOrRecord | undefined, parentRecord: DataRecord | undefined);
     toObject(): QueryDataRow;
     path(...path: (number | string)[]): DataColumn;

package/dist/malloy.js

@@ -2611,6 +2611,7 @@ class DataNull extends Data {
 class DataArray extends Data {
     constructor(queryData, field, parent, parentRecord) {
         super(field, parent, parentRecord);
+        this.rowCache = new Map();
         this.queryData = queryData;
         this._field = field;
     }
@@ -2630,6 +2631,12 @@ class DataArray extends Data {
         return getPath(this, path);
     }
     row(index) {
+        let record = this.rowCache.get(index);
+        if (!record) {
+            record = new DataRecord(this.queryData[index], index, this.field, this, this.parentRecord);
+            this.rowCache.set(index, record);
+        }
+        return record;
         return new DataRecord(this.queryData[index], index, this.field, this, this.parentRecord);
     }
     get rowCount() {
@@ -2674,6 +2681,7 @@ function getPath(data, path) {
 class DataRecord extends Data {
     constructor(queryDataRow, index, field, parent, parentRecord) {
         super(field, parent, parentRecord);
+        this.cellCache = new Map();
         this.queryDataRow = queryDataRow;
         this._field = field;
         this.index = index;
@@ -2687,41 +2695,48 @@ class DataRecord extends Data {
     cell(fieldOrName) {
         const fieldName = typeof fieldOrName === 'string' ? fieldOrName : fieldOrName.name;
         const field = this._field.getFieldByName(fieldName);
-        const value = this.queryDataRow[fieldName];
-        if (value === null) {
-            return new DataNull(field, this, this);
-        }
-        if (field.isAtomicField()) {
-            if (field.isBoolean()) {
-                return new DataBoolean(value, field, this, this);
-            }
-            else if (field.isDate()) {
-                return new DataDate(value, field, this, this);
-            }
-            else if (field.isJSON()) {
-                return new DataJSON(value, field, this, this);
-            }
-            else if (field.isTimestamp()) {
-                return new DataTimestamp(value, field, this, this);
+        let column = this.cellCache.get(fieldName);
+        if (!column) {
+            const value = this.queryDataRow[fieldName];
+            if (value === null) {
+                column = new DataNull(field, this, this);
             }
-            else if (field.isNumber()) {
-                return new DataNumber(value, field, this, this);
-            }
-            else if (field.isString()) {
-                return new DataString(value, field, this, this);
-            }
-            else if (field.isUnsupported()) {
-                return new DataUnsupported(value, field, this, this);
-            }
-        }
-        else if (field.isExploreField()) {
-            if (Array.isArray(value)) {
-                return new DataArray(value, field, this, this);
+            else if (field.isAtomicField()) {
+                if (field.isBoolean()) {
+                    column = new DataBoolean(value, field, this, this);
+                }
+                else if (field.isDate()) {
+                    column = new DataDate(value, field, this, this);
+                }
+                else if (field.isJSON()) {
+                    column = new DataJSON(value, field, this, this);
+                }
+                else if (field.isTimestamp()) {
+                    column = new DataTimestamp(value, field, this, this);
+                }
+                else if (field.isNumber()) {
+                    column = new DataNumber(value, field, this, this);
+                }
+                else if (field.isString()) {
+                    column = new DataString(value, field, this, this);
+                }
+                else if (field.isUnsupported()) {
+                    column = new DataUnsupported(value, field, this, this);
+                }
             }
-            else {
-                return new DataRecord(value, undefined, field, this, this);
+            else if (field.isExploreField()) {
+                if (Array.isArray(value)) {
+                    column = new DataArray(value, field, this, this);
+                }
+                else {
+                    column = new DataRecord(value, undefined, field, this, this);
+                }
             }
+            if (column)
+                this.cellCache.set(fieldName, column);
         }
+        if (column)
+            return column;
         throw new Error(`Internal Error: could not construct data column for field '${fieldName}'.`);
     }
     get value() {

package/package.json

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