refactor: centralize VALUE key handling

Author: chhoumann

src/formatters/fileNameDisplayFormatter.ts

@@ -12,7 +12,7 @@ import {
 	getCurrentFileNamePreview,
 	DateFormatPreviewGenerator
 } from "./helpers/previewHelpers";
-import { VALUE_LABEL_KEY_DELIMITER } from "../utils/valueSyntax";
+import { getValueVariableBaseName } from "../utils/valueSyntax";
 
 import type QuickAdd from "../main";
 
@@ -74,8 +74,7 @@ export class FileNameDisplayFormatter extends Formatter {
 	protected getVariableValue(variableName: string): string {
 		const stored = this.variables.get(variableName);
 		if (typeof stored === "string") return stored;
-		const baseName =
-			variableName.split(VALUE_LABEL_KEY_DELIMITER)[0] ?? variableName;
+		const baseName = getValueVariableBaseName(variableName);
 		return getVariableExample(baseName);
 	}
 

src/formatters/formatDisplayFormatter.ts

@@ -14,7 +14,7 @@ import {
 	getCurrentFileNamePreview,
 	DateFormatPreviewGenerator
 } from "./helpers/previewHelpers";
-import { VALUE_LABEL_KEY_DELIMITER } from "../utils/valueSyntax";
+import { getValueVariableBaseName } from "../utils/valueSyntax";
 
 export class FormatDisplayFormatter extends Formatter {
 	constructor(
@@ -77,8 +77,7 @@ export class FormatDisplayFormatter extends Formatter {
 	protected getVariableValue(variableName: string): string {
 		const stored = this.variables.get(variableName);
 		if (typeof stored === "string") return stored;
-		const baseName =
-			variableName.split(VALUE_LABEL_KEY_DELIMITER)[0] ?? variableName;
+		const baseName = getValueVariableBaseName(variableName);
 		return getVariableExample(baseName);
 	}
 

src/utils/valueSyntax.ts

@@ -24,6 +24,12 @@ export function buildValueVariableKey(
 		: variableName;
 }
 
+export function getValueVariableBaseName(variableKey: string): string {
+	const delimiterIndex = variableKey.indexOf(VALUE_LABEL_KEY_DELIMITER);
+	if (delimiterIndex === -1) return variableKey;
+	return variableKey.slice(0, delimiterIndex);
+}
+
 type ParsedOptions = {
 	label?: string;
 	defaultValue: string;