From ce0170b808d36eee2cf99369860a9a32007a2062 Mon Sep 17 00:00:00 2001 From: BluJ Date: Mon, 27 Mar 2023 15:39:01 -0600 Subject: [PATCH] wip --- Makefile | 4 ++-- lib/util/propertiesMatcher.ts | 20 ++++++-------------- package-lock.json | 4 ++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 2017131..c467290 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ lib/test/output.ts: lib/test/makeOutput.ts scripts/oldSpecToBuilder.ts npm run buildOutput bundle: fmt $(TS_FILES) .FORCE node_modules - npm run tsc-multi - npm run tsc --emitDeclarationOnly + npx tsc-multi + npx tsc --emitDeclarationOnly check: npm run check diff --git a/lib/util/propertiesMatcher.ts b/lib/util/propertiesMatcher.ts index c9a7932..a505dfc 100644 --- a/lib/util/propertiesMatcher.ts +++ b/lib/util/propertiesMatcher.ts @@ -2,16 +2,8 @@ import * as matches from "ts-matches"; import { Parser } from "ts-matches"; import { InputSpec, ValueSpec as ValueSpecAny } from "../config/config-types"; -const { - string, - some, - object, - dictionary, - unknown, - number, - literals, - boolean, -} = matches; +const { string, some, object, dictionary, unknown, number, literals, boolean } = + matches; type TypeBoolean = "boolean"; type TypeString = "string"; @@ -166,13 +158,13 @@ export function matchNumberWithRange(range: string) { leftValue === "*" ? (_) => true : left === "[" - ? (x) => x >= Number(leftValue) - : (x) => x > Number(leftValue), + ? (x) => x >= Number(leftValue) + : (x) => x > Number(leftValue), leftValue === "*" ? "any" : left === "[" - ? `greaterThanOrEqualTo${leftValue}` - : `greaterThan${leftValue}` + ? `greaterThanOrEqualTo${leftValue}` + : `greaterThan${leftValue}` ) .validate( // prettier-ignore diff --git a/package-lock.json b/package-lock.json index 135388e..981ae38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "start-sdk", - "version": "0.4.0-lib0.alpha9", + "version": "0.4.0-alpha10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "start-sdk", - "version": "0.4.0-lib0.alpha9", + "version": "0.4.0-alpha10", "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5",