@intrig/core 0.0.14-2 → 0.0.14-3

package/main.js

@@ -5991,7 +5991,7 @@ function context_template_contextTemplate(_path) {
   import { NetworkAction, NetworkState } from '@intrig/react/network-state';
 import { AxiosProgressEvent, AxiosRequestConfig } from 'axios';
 import { ZodSchema } from 'zod';
-import { createContext, useContext } from 'react';
+import { createContext, useContext, Dispatch } from 'react';
 import { DefaultConfigs } from '@intrig/react/intrig-provider';
 
 type GlobalState = Record<string, NetworkState>;
@@ -6008,13 +6008,13 @@ interface RequestType<T = any> extends AxiosRequestConfig {
  *
  * @interface ContextType
  * @property {GlobalState} state - The global state of the application.
- * @property {React.Dispatch<NetworkAction<unknown>>} dispatch - The dispatch function to send network actions.
+ * @property {Dispatch<NetworkAction<unknown>>} dispatch - The dispatch function to send network actions.
  * @property {Record<string, AxiosInstance>} axios - A record of Axios instances for making HTTP requests.
  */
 export interface ContextType {
   state: GlobalState;
   filteredState: GlobalState;
-  dispatch: React.Dispatch<NetworkAction<unknown, unknown>>;
+  dispatch: Dispatch<NetworkAction<unknown, unknown>>;
   configs: DefaultConfigs;
   execute: <T>(request: RequestType, dispatch: (state: NetworkState<T>) => void, schema: ZodSchema<T> | undefined, errorSchema: ZodSchema<T> | undefined) => Promise<void>;
 }
@@ -6134,11 +6134,13 @@ 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: string = 'default'): [NetworkState<T>, (...params: Parameters<F>) => void, () => void] {
+export function useAsNetworkState<T, F extends ((...args: any) => Promise<T>)>(fn: F, options: any = {}): [NetworkState<T>, (...params: Parameters<F>) => void, () => void] {
   let id = useId();
 
   let context = useIntrigContext();
 
+  let key = options.key ?? 'default';
+
   const networkState = useMemo(() => {
     return context.state?.[${"`promiseState:${id}:${key}}`"}] ?? init()
   }, [context.state?.[${"`promiseState:${id}:${key}}`"}]]);
@@ -6150,7 +6152,7 @@ export function useAsNetworkState<T, F extends ((...args: any) => Promise<T>)>(f
     [key, context.dispatch]
   );
 
-  const execute = useCallback((...args: Parameters<F>) => {
+  const execute = useCallback((...args: any[]) => {
     dispatch(pending())
     return fn(...args).then(
       (data) => {
@@ -7011,7 +7013,9 @@ export function isResponseValidationError<T, E>(value: IntrigError<T, E>): value
 ;// ../../lib/react-binding/src/lib/templates/packageJson.template.ts
 
 
+
 function packageJson_template_packageJsonTemplate(_path) {
+    const packageJson = external_fs_extra_namespaceObject.readJsonSync(external_path_namespaceObject.resolve(_path, '..', '..', 'package.json'));
     const json = jsonLiteral(external_path_namespaceObject.resolve(_path, 'package.json'));
     return json`
 {
@@ -7033,9 +7037,16 @@ function packageJson_template_packageJsonTemplate(_path) {
     "module-alias": "^2.2.2",
     "zod": "^3.23.8"
   },
+  "devDependencies": {
+    "@swc/cli": "^0.7.7",
+    "@swc/core": "^1.12.6",
+    "@types/node": "^24.0.4",
+    "react": "${packageJson.dependencies.react}",
+    "react-dom": "${packageJson.dependencies['react-dom']}"
+  },
   "peerDependencies": {
-    "react": "18.3.1",
-    "react-dom": "18.3.1"
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0"
   },
   "_moduleAliases": {
     "@intrig/react": "./src"
@@ -7418,7 +7429,7 @@ export function useNetworkState<T, E = unknown>({
 }: NetworkStateProps<T>): [
   NetworkState<T, E>,
   (request: RequestType) => void,
-  clear: () => void,
+  () => void,
   (state: NetworkState<T, E>) => void
 ] {
   const context = useContext(Context);
@@ -7530,7 +7541,7 @@ export function useTransientCall<T, E = unknown>({
           { ...request, signal: abort.signal },
           (state) => {
             if (isSuccess(state)) {
-              resolve(state.data);
+              resolve(state.data as T);
             } else if (isError(state)) {
               reject(state.error);
             }
@@ -7547,7 +7558,7 @@ export function useTransientCall<T, E = unknown>({
     controller.current?.abort();
   }, []);
 
-  return [call, abort] as const;
+  return [call, abort];
 }
 
 function debounce<T extends (...args: any[]) => void>(func: T, delay: number) {
@@ -7572,7 +7583,7 @@ export function useCentralError() {
   const ctx = useContext(Context);
 
   return useMemo(() => {
-    return Object.entries(ctx.filteredState)
+    return Object.entries(ctx.filteredState as Record<string, NetworkState>)
       .filter(([, state]) => isError(state))
       .map(([k, state]) => {
         let [source, operation, key] = k.split(':');
@@ -7596,7 +7607,7 @@ export function useCentralPendingState() {
   const ctx = useContext(Context);
 
   const result: NetworkState = useMemo(() => {
-    let pendingStates = Object.values(ctx.filteredState).filter(isPending);
+    let pendingStates = Object.values(ctx.filteredState as Record<string, NetworkState>).filter(isPending);
     if (!pendingStates.length) {
       return init();
     }
@@ -7634,6 +7645,7 @@ function tsconfig_template_tsConfigTemplate(_path) {
     "outDir": "./dist",
     "strict": true,
     "esModuleInterop": true,
+    "noImplicitAny": false,
     "moduleResolution": "node",
     "baseUrl": "./",
     "paths": {
@@ -7875,22 +7887,34 @@ async function requestHook_template_requestHookTemplate({ source, data: { paths,
 ;// ../../lib/react-binding/src/lib/templates/source/controller/method/download.template.ts
 
 
-function extractHookShape(response, requestBody, imports) {
+function download_template_extractHookShapeAndOptionsShape(response, requestBody, imports) {
     if (response) {
         if (requestBody) {
-            imports.add(`import { BinaryFunctionHook } from "@intrig/react"`);
-            return `BinaryFunctionHook<Params, RequestBody, Response, _ErrorType>`;
+            imports.add(`import { BinaryFunctionHook, BinaryHookOptions } from "@intrig/react"`);
+            return {
+                hookShape: `BinaryFunctionHook<Params, RequestBody, Response, _ErrorType>`,
+                optionsShape: `BinaryHookOptions<Params, RequestBody>`
+            };
         } else {
-            imports.add(`import { UnaryFunctionHook } from "@intrig/react"`);
-            return `UnaryFunctionHook<Params, Response, _ErrorType>`;
+            imports.add(`import { UnaryFunctionHook, UnaryHookOptions } from "@intrig/react"`);
+            return {
+                hookShape: `UnaryFunctionHook<Params, Response, _ErrorType>`,
+                optionsShape: `UnaryHookOptions<Params>`
+            };
         }
     } else {
         if (requestBody) {
-            imports.add(`import { BinaryProduceHook } from "@intrig/react"`);
-            return `BinaryProduceHook<Params, RequestBody, _ErrorType>`;
+            imports.add(`import { BinaryProduceHook, BinaryHookOptions } from "@intrig/react"`);
+            return {
+                hookShape: `BinaryProduceHook<Params, RequestBody, _ErrorType>`,
+                optionsShape: `BinaryHookOptions<Params, RequestBody>`
+            };
         } else {
-            imports.add(`import { UnaryProduceHook } from "@intrig/react"`);
-            return `UnaryProduceHook<Params, _ErrorType>`;
+            imports.add(`import { UnaryProduceHook, UnaryHookOptions } from "@intrig/react"`);
+            return {
+                hookShape: `UnaryProduceHook<Params, _ErrorType>`,
+                optionsShape: `UnaryHookOptions<Params>`
+            };
         }
     }
 }
@@ -7945,7 +7969,7 @@ async function download_template_downloadHookTemplate({ source, data: { paths, o
     imports.add(`import { z } from 'zod'`);
     imports.add(`import { useCallback } from 'react'`);
     imports.add(`import {useNetworkState, NetworkState, DispatchState, pending, success, error, successfulDispatch, validationError, encode} from "@intrig/react"`);
-    const hookShape = extractHookShape(response, requestBody, imports);
+    const { hookShape, optionsShape } = download_template_extractHookShapeAndOptionsShape(response, requestBody, imports);
     const { paramExpression, paramType } = download_template_extractParamDeconstruction(variables, requestBody);
     if (requestBody) {
         imports.add(`import { ${requestBody} as RequestBody, ${requestBody}Schema as requestBodySchema } from "@intrig/react/${source}/components/schemas/${requestBody}"`);
@@ -8003,9 +8027,9 @@ async function download_template_downloadHookTemplate({ source, data: { paths, o
     const operation = "${method.toUpperCase()} ${requestUrl}| ${contentType} -> ${responseType}"
     const source = "${source}"
 
-    function use${pascalCase(operationId)}Hook(key: string = "default"): [NetworkState<Response, _ErrorType>, (${paramType}) => DispatchState<any>, () => void] {
+    function use${pascalCase(operationId)}Hook(options: ${optionsShape} = {}): [NetworkState<Response, _ErrorType>, (${paramType}) => DispatchState<any>, () => void] {
       let [state,, clear, dispatch] = useNetworkState<Response, _ErrorType>({
-        key,
+        key: options?.key ?? 'default',
         operation,
         source,
         schema,
@@ -10769,9 +10793,6 @@ class OperationsService {
     }
     async installDependencies(ctx) {
         await this.packageManagerService.install(this.generateDir);
-        await this.packageManagerService.installDependency("@swc/core", true, false, this.generateDir);
-        await this.packageManagerService.installDependency("@swc/cli", true, false, this.generateDir);
-        await this.packageManagerService.installDependency("@types/node", true, false, this.generateDir);
     }
     async generateGlobalContent(ctx, apisToSync) {
         await this.generatorBinding.generateGlobal(apisToSync);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intrig/core",
-  "version": "0.0.14-2",
+  "version": "0.0.14-3",
   "private": false,
   "type": "module",
   "bin": {