Skip to content

Commit

Permalink
fix typing errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Natoandro committed Aug 19, 2024
1 parent d533d82 commit db40575
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
11 changes: 5 additions & 6 deletions files/mod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -921,8 +921,7 @@ type EnvFinalizer = () => {
vars: Record<string, string>;
dynVars: Record<string, string>;
posixDirs: Array<PosixDirProvision>;
dynamicPosixDirs: Array<DynamicPathVarProvision>;
dynBinDirs: string[];
dynamicPosixDirs: Array<DynamicPosixDirProvision>;
desc?: string;
onEnterHookTasks: string[];
onExitHookTasks: string[];
Expand Down Expand Up @@ -986,7 +985,7 @@ export class EnvBuilder {
#vars: Record<string, string | number> = {};
#dynVars: Record<string, string> = {};
#posixDirs: Array<PosixDirProvision> = [];
#dynamicPosixDirs: Array<DynamicPathVarProvision> = [];
#dynamicPosixDirs: Array<DynamicPosixDirProvision> = [];
#desc?: string;
#onEnterHookTasks: string[] = [];
#onExitHookTasks: string[] = [];
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
12 changes: 7 additions & 5 deletions modules/envs/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const posixDirProvision = zod.object({

export type PosixDirProvision = zod.infer<typeof posixDirProvision>;

const dynamicPathVarProvisionTypes = [
const dynamicPosixDirProvisionTypes = [
"posix.execDir.dynamic",
"posix.sharedLibDir.dynamic",
"posix.headerDir.dynamic",
Expand Down Expand Up @@ -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<typeof dynamicPathVarProvision>;
export type DynamicPosixDirProvision = zod.infer<
typeof dynamicPosixDirProvision
>;

const validators = {
provision,
wellKnownProvision,
envVarDynProvision,
posixDirProvision,
dynamicPathVarProvision,
dynamicPosixDirProvision,
envRecipe,
envsModuleConfig,
wellKnownEnvRecipe,
Expand Down

0 comments on commit db40575

Please sign in to comment.