@teambit/objects 0.0.735 → 0.0.737

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export { BitObject, BitRawObject, Ref, Repository } from './objects';
 export type { ObjectWithType, ObjectsWithType } from './objects';
 export { ComponentLog, ScopeListItem, AddVersionOpts, ComponentProps, VERSION_ZERO } from './models/model-component';
 export { ComponentItem, IndexType, LaneItem } from './objects/scope-index';
-export { ObjectItem, ObjectList, ObjectItemsStream } from './objects/object-list';
+export { ObjectItem, ObjectList, ObjectItemsStream, RawObjectsMap } from './objects/object-list';
 export { BitObjectList } from './objects/bit-object-list';
 export { LaneComponent, Log as LaneLog, LaneReadmeComponent } from './models/lane';
 export { DependenciesGraph, type PackagesMap, type PackageAttributes, type DependencyEdge, type DependencyNeighbour, } from './models/dependencies-graph';

package/dist/index.js

@@ -177,6 +177,12 @@ Object.defineProperty(exports, "ObjectsReadableGenerator", {
     return _objectsReadableGenerator().ObjectsReadableGenerator;
   }
 });
+Object.defineProperty(exports, "RawObjectsMap", {
+  enumerable: true,
+  get: function () {
+    return _objectList().RawObjectsMap;
+  }
+});
 Object.defineProperty(exports, "Ref", {
   enumerable: true,
   get: function () {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_models","data","require","_objects","_modelComponent","_scopeIndex","_objectList","_bitObjectList","_lane","_dependenciesGraph","_version","_objectsReadableGenerator","_versionHistory","_laneHistory","_objectListToGraph","_objects2","_default","exports","default","ObjectsAspect"],"sources":["index.ts"],"sourcesContent":["export {\n  ModelComponent,\n  ScopeMeta,\n  Source,\n  Version,\n  Symlink,\n  Lane,\n  ExportMetadata,\n  VersionHistory,\n  LaneHistory,\n} from './models';\nexport { BitObject, BitRawObject, Ref, Repository } from './objects';\nexport type { ObjectWithType, ObjectsWithType } from './objects';\nexport { ComponentLog, ScopeListItem, AddVersionOpts, ComponentProps, VERSION_ZERO } from './models/model-component';\nexport { ComponentItem, IndexType, LaneItem } from './objects/scope-index';\nexport { ObjectItem, ObjectList, ObjectItemsStream } from './objects/object-list';\nexport { BitObjectList } from './objects/bit-object-list';\nexport { LaneComponent, Log as LaneLog, LaneReadmeComponent } from './models/lane';\nexport {\n  DependenciesGraph,\n  type PackagesMap,\n  type PackageAttributes,\n  type DependencyEdge,\n  type DependencyNeighbour,\n} from './models/dependencies-graph';\nexport { DepEdge, DepEdgeType, SourceFileModel, Log, ObjectsLoader } from './models/version';\nexport { ComponentWithCollectOptions, ObjectsReadableGenerator } from './objects/objects-readable-generator';\nexport { ScopeIndex } from './objects/scope-index';\nexport { VersionHistoryGraph } from './models/version-history';\nexport { VersionParents, versionParentsToGraph } from './models/version-history';\nexport { HistoryItem } from './models/lane-history';\nexport { IdGraph, objectListToGraph, bitObjectListToGraph } from './objects/object-list-to-graph';\n\nimport { ObjectsAspect } from './objects.aspect';\n\nexport type { ObjectsMain } from './objects.main.runtime';\nexport default ObjectsAspect;\nexport { ObjectsAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,QAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,OAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAWA,SAAAE,SAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,QAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAG,gBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,eAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,YAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,WAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,YAAA;EAAA,MAAAL,IAAA,GAAAC,OAAA;EAAAI,WAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,eAAA;EAAA,MAAAN,IAAA,GAAAC,OAAA;EAAAK,cAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,MAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,KAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,mBAAA;EAAA,MAAAR,IAAA,GAAAC,OAAA;EAAAO,kBAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAOA,SAAAS,SAAA;EAAA,MAAAT,IAAA,GAAAC,OAAA;EAAAQ,QAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,0BAAA;EAAA,MAAAV,IAAA,GAAAC,OAAA;EAAAS,yBAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAW,gBAAA;EAAA,MAAAX,IAAA,GAAAC,OAAA;EAAAU,eAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAY,aAAA;EAAA,MAAAZ,IAAA,GAAAC,OAAA;EAAAW,YAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,mBAAA;EAAA,MAAAb,IAAA,GAAAC,OAAA;EAAAY,kBAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAc,UAAA;EAAA,MAAAd,IAAA,GAAAC,OAAA;EAAAa,SAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiD,IAAAe,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAGlCC,yBAAa","ignoreList":[]}
+{"version":3,"names":["_models","data","require","_objects","_modelComponent","_scopeIndex","_objectList","_bitObjectList","_lane","_dependenciesGraph","_version","_objectsReadableGenerator","_versionHistory","_laneHistory","_objectListToGraph","_objects2","_default","exports","default","ObjectsAspect"],"sources":["index.ts"],"sourcesContent":["export {\n  ModelComponent,\n  ScopeMeta,\n  Source,\n  Version,\n  Symlink,\n  Lane,\n  ExportMetadata,\n  VersionHistory,\n  LaneHistory,\n} from './models';\nexport { BitObject, BitRawObject, Ref, Repository } from './objects';\nexport type { ObjectWithType, ObjectsWithType } from './objects';\nexport { ComponentLog, ScopeListItem, AddVersionOpts, ComponentProps, VERSION_ZERO } from './models/model-component';\nexport { ComponentItem, IndexType, LaneItem } from './objects/scope-index';\nexport { ObjectItem, ObjectList, ObjectItemsStream, RawObjectsMap } from './objects/object-list';\nexport { BitObjectList } from './objects/bit-object-list';\nexport { LaneComponent, Log as LaneLog, LaneReadmeComponent } from './models/lane';\nexport {\n  DependenciesGraph,\n  type PackagesMap,\n  type PackageAttributes,\n  type DependencyEdge,\n  type DependencyNeighbour,\n} from './models/dependencies-graph';\nexport { DepEdge, DepEdgeType, SourceFileModel, Log, ObjectsLoader } from './models/version';\nexport { ComponentWithCollectOptions, ObjectsReadableGenerator } from './objects/objects-readable-generator';\nexport { ScopeIndex } from './objects/scope-index';\nexport { VersionHistoryGraph } from './models/version-history';\nexport { VersionParents, versionParentsToGraph } from './models/version-history';\nexport { HistoryItem } from './models/lane-history';\nexport { IdGraph, objectListToGraph, bitObjectListToGraph } from './objects/object-list-to-graph';\n\nimport { ObjectsAspect } from './objects.aspect';\n\nexport type { ObjectsMain } from './objects.main.runtime';\nexport default ObjectsAspect;\nexport { ObjectsAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,QAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,OAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAWA,SAAAE,SAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,QAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAG,gBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,eAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,YAAA;EAAA,MAAAJ,IAAA,GAAAC,OAAA;EAAAG,WAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,YAAA;EAAA,MAAAL,IAAA,GAAAC,OAAA;EAAAI,WAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,eAAA;EAAA,MAAAN,IAAA,GAAAC,OAAA;EAAAK,cAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,MAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,KAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,mBAAA;EAAA,MAAAR,IAAA,GAAAC,OAAA;EAAAO,kBAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAOA,SAAAS,SAAA;EAAA,MAAAT,IAAA,GAAAC,OAAA;EAAAQ,QAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,0BAAA;EAAA,MAAAV,IAAA,GAAAC,OAAA;EAAAS,yBAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAW,gBAAA;EAAA,MAAAX,IAAA,GAAAC,OAAA;EAAAU,eAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAY,aAAA;EAAA,MAAAZ,IAAA,GAAAC,OAAA;EAAAW,YAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,mBAAA;EAAA,MAAAb,IAAA,GAAAC,OAAA;EAAAY,kBAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAc,UAAA;EAAA,MAAAd,IAAA,GAAAC,OAAA;EAAAa,SAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiD,IAAAe,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAGlCC,yBAAa","ignoreList":[]}

package/dist/models/model-component.d.ts

@@ -67,8 +67,11 @@ export declare const VERSION_ZERO = "0.0.0";
 export default class Component extends BitObject {
     scope: string;
     name: string;
-    versions: Versions;
-    orphanedVersions: Versions;
+    /**
+     * read-only from outside, so every write goes through a method of this class, which drops the tags index.
+     */
+    readonly versions: Readonly<Versions>;
+    readonly orphanedVersions: Readonly<Versions>;
     lang: string;
     /**
      * @deprecated moved to the Version object inside teambit/deprecation aspect
@@ -105,12 +108,15 @@ export default class Component extends BitObject {
     detachedHeads: DetachedHeads;
     private divergeData?;
     private _populateVersionHistoryMutex?;
-    private lastFoundTag?;
     constructor(props: ComponentProps);
     private get populateVersionHistoryMutex();
+    private get writableVersions();
+    private get writableOrphanedVersions();
     get versionArray(): Ref[];
     setVersion(tag: string, ref: Ref): void;
     setOrphanedVersion(tag: string, ref: Ref): void;
+    clearOrphanedVersions(): void;
+    moveVersionToOrphaned(tag: string): void;
     getRef(version: string): Ref | null;
     getHeadStr(): string | null;
     getHead(): Ref | undefined;

package/dist/models/model-component.js

@@ -193,6 +193,23 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * the tag of each hash. a later tag of the same hash overrides an earlier one, so pass the maps by ascending
+ * precedence. within a map the newest tag wins, as tags keep insertion order.
+ */
+function indexTagsByHash(...versionsMaps) {
+  const tagsByHash = new Map();
+  for (const versions of versionsMaps) {
+    for (const tag in versions) tagsByHash.set(versions[tag].toString(), tag);
+  }
+  return tagsByHash;
+}
+
+/**
+ * the index of `getTagOfRefIfExists` per component, built on demand. kept off the component itself, so it's not
+ * serialized with it (e.g. by `bit cat-scope --json`).
+ */
+const tagsByHashIndex = new WeakMap();
 const VERSION_ZERO = exports.VERSION_ZERO = '0.0.0';
 
 /**
@@ -205,6 +222,9 @@ class Component extends _objects().BitObject {
     super();
     _defineProperty(this, "scope", void 0);
     _defineProperty(this, "name", void 0);
+    /**
+     * read-only from outside, so every write goes through a method of this class, which drops the tags index.
+     */
     _defineProperty(this, "versions", void 0);
     _defineProperty(this, "orphanedVersions", void 0);
     _defineProperty(this, "lang", void 0);
@@ -246,7 +266,6 @@ class Component extends _objects().BitObject {
     _defineProperty(this, "detachedHeads", void 0);
     _defineProperty(this, "divergeData", void 0);
     _defineProperty(this, "_populateVersionHistoryMutex", void 0);
-    _defineProperty(this, "lastFoundTag", void 0);
     if (!props.name) throw new TypeError('Model Component constructor expects to get a name parameter');
     if (!props.scope) {
       throw new (_legacy6().BitIdCompIdError)(props.name);
@@ -270,18 +289,36 @@ class Component extends _objects().BitObject {
     }
     return this._populateVersionHistoryMutex;
   }
+  get writableVersions() {
+    return this.versions;
+  }
+  get writableOrphanedVersions() {
+    return this.orphanedVersions;
+  }
   get versionArray() {
     return Object.values(this.versions);
   }
   setVersion(tag, ref) {
-    this.versions[tag] = ref;
-    delete this.orphanedVersions[tag]; // just in case it's there.
+    this.writableVersions[tag] = ref;
+    delete this.writableOrphanedVersions[tag]; // just in case it's there.
+    tagsByHashIndex.delete(this);
   }
   setOrphanedVersion(tag, ref) {
     if (this.versions[tag]) {
       throw new Error(`unable to save orphanedVersion "${tag}" for "${this.id()}" because this tag is already part of the versions prop`);
     }
-    this.orphanedVersions[tag] = ref;
+    this.writableOrphanedVersions[tag] = ref;
+    tagsByHashIndex.delete(this);
+  }
+  clearOrphanedVersions() {
+    Object.keys(this.orphanedVersions).forEach(tag => delete this.writableOrphanedVersions[tag]);
+    tagsByHashIndex.delete(this);
+  }
+  moveVersionToOrphaned(tag) {
+    const ref = this.versions[tag];
+    if (!ref) throw new Error(`moveVersionToOrphaned failed finding version ${tag} of ${this.id()}`);
+    delete this.writableVersions[tag];
+    this.setOrphanedVersion(tag, ref);
   }
   getRef(version) {
     if ((0, _componentVersion().isTag)(version)) {
@@ -715,18 +752,14 @@ class Component extends _objects().BitObject {
     }));
   }
   getTagOfRefIfExists(ref) {
-    // the same ref (usually the head) is looked up many times per command, and each scan has to list all the tags.
-    // the last hit is re-checked against the current versions, so it can't go stale when versions change. only hits
-    // in `versions` are remembered, so they keep their precedence over orphaned versions.
-    if (this.lastFoundTag && this.versions[this.lastFoundTag]?.isEqual(ref)) return this.lastFoundTag;
-    // search from the newest tag. tags are kept in insertion order and the head is usually the latest one.
-    const findIn = versions => (0, _lodash().findLastKey)(versions, versionRef => versionRef.isEqual(ref));
-    const tag = findIn(this.versions);
-    if (tag) {
-      this.lastFoundTag = tag;
-      return tag;
-    }
-    return findIn(this.orphanedVersions);
+    // called for every version of a history walk, so it's a lookup in an index rather than a scan of all the tags.
+    // a tag in `versions` takes precedence over an orphaned one.
+    let tagsByHash = tagsByHashIndex.get(this);
+    if (!tagsByHash) {
+      tagsByHash = indexTagsByHash(this.orphanedVersions, this.versions);
+      tagsByHashIndex.set(this, tagsByHash);
+    }
+    return tagsByHash.get(ref.toString());
   }
   getTag(version) {
     if ((0, _componentVersion().isTag)(version)) return version;
@@ -1026,7 +1059,8 @@ consider using --ignore-missing-artifacts flag if you're sure the artifacts are
   removeVersion(version) {
     const objectRef = this.getRef(version);
     if (!objectRef) throw new Error(`removeVersion failed finding version ${version}`);
-    delete this.versions[version];
+    delete this.writableVersions[version];
+    tagsByHashIndex.delete(this);
     if (this.state.versions && this.state.versions[version]) delete this.state.versions[version];
     return objectRef;
   }