@malloydata/malloy 0.0.309 → 0.0.311

package/README.md

@@ -1,6 +1,6 @@
 # Malloy
 
-Malloy is an experimental language for describing data relationships and transformations. It is both a semantic modeling language and a querying language that runs queries against a relational database. Malloy currently connects to BigQuery and Postgres, and natively supports DuckDB. We've built a Visual Studio Code extension to facilitate building Malloy data models, querying and transforming data, and creating simple visualizations and dashboards.
+Malloy is a modern open source language for describing data relationships and transformations. It is both a semantic modeling language and a querying language that runs queries against a relational database. Malloy currently connects to BigQuery and Postgres, and natively supports DuckDB. We've built a Visual Studio Code extension to facilitate building Malloy data models, querying and transforming data, and creating simple visualizations and dashboards.
 
 ## Building applications or products in javascript with @malloydata/malloy
 

package/dist/dialect/mysql/mysql.js

@@ -65,6 +65,23 @@ const mysqlToMalloyTypes = {
     // TODO: Check if we need special handling for boolean.
     'tinyint(1)': { type: 'boolean' },
 };
+function malloyTypeToJSONTableType(malloyType) {
+    switch (malloyType.type) {
+        case 'number':
+            return malloyType.numberType === 'integer' ? 'INT' : 'DOUBLE';
+        case 'string':
+            return 'CHAR(255)'; // JSON_TABLE needs a length
+        case 'boolean':
+            return 'INT'; // or TINYINT(1) if you prefer
+        case 'record':
+        case 'array':
+            return 'JSON';
+        case 'timestamp':
+            return 'DATETIME';
+        default:
+            return malloyType.type.toUpperCase();
+    }
+}
 class MySQLDialect extends dialect_1.Dialect {
     constructor() {
         super(...arguments);
@@ -99,14 +116,16 @@ class MySQLDialect extends dialect_1.Dialect {
     malloyTypeToSQLType(malloyType) {
         switch (malloyType.type) {
             case 'number':
-                return malloyType.numberType === 'integer' ? 'BIGINT' : 'DOUBLE';
+                return malloyType.numberType === 'integer' ? 'SIGNED' : 'DOUBLE';
             case 'string':
-                return 'TEXT';
+                return 'CHAR';
+            case 'boolean':
+                return 'SIGNED';
             case 'record':
             case 'array':
                 return 'JSON';
-            case 'date':
             case 'timestamp':
+                return 'DATETIME';
             default:
                 return malloyType.type;
         }
@@ -177,7 +196,7 @@ class MySQLDialect extends dialect_1.Dialect {
         var _a;
         const fields = [];
         for (const f of fieldList) {
-            let fType = this.malloyTypeToSQLType(f.typeDef);
+            let fType = malloyTypeToJSONTableType(f.typeDef);
             if (f.typeDef.type === 'sql native' &&
                 f.typeDef.rawType &&
                 ((_a = f.typeDef.rawType) === null || _a === void 0 ? void 0 : _a.match(/json/))) {

package/dist/dialect/pg_impl.js

@@ -22,17 +22,21 @@ class PostgresBase extends dialect_1.Dialect {
         // adjusting for monday/sunday weeks
         const week = df.units === 'week';
         const truncThis = week ? `${df.e.sql} + INTERVAL '1' DAY` : df.e.sql;
+        // Only do timezone conversion for timestamps, not dates
         if (malloy_types_1.TD.isTimestamp(df.e.typeDef)) {
             const tz = (0, dialect_1.qtz)(qi);
             if (tz) {
                 const civilSource = `(${truncThis}::TIMESTAMPTZ AT TIME ZONE '${tz}')`;
                 let civilTrunc = `DATE_TRUNC('${df.units}', ${civilSource})`;
-                // MTOY todo ... only need to do this if this is a date ...
-                civilTrunc = `${civilTrunc}::TIMESTAMP`;
+                if (week) {
+                    civilTrunc = `(${civilTrunc} - INTERVAL '1' DAY)`;
+                }
+                // Convert the truncated civil time back to UTC by treating it as being IN the query timezone
                 const truncTsTz = `${civilTrunc} AT TIME ZONE '${tz}'`;
                 return `(${truncTsTz})::TIMESTAMP`;
             }
         }
+        // For dates (civil time) or timestamps without query timezone
         let result = `DATE_TRUNC('${df.units}', ${truncThis})`;
         if (week) {
             result = `(${result} - INTERVAL '1' DAY)`;

package/dist/dialect/postgres/postgres.js

@@ -193,8 +193,9 @@ class PostgresDialect extends pg_impl_1.PostgresBase {
     sqlCreateFunction(id, funcText) {
         return `CREATE FUNCTION ${id}(JSONB) RETURNS JSONB AS $$\n${(0, utils_1.indent)(funcText)}\n$$ LANGUAGE SQL;\n`;
     }
+    //
     sqlCreateFunctionCombineLastStage(lastStageName) {
-        return `SELECT JSONB_AGG(__stage0) FROM ${lastStageName}\n`;
+        return `SELECT JSONB_AGG(${lastStageName}) FROM ${lastStageName}\n`;
     }
     sqlFinalStage(lastStageName, _fields) {
         return `SELECT row_to_json(finalStage) as row FROM ${lastStageName} AS finalStage`;

package/dist/dialect/trino/trino.js

@@ -519,7 +519,7 @@ ${(0, utils_1.indent)(sql)}
                 const name = (_a = f.as) !== null && _a !== void 0 ? _a : f.name;
                 rowVals.push((_b = lit.kids[name].sql) !== null && _b !== void 0 ? _b : 'internal-error-record-literal');
                 const elType = this.malloyTypeToSQLType(f);
-                rowTypes.push(`${name} ${elType}`);
+                rowTypes.push(`${this.sqlMaybeQuoteIdentifier(name)} ${elType}`);
             }
         }
         return `CAST(ROW(${rowVals.join(',')}) AS ROW(${rowTypes.join(',')}))`;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { DuckDBDialect, StandardSQLDialect, TrinoDialect, PostgresDialect, SnowflakeDialect, MySQLDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, param, variadicParam, literal, spread, Dialect, TinyParser, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, MalloyStandardFunctionImplementations, DefinitionBlueprint, DefinitionBlueprintMap, OverloadedDefinitionBlueprint, TinyToken, } from './dialect';
-export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, SourceComponentInfo, } from './model';
-export { isSourceDef, isBasicAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, isTimestampUnit, isDateUnit, } from './model';
+export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, SourceComponentInfo, TimeLiteralNode, TypecastExpr, } from './model';
+export { isSourceDef, isBasicAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, isTimestampUnit, isDateUnit, constantExprToSQL, } from './model';
 export { malloyToQuery, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
 export { Model, Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, PreparedResult, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, InMemoryModelCache, CacheManager, } from './malloy';

package/dist/index.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = exports.isDateUnit = exports.isTimestampUnit = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isBasicArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isBasicAtomic = exports.isSourceDef = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.extractMalloyObjectFromTag = exports.writeMalloyObjectToTag = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = void 0;
+exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = exports.constantExprToSQL = exports.isDateUnit = exports.isTimestampUnit = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isBasicArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isBasicAtomic = exports.isSourceDef = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
+exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.extractMalloyObjectFromTag = exports.writeMalloyObjectToTag = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -102,6 +102,8 @@ Object.defineProperty(exports, "indent", { enumerable: true, get: function () {
 Object.defineProperty(exports, "composeSQLExpr", { enumerable: true, get: function () { return model_1.composeSQLExpr; } });
 Object.defineProperty(exports, "isTimestampUnit", { enumerable: true, get: function () { return model_1.isTimestampUnit; } });
 Object.defineProperty(exports, "isDateUnit", { enumerable: true, get: function () { return model_1.isDateUnit; } });
+// Used in testing, not really public API
+Object.defineProperty(exports, "constantExprToSQL", { enumerable: true, get: function () { return model_1.constantExprToSQL; } });
 var lang_1 = require("./lang");
 Object.defineProperty(exports, "malloyToQuery", { enumerable: true, get: function () { return lang_1.malloyToQuery; } });
 // Needed for tests only

package/dist/lang/ast/field-space/refined-space.js

@@ -63,7 +63,7 @@ class RefinedSpace extends dynamic_space_1.DynamicSpace {
                     const renamed = renameMap.get(symbol);
                     if (renamed) {
                         if (value instanceof space_field_1.SpaceField) {
-                            edited.setEntry(renamed.as, new rename_space_field_1.RenameSpaceField(value, renamed.as, renamed.location));
+                            edited.setEntry(renamed.as, new rename_space_field_1.RenameSpaceField(value, renamed.as, renamed.location, undefined));
                         }
                         else {
                             renamed.logTo.logError('cannot-rename-non-field', `Cannot rename \`${symbol}\` which is not a field`);

package/dist/lang/ast/field-space/rename-space-field.d.ts

@@ -1,10 +1,11 @@
-import type { DocumentLocation, FieldDef } from '../../../model/malloy_types';
+import type { Annotation, DocumentLocation, FieldDef } from '../../../model/malloy_types';
 import { SpaceField } from '../types/space-field';
 export declare class RenameSpaceField extends SpaceField {
     private readonly otherField;
     private readonly newName;
     private readonly location;
-    constructor(otherField: SpaceField, newName: string, location: DocumentLocation);
+    private note;
+    constructor(otherField: SpaceField, newName: string, location: DocumentLocation, note: Annotation | undefined);
     fieldDef(): FieldDef | undefined;
     typeDesc(): import("../../../model/malloy_types").TypeDesc;
 }

package/dist/lang/ast/field-space/rename-space-field.js

@@ -25,19 +25,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenameSpaceField = void 0;
 const space_field_1 = require("../types/space-field");
 class RenameSpaceField extends space_field_1.SpaceField {
-    constructor(otherField, newName, location) {
+    constructor(otherField, newName, location, note) {
         super();
         this.otherField = otherField;
         this.newName = newName;
         this.location = location;
+        this.note = note;
     }
     fieldDef() {
-        const renamedFieldRaw = this.otherField.fieldDef();
-        if (renamedFieldRaw === undefined) {
+        const returnFieldDef = this.otherField.fieldDef();
+        if (returnFieldDef === undefined) {
             return undefined;
         }
+        if (this.note) {
+            if (returnFieldDef.annotation) {
+                returnFieldDef.annotation = {
+                    ...this.note,
+                    inherits: returnFieldDef.annotation,
+                };
+            }
+            else {
+                returnFieldDef.annotation = this.note;
+            }
+        }
         return {
-            ...renamedFieldRaw,
+            ...returnFieldDef,
             as: this.newName,
             location: this.location,
         };

package/dist/lang/ast/source-properties/renames.d.ts

@@ -1,17 +1,22 @@
-import type { AccessModifierLabel } from '../../../model';
+import type { AccessModifierLabel, Annotation } from '../../../model';
 import type { DynamicSpace } from '../field-space/dynamic-space';
+import { DefinitionList } from '../types/definition-list';
 import type { FieldName } from '../types/field-space';
-import { ListOf, MalloyElement } from '../types/malloy-element';
+import { MalloyElement } from '../types/malloy-element';
+import { extendNoteMethod, type Noteable } from '../types/noteable';
 import type { MakeEntry } from '../types/space-entry';
-export declare class RenameField extends MalloyElement implements MakeEntry {
+export declare class RenameField extends MalloyElement implements Noteable, MakeEntry {
     readonly newName: string;
     readonly oldName: FieldName;
     elementType: string;
+    note?: Annotation;
+    extendNote: typeof extendNoteMethod;
+    readonly isNoteableObj = true;
     constructor(newName: string, oldName: FieldName);
     makeEntry(fs: DynamicSpace): void;
     getName(): string;
 }
-export declare class Renames extends ListOf<RenameField> {
+export declare class Renames extends DefinitionList<RenameField> {
     readonly accessModifier: AccessModifierLabel | undefined;
     elementType: string;
     constructor(fields: RenameField[], accessModifier: AccessModifierLabel | undefined);

package/dist/lang/ast/source-properties/renames.js

@@ -24,7 +24,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Renames = exports.RenameField = void 0;
 const rename_space_field_1 = require("../field-space/rename-space-field");
+const definition_list_1 = require("../types/definition-list");
 const malloy_element_1 = require("../types/malloy-element");
+const noteable_1 = require("../types/noteable");
 const space_field_1 = require("../types/space-field");
 class RenameField extends malloy_element_1.MalloyElement {
     constructor(newName, oldName) {
@@ -32,6 +34,8 @@ class RenameField extends malloy_element_1.MalloyElement {
         this.newName = newName;
         this.oldName = oldName;
         this.elementType = 'renameField';
+        this.extendNote = noteable_1.extendNoteMethod;
+        this.isNoteableObj = true;
         this.has({ oldName: oldName });
     }
     makeEntry(fs) {
@@ -40,9 +44,19 @@ class RenameField extends malloy_element_1.MalloyElement {
             return;
         }
         const oldValue = this.oldName.getField(fs);
+        /*
+    
+        ok need to get the annotation from the old field into the inherits and the annotaiton
+        of the curuent field and then
+    
+    
+    
+    
+    
+        */
         if (oldValue.found) {
             if (oldValue.found instanceof space_field_1.SpaceField) {
-                fs.renameEntry(this.oldName.refString, this.newName, new rename_space_field_1.RenameSpaceField(oldValue.found, this.newName, this.location));
+                fs.renameEntry(this.oldName.refString, this.newName, new rename_space_field_1.RenameSpaceField(oldValue.found, this.newName, this.location, this.note));
             }
             else {
                 this.logError('failed-rename', `'${this.oldName}' cannot be renamed`);
@@ -57,7 +71,7 @@ class RenameField extends malloy_element_1.MalloyElement {
     }
 }
 exports.RenameField = RenameField;
-class Renames extends malloy_element_1.ListOf {
+class Renames extends definition_list_1.DefinitionList {
     constructor(fields, accessModifier) {
         super(fields);
         this.accessModifier = accessModifier;

package/dist/lang/composite-source-utils.js

@@ -39,7 +39,7 @@ sources) {
     let anyComposites = false;
     let joinsProcessed = false;
     const nonCompositeFields = getNonCompositeFields(source);
-    const expandedForError = onlyCompositeUsage(_expandFieldUsage(fieldUsage, rootFields).result, source.fields);
+    const expandedForError = onlyCompositeUsage(expandFieldUsage(fieldUsage, rootFields).result, source.fields);
     if (source.type === 'composite') {
         let found = false;
         anyComposites = true;
@@ -66,7 +66,7 @@ sources) {
             }
             const fieldUsageWithWheres = (_b = mergeFieldUsage(getFieldUsageFromFilterList(inputSource), fieldUsage)) !== null && _b !== void 0 ? _b : [];
             const fieldsForLookup = [...nonCompositeFields, ...inputSource.fields];
-            const expanded = _expandFieldUsage(fieldUsageWithWheres, fieldsForLookup);
+            const expanded = expandFieldUsage(fieldUsageWithWheres, fieldsForLookup);
             if (expanded.missingFields.length > 0) {
                 // A lookup failed while expanding, which means this source certainly won't work
                 for (const missingField of expanded.missingFields) {
@@ -177,7 +177,7 @@ sources) {
     }
     else if (source.partitionComposite !== undefined) {
         anyComposites = true;
-        const expanded = _expandFieldUsage(fieldUsage, rootFields).result;
+        const expanded = expandFieldUsage(fieldUsage, rootFields).result;
         // TODO possibly abort if expanded has missing fields...
         const expandedCategorized = categorizeFieldUsage(expanded);
         const { partitionFilter, issues } = getPartitionCompositeFilter(source.partitionComposite, expandedCategorized.sourceUsage);
@@ -199,7 +199,7 @@ sources) {
         };
     }
     if (!joinsProcessed) {
-        const expanded = _expandFieldUsage(fieldUsage, getJoinFields(rootFields, path));
+        const expanded = expandFieldUsage(fieldUsage, getJoinFields(rootFields, path));
         if (expanded.missingFields.length > 0) {
             return {
                 error: {
@@ -278,7 +278,7 @@ function getExpandedSegment(segment, inputSource) {
         updatedSegment = { ...segment, queryFields: updatedQueryFields };
     }
     const allFieldUsage = mergeFieldUsage(getFieldUsageFromFilterList(inputSource), segment.fieldUsage);
-    const expanded = _expandFieldUsage(allFieldUsage || [], fields);
+    const expanded = expandFieldUsage(allFieldUsage || [], fields);
     // Merge ungroupings from direct collection and field expansion
     const allUngroupings = [...collectedUngroupings, ...expanded.ungroupings];
     return {
@@ -334,7 +334,7 @@ function findActiveJoins(dependencies) {
  * - `missingFields`: References to fields which could not be resolved
  * - `activeJoins`: Topologically sorted list of joins needed to resolve these uses
  */
-function _expandFieldUsage(fieldUsage, fields) {
+function expandFieldUsage(fieldUsage, fields) {
     var _a, _b, _c;
     const seen = {};
     const missingFields = [];

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

@@ -222,7 +222,7 @@ export declare class MalloyParser extends Parser {
     static readonly RULE_defMeasures = 38;
     static readonly RULE_defDimensions = 39;
     static readonly RULE_renameList = 40;
-    static readonly RULE_exploreRenameDef = 41;
+    static readonly RULE_renameEntry = 41;
     static readonly RULE_defList = 42;
     static readonly RULE_fieldDef = 43;
     static readonly RULE_fieldNameDef = 44;
@@ -391,7 +391,7 @@ export declare class MalloyParser extends Parser {
     defMeasures(): DefMeasuresContext;
     defDimensions(): DefDimensionsContext;
     renameList(): RenameListContext;
-    exploreRenameDef(): ExploreRenameDefContext;
+    renameEntry(): RenameEntryContext;
     defList(): DefListContext;
     fieldDef(): FieldDefContext;
     fieldNameDef(): FieldNameDefContext;
@@ -936,6 +936,7 @@ export declare class DefExplorePrimaryKeyContext extends ExploreStatementContext
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefExploreRenameContext extends ExploreStatementContext {
+    tags(): TagsContext;
     RENAME(): TerminalNode;
     renameList(): RenameListContext;
     accessLabel(): AccessLabelContext | undefined;
@@ -1028,8 +1029,8 @@ export declare class DefDimensionsContext extends ParserRuleContext {
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class RenameListContext extends ParserRuleContext {
-    exploreRenameDef(): ExploreRenameDefContext[];
-    exploreRenameDef(i: number): ExploreRenameDefContext;
+    renameEntry(): RenameEntryContext[];
+    renameEntry(i: number): RenameEntryContext;
     COMMA(): TerminalNode[];
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1038,7 +1039,8 @@ export declare class RenameListContext extends ParserRuleContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
-export declare class ExploreRenameDefContext extends ParserRuleContext {
+export declare class RenameEntryContext extends ParserRuleContext {
+    tags(): TagsContext;
     fieldName(): FieldNameContext[];
     fieldName(i: number): FieldNameContext;
     isDefine(): IsDefineContext;