@travetto/config 3.4.0-rc.4 → 3.4.0-rc.5

package/README.md

@@ -23,9 +23,14 @@ Config loading follows a defined resolution path, below is the order in increasi
    1. `resources/application.<ext>` - Priority `100` - Load the default `application.<ext>` if available.
    1. `resources/{env}.<ext>` - Priority `200` - Load environment specific profile configurations as defined by the values of `process.env.TRV_ENV`.
    1. `resources/*.<ext>` - Priority `300` - Load profile specific configurations as defined by the values in `process.env.TRV_PROFILES`
+   1. [@Injectable](https://github.com/travetto/travetto/tree/main/module/di/src/decorator.ts#L31) [ConfigSource](https://github.com/travetto/travetto/tree/main/module/config/src/source/types.ts#L6) - Priority `???` - These are custom config sources provided by the module, and are able to define their own priorities
+   1. [OverrideConfigSource](https://github.com/travetto/travetto/tree/main/module/config/src/source/override.ts#L11) - Priority `999` - This is for [EnvVar](https://github.com/travetto/travetto/tree/main/module/config/src/decorator.ts#L34) overrides, and is at the top priority for all built-in config sources.
 By default all configuration data is inert, and will only be applied when constructing an instance of a configuration class.
 
-**Note**: When working in a monorepo, the parent resources folder will also be searched with a lower priority than the the module's specific resources.  This allows for shared-global configuration that can be overridden at the module level.  The general rule is that the longest path has the highest priority.
+**Note**: When working in a monorepo, the parent resources folder will also be searched with a lower priority than the the module's specific resources.  This allows for shared-global configuration that can be overridden at the module level. The general priority is:
+   1. Mono-repo root
+   1. Module root
+   1. Folders for `TRV_RESOURCES`, in order
 
 ### A Complete Example
 A more complete example setup would look like:

package/package.json

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

package/src/source/file.ts

@@ -24,21 +24,19 @@ export class FileConfigSource extends FileQueryProvider implements ConfigSource
   }
 
   async getData(): Promise<ConfigData[]> {
-    const out: { file: string, data: ConfigData }[] = [];
+    const out: ConfigData[] = [];
     for await (const file of this.query(f => this.parser.matches(f))) {
       const ext = path.extname(file);
       const base = path.basename(file, ext);
       if (base === this.profile && !file.includes('/')) { // Ensures no nesting
         for (const resolved of await this.resolveAll(file)) {
-          out.push({ file: resolved, data: await this.parser.parse(resolved) });
+          // Ensure more specific files are processed later, .resolveAll returns with most specific first
+          const data = await this.parser.parse(resolved);
+          // eslint-disable-next-line @typescript-eslint/naming-convention    
+          out.push({ ...data, __ID__: resolved.replace(`${RootIndex.manifest.workspacePath}/`, '') });
         }
       }
     }
-
-    // Ensure more specific files are processed later
-    return out
-      .sort((a, b) => (a.file.length - b.file.length) || a.file.localeCompare(b.file))
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      .map(a => ({ ...a.data, __ID__: a.file.replace(`${RootIndex.manifest.workspacePath}/`, '') }));
+    return out.reverse();
   }
 }