@candlerip/shared 0.0.83 → 0.0.85

package/cache/common/cache-key/cache-key/configs.js

@@ -0,0 +1,4 @@
+import { COUNTRY_DICTIONARY_CACHE_KEYS } from '../country-dictionary-cache-key/configs.js';
+import { PAGE_DICTIONARY_CACHE_KEYS } from '../page-dictionary-cache-key/configs.js';
+import { PAGE_SERVER_DATA_CACHE_KEYS } from '../page-server-data-cache-key/configs.js';
+export const CACHE_KEYS = [...COUNTRY_DICTIONARY_CACHE_KEYS, ...PAGE_DICTIONARY_CACHE_KEYS, ...PAGE_SERVER_DATA_CACHE_KEYS];

package/cache/common/cache-key/cache-key/domains.d.ts

@@ -0,0 +1,4 @@
+import { CountryDictionaryCacheKey } from '../country-dictionary-cache-key/domains.js';
+import { PageDictionaryCacheKey } from '../page-dictionary-cache-key/domains.js';
+import { PageServerDataCacheKey } from '../page-server-data-cache-key/domains.js';
+export type CacheKey = CountryDictionaryCacheKey | PageDictionaryCacheKey | PageServerDataCacheKey;

package/cache/common/cache-key/cache-key/index.d.ts

@@ -0,0 +1,3 @@
+export * from './configs.js';
+export * from './domains.js';
+export * from './type-guards.js';

package/cache/common/cache-key/cache-key/index.js

@@ -0,0 +1,3 @@
+export * from './configs.js';
+export * from './domains.js';
+export * from './type-guards.js';

package/cache/common/cache-key/{type-guards.d.ts → cache-key/type-guards.d.ts}

@@ -1,2 +1,2 @@
-import { CacheKey } from './domains/index.js';
+import { CacheKey } from './domains.js';
 export declare const isCacheKey: (data?: unknown) => data is CacheKey;

package/cache/common/cache-key/{type-guards.js → cache-key/type-guards.js}

@@ -1,2 +1,2 @@
-import { CACHE_KEYS } from './configs/index.js';
+import { CACHE_KEYS } from './configs.js';
 export const isCacheKey = (data) => CACHE_KEYS.some((it) => data === it);

package/cache/common/cache-key/{configs/country-dictionary-cache-keys.d.ts → country-dictionary-cache-key/configs.d.ts}

@@ -1,2 +1,2 @@
-import { CountryDictionaryCacheKey } from '../domains/index.js';
+import { CountryDictionaryCacheKey } from './domains.js';
 export declare const COUNTRY_DICTIONARY_CACHE_KEYS: CountryDictionaryCacheKey[];

package/cache/common/cache-key/country-dictionary-cache-key/index.d.ts

@@ -0,0 +1,2 @@
+export * from './configs.js';
+export * from './domains.js';

package/cache/common/cache-key/country-dictionary-cache-key/index.js

@@ -0,0 +1,2 @@
+export * from './configs.js';
+export * from './domains.js';

package/cache/common/cache-key/index.d.ts

@@ -1,3 +1,4 @@
-export * from './configs/index.js';
-export * from './domains/index.js';
-export * from './type-guards.js';
+export * from './cache-key/index.js';
+export * from './country-dictionary-cache-key/index.js';
+export * from './page-dictionary-cache-key/index.js';
+export * from './page-server-data-cache-key/index.js';

package/cache/common/cache-key/index.js

@@ -1,3 +1,4 @@
-export * from './configs/index.js';
-export * from './domains/index.js';
-export * from './type-guards.js';
+export * from './cache-key/index.js';
+export * from './country-dictionary-cache-key/index.js';
+export * from './page-dictionary-cache-key/index.js';
+export * from './page-server-data-cache-key/index.js';

package/cache/common/cache-key/page-dictionary-cache-key/index.d.ts

@@ -0,0 +1,2 @@
+export * from './configs.js';
+export * from './domains.js';

package/cache/common/cache-key/page-dictionary-cache-key/index.js

@@ -0,0 +1,2 @@
+export * from './configs.js';
+export * from './domains.js';

package/cache/common/cache-key/page-server-data-cache-key/domains.d.ts

@@ -0,0 +1,3 @@
+import { Language } from '../../../../common/index.js';
+import { PageServerDataCacheKeyPage } from './page-server-data-cache-key-page/index.js';
+export type PageServerDataCacheKey = `${PageServerDataCacheKeyPage}-server-data-${Language}`;

package/cache/common/cache-key/page-server-data-cache-key/index.d.ts

@@ -0,0 +1,3 @@
+export * from './configs.js';
+export * from './domains.js';
+export * from './page-server-data-cache-key-page/index.js';

package/cache/common/cache-key/page-server-data-cache-key/index.js

@@ -0,0 +1,3 @@
+export * from './configs.js';
+export * from './domains.js';
+export * from './page-server-data-cache-key-page/index.js';

package/cache/common/cache-key/page-server-data-cache-key/page-server-data-cache-key-page/configs.d.ts

@@ -0,0 +1 @@
+export declare const PAGE_SERVER_DATA_CACHE_KEY_PAGES: readonly ["candles-page", "home-page", "persons-page", "persons-map-page"];

package/cache/common/cache-key/page-server-data-cache-key/page-server-data-cache-key-page/configs.js

@@ -0,0 +1,3 @@
+export const PAGE_SERVER_DATA_CACHE_KEY_PAGES = ['candles-page', 'home-page', 'persons-page', 'persons-map-page'];
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const CHECK = PAGE_SERVER_DATA_CACHE_KEY_PAGES;

package/cache/common/cache-key/page-server-data-cache-key/page-server-data-cache-key-page/domains.d.ts

@@ -0,0 +1,2 @@
+import { PAGE_SERVER_DATA_CACHE_KEY_PAGES } from './configs.js';
+export type PageServerDataCacheKeyPage = (typeof PAGE_SERVER_DATA_CACHE_KEY_PAGES)[number];

package/cache/common/cache-key/page-server-data-cache-key/page-server-data-cache-key-page/domains.js

@@ -0,0 +1 @@
+export {};

package/cache/common/cache-key/page-server-data-cache-key/page-server-data-cache-key-page/index.d.ts

@@ -0,0 +1,2 @@
+export * from './configs.js';
+export * from './domains.js';

package/cache/common/cache-key/page-server-data-cache-key/page-server-data-cache-key-page/index.js

@@ -0,0 +1,2 @@
+export * from './configs.js';
+export * from './domains.js';

package/cache/redis/domains.d.ts

@@ -1,15 +1,16 @@
 import { CandlesPageServerData, CountryDictionary, Dictionary, HomePageServerData, Language, PersonsMapPageServerData, PersonsPageServerData } from '../../common/index.js';
 import { CountryDictionaryCacheKey, PageDictionaryCacheKey } from '../common/index.js';
+type PageServerDataMap = {
+    'candles-page': CandlesPageServerData;
+    'home-page': HomePageServerData;
+    'persons-page': PersonsPageServerData;
+    'persons-map-page': PersonsMapPageServerData;
+};
 export type Cache = {
     [key in PageDictionaryCacheKey]: Dictionary;
 } & {
     [key in CountryDictionaryCacheKey]: CountryDictionary;
 } & {
-    [key in `candles-page-server-data-${Language}`]: CandlesPageServerData;
-} & {
-    [key in `home-page-server-data-${Language}`]: HomePageServerData;
-} & {
-    [key in `persons-page-server-data-${Language}`]: PersonsPageServerData;
-} & {
-    [key in `persons-map-page-server-data-${Language}`]: PersonsMapPageServerData;
+    [key in keyof PageServerDataMap as `${key}-server-data-${Language}`]: PageServerDataMap[key];
 };
+export {};

package/database/aggregate/translation/utils/compose-get-translations-as-dictionary-aggregates/index.js

@@ -13,7 +13,9 @@ export const composeGetTranslationsAsDictionaryAggregates = ({ codes, language }
         {
             $project: {
                 code: 1,
-                [language]: 1,
+                translation: {
+                    [language]: 1,
+                },
             },
         },
         {
@@ -22,7 +24,7 @@ export const composeGetTranslationsAsDictionaryAggregates = ({ codes, language }
                 root: {
                     $push: {
                         k: '$code',
-                        v: `$${language}`,
+                        v: `$translation.${language}`,
                     },
                 },
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@candlerip/shared",
-  "version": "0.0.83",
+  "version": "0.0.85",
   "type": "module",
   "engines": {
     "node": "=22.19.0"

package/cache/common/cache-key/configs/cache-keys.js

@@ -1,4 +0,0 @@
-import { COUNTRY_DICTIONARY_CACHE_KEYS } from './country-dictionary-cache-keys.js';
-import { PAGE_DICTIONARY_CACHE_KEYS } from './page-dictionary-cache-keys.js';
-import { PAGE_SERVER_DATA_CACHE_KEYS } from './page-server-data-cache-keys.js';
-export const CACHE_KEYS = [...COUNTRY_DICTIONARY_CACHE_KEYS, ...PAGE_DICTIONARY_CACHE_KEYS, ...PAGE_SERVER_DATA_CACHE_KEYS];

package/cache/common/cache-key/configs/index.d.ts

@@ -1,4 +0,0 @@
-export * from './cache-keys.js';
-export * from './country-dictionary-cache-keys.js';
-export * from './page-dictionary-cache-keys.js';
-export * from './page-server-data-cache-keys.js';

package/cache/common/cache-key/configs/index.js

@@ -1,4 +0,0 @@
-export * from './cache-keys.js';
-export * from './country-dictionary-cache-keys.js';
-export * from './page-dictionary-cache-keys.js';
-export * from './page-server-data-cache-keys.js';

package/cache/common/cache-key/domains/cache-key.d.ts

@@ -1,4 +0,0 @@
-import { CountryDictionaryCacheKey } from './country-dictionary-cache-key.js';
-import { PageDictionaryCacheKey } from './page-dictionary-cache-key.js';
-import { PageServerDataCacheKey } from './page-server-data-cache-key.js';
-export type CacheKey = CountryDictionaryCacheKey | PageDictionaryCacheKey | PageServerDataCacheKey;

package/cache/common/cache-key/domains/index.d.ts

@@ -1,4 +0,0 @@
-export * from './cache-key.js';
-export * from './country-dictionary-cache-key.js';
-export * from './page-dictionary-cache-key.js';
-export * from './page-server-data-cache-key.js';

package/cache/common/cache-key/domains/index.js

@@ -1,4 +0,0 @@
-export * from './cache-key.js';
-export * from './country-dictionary-cache-key.js';
-export * from './page-dictionary-cache-key.js';
-export * from './page-server-data-cache-key.js';

package/cache/common/cache-key/domains/page-server-data-cache-key.d.ts

@@ -1,2 +0,0 @@
-import { Language } from '../../../../common/index.js';
-export type PageServerDataCacheKey = `${'candles-page' | 'home-page' | 'persons-page' | 'persons-map-page'}-server-data-${Language}`;