fix: revert change

Author: marshallpete

packages/vega-spec-builder/src/legend/legendFacetUtils.test.ts

@@ -9,12 +9,11 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { Scale, ScaleField } from 'vega';
+import { Scale } from 'vega';
 
 import { COLOR_SCALE, DEFAULT_COLOR, LINE_TYPE_SCALE, SYMBOL_SIZE_SCALE, TABLE } from '@spectrum-charts/constants';
 
-import { getFacets, getFacetsFromKeys, getFieldName } from './legendFacetUtils';
-
+import { getFacets, getFacetsFromKeys } from './legendFacetUtils';
 
 describe('getFacets()', () => {
   test('should correctly identify continuous and categorical facets', () => {
@@ -38,8 +37,6 @@ describe('getFacets()', () => {
     expect(ordinalFacets).toHaveLength(1);
     expect(continuousFacets).toHaveLength(1);
   });
-
-
 });
 
 describe('getFacetsFromKeys()', () => {
@@ -67,69 +64,4 @@ describe('getFacetsFromKeys()', () => {
     expect(facets.ordinalFacets).toHaveLength(1);
     expect(facets.continuousFacets).toHaveLength(0);
   });
-
-
-});
-
-describe('getFieldName()', () => {
-  test('should return string field as is', () => {
-    expect(getFieldName('category')).toBe('category');
-    expect(getFieldName('series')).toBe('series');
-    expect(getFieldName('')).toBe('');
-  });
-
-  test('should extract field name from object with field property', () => {
-    expect(getFieldName({ field: 'category' } as unknown as ScaleField)).toBe('category');
-    expect(getFieldName({ field: 'series' } as unknown as ScaleField)).toBe('series');
-    expect(getFieldName({ field: '' } as unknown as ScaleField)).toBe('');
-  });
-
-  test('should extract signal name from object with signal property', () => {
-    expect(getFieldName({ signal: 'category' } as unknown as ScaleField)).toBe('category');
-    expect(getFieldName({ signal: 'series' } as unknown as ScaleField)).toBe('series');
-    expect(getFieldName({ signal: '' } as unknown as ScaleField)).toBe('');
-  });
-
-  test('should handle undefined input', () => {
-    expect(getFieldName(undefined)).toBe('undefined');
-  });
-
-  test('should handle null input', () => {
-    expect(getFieldName(null as unknown as ScaleField)).toBe('null');
-  });
-
-  test('should handle other object types with toString fallback', () => {
-    const obj = { toString: () => 'custom object' };
-    expect(getFieldName(obj as unknown as ScaleField)).toBe('custom object');
-  });
-
-  test('should handle object with both field and signal properties', () => {
-    // Should prioritize field over signal
-    expect(getFieldName({ field: 'category', signal: 'series' } as unknown as ScaleField)).toBe('category');
-  });
-
-  test('should handle object with non-string field property', () => {
-    expect(getFieldName({ field: 123 } as unknown as ScaleField)).toBe('[object Object]');
-  });
-
-  test('should handle object with non-string signal property', () => {
-    expect(getFieldName({ signal: 456 } as unknown as ScaleField)).toBe('[object Object]');
-  });
-
-  test('should handle empty object', () => {
-    expect(getFieldName({} as unknown as ScaleField)).toBe('[object Object]');
-  });
-
-  test('should handle array input', () => {
-    expect(getFieldName(['category'] as unknown as ScaleField)).toBe('category');
-  });
-
-  test('should handle number input', () => {
-    expect(getFieldName(123 as unknown as ScaleField)).toBe('123');
-  });
-
-  test('should handle boolean input', () => {
-    expect(getFieldName(true as unknown as ScaleField)).toBe('true');
-    expect(getFieldName(false as unknown as ScaleField)).toBe('false');
-  });
 });

packages/vega-spec-builder/src/legend/legendFacetUtils.ts

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { Scale, ScaleField, ScaleMultiFieldsRef } from 'vega';
+import { Scale, ScaleMultiFieldsRef } from 'vega';
 
 import {
   COLOR_SCALE,
@@ -39,29 +39,6 @@ const facetScaleNames: (FacetType | SecondaryFacetType)[] = [
   SYMBOL_SIZE_SCALE,
 ];
 
-/**
- * Safely extracts the field name from a field reference
- * @param field - The field reference which could be a string or object
- * @returns The field name as a string
- */
-export const getFieldName = (field: ScaleField | undefined): string => {
-  if (typeof field === 'string') {
-    return field;
-  }
-  if (field && typeof field === 'object') {
-    // Handle Vega field reference objects
-    if ('field' in field && typeof field.field === 'string') {
-      return field.field;
-    }
-    if ('signal' in field && typeof field.signal === 'string') {
-      return field.signal;
-    }
-    // Fallback to toString for other object types
-    return String(field);
-  }
-  return String(field);
-};
-
 /**
  * Goes through all the scales and finds all the facets that are used
  * A facet is a key in the data that is used to differentiate the data
@@ -82,10 +59,10 @@ export const getFacets = (scales: Scale[]): { ordinalFacets: Facet[]; continuous
       if (scale.type === 'ordinal' || scale.type === 'point') {
         ordinalFacets.push({
           facetType: scale.name as FacetType,
-          field: getFieldName(scale.domain.fields[0]),
+          field: scale.domain.fields[0].toString(),
         });
       } else {
-        continuousFacets.push({ facetType: scale.name as FacetType, field: getFieldName(scale.domain.fields[0]) });
+        continuousFacets.push({ facetType: scale.name as FacetType, field: scale.domain.fields[0].toString() });
       }
     }
   });
@@ -110,12 +87,12 @@ export const getFacetsFromKeys = (
       if (scale.type === 'ordinal' || scale.type === 'point') {
         ordinalFacets.push({
           facetType: scale.name as FacetType,
-          field: getFieldName(scale.domain.fields.find((field) => keys.includes(getFieldName(field)))),
+          field: scale.domain.fields.find((field) => keys.includes(field.toString()))?.toString() as string,
         });
       } else {
         continuousFacets.push({
           facetType: scale.name as FacetType,
-          field: getFieldName(scale.domain.fields.find((field) => keys.includes(getFieldName(field)))),
+          field: scale.domain.fields.find((field) => keys.includes(field.toString()))?.toString() as string,
         });
       }
     }
@@ -130,7 +107,7 @@ export const getFacetsFromKeys = (
  * @returns boolean
  */
 const scaleHasKey = (scale: ScaleWithMultiFields, keys: string[]): boolean =>
-  scale.domain.fields.some((field) => keys.includes(getFieldName(field)));
+  scale.domain.fields.some((field) => keys.includes(field.toString()));
 
 type ScaleWithMultiFields = Scale & { domain: ScaleMultiFieldsRef };