@malloydata/render 0.0.104-dev231117214047 → 0.0.104

package/dist/drill.js

@@ -26,7 +26,7 @@ exports.getDrillQuery = exports.getDrillFilters = void 0;
 const malloy_1 = require("@malloydata/malloy");
 const utils_1 = require("./html/utils");
 function filterQuote(s) {
-    return `'${s.replace("'", "\\'")}'`;
+    return `'${s.replace(/(['\\])/g, '\\$1')}'`;
 }
 function timestampToDateFilter(key, value, timeframe) {
     const adjustedTimeframe = timeframe === malloy_1.TimestampTimeframe.Minute
@@ -50,7 +50,11 @@ function getRowFilters(row) {
     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 = dim.isAtomicField() || dim.isQueryField() ? dim.expression : undefined;
+        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' });
@@ -62,7 +66,12 @@ function getRowFilters(row) {
                 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 = malloy_1.DateTimeframe.Day;
+                }
+                filters.push(timestampToDateFilter(key, cell.value, timeframe));
             }
         }
     }
@@ -88,7 +97,7 @@ function getDrillFilters(data) {
     const formattedFilters = [];
     for (const { key, value } of filters) {
         if (value !== undefined) {
-            formattedFilters.push(`${key}: ${value}`);
+            formattedFilters.push(`${key} = ${value}`);
         }
         else {
             formattedFilters.push(key);
@@ -102,12 +111,11 @@ function getDrillFilters(data) {
 exports.getDrillFilters = getDrillFilters;
 function getDrillQuery(data) {
     const { formattedFilters, source } = getDrillFilters(data);
-    let ret = `run: ${(source === null || source === void 0 ? void 0 : source.name) || '"unable to compute source"'} `;
+    let ret = `run: ${(source === null || source === void 0 ? void 0 : 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 };
 }
 exports.getDrillQuery = getDrillQuery;
 //# sourceMappingURL=drill.js.map

package/package.json

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