@armoury/fivem-framework-common 1.0.13 → 1.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/cjs/common/config.decorator.js +9 -2
  2. package/dist/esm/common/config.decorator.js +9 -2
  3. package/package.json +1 -1
package/dist/cjs/common/config.decorator.js CHANGED
@@ -40,9 +40,16 @@ function createConfigProviders(targets, readValue) {
40
40
  return [...bindings.values()].map(({ token, key, index }) => ({
41
41
  provide: token,
42
42
  useFactory: () => {
43
- const value = readValue(key, index);
43
+ const metadataKeys = key.endsWith('_extra') ? [key] : [`${key}_extra`, key];
44
+ let value;
45
+ for (const metadataKey of metadataKeys) {
46
+ value = readValue(metadataKey, index);
47
+ if (value !== null && value !== undefined) {
48
+ break;
49
+ }
50
+ }
44
51
  if (value === null || value === undefined) {
45
- throw new Error(`Missing resource metadata '${key}' at index ${index}.`);
52
+ throw new Error(`Missing resource metadata '${metadataKeys.join("' or '")}' at index ${index}.`);
46
53
  }
47
54
  return parseConfigValue(value, key);
48
55
  },
package/dist/esm/common/config.decorator.js CHANGED
@@ -35,9 +35,16 @@ export function createConfigProviders(targets, readValue) {
35
35
  return [...bindings.values()].map(({ token, key, index }) => ({
36
36
  provide: token,
37
37
  useFactory: () => {
38
- const value = readValue(key, index);
38
+ const metadataKeys = key.endsWith('_extra') ? [key] : [`${key}_extra`, key];
39
+ let value;
40
+ for (const metadataKey of metadataKeys) {
41
+ value = readValue(metadataKey, index);
42
+ if (value !== null && value !== undefined) {
43
+ break;
44
+ }
45
+ }
39
46
  if (value === null || value === undefined) {
40
- throw new Error(`Missing resource metadata '${key}' at index ${index}.`);
47
+ throw new Error(`Missing resource metadata '${metadataKeys.join("' or '")}' at index ${index}.`);
41
48
  }
42
49
  return parseConfigValue(value, key);
43
50
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@armoury/fivem-framework-common",
3
- "version": "1.0.13",
3
+ "version": "1.0.14",
4
4
  "description": "Shared APIs for the Armoury FiveM framework",
5
5
  "main": "dist/cjs/common/index.js",
6
6
  "module": "dist/esm/common/index.js",