fix: accept newlines before an operator (#1101)

arktypeio · Aug 28, 2024 · 1532a39 · 1532a39
1 parent 8876a4b
commit 1532a39
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/ark/type/__tests__/string.test.ts b/ark/type/__tests__/string.test.ts
@@ -12,9 +12,10 @@ contextualize(() => {
 
 	it("ignores whitespace between identifiers/operators", () => {
 		const t = type(`  \n   string  |
-    \tboolean    []   `)
-		attest<string | boolean[]>(t.infer)
-		attest(t.json).equals(type("string|boolean[]").json)
+           number
+    \t|boolean    []   `)
+		attest<string | number | boolean[]>(t.infer)
+		attest(t.json).equals(type("string|number|boolean[]").json)
 	})
 
 	it("errors on bad whitespace", () => {

diff --git a/ark/type/parser/string/shift/operator/operator.ts b/ark/type/parser/string/shift/operator/operator.ts
@@ -1,4 +1,4 @@
-import { isKeyOf, type WhiteSpaceToken } from "@ark/util"
+import { isKeyOf, type WhiteSpaceToken, whiteSpaceTokens } from "@ark/util"
 import type { DynamicStateWithRoot } from "../../reduce/dynamic.ts"
 import type { StaticState, state } from "../../reduce/static.ts"
 import { Scanner } from "../scanner.ts"
@@ -23,7 +23,7 @@ export const parseOperator = (s: DynamicStateWithRoot): void => {
 			s.finalize(lookahead)
 		: isKeyOf(lookahead, comparatorStartChars) ? parseBound(s, lookahead)
 		: lookahead === "%" ? parseDivisor(s)
-		: lookahead === " " ? parseOperator(s)
+		: lookahead in whiteSpaceTokens ? parseOperator(s)
 		: s.error(writeUnexpectedCharacterMessage(lookahead))
 	)
 }

diff --git a/ark/type/parser/string/shift/scanner.ts b/ark/type/parser/string/shift/scanner.ts
@@ -99,9 +99,9 @@ export class Scanner<lookahead extends string = string> {
 		")": true,
 		"[": true,
 		"%": true,
-		" ": true,
 		",": true,
-		":": true
+		":": true,
+		...whiteSpaceTokens
 	} as const
 
 	static finalizingLookaheads = {