@farm.js/core 0.1.18 → 0.1.20

package/dist/{chunk-TNBAYAWO.mjs → chunk-L4DVIHOC.mjs}

@@ -21,7 +21,7 @@ import {
   readSchemaState,
   readSchemaTables,
   withoutRenameTargets
-} from "./chunk-DHDVMXYK.mjs";
+} from "./chunk-HALDNTIV.mjs";
 import {
   resolveSchemaModels
 } from "./chunk-ZMSZZXOR.mjs";

package/dist/{chunk-XWAYMDLB.mjs → chunk-MVUREHPN.mjs}

@@ -1,6 +1,6 @@
 import {
   createFarmMarkdownRouteModule
-} from "./chunk-6VQIKZZO.mjs";
+} from "./chunk-N255VYFP.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-6VQIKZZO.mjs → chunk-N255VYFP.mjs}

@@ -1,6 +1,6 @@
 import {
   requestAcceptsMarkdown
-} from "./chunk-SXHV42UQ.mjs";
+} from "./chunk-OFEY6KHO.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-GNEO2XOF.cjs → chunk-NBAHDVOJ.cjs}

@@ -11,7 +11,7 @@ var _chunkKGZIORNLcjs = require('./chunk-KGZIORNL.cjs');
 var _chunkHREOKQWTcjs = require('./chunk-HREOKQWT.cjs');
 
 
-var _chunkTWGMSEHXcjs = require('./chunk-TWGMSEHX.cjs');
+var _chunkBBVSJVBZcjs = require('./chunk-BBVSJVBZ.cjs');
 
 
 var _chunkEM6SBQKMcjs = require('./chunk-EM6SBQKM.cjs');
@@ -1194,11 +1194,11 @@ function shouldReturnMarkdown(request) {
   if (url.pathname.endsWith(".md")) return true;
   const accept = request.headers.get("accept");
   const markdown = Math.max(
-    _chunkTWGMSEHXcjs.farmAcceptQuality.call(void 0, accept, "text/markdown"),
-    _chunkTWGMSEHXcjs.farmAcceptQuality.call(void 0, accept, "text/plain")
+    _chunkBBVSJVBZcjs.farmAcceptQuality.call(void 0, accept, "text/markdown"),
+    _chunkBBVSJVBZcjs.farmAcceptQuality.call(void 0, accept, "text/plain")
   );
   if (markdown <= 0) return false;
-  return markdown >= _chunkTWGMSEHXcjs.farmAcceptQuality.call(void 0, accept, "text/html", { wildcards: true });
+  return markdown >= _chunkBBVSJVBZcjs.farmAcceptQuality.call(void 0, accept, "text/html", { wildcards: true });
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, shouldReturnMarkdown, "shouldReturnMarkdown");
 function escapeAttribute(value) {

package/dist/{chunk-EN7WTEAY.mjs → chunk-NRS46D4L.mjs}

@@ -1,6 +1,6 @@
 import {
   readSchemaTables
-} from "./chunk-DHDVMXYK.mjs";
+} from "./chunk-HALDNTIV.mjs";
 import {
   resolveSchemaModels
 } from "./chunk-ZMSZZXOR.mjs";
@@ -26,7 +26,7 @@ import {
 } from "./chunk-OLYK7EAK.mjs";
 import {
   discoverProgrammaticRoutePaths
-} from "./chunk-BNGS6KJ6.mjs";
+} from "./chunk-YOYF2E4U.mjs";
 import {
   readFarmI18nCatalogs
 } from "./chunk-FV45CKBC.mjs";

package/dist/{chunk-A72YEUZ3.mjs → chunk-OCE65DDM.mjs}

@@ -1,6 +1,6 @@
 import {
   MiddlewareManager
-} from "./chunk-57J3Y7Y3.mjs";
+} from "./chunk-TIKNUAU7.mjs";
 import {
   resolveFarmI18nConfig
 } from "./chunk-YMCXWPWK.mjs";

package/dist/{chunk-SXHV42UQ.mjs → chunk-OFEY6KHO.mjs}

@@ -145,9 +145,13 @@ var BLOCK_TAGS = /<\/?(ul|ol|main|section|article|header|footer|nav|aside|div|fo
 var BOX_TAGS = /<\/?(label|button|input|select|textarea|option|output|meter|progress|td|th)\b[^>]*>/gi;
 function htmlToMarkdown(html, options = {}) {
   const title = options.title ?? extractHtmlTitle(html);
+  const streamed = readStreamedBoundaryInstructions(html);
   let source = extractHtmlBody(
     removeHiddenElements(
-      html.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, "").replace(/<style\b[^>]*>[\s\S]*?<\/style>/gi, "").replace(/<noscript\b[^>]*>[\s\S]*?<\/noscript>/gi, "").replace(/<!--[\s\S]*?-->/g, "")
+      resolveStreamedBoundaries(
+        html.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, "").replace(/<style\b[^>]*>[\s\S]*?<\/style>/gi, "").replace(/<noscript\b[^>]*>[\s\S]*?<\/noscript>/gi, ""),
+        streamed
+      ).replace(/<!--[\s\S]*?-->/g, "")
     )
   );
   const codeBlocks = [];
@@ -422,6 +426,7 @@ var VOID_TAGS = /* @__PURE__ */ new Set([
 ]);
 function removeHiddenElements(html) {
   const openingTag = /<([a-zA-Z][\w:-]*)((?:[^>"']|"[^"]*"|'[^']*')*)>/g;
+  let closingTags;
   let result = "";
   let cursor = 0;
   let match;
@@ -431,7 +436,8 @@ function removeHiddenElements(html) {
     const start = match.index;
     let end = start + tag.length;
     if (!VOID_TAGS.has(name.toLowerCase()) && !isSelfClosingTag(tag)) {
-      const close = findClosingTagEnd(html, name, end);
+      closingTags ?? (closingTags = matchClosingTags(html));
+      const close = closingTags.get(start);
       if (close === void 0) continue;
       end = close;
     }
@@ -458,24 +464,93 @@ function isSelfClosingTag(tag) {
   return /(?:^<[a-zA-Z][\w:-]*|[\s"'])\/>$/.test(tag);
 }
 __name(isSelfClosingTag, "isSelfClosingTag");
-function findClosingTagEnd(html, name, from) {
+function matchClosingTags(html) {
   const tags = /<(\/?)([a-zA-Z][\w:-]*)(?:[^>"']|"[^"]*"|'[^']*')*>/g;
-  tags.lastIndex = from;
-  const target = name.toLowerCase();
-  let depth = 1;
+  const open = /* @__PURE__ */ new Map();
+  const closes = /* @__PURE__ */ new Map();
   let match;
   while (match = tags.exec(html)) {
-    if (match[2].toLowerCase() !== target) continue;
+    const name = match[2].toLowerCase();
     if (match[1]) {
-      depth -= 1;
-      if (depth === 0) return match.index + match[0].length;
-    } else if (!isSelfClosingTag(match[0])) {
-      depth += 1;
+      const start = open.get(name)?.pop();
+      if (start !== void 0) closes.set(start, match.index + match[0].length);
+    } else if (!VOID_TAGS.has(name) && !isSelfClosingTag(match[0])) {
+      let starts = open.get(name);
+      if (!starts) open.set(name, starts = []);
+      starts.push(match.index);
     }
   }
-  return void 0;
+  return closes;
+}
+__name(matchClosingTags, "matchClosingTags");
+function readStreamedBoundaryInstructions(html) {
+  const boundaries = /* @__PURE__ */ new Map();
+  const placeholders = /* @__PURE__ */ new Map();
+  for (const [, script] of html.matchAll(/<script\b[^>]*>([\s\S]*?)<\/script>/gi)) {
+    for (const [, kind, first, second] of script.matchAll(
+      /\$R([CRS])\("([^"\\]+)","([^"\\]+)"/g
+    )) {
+      if (kind === "S") placeholders.set(second, first);
+      else boundaries.set(first, second);
+    }
+  }
+  return { boundaries, placeholders };
+}
+__name(readStreamedBoundaryInstructions, "readStreamedBoundaryInstructions");
+function resolveStreamedBoundaries(html, { boundaries, placeholders }) {
+  if (boundaries.size === 0 && placeholders.size === 0) return html;
+  const wanted = /* @__PURE__ */ new Set([...boundaries.values(), ...placeholders.values()]);
+  const segments = /* @__PURE__ */ new Map();
+  const closingTags = matchClosingTags(html);
+  const openingTag = /<([a-zA-Z][\w:-]*)((?:[^>"']|"[^"]*"|'[^']*')*)>/g;
+  let page = "";
+  let cursor = 0;
+  let match;
+  while (match = openingTag.exec(html)) {
+    const id = /\sid="([^"]*)"/.exec(match[2])?.[1];
+    if (!id || !wanted.has(id) || segments.has(id)) continue;
+    const close = closingTags.get(match.index);
+    if (close === void 0) continue;
+    const contentStart = match.index + match[0].length;
+    segments.set(id, html.slice(contentStart, html.lastIndexOf("<", close - 1)));
+    page += html.slice(cursor, match.index);
+    cursor = close;
+    openingTag.lastIndex = close;
+  }
+  page += html.slice(cursor);
+  const used = /* @__PURE__ */ new Set();
+  const expand = /* @__PURE__ */ __name((fragment) => {
+    const template = /<template\b[^>]*\sid="([^"]+)"[^>]*>\s*<\/template>/gi;
+    let output = "";
+    let position = 0;
+    let found;
+    while (found = template.exec(fragment)) {
+      const id = found[1];
+      const segmentId = boundaries.get(id) ?? placeholders.get(id);
+      const segment = segmentId === void 0 ? void 0 : segments.get(segmentId);
+      if (segment === void 0 || used.has(segmentId)) continue;
+      used.add(segmentId);
+      output += fragment.slice(position, found.index) + expand(segment);
+      position = found.index + found[0].length;
+      if (boundaries.has(id)) {
+        const marker = /<!--(\/?)(?:\$[?!~]?|&)-->/g;
+        marker.lastIndex = position;
+        let depth = 0;
+        let end;
+        while (end = marker.exec(fragment)) {
+          if (!end[1]) depth += 1;
+          else if (depth === 0) break;
+          else depth -= 1;
+        }
+        if (end) position = end.index;
+      }
+      template.lastIndex = position;
+    }
+    return output + fragment.slice(position);
+  }, "expand");
+  return expand(page);
 }
-__name(findClosingTagEnd, "findClosingTagEnd");
+__name(resolveStreamedBoundaries, "resolveStreamedBoundaries");
 function stripTags(input) {
   return input.replace(/<[^>]+>/g, "");
 }

package/dist/{chunk-OIEOCXKG.cjs → chunk-OYDRPBBV.cjs}

@@ -3,7 +3,7 @@
 var _chunkOWOUTKIJcjs = require('./chunk-OWOUTKIJ.cjs');
 
 
-var _chunkTYQUSXUGcjs = require('./chunk-TYQUSXUG.cjs');
+var _chunkISTFC3MZcjs = require('./chunk-ISTFC3MZ.cjs');
 
 
 var _chunkOI6CMLWXcjs = require('./chunk-OI6CMLWX.cjs');
@@ -197,7 +197,7 @@ function createFarmMetadataRouteResponse(kind, value, routeModule = {}, options
   if (isResponse(value)) {
     return method === "HEAD" ? _chunkTKJZFIMLcjs.omitFarmResponseBody.call(void 0, value) : value;
   }
-  const body = kind === "sitemap" ? serializeSitemap(value) : kind === "robots" ? serializeRobots(value) : kind === "llms" || kind === "llms-full" ? _chunkTYQUSXUGcjs.serializeFarmLlmsTxt.call(void 0, value) : serializeManifest(value);
+  const body = kind === "sitemap" ? serializeSitemap(value) : kind === "robots" ? serializeRobots(value) : kind === "llms" || kind === "llms-full" ? _chunkISTFC3MZcjs.serializeFarmLlmsTxt.call(void 0, value) : serializeManifest(value);
   const contentType = kind === "sitemap" ? "application/xml; charset=utf-8" : kind === "robots" || kind === "llms" || kind === "llms-full" ? "text/plain; charset=utf-8" : "application/manifest+json; charset=utf-8";
   return new Response(method === "HEAD" ? null : body, {
     headers: {

package/dist/{chunk-76DG3LF3.mjs → chunk-PGQBL5DN.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-XAXTTBUT.mjs";
 import {
   serializeFarmLlmsTxt
-} from "./chunk-ZCNJKLA2.mjs";
+} from "./chunk-7BC6GAL7.mjs";
 import {
   resolveFarmThemeConfig
 } from "./chunk-AELACLOB.mjs";

package/dist/{chunk-UDBJCUPA.mjs → chunk-PUCUVI7K.mjs}

@@ -6,10 +6,10 @@ import {
 } from "./chunk-IOEH4VWN.mjs";
 import {
   APIRouteConflictError
-} from "./chunk-ATERBVHQ.mjs";
+} from "./chunk-CQHFU55R.mjs";
 import {
   findProgrammaticRouteFilesInDir
-} from "./chunk-BNGS6KJ6.mjs";
+} from "./chunk-YOYF2E4U.mjs";
 import {
   isFarmAPIRouteFileName
 } from "./chunk-CU625VAY.mjs";
@@ -31,6 +31,9 @@ import {
 import {
   createCliColors
 } from "./chunk-I2BHUNBU.mjs";
+import {
+  loadFarmDevModule
+} from "./chunk-43FMW62B.mjs";
 import {
   toPosixPath,
   toViteModuleId
@@ -249,7 +252,7 @@ function farmApiPlugin(options = {}) {
           try {
             const relativePath = path.relative(apiDir, path.dirname(filePath));
             const routePath = "/api/" + (relativePath === "." ? "" : relativePath.replace(/\\/g, "/"));
-            const routeModule = await server.ssrLoadModule(filePath);
+            const routeModule = await loadFarmDevModule(server, filePath);
             const endpoints = {};
             const availableMethods = [];
             for (const method of API_ROUTE_METHODS) {
@@ -281,7 +284,7 @@ function farmApiPlugin(options = {}) {
         for (const routesFile of routesFiles) {
           if (fs.existsSync(routesFile)) {
             try {
-              const routesModule = await server.ssrLoadModule(routesFile);
+              const routesModule = await loadFarmDevModule(server, routesFile);
               for (const [exportName, exportValue] of Object.entries(routesModule)) {
                 const endpoint = exportValue;
                 if (endpoint && endpoint.__path) {
@@ -307,7 +310,8 @@ function farmApiPlugin(options = {}) {
         const { getProgrammaticRouteManifest } = await import("./routes.mjs");
         for (const routeFile of routeFiles) {
           try {
-            const routesModule = await server.ssrLoadModule(
+            const routesModule = await loadFarmDevModule(
+              server,
               toViteModuleId(routeFile, server.config.root)
             );
             const manifest = getProgrammaticRouteManifest(routesModule);
@@ -471,7 +475,7 @@ function farmApiPlugin(options = {}) {
         if (await recoverFailedDiscovery?.()) return [];
         const previousState = snapshotRouteState();
         try {
-          const routesModule = await server.ssrLoadModule(file);
+          const routesModule = await loadFarmDevModule(server, file);
           removeEndpointsFromFile(file);
           for (const [exportName, exportValue] of Object.entries(routesModule)) {
             const endpoint = exportValue;
@@ -524,7 +528,7 @@ function farmApiPlugin(options = {}) {
             log(`API route file removed: ${routePath}`);
             return [];
           }
-          const routeModule = await server.ssrLoadModule(file);
+          const routeModule = await loadFarmDevModule(server, file);
           removeEndpointsFromFile(file);
           const availableMethods = [];
           for (const method of API_ROUTE_METHODS) {