@teambit/objects 0.0.0-8b6608c77c163392ff1074022c7dce36c086bd31 → 0.0.0-8c2cf74a85cf199917ff7a7c9e73a917181bb93f

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(obj.buffer);
+    }
+    return hash.digest('hex');
+  }
+
   static mergeMultipleInstances(objectLists: ObjectList[]): ObjectList {
     const objectList = new ObjectList();
     objectLists.forEach((objList) => objectList.mergeObjectList(objList));

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-8b6608c77c163392ff1074022c7dce36c086bd31",
+  "version": "0.0.0-8c2cf74a85cf199917ff7a7c9e73a917181bb93f",
   "homepage": "https://bit.cloud/teambit/scope/objects",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.scope",
     "name": "objects",
-    "version": "8b6608c77c163392ff1074022c7dce36c086bd31"
+    "version": "8c2cf74a85cf199917ff7a7c9e73a917181bb93f"
   },
   "dependencies": {
-    "@pnpm/dependency-path": "1001.1.0",
-    "@pnpm/lockfile.types": "^1002.0.0",
-    "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",
+    "p-map-series": "2.1.0",
+    "async-mutex": "0.3.1",
     "fs-extra": "10.0.0",
     "uid-number": "0.0.6",
+    "@pnpm/dependency-path": "1001.1.2",
+    "@pnpm/lockfile.types": "^1002.0.1",
+    "semver": "7.7.1",
+    "uuid": "8.3.2",
     "@teambit/harmony": "0.4.7",
-    "@teambit/cli": "0.0.0-db56479e59017a6bfec5bef7047caf6c34e5c5b0",
     "@teambit/component-id": "1.2.4",
-    "@teambit/legacy.utils": "0.0.23",
-    "@teambit/harmony.modules.get-basic-log": "0.0.0-0a3a9c2cdf5e4bce1bdf70e46866d57497fe3f35",
+    "@teambit/graph.cleargraph": "0.0.11",
+    "@teambit/harmony.modules.concurrency": "0.0.21",
+    "@teambit/legacy.logger": "0.0.31",
+    "@teambit/toolbox.promise.map-pool": "0.0.10",
+    "@teambit/legacy.constants": "0.0.20",
+    "@teambit/legacy.utils": "0.0.29",
+    "@teambit/toolbox.crypto.sha1": "0.0.11",
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-version": "1.0.4",
-    "@teambit/component.snap-distance": "0.0.0-a356afe5dfe7f3c9d5d2256a59de3bb03b737bee",
-    "@teambit/config-store": "0.0.0-4ae5a69a7e726f055555fecba359183563ab9fd4",
+    "@teambit/harmony.modules.in-memory-cache": "0.0.24",
+    "@teambit/toolbox.fs.remove-empty-dir": "0.0.9",
     "@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/legacy.scope": "0.0.0-0d3302f45fb21f8ffe0bc161c47f2a10c66716cb",
-    "@teambit/toolbox.crypto.sha1": "0.0.7",
-    "@teambit/component.sources": "0.0.0-efa014456ccb1731af8e3235405e0163f6ace58e",
+    "@teambit/legacy.cli.error": "0.0.31",
     "@teambit/legacy-bit-id": "1.1.3",
-    "@teambit/legacy-component-log": "0.0.408",
-    "@teambit/legacy.consumer-component": "0.0.0-331c006738a542865edcf7b7f7c22fce304bb990",
-    "@teambit/legacy.consumer-config": "0.0.0-55f2dd578a1e7f7b632a34e9ebc58b081f7e8764",
-    "@teambit/legacy.extension-data": "0.0.0-a44b7009e769af3fe24e5a49b360b1d98c9750e3",
-    "@teambit/pkg.modules.semver-helper": "0.0.13",
+    "@teambit/legacy-component-log": "0.0.413",
+    "@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/semantics.doc-parser": "0.0.0-55cff53246e9b9da41826ccf8eff1324f63f57b5",
-    "@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/graph": "0.0.0-912ab71f49cedc2fcbacc472341427fddaed0cb3"
+    "@teambit/bit.get-bit-version": "0.0.11",
+    "@teambit/cli": "0.0.0-62037e848ccce631ed65b950cfcbd1fa52ae39b4",
+    "@teambit/component.snap-distance": "0.0.0-b1294df9203b97c5e8c4160219df8a4dede30669",
+    "@teambit/graph": "0.0.0-6c3f32c3713bc936d01a18266d9623531b9fee0e",
+    "@teambit/legacy.scope": "0.0.0-489d49a98bd008e2fa4f77170f4a629bca6734f3",
+    "@teambit/harmony.modules.get-basic-log": "0.0.0-dbacc309097c68aa0359e53d54727394845b99e7",
+    "@teambit/config-store": "0.0.0-d7203560dd4e08000e376ba758d28879412a84fb",
+    "@teambit/component.sources": "0.0.0-3f5a2137820e5fc0f12aa06a6878809b00360eac",
+    "@teambit/legacy.consumer-component": "0.0.0-af84730be49f8bc7baf1a0632feef80749ea5a41",
+    "@teambit/legacy.consumer-config": "0.0.0-ee13f4f049852aff5101c54966547f051f406cf3",
+    "@teambit/legacy.extension-data": "0.0.0-7a10641b5f4619f1499b49780d295c86b042518a",
+    "@teambit/semantics.doc-parser": "0.0.0-df9cd71a75fb0c49b8971d0404ccf323bb38f635"
   },
   "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"
+    "@types/semver": "7.5.8",
+    "@types/uuid": "8.3.4",
+    "@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;
-}