refactor: centralize numeric coercion helpers · openclaw/openclaw@b877fc5

Recent Commits to openclaw:main

steipete · 2026-05-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,12 @@`
`1`	`1`	`import type { TSchema } from "typebox";`
`2`	`2`	`import { readLocalFileSafely } from "../../infra/fs-safe.js";`
`3`		`-import { parseStrictFiniteNumber } from "../../infra/parse-finite-number.js";`
`4`	`3`	`import { detectMime } from "../../media/mime.js";`
`5`	`4`	`import { readSnakeCaseParamRaw } from "../../param-key.js";`
	`5`	`+import {`
	`6`	`+asPositiveSafeInteger,`
	`7`	`+asSafeIntegerInRange,`
	`8`	`+parseStrictFiniteNumber,`
	`9`	`+} from "../../shared/number-coercion.js";`
`6`	`10`	`import { normalizeStringEntries } from "../../shared/string-normalization.js";`
`7`	`11`	`import type { ImageSanitizationLimits } from "../image-sanitization.js";`
`8`	`12`	`import type { AgentTool, AgentToolResult, AgentToolUpdateCallback } from "../runtime/index.js";`
`@@ -194,10 +198,10 @@ export function readNumberParam(`
`194`	`198`	`return undefined;`
`195`	`199`	`}`
`196`	`200`	`if (positiveInteger) {`
`197`		`-return Number.isSafeInteger(value) && value > 0 ? value : undefined;`
	`201`	`+return asPositiveSafeInteger(value);`
`198`	`202`	`}`
`199`	`203`	`if (nonNegativeInteger) {`
`200`		`-return Number.isSafeInteger(value) && value >= 0 ? value : undefined;`
	`204`	`+return asSafeIntegerInRange(value, { min: 0 });`
`201`	`205`	`}`
`202`	`206`	`return integer ? Math.trunc(value) : value;`
`203`	`207`	`}`

Original file line number	Diff line number	Diff line change
`@@ -1,54 +1,7 @@`
`1`		`-function normalizeNumericString(value: string): string \| undefined {`
`2`		`-const trimmed = value.trim();`
`3`		`-return trimmed ? trimmed : undefined;`
`4`		`-}`
`5`		`-`
`6`		`-export function parseFiniteNumber(value: unknown): number \| undefined {`
`7`		`-if (typeof value === "number" && Number.isFinite(value)) {`
`8`		`-return value;`
`9`		`-}`
`10`		`-if (typeof value === "string") {`
`11`		`-return parseStrictFiniteNumber(value);`
`12`		`-}`
`13`		`-return undefined;`
`14`		`-}`
`15`		`-`
`16`		`-export function parseStrictInteger(value: unknown): number \| undefined {`
`17`		`-if (typeof value === "number") {`
`18`		`-return Number.isSafeInteger(value) ? value : undefined;`
`19`		`-}`
`20`		`-if (typeof value !== "string") {`
`21`		`-return undefined;`
`22`		`-}`
`23`		`-const normalized = normalizeNumericString(value);`
`24`		`-if (!normalized \|\| !/^[+-]?\d+$/.test(normalized)) {`
`25`		`-return undefined;`
`26`		`-}`
`27`		`-const parsed = Number(normalized);`
`28`		`-return Number.isSafeInteger(parsed) ? parsed : undefined;`
`29`		`-}`
`30`		`-`
`31`		`-export function parseStrictFiniteNumber(value: unknown): number \| undefined {`
`32`		`-if (typeof value === "number") {`
`33`		`-return Number.isFinite(value) ? value : undefined;`
`34`		`-}`
`35`		`-if (typeof value !== "string") {`
`36`		`-return undefined;`
`37`		`-}`
`38`		`-const normalized = normalizeNumericString(value);`
`39`		`-if (!normalized \|\| !/^[+-]?(?:(?:\d+\.?\d*)\|(?:\.\d+))(?:e[+-]?\d+)?$/i.test(normalized)) {`
`40`		`-return undefined;`
`41`		`-}`
`42`		`-const parsed = Number(normalized);`
`43`		`-return Number.isFinite(parsed) ? parsed : undefined;`
`44`		`-}`
`45`		`-`
`46`		`-export function parseStrictPositiveInteger(value: unknown): number \| undefined {`
`47`		`-const parsed = parseStrictInteger(value);`
`48`		`-return parsed !== undefined && parsed > 0 ? parsed : undefined;`
`49`		`-}`
`50`		`-`
`51`		`-export function parseStrictNonNegativeInteger(value: unknown): number \| undefined {`
`52`		`-const parsed = parseStrictInteger(value);`
`53`		`-return parsed !== undefined && parsed >= 0 ? parsed : undefined;`
`54`		`-}`
	`1`	`+export {`
	`2`	`+parseFiniteNumber,`
	`3`	`+parseStrictFiniteNumber,`
	`4`	`+parseStrictInteger,`
	`5`	`+parseStrictNonNegativeInteger,`
	`6`	`+parseStrictPositiveInteger,`
	`7`	`+} from "../shared/number-coercion.js";`

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ export {`
`6`	`6`	`parseStrictFiniteNumber,`
`7`	`7`	`parseStrictNonNegativeInteger,`
`8`	`8`	`parseStrictPositiveInteger,`
`9`		`-} from "../infra/parse-finite-number.js";`
	`9`	`+} from "../shared/number-coercion.js";`

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ export {`
`20`	`20`	`asPositiveSafeInteger,`
`21`	`21`	`asSafeIntegerInRange,`
`22`	`22`	`parseFiniteNumber,`
	`23`	`+parseStrictFiniteNumber,`
	`24`	`+parseStrictInteger,`
	`25`	`+parseStrictNonNegativeInteger,`
	`26`	`+parseStrictPositiveInteger,`
`23`	`27`	`} from "../shared/number-coercion.js";`
`24`	`28`	`export { asBoolean, parseBooleanValue } from "../utils/boolean.js";`
`25`	`29`	`export {`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,10 @@ import {`
`4`	`4`	`asFiniteNumberInRange,`
`5`	`5`	`asSafeIntegerInRange,`
`6`	`6`	`parseFiniteNumber,`
	`7`	`+parseStrictFiniteNumber,`
	`8`	`+parseStrictInteger,`
	`9`	`+parseStrictNonNegativeInteger,`
	`10`	`+parseStrictPositiveInteger,`
`7`	`11`	`} from "./number-coercion.js";`
`8`	`12`
`9`	`13`	`describe("number-coercion", () => {`
`@@ -37,4 +41,28 @@ describe("number-coercion", () => {`
`37`	`41`	`expect(parseFiniteNumber("")).toBeUndefined();`
`38`	`42`	`expect(parseFiniteNumber("nope")).toBeUndefined();`
`39`	`43`	`});`
	`44`	`+`
	`45`	`+test("parseStrictInteger accepts only safe integer tokens", () => {`
	`46`	`+expect(parseStrictInteger("42")).toBe(42);`
	`47`	`+expect(parseStrictInteger(" -7 ")).toBe(-7);`
	`48`	`+expect(parseStrictInteger("+9")).toBe(9);`
	`49`	`+expect(parseStrictInteger("1.5")).toBeUndefined();`
	`50`	`+expect(parseStrictInteger("1e3")).toBeUndefined();`
	`51`	`+expect(parseStrictInteger(Number.MAX_SAFE_INTEGER + 1)).toBeUndefined();`
	`52`	`+});`
	`53`	`+`
	`54`	`+test("parseStrictFiniteNumber rejects partial numeric strings", () => {`
	`55`	`+expect(parseStrictFiniteNumber("42")).toBe(42);`
	`56`	`+expect(parseStrictFiniteNumber(".5")).toBe(0.5);`
	`57`	`+expect(parseStrictFiniteNumber("1e3")).toBe(1000);`
	`58`	`+expect(parseStrictFiniteNumber("3.14ms")).toBeUndefined();`
	`59`	`+expect(parseStrictFiniteNumber("0x10")).toBeUndefined();`
	`60`	`+});`
	`61`	`+`
	`62`	`+test("strict integer range helpers enforce sign", () => {`
	`63`	`+expect(parseStrictPositiveInteger("9")).toBe(9);`
	`64`	`+expect(parseStrictPositiveInteger("0")).toBeUndefined();`
	`65`	`+expect(parseStrictNonNegativeInteger("0")).toBe(0);`
	`66`	`+expect(parseStrictNonNegativeInteger("-1")).toBeUndefined();`
	`67`	`+});`
`40`	`68`	`});`

Original file line number	Diff line number	Diff line change
`@@ -47,21 +47,58 @@ export function asSafeIntegerInRange(`
`47`	`47`	`return value;`
`48`	`48`	`}`
`49`	`49`
	`50`	`+function normalizeNumericString(value: string): string \| undefined {`
	`51`	`+const trimmed = value.trim();`
	`52`	`+return trimmed ? trimmed : undefined;`
	`53`	`+}`
	`54`	`+`
`50`	`55`	`export function parseFiniteNumber(value: unknown): number \| undefined {`
`51`	`56`	`if (typeof value === "number") {`
`52`	`57`	`return Number.isFinite(value) ? value : undefined;`
`53`	`58`	`}`
	`59`	`+return parseStrictFiniteNumber(value);`
	`60`	`+}`
	`61`	`+`
	`62`	`+export function parseStrictInteger(value: unknown): number \| undefined {`
	`63`	`+if (typeof value === "number") {`
	`64`	`+return Number.isSafeInteger(value) ? value : undefined;`
	`65`	`+}`
`54`	`66`	`if (typeof value !== "string") {`
`55`	`67`	`return undefined;`
`56`	`68`	`}`
`57`		`-const trimmed = value.trim();`
`58`		`-if (!trimmed \|\| !/^[+-]?(?:(?:\d+\.?\d*)\|(?:\.\d+))(?:e[+-]?\d+)?$/i.test(trimmed)) {`
	`69`	`+const normalized = normalizeNumericString(value);`
	`70`	`+if (!normalized \|\| !/^[+-]?\d+$/.test(normalized)) {`
	`71`	`+return undefined;`
	`72`	`+}`
	`73`	`+const parsed = Number(normalized);`
	`74`	`+return Number.isSafeInteger(parsed) ? parsed : undefined;`
	`75`	`+}`
	`76`	`+`
	`77`	`+export function parseStrictFiniteNumber(value: unknown): number \| undefined {`
	`78`	`+if (typeof value === "number") {`
	`79`	`+return Number.isFinite(value) ? value : undefined;`
	`80`	`+}`
	`81`	`+if (typeof value !== "string") {`
`59`	`82`	`return undefined;`
`60`	`83`	`}`
`61`		`-const parsed = Number(trimmed);`
	`84`	`+const normalized = normalizeNumericString(value);`
	`85`	`+if (!normalized \|\| !/^[+-]?(?:(?:\d+\.?\d*)\|(?:\.\d+))(?:e[+-]?\d+)?$/i.test(normalized)) {`
	`86`	`+return undefined;`
	`87`	`+}`
	`88`	`+const parsed = Number(normalized);`
`62`	`89`	`return Number.isFinite(parsed) ? parsed : undefined;`
`63`	`90`	`}`
`64`	`91`
`65`	`92`	`export function asPositiveSafeInteger(value: unknown): number \| undefined {`
`66`	`93`	`return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : undefined;`
`67`	`94`	`}`
	`95`	`+`
	`96`	`+export function parseStrictPositiveInteger(value: unknown): number \| undefined {`
	`97`	`+const parsed = parseStrictInteger(value);`
	`98`	`+return parsed !== undefined && parsed > 0 ? parsed : undefined;`
	`99`	`+}`
	`100`	`+`
	`101`	`+export function parseStrictNonNegativeInteger(value: unknown): number \| undefined {`
	`102`	`+const parsed = parseStrictInteger(value);`
	`103`	`+return parsed !== undefined && parsed >= 0 ? parsed : undefined;`
	`104`	`+}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main