diff --git a/lib/config/configTypes.ts b/lib/config/configTypes.ts index 19f0c74..662c918 100644 --- a/lib/config/configTypes.ts +++ b/lib/config/configTypes.ts @@ -218,7 +218,7 @@ export type RandomString = { len: number } // sometimes the type checker needs just a little bit of help -function isValueSpecListOf( +export function isValueSpecListOf( t: ValueSpec, s: S, ): t is ValueSpecListOf & { spec: ListValueSpecOf } { diff --git a/lib/mainFn/NetworkInterfaceBuilder.ts b/lib/mainFn/NetworkInterfaceBuilder.ts index 7425d01..1d8d475 100644 --- a/lib/mainFn/NetworkInterfaceBuilder.ts +++ b/lib/mainFn/NetworkInterfaceBuilder.ts @@ -21,7 +21,7 @@ export class NetworkInterfaceBuilder { id: string description: string ui: boolean - basic: null | { username: string } + username: null | string path: string search: Record }, @@ -36,10 +36,10 @@ export class NetworkInterfaceBuilder { * @returns */ async export(origins: Iterable) { - const { name, description, id, ui, basic, path, search } = this.options + const { name, description, id, ui, username, path, search } = this.options const addresses = Array.from(origins).map((o) => - o.build({ basic, path, search }), + o.build({ username, path, search }), ) await this.options.effects.exportNetworkInterface({ diff --git a/lib/mainFn/Origin.ts b/lib/mainFn/Origin.ts index 6a771b8..5bb0daa 100644 --- a/lib/mainFn/Origin.ts +++ b/lib/mainFn/Origin.ts @@ -1,9 +1,9 @@ export class Origin { constructor(readonly protocol: string | null, readonly host: string) {} - build({ basic, path, search }: BuildOptions) { + build({ username, path, search }: BuildOptions) { // prettier-ignore - const urlAuth = !!(basic) ? `${basic.username}@` : + const urlAuth = !!(username) ? `${username}@` : ''; const protocolSection = this.protocol != null ? `${this.protocol}://` : "" @@ -20,7 +20,7 @@ export class Origin { } type BuildOptions = { - basic: { username: string } | null + username: string | null path: string search: Record } diff --git a/lib/test/configTypes.test.ts b/lib/test/configTypes.test.ts index a50ec6c..7e3ff5c 100644 --- a/lib/test/configTypes.test.ts +++ b/lib/test/configTypes.test.ts @@ -1,4 +1,8 @@ -import { ListValueSpecOf, isValueSpecListOf } from "../config/configTypes" +import { + ListValueSpecOf, + ValueSpec, + isValueSpecListOf, +} from "../config/configTypes" import { Config } from "../config/builder/config" import { List } from "../config/builder/list" import { Value } from "../config/builder/value"