feat: removes default-extensions

.github/workflows/publishing.yml

@@ -37,13 +37,6 @@ jobs:
         access: public
         package: ./app-config-cypress/package.json
         tag: next
-    - name: app-config-default-extensions
-      uses: JS-DevTools/npm-publish@v1
-      with:
-        token: ${{ secrets.NPM_TOKEN }}
-        access: public
-        package: ./app-config-default-extensions/package.json
-        tag: next
     - name: app-config-encryption
       uses: JS-DevTools/npm-publish@v1
       with:

CONTRIBUTING.md

@@ -43,7 +43,6 @@ If you are adding anything new or changing behavior, please add applicable tests
 - `@app-config/git`: `$git` parsing extension
 - `@app-config/v1-compat`: v1 version compatibility extension
 - `@app-config/extensions`: common parsing extensions
-- `@app-config/default-extensions`: all default parsing extensions
 - `@app-config/generate`: code generation
 - `@app-config/config`: config loading
 - `@app-config/meta`: meta file loading

app-config-config/package.json

@@ -31,7 +31,6 @@
   },
   "dependencies": {
     "@app-config/core": "^3.0.0-alpha.3",
-    "@app-config/default-extensions": "^3.0.0-alpha.3",
     "@app-config/extensions": "^3.0.0-alpha.3",
     "@app-config/logging": "^3.0.0-alpha.3",
     "@app-config/meta": "^3.0.0-alpha.3",

app-config-config/src/index.ts

@@ -17,8 +17,11 @@ import {
   EnvironmentSource,
   asEnvOptions,
 } from '@app-config/node';
-import { markAllValuesAsSecret } from '@app-config/extensions';
-import { defaultExtensions, defaultEnvExtensions } from '@app-config/default-extensions';
+import {
+  defaultExtensions,
+  defaultEnvExtensions,
+  markAllValuesAsSecret,
+} from '@app-config/extensions';
 import { loadSchema, JSONSchema, SchemaLoadingOptions } from '@app-config/schema';
 import { loadMetaConfig, loadExtraParsingExtensions } from '@app-config/meta';
 

app-config-extensions/src/index.ts

@@ -1,18 +1,31 @@
 import { named } from '@app-config/extension-utils';
 import { ParsingExtension } from '@app-config/core';
 
-export { tryDirective } from './try-directive';
-export { ifDirective } from './if-directive';
-export { eqDirective } from './eq-directive';
-export { hiddenDirective } from './hidden-directive';
-export { envDirective } from './env-directive';
-export { extendsDirective, extendsSelfDirective, overrideDirective } from './extends-directive';
-export { timestampDirective } from './timestamp-directive';
-
-export { envVarDirective } from './env-var-directive';
-export { substituteDirective } from './substitute-directive';
-export { substituteDirective as environmentVariableSubstitution } from './substitute-directive';
-export { parseDirective } from './parse-directive';
+import { tryDirective } from './try-directive';
+import { ifDirective } from './if-directive';
+import { eqDirective } from './eq-directive';
+import { hiddenDirective } from './hidden-directive';
+import { envDirective } from './env-directive';
+import { extendsDirective, extendsSelfDirective, overrideDirective } from './extends-directive';
+import { timestampDirective } from './timestamp-directive';
+import { envVarDirective } from './env-var-directive';
+import { substituteDirective } from './substitute-directive';
+import { parseDirective } from './parse-directive';
+
+export {
+  tryDirective,
+  ifDirective,
+  eqDirective,
+  hiddenDirective,
+  envDirective,
+  extendsDirective,
+  extendsSelfDirective,
+  overrideDirective,
+  timestampDirective,
+  envVarDirective,
+  substituteDirective,
+  parseDirective,
+};
 
 /** Marks all values recursively as fromSecrets, so they do not trigger schema errors */
 export function markAllValuesAsSecret(): ParsingExtension {
@@ -31,3 +44,38 @@ export function unescape$Directives(): ParsingExtension {
     return false;
   });
 }
+
+export function defaultExtensions() {
+  return [
+    unescape$Directives(),
+    tryDirective(),
+    ifDirective(),
+    eqDirective(),
+    parseDirective(),
+    hiddenDirective(),
+    envDirective(),
+    envVarDirective(),
+    extendsDirective(),
+    extendsSelfDirective(),
+    overrideDirective(),
+    timestampDirective(),
+    substituteDirective(),
+  ];
+}
+
+export function defaultEnvExtensions() {
+  return [unescape$Directives(), markAllValuesAsSecret()];
+}
+
+export function defaultMetaExtensions() {
+  return [
+    unescape$Directives(),
+    tryDirective(),
+    ifDirective(),
+    eqDirective(),
+    hiddenDirective(),
+    extendsDirective(),
+    extendsSelfDirective(),
+    overrideDirective(),
+  ];
+}

app-config-main/package.json

@@ -37,7 +37,7 @@
     "@app-config/cli": "^3.0.0-alpha.3",
     "@app-config/config": "^3.0.0-alpha.3",
     "@app-config/core": "^3.0.0-alpha.3",
-    "@app-config/default-extensions": "^3.0.0-alpha.3",
+    "@app-config/extensions": "^3.0.0-alpha.3",
     "@app-config/logging": "^3.0.0-alpha.3",
     "@app-config/meta": "^3.0.0-alpha.3",
     "@app-config/node": "^3.0.0-alpha.3",

app-config-main/src/index.ts

@@ -118,7 +118,7 @@ export {
   defaultExtensions,
   defaultEnvExtensions,
   defaultMetaExtensions,
-} from '@app-config/default-extensions';
+} from '@app-config/extensions';
 
 /** @hidden Please don't rely on this. */
 export function resetConfigInternal() {

app-config-meta/package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@app-config/core": "^3.0.0-alpha.3",
-    "@app-config/default-extensions": "^3.0.0-alpha.3",
+    "@app-config/extensions": "^3.0.0-alpha.3",
     "@app-config/logging": "^3.0.0-alpha.3",
     "@app-config/node": "^3.0.0-alpha.3",
     "@app-config/utils": "^3.0.0-alpha.3",

app-config-meta/src/index.ts

@@ -12,7 +12,7 @@ import {
 import { logger } from '@app-config/logging';
 
 import { FlexibleFileSource, FileSource } from '@app-config/node';
-import { defaultMetaExtensions } from '@app-config/default-extensions';
+import { defaultMetaExtensions } from '@app-config/extensions';
 
 export interface MetaLoadingOptions {
   directory?: string;

app-config-meta/tsconfig.json

@@ -9,6 +9,6 @@
   "references": [
     { "path": "../app-config-test-utils" },
     { "path": "../app-config-node" },
-    { "path": "../app-config-default-extensions" }
+    { "path": "../app-config-extensions" }
   ]
 }

new-version.sh

@@ -41,7 +41,6 @@ new_version app-config-cli
 new_version app-config-config
 new_version app-config-core
 new_version app-config-cypress
-new_version app-config-default-extensions
 new_version app-config-encryption
 new_version app-config-exec
 new_version app-config-extension-utils