Skip to content

Commit 1819e05

Browse files
committed
cleanup: removes deprecated FlexibleFileSource constructor
1 parent ffe46a4 commit 1819e05

File tree

1 file changed

+3
-41
lines changed

1 file changed

+3
-41
lines changed

app-config-node/src/file-source.ts

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -54,54 +54,16 @@ export class FlexibleFileSource extends ConfigSource {
5454
private readonly fileExtensions: string[];
5555
private readonly environmentOptions: EnvironmentOptions;
5656

57-
constructor(filePath: string, fileExtensions?: string[], environmentOptions?: EnvironmentOptions);
58-
59-
/** @deprecated use constructor with environmentOptions instead */
60-
constructor(
61-
filePath: string,
62-
environmentOverride?: string,
63-
environmentAliases?: EnvironmentAliases,
64-
fileExtensions?: string[],
65-
environmentSourceNames?: string[] | string,
66-
);
67-
6857
constructor(
6958
filePath: string,
70-
environmentOverrideOrFileExtensions?: string | string[],
71-
environmentAliasesOrEnvironmentOptions?: EnvironmentAliases | EnvironmentOptions,
7259
fileExtensions?: string[],
73-
environmentSourceNames?: string[] | string,
60+
environmentOptions?: EnvironmentOptions,
7461
) {
7562
super();
7663

7764
this.filePath = filePath;
78-
const defaultFileExtensions = ['yml', 'yaml', 'toml', 'json', 'json5'];
79-
80-
if (
81-
(Array.isArray(environmentOverrideOrFileExtensions) ||
82-
environmentOverrideOrFileExtensions === undefined) &&
83-
(environmentAliasesOrEnvironmentOptions
84-
? 'aliases' in environmentAliasesOrEnvironmentOptions ||
85-
'envVarNames' in environmentAliasesOrEnvironmentOptions
86-
: true) &&
87-
fileExtensions === undefined &&
88-
environmentSourceNames === undefined
89-
) {
90-
this.fileExtensions = environmentOverrideOrFileExtensions ?? defaultFileExtensions;
91-
this.environmentOptions =
92-
(environmentAliasesOrEnvironmentOptions as EnvironmentOptions) ?? defaultEnvOptions;
93-
} else {
94-
logger.warn(
95-
`Detected deprecated usage of FlexibleFileSource constructor loading ${filePath}`,
96-
);
97-
98-
this.fileExtensions = fileExtensions ?? defaultFileExtensions;
99-
this.environmentOptions = asEnvOptions(
100-
environmentOverrideOrFileExtensions as string,
101-
environmentAliasesOrEnvironmentOptions as EnvironmentAliases,
102-
environmentSourceNames,
103-
);
104-
}
65+
this.fileExtensions = fileExtensions ?? ['yml', 'yaml', 'toml', 'json', 'json5'];
66+
this.environmentOptions = environmentOptions ?? defaultEnvOptions;
10567
}
10668

10769
// share 'resolveSource' so that read() returns a ParsedValue pointed to the FileSource, not FlexibleFileSource

0 commit comments

Comments
 (0)