@travetto/config 3.4.0-rc.0 → 3.4.0-rc.2

package/README.md

@@ -55,7 +55,6 @@ with environment variables
 **Config: Environment variables**
 ```properties
 TRV_ENV = prod
-TRV_PROFILES = prod
 ```
 
 At runtime the resolved config would be:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/config",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "Configuration support",
   "keywords": [
     "yaml",
@@ -26,9 +26,9 @@
     "directory": "module/config"
   },
   "dependencies": {
-    "@travetto/di": "^3.4.0-rc.0",
-    "@travetto/schema": "^3.4.0-rc.0",
-    "@travetto/yaml": "^3.4.0-rc.0"
+    "@travetto/di": "^3.4.0-rc.2",
+    "@travetto/schema": "^3.4.0-rc.2",
+    "@travetto/yaml": "^3.4.0-rc.2"
   },
   "travetto": {
     "displayName": "Configuration"

package/src/service.ts

@@ -1,6 +1,6 @@
 import util from 'util';
 
-import { AppError, Class, ClassInstance, GlobalEnv, DataUtil } from '@travetto/base';
+import { AppError, Class, ClassInstance, GlobalEnv, DataUtil, Env } from '@travetto/base';
 import { DependencyRegistry, Injectable } from '@travetto/di';
 import { RootIndex } from '@travetto/manifest';
 import { BindUtil, SchemaRegistry, SchemaValidator, ValidationResultError } from '@travetto/schema';
@@ -26,9 +26,9 @@ export class ConfigurationService {
   }
 
   #storage: Record<string, unknown> = {};   // Lowered, and flattened
-  #profiles: string[] = ['application', ...GlobalEnv.profiles, 'override'];
+  #profiles: string[] = ['application', GlobalEnv.envName, ...Env.getList('TRV_PROFILES') ?? [], 'override'];
   #sources: string[] = [];
-  #secrets: (RegExp | string)[] = [/password|private|secret|salt|(api(-|_)?key)/i];
+  #secrets: (RegExp | string)[] = [/secure(-|_|[a-z])|password|private|secret|salt|(api(-|_)?key)/i];
 
   /**
    * Get a sub tree of the config, or everything if namespace is not passed

package/src/source/file.ts

@@ -53,6 +53,7 @@ export class FileConfigSource extends FileQueryProvider implements ConfigSource
         priority: this.priority
       });
     }
-    return out;
+    // Ensure more specific files are processed later
+    return out.sort((a, b) => (a.source.length - b.source.length) || a.source.localeCompare(b.source));
   }
 }