refactor: project source code

Author: js2me

src/code-formatter.js

@@ -8,7 +8,7 @@ class CodeFormatter {
    */
   config;
 
-  constructor(config) {
+  constructor({ config }) {
     this.config = config;
   }
 

src/code-gen-process.js

@@ -7,86 +7,61 @@ const _ = require("lodash");
 const { SchemaParser } = require("./schema-parser/schema-parser.js");
 const { SchemaRoutes } = require("./schema-parser/schema-routes.js");
 const { CodeGenConfig } = require("./configuration.js");
+const { SchemaWalker } = require("./schema-walker");
 const { FileSystem } = require("./util/file-system");
-const { Templates } = require("./templates");
+const { TemplatesWorker } = require("./templates-worker");
 const { translate: translateToJS } = require("./translators/JavaScript");
 const ts = require("typescript");
 const { CodeFormatter } = require("./code-formatter");
 const { pascalCase } = require("./util/pascal-case");
 const { internalCase } = require("./util/internal-case");
 
 class CodeGenProcess {
-  /**
-   * @type {CodeGenConfig}
-   */
+  /** @type {CodeGenConfig} */
   config;
-  /**
-   * @type {SwaggerSchemaResolver}
-   */
+  /** @type {SwaggerSchemaResolver} */
   swaggerSchemaResolver;
-  /**
-   * @type {SchemaComponentsMap}
-   */
-  schemaComponentMap;
-  /**
-   * @type {Logger}
-   */
+  /** @type {SchemaComponentsMap} */
+  schemaComponentsMap;
+  /** @type {Logger} */
   logger;
-  /**
-   * @type {TypeNameFormatter}
-   */
+  /** @type {TypeNameFormatter} */
   typeNameFormatter;
-  /**
-   * @type {SchemaParser}
-   */
+  /** @type {SchemaParser} */
   schemaParser;
-  /**
-   * @type {SchemaRoutes}
-   */
+  /** @type {SchemaRoutes} */
   schemaRoutes;
-  /**
-   * @type {FileSystem}
-   */
+  /** @type {FileSystem} */
   fileSystem;
-  /**
-   * @type {CodeFormatter}
-   */
+  /** @type {CodeFormatter} */
   codeFormatter;
+  /** type {TemplatesWorker} */
+  templatesWorker;
+  /** @type {SchemaWalker} */
+  schemaWalker;
 
   /**
    *
    * @param config {Partial<import("../index.d.ts").GenerateApiConfiguration['config']>}
    */
   constructor(config) {
     this.config = new CodeGenConfig(config);
-    this.logger = new Logger(this.config);
-    this.fileSystem = new FileSystem();
-    this.swaggerSchemaResolver = new SwaggerSchemaResolver(this.config, this.logger, this.fileSystem);
-    this.schemaComponentMap = new SchemaComponentsMap(this.config);
-    this.typeNameFormatter = new TypeNameFormatter(this.config, this.logger);
-    this.templates = new Templates(this.config, this.logger, this.fileSystem, this.getRenderTemplateData);
-    this.codeFormatter = new CodeFormatter(this.config);
-    this.schemaParser = new SchemaParser(
-      this.config,
-      this.logger,
-      this.templates,
-      this.schemaComponentMap,
-      this.typeNameFormatter,
-    );
-    this.schemaRoutes = new SchemaRoutes(
-      this.config,
-      this.schemaParser,
-      this.schemaComponentMap,
-      this.logger,
-      this.templates,
-      this.typeNameFormatter,
-    );
+    this.logger = new Logger(this);
+    this.schemaWalker = new SchemaWalker(this);
+    this.fileSystem = new FileSystem(this);
+    this.swaggerSchemaResolver = new SwaggerSchemaResolver(this);
+    this.schemaComponentsMap = new SchemaComponentsMap(this);
+    this.typeNameFormatter = new TypeNameFormatter(this);
+    this.templatesWorker = new TemplatesWorker(this);
+    this.codeFormatter = new CodeFormatter(this);
+    this.schemaParser = new SchemaParser(this);
+    this.schemaRoutes = new SchemaRoutes(this);
     this.config.componentTypeNameResolver.logger = this.logger;
   }
 
   async start() {
-    this.config.update({ templatePaths: this.templates.getTemplatePaths(this.config) });
-    this.config.update({ templatesToRender: this.templates.getTemplates(this.config) });
+    this.config.update({ templatePaths: this.templatesWorker.getTemplatePaths(this.config) });
+    this.config.update({ templatesToRender: this.templatesWorker.getTemplates(this.config) });
 
     const swagger = await this.swaggerSchemaResolver.create();
 
@@ -97,13 +72,16 @@ class CodeGenProcess {
       originalSchema: swagger.originalSchema,
     });
 
+    this.schemaWalker.addSchema("$usage", swagger.usageSchema);
+    this.schemaWalker.addSchema("$original", swagger.originalSchema);
+
     this.logger.event("start generating your typescript api");
 
     this.config.update(this.config.hooks.onInit(this.config) || this.config);
 
-    this.schemaComponentMap.processSchema(swagger.usageSchema);
+    this.schemaComponentsMap.processSchema(swagger.usageSchema);
 
-    const componentSchemaNames = this.schemaComponentMap.filter("schemas").map((c) => c.typeName);
+    const componentSchemaNames = this.schemaComponentsMap.filter("schemas").map((c) => c.typeName);
 
     this.config.componentTypeNameResolver.reserve(componentSchemaNames);
 
@@ -116,7 +94,7 @@ class CodeGenProcess {
       parsedSchemas,
     });
 
-    const usageComponentSchemas = this.schemaComponentMap.filter("schemas");
+    const usageComponentSchemas = this.schemaComponentsMap.filter("schemas");
     const sortByProperty = (propertyName) => (o1, o2) => {
       if (o1[propertyName] > o2[propertyName]) {
         return 1;
@@ -217,8 +195,8 @@ class CodeGenProcess {
     return {
       files: generatedFiles,
       configuration,
-      getTemplate: this.templates.getTemplate,
-      renderTemplate: this.templates.renderTemplate,
+      getTemplate: this.templatesWorker.getTemplate,
+      renderTemplate: this.templatesWorker.renderTemplate,
       createFile: this.fileSystem.createFile,
       formatTSContent: this.codeFormatter.formatCode,
     };
@@ -234,7 +212,7 @@ class CodeGenProcess {
         pascalCase: pascalCase,
         getInlineParseContent: this.schemaParser.getInlineParseContent,
         getParseContent: this.schemaParser.getParseContent,
-        getComponentByRef: this.schemaComponentMap.get,
+        getComponentByRef: this.schemaComponentsMap.get,
         parseSchema: this.schemaParser.parseSchema,
         checkAndAddNull: this.schemaParser.schemaUtils.safeAddNullToType,
         safeAddNullToType: this.schemaParser.schemaUtils.safeAddNullToType,
@@ -247,7 +225,7 @@ class CodeGenProcess {
         },
         NameResolver: NameResolver,
         _,
-        require: this.templates.requireFnFromTemplate,
+        require: this.templatesWorker.requireFnFromTemplate,
       },
       config: this.config,
     };
@@ -291,7 +269,7 @@ class CodeGenProcess {
           return this.createOutputFileInfo(
             configuration,
             extraTemplate.name,
-            this.templates.renderTemplate(this.fileSystem.getFileContent(extraTemplate.path), configuration),
+            this.templatesWorker.renderTemplate(this.fileSystem.getFileContent(extraTemplate.path), configuration),
           );
         }),
       );
@@ -307,7 +285,7 @@ class CodeGenProcess {
 
     if (routes.$outOfModule) {
       if (generateRouteTypes) {
-        const outOfModuleRouteContent = this.templates.renderTemplate(templatesToRender.routeTypes, {
+        const outOfModuleRouteContent = this.templatesWorker.renderTemplate(templatesToRender.routeTypes, {
           ...configuration,
           route: configuration.routes.$outOfModule,
         });
@@ -317,7 +295,7 @@ class CodeGenProcess {
         );
       }
       if (generateClient) {
-        const outOfModuleApiContent = this.templates.renderTemplate(templatesToRender.api, {
+        const outOfModuleApiContent = this.templatesWorker.renderTemplate(templatesToRender.api, {
           ...configuration,
           route: configuration.routes.$outOfModule,
         });
@@ -334,7 +312,7 @@ class CodeGenProcess {
           routes.combined,
           (apiFileInfos, route) => {
             if (generateRouteTypes) {
-              const routeModuleContent = this.templates.renderTemplate(templatesToRender.routeTypes, {
+              const routeModuleContent = this.templatesWorker.renderTemplate(templatesToRender.routeTypes, {
                 ...configuration,
                 route,
               });
@@ -345,7 +323,7 @@ class CodeGenProcess {
             }
 
             if (generateClient) {
-              const apiModuleContent = this.templates.renderTemplate(templatesToRender.api, {
+              const apiModuleContent = this.templatesWorker.renderTemplate(templatesToRender.api, {
                 ...configuration,
                 route,
               });
@@ -366,13 +344,13 @@ class CodeGenProcess {
       this.createOutputFileInfo(
         configuration,
         fileNames.dataContracts,
-        this.templates.renderTemplate(templatesToRender.dataContracts, configuration),
+        this.templatesWorker.renderTemplate(templatesToRender.dataContracts, configuration),
       ),
       generateClient &&
         this.createOutputFileInfo(
           configuration,
           fileNames.httpClient,
-          this.templates.renderTemplate(templatesToRender.httpClient, configuration),
+          this.templatesWorker.renderTemplate(templatesToRender.httpClient, configuration),
         ),
       ...modularApiFileInfos,
     ];
@@ -386,10 +364,10 @@ class CodeGenProcess {
         configuration,
         configuration.fileName,
         _.compact([
-          this.templates.renderTemplate(templatesToRender.dataContracts, configuration),
-          generateRouteTypes && this.templates.renderTemplate(templatesToRender.routeTypes, configuration),
-          generateClient && this.templates.renderTemplate(templatesToRender.httpClient, configuration),
-          generateClient && this.templates.renderTemplate(templatesToRender.api, configuration),
+          this.templatesWorker.renderTemplate(templatesToRender.dataContracts, configuration),
+          generateRouteTypes && this.templatesWorker.renderTemplate(templatesToRender.routeTypes, configuration),
+          generateClient && this.templatesWorker.renderTemplate(templatesToRender.httpClient, configuration),
+          generateClient && this.templatesWorker.renderTemplate(templatesToRender.api, configuration),
         ]).join("\n"),
       ),
     ];

src/commands/generate-templates/templates-gen-process.js

@@ -31,8 +31,8 @@ class TemplatesGenProcess {
 
   constructor(config) {
     this.config = new TemplatesGenConfig(config);
-    this.logger = new Logger(this.config);
-    this.fileSystem = new FileSystem();
+    this.logger = new Logger(this);
+    this.fileSystem = new FileSystem(this);
   }
 
   /**

src/schema-components-map.js

@@ -1,25 +1,22 @@
 const _ = require("lodash");
 
 class SchemaComponentsMap {
-  /**
-   * @type {Record<string, SchemaComponent>}
-   */
+  /** @type {Record<string, SchemaComponent>} */
   data = {};
-  /**
-   * @type {CodeGenConfig}
-   */
+  /** @type {CodeGenConfig} */
   config;
 
-  constructor(config, schema) {
+  constructor({ config }) {
     this.config = config;
-    this.processSchema(schema);
   }
 
   processSchema(schema) {
     this.data = {};
     if (!schema) return;
     _.each(schema.components, (component, componentName) =>
-      _.each(component, (rawTypeData, typeName) => this.createComponent(componentName, typeName, rawTypeData)),
+      _.each(component, (rawTypeData, typeName) => {
+        return this.createComponent(componentName, typeName, rawTypeData);
+      }),
     );
   }
 

src/schema-parser/base-schema-parsers/discriminator.js

@@ -7,7 +7,9 @@ class DiscriminatorSchemaParser extends MonoSchemaParser {
   parse() {
     const { discriminator, ...noDiscriminatorSchema } = this.schema;
 
-    if (this.typeName == null || !discriminator.mapping)
+    // TODO: disable for now
+    if (!!this)
+      // if (this.typeName == null || !discriminator.mapping)
       return this.schemaParser.parseSchema(noDiscriminatorSchema, this.typeName, this.schemaPath);
 
     const abstractSchemaStruct = this.createAbstractSchemaStruct();

src/schema-parser/complex-schema-parsers/all-of.js

@@ -1,9 +1,10 @@
 const { MonoSchemaParser } = require("../mono-schema-parser");
 const _ = require("lodash");
 
+// T1 & T2
 class AllOfSchemaParser extends MonoSchemaParser {
   parse() {
-    const ignoreTypes = [...this.config.jsPrimitiveTypes, this.config.Ts.Keyword.Any];
+    const ignoreTypes = [this.config.Ts.Keyword.Any];
     const combined = _.map(this.schema.allOf, (childSchema) =>
       this.schemaParser.getInlineParseContent(
         this.schemaUtils.makeAddRequiredToChildSchema(this.schema, childSchema),

src/schema-parser/complex-schema-parsers/any-of.js

@@ -1,9 +1,10 @@
 const { MonoSchemaParser } = require("../mono-schema-parser");
 const _ = require("lodash");
 
+// T1 | T2 | (T1 & T2)
 class AnyOfSchemaParser extends MonoSchemaParser {
   parse() {
-    const ignoreTypes = [...this.config.jsPrimitiveTypes, this.config.Ts.Keyword.Any];
+    const ignoreTypes = [this.config.Ts.Keyword.Any];
     const combined = _.map(this.schema.anyOf, (childSchema) =>
       this.schemaParser.getInlineParseContent(
         this.schemaUtils.makeAddRequiredToChildSchema(this.schema, childSchema),

src/schema-parser/complex-schema-parsers/one-of.js

@@ -1,6 +1,7 @@
 const { MonoSchemaParser } = require("../mono-schema-parser");
 const _ = require("lodash");
 
+// T1 | T2
 class OneOfSchemaParser extends MonoSchemaParser {
   parse() {
     const ignoreTypes = [this.config.Ts.Keyword.Any];

src/schema-parser/schema-formatters.js

@@ -15,15 +15,18 @@ class SchemaFormatters {
    */
   schemaParser;
   /**
-   * @type {Templates}
+   * @type {TemplatesWorker}
    */
-  templates;
+  templatesWorker;
 
-  constructor(config, logger, schemaParser, templates) {
-    this.config = config;
-    this.logger = logger;
+  /**
+   * @param schemaParser {SchemaParser}
+   */
+  constructor(schemaParser) {
+    this.config = schemaParser.config;
+    this.logger = schemaParser.logger;
     this.schemaParser = schemaParser;
-    this.templates = templates;
+    this.templatesWorker = schemaParser.templatesWorker;
   }
 
   base = {
@@ -131,7 +134,7 @@ class SchemaFormatters {
       const extraSpace = "  ";
       const result = `${extraSpace}${part.field},\n`;
 
-      const renderedJsDoc = this.templates.renderTemplate(this.config.templatesToRender.dataContractJsDoc, {
+      const renderedJsDoc = this.templatesWorker.renderTemplate(this.config.templatesToRender.dataContractJsDoc, {
         data: part,
       });