@arrirpc/codegen-dart 0.74.0 → 0.75.0

package/dist/index.cjs

@@ -404,11 +404,12 @@ function dartClassFromSchema(schema, context) {
     String get ${validDartIdentifier(context.discriminatorKey)} => "${context.discriminatorValue}";
 `;
   }
+  const hasProperties = propNames.length > 0;
   result.content = `${getCodeComments(schema.metadata)}class ${finalClassName} implements ${context.discriminatorParentId ? `${context.modelPrefix}${context.discriminatorParentId}` : "ArriModel"} {
 ${fieldParts.join("\n")}
-  const ${finalClassName}({
+  const ${finalClassName}(${hasProperties ? "{" : ""}
 ${constructorParts.join("\n")}
-  });
+  ${hasProperties ? "}" : ""});
 ${discriminatorPart}
   factory ${finalClassName}.empty() {
     return ${finalClassName}(
@@ -449,9 +450,9 @@ ${toUrlQueryParts.join("\n")}
   }
 
   @override
-  ${finalClassName} copyWith({
+  ${finalClassName} copyWith(${hasProperties ? "{" : ""}
 ${copyWithParamParts.join("\n")}
-  }) {
+  ${hasProperties ? "}" : ""}) {
     return ${finalClassName}(
 ${copyWithReturnParts.join("\n")}
     );
@@ -581,7 +582,7 @@ function dartEnumFromSchema(schema, context) {
   const enumName = getDartClassName(schema, context);
   const typeName = isNullable ? `${context.modelPrefix}${enumName}?` : `${context.modelPrefix}${enumName}`;
   const enumValues = schema.enum.map((val) => ({
-    name: codegenUtils.camelCase(val, { normalize: true }),
+    name: validDartIdentifier(codegenUtils.camelCase(val, { normalize: true })),
     serialValue: val
   }));
   if (!enumValues.length) {
@@ -1131,8 +1132,6 @@ function createDartClient(def, options) {
     clientName: options.clientName ?? "Client",
     modelPrefix: options.typePrefix ?? "",
     generatedTypes: [],
-    instancePath: "",
-    schemaPath: "",
     clientVersion: def.info?.version ?? ""
   };
   const services = codegenUtils.unflattenProcedures(def.procedures);
@@ -1161,13 +1160,8 @@ function createDartClient(def, options) {
     }
     if (codegenUtils.isRpcDefinition(subSchema)) {
       const rpc = dartRpcFromSchema(subSchema, {
-        clientName: context.clientName,
         modelPrefix: context.modelPrefix,
-        generatedTypes: context.generatedTypes,
-        instancePath: key,
-        schemaPath: `procedures.${key}`,
-        clientVersion: context.clientVersion
-      });
+        instancePath: key});
       if (rpc) {
         rpcParts.push(rpc);
       }

package/dist/index.mjs

@@ -397,11 +397,12 @@ function dartClassFromSchema(schema, context) {
     String get ${validDartIdentifier(context.discriminatorKey)} => "${context.discriminatorValue}";
 `;
   }
+  const hasProperties = propNames.length > 0;
   result.content = `${getCodeComments(schema.metadata)}class ${finalClassName} implements ${context.discriminatorParentId ? `${context.modelPrefix}${context.discriminatorParentId}` : "ArriModel"} {
 ${fieldParts.join("\n")}
-  const ${finalClassName}({
+  const ${finalClassName}(${hasProperties ? "{" : ""}
 ${constructorParts.join("\n")}
-  });
+  ${hasProperties ? "}" : ""});
 ${discriminatorPart}
   factory ${finalClassName}.empty() {
     return ${finalClassName}(
@@ -442,9 +443,9 @@ ${toUrlQueryParts.join("\n")}
   }
 
   @override
-  ${finalClassName} copyWith({
+  ${finalClassName} copyWith(${hasProperties ? "{" : ""}
 ${copyWithParamParts.join("\n")}
-  }) {
+  ${hasProperties ? "}" : ""}) {
     return ${finalClassName}(
 ${copyWithReturnParts.join("\n")}
     );
@@ -574,7 +575,7 @@ function dartEnumFromSchema(schema, context) {
   const enumName = getDartClassName(schema, context);
   const typeName = isNullable ? `${context.modelPrefix}${enumName}?` : `${context.modelPrefix}${enumName}`;
   const enumValues = schema.enum.map((val) => ({
-    name: camelCase(val, { normalize: true }),
+    name: validDartIdentifier(camelCase(val, { normalize: true })),
     serialValue: val
   }));
   if (!enumValues.length) {
@@ -1124,8 +1125,6 @@ function createDartClient(def, options) {
     clientName: options.clientName ?? "Client",
     modelPrefix: options.typePrefix ?? "",
     generatedTypes: [],
-    instancePath: "",
-    schemaPath: "",
     clientVersion: def.info?.version ?? ""
   };
   const services = unflattenProcedures(def.procedures);
@@ -1154,13 +1153,8 @@ function createDartClient(def, options) {
     }
     if (isRpcDefinition(subSchema)) {
       const rpc = dartRpcFromSchema(subSchema, {
-        clientName: context.clientName,
         modelPrefix: context.modelPrefix,
-        generatedTypes: context.generatedTypes,
-        instancePath: key,
-        schemaPath: `procedures.${key}`,
-        clientVersion: context.clientVersion
-      });
+        instancePath: key});
       if (rpc) {
         rpcParts.push(rpc);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/codegen-dart",
-  "version": "0.74.0",
+  "version": "0.75.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -22,7 +22,7 @@
     "dist"
   ],
   "dependencies": {
-    "pathe": "^2.0.2",
-    "@arrirpc/codegen-utils": "0.74.0"
+    "pathe": "^2.0.3",
+    "@arrirpc/codegen-utils": "0.75.0"
   }
 }