quicktype-core 7.0.8 → 7.0.9

package/dist/language/Python.d.ts

@@ -7,9 +7,7 @@ import { ConvenienceRenderer, ForbiddenWordsInfo } from "../ConvenienceRenderer"
 import { Namer, Name, DependencyName } from "../Naming";
 import { Sourcelike, MultiWord } from "../Source";
 import { Transformer } from "../Transformers";
-export declare type PythonVersion = 2 | 3;
 export declare type PythonFeatures = {
-    version: 2 | 3;
     typeHints: boolean;
     dataClasses: boolean;
 };
@@ -59,7 +57,6 @@ export declare class PythonRenderer extends ConvenienceRenderer {
     protected emitClass(t: ClassType): void;
     protected emitEnum(t: EnumType): void;
     protected emitImports(): void;
-    protected emitDefaultLeadingComments(): void;
     protected emitSupportCode(): void;
     protected emitClosingCode(): void;
     protected emitSourceStructure(_givenOutputFilename: string): void;

package/dist/language/Python.js

@@ -72,13 +72,12 @@ const forbiddenPropertyNames = [
 ];
 exports.pythonOptions = {
     features: new RendererOptions_1.EnumOption("python-version", "Python version", [
-        ["2.7", { version: 2, typeHints: false, dataClasses: false }],
-        ["3.5", { version: 3, typeHints: false, dataClasses: false }],
-        ["3.6", { version: 3, typeHints: true, dataClasses: false }],
-        ["3.7", { version: 3, typeHints: true, dataClasses: true }]
+        ["3.5", { typeHints: false, dataClasses: false }],
+        ["3.6", { typeHints: true, dataClasses: false }],
+        ["3.7", { typeHints: true, dataClasses: true }]
     ], "3.6"),
     justTypes: new RendererOptions_1.BooleanOption("just-types", "Classes only", false),
-    nicePropertyNames: new RendererOptions_1.BooleanOption("nice-property-names", "Transform property names to be Pythonic", true),
+    nicePropertyNames: new RendererOptions_1.BooleanOption("nice-property-names", "Transform property names to be Pythonic", true)
 };
 class PythonTargetLanguage extends TargetLanguage_1.TargetLanguage {
     getOptions() {
@@ -118,12 +117,6 @@ class PythonTargetLanguage extends TargetLanguage_1.TargetLanguage {
     }
 }
 exports.PythonTargetLanguage = PythonTargetLanguage;
-function isStartCharacter2(utf16Unit) {
-    return Strings_1.isAscii(utf16Unit) && Strings_1.isLetter(utf16Unit);
-}
-function isPartCharacter2(utf16Unit) {
-    return Strings_1.isAscii(utf16Unit) && Strings_1.isLetterOrUnderscoreOrDigit(utf16Unit);
-}
 function isNormalizedStartCharacter3(utf16Unit) {
     // FIXME: add Other_ID_Start - https://docs.python.org/3/reference/lexical_analysis.html#identifiers
     const category = unicode.getCategory(utf16Unit);
@@ -156,11 +149,10 @@ function isPartCharacter3(utf16Unit) {
     }
     return true;
 }
-const legalizeName2 = Strings_1.utf16LegalizeCharacters(isPartCharacter2);
 const legalizeName3 = Strings_1.utf16LegalizeCharacters(isPartCharacter3);
-function classNameStyle(version, original) {
+function classNameStyle(original) {
     const words = Strings_1.splitIntoWords(original);
-    return Strings_1.combineWords(words, version === 2 ? legalizeName2 : legalizeName3, Strings_1.firstUpperWordStyle, Strings_1.firstUpperWordStyle, Strings_1.allUpperWordStyle, Strings_1.allUpperWordStyle, "", version === 2 ? isStartCharacter2 : isStartCharacter3);
+    return Strings_1.combineWords(words, legalizeName3, Strings_1.firstUpperWordStyle, Strings_1.firstUpperWordStyle, Strings_1.allUpperWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter3);
 }
 function getWordStyle(uppercase, forceSnakeNameStyle) {
     if (!forceSnakeNameStyle) {
@@ -168,11 +160,11 @@ function getWordStyle(uppercase, forceSnakeNameStyle) {
     }
     return uppercase ? Strings_1.allUpperWordStyle : Strings_1.allLowerWordStyle;
 }
-function snakeNameStyle(version, original, uppercase, forceSnakeNameStyle) {
+function snakeNameStyle(original, uppercase, forceSnakeNameStyle) {
     const wordStyle = getWordStyle(uppercase, forceSnakeNameStyle);
     const separator = forceSnakeNameStyle ? "_" : "";
     const words = Strings_1.splitIntoWords(original);
-    return Strings_1.combineWords(words, version === 2 ? legalizeName2 : legalizeName3, wordStyle, wordStyle, wordStyle, wordStyle, separator, isStartCharacter3);
+    return Strings_1.combineWords(words, legalizeName3, wordStyle, wordStyle, wordStyle, wordStyle, separator, isStartCharacter3);
 }
 class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     constructor(targetLanguage, renderContext, pyOptions) {
@@ -188,16 +180,16 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return { names: forbiddenPropertyNames, includeGlobalForbidden: false };
     }
     makeNamedTypeNamer() {
-        return Naming_1.funPrefixNamer("type", s => classNameStyle(this.pyOptions.features.version, s));
+        return Naming_1.funPrefixNamer("type", classNameStyle);
     }
     namerForObjectProperty() {
-        return Naming_1.funPrefixNamer("property", s => snakeNameStyle(this.pyOptions.features.version, s, false, this.pyOptions.nicePropertyNames));
+        return Naming_1.funPrefixNamer("property", s => snakeNameStyle(s, false, this.pyOptions.nicePropertyNames));
     }
     makeUnionMemberNamer() {
         return null;
     }
     makeEnumCaseNamer() {
-        return Naming_1.funPrefixNamer("enum-case", s => snakeNameStyle(this.pyOptions.features.version, s, true, this.pyOptions.nicePropertyNames));
+        return Naming_1.funPrefixNamer("enum-case", s => snakeNameStyle(s, true, this.pyOptions.nicePropertyNames));
     }
     get commentLineStart() {
         return "# ";
@@ -222,7 +214,7 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.indent(f);
     }
     string(s) {
-        const openQuote = this.pyOptions.features.version === 2 ? 'u"' : '"';
+        const openQuote = '"';
         return [openQuote, Strings_1.stringEscape(s), '"'];
     }
     withImport(module, name) {
@@ -255,7 +247,13 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     rest.push(" = None");
                 if (nonNulls.size > 1) {
                     this.withImport("typing", "Union");
-                    return [this.withTyping("Optional"), "[Union[", collection_utils_1.arrayIntercalate(", ", memberTypes), "]]", ...rest];
+                    return [
+                        this.withTyping("Optional"),
+                        "[Union[",
+                        collection_utils_1.arrayIntercalate(", ", memberTypes),
+                        "]]",
+                        ...rest
+                    ];
                 }
                 else {
                     return [this.withTyping("Optional"), "[", Support_1.defined(collection_utils_1.iterableFirst(memberTypes)), "]", ...rest];
@@ -362,20 +360,6 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine("from ", module, " import ", Array.from(names).join(", "));
         });
     }
-    emitDefaultLeadingComments() {
-        if (this.pyOptions.features.version === 2) {
-            this.emitCommentLines(["coding: utf-8"]);
-            this.ensureBlankLine();
-            if (this.haveEnums) {
-                this.emitCommentLines([
-                    "",
-                    "To use this code in Python 2.7 you'll have to",
-                    "",
-                    "    pip install enum34"
-                ]);
-            }
-        }
-    }
     emitSupportCode() {
         return;
     }
@@ -393,9 +377,6 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this.leadingComments !== undefined) {
             this.emitCommentLines(this.leadingComments);
         }
-        else {
-            this.emitDefaultLeadingComments();
-        }
         this.ensureBlankLine();
         this.emitImports();
         this.ensureBlankLine(2);
@@ -472,7 +453,7 @@ class JSONPythonRenderer extends PythonRenderer {
     constructor() {
         super(...arguments);
         this._deserializerFunctions = new Set();
-        this._converterNamer = Naming_1.funPrefixNamer("converter", s => snakeNameStyle(this.pyOptions.features.version, s, false, this.pyOptions.nicePropertyNames));
+        this._converterNamer = Naming_1.funPrefixNamer("converter", s => snakeNameStyle(s, false, this.pyOptions.nicePropertyNames));
         this._topLevelConverterNames = new Map();
         this._haveTypeVar = false;
         this._haveEnumTypeVar = false;
@@ -542,7 +523,7 @@ class JSONPythonRenderer extends PythonRenderer {
     }
     emitStrConverter() {
         this.emitBlock(["def from_str(", this.typingDecl("x", "Any"), ")", this.typeHint(" -> str"), ":"], () => {
-            const strType = this.pyOptions.features.version === 2 ? "(str, unicode)" : "str";
+            const strType = "str";
             this.emitLine("assert isinstance(x, ", strType, ")");
             this.emitLine("return x");
         });
@@ -725,7 +706,14 @@ class JSONPythonRenderer extends PythonRenderer {
         };
         if (xfer instanceof Transformers_1.DecodingChoiceTransformer || xfer instanceof Transformers_1.ChoiceTransformer) {
             const lambdas = xfer.transformers.map(x => makeLambda(this.transformer(identity, x, targetType)).source);
-            return compose(inputTransformer, v => [this.conv("union"), "([", collection_utils_1.arrayIntercalate(", ", lambdas), "], ", v, ")"]);
+            return compose(inputTransformer, v => [
+                this.conv("union"),
+                "([",
+                collection_utils_1.arrayIntercalate(", ", lambdas),
+                "], ",
+                v,
+                ")"
+            ]);
         }
         else if (xfer instanceof Transformers_1.DecodingTransformer) {
             const consumer = xfer.consumer;
@@ -811,7 +799,10 @@ class JSONPythonRenderer extends PythonRenderer {
             ", ",
             v,
             ")"
-        ]), classType => compose(value, { lambda: Source_1.singleWord(this.nameForNamedType(classType), ".from_dict"), value: undefined }), mapType => compose(value, v => [
+        ]), classType => compose(value, {
+            lambda: Source_1.singleWord(this.nameForNamedType(classType), ".from_dict"),
+            value: undefined
+        }), mapType => compose(value, v => [
             this.conv("dict"),
             "(",
             makeLambda(this.deserializer(identity, mapType.values)).source,
@@ -821,7 +812,14 @@ class JSONPythonRenderer extends PythonRenderer {
         ]), enumType => compose(value, { lambda: Source_1.singleWord(this.nameForNamedType(enumType)), value: undefined }), unionType => {
             // FIXME: handle via transformers
             const deserializers = Array.from(unionType.members).map(m => makeLambda(this.deserializer(identity, m)).source);
-            return compose(value, v => [this.conv("union"), "([", collection_utils_1.arrayIntercalate(", ", deserializers), "], ", v, ")"]);
+            return compose(value, v => [
+                this.conv("union"),
+                "([",
+                collection_utils_1.arrayIntercalate(", ", deserializers),
+                "], ",
+                v,
+                ")"
+            ]);
         }, transformedStringType => {
             // FIXME: handle via transformers
             if (transformedStringType.kind === "date-time") {
@@ -855,7 +853,14 @@ class JSONPythonRenderer extends PythonRenderer {
             ")"
         ]), enumType => compose(value, v => [this.conv("to-enum"), "(", this.nameForNamedType(enumType), ", ", v, ")"]), unionType => {
             const serializers = Array.from(unionType.members).map(m => makeLambda(this.serializer(identity, m)).source);
-            return compose(value, v => [this.conv("union"), "([", collection_utils_1.arrayIntercalate(", ", serializers), "], ", v, ")"]);
+            return compose(value, v => [
+                this.conv("union"),
+                "([",
+                collection_utils_1.arrayIntercalate(", ", serializers),
+                "], ",
+                v,
+                ")"
+            ]);
         }, transformedStringType => {
             if (transformedStringType.kind === "date-time") {
                 return compose(value, v => [v, ".isoformat()"]);
@@ -926,7 +931,6 @@ class JSONPythonRenderer extends PythonRenderer {
         return [fromDict, toDict];
     }
     emitDefaultLeadingComments() {
-        super.emitDefaultLeadingComments();
         this.ensureBlankLine();
         if (this._haveDateutil) {
             this.emitCommentLines([

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "7.0.8",
+    "version": "7.0.9",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -45,6 +45,6 @@
         "fs": false
     },
     "config": {
-        "commit": "f4487c279b4d7a4131e6822bdda846904760dd63"
+        "commit": "316b5df7236a38c80f6d19bf5fbc19be3f3a07db"
     }
 }