@candlerip/shared3 0.0.168 → 0.0.170

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@candlerip/shared3",
-  "version": "0.0.168",
+  "version": "0.0.170",
   "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/page/page-data/candles/compose-candles-page-data/index.js

@@ -10,9 +10,9 @@ export const composeCandlesPageData = async ({ filterSort }) => {
             candlesList: {
                 candles,
                 candlesCount,
+                renderDate: new Date(),
             },
             filterSort,
-            renderDate: new Date(),
         },
     };
 };

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

@@ -7,7 +7,7 @@ export interface CandlesPageData {
             person?: Person;
         }>;
         candlesCount: number;
+        renderDate: Date;
     };
     filterSort: CandleFilterSort;
-    renderDate: Date;
 }

package/src/backend/page/page-data/home/compose-home-page-data/index.js

@@ -60,6 +60,7 @@ export const composeHomePageData = async () => {
             }),
             lastLitCandles: {
                 candles,
+                renderDate: new Date(),
             },
             lastUploadedPersons: {
                 persons,

package/src/backend/page/page-data/home/type.d.ts

@@ -8,6 +8,7 @@ export interface HomePageData {
         candles: Array<Candle & {
             person?: Person;
         }>;
+        renderDate: Date;
     };
     lastUploadedPersons: {
         persons: Array<Person & {

package/src/backend/page/page-data/index.d.ts

@@ -2,4 +2,5 @@ export * from './candles/index.js';
 export * from './edit-candle/index.js';
 export * from './home/index.js';
 export * from './light-candle/index.js';
+export * from './person-candles/index.js';
 export * from './persons-map/index.js';

package/src/backend/page/page-data/index.js

@@ -2,4 +2,5 @@ export * from './candles/index.js';
 export * from './edit-candle/index.js';
 export * from './home/index.js';
 export * from './light-candle/index.js';
+export * from './person-candles/index.js';
 export * from './persons-map/index.js';

package/src/backend/page/page-data/person-candles/compose-person-candles-page-data/index.d.ts

@@ -0,0 +1,2 @@
+import { ComposePersonCandlesPageData } from './type.js';
+export declare const composePersonCandlesPageData: ComposePersonCandlesPageData;

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

@@ -0,0 +1,35 @@
+import { composeCustomError } from '../../../../../error/index.js';
+import { getCandles, getPerson } from '../../../../database/index.js';
+export const composePersonCandlesPageData = async (personId, filterSort) => {
+    let resp;
+    resp = await getPerson({ _id: personId });
+    if ('customError' in resp) {
+        return resp;
+    }
+    const { data: person } = resp;
+    if (!person) {
+        return {
+            customError: composeCustomError('Person not found'),
+            personNotFoundError: true,
+        };
+    }
+    resp = await getCandles({
+        filterSort,
+    });
+    if ('customError' in resp) {
+        return resp;
+    }
+    const { candles, candlesCount } = resp.data;
+    return {
+        data: {
+            addCandle: {
+                person,
+            },
+            candlesList: {
+                candles,
+                candlesCount,
+                renderDate: new Date(),
+            },
+        },
+    };
+};

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

@@ -0,0 +1,9 @@
+import { CustomError } from '../../../../../error/index.js';
+import { CandleFilterSort } from '../../../../../filter-sort/index.js';
+import { PersonCandlesPageData } from '../type.js';
+export type ComposePersonCandlesPageData = (personId: string, filterSort: CandleFilterSort) => Promise<{
+    data: PersonCandlesPageData;
+} | {
+    customError: CustomError;
+    personNotFoundError?: boolean;
+}>;

package/src/backend/page/page-data/person-candles/index.d.ts

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

package/src/backend/page/page-data/person-candles/index.js

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

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

@@ -0,0 +1,12 @@
+import { Candle } from '../../../../candle/index.js';
+import { Person } from '../../../../person/index.js';
+export interface PersonCandlesPageData {
+    addCandle: {
+        person: Person;
+    };
+    candlesList: {
+        candles: Candle[];
+        candlesCount: number;
+        renderDate: Date;
+    };
+}

package/src/backend/page/page-data/person-candles/type.js

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

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/compose-home-page-server-data/type.js

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

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';

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

@@ -2,4 +2,5 @@ export * from './candles/index.js';
 export * from './edit-candle/index.js';
 export * from './home/index.js';
 export * from './light-candle/index.js';
+export * from './person-candles/index.js';
 export * from './persons-map/index.js';

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

@@ -2,4 +2,5 @@ export * from './candles/index.js';
 export * from './edit-candle/index.js';
 export * from './home/index.js';
 export * from './light-candle/index.js';
+export * from './person-candles/index.js';
 export * from './persons-map/index.js';

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

@@ -0,0 +1,2 @@
+import { ComposePersonCandlesPageServerData } from './type.js';
+export declare const composePersonCandlesPageServerData: ComposePersonCandlesPageServerData;

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

@@ -0,0 +1,28 @@
+import { DEFAULT_CANDLE_FILTER_SORT } from '../../../../../filter-sort/index.js';
+import { composeDictionary } from '../../../../dictionary/index.js';
+import { composePersonCandlesPageData } from '../../../../page/index.js';
+export const composePersonCandlesPageServerData = async (language, personId, options) => {
+    const excludedTranslationIdOptions = options?.excludedTranslationIdOptions;
+    const initFilterSort = options?.filterSort;
+    const filterSort = {
+        ...DEFAULT_CANDLE_FILTER_SORT,
+        ...initFilterSort,
+    };
+    let resp;
+    resp = await composePersonCandlesPageData(personId, filterSort);
+    if ('customError' in resp) {
+        return resp;
+    }
+    const pageData = resp.data;
+    resp = await composeDictionary('person-candles-page', language, { excludedTranslationIdOptions });
+    if ('customError' in resp) {
+        return resp;
+    }
+    const dictionary = resp.data;
+    return {
+        data: {
+            dictionary,
+            pageData,
+        },
+    };
+};

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

@@ -0,0 +1,13 @@
+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 { PersonCandlesPageServerData } from '../type.js';
+export type ComposePersonCandlesPageServerData = (language: Language, personId: string, options?: {
+    excludedTranslationIdOptions?: ExcludedTranslationIdOptions;
+    filterSort?: Partial<CandleFilterSort>;
+}) => Promise<{
+    data: PersonCandlesPageServerData;
+} | {
+    customError: CustomError;
+}>;

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

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

package/src/backend/server/server-data/person-candles/index.d.ts

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

package/src/backend/server/server-data/person-candles/index.js

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

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

@@ -0,0 +1,6 @@
+import { Dictionary } from '../../../../dictionary/index.js';
+import { PersonCandlesPageData } from '../../../page/index.js';
+export interface PersonCandlesPageServerData {
+    dictionary: Dictionary;
+    pageData: PersonCandlesPageData;
+}

package/src/backend/server/server-data/person-candles/type.js

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