@ms-cloudpack/config 0.17.28 → 0.17.30

package/lib/readUserConfig.js

@@ -18,7 +18,7 @@ async function readUserConfigInternal(configPath) {
     // Recursively read any parent config files
     const parentConfigs = [];
     for (const importSpecifier of extendsArray) {
-        const resolvedPath = await resolveParentConfig({ configPath, importSpecifier });
+        const resolvedPath = resolveParentConfig({ configPath, importSpecifier });
         if (resolvedPath) {
             const parentConfig = await readUserConfigInternal(resolvedPath);
             if (parentConfig) {

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,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"]}
+{"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,mBAAmB,CAAC,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC,CAAC;QAC1E,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 = 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

@@ -7,5 +7,5 @@ export declare function resolveParentConfig(params: {
     configPath: string;
     /** The import specifier for the parent (extends) config file. */
     importSpecifier: string;
-}): Promise<string | undefined>;
+}): string | undefined;
 //# sourceMappingURL=resolveParentConfig.d.ts.map

package/lib/resolveParentConfig.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"resolveParentConfig.d.ts","sourceRoot":"","sources":["../src/resolveParentConfig.ts"],"names":[],"mappings":"AAOA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,eAAe,EAAE,MAAM,CAAC;CACzB,GAAG,MAAM,GAAG,SAAS,CAarB"}

package/lib/resolveParentConfig.js

@@ -1,33 +1,21 @@
-import { resolve } from '@ms-cloudpack/package-utilities';
-import { parseImportString } from '@ms-cloudpack/path-string-parsing';
-import fs from 'fs';
-import path from 'path';
+import { moduleResolve } from 'import-meta-resolve';
+import { fileURLToPath, pathToFileURL } from 'url';
+// Conditions used for resolution if the package has an exports map.
+// More could be added later if desired ("default" is implicitly included).
+const conditions = new Set(['import', 'require', 'node']);
 /**
  * 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) {
+export function resolveParentConfig(params) {
     const { importSpecifier, configPath } = params;
     let resolvedConfigPath;
-    if (importSpecifier.startsWith('.')) {
-        resolvedConfigPath = path.resolve(path.dirname(configPath), importSpecifier);
+    try {
+        const resolvedUrl = moduleResolve(importSpecifier, pathToFileURL(configPath), conditions);
+        resolvedConfigPath = fileURLToPath(resolvedUrl);
     }
-    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;
+    catch (err) {
+        console.warn(`Error resolving config "extends": "${importSpecifier}": ${err.message || err}`);
     }
     return resolvedConfigPath;
 }

package/lib/resolveParentConfig.js.map

@@ -1 +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"]}
+{"version":3,"file":"resolveParentConfig.js","sourceRoot":"","sources":["../src/resolveParentConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEnD,oEAAoE;AACpE,2EAA2E;AAC3E,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;AAE1D;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAKnC;IACC,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAE/C,IAAI,kBAAsC,CAAC;IAE3C,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,aAAa,CAAC,eAAe,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAC;QAC1F,kBAAkB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,sCAAsC,eAAe,MAAO,GAAa,CAAC,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC;IAC3G,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC","sourcesContent":["import { moduleResolve } from 'import-meta-resolve';\nimport { fileURLToPath, pathToFileURL } from 'url';\n\n// Conditions used for resolution if the package has an exports map.\n// More could be added later if desired (\"default\" is implicitly included).\nconst conditions = new Set(['import', 'require', 'node']);\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 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}): string | undefined {\n  const { importSpecifier, configPath } = params;\n\n  let resolvedConfigPath: string | undefined;\n\n  try {\n    const resolvedUrl = moduleResolve(importSpecifier, pathToFileURL(configPath), conditions);\n    resolvedConfigPath = fileURLToPath(resolvedUrl);\n  } catch (err) {\n    console.warn(`Error resolving config \"extends\": \"${importSpecifier}\": ${(err as Error).message || err}`);\n  }\n\n  return resolvedConfigPath;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.17.28",
+  "version": "0.17.30",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,11 +14,11 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/bundler-types": "^0.24.3",
-    "@ms-cloudpack/config-types": "^0.5.0",
+    "@ms-cloudpack/bundler-types": "^0.24.5",
+    "@ms-cloudpack/config-types": "^0.5.1",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-utilities": "^5.10.3",
-    "@ms-cloudpack/path-string-parsing": "^1.1.3",
+    "@ms-cloudpack/package-utilities": "^5.10.5",
+    "import-meta-resolve": "^4.0.0",
     "merge": "^2.1.1",
     "semver": "^7.6.0"
   },