quicktype-core 23.0.166 → 23.0.168

package/dist/TypeUtils.d.ts

@@ -1,6 +1,6 @@
-import { type StringTypes } from "./attributes/StringTypes";
 import { type CombinationKind, type TypeAttributes } from "./attributes/TypeAttributes";
 import { ArrayType, type ClassProperty, ClassType, EnumType, MapType, ObjectType, type PrimitiveType, type SetOperationType, type Type, UnionType } from "./Type";
+import { type StringTypes } from "./attributes/StringTypes";
 export declare function assertIsObject(t: Type): ObjectType;
 export declare function assertIsClass(t: Type): ClassType;
 export declare function setOperationMembersRecursively<T extends SetOperationType>(setOperations: T | T[], combinationKind: CombinationKind | undefined): [ReadonlySet<Type>, TypeAttributes];

package/dist/TypeUtils.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchCompoundType = exports.matchType = exports.matchTypeExhaustive = exports.stringTypesForType = exports.directlyReachableSingleNamedType = exports.directlyReachableTypes = exports.separateNamedTypes = exports.isNamedType = exports.getNullAsOptional = exports.nonNullTypeCases = exports.nullableFromUnion = exports.removeNullFromType = exports.removeNullFromUnion = exports.isAnyOrNull = exports.combineTypeAttributesOfTypes = exports.makeGroupsToFlatten = exports.setOperationMembersRecursively = exports.assertIsClass = exports.assertIsObject = void 0;
 const collection_utils_1 = require("collection-utils");
-// eslint-disable-next-line import/no-cycle
-const StringTypes_1 = require("./attributes/StringTypes");
 const TypeAttributes_1 = require("./attributes/TypeAttributes");
 const Support_1 = require("./support/Support");
+// eslint-disable-next-line import/no-cycle
 const Type_1 = require("./Type");
+// String types should be imported last to avoid circular dependency issues.
+// eslint-disable-next-line import/order
+const StringTypes_1 = require("./attributes/StringTypes");
 function assertIsObject(t) {
     if (t instanceof Type_1.ObjectType) {
         return t;

package/dist/language/CJSON/language.d.ts

@@ -24,7 +24,7 @@ import { type RenderContext } from "../../Renderer";
 import { EnumOption, type Option, StringOption } from "../../RendererOptions";
 import { type NamingStyle } from "../../support/Strings";
 import { TargetLanguage } from "../../TargetLanguage";
-import { type FixMeOptionsType, type FixMeOptionsAnyType } from "../../types";
+import { type FixMeOptionsAnyType, type FixMeOptionsType } from "../../types";
 import { CJSONRenderer } from "./CJSONRenderer";
 export declare const cJSONOptions: {
     typeSourceStyle: EnumOption<boolean>;

package/dist/language/Rust/RustRenderer.js

@@ -71,7 +71,7 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     emitRenameAttribute(propName, jsonName, defaultNamingStyle, preferedNamingStyle) {
         const escapedName = (0, utils_1.rustStringEscape)(jsonName);
         const name = utils_1.namingStyles[defaultNamingStyle].fromParts(this.sourcelikeToString(propName).split(" "));
-        const styledName = (0, utils_1.nameToNamingStyle)(name, preferedNamingStyle);
+        const styledName = (0, utils_1.nameWithNamingStyle)(name, preferedNamingStyle);
         const namesDiffer = escapedName !== styledName;
         if (namesDiffer) {
             this.emitLine('#[serde(rename = "', escapedName, '")]');
@@ -103,7 +103,7 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
         // Set the default naming style on the struct
         const defaultStyle = "snake_case";
-        const preferedNamingStyle = (0, utils_1.getPreferedNamingStyle)(Object.values(propertiesNamingStyles).flat(), defaultStyle);
+        const preferedNamingStyle = (0, utils_1.getPreferredNamingStyle)(Object.values(propertiesNamingStyles).flat(), defaultStyle);
         if (preferedNamingStyle !== defaultStyle) {
             this.emitLine(`#[serde(rename_all = "${preferedNamingStyle}")]`);
         }
@@ -148,7 +148,7 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
         // Set the default naming style on the enum
         const defaultStyle = "PascalCase";
-        const preferedNamingStyle = (0, utils_1.getPreferedNamingStyle)(Object.values(enumCasesNamingStyles).flat(), defaultStyle);
+        const preferedNamingStyle = (0, utils_1.getPreferredNamingStyle)(Object.values(enumCasesNamingStyles).flat(), defaultStyle);
         if (preferedNamingStyle !== defaultStyle) {
             this.emitLine(`#[serde(rename_all = "${preferedNamingStyle}")]`);
         }

package/dist/language/Rust/utils.d.ts

@@ -7,18 +7,52 @@ export declare enum Visibility {
     Crate = "Crate",
     Public = "Public"
 }
-type NameToParts = (name: string) => string[];
-type PartsToName = (parts: string[]) => string;
-interface NamingStyle {
-    fromParts: PartsToName;
-    regex: RegExp;
-    toParts: NameToParts;
-}
-export declare const namingStyles: Record<string, NamingStyle>;
+export declare const namingStyles: {
+    readonly snake_case: {
+        readonly regex: RegExp;
+        readonly toParts: (name: string) => string[];
+        readonly fromParts: (parts: string[]) => string;
+    };
+    readonly SCREAMING_SNAKE_CASE: {
+        readonly regex: RegExp;
+        readonly toParts: (name: string) => string[];
+        readonly fromParts: (parts: string[]) => string;
+    };
+    readonly camelCase: {
+        readonly regex: RegExp;
+        readonly toParts: (name: string) => string[];
+        readonly fromParts: (parts: string[]) => string;
+    };
+    readonly PascalCase: {
+        readonly regex: RegExp;
+        readonly toParts: (name: string) => string[];
+        readonly fromParts: (parts: string[]) => string;
+    };
+    readonly "kebab-case": {
+        readonly regex: RegExp;
+        readonly toParts: (name: string) => string[];
+        readonly fromParts: (parts: string[]) => string;
+    };
+    readonly "SCREAMING-KEBAB-CASE": {
+        readonly regex: RegExp;
+        readonly toParts: (name: string) => string[];
+        readonly fromParts: (parts: string[]) => string;
+    };
+    readonly lowercase: {
+        readonly regex: RegExp;
+        readonly toParts: (name: string) => string[];
+        readonly fromParts: (parts: string[]) => string;
+    };
+    readonly UPPERCASE: {
+        readonly regex: RegExp;
+        readonly toParts: (name: string) => string[];
+        readonly fromParts: (parts: string[]) => string;
+    };
+};
+export type NamingStyleKey = keyof typeof namingStyles;
 export declare const snakeNamingFunction: import("../../Naming").Namer;
 export declare const camelNamingFunction: import("../../Naming").Namer;
 export declare const rustStringEscape: (s: string) => string;
-export declare function getPreferedNamingStyle(namingStyleOccurences: string[], defaultStyle: string): string;
-export declare function listMatchingNamingStyles(name: string): string[];
-export declare function nameToNamingStyle(name: string, style: string): string;
-export {};
+export declare function getPreferredNamingStyle(namingStyleOccurences: string[], defaultStyle: NamingStyleKey): NamingStyleKey;
+export declare function listMatchingNamingStyles(name: string): NamingStyleKey[];
+export declare function nameWithNamingStyle(name: string, style: NamingStyleKey): string;

package/dist/language/Rust/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nameToNamingStyle = exports.listMatchingNamingStyles = exports.getPreferedNamingStyle = exports.rustStringEscape = exports.camelNamingFunction = exports.snakeNamingFunction = exports.namingStyles = exports.Visibility = exports.Density = void 0;
+exports.nameWithNamingStyle = exports.listMatchingNamingStyles = exports.getPreferredNamingStyle = exports.rustStringEscape = exports.camelNamingFunction = exports.snakeNamingFunction = exports.namingStyles = exports.Visibility = exports.Density = void 0;
 const Naming_1 = require("../../Naming");
 const Strings_1 = require("../../support/Strings");
 var Density;
@@ -58,6 +58,7 @@ exports.namingStyles = {
         fromParts: (parts) => parts.map(p => p.toUpperCase()).join("")
     }
 };
+exports.namingStyles;
 const isAsciiLetterOrUnderscoreOrDigit = (codePoint) => {
     if (!(0, Strings_1.isAscii)(codePoint)) {
         return false;
@@ -88,26 +89,22 @@ const standardUnicodeRustEscape = (codePoint) => {
     }
 };
 exports.rustStringEscape = (0, Strings_1.utf32ConcatMap)((0, Strings_1.escapeNonPrintableMapper)(Strings_1.isPrintable, standardUnicodeRustEscape));
-function getPreferedNamingStyle(namingStyleOccurences, defaultStyle) {
+function getPreferredNamingStyle(namingStyleOccurences, defaultStyle) {
     const occurrences = Object.fromEntries(Object.keys(exports.namingStyles).map(key => [key, 0]));
     namingStyleOccurences.forEach(style => ++occurrences[style]);
     const max = Math.max(...Object.values(occurrences));
-    const preferedStyles = Object.entries(occurrences)
-        .filter(([_style, num]) => num === max)
-        .map(([style, _num]) => style);
+    const preferedStyles = Object.entries(occurrences).flatMap(([style, num]) => num === max ? [style] : []);
     if (preferedStyles.includes(defaultStyle)) {
         return defaultStyle;
     }
     return preferedStyles[0];
 }
-exports.getPreferedNamingStyle = getPreferedNamingStyle;
+exports.getPreferredNamingStyle = getPreferredNamingStyle;
 function listMatchingNamingStyles(name) {
-    return Object.entries(exports.namingStyles)
-        .filter(([_, { regex }]) => regex.test(name))
-        .map(([namingStyle, _]) => namingStyle);
+    return Object.entries(exports.namingStyles).flatMap(([namingStyleKey, { regex }]) => regex.test(name) ? [namingStyleKey] : []);
 }
 exports.listMatchingNamingStyles = listMatchingNamingStyles;
-function nameToNamingStyle(name, style) {
+function nameWithNamingStyle(name, style) {
     if (exports.namingStyles[style].regex.test(name)) {
         return name;
     }
@@ -117,4 +114,4 @@ function nameToNamingStyle(name, style) {
     }
     return exports.namingStyles[style].fromParts(exports.namingStyles[fromStyle].toParts(name));
 }
-exports.nameToNamingStyle = nameToNamingStyle;
+exports.nameWithNamingStyle = nameWithNamingStyle;

package/package.json

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