Update dependencies

Author: nktpro

cli.sh

@@ -6,7 +6,7 @@ ENTRY_FILE="./src/cli.ts"
 MOD_FILE="./src/mod.ts"
 
 update_deps() {
-  deno run -A jsr:@wok/deup@1.3.1 update "$@"
+  deno run -A jsr:@wok/deup@2.0.0 update "$@"
   "$0" update_lock
 }
 

deno.json

@@ -36,7 +36,7 @@
     "@std/streams": "jsr:@std/streams@^1.0.8",
     "@std/yaml": "jsr:@std/yaml@^1.0.5",
     "@wok/case": "jsr:@wok/case@^1.0.2",
-    "@wok/typebox": "jsr:@wok/typebox@^0.33.22",
-    "@wok/utils": "jsr:@wok/utils@^3.5.3"
+    "@wok/schema": "jsr:@wok/schema@^2.0.2",
+    "@wok/utils": "jsr:@wok/utils@^4.0.2"
   }
 }

deno.lock

@@ -1,13 +1,13 @@
-import { Type } from "@wok/typebox";
 import { createCliAction, ExitCode } from "@wok/utils/cli";
 import { fetchCurrentWhitelist, updateWhitelist } from "./whitelist_instance.ts";
 import { resolve as resolvePath } from "@std/path";
 import { bold, red } from "@std/fmt/colors";
 import { importBundleModule } from "../libs/iac_utils.ts";
+import { Str } from "../deps/schema.ts";
 
 export default createCliAction(
   {
-    path: Type.String({
+    path: Str({
       description: "Path to the instance module",
       examples: ["./instances/prod.ts"],
     }),

src/actions/blacklist_instance.ts

@@ -2,10 +2,10 @@ import { stringifyYamlRelaxed } from "../libs/yaml_utils.ts";
 import type { HelmetChartInstance } from "../libs/types.ts";
 import { join as joinPath, resolve as resolvePath } from "@std/path";
 import { createCliAction, ExitCode } from "@wok/utils/cli";
-import { Type } from "@wok/typebox";
 import { cyan } from "@std/fmt/colors";
 import { importBundleModule } from "../libs/iac_utils.ts";
 import { K8sKind } from "@wok/utils/k8s";
+import { Str } from "../deps/schema.ts";
 
 async function generateChildChart(
   { crdsPath, resourcesPath, namespacesPath, instance }: {
@@ -269,15 +269,15 @@ export async function compile(
 }
 
 export default createCliAction({
-  version: Type.String({
+  version: Str({
     description: "Version to write to the generated Chart.yaml",
     examples: ["1.0.0"],
   }),
-  source: Type.String({
+  source: Str({
     description: "Path to the instance module's source",
     examples: ["./instances/prod.ts"],
   }),
-  destination: Type.String({
+  destination: Str({
     description: "Destination path to generate the Helm chart to",
     examples: ["/path/to/compiled-prod-chart"],
   }),

src/actions/compile.ts

@@ -2,13 +2,13 @@ import { createCliAction, ExitCode } from "@wok/utils/cli";
 import { captureExec } from "@wok/utils/exec";
 import { bold, cyan, red } from "@std/fmt/colors";
 import { resolve as resolvePath } from "@std/path";
-import { Type } from "@wok/typebox";
 import { importBundleModule } from "../libs/iac_utils.ts";
 import { fetchCurrentWhitelist } from "./whitelist_instance.ts";
+import { Str } from "../deps/schema.ts";
 
 export default createCliAction(
   {
-    path: Type.String({
+    path: Str({
       description: "Path to the instance module",
       examples: ["./instances/prod.ts"],
     }),

src/actions/ensure_instance_whitelisted.ts

@@ -1,12 +1,11 @@
 import { captureExec, inheritExec, printErrLines, printOutLines } from "@wok/utils/exec";
-import { validate } from "@wok/utils/validation";
-import { type Static, type TObject, Type } from "@wok/typebox";
 import { join as joinPath, resolve as resolvePath } from "@std/path";
 import { expandGlobSync } from "@std/fs";
 import { createCliAction, ExitCode } from "@wok/utils/cli";
 import { cyan, gray } from "@std/fmt/colors";
 import { HelmLsResultSchema } from "../libs/iac_utils.ts";
 import { TextLineStream } from "@std/streams/text-line-stream";
+import { Bool, Obj, Opt, Str, typedParse } from "../deps/schema.ts";
 
 async function helmInstall(
   {
@@ -39,7 +38,7 @@ async function helmInstall(
     })).out,
   );
 
-  const helmLsResult = validate(HelmLsResultSchema, helmLsResultRaw);
+  const helmLsResult = typedParse(HelmLsResultSchema, helmLsResultRaw);
 
   if (!helmLsResult.isSuccess) {
     throw new Error('Failed validating result of "helm ls" command');
@@ -113,66 +112,83 @@ async function helmInstall(
 }
 
 export const ParamsSchema = {
-  name: Type.String({
+  name: Str({
     description:
       "Helm release base name. This will be used as the prefx of the different sub-releases (*-crds, *-namespaces and *-resources)",
   }),
-  namespace: Type.String({
+  namespace: Str({
     description: "The namespace where the Secrets for Helm releases are stored",
   }),
-  source: Type.String({
+  source: Str({
     description: "Path to the compiled instance generated from `helmet compile ...`",
   }),
-  wait: Type.Optional(Type.Boolean({
-    description: "Whether to pass --wait to the underlying `helm upgrade ...` process",
-    default: false,
-    examples: [false],
-  })),
-  atomic: Type.Optional(Type.Boolean({
-    description: "Whether to pass --atomic to the underlying `helm upgrade ...` process",
-    default: false,
-    examples: [false],
-  })),
-  cleanupOnFail: Type.Optional(Type.Boolean({
-    description: "Whether to pass --cleanup-on-fail to the underlying `helm upgrade ...` process",
-    default: false,
-    examples: [false],
-  })),
-  force: Type.Optional(Type.Boolean({
-    description: "Whether to pass --force to the underlying `helm upgrade ...` process",
-    default: false,
-    examples: [false],
-  })),
-  timeout: Type.Optional(Type.String({
-    description: "Pass --timeout to the underlying `helm upgrade ...` process",
-    default: "",
-    examples: ["5m0s"],
-  })),
-  createNamespace: Type.Optional(Type.Boolean({
-    description: "Whether to pass --create-namespace to the underlying `helm upgrade ...` process",
-    default: false,
-    examples: [false],
-  })),
-  debug: Type.Optional(Type.Boolean({
-    description: "Whether to pass --debug to the underlying `helm upgrade ...` process",
-    default: false,
-    examples: [false],
-  })),
+  wait: Opt(
+    Bool({
+      description: "Whether to pass --wait to the underlying `helm upgrade ...` process",
+      examples: [false],
+    }),
+    false,
+  ),
+  atomic: Opt(
+    Bool({
+      description: "Whether to pass --atomic to the underlying `helm upgrade ...` process",
+      examples: [false],
+    }),
+    false,
+  ),
+  cleanupOnFail: Opt(
+    Bool({
+      description: "Whether to pass --cleanup-on-fail to the underlying `helm upgrade ...` process",
+      examples: [false],
+    }),
+    false,
+  ),
+  force: Opt(
+    Bool({
+      description: "Whether to pass --force to the underlying `helm upgrade ...` process",
+      examples: [false],
+    }),
+    false,
+  ),
+  timeout: Opt(
+    Str({
+      description: "Pass --timeout to the underlying `helm upgrade ...` process",
+      examples: ["5m0s"],
+    }),
+    "",
+  ),
+  createNamespace: Opt(
+    Bool({
+      description: "Whether to pass --create-namespace to the underlying `helm upgrade ...` process",
+      examples: [false],
+    }),
+    false,
+  ),
+  debug: Opt(
+    Bool({
+      description: "Whether to pass --debug to the underlying `helm upgrade ...` process",
+      examples: [false],
+    }),
+    false,
+  ),
 };
 
+const ParamsSchemaObj = Obj(ParamsSchema);
+type ParamsSchema = typeof ParamsSchemaObj.infer;
+
 export async function install(
   {
     name,
     namespace,
     source,
-    wait = false,
-    atomic = false,
-    cleanupOnFail = false,
-    force = false,
-    createNamespace = false,
-    debug = false,
+    wait,
+    atomic,
+    cleanupOnFail,
+    force,
+    createNamespace,
+    debug,
     timeout,
-  }: Static<TObject<typeof ParamsSchema>>,
+  }: ParamsSchema,
 ) {
   const resolvedSource = resolvePath(source);
 

src/actions/install.ts

@@ -8,8 +8,8 @@ import { pascalCase } from "@wok/case";
 import { captureExec, inheritExec, printErrLines } from "@wok/utils/exec";
 import { K8sCrdApiVersionV1beta1 } from "@wok/utils/k8s";
 import { createCliAction, ExitCode } from "@wok/utils/cli";
-import { Type } from "@wok/typebox";
 import { cyan, gray } from "@std/fmt/colors";
+import { Str } from "../deps/schema.ts";
 
 export type ClassifiedType =
   | "array"
@@ -554,7 +554,8 @@ export async function typeifyChart(chartPath: string, typesPath: string) {
 
       return versions.map((version) => {
         const schema = version.schema?.openAPIV3Schema ||
-          crd.spec.validation?.openAPIV3Schema;
+          (typeof crd.spec.validation === "object" && crd.spec.validation !== null &&
+            (crd.spec.validation as Record<string, unknown>).openAPIV3Schema);
 
         if (schema) {
           return generateCrdInterface(
@@ -687,11 +688,11 @@ ${crdInterfaces}
 
 export default createCliAction(
   {
-    charts: Type.String({
+    charts: Str({
       description: "Glob pattern to match directories of Helm charts, for which types will be generated",
       examples: ["./charts/*"],
     }),
-    types: Type.String({
+    types: Str({
       description: "Path to the destination directory where types will be generated into",
       examples: ["./types"],
     }),

src/actions/typeify.ts

@@ -1,14 +1,14 @@
 import { createCliAction, ExitCode } from "@wok/utils/cli";
 import { inheritExec } from "@wok/utils/exec";
-import { Type } from "@wok/typebox";
+import { Str } from "../deps/schema.ts";
 
 export default createCliAction(
   {
-    name: Type.String({
+    name: Str({
       description: "Instance name to uninstall",
       examples: ["iac-my-stack"],
     }),
-    namespace: Type.String({
+    namespace: Str({
       description: "The namespace where corresponding Helm releases of this instance were installed to",
       examples: ["iac-my-stack"],
     }),