arri 0.0.9 → 0.0.10

package/dist/chunks/index.cjs

@@ -29,7 +29,7 @@ require('node:module');
 require('node:assert');
 require('node:v8');
 require('node:util');
-require('../shared/arri.835c5c3c.cjs');
+require('../shared/arri.24f662c0.cjs');
 require('fs/promises');
 require('child_process');
 require('node:http');

package/dist/chunks/index.mjs

@@ -27,7 +27,7 @@ import 'node:module';
 import 'node:assert';
 import 'node:v8';
 import 'node:util';
-import '../shared/arri.0e69fc28.mjs';
+import '../shared/arri.5b1d01a1.mjs';
 import 'fs/promises';
 import 'child_process';
 import 'node:http';

package/dist/chunks/index2.cjs

@@ -31,7 +31,7 @@ require('node:module');
 require('node:assert');
 require('node:v8');
 require('node:util');
-require('../shared/arri.835c5c3c.cjs');
+require('../shared/arri.24f662c0.cjs');
 require('fs/promises');
 require('child_process');
 require('node:http');

package/dist/chunks/index2.mjs

@@ -29,7 +29,7 @@ import 'node:module';
 import 'node:assert';
 import 'node:v8';
 import 'node:util';
-import '../shared/arri.0e69fc28.mjs';
+import '../shared/arri.5b1d01a1.mjs';
 import 'fs/promises';
 import 'child_process';
 import 'node:http';

package/dist/chunks/index3.cjs

@@ -35,7 +35,7 @@ require('v8');
 require('node:module');
 require('node:assert');
 require('node:v8');
-require('../shared/arri.835c5c3c.cjs');
+require('../shared/arri.24f662c0.cjs');
 require('fs/promises');
 require('child_process');
 require('node:http');

package/dist/chunks/index3.mjs

@@ -33,7 +33,7 @@ import 'v8';
 import 'node:module';
 import 'node:assert';
 import 'node:v8';
-import '../shared/arri.0e69fc28.mjs';
+import '../shared/arri.5b1d01a1.mjs';
 import 'fs/promises';
 import 'child_process';
 import 'node:http';

package/dist/cli.cjs

@@ -29,7 +29,7 @@ const node_module = require('node:module');
 const assert = require('node:assert');
 const v8$1 = require('node:v8');
 const node_util = require('node:util');
-const dart = require('./shared/arri.835c5c3c.cjs');
+const dart = require('./shared/arri.24f662c0.cjs');
 const node_http = require('node:http');
 const https = require('node:https');
 const node_net = require('node:net');

package/dist/cli.mjs

@@ -27,7 +27,7 @@ import { builtinModules } from 'node:module';
 import assert from 'node:assert';
 import v8$1 from 'node:v8';
 import { format as format$1, inspect, promisify as promisify$5 } from 'node:util';
-import { f as format2, a as dartClientGenerator } from './shared/arri.0e69fc28.mjs';
+import { f as format2, a as dartClientGenerator } from './shared/arri.5b1d01a1.mjs';
 import { createServer as createServer$2 } from 'node:http';
 import { createServer as createServer$1 } from 'node:https';
 import { createServer } from 'node:net';

package/dist/codegen.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const index = require('./shared/arri.8e602d87.cjs');
-const dart = require('./shared/arri.835c5c3c.cjs');
+const dart = require('./shared/arri.24f662c0.cjs');
 const fs = require('fs');
 require('module');
 require('url');

package/dist/codegen.d.cts

@@ -29,7 +29,7 @@ declare function dartServiceFromServiceDefinition(name: string, def: ServiceDefi
 declare function dartProcedureFromServiceDefinition(clientName: string, key: string, def: ProcedureDefinition): string;
 declare function dartModelFromJsonSchema(name: string, schema: JsonSchemaObject): string;
 declare function dartPropertyTypeFromSchema(objectName: string, propertyName: string, schema: JsonSchemaObject): [DartType | string, string[] | undefined];
-declare function dartParsedJsonField(fieldName: string, dartType: string): string;
+declare function dartParsedJsonField(fieldName: string, jsonKey: string, dartType: string): string;
 declare const dartTypeMap: {
     readonly integer: "int";
     readonly bigint: "int";
@@ -46,8 +46,8 @@ declare const dartTypeMap: {
 };
 interface DartMappedType {
     classBody?: string;
-    fromJsonBody: (jsonKey: string, fallback: string) => string;
-    toJsonBody: (key: string, isNullable?: boolean) => string;
+    fromJsonBody: (key: string, jsonKey: string, fallback: string) => string;
+    toJsonBody: (key: string, jsonKey: string, isNullable?: boolean) => string;
 }
 declare const transformers: Record<DartType, DartMappedType>;
 declare const classTransformer: (typename: string, nullable: boolean) => DartMappedType;

package/dist/codegen.d.mts

@@ -29,7 +29,7 @@ declare function dartServiceFromServiceDefinition(name: string, def: ServiceDefi
 declare function dartProcedureFromServiceDefinition(clientName: string, key: string, def: ProcedureDefinition): string;
 declare function dartModelFromJsonSchema(name: string, schema: JsonSchemaObject): string;
 declare function dartPropertyTypeFromSchema(objectName: string, propertyName: string, schema: JsonSchemaObject): [DartType | string, string[] | undefined];
-declare function dartParsedJsonField(fieldName: string, dartType: string): string;
+declare function dartParsedJsonField(fieldName: string, jsonKey: string, dartType: string): string;
 declare const dartTypeMap: {
     readonly integer: "int";
     readonly bigint: "int";
@@ -46,8 +46,8 @@ declare const dartTypeMap: {
 };
 interface DartMappedType {
     classBody?: string;
-    fromJsonBody: (jsonKey: string, fallback: string) => string;
-    toJsonBody: (key: string, isNullable?: boolean) => string;
+    fromJsonBody: (key: string, jsonKey: string, fallback: string) => string;
+    toJsonBody: (key: string, jsonKey: string, isNullable?: boolean) => string;
 }
 declare const transformers: Record<DartType, DartMappedType>;
 declare const classTransformer: (typename: string, nullable: boolean) => DartMappedType;

package/dist/codegen.d.ts

@@ -29,7 +29,7 @@ declare function dartServiceFromServiceDefinition(name: string, def: ServiceDefi
 declare function dartProcedureFromServiceDefinition(clientName: string, key: string, def: ProcedureDefinition): string;
 declare function dartModelFromJsonSchema(name: string, schema: JsonSchemaObject): string;
 declare function dartPropertyTypeFromSchema(objectName: string, propertyName: string, schema: JsonSchemaObject): [DartType | string, string[] | undefined];
-declare function dartParsedJsonField(fieldName: string, dartType: string): string;
+declare function dartParsedJsonField(fieldName: string, jsonKey: string, dartType: string): string;
 declare const dartTypeMap: {
     readonly integer: "int";
     readonly bigint: "int";
@@ -46,8 +46,8 @@ declare const dartTypeMap: {
 };
 interface DartMappedType {
     classBody?: string;
-    fromJsonBody: (jsonKey: string, fallback: string) => string;
-    toJsonBody: (key: string, isNullable?: boolean) => string;
+    fromJsonBody: (key: string, jsonKey: string, fallback: string) => string;
+    toJsonBody: (key: string, jsonKey: string, isNullable?: boolean) => string;
 }
 declare const transformers: Record<DartType, DartMappedType>;
 declare const classTransformer: (typename: string, nullable: boolean) => DartMappedType;

package/dist/codegen.mjs

@@ -1,6 +1,6 @@
 import { u as unflattenObject, i as isServiceDefinition, p as pascalCase, a as isProcedureDefinition, b as isJsonSchemaScalarType, c as isJsonSchemaNullType, d as isJsonSchemaObject, e as isJsonSchemaEnum, f as isJsonSchemaArray } from './shared/arri.1f1b9dfc.mjs';
-import { d as defineClientGeneratorPlugin, f as format2 } from './shared/arri.0e69fc28.mjs';
-export { k as classListTransformer, j as classTransformer, c as createDartClient, a as dartClientGenerator, g as dartModelFromJsonSchema, i as dartParsedJsonField, e as dartProcedureFromServiceDefinition, h as dartPropertyTypeFromSchema, b as dartServiceFromServiceDefinition, l as isDartType, m as isDartTypeWithNullables, t as transformers } from './shared/arri.0e69fc28.mjs';
+import { d as defineClientGeneratorPlugin, f as format2 } from './shared/arri.5b1d01a1.mjs';
+export { k as classListTransformer, j as classTransformer, c as createDartClient, a as dartClientGenerator, g as dartModelFromJsonSchema, i as dartParsedJsonField, e as dartProcedureFromServiceDefinition, h as dartPropertyTypeFromSchema, b as dartServiceFromServiceDefinition, l as isDartType, m as isDartTypeWithNullables, t as transformers } from './shared/arri.5b1d01a1.mjs';
 import { writeFileSync } from 'fs';
 import 'module';
 import 'url';

package/dist/shared/{arri.835c5c3c.cjs → arri.24f662c0.cjs}

@@ -25,8 +25,8 @@ const assert4__default = /*#__PURE__*/_interopDefaultCompat(assert4);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const v8__default = /*#__PURE__*/_interopDefaultCompat(v8);
 
-const require$2 = require$$2.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.835c5c3c.cjs', document.baseURI).href)));
-const __filename$2 = require$$7.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.835c5c3c.cjs', document.baseURI).href)));
+const require$2 = require$$2.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.24f662c0.cjs', document.baseURI).href)));
+const __filename$2 = require$$7.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.24f662c0.cjs', document.baseURI).href)));
 const __dirname$1 = require$$0.dirname(__filename$2);
 
 var __create$1 = Object.create;
@@ -7791,8 +7791,8 @@ const doc = {
   utils: utils
 };
 
-const require$1 = require$$2.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.835c5c3c.cjs', document.baseURI).href)));
-const __filename$1 = require$$7.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.835c5c3c.cjs', document.baseURI).href)));
+const require$1 = require$$2.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.24f662c0.cjs', document.baseURI).href)));
+const __filename$1 = require$$7.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.24f662c0.cjs', document.baseURI).href)));
 require$$0.dirname(__filename$1);
 
 var __create = Object.create;
@@ -29145,7 +29145,7 @@ class ${prefix} {
     return arriRequest(
       "$_baseUrl\${endpoint.path}",
       method: endpoint.method,
-      headers: headers ?? this._headers,
+      headers: headers ?? _headers,
       body: body,
       query: query,
       encoding: encoding,
@@ -29294,7 +29294,7 @@ function dartModelFromJsonSchema(name, schema) {
         subModelParts.push(sub);
       }
     }
-    fields.push({ type: dartType, name: key });
+    fields.push({ type: dartType, name: index.camelCase(key), jsonKey: key });
     if (!isDartType(dartType) && "type" in val && val.type === "object") {
       subModelParts.push(
         dartModelFromJsonSchema(dartType.replace("?", ""), val)
@@ -29310,7 +29310,13 @@ function dartModelFromJsonSchema(name, schema) {
   });
   factory ${name}.fromJson(Map<String, dynamic> json) {
     return ${name}(
-      ${fields.map((field) => `${dartParsedJsonField(field.name, field.type)},`).join("\n      ")}
+      ${fields.map(
+    (field) => `${dartParsedJsonField(
+      field.name,
+      field.jsonKey,
+      field.type
+    )},`
+  ).join("\n      ")}
     );
   }
   Map<String, dynamic> toJson() {
@@ -29320,16 +29326,22 @@ function dartModelFromJsonSchema(name, schema) {
     const typeName = field.type.replace("?", "");
     if (isDartTypeWithNullables(field.type)) {
       const transformer = transformers[typeName];
-      return transformer.toJsonBody(field.name, isNullable);
+      return transformer.toJsonBody(
+        field.name,
+        field.jsonKey,
+        isNullable
+      );
     }
     if (field.type.includes("List<")) {
       return classListTransformer(typeName).toJsonBody(
         field.name,
+        field.jsonKey,
         isNullable
       );
     }
     return classTransformer(typeName, isNullable).toJsonBody(
       field.name,
+      field.jsonKey,
       isNullable
     );
   }).join(",\n      ")},
@@ -29468,28 +29480,49 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema) {
   }
   return [finalType, subTypes.length ? subTypes : void 0];
 }
-function dartParsedJsonField(fieldName, dartType) {
+function dartParsedJsonField(fieldName, jsonKey, dartType) {
   if (isDartTypeWithNullables(dartType)) {
     switch (dartType) {
       case "String":
-        return transformers.String.fromJsonBody(fieldName, '""');
+        return transformers.String.fromJsonBody(
+          fieldName,
+          jsonKey,
+          '""'
+        );
       case "String?":
-        return transformers.String.fromJsonBody(fieldName, "null");
+        return transformers.String.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "bool":
-        return transformers.bool.fromJsonBody(fieldName, "false");
+        return transformers.bool.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "false"
+        );
       case "double":
-        return transformers.double.fromJsonBody(fieldName, "0.0");
+        return transformers.double.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "0.0"
+        );
       case "int":
-        return transformers.int.fromJsonBody(fieldName, "0");
+        return transformers.int.fromJsonBody(fieldName, jsonKey, "0");
       case "null":
-        return transformers.null.fromJsonBody(fieldName, "");
+        return transformers.null.fromJsonBody(fieldName, jsonKey, "");
       case "DateTime":
         return transformers.DateTime.fromJsonBody(
           fieldName,
+          jsonKey,
           "DateTime(0)"
         );
       case "DateTime?":
-        return transformers.DateTime.fromJsonBody(fieldName, "null");
+        return transformers.DateTime.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "List<String>":
       case "List<bool>":
       case "List<double>":
@@ -29497,26 +29530,29 @@ function dartParsedJsonField(fieldName, dartType) {
       case "List<null>":
         return defaultListFromJsonBody(
           fieldName,
+          jsonKey,
           dartType.replace("List<", "").replace(">", ""),
           "[]"
         );
       default:
-        return `${fieldName}: json["${fieldName}"] is ${dartType.replace(
+        return `${fieldName}: json["${jsonKey}"] is ${dartType.replace(
           "?",
           ""
-        )} ? json["${fieldName}"] : null`;
+        )} ? json["${jsonKey}"] : null`;
     }
   }
   if (dartType.includes("List<")) {
     const innerType = dartType.replace("List<", "").replace(">", "").replace("?", "");
     return classListTransformer(innerType).fromJsonBody(
       fieldName,
+      jsonKey,
       dartType.endsWith("?") ? "null" : "[]"
     );
   }
   const classType = dartType.split("?").join("").trim();
   return classTransformer(classType, dartType.endsWith("?")).fromJsonBody(
     fieldName,
+    jsonKey,
     classType
   );
 }
@@ -29541,89 +29577,91 @@ const transformers = {
     toJsonBody: defaultToJsonBody
   },
   int: {
-    fromJsonBody: (key, fallback) => defaultFromJsonBody(key, "int", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "int", fallback),
     toJsonBody: defaultToJsonBody
   },
   double: {
-    fromJsonBody: (key, fallback) => defaultFromJsonBody(key, "double", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "double", fallback),
     toJsonBody: defaultToJsonBody
   },
   String: {
-    fromJsonBody: (key, fallback) => defaultFromJsonBody(key, "String", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "String", fallback),
     toJsonBody: defaultToJsonBody
   },
   bool: {
-    fromJsonBody: (key, fallback) => defaultFromJsonBody(key, "bool", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "bool", fallback),
     toJsonBody: defaultToJsonBody
   },
   DateTime: {
-    fromJsonBody: (key, fallback) => `${key}: json["${key}"] is String ? DateTime.parse(json["${key}"]) : ${fallback}`,
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.toIso8601String()`
+    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is String ? DateTime.parse(json["${jsonKey}"]) : ${fallback}`,
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.toIso8601String()`
   },
   "List<null>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "null", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "null", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<int>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "int", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "int", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<double>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "double", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "double", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<String>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "String", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "String", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<bool>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "bool", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "bool", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<DateTime>": {
-    fromJsonBody: (key, fallback) => `${key}: json["${key}"] is List<String> ?
-            (json["${key}"] as List<String>)
+    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is List<String> ?
+            (json["${jsonKey}"] as List<String>)
                 .map((item) => DateTime.parse(item)).toList() : ${fallback}`,
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.map((val) => val.toIso8601String()).toList()`
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.map((val) => val.toIso8601String()).toList()`
   },
   Uint8List: {
-    fromJsonBody: (key, fallback) => `${key}: json["${key}"] is List ? Uint8List.fromList(json["${key}"]) : ${fallback}`,
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.toList()`
+    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is List ? Uint8List.fromList(json["${jsonKey}"]) : ${fallback}`,
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.toList()`
   },
   "List<Uint8List>": {
-    fromJsonBody: (key, fallback) => `${key}: json["${key}"] is List && (json["${key}"] as List).isNotEmpty && (json["${key}"] as List).first is List ? json["${key}"] : ${fallback}`,
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.map((val) => val.toList()).toList()`
+    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is List && (json["${jsonKey}"] as List).isNotEmpty && (json["${jsonKey}"] as List).first is List ? json["${jsonKey}"] : ${fallback}`,
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.map((val) => val.toList()).toList()`
   }
 };
-function defaultFromJsonBody(key, typename, fallback) {
-  return `${key}: json["${key}"] is ${typename} ? json["${key}"] : ${fallback}`;
+function defaultFromJsonBody(key, jsonKey, typename, fallback) {
+  return `${key}: json["${jsonKey}"] is ${typename} ? json["${jsonKey}"] : ${fallback}`;
 }
-function defaultListFromJsonBody(key, typename, fallback) {
-  return `${key}: json["${key}"] is List<${typename}> ? json["${key}"] : ${fallback}`;
+function defaultListFromJsonBody(key, jsonKey, typename, fallback) {
+  return `${key}: json["${jsonKey}"] is List<${typename}> ? json["${jsonKey}"] : ${fallback}`;
 }
-function defaultToJsonBody(key) {
-  return `"${key}": ${key}`;
+function defaultToJsonBody(key, jsonKey) {
+  return `"${jsonKey}": ${key}`;
 }
 const classTransformer = (typename, nullable) => {
   return {
-    fromJsonBody: (key, fallback) => {
+    fromJsonBody: (key, jsonKey, fallback) => {
       if (nullable) {
-        return `${key}: json["${key}"] is Map<String, dynamic> ? 
-                ${typename}.fromJson(json["${key}"]) : null`;
+        return `${key}: json["${jsonKey}"] is Map<String, dynamic> ? 
+                ${typename}.fromJson(json["${jsonKey}"]) : null`;
       }
-      return `${key}: ${typename}.fromJson(json["${key}"])`;
+      return `${key}: ${typename}.fromJson(json["${jsonKey}"])`;
     },
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.toJson()`
+    toJsonBody: (key, jsonKey, isNullable) => {
+      return `"${jsonKey}": ${key}${isNullable ? "?" : ""}.toJson()`;
+    }
   };
 };
 const classListTransformer = (typename) => {
   return {
-    fromJsonBody: (key, fallback) => {
-      return `${key}: json["${key}"] is List<Map<String, dynamic>> ? 
-                (json["${key}"] as List<Map<String, dynamic>>)
+    fromJsonBody: (key, jsonKey, fallback) => {
+      return `${key}: json["${jsonKey}"] is List<Map<String, dynamic>> ? 
+                (json["${jsonKey}"] as List<Map<String, dynamic>>)
                     .map((val) => ${typename}.fromJson(val)).toList() : ${fallback}`;
     },
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.map((val) => val.toJson()).toList()`
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.map((val) => val.toJson()).toList()`
   };
 };
 function isDartType(input) {

package/dist/shared/{arri.0e69fc28.mjs → arri.5b1d01a1.mjs}

@@ -29132,7 +29132,7 @@ class ${prefix} {
     return arriRequest(
       "$_baseUrl\${endpoint.path}",
       method: endpoint.method,
-      headers: headers ?? this._headers,
+      headers: headers ?? _headers,
       body: body,
       query: query,
       encoding: encoding,
@@ -29281,7 +29281,7 @@ function dartModelFromJsonSchema(name, schema) {
         subModelParts.push(sub);
       }
     }
-    fields.push({ type: dartType, name: key });
+    fields.push({ type: dartType, name: camelCase(key), jsonKey: key });
     if (!isDartType(dartType) && "type" in val && val.type === "object") {
       subModelParts.push(
         dartModelFromJsonSchema(dartType.replace("?", ""), val)
@@ -29297,7 +29297,13 @@ function dartModelFromJsonSchema(name, schema) {
   });
   factory ${name}.fromJson(Map<String, dynamic> json) {
     return ${name}(
-      ${fields.map((field) => `${dartParsedJsonField(field.name, field.type)},`).join("\n      ")}
+      ${fields.map(
+    (field) => `${dartParsedJsonField(
+      field.name,
+      field.jsonKey,
+      field.type
+    )},`
+  ).join("\n      ")}
     );
   }
   Map<String, dynamic> toJson() {
@@ -29307,16 +29313,22 @@ function dartModelFromJsonSchema(name, schema) {
     const typeName = field.type.replace("?", "");
     if (isDartTypeWithNullables(field.type)) {
       const transformer = transformers[typeName];
-      return transformer.toJsonBody(field.name, isNullable);
+      return transformer.toJsonBody(
+        field.name,
+        field.jsonKey,
+        isNullable
+      );
     }
     if (field.type.includes("List<")) {
       return classListTransformer(typeName).toJsonBody(
         field.name,
+        field.jsonKey,
         isNullable
       );
     }
     return classTransformer(typeName, isNullable).toJsonBody(
       field.name,
+      field.jsonKey,
       isNullable
     );
   }).join(",\n      ")},
@@ -29455,28 +29467,49 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema) {
   }
   return [finalType, subTypes.length ? subTypes : void 0];
 }
-function dartParsedJsonField(fieldName, dartType) {
+function dartParsedJsonField(fieldName, jsonKey, dartType) {
   if (isDartTypeWithNullables(dartType)) {
     switch (dartType) {
       case "String":
-        return transformers.String.fromJsonBody(fieldName, '""');
+        return transformers.String.fromJsonBody(
+          fieldName,
+          jsonKey,
+          '""'
+        );
       case "String?":
-        return transformers.String.fromJsonBody(fieldName, "null");
+        return transformers.String.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "bool":
-        return transformers.bool.fromJsonBody(fieldName, "false");
+        return transformers.bool.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "false"
+        );
       case "double":
-        return transformers.double.fromJsonBody(fieldName, "0.0");
+        return transformers.double.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "0.0"
+        );
       case "int":
-        return transformers.int.fromJsonBody(fieldName, "0");
+        return transformers.int.fromJsonBody(fieldName, jsonKey, "0");
       case "null":
-        return transformers.null.fromJsonBody(fieldName, "");
+        return transformers.null.fromJsonBody(fieldName, jsonKey, "");
       case "DateTime":
         return transformers.DateTime.fromJsonBody(
           fieldName,
+          jsonKey,
           "DateTime(0)"
         );
       case "DateTime?":
-        return transformers.DateTime.fromJsonBody(fieldName, "null");
+        return transformers.DateTime.fromJsonBody(
+          fieldName,
+          jsonKey,
+          "null"
+        );
       case "List<String>":
       case "List<bool>":
       case "List<double>":
@@ -29484,26 +29517,29 @@ function dartParsedJsonField(fieldName, dartType) {
       case "List<null>":
         return defaultListFromJsonBody(
           fieldName,
+          jsonKey,
           dartType.replace("List<", "").replace(">", ""),
           "[]"
         );
       default:
-        return `${fieldName}: json["${fieldName}"] is ${dartType.replace(
+        return `${fieldName}: json["${jsonKey}"] is ${dartType.replace(
           "?",
           ""
-        )} ? json["${fieldName}"] : null`;
+        )} ? json["${jsonKey}"] : null`;
     }
   }
   if (dartType.includes("List<")) {
     const innerType = dartType.replace("List<", "").replace(">", "").replace("?", "");
     return classListTransformer(innerType).fromJsonBody(
       fieldName,
+      jsonKey,
       dartType.endsWith("?") ? "null" : "[]"
     );
   }
   const classType = dartType.split("?").join("").trim();
   return classTransformer(classType, dartType.endsWith("?")).fromJsonBody(
     fieldName,
+    jsonKey,
     classType
   );
 }
@@ -29528,89 +29564,91 @@ const transformers = {
     toJsonBody: defaultToJsonBody
   },
   int: {
-    fromJsonBody: (key, fallback) => defaultFromJsonBody(key, "int", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "int", fallback),
     toJsonBody: defaultToJsonBody
   },
   double: {
-    fromJsonBody: (key, fallback) => defaultFromJsonBody(key, "double", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "double", fallback),
     toJsonBody: defaultToJsonBody
   },
   String: {
-    fromJsonBody: (key, fallback) => defaultFromJsonBody(key, "String", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "String", fallback),
     toJsonBody: defaultToJsonBody
   },
   bool: {
-    fromJsonBody: (key, fallback) => defaultFromJsonBody(key, "bool", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultFromJsonBody(key, jsonKey, "bool", fallback),
     toJsonBody: defaultToJsonBody
   },
   DateTime: {
-    fromJsonBody: (key, fallback) => `${key}: json["${key}"] is String ? DateTime.parse(json["${key}"]) : ${fallback}`,
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.toIso8601String()`
+    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is String ? DateTime.parse(json["${jsonKey}"]) : ${fallback}`,
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.toIso8601String()`
   },
   "List<null>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "null", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "null", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<int>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "int", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "int", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<double>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "double", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "double", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<String>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "String", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "String", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<bool>": {
-    fromJsonBody: (key, fallback) => defaultListFromJsonBody(key, "bool", fallback),
+    fromJsonBody: (key, jsonKey, fallback) => defaultListFromJsonBody(key, jsonKey, "bool", fallback),
     toJsonBody: defaultToJsonBody
   },
   "List<DateTime>": {
-    fromJsonBody: (key, fallback) => `${key}: json["${key}"] is List<String> ?
-            (json["${key}"] as List<String>)
+    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is List<String> ?
+            (json["${jsonKey}"] as List<String>)
                 .map((item) => DateTime.parse(item)).toList() : ${fallback}`,
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.map((val) => val.toIso8601String()).toList()`
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.map((val) => val.toIso8601String()).toList()`
   },
   Uint8List: {
-    fromJsonBody: (key, fallback) => `${key}: json["${key}"] is List ? Uint8List.fromList(json["${key}"]) : ${fallback}`,
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.toList()`
+    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is List ? Uint8List.fromList(json["${jsonKey}"]) : ${fallback}`,
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.toList()`
   },
   "List<Uint8List>": {
-    fromJsonBody: (key, fallback) => `${key}: json["${key}"] is List && (json["${key}"] as List).isNotEmpty && (json["${key}"] as List).first is List ? json["${key}"] : ${fallback}`,
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.map((val) => val.toList()).toList()`
+    fromJsonBody: (key, jsonKey, fallback) => `${key}: json["${jsonKey}"] is List && (json["${jsonKey}"] as List).isNotEmpty && (json["${jsonKey}"] as List).first is List ? json["${jsonKey}"] : ${fallback}`,
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.map((val) => val.toList()).toList()`
   }
 };
-function defaultFromJsonBody(key, typename, fallback) {
-  return `${key}: json["${key}"] is ${typename} ? json["${key}"] : ${fallback}`;
+function defaultFromJsonBody(key, jsonKey, typename, fallback) {
+  return `${key}: json["${jsonKey}"] is ${typename} ? json["${jsonKey}"] : ${fallback}`;
 }
-function defaultListFromJsonBody(key, typename, fallback) {
-  return `${key}: json["${key}"] is List<${typename}> ? json["${key}"] : ${fallback}`;
+function defaultListFromJsonBody(key, jsonKey, typename, fallback) {
+  return `${key}: json["${jsonKey}"] is List<${typename}> ? json["${jsonKey}"] : ${fallback}`;
 }
-function defaultToJsonBody(key) {
-  return `"${key}": ${key}`;
+function defaultToJsonBody(key, jsonKey) {
+  return `"${jsonKey}": ${key}`;
 }
 const classTransformer = (typename, nullable) => {
   return {
-    fromJsonBody: (key, fallback) => {
+    fromJsonBody: (key, jsonKey, fallback) => {
       if (nullable) {
-        return `${key}: json["${key}"] is Map<String, dynamic> ? 
-                ${typename}.fromJson(json["${key}"]) : null`;
+        return `${key}: json["${jsonKey}"] is Map<String, dynamic> ? 
+                ${typename}.fromJson(json["${jsonKey}"]) : null`;
       }
-      return `${key}: ${typename}.fromJson(json["${key}"])`;
+      return `${key}: ${typename}.fromJson(json["${jsonKey}"])`;
     },
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.toJson()`
+    toJsonBody: (key, jsonKey, isNullable) => {
+      return `"${jsonKey}": ${key}${isNullable ? "?" : ""}.toJson()`;
+    }
   };
 };
 const classListTransformer = (typename) => {
   return {
-    fromJsonBody: (key, fallback) => {
-      return `${key}: json["${key}"] is List<Map<String, dynamic>> ? 
-                (json["${key}"] as List<Map<String, dynamic>>)
+    fromJsonBody: (key, jsonKey, fallback) => {
+      return `${key}: json["${jsonKey}"] is List<Map<String, dynamic>> ? 
+                (json["${jsonKey}"] as List<Map<String, dynamic>>)
                     .map((val) => ${typename}.fromJson(val)).toList() : ${fallback}`;
     },
-    toJsonBody: (key, isNullable) => `"${key}": ${key}${isNullable ? "?" : ""}.map((val) => val.toJson()).toList()`
+    toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.map((val) => val.toJson()).toList()`
   };
 };
 function isDartType(input) {

package/package.json

@@ -22,7 +22,7 @@
     "chokidar": "^3.5.3",
     "listhen": "^1.4.3"
   },
-  "version": "0.0.9",
+  "version": "0.0.10",
   "repository": {
     "url": "https://github.com/modiimedia/arri"
   }