fix: clean up remenants of bad ideas

package.json

@@ -27,6 +27,7 @@
     "!build/**/*.test.*"
   ],
   "devDependencies": {
+    "@json-schema-tools/dereferencer": "^1.5.2",
     "@json-schema-tools/meta-schema": "^1.6.10",
     "@types/inquirer": "^7.3.1",
     "@types/jest": "^26.0.15",
@@ -47,7 +48,6 @@
     "typescript": "4.2.4"
   },
   "dependencies": {
-    "@json-schema-tools/dereferencer": "^1.5.2",
     "@json-schema-tools/referencer": "^1.0.4",
     "@json-schema-tools/titleizer": "^1.0.5",
     "@json-schema-tools/traverse": "^1.7.8",

src/codegens/rust.ts

@@ -213,8 +213,7 @@ export default class Rust extends CodeGen {
 
   protected handleUntypedObject(s: JSONSchemaObject): TypeIntermediateRepresentation {
     if (s.additionalProperties) {
-      const refTitle = this.refToTitle(s.additionalProperties);
-      const typeName = this.getSafeTitle(refTitle);
+      const typeName = this.getSafeTitle(this.refToTitle(s.additionalProperties));
       const propertyTypings = [
         "#[serde(flatten)]",
         `pub additional_properties: Option<${typeName}>`
@@ -246,7 +245,7 @@ export default class Rust extends CodeGen {
   }
 
   protected handleAnyOf(s: JSONSchemaObject): TypeIntermediateRepresentation {
-    return this.buildEnum(s.anyOf as JSONSchema[], s);
+    return this.buildEnum(s.anyOf as JSONSchema[]);
   }
 
   /**
@@ -257,7 +256,7 @@ export default class Rust extends CodeGen {
   }
 
   protected handleOneOf(s: JSONSchemaObject): TypeIntermediateRepresentation {
-    return this.buildEnum(s.oneOf as JSONSchema[], s);
+    return this.buildEnum(s.oneOf as JSONSchema[]);
   }
 
   protected handleConstantBool(s: JSONSchemaBoolean): TypeIntermediateRepresentation {
@@ -270,11 +269,10 @@ export default class Rust extends CodeGen {
     return { documentationComment: this.buildDocs(s), prefix: "type", typing: "serde_json::Value" };
   }
 
-  private buildEnum(s: JSONSchema[], parentSchema: JSONSchemaObject): TypeIntermediateRepresentation {
+  private buildEnum(s: JSONSchema[]): TypeIntermediateRepresentation {
     const typeLines = s
       .map((enumItem) => {
-        const refTitle = this.refToTitle(enumItem);
-        let typeName = this.getSafeTitle(refTitle);
+        let typeName = this.getSafeTitle(this.refToTitle(enumItem));
         let rhsTypeName = typeName;
         if (enumItem !== false && enumItem !== true && enumItem.isCycle) {
           rhsTypeName = `Box<${typeName}>`;

src/index.ts

@@ -25,9 +25,9 @@ export class Transpiler {
     const reffed = schemaWithTitles.map(referencer);
     const reffedAndCycleMarked = reffed.map((s) => setIsCycle(s, cycleMap));
     if (useMerge) {
-      this.megaSchema = combineSchemas(reffed);
+      this.megaSchema = combineSchemas(reffedAndCycleMarked);
     } else {
-      [this.megaSchema] = reffed;
+      [this.megaSchema] = reffedAndCycleMarked;
     }
   }
 

src/utils.ts

@@ -2,8 +2,6 @@ import deburr from "lodash.deburr";
 import trim from "lodash.trim";
 import { JSONSchema, Properties, JSONSchemaObject } from "@json-schema-tools/meta-schema";
 import traverse from "@json-schema-tools/traverse";
-import Dereferencer from "@json-schema-tools/dereferencer";
-import referencer from "@json-schema-tools/referencer";
 
 /**
  * Capitalize the first letter of the string.