refactor: add _ for schema parsers maps

js2me · js2me · commit 7dd1a86597e8 · 2022-11-17T13:45:11.000+06:00
diff --git a/src/schema-parser/base-schema-parsers/complex.js b/src/schema-parser/base-schema-parsers/complex.js
@@ -5,8 +5,8 @@ const { SCHEMA_TYPES } = require("../../constants");
 class ComplexSchemaParser extends MonoSchemaParser {
   parse() {
     const complexType = this.schemaUtils.getComplexType(this.schema);
-    const simpleSchema = _.omit(_.clone(this.schema), _.keys(this.schemaParser.complexSchemaParsers));
-    const complexSchemaContent = this.schemaParser.complexSchemaParsers[complexType](this.schema);
+    const simpleSchema = _.omit(_.clone(this.schema), _.keys(this.schemaParser._complexSchemaParsers));
+    const complexSchemaContent = this.schemaParser._complexSchemaParsers[complexType](this.schema);
 
     return {
       ...(_.isObject(this.schema) ? this.schema : {}),
diff --git a/src/schema-parser/base-schema-parsers/discriminator.js b/src/schema-parser/base-schema-parsers/discriminator.js
@@ -40,7 +40,7 @@ class DiscriminatorSchemaParser extends MonoSchemaParser {
     const { discriminator } = this.schema;
     const { mapping, propertyName } = discriminator;
     const mappingEntries = _.entries(mapping);
-    const complexSchemaKeys = _.keys(this.schemaParser.complexSchemaParsers);
+    const complexSchemaKeys = _.keys(this.schemaParser._complexSchemaParsers);
     const ableToCreateMappingType = !!(abstractSchemaStruct?.typeName && mappingEntries.length);
     const mappingContents = [];
     let mappingTypeName;
@@ -118,7 +118,7 @@ class DiscriminatorSchemaParser extends MonoSchemaParser {
 
   createAbstractSchemaStruct = () => {
     const { discriminator, ...noDiscriminatorSchema } = this.schema;
-    const complexSchemaKeys = _.keys(this.schemaParser.complexSchemaParsers);
+    const complexSchemaKeys = _.keys(this.schemaParser._complexSchemaParsers);
     const schema = _.omit(_.clone(noDiscriminatorSchema), complexSchemaKeys);
     const schemaIsEmpty = !_.keys(schema).length;
 
@@ -149,7 +149,7 @@ class DiscriminatorSchemaParser extends MonoSchemaParser {
     if (complexType === SCHEMA_TYPES.COMPLEX_UNKNOWN) return null;
 
     return {
-      content: this.config.Ts.ExpressionGroup(this.schemaParser.complexSchemaParsers[complexType](this.schema)),
+      content: this.config.Ts.ExpressionGroup(this.schemaParser._complexSchemaParsers[complexType](this.schema)),
     };
   };
 }
diff --git a/src/schema-parser/base-schema-parsers/primitive.js b/src/schema-parser/base-schema-parsers/primitive.js
@@ -15,7 +15,7 @@ class PrimitiveSchemaParser extends MonoSchemaParser {
     }
 
     if (_.isArray(type) && type.length) {
-      contentType = this.schemaParser.complexSchemaParsers.oneOf({
+      contentType = this.schemaParser._complexSchemaParsers.oneOf({
         ...(_.isObject(this.schema) ? this.schema : {}),
         oneOf: type.map((type) => ({ type })),
       });
diff --git a/src/schema-parser/schema-parser.js b/src/schema-parser/schema-parser.js
@@ -50,7 +50,7 @@ class SchemaParser {
     this.schemaUtils = new SchemaUtils(config, schemaComponentsMap, this.typeNameFormatter);
   }
 
-  complexSchemaParsers = {
+  _complexSchemaParsers = {
     // T1 | T2
     [SCHEMA_TYPES.COMPLEX_ONE_OF]: (schema) => {
       const schemaParser = new OneOfSchemaParser(this, schema, null);
@@ -72,7 +72,7 @@ class SchemaParser {
     },
   };
 
-  baseSchemaParsers = {
+  _baseSchemaParsers = {
     [SCHEMA_TYPES.ENUM]: (schema, typeName) => {
       const schemaParser = new EnumSchemaParser(this, schema, typeName);
       return schemaParser.parse();
@@ -107,7 +107,7 @@ class SchemaParser {
    * @return {Record<string, any>}
    */
   parseSchema = (schema, typeName = null, schemaPath) => {
-    if (!schema) return this.baseSchemaParsers[SCHEMA_TYPES.PRIMITIVE](null, typeName);
+    if (!schema) return this._baseSchemaParsers[SCHEMA_TYPES.PRIMITIVE](null, typeName);
 
     let schemaType = null;
     let parsedSchema = null;
@@ -130,7 +130,7 @@ class SchemaParser {
       this.schemaPath.push(typeName);
 
       _.merge(schema, this.config.hooks.onPreParseSchema(schema, typeName, schemaType));
-      parsedSchema = this.baseSchemaParsers[schemaType](schema, typeName);
+      parsedSchema = this._baseSchemaParsers[schemaType](schema, typeName);
       schema.$parsed = this.config.hooks.onParseSchema(schema, parsedSchema) || parsedSchema;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class PrimitiveSchemaParser extends MonoSchemaParser {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`if (_.isArray(type) && type.length) {`
`18`		`- contentType = this.schemaParser.complexSchemaParsers.oneOf({`
	`18`	`+ contentType = this.schemaParser._complexSchemaParsers.oneOf({`
`19`	`19`	`...(_.isObject(this.schema) ? this.schema : {}),`
`20`	`20`	`oneOf: type.map((type) => ({ type })),`
`21`	`21`	`});`