@malloydata/malloy 0.0.310 → 0.0.311

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/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/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;