@malloydata/malloy 0.0.60-dev230718174455 → 0.0.60

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export { Segment, isFilteredAliasedName, flattenQuery, expressionIsCalculation,
 export { HighlightType, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
 export { Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, } from './malloy';
-export type { Model, PreparedQuery, PreparedResult, Field, AtomicField, ExploreField, QueryField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, ModelMaterializer, DocumentSymbol, DocumentHighlight, ResultJSON, PreparedResultMaterializer, SQLBlockMaterializer, ExploreMaterializer, WriteStream, SerializedExplore, } from './malloy';
+export type { Model, PreparedQuery, PreparedResult, Field, AtomicField, ExploreField, QueryField, SortableField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, ModelMaterializer, DocumentSymbol, DocumentHighlight, ResultJSON, PreparedResultMaterializer, SQLBlockMaterializer, ExploreMaterializer, WriteStream, SerializedExplore, } from './malloy';
 export type { RunSQLOptions } from './run_sql_options';
 export type { URLReader, InfoConnection, LookupConnection, Connection, QueryString, ModelString, QueryURL, ModelURL, PooledConnection, TestableConnection, PersistSQLResults, StreamingConnection, } from './runtime_types';
 export type { Loggable } from './malloy';

package/dist/malloy.d.ts

@@ -503,11 +503,16 @@ export declare type SerializedExplore = {
     sourceExplore?: SerializedExplore;
     _parentExplore?: SerializedExplore;
 };
+export declare type SortableField = {
+    field: Field;
+    dir: 'asc' | 'desc' | undefined;
+};
 export declare class Explore extends Entity {
     protected readonly _structDef: StructDef;
     protected readonly _parentExplore?: Explore;
     private _fieldMap;
     private sourceExplore;
+    private _allFieldsWithOrder;
     constructor(structDef: StructDef, parentExplore?: Explore, source?: Explore);
     get source(): Explore | undefined;
     isIntrinsic(): boolean;
@@ -520,8 +525,9 @@ export declare class Explore extends Entity {
     getSingleExploreModel(): Model;
     private get fieldMap();
     get allFields(): Field[];
+    get allFieldsWithOrder(): SortableField[];
     get intrinsicFields(): Field[];
-    get dimensions(): Field[];
+    get dimensions(): SortableField[];
     getFieldByName(fieldName: string): Field;
     getFieldByNameIfExists(fieldName: string): Field | undefined;
     get primaryKey(): string | undefined;
@@ -1125,36 +1131,42 @@ declare abstract class ScalarData<T> extends Data<T> {
     get field(): AtomicField;
     abstract get key(): string;
     isScalar(): this is ScalarData<T>;
+    abstract compareTo(other: ScalarData<T>): number;
 }
 declare class DataString extends ScalarData<string> {
     protected _field: StringField;
     constructor(value: string, field: StringField);
     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);
     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);
     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);
     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);
     get field(): NumberField;
     get key(): string;
+    compareTo(other: ScalarData<number>): 0 | 1 | -1;
 }
 declare class DataTimestamp extends ScalarData<Date> {
     protected _field: TimestampField;
@@ -1162,6 +1174,7 @@ declare class DataTimestamp extends ScalarData<Date> {
     get value(): Date;
     get field(): TimestampField;
     get key(): string;
+    compareTo(other: ScalarData<Date>): 0 | 1 | -1;
 }
 declare class DataDate extends ScalarData<Date> {
     protected _field: DateField;
@@ -1169,9 +1182,11 @@ declare class DataDate extends ScalarData<Date> {
     get value(): Date;
     get field(): DateField;
     get key(): string;
+    compareTo(other: ScalarData<Date>): 0 | 1 | -1;
 }
 declare class DataBytes extends ScalarData<Buffer> {
     get key(): string;
+    compareTo(other: ScalarData<Buffer>): 0 | 1 | -1;
 }
 declare class DataNull extends Data<null> {
     get value(): null;

package/dist/malloy.js

@@ -980,11 +980,41 @@ class Explore extends Entity {
     get allFields() {
         return [...this.fieldMap.values()];
     }
+    get allFieldsWithOrder() {
+        var _a, _b;
+        if (!this._allFieldsWithOrder) {
+            const orderByFields = [
+                ...(((_b = (_a = this.structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy) === null || _b === void 0 ? void 0 : _b.map(f => {
+                    if (typeof f.field === 'string') {
+                        const a = {
+                            field: this.fieldMap.get(f.field),
+                            dir: f.dir,
+                        };
+                        return a;
+                    }
+                    throw new Error('Does not support mapping order by from number.');
+                })) || []),
+            ];
+            const orderByFieldSet = new Set(orderByFields.map(f => f.field.name));
+            this._allFieldsWithOrder = [
+                ...orderByFields,
+                ...this.allFields
+                    .filter(f => !orderByFieldSet.has(f.name))
+                    .map(field => {
+                    return {
+                        field,
+                        dir: 'asc',
+                    };
+                }),
+            ];
+        }
+        return this._allFieldsWithOrder;
+    }
     get intrinsicFields() {
         return [...this.fieldMap.values()].filter(f => f.isIntrinsic());
     }
     get dimensions() {
-        return [...this.fieldMap.values()].filter(f => f.isAtomicField() && f.sourceWasDimension());
+        return [...this.allFieldsWithOrder].filter(f => f.field.isAtomicField() && f.field.sourceWasDimension());
     }
     getFieldByName(fieldName) {
         const field = this.fieldMap.get(fieldName);
@@ -2248,6 +2278,11 @@ class DataString extends ScalarData {
     get key() {
         return this.value;
     }
+    compareTo(other) {
+        return this.value
+            .toLocaleLowerCase()
+            .localeCompare(other.value.toLocaleLowerCase());
+    }
 }
 class DataUnsupported extends ScalarData {
     constructor(value, field) {
@@ -2260,6 +2295,9 @@ class DataUnsupported extends ScalarData {
     get key() {
         return '<unsupported>';
     }
+    compareTo(_other) {
+        return 0;
+    }
 }
 class DataBoolean extends ScalarData {
     constructor(value, field) {
@@ -2272,6 +2310,15 @@ class DataBoolean extends ScalarData {
     get key() {
         return `${this.value}`;
     }
+    compareTo(other) {
+        if (this.value === other.value) {
+            return 0;
+        }
+        if (this.value) {
+            return 1;
+        }
+        return -1;
+    }
 }
 class DataJSON extends ScalarData {
     constructor(value, field) {
@@ -2284,6 +2331,19 @@ class DataJSON extends ScalarData {
     get key() {
         return this.value;
     }
+    compareTo(other) {
+        const value = this.value.toString();
+        const otherValue = other.toString();
+        if (value === otherValue) {
+            return 0;
+        }
+        else if (value > otherValue) {
+            return 1;
+        }
+        else {
+            return -1;
+        }
+    }
 }
 class DataNumber extends ScalarData {
     constructor(value, field) {
@@ -2296,6 +2356,16 @@ class DataNumber extends ScalarData {
     get key() {
         return `${this.value}`;
     }
+    compareTo(other) {
+        const difference = this.value - other.value;
+        if (difference > 0) {
+            return 1;
+        }
+        else if (difference === 0) {
+            return 0;
+        }
+        return -1;
+    }
 }
 function valueToDate(value) {
     // TODO properly map the data from BQ/Postgres types
@@ -2339,6 +2409,15 @@ class DataTimestamp extends ScalarData {
     get key() {
         return `${this.value.toLocaleString()}`;
     }
+    compareTo(other) {
+        if (this.value > other.value) {
+            return 1;
+        }
+        else if (this.value < other.value) {
+            return -1;
+        }
+        return 0;
+    }
 }
 class DataDate extends ScalarData {
     constructor(value, field) {
@@ -2354,11 +2433,33 @@ class DataDate extends ScalarData {
     get key() {
         return `${this.value.toLocaleString()}`;
     }
+    compareTo(other) {
+        if (this.value > other.value) {
+            return 1;
+        }
+        else if (this.value < other.value) {
+            return -1;
+        }
+        return 0;
+    }
 }
 class DataBytes extends ScalarData {
     get key() {
         return this.value.toString();
     }
+    compareTo(other) {
+        const value = this.value.toString();
+        const otherValue = other.toString();
+        if (value === otherValue) {
+            return 0;
+        }
+        else if (value > otherValue) {
+            return 1;
+        }
+        else {
+            return -1;
+        }
+    }
 }
 class DataNull extends Data {
     get value() {

package/dist/model/malloy_query.js

@@ -1711,7 +1711,12 @@ class QueryQuery extends QueryField {
             const sourceField = fi.turtleDef.name || fi.turtleDef.as;
             const sourceClasses = sourceField ? [sourceField] : [];
             const filterList = fi.firstSegment.filterList;
-            const limit = fi.turtleDef.pipeline[fi.turtleDef.pipeline.length - 1].limit;
+            const lastSegment = fi.turtleDef.pipeline[fi.turtleDef.pipeline.length - 1];
+            const limit = lastSegment.limit;
+            let orderBy = undefined;
+            if ((0, malloy_types_1.isQuerySegment)(lastSegment)) {
+                orderBy = lastSegment.orderBy;
+            }
             if (sourceField) {
                 return {
                     sourceField,
@@ -1719,6 +1724,7 @@ class QueryQuery extends QueryField {
                     sourceClasses,
                     fieldKind: 'struct',
                     limit,
+                    orderBy,
                 };
             }
         }

package/dist/model/malloy_types.d.ts

@@ -87,6 +87,7 @@ export interface ResultMetadataDef {
 }
 export interface ResultStructMetadataDef extends ResultMetadataDef {
     limit?: number;
+    orderBy?: OrderBy[];
 }
 export interface ResultMetadata {
     resultMetadata?: ResultMetadataDef;

package/package.json

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