@teambit/workspace 0.0.762 → 0.0.765

package/dist/pattern.cmd.d.ts

@@ -5,6 +5,7 @@ export declare class PatternCommand implements Command {
     name: string;
     alias: string;
     description: string;
+    extendedDescription: string;
     group: string;
     private: boolean;
     options: CommandOptions;

package/dist/pattern.cmd.js

@@ -37,6 +37,14 @@ class PatternCommand {
     (0, _defineProperty2().default)(this, "name", 'pattern <pattern>');
     (0, _defineProperty2().default)(this, "alias", '');
     (0, _defineProperty2().default)(this, "description", 'list the component ids matching the given pattern');
+    (0, _defineProperty2().default)(this, "extendedDescription", `this command helps validating a pattern before using it in other commands.
+a pattern can be a simple component-id or component-name. e.g. "ui/button".
+a pattern can be used with wildcards for multiple component ids, e.g. "org.scope/utils/**".
+to enter multiple patterns, separate them by a comma, e.g. "ui/*, lib/*"
+to exclude, use "!". e.g. "ui/**, !ui/button"
+always wrap the pattern with quotes to avoid collision with shell commands.
+the matching algorithm is done by multimatch (@see https://github.com/sindresorhus/multimatch)
+`);
     (0, _defineProperty2().default)(this, "group", 'development');
     (0, _defineProperty2().default)(this, "private", false);
     (0, _defineProperty2().default)(this, "options", [['j', 'json', 'return the output as JSON']]);

package/dist/pattern.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["PatternCommand","constructor","workspace","report","pattern","ids","json","title","chalk","green","bold","length","toString","join","idsByPattern"],"sources":["pattern.cmd.ts"],"sourcesContent":["import { Command, CommandOptions } from '@teambit/cli';\nimport chalk from 'chalk';\nimport { Workspace } from './workspace';\n\nexport class PatternCommand implements Command {\n  name = 'pattern <pattern>';\n  alias = '';\n  description = 'list the component ids matching the given pattern';\n  group = 'development';\n  private = false;\n  options = [['j', 'json', 'return the output as JSON']] as CommandOptions;\n\n  constructor(private workspace: Workspace) {}\n\n  async report([pattern]: [string]) {\n    const ids = await this.json([pattern]);\n    const title = chalk.green(`found ${chalk.bold(ids.length.toString())} components matching the pattern`);\n    return `${title}\\n${ids.join('\\n')}`;\n  }\n\n  async json([pattern]: [string]) {\n    return this.workspace.idsByPattern(pattern, false);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGO,MAAMA,cAAN,CAAwC;EAQ7CC,WAAW,CAASC,SAAT,EAA+B;IAAA,KAAtBA,SAAsB,GAAtBA,SAAsB;IAAA,8CAPnC,mBAOmC;IAAA,+CANlC,EAMkC;IAAA,qDAL5B,mDAK4B;IAAA,+CAJlC,aAIkC;IAAA,iDAHhC,KAGgC;IAAA,iDAFhC,CAAC,CAAC,GAAD,EAAM,MAAN,EAAc,2BAAd,CAAD,CAEgC;EAAE;;EAEhC,MAANC,MAAM,CAAC,CAACC,OAAD,CAAD,EAAsB;IAChC,MAAMC,GAAG,GAAG,MAAM,KAAKC,IAAL,CAAU,CAACF,OAAD,CAAV,CAAlB;;IACA,MAAMG,KAAK,GAAGC,gBAAA,CAAMC,KAAN,CAAa,SAAQD,gBAAA,CAAME,IAAN,CAAWL,GAAG,CAACM,MAAJ,CAAWC,QAAX,EAAX,CAAkC,kCAAvD,CAAd;;IACA,OAAQ,GAAEL,KAAM,KAAIF,GAAG,CAACQ,IAAJ,CAAS,IAAT,CAAe,EAAnC;EACD;;EAES,MAAJP,IAAI,CAAC,CAACF,OAAD,CAAD,EAAsB;IAC9B,OAAO,KAAKF,SAAL,CAAeY,YAAf,CAA4BV,OAA5B,EAAqC,KAArC,CAAP;EACD;;AAlB4C"}
+{"version":3,"names":["PatternCommand","constructor","workspace","report","pattern","ids","json","title","chalk","green","bold","length","toString","join","idsByPattern"],"sources":["pattern.cmd.ts"],"sourcesContent":["import { Command, CommandOptions } from '@teambit/cli';\nimport chalk from 'chalk';\nimport { Workspace } from './workspace';\n\nexport class PatternCommand implements Command {\n  name = 'pattern <pattern>';\n  alias = '';\n  description = 'list the component ids matching the given pattern';\n  extendedDescription = `this command helps validating a pattern before using it in other commands.\na pattern can be a simple component-id or component-name. e.g. \"ui/button\".\na pattern can be used with wildcards for multiple component ids, e.g. \"org.scope/utils/**\".\nto enter multiple patterns, separate them by a comma, e.g. \"ui/*, lib/*\"\nto exclude, use \"!\". e.g. \"ui/**, !ui/button\"\nalways wrap the pattern with quotes to avoid collision with shell commands.\nthe matching algorithm is done by multimatch (@see https://github.com/sindresorhus/multimatch)\n`;\n\n  group = 'development';\n  private = false;\n  options = [['j', 'json', 'return the output as JSON']] as CommandOptions;\n\n  constructor(private workspace: Workspace) {}\n\n  async report([pattern]: [string]) {\n    const ids = await this.json([pattern]);\n    const title = chalk.green(`found ${chalk.bold(ids.length.toString())} components matching the pattern`);\n    return `${title}\\n${ids.join('\\n')}`;\n  }\n\n  async json([pattern]: [string]) {\n    return this.workspace.idsByPattern(pattern, false);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAGO,MAAMA,cAAN,CAAwC;EAiB7CC,WAAW,CAASC,SAAT,EAA+B;IAAA,KAAtBA,SAAsB,GAAtBA,SAAsB;IAAA,8CAhBnC,mBAgBmC;IAAA,+CAflC,EAekC;IAAA,qDAd5B,mDAc4B;IAAA,6DAbnB;AACzB;AACA;AACA;AACA;AACA;AACA;AACA,CAM4C;IAAA,+CAJlC,aAIkC;IAAA,iDAHhC,KAGgC;IAAA,iDAFhC,CAAC,CAAC,GAAD,EAAM,MAAN,EAAc,2BAAd,CAAD,CAEgC;EAAE;;EAEhC,MAANC,MAAM,CAAC,CAACC,OAAD,CAAD,EAAsB;IAChC,MAAMC,GAAG,GAAG,MAAM,KAAKC,IAAL,CAAU,CAACF,OAAD,CAAV,CAAlB;;IACA,MAAMG,KAAK,GAAGC,gBAAA,CAAMC,KAAN,CAAa,SAAQD,gBAAA,CAAME,IAAN,CAAWL,GAAG,CAACM,MAAJ,CAAWC,QAAX,EAAX,CAAkC,kCAAvD,CAAd;;IACA,OAAQ,GAAEL,KAAM,KAAIF,GAAG,CAACQ,IAAJ,CAAS,IAAT,CAAe,EAAnC;EACD;;EAES,MAAJP,IAAI,CAAC,CAACF,OAAD,CAAD,EAAsB;IAC9B,OAAO,KAAKF,SAAL,CAAeY,YAAf,CAA4BV,OAA5B,EAAqC,KAArC,CAAP;EACD;;AA3B4C"}

package/dist/workspace.d.ts

@@ -271,6 +271,8 @@ export declare class Workspace implements ComponentFactory {
      */
     private resolveScopeAspectListIds;
     /**
+     * @deprecated use `this.idsByPattern` instead for consistency. also, it supports negation and list of patterns.
+     *
      * load components into the workspace through a variants pattern.
      * @param pattern variants.
      * @param scope scope name.

package/dist/workspace.js

@@ -14,8 +14,6 @@ require("core-js/modules/es.promise.js");
 
 require("core-js/modules/es.regexp.exec.js");
 
-require("core-js/modules/es.string.trim.js");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -61,16 +59,6 @@ function _pMapSeries() {
   return data;
 }
 
-function _multimatch() {
-  const data = _interopRequireDefault(require("multimatch"));
-
-  _multimatch = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _aspectLoader() {
   const data = require("@teambit/aspect-loader");
 
@@ -1078,6 +1066,8 @@ class Workspace {
     return resolvedList;
   }
   /**
+   * @deprecated use `this.idsByPattern` instead for consistency. also, it supports negation and list of patterns.
+   *
    * load components into the workspace through a variants pattern.
    * @param pattern variants.
    * @param scope scope name.
@@ -1110,17 +1100,7 @@ class Workspace {
     }
 
     const ids = await this.listIds();
-    const patterns = pattern.split(',').map(p => p.trim()); // check also as legacyId.toString, as it doesn't have the defaultScope
-
-    const idsToCheck = id => [id.toStringWithoutVersion(), id._legacy.toStringWithoutVersion()];
-
-    const idsFiltered = ids.filter(id => (0, _multimatch().default)(idsToCheck(id), patterns).length);
-
-    if (throwForNoMatch && !idsFiltered.length) {
-      throw new (_bitError().BitError)(`unable to find any matching for "${pattern}" pattern`);
-    }
-
-    return idsFiltered;
+    return this.scope.filterIdsFromPoolIdsByPattern(pattern, ids, throwForNoMatch);
   }
   /**
    * useful for workspace commands, such as `bit build`, `bit compile`.
@@ -1136,7 +1116,8 @@ class Workspace {
     }
 
     if (pattern) {
-      return this.byPattern(pattern);
+      const ids = await this.idsByPattern(pattern);
+      return this.getMany(ids);
     }
 
     const newAndModified = await this.newAndModified();
@@ -2454,110 +2435,118 @@ your workspace.jsonc has this component-id set. you might want to remove/change
 
     let legacyId = this.consumer.getParsedIdIfExist(id.toString(), true, true);
 
-    if (!legacyId) {
-      try {
-        const idWithVersion = id.toString();
-        const [idWithoutVersion, version] = id.toString().split('@');
-
-        const _bitMapId = this.consumer.getParsedIdIfExist(idWithoutVersion, false, true); // This logic is very specific, and very sensitive for changes please do not touch this without consulting with @ran or @gilad
-        // example (partial list) cases which should be handled are:
-        // use case 1 - ws component provided with the local scope name:
-        // source id        : my-scope1/my-name1
-        // bitmap res (_id) : my-name1 (comp is tagged but not exported)
-        // local scope name : my-scope1
-        // scope content    : my-name1
-        // expected result  : my-name1
-        // use case 2 - component with same name exist in ws and scope (but with different scope name)
-        // source id        : my-scope2/my-name1
-        // bitmap res (_id) : my-name1 (comp exist in ws but it's actually different component)
-        // local scope name : my-scope1
-        // scope content    : my-scope2/my-name1
-        // expected result  : my-scope2/my-name1
-        // use case 3 - component with same name exist in ws and scope (but with different scope name) - source provided without scope name
-        // source id        : my-name1
-        // bitmap res (_id) : my-name1 (comp exist in ws but it's actually different component)
-        // local scope name : my-scope1
-        // scope content    : my-scope1/my-name1 and my-scope2/my-name1
-        // expected result  : my-name1 (get the name from the bitmap)
-        // use case 4 - component with the same name and different scope are imported into the ws
-        // source id        : my-name1
-        // bitmap res (_id) : my-scope2/my-name1 (comp exist in ws from different scope (imported))
-        // local scope name : my-scope1
-        // scope content    : my-scope2/my-name1
-        // expected result  : my-scope2/my-name1 (get the name from the bitmap)
-        // No entry in bitmap at all, search for the original input id
-
-
-        if (!_bitMapId) {
-          return await this.scope.resolveComponentId(id.toString());
-        }
+    if (legacyId) {
+      const defaultScope = await getDefaultScope(legacyId); // only reason to strip the scopeName from the given id is when this id has the defaultScope, because .bitmap
+      // doesn't have the defaultScope. if the given id doesn't have scope or has scope different than the default,
+      // then don't ignore it. search with the scope-name.
 
-        const _bitMapIdWithoutVersion = _bitMapId.toStringWithoutVersion();
+      const shouldSearchWithoutScopeInProvidedId = id.toString().startsWith(`${defaultScope}/`);
+      legacyId = this.consumer.getParsedIdIfExist(id.toString(), true, shouldSearchWithoutScopeInProvidedId);
 
-        const _bitMapIdWithVersion = _bitMapId.changeVersion(version).toString(); // The id in the bitmap has prefix which is not in the source id - the bitmap entry has scope name
-        // Handle use case 4
+      if (legacyId) {
+        return _component().ComponentID.fromLegacy(legacyId, defaultScope);
+      }
+    }
 
+    try {
+      const idWithVersion = id.toString();
+      const [idWithoutVersion, version] = id.toString().split('@');
+
+      const _bitMapId = this.consumer.getParsedIdIfExist(idWithoutVersion, false, true); // This logic is very specific, and very sensitive for changes please do not touch this without consulting with @ran or @gilad
+      // example (partial list) cases which should be handled are:
+      // use case 1 - ws component provided with the local scope name:
+      // source id        : my-scope1/my-name1
+      // bitmap res (_id) : my-name1 (comp is tagged but not exported)
+      // local scope name : my-scope1
+      // scope content    : my-name1
+      // expected result  : my-name1
+      // use case 2 - component with same name exist in ws and scope (but with different scope name)
+      // source id        : my-scope2/my-name1
+      // bitmap res (_id) : my-name1 (comp exist in ws but it's actually different component)
+      // local scope name : my-scope1
+      // scope content    : my-scope2/my-name1
+      // expected result  : my-scope2/my-name1
+      // use case 3 - component with same name exist in ws and scope (but with different scope name) - source provided without scope name
+      // source id        : my-name1
+      // bitmap res (_id) : my-name1 (comp exist in ws but it's actually different component)
+      // local scope name : my-scope1
+      // scope content    : my-scope1/my-name1 and my-scope2/my-name1
+      // expected result  : my-name1 (get the name from the bitmap)
+      // use case 4 - component with the same name and different scope are imported into the ws
+      // source id        : my-name1
+      // bitmap res (_id) : my-scope2/my-name1 (comp exist in ws from different scope (imported))
+      // local scope name : my-scope1
+      // scope content    : my-scope2/my-name1
+      // expected result  : my-scope2/my-name1 (get the name from the bitmap)
+      // No entry in bitmap at all, search for the original input id
+
+
+      if (!_bitMapId) {
+        return await this.scope.resolveComponentId(id.toString());
+      }
 
-        if (_bitMapIdWithoutVersion.endsWith(idWithoutVersion) && _bitMapIdWithoutVersion !== idWithoutVersion) {
-          return await this.scope.resolveComponentId(_bitMapIdWithVersion);
-        } // Handle case when I tagged the component locally with a default scope which is not the local scope
-        // but not exported it yet
-        // now i'm trying to load it with source id contain the default scope prefix
-        // we want to get it from the local first before assuming it's something coming from outside
+      const _bitMapIdWithoutVersion = _bitMapId.toStringWithoutVersion();
 
+      const _bitMapIdWithVersion = _bitMapId.changeVersion(version).toString(); // The id in the bitmap has prefix which is not in the source id - the bitmap entry has scope name
+      // Handle use case 4
 
-        if (!_bitMapId.scope) {
-          const defaultScopeForBitmapId = await getDefaultScope(_bitMapId, {
-            ignoreVersion: true
-          });
 
-          const getFromBitmapAddDefaultScope = () => {
-            let _bitmapIdWithVersionForSource = _bitMapId;
+      if (_bitMapIdWithoutVersion.endsWith(idWithoutVersion) && _bitMapIdWithoutVersion !== idWithoutVersion) {
+        return await this.scope.resolveComponentId(_bitMapIdWithVersion);
+      } // Handle case when I tagged the component locally with a default scope which is not the local scope
+      // but not exported it yet
+      // now i'm trying to load it with source id contain the default scope prefix
+      // we want to get it from the local first before assuming it's something coming from outside
 
-            if (version) {
-              _bitmapIdWithVersionForSource = _bitMapId.changeVersion(version);
-            }
 
-            return _component().ComponentID.fromLegacy(_bitmapIdWithVersionForSource, defaultScopeForBitmapId);
-          }; // a case when the given id contains the default scope
+      if (!_bitMapId.scope) {
+        const defaultScopeForBitmapId = await getDefaultScope(_bitMapId, {
+          ignoreVersion: true
+        });
 
+        const getFromBitmapAddDefaultScope = () => {
+          let _bitmapIdWithVersionForSource = _bitMapId;
 
-          if (idWithVersion.startsWith(`${defaultScopeForBitmapId}/${_bitMapIdWithoutVersion}`)) {
-            return getFromBitmapAddDefaultScope();
-          } // a case when the given id does not contain the default scope
+          if (version) {
+            _bitmapIdWithVersionForSource = _bitMapId.changeVersion(version);
+          }
 
+          return _component().ComponentID.fromLegacy(_bitmapIdWithVersionForSource, defaultScopeForBitmapId);
+        }; // a case when the given id contains the default scope
 
-          const fromScope = await this.scope.resolveComponentId(idWithVersion);
 
-          if (!fromScope._legacy.hasScope()) {
-            return getFromBitmapAddDefaultScope();
-          }
-        }
+        if (idWithVersion.startsWith(`${defaultScopeForBitmapId}/${_bitMapIdWithoutVersion}`)) {
+          return getFromBitmapAddDefaultScope();
+        } // a case when the given id does not contain the default scope
 
-        if (idWithoutVersion.endsWith(_bitMapIdWithoutVersion) && _bitMapIdWithoutVersion !== idWithoutVersion) {
-          // The id in the bitmap doesn't have scope, the source id has scope
-          // Handle use case 2 and use case 1
-          if (id.toString().startsWith(this.scope.name)) {
-            // Handle use case 1 - the provided id has scope name same as the local scope name
-            // we want to send it as it appear in the bitmap
-            return await this.scope.resolveComponentId(_bitMapIdWithVersion);
-          } // Handle use case 2 - the provided id has scope which is not the local scope
-          // we want to search by the source id
 
+        const fromScope = await this.scope.resolveComponentId(idWithVersion);
 
-          return await this.scope.resolveComponentId(idWithVersion);
-        } // Handle use case 3
+        if (!fromScope._legacy.hasScope()) {
+          return getFromBitmapAddDefaultScope();
+        }
+      }
+
+      if (idWithoutVersion.endsWith(_bitMapIdWithoutVersion) && _bitMapIdWithoutVersion !== idWithoutVersion) {
+        // The id in the bitmap doesn't have scope, the source id has scope
+        // Handle use case 2 and use case 1
+        if (id.toString().startsWith(this.scope.name)) {
+          // Handle use case 1 - the provided id has scope name same as the local scope name
+          // we want to send it as it appear in the bitmap
+          return await this.scope.resolveComponentId(_bitMapIdWithVersion);
+        } // Handle use case 2 - the provided id has scope which is not the local scope
+        // we want to search by the source id
 
 
         return await this.scope.resolveComponentId(idWithVersion);
-      } catch (error) {
-        legacyId = _legacyBitId().BitId.parse(id.toString(), true);
-        return _component().ComponentID.fromLegacy(legacyId);
-      }
-    }
+      } // Handle use case 3
 
-    const defaultScope = await getDefaultScope(legacyId);
-    return _component().ComponentID.fromLegacy(legacyId, defaultScope);
+
+      return await this.scope.resolveComponentId(idWithVersion);
+    } catch (error) {
+      legacyId = _legacyBitId().BitId.parse(id.toString(), true);
+      return _component().ComponentID.fromLegacy(legacyId);
+    }
   }
 
   async resolveMultipleComponentIds(ids) {