@candlerip/shared3 0.0.152 → 0.0.153

package/package.json

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

package/src/backend/database/connect-database/util.js

@@ -1,12 +1,15 @@
 import * as mongoose from 'mongoose';
 export const connectDatabase = async (url) => {
-    try {
-        await mongoose.connect(url);
-        mongoose.connection.on('error', () => {
+    const { readyState } = mongoose.connections[0];
+    if (readyState === 0 || readyState === 3) {
+        try {
+            await mongoose.connect(url);
+            mongoose.connection.on('error', () => {
+                setTimeout(connectDatabase, 5000);
+            });
+        }
+        catch {
             setTimeout(connectDatabase, 5000);
-        });
-    }
-    catch {
-        setTimeout(connectDatabase, 5000);
+        }
     }
 };

package/src/backend/database/mutation/candle/get-candles/type.d.ts

@@ -14,8 +14,8 @@ export type GetCandles = <T extends keyof TypeMap = never>(props: {
     customError: CustomError;
 }>;
 type TypeMap = {
-    candle: Candle[];
-    candleWithPerson: Array<Candle & {
+    candles: Candle[];
+    candlesWithPerson: Array<Candle & {
         person?: Person;
     }>;
 };

package/src/backend/dictionary/compose-dictionary/index.d.ts

@@ -1 +1,2 @@
-export * from './util.js';
+import { ComposeDictionary } from './type.js';
+export declare const composeDictionary: ComposeDictionary;

package/src/backend/dictionary/compose-dictionary/index.js

@@ -1 +1,3 @@
-export * from './util.js';
+import { DICTIONARY_CONFIG } from '../../../dictionary/index.js';
+import { getTranslationsAsDictionary } from '../../database/mutation/translation/index.js';
+export const composeDictionary = async (page, language) => getTranslationsAsDictionary(language, [...DICTIONARY_CONFIG[page].translationIds]);

package/src/backend/dictionary/compose-dictionary/type.d.ts

@@ -1,9 +1,7 @@
 import { Dictionary, Language } from '../../../dictionary/index.js';
 import { CustomError } from '../../../error/index.js';
 import { Page } from '../../../page/index.js';
-export type ComposeDictionary = (page: Page, language: Language, options?: {
-    isAuthenticated: boolean;
-}) => Promise<{
+export type ComposeDictionary = (page: Page, language: Language) => Promise<{
     data: Dictionary;
 } | {
     customError: CustomError;

package/src/dictionary/index.d.ts

@@ -1,4 +1,3 @@
 export * from './dictionary/index.js';
 export * from './language/index.js';
 export * from './translation-id/index.js';
-export * from './get-excluded-translation-ids/index.js';

package/src/dictionary/index.js

@@ -1,4 +1,3 @@
 export * from './dictionary/index.js';
 export * from './language/index.js';
 export * from './translation-id/index.js';
-export * from './get-excluded-translation-ids/index.js';

package/src/backend/dictionary/compose-dictionary/util.d.ts

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

package/src/backend/dictionary/compose-dictionary/util.js

@@ -1,10 +0,0 @@
-import { DICTIONARY_CONFIG } from '../../../dictionary/index.js';
-import { getTranslationsAsDictionary } from '../../database/mutation/translation/index.js';
-import { getExcludedTranslationIds } from '../../../dictionary/get-excluded-translation-ids/index.js';
-export const composeDictionary = async (page, language, options) => {
-    let translationIds = [...DICTIONARY_CONFIG[page].translationIds];
-    const excludedIds = getExcludedTranslationIds(page, options);
-    translationIds = translationIds.filter((it) => !excludedIds.includes(it));
-    const resp = await getTranslationsAsDictionary(language, translationIds);
-    return resp;
-};

package/src/dictionary/get-excluded-translation-ids/index.d.ts

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

package/src/dictionary/get-excluded-translation-ids/index.js

@@ -1,10 +0,0 @@
-import { isUndefined } from '../../type/index.js';
-export const getExcludedTranslationIds = (page, options) => {
-    const excludedIds = [`pageMenu.${page}`];
-    if (options) {
-        const { isAuthenticated } = options;
-        if (!isUndefined(isAuthenticated))
-            excludedIds.push(isAuthenticated ? 'login' : 'logout');
-    }
-    return excludedIds;
-};

package/src/dictionary/get-excluded-translation-ids/type.d.ts

@@ -1,5 +0,0 @@
-import { TranslationId } from '../index.js';
-import { Page } from '../../page/index.js';
-export type GetExcludedTranslationIds = (page: Page, options?: {
-    isAuthenticated?: boolean;
-}) => TranslationId[];

package/src/dictionary/get-excluded-translation-ids/type.js

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