@bendyline/squisq 2.3.3 → 2.4.1

package/dist/{chunk-G3JOS25T.js → chunk-7TJJA2RI.js}

@@ -1,18 +1,19 @@
 import {
   coerceAnnotationValues,
+  isReservedAnnotationToken,
   matchTrailingPandocAttr,
   matchTrailingTemplateAnnotation,
   quoteAttrValue,
   splitKeyValueToken,
   tokenizeAttrTokens
-} from "./chunk-2VCNTDNZ.js";
+} from "./chunk-D6YTLQCL.js";
 import {
   resolveIcon
 } from "./chunk-7N4G32LG.js";
 import {
   parseFrontmatter,
   parseHtmlToNodes
-} from "./chunk-BCCXTMN5.js";
+} from "./chunk-O7JILDEF.js";
 
 // src/markdown/convert.ts
 function convertPosition(pos) {
@@ -58,25 +59,54 @@ function extractText(node) {
   return "";
 }
 function extractTemplateAnnotation(children) {
+  const trail = [];
   for (let i = children.length - 1; i >= 0; i--) {
     const child = children[i];
     if (child.type === "text") {
-      const match = matchTrailingTemplateAnnotation(child.value);
-      if (match) {
-        const inner = match.inner.trim();
-        const annotation = parseAnnotationTokens(inner);
-        const stripped = child.value.slice(0, match.index).replace(/\s+$/, "");
-        if (stripped) {
-          child.value = stripped;
-        } else {
-          children.splice(i, 1);
-        }
-        return annotation;
-      }
-      break;
+      trail.unshift({ value: child.value, index: i });
+      continue;
+    }
+    const autolink = literalAutolinkText(child);
+    if (autolink != null) {
+      trail.unshift({ value: autolink, index: i });
+      continue;
     }
     break;
   }
+  if (trail.length === 0) return null;
+  const joined = trail.map((part) => part.value).join("");
+  const match = matchTrailingTemplateAnnotation(joined);
+  if (!match) return null;
+  const annotation = parseAnnotationTokens(match.inner.trim());
+  let scannedLength = 0;
+  for (const part of trail) {
+    if (scannedLength + part.value.length <= match.index) {
+      scannedLength += part.value.length;
+      continue;
+    }
+    const boundaryNode = children[part.index];
+    const keepLength = match.index - scannedLength;
+    if (boundaryNode.type === "text" && keepLength > 0) {
+      const stripped = boundaryNode.value.slice(0, keepLength).replace(/\s+$/, "");
+      if (stripped) {
+        boundaryNode.value = stripped;
+        children.splice(part.index + 1);
+      } else {
+        children.splice(part.index);
+      }
+    } else {
+      children.splice(part.index);
+    }
+    return annotation;
+  }
+  children.splice(trail[0].index);
+  return annotation;
+}
+function literalAutolinkText(node) {
+  if (node.type !== "link" || node.title != null) return null;
+  const label = extractInlineText(node.children);
+  if (label === node.url) return label;
+  if (/^www\./i.test(label) && node.url === `http://${label}`) return label;
   return null;
 }
 function parseAnnotationTokens(inner) {
@@ -274,6 +304,7 @@ function splitTextOnIcons(value, position) {
   const out = [];
   while ((match = ICON_TOKEN_RE.exec(value)) !== null) {
     const token = match[1];
+    if (isReservedAnnotationToken(token)) continue;
     const icon = resolveIcon(token);
     if (!icon) continue;
     if (match.index > lastIndex) {

package/dist/{chunk-RS5AP3J4.js → chunk-AE3IUKMM.js}

@@ -10,7 +10,7 @@ import {
 import {
   extractPlainText,
   getChildren
-} from "./chunk-BCCXTMN5.js";
+} from "./chunk-O7JILDEF.js";
 import {
   estimateTimeFromText
 } from "./chunk-67L6WRJN.js";

package/dist/{chunk-IZLKI3IL.js → chunk-AQF5ZYDI.js}

@@ -1,6 +1,6 @@
 import {
   SHAPE_NAMES,
-  TEMPLATE_ALIASES,
+  buildChartData,
   buildNarrationScript,
   coerceTemplateParams,
   deriveTemplateInputs,
@@ -10,7 +10,6 @@ import {
   flattenRenderableBlocks,
   getBlockBodyText,
   getPinnedBlockMeta,
-  isContainerTemplate,
   isDataFence,
   isShapeName,
   lintTemplateParams,
@@ -21,11 +20,10 @@ import {
   parseNarrationTimingJson,
   parseStandaloneAnnotation,
   readCustomThemesFromFrontmatter,
-  resolveTemplateName,
   templateRegistry,
   writeCustomTemplatesToFrontmatter,
   writeCustomThemesToFrontmatter
-} from "./chunk-GQNH7PLN.js";
+} from "./chunk-2HY2ZA7U.js";
 import {
   ASCII_TREE_VOCAB,
   ASCII_VOCAB,
@@ -41,11 +39,11 @@ import {
   toCells,
   toGrid,
   traceBoxes
-} from "./chunk-QWCFK5FN.js";
+} from "./chunk-CUYHFOFL.js";
 import {
   defaultPageStyle,
   resolveMediaSchedule
-} from "./chunk-2ZWIXGAC.js";
+} from "./chunk-GAZKTT4R.js";
 import {
   DEFAULT_THEME,
   FRONTMATTER_CUSTOM_TEMPLATES_KEY,
@@ -53,24 +51,28 @@ import {
   hexHueDegrees,
   resolveFontFamily,
   resolveTheme
-} from "./chunk-C33GTPUZ.js";
+} from "./chunk-SBAX4ZPO.js";
 import {
   VIEWPORT_PRESETS,
   isTemplateBlock
 } from "./chunk-BAOV476U.js";
 import {
   parseMarkdown
-} from "./chunk-G3JOS25T.js";
+} from "./chunk-7TJJA2RI.js";
 import {
   KNOWN_BLOCK_META_KEYS,
+  TEMPLATE_ALIASES,
   coerceAnnotationValues,
+  isContainerTemplate,
+  resolveTemplateName,
   serializeAnnotation
-} from "./chunk-2VCNTDNZ.js";
+} from "./chunk-D6YTLQCL.js";
 import {
   extractPlainText,
   getChildren,
+  parseHtmlToNodes,
   readFrontmatterThemeId
-} from "./chunk-BCCXTMN5.js";
+} from "./chunk-O7JILDEF.js";
 import {
   estimateTimeFromText
 } from "./chunk-67L6WRJN.js";
@@ -354,15 +356,21 @@ function docToMarkdown(doc, options = {}) {
     children.push(synthesizeMediaParagraph(clip));
   }
   function emitBlock(block) {
+    const promoted = block.promotedBodyAnnotation;
+    const promotedUnedited = promoted !== void 0 && !isPromotedBodyEdited(block, promoted);
     if (block.sourceHeading) {
-      const heading = ensureAnnotation(block, block.sourceHeading, defaultTemplate);
-      children.push(heading);
+      if (promotedUnedited) {
+        children.push(block.sourceHeading);
+      } else {
+        const heading = ensureAnnotation(block, block.sourceHeading, defaultTemplate);
+        children.push(heading);
+      }
     } else if (block.standaloneAnnotation) {
       children.push(synthesizeAnnotationParagraph(block));
     }
     const clips = [...block.media ?? [], ...docMediaByBlock.get(block.id) ?? []];
+    const contents = [...block.contents ?? []];
     if (clips.length > 0) {
-      const contents = [...block.contents ?? []];
       const anchored = clips.filter((clip) => clip.origin).sort((a, b) => a.origin.index - b.origin.index);
       for (const clip of anchored) {
         contents.splice(
@@ -374,10 +382,11 @@ function docToMarkdown(doc, options = {}) {
       for (const clip of clips.filter((c) => !c.origin).reverse()) {
         contents.unshift(synthesizeMediaParagraph(clip));
       }
-      children.push(...contents);
-    } else if (block.contents) {
-      children.push(...block.contents);
     }
+    if (promotedUnedited) {
+      reinsertPromotedBodyAnnotation(contents, promoted);
+    }
+    children.push(...contents);
     if (block.children) {
       for (const child of block.children) {
         emitBlock(child);
@@ -414,11 +423,49 @@ function synthesizeAnnotationParagraph(block) {
   const text = serializeAnnotation(block.sourceAnnotation?.template, block.templateOverrides);
   return { type: "paragraph", children: [{ type: "text", value: text }] };
 }
+function isPromotedBodyEdited(block, p) {
+  const templateSame = resolveTemplateName(block.template ?? "") === resolveTemplateName(p.template);
+  const paramsSame = paramsEqual(block.templateOverrides ?? {}, p.params ?? {});
+  return !(templateSame && paramsSame);
+}
+function reinsertPromotedBodyAnnotation(contents, p) {
+  if (p.origin.kind === "paragraph") {
+    contents.push({ type: "paragraph", children: [{ type: "text", value: p.origin.raw }] });
+    return;
+  }
+  const last = contents[contents.length - 1];
+  if (last && last.type === "paragraph") {
+    const children = last.children ?? [];
+    const lastChild = children[children.length - 1];
+    if (lastChild && lastChild.type === "text") {
+      const cloned = [...children];
+      cloned[cloned.length - 1] = { ...lastChild, value: lastChild.value + p.origin.suffix };
+      contents[contents.length - 1] = { ...last, children: cloned };
+      return;
+    }
+  }
+  contents.push({
+    type: "paragraph",
+    children: [{ type: "text", value: p.origin.suffix.replace(/^\s+/, "") }]
+  });
+}
 function synthesizeMediaParagraph(clip) {
+  if (clip.origin?.format === "html" && clip.origin.raw) {
+    return {
+      type: "htmlBlock",
+      rawHtml: clip.origin.raw,
+      htmlChildren: parseHtmlToNodes(clip.origin.raw)
+    };
+  }
   if (clip.origin?.raw) {
     return { type: "paragraph", children: [{ type: "text", value: clip.origin.raw }] };
   }
   const params = { src: clip.src };
+  if (clip.placement) params.placement = clip.placement;
+  if (clip.pipSize) params.pipSize = clip.pipSize;
+  if (clip.pipShape) params.pipShape = clip.pipShape;
+  if (clip.pipPosition) params.pipPosition = clip.pipPosition;
+  if (clip.lockToBlock != null) params.lockToBlock = String(clip.lockToBlock);
   if (clip.anchor === "document") params.anchor = "document";
   if (clip.startAt) params.startAt = String(clip.startAt);
   if (clip.clipStart != null) params.clipStart = String(clip.clipStart);
@@ -903,6 +950,12 @@ var dataTable = (input) => {
     colorScheme: d.colorScheme
   };
 };
+var chartExtractor = (input, ctx) => {
+  const chart = input;
+  const chartable = Array.isArray(chart.headers) && Array.isArray(chart.rows) && buildChartData({ headers: chart.headers, rows: chart.rows }, chart) !== null;
+  if (chartable) return canvasDraft("chart", ctx, input);
+  return content(input, ctx);
+};
 var diagram = (input, ctx) => canvasDraft("diagram", ctx, input);
 var tree = (input, ctx) => canvasDraft("tree", ctx, input);
 var timeline = (input, ctx) => canvasDraft("timeline", ctx, input);
@@ -931,6 +984,13 @@ var sectionExtractors = {
   videoWithCaption,
   videoPullQuote,
   dataTable,
+  barChart: chartExtractor,
+  columnChart: chartExtractor,
+  pieChart: chartExtractor,
+  donutChart: chartExtractor,
+  lineChart: chartExtractor,
+  areaChart: chartExtractor,
+  scatterChart: chartExtractor,
   diagram,
   tree,
   timeline,

package/dist/{chunk-QWCFK5FN.js → chunk-CUYHFOFL.js}

@@ -2,7 +2,7 @@ import {
   extractPlainText,
   findNodesByType,
   walkMarkdownTree
-} from "./chunk-BCCXTMN5.js";
+} from "./chunk-O7JILDEF.js";
 
 // src/doc/asciiDiagram/chars.ts
 function toCells(s) {
@@ -2435,6 +2435,10 @@ function recommendedNamesForProfile(profile) {
     anyContentSignal = true;
     names.add("dataTable");
     names.add("comparisonBar");
+    names.add("columnChart");
+    names.add("barChart");
+    names.add("lineChart");
+    names.add("pieChart");
   }
   if (profile.hasDate) {
     anyContentSignal = true;

package/dist/{chunk-2VCNTDNZ.js → chunk-D6YTLQCL.js}

@@ -5,6 +5,71 @@ import {
   normalizeTransitionType
 } from "./chunk-4VOD55SX.js";
 
+// src/doc/templates/templateNames.ts
+var TEMPLATE_ALIASES = Object.freeze({
+  titleBlock: "title",
+  quoteBlock: "quote",
+  mapBlock: "map",
+  listBlock: "list",
+  diagramBlock: "diagram",
+  diagramNode: "diagram"
+});
+function resolveTemplateName(name) {
+  return TEMPLATE_ALIASES[name] ?? name;
+}
+var TABLE_FED_TEMPLATES = /* @__PURE__ */ new Set([
+  "dataTable",
+  "barChart",
+  "columnChart",
+  "pieChart",
+  "donutChart",
+  "lineChart",
+  "areaChart",
+  "scatterChart"
+]);
+var CONTAINER_TEMPLATES = /* @__PURE__ */ new Set(["diagram", "drawing", "layout"]);
+function isContainerTemplate(name) {
+  return !!name && CONTAINER_TEMPLATES.has(resolveTemplateName(name));
+}
+var TEMPLATE_TOKEN_NAMES = /* @__PURE__ */ new Set([
+  "title",
+  "sectionHeader",
+  "content",
+  "statHighlight",
+  "quote",
+  "factCard",
+  "twoColumn",
+  "dateEvent",
+  "imageWithCaption",
+  "leftFeature",
+  "rightFeature",
+  "map",
+  "fullBleedQuote",
+  "list",
+  "photoGrid",
+  "definitionCard",
+  "comparisonBar",
+  "pullQuote",
+  "videoWithCaption",
+  "videoPullQuote",
+  "dataTable",
+  "barChart",
+  "columnChart",
+  "pieChart",
+  "donutChart",
+  "lineChart",
+  "areaChart",
+  "scatterChart",
+  "diagram",
+  "tree",
+  "timeline",
+  "layout",
+  "drawing"
+]);
+function isReservedAnnotationToken(token) {
+  return TEMPLATE_TOKEN_NAMES.has(resolveTemplateName(token));
+}
+
 // src/markdown/sanitize.ts
 var SAFE_LINK_SCHEMES = /* @__PURE__ */ new Set(["http", "https", "mailto", "tel"]);
 var SAFE_MEDIA_SCHEMES = /* @__PURE__ */ new Set(["http", "https", "blob"]);
@@ -518,6 +583,12 @@ function serializeAnnotation(template, params) {
 }
 
 export {
+  TEMPLATE_ALIASES,
+  resolveTemplateName,
+  TABLE_FED_TEMPLATES,
+  CONTAINER_TEMPLATES,
+  isContainerTemplate,
+  isReservedAnnotationToken,
   sanitizeUrl,
   sanitizeHtmlNodes,
   KNOWN_BLOCK_META_KEYS,

package/dist/{chunk-32R2RZAO.js → chunk-DAMIRKTO.js}

@@ -2,7 +2,7 @@ import {
   DEFAULT_THEME,
   applySurface,
   resolveFontFamily
-} from "./chunk-C33GTPUZ.js";
+} from "./chunk-SBAX4ZPO.js";
 
 // src/jsonForm/chooseControl.ts
 var ENUM_SEGMENTED_LIMIT = 4;

package/dist/{chunk-ABP4LAJS.js → chunk-EMXYZLRH.js}

@@ -1,7 +1,7 @@
 import {
   expectedSyllablesAt,
   wordPosAtExpectedSyllables
-} from "./chunk-GQNH7PLN.js";
+} from "./chunk-2HY2ZA7U.js";
 
 // src/narration/types.ts
 var DEFAULT_FEATURE_CONFIG = Object.freeze({

package/dist/{chunk-2ZWIXGAC.js → chunk-GAZKTT4R.js}

@@ -10,6 +10,13 @@ function clipLength(clip) {
   if (clip.clipEnd == null) return null;
   return Math.max(0, clip.clipEnd - (clip.clipStart ?? 0));
 }
+function intrinsicPlayedLength(clip, opts) {
+  if (clip.clipEnd != null || clip.lockToBlock === true) return null;
+  const intrinsic = opts?.intrinsicDuration?.(clip);
+  if (intrinsic == null || !Number.isFinite(intrinsic) || intrinsic <= 0) return null;
+  const played = intrinsic - (clip.clipStart ?? 0);
+  return played > 0 ? played : null;
+}
 function baseTimelineEnd(doc) {
   const blockEnd = flatten(doc.blocks).reduce(
     (max, b) => Math.max(max, b.startTime + b.duration),
@@ -17,7 +24,7 @@ function baseTimelineEnd(doc) {
   );
   return Math.max(doc.duration ?? 0, blockEnd);
 }
-function resolveMediaSchedule(doc) {
+function resolveMediaSchedule(doc, opts) {
   const out = [];
   const docEnd = baseTimelineEnd(doc);
   for (const block of flatten(doc.blocks)) {
@@ -31,10 +38,17 @@ function resolveMediaSchedule(doc) {
       } else {
         end = len != null ? Math.min(start + len, blockEnd) : blockEnd;
       }
+      const natLen = intrinsicPlayedLength(clip, opts);
+      if (natLen != null) end = Math.min(end, start + natLen);
       out.push({
         id: clip.id,
         src: clip.src,
         kind: clip.kind,
+        ...clip.placement ? { placement: clip.placement } : {},
+        ...clip.pipSize ? { pipSize: clip.pipSize } : {},
+        ...clip.pipShape ? { pipShape: clip.pipShape } : {},
+        ...clip.pipPosition ? { pipPosition: clip.pipPosition } : {},
+        ...clip.lockToBlock != null ? { lockToBlock: clip.lockToBlock } : {},
         absoluteStart: start,
         absoluteEnd: Math.max(start, end),
         sourceIn: clip.clipStart ?? 0,
@@ -47,11 +61,18 @@ function resolveMediaSchedule(doc) {
   for (const clip of doc.documentMedia ?? []) {
     const start = clip.startAt;
     const len = clipLength(clip);
-    const end = len != null ? start + len : docEnd;
+    let end = len != null ? start + len : docEnd;
+    const natLen = intrinsicPlayedLength(clip, opts);
+    if (natLen != null) end = Math.min(end, start + natLen);
     out.push({
       id: clip.id,
       src: clip.src,
       kind: clip.kind,
+      ...clip.placement ? { placement: clip.placement } : {},
+      ...clip.pipSize ? { pipSize: clip.pipSize } : {},
+      ...clip.pipShape ? { pipShape: clip.pipShape } : {},
+      ...clip.pipPosition ? { pipPosition: clip.pipPosition } : {},
+      ...clip.lockToBlock != null ? { lockToBlock: clip.lockToBlock } : {},
       absoluteStart: start,
       absoluteEnd: Math.max(start, end),
       sourceIn: clip.clipStart ?? 0,
@@ -61,9 +82,12 @@ function resolveMediaSchedule(doc) {
   }
   return out;
 }
-function getDocPlaybackDuration(doc) {
+function getDocPlaybackDuration(doc, opts) {
   const base = baseTimelineEnd(doc);
-  const mediaEnd = resolveMediaSchedule(doc).reduce((max, c) => Math.max(max, c.absoluteEnd), 0);
+  const mediaEnd = resolveMediaSchedule(doc, opts).reduce(
+    (max, c) => Math.max(max, c.absoluteEnd),
+    0
+  );
   return Math.max(base, mediaEnd);
 }
 

package/dist/{chunk-SPTY4C6F.js → chunk-GODLNXO4.js}

@@ -1,6 +1,6 @@
 import {
   defaultPageStyle
-} from "./chunk-2ZWIXGAC.js";
+} from "./chunk-GAZKTT4R.js";
 import {
   FONT_FALLBACKS,
   THEME_SCHEMA_VERSION,
@@ -13,8 +13,9 @@ import {
   oklchSetChroma,
   pickContrastingText,
   relativeLuminance,
-  resolveFontFamily
-} from "./chunk-C33GTPUZ.js";
+  resolveFontFamily,
+  withAlpha
+} from "./chunk-SBAX4ZPO.js";
 
 // src/schemas/Doc.ts
 function calculateDuration(audio) {
@@ -47,6 +48,46 @@ function getCaptionAtTime(captions, time) {
   return null;
 }
 
+// src/schemas/pipStyle.ts
+var DEFAULT_SHADOW = "0 0.75em 2em rgba(0, 0, 0, 0.34)";
+var DERIVED_BORDER_WIDTH = "max(1px, 0.12vw)";
+function cssLength(value) {
+  return typeof value === "number" ? `${value}px` : value;
+}
+function resolveRadius(theme) {
+  const explicit = theme.style.pip?.cornerRadius;
+  if (explicit != null) {
+    if (typeof explicit === "number") return explicit <= 0 ? "0" : `${explicit}px`;
+    return explicit;
+  }
+  const br = theme.style.borderRadius ?? 0;
+  if (br <= 0) return "0";
+  return `${Math.min(28, Math.max(6, Math.round(br)))}%`;
+}
+function resolveBorder(theme) {
+  const border = theme.style.pip?.border;
+  if (border === "none") return "none";
+  if (border && typeof border === "object") {
+    const width = border.width == null ? DERIVED_BORDER_WIDTH : cssLength(border.width);
+    const color = border.color ?? withAlpha(theme.colors.text, 0.35);
+    return `${width} solid ${color}`;
+  }
+  return `${DERIVED_BORDER_WIDTH} solid ${withAlpha(theme.colors.text, 0.35)}`;
+}
+function resolveShadow(theme) {
+  const shadow = theme.style.pip?.shadow;
+  if (shadow === false || shadow === "none") return "none";
+  if (typeof shadow === "string") return shadow;
+  return DEFAULT_SHADOW;
+}
+function pipStyleVars(theme) {
+  return {
+    "--squisq-pip-radius": resolveRadius(theme),
+    "--squisq-pip-border": resolveBorder(theme),
+    "--squisq-pip-shadow": resolveShadow(theme)
+  };
+}
+
 // src/schemas/themeCompile.ts
 var STARTER_BODY_FONT = { stackId: "system-sans" };
 var STARTER_TITLE_FONT = { stackId: "system-serif" };
@@ -308,6 +349,7 @@ export {
   getSegmentAtTime,
   getBlockAtTime,
   getCaptionAtTime,
+  pipStyleVars,
   STARTER_THEME,
   deriveColorPalette,
   accentToColorScheme,