@malloydata/render 0.0.286 → 0.0.287

package/dist/register/register.mjs

@@ -27467,7 +27467,7 @@ ${spaces}}`;
     return new Tag(structuredClone(this));
   }
   static escapeString(str) {
-    return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+    return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
   }
   static escapeProp(str) {
     return str.replace(/\\/g, "\\\\").replace(/`/g, "\\`");
@@ -53597,7 +53597,8 @@ class FilterElement extends malloy_element_1$C.MalloyElement {
         code: this.exprSrc,
         e: { node: "false" },
         expressionType: "scalar",
-        fieldUsage: exprVal.fieldUsage
+        fieldUsage: exprVal.fieldUsage,
+        isSourceFilter: false
       };
     }
     const stableFilter = this.getStableFilter();
@@ -53607,7 +53608,8 @@ class FilterElement extends malloy_element_1$C.MalloyElement {
       e: exprVal.value,
       expressionType: exprVal.expressionType,
       fieldUsage: exprVal.fieldUsage,
-      stableFilter
+      stableFilter,
+      isSourceFilter: false
     };
     return exprCond;
   }
@@ -53930,6 +53932,7 @@ class Drill extends filters_1$4.Filter {
     const exprCond = {
       node: "filterCondition",
       code: filter2.exprSrc,
+      isSourceFilter: false,
       e: collectedWheres === void 0 ? fExpr.value : {
         node: "and",
         kids: { left: collectedWheres, right: fExpr.value }
@@ -56441,7 +56444,10 @@ class RefinedSource extends source_1$7.Source {
         if ((0, malloy_types_1$u.expressionIsCalculation)(fc.expressionType)) {
           el.logError("aggregate-in-source-filter", "Can't use aggregate computations in top level filters");
         } else {
-          filterList.push(fc);
+          filterList.push({
+            ...fc,
+            isSourceFilter: true
+          });
           moreFilters = true;
         }
       }
@@ -85618,7 +85624,6 @@ function convertFieldInfos(source2, fields) {
   return result;
 }
 function getResultMetadataAnnotation(field2, resultMetadata) {
-  var _a;
   const tag = malloy_tag_1$1.Tag.withPrefix("#(malloy) ");
   let hasAny = false;
   if (resultMetadata.referenceId !== void 0) {
@@ -85639,9 +85644,8 @@ function getResultMetadataAnnotation(field2, resultMetadata) {
       hasAny = true;
     }
   }
-  const drillFilters = (_a = resultMetadata.filterList) === null || _a === void 0 ? void 0 : _a.filter((f2) => f2.expressionType === "scalar");
-  if (drillFilters) {
-    addDrillFiltersTag(tag, drillFilters);
+  if (resultMetadata.filterList) {
+    addDrillFiltersTag(tag, resultMetadata.filterList);
     hasAny = true;
   }
   if (resultMetadata.fieldKind === "dimension") {
@@ -85658,6 +85662,8 @@ function addDrillFiltersTag(tag, drillFilters) {
   var _a;
   for (let i = 0; i < drillFilters.length; i++) {
     const filter2 = drillFilters[i];
+    if (filter2.expressionType !== "scalar" || filter2.isSourceFilter)
+      continue;
     tag.set(["drill_filters", i, "code"], filter2.code);
     if (filter2.drillView) {
       tag.set(["drill_filters", i, "drill_view"], filter2.drillView);
@@ -85713,16 +85719,15 @@ function identifierCode(name) {
   return `\`${escapeIdentifier(name)}\``;
 }
 function getResultStructMetadataAnnotation(field2, resultMetadata) {
-  var _a, _b, _c;
+  var _a, _b;
   const tag = malloy_tag_1$1.Tag.withPrefix("#(malloy) ");
   let hasAny = false;
   if (resultMetadata.limit !== void 0) {
     tag.set(["limit"], resultMetadata.limit);
     hasAny = true;
   }
-  const drillFilters = (_a = resultMetadata.filterList) === null || _a === void 0 ? void 0 : _a.filter((f2) => f2.expressionType === "scalar");
-  if (drillFilters) {
-    addDrillFiltersTag(tag, drillFilters);
+  if (resultMetadata.filterList) {
+    addDrillFiltersTag(tag, resultMetadata.filterList);
     hasAny = true;
   }
   if (resultMetadata.drillable) {
@@ -85732,8 +85737,8 @@ function getResultStructMetadataAnnotation(field2, resultMetadata) {
   if (resultMetadata.orderBy) {
     for (let i = 0; i < resultMetadata.orderBy.length; i++) {
       const orderBy = resultMetadata.orderBy[i];
-      const orderByField = typeof orderBy.field === "number" ? (_b = field2.fields[orderBy.field - 1].as) !== null && _b !== void 0 ? _b : field2.fields[orderBy.field - 1].name : orderBy.field;
-      const direction = (_c = orderBy.dir) !== null && _c !== void 0 ? _c : null;
+      const orderByField = typeof orderBy.field === "number" ? (_a = field2.fields[orderBy.field - 1].as) !== null && _a !== void 0 ? _a : field2.fields[orderBy.field - 1].name : orderBy.field;
+      const direction = (_b = orderBy.dir) !== null && _b !== void 0 ? _b : null;
       tag.set(["ordered_by", i, orderByField], direction);
     }
     hasAny = true;
@@ -87000,7 +87005,7 @@ var malloy = {};
 var version = {};
 Object.defineProperty(version, "__esModule", { value: true });
 version.MALLOY_VERSION = void 0;
-version.MALLOY_VERSION = "0.0.286";
+version.MALLOY_VERSION = "0.0.287";
 Object.defineProperty(malloy, "__esModule", { value: true });
 malloy.InMemoryModelCache = malloy.CacheManager = malloy.CSVWriter = malloy.JSONWriter = malloy.DataWriter = malloy.DataRecord = malloy.DataArray = malloy.Result = malloy.ExploreMaterializer = malloy.PreparedResultMaterializer = malloy.QueryMaterializer = malloy.ModelMaterializer = malloy.SingleConnectionRuntime = malloy.ConnectionRuntime = malloy.Runtime = malloy.ExploreField = malloy.JoinRelationship = malloy.QueryField = malloy.Query = malloy.StringField = malloy.UnsupportedField = malloy.JSONField = malloy.BooleanField = malloy.NumberField = malloy.TimestampField = malloy.DateField = malloy.TimestampTimeframe = malloy.DateTimeframe = malloy.AtomicField = malloy.AtomicFieldType = malloy.Explore = malloy.SourceRelationship = malloy.FixedConnectionMap = malloy.InMemoryURLReader = malloy.EmptyURLReader = malloy.PreparedResult = malloy.DocumentCompletion = malloy.DocumentSymbol = malloy.DocumentPosition = malloy.DocumentRange = malloy.DocumentTablePath = malloy.Parse = malloy.PreparedQuery = malloy.Model = malloy.MalloyError = malloy.Malloy = void 0;
 const lang_1$1 = lang;
@@ -91230,6 +91235,44 @@ Object.defineProperty(connection, "__esModule", { value: true });
     return annotation_12.annotationToTaglines;
   } });
 })(dist$2);
+const LEGACY_CHART_TAGS = ["bar_chart", "line_chart"];
+const VIZ_CHART_TYPES = ["bar", "line"];
+function legacyTagToVizType(legacyTag) {
+  const legacyMap = {
+    "bar_chart": "bar",
+    "line_chart": "line",
+    "table": "table",
+    "dashboard": "dashboard"
+  };
+  return legacyMap[legacyTag] ?? legacyTag;
+}
+function convertLegacyToVizTag(tag) {
+  var _a;
+  if (tag.has("viz")) {
+    return tag;
+  }
+  const properties = tag.properties ?? {};
+  const tagNamesInOrder = Object.keys(properties).reverse();
+  const legacyChartTag = tagNamesInOrder.find(
+    (name) => LEGACY_CHART_TAGS.includes(name) && !properties[name].deleted
+  );
+  if (legacyChartTag) {
+    const legacyTagObject = tag.tag(legacyChartTag);
+    tag.set(["viz"], legacyTagToVizType(legacyChartTag));
+    if ((_a = tag.properties) == null ? void 0 : _a["viz"]) {
+      tag.properties["viz"].properties = legacyTagObject == null ? void 0 : legacyTagObject.properties;
+    }
+    return tag;
+  }
+  return tag;
+}
+function getChartTypeFromNormalizedTag(normalizedTag) {
+  const vizType = normalizedTag.text("viz");
+  if (vizType && VIZ_CHART_TYPES.includes(vizType)) {
+    return vizType;
+  }
+  return void 0;
+}
 function getDataTree(result, plugins = []) {
   const fields = [];
   for (const field2 of result.schema.fields) {
@@ -91371,7 +91414,15 @@ const RENDER_TAG_LIST = [
   "segment_map"
 ];
 function shouldRenderAs(field2, parent, tagOverride) {
-  const tag = tagFor(field2);
+  const tag = convertLegacyToVizTag(
+    renderTagFromAnnotations(field2.annotations)
+  );
+  const vizType = tag.text("viz");
+  if (vizType) {
+    if (vizType === "table") return "table";
+    if (vizType === "dashboard") return "dashboard";
+    if (VIZ_CHART_TYPES.includes(vizType)) return "chart";
+  }
   const properties = tag.properties ?? {};
   const tagNamesInOrder = Object.keys(properties).reverse();
   for (const tagName of tagNamesInOrder) {
@@ -91394,7 +91445,7 @@ class FieldBase {
     this.parent = parent;
     this.valueSet = /* @__PURE__ */ new Set();
     this._pluginData = /* @__PURE__ */ new Map();
-    this.tag = tagFor(this.field);
+    this.tag = renderTagFromAnnotations(this.field.annotations);
     this.metadataTag = tagFor(this.field, "#(malloy) ");
     this.path = parent ? parent.isArray() ? [...parent.path] : [...parent.path, field2.name] : [];
     this.renderAs = shouldRenderAs(field2, parent);
@@ -92687,6 +92738,13 @@ function tagFromAnnotations(annotations, prefix = "# ") {
   const tagLines = ((_a = annotations == null ? void 0 : annotations.map((a2) => a2.value)) == null ? void 0 : _a.filter((l2) => l2.startsWith(prefix))) ?? [];
   return dist$4.Tag.fromTagLines(tagLines).tag ?? new dist$4.Tag();
 }
+function renderTagFromAnnotations(annotations) {
+  var _a, _b;
+  const defaultTagLines = ((_a = annotations == null ? void 0 : annotations.map((a2) => a2.value)) == null ? void 0 : _a.filter((l2) => l2.startsWith("# "))) ?? [];
+  const renderTagLines = ((_b = annotations == null ? void 0 : annotations.map((a2) => a2.value)) == null ? void 0 : _b.filter((l2) => l2.startsWith("#r "))) ?? [];
+  const allLines = [...defaultTagLines, ...renderTagLines];
+  return dist$4.Tag.fromTagLines(allLines).tag ?? new dist$4.Tag();
+}
 function formatTimeUnit(value2, unit2, options = {}) {
   let unitString = unit2.toString();
   if (options.terse) {
@@ -92818,15 +92876,15 @@ function notUndefined$1(x2) {
   return x2 !== void 0;
 }
 function getBarChartSettings(explore, tagOverride) {
-  const tag = explore.tag;
-  const chart = tag.tag("bar_chart") ?? tag.tag("bar");
-  const interactive2 = !tag.has("tooltip");
-  const isSpark = (chart == null ? void 0 : chart.text("size")) === "spark" || tag.text("size") === "spark";
-  if (!chart) {
+  const normalizedTag = convertLegacyToVizTag(explore.tag);
+  if (normalizedTag.text("viz") !== "bar") {
     throw new Error(
-      "Tried to render a bar_chart, but no bar_chart tag was found"
+      "Tried to render a bar chart, but no viz=bar tag was found"
     );
   }
+  const vizTag = normalizedTag.tag("viz");
+  const interactive2 = !normalizedTag.has("tooltip");
+  const isSpark = vizTag.text("size") === "spark" || normalizedTag.text("size") === "spark";
   const xChannel = {
     fields: [],
     type: null
@@ -92842,43 +92900,45 @@ function getBarChartSettings(explore, tagOverride) {
   function getField2(ref2) {
     return explore.pathTo(explore.fieldAt([ref2]));
   }
-  const isStack2 = chart.has("stack");
-  if (chart.text("x")) {
-    xChannel.fields.push(getField2(chart.text("x")));
+  const isStack2 = vizTag.has("stack");
+  if (vizTag.text("x")) {
+    xChannel.fields.push(getField2(vizTag.text("x")));
   }
-  if (chart.text("y")) {
-    yChannel.fields.push(getField2(chart.text("y")));
-  } else if (chart.textArray("y")) {
-    yChannel.fields.push(...chart.textArray("y").map(getField2));
+  if (vizTag.text("y")) {
+    yChannel.fields.push(getField2(vizTag.text("y")));
+  } else if (vizTag.textArray("y")) {
+    yChannel.fields.push(...vizTag.textArray("y").map(getField2));
   }
-  if (chart.text("series")) {
-    seriesChannel.fields.push(getField2(chart.text("series")));
+  if (vizTag.text("series")) {
+    seriesChannel.fields.push(getField2(vizTag.text("series")));
   }
   const embeddedX = [];
   const embeddedY = [];
   const embeddedSeries = [];
-  walkFields(explore, (field2) => {
-    const tag2 = field2.tag;
-    const pathTo = explore.pathTo(field2);
-    if (tag2.has("x")) {
-      embeddedX.push(pathTo);
-    }
-    if (tag2.has("y")) {
-      embeddedY.push(pathTo);
-    }
-    if (tag2.has("series")) {
-      embeddedSeries.push(pathTo);
-    }
-  });
-  embeddedX.forEach((path2) => {
-    xChannel.fields.push(path2);
-  });
-  embeddedY.forEach((path2) => {
-    yChannel.fields.push(path2);
-  });
-  embeddedSeries.forEach((path2) => {
-    seriesChannel.fields.push(path2);
-  });
+  if (!vizTag.has("disableEmbedded")) {
+    walkFields(explore, (field2) => {
+      const tag = field2.tag;
+      const pathTo = explore.pathTo(field2);
+      if (tag.has("x")) {
+        embeddedX.push(pathTo);
+      }
+      if (tag.has("y")) {
+        embeddedY.push(pathTo);
+      }
+      if (tag.has("series")) {
+        embeddedSeries.push(pathTo);
+      }
+    });
+    embeddedX.forEach((path2) => {
+      xChannel.fields.push(path2);
+    });
+    embeddedY.forEach((path2) => {
+      yChannel.fields.push(path2);
+    });
+    embeddedSeries.forEach((path2) => {
+      seriesChannel.fields.push(path2);
+    });
+  }
   const dimensions2 = explore.fields.filter(
     (f2) => f2.isBasic() && f2.wasDimension()
   );
@@ -199932,11 +199992,11 @@ function getLimitedData({
 }
 function generateBarChartVegaSpec(explore, metadata2) {
   var _a;
-  const tag = explore.tag;
-  const chartTag = tag.tag("bar_chart") ?? tag.tag("bar");
+  const tag = convertLegacyToVizTag(explore.tag);
+  const chartTag = tag.tag("viz");
   if (!chartTag)
     throw new Error(
-      "Bar chart should only be rendered for bar_chart or bar tag"
+      "Bar chart should only be rendered for bar_chart or viz=bar tag"
     );
   const settings = getBarChartSettings(explore);
   const xFieldPath = settings.xChannel.fields.at(0);
@@ -199983,7 +200043,7 @@ function generateBarChartVegaSpec(explore, metadata2) {
     metadata: metadata2,
     xField,
     yField,
-    chartType: "bar_chart",
+    chartType: "bar",
     getYMinMax: () => [yDomainMin, yDomainMax],
     independentY: chartTag.has("y", "independent")
     // TODO implement this so can calculate data limits here
@@ -200585,7 +200645,7 @@ function generateBarChartVegaSpec(explore, metadata2) {
     plotHeight: chartSettings.plotHeight,
     totalWidth: chartSettings.totalWidth,
     totalHeight: chartSettings.totalHeight,
-    chartType: "bar_chart",
+    chartType: "bar",
     chartTag,
     mapMalloyDataToChartData,
     getTooltipData: (item, view2) => {
@@ -200663,16 +200723,30 @@ function generateBarChartVegaSpec(explore, metadata2) {
     }
   };
 }
+const defaultSettings = {
+  size: "fill",
+  line_chart: {
+    zero_baseline: false
+  }
+};
 function getLineChartSettings(explore, tagOverride) {
-  const tag = tagOverride ?? explore.tag;
-  const chart = tag.tag("line_chart");
-  if (!chart) {
+  const normalizedTag = convertLegacyToVizTag(tagOverride ?? explore.tag);
+  if (normalizedTag.text("viz") !== "line") {
     throw new Error(
-      "Malloy Line Chart: Tried to render a line chart, but no line_chart tag was found"
+      "Malloy Line Chart: Tried to render a line chart, but no viz=line tag was found"
     );
   }
-  const zeroBaseline = chart.has("zero_baseline") ? chart.text("zero_baseline") !== "false" : true;
-  const interactive2 = !tag.has("tooltip");
+  const vizTag = normalizedTag.tag("viz");
+  let zeroBaseline = defaultSettings.line_chart.zero_baseline;
+  if (vizTag.has("zero_baseline")) {
+    const value2 = vizTag.text("zero_baseline");
+    if (value2 === "false") {
+      zeroBaseline = false;
+    } else if (value2 === "true" || value2 === null || value2 === void 0 || value2 === "") {
+      zeroBaseline = true;
+    }
+  }
+  const interactive2 = !normalizedTag.has("tooltip");
   const xChannel = {
     fields: [],
     type: null
@@ -200688,42 +200762,44 @@ function getLineChartSettings(explore, tagOverride) {
   function getField2(ref2) {
     return explore.pathTo(explore.fieldAt([ref2]));
   }
-  if (chart.text("x")) {
-    xChannel.fields.push(getField2(chart.text("x")));
+  if (vizTag.text("x")) {
+    xChannel.fields.push(getField2(vizTag.text("x")));
   }
-  if (chart.text("y")) {
-    yChannel.fields.push(getField2(chart.text("y")));
-  } else if (chart.textArray("y")) {
-    yChannel.fields.push(...chart.textArray("y").map(getField2));
+  if (vizTag.text("y")) {
+    yChannel.fields.push(getField2(vizTag.text("y")));
+  } else if (vizTag.textArray("y")) {
+    yChannel.fields.push(...vizTag.textArray("y").map(getField2));
   }
-  if (chart.text("series")) {
-    seriesChannel.fields.push(getField2(chart.text("series")));
+  if (vizTag.text("series")) {
+    seriesChannel.fields.push(getField2(vizTag.text("series")));
   }
   const embeddedX = [];
   const embeddedY = [];
   const embeddedSeries = [];
-  walkFields(explore, (field2) => {
-    const tag2 = field2.tag;
-    const pathTo = explore.pathTo(field2);
-    if (tag2.has("x")) {
-      embeddedX.push(pathTo);
-    }
-    if (tag2.has("y")) {
-      embeddedY.push(pathTo);
-    }
-    if (tag2.has("series")) {
-      embeddedSeries.push(pathTo);
-    }
-  });
-  embeddedX.forEach((path2) => {
-    xChannel.fields.push(path2);
-  });
-  embeddedY.forEach((path2) => {
-    yChannel.fields.push(path2);
-  });
-  embeddedSeries.forEach((path2) => {
-    seriesChannel.fields.push(path2);
-  });
+  if (!vizTag.has("disableEmbedded")) {
+    walkFields(explore, (field2) => {
+      const tag = field2.tag;
+      const pathTo = explore.pathTo(field2);
+      if (tag.has("x")) {
+        embeddedX.push(pathTo);
+      }
+      if (tag.has("y")) {
+        embeddedY.push(pathTo);
+      }
+      if (tag.has("series")) {
+        embeddedSeries.push(pathTo);
+      }
+    });
+    embeddedX.forEach((path2) => {
+      xChannel.fields.push(path2);
+    });
+    embeddedY.forEach((path2) => {
+      yChannel.fields.push(path2);
+    });
+    embeddedSeries.forEach((path2) => {
+      seriesChannel.fields.push(path2);
+    });
+  }
   const dimensions2 = explore.fields.filter(
     (f2) => f2.isBasic() && f2.wasDimension()
   );
@@ -200798,11 +200874,11 @@ function generateLineChartVegaSpec(explore, metadata2) {
       "Malloy Line Chart: Trying to render a line chart when Line chart series plugin not found"
     );
   }
-  const tag = explore.tag;
-  const chartTag = tag.tag("line_chart");
+  const tag = convertLegacyToVizTag(explore.tag);
+  const chartTag = tag.tag("viz");
   if (!chartTag)
     throw new Error(
-      "Malloy Line Chart: Line chart should only be rendered for line_chart tag"
+      "Malloy Line Chart: Tried to render a line chart, but no viz=line tag was found"
     );
   const settings = getLineChartSettings(explore, tag);
   const xFieldPath = settings.xChannel.fields.at(0);
@@ -200857,7 +200933,7 @@ function generateLineChartVegaSpec(explore, metadata2) {
     metadata: metadata2,
     xField,
     yField,
-    chartType: "line_chart",
+    chartType: "line",
     getYMinMax: () => [yDomainMin, yDomainMax],
     independentY: chartTag.has("y", "independent") || isLimitingSeries
   });
@@ -201516,7 +201592,7 @@ function generateLineChartVegaSpec(explore, metadata2) {
     plotHeight: chartSettings.plotHeight,
     totalWidth: chartSettings.totalWidth,
     totalHeight: chartSettings.totalHeight,
-    chartType: "line_chart",
+    chartType: "line",
     chartTag,
     mapMalloyDataToChartData,
     getTooltipData(item, view2) {
@@ -201616,9 +201692,6 @@ function generateLineChartVegaSpec(explore, metadata2) {
     }
   };
 }
-const defaultSettings = {
-  size: "fill"
-};
 function getResultMetadata(root2, options = { parentSize: { width: 0, height: 0 } }) {
   const rootTag = root2.field.tag;
   const rootSizingStrategy = rootTag.has("size") && rootTag.text("size") !== "fill" ? "fixed" : defaultSettings.size;
@@ -201645,13 +201718,9 @@ function populateAllVegaSpecs(root2, metadata2, options) {
     }
   });
 }
-const CHART_TAG_LIST = ["bar_chart", "line_chart"];
 function shouldRenderChartAs(tag) {
-  const properties = tag.properties ?? {};
-  const tagNamesInOrder = Object.keys(properties).reverse();
-  return tagNamesInOrder.find(
-    (name) => CHART_TAG_LIST.includes(name) && !properties[name].deleted
-  );
+  const normalizedTag = convertLegacyToVizTag(tag);
+  return getChartTypeFromNormalizedTag(normalizedTag);
 }
 function populateVegaSpec(field2, metadata2, options) {
   var _a, _b, _c, _d, _e;
@@ -201663,9 +201732,9 @@ function populateVegaSpec(field2, metadata2, options) {
     runtime: null
   };
   try {
-    if (chartType === "bar_chart") {
+    if (chartType === "bar") {
       vegaChartProps = generateBarChartVegaSpec(field2, metadata2);
-    } else if (chartType === "line_chart") {
+    } else if (chartType === "line") {
       vegaChartProps = generateLineChartVegaSpec(field2, metadata2);
     }
   } catch (error2) {