feat: uses extension-utils for git and vault parsing extensions

Author: joelgallant

app-config-git/package.json

@@ -31,6 +31,7 @@
   },
   "dependencies": {
     "@app-config/core": "^2.1.5",
+    "@app-config/extension-utils": "^2.1.5",
     "simple-git": "2"
   },
   "devDependencies": {

app-config-git/src/index.ts

@@ -1,17 +1,16 @@
 import simpleGit from 'simple-git';
 import { ParsingExtension, AppConfigError } from '@app-config/core';
+import { forKey, validateOptions } from '@app-config/extension-utils';
 
 /** Access to the git branch and commit ref */
 export default function gitRefDirectives(
   getStatus: typeof gitStatus = gitStatus,
 ): ParsingExtension {
-  return (value, [_, key]) => {
-    if (key === '$git') {
-      return async (parse) => {
-        if (typeof value !== 'string') {
-          throw new AppConfigError('$git directive should be passed a string');
-        }
-
+  return forKey(
+    '$git',
+    validateOptions(
+      (SchemaBuilder) => SchemaBuilder.stringSchema(),
+      (value) => async (parse) => {
         switch (value) {
           case 'commit':
             return getStatus().then(({ commitRef }) => parse(commitRef, { shouldFlatten: true }));
@@ -41,11 +40,9 @@ export default function gitRefDirectives(
           default:
             throw new AppConfigError('$git directive was not passed a valid option');
         }
-      };
-    }
-
-    return false;
-  };
+      },
+    ),
+  );
 }
 
 interface GitStatus {

app-config-git/tsconfig.json

@@ -8,6 +8,7 @@
   "exclude": ["node_modules"],
   "references": [
     { "path": "../app-config-test-utils" },
-    { "path": "../app-config-core" }
+    { "path": "../app-config-core" },
+    { "path": "../app-config-extension-utils" }
   ]
 }

app-config-vault/package.json

@@ -31,6 +31,7 @@
   },
   "dependencies": {
     "@lcdev/fetch": "^0.1.10",
+    "@app-config/extension-utils": "^2.1.5",
     "cross-fetch": "3",
     "node-vault": "0.9"
   },

app-config-vault/src/index.ts

@@ -2,6 +2,7 @@ import fetch from 'cross-fetch';
 import { api, buildPath, setGlobalFetch } from '@lcdev/fetch';
 import type { JsonObject } from '@lcdev/ts';
 import type { ParsingExtension, Json } from '@app-config/main';
+import { forKey, validateOptions } from '@app-config/extension-utils';
 
 setGlobalFetch(fetch);
 
@@ -30,24 +31,12 @@ function vaultParsingExtension(options: Options = {}): ParsingExtension {
     return call.expectStatus(200);
   });
 
-  return (value, [_, objectKey]) => {
-    if (objectKey === '$vault') {
-      return async (parse) => {
-        const parsed = await parse(value).then((v) => v.toJSON());
-
-        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-          throw new Error('$vault requires a an object with options');
-        }
-
-        const { secret, select } = parsed;
-
-        if (typeof secret !== 'string') {
-          throw new Error('$vault requires a "secret" option');
-        }
-
-        if (typeof select !== 'string') {
-          throw new Error('$vault requires a "select" option');
-        }
+  return forKey(
+    '$vault',
+    validateOptions(
+      (SchemaBuilder) => SchemaBuilder.emptySchema().addString('secret').addString('select'),
+      (value) => async (parse) => {
+        const { secret, select } = value;
 
         type VaultResponse<T> = {
           data: {
@@ -74,11 +63,9 @@ function vaultParsingExtension(options: Options = {}): ParsingExtension {
         }
 
         return parse(namedValue as Json, { shouldFlatten: true });
-      };
-    }
-
-    return false;
-  };
+      },
+    ),
+  );
 }
 
 export default vaultParsingExtension;

app-config-vault/tsconfig.json

@@ -8,6 +8,7 @@
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "references": [
+    { "path": "../app-config-extension-utils" },
     { "path": "../app-config-main" }
   ]
 }