@teambit/workspace 1.0.259 → 1.0.261

package/dist/{preview-1714533890836.js → preview-1714706485042.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.259/dist/workspace.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.259/dist/workspace.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.261/dist/workspace.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.261/dist/workspace.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/unuse.cmd.d.ts

@@ -0,0 +1,18 @@
+import { Command, CommandOptions } from '@teambit/cli';
+import { Workspace } from './workspace';
+export declare class UnuseCmd implements Command {
+    private workspace;
+    name: string;
+    group: string;
+    description: string;
+    arguments: {
+        name: string;
+        description: string;
+    }[];
+    alias: string;
+    options: CommandOptions;
+    loader: boolean;
+    remoteOp: boolean;
+    constructor(workspace: Workspace);
+    report([id]: [string]): Promise<any>;
+}

package/dist/unuse.cmd.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.UnuseCmd = void 0;
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+  _chalk = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+class UnuseCmd {
+  constructor(workspace) {
+    this.workspace = workspace;
+    _defineProperty(this, "name", 'unuse <component-id>');
+    _defineProperty(this, "group", 'collaborate');
+    _defineProperty(this, "description", 'unset aspects in the workspace config (opposite of "use" command)');
+    _defineProperty(this, "arguments", [{
+      name: 'component-id',
+      description: 'the component ID of the aspect'
+    }]);
+    _defineProperty(this, "alias", '');
+    _defineProperty(this, "options", []);
+    _defineProperty(this, "loader", true);
+    _defineProperty(this, "remoteOp", true);
+  }
+  async report([id]) {
+    const result = await this.workspace.unuse(id);
+    if (!result) return _chalk().default.yellow(`"${id}" was not found in the workspace.jsonc file.`);
+    return _chalk().default.green(`workspace.jsonc updated successfully! the aspect "${id}" has been removed.`);
+  }
+}
+exports.UnuseCmd = UnuseCmd;
+
+//# sourceMappingURL=unuse.cmd.js.map

package/dist/unuse.cmd.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","r","e","Symbol","toPrimitive","call","TypeError","String","Number","UnuseCmd","constructor","workspace","name","description","report","id","result","unuse","chalk","yellow","green","exports"],"sources":["unuse.cmd.ts"],"sourcesContent":["import { Command, CommandOptions } from '@teambit/cli';\nimport chalk from 'chalk';\nimport { Workspace } from './workspace';\n\nexport class UnuseCmd implements Command {\n  name = 'unuse <component-id>';\n  group = 'collaborate';\n  description = 'unset aspects in the workspace config (opposite of \"use\" command)';\n  arguments = [{ name: 'component-id', description: 'the component ID of the aspect' }];\n  alias = '';\n  options = [] as CommandOptions;\n  loader = true;\n  remoteOp = true;\n\n  constructor(private workspace: Workspace) {}\n\n  async report([id]: [string]): Promise<any> {\n    const result = await this.workspace.unuse(id);\n    if (!result) return chalk.yellow(`\"${id}\" was not found in the workspace.jsonc file.`);\n    return chalk.green(`workspace.jsonc updated successfully! the aspect \"${id}\" has been removed.`);\n  }\n}\n"],"mappings":";;;;;;AACA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0B,SAAAC,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAG,CAAA,2BAAAH,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAI,CAAA,GAAAJ,CAAA,CAAAK,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAH,CAAA,GAAAG,CAAA,CAAAG,IAAA,CAAAP,CAAA,EAAAG,CAAA,uCAAAF,CAAA,SAAAA,CAAA,YAAAO,SAAA,yEAAAL,CAAA,GAAAM,MAAA,GAAAC,MAAA,EAAAV,CAAA;AAGnB,MAAMW,QAAQ,CAAoB;EAUvCC,WAAWA,CAASC,SAAoB,EAAE;IAAA,KAAtBA,SAAoB,GAApBA,SAAoB;IAAAtB,eAAA,eATjC,sBAAsB;IAAAA,eAAA,gBACrB,aAAa;IAAAA,eAAA,sBACP,mEAAmE;IAAAA,eAAA,oBACrE,CAAC;MAAEuB,IAAI,EAAE,cAAc;MAAEC,WAAW,EAAE;IAAiC,CAAC,CAAC;IAAAxB,eAAA,gBAC7E,EAAE;IAAAA,eAAA,kBACA,EAAE;IAAAA,eAAA,iBACH,IAAI;IAAAA,eAAA,mBACF,IAAI;EAE4B;EAE3C,MAAMyB,MAAMA,CAAC,CAACC,EAAE,CAAW,EAAgB;IACzC,MAAMC,MAAM,GAAG,MAAM,IAAI,CAACL,SAAS,CAACM,KAAK,CAACF,EAAE,CAAC;IAC7C,IAAI,CAACC,MAAM,EAAE,OAAOE,gBAAK,CAACC,MAAM,CAAE,IAAGJ,EAAG,8CAA6C,CAAC;IACtF,OAAOG,gBAAK,CAACE,KAAK,CAAE,qDAAoDL,EAAG,qBAAoB,CAAC;EAClG;AACF;AAACM,OAAA,CAAAZ,QAAA,GAAAA,QAAA","ignoreList":[]}

package/dist/workspace.d.ts

@@ -3,7 +3,7 @@ import type { PubsubMain } from '@teambit/pubsub';
 import { IssuesList } from '@teambit/component-issues';
 import type { AspectLoaderMain, AspectDefinition } from '@teambit/aspect-loader';
 import { ComponentMain, Component, ComponentFactory, InvalidComponent, ResolveAspectsOptions } from '@teambit/component';
-import { ComponentScopeDirMap } from '@teambit/config';
+import { ComponentScopeDirMap, WorkspaceConfig } from '@teambit/config';
 import { DependencyResolverMain, DependencyList } from '@teambit/dependency-resolver';
 import { EnvsMain } from '@teambit/envs';
 import { GraphqlMain } from '@teambit/graphql';
@@ -287,7 +287,8 @@ export declare class Workspace implements ComponentFactory {
     clearAllComponentsCache(): void;
     clearComponentCache(id: ComponentID): void;
     warmCache(): Promise<void>;
-    cleanFromConfig(ids: ComponentID[]): Promise<void>;
+    getWorkspaceConfig(): WorkspaceConfig;
+    cleanFromConfig(ids: ComponentID[]): Promise<boolean>;
     triggerOnComponentChange(id: ComponentID, files: PathOsBasedAbsolute[], removedFiles: PathOsBasedAbsolute[], watchOpts: WatchOptions): Promise<OnComponentEventResult[]>;
     triggerOnComponentAdd(id: ComponentID, watchOpts: WatchOptions): Promise<OnComponentEventResult[]>;
     triggerOnComponentRemove(id: ComponentID): Promise<OnComponentEventResult[]>;
@@ -311,6 +312,7 @@ export declare class Workspace implements ComponentFactory {
     getDefaultExtensions(): ExtensionDataList;
     getComponentConfigVinylFile(id: ComponentID, options: EjectConfOptions, excludeLocalChanges?: boolean): Promise<JsonVinyl>;
     ejectMultipleConfigs(ids: ComponentID[], options: EjectConfOptions): Promise<EjectConfResult[]>;
+    getAspectConfigForComponent(id: ComponentID, aspectId: string): Promise<object | undefined>;
     getExtensionsFromScopeAndSpecific(id: ComponentID, excludeComponentJson?: boolean): Promise<ExtensionDataList>;
     /**
      * @deprecated use `this.idsByPattern` instead for consistency. also, it supports negation and list of patterns.
@@ -362,6 +364,7 @@ export declare class Workspace implements ComponentFactory {
     importAndGetMany(ids: Array<ComponentID>, reason?: string, loadOpts?: ComponentLoadOptions, throwOnError?: boolean): Promise<Component[]>;
     importCurrentLaneIfMissing(): Promise<Lane | undefined>;
     use(aspectIdStr: string): Promise<string>;
+    unuse(aspectIdStr: string): Promise<boolean>;
     write(component: Component, rootPath?: string): Promise<void>;
     /**
      * @todo: the return path here is Linux when asking for relative and os-based when asking for absolute. fix this to be consistent.

package/dist/workspace.js

@@ -884,14 +884,20 @@ it's possible that the version ${component.id.version} belong to ${idStr.split('
   async warmCache() {
     await this.list();
   }
-  async cleanFromConfig(ids) {
+  getWorkspaceConfig() {
     const config = this.harmony.get('teambit.harmony/config');
     const workspaceConfig = config.workspaceConfig;
     if (!workspaceConfig) throw new Error('workspace config is missing from Config aspect');
-    const hasChanged = ids.some(id => workspaceConfig.removeExtension(id.toStringWithoutVersion()));
+    return workspaceConfig;
+  }
+  async cleanFromConfig(ids) {
+    const workspaceConfig = this.getWorkspaceConfig();
+    const wereIdsRemoved = ids.map(id => workspaceConfig.removeExtension(id));
+    const hasChanged = wereIdsRemoved.some(isRemoved => isRemoved);
     if (hasChanged) await workspaceConfig.write({
       reasonForChange: 'remove components'
     });
+    return hasChanged;
   }
   async triggerOnComponentChange(id, files, removedFiles, watchOpts) {
     const component = await this.get(id);
@@ -1054,6 +1060,11 @@ it's possible that the version ${component.id.version} belong to ${idStr.split('
     await this.bitMap.write(`eject-conf (${ids.length} component(s))`);
     return EjectConfResult;
   }
+  async getAspectConfigForComponent(id, aspectId) {
+    const extensions = await this.getExtensionsFromScopeAndSpecific(id);
+    const obj = extensions.toConfigObject();
+    return obj[aspectId];
+  }
   async getExtensionsFromScopeAndSpecific(id, excludeComponentJson = false) {
     const componentFromScope = await this.scope.get(id);
     const exclude = ['WorkspaceVariants'];
@@ -1238,6 +1249,10 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     const workspaceAspectsLoader = this.getWorkspaceAspectsLoader();
     return workspaceAspectsLoader.use(aspectIdStr);
   }
+  async unuse(aspectIdStr) {
+    const compId = await this.resolveComponentId(aspectIdStr);
+    return this.cleanFromConfig([compId]);
+  }
   async write(component, rootPath) {
     await Promise.all(component.filesystem.files.map(async file => {
       const pathToWrite = rootPath ? _path2().default.join(this.path, rootPath, file.relative) : file.path;
@@ -1478,8 +1493,8 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
     if (!(0, _legacyBitId().isValidScopeName)(scopeName)) {
       throw new (_legacyBitId().InvalidScopeName)(scopeName);
     }
-    const config = this.harmony.get('teambit.harmony/config');
-    config.workspaceConfig?.setExtension(_workspace().WorkspaceAspect.id, {
+    const workspaceConfig = this.getWorkspaceConfig();
+    workspaceConfig.setExtension(_workspace().WorkspaceAspect.id, {
       defaultScope: scopeName
     }, {
       mergeIntoExisting: true,
@@ -1490,7 +1505,7 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
       this.bitMap.updateDefaultScope(this.config.defaultScope, scopeName);
     }
     this.config.defaultScope = scopeName;
-    await config.workspaceConfig?.write({
+    await workspaceConfig.write({
       reasonForChange: `default-scope (${scopeName})`
     });
     await this.bitMap.write('scope-set');
@@ -1510,9 +1525,8 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
       });
     } else {
       if (shouldMergeWithPrevious) {
-        const extensions = await this.getExtensionsFromScopeAndSpecific(id);
-        const obj = extensions.toConfigObject();
-        config = obj[aspectId] ? (0, _lodash().merge)(obj[aspectId], config) : config;
+        const existingConfig = await this.getAspectConfigForComponent(id, aspectId);
+        config = existingConfig ? (0, _lodash().merge)(existingConfig, config) : config;
       }
       this.bitMap.addComponentConfig(id, aspectId, config, shouldMergeWithExisting);
     }