Merge pull request #200 from sasjs/issue-139

refactor: improve sasjs-commands related logic
sasjs · Nov 16, 2020 · fbb5dee · fbb5dee
2 parents d782376 + 8c3b720
commit fbb5dee
Show file tree

Hide file tree

Showing 51 changed files with 459 additions and 655 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@sasjs/adapter": "^1.17.0",
-    "@sasjs/core": "^1.7.3",
+    "@sasjs/core": "^1.7.4",
     "base64-img": "^1.0.4",
     "btoa": "^1.2.1",
     "chalk": "^4.1.0",

diff --git a/src/cli.js b/src/cli.js
@@ -38,16 +38,6 @@ function parseCommand(rawArgs) {
 
   if (args.length) {
     const name = getUnaliasedCommand(args[0])
-    let parameters
-
-    switch (name) {
-      case 'run':
-        parameters = processRunParameters(args.slice(1))
-        return { name, parameters }
-      case 'request':
-        parameters = processRequestParameters(args.slice(1))
-        return { name, parameters }
-    }
 
     return { name, parameters: args }
   }
@@ -170,25 +160,19 @@ export async function cli(args) {
   }
   switch (command.name) {
     case 'create': {
-      const { projectName, appType } = processCreateParameters(
-        command.parameters
-      )
-      await createFileStructure(projectName, appType)
+      await createFileStructure(command.parameters)
       break
     }
     case 'compile': {
       await compileServices(command.parameters[1])
       break
     }
     case 'build': {
-      await buildServices(command.parameters[1])
+      await buildServices(command.parameters)
       break
     }
     case 'deploy': {
-      await deployServices(
-        command.parameters[1],
-        command.parameters[2] === '-f'
-      )
+      await deployServices(command.parameters)
       break
     }
     case 'servicepack': {
@@ -216,27 +200,19 @@ export async function cli(args) {
       break
     }
     case 'web': {
-      await buildWebApp(command.parameters[1])
+      await buildWebApp(command.parameters)
       break
     }
     case 'add': {
-      await add(command.parameters[1])
+      await add(command.parameters)
       break
     }
     case 'run': {
-      const { filePath, targetName } = command.parameters
-      await run(filePath, targetName)
+      await run(command.parameters)
       break
     }
     case 'request': {
-      const {
-        sasJobLocation,
-        dataFilePath,
-        configFilePath,
-        targetName
-      } = command.parameters
-
-      await runRequest(sasJobLocation, dataFilePath, configFilePath, targetName)
+      await runRequest(command.parameters)
 
       break
     }

diff --git a/src/sasjs-add/index.js → src/commands/add.js b/src/sasjs-add/index.js → src/commands/add.js
@@ -1,4 +1,4 @@
-import { create } from '../sasjs-create'
+import { create } from './create'
 import { getAndValidateField } from '../utils/input-utils'
 import chalk from 'chalk'
 import path from 'path'

diff --git a/src/sasjs-build/index.js → src/commands/build.js b/src/sasjs-build/index.js → src/commands/build.js
@@ -1,12 +1,12 @@
-import * as thisModule from './index'
+import * as thisModule from './build'
 
 import find from 'find'
 import path from 'path'
 import chalk from 'chalk'
 import uniqBy from 'lodash.uniqby'
 import groupBy from 'lodash.groupby'
-import { deploy } from '../sasjs-deploy'
-import { createWebAppServices } from '../sasjs-web'
+import { deploy } from './deploy'
+import { createWebAppServices } from './web'
 import {
   readFile,
   getSubFoldersInFolder,

diff --git a/src/sasjs-context/create.js → src/commands/context/create.js b/src/sasjs-context/create.js → src/commands/context/create.js
@@ -1,4 +1,4 @@
-import { displayResult } from '../utils/displayResult'
+import { displayResult } from '../../utils/displayResult'
 
 /**
  * Creates compute context using provided config.

diff --git a/src/sasjs-context/edit.js → src/commands/context/edit.js b/src/sasjs-context/edit.js → src/commands/context/edit.js
@@ -1,4 +1,4 @@
-import { displayResult } from '../utils/displayResult'
+import { displayResult } from '../../utils/displayResult'
 
 /**
  * Edits existing compute context.

diff --git a/src/sasjs-context/export.js → src/commands/context/export.js b/src/sasjs-context/export.js → src/commands/context/export.js
@@ -1,6 +1,6 @@
-import { displayResult } from '../utils/displayResult'
+import { displayResult } from '../../utils/displayResult'
 import path from 'path'
-import { createFile, sanitizeFileName } from '../utils/file-utils'
+import { createFile, sanitizeFileName } from '../../utils/file-utils'
 
 /**
  * Export compute context to json file in current folder.

diff --git a/src/sasjs-context/index.js → src/commands/context/index.js b/src/sasjs-context/index.js → src/commands/context/index.js
@@ -4,107 +4,68 @@ import { edit } from './edit'
 import { remove } from './remove'
 import { list } from './list'
 import { exportContext } from './export'
-import { fileExists, readFile } from '../utils/file-utils'
-import { getBuildTarget, getAccessToken } from '../utils/config-utils'
-import { displayResult } from '../utils/displayResult'
+import { fileExists, readFile } from '../../utils/file-utils'
+import { getBuildTarget, getAccessToken } from '../../utils/config-utils'
+import { displayResult } from '../../utils/displayResult'
+import { Command } from '../../utils/command'
 import SASjs from '@sasjs/adapter/node'
 
 export async function processContext(commandLine) {
-  const command = commandLine[1]
-  const commands = {
+  const command = new Command(commandLine)
+  const subCommand = command.getSubCommand()
+  const subCommands = {
     create: 'create',
     edit: 'edit',
     delete: 'delete',
     list: 'list',
     export: 'export'
   }
 
-  if (!commands.hasOwnProperty(command)) {
+  if (!subCommands.hasOwnProperty(subCommand)) {
     console.log(
       chalk.redBright(
         `Not supported context command. Supported commands are:\n${Object.keys(
-          commands
+          subCommands
         ).join('\n')}`
       )
     )
 
     return
   }
 
-  const commandExample =
-    'sasjs context <command> --source ../contextConfig.json --target targetName'
-
-  let targetName = []
-  let targetNameFlagIndex = commandLine.indexOf('--target')
-
-  if (targetNameFlagIndex === -1)
-    targetNameFlagIndex = commandLine.indexOf('-t')
-
-  if (targetNameFlagIndex !== -1) {
-    for (let i = targetNameFlagIndex + 1; i < commandLine.length; i++) {
-      if (commandLine[i] === '--source' || commandLine[i] === '-s') {
-        throw `Target name has to be provided as the last argument (eg ${commandExample})`
-      }
-
-      targetName.push(commandLine[i])
-    }
-  }
-
-  targetName = targetName.join(' ')
-
+  const targetName = command.getFlagValue('target')
   const target = await getBuildTarget(targetName)
 
-  let configPath
-  let config
-  let parsedConfig
-  let configPathFlagIndex
+  const commandExample =
+    'sasjs context <command> --source ../contextConfig.json --target targetName'
 
   const getConfig = async () => {
-    configPathFlagIndex = commandLine.indexOf('--source')
+    const configPath = command.getFlagValue('source')
 
-    if (configPathFlagIndex === -1)
-      configPathFlagIndex = commandLine.indexOf('-s')
+    if (!configPath) {
+      const message = `'--source' flag is missing (eg '${commandExample}')`
 
-    if (configPathFlagIndex === -1) {
-      console.log(
-        chalk.redBright(`'--source' flag is missing (eg '${commandExample}')`)
-      )
+      console.log(chalk.redBright(message))
 
       return
-    }
+    } else if (!validateConfigPath(configPath)) {
+      const message = `Provide a path to context config file (eg '${commandExample}')`
 
-    configPath = commandLine[configPathFlagIndex + 1]
-
-    if (!configPath || !validateConfigPath(configPath)) {
-      console.log(
-        chalk.redBright(
-          `Provide a path to context config file (eg '${commandExample}')`
-        )
-      )
+      console.log(chalk.redBright(message))
 
       return
     }
 
     return await readFile(configPath)
   }
 
-  const getContextName = (upToSourceFlag = false) => {
-    let contextName = ''
+  const getContextName = () => {
+    let contextName = command.values.join(' ')
 
-    if (targetNameFlagIndex === -1) {
-      contextName = commandLine.slice(2).join(' ')
-    } else {
-      contextName = commandLine
-        .slice(2, upToSourceFlag ? configPathFlagIndex : targetNameFlagIndex)
-        .join(' ')
-    }
+    if (!contextName) {
+      const message = `Provide a context name (eg 'sasjs context <command> contextName')`
 
-    if (!contextName && !upToSourceFlag) {
-      console.log(
-        chalk.redBright(
-          `Provide a context name (eg 'sasjs context <command> contextName')`
-        )
-      )
+      console.log(chalk.redBright(message))
 
       return null
     }
@@ -122,10 +83,12 @@ export async function processContext(commandLine) {
     displayResult(err)
   })
 
+  let config
+  let parsedConfig
   let output
 
-  switch (command) {
-    case commands.create:
+  switch (subCommand) {
+    case subCommands.create:
       config = await getConfig()
 
       if (!config) break
@@ -135,7 +98,7 @@ export async function processContext(commandLine) {
       output = await create(parsedConfig, sasjs, accessToken)
 
       break
-    case commands.edit: {
+    case subCommands.edit: {
       config = await getConfig()
 
       const contextName = getContextName(true)
@@ -146,7 +109,7 @@ export async function processContext(commandLine) {
 
       break
     }
-    case commands.delete: {
+    case subCommands.delete: {
       const contextName = getContextName()
 
       if (contextName) {
@@ -155,11 +118,11 @@ export async function processContext(commandLine) {
 
       break
     }
-    case commands.list:
+    case subCommands.list:
       output = list(target, sasjs, accessToken)
 
       break
-    case commands.export: {
+    case subCommands.export: {
       const contextName = getContextName()
 
       if (contextName) {

diff --git a/src/sasjs-context/list.js → src/commands/context/list.js b/src/sasjs-context/list.js → src/commands/context/list.js
@@ -1,6 +1,6 @@
 import chalk from 'chalk'
 import ora from 'ora'
-import { displayResult } from '../utils/displayResult'
+import { displayResult } from '../../utils/displayResult'
 
 /**
  * Lists all accessible and inaccessible compute contexts.

diff --git a/src/sasjs-context/remove.js → src/commands/context/remove.js b/src/sasjs-context/remove.js → src/commands/context/remove.js
@@ -1,4 +1,4 @@
-import { displayResult } from '../utils/displayResult'
+import { displayResult } from '../../utils/displayResult'
 
 /**
  * Removes compute context.

diff --git a/src/sasjs-create/index.js → src/commands/create.js b/src/sasjs-create/index.js → src/commands/create.js
@@ -17,7 +17,7 @@ import {
 } from '../utils/file-utils'
 import chalk from 'chalk'
 
-export async function create(parentFolderName = '.', appType = '') {
+export async function create(parentFolderName, appType) {
   const configPath =
     appType === 'sasonly' ? '../config-sasonly.json' : '../config.json'
   const config = await getConfiguration(path.join(__dirname, configPath))

diff --git a/src/sasjs-db/index.js → src/commands/db.js b/src/sasjs-db/index.js → src/commands/db.js
diff --git a/src/sasjs-deploy/index.js → src/commands/deploy.js b/src/sasjs-deploy/index.js → src/commands/deploy.js
diff --git a/src/sasjs-folder/create.js → src/commands/folder/create.js b/src/sasjs-folder/create.js → src/commands/folder/create.js
@@ -1,5 +1,5 @@
 import chalk from 'chalk'
-import { displayResult } from '../utils/displayResult'
+import { displayResult } from '../../utils/displayResult'
 
 /**
  * Creates folder.