@arrirpc/codegen-ts 0.66.0 → 0.68.0

package/README.md

@@ -53,6 +53,10 @@ const client = new MyClient({
             Authorization: "<some-token>",
         };
     },
+    // optional
+    onError: (err) => {
+        // do something
+    },
 });
 
 await client.myProcedure();

package/dist/index.cjs

@@ -231,7 +231,7 @@ function tsObjectFromSchema(schema, context) {
     });
     if (prop.content)
       subContentParts.push(prop.content);
-    const fieldName = validVarName(codegenUtils.camelCase(key));
+    const fieldName = validVarName(codegenUtils.camelCase(key, { normalize: true }));
     fieldParts.push(
       `${getJsDocComment(subSchema.metadata)}${fieldName}: ${prop.typeName},`
     );
@@ -275,7 +275,7 @@ function tsObjectFromSchema(schema, context) {
     });
     if (prop.content)
       subContentParts.push(prop.content);
-    const fieldName = validVarName(codegenUtils.camelCase(key));
+    const fieldName = validVarName(codegenUtils.camelCase(key, { normalize: true }));
     fieldParts.push(
       `${getJsDocComment(subSchema.metadata)}${fieldName}?: ${prop.typeName},`
     );
@@ -285,15 +285,15 @@ function tsObjectFromSchema(schema, context) {
             ${prop.fromJsonTemplate(`input.${key}`, tempKey)}
         }`);
     if (hasKey) {
-      toJsonParts.push(`if (typeof input.${key} !== 'undefined') {
+      toJsonParts.push(`if (typeof input.${fieldName} !== 'undefined') {
                 json += \`,"${key}":\`;
-                ${prop.toJsonTemplate(`input.${key}`, "json", key)}
+                ${prop.toJsonTemplate(`input.${fieldName}`, "json", key)}
             }`);
     } else {
-      toJsonParts.push(`if (typeof input.${key} !== 'undefined') {
+      toJsonParts.push(`if (typeof input.${fieldName} !== 'undefined') {
             if (_hasKey) json += ',';
             json += '"${key}":';
-            ${prop.toJsonTemplate(`input.${key}`, "json", key)}
+            ${prop.toJsonTemplate(`input.${fieldName}`, "json", key)}
             _hasKey = true;
         }`);
     }
@@ -933,6 +933,7 @@ function httpRpcFromDefinition(def, context) {
                 url: \`\${this._baseUrl}${def.path}\`,
                 method: "${def.method.toLowerCase()}",
                 headers: this._headers,
+                onError: this._onError,
                 ${params ? "params: params," : ""}
                 responseFromJson: ${response ? `$$${response}.fromJson` : "() => {}"},
                 responseFromString: ${response ? `$$${response}.fromJsonString` : "() => {}"},
@@ -940,7 +941,7 @@ function httpRpcFromDefinition(def, context) {
                 clientVersion: "${context.versionNumber}",
             },
             options,
-        )
+        );
     }`;
   }
   return `${getJsDocComment({
@@ -951,6 +952,7 @@ function httpRpcFromDefinition(def, context) {
             url: \`\${this._baseUrl}${def.path}\`,
             method: "${def.method.toLowerCase()}",
             headers: this._headers,
+            onError: this._onError,
             ${params ? "params: params," : ""}
             responseFromJson: ${response ? `$$${response}.fromJson` : "() => {}"},
             responseFromString: ${response ? `$$${response}.fromJsonString` : "() => {}"},
@@ -1050,15 +1052,18 @@ function tsServiceFromDefinition(def, context) {
     content: `export class ${serviceName} {
     private readonly _baseUrl: string;
     private readonly _headers: HeaderMap | (() => HeaderMap | Promise<HeaderMap>);
+    private readonly _onError?: (err: unknown) => void; 
 ${subServices.map((service) => `    ${service.key}: ${service.name};`).join("\n")}
     constructor(
         options: {
             baseUrl?: string;
             headers?: HeaderMap | (() => HeaderMap | Promise<HeaderMap>);
+            onError?: (err: unknown) => void;
         } = {},
     ) {
         this._baseUrl = options.baseUrl ?? "";
         this._headers = options.headers ?? {};
+        this._onError = options.onError;
 ${subServices.map((service) => `        this.${service.key} = new ${service.name}(options);`).join("\n")}
     }
 ${rpcParts.map((rpc) => `    ${rpc}`).join("\n")}

package/dist/index.mjs

@@ -225,7 +225,7 @@ function tsObjectFromSchema(schema, context) {
     });
     if (prop.content)
       subContentParts.push(prop.content);
-    const fieldName = validVarName(camelCase(key));
+    const fieldName = validVarName(camelCase(key, { normalize: true }));
     fieldParts.push(
       `${getJsDocComment(subSchema.metadata)}${fieldName}: ${prop.typeName},`
     );
@@ -269,7 +269,7 @@ function tsObjectFromSchema(schema, context) {
     });
     if (prop.content)
       subContentParts.push(prop.content);
-    const fieldName = validVarName(camelCase(key));
+    const fieldName = validVarName(camelCase(key, { normalize: true }));
     fieldParts.push(
       `${getJsDocComment(subSchema.metadata)}${fieldName}?: ${prop.typeName},`
     );
@@ -279,15 +279,15 @@ function tsObjectFromSchema(schema, context) {
             ${prop.fromJsonTemplate(`input.${key}`, tempKey)}
         }`);
     if (hasKey) {
-      toJsonParts.push(`if (typeof input.${key} !== 'undefined') {
+      toJsonParts.push(`if (typeof input.${fieldName} !== 'undefined') {
                 json += \`,"${key}":\`;
-                ${prop.toJsonTemplate(`input.${key}`, "json", key)}
+                ${prop.toJsonTemplate(`input.${fieldName}`, "json", key)}
             }`);
     } else {
-      toJsonParts.push(`if (typeof input.${key} !== 'undefined') {
+      toJsonParts.push(`if (typeof input.${fieldName} !== 'undefined') {
             if (_hasKey) json += ',';
             json += '"${key}":';
-            ${prop.toJsonTemplate(`input.${key}`, "json", key)}
+            ${prop.toJsonTemplate(`input.${fieldName}`, "json", key)}
             _hasKey = true;
         }`);
     }
@@ -927,6 +927,7 @@ function httpRpcFromDefinition(def, context) {
                 url: \`\${this._baseUrl}${def.path}\`,
                 method: "${def.method.toLowerCase()}",
                 headers: this._headers,
+                onError: this._onError,
                 ${params ? "params: params," : ""}
                 responseFromJson: ${response ? `$$${response}.fromJson` : "() => {}"},
                 responseFromString: ${response ? `$$${response}.fromJsonString` : "() => {}"},
@@ -934,7 +935,7 @@ function httpRpcFromDefinition(def, context) {
                 clientVersion: "${context.versionNumber}",
             },
             options,
-        )
+        );
     }`;
   }
   return `${getJsDocComment({
@@ -945,6 +946,7 @@ function httpRpcFromDefinition(def, context) {
             url: \`\${this._baseUrl}${def.path}\`,
             method: "${def.method.toLowerCase()}",
             headers: this._headers,
+            onError: this._onError,
             ${params ? "params: params," : ""}
             responseFromJson: ${response ? `$$${response}.fromJson` : "() => {}"},
             responseFromString: ${response ? `$$${response}.fromJsonString` : "() => {}"},
@@ -1044,15 +1046,18 @@ function tsServiceFromDefinition(def, context) {
     content: `export class ${serviceName} {
     private readonly _baseUrl: string;
     private readonly _headers: HeaderMap | (() => HeaderMap | Promise<HeaderMap>);
+    private readonly _onError?: (err: unknown) => void; 
 ${subServices.map((service) => `    ${service.key}: ${service.name};`).join("\n")}
     constructor(
         options: {
             baseUrl?: string;
             headers?: HeaderMap | (() => HeaderMap | Promise<HeaderMap>);
+            onError?: (err: unknown) => void;
         } = {},
     ) {
         this._baseUrl = options.baseUrl ?? "";
         this._headers = options.headers ?? {};
+        this._onError = options.onError;
 ${subServices.map((service) => `        this.${service.key} = new ${service.name}(options);`).join("\n")}
     }
 ${rpcParts.map((rpc) => `    ${rpc}`).join("\n")}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/codegen-ts",
-  "version": "0.66.0",
+  "version": "0.68.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -22,8 +22,7 @@
     "dist"
   ],
   "dependencies": {
-    "prettier": "^3.3.3",
-    "@arrirpc/codegen-utils": "0.66.0"
-  },
-  "devDependencies": {}
+    "prettier": "^3.4.1",
+    "@arrirpc/codegen-utils": "0.68.0"
+  }
 }