@malloydata/malloy 0.0.314 → 0.0.316

package/dist/dialect/mysql/mysql.js

@@ -291,25 +291,33 @@ class MySQLDialect extends dialect_1.Dialect {
     sqlNowExpr() {
         return 'LOCALTIMESTAMP';
     }
-    // truncToUnit(sql, unit: string): string {
-    //   return `EXTRACT(${unit} FROM ${sql})`;
-    // }
     sqlTruncExpr(qi, trunc) {
-        // LTNOTE: how come this can be undefined?
-        let truncThis = trunc.e.sql || 'why could this be undefined';
-        if (trunc.units === 'week') {
-            truncThis = `DATE_SUB(${truncThis}, INTERVAL DAYOFWEEK(${truncThis}) - 1 DAY)`;
-        }
+        const truncThis = trunc.e.sql || 'internal-error-in-sql-generation';
+        const week = trunc.units === 'week';
+        // Only do timezone conversion for timestamps, not dates
         if (malloy_types_1.TD.isTimestamp(trunc.e.typeDef)) {
             const tz = (0, dialect_1.qtz)(qi);
             if (tz) {
+                // Convert timestamp to the query timezone (civil time)
                 const civilSource = `(CONVERT_TZ(${truncThis}, 'UTC','${tz}'))`;
-                const civilTrunc = `${this.truncToUnit(civilSource, trunc.units)}`;
+                // For week truncation, we need to adjust to Sunday in the civil timezone
+                // DAYOFWEEK returns 1=Sunday, 2=Monday, etc., so subtract (DAYOFWEEK-1) days
+                const adjustedSource = week
+                    ? `DATE_SUB(${civilSource}, INTERVAL DAYOFWEEK(${civilSource}) - 1 DAY)`
+                    : civilSource;
+                // Truncate to the appropriate unit in civil time
+                const civilTrunc = `${this.truncToUnit(adjustedSource, trunc.units)}`;
+                // Convert the truncated civil time back to UTC
                 const truncTsTz = `CONVERT_TZ(${civilTrunc}, '${tz}', 'UTC')`;
                 return `(${truncTsTz})`; // TODO: should it cast?
             }
         }
-        const result = `${this.truncToUnit(truncThis, trunc.units)}`;
+        // For dates (civil time) or timestamps without query timezone
+        // do the week adjustment before truncating
+        const adjustedThis = week
+            ? `DATE_SUB(${truncThis}, INTERVAL DAYOFWEEK(${truncThis}) - 1 DAY)`
+            : truncThis;
+        const result = `${this.truncToUnit(adjustedThis, trunc.units)}`;
         return result;
     }
     truncToUnit(expr, units) {

package/dist/dialect/pg_impl.js

@@ -27,7 +27,7 @@ class PostgresBase extends dialect_1.Dialect {
             const tz = (0, dialect_1.qtz)(qi);
             if (tz) {
                 // get a civil version of the time in the query time zone
-                const civilSource = `(${truncThis}::TIMESTAMPTZ AT TIME ZONE '${tz}')`;
+                const civilSource = `((${truncThis})::TIMESTAMPTZ AT TIME ZONE '${tz}')`;
                 // do truncation in that time space
                 let civilTrunc = `DATE_TRUNC('${df.units}', ${civilSource})`;
                 if (week) {

package/dist/lang/ast/field-space/query-spaces.d.ts

@@ -20,7 +20,6 @@ type TranslatedQueryField = {
  * created and paired when a QueryOperationSpace is created.
  */
 export declare abstract class QueryOperationSpace extends RefinedSpace implements QueryFieldSpace {
-    readonly queryInputSpace: SourceFieldSpace;
     readonly nestParent: QueryOperationSpace | undefined;
     readonly astEl: MalloyElement;
     protected exprSpace: QueryInputSpace;

package/dist/lang/ast/field-space/query-spaces.js

@@ -83,7 +83,6 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
     }
     constructor(queryInputSpace, refineThis, nestParent, astEl) {
         super(queryInputSpace.emptyStructDef());
-        this.queryInputSpace = queryInputSpace;
         this.nestParent = nestParent;
         this.astEl = astEl;
         this.expandedWild = {};
@@ -260,7 +259,7 @@ class QuerySpace extends QueryOperationSpace {
         if (typeDesc.type === 'turtle') {
             const pipeline = typeDesc.pipeline;
             const lastSegment = pipeline[pipeline.length - 1];
-            const outputStruct = (_b = lastSegment === null || lastSegment === void 0 ? void 0 : lastSegment.outputStruct) !== null && _b !== void 0 ? _b : error_factory_1.ErrorFactory.structDef;
+            const outputStruct = (_b = lastSegment === null || lastSegment === void 0 ? void 0 : lastSegment.outputStruct) !== null && _b !== void 0 ? _b : this.exprSpace.emptyStructDef();
             const isRepeated = lastSegment
                 ? model.isQuerySegment(lastSegment)
                     ? lastSegment.isRepeated

package/dist/lang/ast/view-elements/refine-utils.js

@@ -71,22 +71,36 @@ function refine(logTo, refineTo, refineFrom) {
                 : undefined;
         if ((0, model_1.isQuerySegment)(from) && (0, model_1.isQuerySegment)(to)) {
             const overlappingFields = [];
-            const nonOverlappingFields = [];
+            const missingOut = [];
             const existingNames = new Map(to.queryFields.map((f) => [
                 (0, field_utils_1.nameFromDef)(f),
                 f,
             ]));
+            const outputFields = [...to.outputStruct.fields];
+            const queryFields = [...to.queryFields];
             for (const field of from.queryFields) {
-                if (existingNames.has((0, field_utils_1.nameFromDef)(field))) {
-                    overlappingFields.push(field);
+                const fieldName = (0, field_utils_1.nameFromDef)(field);
+                if (existingNames.has(fieldName)) {
+                    overlappingFields.push(fieldName);
                 }
                 else {
-                    nonOverlappingFields.push(field);
+                    queryFields.push(field);
+                    const outField = from.outputStruct.fields.find(f => f.name === fieldName);
+                    if (outField) {
+                        outputFields.push(outField);
+                    }
+                    else {
+                        missingOut.push(fieldName);
+                    }
                 }
             }
-            to.queryFields = [...to.queryFields, ...nonOverlappingFields];
+            to.queryFields = queryFields;
+            to.outputStruct.fields = outputFields;
             if (overlappingFields.length > 0) {
-                logTo.logError('name-conflict-in-refinement', `overlapping fields in refinement: ${overlappingFields.map(field_utils_1.nameFromDef)}`);
+                logTo.logError('name-conflict-in-refinement', `overlapping fields in refinement: ${overlappingFields.join(', ')}`);
+            }
+            if (missingOut.length > 0) {
+                logTo.logError('name-conflict-in-refinement', `missing output fields in refinement: ${missingOut.join(', ')}`);
             }
             to.fieldUsage = (0, composite_source_utils_1.mergeFieldUsage)(to.fieldUsage, from.fieldUsage);
         }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.314";
+export declare const MALLOY_VERSION = "0.0.316";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.314';
+exports.MALLOY_VERSION = '0.0.316';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.314",
+  "version": "0.0.316",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.314",
-    "@malloydata/malloy-interfaces": "0.0.314",
-    "@malloydata/malloy-tag": "0.0.314",
+    "@malloydata/malloy-filter": "0.0.316",
+    "@malloydata/malloy-interfaces": "0.0.316",
+    "@malloydata/malloy-tag": "0.0.316",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",