@candlerip/shared3 0.0.168 → 0.0.169

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@candlerip/shared3",
-  "version": "0.0.168",
+  "version": "0.0.169",
   "type": "module",
   "exports": {
     ".": "./src/index.js",

package/src/backend/database/model/candle/candle-db-schema.d.ts

@@ -9,8 +9,8 @@ export declare const CandleDbSchema: mongoose.Schema<any, mongoose.Model<any, an
     litName?: string | null | undefined;
     burningEndsAt?: NativeDate | null | undefined;
     personId?: mongoose.Types.ObjectId | null | undefined;
-    burningMinutes?: number | null | undefined;
     description?: string | null | undefined;
+    burningMinutes?: number | null | undefined;
     userId?: string | null | undefined;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
@@ -19,8 +19,8 @@ export declare const CandleDbSchema: mongoose.Schema<any, mongoose.Model<any, an
     litName?: string | null | undefined;
     burningEndsAt?: NativeDate | null | undefined;
     personId?: mongoose.Types.ObjectId | null | undefined;
-    burningMinutes?: number | null | undefined;
     description?: string | null | undefined;
+    burningMinutes?: number | null | undefined;
     userId?: string | null | undefined;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
@@ -29,8 +29,8 @@ export declare const CandleDbSchema: mongoose.Schema<any, mongoose.Model<any, an
     litName?: string | null | undefined;
     burningEndsAt?: NativeDate | null | undefined;
     personId?: mongoose.Types.ObjectId | null | undefined;
-    burningMinutes?: number | null | undefined;
     description?: string | null | undefined;
+    burningMinutes?: number | null | undefined;
     userId?: string | null | undefined;
 }> & {
     _id: mongoose.Types.ObjectId;

package/src/backend/server/server-data/candles/compose-candles-page-server-data/index.js

@@ -1,23 +1,24 @@
-import { DICTIONARY_CONFIG } from '../../../../../dictionary/index.js';
 import { DEFAULT_CANDLE_FILTER_SORT } from '../../../../../filter-sort/index.js';
-import { getTranslationsAsDictionary } from '../../../../database/index.js';
+import { composeDictionary } from '../../../../dictionary/index.js';
 import { composeCandlesPageData } from '../../../../page/index.js';
-export const composeCandlesPageServerData = async ({ filterSort: initFilterSort, language }) => {
+export const composeCandlesPageServerData = async (language, options) => {
+    const excludedTranslationIdOptions = options?.excludedTranslationIdOptions;
+    const initFilterSort = options?.filterSort;
     const filterSort = {
         ...DEFAULT_CANDLE_FILTER_SORT,
         ...initFilterSort,
     };
     let resp;
-    resp = await getTranslationsAsDictionary(language, DICTIONARY_CONFIG['candles-page'].translationIds);
+    resp = await composeCandlesPageData({ filterSort });
     if ('customError' in resp) {
         return resp;
     }
-    const dictionary = resp.data;
-    resp = await composeCandlesPageData({ filterSort });
+    const pageData = resp.data;
+    resp = await composeDictionary('candles-page', language, { excludedTranslationIdOptions });
     if ('customError' in resp) {
         return resp;
     }
-    const pageData = resp.data;
+    const dictionary = resp.data;
     return {
         data: {
             dictionary,

package/src/backend/server/server-data/candles/compose-candles-page-server-data/type.d.ts

@@ -1,10 +1,11 @@
 import { Language } from '../../../../../dictionary/index.js';
 import { CustomError } from '../../../../../error/index.js';
 import { CandleFilterSort } from '../../../../../filter-sort/index.js';
+import { ExcludedTranslationIdOptions } from '../../../../dictionary/index.js';
 import { CandlesPageServerData } from '../type.js';
-export type ComposeCandlesPageServerData = (props: {
+export type ComposeCandlesPageServerData = (language: Language, options?: {
+    excludedTranslationIdOptions?: ExcludedTranslationIdOptions;
     filterSort?: Partial<CandleFilterSort>;
-    language: Language;
 }) => Promise<{
     data: CandlesPageServerData;
 } | {

package/src/backend/server/server-data/home/{compose-candles-page-server-data → compose-home-page-server-data}/index.js

@@ -1,18 +1,18 @@
-import { DICTIONARY_CONFIG } from '../../../../../dictionary/index.js';
-import { getTranslationsAsDictionary } from '../../../../database/index.js';
+import { composeDictionary } from '../../../../dictionary/index.js';
 import { composeHomePageData } from '../../../../page/index.js';
-export const composeHomePageServerData = async ({ language }) => {
+export const composeHomePageServerData = async (language, options) => {
+    const excludedTranslationIdOptions = options?.excludedTranslationIdOptions;
     let resp;
-    resp = await getTranslationsAsDictionary(language, DICTIONARY_CONFIG['home-page'].translationIds);
+    resp = await composeHomePageData();
     if ('customError' in resp) {
         return resp;
     }
-    const dictionary = resp.data;
-    resp = await composeHomePageData();
+    const pageData = resp.data;
+    resp = await composeDictionary('home-page', language, { excludedTranslationIdOptions });
     if ('customError' in resp) {
         return resp;
     }
-    const pageData = resp.data;
+    const dictionary = resp.data;
     return {
         data: {
             dictionary,

package/src/backend/server/server-data/home/{compose-candles-page-server-data → compose-home-page-server-data}/type.d.ts

@@ -1,8 +1,9 @@
 import { Language } from '../../../../../dictionary/index.js';
 import { CustomError } from '../../../../../error/index.js';
+import { ExcludedTranslationIdOptions } from '../../../../dictionary/index.js';
 import { HomePageServerData } from '../type.js';
-export type ComposeHomePageServerData = (props: {
-    language: Language;
+export type ComposeHomePageServerData = (language: Language, options?: {
+    excludedTranslationIdOptions?: ExcludedTranslationIdOptions;
 }) => Promise<{
     data: HomePageServerData;
 } | {

package/src/backend/server/server-data/home/index.d.ts

@@ -1,2 +1,2 @@
-export * from './compose-candles-page-server-data/index.js';
+export * from './compose-home-page-server-data/index.js';
 export * from './type.js';

package/src/backend/server/server-data/home/index.js

@@ -1,2 +1,2 @@
-export * from './compose-candles-page-server-data/index.js';
+export * from './compose-home-page-server-data/index.js';
 export * from './type.js';