Merge pull request #70 from sasjs/issue-67

This closes #67 , closes #68 and closes #69
sasjs · Sep 9, 2020 · b930b0d · b930b0d
2 parents 167f37a + 52bc940
commit b930b0d
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 41 deletions.
diff --git a/src/cli.js b/src/cli.js
@@ -140,8 +140,9 @@ export async function cli(args) {
   }
   switch (command.name) {
     case 'create':
-      const projectName = command.parameters[1]
-      const appType = processCreateParameters(command.parameters)
+      const { projectName, appType } = processCreateParameters(
+        command.parameters
+      )
       await createFileStructure(projectName, appType)
       break
     case 'compile':
@@ -178,7 +179,7 @@ export async function cli(args) {
       await add(command.parameters[1])
       break
     case 'run':
-      const { filePath, targetName } = command.parameters[1]
+      const { filePath, targetName } = command.parameters
       await run(filePath, targetName)
       break
     default:
@@ -262,39 +263,56 @@ function processRunParameters(parameters) {
   }
 }
 
-function processCreateParameters(parameters) {
-  const supportedTypes = ['react', 'angular', 'minimal']
-  let type = ''
-  if (
-    parameters.length > 2 &&
-    !(parameters[2] === '-t' || parameters[2] === '--template')
-  ) {
-    console.error(
-      chalk.redBright(
-        `Invalid usage.\nCorrect syntax is ${chalk.cyanBright(
-          'sasjs create <app-name> -t <app-type>'
-        )} or ${chalk.cyanBright(
-          'sasjs create <app-name> --template <app-type>'
-        )}.`
-      )
+function invalidSyntax() {
+  console.error(
+    chalk.redBright(
+      `Invalid usage.\nCorrect syntax is ${chalk.cyanBright(
+        'sasjs create <app-name> -t <app-type>'
+      )} or ${chalk.cyanBright(
+        'sasjs create <app-name> --template <app-type>'
+      )}.`
     )
-    exit(1)
-  }
+  )
+  exit(1)
+}
 
-  if (parameters.length !== 4) {
-    return type
-  }
-  type = parameters[3].trim()
-  if (!supportedTypes.includes(type)) {
-    console.error(
-      chalk.redBright(
-        `Invalid web app type.\nSupported types are ${chalk.cyanBright(
-          'angular'
-        )}, ${chalk.cyanBright('react')} and ${chalk.cyanBright('minimal')}.`
-      )
+function invalidAppType() {
+  console.error(
+    chalk.redBright(
+      `Invalid web app type.\nSupported types are ${chalk.cyanBright(
+        'angular'
+      )}, ${chalk.cyanBright('react')}, ${chalk.cyanBright(
+        'minimal'
+      )} and ${chalk.cyanBright('sasonly')}.`
     )
-    exit(1)
-  }
+  )
+  exit(1)
+}
 
-  return type
+function processCreateParameters(parameters) {
+  const supportedTypes = ['react', 'angular', 'minimal', 'sasonly']
+  let params = { projectName: undefined, appType: undefined }
+  switch (parameters.length) {
+    case 1: // sasjs create
+      break
+    case 2: // sasjs create <app_name>
+      params.projectName = parameters[1]
+      break
+    case 3: // sasjs create -t <type>
+      if (parameters[1] === '-t' || parameters[1] === '--template')
+        params.appType = parameters[2].trim()
+      else invalidSyntax()
+      if (!supportedTypes.includes(params.appType)) invalidAppType()
+      break
+    case 4: // sasjs create <app_name> -t <type>
+      if (parameters[2] === '-t' || parameters[2] === '--template') {
+        params.projectName = parameters[1]
+        params.appType = parameters[3].trim()
+      } else invalidSyntax()
+      if (!supportedTypes.includes(params.appType)) invalidAppType()
+      break
+    default:
+      invalidSyntax()
+  }
+  return params
 }
diff --git a/src/config-sasonly.json b/src/config-sasonly.json
@@ -0,0 +1,40 @@
+{
+  "folders": [
+    {
+      "folderName": "sasjs",
+      "files": [],
+      "subFolders": [
+        {
+          "folderName": "db"
+        },
+        {
+          "folderName": "build"
+        },
+        {
+          "folderName": "macros"
+        },
+        {
+          "folderName": "services",
+          "files": [],
+          "subFolders": [
+            {
+              "folderName": "common",
+              "files": [
+                {
+                  "fileName": "appinit.sas",
+                  "content": "/**\n  @file appinit.sas\n  @brief Initialisation service - runs on app startup\n  @details  This is always the first service called when the app is opened.\n\n  <h4> Dependencies </h4>\n\n**/\n\nproc sql;\ncreate table areas as select distinct area\n  from sashelp.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "config": {
+    "cmnMacros": ["macros"],
+    "cmnServices": ["services/common"],
+    "useMacroCore": true,
+    "targets": []
+  }
+}
diff --git a/src/sasjs-add/index.js b/src/sasjs-add/index.js
@@ -1,3 +1,4 @@
+import { create } from '../sasjs-create'
 import { getUserInput } from '../utils/input-utils'
 import chalk from 'chalk'
 import path from 'path'
@@ -69,6 +70,7 @@ async function getLocalConfig() {
   const config = await getConfiguration(
     path.join(buildSourceFolder, 'sasjsconfig.json')
   )
+  if (!config) await create('.', 'sasonly')
   return config
 }
 

diff --git a/src/sasjs-create/index.js b/src/sasjs-create/index.js
@@ -18,8 +18,10 @@ import {
 import chalk from 'chalk'
 
 export async function create(parentFolderName = '.', appType = '') {
-  const config = await getConfiguration(path.join(__dirname, '../config.json'))
-  const fileStructure = await getFileStructure()
+  const configPath =
+    appType === 'sasonly' ? '../config-sasonly.json' : '../config.json'
+  const config = await getConfiguration(path.join(__dirname, configPath))
+  const fileStructure = await getFileStructure(appType === 'sasonly')
   console.log(chalk.greenBright('Creating folders and files...'))
   if (parentFolderName !== '.') {
     await createFolder(path.join(process.projectDir, parentFolderName))
@@ -58,12 +60,12 @@ export async function create(parentFolderName = '.', appType = '') {
     })
   }
 
-  if (!appType) {
+  if (!appType || appType === 'sasonly') {
     await setupNpmProject(parentFolderName)
   }
   await setupGitIgnore(parentFolderName)
 }
 
-async function getFileStructure() {
-  return await getFolders()
+async function getFileStructure(sasOnly = false) {
+  return await getFolders(sasOnly)
 }
diff --git a/src/utils/config-utils.js b/src/utils/config-utils.js
@@ -112,8 +112,9 @@ export async function saveLocalRcFile(content) {
   await createFile(path.join(projectRoot, '.sasjsrc'), content)
 }
 
-export async function getFolders() {
-  const config = await readFile(path.join(__dirname, '../config.json'))
+export async function getFolders(sasOnly = false) {
+  const configPath = sasOnly ? '../config-sasonly.json' : '../config.json'
+  const config = await readFile(path.join(__dirname, configPath))
   if (config) {
     const configJson = JSON.parse(config)
     return Promise.resolve(configJson.folders)