@farm.js/core 0.1.28 → 0.1.29

package/dist/{chunk-XSPGWQWA.cjs → chunk-6CNX6Q3K.cjs}

@@ -6,6 +6,9 @@ var _chunkJ63ZH5OQcjs = require('./chunk-J63ZH5OQ.cjs');
 var _chunk5MKEDGLDcjs = require('./chunk-5MKEDGLD.cjs');
 
 
+var _chunkFJ3M4CUXcjs = require('./chunk-FJ3M4CUX.cjs');
+
+
 var _chunkI57LW5VZcjs = require('./chunk-I57LW5VZ.cjs');
 
 
@@ -14,8 +17,7 @@ var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 // src/markdown-view.ts
 var FENCE = /^\s{0,3}(`{3,}|~{3,})/;
 var ATX_HEADING = /^\s{0,3}(#{1,6})[ \t]+(.+?)[ \t]*#*[ \t]*$/;
-function parseFarmMarkdownHeadings(markdown) {
-  const lines = markdown.split("\n");
+function parseMarkdownHeadingsFromLines(lines) {
   const headings = [];
   const used = /* @__PURE__ */ new Map();
   let index = 0;
@@ -57,7 +59,7 @@ function parseFarmMarkdownHeadings(markdown) {
   }
   return headings;
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, parseFarmMarkdownHeadings, "parseFarmMarkdownHeadings");
+_chunkS3JO3N4Hcjs.__name.call(void 0, parseMarkdownHeadingsFromLines, "parseMarkdownHeadingsFromLines");
 function slugifyHeading(text) {
   return text.replace(/!?\[([^\]]*)\]\([^)]*\)/g, "$1").replace(/[`*_~]/g, "").toLowerCase().replace(/[^\p{L}\p{N}\s-]/gu, "").trim().replace(/\s/g, "-");
 }
@@ -97,7 +99,7 @@ function selectFarmMarkdownView(markdown, searchParams, markdownPath) {
   ), "withinBudget");
   if (!wantsOutline && sectionId === null) return withinBudget(markdown);
   const lines = markdown.split("\n");
-  const headings = parseFarmMarkdownHeadings(markdown);
+  const headings = parseMarkdownHeadingsFromLines(lines);
   const sectionText = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (heading) => lines.slice(heading.start, heading.end).join("\n").trim(), "sectionText");
   if (sectionId !== null) {
     const heading = headings.find((candidate) => candidate.id === sectionId);
@@ -116,10 +118,20 @@ ${available}
 ` : "This page has no sections.\n")
     };
   }
+  const offsets = [];
+  let offset = 0;
+  for (const line of lines) {
+    offsets.push(offset);
+    offset += line.length + 1;
+  }
   const minLevel = headings.reduce((min, heading) => Math.min(min, heading.level), 6);
   const entries = headings.map((heading) => {
     const indent = "  ".repeat(heading.level - minLevel);
-    const tokens = estimateFarmMarkdownTokens(sectionText(heading));
+    let last = heading.end - 1;
+    while (last > heading.start && lines[last].trim().length === 0) last--;
+    const first = lines[heading.start];
+    const length = offsets[last] + lines[last].trimEnd().length - offsets[heading.start] - (first.length - first.trimStart().length);
+    const tokens = Math.ceil(length / 4);
     return `${indent}- [${heading.text}](${viewUrl({ section: heading.id })}) ~${tokens} tokens`;
   });
   return {
@@ -211,7 +223,9 @@ The page changed after this cursor was issued. Start again at ${partUrl()}.
   const part = `${head}${lines.slice(start, end).join("\n").replace(/\n+$/, "")}${open ? `
 ${open.closer}` : ""}`;
   const next = partUrl(`${end}.${version}`);
-  const remaining = estimateFarmMarkdownTokens(lines.slice(end).join("\n"));
+  let remainingLength = lines.length - end - 1;
+  for (let index = end; index < lines.length; index++) remainingLength += lines[index].length;
+  const remaining = Math.ceil(remainingLength / 4);
   return {
     status: 200,
     body: `${part}
@@ -423,19 +437,24 @@ async function createMarkdownMirrorResponse(options) {
   }
   const html = await pageResponse.text();
   const markdownPath = target.pathname === "/" ? "/index.md" : `${target.pathname}.md`;
-  const actions = pageResponse.status >= 400 ? [] : extractFarmPageActions(html, pageUrl);
+  const region = pageResponse.status < 400 && /<form\b/i.test(html) ? readHtmlContentRegion(html) : void 0;
+  const actions = region === void 0 ? [] : extractPageActionsFromRegion(region, pageUrl);
   for (const form of actions) {
     if (!_optionalChain([form, 'access', _16 => _16.action, 'optionalAccess', _17 => _17.startsWith, 'call', _18 => _18("/")])) continue;
     const pathname = new URL(form.action, pageUrl.origin).pathname;
     const tool = _nullishCoalesce(_chunk5MKEDGLDcjs._findFarmMCPEndpointTool.call(void 0, form.method, pathname, options.apiServerBasePath), () => ( _chunk5MKEDGLDcjs._findFarmMCPEndpointTool.call(void 0, form.method, _chunkI57LW5VZcjs.stripFarmBasePath.call(void 0, pathname), options.apiServerBasePath)));
     if (tool) form.tool = tool;
   }
-  const markdown = htmlToMarkdown(html, {
-    title: _optionalChain([target, 'access', _19 => _19.route, 'optionalAccess', _20 => _20.title]),
-    includeMetadata: _nullishCoalesce(_optionalChain([options, 'access', _21 => _21.config, 'optionalAccess', _22 => _22.includeMetadata]), () => ( true)),
-    sourcePath: target.pathname,
-    actionsPath: actions.length > 0 ? `${markdownPath}?actions` : void 0
-  });
+  const markdown = pageResponse.status < 400 && requestUrl.searchParams.has("actions") ? "" : convertHtmlToMarkdown(
+    html,
+    {
+      title: _optionalChain([target, 'access', _19 => _19.route, 'optionalAccess', _20 => _20.title]),
+      includeMetadata: _nullishCoalesce(_optionalChain([options, 'access', _21 => _21.config, 'optionalAccess', _22 => _22.includeMetadata]), () => ( true)),
+      sourcePath: target.pathname,
+      actionsPath: actions.length > 0 ? `${markdownPath}?actions` : void 0
+    },
+    region
+  );
   const headersOut = new Headers({
     "Content-Type": "text/markdown; charset=utf-8",
     "Content-Location": markdownPath,
@@ -537,13 +556,9 @@ function applyMarkdownNegotiationHeaders(response, options) {
   if (!alternatePath) {
     return response;
   }
-  const headers = new Headers(response.headers);
-  appendHeaderToken(headers, "Vary", "Accept");
-  headers.append("Link", `<${alternatePath}>; rel="alternate"; type="text/markdown"`);
-  return new Response(response.body, {
-    status: response.status,
-    statusText: response.statusText,
-    headers
+  return _chunkFJ3M4CUXcjs._withFarmResponseHeaders.call(void 0, response, (headers) => {
+    appendHeaderToken(headers, "Vary", "Accept");
+    headers.append("Link", `<${alternatePath}>; rel="alternate"; type="text/markdown"`);
   });
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, applyMarkdownNegotiationHeaders, "applyMarkdownNegotiationHeaders");
@@ -551,9 +566,61 @@ var CODE_BLOCK_MARK = "\0";
 var CODE_BLOCK_PLACEHOLDER = /\u0000(\d+)\u0000/g;
 var BLOCK_TAGS = /<\/?(ul|ol|main|section|article|header|footer|nav|aside|div|form|fieldset|legend|figure|figcaption|table|thead|tbody|tfoot|tr|dl|dt|dd|details|summary|address)\b[^>]*>/gi;
 var BOX_TAGS = /<\/?(label|button|input|select|textarea|option|output|meter|progress|td|th)\b[^>]*>/gi;
+var LAYOUT_ROW = /<(div|nav|section|header|footer|aside|main|article|figure|figcaption|dt|dd)\b([^>]*)>((?:(?!<\/?(?:div|nav|section|header|footer|aside|main|article|figure|figcaption|dt|dd|p|h[1-6]|ul|ol|li|table|pre|blockquote)\b)[\s\S])*?)<\/\1>/gi;
+var HTML_TOKEN = /<\/?([a-zA-Z][\w:-]*)\b[^>]*?(\/?)>|[^<]+/g;
+function separateLayoutRowItems(source) {
+  return source.replace(
+    LAYOUT_ROW,
+    (container, tag, attributes, content) => {
+      const boundaries = [];
+      const items = [];
+      let depth = 0;
+      let previousEnd = -1;
+      let item = "";
+      for (const match of content.matchAll(HTML_TOKEN)) {
+        const [token, name, selfClosing] = match;
+        const index = _nullishCoalesce(match.index, () => ( 0));
+        if (name === void 0) {
+          if (depth === 0) {
+            if (token.trim()) return container;
+            previousEnd = -1;
+          } else {
+            item += token;
+          }
+          continue;
+        }
+        const closing = token.startsWith("</");
+        const isVoid = selfClosing === "/" || VOID_TAGS.has(name.toLowerCase());
+        if (closing) {
+          depth = Math.max(0, depth - 1);
+        } else {
+          if (depth === 0 && previousEnd === index) boundaries.push(index);
+          if (!isVoid) depth += 1;
+        }
+        if (depth === 0) {
+          previousEnd = index + token.length;
+          items.push(decodeHtml(item).trim());
+          item = "";
+        }
+      }
+      if (boundaries.length === 0) return container;
+      if (items.filter(Boolean).every((text) => text.length === 1)) return container;
+      let separated = content;
+      for (const boundary of boundaries.reverse()) {
+        separated = `${separated.slice(0, boundary)} ${separated.slice(boundary)}`;
+      }
+      return `<${tag}${attributes}>${separated}</${tag}>`;
+    }
+  );
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, separateLayoutRowItems, "separateLayoutRowItems");
 function htmlToMarkdown(html, options = {}) {
+  return convertHtmlToMarkdown(html, options);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, htmlToMarkdown, "htmlToMarkdown");
+function convertHtmlToMarkdown(html, options, region) {
   const title = _nullishCoalesce(options.title, () => ( extractHtmlTitle(html)));
-  let source = readHtmlContentRegion(html);
+  let source = _nullishCoalesce(region, () => ( readHtmlContentRegion(html)));
   const codeBlocks = [];
   const setAsideCodeBlock = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (code, attributes) => {
     const content = decodeHtml(stripTags(code)).trim();
@@ -594,6 +661,7 @@ ${CODE_BLOCK_MARK}${codeBlocks.length - 1}${CODE_BLOCK_MARK}
 `;
     }
   );
+  source = separateLayoutRowItems(source);
   source = source.replace(/<h([1-6])\b[^>]*>([\s\S]*?)<\/h\1>/gi, (_, level, content) => {
     return `
 
@@ -664,7 +732,7 @@ ${markdown}` : ""}`;
   return `${markdown}
 `;
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, htmlToMarkdown, "htmlToMarkdown");
+_chunkS3JO3N4Hcjs.__name.call(void 0, convertHtmlToMarkdown, "convertHtmlToMarkdown");
 function normalizeMarkdownRouteInput(input) {
   if (typeof input === "string") {
     return {
@@ -861,7 +929,10 @@ var FORM_ENCTYPES = /* @__PURE__ */ new Set([
 ]);
 function extractFarmPageActions(html, pageUrl) {
   if (!/<form\b/i.test(html)) return [];
-  const region = readHtmlContentRegion(html);
+  return extractPageActionsFromRegion(readHtmlContentRegion(html), pageUrl);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, extractFarmPageActions, "extractFarmPageActions");
+function extractPageActionsFromRegion(region, pageUrl) {
   const labelsFor = /* @__PURE__ */ new Map();
   for (const match of region.matchAll(/<label\b([^>]*)>([\s\S]*?)<\/label>/gi)) {
     const target = readDecodedAttribute(match[1], "for");
@@ -874,7 +945,7 @@ function extractFarmPageActions(html, pageUrl) {
   }
   return actions;
 }
-_chunkS3JO3N4Hcjs.__name.call(void 0, extractFarmPageActions, "extractFarmPageActions");
+_chunkS3JO3N4Hcjs.__name.call(void 0, extractPageActionsFromRegion, "extractPageActionsFromRegion");
 function readPageForm(attributes, content, pageUrl, labelsFor) {
   const method = _optionalChain([readDecodedAttribute, 'call', _48 => _48(attributes, "method"), 'optionalAccess', _49 => _49.trim, 'call', _50 => _50(), 'access', _51 => _51.toLowerCase, 'call', _52 => _52()]);
   if (method === "dialog") return void 0;
@@ -1109,6 +1180,7 @@ var VOID_TAGS = /* @__PURE__ */ new Set([
   "wbr"
 ]);
 function removeHiddenElements(html) {
+  if (!/hidden/i.test(html)) return html;
   const openingTag = /<([a-zA-Z][\w:-]*)((?:[^>"']|"[^"]*"|'[^']*')*)>/g;
   let closingTags;
   let result = "";

package/dist/{chunk-NVBS5WSZ.mjs → chunk-6G3ZZ2IE.mjs}

@@ -1,6 +1,6 @@
 import {
   createFarmMarkdownRouteModule
-} from "./chunk-2DLN6HG4.mjs";
+} from "./chunk-BZ3CHOFX.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-QBPXNZGV.cjs → chunk-6MVFL3R5.cjs}

@@ -336,32 +336,49 @@ function assertPluginDependencies(plugins, integrations) {
     }
   }
   const state = /* @__PURE__ */ new Map();
-  const path2 = [];
+  const path3 = [];
   const visit = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (plugin) => {
     if (state.get(plugin) === "done") return;
     if (state.get(plugin) === "visiting") {
-      const cycle = [...path2.slice(path2.indexOf(plugin)), plugin].map(
+      const cycle = [...path3.slice(path3.indexOf(plugin)), plugin].map(
         (entry) => pluginShortName(entry.name)
       );
       throw new Error(`Plugins depend on each other in a cycle: ${cycle.join(" \u2192 ")}.`);
     }
     state.set(plugin, "visiting");
-    path2.push(plugin);
+    path3.push(plugin);
     for (const dependency of _nullishCoalesce(plugin.dependsOn, () => ( []))) {
       for (const candidate of plugins) {
         if (candidate !== plugin && matches(candidate, dependency)) visit(candidate);
       }
     }
-    path2.pop();
+    path3.pop();
     state.set(plugin, "done");
   }, "visit");
   for (const plugin of plugins) visit(plugin);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, assertPluginDependencies, "assertPluginDependencies");
 
+// src/utils/source-dir.ts
+var _path = require('path'); var _path2 = _interopRequireDefault(_path);
+var FARM_PROJECT_SOURCE_DIRS = /* @__PURE__ */ Symbol.for("farm.projectSourceDirs");
+function getProjectSourceDirs() {
+  const globalState = globalThis;
+  return _nullishCoalesce(globalState[FARM_PROJECT_SOURCE_DIRS], () => ( (globalState[FARM_PROJECT_SOURCE_DIRS] = /* @__PURE__ */ new Map())));
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getProjectSourceDirs, "getProjectSourceDirs");
+function setFarmProjectSourceDir(root, srcDir) {
+  getProjectSourceDirs().set(_path2.default.resolve(root), srcDir);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, setFarmProjectSourceDir, "setFarmProjectSourceDir");
+function getFarmProjectSourceDir(root) {
+  return _nullishCoalesce(getProjectSourceDirs().get(_path2.default.resolve(root)), () => ( "src"));
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getFarmProjectSourceDir, "getFarmProjectSourceDir");
+
 // src/auth-config.ts
 var _module = require('module');
-var _path = require('path'); var _path2 = _interopRequireDefault(_path);
+
 var _url = require('url');
 function resolveFarmAuthConfig(input) {
   const config = input === true ? {} : input && typeof input === "object" ? input : {};
@@ -484,4 +501,6 @@ _chunkS3JO3N4Hcjs.__name.call(void 0, validateFarmAuthConfig, "validateFarmAuthC
 
 
 
-exports.resolveFarmDevIndicatorsConfig = resolveFarmDevIndicatorsConfig; exports.generateFarmDevIndicatorsClientRuntime = generateFarmDevIndicatorsClientRuntime; exports.resolveFarmAuthConfig = resolveFarmAuthConfig; exports.resolveFarmAuthIntegration = resolveFarmAuthIntegration; exports.pluginShortName = pluginShortName; exports.assertPluginDependencies = assertPluginDependencies;
+
+
+exports.setFarmProjectSourceDir = setFarmProjectSourceDir; exports.getFarmProjectSourceDir = getFarmProjectSourceDir; exports.resolveFarmDevIndicatorsConfig = resolveFarmDevIndicatorsConfig; exports.generateFarmDevIndicatorsClientRuntime = generateFarmDevIndicatorsClientRuntime; exports.resolveFarmAuthConfig = resolveFarmAuthConfig; exports.resolveFarmAuthIntegration = resolveFarmAuthIntegration; exports.pluginShortName = pluginShortName; exports.assertPluginDependencies = assertPluginDependencies;