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

Remove typeCache #1023

Merged
merged 1 commit into from
Mar 18, 2022
Merged

Remove typeCache #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion coverage.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 15 additions & 33 deletions deno/lib/helpers/parseUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,73 +32,56 @@ export const ZodParsedType = util.arrayToEnum([

export type ZodParsedType = keyof typeof ZodParsedType;

function cacheAndReturn(
data: any,
parsedType: ZodParsedType,
cache?: Map<any, ZodParsedType>
) {
if (cache) cache.set(data, parsedType);
return parsedType;
}

export const getParsedType = (
data: any,
cache?: Map<any, ZodParsedType>
): ZodParsedType => {
if (cache && cache.has(data)) return cache.get(data)!;
export const getParsedType = (data: any): ZodParsedType => {
const t = typeof data;

switch (t) {
case "undefined":
return cacheAndReturn(data, ZodParsedType.undefined, cache);
return ZodParsedType.undefined;

case "string":
return cacheAndReturn(data, ZodParsedType.string, cache);
return ZodParsedType.string;

case "number":
return cacheAndReturn(
data,
isNaN(data) ? ZodParsedType.nan : ZodParsedType.number,
cache
);
return isNaN(data) ? ZodParsedType.nan : ZodParsedType.number;

case "boolean":
return cacheAndReturn(data, ZodParsedType.boolean, cache);
return ZodParsedType.boolean;

case "function":
return cacheAndReturn(data, ZodParsedType.function, cache);
return ZodParsedType.function;

case "bigint":
return cacheAndReturn(data, ZodParsedType.bigint, cache);
return ZodParsedType.bigint;

case "object":
if (Array.isArray(data)) {
return cacheAndReturn(data, ZodParsedType.array, cache);
return ZodParsedType.array;
}
if (data === null) {
return cacheAndReturn(data, ZodParsedType.null, cache);
return ZodParsedType.null;
}
if (
data.then &&
typeof data.then === "function" &&
data.catch &&
typeof data.catch === "function"
) {
return cacheAndReturn(data, ZodParsedType.promise, cache);
return ZodParsedType.promise;
}
if (typeof Map !== "undefined" && data instanceof Map) {
return cacheAndReturn(data, ZodParsedType.map, cache);
return ZodParsedType.map;
}
if (typeof Set !== "undefined" && data instanceof Set) {
return cacheAndReturn(data, ZodParsedType.set, cache);
return ZodParsedType.set;
}
if (typeof Date !== "undefined" && data instanceof Date) {
return cacheAndReturn(data, ZodParsedType.date, cache);
return ZodParsedType.date;
}
return cacheAndReturn(data, ZodParsedType.object, cache);
return ZodParsedType.object;

default:
return cacheAndReturn(data, ZodParsedType.unknown, cache);
return ZodParsedType.unknown;
}
};

Expand Down Expand Up @@ -148,7 +131,6 @@ export interface ParseContext {
readonly contextualErrorMap?: ZodErrorMap;
readonly async: boolean;
readonly parent: ParseContext | null;
readonly typeCache: Map<any, ZodParsedType> | undefined;
readonly data: any;
readonly parsedType: ZodParsedType;
}
Expand Down
4 changes: 1 addition & 3 deletions deno/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export abstract class ZodType<
ctx: {
...input.parent,
data: input.data,
parsedType: getParsedType(input.data, input.parent.typeCache),
parsedType: getParsedType(input.data),
schemaErrorMap: this._def.errorMap,
path: input.path,
parent: input.parent,
Expand Down Expand Up @@ -191,7 +191,6 @@ export abstract class ZodType<
contextualErrorMap: params?.errorMap,
schemaErrorMap: this._def.errorMap,
async: params?.async ?? false,
typeCache: typeof Map !== "undefined" ? new Map() : undefined,
parent: null,
data,
parsedType: getParsedType(data),
Expand Down Expand Up @@ -220,7 +219,6 @@ export abstract class ZodType<
contextualErrorMap: params?.errorMap,
schemaErrorMap: this._def.errorMap,
async: true,
typeCache: typeof Map !== "undefined" ? new Map() : undefined,
parent: null,
data,
parsedType: getParsedType(data),
Expand Down
48 changes: 15 additions & 33 deletions src/helpers/parseUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,73 +32,56 @@ export const ZodParsedType = util.arrayToEnum([

export type ZodParsedType = keyof typeof ZodParsedType;

function cacheAndReturn(
data: any,
parsedType: ZodParsedType,
cache?: Map<any, ZodParsedType>
) {
if (cache) cache.set(data, parsedType);
return parsedType;
}

export const getParsedType = (
data: any,
cache?: Map<any, ZodParsedType>
): ZodParsedType => {
if (cache && cache.has(data)) return cache.get(data)!;
export const getParsedType = (data: any): ZodParsedType => {
const t = typeof data;

switch (t) {
case "undefined":
return cacheAndReturn(data, ZodParsedType.undefined, cache);
return ZodParsedType.undefined;

case "string":
return cacheAndReturn(data, ZodParsedType.string, cache);
return ZodParsedType.string;

case "number":
return cacheAndReturn(
data,
isNaN(data) ? ZodParsedType.nan : ZodParsedType.number,
cache
);
return isNaN(data) ? ZodParsedType.nan : ZodParsedType.number;

case "boolean":
return cacheAndReturn(data, ZodParsedType.boolean, cache);
return ZodParsedType.boolean;

case "function":
return cacheAndReturn(data, ZodParsedType.function, cache);
return ZodParsedType.function;

case "bigint":
return cacheAndReturn(data, ZodParsedType.bigint, cache);
return ZodParsedType.bigint;

case "object":
if (Array.isArray(data)) {
return cacheAndReturn(data, ZodParsedType.array, cache);
return ZodParsedType.array;
}
if (data === null) {
return cacheAndReturn(data, ZodParsedType.null, cache);
return ZodParsedType.null;
}
if (
data.then &&
typeof data.then === "function" &&
data.catch &&
typeof data.catch === "function"
) {
return cacheAndReturn(data, ZodParsedType.promise, cache);
return ZodParsedType.promise;
}
if (typeof Map !== "undefined" && data instanceof Map) {
return cacheAndReturn(data, ZodParsedType.map, cache);
return ZodParsedType.map;
}
if (typeof Set !== "undefined" && data instanceof Set) {
return cacheAndReturn(data, ZodParsedType.set, cache);
return ZodParsedType.set;
}
if (typeof Date !== "undefined" && data instanceof Date) {
return cacheAndReturn(data, ZodParsedType.date, cache);
return ZodParsedType.date;
}
return cacheAndReturn(data, ZodParsedType.object, cache);
return ZodParsedType.object;

default:
return cacheAndReturn(data, ZodParsedType.unknown, cache);
return ZodParsedType.unknown;
}
};

Expand Down Expand Up @@ -148,7 +131,6 @@ export interface ParseContext {
readonly contextualErrorMap?: ZodErrorMap;
readonly async: boolean;
readonly parent: ParseContext | null;
readonly typeCache: Map<any, ZodParsedType> | undefined;
readonly data: any;
readonly parsedType: ZodParsedType;
}
Expand Down
4 changes: 1 addition & 3 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export abstract class ZodType<
ctx: {
...input.parent,
data: input.data,
parsedType: getParsedType(input.data, input.parent.typeCache),
parsedType: getParsedType(input.data),
schemaErrorMap: this._def.errorMap,
path: input.path,
parent: input.parent,
Expand Down Expand Up @@ -191,7 +191,6 @@ export abstract class ZodType<
contextualErrorMap: params?.errorMap,
schemaErrorMap: this._def.errorMap,
async: params?.async ?? false,
typeCache: typeof Map !== "undefined" ? new Map() : undefined,
parent: null,
data,
parsedType: getParsedType(data),
Expand Down Expand Up @@ -220,7 +219,6 @@ export abstract class ZodType<
contextualErrorMap: params?.errorMap,
schemaErrorMap: this._def.errorMap,
async: true,
typeCache: typeof Map !== "undefined" ? new Map() : undefined,
parent: null,
data,
parsedType: getParsedType(data),
Expand Down