From 3052bbe85dd12049a5eec82f55e7773e144d37be Mon Sep 17 00:00:00 2001
From: BluJ <mogulslayer@gmail.com>
Date: Fri, 14 Apr 2023 11:44:00 -0600
Subject: [PATCH] chore: charlie 20

---
 lib/config/builder/list.ts  |  2 +-
 lib/config/configTypes.ts   | 50 ++++++++++++++++++++-----------------
 lib/properties/index.ts     |  4 ++-
 package-lock.json           |  4 +--
 package.json                |  2 +-
 scripts/oldSpecToBuilder.ts |  5 +++-
 6 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/lib/config/builder/list.ts b/lib/config/builder/list.ts
index d3686ce..b59c398 100644
--- a/lib/config/builder/list.ts
+++ b/lib/config/builder/list.ts
@@ -103,7 +103,7 @@ export class List<A extends ValueSpecList> extends IBuilder<A> {
       description?: string | null;
       warning?: string | null;
       /** Default [] */
-      default?: Record<string, unknown>[];
+      default?: [];
       /** Default = "(\*,\*)" */
       range?: string;
     },
diff --git a/lib/config/configTypes.ts b/lib/config/configTypes.ts
index c089cec..b64df92 100644
--- a/lib/config/configTypes.ts
+++ b/lib/config/configTypes.ts
@@ -2,34 +2,38 @@ import * as C from "./configTypesRaw";
 
 export type ValueType = C.ValueType;
 
-export type InputSpec = Record<string, Required<C.ValueSpec>>;
+export type RequiredDeep<A> = A extends {}
+  ? { [K in keyof A]-?: RequiredDeep<A[K]> }
+  : Required<A>;
 
-export type ValueSpec = Required<C.ValueSpec>;
+export type InputSpec = Record<string, RequiredDeep<C.ValueSpec>>;
+
+export type ValueSpec = RequiredDeep<C.ValueSpec>;
 
 /** core spec types. These types provide the metadata for performing validations */
-export type ValueSpecOf<T extends ValueType> = Required<C.ValueSpecOf<T>>;
+export type ValueSpecOf<T extends ValueType> = RequiredDeep<C.ValueSpecOf<T>>;
 
-export type ValueSpecString = Required<C.ValueSpecString>;
-export type ValueSpecTextarea = Required<C.ValueSpecTextarea>;
-export type ValueSpecNumber = Required<C.ValueSpecNumber>;
-export type ValueSpecSelect = Required<C.ValueSpecSelect>;
-export type ValueSpecMultiselect = Required<C.ValueSpecMultiselect>;
-export type ValueSpecBoolean = Required<C.ValueSpecBoolean>;
-export type ValueSpecUnion = Required<C.ValueSpecUnion>;
-export type ValueSpecFile = Required<C.ValueSpecFile>;
-export type ValueSpecObject = Required<C.ValueSpecObject>;
-export type WithStandalone = Required<C.WithStandalone>;
-export type SelectBase = Required<C.SelectBase>;
-export type ListValueSpecType = Required<C.ListValueSpecType>;
+export type ValueSpecString = RequiredDeep<C.ValueSpecString>;
+export type ValueSpecTextarea = RequiredDeep<C.ValueSpecTextarea>;
+export type ValueSpecNumber = RequiredDeep<C.ValueSpecNumber>;
+export type ValueSpecSelect = RequiredDeep<C.ValueSpecSelect>;
+export type ValueSpecMultiselect = RequiredDeep<C.ValueSpecMultiselect>;
+export type ValueSpecBoolean = RequiredDeep<C.ValueSpecBoolean>;
+export type ValueSpecUnion = RequiredDeep<C.ValueSpecUnion>;
+export type ValueSpecFile = RequiredDeep<C.ValueSpecFile>;
+export type ValueSpecObject = RequiredDeep<C.ValueSpecObject>;
+export type WithStandalone = RequiredDeep<C.WithStandalone>;
+export type SelectBase = RequiredDeep<C.SelectBase>;
+export type ListValueSpecType = RequiredDeep<C.ListValueSpecType>;
 
 /** represents a spec for the values of a list */
-export type ListValueSpecOf<T extends ListValueSpecType> = Required<
+export type ListValueSpecOf<T extends ListValueSpecType> = RequiredDeep<
   C.ListValueSpecOf<T>
 >;
 
 /** represents a spec for a list */
-export type ValueSpecList = Required<C.ValueSpecList>;
-export type ValueSpecListOf<T extends ListValueSpecType> = Required<
+export type ValueSpecList = RequiredDeep<C.ValueSpecList>;
+export type ValueSpecListOf<T extends ListValueSpecType> = RequiredDeep<
   C.ValueSpecListOf<T>
 >;
 
@@ -40,11 +44,11 @@ export function isValueSpecListOf<S extends ListValueSpecType>(
 ): t is ValueSpecListOf<S> & { spec: ListValueSpecOf<S> } {
   return t.spec.type === s;
 }
-export type ListValueSpecString = Required<C.ListValueSpecString>;
-export type ListValueSpecNumber = Required<C.ListValueSpecNumber>;
-export type ListValueSpecObject = Required<C.ListValueSpecObject>;
-export type UniqueBy = Required<C.UniqueBy>;
-export type DefaultString = Required<C.DefaultString>;
+export type ListValueSpecString = RequiredDeep<C.ListValueSpecString>;
+export type ListValueSpecNumber = RequiredDeep<C.ListValueSpecNumber>;
+export type ListValueSpecObject = RequiredDeep<C.ListValueSpecObject>;
+export type UniqueBy = RequiredDeep<C.UniqueBy>;
+export type DefaultString = RequiredDeep<C.DefaultString>;
 
 export const unionSelectKey = "unionSelectKey" as const;
 export type UnionSelectKey = typeof unionSelectKey;
diff --git a/lib/properties/index.ts b/lib/properties/index.ts
index 27e19e5..33ad3af 100644
--- a/lib/properties/index.ts
+++ b/lib/properties/index.ts
@@ -6,7 +6,9 @@ export { PropertyObject } from "./PropertyObject";
 export { PropertyString } from "./PropertyString";
 
 export const test = "";
-export type UnionToIntersection<T> = ((x: T) => any) extends (x: infer R) => any ? R : never;
+export type UnionToIntersection<T> = ((x: T) => any) extends (x: infer R) => any
+  ? R
+  : never;
 
 /**
  * This is used during creating the type of properties fn in the service package.
diff --git a/package-lock.json b/package-lock.json
index 983cdb6..0b15c12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "start-sdk",
-  "version": "0.4.0-lib0.charlie19",
+  "version": "0.4.0-lib0.charlie20",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "start-sdk",
-      "version": "0.4.0-lib0.charlie19",
+      "version": "0.4.0-lib0.charlie20",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
diff --git a/package.json b/package.json
index 5810700..14aa15d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "start-sdk",
-  "version": "0.4.0-lib0.charlie19",
+  "version": "0.4.0-lib0.charlie20",
   "description": "For making the patterns that are wanted in making services for the startOS.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
diff --git a/scripts/oldSpecToBuilder.ts b/scripts/oldSpecToBuilder.ts
index 072d564..91c32fa 100644
--- a/scripts/oldSpecToBuilder.ts
+++ b/scripts/oldSpecToBuilder.ts
@@ -217,7 +217,10 @@ export default async function makeFileContent(
         const values = Object.fromEntries(
           Array.from(allValueNames)
             .filter(string.test)
-            .map((key) => [key, value?.spec?.["value-names"]?.[key] || key])
+            .map((key: string) => [
+              key,
+              value?.spec?.["value-names"]?.[key] || key,
+            ])
         );
         return `Value.multiselect(${JSON.stringify(
           {