@ms-cloudpack/cli 0.54.14 → 0.54.16

package/lib/commands/init/optimizeDependencies.d.ts

@@ -1,5 +1,5 @@
 import { type ResolveMap } from '@ms-cloudpack/package-utilities';
-import type { BundleInfo } from '@ms-cloudpack/api-server';
+import { type BundleInfo } from '@ms-cloudpack/api-server';
 import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
 import type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';
 import type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';

package/lib/commands/init/optimizeDependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"optimizeDependencies.d.ts","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;CACzB,GACA,OAAO,CAAC;IACT,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,8GAA8G;IAC9G,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CAuJD"}
+{"version":3,"file":"optimizeDependencies.d.ts","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,EAA2B,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;CACzB,GACA,OAAO,CAAC;IACT,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,8GAA8G;IAC9G,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CAgJD"}

package/lib/commands/init/optimizeDependencies.js

@@ -1,5 +1,6 @@
 import { getPackageSettings } from '@ms-cloudpack/config';
 import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';
+import { getConsumedDependencies } from '@ms-cloudpack/api-server';
 /**
  * Optimizes the dependencies of a package to determine if there are any missing or unused.
  * If so, adds the the missing dependencies to included and the unused dependencies to excluded.
@@ -16,14 +17,7 @@ export async function optimizeDependencies(options, context) {
     if (!name || !version) {
         throw new Error(`Package "${displayName}" is missing a name or version.`);
     }
-    const consumedDependencies = new Set();
-    // Iterate through imports and find their path from the resolve map.
-    for (const entryInfo of Object.values(info.entry)) {
-        // iterate through all package names of result.info.entry.consumes
-        for (const consume of entryInfo.consumes) {
-            consumedDependencies.add(consume.packageName);
-        }
-    }
+    const consumedDependencies = getConsumedDependencies(info);
     // Iterate through imports and find their path from the resolve map.
     for (const dependencyName of consumedDependencies) {
         // Add to includedDependencies if it is not listed as a dependency or peer dependency in the package.json.

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

@@ -1 +1 @@
-{"version":3,"file":"optimizeDependencies.js","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import { getPackageSettings } from '@ms-cloudpack/config';\nimport { findResolveMapEntry, type ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { BundleInfo } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n */\nexport async function optimizeDependencies(\n  options: {\n    info: BundleInfo;\n    definition: PackageJson;\n    packagePath: string;\n    resolveMap: ResolveMap;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n    config: CloudpackConfig;\n  },\n): Promise<{\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any warnings encountered */\n  warnings: string[];\n  /** Set from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Set<string>;\n  /** Package paths for which dependencies where included or excluded, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { info, definition, packagePath, resolveMap } = options;\n  const { packages, config } = context;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const warnings: string[] = [];\n  const pathsToEvaluate = new Set<string>();\n  const pathsToRefresh = new Set<string>();\n\n  const { name, version } = definition;\n  if (!name || !version) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const consumedDependencies = new Set<string>();\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info.entry)) {\n    // iterate through all package names of result.info.entry.consumes\n    for (const consume of entryInfo.consumes) {\n      consumedDependencies.add(consume.packageName);\n    }\n  }\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const dependencyName of consumedDependencies) {\n    // Add to includedDependencies if it is not listed as a dependency or peer dependency in the package.json.\n    if (\n      definition.dependencies?.[dependencyName] ||\n      definition.peerDependencies?.[dependencyName] ||\n      dependencyName === name\n    ) {\n      // Skip if it is listed as a dependency, peer dependency or it is importing itself.\n      continue;\n    }\n\n    // If the dependency is not listed in the package.json, add an error or warning.\n    if (!definition.devDependencies?.[dependencyName]) {\n      const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n      const dependencyPath = resolveEntry?.path;\n      const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n      const message =\n        `Optimize Dependencies: Package \"${displayName}\" imports from the package \"${dependencyName}\" but it is not listed in dependencies. ` +\n        `Ensure that \"${dependencyName}\" is listed in dependencies of \"${displayName}\".`;\n      if (!dependencyPath || !dependencyDefinition) {\n        // If the dependency is not found in the resolve map, add an error.\n        // Error is already caught by evaluateImportsForOverrides.\n        continue;\n      } else {\n        // If the dependency is found in the resolve map, add a warning.\n        warnings.push(message);\n      }\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    pathsToEvaluate.add(packagePath);\n\n    // Add to includedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.includedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.includedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'included-dependency',\n          change: dependencyName,\n          reason: `Imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n\n  const dependencies = new Set([\n    ...Object.keys(definition.dependencies ?? {}),\n    ...Object.keys(definition.peerDependencies ?? {}),\n  ]);\n\n  // Iterate through dependencies and find unused.\n  for (const dependencyName of dependencies) {\n    if (consumedDependencies.has(dependencyName)) {\n      continue;\n    }\n\n    pathsToEvaluate.add(packagePath);\n\n    // Add to excludedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.excludedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.excludedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'excluded-dependency',\n          change: dependencyName,\n          reason: `Not imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n  return { warnings, changes, pathsToEvaluate, pathsToRefresh };\n}\n"]}
+{"version":3,"file":"optimizeDependencies.js","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import { getPackageSettings } from '@ms-cloudpack/config';\nimport { findResolveMapEntry, type ResolveMap } from '@ms-cloudpack/package-utilities';\nimport { getConsumedDependencies, type BundleInfo } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n */\nexport async function optimizeDependencies(\n  options: {\n    info: BundleInfo;\n    definition: PackageJson;\n    packagePath: string;\n    resolveMap: ResolveMap;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n    config: CloudpackConfig;\n  },\n): Promise<{\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any warnings encountered */\n  warnings: string[];\n  /** Set from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Set<string>;\n  /** Package paths for which dependencies where included or excluded, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { info, definition, packagePath, resolveMap } = options;\n  const { packages, config } = context;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const warnings: string[] = [];\n  const pathsToEvaluate = new Set<string>();\n  const pathsToRefresh = new Set<string>();\n\n  const { name, version } = definition;\n  if (!name || !version) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const consumedDependencies = getConsumedDependencies(info);\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const dependencyName of consumedDependencies) {\n    // Add to includedDependencies if it is not listed as a dependency or peer dependency in the package.json.\n    if (\n      definition.dependencies?.[dependencyName] ||\n      definition.peerDependencies?.[dependencyName] ||\n      dependencyName === name\n    ) {\n      // Skip if it is listed as a dependency, peer dependency or it is importing itself.\n      continue;\n    }\n\n    // If the dependency is not listed in the package.json, add an error or warning.\n    if (!definition.devDependencies?.[dependencyName]) {\n      const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n      const dependencyPath = resolveEntry?.path;\n      const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n      const message =\n        `Optimize Dependencies: Package \"${displayName}\" imports from the package \"${dependencyName}\" but it is not listed in dependencies. ` +\n        `Ensure that \"${dependencyName}\" is listed in dependencies of \"${displayName}\".`;\n      if (!dependencyPath || !dependencyDefinition) {\n        // If the dependency is not found in the resolve map, add an error.\n        // Error is already caught by evaluateImportsForOverrides.\n        continue;\n      } else {\n        // If the dependency is found in the resolve map, add a warning.\n        warnings.push(message);\n      }\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    pathsToEvaluate.add(packagePath);\n\n    // Add to includedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.includedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.includedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'included-dependency',\n          change: dependencyName,\n          reason: `Imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n\n  const dependencies = new Set([\n    ...Object.keys(definition.dependencies ?? {}),\n    ...Object.keys(definition.peerDependencies ?? {}),\n  ]);\n\n  // Iterate through dependencies and find unused.\n  for (const dependencyName of dependencies) {\n    if (consumedDependencies.has(dependencyName)) {\n      continue;\n    }\n\n    pathsToEvaluate.add(packagePath);\n\n    // Add to excludedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.excludedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.excludedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'excluded-dependency',\n          change: dependencyName,\n          reason: `Not imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n  return { warnings, changes, pathsToEvaluate, pathsToRefresh };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.54.14",
+  "version": "0.54.16",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -10,16 +10,16 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.29.8",
-    "@ms-cloudpack/bundle-server": "^0.2.1",
+    "@ms-cloudpack/api-server": "^0.29.10",
+    "@ms-cloudpack/bundle-server": "^0.2.3",
     "@ms-cloudpack/config": "^0.17.14",
     "@ms-cloudpack/config-types": "^0.4.0",
     "@ms-cloudpack/json-utilities": "^0.1.3",
     "@ms-cloudpack/package-utilities": "^5.7.8",
     "@ms-cloudpack/path-string-parsing": "^1.1.3",
-    "@ms-cloudpack/remote-cache": "^0.4.1",
-    "@ms-cloudpack/app-server": "^0.1.1",
-    "@ms-cloudpack/task-reporter": "^0.10.2",
+    "@ms-cloudpack/remote-cache": "^0.4.3",
+    "@ms-cloudpack/app-server": "^0.1.3",
+    "@ms-cloudpack/task-reporter": "^0.11.0",
     "@ms-cloudpack/telemetry": "^0.4.5",
     "@yarnpkg/lockfile": "^1.1.0",
     "commander": "^11.1.0",