Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions src/typeChecker.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,64 @@ test("Should detect circular references.", () => {
assert.throws(() => isT(obj), /^Error: CircularReference:/);
});

const assertSharedObjectAccepted = <T>(
isT: TypeChecker<T>,
input: unknown,
): void => {
assert.equal(isT(input), true, `${isT}`);
assert.equal(validate(input, isT).ok, true, `${isT}`);
assert.equal(validateAll(input, isT).ok, true, `${isT}`);
};

test("Should accept objects shared between sibling properties.", () => {
const shared = { name: "Ada" };
assertSharedObjectAccepted(
typeChecker({ left: { name: isString }, right: { name: isString } }),
{ left: shared, right: shared },
);
assertSharedObjectAccepted(
isObjectWith({ left: { name: isString }, right: { name: isString } }),
{ left: shared, right: shared },
);
assertSharedObjectAccepted(
typeChecker({
left: { name: isString },
right: isObjectWith({ name: /^A/ }),
}),
{ left: shared, right: shared },
);
assertSharedObjectAccepted(
typeChecker({
pair: { left: { name: isString } },
right: { name: isString },
}),
{ pair: { left: shared }, right: shared },
);
});

test("Should detect circular references reached through a shared object.", () => {
interface Node {
name: string;
next: Node;
}
const isNode: TypeChecker<Node> = typeChecker<Node>(
{
name: isString,
get next() {
return isNode;
},
},
"Node",
);
const isPair = typeChecker({ left: isNode, right: isNode });
const shared = { name: "shared" } as Node;
shared.next = shared;
assert.throws(
() => isPair({ left: shared, right: shared }),
/^Error: CircularReference:/,
);
});

test("Should test type guards and object definitions.", () => {
const isText = typeChecker(
(input: unknown): input is string => typeof input === "string",
Expand Down
12 changes: 9 additions & 3 deletions src/typeChecker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,16 @@ const objectFactoryProps = <T>(
if (exact && hasUnknownKey(v)) {
return false;
}
// refs holds only the active recursion path, so an object shared by
// sibling properties is not mistaken for a circular reference.
refs.set(v, typeName);
return properties().every(([k, is]) =>
runGuard(is, getProperty(v, k), refs),
);
try {
return properties().every(([k, is]) =>
runGuard(is, getProperty(v, k), refs),
);
} finally {
refs.delete(v);
}
};
return {
typeGuard,
Expand Down
Loading