@ms-cloudpack/config 0.17.21 → 0.17.23

package/lib/mergeParentConfig.d.ts

@@ -0,0 +1,6 @@
+import type { UserConfig } from '@ms-cloudpack/config-types';
+export declare function mergeParentConfig(params: {
+    userConfig: UserConfig;
+    parentConfig: UserConfig;
+}): UserConfig;
+//# sourceMappingURL=mergeParentConfig.d.ts.map

package/lib/mergeParentConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeParentConfig.d.ts","sourceRoot":"","sources":["../src/mergeParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAG7D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,YAAY,EAAE,UAAU,CAAA;CAAE,GAAG,UAAU,CAgB1G"}

package/lib/mergeParentConfig.js

@@ -0,0 +1,15 @@
+import { recursive as recursiveMerge } from 'merge';
+export function mergeParentConfig(params) {
+    const { userConfig, parentConfig } = params;
+    // NOTE: This must merge into an empty object to avoid modifying the originals
+    const result = recursiveMerge({}, parentConfig, userConfig);
+    // Remove the extends property from the result
+    delete result.extends;
+    if (userConfig.packageSettings && parentConfig.packageSettings) {
+        // Concatenate the package settings. User config comes first here since order can matter
+        // in some cases (and the user config should override the parent).
+        result.packageSettings = [...userConfig.packageSettings, ...parentConfig.packageSettings];
+    }
+    return result;
+}
+//# sourceMappingURL=mergeParentConfig.js.map

package/lib/mergeParentConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeParentConfig.js","sourceRoot":"","sources":["../src/mergeParentConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,OAAO,CAAC;AAEpD,MAAM,UAAU,iBAAiB,CAAC,MAA4D;IAC5F,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAE5C,8EAA8E;IAC9E,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,EAAE,YAAY,EAAE,UAAU,CAAe,CAAC;IAE1E,8CAA8C;IAC9C,OAAO,MAAM,CAAC,OAAO,CAAC;IAEtB,IAAI,UAAU,CAAC,eAAe,IAAI,YAAY,CAAC,eAAe,EAAE,CAAC;QAC/D,wFAAwF;QACxF,kEAAkE;QAClE,MAAM,CAAC,eAAe,GAAG,CAAC,GAAG,UAAU,CAAC,eAAe,EAAE,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC5F,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { UserConfig } from '@ms-cloudpack/config-types';\nimport { recursive as recursiveMerge } from 'merge';\n\nexport function mergeParentConfig(params: { userConfig: UserConfig; parentConfig: UserConfig }): UserConfig {\n  const { userConfig, parentConfig } = params;\n\n  // NOTE: This must merge into an empty object to avoid modifying the originals\n  const result = recursiveMerge({}, parentConfig, userConfig) as UserConfig;\n\n  // Remove the extends property from the result\n  delete result.extends;\n\n  if (userConfig.packageSettings && parentConfig.packageSettings) {\n    // Concatenate the package settings. User config comes first here since order can matter\n    // in some cases (and the user config should override the parent).\n    result.packageSettings = [...userConfig.packageSettings, ...parentConfig.packageSettings];\n  }\n\n  return result;\n}\n"]}

package/lib/readUserConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readUserConfig.d.ts","sourceRoot":"","sources":["../src/readUserConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAkE7D;;;GAGG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAMzE"}
+{"version":3,"file":"readUserConfig.d.ts","sourceRoot":"","sources":["../src/readUserConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAyD7D;;;GAGG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAMzE"}

package/lib/readUserConfig.js

@@ -1,5 +1,6 @@
 import { readJson } from '@ms-cloudpack/json-utilities';
 import { getConfigPath } from './getConfigPath.js';
+import { mergeParentConfig } from './mergeParentConfig.js';
 import { safeImportParentConfig } from './safeImportParentConfig.js';
 /**
  * Reads the user config file and merges it with any parent configs.
@@ -37,17 +38,7 @@ async function readUserConfigInternal(params) {
     if (!parentConfig) {
         return userConfig;
     }
-    // Merge the parent config with the user config and return the result
-    const result = {
-        ...parentConfig,
-        ...userConfig,
-        features: {
-            ...(parentConfig.features || {}),
-            ...(userConfig.features || {}),
-        },
-    };
-    delete result.extends; // Remove the extends property from the result
-    return result;
+    return mergeParentConfig({ userConfig, parentConfig });
 }
 /**
  * Reads the user config file and merges with any parent configs asynchronously. Note this is only useful for making modifications to the user config.

package/lib/readUserConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"readUserConfig.js","sourceRoot":"","sources":["../src/readUserConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE;;;GAGG;AACH,KAAK,UAAU,sBAAsB,CACnC,MAKK;IAEL,IAAI,UAAU,IAAI,MAAM,IAAI,iBAAiB,IAAI,MAAM,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAED,4BAA4B;IAC5B,IAAI,UAAkC,CAAC;IACvC,IAAI,kBAAsC,CAAC;IAE3C,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;QACzB,UAAU,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;QACpF,kBAAkB,GAAG,MAAM,CAAC,QAAQ,CAAC;IACvC,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC;QAC7F,IAAI,MAAM,EAAE,CAAC;YACX,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;YAC/C,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,IAAI,CAAC,UAAU,EAAE,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,0CAA0C;IAC1C,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC;QAChD,cAAc,EAAE,kBAAkB;QAClC,eAAe,EAAE,UAAU,CAAC,OAAO;KACpC,CAAC,CAAC;IAEH,kEAAkE;IAClE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,qEAAqE;IACrE,MAAM,MAAM,GAAe;QACzB,GAAG,YAAY;QACf,GAAG,UAAU;QACb,QAAQ,EAAE;YACR,GAAG,CAAC,YAAY,CAAC,QAAQ,IAAI,EAAE,CAAC;YAChC,GAAG,CAAC,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC;SAC/B;KACF,CAAC;IAEF,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,8CAA8C;IAErE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAe;IAClD,MAAM,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAElD,MAAM,UAAU,GAAG,CAAC,MAAM,sBAAsB,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAEtF,OAAO,UAAU,CAAC;AACpB,CAAC","sourcesContent":["import { readJson } from '@ms-cloudpack/json-utilities';\nimport { getConfigPath } from './getConfigPath.js';\nimport type { UserConfig } from '@ms-cloudpack/config-types';\nimport { safeImportParentConfig } from './safeImportParentConfig.js';\n\n/**\n * Reads the user config file and merges it with any parent configs.\n * @param params - The path to the user config file or the import specifier for the parent config file.\n */\nasync function readUserConfigInternal(\n  params:\n    | { filePath: string }\n    | {\n        fromConfigPath: string;\n        importSpecifier: string;\n      },\n): Promise<UserConfig | undefined> {\n  if ('filePath' in params && 'importSpecifier' in params) {\n    throw new Error('Only one of filePath or importSpecifier can be specified');\n  }\n\n  // Read the user config file\n  let userConfig: UserConfig | undefined;\n  let resolvedConfigPath: string | undefined;\n\n  if ('filePath' in params) {\n    userConfig = await readJson(params.filePath, { verbose: true, mode: 'permissive' });\n    resolvedConfigPath = params.filePath;\n  } else {\n    const { importSpecifier, fromConfigPath } = params;\n    const result = await safeImportParentConfig({ importSpecifier, configPath: fromConfigPath });\n    if (result) {\n      resolvedConfigPath = result.resolvedConfigPath;\n      userConfig = result.config;\n    }\n  }\n\n  // If there is no userConfig or 'extends' property, return it early\n  if (!userConfig?.extends || !resolvedConfigPath) {\n    return userConfig;\n  }\n\n  // Recursively read the parent config file\n  const parentConfig = await readUserConfigInternal({\n    fromConfigPath: resolvedConfigPath,\n    importSpecifier: userConfig.extends,\n  });\n\n  // If unable to read the parent config file, return the userConfig\n  if (!parentConfig) {\n    return userConfig;\n  }\n\n  // Merge the parent config with the user config and return the result\n  const result: UserConfig = {\n    ...parentConfig,\n    ...userConfig,\n    features: {\n      ...(parentConfig.features || {}),\n      ...(userConfig.features || {}),\n    },\n  };\n\n  delete result.extends; // Remove the extends property from the result\n\n  return result;\n}\n\n/**\n * Reads the user config file and merges with any parent configs asynchronously. Note this is only useful for making modifications to the user config.\n * For a full merged representation of config, use `readConfig` instead.\n */\nexport async function readUserConfig(appPath: string): Promise<UserConfig> {\n  const { userConfigPath } = getConfigPath(appPath);\n\n  const userConfig = (await readUserConfigInternal({ filePath: userConfigPath })) || {};\n\n  return userConfig;\n}\n"]}
+{"version":3,"file":"readUserConfig.js","sourceRoot":"","sources":["../src/readUserConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE;;;GAGG;AACH,KAAK,UAAU,sBAAsB,CACnC,MAKK;IAEL,IAAI,UAAU,IAAI,MAAM,IAAI,iBAAiB,IAAI,MAAM,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAED,4BAA4B;IAC5B,IAAI,UAAkC,CAAC;IACvC,IAAI,kBAAsC,CAAC;IAE3C,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;QACzB,UAAU,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;QACpF,kBAAkB,GAAG,MAAM,CAAC,QAAQ,CAAC;IACvC,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC;QAC7F,IAAI,MAAM,EAAE,CAAC;YACX,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;YAC/C,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,IAAI,CAAC,UAAU,EAAE,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,0CAA0C;IAC1C,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC;QAChD,cAAc,EAAE,kBAAkB;QAClC,eAAe,EAAE,UAAU,CAAC,OAAO;KACpC,CAAC,CAAC;IAEH,kEAAkE;IAClE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,OAAO,iBAAiB,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;AACzD,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAe;IAClD,MAAM,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAElD,MAAM,UAAU,GAAG,CAAC,MAAM,sBAAsB,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAEtF,OAAO,UAAU,CAAC;AACpB,CAAC","sourcesContent":["import type { UserConfig } from '@ms-cloudpack/config-types';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport { getConfigPath } from './getConfigPath.js';\nimport { mergeParentConfig } from './mergeParentConfig.js';\nimport { safeImportParentConfig } from './safeImportParentConfig.js';\n\n/**\n * Reads the user config file and merges it with any parent configs.\n * @param params - The path to the user config file or the import specifier for the parent config file.\n */\nasync function readUserConfigInternal(\n  params:\n    | { filePath: string }\n    | {\n        fromConfigPath: string;\n        importSpecifier: string;\n      },\n): Promise<UserConfig | undefined> {\n  if ('filePath' in params && 'importSpecifier' in params) {\n    throw new Error('Only one of filePath or importSpecifier can be specified');\n  }\n\n  // Read the user config file\n  let userConfig: UserConfig | undefined;\n  let resolvedConfigPath: string | undefined;\n\n  if ('filePath' in params) {\n    userConfig = await readJson(params.filePath, { verbose: true, mode: 'permissive' });\n    resolvedConfigPath = params.filePath;\n  } else {\n    const { importSpecifier, fromConfigPath } = params;\n    const result = await safeImportParentConfig({ importSpecifier, configPath: fromConfigPath });\n    if (result) {\n      resolvedConfigPath = result.resolvedConfigPath;\n      userConfig = result.config;\n    }\n  }\n\n  // If there is no userConfig or 'extends' property, return it early\n  if (!userConfig?.extends || !resolvedConfigPath) {\n    return userConfig;\n  }\n\n  // Recursively read the parent config file\n  const parentConfig = await readUserConfigInternal({\n    fromConfigPath: resolvedConfigPath,\n    importSpecifier: userConfig.extends,\n  });\n\n  // If unable to read the parent config file, return the userConfig\n  if (!parentConfig) {\n    return userConfig;\n  }\n\n  return mergeParentConfig({ userConfig, parentConfig });\n}\n\n/**\n * Reads the user config file and merges with any parent configs asynchronously. Note this is only useful for making modifications to the user config.\n * For a full merged representation of config, use `readConfig` instead.\n */\nexport async function readUserConfig(appPath: string): Promise<UserConfig> {\n  const { userConfigPath } = getConfigPath(appPath);\n\n  const userConfig = (await readUserConfigInternal({ filePath: userConfigPath })) || {};\n\n  return userConfig;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.17.21",
+  "version": "0.17.23",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,11 +14,12 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/bundler-types": "^0.24.0",
+    "@ms-cloudpack/bundler-types": "^0.24.1",
     "@ms-cloudpack/config-types": "^0.4.3",
     "@ms-cloudpack/json-utilities": "^0.1.3",
-    "@ms-cloudpack/package-utilities": "^5.8.2",
+    "@ms-cloudpack/package-utilities": "^5.8.3",
     "@ms-cloudpack/path-string-parsing": "^1.1.3",
+    "merge": "^2.1.1",
     "semver": "^7.6.0"
   },
   "devDependencies": {