sdk input spec improvements (#2785)

* sdk input spec improvements * more sdk changes * fe changes * alpha.14 * fix tests * separate validator in filehelper * use deeppartial for getinput * fix union type and update ts-matches * alpha.15 * alpha.16 * alpha.17 --------- Co-authored-by: Matt Hill <mattnine@protonmail.com>
Start9Labs · Nov 19, 2024 · 1771797 · 1771797
1 parent 46179f5
commit 1771797
Show file tree

Hide file tree

Showing 24 changed files with 550 additions and 512 deletions.
diff --git a/...time/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap b/...time/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
@@ -264,7 +264,6 @@ exports[`transformConfigSpec transformConfigSpec(bitcoind) 1`] = `
         "disabled": false,
         "immutable": false,
         "name": "Pruning Mode",
-        "required": true,
         "type": "union",
         "variants": {
           "automatic": {
@@ -524,7 +523,6 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
     "disabled": false,
     "immutable": false,
     "name": "Type",
-    "required": true,
     "type": "union",
     "variants": {
       "index": {
@@ -589,7 +587,6 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
             "disabled": false,
             "immutable": false,
             "name": "Folder Location",
-            "required": false,
             "type": "select",
             "values": {
               "filebrowser": "filebrowser",
@@ -644,7 +641,6 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
           "disabled": false,
           "immutable": false,
           "name": "Type",
-          "required": true,
           "type": "union",
           "variants": {
             "redirect": {
@@ -705,7 +701,6 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
                   "disabled": false,
                   "immutable": false,
                   "name": "Folder Location",
-                  "required": false,
                   "type": "select",
                   "values": {
                     "filebrowser": "filebrowser",
@@ -758,7 +753,6 @@ exports[`transformConfigSpec transformConfigSpec(nostr2) 1`] = `
     "disabled": false,
     "immutable": false,
     "name": "Relay Type",
-    "required": true,
     "type": "union",
     "variants": {
       "private": {

diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts b/container-runtime/src/Adapters/Systems/SystemForEmbassy/transformConfigSpec.ts
@@ -43,7 +43,6 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): IST.InputSpec {
           }),
           {},
         ),
-        required: false,
         disabled: false,
         immutable: false,
       }
@@ -127,7 +126,6 @@ export function transformConfigSpec(oldSpec: OldConfigSpec): IST.InputSpec {
           {} as Record<string, { name: string; spec: IST.InputSpec }>,
         ),
         disabled: false,
-        required: true,
         default: oldVal.default,
         immutable: false,
       }

diff --git a/sdk/base/lib/actions/index.ts b/sdk/base/lib/actions/index.ts
@@ -1,6 +1,7 @@
 import * as T from "../types"
 import * as IST from "../actions/input/inputSpecTypes"
 import { Action } from "./setupActions"
+import { ExtractInputSpecType } from "./input/builder/inputSpec"
 
 export type RunActionInput<Input> =
   | Input
@@ -44,46 +45,40 @@ export const runAction = async <
     })
   }
 }
-type GetActionInputType<
-  A extends Action<T.ActionId, any, any, Record<string, unknown>>,
-> = A extends Action<T.ActionId, any, any, infer I> ? I : never
+type GetActionInputType<A extends Action<T.ActionId, any, any>> =
+  A extends Action<T.ActionId, any, infer I> ? ExtractInputSpecType<I> : never
 
 type ActionRequestBase = {
   reason?: string
   replayId?: string
 }
-type ActionRequestInput<
-  T extends Action<T.ActionId, any, any, Record<string, unknown>>,
-> = {
+type ActionRequestInput<T extends Action<T.ActionId, any, any>> = {
   kind: "partial"
   value: Partial<GetActionInputType<T>>
 }
-export type ActionRequestOptions<
-  T extends Action<T.ActionId, any, any, Record<string, unknown>>,
-> = ActionRequestBase &
-  (
-    | {
-        when?: Exclude<
-          T.ActionRequestTrigger,
-          { condition: "input-not-matches" }
-        >
-        input?: ActionRequestInput<T>
-      }
-    | {
-        when: T.ActionRequestTrigger & { condition: "input-not-matches" }
-        input: ActionRequestInput<T>
-      }
-  )
+export type ActionRequestOptions<T extends Action<T.ActionId, any, any>> =
+  ActionRequestBase &
+    (
+      | {
+          when?: Exclude<
+            T.ActionRequestTrigger,
+            { condition: "input-not-matches" }
+          >
+          input?: ActionRequestInput<T>
+        }
+      | {
+          when: T.ActionRequestTrigger & { condition: "input-not-matches" }
+          input: ActionRequestInput<T>
+        }
+    )
 
 const _validate: T.ActionRequest = {} as ActionRequestOptions<any> & {
   actionId: string
   packageId: string
   severity: T.ActionSeverity
 }
 
-export const requestAction = <
-  T extends Action<T.ActionId, any, any, Record<string, unknown>>,
->(options: {
+export const requestAction = <T extends Action<T.ActionId, any, any>>(options: {
   effects: T.Effects
   packageId: T.PackageId
   action: T

diff --git a/sdk/base/lib/actions/input/builder/inputSpec.ts b/sdk/base/lib/actions/input/builder/inputSpec.ts
@@ -1,5 +1,5 @@
 import { ValueSpec } from "../inputSpecTypes"
-import { Value } from "./value"
+import { PartialValue, Value } from "./value"
 import { _ } from "../../../util"
 import { Effects } from "../../../Effects"
 import { Parser, object } from "ts-matches"
@@ -16,6 +16,15 @@ export type ExtractInputSpecType<A extends Record<string, any> | InputSpec<Recor
   A extends InputSpec<infer B, any> | InputSpec<infer B, never> ? B :
   A
 
+export type ExtractPartialInputSpecType<
+  A extends
+    | Record<string, any>
+    | InputSpec<Record<string, any>, any>
+    | InputSpec<Record<string, any>, never>,
+> = A extends InputSpec<infer B, any> | InputSpec<infer B, never>
+  ? PartialValue<B>
+  : PartialValue<A>
+
 export type InputSpecOf<A extends Record<string, any>, Store = never> = {
   [K in keyof A]: Value<A[K], Store>
 }
@@ -84,6 +93,8 @@ export class InputSpec<Type extends Record<string, any>, Store = never> {
     },
     public validator: Parser<unknown, Type>,
   ) {}
+  _TYPE: Type = null as any as Type
+  _PARTIAL: PartialValue<Type> = null as any as PartialValue<Type>
   async build(options: LazyBuildOptions<Store>) {
     const answer = {} as {
       [K in keyof Type]: ValueSpec