Merge branch 'main' into feat/pinned-headers

Author: skokenes

lerna.json

@@ -1,7 +1,7 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": false,
-  "version": "0.0.104",
+  "version": "0.0.105",
   "command": {
     "version": {
       "allowBranch": "main"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-bigquery",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@google-cloud/bigquery": "^7.3.0",
     "@google-cloud/common": "^5.0.1",
     "@google-cloud/paginator": "^5.0.0",
-    "@malloydata/malloy": "^0.0.104",
-    "@malloydata/malloy-interfaces": "^0.0.104",
+    "@malloydata/malloy": "^0.0.105",
+    "@malloydata/malloy-interfaces": "^0.0.105",
     "gaxios": "^4.2.0"
   }
 }

packages/malloy-db-bigquery/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,8 +41,8 @@
   },
   "dependencies": {
     "@malloydata/duckdb-wasm": "0.0.6",
-    "@malloydata/malloy": "^0.0.104",
-    "@malloydata/malloy-interfaces": "^0.0.104",
+    "@malloydata/malloy": "^0.0.105",
+    "@malloydata/malloy-interfaces": "^0.0.105",
     "apache-arrow": "^13.0.0",
     "duckdb": "0.9.2",
     "web-worker": "^1.2.0"

packages/malloy-db-duckdb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-postgres",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.104",
-    "@malloydata/malloy-interfaces": "^0.0.104",
+    "@malloydata/malloy": "^0.0.105",
+    "@malloydata/malloy-interfaces": "^0.0.105",
     "@types/pg": "^8.6.1",
     "pg": "^8.7.1",
     "pg-query-stream": "4.2.3"

packages/malloy-db-postgres/package.json

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

packages/malloy-interfaces/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/eslint-plugin-lint",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/malloy-lint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-sql",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.104"
+    "@malloydata/malloy": "^0.0.105"
   },
   "devDependencies": {
     "peggy": "^3.0.2"

packages/malloy-malloy-sql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@lit/context": "^1.1.0",
-    "@malloydata/malloy": "^0.0.104",
+    "@malloydata/malloy": "^0.0.105",
     "@types/luxon": "^2.4.0",
     "lit": "^3.0.2",
     "lodash": "^4.17.20",

packages/malloy-render/package.json

@@ -34,7 +34,7 @@ import {timeToString} from './html/utils';
 type FilterItem = {key: string; value: string | undefined};
 
 function filterQuote(s: string): string {
-  return `'${s.replace("'", "\\'")}'`;
+  return `'${s.replace(/(['\\])/g, '\\$1')}'`;
 }
 
 function timestampToDateFilter(
@@ -69,8 +69,12 @@ function getRowFilters(row: DataRecord): FilterItem[] {
   for (const dim of dimensions) {
     const cell = row.cell(dim);
     // if we have an expression, use it instead of the name of the field.
-    const key =
+    let key =
       dim.isAtomicField() || dim.isQueryField() ? dim.expression : undefined;
+    // Multi word column names.
+    if (key !== undefined && key.includes(' ') && key === dim.name) {
+      key = '`' + key + '`';
+    }
     if (key && !cell.isArray()) {
       if (cell.isNull()) {
         filters.push({key, value: 'null'});
@@ -79,9 +83,12 @@ function getRowFilters(row: DataRecord): FilterItem[] {
       } else if (cell.isNumber() || cell.isBoolean()) {
         filters.push({key, value: cell.value.toString()});
       } else if (cell.isTimestamp() || cell.isDate()) {
-        filters.push(
-          timestampToDateFilter(key, cell.value, cell.field.timeframe)
-        );
+        let timeframe = cell.field.timeframe;
+        // Dont let the timeframe for Date go down to seconds.
+        if (cell.isDate() && timeframe === undefined) {
+          timeframe = DateTimeframe.Day;
+        }
+        filters.push(timestampToDateFilter(key, cell.value, timeframe));
       }
     }
   }
@@ -113,7 +120,7 @@ export function getDrillFilters(data: DataArrayOrRecord): {
   const formattedFilters: string[] = [];
   for (const {key, value} of filters) {
     if (value !== undefined) {
-      formattedFilters.push(`${key}: ${value}`);
+      formattedFilters.push(`${key} = ${value}`);
     } else {
       formattedFilters.push(key);
     }
@@ -137,10 +144,11 @@ export function getDrillQuery(data: DataArrayOrRecord): {
   drillFilters: string[];
 } {
   const {formattedFilters, source} = getDrillFilters(data);
-  let ret = `run: ${source?.name || '"unable to compute source"'} `;
+  let ret = `run: ${source?.name || '"unable to compute source"'} -> `;
   if (formattedFilters.length) {
-    ret += `{ \n  where: \n    ${formattedFilters.join(',\n    ')}\n  \n}\n`;
+    ret += `{ \n  select: *\n  where: \n    ${formattedFilters.join(
+      ',\n    '
+    )}\n  \n}\n`;
   }
-  const drillQuery = ret + '-> ';
-  return {drillQuery, drillFilters: formattedFilters};
+  return {drillQuery: ret, drillFilters: formattedFilters};
 }

packages/malloy-render/src/drill.ts

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/syntax-highlight",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "description": "A package to simplify the process of developing, testing, and syncnig Malloy syntax highlighting grammars",
   "files": [
     "grammars/**/*.tmGrammar.json",

packages/malloy-syntax-highlight/package.json

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

packages/malloy/package.json

@@ -34,7 +34,7 @@ import {
 import {FieldName, FieldSpace} from '../types/field-space';
 import {MalloyElement} from '../types/malloy-element';
 import {QOPDesc} from '../query-properties/qop-desc';
-import {QueryInputSpace} from '../field-space/query-input-space';
+import {QuerySpace} from '../field-space/query-spaces';
 import {ViewFieldReference} from '../query-items/field-references';
 import {Refinement} from '../query-properties/refinements';
 import {StaticSpace} from '../field-space/static-space';
@@ -53,7 +53,21 @@ interface AppendResult {
 export abstract class PipelineDesc extends MalloyElement {
   protected refinements?: Refinement[];
   protected qops: QOPDesc[] = [];
-  nestedInQuerySpace?: QueryInputSpace;
+  private isNestIn?: QuerySpace;
+
+  /**
+   * This pipeline is actually a nest statement, and the passed query space
+   * is the space for the query which contains the nest statement. This is
+   * used so that nest queries can walk up a nest chain to check
+   * "ungrouping" expressions.
+   *
+   * This is only here so that it can be used when a Builder is created
+   * so the query space created by the builder can also know that it is
+   * nested.
+   */
+  declareAsNestInside(qs: QuerySpace) {
+    this.isNestIn = qs;
+  }
 
   alreadyRefined(): boolean {
     return this.refinements !== undefined;
@@ -75,8 +89,7 @@ export abstract class PipelineDesc extends MalloyElement {
     modelPipe: PipeSegment[]
   ): AppendResult {
     const returnPipe: PipeSegment[] = [...modelPipe];
-    const nestedIn =
-      modelPipe.length === 0 ? this.nestedInQuerySpace : undefined;
+    const nestedIn = modelPipe.length === 0 ? this.isNestIn : undefined;
     let nextFS = () => pipelineOutput;
     for (const qop of this.qops) {
       const next = qop.getOp(nextFS(), nestedIn);
@@ -104,7 +117,7 @@ export abstract class PipelineDesc extends MalloyElement {
     }
     pipeline.push(...modelPipe.pipeline);
     for (const refinement of this.refinements) {
-      pipeline = refinement.refine(fs, pipeline);
+      pipeline = refinement.refine(fs, pipeline, this.isNestIn);
     }
     return {pipeline};
   }

packages/malloy/src/lang/ast/elements/pipeline-desc.ts

@@ -60,9 +60,6 @@ class ConstantFieldSpace implements FieldSpace {
   dialectObj(): undefined {
     return undefined;
   }
-  whenComplete(step: () => void): void {
-    step();
-  }
   isQueryFieldSpace(): this is QueryFieldSpace {
     return false;
   }