@travetto/config 3.2.3 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/config",
-  "version": "3.2.3",
+  "version": "3.3.0",
   "description": "Configuration support",
   "keywords": [
     "yaml",
@@ -26,9 +26,9 @@
     "directory": "module/config"
   },
   "dependencies": {
-    "@travetto/di": "^3.2.2",
-    "@travetto/schema": "^3.2.2",
-    "@travetto/yaml": "^3.2.2"
+    "@travetto/di": "^3.3.0",
+    "@travetto/schema": "^3.3.0",
+    "@travetto/yaml": "^3.3.0"
   },
   "travetto": {
     "displayName": "Configuration"

package/src/parser/json.ts

@@ -4,6 +4,6 @@ import { ConfigParser } from './types';
 
 @Injectable()
 export class JSONConfigParser implements ConfigParser {
-  ext = ['json'];
+  ext = ['.json'];
   parse = JSON.parse.bind(JSON);
 }

package/src/parser/properties.ts

@@ -33,7 +33,7 @@ export class PropertiesConfigParser implements ConfigParser {
     }
   }
 
-  ext = ['properties'];
+  ext = ['.properties'];
 
   parse(text: string): ConfigData {
     const out: ConfigData = {};
@@ -41,7 +41,7 @@ export class PropertiesConfigParser implements ConfigParser {
 
     for (let i = 0; i < lines.length; i++) {
       let line = lines[i];
-      while (i < text.length && line.endsWith('\\')) {
+      while (i < lines.length && line.endsWith('\\')) {
         line = `${line.replace(/\\$/, '')}${lines[i += 1].trimStart()}`;
       }
       const entry = PropertiesConfigParser.parseLine(line);

package/src/parser/yaml.ts

@@ -5,6 +5,6 @@ import { ConfigParser } from './types';
 
 @Injectable()
 export class YAMLConfigParser implements ConfigParser {
-  ext = ['yaml', 'yml'];
+  ext = ['.yaml', '.yml'];
   parse = YamlUtil.parse;
 }

package/src/source/file.ts

@@ -1,3 +1,4 @@
+import { path } from '@travetto/manifest';
 import { FileQueryProvider } from '@travetto/base';
 import { DependencyRegistry, InjectableFactory } from '@travetto/di';
 
@@ -29,22 +30,17 @@ export class FileConfigSource extends FileQueryProvider implements ConfigSource
     const parsers = await Promise.all(parserClasses.map(x => DependencyRegistry.getInstance<ConfigParser>(x.class, x.qualifier)));
 
     // Register parsers
-    this.parsers = {};
-    for (const par of parsers) {
-      for (const ext of par.ext) {
-        this.parsers[ext] = par;
-      }
-    }
+    this.parsers = Object.fromEntries(parsers.flatMap(p => p.ext.map(e => [e, p])));
 
-    this.extMatch = parsers.length ? new RegExp(`[.](${Object.keys(this.parsers).join('|')})`) : /^$/;
+    this.extMatch = parsers.length ? new RegExp(`(${Object.keys(this.parsers).join('|').replaceAll('.', '[.]')})`) : /^$/;
   }
 
   async getValues(profiles: string[]): Promise<ConfigValue[]> {
     const out: ConfigValue[] = [];
 
     for await (const file of this.query(f => this.extMatch.test(f))) {
-      const ext = file.split('.')[1];
-      const profile = file.replace(`.${ext}`, '');
+      const ext = path.extname(file);
+      const profile = path.basename(file, ext);
       if (!profiles.includes(profile) || !this.parsers[ext]) {
         continue;
       }