update style and naming

Author: SeeSharpSoft

Diff for: .eslintrc.js

@@ -1,42 +1,42 @@
 module.exports = {
-    parser: "@typescript-eslint/parser",
-    extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"],
-    env: {
-        browser: true,
-        node: true,
-    },
-    parserOptions: {
-        ecmaVersion: 2018,
-        sourceType: "module",
-    },
-    rules: {
-        "@typescript-eslint/explicit-module-boundary-types": "off",
-        "@typescript-eslint/explicit-function-return-type": "off",
-        "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/prefer-for-of": "error",
-        "@typescript-eslint/no-require-imports": "error",
-        "@typescript-eslint/no-parameter-properties": "off",
-        "no-unused-vars": "off",
-        "@typescript-eslint/no-unused-vars": [
-            "error",
-            {
-                vars: "all",
-                args: "none",
-                ignoreRestSiblings: true,
-            },
-        ],
-        "@typescript-eslint/no-object-literal-type-assertion": "off",
-        "@typescript-eslint/no-namespace": "error",
-        "@typescript-eslint/no-non-null-assertion": "off",
-        "max-len": ["error", { code: 120, tabWidth: 4 }],
-        "no-alert": "error",
-        "prefer-const": "error",
-        "no-return-assign": "error",
-        "no-useless-call": "error",
-        "no-shadow": "error",
-        "no-useless-concat": "error",
-        "no-undef": "off",
-        "no-prototype-builtins": "off",
-        "prettier/prettier": "error",
-    },
-};
+  parser: "@typescript-eslint/parser",
+  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"],
+  env: {
+    browser: true,
+    node: true,
+  },
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: "module",
+  },
+  rules: {
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/prefer-for-of": "error",
+    "@typescript-eslint/no-require-imports": "error",
+    "@typescript-eslint/no-parameter-properties": "off",
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        vars: "all",
+        args: "none",
+        ignoreRestSiblings: true,
+      },
+    ],
+    "@typescript-eslint/no-object-literal-type-assertion": "off",
+    "@typescript-eslint/no-namespace": "error",
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "max-len": ["error", { code: 120, tabWidth: 2 }],
+    "no-alert": "error",
+    "prefer-const": "error",
+    "no-return-assign": "error",
+    "no-useless-call": "error",
+    "no-shadow": "error",
+    "no-useless-concat": "error",
+    "no-undef": "off",
+    "no-prototype-builtins": "off",
+    "prettier/prettier": "error",
+  },
+};

Diff for: .prettierrc.json

@@ -1,20 +1,6 @@
 {
   "trailingComma": "es5",
   "printWidth": 120,
-  "tabWidth": 4,
-  "endOfLine": "lf",
-  "overrides": [
-    {
-      "files": "*.json",
-      "options": {
-        "tabWidth": 2
-      }
-    },
-    {
-      "files": "*.yml",
-      "options": {
-        "tabWidth": 2
-      }
-    }
-  ]
+  "tabWidth": 2,
+  "endOfLine": "lf"
 }

Diff for: babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-    presets: [["@babel/preset-env", { targets: { node: "current" } }], "@babel/preset-typescript"],
-};
+  presets: [["@babel/preset-env", { targets: { node: "current" } }], "@babel/preset-typescript"],
+};

Diff for: index.ts

@@ -1,5 +1,5 @@
 export * from "./src/Config";
-export * from "./src/JsonGenerator";
+export * from "./src/Generator";
 export * from "./src/NodeGenerator";
 export * from "./src/NodeVisitor";
 

Diff for: jest.config.js

@@ -1,11 +1,11 @@
 module.exports = {
-    testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$",
-    moduleFileExtensions: ["js", "ts", "json"],
-    testPathIgnorePatterns: ["<rootDir>/dist/", "<rootDir>/node_modules/", "<rootDir>/build/"],
-    coverageDirectory: "./coverage/",
-    collectCoverage: false,
-    testEnvironment: "node",
-    transform: {
-        ".*": "babel-jest",
-    },
-};
+  testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$",
+  moduleFileExtensions: ["js", "ts", "json"],
+  testPathIgnorePatterns: ["<rootDir>/dist/", "<rootDir>/node_modules/", "<rootDir>/build/"],
+  coverageDirectory: "./coverage/",
+  collectCoverage: false,
+  testEnvironment: "node",
+  transform: {
+    ".*": "babel-jest",
+  },
+};

Diff for: package.json

@@ -63,7 +63,7 @@
     "test:coverage": "jest test/ --collectCoverage=true",
     "test:node": "mocha",
     "test:generate-schema": "\"./node_modules/.bin/ts-json-schema-generator\" --path \"test/extra/model/model.ts\" --type \"Model\" --out \"test/extra/model/schema.json\" --additional-properties",
-    "lint": "eslint {src,test}/**/*.ts",
-    "format": "yarn lint --fix"
+    "lint": "eslint {src,test}/**/*.*",
+    "format": "eslint {src,test}/**/*.ts --fix"
   }
 }

Diff for: src/Config.ts

@@ -1,31 +1,31 @@
 import { JSONSchema7TypeName } from "json-schema";
 
 export type Config = {
-    reflectionName?: string;
-    reflectionType?: "none" | "property" | "function";
-    typePriorities?: Record<JSONSchema7TypeName, number>;
-    generatePrimitives?: "required" | "always";
-    generateConst?: "required" | "always";
-    generateDefault?: "required" | "always";
+  reflectionName?: string;
+  reflectionType?: "none" | "property" | "function";
+  typePriorities?: Record<JSONSchema7TypeName, number>;
+  generatePrimitives?: "required" | "always";
+  generateConst?: "required" | "always";
+  generateDefault?: "required" | "always";
 };
 
 export const DEFAULT_CONFIG: Config = {
-    reflectionName: "$schema",
-    reflectionType: "none",
-    typePriorities: {
-        null: 60,
-        string: 50,
-        number: 40,
-        integer: 30,
-        boolean: 20,
-        array: 10,
-        object: 0,
-    },
-    generatePrimitives: "required",
-    generateConst: "required",
-    generateDefault: "required",
+  reflectionName: "$schema",
+  reflectionType: "none",
+  typePriorities: {
+    null: 60,
+    string: 50,
+    number: 40,
+    integer: 30,
+    boolean: 20,
+    array: 10,
+    object: 0,
+  },
+  generatePrimitives: "required",
+  generateConst: "required",
+  generateDefault: "required",
 };
 
 export type ResolvedConfig = Required<Config> & {
-    fallbackType: JSONSchema7TypeName;
+  fallbackType: JSONSchema7TypeName;
 };

Diff for: src/Generator.ts

@@ -0,0 +1,72 @@
+import { createNodeGenerator, NodeGenerator } from "./NodeGenerator";
+import { BaseNodeVisitor } from "./NodeVisitor";
+import { JSONSchema7, JSONSchema7TypeName } from "json-schema";
+import { Config, DEFAULT_CONFIG, ResolvedConfig } from "./Config";
+
+export class Generator {
+  protected readonly config: ResolvedConfig;
+
+  constructor(
+    protected readonly schema: JSONSchema7,
+    config?: Config,
+    protected readonly nodeGenerator: NodeGenerator = createNodeGenerator()
+  ) {
+    this.config = Generator.resolveConfig(config);
+  }
+
+  static resolveConfig(config: Config = {}): ResolvedConfig {
+    const resolvedConfig = <ResolvedConfig>{
+      ...DEFAULT_CONFIG,
+      ...config,
+    };
+    resolvedConfig.fallbackType = <JSONSchema7TypeName>Object.entries(resolvedConfig.typePriorities).reduce(
+      (current, entry) => {
+        const [type, priority] = entry;
+        if (priority < current.min) {
+          current.type = type;
+          current.min = priority;
+        }
+        return current;
+      },
+      { min: Number.MAX_SAFE_INTEGER, type: "object" }
+    ).type;
+
+    return resolvedConfig;
+  }
+
+  generate(path?: string): any {
+    const visitor = new RootNodeVisitor(this.schema, this.config, <NodeGenerator>this.nodeGenerator, path);
+    return <NodeGenerator>this.nodeGenerator?.generate(this.schema, visitor);
+  }
+}
+
+class RootNodeVisitor extends BaseNodeVisitor {
+  constructor(
+    protected readonly schema: JSONSchema7,
+    protected readonly config: ResolvedConfig,
+    protected readonly nodeGenerator: NodeGenerator,
+    protected readonly path: string = "/"
+  ) {
+    super();
+  }
+
+  getRootSchema(): JSONSchema7 {
+    return this.schema;
+  }
+
+  getNodeGenerator(): NodeGenerator {
+    return this.nodeGenerator;
+  }
+
+  getConfig(): ResolvedConfig {
+    return this.config;
+  }
+
+  visited(path: string): boolean {
+    return path === this.path;
+  }
+
+  getLocalPath(): string {
+    return this.path;
+  }
+}