@highstate/library 0.9.16 → 0.9.18

package/src/timeweb.ts

@@ -1,13 +1,13 @@
-import { defineEntity, defineUnit, Type } from "@highstate/contract"
+import { defineEntity, defineUnit, z } from "@highstate/contract"
 import { serverEntity } from "./common"
 import { keyPairEntity } from "./ssh"
 
 export const connectionEntity = defineEntity({
   type: "timeweb.connection",
 
-  schema: Type.Object({
-    name: Type.String(),
-    apiToken: Type.String(),
+  schema: z.object({
+    name: z.string(),
+    apiToken: z.string(),
   }),
 })
 
@@ -15,7 +15,7 @@ export const connection = defineUnit({
   type: "timeweb.connection",
 
   secrets: {
-    apiToken: Type.String(),
+    apiToken: z.string(),
   },
 
   outputs: {
@@ -23,9 +23,9 @@ export const connection = defineUnit({
   },
 
   meta: {
-    displayName: "Timeweb Connection",
+    title: "Timeweb Connection",
     description: "Creates a new Timeweb connection.",
-    primaryIcon: "material-symbols:cloud",
+    icon: "material-symbols:cloud",
     category: "Timeweb",
   },
 
@@ -39,9 +39,9 @@ export const virtualMachine = defineUnit({
   type: "timeweb.virtual-machine",
 
   args: {
-    presetId: Type.Optional(Type.Number()),
-    osId: Type.Optional(Type.Number()),
-    availabilityZone: Type.String(),
+    presetId: z.number().optional(),
+    osId: z.number().optional(),
+    availabilityZone: z.string(),
   },
 
   inputs: {
@@ -53,7 +53,7 @@ export const virtualMachine = defineUnit({
   },
 
   secrets: {
-    sshPrivateKey: Type.Optional(Type.String()),
+    sshPrivateKey: z.string().optional(),
   },
 
   outputs: {
@@ -61,9 +61,9 @@ export const virtualMachine = defineUnit({
   },
 
   meta: {
-    displayName: "Timeweb Virtual Machine",
+    title: "Timeweb Virtual Machine",
     description: "Creates a new Timeweb virtual machine.",
-    primaryIcon: "material-symbols:cloud",
+    icon: "material-symbols:cloud",
     secondaryIcon: "codicon:vm",
     category: "Timeweb",
   },

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { Type, type Static } from "@highstate/contract"
+import { z } from "@highstate/contract"
 
 type PrefixWith<TString extends string, TPrefix extends string> = TPrefix extends ""
   ? TString
@@ -26,7 +26,7 @@ export function prefixKeysWith<T extends Record<string, unknown>, Prefix extends
   ) as PrefixedKeys<T, Prefix>
 }
 
-export const arrayPatchModeSchema = Type.StringEnum(["prepend", "replace"])
+export const arrayPatchModeSchema = z.enum(["prepend", "replace"])
 
 /**
  * The mode to use when patching some array.
@@ -34,4 +34,4 @@ export const arrayPatchModeSchema = Type.StringEnum(["prepend", "replace"])
  * - `prepend`: Prepend the values of the new array to the existing array.
  * - `replace`: Replace the existing array with the new array.
  */
-export type ArrayPatchMode = Static<typeof arrayPatchModeSchema>
+export type ArrayPatchMode = z.infer<typeof arrayPatchModeSchema>

package/src/wireguard.ts

@@ -1,35 +1,35 @@
-import { defineEntity, defineUnit, Type, type Static, type TObject } from "@highstate/contract"
+import { defineEntity, defineUnit, z } from "@highstate/contract"
 import { omit } from "remeda"
 import { clusterEntity, interfaceEntity, exposableWorkloadEntity } from "./k8s"
 import { l3EndpointEntity, l4EndpointEntity } from "./network"
 import { arrayPatchModeSchema } from "./utils"
 
-export const backendSchema = Type.StringEnum(["wireguard", "amneziawg"])
+export const backendSchema = z.enum(["wireguard", "amneziawg"])
 
-export type Backend = Static<typeof backendSchema>
+export type Backend = z.infer<typeof backendSchema>
 
 export const networkEntity = defineEntity({
   type: "wireguard.network",
 
-  schema: Type.Object({
+  schema: z.object({
     backend: backendSchema,
-    ipv6: Type.Boolean(),
+    ipv6: z.boolean(),
   }),
 })
 
-export const nodeExposePolicySchema = Type.StringEnum(["always", "when-has-endpoint", "never"])
+export const nodeExposePolicySchema = z.enum(["always", "when-has-endpoint", "never"])
 
 export const peerEntity = defineEntity({
   type: "wireguard.peer",
 
-  schema: Type.Object({
-    name: Type.String(),
-    network: Type.Optional(networkEntity.schema),
-    publicKey: Type.String(),
-    address: Type.Optional(Type.String()),
-    allowedIps: Type.Array(Type.String()),
-    endpoints: Type.Array(l4EndpointEntity.schema),
-    allowedEndpoints: Type.Array(Type.Union([l3EndpointEntity.schema, l4EndpointEntity.schema])),
+  schema: z.object({
+    name: z.string(),
+    network: networkEntity.schema.optional(),
+    publicKey: z.string(),
+    address: z.string().optional(),
+    allowedIps: z.string().array(),
+    endpoints: l4EndpointEntity.schema.array(),
+    allowedEndpoints: z.union([l3EndpointEntity.schema, l4EndpointEntity.schema]).array(),
 
     /**
      * The pre-shared key of the WireGuard peer.
@@ -38,18 +38,18 @@ export const peerEntity = defineEntity({
      *
      * Will be ignored if both peers have `presharedKeyPart` set.
      */
-    presharedKey: Type.Optional(Type.String()),
+    presharedKey: z.string().optional(),
 
     /**
      * The pre-shared key part of the WireGuard peer.
      *
      * If both peers have `presharedKeyPart` set, their `presharedKey` will be calculated as XOR of the two parts.
      */
-    presharedKeyPart: Type.Optional(Type.String()),
+    presharedKeyPart: z.string().optional(),
 
-    excludedIps: Type.Array(Type.String()),
-    dns: Type.Array(Type.String()),
-    listenPort: Type.Optional(Type.Number()),
+    excludedIps: z.string().array(),
+    dns: z.string().array(),
+    listenPort: z.number().optional(),
   }),
 
   meta: {
@@ -60,9 +60,9 @@ export const peerEntity = defineEntity({
 export const identityEntity = defineEntity({
   type: "wireguard.identity",
 
-  schema: Type.Object({
+  schema: z.object({
     peer: peerEntity.schema,
-    privateKey: Type.String(),
+    privateKey: z.string(),
   }),
 
   meta: {
@@ -70,10 +70,10 @@ export const identityEntity = defineEntity({
   },
 })
 
-export type Network = Static<typeof networkEntity.schema>
-export type Identity = Static<typeof identityEntity.schema>
-export type Peer = Static<typeof peerEntity.schema>
-export type NodeExposePolicy = Static<typeof nodeExposePolicySchema>
+export type Network = z.infer<typeof networkEntity.schema>
+export type Identity = z.infer<typeof identityEntity.schema>
+export type Peer = z.infer<typeof peerEntity.schema>
+export type NodeExposePolicy = z.infer<typeof nodeExposePolicySchema>
 
 /**
  * The network hols the shared configuration for the WireGuard identities, peers and nodes.
@@ -91,14 +91,14 @@ export const network = defineUnit({
      *
      * By default, the `wireguard` backend is used.
      */
-    backend: Type.Default(backendSchema, "wireguard"),
+    backend: backendSchema.default("wireguard"),
 
     /**
      * The option to enable IPv6 support in the network.
      *
      * By default, IPv6 support is disabled.
      */
-    ipv6: Type.Default(Type.Boolean(), false),
+    ipv6: z.boolean().default(false),
   },
 
   outputs: {
@@ -107,8 +107,8 @@ export const network = defineUnit({
 
   meta: {
     description: "The WireGuard network with some shared configuration.",
-    primaryIcon: "simple-icons:wireguard",
-    primaryIconColor: "#88171a",
+    icon: "simple-icons:wireguard",
+    iconColor: "#88171a",
     secondaryIcon: "mdi:local-area-network-connect",
     category: "VPN",
   },
@@ -125,21 +125,21 @@ const sharedPeerArgs = {
    *
    * If not provided, the peer will be named after the unit.
    */
-  peerName: Type.Optional(Type.String()),
+  peerName: z.string().optional(),
 
   /**
    * The address of the WireGuard interface.
    *
    * The address may be any IPv4 or IPv6 address. CIDR notation is also supported.
    */
-  address: Type.Optional(Type.String()),
+  address: z.string().optional(),
 
   /**
    * The convenience option to set `allowedIps` to `0.0.0.0/0, ::/0`.
    *
    * Will be merged with the `allowedIps` if provided.
    */
-  exitNode: Type.Default(Type.Boolean(), false),
+  exitNode: z.boolean().default(false),
 
   /**
    * The list of IP ranges to exclude from the tunnel.
@@ -150,7 +150,7 @@ const sharedPeerArgs = {
    * - Instead, the node will setup extra direct routes to these IPs via default gateway.
    * - This allows to use `0.0.0.0/0, ::/0` in the `allowedIps` (and corresponding fwmark magic) and still have some IPs excluded from the tunnel.
    */
-  excludedIps: Type.Default(Type.Array(Type.String()), []),
+  excludedIps: z.string().array().default([]),
 
   /**
    * The convenience option to exclude private IPs from the tunnel.
@@ -168,38 +168,38 @@ const sharedPeerArgs = {
    *
    * Will be merged with `excludedIps` if provided.
    */
-  excludePrivateIps: Type.Default(Type.Boolean(), false),
+  excludePrivateIps: z.boolean().default(false),
 
   /**
    * The endpoints of the WireGuard peer.
    */
-  endpoints: Type.Default(Type.Array(Type.String()), []),
+  endpoints: z.string().array().default([]),
 
   /**
    * The allowed endpoints of the WireGuard peer.
    *
    * The non `hostname` endpoints will be added to the `allowedIps` of the peer.
    */
-  allowedEndpoints: Type.Default(Type.Array(Type.String()), []),
+  allowedEndpoints: z.string().array().default([]),
 
   /**
    * The DNS servers that should be used by the interface connected to the WireGuard peer.
    *
    * If multiple peers define DNS servers, the node will merge them into a single list (but this is discouraged).
    */
-  dns: Type.Default(Type.Array(Type.String()), []),
+  dns: z.string().array().default([]),
 
   /**
    * The convenience option to include the DNS servers to the allowed IPs.
    *
    * By default, is `true`.
    */
-  includeDns: Type.Default(Type.Boolean(), true),
+  includeDns: z.boolean().default(true),
 
   /**
    * The port to listen on.
    */
-  listenPort: Type.Optional(Type.Number()),
+  listenPort: z.number().optional(),
 }
 
 const sharedPeerInputs = {
@@ -272,7 +272,18 @@ const sharedPeerOutputs = {
   },
 } as const
 
-export type SharedPeerArgs = Static<TObject<typeof sharedPeerArgs>>
+export type SharedPeerArgs = {
+  peerName?: string
+  address?: string
+  exitNode: boolean
+  excludedIps: string[]
+  excludePrivateIps: boolean
+  endpoints: string[]
+  allowedEndpoints: string[]
+  dns: string[]
+  includeDns: boolean
+  listenPort?: number
+}
 
 export const peer = defineUnit({
   type: "wireguard.peer",
@@ -283,14 +294,14 @@ export const peer = defineUnit({
     /**
      * The public key of the WireGuard peer.
      */
-    publicKey: Type.String(),
+    publicKey: z.string(),
   },
 
   secrets: {
     /**
      * The pre-shared key which should be used for the peer.
      */
-    presharedKey: Type.Optional(Type.String()),
+    presharedKey: z.string().optional(),
   },
 
   inputs: sharedPeerInputs,
@@ -298,8 +309,8 @@ export const peer = defineUnit({
 
   meta: {
     description: "The WireGuard peer with the public key.",
-    primaryIcon: "simple-icons:wireguard",
-    primaryIconColor: "#88171a",
+    icon: "simple-icons:wireguard",
+    iconColor: "#88171a",
     secondaryIcon: "mdi:badge-account-horizontal",
     category: "VPN",
   },
@@ -317,7 +328,7 @@ export const peerPatch = defineUnit({
     /**
      * The endpoints of the WireGuard peer.
      */
-    endpoints: Type.Default(Type.Array(Type.String()), []),
+    endpoints: z.string().array().default([]),
 
     /**
      * The mode to use for patching the endpoints.
@@ -325,14 +336,14 @@ export const peerPatch = defineUnit({
      * - `prepend`: prepend the new endpoints to the existing ones (default);
      * - `replace`: replace the existing endpoints with the new ones.
      */
-    endpointsPatchMode: Type.Default(arrayPatchModeSchema, "prepend"),
+    endpointsPatchMode: arrayPatchModeSchema.default("prepend"),
 
     /**
      * The allowed endpoints of the WireGuard peer.
      *
      * The non `hostname` endpoints will be added to the `allowedIps` of the peer.
      */
-    allowedEndpoints: Type.Default(Type.Array(Type.String()), []),
+    allowedEndpoints: z.string().array().default([]),
 
     /**
      * The mode to use for patching the allowed endpoints.
@@ -340,7 +351,7 @@ export const peerPatch = defineUnit({
      * - `prepend`: prepend the new endpoints to the existing ones (default);
      * - `replace`: replace the existing endpoints with the new ones.
      */
-    allowedEndpointsPatchMode: Type.Default(arrayPatchModeSchema, "prepend"),
+    allowedEndpointsPatchMode: arrayPatchModeSchema.default("prepend"),
 
     ...omit(sharedPeerArgs, ["endpoints", "allowedEndpoints"]),
   },
@@ -361,10 +372,10 @@ export const peerPatch = defineUnit({
   },
 
   meta: {
-    displayName: "WireGuard Peer Patch",
+    title: "WireGuard Peer Patch",
     description: "Patches some properties of the WireGuard peer.",
-    primaryIcon: "simple-icons:wireguard",
-    primaryIconColor: "#88171a",
+    icon: "simple-icons:wireguard",
+    iconColor: "#88171a",
     secondaryIcon: "mdi:badge-account-horizontal",
     category: "VPN",
   },
@@ -386,7 +397,7 @@ export const identity = defineUnit({
      *
      * Used by the implementation of the identity and to calculate the endpoint of the peer.
      */
-    listenPort: Type.Optional(Type.Number()),
+    listenPort: z.number().optional(),
 
     /**
      * The endpoint of the WireGuard peer.
@@ -395,7 +406,7 @@ export const identity = defineUnit({
      *
      * Will take priority over all calculated endpoints and `l4Endpoint` input.
      */
-    endpoints: Type.Default(Type.Array(Type.String()), []),
+    endpoints: z.string().array().default([]),
   },
 
   secrets: {
@@ -404,14 +415,14 @@ export const identity = defineUnit({
      *
      * If not provided, the key will be generated automatically.
      */
-    privateKey: Type.Optional(Type.String()),
+    privateKey: z.string().optional(),
 
     /**
      * The part of the pre-shared of the WireGuard identity.
      *
      * Will be generated automatically if not provided.
      */
-    presharedKeyPart: Type.Optional(Type.String()),
+    presharedKeyPart: z.string().optional(),
   },
 
   inputs: sharedPeerInputs,
@@ -423,8 +434,8 @@ export const identity = defineUnit({
 
   meta: {
     description: "The WireGuard identity with the public key.",
-    primaryIcon: "simple-icons:wireguard",
-    primaryIconColor: "#88171a",
+    icon: "simple-icons:wireguard",
+    iconColor: "#88171a",
     secondaryIcon: "mdi:account",
     category: "VPN",
   },
@@ -444,12 +455,12 @@ export const node = defineUnit({
      *
      * By default, the name is `wg-${identity.name}`.
      */
-    appName: Type.Optional(Type.String()),
+    appName: z.string().optional(),
 
     /**
      * Whether to expose the WireGuard node to the outside world.
      */
-    external: Type.Default(Type.Boolean(), false),
+    external: z.boolean().default(false),
 
     /**
      * The policy to use for exposing the WireGuard node.
@@ -460,14 +471,14 @@ export const node = defineUnit({
      *
      * * By default, the `when-has-endpoint` policy is used.
      */
-    exposePolicy: Type.Default(nodeExposePolicySchema, "when-has-endpoint"),
+    exposePolicy: nodeExposePolicySchema.default("when-has-endpoint"),
 
     /**
      * The extra specification of the container which runs the WireGuard node.
      *
      * Will override any overlapping fields.
      */
-    containerSpec: Type.Optional(Type.Record(Type.String(), Type.Any())),
+    containerSpec: z.record(z.string(), z.unknown()).optional(),
 
     /**
      * List of CIDR blocks that should be blocked from forwarding through this WireGuard node.
@@ -477,7 +488,7 @@ export const node = defineUnit({
      *
      * Useful for peer isolation where you want to prevent cross-peer communication.
      */
-    forwardRestrictedIps: Type.Default(Type.Array(Type.String()), []),
+    forwardRestrictedIps: z.string().array().default([]),
   },
 
   inputs: {
@@ -521,8 +532,8 @@ export const node = defineUnit({
 
   meta: {
     description: "The WireGuard node running on the Kubernetes.",
-    primaryIcon: "simple-icons:wireguard",
-    primaryIconColor: "#88171a",
+    icon: "simple-icons:wireguard",
+    iconColor: "#88171a",
     secondaryIcon: "mdi:server",
     category: "VPN",
   },
@@ -542,7 +553,7 @@ export const config = defineUnit({
      *
      * If not provided, the config will not respect `excludedIps`.
      */
-    defaultInterface: Type.Optional(Type.String()),
+    defaultInterface: z.string().optional(),
   },
 
   inputs: {
@@ -555,10 +566,10 @@ export const config = defineUnit({
   },
 
   meta: {
-    displayName: "WireGuard Config",
+    title: "WireGuard Config",
     description: "Just the WireGuard configuration for the identity and peers.",
-    primaryIcon: "simple-icons:wireguard",
-    primaryIconColor: "#88171a",
+    icon: "simple-icons:wireguard",
+    iconColor: "#88171a",
     secondaryIcon: "mdi:settings",
     category: "VPN",
   },
@@ -586,10 +597,10 @@ export const configBundle = defineUnit({
   },
 
   meta: {
-    displayName: "WireGuard Config Bundle",
+    title: "WireGuard Config Bundle",
     description: "The WireGuard configuration bundle for the identity and peers.",
-    primaryIcon: "simple-icons:wireguard",
-    primaryIconColor: "#88171a",
+    icon: "simple-icons:wireguard",
+    iconColor: "#88171a",
     secondaryIcon: "mdi:folder-settings-variant",
     category: "VPN",
   },