@ms-cloudpack/config 0.38.26 → 0.38.30

package/lib/readConfig/readConfig.d.ts

@@ -1,9 +1,6 @@
 import type { CloudpackConfig } from '@ms-cloudpack/common-types';
 import { type ReadAppConfigOptions } from './readAppConfig.js';
-export type ReadConfigOptions = ReadAppConfigOptions & Partial<Pick<CloudpackConfig, 'mode' | 'logBundleInfo'>> & {
-    /** Custom config file name to use instead of cloudpack.config.json */
-    configFileName?: string;
-};
+export type ReadConfigOptions = ReadAppConfigOptions & Partial<Pick<CloudpackConfig, 'mode' | 'logBundleInfo'>>;
 /**
  * Read the app config and generated config if they exist.
  *

package/lib/readConfig/readConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readConfig.d.ts","sourceRoot":"","sources":["../../src/readConfig/readConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAOhB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAiB,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAc9E,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAClD,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,GAAG;IACzD,sEAAsE;IACtE,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEJ;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC,CAmCvG"}
+{"version":3,"file":"readConfig.d.ts","sourceRoot":"","sources":["../../src/readConfig/readConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAOhB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAiB,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAc9E,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC;AAEhH;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC,CAmCvG"}

package/lib/readConfig/readConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../../src/readConfig/readConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  BootstrapRoute,\n  CloudpackConfig,\n  ExpandedSourcePath,\n  PackageJson,\n  RenderedRoute,\n  Route,\n  ShorthandRenderedRoute,\n  ShorthandRoute,\n} from '@ms-cloudpack/common-types';\nimport { isShorthandBootstrapRoute, isShorthandRenderedRoute } from '@ms-cloudpack/common-types';\nimport { readAppConfig, type ReadAppConfigOptions } from './readAppConfig.js';\nimport { readGeneratedConfig } from './readGeneratedConfig.js';\nimport { intermediateToSourcePath, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';\nimport { flattenExportsMap } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { cloneJson, readJsonSync } from '@ms-cloudpack/json-utilities';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * package.json with only the keys used in this file, since we're missing some logic from\n * PackageDefinitions which is assumed in the full type.\n */\ntype PartialPackageJson = Pick<PackageJson, 'exports' | 'module' | 'main'>;\n\nexport type ReadConfigOptions = ReadAppConfigOptions &\n  Partial<Pick<CloudpackConfig, 'mode' | 'logBundleInfo'>> & {\n    /** Custom config file name to use instead of cloudpack.config.json */\n    configFileName?: string;\n  };\n\n/**\n * Read the app config and generated config if they exist.\n *\n * Throws if there's an error reading a file or certain settings are invalid. (As of writing,\n * this doesn't do full schema validation; it only validates certain specific settings.)\n */\nexport async function readConfig(appPath: string, options?: ReadConfigOptions): Promise<CloudpackConfig> {\n  const { mode = 'library', logBundleInfo, configFileName, ...appConfigOptions } = options || {};\n\n  const {\n    appConfig: { routes, ...appConfig },\n    appConfigPaths,\n  } = await readAppConfig(appPath, { ...appConfigOptions, configFileName });\n  const generatedConfig = await readGeneratedConfig(appPath);\n\n  const { getConfigPath } = await import('../getConfigPath.js');\n  const { generatedConfigPath } = getConfigPath(appPath);\n\n  const config: CloudpackConfig = {\n    ...appConfig,\n    appPath,\n    mode,\n    generated: generatedConfig,\n    generatedSnapshot: cloneJson(generatedConfig),\n    configPaths: {\n      generatedConfigPath,\n      appConfigPaths,\n    },\n  };\n\n  if (logBundleInfo) {\n    // Only set this if true, mainly to avoid interfering with tests.\n    config.logBundleInfo = true;\n  }\n\n  // Expands all routes which refer to source files into fully transformed route objects.\n  if (routes?.length) {\n    config.routes = expandRoutes(routes, appPath);\n  }\n\n  return config;\n}\n\n/**\n * Ensure all source entries in routes are expanded to fully qualified entry paths.\n */\nfunction expandRoutes(routes: ShorthandRoute[], appPath: string): Route[] {\n  // Cached flattened exports for appPath, used to expand entries\n  const flattenedExports = getFlattenedExports(appPath);\n\n  return routes.map((route) => {\n    if (!isShorthandRenderedRoute(route) && !isShorthandBootstrapRoute(route)) {\n      // Skip extra processing for other route types.\n      return route;\n    }\n\n    // eslint-disable-next-line etc/no-deprecated\n    const { entry, exportEntry, serverEntry, ...rest } = route as ShorthandRenderedRoute;\n    const renderedRoute: RenderedRoute | BootstrapRoute = rest;\n\n    if (entry?.length) {\n      // Expand the entry to full info about the file path.\n      renderedRoute.entry = expandEntry({ entry, appPath, flattenedExports });\n    }\n\n    if (serverEntry) {\n      // eslint-disable-next-line etc/no-deprecated\n      if (renderedRoute.renderScript) {\n        throw new Error(\n          // eslint-disable-next-line etc/no-deprecated\n          `A route cannot have both serverEntry (\"${serverEntry}\") and renderScript (\"${renderedRoute.renderScript}\").`,\n        );\n      }\n\n      renderedRoute.serverEntry = expandRouteEntry({\n        // Usually entryPath will be a source path, but also handle if it's an exports map key.\n        importPath: flattenedExports[serverEntry] ? serverEntry : undefined,\n        filePath: flattenedExports[serverEntry] || serverEntry,\n        entryType: 'serverEntry',\n        appPath,\n      });\n    }\n\n    if (exportEntry) {\n      // Handle backwards compatibility with moving from exportEntry to entry.\n      const filePath = flattenedExports[exportEntry];\n\n      if (!filePath) {\n        throw new Error(\n          `A route referenced exportEntry \"${exportEntry}\" but this couldn't be resolved from the package.json.`,\n        );\n      }\n\n      const expanded = expandRouteEntry({ importPath: exportEntry, filePath, appPath });\n\n      console.warn(\n        'The route property \"exportEntry\" is deprecated. Update your route as follows:',\n        JSON.stringify({ ...renderedRoute, entry: expanded.sourcePath }, null, 2),\n      );\n      (renderedRoute.entry ??= []).push(expanded);\n    }\n\n    return renderedRoute;\n  });\n}\n\nfunction expandEntry(params: {\n  entry: ShorthandRenderedRoute['entry'];\n  appPath: string;\n  flattenedExports: Record<string, string | undefined>;\n}): ExpandedSourcePath[] {\n  const { entry, appPath, flattenedExports } = params;\n  const entryArray = Array.isArray(entry) ? entry : entry !== undefined ? [entry] : [];\n\n  return entryArray.map((entryPath) =>\n    expandRouteEntry({\n      // Usually entryPath will be a source path, but also handle if it's an exports map key.\n      importPath: flattenedExports[entryPath] ? entryPath : undefined,\n      filePath: flattenedExports[entryPath] || entryPath,\n      appPath,\n    }),\n  );\n}\n\n/**\n * Get flattened exports from package.json at `appPath`.\n * If there's no export for `.`, it will be filled in from `module || main`.\n */\nfunction getFlattenedExports(appPath: string): Record<string, string | undefined> {\n  // We can't use PackageDefinitions.get here because we're reading the config, and definitions\n  // cache requires config resulting in a cycle.\n  const definition = readJsonSync<PartialPackageJson>(path.join(appPath, 'package.json')) || {};\n  const flatExports: Record<string, string | undefined> = flattenExportsMap(definition.exports || {});\n  flatExports['.'] ??= definition.module || definition.main;\n  return flatExports;\n}\n\n/** Expands shorthand route entries into fully qualified ones. */\nfunction expandRouteEntry(options: {\n  importPath: string | undefined;\n  filePath: string;\n  appPath: string;\n  entryType?: 'entry' | 'serverEntry';\n}): ExpandedSourcePath {\n  const { filePath, appPath, importPath, entryType = 'entry' } = options;\n  const sourcePath = intermediateToSourcePath(filePath, appPath);\n\n  if (!sourcePath) {\n    throw new Error(`Could not resolve source path for ${entryType}: ${filePath}`);\n  }\n\n  return {\n    // Used to derive bundle entry path\n    sourcePath,\n    // Import map key\n    importPath: importPath ? normalizeRelativePath(importPath) : sourceToIntermediatePath(sourcePath),\n  };\n}\n"]}
+{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../../src/readConfig/readConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  BootstrapRoute,\n  CloudpackConfig,\n  ExpandedSourcePath,\n  PackageJson,\n  RenderedRoute,\n  Route,\n  ShorthandRenderedRoute,\n  ShorthandRoute,\n} from '@ms-cloudpack/common-types';\nimport { isShorthandBootstrapRoute, isShorthandRenderedRoute } from '@ms-cloudpack/common-types';\nimport { readAppConfig, type ReadAppConfigOptions } from './readAppConfig.js';\nimport { readGeneratedConfig } from './readGeneratedConfig.js';\nimport { intermediateToSourcePath, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';\nimport { flattenExportsMap } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { cloneJson, readJsonSync } from '@ms-cloudpack/json-utilities';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * package.json with only the keys used in this file, since we're missing some logic from\n * PackageDefinitions which is assumed in the full type.\n */\ntype PartialPackageJson = Pick<PackageJson, 'exports' | 'module' | 'main'>;\n\nexport type ReadConfigOptions = ReadAppConfigOptions & Partial<Pick<CloudpackConfig, 'mode' | 'logBundleInfo'>>;\n\n/**\n * Read the app config and generated config if they exist.\n *\n * Throws if there's an error reading a file or certain settings are invalid. (As of writing,\n * this doesn't do full schema validation; it only validates certain specific settings.)\n */\nexport async function readConfig(appPath: string, options?: ReadConfigOptions): Promise<CloudpackConfig> {\n  const { mode = 'library', logBundleInfo, configFileName, ...appConfigOptions } = options || {};\n\n  const {\n    appConfig: { routes, ...appConfig },\n    appConfigPaths,\n  } = await readAppConfig(appPath, { ...appConfigOptions, configFileName });\n  const generatedConfig = await readGeneratedConfig(appPath);\n\n  const { getConfigPath } = await import('../getConfigPath.js');\n  const { generatedConfigPath } = getConfigPath(appPath);\n\n  const config: CloudpackConfig = {\n    ...appConfig,\n    appPath,\n    mode,\n    generated: generatedConfig,\n    generatedSnapshot: cloneJson(generatedConfig),\n    configPaths: {\n      generatedConfigPath,\n      appConfigPaths,\n    },\n  };\n\n  if (logBundleInfo) {\n    // Only set this if true, mainly to avoid interfering with tests.\n    config.logBundleInfo = true;\n  }\n\n  // Expands all routes which refer to source files into fully transformed route objects.\n  if (routes?.length) {\n    config.routes = expandRoutes(routes, appPath);\n  }\n\n  return config;\n}\n\n/**\n * Ensure all source entries in routes are expanded to fully qualified entry paths.\n */\nfunction expandRoutes(routes: ShorthandRoute[], appPath: string): Route[] {\n  // Cached flattened exports for appPath, used to expand entries\n  const flattenedExports = getFlattenedExports(appPath);\n\n  return routes.map((route) => {\n    if (!isShorthandRenderedRoute(route) && !isShorthandBootstrapRoute(route)) {\n      // Skip extra processing for other route types.\n      return route;\n    }\n\n    // eslint-disable-next-line etc/no-deprecated\n    const { entry, exportEntry, serverEntry, ...rest } = route as ShorthandRenderedRoute;\n    const renderedRoute: RenderedRoute | BootstrapRoute = rest;\n\n    if (entry?.length) {\n      // Expand the entry to full info about the file path.\n      renderedRoute.entry = expandEntry({ entry, appPath, flattenedExports });\n    }\n\n    if (serverEntry) {\n      // eslint-disable-next-line etc/no-deprecated\n      if (renderedRoute.renderScript) {\n        throw new Error(\n          // eslint-disable-next-line etc/no-deprecated\n          `A route cannot have both serverEntry (\"${serverEntry}\") and renderScript (\"${renderedRoute.renderScript}\").`,\n        );\n      }\n\n      renderedRoute.serverEntry = expandRouteEntry({\n        // Usually entryPath will be a source path, but also handle if it's an exports map key.\n        importPath: flattenedExports[serverEntry] ? serverEntry : undefined,\n        filePath: flattenedExports[serverEntry] || serverEntry,\n        entryType: 'serverEntry',\n        appPath,\n      });\n    }\n\n    if (exportEntry) {\n      // Handle backwards compatibility with moving from exportEntry to entry.\n      const filePath = flattenedExports[exportEntry];\n\n      if (!filePath) {\n        throw new Error(\n          `A route referenced exportEntry \"${exportEntry}\" but this couldn't be resolved from the package.json.`,\n        );\n      }\n\n      const expanded = expandRouteEntry({ importPath: exportEntry, filePath, appPath });\n\n      console.warn(\n        'The route property \"exportEntry\" is deprecated. Update your route as follows:',\n        JSON.stringify({ ...renderedRoute, entry: expanded.sourcePath }, null, 2),\n      );\n      (renderedRoute.entry ??= []).push(expanded);\n    }\n\n    return renderedRoute;\n  });\n}\n\nfunction expandEntry(params: {\n  entry: ShorthandRenderedRoute['entry'];\n  appPath: string;\n  flattenedExports: Record<string, string | undefined>;\n}): ExpandedSourcePath[] {\n  const { entry, appPath, flattenedExports } = params;\n  const entryArray = Array.isArray(entry) ? entry : entry !== undefined ? [entry] : [];\n\n  return entryArray.map((entryPath) =>\n    expandRouteEntry({\n      // Usually entryPath will be a source path, but also handle if it's an exports map key.\n      importPath: flattenedExports[entryPath] ? entryPath : undefined,\n      filePath: flattenedExports[entryPath] || entryPath,\n      appPath,\n    }),\n  );\n}\n\n/**\n * Get flattened exports from package.json at `appPath`.\n * If there's no export for `.`, it will be filled in from `module || main`.\n */\nfunction getFlattenedExports(appPath: string): Record<string, string | undefined> {\n  // We can't use PackageDefinitions.get here because we're reading the config, and definitions\n  // cache requires config resulting in a cycle.\n  const definition = readJsonSync<PartialPackageJson>(path.join(appPath, 'package.json')) || {};\n  const flatExports: Record<string, string | undefined> = flattenExportsMap(definition.exports || {});\n  flatExports['.'] ??= definition.module || definition.main;\n  return flatExports;\n}\n\n/** Expands shorthand route entries into fully qualified ones. */\nfunction expandRouteEntry(options: {\n  importPath: string | undefined;\n  filePath: string;\n  appPath: string;\n  entryType?: 'entry' | 'serverEntry';\n}): ExpandedSourcePath {\n  const { filePath, appPath, importPath, entryType = 'entry' } = options;\n  const sourcePath = intermediateToSourcePath(filePath, appPath);\n\n  if (!sourcePath) {\n    throw new Error(`Could not resolve source path for ${entryType}: ${filePath}`);\n  }\n\n  return {\n    // Used to derive bundle entry path\n    sourcePath,\n    // Import map key\n    importPath: importPath ? normalizeRelativePath(importPath) : sourceToIntermediatePath(sourcePath),\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.38.26",
+  "version": "0.38.30",
   "description": "Configuration handling for Cloudpack",
   "license": "MIT",
   "type": "module",
@@ -27,7 +27,7 @@
     "@ms-cloudpack/common-types": "^0.33.2",
     "@ms-cloudpack/environment": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.1.11",
-    "@ms-cloudpack/package-utilities": "^13.3.2",
+    "@ms-cloudpack/package-utilities": "^13.3.6",
     "@ms-cloudpack/path-string-parsing": "^1.3.0",
     "@ms-cloudpack/path-utilities": "^3.2.5",
     "semver": "^7.6.0"