@ms-cloudpack/config 0.17.25 → 0.17.27

package/lib/mergeParentConfig.d.ts

@@ -1,6 +1,9 @@
 import type { UserConfig } from '@ms-cloudpack/config-types';
+/**
+ * Merge the configs. Later parent configs override earlier ones.
+ */
 export declare function mergeParentConfig(params: {
     userConfig: UserConfig;
-    parentConfig: UserConfig;
+    parentConfigs: UserConfig[];
 }): UserConfig;
 //# sourceMappingURL=mergeParentConfig.d.ts.map

package/lib/mergeParentConfig.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"mergeParentConfig.d.ts","sourceRoot":"","sources":["../src/mergeParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAG7D;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,UAAU,EAAE,CAAA;CAAE,GAAG,UAAU,CAiB7G"}

package/lib/mergeParentConfig.js

@@ -1,14 +1,18 @@
 import { recursive as recursiveMerge } from 'merge';
+/**
+ * Merge the configs. Later parent configs override earlier ones.
+ */
 export function mergeParentConfig(params) {
-    const { userConfig, parentConfig } = params;
+    const configs = [...params.parentConfigs, params.userConfig];
     // NOTE: This must merge into an empty object to avoid modifying the originals
-    const result = recursiveMerge({}, parentConfig, userConfig);
+    const result = recursiveMerge({}, ...configs);
     // 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];
+    // Concatenate the package settings. User config comes first here since order can matter
+    // in some cases (and the user config should override the parent).
+    const packageSettings = [...configs].reverse().flatMap((config) => config.packageSettings ?? []);
+    if (packageSettings.length) {
+        result.packageSettings = packageSettings;
     }
     return result;
 }

package/lib/mergeParentConfig.js.map

@@ -1 +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"]}
+{"version":3,"file":"mergeParentConfig.js","sourceRoot":"","sources":["../src/mergeParentConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,OAAO,CAAC;AAEpD;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAA+D;IAC/F,MAAM,OAAO,GAAG,CAAC,GAAG,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAE7D,8EAA8E;IAC9E,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,EAAE,GAAG,OAAO,CAAe,CAAC;IAE5D,8CAA8C;IAC9C,OAAO,MAAM,CAAC,OAAO,CAAC;IAEtB,wFAAwF;IACxF,kEAAkE;IAClE,MAAM,eAAe,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;IACjG,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,eAAe,GAAG,eAAe,CAAC;IAC3C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { UserConfig } from '@ms-cloudpack/config-types';\nimport { recursive as recursiveMerge } from 'merge';\n\n/**\n * Merge the configs. Later parent configs override earlier ones.\n */\nexport function mergeParentConfig(params: { userConfig: UserConfig; parentConfigs: UserConfig[] }): UserConfig {\n  const configs = [...params.parentConfigs, params.userConfig];\n\n  // NOTE: This must merge into an empty object to avoid modifying the originals\n  const result = recursiveMerge({}, ...configs) as UserConfig;\n\n  // Remove the extends property from the result\n  delete result.extends;\n\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  const packageSettings = [...configs].reverse().flatMap((config) => config.packageSettings ?? []);\n  if (packageSettings.length) {\n    result.packageSettings = 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":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAyD7D;;;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;AAoC7D;;;GAGG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAIzE"}

package/lib/readUserConfig.js

@@ -1,44 +1,32 @@
 import { readJson } from '@ms-cloudpack/json-utilities';
 import { getConfigPath } from './getConfigPath.js';
 import { mergeParentConfig } from './mergeParentConfig.js';
-import { safeImportParentConfig } from './safeImportParentConfig.js';
+import { resolveParentConfig } from './resolveParentConfig.js';
 /**
- * Reads the user config file and merges it with any parent configs.
- * @param params - The path to the user config file or the import specifier for the parent config file.
+ * Reads the user config, with any `extends` parent configs merged in.
  */
-async function readUserConfigInternal(params) {
-    if ('filePath' in params && 'importSpecifier' in params) {
-        throw new Error('Only one of filePath or importSpecifier can be specified');
+async function readUserConfigInternal(configPath) {
+    const userConfig = await readJson(configPath, { verbose: true, mode: 'permissive' });
+    if (!userConfig) {
+        return undefined;
     }
-    // Read the user config file
-    let userConfig;
-    let resolvedConfigPath;
-    if ('filePath' in params) {
-        userConfig = await readJson(params.filePath, { verbose: true, mode: 'permissive' });
-        resolvedConfigPath = params.filePath;
-    }
-    else {
-        const { importSpecifier, fromConfigPath } = params;
-        const result = await safeImportParentConfig({ importSpecifier, configPath: fromConfigPath });
-        if (result) {
-            resolvedConfigPath = result.resolvedConfigPath;
-            userConfig = result.config;
+    const extendsArray = userConfig.extends
+        ? Array.isArray(userConfig.extends)
+            ? userConfig.extends
+            : [userConfig.extends]
+        : [];
+    // Recursively read any parent config files
+    const parentConfigs = [];
+    for (const importSpecifier of extendsArray) {
+        const resolvedPath = await resolveParentConfig({ configPath, importSpecifier });
+        if (resolvedPath) {
+            const parentConfig = await readUserConfigInternal(resolvedPath);
+            if (parentConfig) {
+                parentConfigs.push(parentConfig);
+            }
         }
     }
-    // If there is no userConfig or 'extends' property, return it early
-    if (!userConfig?.extends || !resolvedConfigPath) {
-        return userConfig;
-    }
-    // Recursively read the parent config file
-    const parentConfig = await readUserConfigInternal({
-        fromConfigPath: resolvedConfigPath,
-        importSpecifier: userConfig.extends,
-    });
-    // If unable to read the parent config file, return the userConfig
-    if (!parentConfig) {
-        return userConfig;
-    }
-    return mergeParentConfig({ userConfig, parentConfig });
+    return mergeParentConfig({ userConfig, parentConfigs });
 }
 /**
  * Reads the user config file and merges with any parent configs asynchronously. Note this is only useful for making modifications to the user config.
@@ -46,7 +34,6 @@ async function readUserConfigInternal(params) {
  */
 export async function readUserConfig(appPath) {
     const { userConfigPath } = getConfigPath(appPath);
-    const userConfig = (await readUserConfigInternal({ filePath: userConfigPath })) || {};
-    return userConfig;
+    return (await readUserConfigInternal(userConfigPath)) || {};
 }
 //# sourceMappingURL=readUserConfig.js.map

package/lib/readUserConfig.js.map

@@ -1 +1 @@
-{"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"]}
+{"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,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;GAEG;AACH,KAAK,UAAU,sBAAsB,CAAC,UAAkB;IACtD,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAa,UAAU,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;IACjG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO;QACrC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;YACjC,CAAC,CAAC,UAAU,CAAC,OAAO;YACpB,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;QACxB,CAAC,CAAC,EAAE,CAAC;IAEP,2CAA2C;IAC3C,MAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,KAAK,MAAM,eAAe,IAAI,YAAY,EAAE,CAAC;QAC3C,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC,CAAC;QAChF,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,YAAY,CAAC,CAAC;YAChE,IAAI,YAAY,EAAE,CAAC;gBACjB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,iBAAiB,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAe;IAClD,MAAM,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAElD,OAAO,CAAC,MAAM,sBAAsB,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC;AAC9D,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 { resolveParentConfig } from './resolveParentConfig.js';\n\n/**\n * Reads the user config, with any `extends` parent configs merged in.\n */\nasync function readUserConfigInternal(configPath: string): Promise<UserConfig | undefined> {\n  const userConfig = await readJson<UserConfig>(configPath, { verbose: true, mode: 'permissive' });\n  if (!userConfig) {\n    return undefined;\n  }\n\n  const extendsArray = userConfig.extends\n    ? Array.isArray(userConfig.extends)\n      ? userConfig.extends\n      : [userConfig.extends]\n    : [];\n\n  // Recursively read any parent config files\n  const parentConfigs: UserConfig[] = [];\n  for (const importSpecifier of extendsArray) {\n    const resolvedPath = await resolveParentConfig({ configPath, importSpecifier });\n    if (resolvedPath) {\n      const parentConfig = await readUserConfigInternal(resolvedPath);\n      if (parentConfig) {\n        parentConfigs.push(parentConfig);\n      }\n    }\n  }\n\n  return mergeParentConfig({ userConfig, parentConfigs });\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  return (await readUserConfigInternal(userConfigPath)) || {};\n}\n"]}

package/lib/resolveParentConfig.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Resolve an import specifier for a parent config file.
+ * Returns undefined if it can't be resolved or doesn't exist.
+ */
+export declare function resolveParentConfig(params: {
+    /** Path of the config file being processed. */
+    configPath: string;
+    /** The import specifier for the parent (extends) config file. */
+    importSpecifier: string;
+}): Promise<string | undefined>;
+//# sourceMappingURL=resolveParentConfig.d.ts.map

package/lib/resolveParentConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveParentConfig.d.ts","sourceRoot":"","sources":["../src/resolveParentConfig.ts"],"names":[],"mappings":"AAKA;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,eAAe,EAAE,MAAM,CAAC;CACzB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA8B9B"}

package/lib/resolveParentConfig.js

@@ -0,0 +1,34 @@
+import { resolve } from '@ms-cloudpack/package-utilities';
+import { parseImportString } from '@ms-cloudpack/path-string-parsing';
+import fs from 'fs';
+import path from 'path';
+/**
+ * Resolve an import specifier for a parent config file.
+ * Returns undefined if it can't be resolved or doesn't exist.
+ */
+export async function resolveParentConfig(params) {
+    const { importSpecifier, configPath } = params;
+    let resolvedConfigPath;
+    if (importSpecifier.startsWith('.')) {
+        resolvedConfigPath = path.resolve(path.dirname(configPath), importSpecifier);
+    }
+    else {
+        const parsedImport = parseImportString(importSpecifier);
+        const resolvedPackage = await resolve(parsedImport.packageName, path.dirname(configPath));
+        if (resolvedPackage) {
+            resolvedConfigPath = path.join(resolvedPackage, parsedImport.importPath);
+        }
+    }
+    if (!resolvedConfigPath) {
+        console.warn(`Unable to resolve config "extends": "${importSpecifier}" from ${configPath}`);
+        return undefined;
+    }
+    // Explicitly check if the file exists and log a warning (so the user knows their config is wrong),
+    // rather than letting readJson quietly return nothing later.
+    if (!fs.existsSync(resolvedConfigPath)) {
+        console.warn(`Resolved config "extends": "${importSpecifier}" (from ${configPath}) to ${resolvedConfigPath}, but the file doesn't exist`);
+        return undefined;
+    }
+    return resolvedConfigPath;
+}
+//# sourceMappingURL=resolveParentConfig.js.map

package/lib/resolveParentConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveParentConfig.js","sourceRoot":"","sources":["../src/resolveParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAKzC;IACC,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAE/C,IAAI,kBAAsC,CAAC;IAE3C,IAAI,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,CAAC;IAC/E,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAC1F,IAAI,eAAe,EAAE,CAAC;YACpB,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,wCAAwC,eAAe,UAAU,UAAU,EAAE,CAAC,CAAC;QAC5F,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,mGAAmG;IACnG,6DAA6D;IAC7D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,IAAI,CACV,+BAA+B,eAAe,WAAW,UAAU,QAAQ,kBAAkB,8BAA8B,CAC5H,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC","sourcesContent":["import { resolve } from '@ms-cloudpack/package-utilities';\nimport { parseImportString } from '@ms-cloudpack/path-string-parsing';\nimport fs from 'fs';\nimport path from 'path';\n\n/**\n * Resolve an import specifier for a parent config file.\n * Returns undefined if it can't be resolved or doesn't exist.\n */\nexport async function resolveParentConfig(params: {\n  /** Path of the config file being processed. */\n  configPath: string;\n  /** The import specifier for the parent (extends) config file. */\n  importSpecifier: string;\n}): Promise<string | undefined> {\n  const { importSpecifier, configPath } = params;\n\n  let resolvedConfigPath: string | undefined;\n\n  if (importSpecifier.startsWith('.')) {\n    resolvedConfigPath = path.resolve(path.dirname(configPath), importSpecifier);\n  } else {\n    const parsedImport = parseImportString(importSpecifier);\n    const resolvedPackage = await resolve(parsedImport.packageName, path.dirname(configPath));\n    if (resolvedPackage) {\n      resolvedConfigPath = path.join(resolvedPackage, parsedImport.importPath);\n    }\n  }\n\n  if (!resolvedConfigPath) {\n    console.warn(`Unable to resolve config \"extends\": \"${importSpecifier}\" from ${configPath}`);\n    return undefined;\n  }\n\n  // Explicitly check if the file exists and log a warning (so the user knows their config is wrong),\n  // rather than letting readJson quietly return nothing later.\n  if (!fs.existsSync(resolvedConfigPath)) {\n    console.warn(\n      `Resolved config \"extends\": \"${importSpecifier}\" (from ${configPath}) to ${resolvedConfigPath}, but the file doesn't exist`,\n    );\n    return undefined;\n  }\n\n  return resolvedConfigPath;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.17.25",
+  "version": "0.17.27",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,10 @@
     }
   },
   "dependencies": {
-    "@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.10.0",
+    "@ms-cloudpack/bundler-types": "^0.24.2",
+    "@ms-cloudpack/config-types": "^0.4.4",
+    "@ms-cloudpack/json-utilities": "^0.1.4",
+    "@ms-cloudpack/package-utilities": "^5.10.2",
     "@ms-cloudpack/path-string-parsing": "^1.1.3",
     "merge": "^2.1.1",
     "semver": "^7.6.0"

package/lib/safeImportParentConfig.d.ts

@@ -1,15 +0,0 @@
-import type { UserConfig } from '@ms-cloudpack/config-types';
-/**
- * Imports the parent config and returns the default export which is the json that represents UserConfig.
- * @returns The UserConfig object. If import specifier can not be resolved, returns undefined.
- */
-export declare function safeImportParentConfig(params: {
-    /** Path of the config file being processed. */
-    configPath: string;
-    /** The import specifier for the parent (extends) config file. */
-    importSpecifier: string;
-}): Promise<{
-    resolvedConfigPath: string;
-    config: UserConfig;
-} | undefined>;
-//# sourceMappingURL=safeImportParentConfig.d.ts.map

package/lib/safeImportParentConfig.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"safeImportParentConfig.d.ts","sourceRoot":"","sources":["../src/safeImportParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAO7D;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,eAAe,EAAE,MAAM,CAAC;CACzB,GAAG,OAAO,CAAC;IAAE,kBAAkB,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,GAAG,SAAS,CAAC,CAiC1E"}

package/lib/safeImportParentConfig.js

@@ -1,38 +0,0 @@
-import { readJson } from '@ms-cloudpack/json-utilities';
-import { resolve } from '@ms-cloudpack/package-utilities';
-import { parseImportString } from '@ms-cloudpack/path-string-parsing';
-import fs from 'fs';
-import path from 'path';
-/**
- * Imports the parent config and returns the default export which is the json that represents UserConfig.
- * @returns The UserConfig object. If import specifier can not be resolved, returns undefined.
- */
-export async function safeImportParentConfig(params) {
-    const { importSpecifier, configPath } = params;
-    let resolvedConfigPath;
-    if (importSpecifier.startsWith('.')) {
-        resolvedConfigPath = path.resolve(path.dirname(configPath), importSpecifier);
-    }
-    else {
-        const parsedImport = parseImportString(importSpecifier);
-        const resolvedPackage = await resolve(parsedImport.packageName, path.dirname(configPath));
-        if (resolvedPackage) {
-            resolvedConfigPath = path.join(resolvedPackage, parsedImport.importPath);
-        }
-    }
-    if (!resolvedConfigPath) {
-        console.warn(`Unable to resolve "${importSpecifier}" relative to ${configPath}`);
-        return undefined;
-    }
-    if (!fs.existsSync(resolvedConfigPath)) {
-        console.warn(`Unable to find config file at ${resolvedConfigPath} (resolving "${importSpecifier}" relative to ${configPath}`);
-        return undefined;
-    }
-    const config = await readJson(resolvedConfigPath, { verbose: true, mode: 'permissive' });
-    if (!config) {
-        console.warn(`Config file at ${resolvedConfigPath} was not valid JSON`);
-        return undefined;
-    }
-    return { resolvedConfigPath, config };
-}
-//# sourceMappingURL=safeImportParentConfig.js.map

package/lib/safeImportParentConfig.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"safeImportParentConfig.js","sourceRoot":"","sources":["../src/safeImportParentConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,MAK5C;IACC,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAE/C,IAAI,kBAAsC,CAAC;IAE3C,IAAI,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,CAAC;IAC/E,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QAC1F,IAAI,eAAe,EAAE,CAAC;YACpB,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,sBAAsB,eAAe,iBAAiB,UAAU,EAAE,CAAC,CAAC;QACjF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,IAAI,CACV,iCAAiC,kBAAkB,gBAAgB,eAAe,iBAAiB,UAAU,EAAE,CAChH,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAa,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;IACrG,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,kBAAkB,kBAAkB,qBAAqB,CAAC,CAAC;QACxE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,CAAC;AACxC,CAAC","sourcesContent":["import type { UserConfig } from '@ms-cloudpack/config-types';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport { resolve } from '@ms-cloudpack/package-utilities';\nimport { parseImportString } from '@ms-cloudpack/path-string-parsing';\nimport fs from 'fs';\nimport path from 'path';\n\n/**\n * Imports the parent config and returns the default export which is the json that represents UserConfig.\n * @returns The UserConfig object. If import specifier can not be resolved, returns undefined.\n */\nexport async function safeImportParentConfig(params: {\n  /** Path of the config file being processed. */\n  configPath: string;\n  /** The import specifier for the parent (extends) config file. */\n  importSpecifier: string;\n}): Promise<{ resolvedConfigPath: string; config: UserConfig } | undefined> {\n  const { importSpecifier, configPath } = params;\n\n  let resolvedConfigPath: string | undefined;\n\n  if (importSpecifier.startsWith('.')) {\n    resolvedConfigPath = path.resolve(path.dirname(configPath), importSpecifier);\n  } else {\n    const parsedImport = parseImportString(importSpecifier);\n    const resolvedPackage = await resolve(parsedImport.packageName, path.dirname(configPath));\n    if (resolvedPackage) {\n      resolvedConfigPath = path.join(resolvedPackage, parsedImport.importPath);\n    }\n  }\n\n  if (!resolvedConfigPath) {\n    console.warn(`Unable to resolve \"${importSpecifier}\" relative to ${configPath}`);\n    return undefined;\n  }\n\n  if (!fs.existsSync(resolvedConfigPath)) {\n    console.warn(\n      `Unable to find config file at ${resolvedConfigPath} (resolving \"${importSpecifier}\" relative to ${configPath}`,\n    );\n    return undefined;\n  }\n\n  const config = await readJson<UserConfig>(resolvedConfigPath, { verbose: true, mode: 'permissive' });\n  if (!config) {\n    console.warn(`Config file at ${resolvedConfigPath} was not valid JSON`);\n    return undefined;\n  }\n  return { resolvedConfigPath, config };\n}\n"]}