feat: parse File size bounds in the type string parser

Author: ooospooky

ark/type/attributes.ts

@@ -12,6 +12,7 @@ import {
 	type optionalKeyOf,
 	type Primitive,
 	type show,
+	type SizeLiteral,
 	type unionKeyOf,
 	type unionToTuple
 } from "@ark/util"
@@ -28,7 +29,9 @@ export type DateLiteral<source extends string = string> =
 	| `d"${source}"`
 	| `d'${source}'`
 
-export type LimitLiteral = number | DateLiteral
+export type { SizeLiteral } from "@ark/util"
+
+export type LimitLiteral = number | DateLiteral | SizeLiteral
 
 export type normalizeLimit<limit> =
 	limit extends DateLiteral<infer source> ? source

ark/type/parser/ast/bounds.ts

@@ -1,6 +1,10 @@
 import type { writeUnboundableMessage } from "@ark/schema"
 import type { ErrorMessage, array, typeToString } from "@ark/util"
-import type { InferredMorph, LimitLiteral } from "../../attributes.ts"
+import type {
+	InferredMorph,
+	LimitLiteral,
+	SizeLiteral
+} from "../../attributes.ts"
 import type { Comparator } from "../reduce/shared.ts"
 import type {
 	BoundExpressionKind,
@@ -32,6 +36,11 @@ export type validateBound<
 		: [bounded] extends [Date] ?
 			// allow numeric or date literal as a Date limit
 			validateAst<boundedAst, $, args>
+		: [bounded] extends [File] ?
+			// allow numeric or size literal as a File limit, but not a date literal
+			[limit] extends [number | SizeLiteral] ?
+				validateAst<boundedAst, $, args>
+			:	ErrorMessage<writeInvalidLimitMessage<comparator, limit, boundKind>>
 		: [bounded] extends [InferredMorph] ?
 			ErrorMessage<writeConstrainedMorphMessage<boundedAst>>
 		:	ErrorMessage<writeUnboundableMessage<typeToString<bounded>>>

ark/type/parser/shift/operand/unenclosed.ts

@@ -12,6 +12,7 @@ import {
 import {
 	printable,
 	throwParseError,
+	tryParseSizeLiteral,
 	tryParseWellFormedBigint,
 	tryParseWellFormedNumber,
 	type BigintLiteral,
@@ -20,6 +21,7 @@ import {
 	type join,
 	type lastOf
 } from "@ark/util"
+import type { SizeLiteral } from "../../../attributes.ts"
 import type { ArkAmbient } from "../../../config.ts"
 import type { resolutionToAst } from "../../../scope.ts"
 import type { GenericInstantiationAst } from "../../ast/generic.ts"
@@ -144,6 +146,9 @@ const maybeParseUnenclosedLiteral = (
 	const maybeBigint = tryParseWellFormedBigint(token)
 	if (maybeBigint !== undefined)
 		return s.ctx.$.node("unit", { unit: maybeBigint })
+
+	const maybeSize = tryParseSizeLiteral(token)
+	if (maybeSize !== undefined) return s.ctx.$.node("unit", { unit: maybeSize })
 }
 
 type tryResolve<
@@ -192,6 +197,8 @@ type tryResolve<
 		>
 	: token extends BigintLiteral<infer b> ?
 		s.setRoot<s, InferredAst<b, token>, unscanned>
+	: token extends SizeLiteral ?
+		s.setRoot<s, InferredAst<number, token>, unscanned>
 	: token extends "keyof" ? s.addPrefix<s, "keyof", unscanned>
 	: unresolvableState<s, token, $, args, []>
 

ark/type/parser/shift/operator/bounds.ts

@@ -6,7 +6,7 @@ import {
 	type NodeSchema
 } from "@ark/schema"
 import { isKeyOf, throwParseError, type KeySet, type Scanner } from "@ark/util"
-import type { DateLiteral } from "../../../attributes.ts"
+import type { DateLiteral, LimitLiteral } from "../../../attributes.ts"
 import type { InferredAst } from "../../ast/infer.ts"
 import type { astToString } from "../../ast/utils.ts"
 import type { RootedRuntimeState, RuntimeState } from "../../reduce/dynamic.ts"
@@ -60,10 +60,7 @@ export type parseBound<
 			>
 		) ?
 			s["root"] extends (
-				InferredAst<
-					Date | number,
-					`${infer limit extends number | DateLiteral}`
-				>
+				InferredAst<Date | number, `${infer limit extends LimitLiteral}`>
 			) ?
 				s.reduceLeftBound<s, limit, comparator, nextUnscanned>
 			:	parseRightBound<s.scanTo<s, nextUnscanned>, comparator, $, args>
@@ -103,7 +100,7 @@ export const writeIncompatibleRangeMessage = (
 
 export const getBoundKinds = (
 	comparator: Comparator,
-	limit: number | DateLiteral,
+	limit: LimitLiteral,
 	root: BaseRoot,
 	boundKind: BoundExpressionKind
 ): BoundKind[] => {
@@ -140,6 +137,18 @@ export const getBoundKinds = (
 			: ["before"]
 		)
 	}
+	if (root.extends($ark.intrinsic.File)) {
+		if (typeof limit !== "number") {
+			return throwParseError(
+				writeInvalidLimitMessage(comparator, limit, boundKind)
+			)
+		}
+		return (
+			comparator === "==" ? ["minSize", "maxSize"]
+			: comparator[0] === ">" ? ["minSize"]
+			: ["maxSize"]
+		)
+	}
 	return throwParseError(writeUnboundableMessage(root.expression))
 }
 
@@ -181,7 +190,7 @@ export const parseRightBound = (
 
 	const boundKinds = getBoundKinds(
 		comparator,
-		typeof limit === "number" ? limit : (limitToken as DateLiteral),
+		limit instanceof Date ? (limitToken as DateLiteral) : limit,
 		previousRoot,
 		"right"
 	)
@@ -217,7 +226,7 @@ export type parseRightBound<
 > =
 	parseOperand<s, $, args> extends infer nextState extends StaticState ?
 		nextState["root"] extends (
-			InferredAst<unknown, `${infer limit extends number | DateLiteral}`>
+			InferredAst<unknown, `${infer limit extends LimitLiteral}`>
 		) ?
 			s["branches"]["leftBound"] extends {} ?
 				comparator extends MaxComparator ?