@teambit/objects 0.0.0-f615bc8e9fc8dad1d9f5b4861b455d01bd8d2a7d → 0.0.0-f6dee22d721666844f2988a94f1f4aaa5978b9f4

package/dist/models/export-metadata.js

@@ -47,8 +47,6 @@ class ExportMetadata extends _objects().BitObject {
       }))
     };
   }
-
-  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
   toString(pretty) {
     const args = (0, _legacy().getStringifyArgs)(pretty);
     return JSON.stringify(this.toObject(), ...args);

package/dist/models/export-metadata.js.map

@@ -1 +1 @@
-{"version":3,"names":["_componentId","data","require","_legacy","_objects","_defineProperty","e","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","ExportMetadata","BitObject","constructor","props","exportVersions","toObject","map","exportComp","id","toStringWithoutVersion","versions","head","toString","pretty","args","getStringifyArgs","JSON","stringify","name","toBuffer","Buffer","from","parse","contents","parsed","comp","ComponentID","fromString","Ref","exports","default"],"sources":["export-metadata.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport { getStringifyArgs } from '@teambit/legacy.utils';\nimport { BitObject, Ref } from '../objects';\n\ntype ExportMetadataProps = {\n  exportVersions: ExportVersions[];\n};\n\nexport type ExportVersions = { id: ComponentID; versions: string[]; head: Ref };\n\n/**\n * @deprecated since 0.0.928 (see #6758). this object is not sent to the remote anymore.\n * introduced in 0.0.782 (see #5935)\n */\nexport default class ExportMetadata extends BitObject {\n  exportVersions: ExportVersions[];\n  constructor(props: ExportMetadataProps) {\n    super();\n    this.exportVersions = props.exportVersions;\n  }\n\n  toObject(): Record<string, any> {\n    return {\n      exportVersions: this.exportVersions.map((exportComp) => ({\n        id: exportComp.id.toStringWithoutVersion(),\n        versions: exportComp.versions,\n        head: exportComp.head.toString(),\n      })),\n    };\n  }\n\n  // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n  toString(pretty: boolean): string {\n    const args = getStringifyArgs(pretty);\n    return JSON.stringify(this.toObject(), ...args);\n  }\n\n  id(): string {\n    return ExportMetadata.name;\n  }\n\n  toBuffer(pretty): Buffer {\n    return Buffer.from(this.toString(pretty));\n  }\n\n  static parse(contents: string): ExportMetadata {\n    const parsed = JSON.parse(contents);\n    const props: ExportMetadataProps = {\n      exportVersions: parsed.exportVersions.map((comp) => ({\n        id: ComponentID.fromString(comp.id),\n        versions: comp.versions,\n        head: Ref.from(comp.head),\n      })),\n    };\n    return new ExportMetadata(props);\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_componentId","data","require","_legacy","_objects","_defineProperty","e","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","ExportMetadata","BitObject","constructor","props","exportVersions","toObject","map","exportComp","id","toStringWithoutVersion","versions","head","toString","pretty","args","getStringifyArgs","JSON","stringify","name","toBuffer","Buffer","from","parse","contents","parsed","comp","ComponentID","fromString","Ref","exports","default"],"sources":["export-metadata.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component-id';\nimport { getStringifyArgs } from '@teambit/legacy.utils';\nimport { BitObject, Ref } from '../objects';\n\ntype ExportMetadataProps = {\n  exportVersions: ExportVersions[];\n};\n\nexport type ExportVersions = { id: ComponentID; versions: string[]; head: Ref };\n\n/**\n * @deprecated since 0.0.928 (see #6758). this object is not sent to the remote anymore.\n * introduced in 0.0.782 (see #5935)\n */\nexport default class ExportMetadata extends BitObject {\n  exportVersions: ExportVersions[];\n  constructor(props: ExportMetadataProps) {\n    super();\n    this.exportVersions = props.exportVersions;\n  }\n\n  toObject(): Record<string, any> {\n    return {\n      exportVersions: this.exportVersions.map((exportComp) => ({\n        id: exportComp.id.toStringWithoutVersion(),\n        versions: exportComp.versions,\n        head: exportComp.head.toString(),\n      })),\n    };\n  }\n\n  toString(pretty: boolean): string {\n    const args = getStringifyArgs(pretty);\n    return JSON.stringify(this.toObject(), ...args);\n  }\n\n  id(): string {\n    return ExportMetadata.name;\n  }\n\n  toBuffer(pretty): Buffer {\n    return Buffer.from(this.toString(pretty));\n  }\n\n  static parse(contents: string): ExportMetadata {\n    const parsed = JSON.parse(contents);\n    const props: ExportMetadataProps = {\n      exportVersions: parsed.exportVersions.map((comp) => ({\n        id: ComponentID.fromString(comp.id),\n        versions: comp.versions,\n        head: Ref.from(comp.head),\n      })),\n    };\n    return new ExportMetadata(props);\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/models/lane.d.ts

@@ -56,10 +56,10 @@ export default class Lane extends BitObject {
     changeScope(scope: string): void;
     refs(): Ref[];
     validateBeforePersisting(str: string): void;
-    toObject(): import("lodash").Dictionary<string | boolean | string[] | {
+    toObject(): import("lodash").Dictionary<string | boolean | string[] | Log | {
         scope: string;
         name: string;
-    } | Log | {
+    } | {
         isDeleted?: true | undefined;
         id: {
             scope: string;

package/dist/models/model-component.js

@@ -186,7 +186,6 @@ const VERSION_ZERO = exports.VERSION_ZERO = '0.0.0';
  * with 'Component' in their headers. see object-registrar.types()
  */
 // TODO: FIX me .parser
-// @ts-ignore
 class Component extends _objects().BitObject {
   constructor(props) {
     super();
@@ -659,7 +658,6 @@ class Component extends _objects().BitObject {
   }
   collectVersions(repo) {
     return Promise.all(this.listVersions().map(versionNum => {
-      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       return this.toConsumerComponent(versionNum, this.scope, repo);
     }));
   }
@@ -772,8 +770,8 @@ class Component extends _objects().BitObject {
     if (parent && head && !parent.isEqual(head) && !overrideHead) {
       if (detachHead) this.detachedHeads.setHead(version.hash());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();
@@ -1088,7 +1086,6 @@ consider using --ignore-missing-artifacts flag if you're sure the artifacts are
     // @todo: this is weird. why the scopeMeta would be taken from the current scope and not he component scope?
     const scopeMetaP = scopeName ? _scopeMeta().default.fromScopeName(scopeName).load(repository) : Promise.resolve();
     const log = version.log || null;
-    // @ts-ignore
     const [files, scopeMeta] = await Promise.all([filesP, scopeMetaP]);
     const extensions = version.extensions.clone();
     // when generating a new ConsumerComponent out of Version, it is critical to make sure that
@@ -1202,6 +1199,26 @@ 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 (0, _component2().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
   }