@malloydata/malloy-interfaces 0.0.119-dev240123183113 → 0.0.119-dev240124170348

package/dist/model/malloy_types.d.ts

@@ -7,6 +7,7 @@ type ConstantExpr = Expr;
 type Condition = Expr;
 interface ParamCondition extends ParamBase {
     condition: Condition | null;
+    type: CastType;
 }
 interface ParamValue extends ParamBase {
     value: ConstantExpr | null;
@@ -70,10 +71,6 @@ export interface AliasedName {
 export interface TypedObject {
     type: string;
 }
-export interface FilteredAliasedName extends AliasedName {
-    filterList?: FilterExpression[];
-}
-export declare function isFilteredAliasedName(f: FieldTypeRef): f is FilteredAliasedName;
 /** all named objects have a type an a name (optionally aliased) */
 export interface NamedObject extends AliasedName, HasLocation {
     type: string;
@@ -198,7 +195,9 @@ export interface TypecastFragment extends DialectFragmentBase {
     function: 'cast';
     safe: boolean;
     expr: Expr;
-    dstType: AtomicFieldType;
+    dstType: CastType | {
+        raw: string;
+    };
     srcType?: AtomicFieldType;
 }
 export interface RegexpMatchFragment extends DialectFragmentBase {
@@ -266,16 +265,17 @@ export declare function expressionIsAnalytic(e: ExpressionType | undefined): boo
 export declare function isExpressionTypeLEQ(e1: ExpressionType, e2: ExpressionType): boolean;
 export declare function maxExpressionType(e1: ExpressionType, e2: ExpressionType): ExpressionType;
 export declare function maxOfExpressionTypes(types: ExpressionType[]): ExpressionType;
-interface JustExpression {
+type HasExpression = FieldDef & Expression & {
     e: Expr;
-}
-type HasExpression = FieldDef & JustExpression;
+};
 /**  Grants access to the expression property of a FieldDef */
 export declare function hasExpression(f: FieldDef): f is HasExpression;
 export type TimeFieldType = 'date' | 'timestamp';
 export declare function isTimeFieldType(s: string): s is TimeFieldType;
-export type AtomicFieldType = 'string' | 'number' | TimeFieldType | 'boolean' | 'unsupported' | 'json' | 'error';
+export type CastType = 'string' | 'number' | TimeFieldType | 'boolean' | 'json';
+export type AtomicFieldType = CastType | 'unsupported' | 'error';
 export declare function isAtomicFieldType(s: string): s is AtomicFieldType;
+export declare function isCastType(s: string): s is CastType;
 /**
  * Fields which contain scalar data all inherit from this. The field
  * value could be an expression, and this is one of the objects
@@ -286,31 +286,49 @@ export interface FieldAtomicDef extends NamedObject, Expression, ResultMetadata
     annotation?: Annotation;
 }
 export declare function FieldIsIntrinsic(f: FieldDef): boolean;
-/** Scalar String Field */
-export interface FieldStringDef extends FieldAtomicDef {
+export interface FieldStringTypeDef {
     type: 'string';
     bucketFilter?: string;
     bucketOther?: string;
 }
-/** Scalar Numeric String Field */
-export interface FieldNumberDef extends FieldAtomicDef {
+/** Scalar String Field */
+export interface FieldStringDef extends FieldAtomicDef, FieldStringTypeDef {
+    type: 'string';
+}
+export interface FieldNumberTypeDef {
     type: 'number';
     numberType?: 'integer' | 'float';
 }
+/** Scalar Numeric String Field */
+export interface FieldNumberDef extends FieldAtomicDef, FieldNumberTypeDef {
+    type: 'number';
+}
+export interface FieldBooleanTypeDef {
+    type: 'boolean';
+}
 /** Scalar Boolean Field */
-export interface FieldBooleanDef extends FieldAtomicDef {
+export interface FieldBooleanDef extends FieldAtomicDef, FieldBooleanTypeDef {
     type: 'boolean';
 }
+export interface FieldJSONTypeDef {
+    type: 'json';
+}
 /** Scalar JSON Field */
-export interface FieldJSONDef extends FieldAtomicDef {
+export interface FieldJSONDef extends FieldAtomicDef, FieldJSONTypeDef {
     type: 'json';
 }
-/** Scalar unsupported Field */
-export interface FieldUnsupportedDef extends FieldAtomicDef {
+export interface FieldUnsupportedTypeDef {
     type: 'unsupported';
     rawType?: string;
 }
-export interface FieldErrorDef extends FieldAtomicDef {
+/** Scalar unsupported Field */
+export interface FieldUnsupportedDef extends FieldAtomicDef, FieldUnsupportedTypeDef {
+    type: 'unsupported';
+}
+export interface FieldErrorTypeDef {
+    type: 'error';
+}
+export interface FieldErrorDef extends FieldAtomicDef, FieldErrorTypeDef {
     type: 'error';
 }
 export type DateUnit = 'day' | 'week' | 'month' | 'quarter' | 'year';
@@ -327,16 +345,22 @@ export declare enum ValueType {
     String = "string"
 }
 export type TimeValueType = ValueType.Date | ValueType.Timestamp;
-/** Scalar Date Field. */
-export interface FieldDateDef extends FieldAtomicDef {
+export interface FieldDateTypeDef {
     type: 'date';
     timeframe?: DateUnit;
 }
-/** Scalar Timestamp Field */
-export interface FieldTimestampDef extends FieldAtomicDef {
+/** Scalar Date Field. */
+export interface FieldDateDef extends FieldAtomicDef, FieldDateTypeDef {
+    type: 'date';
+}
+export interface FieldTimestampTypeDef {
     type: 'timestamp';
     timeframe?: TimestampUnit;
 }
+/** Scalar Timestamp Field */
+export interface FieldTimestampDef extends FieldAtomicDef, FieldTimestampTypeDef {
+    type: 'timestamp';
+}
 /** parameter to order a query */
 export interface OrderBy {
     field: string | number;
@@ -376,16 +400,21 @@ export interface Pipeline {
 }
 export interface Query extends Pipeline, Filtered, HasLocation {
     type?: 'query';
+    name?: string;
     structRef: StructRef;
     annotation?: Annotation;
     modelAnnotation?: Annotation;
 }
 export type NamedQuery = Query & NamedObject;
-export type PipeSegment = QuerySegment | IndexSegment;
+export type PipeSegment = QuerySegment | IndexSegment | RawSegment;
 export interface ReduceSegment extends QuerySegment {
     type: 'reduce';
 }
 export declare function isReduceSegment(pe: PipeSegment): pe is ReduceSegment;
+export interface PartialSegment extends QuerySegment {
+    type: 'partial';
+}
+export declare function isPartialSegment(pe: PipeSegment): pe is PartialSegment;
 export interface ProjectSegment extends QuerySegment {
     type: 'project';
 }
@@ -404,6 +433,11 @@ interface SamplingEnable {
     enable: boolean;
 }
 export declare function isSamplingEnable(s: Sampling): s is SamplingEnable;
+export interface RawSegment extends Filtered {
+    type: 'raw';
+    fields: never[];
+}
+export declare function isRawSegment(pe: PipeSegment): pe is RawSegment;
 export interface IndexSegment extends Filtered {
     type: 'index';
     fields: string[];
@@ -413,7 +447,7 @@ export interface IndexSegment extends Filtered {
 }
 export declare function isIndexSegment(pe: PipeSegment): pe is IndexSegment;
 export interface QuerySegment extends Filtered {
-    type: 'reduce' | 'project';
+    type: 'reduce' | 'project' | 'partial';
     fields: QueryFieldDef[];
     extendSource?: FieldDef[];
     limit?: number;
@@ -439,7 +473,7 @@ export type StructRelationship = {
     type: 'inline';
 } | {
     type: 'nested';
-    field: FieldRef;
+    fieldName: string;
     isArray: boolean;
 };
 export interface SQLFragment {
@@ -530,6 +564,7 @@ export interface FunctionOverloadDef {
         preceding: number | string;
         following: number | string;
     };
+    isSymmetric?: boolean;
     params: FunctionParameterDef[];
     dialect: {
         [dialect: string]: Expr;
@@ -549,17 +584,20 @@ export interface SQLBlockStructDef extends StructDef {
 export declare function isSQLBlockStruct(sd: StructDef): sd is SQLBlockStructDef;
 /** any of the different field types */
 export type FieldTypeDef = FieldStringDef | FieldDateDef | FieldTimestampDef | FieldNumberDef | FieldBooleanDef | FieldJSONDef | FieldUnsupportedDef | FieldErrorDef;
+export type FieldAtomicTypeDef = FieldStringTypeDef | FieldDateTypeDef | FieldTimestampTypeDef | FieldNumberTypeDef | FieldBooleanTypeDef | FieldJSONTypeDef | FieldUnsupportedTypeDef | FieldErrorTypeDef;
 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;
-/** field reference in a query */
-export type FieldTypeRef = string | FieldTypeDef | FilteredAliasedName;
-/** field reference with with possibly and order by. */
-export type QueryFieldDef = FieldTypeRef | TurtleDef;
+export type QueryFieldDef = FieldTypeDef | TurtleDef | RefToField;
 /** basics statement */
 export type FieldDef = FieldTypeDef | StructDef | TurtleDef;
 /** reference to a field */
-export type FieldRef = string | FieldDef;
+export interface RefToField {
+    type: 'fieldref';
+    path: string[];
+    annotation?: Annotation;
+}
+export type FieldRefOrDef = FieldDef | RefToField;
 /** which field is the primary key in this struct */
 export type PrimaryKeyRef = string;
 /** filters */
@@ -613,6 +651,7 @@ export type MalloyQueryData = {
     rows: QueryDataRow[];
     totalRows: number;
     runStats?: QueryRunStats;
+    profilingUrl?: string;
 };
 export interface DrillSource {
     sourceExplore: string;
@@ -634,8 +673,10 @@ export interface QueryResult extends CompiledQuery {
     totalRows: number;
     error?: string;
     runStats?: QueryRunStats;
+    profilingUrl?: string;
 }
 export declare function isTurtleDef(def: FieldDef): def is TurtleDef;
+export declare function isAtomicField(def: FieldDef): def is FieldAtomicDef;
 export interface SearchResultRow {
     field_name: string;
     field_value: string;

package/dist/model/malloy_types.js

@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
-exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = void 0;
+exports.isSQLFragment = exports.isJoinOn = exports.isIndexSegment = exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
+exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -36,15 +36,6 @@ function paramHasValue(p) {
     return isValueParameter(p) || p.condition !== null;
 }
 exports.paramHasValue = paramHasValue;
-function isFilteredAliasedName(f) {
-    for (const prop of Object.keys(f)) {
-        if (!['name', 'as', 'filterList'].includes(prop)) {
-            return false;
-        }
-    }
-    return true;
-}
-exports.isFilteredAliasedName = isFilteredAliasedName;
 function isOutputFieldFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'outputField';
 }
@@ -222,9 +213,14 @@ function isAtomicFieldType(s) {
         'boolean',
         'json',
         'unsupported',
+        'error',
     ].includes(s);
 }
 exports.isAtomicFieldType = isAtomicFieldType;
+function isCastType(s) {
+    return ['string', 'number', 'date', 'timestamp', 'boolean', 'json'].includes(s);
+}
+exports.isCastType = isCastType;
 // this field definition represents something in the database.
 function FieldIsIntrinsic(f) {
     if (isAtomicFieldType(f.type) && !hasExpression(f)) {
@@ -281,6 +277,10 @@ function isReduceSegment(pe) {
     return pe.type === 'reduce';
 }
 exports.isReduceSegment = isReduceSegment;
+function isPartialSegment(pe) {
+    return pe.type === 'partial';
+}
+exports.isPartialSegment = isPartialSegment;
 function isProjectSegment(pe) {
     return pe.type === 'project';
 }
@@ -301,6 +301,10 @@ function isSamplingEnable(s) {
     return s.enable !== undefined;
 }
 exports.isSamplingEnable = isSamplingEnable;
+function isRawSegment(pe) {
+    return pe.type === 'raw';
+}
+exports.isRawSegment = isRawSegment;
 function isIndexSegment(pe) {
     return pe.type === 'index';
 }
@@ -357,6 +361,10 @@ function isTurtleDef(def) {
     return def.type === 'turtle';
 }
 exports.isTurtleDef = isTurtleDef;
+function isAtomicField(def) {
+    return isAtomicFieldType(def.type);
+}
+exports.isAtomicField = isAtomicField;
 function isDimensional(field) {
     var _a;
     if ('resultMetadata' in field) {

package/package.json

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