Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf(NODE-6344): Improve ObjectId.isValid(string) performance #708

Merged
merged 3 commits into from
Sep 17, 2024
Merged

perf(NODE-6344): Improve ObjectId.isValid(string) performance #708

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc20e7a
Improve isValid for strings
SeanReece Aug 22, 2024
00b5f7e
Merge branch 'main' into isvalid-improvement
nbbeeken Sep 16, 2024
bddabbf
Remove regex in favor of ascii code
SeanReece Sep 17, 2024
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
12 changes: 11 additions & 1 deletion src/objectid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export class ObjectId extends BSONValue {
// If intstanceof matches we can escape calling ensure buffer in Node.js environments
this.buffer = ByteUtils.toLocalBufferType(workingId);
} else if (typeof workingId === 'string') {
if (workingId.length === 24 && checkForHexRegExp.test(workingId)) {
if (ObjectId.validateHexString(workingId)) {
this.buffer = ByteUtils.fromHex(workingId);
} else {
throw new BSONError(
Expand Down Expand Up @@ -143,6 +143,15 @@ export class ObjectId extends BSONValue {
}
}

/**
* @internal
* Validates the input string is a valid hex representation of an ObjectId.
*/
private static validateHexString(input: string): boolean {
if (input == null || input.length !== 24) return false;
return checkForHexRegExp.test(input);
nbbeeken marked this conversation as resolved.
Show resolved Hide resolved
}

/** Returns the ObjectId id as a 24 lowercase character hex string representation */
toHexString(): string {
if (ObjectId.cacheHexString && this.__id) {
Expand Down Expand Up @@ -329,6 +338,7 @@ export class ObjectId extends BSONValue {
*/
static isValid(id: string | number | ObjectId | ObjectIdLike | Uint8Array): boolean {
if (id == null) return false;
if (typeof id === 'string') return ObjectId.validateHexString(id);

try {
new ObjectId(id);
Expand Down
Loading