@intrig/next 1.0.10 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intrig/next",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "private": false,
   "description": "Placeholder module for autogenerated intrig next.js boilerplate",
   "dependencies": {
@@ -12,8 +12,7 @@
     "date-fns": "^4.1.0",
     "loglevel": "1.8.1",
     "pino": "^9.6.0",
-    "pino-pretty": "^13.0.0",
-    "qs": "^6.13.0"
+    "pino-pretty": "^13.0.0"
   },
   "peerDependencies": {
     "react": "18.3.1",

package/src/extra/useAsNetworkState.ts

@@ -13,10 +13,10 @@ import { useIntrigContext } from '@intrig/next/intrig-context';
  *         2. A function to execute the provided asynchronous operation.
  *         3. A function to reset the network state back to the initial state.
  */
-export function useAsNetworkState<T, F extends ((...args: any) => Promise<T>)>(fn: F, key = 'default'): [NetworkState<T>, (...params: Parameters<F>) => void, () => void] {
-  const id = useId();
+export function useAsNetworkState<T, F extends ((...args: any) => Promise<T>)>(fn: F, key: string = 'default'): [NetworkState<T>, (...params: Parameters<F>) => void, () => void] {
+  let id = useId();
 
-  const context = useIntrigContext();
+  let context = useIntrigContext();
 
   const networkState = useMemo(() => {
     return context.state?.[`promiseState:${id}:${key}}`] ?? init()

package/src/extra/useAsPromise.ts

@@ -82,7 +82,7 @@ export function useAsPromise<P, B, T, E>(
   const resolveRef = useRef<(value: T) => void>();
   const rejectRef = useRef<(reason?: any) => void>();
 
-  const [state, dispatch, clear] = hook(options as any); // Casting to `any` to match all overloads
+  let [state, dispatch, clear] = hook(options as any); // Casting to `any` to match all overloads
 
   useEffect(() => {
     if (isSuccess(state)) {
@@ -99,7 +99,7 @@ export function useAsPromise<P, B, T, E>(
       resolveRef.current = resolve;
       rejectRef.current = reject;
 
-      const dispatchState = (dispatch as any)(...args);
+      let dispatchState = (dispatch as any)(...args);
       if (isValidationError(dispatchState)) {
         reject(dispatchState.error);
       }

package/src/extra/useLocalReducer.ts

@@ -2,7 +2,7 @@ import { useIntrigContext } from '@intrig/next/intrig-context';
 import { useCallback, useMemo } from 'react';
 import { error, init, isInit, isSuccess, NetworkState, success } from '@intrig/next/network-state';
 
-export interface LocalReducerOptions<T> {
+export interface LocalReducerOptions<T, E> {
   initState?: T;
   key?: string;
 }
@@ -11,8 +11,8 @@ function isPromise<T>(item: any): item is Promise<T> {
   return !!item && typeof item.then === 'function' && typeof item.catch === 'function';
 }
 
-export function useLocalReducer<T, E, F extends (event: E, curState?: T) => T | Promise<T>>(fn: F, options: LocalReducerOptions<T>) {
-  const context = useIntrigContext();
+export function useLocalReducer<T, E, F extends (event: E, curState?: T) => T | Promise<T>>(fn: F, options: LocalReducerOptions<T, E>) {
+  let context = useIntrigContext();
 
   const key = useMemo(() => {
     return options.key ?? 'default';
@@ -32,7 +32,7 @@ export function useLocalReducer<T, E, F extends (event: E, curState?: T) => T |
   const execute = useCallback((event: E) => {
     try {
       if (isSuccess(networkState)) {
-        const data = fn(event, networkState.data);
+        let data = fn(event, networkState.data);
         if (isPromise(data)) {
           dispatch(init());
           data.then(data => dispatch(success(data)));
@@ -40,7 +40,7 @@ export function useLocalReducer<T, E, F extends (event: E, curState?: T) => T |
           dispatch(success(data));
         }
       } else if (isInit(networkState)) {
-        const data1 = fn(event, options.initState);
+        let data1 = fn(event, options.initState);
         if (isPromise(data1)) {
           dispatch(init());
           data1.then(data => dispatch(success(data)));

package/src/extra/useResolvedCachedValue.ts

@@ -73,7 +73,7 @@ export function useResolvedCachedValue<P, B, T, E>(hook: BinaryFunctionHook<P, B
 export function useResolvedCachedValue<P, B, T, E>(hook: IntrigHook<P, B, T, E>, options: IntrigHookOptions<P, B>): T | undefined {
   const [cachedValue, setCachedValue] = useState<T | undefined>();
 
-  const [state] = hook(options as any); // Ensure compatibility with different hook types
+  let [state] = hook(options as any); // Ensure compatibility with different hook types
 
   useEffect(() => {
     if (isSuccess(state)) {

package/src/extra/useResolvedValue.ts

@@ -68,7 +68,7 @@ export function useResolvedValue<P, B, T, E>(hook: BinaryFunctionHook<P, B, T, E
 export function useResolvedValue<P, B, T, E>(hook: IntrigHook<P, B, T, E>, options: IntrigHookOptions<P, B>): T | undefined {
   const [value, setValue] = useState<T | undefined>();
 
-  const [state] = hook(options as any); // Ensure compatibility with different hook types
+  let [state] = hook(options as any); // Ensure compatibility with different hook types
 
   useEffect(() => {
     if (isSuccess(state)) {

package/src/extra.ts

@@ -15,7 +15,7 @@ import {
   UnitHook,
   UnitHookOptions
 } from '@intrig/next/network-state';
-import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useId, useMemo, useReducer, useRef, useState } from 'react';
 import { useIntrigContext } from '@intrig/next/intrig-context';
 
 /**
@@ -42,7 +42,7 @@ export function useAsPromise<P, B, T, E>(
   const resolveRef = useRef<(value: T) => void>();
   const rejectRef = useRef<(reason?: any) => void>();
 
-  const [state, dispatch, clear] = hook(options as any); // Casting to `any` to match all overloads
+  let [state, dispatch, clear] = hook(options as any); // Casting to `any` to match all overloads
 
   useEffect(() => {
     if (isSuccess(state)) {
@@ -59,7 +59,7 @@ export function useAsPromise<P, B, T, E>(
       resolveRef.current = resolve;
       rejectRef.current = reject;
 
-      const dispatchState = (dispatch as any)(...args);
+      let dispatchState = (dispatch as any)(...args);
       if (isValidationError(dispatchState)) {
         reject(dispatchState.error);
       }
@@ -77,10 +77,10 @@ export function useAsPromise<P, B, T, E>(
  * @param key An optional identifier for the network state. Defaults to 'default'.
  * @return A tuple containing the current network state, a function to execute the promise, and a function to clear the state.
  */
-export function useAsNetworkState<T, F extends ((...args: any) => Promise<T>)>(fn: F, key = 'default'): [NetworkState<T>, (...params: Parameters<F>) => void, () => void] {
-  const id = useId();
+export function useAsNetworkState<T, F extends ((...args: any) => Promise<T>)>(fn: F, key: string = 'default'): [NetworkState<T>, (...params: Parameters<F>) => void, () => void] {
+  let id = useId();
 
-  const context = useIntrigContext();
+  let context = useIntrigContext();
 
   const networkState = useMemo(() => {
     return context.state?.[`promiseState:${id}:${key}}`] ?? init()
@@ -139,7 +139,7 @@ export function useResolvedValue<P, B, T, E>(hook: BinaryFunctionHook<P, B, T, E
 export function useResolvedValue<P, B, T, E>(hook: IntrigHook<P, B, T, E>, options: IntrigHookOptions<P, B>): T | undefined {
   const [value, setValue] = useState<T | undefined>();
 
-  const [state] = hook(options as any); // Ensure compatibility with different hook types
+  let [state] = hook(options as any); // Ensure compatibility with different hook types
 
   useEffect(() => {
     if (isSuccess(state)) {
@@ -177,14 +177,14 @@ export function useResolvedCachedValue<P, B, T, E>(hook: BinaryFunctionHook<P, B
 export function useResolvedCachedValue<P, B, T, E>(hook: IntrigHook<P, B, T, E>, options: IntrigHookOptions<P, B>): T | undefined {
   const [cachedValue, setCachedValue] = useState<T | undefined>();
 
-  const [state] = hook(options as any); // Ensure compatibility with different hook types
+  let [state] = hook(options as any); // Ensure compatibility with different hook types
 
   useEffect(() => {
     if (isSuccess(state)) {
       setCachedValue(state.data);
     }
     // Do not clear cached value if state is unsuccessful
-  }, [state]);
+  }, [state]); 
 
   return cachedValue;
 }

package/src/intrig-context.ts

@@ -43,15 +43,13 @@ export interface ContextType {
  *
  * @type {ContextType}
  */
-const Context = createContext<ContextType>({
+let Context = createContext<ContextType>({
   state: {},
   filteredState: {},
-  dispatch() {
-    //noop
-  },
+  dispatch() {},
   configs: {},
   async execute() {
-    //noop
+
   }
 });
 

package/src/intrig-layout.tsx

@@ -5,9 +5,9 @@ import { DefaultConfigs, IntrigProvider } from './intrig-provider';
 
 export default async function IntrigLayout({children, configs}: { children: React.ReactNode, configs?: DefaultConfigs}) {
 
-  const headersData = await headers();
-  const hydratedResponsesStr = headersData.get('INTRIG_HYDRATED');
-  const hydratedResponses = hydratedResponsesStr ? JSON.parse(hydratedResponsesStr) : {}
+  let headersData = await headers();
+  let hydratedResponsesStr = headersData.get('INTRIG_HYDRATED');
+  let hydratedResponses = hydratedResponsesStr ? JSON.parse(hydratedResponsesStr) : {}
   headersData.delete('INTRIG_HYDRATED');
 
   return <>

package/src/intrig-middleware.spec.ts

@@ -0,0 +1,9 @@
+import { extractPathVariables } from './intrig-middleware';
+
+describe('intrig-middleware', () => {
+  it('should extract params', () => {
+    let variables = extractPathVariables('/api/v1/database/{dbId}/table/{tableId}', '/api/v1/database/dap/table/users');
+
+    console.log(variables);
+  })
+})

package/src/intrig-middleware.ts

@@ -1,8 +1,8 @@
 "use server"
 
 import axios from 'axios';
-//@ts-expect-error: 'intrig-hook' is a dynamic module and may not be statically analyzable
-const insightHook = await import('intrig-hook');
+//@ts-ignore
+let insightHook = await import('intrig-hook');
 import {headers as requestHeaders} from 'next/headers'
 
 export async function getAxiosInstance(key: string) {
@@ -23,9 +23,9 @@ export async function getAxiosInstance(key: string) {
 }
 
 export async function addResponseToHydrate(key: string, responseData: any) {
-  const _headers = await requestHeaders();
-  const intrigHydrated = _headers.get('INTRIG_HYDRATED');
-  const ob = intrigHydrated ? JSON.parse(intrigHydrated) : {};
+  let _headers = await requestHeaders();
+  let intrigHydrated = _headers.get('INTRIG_HYDRATED');
+  let ob = intrigHydrated ? JSON.parse(intrigHydrated) : {};
   ob[key] = responseData;
   _headers.set('INTRIG_HYDRATED', JSON.stringify(ob));
 }

package/src/intrig-provider.tsx

@@ -88,11 +88,11 @@ export function IntrigProvider({
     async function execute<T, E = unknown>(request: RequestType, dispatch: (state: NetworkState<T, E>) => void, schema: ZodSchema<T> | undefined, errorSchema: ZodSchema<E> | undefined) {
       try {
         dispatch(pending());
-        const response = await axiosInstance.request(request);
+        let response = await axiosInstance.request(request);
 
         if (response.status >= 200 && response.status < 300) {
           if (schema) {
-            const data = schema.safeParse(response.data);
+            let data = schema.safeParse(response.data);
             if (!data.success) {
               dispatch(
                 error(data.error.issues, response.status, request)
@@ -104,7 +104,7 @@ export function IntrigProvider({
             dispatch(success(response.data));
           }
         } else {
-          const { data } = errorSchema?.safeParse(response.data ?? {}) ?? {};
+          let { data, error: validationError } = errorSchema?.safeParse(response.data ?? {}) ?? {};
           //todo: handle error validation error.
           dispatch(
             error(data ?? response.data ?? response.statusText, response.status)
@@ -112,7 +112,7 @@ export function IntrigProvider({
         }
       } catch (e: any) {
         if (isAxiosError(e)) {
-          const { data } = errorSchema?.safeParse(e.response?.data ?? {}) ?? {};
+          let { data, error: validationError } = errorSchema?.safeParse(e.response?.data ?? {}) ?? {};
           dispatch(error(data ?? e.response?.data, e.response?.status, request));
         } else {
           dispatch(error(e));
@@ -132,17 +132,17 @@ export function IntrigProvider({
   return <Context.Provider value={contextValue}>{children}</Context.Provider>;
 }
 
-export interface StubType {
+export interface StubType<P, B, T> {
   <P, B, T>(hook: IntrigHook<P, B, T>, fn: (params: P, body: B, dispatch: (state: NetworkState<T>) => void) => Promise<void>): void
 }
 
 export type WithStubSupport<T> = T & {
-  stubs?: (stub: StubType) => void;
+  stubs?: (stub: StubType<any, any, any>) => void;
 }
 
 export interface IntrigProviderStubProps {
   configs?: DefaultConfigs;
-  stubs?: (stub: StubType) => void;
+  stubs?: (stub: StubType<any, any, any>) => void;
   children: React.ReactNode;
 }
 
@@ -150,7 +150,7 @@ export function IntrigProviderStub({ children, configs = {}, stubs = () => {} }:
   const [state, dispatch] = useReducer(requestReducer, {} as GlobalState);
 
   const collectedStubs = useMemo(() => {
-    const fns: Record<string, (params: any, body: any, dispatch: (state: NetworkState<any>) => void) => Promise<void>> = {};
+    let fns: Record<string, (params: any, body: any, dispatch: (state: NetworkState<any>) => void) => Promise<void>> = {};
     function stub<P, B, T>(hook: IntrigHook<P, B, T>, fn: (params: P, body: B, dispatch: (state: NetworkState<T>) => void) => Promise<void>) {
       fns[hook.key] = fn;
     }
@@ -161,9 +161,9 @@ export function IntrigProviderStub({ children, configs = {}, stubs = () => {} }:
   const contextValue = useMemo(() => {
 
     async function execute<T>(request: RequestType, dispatch: (state: NetworkState<T>) => void, schema: ZodSchema<T> | undefined) {
-      const stub = collectedStubs[request.key];
+      let stub = collectedStubs[request.key];
 
-      if (stub) {
+      if (!!stub) {
         try {
           await stub(request.params, request.data, dispatch);
         } catch (e) {
@@ -334,10 +334,10 @@ export function useNetworkState<T, E = unknown>({
       logger.info(`Executing request ${key} ${operation} ${source}`);
       logger.debug(`⇨`, request)
 
-      const abortController = new AbortController();
+      let abortController = new AbortController();
       setAbortController(abortController);
 
-      const requestConfig: RequestType = {
+      let requestConfig: RequestType = {
         ...request,
         onUploadProgress(event: AxiosProgressEvent) {
           dispatch(
@@ -410,7 +410,7 @@ export function useCentralError() {
     return Object.entries(ctx.filteredState)
       .filter(([, state]) => isError(state))
       .map(([k, state]) => {
-        const [source, operation, key] = k.split(':');
+        let [source, operation, key] = k.split(':');
         return {
           ...(state as ErrorState<unknown>),
           source,
@@ -431,12 +431,12 @@ export function useCentralPendingState() {
   const ctx = useContext(Context);
 
   const result: NetworkState = useMemo(() => {
-    const pendingStates = Object.values(ctx.filteredState).filter(isPending);
+    let pendingStates = Object.values(ctx.filteredState).filter(isPending);
     if (!pendingStates.length) {
       return init();
     }
 
-    const progress = pendingStates
+    let progress = pendingStates
       .filter((a) => a.progress)
       .reduce(
         (progress, current) => {
@@ -447,7 +447,7 @@ export function useCentralPendingState() {
         },
         { total: 0, loaded: 0 } satisfies Progress
       );
-    return pending(progress.total ? progress : undefined);
+    return pending(!!progress.total ? progress : undefined);
   }, [ctx.filteredState]);
 
   return result;

package/src/logger.ts

@@ -1,7 +1,7 @@
 import log from 'loglevel';
 
 // Set the default logging level (can be overridden via environment variables)
-log.setLevel(process.env.LOG_LEVEL as log.LogLevelDesc || 'error');
+log.setLevel(process.env.LOG_LEVEL as log.LogLevelDesc || 'info');
 
 const logWrapper = {
   info: (msg: string, meta?: object) => meta ? log.info(msg, meta) : log.info(msg),

package/src/media-type-utils.ts

@@ -16,7 +16,7 @@ export function encode<T>(request: T, mediaType: string, schema: ZodSchema) {
   return request;
 }
 
-encoders['application/json'] = async (request) => {
+encoders['application/json'] = async (request, mediaType, schema) => {
   return request;
 }
 
@@ -29,7 +29,7 @@ function appendFormData(
     formData.append(parentKey, data);
   } else if (data !== null && typeof data === 'object') {
     if (Array.isArray(data)) {
-      data.forEach((item: any) => {
+      data.forEach((item: any, index: number) => {
         const key = `${parentKey}`;
         appendFormData(formData, item, key);
       });
@@ -45,22 +45,22 @@ function appendFormData(
 }
 
 
-encoders['multipart/form-data'] = async (request) => {
-  const _request = request as Record<string, any>;
-  const formData = new FormData();
+encoders['multipart/form-data'] = async (request, mediaType, schema) => {
+  let _request = request as Record<string, any>;
+  let formData = new FormData();
   Object.keys(_request).forEach((key: string) => {
     appendFormData(formData, _request[key], key);
   });
   return formData;
 }
 
-encoders['application/octet-stream'] = async (request) => {
+encoders['application/octet-stream'] = async (request, mediaType, schema) => {
   return request;
 }
 
-encoders['application/x-www-form-urlencoded'] = async (request) => {
-  const formData = new FormData();
-  for (const key in request) {
+encoders['application/x-www-form-urlencoded'] = async (request, mediaType, schema) => {
+  let formData = new FormData();
+  for (let key in request) {
     const value = request[key];
     formData.append(key, value instanceof Blob || typeof value === 'string' ? value : String(value));
   }
@@ -93,8 +93,8 @@ transformers['application/json'] = async (request, mediaType, schema) => {
 };
 
 transformers['multipart/form-data'] = async (request, mediaType, schema) => {
-  const formData = await request.formData();
-  const content: Record<string, any> = {};
+  let formData = await request.formData();
+  let content: Record<string, any> = {};
   formData.forEach((value, key) => {
     if (content[key]) {
       if (!(content[key] instanceof Array)) {
@@ -125,15 +125,15 @@ transformers['application/x-www-form-urlencoded'] = async (
   mediaType,
   schema
 ) => {
-  const formData = await request.formData();
-  const content: Record<string, any> = {};
+  let formData = await request.formData();
+  let content: Record<string, any> = {};
   formData.forEach((value, key) => (content[key] = value));
   return schema.parse(content);
 };
 
 transformers['application/xml'] = async (request, mediaType, schema) => {
-  const xmlParser = new XMLParser();
-  const content = await xmlParser.parse(await request.text());
+  let xmlParser = new XMLParser();
+  let content = await xmlParser.parse(await request.text());
   return schema.parse(await content);
 };
 
@@ -168,7 +168,7 @@ responseTransformers['application/json'] = async (data, mediaType, schema) => {
 };
 
 responseTransformers['application/xml'] = async (data, mediaType, schema) => {
-  const parsed = new XMLParser().parse(data);
+  let parsed = new XMLParser().parse(data);
   return schema.parse(parsed);
 }