@farm.js/core 0.1.49 → 0.1.51-beta.0

package/dist/{chunk-PXEXOQ5R.mjs → chunk-SHS6KXOZ.mjs}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-PAKCHVUS.mjs";
 import {
   logger
-} from "./chunk-2SVJGOAX.mjs";
+} from "./chunk-Y3N5BFRJ.mjs";
 
 // src/server-components-status.ts
 import { existsSync, realpathSync } from "fs";

package/dist/{chunk-ETF5C6HR.cjs → chunk-SJ23LJ3N.cjs}

@@ -4,7 +4,7 @@
 var _chunkBPNOYILCcjs = require('./chunk-BPNOYILC.cjs');
 
 
-var _chunkXN2MB4QZcjs = require('./chunk-XN2MB4QZ.cjs');
+var _chunkVQJYGZNXcjs = require('./chunk-VQJYGZNX.cjs');
 
 // src/server-components-status.ts
 var _fs = require('fs');
@@ -103,7 +103,7 @@ function farmAppUsesRscPipeline(config, root) {
   if (status.fallback) {
     if (!warnedFallback) {
       warnedFallback = true;
-      _chunkXN2MB4QZcjs.logger.warn(
+      _chunkVQJYGZNXcjs.logger.warn(
         `[Farm.js] ${formatFarmRscFallbackMessage(status.missingPackages, status.blockingKeys)}`
       );
     }
@@ -113,7 +113,7 @@ function farmAppUsesRscPipeline(config, root) {
     throw new Error(`[Farm.js] ${formatFarmRscBlockingMessage(status.blockingKeys)}`);
   }
   if (status.ignoredKeys.length > 0) {
-    _chunkXN2MB4QZcjs.logger.warn(
+    _chunkVQJYGZNXcjs.logger.warn(
       `[Farm.js] experimental.serverComponents runs on the RSC pipeline, which does not run ${formatKeys(
         status.ignoredKeys
       )} yet. ${status.ignoredKeys.length === 1 ? "It is" : "They are"} ignored.`

package/dist/{chunk-LL7TDMOM.mjs → chunk-SMUW7UST.mjs}

@@ -1,5 +1,14 @@
+import {
+  createPlatformBlockChecker,
+  isPlainObject,
+  readAppPackageJson,
+  resolveAppPackageName,
+  resolvePlatformBlock,
+  resolvePlatformProfile
+} from "./chunk-UB7RVEMX.mjs";
+
 // src/desktop/config.ts
-import { existsSync, readFileSync } from "fs";
+import { existsSync } from "fs";
 import * as path from "path";
 var FARM_PLATFORM_ENV = "FARM_PLATFORM";
 var FARM_DESKTOP_DEV_SESSION = /* @__PURE__ */ Symbol.for("@farm.js/core/desktop-dev-session");
@@ -9,33 +18,18 @@ function setFarmDesktopDevSession(session) {
   else delete store[FARM_DESKTOP_DEV_SESSION];
 }
 function resolveFarmPlatform(env = process.env) {
-  return env[FARM_PLATFORM_ENV] === "desktop" ? "desktop" : "web";
+  const value = env[FARM_PLATFORM_ENV];
+  return value === "desktop" || value === "mobile" ? value : "web";
 }
 var DESKTOP_KEYS = /* @__PURE__ */ new Set(["name", "id", "version", "icon", "window", "shell"]);
 var WINDOW_KEYS = /* @__PURE__ */ new Set(["width", "height", "title"]);
 var APP_ID = /^[A-Za-z][A-Za-z0-9-]*(?:\.[A-Za-z0-9][A-Za-z0-9-]*)+$/;
 var SHELL_NAME = /^[a-z][a-z0-9-]*$/;
 var SHELL_PACKAGE = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*(?:\/[a-z0-9][a-z0-9._-]*)*$/;
-var failPrefix = "desktop";
-function fail(message) {
-  throw new TypeError(`${failPrefix}: ${message}`);
-}
-function isPlainObject(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function checkKeys(value, allowed, where) {
-  for (const key of Object.keys(value)) {
-    if (!allowed.has(key)) {
-      fail(`unknown option ${where}${key}. Supported: ${[...allowed].join(", ")}.`);
-    }
-  }
-}
-function optionalString(value, key) {
-  if (value === void 0) return void 0;
-  if (typeof value !== "string" || !value.trim()) fail(`${key} must be a non-empty string.`);
-  return value.trim();
+function desktopChecker(context) {
+  return createPlatformBlockChecker(context ? `desktop (os: ${context.os})` : "desktop");
 }
-function optionalSize(value, key) {
+function optionalSize({ fail }, value, key) {
   if (value === void 0) return void 0;
   if (typeof value !== "number" || !Number.isInteger(value) || value < 100 || value > 16384) {
     fail(`${key} must be a whole number of points between 100 and 16384.`);
@@ -43,7 +37,11 @@ function optionalSize(value, key) {
   return value;
 }
 function validateFarmDesktopConfig(input, context) {
-  failPrefix = context ? `desktop (os: ${context.os})` : "desktop";
+  const check = desktopChecker(context);
+  const { checkKeys, optionalString } = check;
+  function fail(message) {
+    return check.fail(message);
+  }
   if (input === void 0) return void 0;
   if (!isPlainObject(input)) {
     fail(
@@ -64,8 +62,8 @@ function validateFarmDesktopConfig(input, context) {
   if (input.window !== void 0) {
     if (!isPlainObject(input.window)) fail("window must be an object, such as { width: 1024 }.");
     checkKeys(input.window, WINDOW_KEYS, "window.");
-    optionalSize(input.window.width, "window.width");
-    optionalSize(input.window.height, "window.height");
+    optionalSize(check, input.window.width, "window.width");
+    optionalSize(check, input.window.height, "window.height");
     optionalString(input.window.title, "window.title");
   }
   const shell = optionalString(input.shell, "shell");
@@ -77,14 +75,6 @@ function validateFarmDesktopConfig(input, context) {
   }
   return input;
 }
-function readPackageJson(root) {
-  try {
-    const parsed = JSON.parse(readFileSync(path.join(root, "package.json"), "utf8"));
-    return isPlainObject(parsed) ? parsed : {};
-  } catch {
-    return {};
-  }
-}
 function slug(value) {
   return value.replace(/^@[^/]+\//, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "app";
 }
@@ -93,12 +83,13 @@ function resolveFarmDesktopShellPackage(shell) {
 }
 function resolveFarmDesktopConfig(input, root, context) {
   const config = validateFarmDesktopConfig(input, context) ?? {};
-  const pkg = readPackageJson(root);
-  const packageName = typeof pkg.productName === "string" && pkg.productName.trim() || typeof pkg.name === "string" && pkg.name.replace(/^@[^/]+\//, "").trim() || path.basename(root);
+  const pkg = readAppPackageJson(root);
+  const packageName = resolveAppPackageName(root, pkg);
   const name = config.name?.trim() || packageName || "Farm App";
   const shell = config.shell?.trim() || "electrobun";
   const icon = config.icon ? path.resolve(root, config.icon.trim()) : void 0;
-  if (icon && !existsSync(icon)) fail(`icon ${config.icon} was not found in ${root}.`);
+  if (icon && !existsSync(icon))
+    desktopChecker(context).fail(`icon ${config.icon} was not found in ${root}.`);
   return {
     name,
     id: config.id?.trim() || `local.farm.${slug(name)}`,
@@ -132,10 +123,7 @@ function createFarmDesktopContext(options) {
   if (!DESKTOP_OS.has(os)) {
     throw new TypeError(`--os must be macos, windows, or linux, got "${os}".`);
   }
-  const profile = options.profile ?? "production";
-  if (typeof profile !== "string" || !/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(profile)) {
-    throw new TypeError(`--profile must be a name such as "beta", got "${String(profile)}".`);
-  }
+  const profile = resolvePlatformProfile(options.profile);
   return Object.freeze({
     os,
     mode: options.mode,
@@ -146,26 +134,12 @@ function createFarmDesktopContext(options) {
   });
 }
 async function resolveFarmDesktopBlock(input, context, cache) {
-  if (typeof input !== "function") {
-    return validateFarmDesktopConfig(input, context) ?? {};
-  }
-  const call = () => Promise.resolve().then(() => input(context)).then((value) => validateFarmDesktopConfig(value, context) ?? {});
-  if (!cache) return call();
-  const key = [
-    context.os,
-    context.mode,
-    context.command,
-    context.profile,
-    context.root,
-    String(input)
-  ].join("\0");
-  let resolved = cache.get(key);
-  if (!resolved) {
-    resolved = call();
-    cache.set(key, resolved);
-    resolved.catch(() => cache.delete(key));
-  }
-  return resolved;
+  return resolvePlatformBlock(
+    input,
+    context,
+    (value, ctx) => validateFarmDesktopConfig(value, ctx) ?? {},
+    cache
+  );
 }
 var FARM_DESKTOP_SETUP = /* @__PURE__ */ Symbol.for("@farm.js/core/desktop-setup");
 async function createFarmDesktopSetup(userConfig, root, mode, options, cache) {

package/dist/{chunk-VCFBQFOV.mjs → chunk-SN5VSO3Q.mjs}

@@ -3,8 +3,9 @@ import {
   isFarmLocaleChangeHref
 } from "./chunk-PTLXHRJZ.mjs";
 import {
-  getHashTargetElement
-} from "./chunk-45EUIICW.mjs";
+  getHashTargetElement,
+  runFarmNavigationDelegates
+} from "./chunk-G2KTRMWA.mjs";
 import {
   isFarmBlockedNavigationURL,
   isFarmExternalNavigationURL,
@@ -252,11 +253,12 @@ var SPARouter = class {
       return;
     }
     const from = window.location.pathname + window.location.search;
-    if (await this.shouldBlockNavigation({
-      from,
-      to: fullPath,
-      action: replace ? "replace" : "push"
-    })) {
+    const action = replace ? "replace" : "push";
+    if (await this.shouldBlockNavigation({ from, to: fullPath, action })) {
+      return;
+    }
+    if (!(refresh && fullPath === from) && await runFarmNavigationDelegates({ url: url.href, from, to: fullPath, action })) {
+      this.cancelActiveNavigation();
       return;
     }
     if (this.options.scrollRestoration) {