@gmickel/gno 1.32.0 → 1.33.0

package/src/publish/obsidian-sanitize.ts

@@ -2,12 +2,23 @@
  * Obsidian-aware markdown pre-processor for publish export.
  *
  * Strips wikilinks, drops navigation sidebar idioms, removes references to
- * private (`_internal/`) paths, and warns on unresolvable image embeds before
- * the markdown enters the publish artifact.
+ * private (`_internal/`) paths, and resolves/bundles local raster embeds when
+ * an attachment context is provided (otherwise drops image embeds with a
+ * warning for backward compatibility).
  *
  * @module src/publish/obsidian-sanitize
  */
 
+import { discoverImageOccurrences } from "./attachment-discover";
+import { safePercentDecode } from "./attachment-path";
+import {
+  rewriteAttachmentsInMarkdown,
+  type AttachmentDiagnostic,
+  type AttachmentResolveContext,
+  type AttachmentRewriteResult,
+  type PendingAssetPayload,
+} from "./attachment-resolver";
+
 const WIKILINK_INTERNAL_PREFIX = /_internal\//i;
 const NAV_SIDEBAR_LINE = /^(!?\[\[[^\]]+\]\]\s*\|?\s*)+$/;
 const IMAGE_EMBED = /!\[\[([^\]]+)\]\]/g;
@@ -16,6 +27,7 @@ const ALIASED_WIKILINK = /\[\[([^\]|]+)\|([^\]]+)\]\]/g;
 const BARE_WIKILINK = /\[\[([^\]]+)\]\]/g;
 const TAIL_SEGMENT = /[^/]+$/;
 const BLOCK_ID_SUFFIX = /#\^?[\w-]+$/;
+const EXTERNAL_DESTINATION = /^(?:\/\/|[a-z][a-z0-9+.-]*:)/iu;
 
 export interface SanitizeWarning {
   kind:
@@ -31,6 +43,13 @@ export interface SanitizeResult {
   warnings: SanitizeWarning[];
 }
 
+export interface PublishSanitizeResult extends SanitizeResult {
+  diagnostics: AttachmentDiagnostic[];
+  externalCount: number;
+  payloads: Map<string, PendingAssetPayload>;
+  preDedupRawBytes: number;
+}
+
 const splitFrontmatter = (
   source: string
 ): { body: string; frontmatter: string } => {
@@ -61,8 +80,57 @@ const deriveLinkDisplay = (target: string): string => {
   return tail.trim() || raw;
 };
 
-export function sanitizeObsidianMarkdown(source: string): SanitizeResult {
-  const { body, frontmatter } = splitFrontmatter(source);
+const isPrivateImageReference = (sourceRef: string): boolean => {
+  const trimmed = sourceRef.trim();
+  if (EXTERNAL_DESTINATION.test(trimmed)) {
+    return false;
+  }
+  const decoded = safePercentDecode(trimmed);
+  if (decoded === null) {
+    return false;
+  }
+  return (
+    decoded
+      .split(/[?#]/u, 1)[0]
+      ?.split("/")
+      .some((segment) => segment.toLowerCase() === "_internal") ?? false
+  );
+};
+
+/**
+ * Remove private image references before attachment resolution can read bytes
+ * or replace the authored path with an opaque gno-asset sentinel.
+ */
+const stripPrivateImageReferences = (
+  body: string
+): { markdown: string; warnings: SanitizeWarning[] } => {
+  const replacements = discoverImageOccurrences(body)
+    .filter((occurrence) => isPrivateImageReference(occurrence.sourceRef))
+    .map((occurrence) => ({
+      detail: occurrence.sourceRef.trim(),
+      end: occurrence.end,
+      start: occurrence.start,
+    }));
+  let markdown = body;
+  for (const replacement of [...replacements].sort(
+    (left, right) => right.start - left.start
+  )) {
+    markdown =
+      markdown.slice(0, replacement.start) + markdown.slice(replacement.end);
+  }
+  return {
+    markdown,
+    warnings: replacements.map((replacement) => ({
+      detail: replacement.detail,
+      kind: "internal-reference-stripped" as const,
+    })),
+  };
+};
+
+const applyWikilinkSanitize = (
+  body: string,
+  options: { dropImageEmbeds: boolean }
+): { markdown: string; warnings: SanitizeWarning[] } => {
   const warnings: SanitizeWarning[] = [];
   const lines = body.split("\n");
   const output: string[] = [];
@@ -81,13 +149,15 @@ export function sanitizeObsidianMarkdown(source: string): SanitizeResult {
 
     let line = rawLine;
 
-    line = line.replace(IMAGE_EMBED, (_match, target: string) => {
-      warnings.push({
-        kind: "image-embed-dropped",
-        detail: target.trim(),
+    if (options.dropImageEmbeds) {
+      line = line.replace(IMAGE_EMBED, (_match, target: string) => {
+        warnings.push({
+          kind: "image-embed-dropped",
+          detail: target.trim(),
+        });
+        return "";
       });
-      return "";
-    });
+    }
 
     line = line.replace(INTERNAL_WIKILINK, (match) => {
       warnings.push({
@@ -134,9 +204,46 @@ export function sanitizeObsidianMarkdown(source: string): SanitizeResult {
     output.push(line);
   }
 
+  return { markdown: output.join("\n"), warnings };
+};
+
+/**
+ * Legacy sync sanitizer: drops Obsidian image embeds and converts wikilinks.
+ * Prefer `sanitizePublishMarkdown` when attachment bundling is enabled.
+ */
+export function sanitizeObsidianMarkdown(source: string): SanitizeResult {
+  const { body, frontmatter } = splitFrontmatter(source);
+  const sanitized = applyWikilinkSanitize(body, { dropImageEmbeds: true });
+  return {
+    markdown: `${frontmatter}${sanitized.markdown}`,
+    warnings: sanitized.warnings,
+  };
+}
+
+/**
+ * Parser-aware publish sanitize: resolve/rewrite local rasters in the same
+ * pass as Obsidian cleanup (image discovery is not a second independent scan).
+ */
+export async function sanitizePublishMarkdown(
+  source: string,
+  attachmentCtx: AttachmentResolveContext
+): Promise<PublishSanitizeResult> {
+  const { body, frontmatter } = splitFrontmatter(source);
+  const privateImages = stripPrivateImageReferences(body);
+  const rewritten: AttachmentRewriteResult = await rewriteAttachmentsInMarkdown(
+    privateImages.markdown,
+    attachmentCtx
+  );
+  const sanitized = applyWikilinkSanitize(rewritten.markdown, {
+    dropImageEmbeds: false,
+  });
   return {
-    markdown: `${frontmatter}${output.join("\n")}`,
-    warnings,
+    diagnostics: rewritten.diagnostics,
+    externalCount: rewritten.externalCount,
+    markdown: `${frontmatter}${sanitized.markdown}`,
+    payloads: rewritten.payloads,
+    preDedupRawBytes: rewritten.preDedupRawBytes,
+    warnings: [...privateImages.warnings, ...sanitized.warnings],
   };
 }
 
@@ -159,7 +266,8 @@ export function formatSanitizeWarnings(warnings: SanitizeWarning[]): string[] {
   }
 
   const labels: Record<SanitizeWarning["kind"], string> = {
-    "image-embed-dropped": "Image embeds dropped (attachments not bundled yet)",
+    "image-embed-dropped":
+      "Image embeds dropped (unsupported, missing, or unresolved)",
     "internal-reference-stripped": "Private `_internal/` references stripped",
     "nav-sidebar-dropped": "Navigation sidebar lines dropped",
     "wikilink-unresolved":

package/src/serve/routes/api.ts

@@ -1280,7 +1280,7 @@ export async function handlePublishExport(
   }
 
   try {
-    const { artifact, warnings } = await exportPublishArtifact({
+    const { artifact, assetSummary, warnings } = await exportPublishArtifact({
       collections: config.collections,
       options: {
         encryptionPassphrase: body.encryptionPassphrase,
@@ -1295,6 +1295,7 @@ export async function handlePublishExport(
 
     return jsonResponse({
       artifact,
+      assetSummary,
       fileName: derivePublishArtifactFilename(artifact),
       uploadUrl: "https://gno.sh/studio",
       warnings,

package/browser-extension/artifacts/gno-browser-clipper-v1.32.0.zip.sha256

@@ -1 +0,0 @@
-cb5c4bba8cf1252da4e4fc89f1dc01a8df306851cccb50f636d89a6ef3133cff  gno-browser-clipper-v1.32.0.zip