arri 0.0.40 → 0.0.43

package/dist/chunks/index.cjs

@@ -42,7 +42,7 @@ require('h3');
 require('@sinclair/typebox/errors');
 require('@sinclair/typebox/value');
 require('ofetch');
-require('../shared/arri.529292e9.cjs');
+require('../shared/arri.f250629b.cjs');
 require('child_process');
 require('listhen');
 

package/dist/chunks/index.mjs

@@ -40,7 +40,7 @@ import 'h3';
 import '@sinclair/typebox/errors';
 import '@sinclair/typebox/value';
 import 'ofetch';
-import '../shared/arri.3b1c1533.mjs';
+import '../shared/arri.d767421d.mjs';
 import 'child_process';
 import 'listhen';
 

package/dist/cli.cjs

@@ -29,7 +29,7 @@ const utils$l = require('./shared/arri.0752aa2b.cjs');
 const index = require('./index.cjs');
 require('node:stream');
 const ofetch = require('ofetch');
-const dart = require('./shared/arri.529292e9.cjs');
+const dart = require('./shared/arri.f250629b.cjs');
 const listhen = require('listhen');
 require('@sinclair/typebox');
 require('h3');

package/dist/cli.mjs

@@ -27,7 +27,7 @@ import { c as camelCase, r as removeDisallowedChars, k as kebabCase, d as isAppl
 import { defaultConfig, DEV_DEFINITION_ENDPOINT } from './index.mjs';
 import 'node:stream';
 import { ofetch } from 'ofetch';
-import { g as dartClientGenerator } from './shared/arri.3b1c1533.mjs';
+import { g as dartClientGenerator } from './shared/arri.d767421d.mjs';
 import { listenAndWatch } from 'listhen';
 import '@sinclair/typebox';
 import 'h3';

package/dist/codegen.cjs

@@ -3,7 +3,7 @@
 const require$$0 = require('fs');
 const prettier = require('prettier');
 const utils = require('./shared/arri.0752aa2b.cjs');
-const dart = require('./shared/arri.529292e9.cjs');
+const dart = require('./shared/arri.f250629b.cjs');
 require('child_process');
 
 let generatedModels = [];

package/dist/codegen.mjs

@@ -2,8 +2,8 @@ import { writeFileSync } from 'fs';
 import { format } from 'prettier';
 import { u as unflattenObject, i as isServiceDef, p as pascalCase, a as isProcedureDef, b as unflattenProcedures, c as camelCase } from './shared/arri.ebf86912.mjs';
 export { d as isApplicationDef, n as normalizeWhitespace, r as removeDisallowedChars, s as setNestedObjectProperty } from './shared/arri.ebf86912.mjs';
-import { d as defineClientGeneratorPlugin, i as isJsonSchemaScalarType, a as isJsonSchemaNullType, b as isJsonSchemaObject, c as isJsonSchemaRecord, e as isJsonSchemaEnum, f as isJsonSchemaArray } from './shared/arri.3b1c1533.mjs';
-export { p as classListTransformer, o as classTransformer, h as createDartClient, g as dartClientGenerator, l as dartModelFromJsonSchema, n as dartParsedJsonField, k as dartProcedureFromServiceDefinition, m as dartPropertyTypeFromSchema, j as dartServiceFromServiceDefinition, q as isDartType, r as isDartTypeWithNullables, t as transformers } from './shared/arri.3b1c1533.mjs';
+import { d as defineClientGeneratorPlugin, i as isJsonSchemaScalarType, a as isJsonSchemaNullType, b as isJsonSchemaObject, c as isJsonSchemaRecord, e as isJsonSchemaEnum, f as isJsonSchemaArray } from './shared/arri.d767421d.mjs';
+export { p as classListTransformer, o as classTransformer, h as createDartClient, g as dartClientGenerator, l as dartModelFromJsonSchema, n as dartParsedJsonField, k as dartProcedureFromServiceDefinition, m as dartPropertyTypeFromSchema, j as dartServiceFromServiceDefinition, q as isDartType, r as isDartTypeWithNullables, t as transformers } from './shared/arri.d767421d.mjs';
 import 'child_process';
 
 let generatedModels = [];

package/dist/shared/{arri.3b1c1533.mjs → arri.d767421d.mjs}

@@ -348,6 +348,9 @@ function dartModelFromJsonSchema(modelName, schema, opts) {
       ${fields.map((field) => {
     const isNullable = field.type.endsWith("?");
     const typeName = field.type.replace("?", "");
+    if (typeName === "dynamic") {
+      return `"${field.jsonKey}": ${field.name}`;
+    }
     if (isDartTypeWithNullables(field.type)) {
       const transformer = transformers[typeName];
       return transformer.toJsonBody(
@@ -375,7 +378,9 @@ function dartModelFromJsonSchema(modelName, schema, opts) {
     };
   }
   ${modelDisplayName} copyWith({
-    ${fields.map((field) => `${field.type.replace("?", "")}? ${field.name},`).join("\n    ")}
+    ${fields.map(
+    (field) => `${field.type.replace("?", "")}${field.type !== "dynamic" ? "?" : ""} ${field.name},`
+  ).join("\n    ")}
   }) {
     return ${modelDisplayName}(
       ${fields.map((field) => `${field.name}: ${field.name} ?? this.${field.name},`).join("\n      ")}
@@ -388,7 +393,7 @@ ${subModelParts.join("\n")}`;
 function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
   const prop = schema.properties?.[propertyName];
   const isOptional = !schema.required?.includes(propertyName);
-  let finalType = "";
+  let finalType = "dynamic";
   const subTypes = [];
   if (isJsonSchemaEnum(prop)) {
     const enumName = pascalCase(`${objectName}_${propertyName}`);
@@ -515,6 +520,9 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
   return [finalType, subTypes.length ? subTypes : void 0];
 }
 function dartParsedJsonField(fieldName, jsonKey, dartType) {
+  if (dartType === "dynamic") {
+    return `${fieldName}: json["${jsonKey}"]`;
+  }
   if (isDartTypeWithNullables(dartType)) {
     switch (dartType) {
       case "String":
@@ -716,7 +724,7 @@ const classListTransformer = (typename) => {
   return {
     fromJsonBody: (key, jsonKey, fallback) => {
       return `${key}: json["${jsonKey}"] is List ? 
-                (json["${jsonKey}"] as List<Map<String, dynamic>>)
+                (json["${jsonKey}"] as List<dynamic>)
                     .map((val) => ${typename}.fromJson(val)).toList() : ${fallback}`;
     },
     toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.map((val) => val.toJson()).toList()`

package/dist/shared/{arri.529292e9.cjs → arri.f250629b.cjs}

@@ -350,6 +350,9 @@ function dartModelFromJsonSchema(modelName, schema, opts) {
       ${fields.map((field) => {
     const isNullable = field.type.endsWith("?");
     const typeName = field.type.replace("?", "");
+    if (typeName === "dynamic") {
+      return `"${field.jsonKey}": ${field.name}`;
+    }
     if (isDartTypeWithNullables(field.type)) {
       const transformer = transformers[typeName];
       return transformer.toJsonBody(
@@ -377,7 +380,9 @@ function dartModelFromJsonSchema(modelName, schema, opts) {
     };
   }
   ${modelDisplayName} copyWith({
-    ${fields.map((field) => `${field.type.replace("?", "")}? ${field.name},`).join("\n    ")}
+    ${fields.map(
+    (field) => `${field.type.replace("?", "")}${field.type !== "dynamic" ? "?" : ""} ${field.name},`
+  ).join("\n    ")}
   }) {
     return ${modelDisplayName}(
       ${fields.map((field) => `${field.name}: ${field.name} ?? this.${field.name},`).join("\n      ")}
@@ -390,7 +395,7 @@ ${subModelParts.join("\n")}`;
 function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
   const prop = schema.properties?.[propertyName];
   const isOptional = !schema.required?.includes(propertyName);
-  let finalType = "";
+  let finalType = "dynamic";
   const subTypes = [];
   if (isJsonSchemaEnum(prop)) {
     const enumName = utils.pascalCase(`${objectName}_${propertyName}`);
@@ -517,6 +522,9 @@ function dartPropertyTypeFromSchema(objectName, propertyName, schema, opts) {
   return [finalType, subTypes.length ? subTypes : void 0];
 }
 function dartParsedJsonField(fieldName, jsonKey, dartType) {
+  if (dartType === "dynamic") {
+    return `${fieldName}: json["${jsonKey}"]`;
+  }
   if (isDartTypeWithNullables(dartType)) {
     switch (dartType) {
       case "String":
@@ -718,7 +726,7 @@ const classListTransformer = (typename) => {
   return {
     fromJsonBody: (key, jsonKey, fallback) => {
       return `${key}: json["${jsonKey}"] is List ? 
-                (json["${jsonKey}"] as List<Map<String, dynamic>>)
+                (json["${jsonKey}"] as List<dynamic>)
                     .map((val) => ${typename}.fromJson(val)).toList() : ${fallback}`;
     },
     toJsonBody: (key, jsonKey, isNullable) => `"${jsonKey}": ${key}${isNullable ? "?" : ""}.map((val) => val.toJson()).toList()`

package/package.json

@@ -25,7 +25,7 @@
     "chokidar": "^3.5.3",
     "listhen": "^1.5.0"
   },
-  "version": "0.0.40",
+  "version": "0.0.43",
   "repository": {
     "url": "https://github.com/modiimedia/arri"
   }