From c18769cc00dd85017886cd03ca22a58f3ddbb9b6 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 14 Nov 2020 14:21:53 +0100
Subject: [PATCH] config-loader: visibilities -> visiblity

---
 packages/cli/src/commands/config/print.ts               | 4 ++--
 packages/cli/src/lib/config.ts                          | 2 +-
 packages/config-loader/src/lib/schema/filtering.test.ts | 4 ++--
 packages/config-loader/src/lib/schema/load.ts           | 6 +++---
 packages/config-loader/src/lib/schema/types.ts          | 2 +-
 plugins/app-backend/src/lib/config.ts                   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/commands/config/print.ts b/packages/cli/src/commands/config/print.ts
index 66b709e601..246847b610 100644
--- a/packages/cli/src/commands/config/print.ts
+++ b/packages/cli/src/commands/config/print.ts
@@ -26,14 +26,14 @@ export default async (cmd: Command) => {
 
   if (cmd.frontend) {
     const frontendConfigs = schema.process(appConfigs, {
-      visibilities: ['frontend'],
+      visiblity: ['frontend'],
     });
     data = ConfigReader.fromConfigs(frontendConfigs).get();
   } else if (cmd.withSecrets) {
     data = ConfigReader.fromConfigs(appConfigs).get();
   } else {
     let secretConfigs = schema.process(appConfigs, {
-      visibilities: ['secret'],
+      visiblity: ['secret'],
     });
     secretConfigs = secretConfigs.map(entry => ({
       context: entry.context,
diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/lib/config.ts
index a282bbf88c..63e3958a6f 100644
--- a/packages/cli/src/lib/config.ts
+++ b/packages/cli/src/lib/config.ts
@@ -41,7 +41,7 @@ export async function loadCliConfig(configArgs: string[]) {
   );
 
   const frontendAppConfigs = schema.process(appConfigs, {
-    visibilities: ['frontend'],
+    visiblity: ['frontend'],
   });
   const frontendConfig = ConfigReader.fromConfigs(frontendAppConfigs);
 
diff --git a/packages/config-loader/src/lib/schema/filtering.test.ts b/packages/config-loader/src/lib/schema/filtering.test.ts
index 191edf4824..8e3fb61ae5 100644
--- a/packages/config-loader/src/lib/schema/filtering.test.ts
+++ b/packages/config-loader/src/lib/schema/filtering.test.ts
@@ -38,7 +38,7 @@ const data = {
   objS: { never: 'here' },
 };
 
-const visibilities = new Map<string, ConfigVisibility>(
+const visiblity = 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, visibilities)).toEqual(expected);
+    expect(filterByVisibility(data, filter, visiblity)).toEqual(expected);
   });
 });
diff --git a/packages/config-loader/src/lib/schema/load.ts b/packages/config-loader/src/lib/schema/load.ts
index cdfc8f9549..d886926647 100644
--- a/packages/config-loader/src/lib/schema/load.ts
+++ b/packages/config-loader/src/lib/schema/load.ts
@@ -51,7 +51,7 @@ export async function loadConfigSchema(
   const validate = compileConfigSchemas(schemas);
 
   return {
-    process(configs: AppConfig[], { visibilities } = {}): AppConfig[] {
+    process(configs: AppConfig[], { visiblity } = {}): AppConfig[] {
       const result = validate(configs);
       if (result.errors) {
         throw new Error(
@@ -61,10 +61,10 @@ export async function loadConfigSchema(
 
       let processedConfigs = configs;
 
-      if (visibilities) {
+      if (visiblity) {
         processedConfigs = processedConfigs.map(({ data, context }) => ({
           context,
-          data: filterByVisibility(data, visibilities, result.visibilityByPath),
+          data: filterByVisibility(data, visiblity, result.visibilityByPath),
         }));
       }
 
diff --git a/packages/config-loader/src/lib/schema/types.ts b/packages/config-loader/src/lib/schema/types.ts
index cec2da0160..6ab0602fb3 100644
--- a/packages/config-loader/src/lib/schema/types.ts
+++ b/packages/config-loader/src/lib/schema/types.ts
@@ -79,7 +79,7 @@ type ConfigProcessingOptions = {
    * The visibilities that should be included in the output data.
    * If omitted, the data will not be filtered by visibility.
    */
-  visibilities?: ConfigVisibility[];
+  visiblity?: ConfigVisibility[];
 };
 
 /**
diff --git a/plugins/app-backend/src/lib/config.ts b/plugins/app-backend/src/lib/config.ts
index 60b5d28806..82b431c33f 100644
--- a/plugins/app-backend/src/lib/config.ts
+++ b/plugins/app-backend/src/lib/config.ts
@@ -85,7 +85,7 @@ export async function readConfigs(options: ReadOptions): Promise<AppConfig[]> {
 
     const frontendConfigs = await schema.process(
       [{ data: config.get() as JsonObject, context: 'app' }],
-      { visibilities: ['frontend'] },
+      { visiblity: ['frontend'] },
     );
     appConfigs.push(...frontendConfigs);
   }