@malloydata/malloy 0.0.19-dev230106235212 → 0.0.19

package/dist/malloy.d.ts

@@ -2,7 +2,7 @@
 import { InfoConnection } from ".";
 import { DocumentHighlight as DocumentHighlightDefinition, DocumentSymbol as DocumentSymbolDefinition, DocumentCompletion as DocumentCompletionDefinition, LogMessage, MalloyTranslator } from "./lang";
 import { DocumentHelpContext } from "./lang/parse-tree-walkers/document-help-context-walker";
-import { CompiledQuery, FieldBooleanDef, FieldDateDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, ModelDef, Query as InternalQuery, QueryData, QueryDataRow, QueryResult, StructDef, TurtleDef, SQLBlock, DocumentReference, DocumentPosition as ModelDocumentPosition, SearchIndexResult, SearchValueMapResult, NamedQuery, SQLBlockStructDef } from "./model";
+import { CompiledQuery, FieldBooleanDef, FieldDateDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, ModelDef, Query as InternalQuery, QueryData, QueryDataRow, QueryResult, StructDef, TurtleDef, SQLBlock, DocumentReference, DocumentPosition as ModelDocumentPosition, SearchIndexResult, SearchValueMapResult, NamedQuery, SQLBlockStructDef, FieldJSONDef } from "./model";
 import { LookupConnection, ModelString, ModelURL, QueryString, QueryURL, URLReader, Connection } from "./runtime_types";
 export interface Loggable {
     debug: (message?: any, ...optionalParams: any[]) => void;
@@ -496,7 +496,8 @@ export declare enum AtomicFieldType {
     Number = "number",
     Boolean = "boolean",
     Date = "date",
-    Timestamp = "timestamp"
+    Timestamp = "timestamp",
+    Json = "json"
 }
 export declare class AtomicField extends Entity {
     protected fieldTypeDef: FieldTypeDef;
@@ -518,6 +519,7 @@ export declare class AtomicField extends Entity {
     isNumber(): this is NumberField;
     isDate(): this is DateField;
     isBoolean(): this is BooleanField;
+    isJSON(): this is JSONField;
     isTimestamp(): this is TimestampField;
     get parentExplore(): Explore;
     get expression(): string;
@@ -557,6 +559,10 @@ export declare class BooleanField extends AtomicField {
     private fieldBooleanDef;
     constructor(fieldBooleanDef: FieldBooleanDef, parent: Explore, source?: AtomicField);
 }
+export declare class JSONField extends AtomicField {
+    private fieldJSONDef;
+    constructor(fieldJSONDef: FieldJSONDef, parent: Explore, source?: AtomicField);
+}
 export declare class StringField extends AtomicField {
     private fieldStringDef;
     constructor(fieldStringDef: FieldStringDef, parent: Explore, source?: AtomicField);
@@ -1012,7 +1018,7 @@ export declare class Result extends PreparedResult {
     toJSON(): ResultJSON;
     static fromJSON({ queryResult, modelDef }: ResultJSON): Result;
 }
-export declare type DataColumn = DataArray | DataRecord | DataString | DataBoolean | DataNumber | DataDate | DataTimestamp | DataNull | DataBytes;
+export declare type DataColumn = DataArray | DataRecord | DataString | DataBoolean | DataNumber | DataDate | DataTimestamp | DataNull | DataBytes | DataJSON;
 export declare type DataArrayOrRecord = DataArray | DataRecord;
 declare abstract class Data<T> {
     protected _field: Field | Explore;
@@ -1055,6 +1061,11 @@ declare class DataBoolean extends ScalarData<boolean> {
     constructor(value: boolean, field: BooleanField);
     get field(): BooleanField;
 }
+declare class DataJSON extends ScalarData<string> {
+    protected _field: JSONField;
+    constructor(value: string, field: JSONField);
+    get field(): JSONField;
+}
 declare class DataNumber extends ScalarData<number> {
     protected _field: NumberField;
     constructor(value: number, field: NumberField);

package/dist/malloy.js

@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.ExploreMaterializer = exports.SQLBlockMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.ExploreField = exports.JoinRelationship = exports.QueryField = exports.Query = exports.StringField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicField = exports.AtomicFieldType = exports.Explore = exports.SourceRelationship = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.PreparedResult = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentHighlight = exports.Parse = exports.parseTableURI = exports.PreparedQuery = exports.Model = exports.MalloyError = exports.Malloy = void 0;
+exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.ExploreMaterializer = exports.SQLBlockMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.ExploreField = exports.JoinRelationship = exports.QueryField = exports.Query = exports.StringField = exports.JSONField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicField = exports.AtomicFieldType = exports.Explore = exports.SourceRelationship = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.PreparedResult = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentHighlight = exports.Parse = exports.parseTableURI = exports.PreparedQuery = exports.Model = exports.MalloyError = exports.Malloy = void 0;
 const lang_1 = require("./lang");
 const model_1 = require("./model");
 class Malloy {
@@ -905,6 +905,9 @@ class Explore extends Entity {
                     else if (fieldDef.type === "boolean") {
                         return [name, new BooleanField(fieldDef, this, sourceField)];
                     }
+                    else if (fieldDef.type === "json") {
+                        return [name, new JSONField(fieldDef, this, sourceField)];
+                    }
                 }
             }));
         }
@@ -972,6 +975,7 @@ var AtomicFieldType;
     AtomicFieldType["Boolean"] = "boolean";
     AtomicFieldType["Date"] = "date";
     AtomicFieldType["Timestamp"] = "timestamp";
+    AtomicFieldType["Json"] = "json";
 })(AtomicFieldType = exports.AtomicFieldType || (exports.AtomicFieldType = {}));
 class AtomicField extends Entity {
     constructor(fieldTypeDef, parent, source) {
@@ -991,6 +995,8 @@ class AtomicField extends Entity {
                 return AtomicFieldType.Timestamp;
             case "number":
                 return AtomicFieldType.Number;
+            case "json":
+                return AtomicFieldType.Json;
         }
     }
     isIntrinsic() {
@@ -1046,6 +1052,9 @@ class AtomicField extends Entity {
     isBoolean() {
         return this instanceof BooleanField;
     }
+    isJSON() {
+        return this instanceof JSONField;
+    }
     isTimestamp() {
         return this instanceof TimestampField;
     }
@@ -1147,6 +1156,13 @@ class BooleanField extends AtomicField {
     }
 }
 exports.BooleanField = BooleanField;
+class JSONField extends AtomicField {
+    constructor(fieldJSONDef, parent, source) {
+        super(fieldJSONDef, parent, source);
+        this.fieldJSONDef = fieldJSONDef;
+    }
+}
+exports.JSONField = JSONField;
 class StringField extends AtomicField {
     constructor(fieldStringDef, parent, source) {
         super(fieldStringDef, parent, source);
@@ -2065,6 +2081,15 @@ class DataBoolean extends ScalarData {
         return this._field;
     }
 }
+class DataJSON extends ScalarData {
+    constructor(value, field) {
+        super(value, field);
+        this._field = field;
+    }
+    get field() {
+        return this._field;
+    }
+}
 class DataNumber extends ScalarData {
     constructor(value, field) {
         super(value, field);
@@ -2218,6 +2243,9 @@ class DataRecord extends Data {
             else if (field.isDate()) {
                 return new DataDate(value, field);
             }
+            else if (field.isJSON()) {
+                return new DataJSON(value, field);
+            }
             else if (field.isTimestamp()) {
                 return new DataTimestamp(value, field);
             }

package/dist/model/malloy_query.js

@@ -509,6 +509,8 @@ class QueryFieldNumber extends QueryAtomicField {
 }
 class QueryFieldBoolean extends QueryAtomicField {
 }
+class QueryFieldJSON extends QueryAtomicField {
+}
 // in a query a struct can be referenced.  The struct will
 //  emit the primary key field in the actual result set and
 //  will include the StructDef as a foreign key join in the output
@@ -1558,6 +1560,7 @@ class QueryQuery extends QueryField {
                     // build out the result fields...
                     switch (fi.f.fieldDef.type) {
                         case "boolean":
+                        case "json":
                         case "string":
                             fields.push({
                                 name,
@@ -2774,6 +2777,8 @@ class QueryStruct extends QueryNode {
                 return new QueryFieldNumber(field, this);
             case "boolean":
                 return new QueryFieldBoolean(field, this);
+            case "json":
+                return new QueryFieldJSON(field, this);
             // case "reduce":
             // case "project":
             // case "index":

package/dist/model/malloy_types.d.ts

@@ -241,7 +241,7 @@ declare type HasExpression = FieldDef & JustExpression;
 export declare function hasExpression(f: FieldDef): f is HasExpression;
 export declare type TimeFieldType = "date" | "timestamp";
 export declare function isTimeFieldType(s: string): s is TimeFieldType;
-export declare type AtomicFieldType = "string" | "number" | TimeFieldType | "boolean";
+export declare type AtomicFieldType = "string" | "number" | TimeFieldType | "boolean" | "json";
 export declare function isAtomicFieldType(s: string): s is AtomicFieldType;
 /** All scalars can have an optional expression */
 export interface FieldAtomicDef extends NamedObject, Expression, ResultMetadata {
@@ -263,6 +263,10 @@ export interface FieldNumberDef extends FieldAtomicDef {
 export interface FieldBooleanDef extends FieldAtomicDef {
     type: "boolean";
 }
+/** Scalar JSON Field */
+export interface FieldJSONDef extends FieldAtomicDef {
+    type: "json";
+}
 export declare type DateUnit = "day" | "week" | "month" | "quarter" | "year";
 export declare function isDateUnit(str: string): str is DateUnit;
 export declare type TimestampUnit = DateUnit | "hour" | "minute" | "second";
@@ -446,7 +450,7 @@ export interface SQLBlockStructDef extends StructDef {
 }
 export declare function isSQLBlock(sd: StructDef): sd is SQLBlockStructDef;
 /** any of the different field types */
-export declare type FieldTypeDef = FieldStringDef | FieldDateDef | FieldTimestampDef | FieldNumberDef | FieldBooleanDef;
+export declare type FieldTypeDef = FieldStringDef | FieldDateDef | FieldTimestampDef | FieldNumberDef | FieldBooleanDef | FieldJSONDef;
 export declare function isFieldTypeDef(f: FieldDef): f is FieldTypeDef;
 export declare function isFieldTimeBased(f: FieldDef): f is FieldTimestampDef | FieldDateDef;
 export declare function isFieldStructDef(f: FieldDef): f is StructDef;

package/dist/model/malloy_types.js

@@ -187,7 +187,7 @@ function isTimeFieldType(s) {
 }
 exports.isTimeFieldType = isTimeFieldType;
 function isAtomicFieldType(s) {
-    return ["string", "number", "date", "timestamp", "boolean"].includes(s);
+    return ["string", "number", "date", "timestamp", "boolean", "json"].includes(s);
 }
 exports.isAtomicFieldType = isAtomicFieldType;
 // this field definition represents something in the database.
@@ -288,7 +288,8 @@ function isFieldTypeDef(f) {
         f.type === "date" ||
         f.type === "number" ||
         f.type === "timestamp" ||
-        f.type === "boolean");
+        f.type === "boolean" ||
+        f.type === "json");
 }
 exports.isFieldTypeDef = isFieldTypeDef;
 function isFieldTimeBased(f) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.19-dev230106235212",
+  "version": "0.0.19",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",