nx 22.0.0-canary.20251014-82acc84 → 22.0.0-canary.20251016-849f356

package/src/devkit-internals.d.ts

@@ -27,4 +27,5 @@ export { registerTsProject } from './plugins/js/utils/register';
 export { interpolate } from './tasks-runner/utils';
 export { isCI } from './utils/is-ci';
 export { isUsingPrettierInTree } from './utils/is-using-prettier';
+export { readYamlFile } from './utils/fileutils';
 //# sourceMappingURL=devkit-internals.d.ts.map

package/src/devkit-internals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -59,3 +59,5 @@ var is_ci_1 = require("./utils/is-ci");
 Object.defineProperty(exports, "isCI", { enumerable: true, get: function () { return is_ci_1.isCI; } });
 var is_using_prettier_1 = require("./utils/is-using-prettier");
 Object.defineProperty(exports, "isUsingPrettierInTree", { enumerable: true, get: function () { return is_using_prettier_1.isUsingPrettierInTree; } });
+var fileutils_1 = require("./utils/fileutils");
+Object.defineProperty(exports, "readYamlFile", { enumerable: true, get: function () { return fileutils_1.readYamlFile; } });

package/src/plugins/js/lock-file/lock-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lock-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/lock-file.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EACL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,cAAc,EACf,MAAM,gCAAgC,CAAC;AA8BxC,eAAO,MAAM,SAAS,UAMrB,CAAC;AAQF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAqC1C;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,yBAAyB,GACjC,yBAAyB,EAAE,CA8B7B;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBtE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAiBtE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAgCtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,YAAY,EACnB,cAAc,GAAE,cAAoD,GACnE,MAAM,CA8CR"}
+{"version":3,"file":"lock-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/lock-file.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EACL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,cAAc,EACf,MAAM,gCAAgC,CAAC;AA8BxC,eAAO,MAAM,SAAS,UAMrB,CAAC;AAQF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAqC1C;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,yBAAyB,GACjC,yBAAyB,EAAE,CA8B7B;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBtE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAiBtE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAgCtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,YAAY,EACnB,cAAc,GAAE,cAAoD,GACnE,MAAM,CAmDR"}

package/src/plugins/js/lock-file/lock-file.js

@@ -204,7 +204,7 @@ function createLockFile(packageJson, graph, packageManager = (0, package_manager
         }
         if (packageManager === 'pnpm') {
             const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);
-            return (0, pnpm_parser_1.stringifyPnpmLockfile)(prunedGraph, content, normalizedPackageJson);
+            return (0, pnpm_parser_1.stringifyPnpmLockfile)(prunedGraph, content, normalizedPackageJson, workspace_root_1.workspaceRoot);
         }
         if (packageManager === 'npm') {
             const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);

package/src/plugins/js/lock-file/pnpm-parser.d.ts

@@ -4,5 +4,5 @@ import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-
 import { CreateDependenciesContext } from '../../../project-graph/plugins';
 export declare function getPnpmLockfileNodes(lockFileContent: string, lockFileHash: string): Record<string, ProjectGraphExternalNode>;
 export declare function getPnpmLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
-export declare function stringifyPnpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson): string;
+export declare function stringifyPnpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson, workspaceRoot: string): string;
 //# sourceMappingURL=pnpm-parser.d.ts.map

package/src/plugins/js/lock-file/pnpm-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA0B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,CA8BR"}
+{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA2B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAqCR"}

package/src/plugins/js/lock-file/pnpm-parser.js

@@ -9,6 +9,7 @@ const object_sort_1 = require("../../../utils/object-sort");
 const project_graph_builder_1 = require("../../../project-graph/project-graph-builder");
 const project_graph_1 = require("../../../config/project-graph");
 const file_hasher_1 = require("../../../hasher/file-hasher");
+const catalog_1 = require("../../../utils/catalog");
 const project_graph_pruning_1 = require("./project-graph-pruning");
 const path_1 = require("path");
 const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
@@ -278,10 +279,10 @@ function getDependencies(data, keyMap, isV5, ctx) {
 function parseBaseVersion(rawVersion, isV5) {
     return isV5 ? rawVersion.split('_')[0] : rawVersion.split('(')[0];
 }
-function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson) {
+function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson, workspaceRoot) {
     const data = (0, pnpm_normalizer_1.parseAndNormalizePnpmLockfile)(rootLockFileContent);
     const { lockfileVersion, packages, importers } = data;
-    const { snapshot: rootSnapshot, importers: requiredImporters } = mapRootSnapshot(packageJson, importers, packages, graph, +lockfileVersion);
+    const { snapshot: rootSnapshot, importers: requiredImporters } = mapRootSnapshot(packageJson, importers, packages, graph, +lockfileVersion, workspaceRoot);
     const snapshots = mapSnapshots(data.packages, graph.externalNodes, +lockfileVersion);
     const workspaceDependencyImporters = {};
     for (const [packageName, importerPath] of Object.entries(requiredImporters)) {
@@ -407,7 +408,7 @@ function versionIsAlias(key, versionExpr, lockfileVersion) {
         ? key.startsWith(`${packageName}/${version}`)
         : key.startsWith(`${packageName}@${version}`);
 }
-function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVersion) {
+function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVersion, workspaceRoot) {
     const workspaceModules = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(graph);
     const snapshot = { specifiers: {} };
     const importers = {};
@@ -419,7 +420,14 @@ function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVe
     ].forEach((depType) => {
         if (packageJson[depType]) {
             Object.keys(packageJson[depType]).forEach((packageName) => {
-                const version = packageJson[depType][packageName];
+                let version = packageJson[depType][packageName];
+                const manager = (0, catalog_1.getCatalogManager)(workspaceRoot);
+                if (manager?.isCatalogReference(version)) {
+                    version = manager.resolveCatalogReference(packageName, version, workspaceRoot);
+                    if (!version) {
+                        throw new Error(`Could not resolve catalog reference for package ${packageName}@${version}.`);
+                    }
+                }
                 if (workspaceModules.has(packageName)) {
                     for (const [importerPath, importerSnapshot] of Object.entries(rootImporters)) {
                         const workspaceDep = importerSnapshot.dependencies &&

package/src/plugins/js/lock-file/project-graph-pruning.d.ts

@@ -1,11 +1,11 @@
 import { ProjectGraph, ProjectGraphExternalNode, ProjectGraphProjectNode } from '../../../config/project-graph';
-import { PackageJson } from '../../../utils/package-json';
 import { ProjectGraphBuilder } from '../../../project-graph/project-graph-builder';
+import { PackageJson } from '../../../utils/package-json';
 /**
  * Prune project graph's external nodes and their dependencies
  * based on the pruned package.json
  */
-export declare function pruneProjectGraph(graph: ProjectGraph, prunedPackageJson: PackageJson): ProjectGraph;
+export declare function pruneProjectGraph(graph: ProjectGraph, prunedPackageJson: PackageJson, workspaceRootPath?: string): ProjectGraph;
 export declare function findNodeMatchingVersion(graph: ProjectGraph, packageName: string, versionExpr: string): ProjectGraphExternalNode;
 export declare function addNodesAndDependencies(graph: ProjectGraph, packageJsonDeps: Record<string, string>, workspacePackages: Map<string, ProjectGraphProjectNode>, builder: ProjectGraphBuilder): void;
 export declare function rehoistNodes(graph: ProjectGraph, packageJsonDeps: Record<string, string>, builder: ProjectGraphBuilder): void;

package/src/plugins/js/lock-file/project-graph-pruning.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-graph-pruning.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAInF;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,YAAY,EACnB,iBAAiB,EAAE,WAAW,GAC7B,YAAY,CA0Bd;AAmDD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,4BAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACvD,OAAO,EAAE,mBAAmB,QAgB7B;AA+BD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,mBAAmB,QAiD7B"}
+{"version":3,"file":"project-graph-pruning.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAI1D;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,YAAY,EACnB,iBAAiB,EAAE,WAAW,EAC9B,iBAAiB,GAAE,MAAsB,GACxC,YAAY,CA2Bd;AA0ED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,4BAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACvD,OAAO,EAAE,mBAAmB,QAgB7B;AA+BD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,mBAAmB,QAiD7B"}

package/src/plugins/js/lock-file/project-graph-pruning.js

@@ -5,17 +5,19 @@ exports.findNodeMatchingVersion = findNodeMatchingVersion;
 exports.addNodesAndDependencies = addNodesAndDependencies;
 exports.rehoistNodes = rehoistNodes;
 const semver_1 = require("semver");
-const project_graph_builder_1 = require("../../../project-graph/project-graph-builder");
 const operators_1 = require("../../../project-graph/operators");
+const project_graph_builder_1 = require("../../../project-graph/project-graph-builder");
+const catalog_1 = require("../../../utils/catalog");
+const workspace_root_1 = require("../../../utils/workspace-root");
 const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
 /**
  * Prune project graph's external nodes and their dependencies
  * based on the pruned package.json
  */
-function pruneProjectGraph(graph, prunedPackageJson) {
+function pruneProjectGraph(graph, prunedPackageJson, workspaceRootPath = workspace_root_1.workspaceRoot) {
     const builder = new project_graph_builder_1.ProjectGraphBuilder();
     const workspacePackages = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(graph);
-    const combinedDependencies = normalizeDependencies(prunedPackageJson, graph, workspacePackages);
+    const combinedDependencies = normalizeDependencies(prunedPackageJson, graph, workspacePackages, workspaceRootPath);
     addNodesAndDependencies(graph, combinedDependencies, workspacePackages, builder);
     for (const project of workspacePackages.values()) {
         const node = graph.nodes[project.name];
@@ -28,7 +30,7 @@ function pruneProjectGraph(graph, prunedPackageJson) {
 }
 // ensure that dependency ranges from package.json (e.g. ^1.0.0)
 // are replaced with the actual version based on the available nodes (e.g. 1.0.1)
-function normalizeDependencies(packageJson, graph, workspacePackages) {
+function normalizeDependencies(packageJson, graph, workspacePackages, workspaceRootPath) {
     const { dependencies, devDependencies, optionalDependencies, peerDependencies, } = packageJson;
     const combinedDependencies = {
         ...dependencies,
@@ -37,24 +39,35 @@ function normalizeDependencies(packageJson, graph, workspacePackages) {
         ...peerDependencies,
     };
     Object.entries(combinedDependencies).forEach(([packageName, versionRange]) => {
-        if (graph.externalNodes[`npm:${packageName}@${versionRange}`]) {
+        let resolvedVersionRange = versionRange;
+        const manager = (0, catalog_1.getCatalogManager)(workspaceRootPath);
+        if (manager?.isCatalogReference(versionRange)) {
+            const resolvedVersionRange = manager.resolveCatalogReference(packageName, versionRange, workspaceRootPath);
+            if (!resolvedVersionRange) {
+                throw new Error(`Could not resolve catalog reference for ${packageName}@${versionRange}.`);
+            }
+        }
+        if (graph.externalNodes[`npm:${packageName}@${resolvedVersionRange}`]) {
+            combinedDependencies[packageName] = resolvedVersionRange;
             return;
         }
         if (graph.externalNodes[`npm:${packageName}`] &&
-            graph.externalNodes[`npm:${packageName}`].data.version === versionRange) {
+            graph.externalNodes[`npm:${packageName}`].data.version ===
+                resolvedVersionRange) {
+            combinedDependencies[packageName] = resolvedVersionRange;
             return;
         }
         // otherwise we need to find the correct version
-        const node = findNodeMatchingVersion(graph, packageName, versionRange);
+        const node = findNodeMatchingVersion(graph, packageName, resolvedVersionRange);
         if (node) {
             combinedDependencies[packageName] = node.data.version;
         }
         else if (workspacePackages.has(packageName)) {
             // workspace module, leave as is
-            combinedDependencies[packageName] = versionRange;
+            combinedDependencies[packageName] = resolvedVersionRange;
         }
         else {
-            throw new Error(`Pruned lock file creation failed. The following package was not found in the root lock file: ${packageName}@${versionRange}`);
+            throw new Error(`Pruned lock file creation failed. The following package was not found in the root lock file: ${packageName}@${resolvedVersionRange}`);
         }
     });
     return combinedDependencies;

package/src/plugins/js/package-json/create-package-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-package-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/package-json/create-package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAY1D,UAAU,OAAO;IACf,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CACtE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,YAAY,EACnB,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,CAAC;CACpB,EACN,OAAO,GAAE,cAAqB,GAC7B,WAAW,CA0Lb;AAED,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,uBAAuB,EACpC,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,WAAW,EAC5B,OAAO,EAAE;IACP,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,EACD,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CA8CT"}
+{"version":3,"file":"create-package-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/package-json/create-package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,WAAW,EACZ,MAAM,6BAA6B,CAAC;AAYrC,UAAU,OAAO;IACf,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CACtE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,YAAY,EACnB,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,CAAC;CACpB,EACN,OAAO,GAAE,cAAqB,GAC7B,WAAW,CA6Mb;AAED,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,uBAAuB,EACpC,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,WAAW,EAC5B,OAAO,EAAE;IACP,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,EACD,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CA8CT"}

package/src/plugins/js/package-json/create-package-json.js

@@ -5,6 +5,7 @@ exports.findProjectsNpmDependencies = findProjectsNpmDependencies;
 const fileutils_1 = require("../../../utils/fileutils");
 const object_sort_1 = require("../../../utils/object-sort");
 const project_graph_1 = require("../../../config/project-graph");
+const package_json_1 = require("../../../utils/package-json");
 const fs_1 = require("fs");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const configuration_1 = require("../../../config/configuration");
@@ -21,7 +22,8 @@ const output_1 = require("../../../utils/output");
 function createPackageJson(projectName, graph, options = {}, fileMap = null) {
     const projectNode = graph.nodes[projectName];
     const isLibrary = projectNode.type === 'lib';
-    const rootPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(options.root ?? workspace_root_1.workspaceRoot, 'package.json'));
+    const root = options.root ?? workspace_root_1.workspaceRoot;
+    const rootPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
     const npmDeps = findProjectsNpmDependencies(projectNode, graph, options.target, rootPackageJson, {
         helperDependencies: options.helperDependencies,
         isProduction: options.isProduction,
@@ -31,7 +33,7 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
         name: projectName,
         version: '0.0.1',
     };
-    const projectPackageJsonPath = (0, path_1.join)(options.root ?? workspace_root_1.workspaceRoot, projectNode.data.root, 'package.json');
+    const projectPackageJsonPath = (0, path_1.join)(root, projectNode.data.root, 'package.json');
     if ((0, fs_1.existsSync)(projectPackageJsonPath)) {
         try {
             packageJson = (0, fileutils_1.readJsonFile)(projectPackageJsonPath);
@@ -55,9 +57,19 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
         catch (e) { }
     }
     const getVersion = (packageName, version, section) => {
-        return (packageJson[section][packageName] ||
-            (isLibrary && rootPackageJson[section]?.[packageName]) ||
-            version);
+        // Try project package.json first (single section)
+        const projectVersion = (0, package_json_1.getDependencyVersionFromPackageJson)(packageName, root, packageJson, [section]);
+        if (projectVersion) {
+            return projectVersion;
+        }
+        // For libraries, fall back to root package.json (single section)
+        if (isLibrary) {
+            const rootVersion = (0, package_json_1.getDependencyVersionFromPackageJson)(packageName, root, rootPackageJson, [section]);
+            if (rootVersion) {
+                return rootVersion;
+            }
+        }
+        return version;
     };
     Object.entries(npmDeps.dependencies).forEach(([packageName, version]) => {
         if (rootPackageJson.devDependencies?.[packageName] &&

package/src/utils/catalog/index.d.ts

@@ -0,0 +1,10 @@
+import type { Tree } from '../../generators/tree';
+import type { CatalogManager } from './manager';
+import { getCatalogManager } from './manager-factory';
+export { getCatalogManager };
+/**
+ * Detects which packages in a package.json use catalog references
+ * Returns Map of package name -> catalog name (undefined for default catalog)
+ */
+export declare function getCatalogDependenciesFromPackageJson(tree: Tree, packageJsonPath: string, manager: CatalogManager): Map<string, string | undefined>;
+//# sourceMappingURL=index.d.ts.map

package/src/utils/catalog/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAE7B;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,cAAc,GACtB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CA+BjC"}

package/src/utils/catalog/index.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCatalogManager = void 0;
+exports.getCatalogDependenciesFromPackageJson = getCatalogDependenciesFromPackageJson;
+const json_1 = require("../../generators/utils/json");
+const manager_factory_1 = require("./manager-factory");
+Object.defineProperty(exports, "getCatalogManager", { enumerable: true, get: function () { return manager_factory_1.getCatalogManager; } });
+/**
+ * Detects which packages in a package.json use catalog references
+ * Returns Map of package name -> catalog name (undefined for default catalog)
+ */
+function getCatalogDependenciesFromPackageJson(tree, packageJsonPath, manager) {
+    const catalogDeps = new Map();
+    if (!tree.exists(packageJsonPath)) {
+        return catalogDeps;
+    }
+    try {
+        const packageJson = (0, json_1.readJson)(tree, packageJsonPath);
+        const allDependencies = {
+            ...packageJson.dependencies,
+            ...packageJson.devDependencies,
+            ...packageJson.peerDependencies,
+            ...packageJson.optionalDependencies,
+        };
+        for (const [packageName, version] of Object.entries(allDependencies || {})) {
+            if (manager.isCatalogReference(version)) {
+                const catalogRef = manager.parseCatalogReference(version);
+                if (catalogRef) {
+                    catalogDeps.set(packageName, catalogRef.catalogName);
+                }
+            }
+        }
+    }
+    catch (error) {
+        // If we can't read the package.json, return empty map
+    }
+    return catalogDeps;
+}

package/src/utils/catalog/manager-factory.d.ts

@@ -0,0 +1,6 @@
+import type { CatalogManager } from './manager';
+/**
+ * Factory function to get the appropriate catalog manager based on the package manager
+ */
+export declare function getCatalogManager(workspaceRoot: string): CatalogManager | null;
+//# sourceMappingURL=manager-factory.d.ts.map

package/src/utils/catalog/manager-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"manager-factory.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/manager-factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAGhD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,MAAM,GACpB,cAAc,GAAG,IAAI,CASvB"}

package/src/utils/catalog/manager-factory.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCatalogManager = getCatalogManager;
+const package_manager_1 = require("../package-manager");
+const pnpm_manager_1 = require("./pnpm-manager");
+/**
+ * Factory function to get the appropriate catalog manager based on the package manager
+ */
+function getCatalogManager(workspaceRoot) {
+    const packageManager = (0, package_manager_1.detectPackageManager)(workspaceRoot);
+    switch (packageManager) {
+        case 'pnpm':
+            return new pnpm_manager_1.PnpmCatalogManager();
+        default:
+            return null;
+    }
+}

package/src/utils/catalog/manager.d.ts

@@ -0,0 +1,40 @@
+import type { Tree } from '../../generators/tree';
+import type { PnpmWorkspaceYaml } from '../pnpm-workspace';
+import type { CatalogReference } from './types';
+/**
+ * Interface for catalog managers that handle package manager-specific catalog implementations.
+ */
+export interface CatalogManager {
+    readonly name: string;
+    isCatalogReference(version: string): boolean;
+    parseCatalogReference(version: string): CatalogReference | null;
+    /**
+     * Get catalog definitions from the workspace.
+     */
+    getCatalogDefinitions(workspaceRoot: string): PnpmWorkspaceYaml | null;
+    getCatalogDefinitions(tree: Tree): PnpmWorkspaceYaml | null;
+    /**
+     * Resolve a catalog reference to an actual version.
+     */
+    resolveCatalogReference(workspaceRoot: string, packageName: string, version: string): string | null;
+    resolveCatalogReference(tree: Tree, packageName: string, version: string): string | null;
+    /**
+     * Check that a catalog reference is valid.
+     */
+    validateCatalogReference(workspaceRoot: string, packageName: string, version: string): void;
+    validateCatalogReference(tree: Tree, packageName: string, version: string): void;
+    /**
+     * Updates catalog definitions for specified packages in their respective catalogs.
+     */
+    updateCatalogVersions(tree: Tree, updates: Array<{
+        packageName: string;
+        version: string;
+        catalogName?: string;
+    }>): void;
+    updateCatalogVersions(workspaceRoot: string, updates: Array<{
+        packageName: string;
+        version: string;
+        catalogName?: string;
+    }>): void;
+}
+//# sourceMappingURL=manager.d.ts.map

package/src/utils/catalog/manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAE7C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAEhE;;OAEG;IACH,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAAC;IACvE,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAE5D;;OAEG;IACH,uBAAuB,CACrB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IACjB,uBAAuB,CACrB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IAEjB;;OAEG;IACH,wBAAwB,CACtB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IACR,wBAAwB,CACtB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IAER;;OAEG;IACH,qBAAqB,CACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;IACR,qBAAqB,CACnB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;CACT"}

package/src/utils/catalog/manager.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/utils/catalog/pnpm-manager.d.ts

@@ -0,0 +1,22 @@
+import type { Tree } from '../../generators/tree';
+import type { PnpmWorkspaceYaml } from '../pnpm-workspace';
+import type { CatalogManager } from './manager';
+import type { CatalogReference } from './types';
+/**
+ * PNPM-specific catalog manager implementation
+ */
+export declare class PnpmCatalogManager implements CatalogManager {
+    readonly name = "pnpm";
+    readonly catalogProtocol = "catalog:";
+    isCatalogReference(version: string): boolean;
+    parseCatalogReference(version: string): CatalogReference | null;
+    getCatalogDefinitions(treeOrRoot: Tree | string): PnpmWorkspaceYaml | null;
+    resolveCatalogReference(treeOrRoot: Tree | string, packageName: string, version: string): string | null;
+    validateCatalogReference(treeOrRoot: Tree | string, packageName: string, version: string): void;
+    updateCatalogVersions(treeOrRoot: Tree | string, updates: Array<{
+        packageName: string;
+        version: string;
+        catalogName?: string;
+    }>): void;
+}
+//# sourceMappingURL=pnpm-manager.d.ts.map

package/src/utils/catalog/pnpm-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pnpm-manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/pnpm-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAGlD,OAAO,KAAK,EAAoB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,eAAe,cAAc;IAEtC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI5C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAe/D,qBAAqB,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAe1E,uBAAuB,CACrB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI;IAuBhB,wBAAwB,CACtB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI;IA0HP,qBAAqB,CACnB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI;CAgFR"}