@ms-cloudpack/config 0.33.12 → 0.33.13

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 (4) hide show
  1. package/lib/readConfig/mergeParentConfig.d.ts.map +1 -1
  2. package/lib/readConfig/mergeParentConfig.js +2 -0
  3. package/lib/readConfig/mergeParentConfig.js.map +1 -1
  4. package/package.json +4 -4
package/lib/readConfig/mergeParentConfig.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mergeParentConfig.d.ts","sourceRoot":"","sources":["../../src/readConfig/mergeParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAG5D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,aAAa,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG,SAAS,CAazG"}
1
+ {"version":3,"file":"mergeParentConfig.d.ts","sourceRoot":"","sources":["../../src/readConfig/mergeParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAG5D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,aAAa,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG,SAAS,CAgBzG"}
package/lib/readConfig/mergeParentConfig.js CHANGED
@@ -8,6 +8,8 @@ export function mergeParentConfig(params) {
8
8
  customMerge: {
9
9
  // Concatenate package settings
10
10
  packageSettings: (prev, curr) => [...(prev ?? []), ...(curr ?? [])],
11
+ // Concatenate telemetry
12
+ telemetry: (prev, curr) => ({ ...prev, ...curr }),
11
13
  },
12
14
  });
13
15
  // Remove the extends property from the result
package/lib/readConfig/mergeParentConfig.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mergeParentConfig.js","sourceRoot":"","sources":["../../src/readConfig/mergeParentConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAA4D;IAC5F,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,GAAG,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE;QACvE,UAAU,EAAE,WAAW;QACvB,WAAW,EAAE;YACX,+BAA+B;YAC/B,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;SACpE;KACF,CAAC,CAAC;IAEH,8CAA8C;IAC9C,OAAO,MAAM,CAAC,OAAO,CAAC;IAEtB,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { AppConfig } from '@ms-cloudpack/common-types';\nimport { mergeObjects } from '@ms-cloudpack/package-utilities';\n\n/**\n * Merge the configs. Later parent configs override earlier ones.\n */\nexport function mergeParentConfig(params: { appConfig: AppConfig; parentConfigs: AppConfig[] }): AppConfig {\n const result = mergeObjects([...params.parentConfigs, params.appConfig], {\n arrayMerge: 'overwrite',\n customMerge: {\n // Concatenate package settings\n packageSettings: (prev, curr) => [...(prev ?? []), ...(curr ?? [])],\n },\n });\n\n // Remove the extends property from the result\n delete result.extends;\n\n return result;\n}\n"]}
1
+ {"version":3,"file":"mergeParentConfig.js","sourceRoot":"","sources":["../../src/readConfig/mergeParentConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAA4D;IAC5F,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,GAAG,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE;QACvE,UAAU,EAAE,WAAW;QACvB,WAAW,EAAE;YACX,+BAA+B;YAC/B,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YAEnE,wBAAwB;YACxB,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;SAClD;KACF,CAAC,CAAC;IAEH,8CAA8C;IAC9C,OAAO,MAAM,CAAC,OAAO,CAAC;IAEtB,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { AppConfig } from '@ms-cloudpack/common-types';\nimport { mergeObjects } from '@ms-cloudpack/package-utilities';\n\n/**\n * Merge the configs. Later parent configs override earlier ones.\n */\nexport function mergeParentConfig(params: { appConfig: AppConfig; parentConfigs: AppConfig[] }): AppConfig {\n const result = mergeObjects([...params.parentConfigs, params.appConfig], {\n arrayMerge: 'overwrite',\n customMerge: {\n // Concatenate package settings\n packageSettings: (prev, curr) => [...(prev ?? []), ...(curr ?? [])],\n\n // Concatenate telemetry\n telemetry: (prev, curr) => ({ ...prev, ...curr }),\n },\n });\n\n // Remove the extends property from the result\n delete result.extends;\n\n return result;\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ms-cloudpack/config",
3
- "version": "0.33.12",
3
+ "version": "0.33.13",
4
4
  "description": "Configuration handling for cloudpack.",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -14,12 +14,12 @@
14
14
  }
15
15
  },
16
16
  "dependencies": {
17
- "@ms-cloudpack/common-types": "^0.24.5",
17
+ "@ms-cloudpack/common-types": "^0.24.6",
18
18
  "@ms-cloudpack/environment": "^0.1.1",
19
19
  "@ms-cloudpack/json-utilities": "^0.1.10",
20
- "@ms-cloudpack/package-utilities": "^11.3.2",
20
+ "@ms-cloudpack/package-utilities": "^11.3.3",
21
21
  "@ms-cloudpack/path-string-parsing": "^1.2.6",
22
- "@ms-cloudpack/path-utilities": "^3.0.2",
22
+ "@ms-cloudpack/path-utilities": "^3.0.3",
23
23
  "semver": "^7.6.0"
24
24
  },
25
25
  "devDependencies": {