@ms-cloudpack/cli 0.62.10 → 0.62.12

package/lib/commands/init/init.js

@@ -130,7 +130,6 @@ async function initApp(params) {
     }
     const summary = summaryData.summarize(options);
     if (!options.check && summary.totalChanges && config.generated.packageSettings?.length) {
-        sortExportKeys(config.generated);
         await writeGeneratedConfig(config.generated, appPath);
     }
     if (options.logResolveMap) {
@@ -139,15 +138,4 @@ async function initApp(params) {
     }
     return summary;
 }
-function sortExportKeys({ packageSettings = [] }) {
-    for (const settings of packageSettings) {
-        if (!settings.exports) {
-            continue;
-        }
-        const unsortedExports = settings.exports;
-        settings.exports = Object.fromEntries(Object.keys(unsortedExports)
-            .sort()
-            .map((k) => [k, unsortedExports[k]]));
-    }
-}
 //# sourceMappingURL=init.js.map

package/lib/commands/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Context, TaskRunner } from '@ms-cloudpack/api-server';\nimport type { GeneratedConfig, PackageJsonExportsObject, PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { AutoDispose } from '../../types/AutoDispose.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\nimport { verifyExports } from './verifyExports.js';\nimport type { AppCommandContext } from '../../types/CommandAction.js';\nimport path from 'path';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\n\n/**\n * Init execution function.\n */\nexport async function init(parameters: {\n  options: InitOptions;\n  contexts: AppCommandContext[];\n  autoDispose: AutoDispose;\n  reporter: TaskReporter;\n  /**\n   * App summary objects, created ahead of time so that a partial summary can be generated\n   * if the process is interrupted.\n   */\n  appSummaries: Record<string, InitSummaryData>;\n}): Promise<InitSummary[]> {\n  const { options, contexts, reporter, autoDispose, appSummaries } = parameters;\n\n  const summaries: InitSummary[] = [];\n\n  const taskRunner = new TaskRunner();\n\n  for (const appContext of contexts) {\n    const summary = await initApp({\n      appContext,\n      options,\n      reporter,\n      autoDispose,\n      summaryData: appSummaries[appContext.appPath],\n      taskRunner,\n      isMultiApp: contexts.length > 1,\n    });\n    summaries.push(summary);\n  }\n\n  return summaries;\n}\n\nasync function initApp(params: {\n  appContext: AppCommandContext;\n  options: InitOptions;\n  reporter: TaskReporter;\n  autoDispose: AutoDispose;\n  summaryData: InitSummaryData;\n  taskRunner: TaskRunner;\n  isMultiApp: boolean;\n}): Promise<InitSummary> {\n  const { appContext, options, reporter, autoDispose, summaryData, taskRunner, isMultiApp } = params;\n  const { appPath, config, telemetryClient } = appContext;\n\n  // Run prerequisites for the app.\n  runPrerequisites({ config, cwd: appPath, telemetryClient });\n\n  // If --reset is specified, reset the generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const apiContext: Context = await createPartialApiContext({\n    appPath,\n    config,\n    reporter,\n    telemetryClient,\n    items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n    taskRunner,\n  });\n  autoDispose(apiContext);\n  const resolveMap = apiContext.session.resolveMap;\n\n  // Ensure config.generated.packageSettings is initialized.\n  config.generated.packageSettings ??= [];\n\n  await new Promise<void>((resolve, reject) => {\n    let pending = 0;\n    let isExitingPrematurely = false;\n    const visitedSet = new Set<string>();\n    const refreshPaths = new Set<string>();\n    const priorityMap = new Map<string, number>();\n\n    // Start with the app path or requested matches\n    const initialPaths = options.match ? getFilteredPackages(resolveMap, options.match) : [appPath];\n    if (!initialPaths.length) {\n      reject(); // getFilteredPackages will log an error\n    }\n\n    enqueuePaths(new Map(initialPaths.map((packagePath) => [packagePath, undefined])));\n\n    /**\n     * Enqueue more paths.\n     * @param newPaths Mapping from package path to importer context.\n     */\n    function enqueuePaths(newPaths: Map<string, PackageImporterContext | undefined>) {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const [packagePath, importerContext] of newPaths) {\n        if (visitedSet.has(packagePath)) {\n          continue;\n        }\n\n        visitedSet.add(packagePath);\n        pending++;\n\n        const shouldForce = refreshPaths.delete(packagePath);\n\n        // Get the priority value for this package path, defaults to 0.\n        const priority = priorityMap.get(packagePath) ?? 0;\n        // Lower priority of this package path by 1.\n        priorityMap.set(packagePath, priority - 1);\n\n        // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n        evaluatePath({\n          packagePath,\n          importerContext,\n          config,\n          telemetryClient,\n          resolveMap,\n          initOptions: options,\n          summaryData,\n          ctx: apiContext,\n          // No need to force if we're in a multi-app scenario\n          // as we'll re-evaluate packages if they are different since we use a different task id.\n          shouldForce: !isMultiApp && shouldForce,\n          isMultiApp,\n          priority,\n        })\n          .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n            pending--;\n\n            if (shouldExit) {\n              isExitingPrematurely = true;\n            } else if (pathsToEvaluate?.size) {\n              // If there are packages that need to be rebuilt, delete them from the visited set to re-enqueue them\n              // and add them to the refresh set so that on re-enqueuing we pass the `shouldRerun` flag through\n              // on single app runs.\n              pathsToRefresh?.forEach((refreshPath) => {\n                refreshPaths.add(refreshPath);\n                visitedSet.delete(refreshPath);\n              });\n\n              // Try to enqueue the new paths.\n              enqueuePaths(pathsToEvaluate);\n            }\n\n            // If nothing is pending after this call, we're complete.\n            if (!pending) {\n              resolve();\n            }\n          })\n          .catch((error) => {\n            reject(error);\n          });\n      }\n    }\n  });\n\n  if (config.features?.verifyExports) {\n    const packageResults = await verifyExports(summaryData.getResults(), apiContext);\n    packageResults.forEach((packageResult) => summaryData.recordResult({ packageResult, append: true }));\n  }\n\n  const summary = summaryData.summarize(options);\n\n  if (!options.check && summary.totalChanges && config.generated.packageSettings?.length) {\n    sortExportKeys(config.generated);\n\n    await writeGeneratedConfig(config.generated, appPath);\n  }\n\n  if (options.logResolveMap) {\n    console.log('\\nWriting resolve map to `resolve-map.json`.');\n    await writeJson(path.join(appPath, 'resolve-map.json'), resolveMap);\n  }\n\n  return summary;\n}\n\nfunction sortExportKeys({ packageSettings = [] }: GeneratedConfig) {\n  for (const settings of packageSettings) {\n    if (!settings.exports) {\n      continue;\n    }\n\n    const unsortedExports = settings.exports as PackageJsonExportsObject;\n\n    settings.exports = Object.fromEntries(\n      Object.keys(unsortedExports)\n        .sort()\n        .map((k) => [k, unsortedExports[k]]),\n    );\n  }\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Context, TaskRunner } from '@ms-cloudpack/api-server';\nimport type { PackageImporterContext } from '@ms-cloudpack/common-types';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { AutoDispose } from '../../types/AutoDispose.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\nimport { verifyExports } from './verifyExports.js';\nimport type { AppCommandContext } from '../../types/CommandAction.js';\nimport path from 'path';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { runPrerequisites } from '../../utilities/runPrerequisites.js';\nimport { getFilteredPackages } from '../../utilities/getFilteredPackages.js';\n\n/**\n * Init execution function.\n */\nexport async function init(parameters: {\n  options: InitOptions;\n  contexts: AppCommandContext[];\n  autoDispose: AutoDispose;\n  reporter: TaskReporter;\n  /**\n   * App summary objects, created ahead of time so that a partial summary can be generated\n   * if the process is interrupted.\n   */\n  appSummaries: Record<string, InitSummaryData>;\n}): Promise<InitSummary[]> {\n  const { options, contexts, reporter, autoDispose, appSummaries } = parameters;\n\n  const summaries: InitSummary[] = [];\n\n  const taskRunner = new TaskRunner();\n\n  for (const appContext of contexts) {\n    const summary = await initApp({\n      appContext,\n      options,\n      reporter,\n      autoDispose,\n      summaryData: appSummaries[appContext.appPath],\n      taskRunner,\n      isMultiApp: contexts.length > 1,\n    });\n    summaries.push(summary);\n  }\n\n  return summaries;\n}\n\nasync function initApp(params: {\n  appContext: AppCommandContext;\n  options: InitOptions;\n  reporter: TaskReporter;\n  autoDispose: AutoDispose;\n  summaryData: InitSummaryData;\n  taskRunner: TaskRunner;\n  isMultiApp: boolean;\n}): Promise<InitSummary> {\n  const { appContext, options, reporter, autoDispose, summaryData, taskRunner, isMultiApp } = params;\n  const { appPath, config, telemetryClient } = appContext;\n\n  // Run prerequisites for the app.\n  runPrerequisites({ config, cwd: appPath, telemetryClient });\n\n  // If --reset is specified, reset the generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const apiContext: Context = await createPartialApiContext({\n    appPath,\n    config,\n    reporter,\n    telemetryClient,\n    items: ['bus', 'taskRunner', 'watcher', 'packages', 'session', 'packageImportPaths', 'packageHashes'],\n    taskRunner,\n  });\n  autoDispose(apiContext);\n  const resolveMap = apiContext.session.resolveMap;\n\n  // Ensure config.generated.packageSettings is initialized.\n  config.generated.packageSettings ??= [];\n\n  await new Promise<void>((resolve, reject) => {\n    let pending = 0;\n    let isExitingPrematurely = false;\n    const visitedSet = new Set<string>();\n    const refreshPaths = new Set<string>();\n    const priorityMap = new Map<string, number>();\n\n    // Start with the app path or requested matches\n    const initialPaths = options.match ? getFilteredPackages(resolveMap, options.match) : [appPath];\n    if (!initialPaths.length) {\n      reject(); // getFilteredPackages will log an error\n    }\n\n    enqueuePaths(new Map(initialPaths.map((packagePath) => [packagePath, undefined])));\n\n    /**\n     * Enqueue more paths.\n     * @param newPaths Mapping from package path to importer context.\n     */\n    function enqueuePaths(newPaths: Map<string, PackageImporterContext | undefined>) {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const [packagePath, importerContext] of newPaths) {\n        if (visitedSet.has(packagePath)) {\n          continue;\n        }\n\n        visitedSet.add(packagePath);\n        pending++;\n\n        const shouldForce = refreshPaths.delete(packagePath);\n\n        // Get the priority value for this package path, defaults to 0.\n        const priority = priorityMap.get(packagePath) ?? 0;\n        // Lower priority of this package path by 1.\n        priorityMap.set(packagePath, priority - 1);\n\n        // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n        evaluatePath({\n          packagePath,\n          importerContext,\n          config,\n          telemetryClient,\n          resolveMap,\n          initOptions: options,\n          summaryData,\n          ctx: apiContext,\n          // No need to force if we're in a multi-app scenario\n          // as we'll re-evaluate packages if they are different since we use a different task id.\n          shouldForce: !isMultiApp && shouldForce,\n          isMultiApp,\n          priority,\n        })\n          .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n            pending--;\n\n            if (shouldExit) {\n              isExitingPrematurely = true;\n            } else if (pathsToEvaluate?.size) {\n              // If there are packages that need to be rebuilt, delete them from the visited set to re-enqueue them\n              // and add them to the refresh set so that on re-enqueuing we pass the `shouldRerun` flag through\n              // on single app runs.\n              pathsToRefresh?.forEach((refreshPath) => {\n                refreshPaths.add(refreshPath);\n                visitedSet.delete(refreshPath);\n              });\n\n              // Try to enqueue the new paths.\n              enqueuePaths(pathsToEvaluate);\n            }\n\n            // If nothing is pending after this call, we're complete.\n            if (!pending) {\n              resolve();\n            }\n          })\n          .catch((error) => {\n            reject(error);\n          });\n      }\n    }\n  });\n\n  if (config.features?.verifyExports) {\n    const packageResults = await verifyExports(summaryData.getResults(), apiContext);\n    packageResults.forEach((packageResult) => summaryData.recordResult({ packageResult, append: true }));\n  }\n\n  const summary = summaryData.summarize(options);\n\n  if (!options.check && summary.totalChanges && config.generated.packageSettings?.length) {\n    await writeGeneratedConfig(config.generated, appPath);\n  }\n\n  if (options.logResolveMap) {\n    console.log('\\nWriting resolve map to `resolve-map.json`.');\n    await writeJson(path.join(appPath, 'resolve-map.json'), resolveMap);\n  }\n\n  return summary;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.62.10",
+  "version": "0.62.12",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -10,19 +10,19 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.44.8",
-    "@ms-cloudpack/app-server": "^0.8.1",
-    "@ms-cloudpack/common-types": "^0.6.0",
-    "@ms-cloudpack/config": "^0.20.11",
+    "@ms-cloudpack/api-server": "^0.44.10",
+    "@ms-cloudpack/app-server": "^0.8.3",
+    "@ms-cloudpack/common-types": "^0.6.1",
+    "@ms-cloudpack/config": "^0.20.12",
     "@ms-cloudpack/feature-flags": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/overlay": "^0.17.8",
-    "@ms-cloudpack/package-utilities": "^7.4.9",
+    "@ms-cloudpack/overlay": "^0.17.10",
+    "@ms-cloudpack/package-utilities": "^7.4.10",
     "@ms-cloudpack/path-string-parsing": "^1.2.2",
-    "@ms-cloudpack/path-utilities": "^2.7.12",
-    "@ms-cloudpack/remote-cache": "^0.7.6",
+    "@ms-cloudpack/path-utilities": "^2.7.13",
+    "@ms-cloudpack/remote-cache": "^0.7.8",
     "@ms-cloudpack/task-reporter": "^0.14.1",
-    "@ms-cloudpack/telemetry": "^0.5.2",
+    "@ms-cloudpack/telemetry": "^0.5.3",
     "@yarnpkg/lockfile": "^1.1.0",
     "commander": "^11.1.0",
     "cross-spawn": "^7.0.3",
@@ -34,7 +34,7 @@
     "workspace-tools": "^0.36.4"
   },
   "devDependencies": {
-    "@ms-cloudpack/common-types": "^0.6.0",
+    "@ms-cloudpack/common-types": "^0.6.1",
     "@ms-cloudpack/eslint-plugin-internal": "^0.0.1",
     "@ms-cloudpack/scripts": "^0.0.1",
     "@ms-cloudpack/test-utilities": "^0.5.0",