@malloydata/malloy 0.0.79 → 0.0.80-dev230824170739

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -185,6 +185,7 @@ import { TableURIContext } from "./MalloyParser";
 import { IdContext } from "./MalloyParser";
 import { TimeframeContext } from "./MalloyParser";
 import { UngroupContext } from "./MalloyParser";
+import { MalloyOrSQLTypeContext } from "./MalloyParser";
 import { FieldExprContext } from "./MalloyParser";
 import { PartialAllowedFieldExprContext } from "./MalloyParser";
 import { PickStatementContext } from "./MalloyParser";
@@ -2226,6 +2227,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitUngroup?: (ctx: UngroupContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.malloyOrSQLType`.
+     * @param ctx the parse tree
+     */
+    enterMalloyOrSQLType?: (ctx: MalloyOrSQLTypeContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.malloyOrSQLType`.
+     * @param ctx the parse tree
+     */
+    exitMalloyOrSQLType?: (ctx: MalloyOrSQLTypeContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.fieldExpr`.
      * @param ctx the parse tree

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -185,6 +185,7 @@ import { TableURIContext } from "./MalloyParser";
 import { IdContext } from "./MalloyParser";
 import { TimeframeContext } from "./MalloyParser";
 import { UngroupContext } from "./MalloyParser";
+import { MalloyOrSQLTypeContext } from "./MalloyParser";
 import { FieldExprContext } from "./MalloyParser";
 import { PartialAllowedFieldExprContext } from "./MalloyParser";
 import { PickStatementContext } from "./MalloyParser";
@@ -1406,6 +1407,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitUngroup?: (ctx: UngroupContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.malloyOrSQLType`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitMalloyOrSQLType?: (ctx: MalloyOrSQLTypeContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.fieldExpr`.
      * @param ctx the parse tree

package/dist/lang/malloy-to-ast.d.ts

@@ -8,8 +8,9 @@ import { LogSeverity, MessageLogger } from './parse-log';
 import { MalloyParseInfo } from './malloy-parse-info';
 import { FieldDeclarationConstructor } from './ast';
 import { HasString, HasID } from './parse-utils';
-import { Tag } from '../tags';
+import { CastType } from '../model';
 import { DocumentLocation, Note } from '../model/malloy_types';
+import { Tag } from '../tags';
 declare class IgnoredElement extends ast.MalloyElement {
     elementType: string;
     malloySrc: string;
@@ -178,6 +179,9 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExprApply(pcx: parse.ExprApplyContext): ast.Apply;
     visitExprRange(pcx: parse.ExprRangeContext): ast.Range;
     visitExprCast(pcx: parse.ExprCastContext): ast.ExpressionDef;
+    getMalloyOrSQLType(pcx: parse.MalloyOrSQLTypeContext): CastType | {
+        raw: string;
+    };
     visitExprSafeCast(pcx: parse.ExprSafeCastContext): ast.ExpressionDef;
     visitExprTimeTrunc(pcx: parse.ExprTimeTruncContext): ast.ExprGranularTime;
     visitTimeframe(pcx: parse.TimeframeContext): ast.Timeframe;

package/dist/lang/malloy-to-ast.js

@@ -52,6 +52,7 @@ const ast = __importStar(require("./ast"));
 const Interval_1 = require("antlr4ts/misc/Interval");
 const ast_1 = require("./ast");
 const parse_utils_1 = require("./parse-utils");
+const malloy_types_1 = require("../model/malloy_types");
 const tags_1 = require("../tags");
 class IgnoredElement extends ast.MalloyElement {
     constructor(src) {
@@ -1067,20 +1068,27 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return new ast.Range(this.getFieldExpr(pcx.fieldExpr(0)), this.getFieldExpr(pcx.fieldExpr(1)));
     }
     visitExprCast(pcx) {
-        const type = pcx.malloyType().text;
-        if (ast.isCastType(type)) {
-            return new ast.ExprCast(this.getFieldExpr(pcx.fieldExpr()), type);
+        const type = this.getMalloyOrSQLType(pcx.malloyOrSQLType());
+        return new ast.ExprCast(this.getFieldExpr(pcx.fieldExpr()), type);
+    }
+    getMalloyOrSQLType(pcx) {
+        const mtcx = pcx.malloyType();
+        if (mtcx) {
+            const type = mtcx.text;
+            if ((0, malloy_types_1.isCastType)(type)) {
+                return type;
+            }
+            throw this.internalError(pcx, `unknown type '${type}'`);
         }
-        this.contextError(pcx, `CAST to unknown type '${type}'`);
-        return new ast.ExprNULL();
+        const rtcx = pcx.string();
+        if (rtcx) {
+            return { raw: this.getPlainString({ string: () => rtcx }) };
+        }
+        throw this.internalError(pcx, 'Expected Malloy or SQL type to either be a Malloy type or a string');
     }
     visitExprSafeCast(pcx) {
-        const type = pcx.malloyType().text;
-        if (ast.isCastType(type)) {
-            return new ast.ExprCast(this.getFieldExpr(pcx.fieldExpr()), type, true);
-        }
-        this.contextError(pcx, `'::' cast to unknown type '${type}'`);
-        return new ast.ExprNULL();
+        const type = this.getMalloyOrSQLType(pcx.malloyOrSQLType());
+        return new ast.ExprCast(this.getFieldExpr(pcx.fieldExpr()), type, true);
     }
     visitExprTimeTrunc(pcx) {
         return new ast.ExprGranularTime(this.getFieldExpr(pcx.fieldExpr()), this.visitTimeframe(pcx.timeframe()).text, true);
@@ -1116,7 +1124,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const rawRawType = (_a = pcx.malloyType()) === null || _a === void 0 ? void 0 : _a.text;
         let rawType = undefined;
         if (rawRawType) {
-            if (ast.isCastType(rawRawType)) {
+            if ((0, malloy_types_1.isCastType)(rawRawType)) {
                 rawType = rawRawType;
             }
             else {

package/dist/lang/parse-utils.d.ts

@@ -9,7 +9,7 @@ import { StringContext, ShortStringContext, SqlStringContext, IdContext } from '
  */
 export declare function getShortString(scx: ShortStringContext): string;
 export declare function getStringIfShort(cx: HasString): string | undefined;
-export type HasString = ParserRuleContext & {
+export type HasString = {
     string: () => StringContext;
 };
 type StringPart = ParserRuleContext | string;

package/dist/lang/test/parse.spec.js

@@ -1645,6 +1645,28 @@ describe('unspported fields in schema', () => {
         expect(uModel).toTranslate();
     });
 });
+describe('cast', () => {
+    // The "+ 1"s are there to make sure the result is of type 'number'
+    test('sql cast', () => {
+        expect((0, test_translator_1.expr) `ai::'integer' + 1`).toTranslate();
+        expect((0, test_translator_1.expr) `ai::"integer" + 1`).toTranslate();
+        expect((0, test_translator_1.expr) `ai::"""integer""" + 1`).toTranslate();
+    });
+    test('sql safe cast', () => {
+        expect((0, test_translator_1.expr) `astr:::'integer' + 1`).toTranslate();
+        expect((0, test_translator_1.expr) `astr:::"integer" + 1`).toTranslate();
+        expect((0, test_translator_1.expr) `astr:::"""integer""" + 1`).toTranslate();
+    });
+    test('malloy cast', () => {
+        expect((0, test_translator_1.expr) `astr::number + 1`).toTranslate();
+    });
+    test('malloy safe cast', () => {
+        expect((0, test_translator_1.expr) `astr:::number + 1`).toTranslate();
+    });
+    test('sql cast illegal type name', () => {
+        expect((0, test_translator_1.expr) `astr::"stuff 'n' things"`).translationToFailWith("Cast type `stuff 'n' things` is invalid for standardsql dialect");
+    });
+});
 describe('error handling', () => {
     test('field and query with same name does not overflow', () => {
         expect(`

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;
@@ -198,7 +199,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 {
@@ -274,8 +277,10 @@ type HasExpression = FieldDef & JustExpression;
 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 +291,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 +350,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;
@@ -550,6 +579,7 @@ 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;

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.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.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.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 = exports.isSQLBlockStruct = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -222,9 +222,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)) {

package/package.json

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