@teambit/workspace 1.0.495 → 1.0.497
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/artifacts/__bit_junit.xml +1 -1
- package/artifacts/preview/teambit_workspace_workspace-preview.js +1 -1
- package/artifacts/schema.json +1504 -3726
- package/dist/{preview-1734279612846.js → preview-1734491866611.js} +2 -2
- package/dist/workspace-component/component-status-loader.js +1 -2
- package/dist/workspace-component/component-status-loader.js.map +1 -1
- package/dist/workspace.js +1 -3
- package/dist/workspace.js.map +1 -1
- package/package.json +36 -36
- package/workspace-component/component-status-loader.ts +8 -4
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.
|
|
2
|
-
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.
|
|
1
|
+
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.497/dist/workspace.composition.js';
|
|
2
|
+
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.497/dist/workspace.docs.mdx';
|
|
3
3
|
|
|
4
4
|
export const compositions = [compositions_0];
|
|
5
5
|
export const overview = [overview_0];
|
|
@@ -147,9 +147,8 @@ class ComponentStatusLoader {
|
|
|
147
147
|
return status;
|
|
148
148
|
}
|
|
149
149
|
const lane = await this.consumer.getCurrentLaneObject();
|
|
150
|
-
await componentFromModel.setDivergeData(this.consumer.scope.objects);
|
|
151
|
-
status.staged = await componentFromModel.isLocallyChanged(this.consumer.scope.objects, lane);
|
|
152
150
|
const versionFromFs = componentFromFileSystem.id.version;
|
|
151
|
+
status.staged = await componentFromModel.isLocallyChanged(this.consumer.scope.objects, lane, componentFromFileSystem.id);
|
|
153
152
|
const idStr = id.toString();
|
|
154
153
|
if (!componentFromFileSystem.id.hasVersion()) {
|
|
155
154
|
throw new (_legacy().ComponentOutOfSync)(idStr);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_bitError","_scope","_legacy","_legacy2","_legacy3","_legacy4","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","ComponentStatusLoader","constructor","workspace","consumer","getManyComponentsStatuses","ids","results","mapSeries","id","status","getComponentStatusById","push","_componentsStatusCache","toString","result","getStatus","componentFromModel","scope","getModelComponentIfExist","componentFromFileSystem","components","removedComponents","loadComponents","ComponentIdList","changeVersion","LATEST","length","deleted","err","ComponentNotFoundInPath","MissingBitMapComponent","notExist","ComponentsPendingImport","missingFromScope","newlyCreated","getHeadRegardlessOfLaneAsTagOrHash","VERSION_ZERO","lane","getCurrentLaneObject","setDivergeData","objects","staged","isLocallyChanged","versionFromFs","version","idStr","hasVersion","ComponentOutOfSync","versionRef","getRef","BitError","versionFromModel","getObject","hash","modified","isComponentModified","clearOneComponentCache","clearCache","exports"],"sources":["component-status-loader.ts"],"sourcesContent":["import mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { ModelComponent, VERSION_ZERO } from '@teambit/scope.objects';\nimport { Consumer, ComponentsPendingImport, ComponentOutOfSync } from '@teambit/legacy.consumer';\nimport { LATEST } from '@teambit/legacy.constants';\nimport { MissingBitMapComponent } from '@teambit/legacy.bit-map';\nimport { ComponentNotFoundInPath } from '@teambit/legacy.consumer-component';\nimport { Workspace } from '..';\n\nexport type ComponentStatusLegacy = {\n modified: boolean;\n newlyCreated: boolean;\n deleted: boolean;\n staged: boolean;\n notExist: boolean;\n missingFromScope: boolean;\n};\n\nexport type ComponentStatusResult = { id: ComponentID; status: ComponentStatusLegacy };\n\nexport class ComponentStatusLoader {\n private _componentsStatusCache: Record<string, any> = {}; // cache loaded components\n constructor(private workspace: Workspace) {}\n\n get consumer(): Consumer {\n return this.workspace.consumer;\n }\n\n async getManyComponentsStatuses(ids: ComponentID[]): Promise<ComponentStatusResult[]> {\n const results: ComponentStatusResult[] = [];\n await mapSeries(ids, async (id) => {\n const status = await this.getComponentStatusById(id);\n results.push({ id, status });\n });\n return results;\n }\n\n /**\n * Get a component status by ID. Return a ComponentStatus object.\n * Keep in mind that a result can be a partial object of ComponentStatus, e.g. { notExist: true }.\n * Each one of the ComponentStatus properties can be undefined, true or false.\n * As a result, in order to check whether a component is not modified use (status.modified === false).\n * Don't use (!status.modified) because a component may not exist and the status.modified will be undefined.\n *\n * The status may have 'true' for several properties. For example, a component can be staged and modified at the\n * same time.\n *\n * The result is cached per ID and can be called several times with no penalties.\n */\n async getComponentStatusById(id: ComponentID): Promise<ComponentStatusLegacy> {\n if (!this._componentsStatusCache[id.toString()]) {\n // don't do this: `this._componentsStatusCache[id.toString()] = await this.getStatus(id);`\n // yes, it doesn't make sense right? turns out that \"getStatus\" can call `linkIfMissingWorkspaceAspects` which\n // calls `linkToNodeModulesByIds` which deletes this cache. and makes this: `this._componentsStatusCache[id.toString()]` undefined.\n const result = await this.getStatus(id);\n this._componentsStatusCache[id.toString()] = result;\n }\n return this._componentsStatusCache[id.toString()];\n }\n\n private async getStatus(id: ComponentID) {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const status: ComponentStatusLegacy = {};\n const componentFromModel: ModelComponent | undefined = await this.consumer.scope.getModelComponentIfExist(id);\n let componentFromFileSystem;\n try {\n // change to 'latest' before loading from FS. don't change to null, otherwise, it'll cause\n // loadOne to not find model component as it assumes there is no version\n // also, don't leave the id as is, otherwise, it'll cause issues with import --merge, when\n // imported version is bigger than .bitmap, it won't find it and will consider as deleted\n const { components, removedComponents } = await this.consumer.loadComponents(\n new ComponentIdList(id.changeVersion(LATEST))\n );\n if (removedComponents.length) {\n status.deleted = true;\n return status;\n }\n componentFromFileSystem = components[0];\n } catch (err: any) {\n if (err instanceof ComponentNotFoundInPath || err instanceof MissingBitMapComponent) {\n // the file/s have been deleted or the component doesn't exist in bit.map file\n if (componentFromModel) status.deleted = true;\n else status.notExist = true;\n return status;\n }\n if (err instanceof ComponentsPendingImport) {\n status.missingFromScope;\n return status;\n }\n throw err;\n }\n if (!componentFromModel) {\n status.newlyCreated = true;\n return status;\n }\n if (componentFromModel.getHeadRegardlessOfLaneAsTagOrHash(true) === VERSION_ZERO) {\n status.newlyCreated = true;\n return status;\n }\n\n const lane = await this.consumer.getCurrentLaneObject();\n await componentFromModel.setDivergeData(this.consumer.scope.objects);\n status.staged = await componentFromModel.isLocallyChanged(this.consumer.scope.objects, lane);\n const versionFromFs = componentFromFileSystem.id.version;\n const idStr = id.toString();\n if (!componentFromFileSystem.id.hasVersion()) {\n throw new ComponentOutOfSync(idStr);\n }\n // TODO: instead of doing that like this we should use:\n // const versionFromModel = await componentFromModel.loadVersion(versionFromFs, this.consumer.scope.objects);\n // it looks like it's exactly the same code but it's not working from some reason\n const versionRef = componentFromModel.getRef(versionFromFs);\n if (!versionRef) throw new BitError(`version ${versionFromFs} was not found in ${idStr}`);\n const versionFromModel = await this.consumer.scope.getObject(versionRef.hash);\n if (!versionFromModel) {\n throw new BitError(`failed loading version ${versionFromFs} of ${idStr} from the scope`);\n }\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n status.modified = await this.consumer.isComponentModified(versionFromModel, componentFromFileSystem);\n return status;\n }\n\n clearOneComponentCache(id: ComponentID) {\n delete this._componentsStatusCache[id.toString()];\n }\n\n clearCache() {\n this._componentsStatusCache = {};\n }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,YAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,WAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,aAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,YAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,UAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,SAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,OAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,MAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,QAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,OAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,SAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,QAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,SAAA;EAAA,MAAAR,IAAA,GAAAE,OAAA;EAAAM,QAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,SAAA;EAAA,MAAAT,IAAA,GAAAE,OAAA;EAAAO,QAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA6E,SAAAC,uBAAAS,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,gBAAAH,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAJ,CAAA,GAAAO,MAAA,CAAAC,cAAA,CAAAR,CAAA,EAAAI,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAZ,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAM,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAhB,CAAA,QAAAa,CAAA,GAAAb,CAAA,CAAAiB,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AActE,MAAMgB,qBAAqB,CAAC;EACyB;EAC1DC,WAAWA,CAASC,SAAoB,EAAE;IAAA,KAAtBA,SAAoB,GAApBA,SAAoB;IAAApB,eAAA,iCADc,CAAC,CAAC;EACb;EAE3C,IAAIqB,QAAQA,CAAA,EAAa;IACvB,OAAO,IAAI,CAACD,SAAS,CAACC,QAAQ;EAChC;EAEA,MAAMC,yBAAyBA,CAACC,GAAkB,EAAoC;IACpF,MAAMC,OAAgC,GAAG,EAAE;IAC3C,MAAM,IAAAC,qBAAS,EAACF,GAAG,EAAE,MAAOG,EAAE,IAAK;MACjC,MAAMC,MAAM,GAAG,MAAM,IAAI,CAACC,sBAAsB,CAACF,EAAE,CAAC;MACpDF,OAAO,CAACK,IAAI,CAAC;QAAEH,EAAE;QAAEC;MAAO,CAAC,CAAC;IAC9B,CAAC,CAAC;IACF,OAAOH,OAAO;EAChB;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMI,sBAAsBA,CAACF,EAAe,EAAkC;IAC5E,IAAI,CAAC,IAAI,CAACI,sBAAsB,CAACJ,EAAE,CAACK,QAAQ,CAAC,CAAC,CAAC,EAAE;MAC/C;MACA;MACA;MACA,MAAMC,MAAM,GAAG,MAAM,IAAI,CAACC,SAAS,CAACP,EAAE,CAAC;MACvC,IAAI,CAACI,sBAAsB,CAACJ,EAAE,CAACK,QAAQ,CAAC,CAAC,CAAC,GAAGC,MAAM;IACrD;IACA,OAAO,IAAI,CAACF,sBAAsB,CAACJ,EAAE,CAACK,QAAQ,CAAC,CAAC,CAAC;EACnD;EAEA,MAAcE,SAASA,CAACP,EAAe,EAAE;IACvC;IACA,MAAMC,MAA6B,GAAG,CAAC,CAAC;IACxC,MAAMO,kBAA8C,GAAG,MAAM,IAAI,CAACb,QAAQ,CAACc,KAAK,CAACC,wBAAwB,CAACV,EAAE,CAAC;IAC7G,IAAIW,uBAAuB;IAC3B,IAAI;MACF;MACA;MACA;MACA;MACA,MAAM;QAAEC,UAAU;QAAEC;MAAkB,CAAC,GAAG,MAAM,IAAI,CAAClB,QAAQ,CAACmB,cAAc,CAC1E,KAAIC,8BAAe,EAACf,EAAE,CAACgB,aAAa,CAACC,iBAAM,CAAC,CAC9C,CAAC;MACD,IAAIJ,iBAAiB,CAACK,MAAM,EAAE;QAC5BjB,MAAM,CAACkB,OAAO,GAAG,IAAI;QACrB,OAAOlB,MAAM;MACf;MACAU,uBAAuB,GAAGC,UAAU,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC,OAAOQ,GAAQ,EAAE;MACjB,IAAIA,GAAG,YAAYC,kCAAuB,IAAID,GAAG,YAAYE,iCAAsB,EAAE;QACnF;QACA,IAAId,kBAAkB,EAAEP,MAAM,CAACkB,OAAO,GAAG,IAAI,CAAC,KACzClB,MAAM,CAACsB,QAAQ,GAAG,IAAI;QAC3B,OAAOtB,MAAM;MACf;MACA,IAAImB,GAAG,YAAYI,iCAAuB,EAAE;QAC1CvB,MAAM,CAACwB,gBAAgB;QACvB,OAAOxB,MAAM;MACf;MACA,MAAMmB,GAAG;IACX;IACA,IAAI,CAACZ,kBAAkB,EAAE;MACvBP,MAAM,CAACyB,YAAY,GAAG,IAAI;MAC1B,OAAOzB,MAAM;IACf;IACA,IAAIO,kBAAkB,CAACmB,kCAAkC,CAAC,IAAI,CAAC,KAAKC,qBAAY,EAAE;MAChF3B,MAAM,CAACyB,YAAY,GAAG,IAAI;MAC1B,OAAOzB,MAAM;IACf;IAEA,MAAM4B,IAAI,GAAG,MAAM,IAAI,CAAClC,QAAQ,CAACmC,oBAAoB,CAAC,CAAC;IACvD,MAAMtB,kBAAkB,CAACuB,cAAc,CAAC,IAAI,CAACpC,QAAQ,CAACc,KAAK,CAACuB,OAAO,CAAC;IACpE/B,MAAM,CAACgC,MAAM,GAAG,MAAMzB,kBAAkB,CAAC0B,gBAAgB,CAAC,IAAI,CAACvC,QAAQ,CAACc,KAAK,CAACuB,OAAO,EAAEH,IAAI,CAAC;IAC5F,MAAMM,aAAa,GAAGxB,uBAAuB,CAACX,EAAE,CAACoC,OAAO;IACxD,MAAMC,KAAK,GAAGrC,EAAE,CAACK,QAAQ,CAAC,CAAC;IAC3B,IAAI,CAACM,uBAAuB,CAACX,EAAE,CAACsC,UAAU,CAAC,CAAC,EAAE;MAC5C,MAAM,KAAIC,4BAAkB,EAACF,KAAK,CAAC;IACrC;IACA;IACA;IACA;IACA,MAAMG,UAAU,GAAGhC,kBAAkB,CAACiC,MAAM,CAACN,aAAa,CAAC;IAC3D,IAAI,CAACK,UAAU,EAAE,MAAM,KAAIE,oBAAQ,EAAC,WAAWP,aAAa,qBAAqBE,KAAK,EAAE,CAAC;IACzF,MAAMM,gBAAgB,GAAG,MAAM,IAAI,CAAChD,QAAQ,CAACc,KAAK,CAACmC,SAAS,CAACJ,UAAU,CAACK,IAAI,CAAC;IAC7E,IAAI,CAACF,gBAAgB,EAAE;MACrB,MAAM,KAAID,oBAAQ,EAAC,0BAA0BP,aAAa,OAAOE,KAAK,iBAAiB,CAAC;IAC1F;IACA;IACApC,MAAM,CAAC6C,QAAQ,GAAG,MAAM,IAAI,CAACnD,QAAQ,CAACoD,mBAAmB,CAACJ,gBAAgB,EAAEhC,uBAAuB,CAAC;IACpG,OAAOV,MAAM;EACf;EAEA+C,sBAAsBA,CAAChD,EAAe,EAAE;IACtC,OAAO,IAAI,CAACI,sBAAsB,CAACJ,EAAE,CAACK,QAAQ,CAAC,CAAC,CAAC;EACnD;EAEA4C,UAAUA,CAAA,EAAG;IACX,IAAI,CAAC7C,sBAAsB,GAAG,CAAC,CAAC;EAClC;AACF;AAAC8C,OAAA,CAAA1D,qBAAA,GAAAA,qBAAA","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_bitError","_scope","_legacy","_legacy2","_legacy3","_legacy4","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","ComponentStatusLoader","constructor","workspace","consumer","getManyComponentsStatuses","ids","results","mapSeries","id","status","getComponentStatusById","push","_componentsStatusCache","toString","result","getStatus","componentFromModel","scope","getModelComponentIfExist","componentFromFileSystem","components","removedComponents","loadComponents","ComponentIdList","changeVersion","LATEST","length","deleted","err","ComponentNotFoundInPath","MissingBitMapComponent","notExist","ComponentsPendingImport","missingFromScope","newlyCreated","getHeadRegardlessOfLaneAsTagOrHash","VERSION_ZERO","lane","getCurrentLaneObject","versionFromFs","version","staged","isLocallyChanged","objects","idStr","hasVersion","ComponentOutOfSync","versionRef","getRef","BitError","versionFromModel","getObject","hash","modified","isComponentModified","clearOneComponentCache","clearCache","exports"],"sources":["component-status-loader.ts"],"sourcesContent":["import mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { ModelComponent, VERSION_ZERO } from '@teambit/scope.objects';\nimport { Consumer, ComponentsPendingImport, ComponentOutOfSync } from '@teambit/legacy.consumer';\nimport { LATEST } from '@teambit/legacy.constants';\nimport { MissingBitMapComponent } from '@teambit/legacy.bit-map';\nimport { ComponentNotFoundInPath, ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { Workspace } from '..';\n\nexport type ComponentStatusLegacy = {\n modified: boolean;\n newlyCreated: boolean;\n deleted: boolean;\n staged: boolean;\n notExist: boolean;\n missingFromScope: boolean;\n};\n\nexport type ComponentStatusResult = { id: ComponentID; status: ComponentStatusLegacy };\n\nexport class ComponentStatusLoader {\n private _componentsStatusCache: Record<string, any> = {}; // cache loaded components\n constructor(private workspace: Workspace) {}\n\n get consumer(): Consumer {\n return this.workspace.consumer;\n }\n\n async getManyComponentsStatuses(ids: ComponentID[]): Promise<ComponentStatusResult[]> {\n const results: ComponentStatusResult[] = [];\n await mapSeries(ids, async (id) => {\n const status = await this.getComponentStatusById(id);\n results.push({ id, status });\n });\n return results;\n }\n\n /**\n * Get a component status by ID. Return a ComponentStatus object.\n * Keep in mind that a result can be a partial object of ComponentStatus, e.g. { notExist: true }.\n * Each one of the ComponentStatus properties can be undefined, true or false.\n * As a result, in order to check whether a component is not modified use (status.modified === false).\n * Don't use (!status.modified) because a component may not exist and the status.modified will be undefined.\n *\n * The status may have 'true' for several properties. For example, a component can be staged and modified at the\n * same time.\n *\n * The result is cached per ID and can be called several times with no penalties.\n */\n async getComponentStatusById(id: ComponentID): Promise<ComponentStatusLegacy> {\n if (!this._componentsStatusCache[id.toString()]) {\n // don't do this: `this._componentsStatusCache[id.toString()] = await this.getStatus(id);`\n // yes, it doesn't make sense right? turns out that \"getStatus\" can call `linkIfMissingWorkspaceAspects` which\n // calls `linkToNodeModulesByIds` which deletes this cache. and makes this: `this._componentsStatusCache[id.toString()]` undefined.\n const result = await this.getStatus(id);\n this._componentsStatusCache[id.toString()] = result;\n }\n return this._componentsStatusCache[id.toString()];\n }\n\n private async getStatus(id: ComponentID) {\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n const status: ComponentStatusLegacy = {};\n const componentFromModel: ModelComponent | undefined = await this.consumer.scope.getModelComponentIfExist(id);\n let componentFromFileSystem: ConsumerComponent | undefined;\n try {\n // change to 'latest' before loading from FS. don't change to null, otherwise, it'll cause\n // loadOne to not find model component as it assumes there is no version\n // also, don't leave the id as is, otherwise, it'll cause issues with import --merge, when\n // imported version is bigger than .bitmap, it won't find it and will consider as deleted\n const { components, removedComponents } = await this.consumer.loadComponents(\n new ComponentIdList(id.changeVersion(LATEST))\n );\n if (removedComponents.length) {\n status.deleted = true;\n return status;\n }\n componentFromFileSystem = components[0];\n } catch (err: any) {\n if (err instanceof ComponentNotFoundInPath || err instanceof MissingBitMapComponent) {\n // the file/s have been deleted or the component doesn't exist in bit.map file\n if (componentFromModel) status.deleted = true;\n else status.notExist = true;\n return status;\n }\n if (err instanceof ComponentsPendingImport) {\n status.missingFromScope;\n return status;\n }\n throw err;\n }\n if (!componentFromModel) {\n status.newlyCreated = true;\n return status;\n }\n if (componentFromModel.getHeadRegardlessOfLaneAsTagOrHash(true) === VERSION_ZERO) {\n status.newlyCreated = true;\n return status;\n }\n\n const lane = await this.consumer.getCurrentLaneObject();\n const versionFromFs = componentFromFileSystem.id.version;\n status.staged = await componentFromModel.isLocallyChanged(\n this.consumer.scope.objects,\n lane,\n componentFromFileSystem.id\n );\n\n const idStr = id.toString();\n if (!componentFromFileSystem.id.hasVersion()) {\n throw new ComponentOutOfSync(idStr);\n }\n // TODO: instead of doing that like this we should use:\n // const versionFromModel = await componentFromModel.loadVersion(versionFromFs, this.consumer.scope.objects);\n // it looks like it's exactly the same code but it's not working from some reason\n const versionRef = componentFromModel.getRef(versionFromFs);\n if (!versionRef) throw new BitError(`version ${versionFromFs} was not found in ${idStr}`);\n const versionFromModel = await this.consumer.scope.getObject(versionRef.hash);\n if (!versionFromModel) {\n throw new BitError(`failed loading version ${versionFromFs} of ${idStr} from the scope`);\n }\n // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n status.modified = await this.consumer.isComponentModified(versionFromModel, componentFromFileSystem);\n return status;\n }\n\n clearOneComponentCache(id: ComponentID) {\n delete this._componentsStatusCache[id.toString()];\n }\n\n clearCache() {\n this._componentsStatusCache = {};\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
package/dist/workspace.js
CHANGED
|
@@ -1201,9 +1201,7 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
|
|
|
1201
1201
|
return allIds.hasWithoutVersion(componentId);
|
|
1202
1202
|
}
|
|
1203
1203
|
getIdIfExist(componentId) {
|
|
1204
|
-
|
|
1205
|
-
if (!id) return undefined;
|
|
1206
|
-
return componentId.changeVersion(id.version);
|
|
1204
|
+
return this.consumer.bitmapIdsFromCurrentLane.find(_ => _.isEqualWithoutVersion(componentId));
|
|
1207
1205
|
}
|
|
1208
1206
|
mergeBitmaps(bitmapContent, otherBitmapContent, opts = {}) {
|
|
1209
1207
|
return this.bitMap.mergeBitmaps(bitmapContent, otherBitmapContent, opts);
|