@common-stack/frontend-stack-react 4.0.1-alpha.12 → 4.0.1-alpha.20

package/lib/backend/middlewares/container.js

@@ -1,4 +1,4 @@
-import {v4}from'uuid';import {ClientTypes}from'@common-stack/core';import {merge}from'lodash-es';import {ScopedContainer}from'@common-stack/client-core/lib/connector/ScopedContainer.js';import {createReduxStore}from'../../config/redux-config.js';import {UtilityClass,logger}from'../../utils/index.js';import features from'../../modules.js';import {createApolloClient}from'../../config/base-apollo-client.js';import {config}from'../../config/env-config.js';const TYPES = {
+import {v4}from'uuid';import {ClientTypes}from'@common-stack/core';import {merge}from'lodash-es';import {ScopedContainer}from'@common-stack/client-core/lib/connector/ScopedContainer.js';import {createReduxStore}from'../../config/redux-config.js';import {logger}from'@cdm-logger/server';import {UtilityClass}from'../../utils/index.js';import features from'../../modules.js';import {createApolloClient}from'../../config/base-apollo-client.js';import {config}from'../../config/env-config.server.js';const TYPES = {
     HttpRequest: Symbol.for('HttpRequest'),
 };
 const utility = new UtilityClass(features);

package/lib/backend/middlewares/cors.js

@@ -1,4 +1,4 @@
-import cors from'cors';import {logger}from'@cdm-logger/server';import {config}from'../../config/env-config.js';import'../../config/client.service.js';import'../../config/redux-config.js';/* eslint-disable jest/require-hook */
+import cors from'cors';import {logger}from'@cdm-logger/server';import {config}from'../../config/env-config.server.js';/* eslint-disable jest/require-hook */
 const { CLIENT_URL, BACKEND_URL, LOCAL_GRAPHQL_URL } = config;
 const corsWhitelist = [CLIENT_URL, BACKEND_URL, LOCAL_GRAPHQL_URL];
 logger.info('corsWhitelist (%j)', corsWhitelist);

package/lib/config/base-apollo-cache.d.ts

@@ -1,4 +1,4 @@
-import { InMemoryCache } from '@apollo/client/cache';
+import { InMemoryCache } from '@apollo/client/cache/index.js';
 import { CdmLogger } from '@cdm-logger/core';
 interface CreateCacheParams {
     getDataIdFromObject: (x?: any) => string;

package/lib/config/base-apollo-cache.js

@@ -1,4 +1,4 @@
-import {InMemoryCache}from'@apollo/client/cache';// cache.ts
+import {InMemoryCache}from'@apollo/client/cache/index.js';// cache.ts
 const createCache = ({ getDataIdFromObject, clientState }) => {
     const cache = new InMemoryCache({
         dataIdFromObject: getDataIdFromObject,

package/lib/config/base-apollo-client.js

@@ -1,4 +1,4 @@
-import {isBoolean,merge}from'lodash-es';import {ApolloLink,ApolloClient}from'@apollo/client/index.js';import {HttpLink}from'@apollo/client/link/http';import {BatchHttpLink}from'@apollo/client/link/batch-http';import {onError}from'@apollo/client/link/error';import {GraphQLWsLink}from'@apollo/client/link/subscriptions';import {getOperationAST}from'graphql';import {invariant}from'ts-invariant';import {RetryLink}from'@apollo/client/link/retry';import {createClient}from'graphql-ws';import fetch from'cross-fetch';import {createCache,initializeCache}from'./base-apollo-cache.js';// apolloClient.ts
+import {isBoolean,merge}from'lodash-es';import {ApolloLink,ApolloClient}from'@apollo/client/index.js';import {HttpLink}from'@apollo/client/link/http/index.js';import {BatchHttpLink}from'@apollo/client/link/batch-http/index.js';import {onError}from'@apollo/client/link/error/index.js';import {GraphQLWsLink}from'@apollo/client/link/subscriptions/index.js';import {getOperationAST}from'graphql';import {invariant}from'ts-invariant';import {RetryLink}from'@apollo/client/link/retry/index.js';import {createClient}from'graphql-ws';import fetch from'cross-fetch';import {createCache,initializeCache}from'./base-apollo-cache.js';// apolloClient.ts
 const schema = `
   # Add your schema here
 `;

package/lib/config/{env-config.d.ts → env-config.server.d.ts}

@@ -1,4 +1,7 @@
 import 'reflect-metadata';
+/**
+ * This is for backend only
+ */
 export declare const config: Readonly<{
     SENTRY_DSN_FRONTEND: string;
     NODE_ENV: string;

package/lib/config/{env-config.js → env-config.server.js}

@@ -1,4 +1,7 @@
-import'reflect-metadata';import {cleanEnv,str,json,bool}from'envalid';const config = cleanEnv(process.env, {
+import'reflect-metadata';import {cleanEnv,str,json,bool}from'envalid';/**
+ * This is for backend only
+ */
+const config = cleanEnv(process.env, {
     SENTRY_DSN_FRONTEND: str({ default: 'https://64defc5ee0bd467aa28888f9860f18ee@sentry.io/2158332' }),
     NODE_ENV: str({ default: 'production', choices: ['production', 'staging', 'development', 'test'] }),
     BACKEND_URL: str({ devDefault: __BACKEND_URL__ }),

package/lib/config/index.d.ts

@@ -1,3 +1,2 @@
-export * from './env-config';
 export * from './client.service';
 export * from './redux-config';

package/lib/config/redis-config.server.d.ts

@@ -1 +1,2 @@
-export declare function getRedisClient(): any;
+import Redis from 'ioredis';
+export declare function getRedisClient(): Redis;

package/lib/config/redis-config.server.js

@@ -1,4 +1,4 @@
-import Redis from'ioredis';import {config}from'./env-config.js';let redisClient;
+import Redis from'ioredis';import {config}from'./env-config.server.js';let redisClient;
 function getRedisClient() {
     if (!redisClient) {
         // Initialize Redis client if it doesn't exist

package/lib/config/redux-config.d.ts

@@ -1,8 +1,4 @@
-/// <reference types="redux-persist/types/stateReconciler/autoMergeLevel2" />
-/// <reference types="redux-persist/types/types" />
-/// <reference types="redux-persist" />
 import "reflect-metadata";
-import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2';
 export declare const epicMiddlewareFunc: (apolloClient: any, services: any, container: any) => import("redux-observable").EpicMiddleware<import("redux").Action<any>, import("redux").Action<any>, void, {
     apolloClient: any;
     routes: any;
@@ -15,8 +11,8 @@ export declare const epicMiddlewareFunc: (apolloClient: any, services: any, cont
 }>;
 export declare const persistConfig: {
     key: string;
-    storage: import("redux-persist").WebStorage;
-    stateReconciler: typeof autoMergeLevel2;
+    storage: any;
+    stateReconciler: any;
     transforms: any[];
     blacklist: string[];
 };

package/lib/config/redux-config.js

@@ -1,4 +1,4 @@
-import'reflect-metadata';import storage from'redux-persist/lib/storage';import {combineReducers}from'@reduxjs/toolkit';import autoMergeLevel2 from'redux-persist/lib/stateReconciler/autoMergeLevel2';import {createEpicMiddleware}from'redux-observable';import {createRouterReducer}from'@common-stack/remix-router-redux';import {persistReducer}from'redux-persist';import {REDUX_PERSIST_KEY}from'@common-stack/client-core';import {createReduxStore as createReduxStore$1}from'./base-redux-config.js';import {logger}from'../utils/index.js';import features from'../modules.js';import {rootEpic}from'./epic-config.js';const epicMiddlewareFunc = (apolloClient, services, container) => createEpicMiddleware({
+import'reflect-metadata';import storage from'redux-persist/lib/storage/index.js';import {combineReducers}from'@reduxjs/toolkit';import autoMergeLevel2 from'redux-persist/lib/stateReconciler/autoMergeLevel2.js';import {createEpicMiddleware}from'redux-observable';import {createRouterReducer}from'@common-stack/remix-router-redux';import {persistReducer}from'redux-persist';import {REDUX_PERSIST_KEY}from'@common-stack/client-core';import {createReduxStore as createReduxStore$1}from'./base-redux-config.js';import {logger}from'../utils/index.js';import features from'../modules.js';import {rootEpic}from'./epic-config.js';const epicMiddlewareFunc = (apolloClient, services, container) => createEpicMiddleware({
     dependencies: {
         apolloClient,
         routes: features.getConfiguredRoutes(),

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 export * from './utils';
 export * from './config';
+export * from './tools';
 export * from './backend/middlewares/cors';
 export * from './backend/middlewares/container';
 export * from './backend/middlewares/error';

package/lib/index.js

@@ -1 +1 @@
-export{UtilityClass,logger}from'./utils/index.js';export{config}from'./config/env-config.js';export{createClientContainer}from'./config/client.service.js';export{createReduxStore,epicMiddlewareFunc,persistConfig}from'./config/redux-config.js';export{corsMiddleware}from'./backend/middlewares/cors.js';export{TYPES,containerMiddleware}from'./backend/middlewares/container.js';export{errorMiddleware}from'./backend/middlewares/error.js';export{loadContext}from'./load-context.server.js';
+export{UtilityClass,logger}from'./utils/index.js';export{createClientContainer}from'./config/client.service.js';export{createReduxStore,epicMiddlewareFunc,persistConfig}from'./config/redux-config.js';export{clientLoaderWithMiddleware}from'./tools/clientLoaderWithMiddleware.js';export{loaderWithMiddleware}from'./tools/loaderWithMiddleware.js';export{corsMiddleware}from'./backend/middlewares/cors.js';export{TYPES,containerMiddleware}from'./backend/middlewares/container.js';export{errorMiddleware}from'./backend/middlewares/error.js';export{loadContext}from'./load-context.server.js';

package/lib/interfaces/loaderContext.d.ts

@@ -0,0 +1,15 @@
+import type { Feature } from '@common-stack/client-react';
+import type { CdmLogger } from '@cdm-logger/core';
+import type { Redis } from 'ioredis';
+import type { Container } from 'inversify';
+import type { ApolloClient, NormalizedCache } from '@apollo/client/index';
+export interface IAppLoadContext<S = any> {
+    modules: Feature;
+    routeConfig: any;
+    store: any;
+    container: Container;
+    apolloClient: ApolloClient<NormalizedCache>;
+    services: S;
+    redisClient: Redis;
+    logger?: CdmLogger.ILogger;
+}

package/lib/interfaces/middleware.d.ts

@@ -0,0 +1,10 @@
+export interface MiddlewareOptions {
+    [key: string]: any;
+}
+export interface MiddlewareFunction {
+    (params: any, loaderData: MiddlewareOptions, next: () => Promise<void>): Promise<void>;
+}
+export interface Middleware {
+    name: string;
+    func: MiddlewareFunction;
+}

package/lib/load-context.server.d.ts

@@ -1,10 +1,3 @@
 import 'reflect-metadata';
-export declare const loadContext: (req: Request, res: Response) => Promise<{
-    modules: import("@common-stack/client-react").Feature;
-    routeConfig: any;
-    store: any;
-    container: any;
-    apolloClient: any;
-    services: any;
-    redisClient: any;
-}>;
+import { IAppLoadContext } from './interfaces/loaderContext';
+export declare const loadContext: (req: Request, res: Response) => Promise<IAppLoadContext>;

package/lib/load-context.server.js

@@ -2,7 +2,7 @@ import'reflect-metadata';import features from'./modules.js';import {getRedisClie
 const routeConfig = features.getConfiguredRoutes();
 const redisClient = getRedisClient();
 const loadContext = async (req, res) => {
-    const { container, store, apolloClient, services } = req;
+    const { container, store, apolloClient, services, logger } = req;
     return {
         modules: features,
         routeConfig,
@@ -11,5 +11,6 @@ const loadContext = async (req, res) => {
         apolloClient,
         services,
         redisClient,
+        logger,
     };
 };export{loadContext};

package/lib/tools/clientLoaderWithMiddleware.d.ts

@@ -0,0 +1,4 @@
+import { MiddlewareFunction, MiddlewareOptions } from '../interfaces/middleware';
+export declare function clientLoaderWithMiddleware(params: any, middlewareOptions: MiddlewareOptions, middlewareStack: {
+    func: MiddlewareFunction;
+}[]): Promise<MiddlewareOptions>;

package/lib/tools/clientLoaderWithMiddleware.js

@@ -0,0 +1,11 @@
+async function clientLoaderWithMiddleware(params, middlewareOptions = {}, middlewareStack) {
+    const loaderData = middlewareOptions;
+    const executeMiddlewares = async (index) => {
+        if (index < middlewareStack.length) {
+            const { func } = middlewareStack[index];
+            await func(params, loaderData, async () => await executeMiddlewares(index + 1));
+        }
+    };
+    await executeMiddlewares(0); // Start middleware execution from the first one
+    return loaderData;
+}export{clientLoaderWithMiddleware};

package/lib/tools/index.d.ts

@@ -0,0 +1,2 @@
+export * from './clientLoaderWithMiddleware';
+export * from './loaderWithMiddleware';

package/lib/tools/loaderWithMiddleware.d.ts

@@ -0,0 +1,3 @@
+import { IAppLoadContext } from '../interfaces/loaderContext';
+import { Middleware, MiddlewareOptions } from '../interfaces/middleware';
+export declare function loaderWithMiddleware(params: IAppLoadContext, middlewareOptions: MiddlewareOptions | undefined, middlewareStack: Middleware[]): Promise<MiddlewareOptions>;

package/lib/tools/loaderWithMiddleware.js

@@ -0,0 +1,23 @@
+const isDevelopment = process.env.NODE_ENV === 'development';
+async function loaderWithMiddleware(params, middlewareOptions, middlewareStack) {
+    const { logger } = params;
+    logger.debug('middlewares [%j]', middlewareStack);
+    const loaderData = middlewareOptions ? middlewareOptions : {};
+    const executeMiddlewares = async (index) => {
+        if (index < middlewareStack.length) {
+            const middleware = middlewareStack[index];
+            const start = process.hrtime(); // Get start time
+            if (isDevelopment) {
+                console.log(`[[Middleware ${middleware.name}]] starts to run`); // Log start
+            }
+            await middleware.func(params, loaderData, async () => await executeMiddlewares(index + 1));
+            if (isDevelopment) {
+                const end = process.hrtime(start); // Get end time
+                const elapsedTime = (end[0] * 1e9 + end[1]) / 1e6; // Convert to milliseconds
+                console.log(`[[Middleware ${middleware.name}]] took ${elapsedTime} ms`); // Log time taken
+            }
+        }
+    };
+    await executeMiddlewares(0); // Start middleware execution from the first one
+    return loaderData;
+}export{loaderWithMiddleware};

package/lib/utils/index.js

@@ -1,4 +1,4 @@
-import {ClientLogger}from'@cdm-logger/client';export{default}from'../modules.js';class UtilityClass {
+import {ClientLogger}from'@cdm-logger/client';import {getEnvironment}from'@common-stack/core';export{default}from'../modules.js';class UtilityClass {
     modules;
     cache = { key: null, modules: null };
     constructor(modules) {
@@ -24,6 +24,7 @@ import {ClientLogger}from'@cdm-logger/client';export{default}from'../modules.js'
         return this.cache.key;
     }
 }
-const logger = ClientLogger.create(process.env.APP_NAME || 'Fullstack-Pro', {
-    level: process.env.LOG_LEVEL || 'info',
+const appEnv = getEnvironment();
+const logger = ClientLogger.create(appEnv.APP_NAME || 'Fullstack-Pro', {
+    level: appEnv.LOG_LEVEL || 'info',
 });export{UtilityClass,logger};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/frontend-stack-react",
-    "version": "4.0.1-alpha.12",
+    "version": "4.0.1-alpha.20",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -50,5 +50,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "cb43cb1ed2941d6bd66b43ad4825cda7a2ed5abc"
+    "gitHead": "6e563e11afff4587f965457c1a1bd868562a1688"
 }

package/lib/config/public-config.d.ts

@@ -1,3 +0,0 @@
-/// <reference path="../../../../typings/index.d.ts" />
-declare const env: any;
-export default env;