@cubejs-client/core 1.6.35 → 1.6.37

package/dist/src/format-d3-numeric-locale.d.ts

@@ -1,4 +1,4 @@
 import type { FormatLocaleDefinition, FormatLocaleObject } from 'd3-format';
-export declare const formatD3NumericLocale: Record<string, FormatLocaleDefinition>;
+export declare const formatD3NumericLocale: Record<string, Omit<FormatLocaleDefinition, 'currency'>>;
 export declare function getD3NumericLocale(locale: string, currencyCode?: string): FormatLocaleObject;
 //# sourceMappingURL=format-d3-numeric-locale.d.ts.map

package/dist/src/format-d3-numeric-locale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format-d3-numeric-locale.d.ts","sourceRoot":"","sources":["../../src/format-d3-numeric-locale.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAkB5E,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAcxE,CAAC;AA8DF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,SAAQ,GAAG,kBAAkB,CAsB3F"}
+{"version":3,"file":"format-d3-numeric-locale.d.ts","sourceRoot":"","sources":["../../src/format-d3-numeric-locale.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAI5E,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAc1F,CAAC;AA8DF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,SAAQ,GAAG,kBAAkB,CAyB3F"}

package/dist/src/format-d3-numeric-locale.js

@@ -1,33 +1,20 @@
 import { formatLocale } from 'd3-format';
-import enUS from 'd3-format/locale/en-US.json';
-import enGB from 'd3-format/locale/en-GB.json';
-import zhCN from 'd3-format/locale/zh-CN.json';
-import esES from 'd3-format/locale/es-ES.json';
-import esMX from 'd3-format/locale/es-MX.json';
-import deDE from 'd3-format/locale/de-DE.json';
-import jaJP from 'd3-format/locale/ja-JP.json';
-import frFR from 'd3-format/locale/fr-FR.json';
-import ptBR from 'd3-format/locale/pt-BR.json';
-import koKR from 'd3-format/locale/ko-KR.json';
-import itIT from 'd3-format/locale/it-IT.json';
-import nlNL from 'd3-format/locale/nl-NL.json';
-import ruRU from 'd3-format/locale/ru-RU.json';
 // Pre-built d3 locale definitions for the most popular locales.
 // Used as a fallback when Intl is unavailable (e.g. some edge runtimes).
 export const formatD3NumericLocale = {
-    'en-US': enUS,
-    'en-GB': enGB,
-    'zh-CN': zhCN,
-    'es-ES': esES,
-    'es-MX': esMX,
-    'de-DE': deDE,
-    'ja-JP': jaJP,
-    'fr-FR': frFR,
-    'pt-BR': ptBR,
-    'ko-KR': koKR,
-    'it-IT': itIT,
-    'nl-NL': nlNL,
-    'ru-RU': ruRU,
+    'en-US': { decimal: '.', thousands: ',', grouping: [3] },
+    'en-GB': { decimal: '.', thousands: ',', grouping: [3] },
+    'zh-CN': { decimal: '.', thousands: ',', grouping: [3] },
+    'es-ES': { decimal: ',', thousands: '.', grouping: [3] },
+    'es-MX': { decimal: '.', thousands: ',', grouping: [3] },
+    'de-DE': { decimal: ',', thousands: '.', grouping: [3] },
+    'ja-JP': { decimal: '.', thousands: ',', grouping: [3] },
+    'fr-FR': { decimal: ',', thousands: '\u00a0', grouping: [3], percent: '\u202f%' },
+    'pt-BR': { decimal: ',', thousands: '.', grouping: [3] },
+    'ko-KR': { decimal: '.', thousands: ',', grouping: [3] },
+    'it-IT': { decimal: ',', thousands: '.', grouping: [3] },
+    'nl-NL': { decimal: ',', thousands: '.', grouping: [3] },
+    'ru-RU': { decimal: ',', thousands: '\u00a0', grouping: [3] },
 };
 const currencySymbols = {
     USD: '$',
@@ -39,7 +26,7 @@ const currencySymbols = {
     INR: '₹',
     RUB: '₽',
 };
-function getCurrencySymbol(locale, currencyCode) {
+function getCurrencyOverride(locale, currencyCode) {
     try {
         const cf = new Intl.NumberFormat(locale, { style: 'currency', currency: currencyCode });
         const currencyParts = cf.formatToParts(1);
@@ -76,7 +63,7 @@ function getD3NumericLocaleFromIntl(locale, currencyCode = 'USD') {
         decimal: find('decimal') || '.',
         thousands: find('group') || ',',
         grouping: deriveGrouping(locale),
-        currency: getCurrencySymbol(locale, currencyCode),
+        currency: getCurrencyOverride(locale, currencyCode),
     };
 }
 const localeCache = Object.create(null);
@@ -87,7 +74,7 @@ export function getD3NumericLocale(locale, currencyCode = 'USD') {
     }
     let definition;
     if (formatD3NumericLocale[locale]) {
-        definition = { ...formatD3NumericLocale[locale], currency: getCurrencySymbol(locale, currencyCode) };
+        definition = { ...formatD3NumericLocale[locale], currency: getCurrencyOverride(locale, currencyCode) };
     }
     else {
         try {
@@ -95,7 +82,10 @@ export function getD3NumericLocale(locale, currencyCode = 'USD') {
         }
         catch (e) {
             console.warn('Failed to generate d3 local via Intl, failing back to en-US', e);
-            definition = formatD3NumericLocale['en-US'];
+            definition = {
+                ...formatD3NumericLocale['en-US'],
+                currency: getCurrencyOverride(locale, currencyCode)
+            };
         }
     }
     localeCache[key] = formatLocale(definition);

package/dist/src/format.d.ts

@@ -1,4 +1,5 @@
 import type { DimensionFormat, MeasureFormat, TCubeMemberType } from './types';
+export declare function formatDateByGranularity(value: Date | string | number, granularity?: string): string;
 export type FormatValueMember = {
     type: TCubeMemberType;
     format?: DimensionFormat | MeasureFormat;
@@ -13,5 +14,13 @@ export type FormatValueOptions = FormatValueMember & {
     /** String to return for null/undefined values. Defaults to '∅'. */
     emptyPlaceholder?: string;
 };
-export declare function formatValue(value: any, { type, format, currency, granularity, locale, emptyPlaceholder }: FormatValueOptions): string;
+export type GetFormatOptions = {
+    locale?: string;
+};
+export type GetFormatResult = {
+    formatString: string | null;
+    formatFunc: (value: any) => string;
+};
+export declare function getFormat(member: FormatValueMember, { locale }?: GetFormatOptions): GetFormatResult;
+export declare function formatValue(value: any, options: FormatValueOptions): string;
 //# sourceMappingURL=format.d.ts.map

package/dist/src/format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/format.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAuD/E,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,eAAe,CAAC;IACtB,MAAM,CAAC,EAAE,eAAe,GAAG,aAAa,CAAC;IACzC,kFAAkF;IAClF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yHAAyH;IACzH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG;IACnD,2GAA2G;IAC3G,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAgB,WAAW,CACzB,KAAK,EAAE,GAAG,EACV,EAAE,IAAI,EAAE,MAAM,EAAE,QAAgB,EAAE,WAAW,EAAE,MAAsB,EAAE,gBAAsB,EAAE,EAAE,kBAAkB,GAClH,MAAM,CAuER"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/format.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAoE/E,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAOnG;AAUD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,eAAe,CAAC;IACtB,MAAM,CAAC,EAAE,eAAe,GAAG,aAAa,CAAC;IACzC,kFAAkF;IAClF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yHAAyH;IACzH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG;IACnD,2GAA2G;IAC3G,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,CAAC;CACpC,CAAC;AAwBF,wBAAgB,SAAS,CACvB,MAAM,EAAE,iBAAiB,EACzB,EAAE,MAAsB,EAAE,GAAE,gBAAqB,GAChD,eAAe,CA0EjB;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,kBAAkB,GAC1B,MAAM,CAQR"}

package/dist/src/format.js

@@ -19,26 +19,45 @@ function detectLocale() {
 const currentLocale = detectLocale();
 const DEFAULT_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S';
 const DEFAULT_DATE_FORMAT = '%Y-%m-%d';
-const DEFAULT_DATE_MONTH_FORMAT = '%Y-%m';
+const DEFAULT_DATE_WEEK_FORMAT = '%Y-%m-%d W%V';
+const DEFAULT_DATE_MONTH_FORMAT = '%Y %b';
 const DEFAULT_DATE_QUARTER_FORMAT = '%Y-Q%q';
 const DEFAULT_DATE_YEAR_FORMAT = '%Y';
-function getTimeFormatByGrain(grain) {
-    switch (grain) {
-        case 'day':
-        case 'week':
-            return DEFAULT_DATE_FORMAT;
-        case 'month':
-            return DEFAULT_DATE_MONTH_FORMAT;
-        case 'quarter':
-            return DEFAULT_DATE_QUARTER_FORMAT;
-        case 'year':
-            return DEFAULT_DATE_YEAR_FORMAT;
-        case 'second':
-        case 'minute':
-        case 'hour':
-        default:
-            return DEFAULT_DATETIME_FORMAT;
+function getFormatByGrain(grain) {
+    // Grains that should show date and time (sub-day granularities)
+    const dateTimeGrains = ['second', 'minute', 'hour'];
+    // Grains that should show date only (day and above granularities)
+    const dateOnlyGrains = ['day', 'week', 'month', 'quarter', 'year'];
+    if (grain === 'day') {
+        return DEFAULT_DATE_FORMAT;
     }
+    if (grain === 'week') {
+        return DEFAULT_DATE_WEEK_FORMAT;
+    }
+    if (grain === 'month') {
+        return DEFAULT_DATE_MONTH_FORMAT;
+    }
+    if (grain === 'quarter') {
+        return DEFAULT_DATE_QUARTER_FORMAT;
+    }
+    if (grain === 'year') {
+        return DEFAULT_DATE_YEAR_FORMAT;
+    }
+    if (!grain || dateTimeGrains.includes(grain)) {
+        return DEFAULT_DATETIME_FORMAT;
+    }
+    if (dateOnlyGrains.includes(grain)) {
+        return DEFAULT_DATE_FORMAT;
+    }
+    // Fallback to datetime for unknown grains
+    return DEFAULT_DATETIME_FORMAT;
+}
+export function formatDateByGranularity(value, granularity) {
+    const date = value instanceof Date ? value : new Date(value);
+    if (Number.isNaN(date.getTime())) {
+        return 'Invalid date';
+    }
+    return timeFormat(getFormatByGrain(granularity))(date);
 }
 function parseNumber(value) {
     if (value === null || value === undefined) {
@@ -46,63 +65,94 @@ function parseNumber(value) {
     }
     return parseFloat(value);
 }
-export function formatValue(value, { type, format, currency = 'USD', granularity, locale = currentLocale, emptyPlaceholder = '∅' }) {
-    if (value === null || value === undefined) {
-        return emptyPlaceholder;
+function formatBoolean(value) {
+    if (typeof value === 'boolean') {
+        return value.toString();
+    }
+    if (typeof value === 'number') {
+        return Boolean(value).toString();
+    }
+    // Some SQL drivers return booleans as '0'/'1' or 'true'/'false' strings, It's incorrect behaivour in Cube,
+    // but let's format it as boolean for backward compatibility.
+    if (value === '0' || value === 'false') {
+        return 'false';
     }
+    if (value === '1' || value === 'true') {
+        return 'true';
+    }
+    return String(value);
+}
+export function getFormat(member, { locale = currentLocale } = {}) {
+    const { type, format, currency = 'USD', granularity } = member;
     if (type === 'boolean') {
-        if (typeof value === 'boolean') {
-            return value.toString();
-        }
-        if (typeof value === 'number') {
-            return Boolean(value).toString();
-        }
-        // Some SQL drivers return booleans as '0'/'1' or 'true'/'false' strings, It's incorrect behaivour in Cube,
-        // but let's format it as boolean for backward compatibility.
-        if (value === '0' || value === 'false') {
-            return 'false';
-        }
-        if (value === '1' || value === 'true') {
-            return 'true';
-        }
-        return String(value);
+        return { formatString: null, formatFunc: formatBoolean };
     }
     if (format && typeof format === 'object') {
         if (format.type === 'custom-numeric') {
-            return d3Format(format.value)(parseNumber(value));
+            return {
+                formatString: format.value,
+                formatFunc: (value) => d3Format(format.value)(parseNumber(value)),
+            };
         }
         if (format.type === 'custom-time') {
-            const date = new Date(value);
-            return Number.isNaN(date.getTime()) ? 'Invalid date' : timeFormat(format.value)(date);
+            return {
+                formatString: format.value,
+                formatFunc: (value) => {
+                    const date = new Date(value);
+                    return Number.isNaN(date.getTime()) ? 'Invalid date' : timeFormat(format.value)(date);
+                },
+            };
         }
         // { type: 'link', label: string } — return value as string
-        return String(value);
+        return { formatString: null, formatFunc: (value) => String(value) };
     }
     if (typeof format === 'string') {
         switch (format) {
             case 'currency':
-                return getD3NumericLocale(locale, currency).format(DEFAULT_CURRENCY_FORMAT)(parseNumber(value));
+                return {
+                    formatString: DEFAULT_CURRENCY_FORMAT,
+                    formatFunc: (value) => getD3NumericLocale(locale, currency).format(DEFAULT_CURRENCY_FORMAT)(parseNumber(value)),
+                };
             case 'percent':
-                return getD3NumericLocale(locale).format(DEFAULT_PERCENT_FORMAT)(parseNumber(value));
+                return {
+                    formatString: DEFAULT_PERCENT_FORMAT,
+                    formatFunc: (value) => getD3NumericLocale(locale).format(DEFAULT_PERCENT_FORMAT)(parseNumber(value)),
+                };
             case 'number':
-                return getD3NumericLocale(locale).format(DEFAULT_NUMBER_FORMAT)(parseNumber(value));
+                return {
+                    formatString: DEFAULT_NUMBER_FORMAT,
+                    formatFunc: (value) => getD3NumericLocale(locale).format(DEFAULT_NUMBER_FORMAT)(parseNumber(value)),
+                };
             case 'id':
-                return d3Format(DEFAULT_ID_FORMAT)(parseNumber(value));
+                return {
+                    formatString: DEFAULT_ID_FORMAT,
+                    formatFunc: (value) => d3Format(DEFAULT_ID_FORMAT)(parseNumber(value)),
+                };
             case 'imageUrl':
             case 'link':
             default:
-                return String(value);
+                return { formatString: null, formatFunc: (value) => String(value) };
         }
     }
     // No explicit format — infer from type
     if (type === 'time') {
-        const date = new Date(value);
-        if (Number.isNaN(date.getTime()))
-            return 'Invalid date';
-        return timeFormat(getTimeFormatByGrain(granularity))(date);
+        return {
+            formatString: getFormatByGrain(granularity),
+            formatFunc: (value) => formatDateByGranularity(value, granularity),
+        };
     }
     if (type === 'number') {
-        return getD3NumericLocale(locale, currency).format(DEFAULT_NUMBER_FORMAT)(parseNumber(value));
+        return {
+            formatString: DEFAULT_NUMBER_FORMAT,
+            formatFunc: (value) => getD3NumericLocale(locale, currency).format(DEFAULT_NUMBER_FORMAT)(parseNumber(value)),
+        };
     }
-    return String(value);
+    return { formatString: null, formatFunc: (value) => String(value) };
+}
+export function formatValue(value, options) {
+    const { emptyPlaceholder = '∅' } = options;
+    if (value === null || value === undefined) {
+        return emptyPlaceholder;
+    }
+    return getFormat(options, { locale: options.locale }).formatFunc(value);
 }

package/dist/test/format.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { formatValue } from '../src/format';
+import { formatValue, formatDateByGranularity, getFormat } from '../src/format';
 describe('formatValue', () => {
     it('format null', () => {
         expect(formatValue(null, { type: 'number' })).toBe('∅');
@@ -53,11 +53,12 @@ describe('formatValue', () => {
     });
     it('type-based fallback: time with grain', () => {
         expect(formatValue('2024-03-15T00:00:00.000', { type: 'time', granularity: 'day' })).toBe('2024-03-15');
-        expect(formatValue('2024-03-01T00:00:00.000', { type: 'time', granularity: 'month' })).toBe('2024-03');
+        expect(formatValue('2024-03-01T00:00:00.000', { type: 'time', granularity: 'month' })).toBe('2024 Mar');
         expect(formatValue('2024-01-01T00:00:00.000', { type: 'time', granularity: 'year' })).toBe('2024');
-        expect(formatValue('2024-03-11T00:00:00.000', { type: 'time', granularity: 'week' })).toBe('2024-03-11');
+        expect(formatValue('2024-03-11T00:00:00.000', { type: 'time', granularity: 'week' })).toBe('2024-03-11 W11');
         expect(formatValue('2024-03-01T00:00:00.000', { type: 'time', granularity: 'quarter' })).toBe('2024-Q1');
         expect(formatValue('2024-03-15T14:00:00.000', { type: 'time', granularity: 'hour' })).toBe('2024-03-15 14:00:00');
+        expect(formatValue('2024-03-15T14:30:00.000', { type: 'time', granularity: 'minute' })).toBe('2024-03-15 14:30:00');
         expect(formatValue('2024-03-15T14:30:45.000', { type: 'time' })).toBe('2024-03-15 14:30:45');
     });
     it('format with nl-NL locale', () => {
@@ -99,3 +100,77 @@ describe('formatValue', () => {
         expect(formatValue('0', { type: 'boolean' })).toBe('false');
     });
 });
+describe('formatDateByGranularity', () => {
+    it('formats each predefined granularity', () => {
+        const iso = '2024-03-15T14:30:45.000';
+        expect(formatDateByGranularity(iso, 'second')).toBe('2024-03-15 14:30:45');
+        expect(formatDateByGranularity(iso, 'minute')).toBe('2024-03-15 14:30:45');
+        expect(formatDateByGranularity(iso, 'hour')).toBe('2024-03-15 14:30:45');
+        expect(formatDateByGranularity(iso, 'day')).toBe('2024-03-15');
+        expect(formatDateByGranularity(iso, 'week')).toBe('2024-03-15 W11');
+        expect(formatDateByGranularity(iso, 'month')).toBe('2024 Mar');
+        expect(formatDateByGranularity(iso, 'quarter')).toBe('2024-Q1');
+        expect(formatDateByGranularity(iso, 'year')).toBe('2024');
+    });
+    it('accepts Date, ISO string, and epoch-number inputs', () => {
+        const date = new Date('2024-03-15T00:00:00.000');
+        expect(formatDateByGranularity(date, 'day')).toBe('2024-03-15');
+        expect(formatDateByGranularity(date.getTime(), 'day')).toBe('2024-03-15');
+        expect(formatDateByGranularity('2024-03-15T00:00:00.000', 'day')).toBe('2024-03-15');
+    });
+    it('falls back to second-grain format for missing or unknown granularity', () => {
+        expect(formatDateByGranularity('2024-03-15T14:30:45.000')).toBe('2024-03-15 14:30:45');
+        expect(formatDateByGranularity('2024-03-15T14:30:45.000', 'decade')).toBe('2024-03-15 14:30:45');
+    });
+    it('returns "Invalid date" on bad input', () => {
+        expect(formatDateByGranularity('not-a-date', 'day')).toBe('Invalid date');
+    });
+});
+describe('getFormat', () => {
+    it('time dimension: returns d3 format string per granularity', () => {
+        expect(getFormat({ type: 'time', granularity: 'day' }).formatString).toBe('%Y-%m-%d');
+        expect(getFormat({ type: 'time', granularity: 'month' }).formatString).toBe('%Y %b');
+        expect(getFormat({ type: 'time', granularity: 'year' }).formatString).toBe('%Y');
+        expect(getFormat({ type: 'time', granularity: 'hour' }).formatString).toBe('%Y-%m-%d %H:%M:%S');
+        expect(getFormat({ type: 'time' }).formatString).toBe('%Y-%m-%d %H:%M:%S');
+    });
+    it('time dimension: formatFunc delegates to formatDateByGranularity', () => {
+        const { formatFunc } = getFormat({ type: 'time', granularity: 'month' });
+        expect(formatFunc('2024-03-01T00:00:00.000')).toBe('2024 Mar');
+    });
+    it('number with currency format', () => {
+        const { formatString, formatFunc } = getFormat({ type: 'number', format: 'currency' });
+        expect(formatString).toBe('$,.2f');
+        expect(formatFunc(1234.56)).toBe('$1,234.56');
+        expect(formatFunc('1234.56')).toBe('$1,234.56');
+    });
+    it('number with percent format', () => {
+        const { formatString, formatFunc } = getFormat({ type: 'number', format: 'percent' });
+        expect(formatString).toBe('.2%');
+        expect(formatFunc(0.1234)).toBe('12.34%');
+    });
+    it('number with no explicit format falls back to default number format', () => {
+        const { formatString, formatFunc } = getFormat({ type: 'number' });
+        expect(formatString).toBe(',.2f');
+        expect(formatFunc(1234.56)).toBe('1,234.56');
+    });
+    it('custom-numeric format exposes the spec as formatString', () => {
+        const { formatString, formatFunc } = getFormat({ type: 'number', format: { type: 'custom-numeric', value: '.2s' } });
+        expect(formatString).toBe('.2s');
+        expect(formatFunc(1500)).toBe('1.5k');
+    });
+    it('custom-time format exposes the spec as formatString', () => {
+        const { formatString, formatFunc } = getFormat({ type: 'time', format: { type: 'custom-time', value: '%Y-%m-%d' } });
+        expect(formatString).toBe('%Y-%m-%d');
+        expect(formatFunc('2024-03-15T10:30:00.000')).toBe('2024-03-15');
+    });
+    it('string fallback returns identity formatFunc', () => {
+        const { formatString, formatFunc } = getFormat({ type: 'string' });
+        expect(formatString).toBeNull();
+        expect(formatFunc('hello')).toBe('hello');
+    });
+    it('locale option is honored by formatFunc', () => {
+        const { formatFunc } = getFormat({ type: 'number', format: 'currency', currency: 'EUR' }, { locale: 'nl-NL' });
+        expect(formatFunc(1234.56)).toBe('€1.234,56');
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/core",
-  "version": "1.6.35",
+  "version": "1.6.37",
   "engines": {},
   "repository": {
     "type": "git",
@@ -55,7 +55,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@cubejs-backend/linter": "1.6.35",
+    "@cubejs-backend/linter": "1.6.37",
     "@types/d3-format": "^3",
     "@types/d3-time-format": "^4",
     "@types/moment-range": "^4.0.0",
@@ -67,5 +67,5 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "gitHead": "72474000afc5c4bac7e7ec6b7fc41c5293bc4f7b"
+  "gitHead": "e4ef0024dd5136329f8b3743c4ee83dd844cee86"
 }