diff --git a/lib/config/builder/list.ts b/lib/config/builder/list.ts index bc9e94a..edac7b6 100644 --- a/lib/config/builder/list.ts +++ b/lib/config/builder/list.ts @@ -41,7 +41,7 @@ export class List extends IBuilder { maxLength?: number | null; patterns: Pattern[]; /** Default = "text" */ - inputmode?: ListValueSpecText["inputmode"]; + inputMode?: ListValueSpecText["inputMode"]; }, ) { const spec = { @@ -50,7 +50,7 @@ export class List extends IBuilder { minLength: null, maxLength: null, masked: false, - inputmode: "text" as const, + inputMode: "text" as const, ...aSpec, }; return new List({ diff --git a/lib/config/builder/value.ts b/lib/config/builder/value.ts index c40ba6e..69e4ac1 100644 --- a/lib/config/builder/value.ts +++ b/lib/config/builder/value.ts @@ -65,7 +65,7 @@ export class Value extends IBuilder { maxLength?: number | null; patterns?: Pattern[]; /** Default = 'text' */ - inputmode?: ValueSpecText["inputmode"]; + inputMode?: ValueSpecText["inputMode"]; }) { return new Value({ type: "text" as const, @@ -77,7 +77,7 @@ export class Value extends IBuilder { minLength: null, maxLength: null, patterns: [], - inputmode: "text", + inputMode: "text", ...a, }); } @@ -148,17 +148,17 @@ export class Value extends IBuilder { warning?: string | null; required: boolean; /** Default = 'datetime-local' */ - inputMode?: ValueSpecDatetime['inputMode'] - min?: string | null - max?: string | null - step?: string | null + inputMode?: ValueSpecDatetime["inputMode"]; + min?: string | null; + max?: string | null; + step?: string | null; default?: number | null; }) { return new Value({ type: "datetime" as const, description: null, warning: null, - inputMode: 'datetime-local', + inputMode: "datetime-local", min: null, max: null, step: null, diff --git a/lib/config/configTypes.ts b/lib/config/configTypes.ts index c49977c..0c83971 100644 --- a/lib/config/configTypes.ts +++ b/lib/config/configTypes.ts @@ -56,17 +56,17 @@ export interface ValueSpecNumber extends ListValueSpecNumber, WithStandalone { default: number | null; } export interface ValueSpecColor extends WithStandalone { - type: "color" + type: "color"; required: boolean; default: string | null; } export interface ValueSpecDatetime extends WithStandalone { - type: "datetime" + type: "datetime"; required: boolean; - inputMode: 'date' | 'time' | 'datetime-local' - min: string | null - max: string | null - step: string | null + inputMode: "date" | "time" | "datetime-local"; + min: string | null; + max: string | null; + step: string | null; default: string | null; } export interface ValueSpecSelect extends SelectBase, WithStandalone { @@ -141,16 +141,16 @@ export interface ValueSpecListOf | readonly Record[]; } export interface Pattern { - regex: string - description: string + regex: string; + description: string; } export interface ListValueSpecText { type: "text"; - patterns: Pattern[] - minLength: number | null - maxLength: number | null + patterns: Pattern[]; + minLength: number | null; + maxLength: number | null; masked: boolean; - inputmode: "text" | "email" | "tel" | "url"; + inputMode: "text" | "email" | "tel" | "url"; placeholder: string | null; } export interface ListValueSpecNumber { diff --git a/lib/config/setupConfigExports.ts b/lib/config/setupConfigExports.ts index 0df3800..5039aed 100644 --- a/lib/config/setupConfigExports.ts +++ b/lib/config/setupConfigExports.ts @@ -1,10 +1,5 @@ import { Config } from "./builder"; -import { - DeepPartial, - Dependencies, - Effects, - ExpectedExports, -} from "../types"; +import { DeepPartial, Dependencies, Effects, ExpectedExports } from "../types"; import { InputSpec } from "./configTypes"; import { nullIfEmpty } from "../util"; import { TypeFromProps } from "../util/propertiesMatcher"; diff --git a/lib/config/specToBuilder.ts b/lib/config/specToBuilder.ts index 8eeb733..452c181 100644 --- a/lib/config/specToBuilder.ts +++ b/lib/config/specToBuilder.ts @@ -109,7 +109,7 @@ export async function specToBuilder( masked: spec?.masked || false, placeholder: spec?.placeholder || null, pattern: spec?.patterns || [], - inputMode: spec?.inputmode || 'text', + inputMode: spec?.inputMode || "text", })})`; } case "number": { diff --git a/lib/test/builder.specToBuilder.ts b/lib/test/builder.specToBuilder.ts deleted file mode 100644 index e69de29..0000000 diff --git a/lib/test/configBuilder.test.ts b/lib/test/configBuilder.test.ts index 978f291..75457fe 100644 --- a/lib/test/configBuilder.test.ts +++ b/lib/test/configBuilder.test.ts @@ -38,7 +38,7 @@ describe("builder tests", () => { "minLength": null, "maxLength": null, "patterns": [], - "inputmode":"text", + "inputMode":"text", "name": "Peer tor address", "required": true }}` @@ -67,6 +67,24 @@ describe("values", () => { validator.unsafeCast("test text"); testOutput()(null); }); + test("color", () => { + const value = Value.color({ + name: "Testing", + required: false, + }); + const validator = value.validator(); + validator.unsafeCast("#000000"); + testOutput()(null); + }); + test("datetime", () => { + const value = Value.datetime({ + name: "Testing", + required: false, + }); + const validator = value.validator(); + validator.unsafeCast("2021-01-01"); + testOutput()(null); + }); test("textarea", () => { const value = Value.textarea({ name: "Testing", diff --git a/lib/test/configTypes.test.ts b/lib/test/configTypes.test.ts index 12227d7..d3d19e0 100644 --- a/lib/test/configTypes.test.ts +++ b/lib/test/configTypes.test.ts @@ -1,7 +1,4 @@ -import { - ListValueSpecOf, - isValueSpecListOf, -} from "../config/configTypes"; +import { ListValueSpecOf, isValueSpecListOf } from "../config/configTypes"; import { Config } from "../config/builder/config"; import { List } from "../config/builder/list"; import { Value } from "../config/builder/value"; diff --git a/lib/test/makeOutput.ts b/lib/test/makeOutput.ts index 61115b5..2cf7f71 100644 --- a/lib/test/makeOutput.ts +++ b/lib/test/makeOutput.ts @@ -1,6 +1,6 @@ -import { writeConvertedFile } from "../../scripts/oldSpecToBuilder"; +import { writeConvertedFileFromOld } from "../../scripts/oldSpecToBuilder"; -writeConvertedFile( +writeConvertedFileFromOld( "./lib/test/output.ts", // Make the location { // Put the config here diff --git a/lib/test/output.test.ts b/lib/test/output.test.ts index 1aa330b..53201f2 100644 --- a/lib/test/output.test.ts +++ b/lib/test/output.test.ts @@ -4,6 +4,7 @@ import { UnionValueKey, unionValueKey, } from "../config/configTypes"; +import { deepMerge } from "../util"; import { InputSpec, matchInputSpec, testListUnion } from "./output"; export type IfEquals = (() => G extends T @@ -15,42 +16,10 @@ export function testOutput(): (c: IfEquals) => null { return () => null; } -function isObject(item: unknown): item is object { - return !!(item && typeof item === "object" && !Array.isArray(item)); -} -type UnionToIntersection = (T extends any ? (x: T) => any : never) extends ( - x: infer R, -) => any - ? R - : never; -export function mergeDeep(...sources: A) { - return _mergeDeep({}, ...sources); -} -function _mergeDeep( - target: UnionToIntersection | {}, - ...sources: A -): UnionToIntersection | {} { - if (!sources.length) return target; - const source = sources.shift(); - - if (isObject(target) && isObject(source)) { - for (const key in source) { - if (isObject((source as any)[key])) { - if (!(target as any)[key]) Object.assign(target, { [key]: {} }); - _mergeDeep((target as any)[key], (source as any)[key]); - } else { - Object.assign(target, { [key]: (source as any)[key] }); - } - } - } - - return _mergeDeep(target, ...sources); -} - /// Testing the types of the input spec +testOutput()(null); // @ts-expect-error Because enable should be a boolean testOutput()(null); -testOutput()(null); testOutput()(null); testOutput()(null); @@ -135,19 +104,22 @@ describe("Inputs", () => { const output = matchInputSpec.unsafeCast(validInput); expect(output).toEqual(validInput); }); - test("test errors", () => { + test("test no longer care about the conversion of min/max and validating", () => { + matchInputSpec.unsafeCast( + deepMerge({}, validInput, { rpc: { advanced: { threads: 0 } } }), + ); + }); + test("test errors should throw for number in string", () => { expect(() => matchInputSpec.unsafeCast( - mergeDeep(validInput, { rpc: { advanced: { threads: 0 } } }), + deepMerge({}, validInput, { rpc: { enable: 2 } }), ), ).toThrowError(); - expect(() => - matchInputSpec.unsafeCast(mergeDeep(validInput, { rpc: { enable: 2 } })), - ).toThrowError(); - + }); + test("Test that we set serialversion to something not segwit or non-segwit", () => { expect(() => matchInputSpec.unsafeCast( - mergeDeep(validInput, { + deepMerge({}, validInput, { rpc: { advanced: { serialversion: "testing" } }, }), ), diff --git a/lib/util/deepMerge.ts b/lib/util/deepMerge.ts index c835b18..a4c8422 100644 --- a/lib/util/deepMerge.ts +++ b/lib/util/deepMerge.ts @@ -5,6 +5,7 @@ export function deepMerge(...args: unknown[]): unknown { if (!object.test(lastItem)) return lastItem; const objects = args.filter(object.test).filter((x) => !Array.isArray(x)); if (objects.length === 0) return lastItem as any; + if (objects.length === 1) objects.unshift({}); const allKeys = new Set(objects.flatMap((x) => Object.keys(x))); for (const key of allKeys) { const filteredValues = objects.flatMap((x) => diff --git a/lib/util/propertiesMatcher.ts b/lib/util/propertiesMatcher.ts index f582ba0..3d8314d 100644 --- a/lib/util/propertiesMatcher.ts +++ b/lib/util/propertiesMatcher.ts @@ -80,7 +80,7 @@ unknown type GuardColor = A extends { type: TypeColor } ? GuardDefaultRequired : unknown - // prettier-ignore +// prettier-ignore type GuardDatetime = A extends { type: TypeDatetime } ? GuardDefaultRequired : 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, 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(parser: Parser, 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(parser: Parser, value: unknown) { if (!matchRequired.test(value)) return parser.optional(); return parser; } @@ -253,49 +157,41 @@ export function guardAll( } 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( case "multiselect": if (matchValues.test(value)) { - const maybeAddRangeValidate = , 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; } diff --git a/scripts/oldSpecToBuilder.ts b/scripts/oldSpecToBuilder.ts index 46af34c..e063591 100644 --- a/scripts/oldSpecToBuilder.ts +++ b/scripts/oldSpecToBuilder.ts @@ -2,17 +2,19 @@ import camelCase from "lodash/camelCase"; import * as fs from "fs"; import { string } from "ts-matches"; -export async function writeConvertedFile( +export async function writeConvertedFileFromOld( file: string, inputData: Promise | any, - options: Parameters[1], + options: Parameters[1], ) { - await fs.writeFile(file, await makeFileContent(inputData, options), (err) => - console.error(err), + await fs.writeFile( + file, + await makeFileContentFromOld(inputData, options), + (err) => console.error(err), ); } -export default async function makeFileContent( +export default async function makeFileContentFromOld( inputData: Promise | any, { startSdk = "start-sdk" } = {}, ) { @@ -52,7 +54,9 @@ export default async function makeFileContent( switch (value.type) { case "string": { if (value.textarea) { - return `Value.textarea(${JSON.stringify( + return `${rangeToTodoComment( + value?.range, + )}Value.textarea(${JSON.stringify( { name: value.name || null, description: value.description || null, @@ -64,7 +68,7 @@ export default async function makeFileContent( 2, )})`; } - return `Value.text(${JSON.stringify( + return `${rangeToTodoComment(value?.range)}Value.text(${JSON.stringify( { name: value.name || null, default: value.default || null, @@ -73,9 +77,14 @@ export default async function makeFileContent( required: !(value.nullable || false), masked: value.masked || false, placeholder: value.placeholder || null, - patterns: value.pattern ? - [{ regex: value.pattern, description: value["pattern-description"] }] : - [], + patterns: value.pattern + ? [ + { + regex: value.pattern, + description: value["pattern-description"], + }, + ] + : [], minLength: null, maxLength: null, }, @@ -84,7 +93,9 @@ export default async function makeFileContent( )})`; } case "number": { - return `Value.number(${JSON.stringify( + return `${rangeToTodoComment( + value?.range, + )}Value.number(${JSON.stringify( { name: value.name || null, default: value.default || null, @@ -176,7 +187,7 @@ export default async function makeFileContent( function convertList(value: any) { switch (value.subtype) { case "string": { - return `List.text(${JSON.stringify( + return `${rangeToTodoComment(value?.range)}List.text(${JSON.stringify( { name: value.name || null, minLength: null, @@ -190,15 +201,20 @@ export default async function makeFileContent( )}, ${JSON.stringify({ masked: value?.spec?.masked || false, placeholder: value?.spec?.placeholder || null, - patterns: value?.spec?.pattern ? - [{ regex: value.spec.pattern, description: value?.spec?.["pattern-description"] }] : - [], + patterns: value?.spec?.pattern + ? [ + { + regex: value.spec.pattern, + description: value?.spec?.["pattern-description"], + }, + ] + : [], minLength: null, maxLength: null, })})`; } case "number": { - return `List.number(${JSON.stringify( + return `${rangeToTodoComment(value?.range)}List.number(${JSON.stringify( { name: value.name || null, minLength: null, @@ -230,7 +246,9 @@ export default async function makeFileContent( value?.spec?.["value-names"]?.[key] || key, ]), ); - return `Value.multiselect(${JSON.stringify( + return `${rangeToTodoComment( + value?.range, + )}Value.multiselect(${JSON.stringify( { name: value.name || null, minLength: null, @@ -249,7 +267,7 @@ export default async function makeFileContent( value.name + "_spec", convertInputSpec(value.spec.spec), ); - return `List.obj({ + return `${rangeToTodoComment(value?.range)}List.obj({ name: ${JSON.stringify(value.name || null)}, minLength: ${JSON.stringify(null)}, maxLength: ${JSON.stringify(null)}, @@ -272,7 +290,7 @@ export default async function makeFileContent( ); const unionValueName = newConst( value.name + "_union", - ` + `${rangeToTodoComment(value?.range)} Value.union({ name: ${JSON.stringify(value?.spec?.tag?.name || null)}, description: ${JSON.stringify( @@ -292,7 +310,7 @@ export default async function makeFileContent( }) `, ); - return `List.obj({ + return `${rangeToTodoComment(value?.range)}List.obj({ name:${JSON.stringify(value.name || null)}, minLength:${JSON.stringify(null)}, maxLength:${JSON.stringify(null)}, @@ -332,3 +350,8 @@ export default async function makeFileContent( return newName; } } + +function rangeToTodoComment(range: string | undefined) { + if (!range) return ""; + return `/* TODO: Convert range for this value (${range})*/`; +}