@teambit/component-log 0.0.525 → 0.0.527

package/dist/component-log.main.runtime.d.ts

@@ -10,6 +10,11 @@ export declare type FileLog = {
     fileHash: string;
     fileDiff?: string;
 };
+export declare type FileHashDiffFromParent = {
+    filePath: string;
+    hash?: string;
+    parentHash?: string;
+};
 export declare class ComponentLogMain {
     private workspace;
     constructor(workspace: Workspace | undefined);
@@ -18,6 +23,7 @@ export declare class ComponentLogMain {
      */
     getLogs(id: string, isRemote?: boolean, shortHash?: boolean): Promise<import("@teambit/legacy-component-log").LegacyComponentLog[]>;
     getLogsWithParents(id: string): Promise<string[]>;
+    getChangedFilesFromParent(id: string): Promise<FileHashDiffFromParent[]>;
     getFileHistoryHashes(filePath: string): Promise<FileLog[]>;
     getFileLog(filePath: string): Promise<FileLog[]>;
     private stringifyLogInfoOneLine;

package/dist/component-log.main.runtime.js

@@ -30,6 +30,13 @@ function _legacyBitId() {
   };
   return data;
 }
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+  _path = function () {
+    return data;
+  };
+  return data;
+}
 function _moment() {
   const data = _interopRequireDefault(require("moment"));
   _moment = function () {
@@ -65,9 +72,9 @@ function _pMapSeries() {
   };
   return data;
 }
-function _path() {
+function _path2() {
   const data = require("@teambit/legacy/dist/utils/path");
-  _path = function () {
+  _path2 = function () {
     return data;
   };
   return data;
@@ -153,6 +160,39 @@ class ComponentLogMain {
     const sorted = graph.toposort();
     return sorted.map(node => this.stringifyLogInfoOneLine(node.attr));
   }
+  async getChangedFilesFromParent(id) {
+    const workspace = this.workspace;
+    if (!workspace) throw new (_workspace().OutsideWorkspaceError)();
+    const componentId = await workspace.resolveComponentId(id);
+    const modelComp = await workspace.scope.getBitObjectModelComponent(componentId, true);
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const versionObj = await workspace.scope.getBitObjectVersion(modelComp, componentId.version, true);
+    const firstParent = versionObj.parents[0];
+    const parentObj = firstParent ?
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    await workspace.scope.getBitObjectVersion(modelComp, firstParent.toString(), true) : null;
+    const compDir = workspace.componentDir(componentId, {
+      ignoreVersion: true
+    });
+    const results = (0, _lodash().compact)(versionObj.files.map(file => {
+      const parentFile = parentObj === null || parentObj === void 0 ? void 0 : parentObj.files.find(f => f.relativePath === file.relativePath);
+      if (parentFile !== null && parentFile !== void 0 && parentFile.file.isEqual(file.file)) return null;
+      return {
+        filePath: _path().default.join(compDir, file.relativePath),
+        hash: file.file.toString(),
+        parentHash: parentFile === null || parentFile === void 0 ? void 0 : parentFile.file.toString()
+      };
+    }));
+    const filesOnParentOnly = ((parentObj === null || parentObj === void 0 ? void 0 : parentObj.files) || []).filter(parentFile => !versionObj.files.find(file => file.relativePath === parentFile.relativePath));
+    if (filesOnParentOnly.length) {
+      results.push(...filesOnParentOnly.map(file => ({
+        filePath: file.relativePath,
+        hash: undefined,
+        parentHash: file.file.toString()
+      })));
+    }
+    return results;
+  }
   async getFileHistoryHashes(filePath) {
     const workspace = this.workspace;
     if (!workspace) throw new (_workspace().OutsideWorkspaceError)();
@@ -160,13 +200,12 @@ class ComponentLogMain {
     if (!componentId) throw new Error(`unable to find component for file ${filePath}`);
     const rootDir = workspace.componentDir(componentId, undefined);
     const logs = await this.getLogs(componentId.toString());
-    const filePathAsLinux = (0, _path().pathNormalizeToLinux)(filePath);
+    const filePathAsLinux = (0, _path2().pathNormalizeToLinux)(filePath);
     const filePathRelativeInComponent = filePathAsLinux.replace(`${rootDir}/`, '');
     const modelComp = await workspace.scope.getBitObjectModelComponent(componentId);
     if (!modelComp) return []; // probably a new component
     const results = [];
     await (0, _pMap().default)(logs, async logItem => {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const versionObj = await workspace.scope.getBitObjectVersion(modelComp, logItem.hash, true);
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const fileInComp = versionObj.files.find(f => f.relativePath === filePathRelativeInComponent);
@@ -207,7 +246,7 @@ class ComponentLogMain {
       relative: true
     });
     const logs = await this.getLogs(componentId.toString());
-    const filePathAsLinux = (0, _path().pathNormalizeToLinux)(filePath);
+    const filePathAsLinux = (0, _path2().pathNormalizeToLinux)(filePath);
     const filePathRelativeInComponent = filePathAsLinux.replace(`${rootDir}/`, '');
     const results = [];
     let lastFile;

package/dist/component-log.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["_cli","data","require","_legacyBitId","_moment","_interopRequireDefault","_pMap","_workspace","_interopRequireWildcard","_lodash","_pMapSeries","_path","_componentsDiff","_chalk","_getRemoteByName","_componentLog","_logCmd","_snapGraph","_logFileCmd","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ComponentLogMain","constructor","workspace","getLogs","id","isRemote","shortHash","_this$workspace","consumer","bitId","BitId","parse","remote","getRemoteByName","scope","log","OutsideWorkspaceError","componentId","resolveComponentId","logs","forEach","date","moment","Date","parseInt","format","undefined","getLogsWithParents","graph","buildSnapGraph","sorted","toposort","map","node","stringifyLogInfoOneLine","attr","getFileHistoryHashes","filePath","getComponentIdByPath","Error","rootDir","componentDir","toString","filePathAsLinux","pathNormalizeToLinux","filePathRelativeInComponent","replace","modelComp","getBitObjectModelComponent","results","pMap","logItem","versionObj","getBitObjectVersion","hash","fileInComp","files","find","f","relativePath","push","tag","username","email","message","fileHash","file","concurrency","lastFileHash","item","index","compact","getFileLog","relative","lastFile","pMapSeries","_diff","component","changeVersion","filesystem","lastResult","length","lastHash","toSourceAsLinuxEOL","diff","getFilesDiff","fileDiff","diffOutput","logInfo","parents","join","chalk","yellow","provider","cli","componentLog","register","LogCmd","LogFileCmd","exports","_defineProperty2","CLIAspect","WorkspaceAspect","MainRuntime","ComponentLogAspect","addRuntime"],"sources":["component-log.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport moment from 'moment';\nimport pMap from 'p-map';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { compact } from 'lodash';\nimport pMapSeries from 'p-map-series';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils/path';\nimport { getFilesDiff } from '@teambit/legacy/dist/consumer/component-ops/components-diff';\nimport chalk from 'chalk';\nimport getRemoteByName from '@teambit/legacy/dist/remotes/get-remote-by-name';\nimport { ComponentLogAspect } from './component-log.aspect';\nimport LogCmd from './log-cmd';\nimport { buildSnapGraph } from './snap-graph';\nimport { LogFileCmd } from './log-file-cmd';\n\nexport type FileLog = {\n  hash: string;\n  tag?: string;\n  username?: string;\n  email?: string;\n  date: string;\n  message: string;\n  fileHash: string;\n  fileDiff?: string;\n};\n\nexport class ComponentLogMain {\n  constructor(private workspace: Workspace | undefined) {}\n\n  /**\n   * get component log sorted by the timestamp in ascending order (from the earliest to the latest)\n   */\n  async getLogs(id: string, isRemote?: boolean, shortHash = false) {\n    if (isRemote) {\n      const consumer = this.workspace?.consumer;\n      const bitId: BitId = BitId.parse(id, true);\n      const remote = await getRemoteByName(bitId.scope as string, consumer);\n      return remote.log(bitId);\n    }\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const componentId = await this.workspace.resolveComponentId(id);\n    const logs = await this.workspace.scope.getLogs(componentId, shortHash);\n    logs.forEach((log) => {\n      log.date = log.date ? moment(new Date(parseInt(log.date))).format('YYYY-MM-DD HH:mm:ss') : undefined;\n    });\n    return logs;\n  }\n\n  async getLogsWithParents(id: string) {\n    const logs = await this.getLogs(id, false, true);\n    const graph = buildSnapGraph(logs);\n    const sorted = graph.toposort();\n    return sorted.map((node) => this.stringifyLogInfoOneLine(node.attr));\n  }\n\n  async getFileHistoryHashes(filePath: string): Promise<FileLog[]> {\n    const workspace = this.workspace;\n    if (!workspace) throw new OutsideWorkspaceError();\n    const componentId = await workspace.getComponentIdByPath(filePath);\n    if (!componentId) throw new Error(`unable to find component for file ${filePath}`);\n\n    const rootDir = workspace.componentDir(componentId, undefined);\n\n    const logs = await this.getLogs(componentId.toString());\n\n    const filePathAsLinux = pathNormalizeToLinux(filePath);\n    const filePathRelativeInComponent = filePathAsLinux.replace(`${rootDir}/`, '');\n\n    const modelComp = await workspace.scope.getBitObjectModelComponent(componentId);\n    if (!modelComp) return []; // probably a new component\n    const results: FileLog[] = [];\n    await pMap(\n      logs,\n      async (logItem) => {\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        const versionObj = await workspace.scope.getBitObjectVersion(modelComp!, logItem.hash, true);\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        const fileInComp = versionObj!.files.find((f) => f.relativePath === filePathRelativeInComponent);\n        if (!fileInComp) return;\n\n        results.push({\n          hash: logItem.hash,\n          tag: logItem.tag,\n          username: logItem.username,\n          email: logItem.email,\n          date: logItem.date || '<N/A>',\n          message: logItem.message,\n          fileHash: fileInComp.file.toString(),\n        });\n      },\n      { concurrency: 100 }\n    );\n\n    // remove entries that their fileHash is the same as the previous one\n    let lastFileHash: string;\n    results.forEach((item, index) => {\n      if (index === 0) {\n        lastFileHash = item.fileHash;\n        return;\n      }\n      if (item.fileHash === lastFileHash) {\n        delete results[index];\n      }\n      lastFileHash = item.fileHash;\n    });\n\n    return compact(results);\n  }\n\n  async getFileLog(filePath: string) {\n    const workspace = this.workspace;\n    if (!workspace) throw new OutsideWorkspaceError();\n    const componentId = await workspace.getComponentIdByPath(filePath);\n    if (!componentId) throw new Error(`unable to find component for file ${filePath}`);\n\n    const rootDir = workspace.componentDir(componentId, undefined, { relative: true });\n\n    const logs = await this.getLogs(componentId.toString());\n\n    const filePathAsLinux = pathNormalizeToLinux(filePath);\n    const filePathRelativeInComponent = filePathAsLinux.replace(`${rootDir}/`, '');\n\n    const results: FileLog[] = [];\n    let lastFile;\n    await pMapSeries(logs, async (logItem) => {\n      const component = await workspace.get(componentId.changeVersion(logItem.tag || logItem.hash));\n      const fileInComp = component.filesystem.files.find((f) => f.relative === filePathRelativeInComponent);\n      const lastResult = results[results.length - 1];\n      const lastHash = lastResult?.fileHash;\n      let fileHash: string;\n      if (!fileInComp) {\n        if (!lastHash) return;\n        fileHash = '<REMOVED>';\n      } else {\n        fileHash = fileInComp.toSourceAsLinuxEOL().hash().toString();\n      }\n      if (fileHash === lastHash) return;\n\n      let diff;\n      if (lastFile && fileInComp) {\n        diff = await getFilesDiff([lastFile], [fileInComp], logItem.hash, lastResult.hash, undefined);\n      }\n\n      lastFile = fileInComp;\n\n      results.push({\n        hash: logItem.hash,\n        tag: logItem.tag,\n        username: logItem.username,\n        email: logItem.email,\n        date: logItem.date || '<N/A>',\n        message: logItem.message,\n        fileDiff: diff?.length ? diff[0].diffOutput : undefined,\n        fileHash,\n      });\n    });\n    return results;\n  }\n\n  private stringifyLogInfoOneLine(logInfo: ComponentLogInfo) {\n    const parents = logInfo.parents.length ? `Parent(s): ${logInfo.parents.join(', ')}` : '<N/A>';\n    return `${chalk.yellow(logInfo.hash)} ${logInfo.username || ''} ${logInfo.date || ''} ${\n      logInfo.message\n    }, ${parents}`;\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace]: [CLIMain, Workspace]) {\n    const componentLog = new ComponentLogMain(workspace);\n    cli.register(new LogCmd(componentLog), new LogFileCmd(componentLog));\n    return componentLog;\n  }\n}\n\nComponentLogAspect.addRuntime(ComponentLogMain);\n\nexport type ComponentLogInfo = {\n  hash: string;\n  message: string;\n  onLane?: boolean;\n  parents: string[];\n  username?: string;\n  email?: string;\n  date?: string;\n  tag?: string;\n};\n"],"mappings":"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"}
+{"version":3,"names":["_cli","data","require","_legacyBitId","_path","_interopRequireDefault","_moment","_pMap","_workspace","_interopRequireWildcard","_lodash","_pMapSeries","_path2","_componentsDiff","_chalk","_getRemoteByName","_componentLog","_logCmd","_snapGraph","_logFileCmd","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ComponentLogMain","constructor","workspace","getLogs","id","isRemote","shortHash","_this$workspace","consumer","bitId","BitId","parse","remote","getRemoteByName","scope","log","OutsideWorkspaceError","componentId","resolveComponentId","logs","forEach","date","moment","Date","parseInt","format","undefined","getLogsWithParents","graph","buildSnapGraph","sorted","toposort","map","node","stringifyLogInfoOneLine","attr","getChangedFilesFromParent","modelComp","getBitObjectModelComponent","versionObj","getBitObjectVersion","version","firstParent","parents","parentObj","toString","compDir","componentDir","ignoreVersion","results","compact","files","file","parentFile","find","f","relativePath","isEqual","filePath","path","join","hash","parentHash","filesOnParentOnly","filter","length","push","getFileHistoryHashes","getComponentIdByPath","Error","rootDir","filePathAsLinux","pathNormalizeToLinux","filePathRelativeInComponent","replace","pMap","logItem","fileInComp","tag","username","email","message","fileHash","concurrency","lastFileHash","item","index","getFileLog","relative","lastFile","pMapSeries","_diff","component","changeVersion","filesystem","lastResult","lastHash","toSourceAsLinuxEOL","diff","getFilesDiff","fileDiff","diffOutput","logInfo","chalk","yellow","provider","cli","componentLog","register","LogCmd","LogFileCmd","exports","_defineProperty2","CLIAspect","WorkspaceAspect","MainRuntime","ComponentLogAspect","addRuntime"],"sources":["component-log.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport path from 'path';\nimport moment from 'moment';\nimport pMap from 'p-map';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { compact } from 'lodash';\nimport pMapSeries from 'p-map-series';\nimport { Version } from '@teambit/legacy/dist/scope/models';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils/path';\nimport { getFilesDiff } from '@teambit/legacy/dist/consumer/component-ops/components-diff';\nimport chalk from 'chalk';\nimport getRemoteByName from '@teambit/legacy/dist/remotes/get-remote-by-name';\nimport { ComponentLogAspect } from './component-log.aspect';\nimport LogCmd from './log-cmd';\nimport { buildSnapGraph } from './snap-graph';\nimport { LogFileCmd } from './log-file-cmd';\n\nexport type FileLog = {\n  hash: string;\n  tag?: string;\n  username?: string;\n  email?: string;\n  date: string;\n  message: string;\n  fileHash: string;\n  fileDiff?: string;\n};\n\nexport type FileHashDiffFromParent = {\n  filePath: string; // path OS absolute\n  hash?: string; // if undefined, the file was deleted in this snap\n  parentHash?: string; // if undefined, the file was added in this snap\n};\n\nexport class ComponentLogMain {\n  constructor(private workspace: Workspace | undefined) {}\n\n  /**\n   * get component log sorted by the timestamp in ascending order (from the earliest to the latest)\n   */\n  async getLogs(id: string, isRemote?: boolean, shortHash = false) {\n    if (isRemote) {\n      const consumer = this.workspace?.consumer;\n      const bitId: BitId = BitId.parse(id, true);\n      const remote = await getRemoteByName(bitId.scope as string, consumer);\n      return remote.log(bitId);\n    }\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const componentId = await this.workspace.resolveComponentId(id);\n    const logs = await this.workspace.scope.getLogs(componentId, shortHash);\n    logs.forEach((log) => {\n      log.date = log.date ? moment(new Date(parseInt(log.date))).format('YYYY-MM-DD HH:mm:ss') : undefined;\n    });\n    return logs;\n  }\n\n  async getLogsWithParents(id: string) {\n    const logs = await this.getLogs(id, false, true);\n    const graph = buildSnapGraph(logs);\n    const sorted = graph.toposort();\n    return sorted.map((node) => this.stringifyLogInfoOneLine(node.attr));\n  }\n\n  async getChangedFilesFromParent(id: string): Promise<FileHashDiffFromParent[]> {\n    const workspace = this.workspace;\n    if (!workspace) throw new OutsideWorkspaceError();\n    const componentId = await workspace.resolveComponentId(id);\n    const modelComp = await workspace.scope.getBitObjectModelComponent(componentId, true);\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    const versionObj = (await workspace.scope.getBitObjectVersion(modelComp!, componentId.version, true)) as Version;\n    const firstParent = versionObj.parents[0];\n    const parentObj = firstParent\n      ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        ((await workspace.scope.getBitObjectVersion(modelComp!, firstParent.toString(), true)) as Version)\n      : null;\n    const compDir = workspace.componentDir(componentId, { ignoreVersion: true });\n    const results: FileHashDiffFromParent[] = compact(\n      versionObj.files.map((file) => {\n        const parentFile = parentObj?.files.find((f) => f.relativePath === file.relativePath);\n        if (parentFile?.file.isEqual(file.file)) return null;\n        return {\n          filePath: path.join(compDir, file.relativePath),\n          hash: file.file.toString(),\n          parentHash: parentFile?.file.toString(),\n        };\n      })\n    );\n    const filesOnParentOnly = (parentObj?.files || []).filter(\n      (parentFile) => !versionObj.files.find((file) => file.relativePath === parentFile.relativePath)\n    );\n    if (filesOnParentOnly.length) {\n      results.push(\n        ...filesOnParentOnly.map((file) => ({\n          filePath: file.relativePath,\n          hash: undefined,\n          parentHash: file.file.toString(),\n        }))\n      );\n    }\n\n    return results;\n  }\n\n  async getFileHistoryHashes(filePath: string): Promise<FileLog[]> {\n    const workspace = this.workspace;\n    if (!workspace) throw new OutsideWorkspaceError();\n    const componentId = await workspace.getComponentIdByPath(filePath);\n    if (!componentId) throw new Error(`unable to find component for file ${filePath}`);\n\n    const rootDir = workspace.componentDir(componentId, undefined);\n\n    const logs = await this.getLogs(componentId.toString());\n\n    const filePathAsLinux = pathNormalizeToLinux(filePath);\n    const filePathRelativeInComponent = filePathAsLinux.replace(`${rootDir}/`, '');\n\n    const modelComp = await workspace.scope.getBitObjectModelComponent(componentId);\n    if (!modelComp) return []; // probably a new component\n    const results: FileLog[] = [];\n    await pMap(\n      logs,\n      async (logItem) => {\n        const versionObj = await workspace.scope.getBitObjectVersion(modelComp, logItem.hash, true);\n        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n        const fileInComp = versionObj!.files.find((f) => f.relativePath === filePathRelativeInComponent);\n        if (!fileInComp) return;\n\n        results.push({\n          hash: logItem.hash,\n          tag: logItem.tag,\n          username: logItem.username,\n          email: logItem.email,\n          date: logItem.date || '<N/A>',\n          message: logItem.message,\n          fileHash: fileInComp.file.toString(),\n        });\n      },\n      { concurrency: 100 }\n    );\n\n    // remove entries that their fileHash is the same as the previous one\n    let lastFileHash: string;\n    results.forEach((item, index) => {\n      if (index === 0) {\n        lastFileHash = item.fileHash;\n        return;\n      }\n      if (item.fileHash === lastFileHash) {\n        delete results[index];\n      }\n      lastFileHash = item.fileHash;\n    });\n\n    return compact(results);\n  }\n\n  async getFileLog(filePath: string) {\n    const workspace = this.workspace;\n    if (!workspace) throw new OutsideWorkspaceError();\n    const componentId = await workspace.getComponentIdByPath(filePath);\n    if (!componentId) throw new Error(`unable to find component for file ${filePath}`);\n\n    const rootDir = workspace.componentDir(componentId, undefined, { relative: true });\n\n    const logs = await this.getLogs(componentId.toString());\n\n    const filePathAsLinux = pathNormalizeToLinux(filePath);\n    const filePathRelativeInComponent = filePathAsLinux.replace(`${rootDir}/`, '');\n\n    const results: FileLog[] = [];\n    let lastFile;\n    await pMapSeries(logs, async (logItem) => {\n      const component = await workspace.get(componentId.changeVersion(logItem.tag || logItem.hash));\n      const fileInComp = component.filesystem.files.find((f) => f.relative === filePathRelativeInComponent);\n      const lastResult = results[results.length - 1];\n      const lastHash = lastResult?.fileHash;\n      let fileHash: string;\n      if (!fileInComp) {\n        if (!lastHash) return;\n        fileHash = '<REMOVED>';\n      } else {\n        fileHash = fileInComp.toSourceAsLinuxEOL().hash().toString();\n      }\n      if (fileHash === lastHash) return;\n\n      let diff;\n      if (lastFile && fileInComp) {\n        diff = await getFilesDiff([lastFile], [fileInComp], logItem.hash, lastResult.hash, undefined);\n      }\n\n      lastFile = fileInComp;\n\n      results.push({\n        hash: logItem.hash,\n        tag: logItem.tag,\n        username: logItem.username,\n        email: logItem.email,\n        date: logItem.date || '<N/A>',\n        message: logItem.message,\n        fileDiff: diff?.length ? diff[0].diffOutput : undefined,\n        fileHash,\n      });\n    });\n    return results;\n  }\n\n  private stringifyLogInfoOneLine(logInfo: ComponentLogInfo) {\n    const parents = logInfo.parents.length ? `Parent(s): ${logInfo.parents.join(', ')}` : '<N/A>';\n    return `${chalk.yellow(logInfo.hash)} ${logInfo.username || ''} ${logInfo.date || ''} ${\n      logInfo.message\n    }, ${parents}`;\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace]: [CLIMain, Workspace]) {\n    const componentLog = new ComponentLogMain(workspace);\n    cli.register(new LogCmd(componentLog), new LogFileCmd(componentLog));\n    return componentLog;\n  }\n}\n\nComponentLogAspect.addRuntime(ComponentLogMain);\n\nexport type ComponentLogInfo = {\n  hash: string;\n  message: string;\n  onLane?: boolean;\n  parents: string[];\n  username?: string;\n  email?: string;\n  date?: string;\n  tag?: string;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,aAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,YAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,MAAA;EAAA,MAAAH,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAE,KAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,QAAA;EAAA,MAAAL,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAI,OAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,MAAA;EAAA,MAAAN,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAK,KAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,WAAA;EAAA,MAAAP,IAAA,GAAAQ,uBAAA,CAAAP,OAAA;EAAAM,UAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,QAAA;EAAA,MAAAT,IAAA,GAAAC,OAAA;EAAAQ,OAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,YAAA;EAAA,MAAAV,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAS,WAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAW,OAAA;EAAA,MAAAX,IAAA,GAAAC,OAAA;EAAAU,MAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,gBAAA;EAAA,MAAAZ,IAAA,GAAAC,OAAA;EAAAW,eAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,OAAA;EAAA,MAAAb,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAY,MAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAc,iBAAA;EAAA,MAAAd,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAa,gBAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAe,cAAA;EAAA,MAAAf,IAAA,GAAAC,OAAA;EAAAc,aAAA,YAAAA,CAAA;IAAA,OAAAf,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAgB,QAAA;EAAA,MAAAhB,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAe,OAAA,YAAAA,CAAA;IAAA,OAAAhB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAiB,WAAA;EAAA,MAAAjB,IAAA,GAAAC,OAAA;EAAAgB,UAAA,YAAAA,CAAA;IAAA,OAAAjB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAkB,YAAA;EAAA,MAAAlB,IAAA,GAAAC,OAAA;EAAAiB,WAAA,YAAAA,CAAA;IAAA,OAAAlB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA4C,SAAAmB,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAZ,wBAAAgB,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAmBrC,MAAMW,gBAAgB,CAAC;EAC5BC,WAAWA,CAASC,SAAgC,EAAE;IAAA,KAAlCA,SAAgC,GAAhCA,SAAgC;EAAG;;EAEvD;AACF;AACA;EACE,MAAMC,OAAOA,CAACC,EAAU,EAAEC,QAAkB,EAAEC,SAAS,GAAG,KAAK,EAAE;IAC/D,IAAID,QAAQ,EAAE;MAAA,IAAAE,eAAA;MACZ,MAAMC,QAAQ,IAAAD,eAAA,GAAG,IAAI,CAACL,SAAS,cAAAK,eAAA,uBAAdA,eAAA,CAAgBC,QAAQ;MACzC,MAAMC,KAAY,GAAGC,oBAAK,CAACC,KAAK,CAACP,EAAE,EAAE,IAAI,CAAC;MAC1C,MAAMQ,MAAM,GAAG,MAAM,IAAAC,0BAAe,EAACJ,KAAK,CAACK,KAAK,EAAYN,QAAQ,CAAC;MACrE,OAAOI,MAAM,CAACG,GAAG,CAACN,KAAK,CAAC;IAC1B;IACA,IAAI,CAAC,IAAI,CAACP,SAAS,EAAE,MAAM,KAAIc,kCAAqB,EAAC,CAAC;IACtD,MAAMC,WAAW,GAAG,MAAM,IAAI,CAACf,SAAS,CAACgB,kBAAkB,CAACd,EAAE,CAAC;IAC/D,MAAMe,IAAI,GAAG,MAAM,IAAI,CAACjB,SAAS,CAACY,KAAK,CAACX,OAAO,CAACc,WAAW,EAAEX,SAAS,CAAC;IACvEa,IAAI,CAACC,OAAO,CAAEL,GAAG,IAAK;MACpBA,GAAG,CAACM,IAAI,GAAGN,GAAG,CAACM,IAAI,GAAG,IAAAC,iBAAM,EAAC,IAAIC,IAAI,CAACC,QAAQ,CAACT,GAAG,CAACM,IAAI,CAAC,CAAC,CAAC,CAACI,MAAM,CAAC,qBAAqB,CAAC,GAAGC,SAAS;IACtG,CAAC,CAAC;IACF,OAAOP,IAAI;EACb;EAEA,MAAMQ,kBAAkBA,CAACvB,EAAU,EAAE;IACnC,MAAMe,IAAI,GAAG,MAAM,IAAI,CAAChB,OAAO,CAACC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC;IAChD,MAAMwB,KAAK,GAAG,IAAAC,2BAAc,EAACV,IAAI,CAAC;IAClC,MAAMW,MAAM,GAAGF,KAAK,CAACG,QAAQ,CAAC,CAAC;IAC/B,OAAOD,MAAM,CAACE,GAAG,CAAEC,IAAI,IAAK,IAAI,CAACC,uBAAuB,CAACD,IAAI,CAACE,IAAI,CAAC,CAAC;EACtE;EAEA,MAAMC,yBAAyBA,CAAChC,EAAU,EAAqC;IAC7E,MAAMF,SAAS,GAAG,IAAI,CAACA,SAAS;IAChC,IAAI,CAACA,SAAS,EAAE,MAAM,KAAIc,kCAAqB,EAAC,CAAC;IACjD,MAAMC,WAAW,GAAG,MAAMf,SAAS,CAACgB,kBAAkB,CAACd,EAAE,CAAC;IAC1D,MAAMiC,SAAS,GAAG,MAAMnC,SAAS,CAACY,KAAK,CAACwB,0BAA0B,CAACrB,WAAW,EAAE,IAAI,CAAC;IACrF;IACA,MAAMsB,UAAU,GAAI,MAAMrC,SAAS,CAACY,KAAK,CAAC0B,mBAAmB,CAACH,SAAS,EAAGpB,WAAW,CAACwB,OAAO,EAAE,IAAI,CAAa;IAChH,MAAMC,WAAW,GAAGH,UAAU,CAACI,OAAO,CAAC,CAAC,CAAC;IACzC,MAAMC,SAAS,GAAGF,WAAW;IACzB;IACE,MAAMxC,SAAS,CAACY,KAAK,CAAC0B,mBAAmB,CAACH,SAAS,EAAGK,WAAW,CAACG,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,GACrF,IAAI;IACR,MAAMC,OAAO,GAAG5C,SAAS,CAAC6C,YAAY,CAAC9B,WAAW,EAAE;MAAE+B,aAAa,EAAE;IAAK,CAAC,CAAC;IAC5E,MAAMC,OAAiC,GAAG,IAAAC,iBAAO,EAC/CX,UAAU,CAACY,KAAK,CAACnB,GAAG,CAAEoB,IAAI,IAAK;MAC7B,MAAMC,UAAU,GAAGT,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEO,KAAK,CAACG,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,YAAY,KAAKJ,IAAI,CAACI,YAAY,CAAC;MACrF,IAAIH,UAAU,aAAVA,UAAU,eAAVA,UAAU,CAAED,IAAI,CAACK,OAAO,CAACL,IAAI,CAACA,IAAI,CAAC,EAAE,OAAO,IAAI;MACpD,OAAO;QACLM,QAAQ,EAAEC,eAAI,CAACC,IAAI,CAACd,OAAO,EAAEM,IAAI,CAACI,YAAY,CAAC;QAC/CK,IAAI,EAAET,IAAI,CAACA,IAAI,CAACP,QAAQ,CAAC,CAAC;QAC1BiB,UAAU,EAAET,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAED,IAAI,CAACP,QAAQ,CAAC;MACxC,CAAC;IACH,CAAC,CACH,CAAC;IACD,MAAMkB,iBAAiB,GAAG,CAAC,CAAAnB,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEO,KAAK,KAAI,EAAE,EAAEa,MAAM,CACtDX,UAAU,IAAK,CAACd,UAAU,CAACY,KAAK,CAACG,IAAI,CAAEF,IAAI,IAAKA,IAAI,CAACI,YAAY,KAAKH,UAAU,CAACG,YAAY,CAChG,CAAC;IACD,IAAIO,iBAAiB,CAACE,MAAM,EAAE;MAC5BhB,OAAO,CAACiB,IAAI,CACV,GAAGH,iBAAiB,CAAC/B,GAAG,CAAEoB,IAAI,KAAM;QAClCM,QAAQ,EAAEN,IAAI,CAACI,YAAY;QAC3BK,IAAI,EAAEnC,SAAS;QACfoC,UAAU,EAAEV,IAAI,CAACA,IAAI,CAACP,QAAQ,CAAC;MACjC,CAAC,CAAC,CACJ,CAAC;IACH;IAEA,OAAOI,OAAO;EAChB;EAEA,MAAMkB,oBAAoBA,CAACT,QAAgB,EAAsB;IAC/D,MAAMxD,SAAS,GAAG,IAAI,CAACA,SAAS;IAChC,IAAI,CAACA,SAAS,EAAE,MAAM,KAAIc,kCAAqB,EAAC,CAAC;IACjD,MAAMC,WAAW,GAAG,MAAMf,SAAS,CAACkE,oBAAoB,CAACV,QAAQ,CAAC;IAClE,IAAI,CAACzC,WAAW,EAAE,MAAM,IAAIoD,KAAK,CAAE,qCAAoCX,QAAS,EAAC,CAAC;IAElF,MAAMY,OAAO,GAAGpE,SAAS,CAAC6C,YAAY,CAAC9B,WAAW,EAAES,SAAS,CAAC;IAE9D,MAAMP,IAAI,GAAG,MAAM,IAAI,CAAChB,OAAO,CAACc,WAAW,CAAC4B,QAAQ,CAAC,CAAC,CAAC;IAEvD,MAAM0B,eAAe,GAAG,IAAAC,6BAAoB,EAACd,QAAQ,CAAC;IACtD,MAAMe,2BAA2B,GAAGF,eAAe,CAACG,OAAO,CAAE,GAAEJ,OAAQ,GAAE,EAAE,EAAE,CAAC;IAE9E,MAAMjC,SAAS,GAAG,MAAMnC,SAAS,CAACY,KAAK,CAACwB,0BAA0B,CAACrB,WAAW,CAAC;IAC/E,IAAI,CAACoB,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3B,MAAMY,OAAkB,GAAG,EAAE;IAC7B,MAAM,IAAA0B,eAAI,EACRxD,IAAI,EACJ,MAAOyD,OAAO,IAAK;MACjB,MAAMrC,UAAU,GAAG,MAAMrC,SAAS,CAACY,KAAK,CAAC0B,mBAAmB,CAACH,SAAS,EAAEuC,OAAO,CAACf,IAAI,EAAE,IAAI,CAAC;MAC3F;MACA,MAAMgB,UAAU,GAAGtC,UAAU,CAAEY,KAAK,CAACG,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,YAAY,KAAKiB,2BAA2B,CAAC;MAChG,IAAI,CAACI,UAAU,EAAE;MAEjB5B,OAAO,CAACiB,IAAI,CAAC;QACXL,IAAI,EAAEe,OAAO,CAACf,IAAI;QAClBiB,GAAG,EAAEF,OAAO,CAACE,GAAG;QAChBC,QAAQ,EAAEH,OAAO,CAACG,QAAQ;QAC1BC,KAAK,EAAEJ,OAAO,CAACI,KAAK;QACpB3D,IAAI,EAAEuD,OAAO,CAACvD,IAAI,IAAI,OAAO;QAC7B4D,OAAO,EAAEL,OAAO,CAACK,OAAO;QACxBC,QAAQ,EAAEL,UAAU,CAACzB,IAAI,CAACP,QAAQ,CAAC;MACrC,CAAC,CAAC;IACJ,CAAC,EACD;MAAEsC,WAAW,EAAE;IAAI,CACrB,CAAC;;IAED;IACA,IAAIC,YAAoB;IACxBnC,OAAO,CAAC7B,OAAO,CAAC,CAACiE,IAAI,EAAEC,KAAK,KAAK;MAC/B,IAAIA,KAAK,KAAK,CAAC,EAAE;QACfF,YAAY,GAAGC,IAAI,CAACH,QAAQ;QAC5B;MACF;MACA,IAAIG,IAAI,CAACH,QAAQ,KAAKE,YAAY,EAAE;QAClC,OAAOnC,OAAO,CAACqC,KAAK,CAAC;MACvB;MACAF,YAAY,GAAGC,IAAI,CAACH,QAAQ;IAC9B,CAAC,CAAC;IAEF,OAAO,IAAAhC,iBAAO,EAACD,OAAO,CAAC;EACzB;EAEA,MAAMsC,UAAUA,CAAC7B,QAAgB,EAAE;IACjC,MAAMxD,SAAS,GAAG,IAAI,CAACA,SAAS;IAChC,IAAI,CAACA,SAAS,EAAE,MAAM,KAAIc,kCAAqB,EAAC,CAAC;IACjD,MAAMC,WAAW,GAAG,MAAMf,SAAS,CAACkE,oBAAoB,CAACV,QAAQ,CAAC;IAClE,IAAI,CAACzC,WAAW,EAAE,MAAM,IAAIoD,KAAK,CAAE,qCAAoCX,QAAS,EAAC,CAAC;IAElF,MAAMY,OAAO,GAAGpE,SAAS,CAAC6C,YAAY,CAAC9B,WAAW,EAAES,SAAS,EAAE;MAAE8D,QAAQ,EAAE;IAAK,CAAC,CAAC;IAElF,MAAMrE,IAAI,GAAG,MAAM,IAAI,CAAChB,OAAO,CAACc,WAAW,CAAC4B,QAAQ,CAAC,CAAC,CAAC;IAEvD,MAAM0B,eAAe,GAAG,IAAAC,6BAAoB,EAACd,QAAQ,CAAC;IACtD,MAAMe,2BAA2B,GAAGF,eAAe,CAACG,OAAO,CAAE,GAAEJ,OAAQ,GAAE,EAAE,EAAE,CAAC;IAE9E,MAAMrB,OAAkB,GAAG,EAAE;IAC7B,IAAIwC,QAAQ;IACZ,MAAM,IAAAC,qBAAU,EAACvE,IAAI,EAAE,MAAOyD,OAAO,IAAK;MAAA,IAAAe,KAAA;MACxC,MAAMC,SAAS,GAAG,MAAM1F,SAAS,CAACd,GAAG,CAAC6B,WAAW,CAAC4E,aAAa,CAACjB,OAAO,CAACE,GAAG,IAAIF,OAAO,CAACf,IAAI,CAAC,CAAC;MAC7F,MAAMgB,UAAU,GAAGe,SAAS,CAACE,UAAU,CAAC3C,KAAK,CAACG,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACiC,QAAQ,KAAKf,2BAA2B,CAAC;MACrG,MAAMsB,UAAU,GAAG9C,OAAO,CAACA,OAAO,CAACgB,MAAM,GAAG,CAAC,CAAC;MAC9C,MAAM+B,QAAQ,GAAGD,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAEb,QAAQ;MACrC,IAAIA,QAAgB;MACpB,IAAI,CAACL,UAAU,EAAE;QACf,IAAI,CAACmB,QAAQ,EAAE;QACfd,QAAQ,GAAG,WAAW;MACxB,CAAC,MAAM;QACLA,QAAQ,GAAGL,UAAU,CAACoB,kBAAkB,CAAC,CAAC,CAACpC,IAAI,CAAC,CAAC,CAAChB,QAAQ,CAAC,CAAC;MAC9D;MACA,IAAIqC,QAAQ,KAAKc,QAAQ,EAAE;MAE3B,IAAIE,IAAI;MACR,IAAIT,QAAQ,IAAIZ,UAAU,EAAE;QAC1BqB,IAAI,GAAG,MAAM,IAAAC,8BAAY,EAAC,CAACV,QAAQ,CAAC,EAAE,CAACZ,UAAU,CAAC,EAAED,OAAO,CAACf,IAAI,EAAEkC,UAAU,CAAClC,IAAI,EAAEnC,SAAS,CAAC;MAC/F;MAEA+D,QAAQ,GAAGZ,UAAU;MAErB5B,OAAO,CAACiB,IAAI,CAAC;QACXL,IAAI,EAAEe,OAAO,CAACf,IAAI;QAClBiB,GAAG,EAAEF,OAAO,CAACE,GAAG;QAChBC,QAAQ,EAAEH,OAAO,CAACG,QAAQ;QAC1BC,KAAK,EAAEJ,OAAO,CAACI,KAAK;QACpB3D,IAAI,EAAEuD,OAAO,CAACvD,IAAI,IAAI,OAAO;QAC7B4D,OAAO,EAAEL,OAAO,CAACK,OAAO;QACxBmB,QAAQ,EAAE,CAAAT,KAAA,GAAAO,IAAI,cAAAP,KAAA,eAAJA,KAAA,CAAM1B,MAAM,GAAGiC,IAAI,CAAC,CAAC,CAAC,CAACG,UAAU,GAAG3E,SAAS;QACvDwD;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;IACF,OAAOjC,OAAO;EAChB;EAEQf,uBAAuBA,CAACoE,OAAyB,EAAE;IACzD,MAAM3D,OAAO,GAAG2D,OAAO,CAAC3D,OAAO,CAACsB,MAAM,GAAI,cAAaqC,OAAO,CAAC3D,OAAO,CAACiB,IAAI,CAAC,IAAI,CAAE,EAAC,GAAG,OAAO;IAC7F,OAAQ,GAAE2C,gBAAK,CAACC,MAAM,CAACF,OAAO,CAACzC,IAAI,CAAE,IAAGyC,OAAO,CAACvB,QAAQ,IAAI,EAAG,IAAGuB,OAAO,CAACjF,IAAI,IAAI,EAAG,IACnFiF,OAAO,CAACrB,OACT,KAAItC,OAAQ,EAAC;EAChB;EAKA,aAAa8D,QAAQA,CAAC,CAACC,GAAG,EAAExG,SAAS,CAAuB,EAAE;IAC5D,MAAMyG,YAAY,GAAG,IAAI3G,gBAAgB,CAACE,SAAS,CAAC;IACpDwG,GAAG,CAACE,QAAQ,CAAC,KAAIC,iBAAM,EAACF,YAAY,CAAC,EAAE,KAAIG,wBAAU,EAACH,YAAY,CAAC,CAAC;IACpE,OAAOA,YAAY;EACrB;AACF;AAACI,OAAA,CAAA/G,gBAAA,GAAAA,gBAAA;AAAA,IAAAgH,gBAAA,GAAA/H,OAAA,EA3LYe,gBAAgB,WAmLZ,EAAE;AAAA,IAAAgH,gBAAA,GAAA/H,OAAA,EAnLNe,gBAAgB,kBAoLL,CAACiH,gBAAS,EAAEC,oBAAe,CAAC;AAAA,IAAAF,gBAAA,GAAA/H,OAAA,EApLvCe,gBAAgB,aAqLVmH,kBAAW;AAQ9BC,kCAAkB,CAACC,UAAU,CAACrH,gBAAgB,CAAC"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 import { ComponentLogAspect } from './component-log.aspect';
-export type { ComponentLogMain } from './component-log.main.runtime';
+export type { ComponentLogMain, FileHashDiffFromParent } from './component-log.main.runtime';
 export default ComponentLogAspect;
 export { ComponentLogAspect };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_componentLog","data","require","_default","ComponentLogAspect","exports","default"],"sources":["index.ts"],"sourcesContent":["import { ComponentLogAspect } from './component-log.aspect';\n\nexport type { ComponentLogMain } from './component-log.main.runtime';\nexport default ComponentLogAspect;\nexport { ComponentLogAspect };\n"],"mappings":";;;;;;;;;;;;AAAA,SAAAA,cAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,aAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA4D,IAAAE,QAAA,GAG7CC,kCAAkB;AAAAC,OAAA,CAAAC,OAAA,GAAAH,QAAA"}
+{"version":3,"names":["_componentLog","data","require","_default","ComponentLogAspect","exports","default"],"sources":["index.ts"],"sourcesContent":["import { ComponentLogAspect } from './component-log.aspect';\n\nexport type { ComponentLogMain, FileHashDiffFromParent } from './component-log.main.runtime';\nexport default ComponentLogAspect;\nexport { ComponentLogAspect };\n"],"mappings":";;;;;;;;;;;;AAAA,SAAAA,cAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,aAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA4D,IAAAE,QAAA,GAG7CC,kCAAkB;AAAAC,OAAA,CAAAC,OAAA,GAAAH,QAAA"}

package/dist/{preview-1693797525205.js → preview-1693970363618.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_component-log@0.0.525/dist/component-log.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_component-log@0.0.525/dist/component-log.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_component-log@0.0.527/dist/component-log.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_component-log@0.0.527/dist/component-log.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/component-log",
-  "version": "0.0.525",
+  "version": "0.0.527",
   "homepage": "https://bit.cloud/teambit/component/component-log",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "component-log",
-    "version": "0.0.525"
+    "version": "0.0.527"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -20,8 +20,8 @@
     "@teambit/harmony": "0.4.6",
     "@teambit/legacy-bit-id": "1.0.0",
     "@teambit/graph.cleargraph": "0.0.1",
-    "@teambit/cli": "0.0.767",
-    "@teambit/workspace": "0.0.1148",
+    "@teambit/cli": "0.0.768",
+    "@teambit/workspace": "0.0.1150",
     "@teambit/legacy-component-log": "0.0.400"
   },
   "devDependencies": {
@@ -35,7 +35,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.552",
+    "@teambit/legacy": "1.0.553",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },