quicktype-core 23.3.9 → 23.3.11

package/dist/language/Java/utils.js

@@ -22,5 +22,8 @@ function javaNameStyle(startWithUpper, upperUnderscore, original, acronymsStyle
             ? Strings_1.firstUpperWordStyle
             : Strings_1.allLowerWordStyle, upperUnderscore ? Strings_1.allUpperWordStyle : Strings_1.firstUpperWordStyle, upperUnderscore || startWithUpper
         ? Strings_1.allUpperWordStyle
-        : Strings_1.allLowerWordStyle, acronymsStyle, upperUnderscore ? "_" : "", isStartCharacter);
+        : Strings_1.allLowerWordStyle, 
+    // For UPPER_UNDERSCORE style (Java enum constants), always use allUpperWordStyle for acronyms
+    // to maintain consistency with the naming convention (e.g., XXX_SPA_XXX)
+    upperUnderscore ? Strings_1.allUpperWordStyle : acronymsStyle, upperUnderscore ? "_" : "", isStartCharacter);
 }

package/dist/language/Php/PhpRenderer.js

@@ -221,14 +221,11 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             });
             this.emitLine("}, ", ...args, ");");
         }, (_classType) => this.emitLine(...lhs, ...args, "->to(); ", "/*class*/"), (mapType) => {
-            this.emitBlock(["function to($my): stdClass"], () => {
-                this.emitLine("$out = new stdClass();");
-                this.emitBlock(["foreach ($my as $k => $v)"], () => {
-                    this.phpToObjConvert(className, mapType.values, ["$my->$k = "], ["$v"]);
-                });
-                this.emitLine("return $out;");
+            this.emitLine("$out = new stdClass();");
+            this.emitBlock(["foreach (", ...args, " as $k => $v)"], () => {
+                this.phpToObjConvert(className, mapType.values, ["$out->$k = "], ["$v"]);
             });
-            this.emitLine("return to(", ...args, ");");
+            this.emitLine("return $out;");
         }, (enumType) => this.emitLine(...lhs, this.nameForNamedType(enumType), "::to(", ...args, "); ", "/*enum*/"), (unionType) => {
             const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
             if (nullable !== null) {
@@ -267,14 +264,11 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             });
             this.emitLine("}, ", ...args, ");");
         }, (classType) => this.emitLine(...lhs, this.nameForNamedType(classType), "::from(", ...args, "); ", "/*class*/"), (mapType) => {
-            this.emitBlock(["function from($my): stdClass"], () => {
-                this.emitLine("$out = new stdClass();");
-                this.emitBlock(["foreach ($my as $k => $v)"], () => {
-                    this.phpFromObjConvert(className, mapType.values, ["$out->$k = "], ["$v"]);
-                });
-                this.emitLine("return $out;");
+            this.emitLine("$out = new stdClass();");
+            this.emitBlock(["foreach (", ...args, " as $k => $v)"], () => {
+                this.phpFromObjConvert(className, mapType.values, ["$out->$k = "], ["$v"]);
             });
-            this.emitLine("return from(", ...args, ");");
+            this.emitLine("return $out;");
         }, (enumType) => this.emitLine(...lhs, this.nameForNamedType(enumType), "::from(", ...args, "); ", "/*enum*/"), (unionType) => {
             const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
             if (nullable !== null) {
@@ -308,12 +302,9 @@ class PhpRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             });
             this.emitLine("); /* ", "" + idx, ":", args, "*/");
         }, (classType) => this.emitLine(...lhs, this.nameForNamedType(classType), "::sample()", suffix, " /*", "" + idx, ":", args, "*/"), (mapType) => {
-            this.emitBlock(["function sample(): stdClass"], () => {
-                this.emitLine("$out = new stdClass();");
-                this.phpSampleConvert(className, mapType.values, ["$out->{'", className, "'} = "], args, idx, ";");
-                this.emitLine("return $out;");
-            });
-            this.emitLine("return sample();");
+            this.emitLine("$out = new stdClass();");
+            this.phpSampleConvert(className, mapType.values, ["$out->{'", className, "'} = "], args, idx, ";");
+            this.emitLine("return $out;");
         }, (enumType) => this.emitLine(...lhs, this.nameForNamedType(enumType), "::sample()", suffix, " /*enum*/"), (unionType) => {
             const nullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
             if (nullable !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "23.3.9",
+    "version": "23.3.11",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",