@teambit/workspace 0.0.1037 → 0.0.1039
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/aspects-merger.js +2 -2
- package/dist/aspects-merger.js.map +1 -1
- package/dist/{preview-1681875190881.js → preview-1682047751680.js} +2 -2
- package/dist/types.d.ts +7 -0
- package/dist/types.js.map +1 -1
- package/dist/workspace-aspects-loader.d.ts +5 -4
- package/dist/workspace-aspects-loader.js +39 -16
- package/dist/workspace-aspects-loader.js.map +1 -1
- package/dist/workspace.d.ts +5 -0
- package/dist/workspace.js +11 -2
- package/dist/workspace.js.map +1 -1
- package/dist/workspace.provider.js +5 -2
- package/dist/workspace.provider.js.map +1 -1
- package/package-tar/teambit-workspace-0.0.1039.tgz +0 -0
- package/package.json +35 -35
- package/package-tar/teambit-workspace-0.0.1037.tgz +0 -0
package/dist/aspects-merger.js
CHANGED
|
@@ -350,9 +350,9 @@ class AspectsMerger {
|
|
|
350
350
|
* Load all unloaded extensions from a list
|
|
351
351
|
* @param extensions list of extensions with config to load
|
|
352
352
|
*/
|
|
353
|
-
async loadExtensions(extensions, originatedFrom,
|
|
353
|
+
async loadExtensions(extensions, originatedFrom, opts = {}) {
|
|
354
354
|
const workspaceAspectsLoader = this.workspace.getWorkspaceAspectsLoader();
|
|
355
|
-
return workspaceAspectsLoader.loadComponentsExtensions(extensions, originatedFrom,
|
|
355
|
+
return workspaceAspectsLoader.loadComponentsExtensions(extensions, originatedFrom, opts);
|
|
356
356
|
}
|
|
357
357
|
|
|
358
358
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["AspectsMerger","constructor","workspace","harmony","consumer","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","wsDefaultExtensions","mergeFromScope","errors","bitMapEntry","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","push","adjustEnvsOnConfigMerge","conf","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","configMergeExtensions","ExtensionDataList","fromConfigObject","removeAutoDepsFromConfig","scopeExtensions","extensions","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","length","filter","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","selfInMergedExtensions","findExtension","toStringWithoutScopeAndVersion","extsWithoutSelf","extensionId","remove","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","isDefaultExtension","Promise","all","list","resolveExtensionListIds","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","fromScope","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","key","dep","force","reduce","acc","current","name","version","scope","legacyScope","objects","unmergedComponents","getEntry","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","data","aspectsRegisteredAsEnvs","aspect","getEnvDefinitionByStringId","nonEnvs","e","envAspectExt","find","ids","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","throwOnError","workspaceAspectsLoader","getWorkspaceAspectsLoader","loadComponentsExtensions","extensionList","promises"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component, ComponentID } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { EnvsAspect } from '@teambit/envs';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { partition, mergeWith, merge } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\n\nexport class AspectsMerger {\n private consumer: Consumer;\n private warnedAboutMisconfiguredEnvs: string[] = []; // cache env-ids that have been errored about not having \"env\" type\n readonly mergeConflictFile: MergeConflictFile;\n private mergeConfigDepsResolverDataCache: { [compIdStr: string]: Record<string, any> } = {};\n constructor(private workspace: Workspace, private harmony: Harmony) {\n this.consumer = workspace.consumer;\n this.mergeConflictFile = new MergeConflictFile(workspace.path);\n }\n\n getDepsDataOfMergeConfig(id: BitId) {\n return this.mergeConfigDepsResolverDataCache[id.toString()];\n }\n\n /**\n * Calculate the component config based on:\n * the config property in the .bitmap file\n * the component.json file in the component folder\n * matching pattern in the variants config\n * defaults extensions from workspace config\n * extensions from the model.\n */\n // eslint-disable-next-line complexity\n async merge(\n componentId: ComponentID,\n componentFromScope?: Component,\n excludeOrigins: ExtensionsOrigin[] = []\n ): Promise<{\n extensions: ExtensionDataList;\n beforeMerge: Array<{ extensions: ExtensionDataList; origin: ExtensionsOrigin; extraData: any }>; // useful for debugging\n errors?: Error[];\n }> {\n // TODO: consider caching this result\n let configFileExtensions: ExtensionDataList | undefined;\n let variantsExtensions: ExtensionDataList | undefined;\n let wsDefaultExtensions: ExtensionDataList | undefined;\n const mergeFromScope = true;\n const errors: Error[] = [];\n\n const bitMapEntry = this.consumer.bitMap.getComponentIfExist(componentId._legacy);\n const bitMapExtensions = bitMapEntry?.config;\n\n let configMerge: Record<string, any> | undefined;\n try {\n configMerge = this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());\n } catch (err) {\n if (!(err instanceof MergeConfigConflict)) {\n throw err;\n }\n this.workspace.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);\n errors.push(err);\n }\n\n const adjustEnvsOnConfigMerge = (conf: Record<string, any>) => {\n const env = conf[EnvsAspect.id]?.env;\n if (!env) return;\n const [id] = env.split('@');\n conf[EnvsAspect.id] = { env: id };\n conf[env] = {};\n };\n\n const unmergedData = this.getUnmergedData(componentId);\n const unmergedDataMergeConf = unmergedData?.mergedConfig;\n const getMergeConfigCombined = () => {\n if (!configMerge && !unmergedDataMergeConf) return undefined;\n if (!configMerge) return unmergedDataMergeConf;\n if (!unmergedDataMergeConf) return configMerge;\n\n return mergeWith(configMerge, unmergedDataMergeConf, (objValue, srcValue) => {\n if (Array.isArray(objValue)) {\n // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array\n return objValue.concat(srcValue);\n }\n return undefined;\n });\n };\n const mergeConfigCombined = getMergeConfigCombined();\n adjustEnvsOnConfigMerge(mergeConfigCombined || {});\n\n const configMergeExtensions = mergeConfigCombined\n ? ExtensionDataList.fromConfigObject(mergeConfigCombined)\n : undefined;\n\n this.removeAutoDepsFromConfig(componentId, configMergeExtensions);\n const scopeExtensions = componentFromScope?.config?.extensions || new ExtensionDataList();\n // backward compatibility. previously, it was saved as an array into the model (when there was merge-config)\n this.removeAutoDepsFromConfig(componentId, scopeExtensions, true);\n const [specific, nonSpecific] = partition(scopeExtensions, (entry) => entry.config[AspectSpecificField] === true);\n const scopeExtensionsNonSpecific = new ExtensionDataList(...nonSpecific);\n const scopeExtensionsSpecific = new ExtensionDataList(...specific);\n\n const componentConfigFile = await this.workspace.componentConfigFile(componentId);\n if (componentConfigFile) {\n configFileExtensions = componentConfigFile.aspects.toLegacy();\n }\n const relativeComponentDir = this.workspace.componentDir(componentId, { ignoreVersion: true }, { relative: true });\n const variantConfig = this.workspace.variants.byRootDirAndName(relativeComponentDir, componentId.fullName);\n if (variantConfig) {\n variantsExtensions = variantConfig.extensions.clone();\n // Do not merge from scope when there is specific variant (which is not *) that match the component\n // if (variantConfig.maxSpecificity > 0) {\n // mergeFromScope = false;\n // }\n }\n // We don't stop on each step because we want to merge the default scope even if propagate=false but the default scope is not defined\n // in the case the same extension pushed twice, the former takes precedence (opposite of Object.assign)\n const extensionsToMerge: Array<{ origin: ExtensionsOrigin; extensions: ExtensionDataList; extraData: any }> = [];\n let envWasFoundPreviously = false;\n const removedExtensionIds: string[] = [];\n\n const addExtensionsToMerge = async (extensions: ExtensionDataList, origin: ExtensionsOrigin, extraData?: any) => {\n if (!extensions.length) {\n return;\n }\n removedExtensionIds.push(...extensions.filter((extData) => extData.isRemoved).map((extData) => extData.stringId));\n const extsWithoutRemoved = extensions.filterRemovedExtensions();\n const selfInMergedExtensions = extsWithoutRemoved.findExtension(\n componentId._legacy.toStringWithoutScopeAndVersion(),\n true,\n true\n );\n const extsWithoutSelf = selfInMergedExtensions?.extensionId\n ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId)\n : extsWithoutRemoved;\n const { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n extsWithoutSelf,\n envWasFoundPreviously,\n origin\n );\n if (envIsCurrentlySet) {\n await this.warnAboutMisconfiguredEnv(componentId, extensions);\n envWasFoundPreviously = true;\n }\n\n extensionsToMerge.push({ origin, extensions: extensionDataListFiltered, extraData });\n };\n const setDataListAsSpecific = (extensions: ExtensionDataList) => {\n extensions.forEach((dataEntry) => (dataEntry.config[AspectSpecificField] = true));\n };\n if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {\n const extensionDataList = ExtensionDataList.fromConfigObject(bitMapExtensions);\n setDataListAsSpecific(extensionDataList);\n await addExtensionsToMerge(extensionDataList, 'BitmapFile');\n }\n // config-merge is after the .bitmap. because normally if you have config set in .bitmap, you won't\n // be able to lane-merge. (unless you specify --ignore-config-changes).\n // so, if there is config in .bitmap, it probably happened after lane-merge.\n if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {\n await addExtensionsToMerge(ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');\n }\n if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {\n setDataListAsSpecific(configFileExtensions);\n await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');\n }\n if (!excludeOrigins.includes('ModelSpecific')) {\n await addExtensionsToMerge(ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');\n }\n let continuePropagating = componentConfigFile?.propagate ?? true;\n if (variantsExtensions && continuePropagating && !excludeOrigins.includes('WorkspaceVariants')) {\n const appliedRules = variantConfig?.sortedMatches.map(({ pattern, specificity }) => ({ pattern, specificity }));\n await addExtensionsToMerge(variantsExtensions, 'WorkspaceVariants', { appliedRules });\n }\n continuePropagating = continuePropagating && (variantConfig?.propagate ?? true);\n // Do not apply default extensions on the default extensions (it will create infinite loop when loading them)\n const isDefaultExtension = wsDefaultExtensions?.findExtension(componentId.toString(), true, true);\n if (\n wsDefaultExtensions &&\n continuePropagating &&\n !isDefaultExtension &&\n !excludeOrigins.includes('WorkspaceDefault')\n ) {\n await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');\n }\n if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {\n await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');\n }\n\n // It's important to do this resolution before the merge, otherwise we have issues with extensions\n // coming from scope with local scope name, as opposed to the same extension comes from the workspace with default scope name\n await Promise.all(extensionsToMerge.map((list) => this.resolveExtensionListIds(list.extensions)));\n const afterMerge = ExtensionDataList.mergeConfigs(extensionsToMerge.map((ext) => ext.extensions));\n await this.loadExtensions(afterMerge, componentId);\n const withoutRemoved = afterMerge.filter((extData) => !removedExtensionIds.includes(extData.stringId));\n const extensions = ExtensionDataList.fromArray(withoutRemoved);\n return {\n extensions,\n beforeMerge: extensionsToMerge,\n errors,\n };\n }\n\n /**\n * from the merge-config we get the dep-resolver policy as an array, because it needs to support \"force\" prop.\n * however, when we save the config, we want to save it as an object, so we need split the data into two:\n * 1. force: true, which gets saved into the config.\n * 2. force: false, which gets saved into the data.dependencies later on. see the LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook\n */\n private removeAutoDepsFromConfig(componentId: ComponentID, conf?: ExtensionDataList, fromScope = false) {\n if (!conf) return;\n const policy = conf.findCoreExtension(DependencyResolverAspect.id)?.config.policy;\n if (!policy) return;\n\n const mergeConfigObj = {};\n ['dependencies', 'devDependencies', 'peerDependencies'].forEach((key) => {\n if (!policy[key]) return;\n // this is only relevant when it is saved as an array. otherwise, it's always force: true.\n if (!Array.isArray(policy[key])) return;\n\n mergeConfigObj[key] = policy[key].filter((dep) => !dep.force);\n policy[key] = policy[key].filter((dep) => dep.force);\n\n if (!policy[key].length) {\n delete policy[key];\n return;\n }\n // convert to object\n policy[key] = policy[key].reduce((acc, current) => {\n acc[current.name] = current.version;\n return acc;\n }, {});\n });\n\n if (!fromScope) {\n if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {\n this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};\n }\n this.mergeConfigDepsResolverDataCache[componentId.toString()] = merge(\n this.mergeConfigDepsResolverDataCache[componentId.toString()],\n mergeConfigObj\n );\n }\n }\n\n private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);\n }\n\n private async warnAboutMisconfiguredEnv(componentId: ComponentID, extensionDataList: ExtensionDataList) {\n if (!(await this.workspace.hasId(componentId))) {\n // if this is a dependency and not belong to the workspace, don't show the warning\n return;\n }\n const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n const envFromEnvsAspect = envAspect?.config.env;\n if (!envFromEnvsAspect) return;\n if (this.workspace.envs.getCoreEnvsIds().includes(envFromEnvsAspect)) return;\n if (this.warnedAboutMisconfiguredEnvs.includes(envFromEnvsAspect)) return;\n let env: Component;\n try {\n const envId = await this.workspace.resolveComponentId(envFromEnvsAspect);\n env = await this.workspace.get(envId);\n } catch (err) {\n return; // unable to get the component for some reason. don't sweat it. forget about the warning\n }\n if (!this.workspace.envs.isUsingEnvEnv(env)) {\n this.warnedAboutMisconfiguredEnvs.push(envFromEnvsAspect);\n this.workspace.logger.consoleWarning(\n `env \"${envFromEnvsAspect}\" is not of type env. (correct the env's type, or component config with \"bit env set ${envFromEnvsAspect} teambit.envs/env\")`\n );\n }\n }\n\n private async filterEnvsFromExtensionsIfNeeded(\n extensionDataList: ExtensionDataList,\n envWasFoundPreviously: boolean,\n origin: ExtensionsOrigin\n ) {\n const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n const envFromEnvsAspect: string | undefined = envAspect?.config.env || envAspect?.data.id;\n const aspectsRegisteredAsEnvs = extensionDataList\n .filter((aspect) => this.workspace.envs.getEnvDefinitionByStringId(aspect.stringId))\n .map((aspect) => aspect.stringId);\n if (envWasFoundPreviously && (envAspect || aspectsRegisteredAsEnvs.length)) {\n const nonEnvs = extensionDataList.filter((e) => {\n // normally the env-id inside the envs aspect doesn't have a version, but the aspect itself has a version.\n if (\n (envFromEnvsAspect && e.stringId === envFromEnvsAspect) ||\n (envFromEnvsAspect && e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect) ||\n aspectsRegisteredAsEnvs.includes(e.stringId)\n ) {\n return false;\n }\n return true;\n });\n // still, aspect env may have other data other then config.env.\n if (envAspect) delete envAspect.config.env;\n return { extensionDataListFiltered: new ExtensionDataList(...nonEnvs), envIsCurrentlySet: true };\n }\n if (envFromEnvsAspect && (origin === 'ModelNonSpecific' || origin === 'ModelSpecific')) {\n // if env was found, search for this env in the workspace and if found, replace the env-id with the one from the workspace\n const envAspectExt = extensionDataList.find((e) => e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect);\n const ids = await this.workspace.listIds();\n const envAspectId = envAspectExt?.extensionId;\n const found = envAspectId && ids.find((id) => id._legacy.isEqualWithoutVersion(envAspectId));\n if (found) {\n envAspectExt.extensionId = found._legacy;\n }\n }\n return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n }\n\n /**\n * Load all unloaded extensions from a list\n * @param extensions list of extensions with config to load\n */\n private async loadExtensions(\n extensions: ExtensionDataList,\n originatedFrom?: ComponentID,\n throwOnError = false\n ): Promise<void> {\n const workspaceAspectsLoader = this.workspace.getWorkspaceAspectsLoader();\n return workspaceAspectsLoader.loadComponentsExtensions(extensions, originatedFrom, throwOnError);\n }\n\n /**\n * This will mutate the entries with extensionId prop to have resolved legacy id\n * This should be worked on the extension data list not the new aspect list\n * @param extensionList\n */\n private async resolveExtensionListIds(extensionList: ExtensionDataList): Promise<ExtensionDataList> {\n const promises = extensionList.map(async (entry) => {\n if (entry.extensionId) {\n const id = await this.workspace.resolveComponentId(entry.extensionId);\n entry.extensionId = id._legacy;\n }\n\n return entry;\n });\n await Promise.all(promises);\n return extensionList;\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"names":["AspectsMerger","constructor","workspace","harmony","consumer","mergeConflictFile","MergeConflictFile","path","getDepsDataOfMergeConfig","id","mergeConfigDepsResolverDataCache","toString","merge","componentId","componentFromScope","excludeOrigins","configFileExtensions","variantsExtensions","wsDefaultExtensions","mergeFromScope","errors","bitMapEntry","bitMap","getComponentIfExist","_legacy","bitMapExtensions","config","configMerge","getConflictParsed","toStringWithoutVersion","err","MergeConfigConflict","logger","error","push","adjustEnvsOnConfigMerge","conf","env","EnvsAspect","split","unmergedData","getUnmergedData","unmergedDataMergeConf","mergedConfig","getMergeConfigCombined","undefined","mergeWith","objValue","srcValue","Array","isArray","concat","mergeConfigCombined","configMergeExtensions","ExtensionDataList","fromConfigObject","removeAutoDepsFromConfig","scopeExtensions","extensions","specific","nonSpecific","partition","entry","AspectSpecificField","scopeExtensionsNonSpecific","scopeExtensionsSpecific","componentConfigFile","aspects","toLegacy","relativeComponentDir","componentDir","ignoreVersion","relative","variantConfig","variants","byRootDirAndName","fullName","clone","extensionsToMerge","envWasFoundPreviously","removedExtensionIds","addExtensionsToMerge","origin","extraData","length","filter","extData","isRemoved","map","stringId","extsWithoutRemoved","filterRemovedExtensions","selfInMergedExtensions","findExtension","toStringWithoutScopeAndVersion","extsWithoutSelf","extensionId","remove","extensionDataListFiltered","envIsCurrentlySet","filterEnvsFromExtensionsIfNeeded","warnAboutMisconfiguredEnv","setDataListAsSpecific","forEach","dataEntry","includes","extensionDataList","fromArray","continuePropagating","propagate","appliedRules","sortedMatches","pattern","specificity","isDefaultExtension","Promise","all","list","resolveExtensionListIds","afterMerge","mergeConfigs","ext","loadExtensions","withoutRemoved","beforeMerge","fromScope","policy","findCoreExtension","DependencyResolverAspect","mergeConfigObj","key","dep","force","reduce","acc","current","name","version","scope","legacyScope","objects","unmergedComponents","getEntry","hasId","envAspect","envFromEnvsAspect","envs","getCoreEnvsIds","warnedAboutMisconfiguredEnvs","envId","resolveComponentId","get","isUsingEnvEnv","consoleWarning","data","aspectsRegisteredAsEnvs","aspect","getEnvDefinitionByStringId","nonEnvs","e","envAspectExt","find","ids","listIds","envAspectId","found","isEqualWithoutVersion","Boolean","originatedFrom","opts","workspaceAspectsLoader","getWorkspaceAspectsLoader","loadComponentsExtensions","extensionList","promises"],"sources":["aspects-merger.ts"],"sourcesContent":["import { Harmony } from '@teambit/harmony';\nimport { Component, ComponentID } from '@teambit/component';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { EnvsAspect } from '@teambit/envs';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';\nimport { partition, mergeWith, merge } from 'lodash';\nimport { MergeConfigConflict } from './exceptions/merge-config-conflict';\nimport { AspectSpecificField, ExtensionsOrigin, Workspace } from './workspace';\nimport { MergeConflictFile } from './merge-conflict-file';\nimport { WorkspaceLoadAspectsOptions } from './workspace-aspects-loader';\n\nexport class AspectsMerger {\n private consumer: Consumer;\n private warnedAboutMisconfiguredEnvs: string[] = []; // cache env-ids that have been errored about not having \"env\" type\n readonly mergeConflictFile: MergeConflictFile;\n private mergeConfigDepsResolverDataCache: { [compIdStr: string]: Record<string, any> } = {};\n constructor(private workspace: Workspace, private harmony: Harmony) {\n this.consumer = workspace.consumer;\n this.mergeConflictFile = new MergeConflictFile(workspace.path);\n }\n\n getDepsDataOfMergeConfig(id: BitId) {\n return this.mergeConfigDepsResolverDataCache[id.toString()];\n }\n\n /**\n * Calculate the component config based on:\n * the config property in the .bitmap file\n * the component.json file in the component folder\n * matching pattern in the variants config\n * defaults extensions from workspace config\n * extensions from the model.\n */\n // eslint-disable-next-line complexity\n async merge(\n componentId: ComponentID,\n componentFromScope?: Component,\n excludeOrigins: ExtensionsOrigin[] = []\n ): Promise<{\n extensions: ExtensionDataList;\n beforeMerge: Array<{ extensions: ExtensionDataList; origin: ExtensionsOrigin; extraData: any }>; // useful for debugging\n errors?: Error[];\n }> {\n // TODO: consider caching this result\n let configFileExtensions: ExtensionDataList | undefined;\n let variantsExtensions: ExtensionDataList | undefined;\n let wsDefaultExtensions: ExtensionDataList | undefined;\n const mergeFromScope = true;\n const errors: Error[] = [];\n\n const bitMapEntry = this.consumer.bitMap.getComponentIfExist(componentId._legacy);\n const bitMapExtensions = bitMapEntry?.config;\n\n let configMerge: Record<string, any> | undefined;\n try {\n configMerge = this.mergeConflictFile.getConflictParsed(componentId.toStringWithoutVersion());\n } catch (err) {\n if (!(err instanceof MergeConfigConflict)) {\n throw err;\n }\n this.workspace.logger.error(`unable to parse the config file for ${componentId.toString()} due to conflicts`);\n errors.push(err);\n }\n\n const adjustEnvsOnConfigMerge = (conf: Record<string, any>) => {\n const env = conf[EnvsAspect.id]?.env;\n if (!env) return;\n const [id] = env.split('@');\n conf[EnvsAspect.id] = { env: id };\n conf[env] = {};\n };\n\n const unmergedData = this.getUnmergedData(componentId);\n const unmergedDataMergeConf = unmergedData?.mergedConfig;\n const getMergeConfigCombined = () => {\n if (!configMerge && !unmergedDataMergeConf) return undefined;\n if (!configMerge) return unmergedDataMergeConf;\n if (!unmergedDataMergeConf) return configMerge;\n\n return mergeWith(configMerge, unmergedDataMergeConf, (objValue, srcValue) => {\n if (Array.isArray(objValue)) {\n // critical for dependencyResolver.policy.*dependencies. otherwise, it will override the array\n return objValue.concat(srcValue);\n }\n return undefined;\n });\n };\n const mergeConfigCombined = getMergeConfigCombined();\n adjustEnvsOnConfigMerge(mergeConfigCombined || {});\n\n const configMergeExtensions = mergeConfigCombined\n ? ExtensionDataList.fromConfigObject(mergeConfigCombined)\n : undefined;\n\n this.removeAutoDepsFromConfig(componentId, configMergeExtensions);\n const scopeExtensions = componentFromScope?.config?.extensions || new ExtensionDataList();\n // backward compatibility. previously, it was saved as an array into the model (when there was merge-config)\n this.removeAutoDepsFromConfig(componentId, scopeExtensions, true);\n const [specific, nonSpecific] = partition(scopeExtensions, (entry) => entry.config[AspectSpecificField] === true);\n const scopeExtensionsNonSpecific = new ExtensionDataList(...nonSpecific);\n const scopeExtensionsSpecific = new ExtensionDataList(...specific);\n\n const componentConfigFile = await this.workspace.componentConfigFile(componentId);\n if (componentConfigFile) {\n configFileExtensions = componentConfigFile.aspects.toLegacy();\n }\n const relativeComponentDir = this.workspace.componentDir(componentId, { ignoreVersion: true }, { relative: true });\n const variantConfig = this.workspace.variants.byRootDirAndName(relativeComponentDir, componentId.fullName);\n if (variantConfig) {\n variantsExtensions = variantConfig.extensions.clone();\n // Do not merge from scope when there is specific variant (which is not *) that match the component\n // if (variantConfig.maxSpecificity > 0) {\n // mergeFromScope = false;\n // }\n }\n // We don't stop on each step because we want to merge the default scope even if propagate=false but the default scope is not defined\n // in the case the same extension pushed twice, the former takes precedence (opposite of Object.assign)\n const extensionsToMerge: Array<{ origin: ExtensionsOrigin; extensions: ExtensionDataList; extraData: any }> = [];\n let envWasFoundPreviously = false;\n const removedExtensionIds: string[] = [];\n\n const addExtensionsToMerge = async (extensions: ExtensionDataList, origin: ExtensionsOrigin, extraData?: any) => {\n if (!extensions.length) {\n return;\n }\n removedExtensionIds.push(...extensions.filter((extData) => extData.isRemoved).map((extData) => extData.stringId));\n const extsWithoutRemoved = extensions.filterRemovedExtensions();\n const selfInMergedExtensions = extsWithoutRemoved.findExtension(\n componentId._legacy.toStringWithoutScopeAndVersion(),\n true,\n true\n );\n const extsWithoutSelf = selfInMergedExtensions?.extensionId\n ? extsWithoutRemoved.remove(selfInMergedExtensions.extensionId)\n : extsWithoutRemoved;\n const { extensionDataListFiltered, envIsCurrentlySet } = await this.filterEnvsFromExtensionsIfNeeded(\n extsWithoutSelf,\n envWasFoundPreviously,\n origin\n );\n if (envIsCurrentlySet) {\n await this.warnAboutMisconfiguredEnv(componentId, extensions);\n envWasFoundPreviously = true;\n }\n\n extensionsToMerge.push({ origin, extensions: extensionDataListFiltered, extraData });\n };\n const setDataListAsSpecific = (extensions: ExtensionDataList) => {\n extensions.forEach((dataEntry) => (dataEntry.config[AspectSpecificField] = true));\n };\n if (bitMapExtensions && !excludeOrigins.includes('BitmapFile')) {\n const extensionDataList = ExtensionDataList.fromConfigObject(bitMapExtensions);\n setDataListAsSpecific(extensionDataList);\n await addExtensionsToMerge(extensionDataList, 'BitmapFile');\n }\n // config-merge is after the .bitmap. because normally if you have config set in .bitmap, you won't\n // be able to lane-merge. (unless you specify --ignore-config-changes).\n // so, if there is config in .bitmap, it probably happened after lane-merge.\n if (configMergeExtensions && !excludeOrigins.includes('ConfigMerge')) {\n await addExtensionsToMerge(ExtensionDataList.fromArray(configMergeExtensions), 'ConfigMerge');\n }\n if (configFileExtensions && !excludeOrigins.includes('ComponentJsonFile')) {\n setDataListAsSpecific(configFileExtensions);\n await addExtensionsToMerge(configFileExtensions, 'ComponentJsonFile');\n }\n if (!excludeOrigins.includes('ModelSpecific')) {\n await addExtensionsToMerge(ExtensionDataList.fromArray(scopeExtensionsSpecific), 'ModelSpecific');\n }\n let continuePropagating = componentConfigFile?.propagate ?? true;\n if (variantsExtensions && continuePropagating && !excludeOrigins.includes('WorkspaceVariants')) {\n const appliedRules = variantConfig?.sortedMatches.map(({ pattern, specificity }) => ({ pattern, specificity }));\n await addExtensionsToMerge(variantsExtensions, 'WorkspaceVariants', { appliedRules });\n }\n continuePropagating = continuePropagating && (variantConfig?.propagate ?? true);\n // Do not apply default extensions on the default extensions (it will create infinite loop when loading them)\n const isDefaultExtension = wsDefaultExtensions?.findExtension(componentId.toString(), true, true);\n if (\n wsDefaultExtensions &&\n continuePropagating &&\n !isDefaultExtension &&\n !excludeOrigins.includes('WorkspaceDefault')\n ) {\n await addExtensionsToMerge(wsDefaultExtensions, 'WorkspaceDefault');\n }\n if (mergeFromScope && continuePropagating && !excludeOrigins.includes('ModelNonSpecific')) {\n await addExtensionsToMerge(scopeExtensionsNonSpecific, 'ModelNonSpecific');\n }\n\n // It's important to do this resolution before the merge, otherwise we have issues with extensions\n // coming from scope with local scope name, as opposed to the same extension comes from the workspace with default scope name\n await Promise.all(extensionsToMerge.map((list) => this.resolveExtensionListIds(list.extensions)));\n const afterMerge = ExtensionDataList.mergeConfigs(extensionsToMerge.map((ext) => ext.extensions));\n await this.loadExtensions(afterMerge, componentId);\n const withoutRemoved = afterMerge.filter((extData) => !removedExtensionIds.includes(extData.stringId));\n const extensions = ExtensionDataList.fromArray(withoutRemoved);\n return {\n extensions,\n beforeMerge: extensionsToMerge,\n errors,\n };\n }\n\n /**\n * from the merge-config we get the dep-resolver policy as an array, because it needs to support \"force\" prop.\n * however, when we save the config, we want to save it as an object, so we need split the data into two:\n * 1. force: true, which gets saved into the config.\n * 2. force: false, which gets saved into the data.dependencies later on. see the LegacyDependencyResolver.registerOnComponentAutoDetectOverridesGetter hook\n */\n private removeAutoDepsFromConfig(componentId: ComponentID, conf?: ExtensionDataList, fromScope = false) {\n if (!conf) return;\n const policy = conf.findCoreExtension(DependencyResolverAspect.id)?.config.policy;\n if (!policy) return;\n\n const mergeConfigObj = {};\n ['dependencies', 'devDependencies', 'peerDependencies'].forEach((key) => {\n if (!policy[key]) return;\n // this is only relevant when it is saved as an array. otherwise, it's always force: true.\n if (!Array.isArray(policy[key])) return;\n\n mergeConfigObj[key] = policy[key].filter((dep) => !dep.force);\n policy[key] = policy[key].filter((dep) => dep.force);\n\n if (!policy[key].length) {\n delete policy[key];\n return;\n }\n // convert to object\n policy[key] = policy[key].reduce((acc, current) => {\n acc[current.name] = current.version;\n return acc;\n }, {});\n });\n\n if (!fromScope) {\n if (!this.mergeConfigDepsResolverDataCache[componentId.toString()]) {\n this.mergeConfigDepsResolverDataCache[componentId.toString()] = {};\n }\n this.mergeConfigDepsResolverDataCache[componentId.toString()] = merge(\n this.mergeConfigDepsResolverDataCache[componentId.toString()],\n mergeConfigObj\n );\n }\n }\n\n private getUnmergedData(componentId: ComponentID): UnmergedComponent | undefined {\n return this.workspace.scope.legacyScope.objects.unmergedComponents.getEntry(componentId._legacy.name);\n }\n\n private async warnAboutMisconfiguredEnv(componentId: ComponentID, extensionDataList: ExtensionDataList) {\n if (!(await this.workspace.hasId(componentId))) {\n // if this is a dependency and not belong to the workspace, don't show the warning\n return;\n }\n const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n const envFromEnvsAspect = envAspect?.config.env;\n if (!envFromEnvsAspect) return;\n if (this.workspace.envs.getCoreEnvsIds().includes(envFromEnvsAspect)) return;\n if (this.warnedAboutMisconfiguredEnvs.includes(envFromEnvsAspect)) return;\n let env: Component;\n try {\n const envId = await this.workspace.resolveComponentId(envFromEnvsAspect);\n env = await this.workspace.get(envId);\n } catch (err) {\n return; // unable to get the component for some reason. don't sweat it. forget about the warning\n }\n if (!this.workspace.envs.isUsingEnvEnv(env)) {\n this.warnedAboutMisconfiguredEnvs.push(envFromEnvsAspect);\n this.workspace.logger.consoleWarning(\n `env \"${envFromEnvsAspect}\" is not of type env. (correct the env's type, or component config with \"bit env set ${envFromEnvsAspect} teambit.envs/env\")`\n );\n }\n }\n\n private async filterEnvsFromExtensionsIfNeeded(\n extensionDataList: ExtensionDataList,\n envWasFoundPreviously: boolean,\n origin: ExtensionsOrigin\n ) {\n const envAspect = extensionDataList.findExtension(EnvsAspect.id);\n const envFromEnvsAspect: string | undefined = envAspect?.config.env || envAspect?.data.id;\n const aspectsRegisteredAsEnvs = extensionDataList\n .filter((aspect) => this.workspace.envs.getEnvDefinitionByStringId(aspect.stringId))\n .map((aspect) => aspect.stringId);\n if (envWasFoundPreviously && (envAspect || aspectsRegisteredAsEnvs.length)) {\n const nonEnvs = extensionDataList.filter((e) => {\n // normally the env-id inside the envs aspect doesn't have a version, but the aspect itself has a version.\n if (\n (envFromEnvsAspect && e.stringId === envFromEnvsAspect) ||\n (envFromEnvsAspect && e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect) ||\n aspectsRegisteredAsEnvs.includes(e.stringId)\n ) {\n return false;\n }\n return true;\n });\n // still, aspect env may have other data other then config.env.\n if (envAspect) delete envAspect.config.env;\n return { extensionDataListFiltered: new ExtensionDataList(...nonEnvs), envIsCurrentlySet: true };\n }\n if (envFromEnvsAspect && (origin === 'ModelNonSpecific' || origin === 'ModelSpecific')) {\n // if env was found, search for this env in the workspace and if found, replace the env-id with the one from the workspace\n const envAspectExt = extensionDataList.find((e) => e.extensionId?.toStringWithoutVersion() === envFromEnvsAspect);\n const ids = await this.workspace.listIds();\n const envAspectId = envAspectExt?.extensionId;\n const found = envAspectId && ids.find((id) => id._legacy.isEqualWithoutVersion(envAspectId));\n if (found) {\n envAspectExt.extensionId = found._legacy;\n }\n }\n return { extensionDataListFiltered: extensionDataList, envIsCurrentlySet: Boolean(envFromEnvsAspect) };\n }\n\n /**\n * Load all unloaded extensions from a list\n * @param extensions list of extensions with config to load\n */\n private async loadExtensions(\n extensions: ExtensionDataList,\n originatedFrom?: ComponentID,\n opts: WorkspaceLoadAspectsOptions = {}\n ): Promise<void> {\n const workspaceAspectsLoader = this.workspace.getWorkspaceAspectsLoader();\n return workspaceAspectsLoader.loadComponentsExtensions(extensions, originatedFrom, opts);\n }\n\n /**\n * This will mutate the entries with extensionId prop to have resolved legacy id\n * This should be worked on the extension data list not the new aspect list\n * @param extensionList\n */\n private async resolveExtensionListIds(extensionList: ExtensionDataList): Promise<ExtensionDataList> {\n const promises = extensionList.map(async (entry) => {\n if (entry.extensionId) {\n const id = await this.workspace.resolveComponentId(entry.extensionId);\n entry.extensionId = id._legacy;\n }\n\n return entry;\n });\n await Promise.all(promises);\n return extensionList;\n }\n}\n"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.
|
|
2
|
-
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.
|
|
1
|
+
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.1039/dist/workspace.composition.js';
|
|
2
|
+
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@0.0.1039/dist/workspace.docs.mdx';
|
|
3
3
|
|
|
4
4
|
export const compositions = [compositions_0];
|
|
5
5
|
export const overview = [overview_0];
|
package/dist/types.d.ts
CHANGED
|
@@ -32,5 +32,12 @@ export interface WorkspaceExtConfig {
|
|
|
32
32
|
extensions: {
|
|
33
33
|
[extensionsId: string]: string;
|
|
34
34
|
};
|
|
35
|
+
/**
|
|
36
|
+
* If set to
|
|
37
|
+
* `true`, it allows the workspace to resolve scope's aspects from node modules
|
|
38
|
+
* installed in the workspace's `node_modules` directory. If not set or set to `false`, aspects will only be resolved
|
|
39
|
+
* from the scope aspects capsule.
|
|
40
|
+
*/
|
|
41
|
+
resolveAspectsFromNodeModules?: boolean;
|
|
35
42
|
}
|
|
36
43
|
export {};
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["interface VendorConfig {\n directory: string;\n}\n\nexport interface WorkspaceExtConfig {\n /**\n * name of the workspace.\n */\n name: string;\n\n /**\n * path to icon.\n */\n icon: string;\n\n /**\n * applies only on bit.dev. configure the main owner of your workspace\n */\n defaultOwner: string;\n\n /**\n * set the default scope when there is no matching for the component in the components array.\n */\n defaultScope: string;\n\n /**\n * set the default directory when there is no matching for the component in the components array.\n */\n defaultDirectory: string;\n\n /**\n * set the default structure of components in your project\n */\n vendor: VendorConfig;\n\n /**\n * All component extensions applied by default on all components in the workspace (except vendor components)\n */\n extensions: { [extensionsId: string]: string };\n}\n"],"mappings":""}
|
|
1
|
+
{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["interface VendorConfig {\n directory: string;\n}\n\nexport interface WorkspaceExtConfig {\n /**\n * name of the workspace.\n */\n name: string;\n\n /**\n * path to icon.\n */\n icon: string;\n\n /**\n * applies only on bit.dev. configure the main owner of your workspace\n */\n defaultOwner: string;\n\n /**\n * set the default scope when there is no matching for the component in the components array.\n */\n defaultScope: string;\n\n /**\n * set the default directory when there is no matching for the component in the components array.\n */\n defaultDirectory: string;\n\n /**\n * set the default structure of components in your project\n */\n vendor: VendorConfig;\n\n /**\n * All component extensions applied by default on all components in the workspace (except vendor components)\n */\n extensions: { [extensionsId: string]: string };\n\n /**\n * If set to\n * `true`, it allows the workspace to resolve scope's aspects from node modules\n * installed in the workspace's `node_modules` directory. If not set or set to `false`, aspects will only be resolved\n * from the scope aspects capsule.\n */\n resolveAspectsFromNodeModules?: boolean;\n}\n"],"mappings":""}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';
|
|
2
2
|
import { Harmony } from '@teambit/harmony';
|
|
3
3
|
import { AspectDefinition, AspectLoaderMain } from '@teambit/aspect-loader';
|
|
4
|
-
import { ComponentID, ResolveAspectsOptions } from '@teambit/component';
|
|
4
|
+
import { ComponentID, LoadAspectsOptions, ResolveAspectsOptions } from '@teambit/component';
|
|
5
5
|
import { ScopeMain } from '@teambit/scope';
|
|
6
6
|
import { Logger } from '@teambit/logger';
|
|
7
7
|
import { EnvsMain } from '@teambit/envs';
|
|
@@ -11,7 +11,7 @@ import { OnAspectsResolveSlot, OnRootAspectAddedSlot } from './workspace.provide
|
|
|
11
11
|
export declare type GetConfiguredUserAspectsPackagesOptions = {
|
|
12
12
|
externalsOnly?: boolean;
|
|
13
13
|
};
|
|
14
|
-
export declare type WorkspaceLoadAspectsOptions = {
|
|
14
|
+
export declare type WorkspaceLoadAspectsOptions = LoadAspectsOptions & {
|
|
15
15
|
useScopeAspectsCapsule?: boolean;
|
|
16
16
|
};
|
|
17
17
|
export declare type AspectPackage = {
|
|
@@ -28,9 +28,10 @@ export declare class WorkspaceAspectsLoader {
|
|
|
28
28
|
private harmony;
|
|
29
29
|
private onAspectsResolveSlot;
|
|
30
30
|
private onRootAspectAddedSlot;
|
|
31
|
+
private resolveAspectsFromNodeModules;
|
|
31
32
|
private consumer;
|
|
32
33
|
private resolvedInstalledAspects;
|
|
33
|
-
constructor(workspace: Workspace, scope: ScopeMain, aspectLoader: AspectLoaderMain, envs: EnvsMain, dependencyResolver: DependencyResolverMain, logger: Logger, harmony: Harmony, onAspectsResolveSlot: OnAspectsResolveSlot, onRootAspectAddedSlot: OnRootAspectAddedSlot);
|
|
34
|
+
constructor(workspace: Workspace, scope: ScopeMain, aspectLoader: AspectLoaderMain, envs: EnvsMain, dependencyResolver: DependencyResolverMain, logger: Logger, harmony: Harmony, onAspectsResolveSlot: OnAspectsResolveSlot, onRootAspectAddedSlot: OnRootAspectAddedSlot, resolveAspectsFromNodeModules?: boolean);
|
|
34
35
|
/**
|
|
35
36
|
* load aspects from the workspace and if not exists in the workspace, load from the node_modules.
|
|
36
37
|
* keep in mind that the graph may have circles.
|
|
@@ -84,7 +85,7 @@ export declare class WorkspaceAspectsLoader {
|
|
|
84
85
|
* in such case, I can't install both version into the root of the node_modules so I need to place it somewhere else (capsules)
|
|
85
86
|
* @param extensions list of extensions with config to load
|
|
86
87
|
*/
|
|
87
|
-
loadComponentsExtensions(extensions: ExtensionDataList, originatedFrom?: ComponentID,
|
|
88
|
+
loadComponentsExtensions(extensions: ExtensionDataList, originatedFrom?: ComponentID, opts?: WorkspaceLoadAspectsOptions): Promise<void>;
|
|
88
89
|
private isAspect;
|
|
89
90
|
/**
|
|
90
91
|
* same as `this.importAndGetMany()` with a specific error handling of ComponentNotFound
|
|
@@ -101,7 +101,7 @@ function _bitError() {
|
|
|
101
101
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
102
102
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
103
103
|
class WorkspaceAspectsLoader {
|
|
104
|
-
constructor(workspace, scope, aspectLoader, envs, dependencyResolver, logger, harmony, onAspectsResolveSlot, onRootAspectAddedSlot) {
|
|
104
|
+
constructor(workspace, scope, aspectLoader, envs, dependencyResolver, logger, harmony, onAspectsResolveSlot, onRootAspectAddedSlot, resolveAspectsFromNodeModules = false) {
|
|
105
105
|
this.workspace = workspace;
|
|
106
106
|
this.scope = scope;
|
|
107
107
|
this.aspectLoader = aspectLoader;
|
|
@@ -111,6 +111,7 @@ class WorkspaceAspectsLoader {
|
|
|
111
111
|
this.harmony = harmony;
|
|
112
112
|
this.onAspectsResolveSlot = onAspectsResolveSlot;
|
|
113
113
|
this.onRootAspectAddedSlot = onRootAspectAddedSlot;
|
|
114
|
+
this.resolveAspectsFromNodeModules = resolveAspectsFromNodeModules;
|
|
114
115
|
(0, _defineProperty2().default)(this, "consumer", void 0);
|
|
115
116
|
(0, _defineProperty2().default)(this, "resolvedInstalledAspects", void 0);
|
|
116
117
|
this.consumer = this.workspace.consumer;
|
|
@@ -121,9 +122,13 @@ class WorkspaceAspectsLoader {
|
|
|
121
122
|
* load aspects from the workspace and if not exists in the workspace, load from the node_modules.
|
|
122
123
|
* keep in mind that the graph may have circles.
|
|
123
124
|
*/
|
|
124
|
-
async loadAspects(ids = [], throwOnError
|
|
125
|
+
async loadAspects(ids = [], throwOnError, neededFor, opts = {}) {
|
|
126
|
+
const calculatedThrowOnError = throwOnError !== null && throwOnError !== void 0 ? throwOnError : false;
|
|
125
127
|
const defaultOpts = {
|
|
126
|
-
useScopeAspectsCapsule: false
|
|
128
|
+
useScopeAspectsCapsule: false,
|
|
129
|
+
throwOnError: calculatedThrowOnError,
|
|
130
|
+
hideMissingModuleError: !!this.workspace.inInstallContext,
|
|
131
|
+
ignoreErrors: false
|
|
127
132
|
};
|
|
128
133
|
const mergedOpts = _objectSpread(_objectSpread({}, defaultOpts), opts);
|
|
129
134
|
|
|
@@ -149,14 +154,19 @@ needed-for: ${neededFor || '<unknown>'}. using opts: ${JSON.stringify(mergedOpts
|
|
|
149
154
|
// This is because right now loading from the ws node_modules causes issues in some cases
|
|
150
155
|
// like for the cloud app
|
|
151
156
|
// it should be removed once we fix the issues
|
|
152
|
-
|
|
157
|
+
if (!this.resolveAspectsFromNodeModules) {
|
|
158
|
+
if (!this.resolveAspectsFromNodeModules) {
|
|
159
|
+
mergedOpts.useScopeAspectsCapsule = true;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
153
162
|
if (mergedOpts.useScopeAspectsCapsule) {
|
|
154
163
|
idsToLoadFromWs = workspaceIds;
|
|
155
164
|
const currentLane = await this.consumer.getCurrentLaneObject();
|
|
156
165
|
const nonWorkspaceIdsString = nonWorkspaceIds.map(id => id.toString());
|
|
157
166
|
try {
|
|
158
167
|
scopeAspectIds = await this.scope.loadAspects(nonWorkspaceIdsString, throwOnError, neededFor, currentLane || undefined, {
|
|
159
|
-
packageManagerConfigRootDir: this.workspace.path
|
|
168
|
+
packageManagerConfigRootDir: this.workspace.path,
|
|
169
|
+
workspaceName: this.workspace.name
|
|
160
170
|
});
|
|
161
171
|
} catch (err) {
|
|
162
172
|
if (err instanceof _exceptions().ComponentNotFound) {
|
|
@@ -173,13 +183,12 @@ needed-for: ${neededFor || '<unknown>'}. using opts: ${JSON.stringify(mergedOpts
|
|
|
173
183
|
}
|
|
174
184
|
const aspectsDefs = await this.resolveAspects(undefined, idsToLoadFromWs, _objectSpread({
|
|
175
185
|
excludeCore: true,
|
|
176
|
-
requestedOnly: false
|
|
177
|
-
throwOnError
|
|
186
|
+
requestedOnly: false
|
|
178
187
|
}, mergedOpts));
|
|
179
188
|
const {
|
|
180
189
|
manifests,
|
|
181
190
|
requireableComponents
|
|
182
|
-
} = await this.loadAspectDefsByOrder(aspectsDefs, idsWithoutCore, throwOnError);
|
|
191
|
+
} = await this.loadAspectDefsByOrder(aspectsDefs, idsWithoutCore, mergedOpts.throwOnError, mergedOpts.hideMissingModuleError, neededFor);
|
|
183
192
|
const potentialPluginsIndexes = (0, _lodash().compact)(manifests.map((manifest, index) => {
|
|
184
193
|
if (this.aspectLoader.isValidAspect(manifest)) return undefined;
|
|
185
194
|
return index;
|
|
@@ -191,12 +200,14 @@ needed-for: ${neededFor || '<unknown>'}. using opts: ${JSON.stringify(mergedOpts
|
|
|
191
200
|
});
|
|
192
201
|
// Do the require again now that the plugins defs already registered
|
|
193
202
|
const pluginsManifests = await this.aspectLoader.getManifestsFromRequireableExtensions(pluginsRequireableComponents, throwOnError);
|
|
194
|
-
await this.aspectLoader.loadExtensionsByManifests(pluginsManifests,
|
|
203
|
+
await this.aspectLoader.loadExtensionsByManifests(pluginsManifests, undefined, {
|
|
204
|
+
throwOnError
|
|
205
|
+
});
|
|
195
206
|
this.logger.debug(`${loggerPrefix} finish loading aspects`);
|
|
196
207
|
const manifestIds = manifests.map(manifest => manifest.id);
|
|
197
208
|
return (0, _lodash().compact)(manifestIds.concat(scopeAspectIds));
|
|
198
209
|
}
|
|
199
|
-
async loadAspectDefsByOrder(aspectsDefs, seeders, throwOnError) {
|
|
210
|
+
async loadAspectDefsByOrder(aspectsDefs, seeders, throwOnError, hideMissingModuleError, neededFor) {
|
|
200
211
|
const {
|
|
201
212
|
nonWorkspaceDefs
|
|
202
213
|
} = await this.groupAspectDefsByWorkspaceExistence(aspectsDefs);
|
|
@@ -211,7 +222,13 @@ needed-for: ${neededFor || '<unknown>'}. using opts: ${JSON.stringify(mergedOpts
|
|
|
211
222
|
}
|
|
212
223
|
const requireableComponents = this.aspectDefsToRequireableComponents(aspectsDefs);
|
|
213
224
|
const manifests = await this.aspectLoader.getManifestsFromRequireableExtensions(requireableComponents, throwOnError);
|
|
214
|
-
await this.aspectLoader.loadExtensionsByManifests(manifests,
|
|
225
|
+
await this.aspectLoader.loadExtensionsByManifests(manifests, {
|
|
226
|
+
seeders,
|
|
227
|
+
neededFor
|
|
228
|
+
}, {
|
|
229
|
+
throwOnError,
|
|
230
|
+
hideMissingModuleError
|
|
231
|
+
});
|
|
215
232
|
return {
|
|
216
233
|
manifests,
|
|
217
234
|
requireableComponents
|
|
@@ -258,7 +275,9 @@ needed-for: ${neededFor || '<unknown>'}. using opts: ${JSON.stringify(mergedOpts
|
|
|
258
275
|
// This is because right now loading from the ws node_modules causes issues in some cases
|
|
259
276
|
// like for the cloud app
|
|
260
277
|
// it should be removed once we fix the issues
|
|
261
|
-
|
|
278
|
+
if (!this.resolveAspectsFromNodeModules) {
|
|
279
|
+
mergedOpts.useScopeAspectsCapsule = true;
|
|
280
|
+
}
|
|
262
281
|
let componentsToResolveFromScope = nonWorkspaceComps;
|
|
263
282
|
let componentsToResolveFromInstalled = [];
|
|
264
283
|
if (!mergedOpts.useScopeAspectsCapsule) {
|
|
@@ -536,7 +555,13 @@ needed-for: ${neededFor || '<unknown>'}. using opts: ${JSON.stringify(mergedOpts
|
|
|
536
555
|
* in such case, I can't install both version into the root of the node_modules so I need to place it somewhere else (capsules)
|
|
537
556
|
* @param extensions list of extensions with config to load
|
|
538
557
|
*/
|
|
539
|
-
async loadComponentsExtensions(extensions, originatedFrom,
|
|
558
|
+
async loadComponentsExtensions(extensions, originatedFrom, opts = {}) {
|
|
559
|
+
const defaultOpts = {
|
|
560
|
+
useScopeAspectsCapsule: true,
|
|
561
|
+
throwOnError: false,
|
|
562
|
+
hideMissingModuleError: !!this.workspace.inInstallContext
|
|
563
|
+
};
|
|
564
|
+
const mergedOpts = _objectSpread(_objectSpread({}, defaultOpts), opts);
|
|
540
565
|
const extensionsIdsP = extensions.map(async extensionEntry => {
|
|
541
566
|
// Core extension
|
|
542
567
|
if (!extensionEntry.extensionId) {
|
|
@@ -554,9 +579,7 @@ needed-for: ${neededFor || '<unknown>'}. using opts: ${JSON.stringify(mergedOpts
|
|
|
554
579
|
});
|
|
555
580
|
const extensionsToLoad = (0, _lodash().difference)(extensionsIds, loadedExtensions);
|
|
556
581
|
if (!extensionsToLoad.length) return;
|
|
557
|
-
await this.loadAspects(extensionsToLoad,
|
|
558
|
-
useScopeAspectsCapsule: true
|
|
559
|
-
});
|
|
582
|
+
await this.loadAspects(extensionsToLoad, undefined, originatedFrom === null || originatedFrom === void 0 ? void 0 : originatedFrom.toString(), mergedOpts);
|
|
560
583
|
}
|
|
561
584
|
async isAspect(id) {
|
|
562
585
|
const component = await this.workspace.get(id);
|