@malloydata/malloy 0.0.58-dev230714200721 → 0.0.58

package/dist/malloy.d.ts

@@ -521,6 +521,7 @@ export declare class Explore extends Entity {
     private get fieldMap();
     get allFields(): Field[];
     get intrinsicFields(): Field[];
+    get dimensions(): Field[];
     getFieldByName(fieldName: string): Field;
     getFieldByNameIfExists(fieldName: string): Field | undefined;
     get primaryKey(): string | undefined;
@@ -1114,55 +1115,67 @@ declare abstract class Data<T> {
     isArray(): this is DataArray;
     get array(): DataArray;
     isArrayOrRecord(): DataArrayOrRecord;
+    isScalar(): this is ScalarData<T>;
 }
-declare class ScalarData<T> extends Data<T> {
+declare abstract class ScalarData<T> extends Data<T> {
     protected _value: T;
     protected _field: AtomicField;
     constructor(value: T, field: AtomicField);
     get value(): T;
     get field(): AtomicField;
+    abstract get key(): string;
+    isScalar(): this is ScalarData<T>;
 }
 declare class DataString extends ScalarData<string> {
     protected _field: StringField;
     constructor(value: string, field: StringField);
     get field(): StringField;
+    get key(): string;
 }
 declare class DataUnsupported extends ScalarData<unknown> {
     protected _field: UnsupportedField;
     constructor(value: unknown, field: UnsupportedField);
     get field(): UnsupportedField;
+    get key(): string;
 }
 declare class DataBoolean extends ScalarData<boolean> {
     protected _field: BooleanField;
     constructor(value: boolean, field: BooleanField);
     get field(): BooleanField;
+    get key(): string;
 }
 declare class DataJSON extends ScalarData<string> {
     protected _field: JSONField;
     constructor(value: string, field: JSONField);
     get field(): JSONField;
+    get key(): string;
 }
 declare class DataNumber extends ScalarData<number> {
     protected _field: NumberField;
     constructor(value: number, field: NumberField);
     get field(): NumberField;
+    get key(): string;
 }
 declare class DataTimestamp extends ScalarData<Date> {
     protected _field: TimestampField;
     constructor(value: Date, field: TimestampField);
     get value(): Date;
     get field(): TimestampField;
+    get key(): string;
 }
 declare class DataDate extends ScalarData<Date> {
     protected _field: DateField;
     constructor(value: Date, field: DateField);
     get value(): Date;
     get field(): DateField;
+    get key(): string;
 }
 declare class DataBytes extends ScalarData<Buffer> {
+    get key(): string;
 }
 declare class DataNull extends Data<null> {
     get value(): null;
+    get key(): string;
 }
 export declare class DataArray extends Data<QueryData> implements Iterable<DataRecord> {
     readonly parent: DataArrayOrRecord | undefined;

package/dist/malloy.js

@@ -983,6 +983,9 @@ class Explore extends Entity {
     get intrinsicFields() {
         return [...this.fieldMap.values()].filter(f => f.isIntrinsic());
     }
+    get dimensions() {
+        return [...this.fieldMap.values()].filter(f => f.isAtomicField() && f.sourceWasDimension());
+    }
     getFieldByName(fieldName) {
         const field = this.fieldMap.get(fieldName);
         if (field === undefined) {
@@ -2214,6 +2217,9 @@ class Data {
         }
         throw new Error('No Array or Record');
     }
+    isScalar() {
+        return true;
+    }
 }
 class ScalarData extends Data {
     constructor(value, field) {
@@ -2227,6 +2233,9 @@ class ScalarData extends Data {
     get field() {
         return this._field;
     }
+    isScalar() {
+        return this instanceof ScalarData;
+    }
 }
 class DataString extends ScalarData {
     constructor(value, field) {
@@ -2236,6 +2245,9 @@ class DataString extends ScalarData {
     get field() {
         return this._field;
     }
+    get key() {
+        return this.value;
+    }
 }
 class DataUnsupported extends ScalarData {
     constructor(value, field) {
@@ -2245,6 +2257,9 @@ class DataUnsupported extends ScalarData {
     get field() {
         return this._field;
     }
+    get key() {
+        return '<unsupported>';
+    }
 }
 class DataBoolean extends ScalarData {
     constructor(value, field) {
@@ -2254,6 +2269,9 @@ class DataBoolean extends ScalarData {
     get field() {
         return this._field;
     }
+    get key() {
+        return `${this.value}`;
+    }
 }
 class DataJSON extends ScalarData {
     constructor(value, field) {
@@ -2263,6 +2281,9 @@ class DataJSON extends ScalarData {
     get field() {
         return this._field;
     }
+    get key() {
+        return this.value;
+    }
 }
 class DataNumber extends ScalarData {
     constructor(value, field) {
@@ -2272,6 +2293,9 @@ class DataNumber extends ScalarData {
     get field() {
         return this._field;
     }
+    get key() {
+        return `${this.value}`;
+    }
 }
 function valueToDate(value) {
     // TODO properly map the data from BQ/Postgres types
@@ -2312,6 +2336,9 @@ class DataTimestamp extends ScalarData {
     get field() {
         return this._field;
     }
+    get key() {
+        return `${this.value.toLocaleString()}`;
+    }
 }
 class DataDate extends ScalarData {
     constructor(value, field) {
@@ -2324,13 +2351,22 @@ class DataDate extends ScalarData {
     get field() {
         return this._field;
     }
+    get key() {
+        return `${this.value.toLocaleString()}`;
+    }
 }
 class DataBytes extends ScalarData {
+    get key() {
+        return this.value.toString();
+    }
 }
 class DataNull extends Data {
     get value() {
         return null;
     }
+    get key() {
+        return '<null>';
+    }
 }
 class DataArray extends Data {
     constructor(queryData, field, parent) {

package/package.json

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