@farm.js/core 0.1.60 → 0.1.62

package/dist/chunk-RZNCMRD3.mjs

@@ -0,0 +1,141 @@
+import {
+  readAliases,
+  resolveFile
+} from "./chunk-LVWGURLD.mjs";
+import {
+  transformFarmServerFns
+} from "./chunk-GNZIAJGB.mjs";
+
+// src/mobile/native-server-fns.ts
+import { createHash } from "crypto";
+import { readdirSync, readFileSync, realpathSync } from "fs";
+import path from "path";
+var SCRIPT = /\.(?:tsx|ts|jsx|js|mjs)$/;
+var NATIVE_SCREEN = /^(?:page|layout)\.(?:native|android|ios)\.(?:tsx|ts|jsx|js)$/;
+var IMPORT_SPECIFIERS = /(?:^|[^\w$.])(?:import|export)\s*(?:type\s+)?(?:[\w$*{}\s,]+\s+from\s*)?["']([^"']+)["']|import\(\s*["']([^"']+)["']\s*\)/g;
+function posix(file) {
+  return file.split(path.sep).join("/");
+}
+function real(file) {
+  try {
+    return realpathSync(file);
+  } catch {
+    return file;
+  }
+}
+function farmNativeServerFnId(root, file, exportName) {
+  const relative = posix(path.relative(real(root), real(file)));
+  return createHash("sha256").update(`${relative}#${exportName}`).digest("base64url").slice(0, 20);
+}
+function describeFarmNativeServerFnModule(root, file, code) {
+  if (!code.includes("createServerFn") && !code.includes("createServerQuery")) return void 0;
+  let analysis;
+  try {
+    analysis = transformFarmServerFns(code, file, { environment: "client" });
+  } catch (error) {
+    const named = new Error(`${file}: ${error instanceof Error ? error.message : String(error)}`);
+    named.cause = error;
+    throw named;
+  }
+  if (!analysis || analysis.exports.length === 0) return void 0;
+  return {
+    file,
+    exports: analysis.exports.map((name) => ({ name, id: farmNativeServerFnId(root, file, name) }))
+  };
+}
+function findFarmNativeScreenFiles(appDirs) {
+  const files = [];
+  const visit = (dir) => {
+    let entries;
+    try {
+      entries = readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (entry.name === "node_modules" || entry.name.startsWith(".")) continue;
+      const file = path.join(dir, entry.name);
+      if (entry.isDirectory()) visit(file);
+      else if (NATIVE_SCREEN.test(entry.name)) files.push(file);
+    }
+  };
+  for (const dir of appDirs) visit(dir);
+  return files.sort();
+}
+function collectFarmNativeServerFns(options) {
+  const { root, srcDir } = options;
+  const aliases = readAliases(root, srcDir);
+  const seen = /* @__PURE__ */ new Set();
+  const found = /* @__PURE__ */ new Map();
+  const queue = [...options.entries];
+  while (queue.length > 0) {
+    const file = queue.pop();
+    if (seen.has(file)) continue;
+    seen.add(file);
+    let code;
+    try {
+      code = readFileSync(file, "utf8");
+    } catch {
+      continue;
+    }
+    const module = describeFarmNativeServerFnModule(root, file, code);
+    if (module) {
+      found.set(file, module);
+      continue;
+    }
+    for (const match of code.matchAll(IMPORT_SPECIFIERS)) {
+      const specifier = match[1] ?? match[2];
+      let candidates;
+      if (specifier.startsWith(".")) candidates = [path.resolve(path.dirname(file), specifier)];
+      else {
+        const alias = aliases.find(
+          (entry) => specifier.startsWith(entry.prefix) || specifier === entry.prefix.replace(/\/$/, "")
+        );
+        if (alias) {
+          candidates = alias.targets.map(
+            (target) => path.join(target, specifier.slice(alias.prefix.length))
+          );
+        }
+      }
+      for (const candidate of candidates ?? []) {
+        const resolved = resolveFile(candidate);
+        if (resolved && SCRIPT.test(resolved) && !resolved.includes(`${path.sep}node_modules${path.sep}`)) {
+          queue.push(resolved);
+          break;
+        }
+      }
+    }
+  }
+  return [...found.values()].sort((left, right) => left.file < right.file ? -1 : 1);
+}
+var FARM_DEV_SERVER_MODULE_LOADER = /* @__PURE__ */ Symbol.for("farm.dev.loadServerModule");
+function createFarmDevNativeServerFnResolver(options) {
+  return async (id) => {
+    const modules = collectFarmNativeServerFns({
+      root: options.root,
+      srcDir: options.srcDir,
+      entries: findFarmNativeScreenFiles(options.appDirs())
+    });
+    for (const module of modules) {
+      const entry = module.exports.find((candidate) => candidate.id === id);
+      if (!entry) continue;
+      const load = globalThis[FARM_DEV_SERVER_MODULE_LOADER];
+      if (!load) {
+        throw new Error(
+          "Native server function calls need the Farm dev server or a production build."
+        );
+      }
+      return (await load(module.file))[entry.name];
+    }
+    return void 0;
+  };
+}
+
+export {
+  farmNativeServerFnId,
+  describeFarmNativeServerFnModule,
+  findFarmNativeScreenFiles,
+  collectFarmNativeServerFns,
+  FARM_DEV_SERVER_MODULE_LOADER,
+  createFarmDevNativeServerFnResolver
+};

package/dist/{chunk-D7LTCK3U.mjs → chunk-SA7MLSP4.mjs}

@@ -180,15 +180,20 @@ async function scanRoutePatterns(options) {
     }
   }
   if (!options.platformFiles) return { pages, modules };
+  const nativeOnlyPages = /* @__PURE__ */ new Set();
   for (const [pattern, files] of nativePages) {
-    if (!pages.has(pattern)) {
-      const file = path.relative(root, Object.values(files)[0]);
-      throw new Error(
-        `${file.replace(/\\/g, "/")} has no web page next to it. Add ${path.join(path.dirname(file), "page.tsx").replace(/\\/g, "/")}: it is the route's web screen and the fallback on every platform.`
-      );
+    if (pages.has(pattern)) continue;
+    if (files.native) {
+      nativeOnlyPages.add(pattern);
+      continue;
     }
+    const file = path.relative(root, Object.values(files)[0]);
+    const dir = path.dirname(file);
+    throw new Error(
+      `${file.replace(/\\/g, "/")} has no web page next to it. Add ${path.join(dir, "page.tsx").replace(/\\/g, "/")} (the route's web screen and fallback), or ${path.join(dir, "page.native.tsx").replace(/\\/g, "/")} to make the route native-only on both OSes.`
+    );
   }
-  return { pages, modules, pageFiles, nativePages, nativeLayouts };
+  return { pages, modules, pageFiles, nativePages, nativeLayouts, nativeOnlyPages };
 }
 function scanPlatformRouteFiles(appDir, files, nativePages, nativeLayouts) {
   const seen = /* @__PURE__ */ new Map();

package/dist/{chunk-2FRLSDBT.cjs → chunk-SM25ZC4S.cjs}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});// package.json
-var version = "0.1.60";
+var version = "0.1.62";
 
 // src/version.ts
 var FARM_VERSION = version;

package/dist/{chunk-3YMLUNL2.cjs → chunk-SVXOCTQ2.cjs}

@@ -233,7 +233,7 @@ ${body}
   return `/**
  * Auto-generated from the Codegen specs in src/native: native.<module> from @farm.js/core/native.
  * Web screens reach a module's Promise methods only when mobile.modules.<name>.web is true, and
- * only inside the Android shell; check native.<module>.available() first.
+ * only inside the mobile shell; check native.<module>.available() first.
  */
 declare module "@farm.js/core/native" {
   interface FarmNativeModules {

package/dist/{chunk-W2RZ73IU.cjs → chunk-SYXPWJ7N.cjs}

@@ -17,7 +17,7 @@ var _chunkKORZ6PREcjs = require('./chunk-KORZ6PRE.cjs');
 
 
 
-var _chunkCBKRS3M4cjs = require('./chunk-CBKRS3M4.cjs');
+var _chunkZ7P2BTZ3cjs = require('./chunk-Z7P2BTZ3.cjs');
 
 
 var _chunkJXIYH2NOcjs = require('./chunk-JXIYH2NO.cjs');
@@ -99,7 +99,7 @@ var APIRouteManager = class {
         await this.loadProgrammaticApiRoutes(appDir);
       }
       this.routes = new Map(
-        _chunkCBKRS3M4cjs.mergePluginAPIRoutes.call(void 0, [...this.routes.values()], this.plugins, void 0, {
+        _chunkZ7P2BTZ3cjs.mergePluginAPIRoutes.call(void 0, [...this.routes.values()], this.plugins, void 0, {
           bodySizeLimit: this.bodySizeLimit,
           dispatch: this.dispatch
         }).map((route) => [route.path, route])
@@ -147,7 +147,7 @@ var APIRouteManager = class {
       const routeModule = await this.loadModule(filePath);
       const endpoints = {};
       const availableMethods = [];
-      for (const method of _chunkCBKRS3M4cjs.API_ROUTE_METHODS) {
+      for (const method of _chunkZ7P2BTZ3cjs.API_ROUTE_METHODS) {
         if (routeModule[method]) {
           endpoints[method] = routeModule[method];
           availableMethods.push(method);
@@ -329,7 +329,7 @@ var APIRouteManager = class {
       const url = new URL(request.url);
       const pathname = url.pathname;
       const method = request.method.toUpperCase();
-      const match = _chunkCBKRS3M4cjs.matchAPIRouteAtBasePath.call(void 0, this.routes, pathname, this.basePath);
+      const match = _chunkZ7P2BTZ3cjs.matchAPIRouteAtBasePath.call(void 0, this.routes, pathname, this.basePath);
       if (!match) {
         return new Response(JSON.stringify({ error: "Not Found" }), {
           status: 404,
@@ -337,19 +337,19 @@ var APIRouteManager = class {
         });
       }
       const { route, params } = match;
-      const endpoint = _chunkCBKRS3M4cjs.resolveAPIRouteEndpoint.call(void 0, route, method);
+      const endpoint = _chunkZ7P2BTZ3cjs.resolveAPIRouteEndpoint.call(void 0, route, method);
       if (!endpoint) {
         return new Response(JSON.stringify({ error: "Method Not Allowed" }), {
           status: 405,
           headers: {
-            Allow: _chunkCBKRS3M4cjs.getAllowedAPIRouteMethods.call(void 0, route).join(", "),
+            Allow: _chunkZ7P2BTZ3cjs.getAllowedAPIRouteMethods.call(void 0, route).join(", "),
             "Content-Type": "application/json"
           }
         });
       }
       const invoke = async () => {
         try {
-          return await _chunkCBKRS3M4cjs.invokeAPIRouteEndpoint.call(void 0, endpoint, request, params, this.bodySizeLimit);
+          return await _chunkZ7P2BTZ3cjs.invokeAPIRouteEndpoint.call(void 0, endpoint, request, params, this.bodySizeLimit);
         } catch (error) {
           if (options.throwOnError) throw error;
           console.error(`[API Error] ${pathname}:`, error);
@@ -371,7 +371,7 @@ var APIRouteManager = class {
     return Boolean(this.matchRoute(pathname));
   }
   matchRoute(pathname) {
-    return _chunkCBKRS3M4cjs.matchAPIRouteAtBasePath.call(void 0, this.routes, pathname, this.basePath);
+    return _chunkZ7P2BTZ3cjs.matchAPIRouteAtBasePath.call(void 0, this.routes, pathname, this.basePath);
   }
   /**
    * Get all routes for client type generation

package/dist/{chunk-F6Y7ZAPQ.mjs → chunk-T46NNU4D.mjs}

@@ -5,18 +5,21 @@ import {
   loadFarmDocsPage,
   resolveFarmDocsContentDir,
   toFarmDocsMarkdownPage
-} from "./chunk-2KTYMMWT.mjs";
+} from "./chunk-DPE53XWL.mjs";
 import {
   docsEngine,
   loadFarmDocsEngine
 } from "./chunk-VE3FWJBO.mjs";
 import {
   resolveDocsConfig
-} from "./chunk-VPTWKOCY.mjs";
+} from "./chunk-VWW4Q3BJ.mjs";
 import {
   getFarmDocsAdapterConfigModule,
   isSecretDocsConfigKey
 } from "./chunk-EJCVG25Z.mjs";
+import {
+  cloneFarmRequest
+} from "./chunk-QDWMCFTH.mjs";
 
 // src/docs/adapter.ts
 import { createRequire } from "module";
@@ -241,7 +244,7 @@ function isDocsCloudAction(action) {
 }
 async function readJson(request) {
   try {
-    return await request.clone().json();
+    return await cloneFarmRequest(request).json();
   } catch {
     return void 0;
   }

package/dist/{chunk-IFHPDLIS.mjs → chunk-TGULJSHD.mjs}

@@ -22,11 +22,12 @@ import {
 } from "./chunk-CO6UYM2D.mjs";
 import {
   bufferFarmRequestBody,
+  cloneFarmRequest,
   createFarmRequestBodyErrorResponse,
   readNodeRequestBody,
   resolveFarmServerConfig,
   withFarmRequestClientAddress
-} from "./chunk-GFT5AHAT.mjs";
+} from "./chunk-QDWMCFTH.mjs";
 import {
   clearRequestContext,
   deleteRequestContext,
@@ -1320,10 +1321,10 @@ async function readIntegrationValidationBody(request, format) {
     if (format === "form") {
       return {
         success: true,
-        data: createFormInput(await request.clone().formData())
+        data: createFormInput(await cloneFarmRequest(request).formData())
       };
     }
-    const text = await request.clone().text();
+    const text = await cloneFarmRequest(request).text();
     if (text.trim().length === 0) {
       return {
         success: true,
@@ -1771,7 +1772,7 @@ async function dispatchIntegrationRequests(integrations, runtime, request, optio
       { ...runtime, integration },
       // Each dispatch buffers the body it is given, so hand every integration
       // its own clone rather than a Request another dispatch already read.
-      request.clone(),
+      cloneFarmRequest(request),
       {
         currentRequest: options.currentRequest,
         ranMiddleware: options.ranMiddleware,

package/dist/{chunk-JPIUGDK4.mjs → chunk-TZVUF5JJ.mjs}

@@ -15,7 +15,7 @@ import {
   createFarmRequestBodyErrorResponse,
   readFarmRequestBody,
   resolveFarmServerConfig
-} from "./chunk-GFT5AHAT.mjs";
+} from "./chunk-QDWMCFTH.mjs";
 import {
   validateConfigRouteSource
 } from "./chunk-ONG4RDW3.mjs";

package/dist/chunk-UWI3SJAK.cjs

@@ -0,0 +1,141 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
+
+
+var _chunkJEJQGZI7cjs = require('./chunk-JEJQGZI7.cjs');
+
+
+var _chunkPIUTGRDIcjs = require('./chunk-PIUTGRDI.cjs');
+
+// src/mobile/native-server-fns.ts
+var _crypto = require('crypto');
+var _fs = require('fs');
+var _path = require('path'); var _path2 = _interopRequireDefault(_path);
+var SCRIPT = /\.(?:tsx|ts|jsx|js|mjs)$/;
+var NATIVE_SCREEN = /^(?:page|layout)\.(?:native|android|ios)\.(?:tsx|ts|jsx|js)$/;
+var IMPORT_SPECIFIERS = /(?:^|[^\w$.])(?:import|export)\s*(?:type\s+)?(?:[\w$*{}\s,]+\s+from\s*)?["']([^"']+)["']|import\(\s*["']([^"']+)["']\s*\)/g;
+function posix(file) {
+  return file.split(_path2.default.sep).join("/");
+}
+function real(file) {
+  try {
+    return _fs.realpathSync.call(void 0, file);
+  } catch (e) {
+    return file;
+  }
+}
+function farmNativeServerFnId(root, file, exportName) {
+  const relative = posix(_path2.default.relative(real(root), real(file)));
+  return _crypto.createHash.call(void 0, "sha256").update(`${relative}#${exportName}`).digest("base64url").slice(0, 20);
+}
+function describeFarmNativeServerFnModule(root, file, code) {
+  if (!code.includes("createServerFn") && !code.includes("createServerQuery")) return void 0;
+  let analysis;
+  try {
+    analysis = _chunkPIUTGRDIcjs.transformFarmServerFns.call(void 0, code, file, { environment: "client" });
+  } catch (error) {
+    const named = new Error(`${file}: ${error instanceof Error ? error.message : String(error)}`);
+    named.cause = error;
+    throw named;
+  }
+  if (!analysis || analysis.exports.length === 0) return void 0;
+  return {
+    file,
+    exports: analysis.exports.map((name) => ({ name, id: farmNativeServerFnId(root, file, name) }))
+  };
+}
+function findFarmNativeScreenFiles(appDirs) {
+  const files = [];
+  const visit = (dir) => {
+    let entries;
+    try {
+      entries = _fs.readdirSync.call(void 0, dir, { withFileTypes: true });
+    } catch (e2) {
+      return;
+    }
+    for (const entry of entries) {
+      if (entry.name === "node_modules" || entry.name.startsWith(".")) continue;
+      const file = _path2.default.join(dir, entry.name);
+      if (entry.isDirectory()) visit(file);
+      else if (NATIVE_SCREEN.test(entry.name)) files.push(file);
+    }
+  };
+  for (const dir of appDirs) visit(dir);
+  return files.sort();
+}
+function collectFarmNativeServerFns(options) {
+  const { root, srcDir } = options;
+  const aliases = _chunkJEJQGZI7cjs.readAliases.call(void 0, root, srcDir);
+  const seen = /* @__PURE__ */ new Set();
+  const found = /* @__PURE__ */ new Map();
+  const queue = [...options.entries];
+  while (queue.length > 0) {
+    const file = queue.pop();
+    if (seen.has(file)) continue;
+    seen.add(file);
+    let code;
+    try {
+      code = _fs.readFileSync.call(void 0, file, "utf8");
+    } catch (e3) {
+      continue;
+    }
+    const module = describeFarmNativeServerFnModule(root, file, code);
+    if (module) {
+      found.set(file, module);
+      continue;
+    }
+    for (const match of code.matchAll(IMPORT_SPECIFIERS)) {
+      const specifier = _nullishCoalesce(match[1], () => ( match[2]));
+      let candidates;
+      if (specifier.startsWith(".")) candidates = [_path2.default.resolve(_path2.default.dirname(file), specifier)];
+      else {
+        const alias = aliases.find(
+          (entry) => specifier.startsWith(entry.prefix) || specifier === entry.prefix.replace(/\/$/, "")
+        );
+        if (alias) {
+          candidates = alias.targets.map(
+            (target) => _path2.default.join(target, specifier.slice(alias.prefix.length))
+          );
+        }
+      }
+      for (const candidate of _nullishCoalesce(candidates, () => ( []))) {
+        const resolved = _chunkJEJQGZI7cjs.resolveFile.call(void 0, candidate);
+        if (resolved && SCRIPT.test(resolved) && !resolved.includes(`${_path2.default.sep}node_modules${_path2.default.sep}`)) {
+          queue.push(resolved);
+          break;
+        }
+      }
+    }
+  }
+  return [...found.values()].sort((left, right) => left.file < right.file ? -1 : 1);
+}
+var FARM_DEV_SERVER_MODULE_LOADER = /* @__PURE__ */ Symbol.for("farm.dev.loadServerModule");
+function createFarmDevNativeServerFnResolver(options) {
+  return async (id) => {
+    const modules = collectFarmNativeServerFns({
+      root: options.root,
+      srcDir: options.srcDir,
+      entries: findFarmNativeScreenFiles(options.appDirs())
+    });
+    for (const module of modules) {
+      const entry = module.exports.find((candidate) => candidate.id === id);
+      if (!entry) continue;
+      const load = globalThis[FARM_DEV_SERVER_MODULE_LOADER];
+      if (!load) {
+        throw new Error(
+          "Native server function calls need the Farm dev server or a production build."
+        );
+      }
+      return (await load(module.file))[entry.name];
+    }
+    return void 0;
+  };
+}
+
+
+
+
+
+
+
+
+exports.farmNativeServerFnId = farmNativeServerFnId; exports.describeFarmNativeServerFnModule = describeFarmNativeServerFnModule; exports.findFarmNativeScreenFiles = findFarmNativeScreenFiles; exports.collectFarmNativeServerFns = collectFarmNativeServerFns; exports.FARM_DEV_SERVER_MODULE_LOADER = FARM_DEV_SERVER_MODULE_LOADER; exports.createFarmDevNativeServerFnResolver = createFarmDevNativeServerFnResolver;

package/dist/{chunk-JI5D7MXY.mjs → chunk-UYRI6U3P.mjs}

@@ -1,6 +1,6 @@
 import {
   _withFarmGuardedResponseCache
-} from "./chunk-EGVC4LIG.mjs";
+} from "./chunk-E4RDMG3K.mjs";
 import {
   _markFarmOwnedResponse,
   _withFarmResponseHeaders

package/dist/{chunk-D2X5MUF5.cjs → chunk-V727H3RI.cjs}

@@ -926,17 +926,50 @@ function splitFarmCssDeclarations(css) {
   push(css.length);
   return out;
 }
-function resolveFarmNativeInlineStyle(css) {
+function substituteFarmNativeVars(value, vars, depth = 0) {
+  if (!value.includes("var(")) return value;
+  if (depth > 8) return void 0;
+  let missing = false;
+  const replaced = value.replace(
+    /var\(\s*(--[\w-]+)\s*(?:,\s*([^()]*(?:\([^()]*\))?[^()]*))?\)/g,
+    (_, name, fallback) => {
+      const resolved = _nullishCoalesce(vars[name], () => ( _optionalChain([fallback, 'optionalAccess', _5 => _5.trim, 'call', _6 => _6()])));
+      if (resolved === void 0) {
+        missing = true;
+        return "";
+      }
+      return resolved;
+    }
+  );
+  return missing ? void 0 : substituteFarmNativeVars(replaced, vars, depth + 1);
+}
+function resolveFarmNativeInlineStyle(css, vars = {
+  light: {},
+  dark: {}
+}) {
   const style = {};
+  const dark = {};
   const unsupported = [];
+  const themes = [
+    [style, vars.light],
+    [dark, { ...vars.light, ...vars.dark }]
+  ];
   for (const [property, raw] of splitFarmCssDeclarations(css)) {
-    const value = raw.toLowerCase();
     if (!property) continue;
-    const resolved = resolveFarmNativeDeclaration(property, value);
-    if (resolved) Object.assign(style, resolved);
-    else if (resolved === void 0) unsupported.push(`${property}: ${value}`);
+    for (const [target, themeVars] of themes) {
+      const value = _optionalChain([substituteFarmNativeVars, 'call', _7 => _7(raw, themeVars), 'optionalAccess', _8 => _8.toLowerCase, 'call', _9 => _9()]);
+      const resolved = value === void 0 ? void 0 : resolveFarmNativeDeclaration(property, value);
+      if (resolved === void 0) {
+        unsupported.push(`${property}: ${raw.toLowerCase()}`);
+        break;
+      }
+      if (resolved) Object.assign(target, resolved);
+    }
+  }
+  for (const key of Object.keys(dark)) {
+    if (dark[key] === style[key]) delete dark[key];
   }
-  return { style, unsupported };
+  return { style, dark, unsupported };
 }
 function oklchToHex(value) {
   const match = /^oklch\(\s*([\d.]+)(%?)\s+([\d.]+)\s+([\d.]+|none)(?:deg)?\s*(?:\/\s*([\d.]+)(%?))?\s*\)$/.exec(
@@ -1052,7 +1085,7 @@ function createFarmNativeTheme(declarations, vars = {
       const px = light === void 0 ? void 0 : themeLength(light);
       const key = name.slice(5);
       if (px === void 0) delete theme.text[key];
-      else theme.text[key] = [px, _nullishCoalesce(_optionalChain([theme, 'access', _5 => _5.text, 'access', _6 => _6[key], 'optionalAccess', _7 => _7[1]]), () => ( Number.NaN))];
+      else theme.text[key] = [px, _nullishCoalesce(_optionalChain([theme, 'access', _10 => _10.text, 'access', _11 => _11[key], 'optionalAccess', _12 => _12[1]]), () => ( Number.NaN))];
       continue;
     }
     const numeric = [
@@ -1218,12 +1251,12 @@ function parseFarmNativeStylesheet(css) {
       for (const text2 of splitList(prelude)) {
         const selector = parseSelector(text2);
         if (selector === null) continue;
-        const subject = _optionalChain([selector, 'optionalAccess', _8 => _8.steps, 'access', _9 => _9[0], 'access', _10 => _10.compound]);
+        const subject = _optionalChain([selector, 'optionalAccess', _13 => _13.steps, 'access', _14 => _14[0], 'access', _15 => _15.compound]);
         if (context.layered) {
-          for (const name of _nullishCoalesce(_optionalChain([subject, 'optionalAccess', _11 => _11.classes]), () => ( []))) sheet.layered.add(name);
+          for (const name of _nullishCoalesce(_optionalChain([subject, 'optionalAccess', _16 => _16.classes]), () => ( []))) sheet.layered.add(name);
           continue;
         }
-        if (selector && selector.steps.length === 1 && _optionalChain([subject, 'optionalAccess', _12 => _12.tag]) === "html" && !subject.classes.length) {
+        if (selector && selector.steps.length === 1 && _optionalChain([subject, 'optionalAccess', _17 => _17.tag]) === "html" && !subject.classes.length) {
           for (const [property, value] of declarations) {
             if (property.startsWith("--")) {
               (context.dark ? sheet.vars.dark : sheet.vars.light)[property] = value;
@@ -1233,8 +1266,8 @@ function parseFarmNativeStylesheet(css) {
         if (!selector || context.unknownMedia || applies) {
           const fallback = /(?:^|[\s>+~])([a-zA-Z][\w-]*)?((?:[.#:[][^\s>+~]*)?)$/.exec(text2);
           sheet.unknown.push({
-            classes: [...(_nullishCoalesce(_optionalChain([fallback, 'optionalAccess', _13 => _13[2]]), () => ( ""))).matchAll(/\.([\w-]+)/g)].map((match) => match[1]),
-            tag: _optionalChain([fallback, 'optionalAccess', _14 => _14[1], 'optionalAccess', _15 => _15.toLowerCase, 'call', _16 => _16()]),
+            classes: [...(_nullishCoalesce(_optionalChain([fallback, 'optionalAccess', _18 => _18[2]]), () => ( ""))).matchAll(/\.([\w-]+)/g)].map((match) => match[1]),
+            tag: _optionalChain([fallback, 'optionalAccess', _19 => _19[1], 'optionalAccess', _20 => _20.toLowerCase, 'call', _21 => _21()]),
             text: context.unknownMedia ? `${context.unknownMedia} ${text2}` : applies ? `${text2} { @apply }` : text2
           });
           continue;
@@ -1302,23 +1335,6 @@ function matches(selector, element) {
   };
   return step(0, element);
 }
-function substitute(value, vars, depth = 0) {
-  if (!value.includes("var(")) return value;
-  if (depth > 8) return void 0;
-  let missing = false;
-  const replaced = value.replace(
-    /var\(\s*(--[\w-]+)\s*(?:,\s*([^()]*(?:\([^()]*\))?[^()]*))?\)/g,
-    (_, name, fallback) => {
-      const resolved = _nullishCoalesce(vars[name], () => ( _optionalChain([fallback, 'optionalAccess', _17 => _17.trim, 'call', _18 => _18()])));
-      if (resolved === void 0) {
-        missing = true;
-        return "";
-      }
-      return resolved;
-    }
-  );
-  return missing ? void 0 : substitute(replaced, vars, depth + 1);
-}
 function cascadeFarmNativeStylesheets(sheets, element) {
   const style = {};
   const dark = {};
@@ -1342,7 +1358,7 @@ function cascadeFarmNativeStylesheets(sheets, element) {
       const themes = rule.dark ? [dark] : [style, dark];
       for (const target of themes) {
         const vars = target === dark ? { ...sheet.vars.light, ...sheet.vars.dark } : sheet.vars.light;
-        const value = substitute(raw, vars);
+        const value = substituteFarmNativeVars(raw, vars);
         const resolved = value === void 0 ? void 0 : resolveFarmNativeDeclaration(property, value.toLowerCase().trim());
         if (resolved === void 0) {
           const message = `${property}: ${raw}`;
@@ -1369,7 +1385,7 @@ function inspectFarmNativeStylesheets(sheets, target) {
       styled = true;
       for (const [property, raw] of rule.declarations) {
         for (const vars of [sheet.vars.light, { ...sheet.vars.light, ...sheet.vars.dark }]) {
-          const value = substitute(raw, vars);
+          const value = substituteFarmNativeVars(raw, vars);
           if (value === void 0 || resolveFarmNativeDeclaration(property, value.toLowerCase().trim()) === void 0) {
             const message = `"${rule.text} { ${property}: ${raw} }" has no native-tier style`;
             if (!problems.includes(message)) problems.push(message);

package/dist/{chunk-ZMHAFH4R.mjs → chunk-VM7X5CKC.mjs}

@@ -20,10 +20,10 @@ import {
 import {
   createFarmWeakETag,
   matchesFarmIfNoneMatch
-} from "./chunk-GFT5AHAT.mjs";
+} from "./chunk-QDWMCFTH.mjs";
 import {
   FARM_VERSION
-} from "./chunk-HPWB57PZ.mjs";
+} from "./chunk-NT3QDN2E.mjs";
 import {
   applyFarmBasePath
 } from "./chunk-SF3JB56B.mjs";