@teambit/objects 0.0.0-420215afca7cec9ac6474c9228f933bbe7f69a08 → 0.0.0-4263b1ed64ef563e8ee21f07834766d925c08898

package/models/model-component.ts

@@ -738,8 +738,8 @@ export default class Component extends BitObject {
       else
         throw new Error(`unable to add a new version for "${this.id()}" on main.
 this version started from an older version (${previouslyUsedVersion}), and not from the head (${head}).
-if this is done intentionally, please re-run with --detach-head (or --override-head if available).
-otherwise, please run "bit checkout head" to be up to date, then snap/tag your changes.`);
+please run "bit checkout head" to be up to date, then snap/tag your changes.
+if this is done intentionally, you can use --detach-head (or --override-head if available), but make sure you understand the implications as this is an experimental feature that may not be fully stable.`);
     } else {
       this.setHead(version.hash());
       this.detachedHeads.clearCurrent();
@@ -1205,6 +1205,27 @@ consider using --ignore-missing-artifacts flag if you're sure the artifacts are
     await this.setDivergeData(repo, undefined, undefined, workspaceId);
     const divergeData = this.getDivergeData();
     const localHashes = divergeData.snapsOnSourceOnly;
+
+    // When there's a detached head, divergeData only includes the detached head lineage.
+    // We also need to include unexported versions from the main head lineage.
+    const hasDetachedHead = this.detachedHeads && this.detachedHeads.getAllHeads().length > 0;
+    if (hasDetachedHead && this.head) {
+      // Calculate divergence from the main head as well
+      const mainHeadDivergeData = await getDivergeData({
+        repo,
+        modelComponent: this,
+        targetHead: (this.laneId ? this.calculatedRemoteHeadWhenOnLane : this.remoteHead) || null,
+        sourceHead: this.head,
+        throws: false,
+      });
+      // Add main head local versions that aren't already in localHashes
+      for (const hash of mainHeadDivergeData.snapsOnSourceOnly) {
+        if (!localHashes.find((h) => h.isEqual(hash))) {
+          localHashes.push(hash);
+        }
+      }
+    }
+
     if (!localHashes.length) return [];
     return localHashes.reverse(); // reverse to get the older first
   }

package/models/version.spec.ts

@@ -67,21 +67,13 @@ describe('Version', () => {
       it('dependencies should be an array', () => {
         expect(dependencies).to.be.an('array').and.have.lengthOf(1);
       });
-      it('dependencies should have properties id and relativePaths only', () => {
+      it('dependencies should have id property only (relativePaths removed)', () => {
         expect(dependencies[0]).to.haveOwnProperty('id');
-        expect(dependencies[0]).to.haveOwnProperty('relativePaths');
+        expect(dependencies[0]).to.not.haveOwnProperty('relativePaths');
         expect(dependencies[0]).to.not.haveOwnProperty('nonExistProperty');
-        expect(Object.keys(dependencies[0])).to.have.lengthOf(2);
-      });
-      it('relativePaths should be an array', () => {
-        expect(dependencies[0].relativePaths).to.be.an('array').and.have.lengthOf(1);
-      });
-      it('relativePaths should have properties sourceRelativePath and destinationRelativePath only', () => {
-        expect(dependencies[0].relativePaths[0]).to.haveOwnProperty('sourceRelativePath');
-        expect(dependencies[0].relativePaths[0]).to.haveOwnProperty('destinationRelativePath');
-        expect(dependencies[0].relativePaths[0]).to.not.haveOwnProperty('nonExistProperty');
-        expect(Object.keys(dependencies[0].relativePaths[0])).to.have.lengthOf(2);
+        expect(Object.keys(dependencies[0])).to.have.lengthOf(1);
       });
+      // relativePaths tests removed - no longer included in Version.id() hash for Harmony components
     });
   });
   describe('hash()', () => {

package/models/version.ts

@@ -231,19 +231,11 @@ export default class Version extends BitObject {
   id() {
     const obj = this.toObject();
 
-    // @todo: remove the entire dependencies.relativePaths from the ID (it's going to be a breaking change)
     const getDependencies = (deps: Dependencies) => {
       const clonedDependencies = deps.cloneAsString();
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-      return clonedDependencies.map((dependency: Dependency) => {
+      return clonedDependencies.map((dependency) => {
         return {
           id: dependency.id,
-          relativePaths: dependency.relativePaths.map((relativePath) => {
-            return {
-              sourceRelativePath: relativePath.sourceRelativePath,
-              destinationRelativePath: relativePath.destinationRelativePath,
-            };
-          }),
         };
       });
     };

package/objects/object-list.ts

@@ -2,6 +2,7 @@ import tarStream from 'tar-stream';
 import { pMapPool } from '@teambit/toolbox.promise.map-pool';
 import { compact } from 'lodash';
 import { Readable, PassThrough, pipeline } from 'stream';
+import crypto from 'crypto';
 import BitObject from './object';
 import { BitObjectList } from './bit-object-list';
 import Ref from './ref';
@@ -52,6 +53,19 @@ export class ObjectList {
     return this.objects.length;
   }
 
+  /**
+   * Generates a SHA1 hash from all object buffers.
+   * Used to identify duplicate export requests during retries.
+   * Performance wise, it's not too bad. ~98ms for 150 components on CircleCI.
+   */
+  getSha1Hash(): string {
+    const hash = crypto.createHash('sha1');
+    for (const obj of this.objects) {
+      hash.update(new Uint8Array(obj.buffer));
+    }
+    return hash.digest('hex');
+  }
+
   static mergeMultipleInstances(objectLists: ObjectList[]): ObjectList {
     const objectList = new ObjectList();
     objectLists.forEach((objList) => objectList.mergeObjectList(objList));

package/objects/object.ts

@@ -141,6 +141,7 @@ path: ${err.path}`);
    * prefer using `this.parseObject()`, unless it must be sync.
    */
   static parseSync(fileContents: Buffer): BitObject {
+    // @ts-ignore todo: fix after merging #9359
     const buffer = inflateSync(fileContents);
     return parse(buffer);
   }

package/objects/repository.ts

@@ -22,12 +22,11 @@ import type { ObjectItem } from './object-list';
 import { ObjectList } from './object-list';
 import BitRawObject from './raw-object';
 import Ref from './ref';
-import type { ContentTransformer } from './repository-hooks';
-import { onPersist, onRead } from './repository-hooks';
 import type { InMemoryCache } from '@teambit/harmony.modules.in-memory-cache';
 import { getMaxSizeForObjects, createInMemoryCache } from '@teambit/harmony.modules.in-memory-cache';
 import { ScopeMeta, Lane, ModelComponent } from '../models';
 
+type ContentTransformer = (content: Buffer) => Buffer;
 const OBJECTS_BACKUP_DIR = `${OBJECTS_DIR}.bak`;
 const TRASH_DIR = 'trash';
 
@@ -46,8 +45,8 @@ export default class Repository {
   constructor(scopePath: string, scopeJson: ScopeJson) {
     this.scopePath = scopePath;
     this.scopeJson = scopeJson;
-    this.onRead = onRead(scopePath, scopeJson);
-    this.onPersist = onPersist(scopePath, scopeJson);
+    this.onRead = (content: Buffer) => Repository.onPostObjectRead?.(content) || content;
+    this.onPersist = (content: Buffer) => Repository.onPreObjectPersist?.(content) || content;
     this.cache = createInMemoryCache({ maxSize: getMaxSizeForObjects() });
   }
 
@@ -90,6 +89,20 @@ export default class Repository {
 
   static onPostObjectsPersist: () => Promise<void>;
 
+  /**
+   * Hook for transforming content before objects are persisted to the filesystem.
+   * Note: This function cannot be async because it's used by the synchronous `loadSync` method
+   * which needs to maintain sync behavior for compatibility with existing code.
+   */
+  static onPreObjectPersist: (content: Buffer) => Buffer;
+
+  /**
+   * Hook for transforming content after objects are read from the filesystem.
+   * Note: This function cannot be async because it's used by the synchronous `loadSync` method
+   * which needs to maintain sync behavior for compatibility with existing code.
+   */
+  static onPostObjectRead: (content: Buffer) => Buffer;
+
   async reLoadScopeIndex() {
     this.scopeIndex = await this.loadOptionallyCreateScopeIndex();
   }

package/package.json

@@ -1,63 +1,62 @@
 {
   "name": "@teambit/objects",
-  "version": "0.0.0-420215afca7cec9ac6474c9228f933bbe7f69a08",
+  "version": "0.0.0-4263b1ed64ef563e8ee21f07834766d925c08898",
   "homepage": "https://bit.cloud/teambit/scope/objects",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.scope",
     "name": "objects",
-    "version": "420215afca7cec9ac6474c9228f933bbe7f69a08"
+    "version": "4263b1ed64ef563e8ee21f07834766d925c08898"
   },
   "dependencies": {
-    "@pnpm/dependency-path": "1001.1.0",
-    "@pnpm/lockfile.types": "^1002.0.0",
+    "@pnpm/dependency-path": "1001.1.6",
+    "@pnpm/lockfile.types": "^1002.0.5",
     "semver": "7.7.1",
     "lodash": "4.17.21",
     "uuid": "8.3.2",
     "async-mutex": "0.3.1",
     "p-map-series": "2.1.0",
     "tar-stream": "2.2.0",
-    "is-relative-path": "2.0.0",
     "fs-extra": "10.0.0",
     "uid-number": "0.0.6",
     "@teambit/harmony": "0.4.7",
+    "@teambit/cli": "0.0.1289",
     "@teambit/component-id": "1.2.4",
-    "@teambit/legacy.utils": "0.0.23",
+    "@teambit/legacy.utils": "0.0.29",
+    "@teambit/harmony.modules.get-basic-log": "0.0.90",
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-version": "1.0.4",
+    "@teambit/component.snap-distance": "0.0.90",
+    "@teambit/config-store": "0.0.169",
     "@teambit/lane-id": "0.0.312",
-    "@teambit/legacy.cli.error": "0.0.24",
-    "@teambit/legacy.constants": "0.0.14",
-    "@teambit/legacy.logger": "0.0.24",
-    "@teambit/toolbox.crypto.sha1": "0.0.7",
+    "@teambit/legacy.cli.error": "0.0.31",
+    "@teambit/legacy.constants": "0.0.20",
+    "@teambit/legacy.logger": "0.0.31",
+    "@teambit/legacy.scope": "0.0.89",
+    "@teambit/toolbox.crypto.sha1": "0.0.11",
+    "@teambit/component.sources": "0.0.141",
     "@teambit/legacy-bit-id": "1.1.3",
-    "@teambit/legacy-component-log": "0.0.408",
-    "@teambit/pkg.modules.semver-helper": "0.0.13",
+    "@teambit/legacy-component-log": "0.0.413",
+    "@teambit/legacy.consumer-component": "0.0.90",
+    "@teambit/legacy.consumer-config": "0.0.89",
+    "@teambit/legacy.extension-data": "0.0.91",
+    "@teambit/pkg.modules.semver-helper": "0.0.18",
     "@teambit/toolbox.array.duplications-finder": "0.0.3",
     "@teambit/graph.cleargraph": "0.0.11",
-    "@teambit/bit.get-bit-version": "0.0.6",
-    "@teambit/harmony.modules.concurrency": "0.0.15",
-    "@teambit/toolbox.promise.map-pool": "0.0.6",
-    "@teambit/harmony.modules.in-memory-cache": "0.0.17",
-    "@teambit/toolbox.fs.remove-empty-dir": "0.0.5",
-    "@teambit/cli": "0.0.0-caae57424b1508fa747a3dee4ebf0d3dea58d299",
-    "@teambit/harmony.modules.get-basic-log": "0.0.0-31bee6d769fdb68b53e1061b305f2951b4896901",
-    "@teambit/component.snap-distance": "0.0.0-e5ce840a4cc1c37d0d9ab05cdda957ca35ba1cfb",
-    "@teambit/config-store": "0.0.0-507e0921c023fe811a89847dbdd405ca091badd8",
-    "@teambit/legacy.scope": "0.0.0-3a16a8d0dfee5d75f435468844a824d3a2dcb99d",
-    "@teambit/component.sources": "0.0.0-02419ba08b235e0f4bdb459c1894e03ed2381c5d",
-    "@teambit/legacy.consumer-component": "0.0.0-4b1b0616a15195d07d8854f1ef490dd1ee9fdd82",
-    "@teambit/legacy.consumer-config": "0.0.0-fdda55d0da29351c3477bd6616c7aac1cdb136a2",
-    "@teambit/legacy.extension-data": "0.0.0-4eef6e6509d2baf2a66d7148aeaf1a7622cb2069",
-    "@teambit/semantics.doc-parser": "0.0.0-f913c490db1567a221bfbfc240f90c062bb09e05",
-    "@teambit/graph": "0.0.0-623bd10c15acd489c98faf81f5bef77c67ce7536"
+    "@teambit/bit.get-bit-version": "0.0.11",
+    "@teambit/semantics.doc-parser": "0.0.97",
+    "@teambit/harmony.modules.concurrency": "0.0.21",
+    "@teambit/toolbox.promise.map-pool": "0.0.10",
+    "@teambit/harmony.modules.in-memory-cache": "0.0.24",
+    "@teambit/toolbox.fs.remove-empty-dir": "0.0.9",
+    "@teambit/graph": "0.0.0-273fd9923d353a095e323ebd2f986f2e8ba6652f"
   },
   "devDependencies": {
     "@types/semver": "7.5.8",
     "@types/lodash": "4.14.165",
     "@types/uuid": "8.3.4",
     "@types/fs-extra": "9.0.7",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.75"
+    "@teambit/harmony.envs.core-aspect-env": "0.0.80"
   },
   "peerDependencies": {
     "chai": "5.2.1",

package/dist/objects/repository-hooks.d.ts

@@ -1,4 +0,0 @@
-import type { ScopeJson } from '@teambit/legacy.scope';
-export type ContentTransformer = (content: Buffer) => Buffer;
-export declare function onPersist(scopePath: string, scopeJson: ScopeJson): ContentTransformer;
-export declare function onRead(scopePath: string, scopeJson: ScopeJson): ContentTransformer;

package/dist/objects/repository-hooks.js

@@ -1,56 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.onPersist = onPersist;
-exports.onRead = onRead;
-function _isRelativePath() {
-  const data = _interopRequireDefault(require("is-relative-path"));
-  _isRelativePath = function () {
-    return data;
-  };
-  return data;
-}
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-  _path = function () {
-    return data;
-  };
-  return data;
-}
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function loadHooks(scopePath, scopeJson) {
-  const hooksPath = scopeJson.hooksPath;
-  if (hooksPath) {
-    const hooksFinalPath = (0, _isRelativePath().default)(hooksPath) ? _path().default.join(scopePath, hooksPath) : hooksPath;
-    // eslint-disable-next-line global-require, import/no-dynamic-require
-    const hooks = require(hooksFinalPath);
-    return hooks;
-  }
-  return undefined;
-}
-function onPersist(scopePath, scopeJson) {
-  const defaultFunc = content => content;
-  const hooks = loadHooks(scopePath, scopeJson);
-  if (hooks) {
-    const onReadFunction = hooks.onPersist;
-    if (onReadFunction) {
-      return onReadFunction;
-    }
-  }
-  return defaultFunc;
-}
-function onRead(scopePath, scopeJson) {
-  const defaultFunc = content => content;
-  const hooks = loadHooks(scopePath, scopeJson);
-  if (hooks) {
-    const onReadFunction = hooks.onRead;
-    if (onReadFunction) {
-      return onReadFunction;
-    }
-  }
-  return defaultFunc;
-}
-
-//# sourceMappingURL=repository-hooks.js.map

package/dist/objects/repository-hooks.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_isRelativePath","data","_interopRequireDefault","require","_path","e","__esModule","default","loadHooks","scopePath","scopeJson","hooksPath","hooksFinalPath","isRelative","path","join","hooks","undefined","onPersist","defaultFunc","content","onReadFunction","onRead"],"sources":["repository-hooks.ts"],"sourcesContent":["import isRelative from 'is-relative-path';\nimport path from 'path';\n\nimport type { ScopeJson } from '@teambit/legacy.scope';\n\nexport type ContentTransformer = (content: Buffer) => Buffer;\n\nfunction loadHooks(scopePath: string, scopeJson: ScopeJson): any | undefined {\n  const hooksPath = scopeJson.hooksPath;\n  if (hooksPath) {\n    const hooksFinalPath = isRelative(hooksPath) ? path.join(scopePath, hooksPath) : hooksPath;\n    // eslint-disable-next-line global-require, import/no-dynamic-require\n    const hooks = require(hooksFinalPath);\n    return hooks;\n  }\n  return undefined;\n}\n\nexport function onPersist(scopePath: string, scopeJson: ScopeJson): ContentTransformer {\n  const defaultFunc = (content) => content;\n  const hooks = loadHooks(scopePath, scopeJson);\n  if (hooks) {\n    const onReadFunction = hooks.onPersist;\n    if (onReadFunction) {\n      return onReadFunction;\n    }\n  }\n  return defaultFunc;\n}\n\nexport function onRead(scopePath: string, scopeJson: ScopeJson): ContentTransformer {\n  const defaultFunc = (content) => content;\n\n  const hooks = loadHooks(scopePath, scopeJson);\n  if (hooks) {\n    const onReadFunction = hooks.onRead;\n    if (onReadFunction) {\n      return onReadFunction;\n    }\n  }\n  return defaultFunc;\n}\n"],"mappings":";;;;;;;AAAA,SAAAA,gBAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,eAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,MAAA;EAAA,MAAAH,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAC,KAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAwB,SAAAC,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAMxB,SAASG,SAASA,CAACC,SAAiB,EAAEC,SAAoB,EAAmB;EAC3E,MAAMC,SAAS,GAAGD,SAAS,CAACC,SAAS;EACrC,IAAIA,SAAS,EAAE;IACb,MAAMC,cAAc,GAAG,IAAAC,yBAAU,EAACF,SAAS,CAAC,GAAGG,eAAI,CAACC,IAAI,CAACN,SAAS,EAAEE,SAAS,CAAC,GAAGA,SAAS;IAC1F;IACA,MAAMK,KAAK,GAAGb,OAAO,CAACS,cAAc,CAAC;IACrC,OAAOI,KAAK;EACd;EACA,OAAOC,SAAS;AAClB;AAEO,SAASC,SAASA,CAACT,SAAiB,EAAEC,SAAoB,EAAsB;EACrF,MAAMS,WAAW,GAAIC,OAAO,IAAKA,OAAO;EACxC,MAAMJ,KAAK,GAAGR,SAAS,CAACC,SAAS,EAAEC,SAAS,CAAC;EAC7C,IAAIM,KAAK,EAAE;IACT,MAAMK,cAAc,GAAGL,KAAK,CAACE,SAAS;IACtC,IAAIG,cAAc,EAAE;MAClB,OAAOA,cAAc;IACvB;EACF;EACA,OAAOF,WAAW;AACpB;AAEO,SAASG,MAAMA,CAACb,SAAiB,EAAEC,SAAoB,EAAsB;EAClF,MAAMS,WAAW,GAAIC,OAAO,IAAKA,OAAO;EAExC,MAAMJ,KAAK,GAAGR,SAAS,CAACC,SAAS,EAAEC,SAAS,CAAC;EAC7C,IAAIM,KAAK,EAAE;IACT,MAAMK,cAAc,GAAGL,KAAK,CAACM,MAAM;IACnC,IAAID,cAAc,EAAE;MAClB,OAAOA,cAAc;IACvB;EACF;EACA,OAAOF,WAAW;AACpB","ignoreList":[]}

package/objects/repository-hooks.ts

@@ -1,42 +0,0 @@
-import isRelative from 'is-relative-path';
-import path from 'path';
-
-import type { ScopeJson } from '@teambit/legacy.scope';
-
-export type ContentTransformer = (content: Buffer) => Buffer;
-
-function loadHooks(scopePath: string, scopeJson: ScopeJson): any | undefined {
-  const hooksPath = scopeJson.hooksPath;
-  if (hooksPath) {
-    const hooksFinalPath = isRelative(hooksPath) ? path.join(scopePath, hooksPath) : hooksPath;
-    // eslint-disable-next-line global-require, import/no-dynamic-require
-    const hooks = require(hooksFinalPath);
-    return hooks;
-  }
-  return undefined;
-}
-
-export function onPersist(scopePath: string, scopeJson: ScopeJson): ContentTransformer {
-  const defaultFunc = (content) => content;
-  const hooks = loadHooks(scopePath, scopeJson);
-  if (hooks) {
-    const onReadFunction = hooks.onPersist;
-    if (onReadFunction) {
-      return onReadFunction;
-    }
-  }
-  return defaultFunc;
-}
-
-export function onRead(scopePath: string, scopeJson: ScopeJson): ContentTransformer {
-  const defaultFunc = (content) => content;
-
-  const hooks = loadHooks(scopePath, scopeJson);
-  if (hooks) {
-    const onReadFunction = hooks.onRead;
-    if (onReadFunction) {
-      return onReadFunction;
-    }
-  }
-  return defaultFunc;
-}