Refactor visibility typo

This commit is contained in:
Adam Harvey
2020-11-29 00:22:10 -05:00
parent 3f947b70d1
commit d40eddac9d
8 changed files with 18 additions and 18 deletions
+6 -6
View File
@@ -25,7 +25,7 @@ export default async (cmd: Command) => {
args: cmd.config,
fromPackage: cmd.package,
});
const visibility = getVisiblityOption(cmd);
const visibility = getVisibilityOption(cmd);
const data = serializeConfigData(appConfigs, schema, visibility);
if (cmd.format === 'json') {
@@ -35,7 +35,7 @@ export default async (cmd: Command) => {
}
};
function getVisiblityOption(cmd: Command): ConfigVisibility {
function getVisibilityOption(cmd: Command): ConfigVisibility {
if (cmd.frontend && cmd.withSecrets) {
throw new Error('Not allowed to combine frontend and secret config');
}
@@ -50,14 +50,14 @@ function getVisiblityOption(cmd: Command): ConfigVisibility {
function serializeConfigData(
appConfigs: AppConfig[],
schema: ConfigSchema,
visiblity: ConfigVisibility,
visibility: ConfigVisibility,
) {
if (visiblity === 'frontend') {
if (visibility === 'frontend') {
const frontendConfigs = schema.process(appConfigs, {
visiblity: ['frontend'],
visibility: ['frontend'],
});
return ConfigReader.fromConfigs(frontendConfigs).get();
} else if (visiblity === 'secret') {
} else if (visibility === 'secret') {
return ConfigReader.fromConfigs(appConfigs).get();
}
+1 -1
View File
@@ -51,7 +51,7 @@ export async function loadCliConfig(options: Options) {
try {
const frontendAppConfigs = schema.process(appConfigs, {
visiblity: ['frontend'],
visibility: ['frontend'],
});
const frontendConfig = ConfigReader.fromConfigs(frontendAppConfigs);
@@ -89,7 +89,7 @@ describe('compileConfigSchemas', () => {
});
});
it('should reject visiblity conflicts', () => {
it('should reject visibility conflicts', () => {
expect(() =>
compileConfigSchemas([
{
@@ -38,7 +38,7 @@ const data = {
objS: { never: 'here' },
};
const visiblity = new Map<string, ConfigVisibility>(
const visibility = new Map<string, ConfigVisibility>(
Object.entries({
'.arr.0': 'frontend',
'.arr.1': 'backend',
@@ -100,6 +100,6 @@ describe('filterByVisibility', () => {
],
[['frontend', 'backend', 'secret'], data],
])('should filter correctly with %p', (filter, expected) => {
expect(filterByVisibility(data, filter, visiblity)).toEqual(expected);
expect(filterByVisibility(data, filter, visibility)).toEqual(expected);
});
});
@@ -61,12 +61,12 @@ describe('loadConfigSchema', () => {
const configs = [{ data: { key1: 'a', key2: 2 }, context: 'test' }];
expect(schema.process(configs)).toEqual(configs);
expect(schema.process(configs, { visiblity: ['frontend'] })).toEqual([
expect(schema.process(configs, { visibility: ['frontend'] })).toEqual([
{ data: { key1: 'a' }, context: 'test' },
]);
expect(
schema.process(configs, {
visiblity: ['frontend'],
visibility: ['frontend'],
valueTransform: () => 'X',
}),
).toEqual([{ data: { key1: 'X' }, context: 'test' }]);
@@ -79,7 +79,7 @@ describe('loadConfigSchema', () => {
const serialized = schema.serialize();
const schema2 = await loadConfigSchema({ serialized });
expect(schema2.process(configs, { visiblity: ['frontend'] })).toEqual([
expect(schema2.process(configs, { visibility: ['frontend'] })).toEqual([
{ data: { key1: 'a' }, context: 'test' },
]);
expect(() =>
@@ -57,7 +57,7 @@ export async function loadConfigSchema(
return {
process(
configs: AppConfig[],
{ visiblity, valueTransform } = {},
{ visibility, valueTransform } = {},
): AppConfig[] {
const result = validate(configs);
if (result.errors) {
@@ -70,12 +70,12 @@ export async function loadConfigSchema(
let processedConfigs = configs;
if (visiblity) {
if (visibility) {
processedConfigs = processedConfigs.map(({ data, context }) => ({
context,
data: filterByVisibility(
data,
visiblity,
visibility,
result.visibilityByPath,
valueTransform,
),
@@ -87,7 +87,7 @@ type ConfigProcessingOptions = {
* The visibilities that should be included in the output data.
* If omitted, the data will not be filtered by visibility.
*/
visiblity?: ConfigVisibility[];
visibility?: ConfigVisibility[];
/**
* A transform function that can be used to transform primitive configuration values
+1 -1
View File
@@ -88,7 +88,7 @@ export async function readConfigs(options: ReadOptions): Promise<AppConfig[]> {
const frontendConfigs = await schema.process(
[{ data: config.get() as JsonObject, context: 'app' }],
{ visiblity: ['frontend'] },
{ visibility: ['frontend'] },
);
appConfigs.push(...frontendConfigs);
}