feat: improve strictObject to check for unexpected keys using a known keys set

Author: DevilTea

packages/internal/src/steps/strictObject/strictObject.ts

@@ -105,6 +105,7 @@ export const strictObject = implStepPlugin<PluginDef>({
 		// Pre-compute metadata for each property to avoid repeated lookups
 		const keys = Object.keys(struct)
 		const keysLen = keys.length
+		const knownKeysSet = new Set(keys)
 		const propsMeta: Array<{ key: string, isOptional: boolean, schema: Use<Valchecker> }> = []
 
 		for (let i = 0; i < keysLen; i++) {
@@ -131,7 +132,31 @@ export const strictObject = implStepPlugin<PluginDef>({
 				})
 			}
 
-			const ownKeysSet = new Set(Object.keys(value))
+			// Check for unknown keys
+			const ownKeys = Object.keys(value)
+			const ownKeysLen = ownKeys.length
+			const unknownKeys: string[] = []
+			for (let i = 0; i < ownKeysLen; i++) {
+				const key = ownKeys[i]!
+				if (!knownKeysSet.has(key)) {
+					unknownKeys.push(key)
+				}
+			}
+			if (unknownKeys.length > 0) {
+				return failure({
+					code: 'strictObject:unexpected_keys',
+					payload: { value, keys: unknownKeys },
+					message: resolveMessage(
+						{
+							code: 'strictObject:unexpected_keys',
+							payload: { value, keys: unknownKeys },
+						},
+						message,
+						'Unexpected object keys found.',
+					),
+				})
+			}
+
 			const issues: ExecutionIssue<any, any>[] = []
 			const output: Record<string, any> = {}
 
@@ -144,7 +169,6 @@ export const strictObject = implStepPlugin<PluginDef>({
 					continue
 				}
 				const { key, isOptional, schema } = propsMeta[i]!
-				ownKeysSet.delete(key)
 				const propValue = (value as any)[key]
 
 				const propResult = (isOptional && propValue === void 0)
@@ -169,7 +193,6 @@ export const strictObject = implStepPlugin<PluginDef>({
 					for (let j = i + 1; j < keysLen; j++) {
 						const nextMeta = propsMeta[j]!
 						const nextPropValue = (value as any)[nextMeta.key]
-						ownKeysSet.delete(nextMeta.key)
 
 						chain = chain.then((): void | Promise<void> => {
 							return Promise.resolve(
@@ -190,25 +213,7 @@ export const strictObject = implStepPlugin<PluginDef>({
 						})
 					}
 
-					return chain
-						.then(() => {
-							// Check for unexpected keys only if no issues so far
-							if (issues.length === 0 && ownKeysSet.size > 0) {
-								issues.push({
-									code: 'strictObject:unexpected_keys',
-									payload: { value, keys: Array.from(ownKeysSet) },
-									message: resolveMessage(
-										{
-											code: 'strictObject:unexpected_keys',
-											payload: { value, keys: Array.from(ownKeysSet) },
-										},
-										message,
-										'Unexpected object keys found.',
-									),
-								})
-							}
-						})
-						.then(() => issues.length > 0 ? failure(issues) : success(output))
+					return chain.then(() => issues.length > 0 ? failure(issues) : success(output))
 				}
 
 				if (isFailure(propResult)) {
@@ -221,22 +226,6 @@ export const strictObject = implStepPlugin<PluginDef>({
 				}
 			}
 
-			// Check for unexpected keys only if no issues so far
-			if (issues.length === 0 && ownKeysSet.size > 0) {
-				issues.push({
-					code: 'strictObject:unexpected_keys',
-					payload: { value, keys: Array.from(ownKeysSet) },
-					message: resolveMessage(
-						{
-							code: 'strictObject:unexpected_keys',
-							payload: { value, keys: Array.from(ownKeysSet) },
-						},
-						message,
-						'Unexpected object keys found.',
-					),
-				})
-			}
-
 			return issues.length > 0 ? failure(issues) : success(output)
 		})
 	},