Skip to content

Next Version #1

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

Merged
baseten merged 7 commits into from
Apr 27, 2023
Merged

Next Version #1

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
298f54a
* update all libraries to latest
baseten Apr 12, 2023
49512db
convert library to TS, refactor Transform2d and Transform3d to functi…
baseten Apr 12, 2023
33b2bb2
Port tests to TS and React Testing Library, refactor based on functio…
baseten Apr 12, 2023
6f0244d
port examples to TS and switch to codesandbox style parcel bundler
baseten Apr 25, 2023
cc87780
make custom proptypes optional
baseten Apr 25, 2023
73669c7
add codesandbox ci
baseten Apr 25, 2023
5f12cc1
fix weird TS error
baseten Apr 27, 2023
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
Prev Previous commit
fix weird TS error
  • Loading branch information
@baseten
baseten committed Apr 27, 2023
commit 5f12cc16c8dfdeedb6b9aef6921048ecbbb7ed9e
68 changes: 34 additions & 34 deletions src/propTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import {
} from './utils';

type PropTypes = { [key: string]: any };
interface PropTypeValidator {
type PropTypeValidator = {
<P extends PropTypes>(
props: P,
propName: string & keyof P,
componentName: string,
): null | Error;
}
interface PropTypeWithRequired extends PropTypeValidator {
};
type PropTypeWithRequired = PropTypeValidator & {
isRequired: PropTypeValidator;
}
};

function createPropType<P extends PropTypes>(
validator: PropTypeValidator,
Expand Down Expand Up @@ -51,11 +51,12 @@ const vec2ObjValidator = <P extends PropTypes>(
: new Error(`${propName} in ${componentName} is not a vec2 shape`);
};

export const vec2Obj: PropTypeWithRequired = createPropType(
vec2ObjValidator,
false,
) as PropTypeWithRequired;
vec2Obj.isRequired = createPropType(vec2ObjValidator, true);
export const vec2Obj: PropTypeWithRequired = Object.assign(
createPropType(vec2ObjValidator, false),
{
isRequired: createPropType(vec2ObjValidator, true),
},
);

const vec3ObjValidator = <P extends PropTypes>(
props: P,
Expand All @@ -68,11 +69,10 @@ const vec3ObjValidator = <P extends PropTypes>(
: new Error(`${propName} in ${componentName} is not a vec3 shape`);
};

export const vec3Obj: PropTypeWithRequired = createPropType(
vec3ObjValidator,
false,
) as PropTypeWithRequired;
vec3Obj.isRequired = createPropType(vec3ObjValidator, true);
export const vec3Obj: PropTypeWithRequired = Object.assign(
createPropType(vec3ObjValidator, false),
{ isRequired: createPropType(vec3ObjValidator, true) },
);

const vec2GlMatrixValidator = <P extends PropTypes>(
props: P,
Expand All @@ -85,11 +85,12 @@ const vec2GlMatrixValidator = <P extends PropTypes>(
: new Error(`${propName} in ${componentName} is not a gl-matrix vec2`);
};

export const vec2GlMatrix: PropTypeWithRequired = createPropType(
vec2GlMatrixValidator,
false,
) as PropTypeWithRequired;
vec2GlMatrix.isRequired = createPropType(vec2GlMatrixValidator, true);
export const vec2GlMatrix: PropTypeWithRequired = Object.assign(
createPropType(vec2GlMatrixValidator, false),
{
isRequired: createPropType(vec2GlMatrixValidator, true),
},
);

const vec3GlMatrixValidator = <P extends PropTypes>(
props: P,
Expand All @@ -101,11 +102,12 @@ const vec3GlMatrixValidator = <P extends PropTypes>(
? null
: new Error(`${propName} in ${componentName} is not a gl-matrix vec3`);
};
export const vec3GlMatrix: PropTypeWithRequired = createPropType(
vec3GlMatrixValidator,
false,
) as PropTypeWithRequired;
vec3GlMatrix.isRequired = createPropType(vec3GlMatrixValidator, true);
export const vec3GlMatrix: PropTypeWithRequired = Object.assign(
createPropType(vec3GlMatrixValidator, false),
{
isRequired: createPropType(vec3GlMatrixValidator, true),
},
);

const mat2dGlMatrixValidator = <P extends PropTypes>(
props: P,
Expand All @@ -118,11 +120,10 @@ const mat2dGlMatrixValidator = <P extends PropTypes>(
: new Error(`${propName} in ${componentName} is not a gl-matrix mat2d`);
};

export const mat2dGlMatrix: PropTypeWithRequired = createPropType(
mat2dGlMatrixValidator,
false,
) as PropTypeWithRequired;
mat2dGlMatrix.isRequired = createPropType(mat2dGlMatrixValidator, true);
export const mat2dGlMatrix: PropTypeWithRequired = Object.assign(
createPropType(mat2dGlMatrixValidator, false),
{ isRequired: createPropType(mat2dGlMatrixValidator, true) },
);

export const mat4GlMatrixValidator = <P extends PropTypes>(
props: P,
Expand All @@ -135,8 +136,7 @@ export const mat4GlMatrixValidator = <P extends PropTypes>(
: new Error(`${propName} in ${componentName} is not a gl-matrix mat4`);
};

export const mat4GlMatrix: PropTypeWithRequired = createPropType(
mat4GlMatrixValidator,
false,
) as PropTypeWithRequired;
mat4GlMatrix.isRequired = createPropType(mat4GlMatrixValidator, true);
export const mat4GlMatrix: PropTypeWithRequired = Object.assign(
createPropType(mat4GlMatrixValidator, false),
{ isRequired: createPropType(mat4GlMatrixValidator, true) },
);