@json-schema-tools/transpiler - npm Package Compare versions

Comparing version 1.0.1 to 1.1.0

build/codegens/codegen.js

@@ -24,3 +24,6 @@ "use strict";
         var _this = this;
-        var rootSchemaTypes = this.generate(this.schema, this.toIR(this.schema));
+        var rootSchemaTypes = "";
+        if (this.schema.$ref === undefined) {
+            rootSchemaTypes = this.generate(this.schema, this.toIR(this.schema));
+        }
         var defsSchemaTypes = [];
@@ -27,0 +30,0 @@ if (this.schema.definitions) {

build/utils.js

@@ -29,3 +29,3 @@ "use strict";
 var crypto_1 = require("crypto");
-var traverse_1 = __importDefault(require("./traverse"));
+var traverse_1 = __importDefault(require("@json-schema-tools/traverse"));
 /**
@@ -141,3 +141,4 @@ * Capitalize the first letter of the string.
     var friendlyHash = hash.replace(hashRegex, "").slice(0, 8);
-    return __assign(__assign({}, schema), { title: "" + prefix + friendlyHash });
+    schema.title = "" + prefix + friendlyHash;
+    return schema;
 }
@@ -159,3 +160,3 @@ exports.getDefaultTitleForSchema = getDefaultTitleForSchema;
  */
-exports.ensureSchemaTitles = function (s) { return traverse_1.default(s, getDefaultTitleForSchema); };
+exports.ensureSchemaTitles = function (s) { return traverse_1.default(s, getDefaultTitleForSchema, { mutable: true }); };
 /**
@@ -174,6 +175,10 @@ * Returns the schema where all subschemas have been replaced with $refs and added to definitions
     var definitions = {};
-    return __assign(__assign({}, traverse_1.default(s, function (subSchema) {
+    traverse_1.default(s, function (subSchema) {
         definitions[subSchema.title] = subSchema;
         return { $ref: "#/definitions/" + subSchema.title };
-    })), { definitions: definitions });
+    }, { mutable: true, skipFirstMutation: true });
+    if (typeof s === "object") {
+        s.definitions = definitions;
+    }
+    return s;
 }
@@ -180,0 +185,0 @@ exports.collectAndRefSchemas = collectAndRefSchemas;

CHANGELOG.md

@@ -0,1 +1,14 @@
+# [1.1.0](https://github.com/json-schema-tools/transpiler/compare/1.0.1...1.1.0) (2020-07-02)
+
+
+### Bug Fixes
+
+* all green baby! ([75ee5f4](https://github.com/json-schema-tools/transpiler/commit/75ee5f4109813a8a654be9f14492107a5612aa37))
+* update dereferencer ([af4db1b](https://github.com/json-schema-tools/transpiler/commit/af4db1b06c44d0a76322f353afe07071fdc5ee35))
+
+
+### Features
+
+* integrate new traverse ([8227adb](https://github.com/json-schema-tools/transpiler/commit/8227adb50977eb1276a5c501c06ce3c098df25ed))
+
 ## [1.0.1](https://github.com/json-schema-tools/transpiler/compare/1.0.0...1.0.1) (2020-06-30)
@@ -2,0 +15,0 @@

package.json

 {
   "name": "@json-schema-tools/transpiler",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "",
@@ -36,8 +36,7 @@ "main": "build/index.js",
   "dependencies": {
-    "@json-schema-tools/dereferencer": "^1.0.5",
-    "@json-schema-tools/traverse": "^1.1.2",
+    "@json-schema-tools/dereferencer": "^1.0.7",
+    "@json-schema-tools/traverse": "^1.2.2",
     "lodash.deburr": "^4.1.0",
-    "lodash.merge": "^4.6.2",
     "lodash.trim": "^4.5.1"
   }
 }

src/codegens/codegen.ts

@@ -21,3 +21,6 @@ import { JSONMetaSchema } from "@json-schema-tools/meta-schema";
   public transpile() {
-    const rootSchemaTypes = this.generate(this.schema, this.toIR(this.schema));
+    let rootSchemaTypes = "";
+    if (this.schema.$ref === undefined) {
+      rootSchemaTypes = this.generate(this.schema, this.toIR(this.schema));
+    }
     const defsSchemaTypes: string[] = [];
@@ -24,0 +27,0 @@ if (this.schema.definitions) {

src/ensure-subschema-titles.ts

@@ -48,3 +48,3 @@ import { JSONMetaSchema } from "@json-schema-tools/meta-schema";
   if (s.properties) {
-    const propVals = Object.entries(s.properties) as Array<[string, JSONMetaSchema]>;
+    const propVals = Object.entries(s.properties) as [string, JSONMetaSchema][];
     propVals.forEach(([key, ss]: [string, JSONMetaSchema]) => {
@@ -51,0 +51,0 @@ if (ss.title === undefined) { errors.push(new NoTitleError(s, `properties.${key}`, ss)); }

src/utils.ts

 import deburr from "lodash.deburr";
 import trim from "lodash.trim";
-import { JSONMetaSchema, Properties } from "@json-schema-tools/meta-schema";
+import { JSONMetaSchema, Properties, Title } from "@json-schema-tools/meta-schema";
 import { ensureSubschemaTitles } from "./ensure-subschema-titles";
 import { createHash } from "crypto";
-import traverse from "./traverse";
+import traverse from "@json-schema-tools/traverse";
 
@@ -123,3 +123,5 @@ /**
   const friendlyHash = hash.replace(hashRegex, "").slice(0, 8);
-  return { ...schema, title: `${prefix}${friendlyHash}` };
+
+  schema.title = `${prefix}${friendlyHash}`;
+  return schema;
 }
@@ -141,3 +143,7 @@
  */
-export const ensureSchemaTitles = (s: JSONMetaSchema): JSONMetaSchema => traverse(s, getDefaultTitleForSchema);
+export const ensureSchemaTitles = (s: JSONMetaSchema): JSONMetaSchema => traverse(
+  s,
+  getDefaultTitleForSchema,
+  { mutable: true },
+);
 
@@ -157,9 +163,17 @@ /**
   const definitions: any = {};
-  return {
-    ...traverse(s, (subSchema: JSONMetaSchema) => {
+
+  traverse(
+    s,
+    (subSchema: JSONMetaSchema) => {
       definitions[subSchema.title as string] = subSchema;
       return { $ref: `#/definitions/${subSchema.title}` };
-    }),
-    definitions,
-  };
+    },
+    { mutable: true, skipFirstMutation: true },
+  );
+
+  if (typeof s === "object") {
+    s.definitions = definitions;
+  }
+
+  return s;
 }
@@ -166,0 +180,0 @@

No alert changes

Improved metrics

Dependency count

4

-20%

Worsened metrics

Total package byte prevSize

262326

-8.28%

Number of package files

108

-5.26%

Lines of code

5474

-10.51%

Dependency changes

• - Removed

  lodash.merge@^4.6.2

• - Removed

  lodash.merge@4.6.2
  (transitive)

• Updated

  @json-schema-tools/dereferencer@^1.0.7

• Updated

  @json-schema-tools/traverse@^1.2.2