@openclaw/firecrawl-plugin 2026.10.10-beta.5 → 2026.11.5-beta.1

package/dist/index.js

@@ -1,11 +1,11 @@
-import { n as runFirecrawlScrape, r as runFirecrawlSearch } from "./.setup/firecrawl-client-CMLsufX8.mjs";
-import { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-uRENNKri.mjs";
-import { n as createFirecrawlWebSearchProvider, t as createFirecrawlFreeWebSearchProvider } from "./.setup/firecrawl-search-provider-CFhWH8gx.mjs";
+import { n as runFirecrawlScrape, r as runFirecrawlSearch } from "./.setup/firecrawl-client-CDyLQvtN.mjs";
+import { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-QmPccHZS.mjs";
+import { n as createFirecrawlWebSearchProvider, t as createFirecrawlFreeWebSearchProvider } from "./.setup/firecrawl-search-provider-wsRgx6kl.mjs";
+import { optionalNonNegativeIntegerSchema, optionalPositiveIntegerSchema, optionalStringEnum } from "openclaw/plugin-sdk/channel-actions";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
-import { optionalStringEnum } from "openclaw/plugin-sdk/channel-actions";
 import { jsonResult, readNonNegativeIntegerParam, readPositiveIntegerParam, readStringArrayParam, readStringParam } from "openclaw/plugin-sdk/provider-web-search";
 import { Type } from "typebox";
-//#region extensions/firecrawl/src/firecrawl-scrape-tool.ts
+// extensions/firecrawl/index.ts
 const FirecrawlScrapeToolSchema = Type.Object({
 	url: Type.String({ description: "HTTP or HTTPS URL to scrape via Firecrawl." }),
 	extractMode: optionalStringEnum(["markdown", "text"], { description: "Extraction mode (\"markdown\" or \"text\"). Default: markdown." }),
@@ -14,63 +14,21 @@ const FirecrawlScrapeToolSchema = Type.Object({
 		minimum: 100
 	})),
 	onlyMainContent: Type.Optional(Type.Boolean({ description: "Keep only main content when Firecrawl supports it." })),
-	maxAgeMs: Type.Optional(Type.Integer({
-		description: "Maximum Firecrawl cache age in milliseconds.",
-		minimum: 0
-	})),
+	maxAgeMs: optionalNonNegativeIntegerSchema({ description: "Maximum Firecrawl cache age in milliseconds." }),
 	proxy: optionalStringEnum([
 		"auto",
 		"basic",
 		"stealth"
 	], { description: "Firecrawl proxy mode (\"auto\", \"basic\", or \"stealth\")." }),
 	storeInCache: Type.Optional(Type.Boolean({ description: "Whether Firecrawl should store the scrape in its cache." })),
-	timeoutSeconds: Type.Optional(Type.Integer({
-		description: "Timeout in seconds for the Firecrawl scrape request.",
-		minimum: 1
-	}))
+	timeoutSeconds: optionalPositiveIntegerSchema({ description: "Timeout in seconds for the Firecrawl scrape request." })
 }, { additionalProperties: false });
-function createFirecrawlScrapeTool(api) {
-	return {
-		name: "firecrawl_scrape",
-		label: "Firecrawl Scrape",
-		resultContentSource: "network",
-		description: "Scrape a page using Firecrawl v2/scrape. Useful for JS-heavy or bot-protected pages where a plain URL fetch is weak.",
-		parameters: FirecrawlScrapeToolSchema,
-		execute: async (_toolCallId, rawParams, signal) => {
-			signal?.throwIfAborted();
-			const url = readStringParam(rawParams, "url", { required: true });
-			const extractMode = readStringParam(rawParams, "extractMode") === "text" ? "text" : "markdown";
-			const maxChars = readPositiveIntegerParam(rawParams, "maxChars");
-			const maxAgeMs = readNonNegativeIntegerParam(rawParams, "maxAgeMs");
-			const timeoutSeconds = readPositiveIntegerParam(rawParams, "timeoutSeconds");
-			const proxyRaw = readStringParam(rawParams, "proxy");
-			const proxy = proxyRaw === "basic" || proxyRaw === "stealth" || proxyRaw === "auto" ? proxyRaw : void 0;
-			const onlyMainContent = typeof rawParams.onlyMainContent === "boolean" ? rawParams.onlyMainContent : void 0;
-			const storeInCache = typeof rawParams.storeInCache === "boolean" ? rawParams.storeInCache : void 0;
-			return jsonResult(await runFirecrawlScrape({
-				cfg: api.config,
-				url,
-				extractMode,
-				maxChars,
-				onlyMainContent,
-				maxAgeMs,
-				proxy,
-				storeInCache,
-				timeoutSeconds,
-				...signal ? { signal } : {}
-			}));
-		}
-	};
-}
-//#endregion
-//#region extensions/firecrawl/src/firecrawl-search-tool.ts
 const FirecrawlSearchToolSchema = Type.Object({
 	query: Type.String({ description: "Search query string." }),
-	count: Type.Optional(Type.Integer({
+	count: optionalPositiveIntegerSchema({
 		description: "Number of results to return (1-100).",
-		minimum: 1,
 		maximum: 100
-	})),
+	}),
 	sources: Type.Optional(Type.Array(Type.String(), { description: "Optional sources list, for example [\"web\"], [\"news\"], or [\"images\"]." })),
 	categories: Type.Optional(Type.Array(Type.String(), { description: "Optional Firecrawl categories, for example [\"github\"] or [\"research\"]." })),
 	includeDomains: Type.Optional(Type.Array(Type.String(), { description: "Restrict results to these hostnames (no protocol or path). Cannot be combined with excludeDomains." })),
@@ -79,43 +37,8 @@ const FirecrawlSearchToolSchema = Type.Object({
 	location: Type.Optional(Type.String({ description: "Geo-target location, for example \"Germany\" or \"San Francisco,California,United States\"." })),
 	country: Type.Optional(Type.String({ description: "ISO country code for geo-targeting, for example \"US\", \"DE\", or \"JP\"." })),
 	scrapeResults: Type.Optional(Type.Boolean({ description: "Include scraped result content when Firecrawl returns it." })),
-	timeoutSeconds: Type.Optional(Type.Integer({
-		description: "Timeout in seconds for the Firecrawl Search request.",
-		minimum: 1
-	}))
+	timeoutSeconds: optionalPositiveIntegerSchema({ description: "Timeout in seconds for the Firecrawl Search request." })
 }, { additionalProperties: false });
-function createFirecrawlSearchTool(api) {
-	return {
-		name: "firecrawl_search",
-		label: "Firecrawl Search",
-		resultContentSource: "network",
-		description: "Search the web using Firecrawl v2/search. Supports includeDomains/excludeDomains filtering and tbs time filters (day/week/month/year). Can optionally include scraped content from result pages.",
-		parameters: FirecrawlSearchToolSchema,
-		execute: async (_toolCallId, rawParams, signal) => {
-			signal?.throwIfAborted();
-			return jsonResult(await runFirecrawlSearch({
-				query: readStringParam(rawParams, "query", { required: true }),
-				count: readPositiveIntegerParam(rawParams, "count", {
-					max: 100,
-					message: "count must be an integer from 1 to 100"
-				}),
-				timeoutSeconds: readPositiveIntegerParam(rawParams, "timeoutSeconds"),
-				sources: readStringArrayParam(rawParams, "sources"),
-				categories: readStringArrayParam(rawParams, "categories"),
-				includeDomains: readStringArrayParam(rawParams, "includeDomains"),
-				excludeDomains: readStringArrayParam(rawParams, "excludeDomains"),
-				tbs: readStringParam(rawParams, "tbs"),
-				location: readStringParam(rawParams, "location"),
-				country: readStringParam(rawParams, "country"),
-				scrapeResults: rawParams.scrapeResults === true,
-				cfg: api.config,
-				...signal ? { signal } : {}
-			}));
-		}
-	};
-}
-//#endregion
-//#region extensions/firecrawl/index.ts
 var firecrawl_default = definePluginEntry({
 	id: "firecrawl",
 	name: "Firecrawl Plugin",
@@ -124,9 +47,65 @@ var firecrawl_default = definePluginEntry({
 		api.registerWebFetchProvider(createFirecrawlWebFetchProvider());
 		api.registerWebSearchProvider(createFirecrawlWebSearchProvider());
 		api.registerWebSearchProvider(createFirecrawlFreeWebSearchProvider());
-		api.registerTool(createFirecrawlSearchTool(api));
-		api.registerTool(createFirecrawlScrapeTool(api));
+		api.registerTool({
+			name: "firecrawl_search",
+			label: "Firecrawl Search",
+			resultContentSource: "network",
+			description: "Search the web using Firecrawl v2/search. Supports includeDomains/excludeDomains filtering and tbs time filters (day/week/month/year). Can optionally include scraped content from result pages.",
+			parameters: FirecrawlSearchToolSchema,
+			execute: async (_toolCallId, rawParams, signal) => {
+				signal?.throwIfAborted();
+				return jsonResult(await runFirecrawlSearch({
+					query: readStringParam(rawParams, "query", { required: true }),
+					count: readPositiveIntegerParam(rawParams, "count", {
+						max: 100,
+						message: "count must be an integer from 1 to 100"
+					}),
+					timeoutSeconds: readPositiveIntegerParam(rawParams, "timeoutSeconds"),
+					sources: readStringArrayParam(rawParams, "sources"),
+					categories: readStringArrayParam(rawParams, "categories"),
+					includeDomains: readStringArrayParam(rawParams, "includeDomains"),
+					excludeDomains: readStringArrayParam(rawParams, "excludeDomains"),
+					tbs: readStringParam(rawParams, "tbs"),
+					location: readStringParam(rawParams, "location"),
+					country: readStringParam(rawParams, "country"),
+					scrapeResults: rawParams.scrapeResults === true,
+					cfg: api.config,
+					...signal ? { signal } : {}
+				}));
+			}
+		});
+		api.registerTool({
+			name: "firecrawl_scrape",
+			label: "Firecrawl Scrape",
+			resultContentSource: "network",
+			description: "Scrape a page using Firecrawl v2/scrape. Useful for JS-heavy or bot-protected pages where a plain URL fetch is weak.",
+			parameters: FirecrawlScrapeToolSchema,
+			execute: async (_toolCallId, rawParams, signal) => {
+				signal?.throwIfAborted();
+				const url = readStringParam(rawParams, "url", { required: true });
+				const extractMode = readStringParam(rawParams, "extractMode") === "text" ? "text" : "markdown";
+				const maxChars = readPositiveIntegerParam(rawParams, "maxChars");
+				const maxAgeMs = readNonNegativeIntegerParam(rawParams, "maxAgeMs");
+				const timeoutSeconds = readPositiveIntegerParam(rawParams, "timeoutSeconds");
+				const proxyRaw = readStringParam(rawParams, "proxy");
+				const proxy = proxyRaw === "basic" || proxyRaw === "stealth" || proxyRaw === "auto" ? proxyRaw : void 0;
+				const onlyMainContent = typeof rawParams.onlyMainContent === "boolean" ? rawParams.onlyMainContent : void 0;
+				const storeInCache = typeof rawParams.storeInCache === "boolean" ? rawParams.storeInCache : void 0;
+				return jsonResult(await runFirecrawlScrape({
+					cfg: api.config,
+					url,
+					extractMode,
+					maxChars,
+					onlyMainContent,
+					maxAgeMs,
+					proxy,
+					storeInCache,
+					timeoutSeconds,
+					...signal ? { signal } : {}
+				}));
+			}
+		});
 	}
 });
-//#endregion
 export { firecrawl_default as default };

package/dist/web-fetch-contract-api.js

@@ -1,2 +1,2 @@
-export { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-uRENNKri.mjs";
+export { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-QmPccHZS.mjs";
 import "./web-fetch-provider.js";

package/dist/web-fetch-provider.js

@@ -1 +1 @@
-export { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-uRENNKri.mjs";
+export { t as createFirecrawlWebFetchProvider } from "./.setup/firecrawl-fetch-provider-QmPccHZS.mjs";

package/dist/web-search-contract-api.js

@@ -1,2 +1,2 @@
-export { t as createFirecrawlFreeWebSearchProvider, n as createFirecrawlWebSearchProvider } from "./.setup/firecrawl-search-provider-CFhWH8gx.mjs";
+export { t as createFirecrawlFreeWebSearchProvider, n as createFirecrawlWebSearchProvider } from "./.setup/firecrawl-search-provider-wsRgx6kl.mjs";
 import "./web-search-provider.js";

package/dist/web-search-provider.js

@@ -1 +1 @@
-export { t as createFirecrawlFreeWebSearchProvider, n as createFirecrawlWebSearchProvider } from "./.setup/firecrawl-search-provider-CFhWH8gx.mjs";
+export { t as createFirecrawlFreeWebSearchProvider, n as createFirecrawlWebSearchProvider } from "./.setup/firecrawl-search-provider-wsRgx6kl.mjs";

package/node_modules/typebox/build/format/duration.d.mts

@@ -1,5 +1,5 @@
 /**
- * Returns true if the value is a valid ISO-8601 duration.
- * @specification https://tools.ietf.org/html/rfc3339
+ * Returns true if the value is a valid duration.
+ * @specification https://www.rfc-editor.org/rfc/rfc3339.html#appendix-A
  */
 export declare function IsDuration(value: string): boolean;

package/node_modules/typebox/build/format/duration.mjs

@@ -1,7 +1,7 @@
 const Duration = /^P((\d+Y(\d+M(\d+D)?)?|\d+M(\d+D)?|\d+D)(T(\d+H(\d+M(\d+S)?)?|\d+M(\d+S)?|\d+S))?|T(\d+H(\d+M(\d+S)?)?|\d+M(\d+S)?|\d+S)|\d+W)$/;
 /**
- * Returns true if the value is a valid ISO-8601 duration.
- * @specification https://tools.ietf.org/html/rfc3339
+ * Returns true if the value is a valid duration.
+ * @specification https://www.rfc-editor.org/rfc/rfc3339.html#appendix-A
  */
 export function IsDuration(value) {
     return Duration.test(value);

package/node_modules/typebox/build/format/idn_email.d.mts

@@ -1,5 +1,6 @@
 /**
  * Returns true if the value is an IdnEmail
  * @specification https://datatracker.ietf.org/doc/html/rfc4952
+ * @specification https://datatracker.ietf.org/doc/html/rfc6531
  */
 export declare function IsIdnEmail(value: string): boolean;

package/node_modules/typebox/build/format/idn_email.mjs

@@ -2,6 +2,7 @@ const IdnEmail = /^(?:[A-Za-z0-9!#$%&'*+\/=?^_`{|}~\u{0080}-\u{10FFFF}-]+(?:\.[A
 /**
  * Returns true if the value is an IdnEmail
  * @specification https://datatracker.ietf.org/doc/html/rfc4952
+ * @specification https://datatracker.ietf.org/doc/html/rfc6531
  */
 export function IsIdnEmail(value) {
     return IdnEmail.test(value.normalize('NFC'));

package/node_modules/typebox/build/format/idn_hostname.d.mts

@@ -1,6 +1,6 @@
 /**
  * Returns true if the value is a valid internationalized (IDN) hostname.
- * @specification https://tools.ietf.org/html/rfc3490
+ * @specification https://datatracker.ietf.org/doc/html/rfc5890
  * @specification https://tools.ietf.org/html/rfc5891
  * @specification https://tools.ietf.org/html/rfc5892
  * @specification https://tools.ietf.org/html/rfc5893

package/node_modules/typebox/build/format/idn_hostname.mjs

@@ -1,7 +1,7 @@
 import * as Idna from './idna/index.mjs';
 /**
  * Returns true if the value is a valid internationalized (IDN) hostname.
- * @specification https://tools.ietf.org/html/rfc3490
+ * @specification https://datatracker.ietf.org/doc/html/rfc5890
  * @specification https://tools.ietf.org/html/rfc5891
  * @specification https://tools.ietf.org/html/rfc5892
  * @specification https://tools.ietf.org/html/rfc5893

package/node_modules/typebox/build/format/ipv4.d.mts

@@ -1,5 +1,5 @@
 /**
- * Returns true if the value is a IPV4 address
- * @specification http://tools.ietf.org/html/rfc2673#section-3.2
+ * Returns true if the value is an IPv4 address
+ * @specification https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2
  */
 export declare function IsIPv4(value: string): boolean;

package/node_modules/typebox/build/format/ipv4.mjs

@@ -1,7 +1,7 @@
 const IPv4 = /^(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)$/;
 /**
- * Returns true if the value is a IPV4 address
- * @specification http://tools.ietf.org/html/rfc2673#section-3.2
+ * Returns true if the value is an IPv4 address
+ * @specification https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2
  */
 export function IsIPv4(value) {
     return IPv4.test(value);

package/node_modules/typebox/build/format/ipv6.d.mts

@@ -1,5 +1,5 @@
 /**
  * Returns true if the value is an IPv6 address
- * @specification http://tools.ietf.org/html/rfc2373#section-2.2
+ * @specification https://datatracker.ietf.org/doc/html/rfc4291#section-2.2
  */
 export declare function IsIPv6(value: string): boolean;

package/node_modules/typebox/build/format/ipv6.mjs

@@ -1,7 +1,7 @@
 const IPv6 = /^(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:)?[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)$/i;
 /**
  * Returns true if the value is an IPv6 address
- * @specification http://tools.ietf.org/html/rfc2373#section-2.2
+ * @specification https://datatracker.ietf.org/doc/html/rfc4291#section-2.2
  */
 export function IsIPv6(value) {
     return IPv6.test(value);

package/node_modules/typebox/build/format/relative_json_pointer.d.mts

@@ -1,6 +1,6 @@
 /**
- * Returns true if the value is a relative json pointer
- * @specification https://datatracker.ietf.org/doc/html/rfc6901
+ * Returns true if the value is a relative JSON Pointer
+ * @specification https://datatracker.ietf.org/doc/html/draft-handrews-relative-json-pointer/
  * @source https://github.com/ajv-validator/ajv-formats
  */
 export declare function IsRelativeJsonPointer(value: string): boolean;

package/node_modules/typebox/build/format/relative_json_pointer.mjs

@@ -1,7 +1,7 @@
 const RelativeJsonPointer = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
 /**
- * Returns true if the value is a relative json pointer
- * @specification https://datatracker.ietf.org/doc/html/rfc6901
+ * Returns true if the value is a relative JSON Pointer
+ * @specification https://datatracker.ietf.org/doc/html/draft-handrews-relative-json-pointer/
  * @source https://github.com/ajv-validator/ajv-formats
  */
 export function IsRelativeJsonPointer(value) {

package/node_modules/typebox/build/schema/build.mjs

@@ -106,6 +106,7 @@ export function Build(...args) {
         2: (context, schema) => [context, schema],
         1: (schema) => [{}, schema]
     });
+    Engine.ResetUnique();
     Engine.ResetExternal();
     Engine.ResetFunctions();
     const stack = Engine.Stack(context, schema);

package/node_modules/typebox/build/schema/engine/_unique.d.mts

@@ -1,2 +1,4 @@
-/** Returns a Unique Variable Name */
-export declare function Unique(): string;
+/** Creates a unique variable name */
+export declare function CreateUnique(): string;
+/** Resets the unique variable name counter */
+export declare function ResetUnique(): void;

package/node_modules/typebox/build/schema/engine/_unique.mjs

@@ -1,5 +1,9 @@
 let index = 0;
-/** Returns a Unique Variable Name */
-export function Unique() {
-    return `var_${index++}`;
+/** Creates a unique variable name */
+export function CreateUnique() {
+    return `unique_${index++}`;
+}
+/** Resets the unique variable name counter */
+export function ResetUnique() {
+    index = 0;
 }

package/node_modules/typebox/build/schema/engine/additionalItems.mjs

@@ -1,6 +1,6 @@
 // deno-fmt-ignore-file
 import * as Schema from '../types/index.mjs';
-import { Unique } from './_unique.mjs';
+import * as Unique from './_unique.mjs';
 import { Guard as G, EmitGuard as E } from '../../guard/index.mjs';
 import { BuildSchemaPushStack, CheckSchemaPushStack, ErrorSchemaPushStack } from './schema.mjs';
 // ------------------------------------------------------------------
@@ -13,14 +13,14 @@ function IsValid(schema) {
 // Build
 // ------------------------------------------------------------------
 function BuildAdditionalItemsStandard(stack, context, schema, value) {
-    const [item, index] = [Unique(), Unique()];
+    const [item, index] = [Unique.CreateUnique(), Unique.CreateUnique()];
     const isSchema = BuildSchemaPushStack(stack, context, schema.additionalItems, item);
     const isLength = E.IsLessThan(index, E.Constant(schema.items.length));
     const addIndex = context.AddIndex(index);
     return E.Every(value, E.Constant(0), [item, index], E.Or(isLength, E.And(isSchema, addIndex)));
 }
 function BuildAdditionalItemsFast(stack, context, schema, value) {
-    const [item, index] = [Unique(), Unique()];
+    const [item, index] = [Unique.CreateUnique(), Unique.CreateUnique()];
     const isSchema = BuildSchemaPushStack(stack, context, schema.additionalItems, item);
     const isLength = E.IsLessThan(index, E.Constant(schema.items.length));
     return E.Every(value, E.Constant(0), [item, index], E.Or(isLength, isSchema));

package/node_modules/typebox/build/schema/engine/additionalProperties.d.mts

@@ -1,9 +1,6 @@
 import * as Schema from '../types/index.mjs';
 import * as Stack from './_stack.mjs';
 import { BuildContext, CheckContext, ErrorContext } from './_context.mjs';
-export declare function CanAdditionalPropertiesFast(_context: BuildContext, schema: Schema.XAdditionalProperties, _value: string): schema is Schema.XAdditionalProperties & Schema.XRequired;
-export declare function BuildAdditionalPropertiesFast(_context: BuildContext, schema: Schema.XAdditionalProperties & Schema.XRequired, value: string): string;
-export declare function BuildAdditionalPropertiesStandard(stack: Stack.XStack, context: BuildContext, schema: Schema.XAdditionalProperties, value: string): string;
 export declare function BuildAdditionalProperties(stack: Stack.XStack, context: BuildContext, schema: Schema.XAdditionalProperties, value: string): string;
 export declare function CheckAdditionalProperties(stack: Stack.XStack, context: CheckContext, schema: Schema.XAdditionalProperties, value: Record<PropertyKey, unknown>): boolean;
 export declare function ErrorAdditionalProperties(stack: Stack.XStack, context: ErrorContext, schemaPath: string, instancePath: string, schema: Schema.XAdditionalProperties, value: Record<PropertyKey, unknown>): boolean;

package/node_modules/typebox/build/schema/engine/additionalProperties.mjs

@@ -1,8 +1,8 @@
 // deno-fmt-ignore-file
 import * as Schema from '../types/index.mjs';
+import * as Unique from './_unique.mjs';
 import * as Externals from './_externals.mjs';
 import * as Pathing from './_pathing.mjs';
-import { Unique } from './_unique.mjs';
 import { UnicodeRegExp } from './_regexp.mjs';
 import { EmitGuard as E, Guard as G } from '../../guard/index.mjs';
 import { BuildSchemaPushStack, CheckSchemaPushStack, ErrorSchemaPushStack } from './schema.mjs';
@@ -42,35 +42,33 @@ function GetPropertiesPattern(schema) {
     return G.IsEqual(patterns.length, 0) ? '(?!)' : `(${patterns.join('|')})`;
 }
 // ------------------------------------------------------------------
-// BuildAdditionalPropertiesFast
+// BuildAdditionalPropertiesFast (AdditionalProperties False)
 //
-// Optimized logic for schemas with `additionalProperties: false`.
-//
-// This fast-path applies only when:
-// - `additionalProperties` is explicitly set to false,
-// - the schema uses only `properties` (no `patternProperties`),
-// - and all defined properties are required (i.e., no optional keys).
-//
-// This constraint is common when enforcing strict object shapes
-// with only known, fixed keys. When all these conditions are met,
-// we can generate a simplified and efficient runtime check.
+// - AdditionalProperties is explicitly set to false,
+// - The schema uses only Properties (no PatternProperties),
+// - Required contains exactly the keys in Properties.
 //
 // ------------------------------------------------------------------
-export function CanAdditionalPropertiesFast(_context, schema, _value) {
+function HasExactRequiredProperties(schema) {
+    const keys = G.Keys(schema.properties);
+    return G.IsEqual(keys.length, schema.required.length)
+        && G.Every(keys, 0, (key) => schema.required.includes(key));
+}
+function CanAdditionalPropertiesFast(_context, schema, _value) {
     return Schema.IsRequired(schema)
         && Schema.IsProperties(schema)
         && !Schema.IsPatternProperties(schema)
         && G.IsEqual(schema.additionalProperties, false)
-        && G.IsEqual(G.Keys(schema.properties).length, schema.required.length);
+        && HasExactRequiredProperties(schema);
 }
-export function BuildAdditionalPropertiesFast(_context, schema, value) {
+function BuildAdditionalPropertiesFast(_context, schema, value) {
     return E.IsEqual(E.Member(E.Call(E.Member('Object', 'getOwnPropertyNames'), [value]), 'length'), E.Constant(schema.required.length));
 }
 // ------------------------------------------------------------------
 // BuildAdditionalPropertiesStandard
 // ------------------------------------------------------------------
-export function BuildAdditionalPropertiesStandard(stack, context, schema, value) {
-    const [key, _index] = [Unique(), Unique()];
+function BuildAdditionalPropertiesStandard(stack, context, schema, value) {
+    const [key, _index] = [Unique.CreateUnique(), Unique.CreateUnique()];
     const regexp = Externals.CreateVariable(UnicodeRegExp(GetPropertiesPattern(schema)));
     const isSchema = BuildSchemaPushStack(stack, context, schema.additionalProperties, `${value}[${key}]`);
     const isKey = E.Call(E.Member(regexp, 'test'), [key]);

package/node_modules/typebox/build/schema/engine/contains.mjs

@@ -1,6 +1,6 @@
 // deno-fmt-ignore-file
 import * as Schema from '../types/index.mjs';
-import { Unique } from './_unique.mjs';
+import * as Unique from './_unique.mjs';
 import { EmitGuard as E, Guard as G } from '../../guard/index.mjs';
 import { BuildSchema, CheckSchema } from './schema.mjs';
 // ------------------------------------------------------------------
@@ -13,13 +13,13 @@ function IsValid(schema) {
 // Build
 // ------------------------------------------------------------------
 function BuildContainsStandard(stack, context, schema, value) {
-    const [item, index] = [Unique(), Unique()];
+    const [item, index] = [Unique.CreateUnique(), Unique.CreateUnique()];
     const isLength = E.Not(E.IsEqual(E.Member(value, 'length'), E.Constant(0)));
     const isSome = E.SomeAll(value, [item, index], E.And(BuildSchema(stack, context, schema.contains, item), context.AddIndex(index)));
     return E.And(isLength, isSome);
 }
 function BuildContainsFast(stack, context, schema, value) {
-    const [item] = [Unique()];
+    const [item] = [Unique.CreateUnique()];
     const isLength = E.Not(E.IsEqual(E.Member(value, 'length'), E.Constant(0)));
     const isSome = E.Some(value, [item, '_'], BuildSchema(stack, context, schema.contains, item));
     return E.And(isLength, isSome);

package/node_modules/typebox/build/schema/engine/index.d.mts

@@ -4,6 +4,7 @@ export * from './_functions.mjs';
 export * from './_reducer.mjs';
 export * from './_refine.mjs';
 export * from './_stack.mjs';
+export * from './_unique.mjs';
 export * from './additionalItems.mjs';
 export * from './additionalProperties.mjs';
 export * from './allOf.mjs';

package/node_modules/typebox/build/schema/engine/index.mjs

@@ -7,6 +7,7 @@ export * from './_functions.mjs';
 export * from './_reducer.mjs';
 export * from './_refine.mjs';
 export * from './_stack.mjs';
+export * from './_unique.mjs';
 // ------------------------------------------------------------------
 // Schematics
 // ------------------------------------------------------------------

package/node_modules/typebox/build/schema/engine/items.mjs

@@ -1,5 +1,6 @@
 // deno-fmt-ignore-file
 import * as Schema from '../types/index.mjs';
+import * as Unique from './_unique.mjs';
 import { BuildSchemaPushStack, CheckSchemaPushStack, ErrorSchemaPushStack } from './schema.mjs';
 import { Guard as G, EmitGuard as E } from '../../guard/index.mjs';
 // ------------------------------------------------------------------
@@ -44,14 +45,16 @@ function ErrorItemsSized(stack, context, schemaPath, instancePath, schema, value
 // ------------------------------------------------------------------
 function BuildItemsUnsizedStandard(stack, context, schema, value) {
     const offset = Schema.IsPrefixItems(schema) ? schema.prefixItems.length : 0;
-    const isSchema = BuildSchemaPushStack(stack, context, schema.items, 'element');
+    const [item] = [Unique.CreateUnique()];
+    const isSchema = BuildSchemaPushStack(stack, context, schema.items, item);
     const addIndex = context.AddIndex('index');
-    return E.Every(value, E.Constant(offset), ['element', 'index'], E.And(isSchema, addIndex));
+    return E.Every(value, E.Constant(offset), [item, 'index'], E.And(isSchema, addIndex));
 }
 function BuildItemsUnsizedFast(stack, context, schema, value) {
     const offset = Schema.IsPrefixItems(schema) ? schema.prefixItems.length : 0;
-    const isSchema = BuildSchemaPushStack(stack, context, schema.items, 'element');
-    return E.Every(value, E.Constant(offset), ['element', 'index'], isSchema);
+    const [item] = [Unique.CreateUnique()];
+    const isSchema = BuildSchemaPushStack(stack, context, schema.items, item);
+    return E.Every(value, E.Constant(offset), [item, 'index'], isSchema);
 }
 function BuildItemsUnsized(stack, context, schema, value) {
     return context.UseUnevaluated()

package/node_modules/typebox/build/schema/engine/maxContains.mjs

@@ -1,6 +1,6 @@
 // deno-fmt-ignore-file
 import * as Schema from '../types/index.mjs';
-import { Unique } from './_unique.mjs';
+import * as Unique from './_unique.mjs';
 import { Guard as G, EmitGuard as E } from '../../guard/index.mjs';
 import { BuildSchema, CheckSchema } from './schema.mjs';
 // ------------------------------------------------------------------
@@ -15,7 +15,7 @@ function IsValid(schema) {
 export function BuildMaxContains(stack, context, schema, value) {
     if (!IsValid(schema))
         return E.Constant(true);
-    const [item] = [Unique()];
+    const [item] = [Unique.CreateUnique()];
     const count = E.Counted(value, [item, '_'], BuildSchema(stack, context, schema.contains, item));
     return E.IsLessEqualThan(count, E.Constant(schema.maxContains));
 }

package/node_modules/typebox/build/schema/engine/minContains.mjs

@@ -1,6 +1,6 @@
 // deno-fmt-ignore-file
 import * as Schema from '../types/index.mjs';
-import { Unique } from './_unique.mjs';
+import * as Unique from './_unique.mjs';
 import { Guard as G, EmitGuard as E } from '../../guard/index.mjs';
 import { BuildSchema, CheckSchema } from './schema.mjs';
 // ------------------------------------------------------------------
@@ -13,12 +13,12 @@ function IsValid(schema) {
 // Build
 // ------------------------------------------------------------------
 function BuildMinContainsStandard(stack, context, schema, value) {
-    const [item, index] = [Unique(), Unique()];
+    const [item, index] = [Unique.CreateUnique(), Unique.CreateUnique()];
     const count = E.Counted(value, [item, index], E.And(BuildSchema(stack, context, schema.contains, item), context.AddIndex(index)));
     return E.IsGreaterEqualThan(count, E.Constant(schema.minContains));
 }
 function BuildMinContainsFast(stack, context, schema, value) {
-    const [item] = [Unique()];
+    const [item] = [Unique.CreateUnique()];
     const count = E.Counted(value, [item, '_'], BuildSchema(stack, context, schema.contains, item));
     return E.IsGreaterEqualThan(count, E.Constant(schema.minContains));
 }

package/node_modules/typebox/build/schema/engine/oneOf.mjs

@@ -1,6 +1,6 @@
 // deno-fmt-ignore-file
 import { Reducer } from './_reducer.mjs';
-import { Unique } from './_unique.mjs';
+import * as Unique from './_unique.mjs';
 import { CheckContext, ErrorContext } from './_context.mjs';
 import { BuildSchema, CheckSchema, ErrorSchema } from './schema.mjs';
 import { EmitGuard as E, Guard as G } from '../../guard/index.mjs';
@@ -11,7 +11,7 @@ function BuildOneOfStandard(stack, context, schema, value) {
     return Reducer(stack, context, schema.oneOf, value, E.IsEqual(E.Member('results', 'length'), E.Constant(1)));
 }
 function BuildOneOfFast(stack, context, schema, value) {
-    const [result] = [Unique()];
+    const [result] = [Unique.CreateUnique()];
     const results = E.ArrayLiteral(schema.oneOf.map((schema) => BuildSchema(stack, context, schema, value)));
     const count = E.Counted(results, [result, '_'], E.IsEqual(result, E.Constant(true)));
     return E.IsEqual(count, E.Constant(1));

package/node_modules/typebox/build/schema/engine/patternProperties.mjs

@@ -1,7 +1,7 @@
 // deno-fmt-ignore-file
+import * as Unique from './_unique.mjs';
 import * as Externals from './_externals.mjs';
 import * as Pathing from './_pathing.mjs';
-import { Unique } from './_unique.mjs';
 import { UnicodeRegExp } from './_regexp.mjs';
 import { BuildSchemaPushStack, CheckSchemaPushStack, ErrorSchemaPushStack } from './schema.mjs';
 import { Guard as G, EmitGuard as E } from '../../guard/index.mjs';
@@ -10,7 +10,7 @@ import { Guard as G, EmitGuard as E } from '../../guard/index.mjs';
 // ------------------------------------------------------------------
 export function BuildPatternProperties(stack, context, schema, value) {
     return E.ReduceAnd(G.Entries(schema.patternProperties).map(([pattern, schema]) => {
-        const [key, prop] = [Unique(), Unique()];
+        const [key, prop] = [Unique.CreateUnique(), Unique.CreateUnique()];
         const regexp = Externals.CreateVariable(UnicodeRegExp(pattern));
         const notKey = E.Not(E.Call(E.Member(regexp, 'test'), [key]));
         const isSchema = BuildSchemaPushStack(stack, context, schema, prop);