@arrirpc/codegen-ts 0.77.1 → 0.79.0

package/README.md

@@ -50,19 +50,35 @@ pnpm i --save @arrirpc/client
 import { MyClient } from './myClient.g';
 
 const client = new MyClient({
+    // only required field
     baseUrl: 'https://example.com',
+
+    // everything below is optional
     headers: () => {
         return {
             Authorization: '<some-token>',
         };
     },
-    // optional
-    onError: (err) => {
-        // do something
+    onError: (err) => {},
+    options: {
+        retry: 4,
+        retryDelay: 200,
+        retryStatusCodes: [400, 403, 500, 501],
+        onRequest: (ctx) => {},
+        onRequestError: (ctx) => {},
+        onResponse: (ctx) => {},
+        onResponseError: (ctx) => {},
+        signal: undefined, // abortcontroller signal
+        timeout: 200,
     },
 });
 
-await client.myProcedure();
+await client.myProcedure({ foo: 'foo' });
+
+// individual procedures can also override the global request options
+await client.myProcedure({ foo: 'foo' }, { timeout: 400 });
+// be aware that these options are not merged with the global request options so you will have to
+// re-specify every hook if you only want to change one thing
 ```
 
 The root client will be a class containing all of the services and procedures in a single class. If you only need a particular service. You can also import just that service.

package/dist/index.cjs

@@ -10,7 +10,7 @@ const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 
 function tsAnyFromSchema(schema, context) {
   const typeName = "any";
-  const defaultValue = schema.nullable ? "null" : "undefined";
+  const defaultValue = schema.isNullable ? "null" : "undefined";
   return {
     typeName,
     defaultValue,
@@ -92,16 +92,16 @@ function tsArrayFromSchema(schema, context) {
     rpcGenerators: context.rpcGenerators
   });
   const typeName = `(${innerType.typeName})[]`;
-  const defaultValue = schema.nullable ? "null" : "[]";
+  const defaultValue = schema.isNullable ? "null" : "[]";
   return {
-    typeName: schema.nullable ? `${typeName} | null` : typeName,
+    typeName: schema.isNullable ? `${typeName} | null` : typeName,
     defaultValue,
     validationTemplate(input) {
       const mainPart = `Array.isArray(${input}) 
                 && ${input}.every(
                     (_element) => ${innerType.validationTemplate("_element")}
             )`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `((${mainPart}) || 
                 ${input} === null)`;
       }
@@ -122,7 +122,7 @@ function tsArrayFromSchema(schema, context) {
     toJsonTemplate(input, target) {
       const elVar = `_${codegenUtils.camelCase(validVarName(input.split(".").join("_")), { normalize: true })}El`;
       const elKeyVar = `${elVar}Key`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} !== null) {
                     ${target} += '[';
                     for (let i = 0; i < ${input}.length; i++) {
@@ -153,12 +153,12 @@ function tsArrayFromSchema(schema, context) {
 function tsObjectFromSchema(schema, context) {
   const typeName = getTsTypeName(schema, context);
   const prefixedTypeName = `${context.typePrefix}${typeName}`;
-  const defaultValue = schema.nullable ? "null" : `$$${prefixedTypeName}.new()`;
+  const defaultValue = schema.isNullable ? "null" : `$$${prefixedTypeName}.new()`;
   const result = {
-    typeName: schema.nullable ? `${prefixedTypeName} | null` : prefixedTypeName,
+    typeName: schema.isNullable ? `${prefixedTypeName} | null` : prefixedTypeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `($$${prefixedTypeName}.validate(${input}) || ${input} === null)`;
       }
       return `$$${prefixedTypeName}.validate(${input})`;
@@ -171,7 +171,7 @@ function tsObjectFromSchema(schema, context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} !== null) {
                     ${target} += $$${prefixedTypeName}.toJsonString(${input}); 
                 } else {
@@ -348,13 +348,13 @@ ${subContentParts.join("\n")}`;
 function tsTaggedUnionFromSchema(schema, context) {
   const typeName = getTsTypeName(schema, context);
   const prefixedTypeName = `${context.typePrefix}${typeName}`;
-  const defaultValue = schema.nullable ? "null" : `$$${prefixedTypeName}.new()`;
+  const defaultValue = schema.isNullable ? "null" : `$$${prefixedTypeName}.new()`;
   const result = {
-    typeName: schema.nullable ? `${prefixedTypeName} | null` : prefixedTypeName,
+    typeName: schema.isNullable ? `${prefixedTypeName} | null` : prefixedTypeName,
     defaultValue,
     validationTemplate(input) {
       const mainPart = `$$${prefixedTypeName}.validate(${input})`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(${mainPart} || ${input} === null)`;
       }
       return mainPart;
@@ -367,7 +367,7 @@ function tsTaggedUnionFromSchema(schema, context) {
             }`;
     },
     toJsonTemplate(input, target, _key) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} != null) {
                     ${target} += $$${prefixedTypeName}.toJsonString(${input});
                 } else {
@@ -469,13 +469,13 @@ function tsEnumFromSchema(schema, context) {
     );
   const enumName = getTsTypeName(schema, context);
   const prefixedEnumName = `${context.typePrefix}${enumName}`;
-  const typeName = schema.nullable ? `${prefixedEnumName} | null` : prefixedEnumName;
-  const defaultValue = schema.nullable ? "null" : `$$${prefixedEnumName}.new()`;
+  const typeName = schema.isNullable ? `${prefixedEnumName} | null` : prefixedEnumName;
+  const defaultValue = schema.isNullable ? "null" : `$$${prefixedEnumName}.new()`;
   const result = {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `($$${prefixedEnumName}.validate(${input}) || ${input} === null)`;
       }
       return `$$${prefixedEnumName}.validate(${input})`;
@@ -488,7 +488,7 @@ function tsEnumFromSchema(schema, context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (typeof ${input} === 'string') {
                     ${target} += \`"\${${input}}"\`;
                 } else {
@@ -539,13 +539,13 @@ export const $$${name}: ArriEnumValidator<${name}> = {
 }
 
 function tsStringFromSchema(schema, _context) {
-  const typeName = schema.nullable ? "string | null" : "string";
-  const defaultValue = schema.nullable ? "null" : '""';
+  const typeName = schema.isNullable ? "string | null" : "string";
+  const defaultValue = schema.isNullable ? "null" : '""';
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(typeof ${input} === 'string' || ${input} === null)`;
       }
       return `typeof ${input} === 'string'`;
@@ -558,7 +558,7 @@ function tsStringFromSchema(schema, _context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (typeof ${input} === 'string') {
                     ${target} += serializeString(${input});
                 } else {
@@ -574,13 +574,13 @@ function tsStringFromSchema(schema, _context) {
   };
 }
 function tsBooleanFromSchema(schema, _context) {
-  const typeName = schema.nullable ? `boolean | null` : "boolean";
-  const defaultValue = schema.nullable ? `null` : "false";
+  const typeName = schema.isNullable ? `boolean | null` : "boolean";
+  const defaultValue = schema.isNullable ? `null` : "false";
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(typeof ${input} === 'boolean' || ${input} === null)`;
       }
       return `typeof ${input} === 'boolean'`;
@@ -602,13 +602,13 @@ function tsBooleanFromSchema(schema, _context) {
   };
 }
 function tsDateFromSchema(schema, _context) {
-  const typeName = schema.nullable ? `Date | null` : "Date";
-  const defaultValue = schema.nullable ? `null` : "new Date()";
+  const typeName = schema.isNullable ? `Date | null` : "Date";
+  const defaultValue = schema.isNullable ? `null` : "new Date()";
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(${input} instanceof Date || ${input} === null)`;
       }
       return `${input} instanceof Date`;
@@ -623,7 +623,7 @@ function tsDateFromSchema(schema, _context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} instanceof Date) {
                     ${target} += \`"\${${input}.toISOString()}"\`
                 } else {
@@ -633,7 +633,7 @@ function tsDateFromSchema(schema, _context) {
       return `${target} += \`"\${${input}.toISOString()}"\``;
     },
     toQueryStringTemplate(input, target, key) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `${target}.push(\`${key}=\${${input}?.toISOString()}\`)`;
       }
       return `${target}.push(\`${key}=\${${input}.toISOString()}\`)`;
@@ -642,13 +642,13 @@ function tsDateFromSchema(schema, _context) {
   };
 }
 function tsFloatFromSchema(schema, _context) {
-  const typeName = schema.nullable ? "number | null" : "number";
-  const defaultValue = schema.nullable ? "null" : "0";
+  const typeName = schema.isNullable ? "number | null" : "number";
+  const defaultValue = schema.isNullable ? "null" : "0";
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(typeof ${input} === 'number' || ${input} === null)`;
       }
       return `typeof ${input} === 'number'`;
@@ -670,8 +670,8 @@ function tsFloatFromSchema(schema, _context) {
   };
 }
 function tsIntFromSchema(schema, intType, _context) {
-  const typeName = schema.nullable ? "number | null" : "number";
-  const defaultValue = schema.nullable ? "null" : "0";
+  const typeName = schema.isNullable ? "number | null" : "number";
+  const defaultValue = schema.isNullable ? "null" : "0";
   let min;
   let max;
   switch (intType) {
@@ -705,7 +705,7 @@ function tsIntFromSchema(schema, intType, _context) {
     defaultValue,
     validationTemplate(input) {
       const mainPart = `typeof ${input} === 'number' && Number.isInteger(${input}) && ${input} >= ${min} && ${input} <= ${max}`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `((${mainPart}) || ${input} === null)`;
       }
       return mainPart;
@@ -732,14 +732,14 @@ function tsIntFromSchema(schema, intType, _context) {
   };
 }
 function tsBigIntFromSchema(schema, isUnsigned, _context) {
-  const typeName = schema.nullable ? `bigint | null` : `bigint`;
-  const defaultValue = schema.nullable ? `null` : "BigInt(0)";
+  const typeName = schema.isNullable ? `bigint | null` : `bigint`;
+  const defaultValue = schema.isNullable ? `null` : "BigInt(0)";
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
       const mainPart = isUnsigned ? `typeof ${input} === 'bigint' && ${input} >= BigInt(0) && ${input} <= UINT64_MAX` : `typeof ${input} === 'bigint' && ${input} >= INT64_MIN && ${input} <= INT64_MAX`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `((${mainPart}) || ${input} === null)`;
       }
       return mainPart;
@@ -763,7 +763,7 @@ function tsBigIntFromSchema(schema, isUnsigned, _context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (typeof ${input} === 'bigint') {
                     ${target} += \`"\${${input}}"\`
                 } else {
@@ -794,15 +794,15 @@ function tsRecordFromSchema(schema, context) {
     rpcGenerators: context.rpcGenerators
   });
   const typeName = `Record<string, ${innerType.typeName}>`;
-  const defaultValue = schema.nullable ? "null" : "{}";
+  const defaultValue = schema.isNullable ? "null" : "{}";
   return {
-    typeName: schema.nullable ? `${typeName} | null` : typeName,
+    typeName: schema.isNullable ? `${typeName} | null` : typeName,
     defaultValue,
     validationTemplate(input) {
       const mainPart = `isObject(${input}) && Object.values(${input}).every(
                 (_value) => ${innerType.validationTemplate("_value")},
             )`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `((${mainPart}) || ${input} === null)`;
       }
       return mainPart;
@@ -821,7 +821,7 @@ function tsRecordFromSchema(schema, context) {
     },
     toJsonTemplate(input, target, key) {
       const countVal = `_${validVarName(key)}PropertyCount`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} !== null) {
                     ${target} += '{';
                     let ${countVal} = 0;
@@ -861,12 +861,12 @@ function tsRecordFromSchema(schema, context) {
 function tsRefFromSchema(schema, context) {
   const typeName = codegenUtils.pascalCase(validVarName(schema.ref), { normalize: true });
   const prefixedTypeName = `${context.typePrefix}${typeName}`;
-  const defaultValue = schema.nullable ? "null" : `${prefixedTypeName}.new()`;
+  const defaultValue = schema.isNullable ? "null" : `${prefixedTypeName}.new()`;
   return {
-    typeName: schema.nullable ? `${prefixedTypeName} | null` : prefixedTypeName,
+    typeName: schema.isNullable ? `${prefixedTypeName} | null` : prefixedTypeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `($$${prefixedTypeName}.validate(${input}) || ${input} === null)`;
       }
       return `$$${prefixedTypeName}.validate(${input})`;
@@ -879,7 +879,7 @@ function tsRefFromSchema(schema, context) {
                 }`;
     },
     toJsonTemplate(input, target, _key) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} !== null) {
                     ${target} += $$${prefixedTypeName}.toJsonString(${input});
                 } else {
@@ -944,7 +944,7 @@ function httpRpcFromDefinition(def, context) {
   return `${getJsDocComment({
     description: def.description,
     isDeprecated: def.isDeprecated
-  })}    async ${key}(${params ? `params: ${params}` : ""}): Promise<${response ?? "undefined"}> {
+  })}    async ${key}(${params ? `params: ${params}, ` : ""}options?: ArriRequestOptions): Promise<${response ?? "undefined"}> {
         return arriRequest<${response ?? "undefined"}, ${params ?? "undefined"}>({
             url: \`\${this._baseUrl}${def.path}\`,
             method: "${def.method.toLowerCase()}",
@@ -956,6 +956,7 @@ function httpRpcFromDefinition(def, context) {
             responseFromString: ${response ? `$$${response}.fromJsonString` : "() => {}"},
             serializer: ${params ? `$$${params}.${serializerMethod}` : "() => {}"},
             clientVersion: "${context.versionNumber}",
+            options: options ?? this._options,
         });
     }`;
 }
@@ -1048,23 +1049,26 @@ function tsServiceFromDefinition(def, context) {
     private readonly _baseUrl: string;
     private readonly _fetch?: $Fetch;
     private readonly _headers: HeaderMap | (() => HeaderMap | Promise<HeaderMap>);
-    private readonly _onError?: (err: unknown) => void; 
+    private readonly _onError?: (err: unknown) => void;
+    private readonly _options?: ArriRequestOptions;
 ${subServices.map((service) => `    ${service.key}: ${service.name};`).join("\n")}
     constructor(
-        options: {
+        config: {
             baseUrl?: string;
             fetch?: Fetch;
             headers?: HeaderMap | (() => HeaderMap | Promise<HeaderMap>);
             onError?: (err: unknown) => void;
+            options?: ArriRequestOptions;
         } = {},
     ) {
-        this._baseUrl = options.baseUrl ?? "";
-        if (options.fetch) {
-            this._fetch = createFetch({ fetch: options.fetch });
+        this._baseUrl = config.baseUrl ?? "";
+        if (config.fetch) {
+            this._fetch = createFetch({ fetch: config.fetch });
         }
-        this._headers = options.headers ?? {};
-        this._onError = options.onError;
-${subServices.map((service) => `        this.${service.key} = new ${service.name}(options);`).join("\n")}
+        this._headers = config.headers ?? {};
+        this._onError = config.onError;
+        this._options = config.options;
+${subServices.map((service) => `        this.${service.key} = new ${service.name}(config);`).join("\n")}
     }
 ${rpcParts.map((rpc) => `    ${rpc}`).join("\n")}
 }
@@ -1153,6 +1157,7 @@ async function createTypescriptClient(def, options) {
 import {
     ArriEnumValidator,
     ArriModelValidator,
+    type ArriRequestOptions,
     arriRequest,
     ${context.usedFeatures.sse ? "arriSseRequest," : ""}
     ${context.usedFeatures.ws ? "arriWsRequest," : ""}

package/dist/index.mjs

@@ -4,7 +4,7 @@ import prettier from 'prettier';
 
 function tsAnyFromSchema(schema, context) {
   const typeName = "any";
-  const defaultValue = schema.nullable ? "null" : "undefined";
+  const defaultValue = schema.isNullable ? "null" : "undefined";
   return {
     typeName,
     defaultValue,
@@ -86,16 +86,16 @@ function tsArrayFromSchema(schema, context) {
     rpcGenerators: context.rpcGenerators
   });
   const typeName = `(${innerType.typeName})[]`;
-  const defaultValue = schema.nullable ? "null" : "[]";
+  const defaultValue = schema.isNullable ? "null" : "[]";
   return {
-    typeName: schema.nullable ? `${typeName} | null` : typeName,
+    typeName: schema.isNullable ? `${typeName} | null` : typeName,
     defaultValue,
     validationTemplate(input) {
       const mainPart = `Array.isArray(${input}) 
                 && ${input}.every(
                     (_element) => ${innerType.validationTemplate("_element")}
             )`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `((${mainPart}) || 
                 ${input} === null)`;
       }
@@ -116,7 +116,7 @@ function tsArrayFromSchema(schema, context) {
     toJsonTemplate(input, target) {
       const elVar = `_${camelCase(validVarName(input.split(".").join("_")), { normalize: true })}El`;
       const elKeyVar = `${elVar}Key`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} !== null) {
                     ${target} += '[';
                     for (let i = 0; i < ${input}.length; i++) {
@@ -147,12 +147,12 @@ function tsArrayFromSchema(schema, context) {
 function tsObjectFromSchema(schema, context) {
   const typeName = getTsTypeName(schema, context);
   const prefixedTypeName = `${context.typePrefix}${typeName}`;
-  const defaultValue = schema.nullable ? "null" : `$$${prefixedTypeName}.new()`;
+  const defaultValue = schema.isNullable ? "null" : `$$${prefixedTypeName}.new()`;
   const result = {
-    typeName: schema.nullable ? `${prefixedTypeName} | null` : prefixedTypeName,
+    typeName: schema.isNullable ? `${prefixedTypeName} | null` : prefixedTypeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `($$${prefixedTypeName}.validate(${input}) || ${input} === null)`;
       }
       return `$$${prefixedTypeName}.validate(${input})`;
@@ -165,7 +165,7 @@ function tsObjectFromSchema(schema, context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} !== null) {
                     ${target} += $$${prefixedTypeName}.toJsonString(${input}); 
                 } else {
@@ -342,13 +342,13 @@ ${subContentParts.join("\n")}`;
 function tsTaggedUnionFromSchema(schema, context) {
   const typeName = getTsTypeName(schema, context);
   const prefixedTypeName = `${context.typePrefix}${typeName}`;
-  const defaultValue = schema.nullable ? "null" : `$$${prefixedTypeName}.new()`;
+  const defaultValue = schema.isNullable ? "null" : `$$${prefixedTypeName}.new()`;
   const result = {
-    typeName: schema.nullable ? `${prefixedTypeName} | null` : prefixedTypeName,
+    typeName: schema.isNullable ? `${prefixedTypeName} | null` : prefixedTypeName,
     defaultValue,
     validationTemplate(input) {
       const mainPart = `$$${prefixedTypeName}.validate(${input})`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(${mainPart} || ${input} === null)`;
       }
       return mainPart;
@@ -361,7 +361,7 @@ function tsTaggedUnionFromSchema(schema, context) {
             }`;
     },
     toJsonTemplate(input, target, _key) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} != null) {
                     ${target} += $$${prefixedTypeName}.toJsonString(${input});
                 } else {
@@ -463,13 +463,13 @@ function tsEnumFromSchema(schema, context) {
     );
   const enumName = getTsTypeName(schema, context);
   const prefixedEnumName = `${context.typePrefix}${enumName}`;
-  const typeName = schema.nullable ? `${prefixedEnumName} | null` : prefixedEnumName;
-  const defaultValue = schema.nullable ? "null" : `$$${prefixedEnumName}.new()`;
+  const typeName = schema.isNullable ? `${prefixedEnumName} | null` : prefixedEnumName;
+  const defaultValue = schema.isNullable ? "null" : `$$${prefixedEnumName}.new()`;
   const result = {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `($$${prefixedEnumName}.validate(${input}) || ${input} === null)`;
       }
       return `$$${prefixedEnumName}.validate(${input})`;
@@ -482,7 +482,7 @@ function tsEnumFromSchema(schema, context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (typeof ${input} === 'string') {
                     ${target} += \`"\${${input}}"\`;
                 } else {
@@ -533,13 +533,13 @@ export const $$${name}: ArriEnumValidator<${name}> = {
 }
 
 function tsStringFromSchema(schema, _context) {
-  const typeName = schema.nullable ? "string | null" : "string";
-  const defaultValue = schema.nullable ? "null" : '""';
+  const typeName = schema.isNullable ? "string | null" : "string";
+  const defaultValue = schema.isNullable ? "null" : '""';
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(typeof ${input} === 'string' || ${input} === null)`;
       }
       return `typeof ${input} === 'string'`;
@@ -552,7 +552,7 @@ function tsStringFromSchema(schema, _context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (typeof ${input} === 'string') {
                     ${target} += serializeString(${input});
                 } else {
@@ -568,13 +568,13 @@ function tsStringFromSchema(schema, _context) {
   };
 }
 function tsBooleanFromSchema(schema, _context) {
-  const typeName = schema.nullable ? `boolean | null` : "boolean";
-  const defaultValue = schema.nullable ? `null` : "false";
+  const typeName = schema.isNullable ? `boolean | null` : "boolean";
+  const defaultValue = schema.isNullable ? `null` : "false";
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(typeof ${input} === 'boolean' || ${input} === null)`;
       }
       return `typeof ${input} === 'boolean'`;
@@ -596,13 +596,13 @@ function tsBooleanFromSchema(schema, _context) {
   };
 }
 function tsDateFromSchema(schema, _context) {
-  const typeName = schema.nullable ? `Date | null` : "Date";
-  const defaultValue = schema.nullable ? `null` : "new Date()";
+  const typeName = schema.isNullable ? `Date | null` : "Date";
+  const defaultValue = schema.isNullable ? `null` : "new Date()";
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(${input} instanceof Date || ${input} === null)`;
       }
       return `${input} instanceof Date`;
@@ -617,7 +617,7 @@ function tsDateFromSchema(schema, _context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} instanceof Date) {
                     ${target} += \`"\${${input}.toISOString()}"\`
                 } else {
@@ -627,7 +627,7 @@ function tsDateFromSchema(schema, _context) {
       return `${target} += \`"\${${input}.toISOString()}"\``;
     },
     toQueryStringTemplate(input, target, key) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `${target}.push(\`${key}=\${${input}?.toISOString()}\`)`;
       }
       return `${target}.push(\`${key}=\${${input}.toISOString()}\`)`;
@@ -636,13 +636,13 @@ function tsDateFromSchema(schema, _context) {
   };
 }
 function tsFloatFromSchema(schema, _context) {
-  const typeName = schema.nullable ? "number | null" : "number";
-  const defaultValue = schema.nullable ? "null" : "0";
+  const typeName = schema.isNullable ? "number | null" : "number";
+  const defaultValue = schema.isNullable ? "null" : "0";
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `(typeof ${input} === 'number' || ${input} === null)`;
       }
       return `typeof ${input} === 'number'`;
@@ -664,8 +664,8 @@ function tsFloatFromSchema(schema, _context) {
   };
 }
 function tsIntFromSchema(schema, intType, _context) {
-  const typeName = schema.nullable ? "number | null" : "number";
-  const defaultValue = schema.nullable ? "null" : "0";
+  const typeName = schema.isNullable ? "number | null" : "number";
+  const defaultValue = schema.isNullable ? "null" : "0";
   let min;
   let max;
   switch (intType) {
@@ -699,7 +699,7 @@ function tsIntFromSchema(schema, intType, _context) {
     defaultValue,
     validationTemplate(input) {
       const mainPart = `typeof ${input} === 'number' && Number.isInteger(${input}) && ${input} >= ${min} && ${input} <= ${max}`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `((${mainPart}) || ${input} === null)`;
       }
       return mainPart;
@@ -726,14 +726,14 @@ function tsIntFromSchema(schema, intType, _context) {
   };
 }
 function tsBigIntFromSchema(schema, isUnsigned, _context) {
-  const typeName = schema.nullable ? `bigint | null` : `bigint`;
-  const defaultValue = schema.nullable ? `null` : "BigInt(0)";
+  const typeName = schema.isNullable ? `bigint | null` : `bigint`;
+  const defaultValue = schema.isNullable ? `null` : "BigInt(0)";
   return {
     typeName,
     defaultValue,
     validationTemplate(input) {
       const mainPart = isUnsigned ? `typeof ${input} === 'bigint' && ${input} >= BigInt(0) && ${input} <= UINT64_MAX` : `typeof ${input} === 'bigint' && ${input} >= INT64_MIN && ${input} <= INT64_MAX`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `((${mainPart}) || ${input} === null)`;
       }
       return mainPart;
@@ -757,7 +757,7 @@ function tsBigIntFromSchema(schema, isUnsigned, _context) {
             }`;
     },
     toJsonTemplate(input, target) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (typeof ${input} === 'bigint') {
                     ${target} += \`"\${${input}}"\`
                 } else {
@@ -788,15 +788,15 @@ function tsRecordFromSchema(schema, context) {
     rpcGenerators: context.rpcGenerators
   });
   const typeName = `Record<string, ${innerType.typeName}>`;
-  const defaultValue = schema.nullable ? "null" : "{}";
+  const defaultValue = schema.isNullable ? "null" : "{}";
   return {
-    typeName: schema.nullable ? `${typeName} | null` : typeName,
+    typeName: schema.isNullable ? `${typeName} | null` : typeName,
     defaultValue,
     validationTemplate(input) {
       const mainPart = `isObject(${input}) && Object.values(${input}).every(
                 (_value) => ${innerType.validationTemplate("_value")},
             )`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `((${mainPart}) || ${input} === null)`;
       }
       return mainPart;
@@ -815,7 +815,7 @@ function tsRecordFromSchema(schema, context) {
     },
     toJsonTemplate(input, target, key) {
       const countVal = `_${validVarName(key)}PropertyCount`;
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} !== null) {
                     ${target} += '{';
                     let ${countVal} = 0;
@@ -855,12 +855,12 @@ function tsRecordFromSchema(schema, context) {
 function tsRefFromSchema(schema, context) {
   const typeName = pascalCase(validVarName(schema.ref), { normalize: true });
   const prefixedTypeName = `${context.typePrefix}${typeName}`;
-  const defaultValue = schema.nullable ? "null" : `${prefixedTypeName}.new()`;
+  const defaultValue = schema.isNullable ? "null" : `${prefixedTypeName}.new()`;
   return {
-    typeName: schema.nullable ? `${prefixedTypeName} | null` : prefixedTypeName,
+    typeName: schema.isNullable ? `${prefixedTypeName} | null` : prefixedTypeName,
     defaultValue,
     validationTemplate(input) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `($$${prefixedTypeName}.validate(${input}) || ${input} === null)`;
       }
       return `$$${prefixedTypeName}.validate(${input})`;
@@ -873,7 +873,7 @@ function tsRefFromSchema(schema, context) {
                 }`;
     },
     toJsonTemplate(input, target, _key) {
-      if (schema.nullable) {
+      if (schema.isNullable) {
         return `if (${input} !== null) {
                     ${target} += $$${prefixedTypeName}.toJsonString(${input});
                 } else {
@@ -938,7 +938,7 @@ function httpRpcFromDefinition(def, context) {
   return `${getJsDocComment({
     description: def.description,
     isDeprecated: def.isDeprecated
-  })}    async ${key}(${params ? `params: ${params}` : ""}): Promise<${response ?? "undefined"}> {
+  })}    async ${key}(${params ? `params: ${params}, ` : ""}options?: ArriRequestOptions): Promise<${response ?? "undefined"}> {
         return arriRequest<${response ?? "undefined"}, ${params ?? "undefined"}>({
             url: \`\${this._baseUrl}${def.path}\`,
             method: "${def.method.toLowerCase()}",
@@ -950,6 +950,7 @@ function httpRpcFromDefinition(def, context) {
             responseFromString: ${response ? `$$${response}.fromJsonString` : "() => {}"},
             serializer: ${params ? `$$${params}.${serializerMethod}` : "() => {}"},
             clientVersion: "${context.versionNumber}",
+            options: options ?? this._options,
         });
     }`;
 }
@@ -1042,23 +1043,26 @@ function tsServiceFromDefinition(def, context) {
     private readonly _baseUrl: string;
     private readonly _fetch?: $Fetch;
     private readonly _headers: HeaderMap | (() => HeaderMap | Promise<HeaderMap>);
-    private readonly _onError?: (err: unknown) => void; 
+    private readonly _onError?: (err: unknown) => void;
+    private readonly _options?: ArriRequestOptions;
 ${subServices.map((service) => `    ${service.key}: ${service.name};`).join("\n")}
     constructor(
-        options: {
+        config: {
             baseUrl?: string;
             fetch?: Fetch;
             headers?: HeaderMap | (() => HeaderMap | Promise<HeaderMap>);
             onError?: (err: unknown) => void;
+            options?: ArriRequestOptions;
         } = {},
     ) {
-        this._baseUrl = options.baseUrl ?? "";
-        if (options.fetch) {
-            this._fetch = createFetch({ fetch: options.fetch });
+        this._baseUrl = config.baseUrl ?? "";
+        if (config.fetch) {
+            this._fetch = createFetch({ fetch: config.fetch });
         }
-        this._headers = options.headers ?? {};
-        this._onError = options.onError;
-${subServices.map((service) => `        this.${service.key} = new ${service.name}(options);`).join("\n")}
+        this._headers = config.headers ?? {};
+        this._onError = config.onError;
+        this._options = config.options;
+${subServices.map((service) => `        this.${service.key} = new ${service.name}(config);`).join("\n")}
     }
 ${rpcParts.map((rpc) => `    ${rpc}`).join("\n")}
 }
@@ -1147,6 +1151,7 @@ async function createTypescriptClient(def, options) {
 import {
     ArriEnumValidator,
     ArriModelValidator,
+    type ArriRequestOptions,
     arriRequest,
     ${context.usedFeatures.sse ? "arriSseRequest," : ""}
     ${context.usedFeatures.ws ? "arriWsRequest," : ""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/codegen-ts",
-  "version": "0.77.1",
+  "version": "0.79.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -23,6 +23,6 @@
   ],
   "dependencies": {
     "prettier": "^3.5.3",
-    "@arrirpc/codegen-utils": "0.77.1"
+    "@arrirpc/codegen-utils": "0.79.0"
   }
 }