Start9/start-sdk
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-sdk.git synced 2026-03-30 12:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Add tests and fix tests. Remove validation for types not seeable

Browse Source
This commit is contained in:
BluJ
2023-04-20 14:25:36 -06:00
parent 6ac6c215c3
commit 45dc591ad0
13 changed files with 115 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
lib/util/propertiesMatcher.ts
View File

@@ -80,7 +80,7 @@ unknown
type GuardColor<A> =
A extends { type: TypeColor } ? GuardDefaultRequired<A, string> :
unknown
// prettier-ignore
// prettier-ignore
type GuardDatetime<A> =
A extends { type: TypeDatetime } ? GuardDefaultRequired<A, string> :
unknown
@@ -121,8 +121,6 @@ const matchVariant = object({
const recordString = dictionary([string, unknown]);
const matchDefault = object({ default: unknown });
const matchRequired = object({ required: literals(false) });
const rangeRegex = /(\[|\()(\*|(\d|\.)+),(\*|(\d|\.)+)(\]|\))/;
const matchRange = object({ range: string });
const matchInteger = object({ integer: literals(true) });
const matchSpec = object({ spec: recordString });
const matchUnion = object({
@@ -132,107 +130,13 @@ const matchValues = object({
values: dictionary([string, string]),
});
function charRange(value = "") {
const split = value
.split("-")
.filter(Boolean)
.map((x) => x.charCodeAt(0));
if (split.length < 1) return null;
if (split.length === 1) return [split[0], split[0]];
return [split[0], split[1]];
}
/**
* @param generate.charset Pattern like "a-z" or "a-z,1-5"
* @param generate.len Length to make random variable
* @param param1
* @returns
*/
export function generateDefault(
generate: { charset: string; len: number },
{ random = () => Math.random() } = {},
) {
const validCharSets: number[][] = generate.charset
.split(",")
.map(charRange)
.filter(Array.isArray);
if (validCharSets.length === 0) {
throw new Error("Expecing that we have a valid charset");
}
const max = validCharSets.reduce(
(acc, x) => x.reduce((x, y) => Math.max(x, y), acc),
0,
);
let i = 0;
const answer: string[] = Array(generate.len);
while (i < generate.len) {
const nextValue = Math.round(random() * max);
const inRange = validCharSets.reduce(
(acc, [lower, upper]) =>
acc || (nextValue >= lower && nextValue <= upper),
false,
);
if (!inRange) continue;
answer[i] = String.fromCharCode(nextValue);
i++;
}
return answer.join("");
}
export function matchNumberWithRange(range: string) {
const matched = rangeRegex.exec(range);
if (!matched) return number;
const [, left, leftValue, , rightValue, , right] = matched;
return number
.validate(
leftValue === "*"
? (_) => true
: left === "["
? (x) => x >= Number(leftValue)
: (x) => x > Number(leftValue),
leftValue === "*"
? "any"
: left === "["
? `greaterThanOrEqualTo${leftValue}`
: `greaterThan${leftValue}`,
)
.validate(
// prettier-ignore
rightValue === "*" ? (_) => true :
right === "]" ? (x) => x <= Number(rightValue) :
(x) => x < Number(rightValue),
// prettier-ignore
rightValue === "*" ? "any" :
right === "]" ? `lessThanOrEqualTo${rightValue}` :
`lessThan${rightValue}`,
);
}
function withInteger(parser: Parser<unknown, number>, value: unknown) {
if (matchInteger.test(value)) {
return parser.validate(Number.isInteger, "isIntegral");
}
return parser;
}
function withRange(value: unknown) {
if (matchRange.test(value)) {
return matchNumberWithRange(value.range);
}
return number;
}
const isGenerator = object({
charset: string,
len: number,
}).test;
function defaultRequired<A>(parser: Parser<unknown, A>, value: unknown) {
if (matchDefault.test(value)) {
if (isGenerator(value.default)) {
return parser.defaultTo(
parser.unsafeCast(generateDefault(value.default)),
);
}
return parser.defaultTo(value.default);
}
function requiredParser<A>(parser: Parser<unknown, A>, value: unknown) {
if (!matchRequired.test(value)) return parser.optional();
return parser;
}
@@ -253,49 +157,41 @@ export function guardAll<A extends ValueSpecAny>(
}
switch (value.type) {
case "toggle":
return defaultRequired(boolean, value) as any;
return requiredParser(boolean, value) as any;
case "text":
return defaultRequired(string, value) as any;
return requiredParser(string, value) as any;
case "textarea":
return defaultRequired(string, value) as any;
return requiredParser(string, value) as any;
case "color":
return defaultRequired(string, value) as any;
return requiredParser(string, value) as any;
case "datetime":
return defaultRequired(string, value) as any;
return requiredParser(string, value) as any;
case "number":
return defaultRequired(
withInteger(withRange(value), value),
value,
) as any;
return requiredParser(withInteger(number, value), value) as any;
case "object":
if (matchSpec.test(value)) {
return defaultRequired(typeFromProps(value.spec), value) as any;
return requiredParser(typeFromProps(value.spec), value) as any;
}
return unknown as any;
case "list": {
const spec = (matchSpec.test(value) && value.spec) || {};
const rangeValidate =
(matchRange.test(value) && matchNumberWithRange(value.range).test) ||
(() => true);
return defaultRequired(
matches
.arrayOf(guardAll(spec as any))
.validate((x) => rangeValidate(x.length), "valid length"),
return requiredParser(
matches.arrayOf(guardAll(spec as any)),
value,
) as any;
}
case "select":
if (matchValues.test(value)) {
const valueKeys = Object.keys(value.values);
return defaultRequired(
return requiredParser(
literals(valueKeys[0], ...valueKeys),
value,
) as any;
@@ -304,19 +200,9 @@ export function guardAll<A extends ValueSpecAny>(
case "multiselect":
if (matchValues.test(value)) {
const maybeAddRangeValidate = <X extends Validator<unknown, B[]>, B>(
x: X,
) => {
if (!matchRange.test(value)) return x;
return x.validate(
(x) => matchNumberWithRange(value.range).test(x.length),
"validLength",
);
};
const valueKeys = Object.keys(value.values);
return defaultRequired(
maybeAddRangeValidate(arrayOf(literals(valueKeys[0], ...valueKeys))),
return requiredParser(
arrayOf(literals(valueKeys[0], ...valueKeys)),
value,
) as any;
}