@teambit/isolator 0.0.1052 → 0.0.1053

package/dist/capsule-list.js

@@ -50,14 +50,19 @@ class CapsuleList extends Array {
   async toposort(depResolver) {
     const components = this.getAllComponents();
     const graph = new (_graph().Graph)();
-    components.forEach(comp => graph.setNode(new (_graph().Node)(comp.id.toString(), comp)));
-    for (const comp of components) {
+
+    // Build a graph with all the components from the current capsule list
+    components.forEach(comp => graph.setNode(new (_graph().Node)(depResolver.getPackageName(comp), comp)));
+
+    // Add edges between the components according to their interdependencies
+    for (const node of graph.nodes) {
       // eslint-disable-next-line no-await-in-loop
-      const deps = await depResolver.getComponentDependencies(comp);
+      const deps = await depResolver.getDependencies(node.attr);
       deps.forEach(dep => {
-        const depCompId = dep.componentId;
-        if (graph.hasNode(depCompId.toString())) {
-          graph.setEdge(new (_graph().Edge)(comp.id.toString(), depCompId.toString(), dep.lifecycle));
+        var _dep$getPackageName;
+        const depPkgName = (_dep$getPackageName = dep.getPackageName) === null || _dep$getPackageName === void 0 ? void 0 : _dep$getPackageName.call(dep);
+        if (depPkgName && graph.hasNode(depPkgName)) {
+          graph.setEdge(new (_graph().Edge)(node.id, depPkgName, dep.lifecycle));
         }
       });
     }

package/dist/capsule-list.js.map

@@ -1 +1 @@
-{"version":3,"names":["CapsuleList","Array","getCapsule","id","find","capsule","component","isEqual","getCapsuleByLegacyId","_legacy","getCapsuleIgnoreVersion","ignoreVersion","getCapsuleIgnoreScopeAndVersion","isEqualWithoutScopeAndVersion","getAllCapsuleDirs","map","path","getIdByPathInCapsule","pathInCapsule","normalizedPathInCapsule","normalize","found","getAllComponents","c","toposort","depResolver","components","graph","Graph","forEach","comp","setNode","Node","toString","deps","getComponentDependencies","dep","depCompId","componentId","hasNode","setEdge","Edge","lifecycle","sortedSeeders","sortedCapsules","node","attr","fromArray","capsules","capsuleUsePreviouslySavedDists","isModified","buildStatus"],"sources":["capsule-list.ts"],"sourcesContent":["import type { Component, ComponentID } from '@teambit/component';\nimport { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { Edge, Graph, Node } from '@teambit/graph.cleargraph';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { normalize } from 'path';\nimport { Capsule } from './capsule';\n\nexport default class CapsuleList extends Array<Capsule> {\n  getCapsule(id: ComponentID): Capsule | undefined {\n    return this.find((capsule) => capsule.component.id.isEqual(id));\n  }\n  getCapsuleByLegacyId(id: BitId): Capsule | undefined {\n    return this.find((capsule) => capsule.component.id._legacy.isEqual(id));\n  }\n  getCapsuleIgnoreVersion(id: ComponentID): Capsule | undefined {\n    return this.find((capsule) => capsule.component.id.isEqual(id, { ignoreVersion: true }));\n  }\n  getCapsuleIgnoreScopeAndVersion(id: ComponentID): Capsule | undefined {\n    return this.find((capsule) => capsule.component.id._legacy.isEqualWithoutScopeAndVersion(id._legacy));\n  }\n  getAllCapsuleDirs(): string[] {\n    return this.map((capsule) => capsule.path);\n  }\n  getIdByPathInCapsule(pathInCapsule: string): ComponentID | null {\n    const normalizedPathInCapsule = normalize(pathInCapsule);\n    const found = this.find((capsule) => normalizedPathInCapsule === normalize(capsule.path));\n    return found ? found.component.id : null;\n  }\n  getAllComponents(): Component[] {\n    return this.map((c) => c.component);\n  }\n  // Sort the capsules by their dependencies. The capsules with no dependencies will be first. Returns a new array.\n  async toposort(depResolver: DependencyResolverMain): Promise<CapsuleList> {\n    const components = this.getAllComponents();\n    const graph = new Graph<Component, string>();\n\n    components.forEach((comp) => graph.setNode(new Node(comp.id.toString(), comp)));\n\n    for (const comp of components) {\n      // eslint-disable-next-line no-await-in-loop\n      const deps = await depResolver.getComponentDependencies(comp);\n      deps.forEach((dep) => {\n        const depCompId = dep.componentId;\n        if (graph.hasNode(depCompId.toString())) {\n          graph.setEdge(new Edge(comp.id.toString(), depCompId.toString(), dep.lifecycle));\n        }\n      });\n    }\n\n    const sortedSeeders = graph.toposort(true);\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    const sortedCapsules: Capsule[] = sortedSeeders.map((node: Node<Component>) => this.getCapsule(node.attr.id)!);\n    return CapsuleList.fromArray(sortedCapsules);\n  }\n  static fromArray(capsules: Capsule[]) {\n    return new CapsuleList(...capsules);\n  }\n  /**\n   * determines whether or not a capsule can theoretically use the dists saved in the last snap, rather than re-compile them.\n   * practically, this optimization is used for components that have typescript as their compiler.\n   */\n  static async capsuleUsePreviouslySavedDists(component: Component): Promise<boolean> {\n    const isModified = await component.isModified();\n    return component.buildStatus === 'succeed' && !isModified;\n  }\n}\n"],"mappings":";;;;;;;;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAGe,MAAMA,WAAW,SAASC,KAAK,CAAU;EACtDC,UAAU,CAACC,EAAe,EAAuB;IAC/C,OAAO,IAAI,CAACC,IAAI,CAAEC,OAAO,IAAKA,OAAO,CAACC,SAAS,CAACH,EAAE,CAACI,OAAO,CAACJ,EAAE,CAAC,CAAC;EACjE;EACAK,oBAAoB,CAACL,EAAS,EAAuB;IACnD,OAAO,IAAI,CAACC,IAAI,CAAEC,OAAO,IAAKA,OAAO,CAACC,SAAS,CAACH,EAAE,CAACM,OAAO,CAACF,OAAO,CAACJ,EAAE,CAAC,CAAC;EACzE;EACAO,uBAAuB,CAACP,EAAe,EAAuB;IAC5D,OAAO,IAAI,CAACC,IAAI,CAAEC,OAAO,IAAKA,OAAO,CAACC,SAAS,CAACH,EAAE,CAACI,OAAO,CAACJ,EAAE,EAAE;MAAEQ,aAAa,EAAE;IAAK,CAAC,CAAC,CAAC;EAC1F;EACAC,+BAA+B,CAACT,EAAe,EAAuB;IACpE,OAAO,IAAI,CAACC,IAAI,CAAEC,OAAO,IAAKA,OAAO,CAACC,SAAS,CAACH,EAAE,CAACM,OAAO,CAACI,6BAA6B,CAACV,EAAE,CAACM,OAAO,CAAC,CAAC;EACvG;EACAK,iBAAiB,GAAa;IAC5B,OAAO,IAAI,CAACC,GAAG,CAAEV,OAAO,IAAKA,OAAO,CAACW,IAAI,CAAC;EAC5C;EACAC,oBAAoB,CAACC,aAAqB,EAAsB;IAC9D,MAAMC,uBAAuB,GAAG,IAAAC,iBAAS,EAACF,aAAa,CAAC;IACxD,MAAMG,KAAK,GAAG,IAAI,CAACjB,IAAI,CAAEC,OAAO,IAAKc,uBAAuB,KAAK,IAAAC,iBAAS,EAACf,OAAO,CAACW,IAAI,CAAC,CAAC;IACzF,OAAOK,KAAK,GAAGA,KAAK,CAACf,SAAS,CAACH,EAAE,GAAG,IAAI;EAC1C;EACAmB,gBAAgB,GAAgB;IAC9B,OAAO,IAAI,CAACP,GAAG,CAAEQ,CAAC,IAAKA,CAAC,CAACjB,SAAS,CAAC;EACrC;EACA;EACA,MAAMkB,QAAQ,CAACC,WAAmC,EAAwB;IACxE,MAAMC,UAAU,GAAG,IAAI,CAACJ,gBAAgB,EAAE;IAC1C,MAAMK,KAAK,GAAG,KAAIC,cAAK,GAAqB;IAE5CF,UAAU,CAACG,OAAO,CAAEC,IAAI,IAAKH,KAAK,CAACI,OAAO,CAAC,KAAIC,aAAI,EAACF,IAAI,CAAC3B,EAAE,CAAC8B,QAAQ,EAAE,EAAEH,IAAI,CAAC,CAAC,CAAC;IAE/E,KAAK,MAAMA,IAAI,IAAIJ,UAAU,EAAE;MAC7B;MACA,MAAMQ,IAAI,GAAG,MAAMT,WAAW,CAACU,wBAAwB,CAACL,IAAI,CAAC;MAC7DI,IAAI,CAACL,OAAO,CAAEO,GAAG,IAAK;QACpB,MAAMC,SAAS,GAAGD,GAAG,CAACE,WAAW;QACjC,IAAIX,KAAK,CAACY,OAAO,CAACF,SAAS,CAACJ,QAAQ,EAAE,CAAC,EAAE;UACvCN,KAAK,CAACa,OAAO,CAAC,KAAIC,aAAI,EAACX,IAAI,CAAC3B,EAAE,CAAC8B,QAAQ,EAAE,EAAEI,SAAS,CAACJ,QAAQ,EAAE,EAAEG,GAAG,CAACM,SAAS,CAAC,CAAC;QAClF;MACF,CAAC,CAAC;IACJ;IAEA,MAAMC,aAAa,GAAGhB,KAAK,CAACH,QAAQ,CAAC,IAAI,CAAC;IAC1C;IACA,MAAMoB,cAAyB,GAAGD,aAAa,CAAC5B,GAAG,CAAE8B,IAAqB,IAAK,IAAI,CAAC3C,UAAU,CAAC2C,IAAI,CAACC,IAAI,CAAC3C,EAAE,CAAE,CAAC;IAC9G,OAAOH,WAAW,CAAC+C,SAAS,CAACH,cAAc,CAAC;EAC9C;EACA,OAAOG,SAAS,CAACC,QAAmB,EAAE;IACpC,OAAO,IAAIhD,WAAW,CAAC,GAAGgD,QAAQ,CAAC;EACrC;EACA;AACF;AACA;AACA;EACE,aAAaC,8BAA8B,CAAC3C,SAAoB,EAAoB;IAClF,MAAM4C,UAAU,GAAG,MAAM5C,SAAS,CAAC4C,UAAU,EAAE;IAC/C,OAAO5C,SAAS,CAAC6C,WAAW,KAAK,SAAS,IAAI,CAACD,UAAU;EAC3D;AACF;AAAC"}
+{"version":3,"names":["CapsuleList","Array","getCapsule","id","find","capsule","component","isEqual","getCapsuleByLegacyId","_legacy","getCapsuleIgnoreVersion","ignoreVersion","getCapsuleIgnoreScopeAndVersion","isEqualWithoutScopeAndVersion","getAllCapsuleDirs","map","path","getIdByPathInCapsule","pathInCapsule","normalizedPathInCapsule","normalize","found","getAllComponents","c","toposort","depResolver","components","graph","Graph","forEach","comp","setNode","Node","getPackageName","node","nodes","deps","getDependencies","attr","dep","depPkgName","hasNode","setEdge","Edge","lifecycle","sortedSeeders","sortedCapsules","fromArray","capsules","capsuleUsePreviouslySavedDists","isModified","buildStatus"],"sources":["capsule-list.ts"],"sourcesContent":["import type { Component, ComponentID } from '@teambit/component';\nimport { Dependency, DependencyResolverMain } from '@teambit/dependency-resolver';\nimport { Edge, Graph, Node } from '@teambit/graph.cleargraph';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { normalize } from 'path';\nimport { Capsule } from './capsule';\n\nexport default class CapsuleList extends Array<Capsule> {\n  getCapsule(id: ComponentID): Capsule | undefined {\n    return this.find((capsule) => capsule.component.id.isEqual(id));\n  }\n  getCapsuleByLegacyId(id: BitId): Capsule | undefined {\n    return this.find((capsule) => capsule.component.id._legacy.isEqual(id));\n  }\n  getCapsuleIgnoreVersion(id: ComponentID): Capsule | undefined {\n    return this.find((capsule) => capsule.component.id.isEqual(id, { ignoreVersion: true }));\n  }\n  getCapsuleIgnoreScopeAndVersion(id: ComponentID): Capsule | undefined {\n    return this.find((capsule) => capsule.component.id._legacy.isEqualWithoutScopeAndVersion(id._legacy));\n  }\n  getAllCapsuleDirs(): string[] {\n    return this.map((capsule) => capsule.path);\n  }\n  getIdByPathInCapsule(pathInCapsule: string): ComponentID | null {\n    const normalizedPathInCapsule = normalize(pathInCapsule);\n    const found = this.find((capsule) => normalizedPathInCapsule === normalize(capsule.path));\n    return found ? found.component.id : null;\n  }\n  getAllComponents(): Component[] {\n    return this.map((c) => c.component);\n  }\n  // Sort the capsules by their dependencies. The capsules with no dependencies will be first. Returns a new array.\n  async toposort(depResolver: DependencyResolverMain): Promise<CapsuleList> {\n    const components = this.getAllComponents();\n    const graph = new Graph<Component, string>();\n\n    // Build a graph with all the components from the current capsule list\n    components.forEach((comp: Component) => graph.setNode(new Node(depResolver.getPackageName(comp), comp)));\n\n    // Add edges between the components according to their interdependencies\n    for (const node of graph.nodes) {\n      // eslint-disable-next-line no-await-in-loop\n      const deps = await depResolver.getDependencies(node.attr);\n      deps.forEach((dep: Dependency) => {\n        const depPkgName = dep.getPackageName?.();\n        if (depPkgName && graph.hasNode(depPkgName)) {\n          graph.setEdge(new Edge(node.id, depPkgName, dep.lifecycle));\n        }\n      });\n    }\n\n    const sortedSeeders = graph.toposort(true);\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    const sortedCapsules: Capsule[] = sortedSeeders.map((node: Node<Component>) => this.getCapsule(node.attr.id)!);\n    return CapsuleList.fromArray(sortedCapsules);\n  }\n  static fromArray(capsules: Capsule[]) {\n    return new CapsuleList(...capsules);\n  }\n  /**\n   * determines whether or not a capsule can theoretically use the dists saved in the last snap, rather than re-compile them.\n   * practically, this optimization is used for components that have typescript as their compiler.\n   */\n  static async capsuleUsePreviouslySavedDists(component: Component): Promise<boolean> {\n    const isModified = await component.isModified();\n    return component.buildStatus === 'succeed' && !isModified;\n  }\n}\n"],"mappings":"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"}

package/dist/{preview-1683689530779.js → preview-1683776045298.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_isolator@0.0.1052/dist/isolator.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_isolator@0.0.1052/dist/isolator.docs.md';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_isolator@0.0.1053/dist/isolator.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_isolator@0.0.1053/dist/isolator.docs.md';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/isolator",
-  "version": "0.0.1052",
+  "version": "0.0.1053",
   "homepage": "https://bit.cloud/teambit/component/isolator",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "isolator",
-    "version": "0.0.1052"
+    "version": "0.0.1053"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -27,15 +27,15 @@
     "@teambit/graph.cleargraph": "0.0.1",
     "@teambit/legacy-bit-id": "0.0.423",
     "@teambit/harmony": "0.4.6",
-    "@teambit/component": "0.0.1052",
-    "@teambit/dependency-resolver": "0.0.1052",
-    "@teambit/aspect-loader": "0.0.1052",
-    "@teambit/cli": "0.0.708",
+    "@teambit/component": "0.0.1053",
+    "@teambit/dependency-resolver": "0.0.1053",
+    "@teambit/aspect-loader": "0.0.1053",
+    "@teambit/cli": "0.0.709",
     "@teambit/component-package-version": "0.0.422",
-    "@teambit/global-config": "0.0.710",
-    "@teambit/graph": "0.0.1052",
-    "@teambit/logger": "0.0.801",
-    "@teambit/workspace.modules.node-modules-linker": "0.0.52"
+    "@teambit/global-config": "0.0.711",
+    "@teambit/graph": "0.0.1053",
+    "@teambit/logger": "0.0.802",
+    "@teambit/workspace.modules.node-modules-linker": "0.0.53"
   },
   "devDependencies": {
     "@types/react": "^17.0.8",
@@ -51,7 +51,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.488",
+    "@teambit/legacy": "1.0.489",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },