fix: normalize icon ids for comapeocat

Author: luandro

src/services/comapeocatBuilder.ts

@@ -219,8 +219,8 @@ function mapCategory(category: any, index: number): MappedCategory {
   const fields = category.fields || category.defaultFieldIds || [];
 
   let icon = category.icon || category.iconId;
-  if (icon && typeof icon === 'string' && !icon.endsWith('.svg')) {
-    icon = `${icon}.svg`;
+  if (icon && typeof icon === 'string') {
+    icon = normalizeIconId(icon);
   }
 
   const definition = {
@@ -300,7 +300,7 @@ function deriveCategorySelection(categories: MappedCategory[]) {
 async function resolveIcon(icon: any): Promise<MappedIcon> {
   if (!icon?.id) throw new ValidationError('Icon id is required');
 
-  const id = icon.id.endsWith('.svg') ? icon.id : `${icon.id}.svg`;
+  const id = normalizeIconId(icon.id);
 
   if (icon.svgData) {
     enforceIconSize(icon.svgData, id);
@@ -324,6 +324,26 @@ async function resolveIcon(icon: any): Promise<MappedIcon> {
   throw new ValidationError(`Icon ${id} must include svgData or svgUrl`);
 }
 
+const SVG_EXTENSION_PATTERN = /(\.svg)+$/i;
+
+function normalizeIconId(value: unknown): string {
+  if (typeof value !== 'string') {
+    throw new ValidationError('Icon id must be a non-empty string');
+  }
+
+  const trimmed = value.trim();
+  if (!trimmed) {
+    throw new ValidationError('Icon id must be a non-empty string');
+  }
+
+  const normalized = trimmed.replace(SVG_EXTENSION_PATTERN, '');
+  if (!normalized) {
+    throw new ValidationError('Icon id must include characters other than ".svg"');
+  }
+
+  return normalized;
+}
+
 function decodeDataUri(dataUri: string): string {
   if (!dataUri.startsWith('data:image/svg+xml,')) {
     throw new ValidationError('Invalid data URI format. Must start with "data:image/svg+xml,"');
@@ -536,4 +556,6 @@ export const __test__ = {
   enforceEntryCap,
   sanitizePathComponent,
   decodeDataUri,
+  normalizeIconId,
+  resolveIcon,
 };

src/tests/unit/services/comapeocatBuilder.test.ts

@@ -107,6 +107,18 @@ describe('comapeocatBuilder helpers', () => {
     expect(mapped.definition.appliesTo.sort()).toEqual(['observation', 'track']);
   });
 
+  it('normalizes category icon references by stripping .svg suffix', () => {
+    const category = {
+      id: 'cat',
+      name: 'Cat',
+      appliesTo: ['observation'],
+      tags: { categoryId: 'cat' },
+      icon: 'animal-terrs.svg',
+    };
+    const mapped = __test__.mapCategory(category, 0);
+    expect(mapped.definition.icon).toBe('animal-terrs');
+  });
+
   it('throws when icon exceeds size cap', async () => {
     const payload = createBasePayload();
     payload.icons = [{ id: 'big', svgData: 'a'.repeat(2_000_001) }];
@@ -171,6 +183,16 @@ describe('icon resolution with all three formats', () => {
     expect(result.fileName).toContain('test');
   });
 
+  it('normalizes icon ids to prevent duplicate .svg suffixes', async () => {
+    const icon = await __test__.resolveIcon({ id: 'animal-terrs.svg', svgData: '<svg xmlns="http://www.w3.org/2000/svg"></svg>' });
+    expect(icon.id).toBe('animal-terrs');
+  });
+
+  it('strips repeated .svg suffixes when normalizing icon ids', async () => {
+    const icon = await __test__.resolveIcon({ id: 'animal-terrs.svg.svg', svgData: '<svg xmlns="http://www.w3.org/2000/svg"></svg>' });
+    expect(icon.id).toBe('animal-terrs');
+  });
+
   it('successfully processes svgUrl with data URI', async () => {
     const payload = createBasePayload();
     const dataUri = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%3e%3ccircle%20r='10'/%3e%3c/svg%3e";