@teambit/objects 0.0.0-fd60f21b81b1095052d083af7129e5c40f5903a0 → 0.0.0-ff3121b14c6880670d2b2c275634315b73294711

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

@@ -147,7 +147,6 @@ path: ${err.path}`);
   }
 
   static makeHash(str: string | Buffer): string {
-    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
     return sha1(str);
   }
 }

package/objects/raw-object.ts

@@ -8,7 +8,6 @@ export default class BitRawObject {
   headers: string[];
   type: string;
   content: Buffer;
-  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
   parsedContent: any;
   _ref: string;
 
@@ -17,7 +16,6 @@ export default class BitRawObject {
     ref: string | null | undefined,
     type: string | null | undefined,
     content: Buffer | null | undefined,
-    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
     parsedContent: any | null | undefined
   ) {
     let headers;
@@ -72,17 +70,14 @@ export default class BitRawObject {
     }
   }
 
-  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
   set ref(ref: string) {
     this._ref = ref;
   }
 
-  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
   get ref(): string {
     return this._ref;
   }
 
-  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
   get id(): string {
     switch (this.type) {
       case 'Version':
@@ -114,11 +109,7 @@ export default class BitRawObject {
     return [];
   }
 
-  static async fromDeflatedBuffer(
-    fileContents: Buffer,
-    ref: string | null | undefined
-    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
-  ): Promise<BitObject> {
+  static async fromDeflatedBuffer(fileContents: Buffer, ref: string | null | undefined): Promise<BitObject> {
     // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
     return inflate(fileContents).then((buffer) => new BitRawObject(buffer, ref));
   }
@@ -129,7 +120,6 @@ export default class BitRawObject {
    * @param {Any} parsedContent
    */
   toRealObject() {
-    // @ts-ignore
     return types[this.type].from(this.parsedContent || this.getParsedContent(), this.headers[1]);
   }
 

package/objects/repository.ts

@@ -10,7 +10,8 @@ import { pMapPool } from '@teambit/toolbox.promise.map-pool';
 import { OBJECTS_DIR } from '@teambit/legacy.constants';
 import { logger } from '@teambit/legacy.logger';
 import type { ChownOptions, PathOsBasedAbsolute } from '@teambit/legacy.utils';
-import { glob, writeFile } from '@teambit/legacy.utils';
+import { writeFile } from '@teambit/legacy.utils';
+import { glob } from 'glob';
 import { removeEmptyDir } from '@teambit/toolbox.fs.remove-empty-dir';
 import { concurrentIOLimit } from '@teambit/harmony.modules.concurrency';
 import type { Types, ScopeJson } from '@teambit/legacy.scope';
@@ -22,17 +23,15 @@ 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';
 
 export default class Repository {
-  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
   objects: { [key: string]: BitObject } = {};
   objectsToRemove: Ref[] = [];
   scopeJson: ScopeJson;
@@ -47,8 +46,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() });
   }
 
@@ -91,6 +90,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/objects/scope-index.ts

@@ -111,7 +111,6 @@ export class ScopeIndex {
   }
 
   getHashes(indexType: IndexType): string[] {
-    // @ts-ignore how to tell TS that all this.index.prop are array?
     return this.index[indexType].map((indexItem: IndexItem) => indexItem.hash);
   }
   getHashesByQuery(indexType: IndexType, filter: Function): string[] {

package/package.json

@@ -1,63 +1,63 @@
 {
   "name": "@teambit/objects",
-  "version": "0.0.0-fd60f21b81b1095052d083af7129e5c40f5903a0",
+  "version": "0.0.0-ff3121b14c6880670d2b2c275634315b73294711",
   "homepage": "https://bit.cloud/teambit/scope/objects",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.scope",
     "name": "objects",
-    "version": "fd60f21b81b1095052d083af7129e5c40f5903a0"
+    "version": "ff3121b14c6880670d2b2c275634315b73294711"
   },
   "dependencies": {
-    "@pnpm/dependency-path": "1001.1.0",
-    "@pnpm/lockfile.types": "^1002.0.0",
+    "@pnpm/dependency-path": "1001.1.7",
+    "@pnpm/lockfile.types": "^1002.0.6",
     "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",
+    "glob": "13.0.0",
     "uid-number": "0.0.6",
     "@teambit/harmony": "0.4.7",
     "@teambit/component-id": "1.2.4",
-    "@teambit/legacy.utils": "0.0.23",
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-version": "1.0.4",
     "@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-bit-id": "1.1.3",
-    "@teambit/legacy-component-log": "0.0.408",
-    "@teambit/pkg.modules.semver-helper": "0.0.13",
     "@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-ec2c4ec1f8107543e6a8cbf0d42defd5c8cbf33e",
-    "@teambit/harmony.modules.get-basic-log": "0.0.0-3f4e0b873af215bb28ff831e87141e726d5aebb7",
-    "@teambit/component.snap-distance": "0.0.0-e468fcc3c0a2692b42580ade3afba4f8e4ca397c",
-    "@teambit/config-store": "0.0.0-cd35f68dadfdd573f95a2a301dc3a9dff7305b1b",
-    "@teambit/legacy.scope": "0.0.0-0eb16c183a0e85d04e5739ac205f19a0962ffb61",
-    "@teambit/component.sources": "0.0.0-f02d56637f9b9a500567379124eafa2851377c05",
-    "@teambit/legacy.consumer-component": "0.0.0-6ade2964a0254a36ed49f924b6418d2d00a598a0",
-    "@teambit/legacy.consumer-config": "0.0.0-2329ee9bf8e29135f9f2d2c6cc6066ad08cfefca",
-    "@teambit/legacy.extension-data": "0.0.0-77f6d0ab848b40e2225559120d6be1acc049df81",
-    "@teambit/semantics.doc-parser": "0.0.0-82e76e83455a60ff203919c681abce222aea9ef2",
-    "@teambit/graph": "0.0.0-5471bee9c53dd0f09e9d397e7674f43e9917ef7e"
+    "@teambit/cli": "0.0.0-69a03b2177c66dececbe9883c1fcd9c630beda4a",
+    "@teambit/legacy.utils": "0.0.0-6295a8192f6b5690d60e820e03b50b49f6e073da",
+    "@teambit/harmony.modules.get-basic-log": "0.0.0-47a2e6f6b3937ad7e7ac6d560fb367ba0ae10cea",
+    "@teambit/component.snap-distance": "0.0.0-2274755b369ae5a0699b1b1f59e27784a89cc53a",
+    "@teambit/config-store": "0.0.0-1ff31af92694d12576e1e3a72baec12f81890d0c",
+    "@teambit/legacy.cli.error": "0.0.0-4b4ca3eae38b41b16b582e88cc71df7486bb9320",
+    "@teambit/legacy.constants": "0.0.0-d75a19d39ec69adb051d384b260cd1035a1cb3f6",
+    "@teambit/legacy.logger": "0.0.0-0cf1108d874f2b5ba9c3fd3a3b422e9bf48e99c5",
+    "@teambit/legacy.scope": "0.0.0-4d81bcba0c98a9aff72479ad04da65c4ca7d4e90",
+    "@teambit/toolbox.crypto.sha1": "0.0.0-1aab01159fc75f42007d28d2b4b7eee55c5f8022",
+    "@teambit/component.sources": "0.0.0-b3da4721a60c5b9c9cb6ea87432561899b4c15ac",
+    "@teambit/legacy-component-log": "0.0.0-de6dd7d5cab27d5a97a9550195a4baaea45bc915",
+    "@teambit/legacy.consumer-component": "0.0.0-ee4ca34eb70b6969a710bdb63d229a4b2281480c",
+    "@teambit/legacy.consumer-config": "0.0.0-83bab93821cb0e23164cdd37894626985d3f06cb",
+    "@teambit/legacy.extension-data": "0.0.0-3990447ef57cae9d7d1d1ca8a0361873d610cc14",
+    "@teambit/pkg.modules.semver-helper": "0.0.0-6390eb2fd66bae6c4e6ae5db48a0a2d5542a827f",
+    "@teambit/bit.get-bit-version": "0.0.0-c0d1877a0377936650ad85593ecd49745504282b",
+    "@teambit/semantics.doc-parser": "0.0.0-9cd4d1f915ff7bb5f83ebcb0160191ace7026628",
+    "@teambit/graph": "0.0.0-a9bb47c7ba50e86f9149a45b5f62b1af653a55de",
+    "@teambit/harmony.modules.concurrency": "0.0.0-43f782bb55ca2196348e9a1e2393ce3a8459377b",
+    "@teambit/toolbox.promise.map-pool": "0.0.0-2c58e80bf30293b35bdd68bb5b9f4ff02907c5d8",
+    "@teambit/harmony.modules.in-memory-cache": "0.0.0-b0882c18906d00edf0ca7bdd784115e84cd40a3e",
+    "@teambit/toolbox.fs.remove-empty-dir": "0.0.0-cd8f2201e578f5c349b56a8333cff10824df6629"
   },
   "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.72"
+    "@teambit/harmony.envs.core-aspect-env": "0.1.0"
   },
   "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;
-}