@farm.js/core 0.1.38 → 0.1.40

package/dist/{chunk-JCKYH4LG.mjs → chunk-45UZKX2J.mjs}

@@ -1,33 +1,36 @@
 import {
-  isRouteSlotSegment,
-  parseInterceptionMarker
-} from "./chunk-RHAZ22ZN.mjs";
+  appendMiddlewareDirectory,
+  appendMiddlewareRoutePath,
+  compareMiddlewareRouteLocations
+} from "./chunk-LFHCG2DU.mjs";
 import {
   normalizeMiddlewareModule,
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion
-} from "./chunk-SKVTP5PR.mjs";
+} from "./chunk-TFX4RTH2.mjs";
 import {
   compileMiddlewareConfig,
   compileMiddlewareRoute,
   matchesMiddlewareConfigAt,
   matchesMiddlewareRouteAt,
   toMiddlewareRoutePathname
-} from "./chunk-HZFM2LWQ.mjs";
+} from "./chunk-HKFBMHCD.mjs";
 import {
   createCliColors
 } from "./chunk-I2BHUNBU.mjs";
 import {
-  loadFarmDevModule,
   toFileModuleUrl
-} from "./chunk-KMTGADN3.mjs";
+} from "./chunk-7GNWGLWB.mjs";
+import {
+  loadFarmDevModule
+} from "./chunk-QCVIRVHE.mjs";
 import {
   logger
 } from "./chunk-KI3MESHB.mjs";
 import {
   emitFarmEvent
-} from "./chunk-FUZEBRP3.mjs";
+} from "./chunk-4GP3XZ4Z.mjs";
 import {
   sendWebResponse
 } from "./chunk-Z2RZJZIZ.mjs";
@@ -41,7 +44,7 @@ import {
 } from "./chunk-CBBLJMR5.mjs";
 import {
   resolveFarmRequestURL
-} from "./chunk-POSPE3IO.mjs";
+} from "./chunk-ZOABCQGT.mjs";
 import {
   stripFarmLocaleFromPathname
 } from "./chunk-L3KT7IXV.mjs";
@@ -194,38 +197,6 @@ __name(createContext, "createContext");
 // src/middleware/manager.ts
 import * as fs from "fs";
 import * as path from "path";
-
-// src/middleware/path.ts
-function appendMiddlewareRoutePath(routePath, directoryName) {
-  const marker = parseInterceptionMarker(directoryName);
-  if (marker) {
-    const owner = routePath.split("/").filter(Boolean);
-    const parts = [
-      ...marker.root ? [] : owner.slice(0, Math.max(0, owner.length - marker.up)),
-      ...marker.remainder ? [marker.remainder] : []
-    ];
-    return `/${parts.join("/")}`;
-  }
-  if (directoryName.startsWith("(") && directoryName.endsWith(")") || isRouteSlotSegment(directoryName)) {
-    return routePath;
-  }
-  return routePath === "/" ? `/${directoryName}` : `${routePath}/${directoryName}`;
-}
-__name(appendMiddlewareRoutePath, "appendMiddlewareRoutePath");
-function appendMiddlewareDirectory(directory, directoryName) {
-  return directory === "" ? directoryName : `${directory}/${directoryName}`;
-}
-__name(appendMiddlewareDirectory, "appendMiddlewareDirectory");
-function countSegments(value) {
-  return value.split("/").filter(Boolean).length;
-}
-__name(countSegments, "countSegments");
-function compareMiddlewareRouteLocations(left, right) {
-  return countSegments(left.path) - countSegments(right.path) || left.path.localeCompare(right.path) || countSegments(left.directory) - countSegments(right.directory) || left.directory.localeCompare(right.directory);
-}
-__name(compareMiddlewareRouteLocations, "compareMiddlewareRouteLocations");
-
-// src/middleware/manager.ts
 function isMiddlewareResponse(value) {
   return value instanceof Response;
 }
@@ -562,8 +533,5 @@ var MiddlewareManager = _MiddlewareManager;
 
 export {
   createContext,
-  appendMiddlewareRoutePath,
-  appendMiddlewareDirectory,
-  compareMiddlewareRouteLocations,
   MiddlewareManager
 };

package/dist/{chunk-FUCSUGDM.cjs → chunk-4A3YUB4D.cjs}

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }
 
 
-var _chunk6V4TDWECcjs = require('./chunk-6V4TDWEC.cjs');
+var _chunkCGVPXIRNcjs = require('./chunk-CGVPXIRN.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -30,7 +30,7 @@ function findProgrammaticRouteFiles(root, srcDir = "src") {
 _chunkS3JO3N4Hcjs.__name.call(void 0, findProgrammaticRouteFiles, "findProgrammaticRouteFiles");
 function findProgrammaticRouteFilesInDir(srcRoot) {
   const files = [];
-  for (const fileName of _chunk6V4TDWECcjs.PROGRAMMATIC_ROUTE_FILE_NAMES) {
+  for (const fileName of _chunkCGVPXIRNcjs.PROGRAMMATIC_ROUTE_FILE_NAMES) {
     const filePath = _path.join.call(void 0, srcRoot, fileName);
     if (_fs.existsSync.call(void 0, filePath)) {
       files.push(filePath);
@@ -47,7 +47,7 @@ async function discoverProgrammaticRoutePaths(root, srcDir = "src") {
   ]);
   for (const filePath of files) {
     const source = _fs.readFileSync.call(void 0, filePath, "utf8");
-    for (const routePath of _chunk6V4TDWECcjs.scanProgrammaticPagePaths.call(void 0, source)) {
+    for (const routePath of _chunkCGVPXIRNcjs.scanProgrammaticPagePaths.call(void 0, source)) {
       paths.add(routePath);
     }
   }

package/dist/{chunk-FUZEBRP3.mjs → chunk-4GP3XZ4Z.mjs}

@@ -307,12 +307,11 @@ function hashFarmCacheKey(value) {
 __name(hashFarmCacheKey, "hashFarmCacheKey");
 function toEventAttributes(event) {
   const attributes = {};
-  const redactKey = typeof event.type === "string" && event.type.startsWith("cache.");
   for (const [key, value] of Object.entries(event)) {
     if (key === "timestamp" || key === "level" || key === "error" || key === "traceId" || key === "spanId" || key === "traceSampled" || value === void 0) {
       continue;
     }
-    if (redactKey && key === "key" && typeof value === "string") {
+    if (key === "key" && typeof value === "string") {
       attributes["farm.key_hash"] = hashFarmCacheKey(value);
       continue;
     }
@@ -432,6 +431,7 @@ function emitFarmEvent(input) {
     level: inferFarmEventLevel(input.type),
     ...input
   };
+  if (event.type === "route.redirect") event.to = event.to.replace(/[?#][\s\S]*$/, "");
   const traceContext = recordFarmEventTrace(event);
   if (traceContext) {
     event.traceId = traceContext.traceId;
@@ -553,7 +553,9 @@ function formatFarmEventDetails(event) {
     "count"
   ]) {
     const value = record[key];
-    if (value !== void 0) {
+    if (key === "key" && typeof value === "string") {
+      details.push(`key_hash=${hashFarmCacheKey(value)}`);
+    } else if (value !== void 0) {
       details.push(`${key}=${formatDetailValue(value)}`);
     }
   }

package/dist/chunk-4TLUFAIP.cjs

@@ -0,0 +1,92 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+
+var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
+
+// src/request-context.ts
+var REQUEST_CONTEXT_STORE_KEY = /* @__PURE__ */ Symbol.for("farm.requestContextStore");
+function getRequestContextStore() {
+  const globalState = globalThis;
+  if (!globalState[REQUEST_CONTEXT_STORE_KEY]) {
+    globalState[REQUEST_CONTEXT_STORE_KEY] = /* @__PURE__ */ new WeakMap();
+  }
+  return globalState[REQUEST_CONTEXT_STORE_KEY];
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getRequestContextStore, "getRequestContextStore");
+function getBucket(target) {
+  const requestContextStore = getRequestContextStore();
+  let bucket = requestContextStore.get(target);
+  if (!bucket) {
+    bucket = {
+      privateData: /* @__PURE__ */ new Map(),
+      exposedData: /* @__PURE__ */ new Map()
+    };
+    requestContextStore.set(target, bucket);
+  }
+  return bucket;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getBucket, "getBucket");
+function setRequestContext(target, key, value, options = {}) {
+  const bucket = getBucket(target);
+  bucket.privateData.set(key, value);
+  if (options.exposeToPage) {
+    bucket.exposedData.set(key, value);
+  }
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, setRequestContext, "setRequestContext");
+function getRequestContext(target, key) {
+  const requestContextStore = getRequestContextStore();
+  const bucket = requestContextStore.get(target);
+  return _optionalChain([bucket, 'optionalAccess', _ => _.privateData, 'access', _2 => _2.get, 'call', _3 => _3(key)]);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getRequestContext, "getRequestContext");
+function hasRequestContext(target, key) {
+  const requestContextStore = getRequestContextStore();
+  const bucket = requestContextStore.get(target);
+  return _nullishCoalesce(_optionalChain([bucket, 'optionalAccess', _4 => _4.privateData, 'access', _5 => _5.has, 'call', _6 => _6(key)]), () => ( false));
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, hasRequestContext, "hasRequestContext");
+function deleteRequestContext(target, key) {
+  const requestContextStore = getRequestContextStore();
+  const bucket = requestContextStore.get(target);
+  if (!bucket) return false;
+  const removedPrivate = bucket.privateData.delete(key);
+  bucket.exposedData.delete(key);
+  return removedPrivate;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, deleteRequestContext, "deleteRequestContext");
+function clearRequestContext(target) {
+  const requestContextStore = getRequestContextStore();
+  const bucket = requestContextStore.get(target);
+  if (!bucket) return;
+  bucket.privateData.clear();
+  bucket.exposedData.clear();
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, clearRequestContext, "clearRequestContext");
+function getRequestContextSnapshot(target, options = {}) {
+  const requestContextStore = getRequestContextStore();
+  const bucket = requestContextStore.get(target);
+  if (!bucket) return /* @__PURE__ */ new Map();
+  if (options.exposedOnly) {
+    return new Map(bucket.exposedData);
+  }
+  return new Map(bucket.privateData);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, getRequestContextSnapshot, "getRequestContextSnapshot");
+function copyRequestContext(source, target) {
+  const bucket = getRequestContextStore().get(source);
+  if (!bucket || source === target) return;
+  for (const [key, value] of bucket.privateData) {
+    setRequestContext(target, key, value, { exposeToPage: bucket.exposedData.has(key) });
+  }
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, copyRequestContext, "copyRequestContext");
+
+
+
+
+
+
+
+
+
+exports.setRequestContext = setRequestContext; exports.getRequestContext = getRequestContext; exports.hasRequestContext = hasRequestContext; exports.deleteRequestContext = deleteRequestContext; exports.clearRequestContext = clearRequestContext; exports.getRequestContextSnapshot = getRequestContextSnapshot; exports.copyRequestContext = copyRequestContext;

package/dist/chunk-4U5XZDLG.cjs

@@ -0,0 +1,80 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
+
+var _chunk6D24SDKOcjs = require('./chunk-6D24SDKO.cjs');
+
+
+var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
+
+// src/schema-extend.ts
+function collectSchemaExtensions(owner, schema, models) {
+  if (!schema.extend) return [];
+  const resolved = _chunk6D24SDKOcjs.resolveSchemaModels.call(void 0, owner, schema);
+  const extensions = [];
+  for (const [modelKey, extension] of Object.entries(schema.extend)) {
+    const model = resolved[modelKey];
+    if (!model || !model.external && (!models || models.includes(modelKey))) continue;
+    const fields = Object.keys(_nullishCoalesce(extension.fields, () => ( {}))).map((fieldKey) => {
+      const field = model.fields[fieldKey];
+      assertAddableColumn(owner, modelKey, fieldKey, field);
+      return { fieldKey, field };
+    });
+    if (fields.length > 0) {
+      extensions.push({ owner, modelKey, table: model.name, fields });
+    }
+  }
+  return extensions;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, collectSchemaExtensions, "collectSchemaExtensions");
+function assertAddableColumn(owner, modelKey, fieldKey, field) {
+  const where = `${owner} adds "${modelKey}.${fieldKey}" to a table it does not own`;
+  if (field.primaryKey || field.unique || field.index || field.list) {
+    const what = field.primaryKey ? "a primary key" : field.unique ? "unique" : field.index ? "indexed" : "a list";
+    throw new Error(`${where}, which cannot be ${what}. Remove it from the extension.`);
+  }
+  if (field.nullable !== true && field.required !== false && field.default === void 0) {
+    throw new Error(
+      `${where}. The table may already have rows, so the column needs a \`default\` or \`nullable: true\`.`
+    );
+  }
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, assertAddableColumn, "assertAddableColumn");
+function isSchemaExtensionAllowed(allowExtend, extension) {
+  if (!allowExtend || !Object.prototype.hasOwnProperty.call(allowExtend, extension.owner)) {
+    return false;
+  }
+  const allowed = _nullishCoalesce(allowExtend[extension.owner], () => ( []));
+  return allowed.includes(extension.modelKey) || allowed.includes(extension.table);
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, isSchemaExtensionAllowed, "isSchemaExtensionAllowed");
+function describeSchemaExtensionApproval(extension) {
+  return `schema: { allowExtend: { ${JSON.stringify(extension.owner)}: [${JSON.stringify(extension.modelKey)}] } }`;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, describeSchemaExtensionApproval, "describeSchemaExtensionApproval");
+
+// src/schema-owner.ts
+var FARM_SCHEMA_TABLES = /* @__PURE__ */ Symbol.for("farm.schema-tables");
+function declareSchemaTables(target, declaration) {
+  Object.defineProperty(target, FARM_SCHEMA_TABLES, {
+    value: declaration,
+    enumerable: false,
+    configurable: true
+  });
+  return target;
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, declareSchemaTables, "declareSchemaTables");
+function readSchemaTables(candidate) {
+  if (!candidate || typeof candidate !== "object" && typeof candidate !== "function") {
+    return void 0;
+  }
+  return candidate[FARM_SCHEMA_TABLES];
+}
+_chunkS3JO3N4Hcjs.__name.call(void 0, readSchemaTables, "readSchemaTables");
+
+
+
+
+
+
+
+
+exports.collectSchemaExtensions = collectSchemaExtensions; exports.isSchemaExtensionAllowed = isSchemaExtensionAllowed; exports.describeSchemaExtensionApproval = describeSchemaExtensionApproval; exports.FARM_SCHEMA_TABLES = FARM_SCHEMA_TABLES; exports.declareSchemaTables = declareSchemaTables; exports.readSchemaTables = readSchemaTables;

package/dist/{chunk-VXEEATVD.cjs → chunk-4XO5GSD6.cjs}

@@ -6,7 +6,7 @@
 var _chunkDVM4FKZLcjs = require('./chunk-DVM4FKZL.cjs');
 
 
-var _chunk6XWDE2P2cjs = require('./chunk-6XWDE2P2.cjs');
+var _chunkXVIEGKTTcjs = require('./chunk-XVIEGKTT.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -29,7 +29,7 @@ function createRewritesPlugin(rewrites, {
       if (overrideBeforeRequest) {
         await overrideBeforeRequest(req, res, context);
       }
-      const url = _chunk6XWDE2P2cjs.resolveFarmRequestURL.call(void 0, req);
+      const url = _chunkXVIEGKTTcjs.resolveFarmRequestURL.call(void 0, req);
       const routePath = _chunkDVM4FKZLcjs.resolveConfigRoutePathname.call(void 0, url.pathname, i18n);
       const pathname = routePath.pathname;
       for (const { rewrite, pattern } of compiledRewrites) {

package/dist/{chunk-P664ZVTV.mjs → chunk-4ZZNPK25.mjs}

@@ -1,10 +1,10 @@
 import {
   collectFarmLlmsTxtPages
-} from "./chunk-HD5CF3OE.mjs";
+} from "./chunk-ETPEZLS3.mjs";
 import {
   getFarmMarkdownMirrorPath,
   isFarmMarkdownMirrorExposed
-} from "./chunk-VNGH5MLF.mjs";
+} from "./chunk-I6UVKUYK.mjs";
 import {
   _listFarmMCPCatalogs,
   _listFarmRegisteredMCPServers