Merge branch 'master' into aarav_edit

1 files changed, 6 insertions, 2 deletions

diff --git a/src/fields/Types.ts b/src/fields/Types.ts
index af9cb1180..dc7516f38 100644
--- a/src/fields/Types.ts
+++ b/src/fields/Types.ts
@@ -131,9 +131,13 @@ export function PDFCast(field: FieldResult, defaultVal: PdfField | null = null)
 export function ImageCast(field: FieldResult, defaultVal: ImageField | null = null) {
     return Cast(field, ImageField, defaultVal);
 }
-export function ImageCastWithSuffix(field: FieldResult, suffix: string, defaultVal: ImageField | null = null) {
+export function ImageCastToNameType(field: FieldResult, defaultVal: ImageField | null = null) {
     const href = ImageCast(field, defaultVal)?.url.href;
-    return href ? `${href.split('.')[0]}${suffix}.${href.split('.')[1]}` : null;
+    return href ? [href.replace(/.[^.]*$/, ''), href.split('.').lastElement()] : ["", ""];
+}
+export function ImageCastWithSuffix(field: FieldResult, suffix: string, defaultVal: ImageField | null = null) {
+    const [name, type] = ImageCastToNameType(field, defaultVal);
+    return name ? `${name}${suffix}.${type}` : null;
 }
 
 export function FieldValue<T extends FieldType, U extends WithoutList<T>>(field: FieldResult<T>, defaultValue: U): WithoutList<T>;