@malloydata/render 0.0.286 → 0.0.287

package/dist/component/default-settings.d.ts

@@ -1,3 +1,6 @@
 export declare const defaultSettings: {
     readonly size: "fill";
+    readonly line_chart: {
+        readonly zero_baseline: boolean;
+    };
 };

package/dist/component/tag-utils.d.ts

@@ -1,2 +1,10 @@
 import type { Tag } from '@malloydata/malloy-tag';
-export declare function hasAny(tag: Tag, ...paths: Array<string | string[]>): boolean;
+export declare const VIZ_CHART_TYPES: string[];
+/**
+ * Convert legacy chart tags to viz format internally.
+ */
+export declare function convertLegacyToVizTag(tag: Tag): Tag;
+/**
+ * Get the effective chart type from a normalized tag
+ */
+export declare function getChartTypeFromNormalizedTag(normalizedTag: Tag): string | undefined;

package/dist/module/index.mjs

@@ -138380,7 +138380,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, "\\`");
@@ -138838,6 +138838,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$3.Tag.fromTagLines(tagLines).tag ?? new dist$3.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$3.Tag.fromTagLines(allLines).tag ?? new dist$3.Tag();
+}
 /* @__PURE__ */ new Map([
   [DurationUnit.Nanoseconds, "ns"],
   [DurationUnit.Microseconds, "µs"],
@@ -157485,7 +157492,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();
@@ -157495,7 +157503,8 @@ class FilterElement extends malloy_element_1$C.MalloyElement {
       e: exprVal.value,
       expressionType: exprVal.expressionType,
       fieldUsage: exprVal.fieldUsage,
-      stableFilter
+      stableFilter,
+      isSourceFilter: false
     };
     return exprCond;
   }
@@ -157818,6 +157827,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 }
@@ -160329,7 +160339,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;
         }
       }
@@ -189506,7 +189519,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) {
@@ -189527,9 +189539,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") {
@@ -189546,6 +189557,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);
@@ -189601,16 +189614,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) {
@@ -189620,8 +189632,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;
@@ -190888,7 +190900,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;
@@ -195118,6 +195130,37 @@ Object.defineProperty(connection, "__esModule", { value: true });
     return annotation_12.annotationToTaglines;
   } });
 })(dist$1);
+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 getDataTree(result, plugins = []) {
   const fields = [];
   for (const field2 of result.schema.fields) {
@@ -195259,7 +195302,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) {
@@ -195282,7 +195333,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);

package/dist/module/index.umd.js

@@ -138384,7 +138384,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, "\\`");
@@ -138842,6 +138842,13 @@ ${spaces}}`;
     const tagLines = ((_a = annotations == null ? void 0 : annotations.map((a2) => a2.value)) == null ? void 0 : _a.filter((l2) => l2.startsWith(prefix))) ?? [];
     return dist$3.Tag.fromTagLines(tagLines).tag ?? new dist$3.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$3.Tag.fromTagLines(allLines).tag ?? new dist$3.Tag();
+  }
   /* @__PURE__ */ new Map([
     [DurationUnit.Nanoseconds, "ns"],
     [DurationUnit.Microseconds, "µs"],
@@ -157489,7 +157496,8 @@ ${left}  `;
           code: this.exprSrc,
           e: { node: "false" },
           expressionType: "scalar",
-          fieldUsage: exprVal.fieldUsage
+          fieldUsage: exprVal.fieldUsage,
+          isSourceFilter: false
         };
       }
       const stableFilter = this.getStableFilter();
@@ -157499,7 +157507,8 @@ ${left}  `;
         e: exprVal.value,
         expressionType: exprVal.expressionType,
         fieldUsage: exprVal.fieldUsage,
-        stableFilter
+        stableFilter,
+        isSourceFilter: false
       };
       return exprCond;
     }
@@ -157822,6 +157831,7 @@ ${left}  `;
       const exprCond = {
         node: "filterCondition",
         code: filter2.exprSrc,
+        isSourceFilter: false,
         e: collectedWheres === void 0 ? fExpr.value : {
           node: "and",
           kids: { left: collectedWheres, right: fExpr.value }
@@ -160333,7 +160343,10 @@ ${left}  `;
           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;
           }
         }
@@ -189510,7 +189523,6 @@ ${cooked}`;
     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) {
@@ -189531,9 +189543,8 @@ ${cooked}`;
         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") {
@@ -189550,6 +189561,8 @@ ${cooked}`;
     var _a;
     for (let i2 = 0; i2 < drillFilters.length; i2++) {
       const filter2 = drillFilters[i2];
+      if (filter2.expressionType !== "scalar" || filter2.isSourceFilter)
+        continue;
       tag.set(["drill_filters", i2, "code"], filter2.code);
       if (filter2.drillView) {
         tag.set(["drill_filters", i2, "drill_view"], filter2.drillView);
@@ -189605,16 +189618,15 @@ ${cooked}`;
     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) {
@@ -189624,8 +189636,8 @@ ${cooked}`;
     if (resultMetadata.orderBy) {
       for (let i2 = 0; i2 < resultMetadata.orderBy.length; i2++) {
         const orderBy = resultMetadata.orderBy[i2];
-        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", i2, orderByField], direction);
       }
       hasAny = true;
@@ -190892,7 +190904,7 @@ ${cooked}`;
   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;
@@ -195122,6 +195134,37 @@ ${errText}`, errors2);
       return annotation_12.annotationToTaglines;
     } });
   })(dist$1);
+  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 getDataTree(result, plugins = []) {
     const fields = [];
     for (const field2 of result.schema.fields) {
@@ -195263,7 +195306,15 @@ ${errText}`, errors2);
     "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) {
@@ -195286,7 +195337,7 @@ ${errText}`, errors2);
       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);