@teambit/snapping 1.0.1235 → 1.0.1236

package/dist/generate-comp-from-scope.d.ts

@@ -1,5 +1,6 @@
 import { ComponentID } from '@teambit/component-id';
 import type { ScopeMain } from '@teambit/scope';
+import type { DependenciesOverridesData } from '@teambit/legacy.consumer-config';
 import type { Component } from '@teambit/component';
 import type { DependenciesMain } from '@teambit/dependencies';
 import type { DependencyResolverMain, VariantPolicyConfigArr } from '@teambit/dependency-resolver';
@@ -30,4 +31,4 @@ export type CompData = {
  * ConsumerComponent.
  */
 export declare function generateCompFromScope(scope: ScopeMain, depsResolver: DependencyResolverMain, compData: CompData, snapping: SnappingMain): Promise<Component>;
-export declare function addDeps(component: Component, snapData: SnapDataParsed, scope: ScopeMain, deps: DependenciesMain, depsResolver: DependencyResolverMain, snapping: SnappingMain, autoDetect?: VariantPolicyConfigArr): Promise<void>;
+export declare function addDeps(component: Component, snapData: SnapDataParsed, scope: ScopeMain, deps: DependenciesMain, depsResolver: DependencyResolverMain, snapping: SnappingMain, autoDetect?: VariantPolicyConfigArr, autoDetectOverrides?: DependenciesOverridesData): Promise<void>;

package/dist/generate-comp-from-scope.js

@@ -121,7 +121,7 @@ async function getCompDeps(scope, depsResolver, newDeps) {
     compPeerDeps
   };
 }
-async function addDeps(component, snapData, scope, deps, depsResolver, snapping, autoDetect) {
+async function addDeps(component, snapData, scope, deps, depsResolver, snapping, autoDetect, autoDetectOverrides) {
   const newDeps = snapData.newDependencies || [];
   const updateDeps = snapData.dependencies || [];
   const packageDeps = newDeps.filter(dep => !dep.isComponent);
@@ -188,7 +188,7 @@ async function addDeps(component, snapData, scope, deps, depsResolver, snapping,
 
   // add the dependencies to the legacy ConsumerComponent object
   // it takes care of both: given dependencies (from the cli) and the overrides, which are coming from the env.
-  await deps.loadDependenciesFromScope(consumerComponent, dependenciesData);
+  await deps.loadDependenciesFromScope(consumerComponent, dependenciesData, autoDetectOverrides);
   await snapping.UpdateDepsAspectsSaveIntoDepsResolver(component, updateDeps);
 }
 

package/dist/generate-comp-from-scope.js.map

@@ -1 +1 @@
-{"version":3,"names":["_componentId","data","require","_legacy","_component","_legacy2","_legacy3","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","generateCompFromScope","scope","depsResolver","compData","snapping","files","Error","map","file","SourceFile","base","path","contents","Buffer","from","content","test","id","componentId","extensions","ExtensionDataList","fromConfigObject","aspects","compDeps","getCompDeps","newDependencies","consumerComponent","ConsumerComponent","mainFile","name","fullName","schema","CURRENT_SCHEMA","overrides","ComponentOverrides","loadNewFromScope","defaultScope","log","message","date","Date","now","toString","username","email","_addFlattenedDependenciesToComponents","version","filesBitObject","legacyScope","sources","consumerComponentToVersion","modelComponent","findOrAddComponent","hash","objects","writeObjectsToTheFS","f","component","getManyByLegacy","newDeps","compIdsData","dep","isComponent","compIdsDataParsed","ComponentID","fromString","compIds","changeVersion","comps","getMany","toDependency","depId","comp","find","c","isEqualWithoutVersion","pkgName","getPackageName","Dependency","type","compDevDeps","compPeerDeps","addDeps","snapData","deps","autoDetect","updateDeps","dependencies","packageDeps","toPackageObj","pkgs","reduce","acc","curr","getPkgObj","allAutoDeps","depType","manipulateCurrentPkgs","removeDependencies","pkg","found","d","startsWith","replace","manipulateCurrentDeps","currentCompDeps","afterRemoval","includes","toStringWithoutVersion","foundInAutoDeps","packageName","undefined","state","_consumer","dependenciesData","allDependencies","get","devDependencies","peerDependencies","allPackagesDependencies","packageDependencies","devPackageDependencies","peerPackageDependencies","loadDependenciesFromScope","UpdateDepsAspectsSaveIntoDepsResolver"],"sources":["generate-comp-from-scope.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport { Dependency, ConsumerComponent, CURRENT_SCHEMA } from '@teambit/legacy.consumer-component';\nimport { SourceFile } from '@teambit/component.sources';\nimport type { ScopeMain } from '@teambit/scope';\nimport { ComponentOverrides } from '@teambit/legacy.consumer-config';\nimport { ExtensionDataList } from '@teambit/legacy.extension-data';\nimport type { Component } from '@teambit/component';\nimport type { DependenciesMain } from '@teambit/dependencies';\nimport type { DependencyResolverMain, VariantPolicyConfigArr } from '@teambit/dependency-resolver';\nimport type { FileData, SnappingMain, SnapDataParsed } from './snapping.main.runtime';\n\nexport type NewDependency = {\n  id: string; // component-id or package-name. e.g. \"teambit.react/react\" or \"lodash\".\n  version?: string; // version of the package. e.g. \"2.0.3\". for packages, it is mandatory.\n  isComponent?: boolean; // default true. if false, it's a package dependency\n  type?: 'runtime' | 'dev' | 'peer'; // default \"runtime\".\n};\n\nexport type NewDependencies = NewDependency[];\n\nexport type CompData = {\n  componentId: ComponentID;\n  dependencies: string[];\n  aspects: Record<string, any> | undefined;\n  message: string | undefined;\n  files: FileData[] | undefined;\n  mainFile?: string;\n  newDependencies?: NewDependencies;\n};\n\n/**\n * normally new components are created from a workspace. the files are in the filesystem and the ConsumerComponent\n * object is created from the files.\n * here, we need to create the ConsumerComponent object \"on the fly\". we don't have workspace, only scope. the files\n * are in-memory (we got them from snap-from-scope command).\n * the way how it is done is by creating a minimal ConsumerComponent object, then convert `Version` object from it,\n * write the version and files into the scope as objects, so then it's possible to load Component object using the\n * ConsumerComponent.\n */\nexport async function generateCompFromScope(\n  scope: ScopeMain,\n  depsResolver: DependencyResolverMain,\n  compData: CompData,\n  snapping: SnappingMain\n): Promise<Component> {\n  if (!compData.files) throw new Error('generateComp: files are missing');\n  const files = compData.files.map((file) => {\n    return new SourceFile({ base: '.', path: file.path, contents: Buffer.from(file.content), test: false });\n  });\n  const id = compData.componentId;\n  const extensions = ExtensionDataList.fromConfigObject(compData.aspects || {});\n  const { compDeps } = await getCompDeps(scope, depsResolver, compData.newDependencies || []);\n\n  const consumerComponent = new ConsumerComponent({\n    mainFile: compData.mainFile || 'index.ts',\n    name: compData.componentId.fullName,\n    scope: compData.componentId.scope,\n    files,\n    schema: CURRENT_SCHEMA,\n    overrides: await ComponentOverrides.loadNewFromScope(id, files, extensions, compDeps),\n    defaultScope: compData.componentId.scope,\n    extensions,\n    // the dummy data here are not important. this Version object will be discarded later.\n    log: {\n      message: compData.message || '',\n      date: Date.now().toString(),\n      username: '',\n      email: '',\n    },\n  });\n  // this is needed, otherwise in case of updating envs/aspects, the version-validator throws\n  // an error saying \"the extension ${extensionId.toString()} is missing from the flattenedDependencies\"\n  await snapping._addFlattenedDependenciesToComponents([consumerComponent]);\n\n  const { version, files: filesBitObject } =\n    await scope.legacyScope.sources.consumerComponentToVersion(consumerComponent);\n  const modelComponent = await scope.legacyScope.sources.findOrAddComponent(consumerComponent);\n  consumerComponent.version = version.hash().toString();\n  await scope.legacyScope.objects.writeObjectsToTheFS([version, modelComponent, ...filesBitObject.map((f) => f.file)]);\n  const component = await scope.getManyByLegacy([consumerComponent]);\n\n  return component[0];\n}\n\nasync function getCompDeps(scope: ScopeMain, depsResolver: DependencyResolverMain, newDeps: NewDependencies) {\n  const compIdsData = newDeps.filter((dep) => dep.isComponent);\n  const compIdsDataParsed = compIdsData.map((data) => ({\n    ...data,\n    id: ComponentID.fromString(data.id),\n  }));\n  const compIds = compIdsDataParsed.map((dep) => (dep.version ? dep.id.changeVersion(dep.version) : dep.id));\n  const comps = await scope.getMany(compIds);\n  const toDependency = (depId: ComponentID) => {\n    const comp = comps.find((c) => c.id.isEqualWithoutVersion(depId));\n    if (!comp) throw new Error(`unable to find the specified dependency ${depId.toString()} in the scope`);\n    const pkgName = depsResolver.getPackageName(comp);\n    return new Dependency(comp.id, [], pkgName);\n  };\n  const compDeps = compIdsDataParsed.filter((c) => c.type === 'runtime').map((dep) => toDependency(dep.id));\n  const compDevDeps = compIdsDataParsed.filter((c) => c.type === 'dev').map((dep) => toDependency(dep.id));\n  const compPeerDeps = compIdsDataParsed.filter((c) => c.type === 'peer').map((dep) => toDependency(dep.id));\n  return { compDeps, compDevDeps, compPeerDeps };\n}\n\nexport async function addDeps(\n  component: Component,\n  snapData: SnapDataParsed,\n  scope: ScopeMain,\n  deps: DependenciesMain,\n  depsResolver: DependencyResolverMain,\n  snapping: SnappingMain,\n  autoDetect?: VariantPolicyConfigArr\n) {\n  const newDeps = snapData.newDependencies || [];\n  const updateDeps = snapData.dependencies || [];\n  const packageDeps = newDeps.filter((dep) => !dep.isComponent);\n  const { compDeps, compDevDeps, compPeerDeps } = await getCompDeps(scope, depsResolver, newDeps);\n  const toPackageObj = (pkgs: Array<{ id: string; version?: string }>) => {\n    return pkgs.reduce((acc, curr) => {\n      if (!curr.version) throw new Error(`please specify a version for the package dependency: \"${curr.id}\"`);\n      acc[curr.id] = curr.version;\n      return acc;\n    }, {});\n  };\n  const getPkgObj = (type: 'runtime' | 'dev' | 'peer') => {\n    return toPackageObj(packageDeps.filter((dep) => dep.type === type));\n  };\n  const allAutoDeps: { [pkgName: string]: string } = {};\n  ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n    autoDetect?.[depType]?.forEach((dep) => {\n      allAutoDeps[dep.name] = dep.version;\n    });\n  });\n\n  const manipulateCurrentPkgs = (pkgs: Record<string, string>) => {\n    snapData.removeDependencies?.forEach((pkg) => {\n      delete pkgs[pkg];\n    });\n    Object.keys(pkgs).forEach((pkg) => {\n      const found = updateDeps.find((d) => d.startsWith(`${pkg}@`));\n      if (found) {\n        pkgs[pkg] = found.replace(`${pkg}@`, '');\n      }\n    });\n    return pkgs;\n  };\n  const manipulateCurrentDeps = (currentCompDeps: Dependency[]) => {\n    const afterRemoval = currentCompDeps.filter(\n      (dep) => !snapData.removeDependencies?.includes(dep.id.toStringWithoutVersion())\n    );\n    afterRemoval.forEach((dep) => {\n      const found = updateDeps.find((d) => d.startsWith(`${dep.id.toStringWithoutVersion()}@`));\n      if (found) {\n        dep.id = dep.id.changeVersion(found.replace(`${dep.id.toStringWithoutVersion()}@`, ''));\n      }\n      const foundInAutoDeps = dep.packageName ? allAutoDeps[dep.packageName] : undefined;\n      if (foundInAutoDeps) {\n        dep.id = dep.id.changeVersion(allAutoDeps[dep.packageName!]);\n      }\n    });\n    return afterRemoval;\n  };\n\n  const consumerComponent = component.state._consumer as ConsumerComponent;\n\n  const dependenciesData = {\n    allDependencies: {\n      dependencies: [...compDeps, ...manipulateCurrentDeps(consumerComponent.dependencies.get())],\n      devDependencies: [...compDevDeps, ...manipulateCurrentDeps(consumerComponent.devDependencies.get())],\n      peerDependencies: [...compPeerDeps, ...manipulateCurrentDeps(consumerComponent.peerDependencies.get())],\n    },\n    allPackagesDependencies: {\n      packageDependencies: { ...manipulateCurrentPkgs(consumerComponent.packageDependencies), ...getPkgObj('runtime') },\n      devPackageDependencies: {\n        ...manipulateCurrentPkgs(consumerComponent.devPackageDependencies),\n        ...getPkgObj('dev'),\n      },\n      peerPackageDependencies: {\n        ...manipulateCurrentPkgs(consumerComponent.peerPackageDependencies),\n        ...getPkgObj('peer'),\n      },\n    },\n  };\n\n  // add the dependencies to the legacy ConsumerComponent object\n  // it takes care of both: given dependencies (from the cli) and the overrides, which are coming from the env.\n  await deps.loadDependenciesFromScope(consumerComponent, dependenciesData);\n\n  await snapping.UpdateDepsAspectsSaveIntoDepsResolver(component, updateDeps);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_componentId","data","require","_legacy","_component","_legacy2","_legacy3","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","generateCompFromScope","scope","depsResolver","compData","snapping","files","Error","map","file","SourceFile","base","path","contents","Buffer","from","content","test","id","componentId","extensions","ExtensionDataList","fromConfigObject","aspects","compDeps","getCompDeps","newDependencies","consumerComponent","ConsumerComponent","mainFile","name","fullName","schema","CURRENT_SCHEMA","overrides","ComponentOverrides","loadNewFromScope","defaultScope","log","message","date","Date","now","toString","username","email","_addFlattenedDependenciesToComponents","version","filesBitObject","legacyScope","sources","consumerComponentToVersion","modelComponent","findOrAddComponent","hash","objects","writeObjectsToTheFS","f","component","getManyByLegacy","newDeps","compIdsData","dep","isComponent","compIdsDataParsed","ComponentID","fromString","compIds","changeVersion","comps","getMany","toDependency","depId","comp","find","c","isEqualWithoutVersion","pkgName","getPackageName","Dependency","type","compDevDeps","compPeerDeps","addDeps","snapData","deps","autoDetect","autoDetectOverrides","updateDeps","dependencies","packageDeps","toPackageObj","pkgs","reduce","acc","curr","getPkgObj","allAutoDeps","depType","manipulateCurrentPkgs","removeDependencies","pkg","found","d","startsWith","replace","manipulateCurrentDeps","currentCompDeps","afterRemoval","includes","toStringWithoutVersion","foundInAutoDeps","packageName","undefined","state","_consumer","dependenciesData","allDependencies","get","devDependencies","peerDependencies","allPackagesDependencies","packageDependencies","devPackageDependencies","peerPackageDependencies","loadDependenciesFromScope","UpdateDepsAspectsSaveIntoDepsResolver"],"sources":["generate-comp-from-scope.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport { Dependency, ConsumerComponent, CURRENT_SCHEMA } from '@teambit/legacy.consumer-component';\nimport { SourceFile } from '@teambit/component.sources';\nimport type { ScopeMain } from '@teambit/scope';\nimport type { DependenciesOverridesData } from '@teambit/legacy.consumer-config';\nimport { ComponentOverrides } from '@teambit/legacy.consumer-config';\nimport { ExtensionDataList } from '@teambit/legacy.extension-data';\nimport type { Component } from '@teambit/component';\nimport type { DependenciesMain } from '@teambit/dependencies';\nimport type { DependencyResolverMain, VariantPolicyConfigArr } from '@teambit/dependency-resolver';\nimport type { FileData, SnappingMain, SnapDataParsed } from './snapping.main.runtime';\n\nexport type NewDependency = {\n  id: string; // component-id or package-name. e.g. \"teambit.react/react\" or \"lodash\".\n  version?: string; // version of the package. e.g. \"2.0.3\". for packages, it is mandatory.\n  isComponent?: boolean; // default true. if false, it's a package dependency\n  type?: 'runtime' | 'dev' | 'peer'; // default \"runtime\".\n};\n\nexport type NewDependencies = NewDependency[];\n\nexport type CompData = {\n  componentId: ComponentID;\n  dependencies: string[];\n  aspects: Record<string, any> | undefined;\n  message: string | undefined;\n  files: FileData[] | undefined;\n  mainFile?: string;\n  newDependencies?: NewDependencies;\n};\n\n/**\n * normally new components are created from a workspace. the files are in the filesystem and the ConsumerComponent\n * object is created from the files.\n * here, we need to create the ConsumerComponent object \"on the fly\". we don't have workspace, only scope. the files\n * are in-memory (we got them from snap-from-scope command).\n * the way how it is done is by creating a minimal ConsumerComponent object, then convert `Version` object from it,\n * write the version and files into the scope as objects, so then it's possible to load Component object using the\n * ConsumerComponent.\n */\nexport async function generateCompFromScope(\n  scope: ScopeMain,\n  depsResolver: DependencyResolverMain,\n  compData: CompData,\n  snapping: SnappingMain\n): Promise<Component> {\n  if (!compData.files) throw new Error('generateComp: files are missing');\n  const files = compData.files.map((file) => {\n    return new SourceFile({ base: '.', path: file.path, contents: Buffer.from(file.content), test: false });\n  });\n  const id = compData.componentId;\n  const extensions = ExtensionDataList.fromConfigObject(compData.aspects || {});\n  const { compDeps } = await getCompDeps(scope, depsResolver, compData.newDependencies || []);\n\n  const consumerComponent = new ConsumerComponent({\n    mainFile: compData.mainFile || 'index.ts',\n    name: compData.componentId.fullName,\n    scope: compData.componentId.scope,\n    files,\n    schema: CURRENT_SCHEMA,\n    overrides: await ComponentOverrides.loadNewFromScope(id, files, extensions, compDeps),\n    defaultScope: compData.componentId.scope,\n    extensions,\n    // the dummy data here are not important. this Version object will be discarded later.\n    log: {\n      message: compData.message || '',\n      date: Date.now().toString(),\n      username: '',\n      email: '',\n    },\n  });\n  // this is needed, otherwise in case of updating envs/aspects, the version-validator throws\n  // an error saying \"the extension ${extensionId.toString()} is missing from the flattenedDependencies\"\n  await snapping._addFlattenedDependenciesToComponents([consumerComponent]);\n\n  const { version, files: filesBitObject } =\n    await scope.legacyScope.sources.consumerComponentToVersion(consumerComponent);\n  const modelComponent = await scope.legacyScope.sources.findOrAddComponent(consumerComponent);\n  consumerComponent.version = version.hash().toString();\n  await scope.legacyScope.objects.writeObjectsToTheFS([version, modelComponent, ...filesBitObject.map((f) => f.file)]);\n  const component = await scope.getManyByLegacy([consumerComponent]);\n\n  return component[0];\n}\n\nasync function getCompDeps(scope: ScopeMain, depsResolver: DependencyResolverMain, newDeps: NewDependencies) {\n  const compIdsData = newDeps.filter((dep) => dep.isComponent);\n  const compIdsDataParsed = compIdsData.map((data) => ({\n    ...data,\n    id: ComponentID.fromString(data.id),\n  }));\n  const compIds = compIdsDataParsed.map((dep) => (dep.version ? dep.id.changeVersion(dep.version) : dep.id));\n  const comps = await scope.getMany(compIds);\n  const toDependency = (depId: ComponentID) => {\n    const comp = comps.find((c) => c.id.isEqualWithoutVersion(depId));\n    if (!comp) throw new Error(`unable to find the specified dependency ${depId.toString()} in the scope`);\n    const pkgName = depsResolver.getPackageName(comp);\n    return new Dependency(comp.id, [], pkgName);\n  };\n  const compDeps = compIdsDataParsed.filter((c) => c.type === 'runtime').map((dep) => toDependency(dep.id));\n  const compDevDeps = compIdsDataParsed.filter((c) => c.type === 'dev').map((dep) => toDependency(dep.id));\n  const compPeerDeps = compIdsDataParsed.filter((c) => c.type === 'peer').map((dep) => toDependency(dep.id));\n  return { compDeps, compDevDeps, compPeerDeps };\n}\n\nexport async function addDeps(\n  component: Component,\n  snapData: SnapDataParsed,\n  scope: ScopeMain,\n  deps: DependenciesMain,\n  depsResolver: DependencyResolverMain,\n  snapping: SnappingMain,\n  autoDetect?: VariantPolicyConfigArr,\n  autoDetectOverrides?: DependenciesOverridesData\n) {\n  const newDeps = snapData.newDependencies || [];\n  const updateDeps = snapData.dependencies || [];\n  const packageDeps = newDeps.filter((dep) => !dep.isComponent);\n  const { compDeps, compDevDeps, compPeerDeps } = await getCompDeps(scope, depsResolver, newDeps);\n  const toPackageObj = (pkgs: Array<{ id: string; version?: string }>) => {\n    return pkgs.reduce((acc, curr) => {\n      if (!curr.version) throw new Error(`please specify a version for the package dependency: \"${curr.id}\"`);\n      acc[curr.id] = curr.version;\n      return acc;\n    }, {});\n  };\n  const getPkgObj = (type: 'runtime' | 'dev' | 'peer') => {\n    return toPackageObj(packageDeps.filter((dep) => dep.type === type));\n  };\n  const allAutoDeps: { [pkgName: string]: string } = {};\n  ['dependencies', 'devDependencies', 'peerDependencies'].forEach((depType) => {\n    autoDetect?.[depType]?.forEach((dep) => {\n      allAutoDeps[dep.name] = dep.version;\n    });\n  });\n\n  const manipulateCurrentPkgs = (pkgs: Record<string, string>) => {\n    snapData.removeDependencies?.forEach((pkg) => {\n      delete pkgs[pkg];\n    });\n    Object.keys(pkgs).forEach((pkg) => {\n      const found = updateDeps.find((d) => d.startsWith(`${pkg}@`));\n      if (found) {\n        pkgs[pkg] = found.replace(`${pkg}@`, '');\n      }\n    });\n    return pkgs;\n  };\n  const manipulateCurrentDeps = (currentCompDeps: Dependency[]) => {\n    const afterRemoval = currentCompDeps.filter(\n      (dep) => !snapData.removeDependencies?.includes(dep.id.toStringWithoutVersion())\n    );\n    afterRemoval.forEach((dep) => {\n      const found = updateDeps.find((d) => d.startsWith(`${dep.id.toStringWithoutVersion()}@`));\n      if (found) {\n        dep.id = dep.id.changeVersion(found.replace(`${dep.id.toStringWithoutVersion()}@`, ''));\n      }\n      const foundInAutoDeps = dep.packageName ? allAutoDeps[dep.packageName] : undefined;\n      if (foundInAutoDeps) {\n        dep.id = dep.id.changeVersion(allAutoDeps[dep.packageName!]);\n      }\n    });\n    return afterRemoval;\n  };\n\n  const consumerComponent = component.state._consumer as ConsumerComponent;\n\n  const dependenciesData = {\n    allDependencies: {\n      dependencies: [...compDeps, ...manipulateCurrentDeps(consumerComponent.dependencies.get())],\n      devDependencies: [...compDevDeps, ...manipulateCurrentDeps(consumerComponent.devDependencies.get())],\n      peerDependencies: [...compPeerDeps, ...manipulateCurrentDeps(consumerComponent.peerDependencies.get())],\n    },\n    allPackagesDependencies: {\n      packageDependencies: { ...manipulateCurrentPkgs(consumerComponent.packageDependencies), ...getPkgObj('runtime') },\n      devPackageDependencies: {\n        ...manipulateCurrentPkgs(consumerComponent.devPackageDependencies),\n        ...getPkgObj('dev'),\n      },\n      peerPackageDependencies: {\n        ...manipulateCurrentPkgs(consumerComponent.peerPackageDependencies),\n        ...getPkgObj('peer'),\n      },\n    },\n  };\n\n  // add the dependencies to the legacy ConsumerComponent object\n  // it takes care of both: given dependencies (from the cli) and the overrides, which are coming from the env.\n  await deps.loadDependenciesFromScope(consumerComponent, dependenciesData, autoDetectOverrides);\n\n  await snapping.UpdateDepsAspectsSaveIntoDepsResolver(component, updateDeps);\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/snapping.main.runtime.d.ts

@@ -143,6 +143,14 @@ export declare class SnappingMain {
         batchId: string;
     }>;
     private addAspectsFromConfigObject;
+    /**
+     * re-calculate the dependencies policy of the component and its overrides from its config and env, the same way a
+     * workspace calculates them when it loads a component, rather than keeping the ones of the version it was loaded from.
+     * returns the policy and the overrides of the auto-detected dependencies (versions only, see
+     * ApplyOverrides.autoDetectOverrides), which include the deps of the merge-config, same as
+     * workspace.getAutoDetectOverrides().
+     */
+    private recalcDependenciesPolicy;
     snapFromScope(snapDataPerCompRaw: SnapDataPerCompRaw[], params: {
         push?: boolean;
         ignoreIssues?: string;
@@ -151,6 +159,7 @@ export declare class SnappingMain {
         tag?: boolean;
         updatedLegacyComponents?: ConsumerComponent[];
         loadAspectOnlyForIds?: ComponentIdList;
+        recalcDependencies?: boolean;
     } & Partial<BasicTagParams>): Promise<SnapFromScopeResults>;
     /**
      * save the local changes of a component(s) into the scope. snap can be done on main or on a lane.
@@ -277,6 +286,7 @@ export declare class SnappingMain {
      * 2. save all dependencies data from the legacy into DependencyResolver aspect.
      */
     UpdateDepsAspectsSaveIntoDepsResolver(component: Component, updatedIds: string[]): Promise<void>;
+    private updateAspectsVersions;
     /**
      * a new or modified workspace-root component joins every tag and snap of its members. they record
      * the root at the version that has their files (see VersionMaker.recordWorkspaceRoot), and a build

package/dist/snapping.main.runtime.js

@@ -194,12 +194,19 @@ function _dependencyResolver() {
   return data;
 }
 function _legacy6() {
-  const data = require("@teambit/legacy.extension-data");
+  const data = require("@teambit/legacy.consumer-config");
   _legacy6 = function () {
     return data;
   };
   return data;
 }
+function _legacy7() {
+  const data = require("@teambit/legacy.extension-data");
+  _legacy7 = function () {
+    return data;
+  };
+  return data;
+}
 function _builder() {
   const data = require("@teambit/builder");
   _builder = function () {
@@ -312,9 +319,9 @@ function _application() {
   };
   return data;
 }
-function _legacy7() {
+function _legacy8() {
   const data = require("@teambit/legacy.scope-api");
-  _legacy7 = function () {
+  _legacy8 = function () {
     return data;
   };
   return data;
@@ -501,10 +508,10 @@ class SnappingMain {
   }
   async addAspectsFromConfigObject(component, configObject) {
     if (!configObject) return;
-    _legacy6().ExtensionDataList.adjustEnvsOnConfigObject(configObject);
-    const extensionsFromConfigObject = _legacy6().ExtensionDataList.fromConfigObject(configObject);
+    _legacy7().ExtensionDataList.adjustEnvsOnConfigObject(configObject);
+    const extensionsFromConfigObject = _legacy7().ExtensionDataList.fromConfigObject(configObject);
     const consumerComponent = component.state._consumer;
-    const extensionDataList = _legacy6().ExtensionDataList.mergeConfigs([extensionsFromConfigObject, consumerComponent.extensions]).filterRemovedExtensions();
+    const extensionDataList = _legacy7().ExtensionDataList.mergeConfigs([extensionsFromConfigObject, consumerComponent.extensions]).filterRemovedExtensions();
 
     // Restore data fields from the original extensions after merging configs.
     // configObject contains only config (from the merged config result), it has no data.
@@ -525,6 +532,49 @@ class SnappingMain {
     const autoDeps = extensionsFromConfigObject.extractAutoDepsFromConfig();
     return autoDeps;
   }
+
+  /**
+   * re-calculate the dependencies policy of the component and its overrides from its config and env, the same way a
+   * workspace calculates them when it loads a component, rather than keeping the ones of the version it was loaded from.
+   * returns the policy and the overrides of the auto-detected dependencies (versions only, see
+   * ApplyOverrides.autoDetectOverrides), which include the deps of the merge-config, same as
+   * workspace.getAutoDetectOverrides().
+   */
+  async recalcDependenciesPolicy(component, componentsInSnap, mergeConfigAutoDeps) {
+    const legacyComponent = component.state._consumer;
+    const {
+      extensions
+    } = legacyComponent;
+    const depResolverExt = extensions.findCoreExtension(_dependencyResolver().DependencyResolverAspect.id);
+    // an env that defines its policy in code is loaded only when it changed: a changed env is a changed (or missing)
+    // extension, which mergeExtensionsData() reports as a data conflict (see loadAspectOnlyForIds). when it's not
+    // loaded, it didn't change, so the env part of the stored policy is still valid. (the other parts, such as the
+    // policies of aspects and the config, are calculated by mergeVariantPolicies() from the current config)
+    const storedPolicy = _dependencyResolver().VariantPolicy.parse(depResolverExt?.data.policy || []);
+    const storedEnvPolicy = storedPolicy.filter(entry => entry.source === 'env');
+    // an env.jsonc env that is snapped along (e.g. merged as well) has its policy in its new files, like a workspace
+    // that loads the env from its files. otherwise, the policy is read from the stored version of the env.
+    const envPolicy = (await this.dependencyResolver.getEnvPolicyFromComponents(extensions, componentsInSnap)) ?? (await this.dependencyResolver.getComponentEnvPolicyFromExtension(extensions, storedEnvPolicy));
+    // when the component is an env, its own policy (its own peers) is calculated from its env.jsonc or from the loaded
+    // env. same as above, an env that defines it in code and is not loaded didn't change, so the stored one is valid.
+    const envExtendsDeps = legacyComponent.dependencies.get();
+    const storedEnvOwnPolicy = storedPolicy.filter(entry => entry.source === 'env-own');
+    const isEnvOwnPolicyMissing = storedEnvOwnPolicy.length > 0 && !(await this.dependencyResolver.getPoliciesFromEnvForItself(component.id, legacyComponent.files, envExtendsDeps));
+    const policy = await this.dependencyResolver.mergeVariantPolicies(extensions, component.id, legacyComponent.files, envExtendsDeps,
+    // merged right after the env policy, same as mergeVariantPolicies() merges a calculated own policy
+    isEnvOwnPolicyMissing ? _dependencyResolver().VariantPolicy.mergePolices([envPolicy, storedEnvOwnPolicy]) : envPolicy);
+    // the "source" of each dependency in the dependency-resolver data is determined by this policy
+    if (depResolverExt) depResolverExt.data.policy = policy.serialize();
+    legacyComponent.overrides = new (_legacy6().ComponentOverrides)((0, _lodash().pickBy)(policy.toLegacyDepsOverrides(), val => !(0, _lodash().isEmpty)(val)));
+    const mergeConfigPolicy = _dependencyResolver().VariantPolicy.fromConfigObject(mergeConfigAutoDeps || {}, {
+      source: 'auto'
+    });
+    const autoDetectOverrides = _dependencyResolver().VariantPolicy.mergePolices([policy, mergeConfigPolicy]).toLegacyAutoDetectOverrides();
+    return {
+      policy,
+      autoDetectOverrides
+    };
+  }
   async snapFromScope(snapDataPerCompRaw, params) {
     if (this.workspace) {
       throw new (_bitError().BitError)(`unable to run this command from a workspace, please create a new bare-scope and run it from there`);
@@ -536,7 +586,7 @@ class SnappingMain {
       try {
         lane = await this.importer.importLaneObject(laneId);
       } catch (err) {
-        if (err.constructor.name !== _legacy7().LaneNotFound.name) throw err;
+        if (err.constructor.name !== _legacy8().LaneNotFound.name) throw err;
         // if the lane is not found, it's probably because it's new. create a new lane.
         lane = await (0, _lanesModules().createLaneInScope)(laneId.name, this.scope, laneId.scope);
         // it's important to set the lane as new in scope.json. otherwise, later, when importing and the lane is loaded
@@ -628,13 +678,20 @@ class SnappingMain {
       });
     }
     const components = [...existingComponents, ...newComponents];
-
+    const autoDepsPerComp = new Map();
+    const addDepsToComp = (component, autoDetectOverrides) => (0, _generateCompFromScope().addDeps)(component, getSnapData(component.id), this.scope, this.deps, this.dependencyResolver, this, autoDepsPerComp.get(component), autoDetectOverrides);
     // this must be done before we load component aspects later on, because this updated deps may update aspects.
     await (0, _pMapSeries().default)(components, async component => {
       const snapData = getSnapData(component.id);
-      const autoDeps = await this.addAspectsFromConfigObject(component, snapData.aspects);
+      autoDepsPerComp.set(component, await this.addAspectsFromConfigObject(component, snapData.aspects));
+      if (params.recalcDependencies) {
+        // the dependencies are added once the aspects are loaded, see below. only update the versions of aspects that
+        // are part of the snap (e.g. an env merged into the lane), so the correct versions get loaded.
+        await this.updateAspectsVersions(component, snapData.dependencies);
+        return;
+      }
       // adds explicitly defined dependencies and dependencies from envs/aspects (overrides)
-      await (0, _generateCompFromScope().addDeps)(component, snapData, this.scope, this.deps, this.dependencyResolver, this, autoDeps);
+      await addDepsToComp(component);
     });
 
     // for new components these are not needed. coz when generating them we already add the aspects and the files.
@@ -670,9 +727,22 @@ class SnappingMain {
     } = params;
     const compsToLoadAspects = loadAspectOnlyForIds ? components.filter(c => loadAspectOnlyForIds.hasWithoutVersion(c.id)) : components;
     await this.scope.loadManyCompsAspects(compsToLoadAspects);
+    const policyPerComp = new Map();
+    if (params.recalcDependencies) {
+      // the config (and with it, the env) may differ from the one stored in the version the components were loaded
+      // from. now that the env is loaded, the dependencies are calculated according to it.
+      await (0, _pMapSeries().default)(components, async component => {
+        const {
+          policy,
+          autoDetectOverrides
+        } = await this.recalcDependenciesPolicy(component, components, autoDepsPerComp.get(component));
+        policyPerComp.set(component, policy);
+        await addDepsToComp(component, autoDetectOverrides);
+      });
+    }
 
     // this is similar to what happens in the workspace. the "onLoad" is running and populating the "data" of the aspects.
-    await (0, _pMapSeries().default)(compsToLoadAspects, async comp => this.scope.executeOnCompAspectReCalcSlot(comp));
+    await (0, _pMapSeries().default)(compsToLoadAspects, async comp => this.scope.executeOnCompAspectReCalcSlot(comp, policyPerComp.get(comp)));
     const ids = _componentId().ComponentIdList.fromArray(allCompIds);
     const shouldTag = Boolean(params.tag);
     const makeVersionParams = _objectSpread(_objectSpread({}, params), {}, {
@@ -1484,6 +1554,22 @@ another option, in case this dependency is not in main yet is to remove all refe
    * 2. save all dependencies data from the legacy into DependencyResolver aspect.
    */
   async UpdateDepsAspectsSaveIntoDepsResolver(component, updatedIds) {
+    await this.updateAspectsVersions(component, updatedIds);
+    const dependenciesListSerialized = (await this.dependencyResolver.extractDepsFromLegacy(component)).serialize();
+    const extId = _dependencyResolver().DependencyResolverAspect.id;
+    const data = {
+      dependencies: dependenciesListSerialized
+    };
+    const existingExtension = component.config.extensions.findExtension(extId);
+    if (existingExtension) {
+      // Only merge top level of extension data
+      Object.assign(existingExtension.data, data);
+      return;
+    }
+    const extension = new (_legacy7().ExtensionDataEntry)(undefined, undefined, extId, undefined, data);
+    component.config.extensions.push(extension);
+  }
+  async updateAspectsVersions(component, updatedIds) {
     const legacyComponent = component.state._consumer;
     legacyComponent.extensions.forEach(ext => {
       const extId = ext.extensionId;
@@ -1497,19 +1583,6 @@ another option, in case this dependency is not in main yet is to remove all refe
       }
     });
     component.state.aspects = await this.scope.createAspectListFromExtensionDataList(legacyComponent.extensions);
-    const dependenciesListSerialized = (await this.dependencyResolver.extractDepsFromLegacy(component)).serialize();
-    const extId = _dependencyResolver().DependencyResolverAspect.id;
-    const data = {
-      dependencies: dependenciesListSerialized
-    };
-    const existingExtension = component.config.extensions.findExtension(extId);
-    if (existingExtension) {
-      // Only merge top level of extension data
-      Object.assign(existingExtension.data, data);
-      return;
-    }
-    const extension = new (_legacy6().ExtensionDataEntry)(undefined, undefined, extId, undefined, data);
-    component.config.extensions.push(extension);
   }
 
   /**