arri 0.0.10 → 0.0.11

package/dist/chunks/index.cjs

@@ -29,7 +29,7 @@ require('node:module');
 require('node:assert');
 require('node:v8');
 require('node:util');
-require('../shared/arri.24f662c0.cjs');
+require('../shared/arri.dd4e8564.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.5b1d01a1.mjs';
+import '../shared/arri.d491643b.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.24f662c0.cjs');
+require('../shared/arri.dd4e8564.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.5b1d01a1.mjs';
+import '../shared/arri.d491643b.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.24f662c0.cjs');
+require('../shared/arri.dd4e8564.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.5b1d01a1.mjs';
+import '../shared/arri.d491643b.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.24f662c0.cjs');
+const dart = require('./shared/arri.dd4e8564.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.5b1d01a1.mjs';
+import { f as format2, a as dartClientGenerator } from './shared/arri.d491643b.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.24f662c0.cjs');
+const dart = require('./shared/arri.dd4e8564.cjs');
 const fs = require('fs');
 require('module');
 require('url');

package/dist/codegen.d.cts

@@ -24,11 +24,14 @@ interface DartClientGeneratorOptions {
     outputFile: string;
 }
 declare const dartClientGenerator: ClientGeneratorPlugin<DartClientGeneratorOptions>;
-declare function createDartClient(appDef: ApplicationDefinition, prefix?: string): string;
-declare function dartServiceFromServiceDefinition(name: string, def: ServiceDefinition, prefix?: string): string;
-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];
+interface CreateClientOptions {
+    clientName: string;
+}
+declare function createDartClient(appDef: ApplicationDefinition, opts?: CreateClientOptions): string;
+declare function dartServiceFromServiceDefinition(name: string, def: ServiceDefinition, opts: CreateClientOptions): string;
+declare function dartProcedureFromServiceDefinition(key: string, def: ProcedureDefinition, opts: CreateClientOptions): string;
+declare function dartModelFromJsonSchema(modelName: string, schema: JsonSchemaObject, opts: CreateClientOptions): string;
+declare function dartPropertyTypeFromSchema(objectName: string, propertyName: string, schema: JsonSchemaObject, opts: CreateClientOptions): [DartType | string, string[] | undefined];
 declare function dartParsedJsonField(fieldName: string, jsonKey: string, dartType: string): string;
 declare const dartTypeMap: {
     readonly integer: "int";

package/dist/codegen.d.mts

@@ -24,11 +24,14 @@ interface DartClientGeneratorOptions {
     outputFile: string;
 }
 declare const dartClientGenerator: ClientGeneratorPlugin<DartClientGeneratorOptions>;
-declare function createDartClient(appDef: ApplicationDefinition, prefix?: string): string;
-declare function dartServiceFromServiceDefinition(name: string, def: ServiceDefinition, prefix?: string): string;
-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];
+interface CreateClientOptions {
+    clientName: string;
+}
+declare function createDartClient(appDef: ApplicationDefinition, opts?: CreateClientOptions): string;
+declare function dartServiceFromServiceDefinition(name: string, def: ServiceDefinition, opts: CreateClientOptions): string;
+declare function dartProcedureFromServiceDefinition(key: string, def: ProcedureDefinition, opts: CreateClientOptions): string;
+declare function dartModelFromJsonSchema(modelName: string, schema: JsonSchemaObject, opts: CreateClientOptions): string;
+declare function dartPropertyTypeFromSchema(objectName: string, propertyName: string, schema: JsonSchemaObject, opts: CreateClientOptions): [DartType | string, string[] | undefined];
 declare function dartParsedJsonField(fieldName: string, jsonKey: string, dartType: string): string;
 declare const dartTypeMap: {
     readonly integer: "int";

package/dist/codegen.d.ts

@@ -24,11 +24,14 @@ interface DartClientGeneratorOptions {
     outputFile: string;
 }
 declare const dartClientGenerator: ClientGeneratorPlugin<DartClientGeneratorOptions>;
-declare function createDartClient(appDef: ApplicationDefinition, prefix?: string): string;
-declare function dartServiceFromServiceDefinition(name: string, def: ServiceDefinition, prefix?: string): string;
-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];
+interface CreateClientOptions {
+    clientName: string;
+}
+declare function createDartClient(appDef: ApplicationDefinition, opts?: CreateClientOptions): string;
+declare function dartServiceFromServiceDefinition(name: string, def: ServiceDefinition, opts: CreateClientOptions): string;
+declare function dartProcedureFromServiceDefinition(key: string, def: ProcedureDefinition, opts: CreateClientOptions): string;
+declare function dartModelFromJsonSchema(modelName: string, schema: JsonSchemaObject, opts: CreateClientOptions): string;
+declare function dartPropertyTypeFromSchema(objectName: string, propertyName: string, schema: JsonSchemaObject, opts: CreateClientOptions): [DartType | string, string[] | undefined];
 declare function dartParsedJsonField(fieldName: string, jsonKey: string, dartType: string): string;
 declare const dartTypeMap: {
     readonly integer: "int";

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.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 { d as defineClientGeneratorPlugin, f as format2 } from './shared/arri.d491643b.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.d491643b.mjs';
 import { writeFileSync } from 'fs';
 import 'module';
 import 'url';

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

@@ -9,7 +9,7 @@ import assert4 from 'assert';
 import fs from 'fs/promises';
 import v8 from 'v8';
 import { format, inspect } from 'util';
-import { g as unflattenProcedures, i as isServiceDefinition, p as pascalCase, h as camelCase, a as isProcedureDefinition, e as isJsonSchemaEnum, c as isJsonSchemaNullType, b as isJsonSchemaScalarType, d as isJsonSchemaObject, f as isJsonSchemaArray } from './arri.1f1b9dfc.mjs';
+import { g as unflattenProcedures, i as isServiceDefinition, p as pascalCase, h as camelCase, a as isProcedureDefinition, d as isJsonSchemaObject, e as isJsonSchemaEnum, c as isJsonSchemaNullType, b as isJsonSchemaScalarType, f as isJsonSchemaArray } from './arri.1f1b9dfc.mjs';
 import { execSync } from 'child_process';
 
 const require$1 = createRequire(import.meta.url);
@@ -29047,7 +29047,9 @@ const dartClientGenerator = defineClientGeneratorPlugin(
             'Missing "outputFile" cannot generate dart client'
           );
         }
-        const result = createDartClient(def, options.clientName);
+        const result = createDartClient(def, {
+          clientName: options.clientName
+        });
         writeFileSync(options.outputFile, result);
         execSync(`dart format ${options.outputFile}`);
       },
@@ -29056,7 +29058,7 @@ const dartClientGenerator = defineClientGeneratorPlugin(
   }
 );
 const generatedModels = [];
-function createDartClient(appDef, prefix = "Client") {
+function createDartClient(appDef, opts = { clientName: "Client" }) {
   const { models, procedures } = appDef;
   const serviceParts = [];
   const procedureParts = [];
@@ -29064,22 +29066,18 @@ function createDartClient(appDef, prefix = "Client") {
   Object.keys(services).forEach((k) => {
     const item = services[k];
     if (isServiceDefinition(item)) {
-      const serviceName = pascalCase(`${prefix}_${k}_service`);
+      const serviceName = pascalCase(`${opts.clientName}_${k}_service`);
       serviceParts.push({
         name: serviceName,
         key: k,
         content: dartServiceFromServiceDefinition(
           // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
           serviceName,
-          item,
-          prefix
-        )
+          item)
       });
       return;
     }
-    procedureParts.push(
-      dartProcedureFromServiceDefinition(prefix, k, item)
-    );
+    procedureParts.push(dartProcedureFromServiceDefinition(k, item));
   });
   const endpoints = {};
   Object.keys(procedures).forEach((key) => {
@@ -29089,14 +29087,11 @@ function createDartClient(appDef, prefix = "Client") {
   const modelParts = [];
   Object.keys(models).forEach((key) => {
     const model = models[key];
-    const typeName = `${prefix}${pascalCase(key)}`;
+    const typeName = pascalCase(key);
     const objModel = model;
     if (!generatedModels.includes(typeName)) {
       modelParts.push(
-        dartModelFromJsonSchema(
-          `${prefix}${pascalCase(key)}`,
-          objModel
-        )
+        dartModelFromJsonSchema(`${pascalCase(key)}`, objModel)
       );
       generatedModels.push(typeName);
     }
@@ -29106,10 +29101,10 @@ import "dart:convert";
 import "package:http/http.dart" as http;
 import "package:arri_client/arri_client.dart";
 
-class ${prefix} {
+class ${opts.clientName} {
   final String _baseUrl;
   final Map<String, String> _headers;
-  const ${prefix}({
+  const ${opts.clientName}({
     String baseUrl = "",
     Map<String, String> headers = const {},
   }): _headers = headers,
@@ -29123,7 +29118,7 @@ class ${prefix} {
   }`
   ).join("\n  ")}
   Future<http.Response> rawRequest(
-    ${prefix}Endpoints endpoint, {
+    ${opts.clientName}Endpoints endpoint, {
     Map<String, String>? query,
     dynamic body,
     Map<String, String>? headers,
@@ -29142,7 +29137,7 @@ class ${prefix} {
 ${serviceParts.map((item) => item.content).join("\n")}
 ${modelParts.join("\n")}
 
-enum ${prefix}Endpoints implements Comparable<${prefix}Endpoints>, ArriEndpoint {
+enum ${opts.clientName}Endpoints implements Comparable<${opts.clientName}Endpoints>, ArriEndpoint {
   ${Object.keys(endpoints).map(
     (key) => `${camelCase(key.split("/").join("_"))}(
         path: "${key}",
@@ -29150,7 +29145,7 @@ enum ${prefix}Endpoints implements Comparable<${prefix}Endpoints>, ArriEndpoint
       )`
   ).join(",\n  ")};
 
-  const ${prefix}Endpoints({
+  const ${opts.clientName}Endpoints({
     required this.path, required this.method,
   });
   @override
@@ -29159,19 +29154,17 @@ enum ${prefix}Endpoints implements Comparable<${prefix}Endpoints>, ArriEndpoint
   final HttpMethod method;
 
   @override
-  compareTo(${prefix}Endpoints other) => name.compareTo(other.name);
+  compareTo(${opts.clientName}Endpoints other) => name.compareTo(other.name);
 }`;
 }
-function dartServiceFromServiceDefinition(name, def, prefix = "") {
+function dartServiceFromServiceDefinition(name, def, opts) {
   const rpcParts = [];
   const subServiceParts = [];
   const serviceName = `${name}`;
   Object.keys(def).forEach((key) => {
     const item = def[key];
     if (isProcedureDefinition(item)) {
-      rpcParts.push(
-        dartProcedureFromServiceDefinition(prefix, key, item)
-      );
+      rpcParts.push(dartProcedureFromServiceDefinition(key, item));
       return;
     }
     const nameParts = name.split("Service");
@@ -29181,9 +29174,7 @@ function dartServiceFromServiceDefinition(name, def, prefix = "") {
     );
     const subService = dartServiceFromServiceDefinition(
       subServiceName,
-      item,
-      prefix
-    );
+      item);
     subServiceParts.push({
       name: subServiceName,
       key,
@@ -29211,18 +29202,18 @@ function dartServiceFromServiceDefinition(name, def, prefix = "") {
 ${subServiceParts.map((sub) => sub.content).join("\n")}
 `;
 }
-function dartProcedureFromServiceDefinition(clientName, key, def) {
+function dartProcedureFromServiceDefinition(key, def, opts) {
   let returnType = `Future<String>`;
   let returnTypeName = "String";
   if (def.response) {
-    returnType = `Future<${clientName}${def.response}>`;
-    returnTypeName = `${clientName}${def.response}`;
+    returnType = `Future<${def.response}>`;
+    returnTypeName = `${def.response}`;
   } else {
     returnType = "Future<void>";
   }
   let paramsInput = "";
   if (def.params) {
-    paramsInput = `${clientName}${def.params} params`;
+    paramsInput = `${def.params} params`;
   }
   let responseParser = "(body) => body;";
   switch (returnType) {
@@ -29264,7 +29255,8 @@ function dartProcedureFromServiceDefinition(clientName, key, def) {
     );
   }`;
 }
-function dartModelFromJsonSchema(name, schema) {
+function dartModelFromJsonSchema(modelName, schema, opts) {
+  const modelDisplayName = pascalCase(`${modelName}`);
   const fields = [];
   const subModelParts = [];
   Object.entries(schema.properties ?? {}).forEach(([key, val]) => {
@@ -29272,31 +29264,35 @@ function dartModelFromJsonSchema(name, schema) {
       return;
     }
     const [dartType, subTypes] = dartPropertyTypeFromSchema(
-      name,
+      modelName,
       key,
-      schema
-    );
+      schema);
     if (subTypes?.length) {
       for (const sub of subTypes) {
         subModelParts.push(sub);
       }
     }
     fields.push({ type: dartType, name: camelCase(key), jsonKey: key });
-    if (!isDartType(dartType) && "type" in val && val.type === "object") {
+    if (!isDartType(dartType) && isJsonSchemaObject(val)) {
+      if (val.$id && generatedModels.includes(val.$id)) {
+        return;
+      }
+      const subModelName = val.$id ? pascalCase(val.$id) : pascalCase(dartType.replace("?", ""));
       subModelParts.push(
-        dartModelFromJsonSchema(dartType.replace("?", ""), val)
+        dartModelFromJsonSchema(subModelName, val)
       );
+      generatedModels.push(subModelName);
     }
   });
-  return `class ${name} {
+  return `class ${modelDisplayName} {
   ${fields.map((field) => `final ${field.type} ${field.name};`).join("\n  ")}
-  const ${name}({
+  const ${modelDisplayName}({
     ${fields.map(
     (field) => field.type.includes("?") ? `this.${field.name},` : `required this.${field.name},`
   ).join("\n    ")}
   });
-  factory ${name}.fromJson(Map<String, dynamic> json) {
-    return ${name}(
+  factory ${modelDisplayName}.fromJson(Map<String, dynamic> json) {
+    return ${modelDisplayName}(
       ${fields.map(
     (field) => `${dartParsedJsonField(
       field.name,
@@ -29334,10 +29330,10 @@ function dartModelFromJsonSchema(name, schema) {
   }).join(",\n      ")},
     };
   }
-  ${name} copyWith({
+  ${modelDisplayName} copyWith({
     ${fields.map((field) => `${field.type.replace("?", "")}? ${field.name},`).join("\n    ")}
   }) {
-    return ${name}(
+    return ${modelDisplayName}(
       ${fields.map((field) => `${field.name}: ${field.name} ?? this.${field.name},`).join("\n      ")}
     );
   }
@@ -29345,7 +29341,7 @@ function dartModelFromJsonSchema(name, schema) {
 
 ${subModelParts.join("\n")}`;
 }
-function dartPropertyTypeFromSchema(objectName, propertyName, schema) {
+function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
   const prop = schema.properties?.[propertyName];
   const isOptional = !schema.required?.includes(propertyName);
   let finalType = "";
@@ -29421,9 +29417,7 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema) {
     }
   }
   if (isJsonSchemaObject(prop)) {
-    const joinedPropName = pascalCase(
-      `${objectName}_${propertyName}`
-    );
+    const joinedPropName = prop.$id ? pascalCase(prop.$id) : pascalCase(`${objectName}_${propertyName}`);
     finalType = isOptional ? `${joinedPropName}?` : joinedPropName;
   }
   if (isJsonSchemaArray(prop)) {
@@ -29455,8 +29449,10 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema) {
         break;
       case "object": {
         const subTypeName = item.$id ?? pascalCase(`${objectName}_${propertyName}_item`);
-        const model = dartModelFromJsonSchema(subTypeName, item);
         if (!generatedModels.includes(subTypeName)) {
+          const model = dartModelFromJsonSchema(
+            subTypeName,
+            item);
           subTypes.push(model);
           generatedModels.push(subTypeName);
         }

package/dist/shared/{arri.24f662c0.cjs → arri.dd4e8564.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.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 require$2 = require$$2.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.dd4e8564.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.dd4e8564.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.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)));
+const require$1 = require$$2.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared/arri.dd4e8564.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.dd4e8564.cjs', document.baseURI).href)));
 require$$0.dirname(__filename$1);
 
 var __create = Object.create;
@@ -29060,7 +29060,9 @@ const dartClientGenerator = defineClientGeneratorPlugin(
             'Missing "outputFile" cannot generate dart client'
           );
         }
-        const result = createDartClient(def, options.clientName);
+        const result = createDartClient(def, {
+          clientName: options.clientName
+        });
         fs$1.writeFileSync(options.outputFile, result);
         require$$1.execSync(`dart format ${options.outputFile}`);
       },
@@ -29069,7 +29071,7 @@ const dartClientGenerator = defineClientGeneratorPlugin(
   }
 );
 const generatedModels = [];
-function createDartClient(appDef, prefix = "Client") {
+function createDartClient(appDef, opts = { clientName: "Client" }) {
   const { models, procedures } = appDef;
   const serviceParts = [];
   const procedureParts = [];
@@ -29077,22 +29079,18 @@ function createDartClient(appDef, prefix = "Client") {
   Object.keys(services).forEach((k) => {
     const item = services[k];
     if (index.isServiceDefinition(item)) {
-      const serviceName = index.pascalCase(`${prefix}_${k}_service`);
+      const serviceName = index.pascalCase(`${opts.clientName}_${k}_service`);
       serviceParts.push({
         name: serviceName,
         key: k,
         content: dartServiceFromServiceDefinition(
           // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
           serviceName,
-          item,
-          prefix
-        )
+          item)
       });
       return;
     }
-    procedureParts.push(
-      dartProcedureFromServiceDefinition(prefix, k, item)
-    );
+    procedureParts.push(dartProcedureFromServiceDefinition(k, item));
   });
   const endpoints = {};
   Object.keys(procedures).forEach((key) => {
@@ -29102,14 +29100,11 @@ function createDartClient(appDef, prefix = "Client") {
   const modelParts = [];
   Object.keys(models).forEach((key) => {
     const model = models[key];
-    const typeName = `${prefix}${index.pascalCase(key)}`;
+    const typeName = index.pascalCase(key);
     const objModel = model;
     if (!generatedModels.includes(typeName)) {
       modelParts.push(
-        dartModelFromJsonSchema(
-          `${prefix}${index.pascalCase(key)}`,
-          objModel
-        )
+        dartModelFromJsonSchema(`${index.pascalCase(key)}`, objModel)
       );
       generatedModels.push(typeName);
     }
@@ -29119,10 +29114,10 @@ import "dart:convert";
 import "package:http/http.dart" as http;
 import "package:arri_client/arri_client.dart";
 
-class ${prefix} {
+class ${opts.clientName} {
   final String _baseUrl;
   final Map<String, String> _headers;
-  const ${prefix}({
+  const ${opts.clientName}({
     String baseUrl = "",
     Map<String, String> headers = const {},
   }): _headers = headers,
@@ -29136,7 +29131,7 @@ class ${prefix} {
   }`
   ).join("\n  ")}
   Future<http.Response> rawRequest(
-    ${prefix}Endpoints endpoint, {
+    ${opts.clientName}Endpoints endpoint, {
     Map<String, String>? query,
     dynamic body,
     Map<String, String>? headers,
@@ -29155,7 +29150,7 @@ class ${prefix} {
 ${serviceParts.map((item) => item.content).join("\n")}
 ${modelParts.join("\n")}
 
-enum ${prefix}Endpoints implements Comparable<${prefix}Endpoints>, ArriEndpoint {
+enum ${opts.clientName}Endpoints implements Comparable<${opts.clientName}Endpoints>, ArriEndpoint {
   ${Object.keys(endpoints).map(
     (key) => `${index.camelCase(key.split("/").join("_"))}(
         path: "${key}",
@@ -29163,7 +29158,7 @@ enum ${prefix}Endpoints implements Comparable<${prefix}Endpoints>, ArriEndpoint
       )`
   ).join(",\n  ")};
 
-  const ${prefix}Endpoints({
+  const ${opts.clientName}Endpoints({
     required this.path, required this.method,
   });
   @override
@@ -29172,19 +29167,17 @@ enum ${prefix}Endpoints implements Comparable<${prefix}Endpoints>, ArriEndpoint
   final HttpMethod method;
 
   @override
-  compareTo(${prefix}Endpoints other) => name.compareTo(other.name);
+  compareTo(${opts.clientName}Endpoints other) => name.compareTo(other.name);
 }`;
 }
-function dartServiceFromServiceDefinition(name, def, prefix = "") {
+function dartServiceFromServiceDefinition(name, def, opts) {
   const rpcParts = [];
   const subServiceParts = [];
   const serviceName = `${name}`;
   Object.keys(def).forEach((key) => {
     const item = def[key];
     if (index.isProcedureDefinition(item)) {
-      rpcParts.push(
-        dartProcedureFromServiceDefinition(prefix, key, item)
-      );
+      rpcParts.push(dartProcedureFromServiceDefinition(key, item));
       return;
     }
     const nameParts = name.split("Service");
@@ -29194,9 +29187,7 @@ function dartServiceFromServiceDefinition(name, def, prefix = "") {
     );
     const subService = dartServiceFromServiceDefinition(
       subServiceName,
-      item,
-      prefix
-    );
+      item);
     subServiceParts.push({
       name: subServiceName,
       key,
@@ -29224,18 +29215,18 @@ function dartServiceFromServiceDefinition(name, def, prefix = "") {
 ${subServiceParts.map((sub) => sub.content).join("\n")}
 `;
 }
-function dartProcedureFromServiceDefinition(clientName, key, def) {
+function dartProcedureFromServiceDefinition(key, def, opts) {
   let returnType = `Future<String>`;
   let returnTypeName = "String";
   if (def.response) {
-    returnType = `Future<${clientName}${def.response}>`;
-    returnTypeName = `${clientName}${def.response}`;
+    returnType = `Future<${def.response}>`;
+    returnTypeName = `${def.response}`;
   } else {
     returnType = "Future<void>";
   }
   let paramsInput = "";
   if (def.params) {
-    paramsInput = `${clientName}${def.params} params`;
+    paramsInput = `${def.params} params`;
   }
   let responseParser = "(body) => body;";
   switch (returnType) {
@@ -29277,7 +29268,8 @@ function dartProcedureFromServiceDefinition(clientName, key, def) {
     );
   }`;
 }
-function dartModelFromJsonSchema(name, schema) {
+function dartModelFromJsonSchema(modelName, schema, opts) {
+  const modelDisplayName = index.pascalCase(`${modelName}`);
   const fields = [];
   const subModelParts = [];
   Object.entries(schema.properties ?? {}).forEach(([key, val]) => {
@@ -29285,31 +29277,35 @@ function dartModelFromJsonSchema(name, schema) {
       return;
     }
     const [dartType, subTypes] = dartPropertyTypeFromSchema(
-      name,
+      modelName,
       key,
-      schema
-    );
+      schema);
     if (subTypes?.length) {
       for (const sub of subTypes) {
         subModelParts.push(sub);
       }
     }
     fields.push({ type: dartType, name: index.camelCase(key), jsonKey: key });
-    if (!isDartType(dartType) && "type" in val && val.type === "object") {
+    if (!isDartType(dartType) && index.isJsonSchemaObject(val)) {
+      if (val.$id && generatedModels.includes(val.$id)) {
+        return;
+      }
+      const subModelName = val.$id ? index.pascalCase(val.$id) : index.pascalCase(dartType.replace("?", ""));
       subModelParts.push(
-        dartModelFromJsonSchema(dartType.replace("?", ""), val)
+        dartModelFromJsonSchema(subModelName, val)
       );
+      generatedModels.push(subModelName);
     }
   });
-  return `class ${name} {
+  return `class ${modelDisplayName} {
   ${fields.map((field) => `final ${field.type} ${field.name};`).join("\n  ")}
-  const ${name}({
+  const ${modelDisplayName}({
     ${fields.map(
     (field) => field.type.includes("?") ? `this.${field.name},` : `required this.${field.name},`
   ).join("\n    ")}
   });
-  factory ${name}.fromJson(Map<String, dynamic> json) {
-    return ${name}(
+  factory ${modelDisplayName}.fromJson(Map<String, dynamic> json) {
+    return ${modelDisplayName}(
       ${fields.map(
     (field) => `${dartParsedJsonField(
       field.name,
@@ -29347,10 +29343,10 @@ function dartModelFromJsonSchema(name, schema) {
   }).join(",\n      ")},
     };
   }
-  ${name} copyWith({
+  ${modelDisplayName} copyWith({
     ${fields.map((field) => `${field.type.replace("?", "")}? ${field.name},`).join("\n    ")}
   }) {
-    return ${name}(
+    return ${modelDisplayName}(
       ${fields.map((field) => `${field.name}: ${field.name} ?? this.${field.name},`).join("\n      ")}
     );
   }
@@ -29358,7 +29354,7 @@ function dartModelFromJsonSchema(name, schema) {
 
 ${subModelParts.join("\n")}`;
 }
-function dartPropertyTypeFromSchema(objectName, propertyName, schema) {
+function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
   const prop = schema.properties?.[propertyName];
   const isOptional = !schema.required?.includes(propertyName);
   let finalType = "";
@@ -29434,9 +29430,7 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema) {
     }
   }
   if (index.isJsonSchemaObject(prop)) {
-    const joinedPropName = index.pascalCase(
-      `${objectName}_${propertyName}`
-    );
+    const joinedPropName = prop.$id ? index.pascalCase(prop.$id) : index.pascalCase(`${objectName}_${propertyName}`);
     finalType = isOptional ? `${joinedPropName}?` : joinedPropName;
   }
   if (index.isJsonSchemaArray(prop)) {
@@ -29468,8 +29462,10 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema) {
         break;
       case "object": {
         const subTypeName = item.$id ?? index.pascalCase(`${objectName}_${propertyName}_item`);
-        const model = dartModelFromJsonSchema(subTypeName, item);
         if (!generatedModels.includes(subTypeName)) {
+          const model = dartModelFromJsonSchema(
+            subTypeName,
+            item);
           subTypes.push(model);
           generatedModels.push(subTypeName);
         }

package/package.json

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