itube-specs 0.0.766 → 0.0.768

package/composables/__tests__/use-format-time-ago.test.ts

@@ -0,0 +1,39 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { useFormatTimeAgo } from '../use-format-time-ago';
+
+describe('useFormatTimeAgo', () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2025-06-15T12:00:00Z'));
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  const now = () => Math.floor(Date.now() / 1000);
+
+  it('сегодня', () => {
+    expect(useFormatTimeAgo(now(), 'en')).toBe('today');
+  });
+
+  it('вчера', () => {
+    expect(useFormatTimeAgo(now() - 86400, 'en')).toBe('yesterday');
+  });
+
+  it('5 дней назад', () => {
+    expect(useFormatTimeAgo(now() - 5 * 86400, 'en')).toBe('5 days ago');
+  });
+
+  it('3 месяца назад', () => {
+    expect(useFormatTimeAgo(now() - 90 * 86400, 'en')).toBe('3 months ago');
+  });
+
+  it('2 года назад', () => {
+    expect(useFormatTimeAgo(now() - 730 * 86400, 'en')).toBe('2 years ago');
+  });
+
+  it('локализация (ru)', () => {
+    expect(useFormatTimeAgo(now() - 5 * 86400, 'ru')).toBe('5 дней назад');
+  });
+});

package/composables/__tests__/use-model-filter-chips.test.ts

@@ -8,14 +8,14 @@ describe('useFilterChipsItems', () => {
   it('пустой массив без filter_ в query', () => {
     const filters = ref([]);
     const route = { query: {} };
-    const { chipsItems } = useFilterChipsItems(filters, route, t);
+    const { chipsItems } = useFilterChipsItems(filters, route, t, ref('en'));
     expect(chipsItems.value).toEqual([]);
   });
 
   it('игнорирует не-filter параметры', () => {
     const filters = ref([]);
     const route = { query: { page: '1', sort: 'popular' } };
-    const { chipsItems } = useFilterChipsItems(filters, route, t);
+    const { chipsItems } = useFilterChipsItems(filters, route, t, ref('en'));
     expect(chipsItems.value).toEqual([]);
   });
 
@@ -29,7 +29,7 @@ describe('useFilterChipsItems', () => {
       ],
     }]);
     const route = { query: { filter_hair_color: 'blonde' } };
-    const { chipsItems } = useFilterChipsItems(filters, route, t);
+    const { chipsItems } = useFilterChipsItems(filters, route, t, ref('en'));
     expect(chipsItems.value).toHaveLength(1);
     expect(chipsItems.value[0].title).toBe('Hair color: Blonde');
     expect(chipsItems.value[0].value).toEqual(['filter_hair_color']);
@@ -45,7 +45,7 @@ describe('useFilterChipsItems', () => {
       ],
     }]);
     const route = { query: { filter_age_from: '18', filter_age_to: '30' } };
-    const { chipsItems } = useFilterChipsItems(filters, route, t);
+    const { chipsItems } = useFilterChipsItems(filters, route, t, ref('en'));
     expect(chipsItems.value).toHaveLength(1);
     expect(chipsItems.value[0].title).toBe('Age: 18 - 30');
     expect(chipsItems.value[0].value).toEqual(['filter_age_from', 'filter_age_to']);
@@ -61,7 +61,21 @@ describe('useFilterChipsItems', () => {
       ],
     }]);
     const route = { query: { filter_weight: '65' } };
-    const { chipsItems } = useFilterChipsItems(filters, route, t);
+    const { chipsItems } = useFilterChipsItems(filters, route, t, ref('en'));
     expect(chipsItems.value[0].title).toBe('Weight: 65');
   });
+
+  it('месяц → локализованное название', () => {
+    const filters = ref([{
+      name: 'birth_month',
+      title: 'Birth month',
+      options: [
+        { name: '1', title: '1' },
+        { name: '12', title: '12' },
+      ],
+    }]);
+    const route = { query: { filter_birth_month: '6' } };
+    const { chipsItems } = useFilterChipsItems(filters, route, t, ref('en'));
+    expect(chipsItems.value[0].title).toBe('Birth month: June');
+  });
 });

package/composables/use-format-time-ago.ts

@@ -1,26 +1,18 @@
 /**
- * Форматирует Unix timestamp (в секундах) в относительную строку: «сегодня», «вчера», «3 дня назад» и т.д.
- * @param t - функция перевода (i18n)
+ * Форматирует Unix timestamp (в секундах) в относительную строку в локали пользователя
+ * («сегодня», «вчера», «5 дней назад») через Intl.RelativeTimeFormat.
  * @param time - Unix timestamp в секундах
+ * @param locale - активная локаль (код или BCP-47)
  */
-export const useFormatTimeAgo = (t, time: number) => {
-  const pastDate = new Date(time * 1000);
-  const now = new Date();
+export const useFormatTimeAgo = (time: number, locale: string): string => {
+  const diffInDays = Math.floor((Date.now() - time * 1000) / 86_400_000);
+  const rtf = new Intl.RelativeTimeFormat(locale, { numeric: 'auto' });
 
-  const diffInMs = Number(now) - Number(pastDate);
-  const diffInDays = Math.floor(diffInMs / (1000 * 60 * 60 * 24));
-
-  if (diffInDays === 0) {
-    return t('date.today');
-  } else if (diffInDays === 1) {
-    return t('date.day_ago');
-  } else if (diffInDays < 30) {
-    return `${diffInDays} ${t('date.days_ago')}`;
-  } else if (diffInDays < 365) {
-    const diffInMonths = Math.floor(diffInDays / 30);
-    return `${diffInMonths} ${t('date.month')}${diffInMonths > 1 ? 's' : ''}`;
-  } else {
-    const diffInYears = Math.floor(diffInDays / 365);
-    return `${diffInYears} ${t('date.year')}${diffInYears > 1 ? 's' : ''}`;
+  if (diffInDays < 30) {
+    return rtf.format(-diffInDays, 'day');
+  }
+  if (diffInDays < 365) {
+    return rtf.format(-Math.floor(diffInDays / 30), 'month');
   }
-}
+  return rtf.format(-Math.floor(diffInDays / 365), 'year');
+};

package/composables/use-model-filter-chips.ts

@@ -6,7 +6,8 @@ import type { Ref } from 'vue';
 export function useFilterChipsItems(
   filters: Ref<IModelFilter[]>,
   route: { query: LocationQuery },
-  t: (key: string) => string
+  t: (key: string) => string,
+  locale: Ref<string>
 ) {
   const chipsItems = computed<IChipsItem[]>(() => {
     const queryItems = Object.keys(route.query)
@@ -60,7 +61,7 @@ export function useFilterChipsItems(
 
       if (item.includes('month')) {
         return getMonth(
-          t,
+          locale.value,
           Number(value ?? defaultValue?.name) - 1
         );
       }

package/lib/report-forms-scheme.ts

@@ -64,7 +64,7 @@ export const reportFormsScheme: Array<IReportScheme> = [
                 marginClass: '_mb-12'
             },
             {
-                type: 'text',
+                type: 'email',
                 value: 'from',
                 label: 'email',
                 hideLabel: true,
@@ -113,7 +113,7 @@ export const reportFormsScheme: Array<IReportScheme> = [
                 marginClass: '_mb-12 _mt-4'
             },
             {
-                type: 'text',
+                type: 'email',
                 value: 'from',
                 label: 'email',
                 hideLabel: true,
@@ -153,7 +153,7 @@ export const reportFormsScheme: Array<IReportScheme> = [
                 marginClass: '_mb-12 _mt-4'
             },
             {
-                type: 'text',
+                type: 'email',
                 value: 'from',
                 label: 'email',
                 hideLabel: true,
@@ -185,7 +185,7 @@ export const reportFormsScheme: Array<IReportScheme> = [
                 marginClass: '_mb-12'
             })),
             {
-                type: 'text',
+                type: 'email',
                 value: 'from',
                 label: 'email',
                 hideLabel: true,
@@ -247,7 +247,7 @@ export const reportFormsScheme: Array<IReportScheme> = [
                 marginClass: '_mt-4 _mb-12'
             },
             {
-                type: 'text',
+                type: 'email',
                 value: 'from',
                 label: 'email',
                 hideLabel: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.766",
+  "version": "0.0.768",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {

package/runtime/index.ts

@@ -8,7 +8,6 @@ export * from './constants/report-forms-subjects';
 export * from './constants/playlist-step';
 export * from './constants/thumb-size';
 export * from './utils/format-date';
-export * from './utils/format-number';
 export * from './utils/format-time';
 export * from './utils/get-multiple-query';
 export * from './utils/get-duration';
@@ -35,7 +34,6 @@ export * from './utils/cleaners/clean-video-data';
 export * from './utils/cleaners/clean-video-card';
 export * from './utils/cleaners/clean-model-info';
 export * from './utils/video-data-add-model-icon';
-export * from './utils/format-time-ago';
 export * from './utils/converters/convert-categories-to-footer';
 export * from './utils/converters/convert-categories-to-chips';
 export * from './utils/converters/convert-model-card-to-chips';

package/runtime/utils/__tests__/get-month.test.ts

@@ -1,30 +1,32 @@
 import { describe, it, expect } from 'vitest';
 import { getMonth } from '../get-month';
 
-const t = (key: string) => key;
-
 describe('getMonth', () => {
   it('январь = 0', () => {
-    expect(getMonth(t, 0)).toBe('january');
+    expect(getMonth('en', 0)).toBe('January');
   });
 
   it('декабрь = 11', () => {
-    expect(getMonth(t, 11)).toBe('december');
+    expect(getMonth('en', 11)).toBe('December');
   });
 
   it('июнь = 5', () => {
-    expect(getMonth(t, 5)).toBe('june');
+    expect(getMonth('en', 5)).toBe('June');
   });
 
   it('undefined → декабрь (дефолт)', () => {
-    expect(getMonth(t)).toBe('december');
+    expect(getMonth('en')).toBe('December');
   });
 
   it('отрицательное число → декабрь', () => {
-    expect(getMonth(t, -1)).toBe('december');
+    expect(getMonth('en', -1)).toBe('December');
   });
 
   it('число >= 12 → декабрь', () => {
-    expect(getMonth(t, 12)).toBe('december');
+    expect(getMonth('en', 12)).toBe('December');
+  });
+
+  it('локализация (ru)', () => {
+    expect(getMonth('ru', 5)).toBe('июнь');
   });
 });

package/runtime/utils/get-month.ts

@@ -1,24 +1,9 @@
 /**
- * Возвращает локализованное название месяца по его номеру (0-based).
- * @param t - функция перевода (i18n)
- * @param number - номер месяца от 0 (январь) до 11 (декабрь)
+ * Возвращает локализованное название месяца по его номеру (0-based) через Intl.DateTimeFormat.
+ * @param locale - локаль (код или BCP-47)
+ * @param number - номер месяца от 0 (январь) до 11 (декабрь); вне диапазона → декабрь
  */
-export function getMonth(t: (key: string) => string, number?: number) {
-  const months = [
-    'january',
-    'february',
-    'march',
-    'april',
-    'may',
-    'june',
-    'july',
-    'august',
-    'september',
-    'october',
-    'november',
-    'december'
-  ];
+export function getMonth(locale: string, number?: number): string {
   const index = typeof number === 'number' && number >= 0 && number < 12 ? number : 11;
-  const key = months[index];
-  return t(key) || key;
+  return new Intl.DateTimeFormat(locale, { month: 'long' }).format(new Date(2000, index, 1));
 }

package/runtime/utils/__tests__/format-number.test.ts

@@ -1,24 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { formatNumber } from '../format-number';
-
-describe('formatNumber', () => {
-  it('тысячи', () => {
-    expect(formatNumber(10400)).toBe('10.4K');
-  });
-
-  it('миллионы', () => {
-    expect(formatNumber(1500000)).toBe('1.5M');
-  });
-
-  it('маленькое число без сокращения', () => {
-    expect(formatNumber(999)).toBe('999');
-  });
-
-  it('ноль', () => {
-    expect(formatNumber(0)).toBe('0');
-  });
-
-  it('ровно тысяча', () => {
-    expect(formatNumber(1000)).toBe('1K');
-  });
-});

package/runtime/utils/__tests__/format-time-ago.test.ts

@@ -1,49 +0,0 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { formatTimeAgo } from '../format-time-ago';
-
-const t = (key: string) => key;
-
-describe('formatTimeAgo', () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-06-15T12:00:00Z'));
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-  });
-
-  const now = () => Math.floor(Date.now() / 1000);
-
-  it('сегодня', () => {
-    expect(formatTimeAgo(now(), t)).toBe('today');
-  });
-
-  it('1 день назад', () => {
-    expect(formatTimeAgo(now() - 86400, t)).toBe('day_ago');
-  });
-
-  it('5 дней назад', () => {
-    expect(formatTimeAgo(now() - 5 * 86400, t)).toBe('5 days_ago');
-  });
-
-  it('29 дней назад', () => {
-    expect(formatTimeAgo(now() - 29 * 86400, t)).toBe('29 days_ago');
-  });
-
-  it('1 месяц', () => {
-    expect(formatTimeAgo(now() - 31 * 86400, t)).toBe('1 month ago');
-  });
-
-  it('3 месяца — plural', () => {
-    expect(formatTimeAgo(now() - 90 * 86400, t)).toBe('3 months ago');
-  });
-
-  it('1 год', () => {
-    expect(formatTimeAgo(now() - 366 * 86400, t)).toBe('1 year ago');
-  });
-
-  it('2 года — plural', () => {
-    expect(formatTimeAgo(now() - 730 * 86400, t)).toBe('2 years ago');
-  });
-});

package/runtime/utils/format-number.ts

@@ -1,12 +0,0 @@
-/**
- * Форматирует число в короткий формат: 10400 → 10.4K.
- * @param number - исходное число
- */
-
-export function formatNumber (number: number) {
-  return number.toLocaleString('en-US', {
-    maximumFractionDigits: 2,
-    notation: 'compact',
-    compactDisplay: 'short'
-  });
-};

package/runtime/utils/format-time-ago.ts

@@ -1,26 +0,0 @@
-/**
- * Форматирует Unix timestamp (в секундах) в относительную строку: «сегодня», «вчера», «3 дня назад» и т.д.
- * @param date - Unix timestamp в секундах
- * @param t - функция перевода (i18n)
- */
-export function formatTimeAgo(date: number, t) {
-  const pastDate = new Date(date * 1000);
-  const now = new Date();
-
-  const diffInMs = Number(now) - Number(pastDate);
-  const diffInDays = Math.floor(diffInMs / (1000 * 60 * 60 * 24));
-
-  if (diffInDays === 0) {
-    return t('today');
-  } else if (diffInDays === 1) {
-    return t('day_ago');
-  } else if (diffInDays < 30) {
-    return `${diffInDays} ${t('days_ago')}`;
-  } else if (diffInDays < 365) {
-    const diffInMonths = Math.floor(diffInDays / 30);
-    return `${diffInMonths} ${t('month')}${diffInMonths > 1 ? 's' : ''} ${t('ago')}`;
-  } else {
-    const diffInYears = Math.floor(diffInDays / 365);
-    return `${diffInYears} ${t('year')}${diffInYears > 1 ? 's' : ''} ${t('ago')}`;
-  }
-}