Moves into utils

Author: eamodio

src/views/nodes/branchNode.ts

@@ -41,10 +41,10 @@ import { BranchTrackingStatusNode } from './branchTrackingStatusNode';
 import { CommitNode } from './commitNode';
 import { LoadMoreNode, MessageNode } from './common';
 import { CompareBranchNode } from './compareBranchNode';
-import { insertDateMarkers } from './helpers';
 import { PausedOperationStatusNode } from './pausedOperationStatusNode';
 import { PullRequestNode } from './pullRequestNode';
 import { StashNode } from './stashNode';
+import { insertDateMarkers } from './utils/-webview/node.utils';
 
 type State = {
 	pullRequest: PullRequest | null | undefined;

src/views/nodes/branchTrackingStatusNode.ts

@@ -20,7 +20,7 @@ import { ContextValues, getViewNodeId, ViewNode } from './abstract/viewNode';
 import { BranchTrackingStatusFilesNode } from './branchTrackingStatusFilesNode';
 import { CommitNode } from './commitNode';
 import { LoadMoreNode } from './common';
-import { insertDateMarkers } from './helpers';
+import { insertDateMarkers } from './utils/-webview/node.utils';
 
 export interface BranchTrackingStatus {
 	ref: string;

src/views/nodes/contributorNode.ts

@@ -16,7 +16,7 @@ import type { ClipboardType, PageableViewNode } from './abstract/viewNode';
 import { ContextValues, getViewNodeId, ViewNode } from './abstract/viewNode';
 import { CommitNode } from './commitNode';
 import { LoadMoreNode, MessageNode } from './common';
-import { insertDateMarkers } from './helpers';
+import { insertDateMarkers } from './utils/-webview/node.utils';
 
 export class ContributorNode extends ViewNode<'contributor', ViewsWithContributors> implements PageableViewNode {
 	limit: number | undefined;

src/views/nodes/fileHistoryNode.ts

@@ -23,7 +23,7 @@ import { CommitNode } from './commitNode';
 import { LoadMoreNode, MessageNode } from './common';
 import { FileHistoryTrackerNode } from './fileHistoryTrackerNode';
 import { FileRevisionAsCommitNode } from './fileRevisionAsCommitNode';
-import { insertDateMarkers } from './helpers';
+import { insertDateMarkers } from './utils/-webview/node.utils';
 
 export class FileHistoryNode
 	extends SubscribeableViewNode<'file-history', FileHistoryView>

src/views/nodes/helpers.ts

@@ -22,8 +22,8 @@ import type { PageableViewNode, ViewNode } from './abstract/viewNode';
 import { ContextValues, getViewNodeId } from './abstract/viewNode';
 import { LoadMoreNode, MessageNode } from './common';
 import { FileRevisionAsCommitNode } from './fileRevisionAsCommitNode';
-import { insertDateMarkers } from './helpers';
 import { LineHistoryTrackerNode } from './lineHistoryTrackerNode';
+import { insertDateMarkers } from './utils/-webview/node.utils';
 
 export class LineHistoryNode
 	extends SubscribeableViewNode<'line-history', FileHistoryView | LineHistoryView>

src/views/nodes/lineHistoryNode.ts

@@ -18,9 +18,9 @@ import { AutolinkedItemsNode } from './autolinkedItemsNode';
 import { CommitNode } from './commitNode';
 import { LoadMoreNode, MessageNode } from './common';
 import { ContributorsNode } from './contributorsNode';
-import { insertDateMarkers } from './helpers';
 import { ResultsFilesNode } from './resultsFilesNode';
 import { StashNode } from './stashNode';
+import { insertDateMarkers } from './utils/-webview/node.utils';
 
 interface Options {
 	autolinks: boolean;

src/views/nodes/resultsCommitsNode.ts

@@ -16,7 +16,7 @@ import { ContextValues, getViewNodeId } from './abstract/viewNode';
 import { ViewRefNode } from './abstract/viewRefNode';
 import { CommitNode } from './commitNode';
 import { LoadMoreNode, MessageNode } from './common';
-import { insertDateMarkers } from './helpers';
+import { insertDateMarkers } from './utils/-webview/node.utils';
 
 export class TagNode extends ViewRefNode<'tag', ViewsWithTags, GitTagReference> implements PageableViewNode {
 	limit: number | undefined;

src/views/nodes/tagNode.ts

@@ -1,14 +1,16 @@
 import type { TreeViewNodeTypes } from '../../../../constants.views';
 import { treeViewFileNodeTypes, treeViewRefFileNodeTypes, treeViewRefNodeTypes } from '../../../../constants.views';
+import type { GitCommit } from '../../../../git/models/commit';
 import type { LaunchpadItemNode } from '../../../launchpadView';
 import type { RepositoryFolderNode } from '../../abstract/repositoryFolderNode';
-import { ViewNode } from '../../abstract/viewNode';
+import { ContextValues, ViewNode } from '../../abstract/viewNode';
 import type { BranchNode } from '../../branchNode';
 import type { BranchTrackingStatusFilesNode } from '../../branchTrackingStatusFilesNode';
 import type { BranchTrackingStatusNode } from '../../branchTrackingStatusNode';
 import type { CodeSuggestionsNode } from '../../codeSuggestionsNode';
 import type { CommitFileNode } from '../../commitFileNode';
 import type { CommitNode } from '../../commitNode';
+import { MessageNode } from '../../common';
 import type { CompareBranchNode } from '../../compareBranchNode';
 import type { CompareResultsNode } from '../../compareResultsNode';
 import type { FileRevisionAsCommitNode } from '../../fileRevisionAsCommitNode';
@@ -86,6 +88,77 @@ type FilterNodesByType<T extends keyof TreeViewNodesByType | (keyof TreeViewNode
 		  ? TreeViewNodesByType[T[number]]
 		  : never;
 
+export const markers: [number, string][] = [
+	[0, 'Less than a week ago'],
+	[7, 'Over a week ago'],
+	[25, 'Over a month ago'],
+	[77, 'Over 3 months ago'],
+];
+
+export function* insertDateMarkers<T extends ViewNode & { commit: GitCommit }>(
+	iterable: Iterable<T>,
+	parent: ViewNode,
+	skip?: number,
+	{ show }: { show: boolean } = { show: true },
+): Iterable<ViewNode> {
+	if (!parent.view.config.showRelativeDateMarkers || !show) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return yield* iterable;
+	}
+
+	let index = skip ?? 0;
+	let time = undefined;
+	const now = Date.now();
+
+	let first = true;
+
+	for (const node of iterable) {
+		if (index < markers.length) {
+			let [daysAgo, marker] = markers[index];
+			if (time === undefined) {
+				const date = new Date(now);
+				time = date.setDate(date.getDate() - daysAgo);
+			}
+
+			const date = new Date(node.commit.committer.date).setUTCHours(0, 0, 0, 0);
+			if (date <= time) {
+				while (index < markers.length - 1) {
+					[daysAgo] = markers[index + 1];
+					const nextDate = new Date(now);
+					const nextTime = nextDate.setDate(nextDate.getDate() - daysAgo);
+
+					if (date > nextTime) break;
+
+					index++;
+					time = undefined;
+					[, marker] = markers[index];
+				}
+
+				// Don't show the marker if it is the first node
+				if (!first) {
+					yield new MessageNode(
+						parent.view,
+						parent,
+						'',
+						marker,
+						undefined,
+						undefined,
+						ContextValues.DateMarker,
+					);
+				}
+
+				index++;
+				time = undefined;
+			}
+		}
+
+		first = false;
+		yield node;
+	}
+
+	return undefined;
+}
+
 export function isViewNode(node: unknown): node is ViewNode;
 export function isViewNode<T extends keyof TreeViewNodesByType | (keyof TreeViewNodesByType)[]>(
 	node: unknown,

src/views/nodes/utils/-webview/node.utils.ts

@@ -27,10 +27,10 @@ import { ContextValues, getViewNodeId } from './abstract/viewNode';
 import { CommitNode } from './commitNode';
 import { LoadMoreNode, MessageNode } from './common';
 import { CompareBranchNode } from './compareBranchNode';
-import { insertDateMarkers } from './helpers';
 import { PullRequestNode } from './pullRequestNode';
 import { StashNode } from './stashNode';
 import { UncommittedFilesNode } from './UncommittedFilesNode';
+import { insertDateMarkers } from './utils/-webview/node.utils';
 
 type State = {
 	pullRequest: PullRequest | null | undefined;