quicktype-core 6.0.71 → 6.1.0

package/dist/language/Kotlin.d.ts

@@ -5,6 +5,7 @@ import { Sourcelike } from "../Source";
 import { TargetLanguage } from "../TargetLanguage";
 import { ArrayType, ClassType, EnumType, MapType, ObjectType, PrimitiveType, Type, UnionType } from "../Type";
 import { RenderContext } from "../Renderer";
+import { AcronymStyleOptions } from "../support/Acronyms";
 export declare enum Framework {
     None = 0,
     Jackson = 1,
@@ -13,6 +14,7 @@ export declare enum Framework {
 }
 export declare const kotlinOptions: {
     framework: EnumOption<Framework>;
+    acronymStyle: EnumOption<AcronymStyleOptions>;
     packageName: StringOption;
 };
 export declare class KotlinTargetLanguage extends TargetLanguage {

package/dist/language/Kotlin.js

@@ -11,6 +11,7 @@ const Support_1 = require("../support/Support");
 const TargetLanguage_1 = require("../TargetLanguage");
 const Type_1 = require("../Type");
 const TypeUtils_1 = require("../TypeUtils");
+const Acronyms_1 = require("../support/Acronyms");
 var Framework;
 (function (Framework) {
     Framework[Framework["None"] = 0] = "None";
@@ -20,6 +21,7 @@ var Framework;
 })(Framework = exports.Framework || (exports.Framework = {}));
 exports.kotlinOptions = {
     framework: new RendererOptions_1.EnumOption("framework", "Serialization framework", [["just-types", Framework.None], ["jackson", Framework.Jackson], ["klaxon", Framework.Klaxon], ["kotlinx", Framework.KotlinX]], "klaxon"),
+    acronymStyle: Acronyms_1.acronymOption(Acronyms_1.AcronymStyleOptions.Pascal),
     packageName: new RendererOptions_1.StringOption("package", "Package", "PACKAGE", "quicktype")
 };
 class KotlinTargetLanguage extends TargetLanguage_1.TargetLanguage {
@@ -27,7 +29,7 @@ class KotlinTargetLanguage extends TargetLanguage_1.TargetLanguage {
         super("Kotlin", ["kotlin"], "kt");
     }
     getOptions() {
-        return [exports.kotlinOptions.framework, exports.kotlinOptions.packageName];
+        return [exports.kotlinOptions.framework, exports.kotlinOptions.acronymStyle, exports.kotlinOptions.packageName];
     }
     get supportsOptionalClassProperties() {
         return true;
@@ -110,9 +112,9 @@ function isStartCharacter(codePoint) {
     return isPartCharacter(codePoint) && !Strings_1.isDigit(codePoint);
 }
 const legalizeName = Strings_1.legalizeCharacters(isPartCharacter);
-function kotlinNameStyle(isUpper, original) {
+function kotlinNameStyle(isUpper, original, acronymsStyle = Strings_1.allUpperWordStyle) {
     const words = Strings_1.splitIntoWords(original);
-    return Strings_1.combineWords(words, legalizeName, isUpper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, isUpper ? Strings_1.allUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter);
+    return Strings_1.combineWords(words, legalizeName, isUpper ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.firstUpperWordStyle, isUpper ? Strings_1.allUpperWordStyle : Strings_1.allLowerWordStyle, acronymsStyle, "", isStartCharacter);
 }
 function unicodeEscape(codePoint) {
     return "\\u" + Strings_1.intToHex(codePoint, 4);
@@ -122,8 +124,6 @@ function stringEscape(s) {
     // "$this" is a template string in Kotlin so we have to escape $
     return _stringEscape(s).replace(/\$/g, "\\$");
 }
-const upperNamingFunction = Naming_1.funPrefixNamer("upper", s => kotlinNameStyle(true, s));
-const lowerNamingFunction = Naming_1.funPrefixNamer("lower", s => kotlinNameStyle(false, s));
 class KotlinRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     constructor(targetLanguage, renderContext, _kotlinOptions) {
         super(targetLanguage, renderContext);
@@ -145,16 +145,16 @@ class KotlinRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return kotlinNameStyle(true, rawName);
     }
     makeNamedTypeNamer() {
-        return upperNamingFunction;
+        return Naming_1.funPrefixNamer("upper", s => kotlinNameStyle(true, s, Acronyms_1.acronymStyle(this._kotlinOptions.acronymStyle)));
     }
     namerForObjectProperty() {
-        return lowerNamingFunction;
+        return Naming_1.funPrefixNamer("lower", s => kotlinNameStyle(false, s, Acronyms_1.acronymStyle(this._kotlinOptions.acronymStyle)));
     }
     makeUnionMemberNamer() {
         return Naming_1.funPrefixNamer("upper", s => kotlinNameStyle(true, s) + "Value");
     }
     makeEnumCaseNamer() {
-        return upperNamingFunction;
+        return Naming_1.funPrefixNamer("upper", s => kotlinNameStyle(true, s, Acronyms_1.acronymStyle(this._kotlinOptions.acronymStyle)));
     }
     emitDescriptionBlock(lines) {
         this.emitCommentLines(lines, " * ", "/**", " */");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "6.0.71",
+    "version": "6.1.0",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -45,6 +45,6 @@
         "fs": false
     },
     "config": {
-        "commit": "4338513046695713324a750cacb54b6a99381b26"
+        "commit": "7c1db5f51ccd8f66319792238d3ad58c52fc3d8c"
     }
 }