refactor: part array type own parser (2)

Author: js2me

src/configuration.js

@@ -294,10 +294,6 @@ class CodeGenConfig {
       "relative-json-pointer": () => this.Ts.Keyword.String,
       regex: () => this.Ts.Keyword.String,
     },
-    array: ({ items, ...schemaPart }, parser) => {
-      const content = parser.getInlineParseContent(items);
-      return parser.schemaUtils.safeAddNullToType(schemaPart, this.Ts.ArrayType(content));
-    },
   };
 
   templateInfos = [

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

@@ -22,7 +22,7 @@ class ComplexSchemaParser extends MonoSchemaParser {
         this.config.Ts.IntersectionType(
           _.compact([
             this.config.Ts.ExpressionGroup(complexSchemaContent),
-            this.schemaParser.getInternalSchemaType(simpleSchema) === SCHEMA_TYPES.OBJECT &&
+            this.schemaUtils.getInternalSchemaType(simpleSchema) === SCHEMA_TYPES.OBJECT &&
               this.config.Ts.ExpressionGroup(this.schemaParser.getInlineParseContent(simpleSchema)),
           ]),
         ) || this.config.Ts.Keyword.Any,

src/schema-parser/schema-parser.js

@@ -99,15 +99,6 @@ class SchemaParser {
     },
   };
 
-  getInternalSchemaType = (schema) => {
-    if (!_.isEmpty(schema.enum) || !_.isEmpty(this.schemaUtils.getEnumNames(schema))) return SCHEMA_TYPES.ENUM;
-    if (schema.discriminator) return SCHEMA_TYPES.DISCRIMINATOR;
-    if (schema.allOf || schema.oneOf || schema.anyOf || schema.not) return SCHEMA_TYPES.COMPLEX;
-    if (!_.isEmpty(schema.properties)) return SCHEMA_TYPES.OBJECT;
-
-    return SCHEMA_TYPES.PRIMITIVE;
-  };
-
   /**
    *
    * @param schema {any}
@@ -133,7 +124,7 @@ class SchemaParser {
       if (schema.items && !Array.isArray(schema.items) && !schema.type) {
         schema.type = SCHEMA_TYPES.ARRAY;
       }
-      schemaType = this.getInternalSchemaType(schema);
+      schemaType = this.schemaUtils.getInternalSchemaType(schema);
 
       this.schemaPath.push(...(schemaPath || []));
       this.schemaPath.push(typeName);

src/schema-parser/schema-utils.js

@@ -174,6 +174,16 @@ class SchemaUtils {
     return SCHEMA_TYPES.COMPLEX_UNKNOWN;
   };
 
+  getInternalSchemaType = (schema) => {
+    if (!_.isEmpty(schema.enum) || !_.isEmpty(this.getEnumNames(schema))) return SCHEMA_TYPES.ENUM;
+    if (schema.discriminator) return SCHEMA_TYPES.DISCRIMINATOR;
+    if (schema.allOf || schema.oneOf || schema.anyOf || schema.not) return SCHEMA_TYPES.COMPLEX;
+    if (!_.isEmpty(schema.properties)) return SCHEMA_TYPES.OBJECT;
+    if (schema.type === SCHEMA_TYPES.ARRAY) return SCHEMA_TYPES.ARRAY;
+
+    return SCHEMA_TYPES.PRIMITIVE;
+  };
+
   getSchemaType = (schema) => {
     if (!schema) return this.config.Ts.Keyword.Any;