quicktype-core 7.0.21 → 7.0.22

package/dist/language/ruby/index.js

@@ -7,6 +7,7 @@ const ConvenienceRenderer_1 = require("../../ConvenienceRenderer");
 const TargetLanguage_1 = require("../../TargetLanguage");
 const RendererOptions_1 = require("../../RendererOptions");
 const keywords = require("./keywords");
+const forbiddenForObjectProperties = Array.from(new Set([...keywords.keywords, ...keywords.reservedProperties]));
 const Type_1 = require("../../Type");
 const TypeUtils_1 = require("../../TypeUtils");
 const Strings_1 = require("../../support/Strings");
@@ -46,15 +47,16 @@ class RubyTargetLanguage extends TargetLanguage_1.TargetLanguage {
     }
 }
 exports.RubyTargetLanguage = RubyTargetLanguage;
-function isStartCharacter(utf16Unit) {
-    return unicode.isAlphabetic(utf16Unit) || utf16Unit === 0x5f; // underscore
-}
+const isStartCharacter = Strings_1.isLetterOrUnderscore;
 function isPartCharacter(utf16Unit) {
     const category = unicode.getCategory(utf16Unit);
     return ["Nd", "Pc", "Mn", "Mc"].indexOf(category) >= 0 || isStartCharacter(utf16Unit);
 }
 const legalizeName = Strings_1.legalizeCharacters(isPartCharacter);
 function simpleNameStyle(original, uppercase) {
+    if (/^[0-9]+$/.test(original)) {
+        original = original + "N";
+    }
     const words = Strings_1.splitIntoWords(original);
     return Strings_1.combineWords(words, legalizeName, uppercase ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, uppercase ? Strings_1.firstUpperWordStyle : Strings_1.allLowerWordStyle, Strings_1.allUpperWordStyle, Strings_1.allUpperWordStyle, "", isStartCharacter);
 }
@@ -77,10 +79,10 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         return "class" === t.kind;
     }
     forbiddenNamesForGlobalNamespace() {
-        return keywords.globals.concat(["Types", "JSON", "Dry", "Constructor"]);
+        return keywords.globals.concat(["Types", "JSON", "Dry", "Constructor", "Self"]);
     }
     forbiddenForObjectProperties(_c, _classNamed) {
-        return { names: keywords.reservedProperties, includeGlobalForbidden: true };
+        return { names: forbiddenForObjectProperties, includeGlobalForbidden: true };
     }
     makeNamedTypeNamer() {
         return new Naming_1.Namer("types", n => simpleNameStyle(n, true), []);
@@ -96,7 +98,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     dryType(t, isOptional = false) {
         const optional = isOptional ? ".optional" : "";
-        return TypeUtils_1.matchType(t, _anyType => ["Types::Any", optional], _nullType => ["Types::Nil", optional], _boolType => ["Types::Bool", optional], _integerType => ["Types::Int", optional], _doubleType => ["Types::Double", optional], _stringType => ["Types::String", optional], arrayType => ["Types.Array(", this.dryType(arrayType.items), ")", optional], classType => [this.nameForNamedType(classType), optional], mapType => ["Types::Hash.meta(of: ", this.dryType(mapType.values), ")", optional], enumType => ["Types::", this.nameForNamedType(enumType), optional], unionType => {
+        return TypeUtils_1.matchType(t, _anyType => ["Types::Any", optional], _nullType => ["Types::Nil", optional], _boolType => ["Types::Bool", optional], _integerType => ["Types::Integer", optional], _doubleType => ["Types::Double", optional], _stringType => ["Types::String", optional], arrayType => ["Types.Array(", this.dryType(arrayType.items), ")", optional], classType => [this.nameForNamedType(classType), optional], mapType => ["Types::Hash.meta(of: ", this.dryType(mapType.values), ")", optional], enumType => ["Types::", this.nameForNamedType(enumType), optional], unionType => {
             const nullable = TypeUtils_1.nullableFromUnion(unionType);
             if (nullable !== null) {
                 return [this.dryType(nullable), ".optional"];
@@ -307,7 +309,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.indent(() => {
                     const inits = [];
                     this.forEachClassProperty(c, "none", (name, jsonName, p) => {
-                        const expression = this.toDynamic(p.type, ["@", name], p.isOptional);
+                        const expression = this.toDynamic(p.type, name, p.isOptional);
                         inits.push([[`"${stringEscape(jsonName)}"`], [" => ", expression, ","]]);
                     });
                     this.emitTable(inits);
@@ -376,9 +378,9 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitBlock("def to_dynamic", () => {
                 let first = true;
                 this.forEachUnionMember(u, nonNulls, "none", null, (name, t) => {
-                    this.emitLine(first ? "if" : "elsif", " @", name, " != nil");
+                    this.emitLine(first ? "if" : "elsif", " ", name, " != nil");
                     this.indent(() => {
-                        this.emitLine(this.toDynamic(t, ["@", name]));
+                        this.emitLine(this.toDynamic(t, name));
                     });
                     first = false;
                 });
@@ -398,7 +400,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     emitTypesModule() {
         this.emitBlock(["module Types"], () => {
-            this.emitLine("include Dry::Types.module");
+            this.emitLine("include Dry.Types(default: :nominal)");
             const declarations = [];
             if (this._options.strictness !== Strictness.None) {
                 let has = { int: false, nil: false, bool: false, hash: false, string: false, double: false };
@@ -413,7 +415,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     };
                 });
                 if (has.int)
-                    declarations.push([["Int"], [` = ${this._options.strictness}Int`]]);
+                    declarations.push([["Integer"], [` = ${this._options.strictness}Integer`]]);
                 if (this._options.strictness === Strictness.Strict) {
                     if (has.nil)
                         declarations.push([["Nil"], [` = ${this._options.strictness}Nil`]]);
@@ -427,7 +429,7 @@ class RubyRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 if (has.double)
                     declarations.push([
                         ["Double"],
-                        [` = ${this._options.strictness}Float | ${this._options.strictness}Int`]
+                        [` = ${this._options.strictness}Float | ${this._options.strictness}Integer`]
                     ]);
             }
             this.forEachEnum("none", (enumType, enumName) => {

package/dist/language/ruby/keywords.js

@@ -223,6 +223,7 @@ const kernel = [
     "module_eval",
     "module_exec",
     "name",
+    "new",
     "nil?",
     "object_id",
     "open",
@@ -291,7 +292,9 @@ exports.globals = kernel.concat(globalClasses);
 exports.reservedProperties = [
     "__id__",
     "__send__",
+    "break",
     "call",
+    "case",
     "class",
     "clone",
     "constrained_type",
@@ -319,6 +322,7 @@ exports.reservedProperties = [
     "meta",
     "method",
     "methods",
+    "next",
     "object_id",
     "optional",
     "options",
@@ -331,6 +335,7 @@ exports.reservedProperties = [
     "remove_instance_variable",
     "rule",
     "safe",
+    "self",
     "send",
     "singleton_class",
     "singleton_method",
@@ -345,6 +350,8 @@ exports.reservedProperties = [
     "try",
     "type",
     "untaint",
+    "undef",
     "untrust",
+    "while",
     "with"
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "7.0.21",
+    "version": "7.0.22",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -45,6 +45,6 @@
         "fs": false
     },
     "config": {
-        "commit": "f27d5e096ad0c592d6b7aa50c4c56b310356754e"
+        "commit": "e6d9552bcb36d29258d8750515d2a0af310aefcd"
     }
 }