quicktype-core 23.0.33 → 23.0.35

package/dist/input/JSONSchemaInput.js

@@ -985,7 +985,7 @@ class JSONSchemaInput {
                 const refs = yield refsInSchemaForURI(resolver, normalizedURI, givenName);
                 if (Array.isArray(refs)) {
                     let name;
-                    if (this._schemaSources.length === 1) {
+                    if (this._schemaSources.length === 1 && givenName !== undefined) {
                         name = givenName;
                     }
                     else {

package/dist/language/Rust.js

@@ -38,52 +38,48 @@ exports.rustOptions = {
     leadingComments: new RendererOptions_1.BooleanOption("leading-comments", "Leading Comments", true)
 };
 const namingStyles = {
-    "snake_case": {
+    snake_case: {
         regex: /^[a-z][a-z0-9]*(_[a-z0-9]+)*$/,
-        toParts: (name) => name.split('_'),
-        fromParts: (parts) => parts.map(p => p.toLowerCase()).join('_'),
+        toParts: (name) => name.split("_"),
+        fromParts: (parts) => parts.map(p => p.toLowerCase()).join("_")
     },
-    "SCREAMING_SNAKE_CASE": {
+    SCREAMING_SNAKE_CASE: {
         regex: /^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$/,
-        toParts: (name) => name.split('_'),
-        fromParts: (parts) => parts.map(p => p.toUpperCase()).join('_'),
+        toParts: (name) => name.split("_"),
+        fromParts: (parts) => parts.map(p => p.toUpperCase()).join("_")
     },
-    "camelCase": {
+    camelCase: {
         regex: /^[a-z]+([A-Z0-9][a-z]*)*$/,
         toParts: (name) => namingStyles.snake_case.toParts(name.replace(/(.)([A-Z])/g, "$1_$2")),
         fromParts: (parts) => parts
-            .map((p, i) => i === 0
-            ? p.toLowerCase()
-            : p.substring(0, 1).toUpperCase() + p.substring(1).toLowerCase())
-            .join(''),
+            .map((p, i) => i === 0 ? p.toLowerCase() : p.substring(0, 1).toUpperCase() + p.substring(1).toLowerCase())
+            .join("")
     },
-    "PascalCase": {
+    PascalCase: {
         regex: /^[A-Z][a-z]*([A-Z0-9][a-z]*)*$/,
         toParts: (name) => namingStyles.snake_case.toParts(name.replace(/(.)([A-Z])/g, "$1_$2")),
-        fromParts: (parts) => parts
-            .map(p => p.substring(0, 1).toUpperCase() + p.substring(1).toLowerCase())
-            .join(''),
+        fromParts: (parts) => parts.map(p => p.substring(0, 1).toUpperCase() + p.substring(1).toLowerCase()).join("")
     },
     "kebab-case": {
         regex: /^[a-z][a-z0-9]*(-[a-z0-9]+)*$/,
-        toParts: (name) => name.split('-'),
-        fromParts: (parts) => parts.map(p => p.toLowerCase()).join('-'),
+        toParts: (name) => name.split("-"),
+        fromParts: (parts) => parts.map(p => p.toLowerCase()).join("-")
     },
     "SCREAMING-KEBAB-CASE": {
         regex: /^[A-Z][A-Z0-9]*(-[A-Z0-9]+)*$/,
-        toParts: (name) => name.split('-'),
-        fromParts: (parts) => parts.map(p => p.toUpperCase()).join('-'),
+        toParts: (name) => name.split("-"),
+        fromParts: (parts) => parts.map(p => p.toUpperCase()).join("-")
     },
-    "lowercase": {
+    lowercase: {
         regex: /^[a-z][a-z0-9]*$/,
         toParts: (name) => [name],
-        fromParts: (parts) => parts.map(p => p.toLowerCase()).join(''),
+        fromParts: (parts) => parts.map(p => p.toLowerCase()).join("")
     },
-    "UPPERCASE": {
+    UPPERCASE: {
         regex: /^[A-Z][A-Z0-9]*$/,
         toParts: (name) => [name],
-        fromParts: (parts) => parts.map(p => p.toUpperCase()).join(''),
-    },
+        fromParts: (parts) => parts.map(p => p.toUpperCase()).join("")
+    }
 };
 class RustTargetLanguage extends TargetLanguage_1.TargetLanguage {
     makeRenderer(renderContext, untypedOptionValues) {
@@ -382,8 +378,7 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
 exports.RustRenderer = RustRenderer;
 function getPreferedNamingStyle(namingStyleOccurences, defaultStyle) {
     const occurrences = Object.fromEntries(Object.keys(namingStyles).map(key => [key, 0]));
-    namingStyleOccurences
-        .forEach(style => ++occurrences[style]);
+    namingStyleOccurences.forEach(style => ++occurrences[style]);
     const max = Math.max(...Object.values(occurrences));
     const preferedStyles = Object.entries(occurrences)
         .filter(([_style, num]) => num === max)

package/package.json

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