fix: enhance table clashes handling

closes #10

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "smol-toml",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"keywords": [
 		"toml",
 		"parser",

src/extract.ts

@@ -82,7 +82,19 @@ export function extractValue (str: string, ptr: number, end?: string): [ TomlPri
 	if (c === '"' || c === "'") {
 		endPtr = getStringEnd(str, ptr)
 		let parsed = parseString(str, ptr, endPtr)
-		if (end) endPtr = skipUntil(str, endPtr, ',', end,end !== ']')
+		if (end) {
+			endPtr = skipVoid(str, endPtr, end !== ']')
+
+			if (str[endPtr] && str[endPtr] !== ',' && str[endPtr] !== end && str[endPtr] !== '\n' && str[endPtr] !== '\r') {
+				throw new TomlError('unexpected character encountered', {
+					toml: str,
+					ptr: endPtr,
+				})
+			}
+
+			endPtr += (+(str[endPtr] === ','))
+		}
+
 		return [ parsed, endPtr ]
 	}
 

src/parse.ts

@@ -31,7 +31,7 @@ import { extractValue } from './extract.js'
 import { type TomlPrimitive, skipVoid } from './util.js'
 import TomlError from './error.js'
 
-const enum Type { DOTTED, EXPLICIT, ARRAY }
+const enum Type { DOTTED, EXPLICIT, ARRAY, ARRAY_DOTTED }
 
 type MetaState = { t: Type, d: boolean, i: number, c: MetaRecord }
 type MetaRecord = { [k: string]: MetaState }
@@ -49,7 +49,7 @@ function peekTable (key: string[], table: Record<string, TomlPrimitive>, meta: M
 			t = hasOwn! ? t[k!] : (t[k!] = {})
 			m = (state = m[k!]!).c
 
-			if (type === Type.DOTTED && state.t === Type.EXPLICIT) {
+			if (type === Type.DOTTED && (state.t === Type.EXPLICIT || state.t === Type.ARRAY)) {
 				return null
 			}
 
@@ -73,7 +73,7 @@ function peekTable (key: string[], table: Record<string, TomlPrimitive>, meta: M
 
 			m[k] = {
 				t: i < key.length - 1 && type === Type.ARRAY
-					? Type.DOTTED
+					? Type.ARRAY_DOTTED
 					: type,
 				d: false,
 				i: 0,
@@ -83,7 +83,7 @@ function peekTable (key: string[], table: Record<string, TomlPrimitive>, meta: M
 	}
 
 	state = m[k!]!
-	if (state.t !== type) {
+	if (state.t !== type && !(type === Type.EXPLICIT && state.t === Type.ARRAY_DOTTED)) {
 		// Bad key type!
 		return null
 	}

test/array.test.ts

@@ -79,6 +79,7 @@ it('is not bothered by comments', () => {
 it('rejects invalid arrays', () => {
 	expect(() => parseArray('[ 1,, 2]', 0)).toThrowError(TomlError)
 	expect(() => parseArray('[ 1, 2, 3 ', 0)).toThrowError(TomlError)
+	expect(() => parseArray('[ 1, "2" a, 3 ]', 0)).toThrowError(TomlError)
 })
 
 it('consumes only an array and aborts', () => {

test/inlineTable.test.ts

@@ -40,7 +40,8 @@ it('parses inline tables', () => {
 	expect(parseInlineTable('{}', 0))
 		.toStrictEqual([ {}, 2 ])
 })
-it('parse inline tables with non traditional spaces',()=>{
+
+it('parse inline tables with non traditional spaces',() => {
 	expect(parseInlineTable('{ first = "Tom" ,last = "Preston-Werner" }', 0))
 		.toStrictEqual([ { first: 'Tom', last: 'Preston-Werner' }, 42 ])
 	expect(parseInlineTable('{ first = "Tom" , last = "Preston-Werner" }', 0))

test/parse.test.ts

@@ -345,6 +345,17 @@ kind = "granny smith"
 		expect(() => parse(doc)).toThrowError(TomlError)
 	})
 
+	it('does not allow clashes between [[table.a]] and a dotted key within [table]', () => {
+		const doc = `
+[[uwu.owo]]
+
+[uwu]
+owo.hehe = "meow!"
+`.trim()
+
+		expect(() => parse(doc)).toThrowError(TomlError)
+	})
+
 	it('does not allow clashes between [table] and [[table]]', () => {
 		const doc = `
 [uwu]
@@ -396,4 +407,27 @@ hehe = true
 			]
 		})
 	})
+
+	it('does NOT reject duplicate [tables] when the table was originally defined as an array', () => {
+		const doc = `
+[[uwu.owo]]
+hehe = true
+
+[[uwu.owo]]
+hehe = false
+
+[uwu]
+meow = "nya"
+`.trim()
+
+		expect(parse(doc)).toStrictEqual({
+			uwu: {
+				owo: [
+					{ hehe: true },
+					{ hehe: false },
+				],
+				meow: "nya",
+			},
+		})
+	})
 })

toml-test-encode.js

@@ -49,6 +49,10 @@ function untagObject (obj) {
 				if (obj.value === 'inf') return Infinity
 				if (obj.value === '+inf') return Infinity
 				if (obj.value === '-inf') return -Infinity
+
+				if (obj.value === 'Inf') return Infinity
+				if (obj.value === '+Inf') return Infinity
+				if (obj.value === '-Inf') return -Infinity
 				return Number(obj.value)
 			case 'datetime':
 			case 'datetime-local':