From db405752cbb30bc7410ff2aca153cc36b37c4ff6 Mon Sep 17 00:00:00 2001 From: Natoandro Date: Mon, 19 Aug 2024 10:26:52 +0300 Subject: [PATCH] fix typing errors --- files/mod.ts | 11 +++++------ modules/envs/types.ts | 12 +++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/files/mod.ts b/files/mod.ts index 594542d..a4499ea 100644 --- a/files/mod.ts +++ b/files/mod.ts @@ -37,7 +37,7 @@ import type { ExecTaskArgs } from "../modules/tasks/deno.ts"; import { TaskDefHashed, TasksModuleConfig } from "../modules/tasks/types.ts"; // envs import { - DynamicPathVarProvision, + DynamicPosixDirProvision, type EnvRecipe, type EnvsModuleConfig, PosixDirProvision, @@ -921,8 +921,7 @@ type EnvFinalizer = () => { vars: Record; dynVars: Record; posixDirs: Array; - dynamicPosixDirs: Array; - dynBinDirs: string[]; + dynamicPosixDirs: Array; desc?: string; onEnterHookTasks: string[]; onExitHookTasks: string[]; @@ -986,7 +985,7 @@ export class EnvBuilder { #vars: Record = {}; #dynVars: Record = {}; #posixDirs: Array = []; - #dynamicPosixDirs: Array = []; + #dynamicPosixDirs: Array = []; #desc?: string; #onEnterHookTasks: string[] = []; #onExitHookTasks: string[] = []; @@ -1095,7 +1094,7 @@ export class EnvBuilder { case "string": { const prov = { ty: type, path: val }; this.#posixDirs.push(unwrapZodRes( - envsValidators.pathVarProvision.safeParse(prov), + envsValidators.posixDirProvision.safeParse(prov), prov, )); break; @@ -1108,7 +1107,7 @@ export class EnvBuilder { }); const prov = { ty: type + ".dynamic", taskKey }; this.#dynamicPosixDirs.push(unwrapZodRes( - envsValidators.dynamicPathVarProvision.safeParse(prov), + envsValidators.dynamicPosixDirProvision.safeParse(prov), prov, )); break; diff --git a/modules/envs/types.ts b/modules/envs/types.ts index 263cb61..22cfdbd 100644 --- a/modules/envs/types.ts +++ b/modules/envs/types.ts @@ -27,7 +27,7 @@ const posixDirProvision = zod.object({ export type PosixDirProvision = zod.infer; -const dynamicPathVarProvisionTypes = [ +const dynamicPosixDirProvisionTypes = [ "posix.execDir.dynamic", "posix.sharedLibDir.dynamic", "posix.headerDir.dynamic", @@ -114,18 +114,20 @@ const envVarDynProvision = zod.object({ taskKey: zod.string(), }); -const dynamicPathVarProvision = zod.object({ - ty: zod.enum(dynamicPathVarProvisionTypes), +const dynamicPosixDirProvision = zod.object({ + ty: zod.enum(dynamicPosixDirProvisionTypes), taskKey: zod.string(), }); -export type DynamicPathVarProvision = zod.infer; +export type DynamicPosixDirProvision = zod.infer< + typeof dynamicPosixDirProvision +>; const validators = { provision, wellKnownProvision, envVarDynProvision, posixDirProvision, - dynamicPathVarProvision, + dynamicPosixDirProvision, envRecipe, envsModuleConfig, wellKnownEnvRecipe,