feat: tymly add-model <model>

Initial implementation of the add-model command

Author: jezhiggins

lib/actions/add-model/index.js

@@ -1,4 +1,5 @@
 const c = require('ansi-colors')
+const { prompt } = require('enquirer')
 const Scaffold = require('@wmfs/tymly-scaffold')
 
 async function addModelAction (name, options) {
@@ -10,11 +11,102 @@ async function addModelAction (name, options) {
   }
 
   const scaffold = new Scaffold()
-  scaffold.setBlueprint(workingDirectory)
+  scaffold.setBlueprintDir(workingDirectory)
 
   console.log(c.bold(`Adding ${c.cyan(modelName)} model to blueprint ${c.cyan(scaffold.blueprintName)}`))
 
+  const modelDetails = await gatherModelDetails(modelName)
+
+  scaffold.addModel(modelDetails)
+
   await scaffold.commit()
 } // addModelAction
 
+async function gatherModelDetails (modelName) {
+  const modelHeader = await gatherModelHeader(modelName)
+  const modelProperties = await gatherModelProperties()
+
+  return {
+    name: modelHeader.name,
+    title: modelHeader.title,
+    description: modelHeader.description,
+    propertyHints: modelProperties
+  }
+} // gatherModelDetails
+
+async function gatherModelHeader (modelName) {
+  let modelHeader = {
+    name: modelName
+  }
+
+  const questions = [
+    {
+      type: 'input',
+      name: 'title',
+      message: 'Title',
+      initial: `${modelName[0].toUpperCase()}${modelName.substring(1)}`
+    },
+    {
+      type: 'input',
+      name: 'description',
+      message: 'Description',
+      initial: ''
+    }
+  ]
+
+  for (const question of questions) {
+    modelHeader = await prompt(question, {}, modelHeader)
+  }
+
+  return modelHeader
+} // gatherModelHeader
+
+async function gatherModelProperties () {
+  const properties = []
+  for await (const property of gatherModelProperty()) {
+    properties.push(property)
+  }
+  return properties
+} // gatherModelProperties
+
+async function * gatherModelProperty () {
+  while (true) {
+    let propertyDetails = {}
+
+    const questions = [
+      {
+        type: 'input',
+        name: 'key',
+        message: 'Property name'
+      },
+      {
+        type: 'input',
+        name: 'typeHint',
+        message: 'Property type'
+      },
+      {
+        type: 'confirm',
+        name: 'primary',
+        message: 'Primary Key',
+        initial: false
+      },
+      {
+        type: 'confirm',
+        name: 'required',
+        message: 'Required',
+        initial: false
+      }
+    ]
+
+    for (const question of questions) {
+      propertyDetails = await prompt(question, {}, propertyDetails)
+
+      if (!propertyDetails.key) {
+        return
+      }
+    }
+    yield propertyDetails
+  }
+} // gatherModelProperty
+
 module.exports = addModelAction

lib/actions/new-blueprint/index.js

@@ -22,22 +22,12 @@ async function newBlueprint (name, options) {
   }
 
   const profile = loadProfile(options.profile)
-  const blueprintInfo = await solicitDetails(profile)
+  const blueprintInfo = await solicitDetails(blueprintName, profile)
 
   const scaffold = new Scaffold({
     basePath: workingDirectory
   })
-  scaffold.addBlueprint({
-    name: blueprintName,
-    description: blueprintInfo.description,
-    author: blueprintInfo.author,
-    organisation: blueprintInfo.organisation,
-    license: blueprintInfo.license,
-    gitHubOwner: blueprintInfo.gitHubOwner,
-    npmOrg: blueprintInfo.npmOrg,
-    semanticVersioning: blueprintInfo.semanticVersioning,
-    ciProfile: blueprintInfo.ciProfile
-  })
+  scaffold.addBlueprint(blueprintInfo)
   await scaffold.commit()
 } // initAction
 
@@ -50,8 +40,10 @@ function canCreate (blueprintPath) {
   }
 }
 
-async function solicitDetails (profile) {
-  let blueprintInfo = { }
+async function solicitDetails (blueprintName, profile) {
+  let blueprintInfo = {
+    name: blueprintName
+  }
 
   const questions = [
     {

test/fixtures/add-model/expected/named-pizza/models/pizza.json

@@ -1,15 +1,17 @@
 {
-  "title": "pizza",
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "title": "Pizza",
   "description": "A pizza",
-  "primaryKey": [
-    "name"
-  ],
+  "type": "object",
   "properties": {
     "name": {
       "type": "string"
     }
   },
   "required": [
     "name"
+  ],
+  "primaryKey": [
+    "name"
   ]
 }