typescript-json-schema - npm Package Compare versions

Comparing version 0.3.3 to 0.3.4

package.json

 {
   "name": "typescript-json-schema",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "typescript-json-schema generates JSON Schema files from your Typescript sources",
@@ -35,4 +35,4 @@ "main": "typescript-json-schema.js",
     "json-stable-stringify": "^1.0.1",
-    "typescript": "~2.0.3",
-    "yargs": "^6.3.0"
+    "typescript": "~2.0.10",
+    "yargs": "^6.4.0"
   },
@@ -44,8 +44,8 @@ "devDependencies": {
     "@types/json-stable-stringify": "^1.0.29",
-    "@types/mocha": "^2.2.32",
-    "@types/node": "^6.0.46",
+    "@types/mocha": "^2.2.33",
+    "@types/node": "^6.0.51",
     "chai": "^3.5.0",
     "mocha": "^3.1.2",
-    "source-map-support": "^0.4.0",
-    "tslint": "^3.15.1"
+    "source-map-support": "^0.4.6",
+    "tslint": "^4.0.2"
   },
@@ -52,0 +52,0 @@ "scripts": {

test/programs/type-nullable/main.ts

@@ -19,2 +19,3 @@
 
+interface MyType6 {};
 
@@ -27,2 +28,8 @@ interface MyObject {
     var5: MyType5;
+
+    /**
+     * @nullable
+     */
+    var6: MyType6;
+    var7: MyType6;
 }

test/programs/type-nullable/schema.json

 {
-    "type": "object",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "definitions": {
+        "MyType6": {
+            "properties": {
+            },
+            "type": "object"
+        }
+    },
     "properties": {
@@ -20,6 +27,6 @@ "var1": {
                 {
-                    "type": "array",
                     "items": {
                         "type": "number"
-                    }
+                    },
+                    "type": "array"
                 },
@@ -37,6 +44,6 @@ {
                 {
-                    "type": "array",
                     "items": {
                         "type": "number"
-                    }
+                    },
+                    "type": "array"
                 },
@@ -51,3 +58,2 @@ {
                 {
-                    "type": "object",
                     "properties": {
@@ -60,3 +66,4 @@ "foo": {
                         "foo"
-                    ]
+                    ],
+                    "type": "object"
                 },
@@ -67,2 +74,15 @@ {
             ]
+        },
+        "var6": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/MyType6"
+                },
+                {
+                    "type": "null"
+                }
+            ]
+        },
+        "var7": {
+            "$ref": "#/definitions/MyType6"
         }
@@ -75,5 +95,7 @@ },
         "var4",
-        "var5"
+        "var5",
+        "var6",
+        "var7"
     ],
-    "$schema": "http://json-schema.org/draft-04/schema#"
-}
+    "type": "object"
+}

tsconfig.json

@@ -10,3 +10,5 @@ {
         "declaration": true,
-        "noImplicitAny": false,
+        "noImplicitAny": true,
+        "suppressImplicitAnyIndexErrors": true,
+        "strictNullChecks": false,
         "removeComments": true,
@@ -13,0 +15,0 @@ "noLib": false,

typescript-json-schema.d.ts

@@ -12,3 +12,3 @@ import * as ts from "typescript";
     strictNullChecks: boolean;
-    out: any;
+    out: string;
 };
@@ -37,3 +37,3 @@ export declare class JsonSchemaGenerator {
         strictNullChecks: boolean;
-        out: any;
+        out: string;
     });
@@ -74,3 +74,3 @@ readonly ReffedDefinitions: {
     strictNullChecks: boolean;
-    out: any;
+    out: string;
 }): any;
@@ -88,4 +88,4 @@ export declare function programFromConfig(configFileName: string): ts.Program;
     strictNullChecks: boolean;
-    out: any;
+    out: string;
 }): void;
 export declare function run(): void;

typescript-json-schema.js

@@ -18,3 +18,3 @@ "use strict";
         strictNullChecks: false,
-        out: undefined
+        out: ""
     };
@@ -551,6 +551,6 @@ }
             }
-            if (otherAnnotations["nullable"]) {
-                this.makeNullable(definition);
-            }
         }
+        if (otherAnnotations["nullable"]) {
+            this.makeNullable(returnedDefinition);
+        }
         return returnedDefinition;
@@ -726,3 +726,3 @@ };
         .boolean("strictNullChecks").default("strictNullChecks", defaultArgs.strictNullChecks)
-        .describe("strictNullChecks", "(TypeScript 2) Make values non-nullable by default.")
+        .describe("strictNullChecks", "Make values non-nullable by default.")
         .alias("out", "o")
@@ -729,0 +729,0 @@ .describe("out", "The output file, defaults to using stdout")

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

105264

increased by2.07%

Number of package files

80

increased by1.27%

Lines of code

2196

increased by1.34%

Dependency changes

• Updatedtypescript@~2.0.10

• Updatedyargs@^6.4.0