@ms-cloudpack/config 0.28.2 → 0.28.3

package/lib/createPackageDefinitions.js

@@ -7,7 +7,7 @@ import { createPackageSettingsTransform } from './createPackageSettingsTransform
 export function createPackageDefinitions(params) {
     const { config } = params;
     const packages = new PackageDefinitions(undefined, config);
-    packages.registerTransform((newConfig) => createPackageSettingsTransform(newConfig));
+    packages.registerTransform((newConfig) => (newConfig ? createPackageSettingsTransform(newConfig) : () => undefined));
     return packages;
 }
 //# sourceMappingURL=createPackageDefinitions.js.map

package/lib/createPackageDefinitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPackageDefinitions.js","sourceRoot":"","sources":["../src/createPackageDefinitions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,MAAmC;IAC1E,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC1B,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAE3D,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,8BAA8B,CAAC,SAA4B,CAAC,CAAC,CAAC;IAExG,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport { createPackageSettingsTransform } from './createPackageSettingsTransform.js';\n\n/**\n * Given a Cloudpack config, create a package definitions cache with transforms resulting from settings defined\n * within the config.\n */\nexport function createPackageDefinitions(params: { config: CloudpackConfig }): PackageDefinitionsCache {\n  const { config } = params;\n  const packages = new PackageDefinitions(undefined, config);\n\n  packages.registerTransform((newConfig) => createPackageSettingsTransform(newConfig as CloudpackConfig));\n\n  return packages;\n}\n"]}
+{"version":3,"file":"createPackageDefinitions.js","sourceRoot":"","sources":["../src/createPackageDefinitions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,MAAmC;IAC1E,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC1B,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAE3D,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAErH,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport { createPackageSettingsTransform } from './createPackageSettingsTransform.js';\n\n/**\n * Given a Cloudpack config, create a package definitions cache with transforms resulting from settings defined\n * within the config.\n */\nexport function createPackageDefinitions(params: { config: CloudpackConfig }): PackageDefinitionsCache {\n  const { config } = params;\n  const packages = new PackageDefinitions(undefined, config);\n\n  packages.registerTransform((newConfig) => (newConfig ? createPackageSettingsTransform(newConfig) : () => undefined));\n\n  return packages;\n}\n"]}

package/lib/createPackageSettingsTransform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPackageSettingsTransform.d.ts","sourceRoot":"","sources":["../src/createPackageSettingsTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,0BAA0B,EAO3B,MAAM,4BAA4B,CAAC;AAKpC;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,eAAe,GAAG,0BAA0B,CA6ClG"}
+{"version":3,"file":"createPackageSettingsTransform.d.ts","sourceRoot":"","sources":["../src/createPackageSettingsTransform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,0BAA0B,EAO3B,MAAM,4BAA4B,CAAC;AAMpC;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,eAAe,GAAG,0BAA0B,CA6ClG"}

package/lib/createPackageSettingsTransform.js

@@ -1,5 +1,6 @@
-import { getPackageSettings } from './getPackageSettings.js';
 import { addExportsMapEntry, getExportsMap } from '@ms-cloudpack/package-utilities';
+import { slash } from '@ms-cloudpack/path-string-parsing';
+import { getPackageSettings } from './getPackageSettings.js';
 import { mergePackageSettings } from './mergePackageSettings.js';
 /**
  * Creates a transform to be registered with a PackageDefinitions registry for updating package.json
@@ -80,36 +81,33 @@ function computeDependencies(options) {
 }
 async function computeExports(options, context) {
     const { packagePath, definition, userPackageSettings, generatedPackageSettings } = options;
-    const { appPath } = context.config;
-    // TODO: an array of export objects is not really valid per the spec and most implementations
-    const exports = [];
-    // If this is the app package, ensure the routes are part of the exports map.
-    if (appPath === packagePath) {
-        const { routes = [] } = context.config;
+    const { appPath, routes } = context.config;
+    // If this is the app package and it has routes with entries, use those to define the exports map.
+    if (slash(appPath) === slash(packagePath) && routes?.length) {
         const routeExports = {};
-        let hasRouteExports = false;
         for (const route of routes) {
             const { entry } = route;
-            if (entry?.length) {
-                for (const entryItem of entry) {
-                    hasRouteExports =
-                        (await addExportsMapEntry({
-                            exports: routeExports,
-                            packagePath,
-                            environmentCondition: 'browser',
-                            filePath: entryItem.sourcePath,
-                            importPath: entryItem.importPath,
-                        }, context)) || hasRouteExports;
-                }
+            if (!entry?.length) {
+                continue;
+            }
+            for (const entryItem of entry) {
+                await addExportsMapEntry({
+                    exports: routeExports,
+                    packagePath,
+                    environmentCondition: 'browser',
+                    filePath: entryItem.sourcePath,
+                    importPath: entryItem.importPath,
+                }, context);
             }
         }
-        // Insert them at the start, so that future exports have precedence.
-        if (hasRouteExports) {
+        if (Object.keys(routeExports).length) {
             // We short circuit here because we don't want to include any unused exports that might
             // be pulled from package.json.
             return routeExports;
         }
     }
+    // TODO: an array of export objects is not really valid per the spec and most implementations
+    const exports = [];
     // Push exports from the package.
     exports.push(userPackageSettings?.exports ||
         definition.exports ||

package/lib/createPackageSettingsTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPackageSettingsTransform.js","sourceRoot":"","sources":["../src/createPackageSettingsTransform.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  CloudpackConfig,\n  PackageDefinitionTransform,\n  PackageDefinitionsCache,\n  PackageJson,\n  PackageJsonDependencies,\n  PackageJsonExports,\n  PackageJsonExportsObject,\n  RenderedRoute,\n} from '@ms-cloudpack/common-types';\nimport { getPackageSettings, type GetPackageSettingsResult } from './getPackageSettings.js';\nimport { addExportsMapEntry, getExportsMap } from '@ms-cloudpack/package-utilities';\nimport { mergePackageSettings } from './mergePackageSettings.js';\n\n/**\n * Creates a transform to be registered with a PackageDefinitions registry for updating package.json\n * based on package settings from the config.\n */\nexport function createPackageSettingsTransform(config: CloudpackConfig): PackageDefinitionTransform {\n  return async ({ definition, packagePath, packages }) => {\n    const { name, version } = definition;\n\n    const { userPackageSettings, generatedPackageSettings } = getPackageSettings({\n      name,\n      version,\n      userPackageSettings: config.packageSettings,\n      generatedPackageSettings: config.generated.packageSettings,\n    });\n\n    // Exclude all things not important in preserving within the package.json. This limits what we end up hashing\n    // when we hash the definition.\n    const { exports, includedDependencies, excludedDependencies, ...settings } = mergePackageSettings([\n      userPackageSettings || {},\n      generatedPackageSettings || {},\n    ]);\n\n    const newDefinition: PackageJson = {\n      name,\n      version,\n      exports: await computeExports(\n        { packagePath, definition, userPackageSettings, generatedPackageSettings },\n        { packages, config },\n      ),\n      dependencies: computeDependencies({ definition, userPackageSettings, generatedPackageSettings }),\n    };\n\n    if (definition.peerDependencies && !userPackageSettings?.excludedDependencies?.includes('$peerDependencies')) {\n      newDefinition.peerDependencies = !excludedDependencies?.length\n        ? definition.peerDependencies\n        : Object.fromEntries(\n            Object.entries(definition.peerDependencies).filter(([dep]) => !excludedDependencies.includes(dep)),\n          );\n    }\n\n    if (config.mode || Object.keys(settings).length > 0) {\n      newDefinition.cloudpack = {\n        mode: config.mode,\n        ...settings,\n      };\n    }\n\n    return newDefinition;\n  };\n}\n\nfunction computeDependencies(\n  options: GetPackageSettingsResult & {\n    definition: PackageJson;\n  },\n): PackageJsonDependencies {\n  const { definition, userPackageSettings, generatedPackageSettings } = options;\n  const { dependencies = {} } = definition;\n  const newDependencies = { ...dependencies };\n\n  // If we have included dependencies, add them.\n  const includedDependencies = [\n    ...(userPackageSettings?.includedDependencies || []),\n    ...(generatedPackageSettings?.includedDependencies || []),\n  ];\n\n  // Expand the $devDependencies placeholder to the actual dev dependencies.\n  const includeDevDependencies = includedDependencies.indexOf('$devDependencies');\n\n  if (includeDevDependencies !== -1) {\n    includedDependencies.splice(includeDevDependencies, 1, ...Object.keys(definition.devDependencies || {}));\n  }\n\n  // Add the dependency from other sources, or use a wildcard.\n  for (const dep of includedDependencies) {\n    newDependencies[dep] =\n      definition.dependencies?.[dep] ||\n      definition.devDependencies?.[dep] ||\n      definition.peerDependencies?.[dep] ||\n      definition.optionalDependencies?.[dep] ||\n      '*';\n  }\n\n  const excludedDependencies = [\n    ...(userPackageSettings?.excludedDependencies || []),\n    ...(generatedPackageSettings?.excludedDependencies || []),\n  ];\n\n  // Expand the $peerDependencies placeholder to the actual peer dependencies.\n  const excludePeerDependencies = excludedDependencies.indexOf('$peerDependencies');\n\n  if (excludePeerDependencies !== -1) {\n    // Add peer dependencies to the list of excluded dependencies.\n    excludedDependencies.splice(excludePeerDependencies, 1, ...Object.keys(definition.peerDependencies || {}));\n  }\n\n  for (const dep of excludedDependencies) {\n    delete newDependencies[dep];\n  }\n\n  return newDependencies;\n}\n\nasync function computeExports(\n  options: GetPackageSettingsResult & {\n    packagePath: string;\n    definition: PackageJson;\n  },\n  context: { packages: PackageDefinitionsCache; config: CloudpackConfig },\n): Promise<PackageJsonExports | undefined> {\n  const { packagePath, definition, userPackageSettings, generatedPackageSettings } = options;\n  const { appPath } = context.config;\n  // TODO: an array of export objects is not really valid per the spec and most implementations\n  const exports: PackageJsonExports[] = [];\n\n  // If this is the app package, ensure the routes are part of the exports map.\n  if (appPath === packagePath) {\n    const { routes = [] } = context.config;\n    const routeExports: PackageJsonExportsObject = {};\n    let hasRouteExports = false;\n\n    for (const route of routes) {\n      const { entry } = route as RenderedRoute;\n\n      if (entry?.length) {\n        for (const entryItem of entry) {\n          hasRouteExports =\n            (await addExportsMapEntry(\n              {\n                exports: routeExports,\n                packagePath,\n                environmentCondition: 'browser',\n                filePath: entryItem.sourcePath,\n                importPath: entryItem.importPath,\n              },\n              context,\n            )) || hasRouteExports;\n        }\n      }\n    }\n\n    // Insert them at the start, so that future exports have precedence.\n    if (hasRouteExports) {\n      // We short circuit here because we don't want to include any unused exports that might\n      // be pulled from package.json.\n      return routeExports;\n    }\n  }\n\n  // Push exports from the package.\n  exports.push(\n    userPackageSettings?.exports ||\n      definition.exports ||\n      (await getExportsMap({ packagePath, disableTransforms: true }, context)),\n  );\n\n  // Push generated exports.\n  if (generatedPackageSettings?.exports) {\n    exports.push(generatedPackageSettings.exports);\n  }\n\n  if (exports.length === 0) {\n    return undefined;\n  }\n\n  if (exports.length === 1) {\n    return exports[0];\n  }\n\n  return exports;\n}\n"]}
+{"version":3,"file":"createPackageSettingsTransform.js","sourceRoot":"","sources":["../src/createPackageSettingsTransform.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAiC,MAAM,yBAAyB,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;GAGG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAAuB;IACpE,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE;QACrD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;QAErC,MAAM,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,GAAG,kBAAkB,CAAC;YAC3E,IAAI;YACJ,OAAO;YACP,mBAAmB,EAAE,MAAM,CAAC,eAAe;YAC3C,wBAAwB,EAAE,MAAM,CAAC,SAAS,CAAC,eAAe;SAC3D,CAAC,CAAC;QAEH,6GAA6G;QAC7G,+BAA+B;QAC/B,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,QAAQ,EAAE,GAAG,oBAAoB,CAAC;YAChG,mBAAmB,IAAI,EAAE;YACzB,wBAAwB,IAAI,EAAE;SAC/B,CAAC,CAAC;QAEH,MAAM,aAAa,GAAgB;YACjC,IAAI;YACJ,OAAO;YACP,OAAO,EAAE,MAAM,cAAc,CAC3B,EAAE,WAAW,EAAE,UAAU,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,EAC1E,EAAE,QAAQ,EAAE,MAAM,EAAE,CACrB;YACD,YAAY,EAAE,mBAAmB,CAAC,EAAE,UAAU,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,CAAC;SACjG,CAAC;QAEF,IAAI,UAAU,CAAC,gBAAgB,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC7G,aAAa,CAAC,gBAAgB,GAAG,CAAC,oBAAoB,EAAE,MAAM;gBAC5D,CAAC,CAAC,UAAU,CAAC,gBAAgB;gBAC7B,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACnG,CAAC;QACR,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,aAAa,CAAC,SAAS,GAAG;gBACxB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,GAAG,QAAQ;aACZ,CAAC;QACJ,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,OAEC;IAED,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC;IAC9E,MAAM,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;IACzC,MAAM,eAAe,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC;IAE5C,8CAA8C;IAC9C,MAAM,oBAAoB,GAAG;QAC3B,GAAG,CAAC,mBAAmB,EAAE,oBAAoB,IAAI,EAAE,CAAC;QACpD,GAAG,CAAC,wBAAwB,EAAE,oBAAoB,IAAI,EAAE,CAAC;KAC1D,CAAC;IAEF,0EAA0E;IAC1E,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAEhF,IAAI,sBAAsB,KAAK,CAAC,CAAC,EAAE,CAAC;QAClC,oBAAoB,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3G,CAAC;IAED,4DAA4D;IAC5D,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACvC,eAAe,CAAC,GAAG,CAAC;YAClB,UAAU,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC;gBAC9B,UAAU,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC;gBACjC,UAAU,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC;gBAClC,UAAU,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC;gBACtC,GAAG,CAAC;IACR,CAAC;IAED,MAAM,oBAAoB,GAAG;QAC3B,GAAG,CAAC,mBAAmB,EAAE,oBAAoB,IAAI,EAAE,CAAC;QACpD,GAAG,CAAC,wBAAwB,EAAE,oBAAoB,IAAI,EAAE,CAAC;KAC1D,CAAC;IAEF,4EAA4E;IAC5E,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAElF,IAAI,uBAAuB,KAAK,CAAC,CAAC,EAAE,CAAC;QACnC,8DAA8D;QAC9D,oBAAoB,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7G,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACvC,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,OAGC,EACD,OAAuE;IAEvE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC;IAC3F,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAE3C,kGAAkG;IAClG,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,WAAW,CAAC,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;QAC5D,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,KAAsB,CAAC;YACzC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,KAAK,MAAM,SAAS,IAAI,KAAK,EAAE,CAAC;gBAC9B,MAAM,kBAAkB,CACtB;oBACE,OAAO,EAAE,YAAY;oBACrB,WAAW;oBACX,oBAAoB,EAAE,SAAS;oBAC/B,QAAQ,EAAE,SAAS,CAAC,UAAU;oBAC9B,UAAU,EAAE,SAAS,CAAC,UAAU;iBACjC,EACD,OAAO,CACR,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAAC;YACrC,uFAAuF;YACvF,+BAA+B;YAC/B,OAAO,YAAY,CAAC;QACtB,CAAC;IACH,CAAC;IAED,6FAA6F;IAC7F,MAAM,OAAO,GAAyB,EAAE,CAAC;IAEzC,iCAAiC;IACjC,OAAO,CAAC,IAAI,CACV,mBAAmB,EAAE,OAAO;QAC1B,UAAU,CAAC,OAAO;QAClB,CAAC,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,CAC3E,CAAC;IAEF,0BAA0B;IAC1B,IAAI,wBAAwB,EAAE,OAAO,EAAE,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC","sourcesContent":["import type {\n  CloudpackConfig,\n  PackageDefinitionTransform,\n  PackageDefinitionsCache,\n  PackageJson,\n  PackageJsonDependencies,\n  PackageJsonExports,\n  PackageJsonExportsObject,\n  RenderedRoute,\n} from '@ms-cloudpack/common-types';\nimport { addExportsMapEntry, getExportsMap } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { getPackageSettings, type GetPackageSettingsResult } from './getPackageSettings.js';\nimport { mergePackageSettings } from './mergePackageSettings.js';\n\n/**\n * Creates a transform to be registered with a PackageDefinitions registry for updating package.json\n * based on package settings from the config.\n */\nexport function createPackageSettingsTransform(config: CloudpackConfig): PackageDefinitionTransform {\n  return async ({ definition, packagePath, packages }) => {\n    const { name, version } = definition;\n\n    const { userPackageSettings, generatedPackageSettings } = getPackageSettings({\n      name,\n      version,\n      userPackageSettings: config.packageSettings,\n      generatedPackageSettings: config.generated.packageSettings,\n    });\n\n    // Exclude all things not important in preserving within the package.json. This limits what we end up hashing\n    // when we hash the definition.\n    const { exports, includedDependencies, excludedDependencies, ...settings } = mergePackageSettings([\n      userPackageSettings || {},\n      generatedPackageSettings || {},\n    ]);\n\n    const newDefinition: PackageJson = {\n      name,\n      version,\n      exports: await computeExports(\n        { packagePath, definition, userPackageSettings, generatedPackageSettings },\n        { packages, config },\n      ),\n      dependencies: computeDependencies({ definition, userPackageSettings, generatedPackageSettings }),\n    };\n\n    if (definition.peerDependencies && !userPackageSettings?.excludedDependencies?.includes('$peerDependencies')) {\n      newDefinition.peerDependencies = !excludedDependencies?.length\n        ? definition.peerDependencies\n        : Object.fromEntries(\n            Object.entries(definition.peerDependencies).filter(([dep]) => !excludedDependencies.includes(dep)),\n          );\n    }\n\n    if (config.mode || Object.keys(settings).length > 0) {\n      newDefinition.cloudpack = {\n        mode: config.mode,\n        ...settings,\n      };\n    }\n\n    return newDefinition;\n  };\n}\n\nfunction computeDependencies(\n  options: GetPackageSettingsResult & {\n    definition: PackageJson;\n  },\n): PackageJsonDependencies {\n  const { definition, userPackageSettings, generatedPackageSettings } = options;\n  const { dependencies = {} } = definition;\n  const newDependencies = { ...dependencies };\n\n  // If we have included dependencies, add them.\n  const includedDependencies = [\n    ...(userPackageSettings?.includedDependencies || []),\n    ...(generatedPackageSettings?.includedDependencies || []),\n  ];\n\n  // Expand the $devDependencies placeholder to the actual dev dependencies.\n  const includeDevDependencies = includedDependencies.indexOf('$devDependencies');\n\n  if (includeDevDependencies !== -1) {\n    includedDependencies.splice(includeDevDependencies, 1, ...Object.keys(definition.devDependencies || {}));\n  }\n\n  // Add the dependency from other sources, or use a wildcard.\n  for (const dep of includedDependencies) {\n    newDependencies[dep] =\n      definition.dependencies?.[dep] ||\n      definition.devDependencies?.[dep] ||\n      definition.peerDependencies?.[dep] ||\n      definition.optionalDependencies?.[dep] ||\n      '*';\n  }\n\n  const excludedDependencies = [\n    ...(userPackageSettings?.excludedDependencies || []),\n    ...(generatedPackageSettings?.excludedDependencies || []),\n  ];\n\n  // Expand the $peerDependencies placeholder to the actual peer dependencies.\n  const excludePeerDependencies = excludedDependencies.indexOf('$peerDependencies');\n\n  if (excludePeerDependencies !== -1) {\n    // Add peer dependencies to the list of excluded dependencies.\n    excludedDependencies.splice(excludePeerDependencies, 1, ...Object.keys(definition.peerDependencies || {}));\n  }\n\n  for (const dep of excludedDependencies) {\n    delete newDependencies[dep];\n  }\n\n  return newDependencies;\n}\n\nasync function computeExports(\n  options: GetPackageSettingsResult & {\n    packagePath: string;\n    definition: PackageJson;\n  },\n  context: { packages: PackageDefinitionsCache; config: CloudpackConfig },\n): Promise<PackageJsonExports | undefined> {\n  const { packagePath, definition, userPackageSettings, generatedPackageSettings } = options;\n  const { appPath, routes } = context.config;\n\n  // If this is the app package and it has routes with entries, use those to define the exports map.\n  if (slash(appPath) === slash(packagePath) && routes?.length) {\n    const routeExports: PackageJsonExportsObject = {};\n\n    for (const route of routes) {\n      const { entry } = route as RenderedRoute;\n      if (!entry?.length) {\n        continue;\n      }\n\n      for (const entryItem of entry) {\n        await addExportsMapEntry(\n          {\n            exports: routeExports,\n            packagePath,\n            environmentCondition: 'browser',\n            filePath: entryItem.sourcePath,\n            importPath: entryItem.importPath,\n          },\n          context,\n        );\n      }\n    }\n\n    if (Object.keys(routeExports).length) {\n      // We short circuit here because we don't want to include any unused exports that might\n      // be pulled from package.json.\n      return routeExports;\n    }\n  }\n\n  // TODO: an array of export objects is not really valid per the spec and most implementations\n  const exports: PackageJsonExports[] = [];\n\n  // Push exports from the package.\n  exports.push(\n    userPackageSettings?.exports ||\n      definition.exports ||\n      (await getExportsMap({ packagePath, disableTransforms: true }, context)),\n  );\n\n  // Push generated exports.\n  if (generatedPackageSettings?.exports) {\n    exports.push(generatedPackageSettings.exports);\n  }\n\n  if (exports.length === 0) {\n    return undefined;\n  }\n\n  if (exports.length === 1) {\n    return exports[0];\n  }\n\n  return exports;\n}\n"]}

package/lib/readConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readConfig.d.ts","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EAKhB,MAAM,4BAA4B,CAAC;AAepC;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,UAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAcxG"}
+{"version":3,"file":"readConfig.d.ts","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EACV,eAAe,EAOhB,MAAM,4BAA4B,CAAC;AAepC;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,UAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAiBxG"}

package/lib/readConfig.js

@@ -1,9 +1,10 @@
+import { isShorthandBootstrapRoute, isShorthandRenderedRoute } from '@ms-cloudpack/common-types';
 import { readAppConfig } from './readAppConfig.js';
 import { readGeneratedConfig } from './readGeneratedConfig.js';
 import { intermediateToSourcePath, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';
 import { flattenExportsMap } from '@ms-cloudpack/package-utilities';
 import path from 'path';
-import { readJson } from '@ms-cloudpack/json-utilities';
+import { readJsonSync } from '@ms-cloudpack/json-utilities';
 /**
  * Reads the config file asynchronously (and merges generated config into the result.)
  */
@@ -17,69 +18,59 @@ export async function readConfig(appPath, mode = 'library') {
         generatedSnapshot: structuredClone(generatedConfig),
     };
     // Expands all routes which refer to source files into fully transformed route objects.
-    await expandRouteShorthandEntries(config, appPath);
+    const routes = appConfig.routes;
+    if (routes?.length) {
+        config.routes = expandRoutes(routes, appPath);
+    }
     return config;
 }
 /**
- * Ensure all source entries in route are expanded to fully qualified entry paths.
+ * Ensure all source entries in routes are expanded to fully qualified entry paths.
  */
-async function expandRouteShorthandEntries(config, appPath) {
-    const { routes } = config;
-    let definition;
-    if (!routes?.length) {
-        return;
-    }
-    for (const route of routes) {
-        const shorthandRoute = route;
-        const renderedRoute = route;
-        renderedRoute.entry = ensureArray(shorthandRoute.entry)?.map((filePath) => expandRouteEntry({
-            filePath,
-            appPath,
-        }));
+function expandRoutes(routes, appPath) {
+    // Cached flattened exports for appPath, used to expand deprecated exportEntry props if present
+    let flattenedExports;
+    return routes.map((route) => {
+        if (!isShorthandRenderedRoute(route) && !isShorthandBootstrapRoute(route)) {
+            // Skip extra processing for other route types.
+            return route;
+        }
         // eslint-disable-next-line etc/no-deprecated
-        if (shorthandRoute.exportEntry) {
-            if (!definition) {
-                // We can't use PackageDefinitions.get here because we're reading the config, and definitions
-                // cache requires config resulting in a cycle.
-                definition = (await readJson(path.join(appPath, 'package.json')));
+        const { entry, exportEntry, ...rest } = route;
+        const renderedRoute = rest;
+        if (entry?.length) {
+            // Expand the entry to full info about the file path.
+            renderedRoute.entry = expandEntry(entry, appPath);
+        }
+        if (exportEntry) {
+            // Handle backwards compatibility with moving from exportEntry to entry.
+            flattenedExports ??= getFlattenedExports(appPath);
+            const filePath = flattenedExports[exportEntry];
+            if (!filePath) {
+                throw new Error(`A route referenced exportEntry "${exportEntry}" but this couldn't be resolved from the package.json.`);
             }
-            expandDeprecatedExportEntry(route, definition, appPath);
+            const expanded = expandRouteEntry({ importPath: exportEntry, filePath, appPath });
+            console.warn('The route property "exportEntry" is deprecated. Update your route as follows:', JSON.stringify({ ...renderedRoute, entry: expanded.sourcePath }, null, 2));
+            (renderedRoute.entry ??= []).push(expanded);
         }
-    }
+        return renderedRoute;
+    });
+}
+function expandEntry(entry, appPath) {
+    entry = Array.isArray(entry) ? entry : entry !== undefined ? [entry] : [];
+    return entry.map((filePath) => expandRouteEntry({ filePath, appPath }));
 }
 /**
- * Handle backwards compatibility with moving from exportEntry to entry. When exportEntry is deleted,
- * this function can be removed.
+ * Get flattened exports from package.json at `appPath`.
+ * If there's no export for `.`, it will be filled in from `module || main`.
  */
-function expandDeprecatedExportEntry(route, definition, appPath) {
-    const shorthandRoute = route;
-    const renderedRoute = route;
-    // eslint-disable-next-line etc/no-deprecated
-    const { exportEntry } = shorthandRoute;
-    const flattenedExports = flattenExportsMap(definition.exports || {});
-    if (exportEntry) {
-        renderedRoute.entry = ensureArray(renderedRoute.entry);
-        const filePath = flattenedExports[exportEntry] || definition.module || definition.main;
-        if (!filePath) {
-            throw new Error(`A route referenced exportEntry "${exportEntry}" but this couldn't be resolved from the package.json.`);
-        }
-        // We are converting the exportEntry to an ExpandedSourcePath so that the route
-        // can be returned as a RenderedRoute.
-        renderedRoute.entry.push(expandRouteEntry({
-            importPath: exportEntry,
-            filePath,
-            appPath,
-        }));
-        // eslint-disable-next-line etc/no-deprecated
-        delete shorthandRoute.exportEntry;
-    }
-}
-/** Ensures the value is an array, or is wrapped in one. If a value is blank, will return a blank array. */
-function ensureArray(value) {
-    if (Array.isArray(value)) {
-        return value;
-    }
-    return (value !== undefined ? [value] : []);
+function getFlattenedExports(appPath) {
+    // We can't use PackageDefinitions.get here because we're reading the config, and definitions
+    // cache requires config resulting in a cycle.
+    const definition = readJsonSync(path.join(appPath, 'package.json')) || {};
+    const flatExports = flattenExportsMap(definition.exports || {});
+    flatExports['.'] ??= definition.module || definition.main;
+    return flatExports;
 }
 /** Expands shorthand route entries into fully qualified ones. */
 function expandRouteEntry(options) {

package/lib/readConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  BundleMode,\n  CloudpackConfig,\n  PackageJson,\n  RenderedRoute,\n  Route,\n  ShorthandRenderedRoute,\n} from '@ms-cloudpack/common-types';\nimport { readAppConfig } from './readAppConfig.js';\nimport { readGeneratedConfig } from './readGeneratedConfig.js';\nimport { intermediateToSourcePath, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';\nimport type { ExpandedSourcePath } from '../../common-types/lib/ExpandedSourcePath.js';\nimport { flattenExportsMap } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { readJson } from '@ms-cloudpack/json-utilities';\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\n/**\n * Reads the config file asynchronously (and merges generated config into the result.)\n */\nexport async function readConfig(appPath: string, mode: BundleMode = 'library'): Promise<CloudpackConfig> {\n  const [appConfig, generatedConfig] = await Promise.all([readAppConfig(appPath), readGeneratedConfig(appPath)]);\n  const config = {\n    ...appConfig,\n    appPath,\n    mode,\n    generated: generatedConfig,\n    generatedSnapshot: structuredClone(generatedConfig),\n  } as CloudpackConfig;\n\n  // Expands all routes which refer to source files into fully transformed route objects.\n  await expandRouteShorthandEntries(config, appPath);\n\n  return config;\n}\n\n/**\n * Ensure all source entries in route are expanded to fully qualified entry paths.\n */\nasync function expandRouteShorthandEntries(config: CloudpackConfig, appPath: string) {\n  const { routes } = config;\n  let definition: PartialPackageJson | undefined;\n\n  if (!routes?.length) {\n    return;\n  }\n\n  for (const route of routes) {\n    const shorthandRoute = route as ShorthandRenderedRoute;\n    const renderedRoute = route as RenderedRoute;\n\n    renderedRoute.entry = ensureArray(shorthandRoute.entry)?.map((filePath) =>\n      expandRouteEntry({\n        filePath,\n        appPath,\n      }),\n    );\n\n    // eslint-disable-next-line etc/no-deprecated\n    if (shorthandRoute.exportEntry) {\n      if (!definition) {\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        definition = (await readJson(path.join(appPath, 'package.json'))) as PartialPackageJson;\n      }\n\n      expandDeprecatedExportEntry(route, definition, appPath);\n    }\n  }\n}\n\n/**\n * Handle backwards compatibility with moving from exportEntry to entry. When exportEntry is deleted,\n * this function can be removed.\n */\nfunction expandDeprecatedExportEntry(route: Route, definition: PartialPackageJson, appPath: string) {\n  const shorthandRoute = route as ShorthandRenderedRoute;\n  const renderedRoute = route as RenderedRoute;\n\n  // eslint-disable-next-line etc/no-deprecated\n  const { exportEntry } = shorthandRoute;\n  const flattenedExports = flattenExportsMap(definition.exports || {});\n\n  if (exportEntry) {\n    renderedRoute.entry = ensureArray(renderedRoute.entry) as unknown as ExpandedSourcePath[];\n\n    const filePath = flattenedExports[exportEntry] || definition.module || definition.main;\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    // We are converting the exportEntry to an ExpandedSourcePath so that the route\n    // can be returned as a RenderedRoute.\n    renderedRoute.entry.push(\n      expandRouteEntry({\n        importPath: exportEntry,\n        filePath,\n        appPath,\n      }),\n    );\n\n    // eslint-disable-next-line etc/no-deprecated\n    delete shorthandRoute.exportEntry;\n  }\n}\n\n/** Ensures the value is an array, or is wrapped in one. If a value is blank, will return a blank array. */\nfunction ensureArray<T>(value?: T): T extends unknown[] ? T : T[] {\n  if (Array.isArray(value)) {\n    return value as T extends unknown[] ? T : T[];\n  }\n\n  return (value !== undefined ? [value] : []) as T extends unknown[] ? T : T[];\n}\n\n/** Expands shorthand route entries into fully qualified ones. */\nfunction expandRouteEntry(options: { importPath?: string; filePath: string; appPath: string }): ExpandedSourcePath {\n  const { filePath, appPath, importPath } = options;\n  const sourcePath = intermediateToSourcePath(filePath, appPath);\n\n  if (!sourcePath) {\n    throw new Error(`Could not resolve source path for entry: ${filePath}`);\n  }\n\n  const intermediatePath = sourceToIntermediatePath(sourcePath);\n\n  return {\n    // Used to derive bundle entry path\n    sourcePath,\n    // Used to derive import map key\n    importPath: importPath || intermediatePath,\n    // Used to derive import map value\n    requestPath: intermediatePath,\n  };\n}\n"]}
+{"version":3,"file":"readConfig.js","sourceRoot":"","sources":["../src/readConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  BootstrapRoute,\n  BundleMode,\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 } 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 { readJsonSync } from '@ms-cloudpack/json-utilities';\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\n/**\n * Reads the config file asynchronously (and merges generated config into the result.)\n */\nexport async function readConfig(appPath: string, mode: BundleMode = 'library'): Promise<CloudpackConfig> {\n  const [appConfig, generatedConfig] = await Promise.all([readAppConfig(appPath), readGeneratedConfig(appPath)]);\n  const config = {\n    ...appConfig,\n    appPath,\n    mode,\n    generated: generatedConfig,\n    generatedSnapshot: structuredClone(generatedConfig),\n  } as CloudpackConfig;\n\n  // Expands all routes which refer to source files into fully transformed route objects.\n  const routes = appConfig.routes;\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 deprecated exportEntry props if present\n  let flattenedExports: Record<string, string | undefined> | undefined;\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, ...rest } = route;\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);\n    }\n\n    if (exportEntry) {\n      // Handle backwards compatibility with moving from exportEntry to entry.\n      flattenedExports ??= getFlattenedExports(appPath);\n      const filePath = flattenedExports[exportEntry];\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      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(entry: ShorthandRenderedRoute['entry'], appPath: string): ExpandedSourcePath[] {\n  entry = Array.isArray(entry) ? entry : entry !== undefined ? [entry] : [];\n  return entry.map((filePath) => expandRouteEntry({ filePath, appPath }));\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: { importPath?: string; filePath: string; appPath: string }): ExpandedSourcePath {\n  const { filePath, appPath, importPath } = options;\n  const sourcePath = intermediateToSourcePath(filePath, appPath);\n\n  if (!sourcePath) {\n    throw new Error(`Could not resolve source path for entry: ${filePath}`);\n  }\n\n  const intermediatePath = sourceToIntermediatePath(sourcePath);\n\n  return {\n    // Used to derive bundle entry path\n    sourcePath,\n    // Used to derive import map key\n    importPath: importPath || intermediatePath,\n    // Used to derive import map value\n    requestPath: intermediatePath,\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,11 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.19.2",
+    "@ms-cloudpack/common-types": "^0.19.3",
     "@ms-cloudpack/json-utilities": "^0.1.7",
-    "@ms-cloudpack/package-utilities": "^10.0.2",
-    "@ms-cloudpack/path-utilities": "^2.7.39",
+    "@ms-cloudpack/package-utilities": "^10.0.3",
+    "@ms-cloudpack/path-string-parsing": "^1.2.4",
+    "@ms-cloudpack/path-utilities": "^2.7.40",
     "import-meta-resolve": "^4.0.0",
     "semver": "^7.6.0"
   },