Generate additional types for collections with x-collection-type property

Author: reggie_7

lib/generator.js

@@ -1,4 +1,5 @@
 const fs = require('fs')
+const path = require('path')
 
 /** Class representing the sling model generator */
 class Generator {
@@ -90,7 +91,12 @@ function genNames(properties) {
                 }
                 if(props['x-form-type'] === 'collection') {
                     if (Object.keys(props['properties']).length > 1 || props['x-form-multifield'] === "true" || props['x-form-multifield'] === true) {
-                        inject += '\tprivate List<IComponent> '
+                        var collectionType = props['x-collection-type']
+                        if (collectionType) {
+                            inject += `\tprivate List<${collectionType}Model> `
+                        } else {
+                            inject += '\tprivate List<IComponent> '
+                        }
                     } else {
                         inject += '\tprivate String[] '
                     }
@@ -137,7 +143,12 @@ function genGetters(properties, customGetters) {
                 inject += `\t/* ${JSON.stringify(props)} */\n`
                 if(props['x-form-type'] === 'collection') {
                      if (Object.keys(props['properties']).length > 1 || props['x-form-multifield'] === "true" || props['x-form-multifield'] === true) {
-                        inject += '\tpublic List<IComponent> get'
+                        var collectionType = props['x-collection-type']
+                        if (collectionType) {
+                            inject += `\tpublic List<${collectionType}Model> get`
+                        } else {
+                            inject += '\tpublic List<IComponent> get'
+                        }
                     } else {
                         inject += '\tpublic String[] get'
                     }
@@ -170,16 +181,40 @@ function genGettersAnnotates(ownerName, annotate) {
     return result
 }
 
+function genTypes(properties, generator) {
+    for(var propName in properties) {
+        if (propName !== 'children') {
+            var props = properties[propName]
+            if(props['x-source'] === 'inject') {
+                if(props['x-form-type'] === 'collection') {
+                    if (Object.keys(props['properties']).length > 1 || props['x-form-multifield'] === "true" || props['x-form-multifield'] === true) {
+                        var collectionType = props['x-collection-type']
+                        if (collectionType) {
+                            gen(new Generator(generator.src, path.join(path.dirname(generator.dst), `${collectionType}Model.java`), {
+                                ...generator.data,
+                                modelName: collectionType,
+                                definitions: {
+                                    [collectionType]: props
+                                }
+                            }))
+                        }
+                    }
+                } 
+            }
+        }
+    }
+    
+}
+
 /**
     * Loads in the sling model template and fills in the data, inject, and getters content to make the components model
     * @param {string} generator - the generator object
 */
 function gen(generator) {
-
     // load the template
     var srcData = fs.readFileSync(generator.src).toString()
 
-    // now substitute all the values we know into the template
+    // substitute all the values we know into the template
     srcData = makeInitial(srcData, generator)
 
     // if the generated file does not exist yet, create it with the template we just created
@@ -242,6 +277,8 @@ function gen(generator) {
     } catch(error) {
         fs.writeFileSync(generator.dst, dstCurrent)
     }
+
+    genTypes(properties, generator)
 }
 
 module.exports = {