fix(cli): generate property.array for array of simple types

Author: raymondfeng

packages/cli/generators/openapi/schema-helper.js

@@ -167,11 +167,15 @@ function mapObjectType(schema, options) {
         propDecoration = `@property({name: '${p}', required: true})`;
       }
 
-      if (propertyType.itemType && propertyType.itemType.kind === 'class') {
-        // Use `@property.array` for array types
-        propDecoration = `@property.array(${
-          propertyType.itemType.className
-        }, {name: '${p}'})`;
+      if (propertyType.itemType) {
+        const itemType =
+          propertyType.itemType.kind === 'class'
+            ? propertyType.itemType.className
+            : getJSType(propertyType.itemType.name);
+        if (itemType) {
+          // Use `@property.array` for array types
+          propDecoration = `@property.array(${itemType}, {name: '${p}'})`;
+        }
       }
       const propSpec = {
         name: p,
@@ -258,6 +262,23 @@ function mapPrimitiveType(schema, options) {
   return typeSpec;
 }
 
+const JSTypeMapping = {
+  number: Number,
+  boolean: Boolean,
+  string: String,
+  Date: Date,
+  Buffer: Buffer,
+};
+
+/**
+ * Mapping simple type names to JS Type constructors
+ * @param {string} type Simple type name
+ */
+function getJSType(type) {
+  const ctor = JSTypeMapping[type];
+  return (ctor && ctor.name) || type;
+}
+
 /**
  *
  * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#data-types

packages/cli/test/fixtures/openapi/3.0/customer.yaml

@@ -1,4 +1,4 @@
-openapi: "3.0.0"
+openapi: '3.0.0'
 info:
   version: 1.0.0
   title: Customer
@@ -117,9 +117,11 @@ components:
           type: string
         last-name:
           $ref: '#/components/schemas/Name'
+        emails:
+          type: array
+          items:
+            type: string
         addresses:
           type: array
           items:
             $ref: '#/components/schemas/Address'
-
-

packages/cli/test/unit/openapi/schema-model.unit.js

@@ -14,7 +14,7 @@ const {
 const path = require('path');
 
 describe('schema to model', () => {
-  let usptoSpec, usptoSpecAnonymous, petstoreSpec, customerSepc;
+  let usptoSpec, usptoSpecAnonymous, petstoreSpec, customerSpec;
   const uspto = path.join(__dirname, '../../fixtures/openapi/3.0/uspto.yaml');
   const petstore = path.join(
     __dirname,
@@ -31,7 +31,7 @@ describe('schema to model', () => {
       promoteAnonymousSchemas: true,
     });
     petstoreSpec = await loadSpec(petstore);
-    customerSepc = await loadSpec(customer);
+    customerSpec = await loadSpec(customer);
   });
 
   it('generates models for uspto', () => {
@@ -269,7 +269,7 @@ describe('schema to model', () => {
 
   it('generates models for customer', () => {
     const objectTypeMapping = new Map();
-    const models = generateModelSpecs(customerSepc, {objectTypeMapping});
+    const models = generateModelSpecs(customerSpec, {objectTypeMapping});
     expect(models).to.eql([
       {
         description: 'Name',
@@ -338,6 +338,11 @@ describe('schema to model', () => {
             signature: "'last-name'?: Name;",
             decoration: "@property({name: 'last-name'})",
           },
+          {
+            decoration: "@property.array(String, {name: 'emails'})",
+            name: 'emails',
+            signature: 'emails?: string[];',
+          },
           {
             name: 'addresses',
             signature: 'addresses?: Address[];',
@@ -351,8 +356,8 @@ describe('schema to model', () => {
         import: "import {Customer} from './customer.model';",
         kind: 'class',
         declaration:
-          "{\n  id: number;\n  'first-name'?: string;\n  'last-name'?: " +
-          'Name;\n  addresses?: Address[];\n}',
+          "{\n  id: number;\n  'first-name'?: string;\n  'last-name'?: Name;\n" +
+          '  emails?: string[];\n  addresses?: Address[];\n}',
         signature: 'Customer',
       },
     ]);