@ossy/cli 0.0.2-alpha → 0.0.4-alpha

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@ossy/cli",
-  "version": "0.0.2-alpha",
+  "version": "0.0.4-alpha",
   "description": "Command line tool that makes it easier to interact with our APIs",
   "source": "./src/index.js",
   "main": "./src/index.js",
+  "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "echo \"The build step is not required when using JavaScript!\" && exit 0"

package/src/cms/cli.js

@@ -1,56 +1,67 @@
 #!/usr/bin/env node
-const { resolve } = require('path')
-const { readFileSync } = require('fs')
-const arg = require('arg')
-const fetch = require('node-fetch')
-const { logInfo, logError } = require('../log')
-
-const config = {
-  apiUrl: 'https://api.ossy.se/api/v0',
-  // apiUrl: 'http://localhost:3001/api/v0'
+import { resolve } from 'path'
+import { readFileSync } from 'fs'
+import arg from 'arg'
+import fetch from 'node-fetch'
+import { logInfo, logError, logErrorAndReject, logDebug } from '../log.js'
+
+const Api = {
+  uploadResourceTemplates: (apiUrl, token, workspaceId, resourceTemplates) => {
+    const endpoint = `${apiUrl}/workspaces/${workspaceId}/resource-templates`
+
+    const fetchOptions = {
+      method: 'POST',
+      headers: { 'Authorization': token, 'Content-Type': 'application/json' },
+      body: JSON.stringify(resourceTemplates)
+    }
+
+    return fetch(endpoint, fetchOptions)
+  }
 }
 
+const resolveConfigImport = path => path.endsWith('json')
+  ? Promise.resolve(JSON.parse(readFileSync(path), 'utf8'))
+  : import(path)
+
 const importResourceTemplates = options => {
 
   const parsedArgs = arg({
     '--authentication': String,
     '--a': '--authentication',
 
-    '--ossy-file': String,
-    '-o': '--ossy-file',
+    '--config': String,
+    '-c': '--config',
   }, { argv: options })
 
   logInfo({ message: '[CMS] reading files' })
-  const token = parsedArgs['--authentication']
-  const filePath = resolve(parsedArgs['--ossy-file'])
+  const token = parsedArgs['--authentication'];
+  const filePath = resolve(parsedArgs['--config'])
 
-  const ossyfile = filePath.endsWith('json')
-    ? JSON.parse(readFileSync(filePath), 'utf8')
-    : require(filePath)
+  if (!token) return logErrorAndReject({ message: '[CMS] No token provided with --authentication'})
 
-  if (!token) return logError({ message: '[CMS] No token provided with --authentication'})
-  if (!ossyfile?.workspaceId) return logError({ message: '[CMS] No workspaceId provided in ossy.json'})
-  if (!ossyfile?.resourceTemplates) return logError({ message: '[CMS] No resource templates provided in ossy.json'})
+  return resolveConfigImport(filePath)
+    .then(module => {
+      const config = module?.default
+      const apiUrl = config?.apiUrl || 'https://api.ossy.se/api/v0'
+      const workspaceId = config?.workspaceId
+      const resourceTemplates = config?.resourceTemplates
 
-  logInfo({ message: '[CMS] uploading resource templates' })
+      if (!workspaceId) return logErrorAndReject({ message: '[CMS] No workspaceId provided in ossy.json'})
+      if (!resourceTemplates) return logErrorAndReject({ message: '[CMS] No resource templates provided in ossy.json'})
 
-  const endpoint = `${config.apiUrl}/workspaces/${ossyfile.workspaceId}/resource-templates`
+      logInfo({ message: '[CMS] uploading resource templates' })
 
-  const fetchOptions = {
-    method: 'POST',
-    headers: { 'Authorization': token, 'Content-Type': 'application/json' },
-    body: JSON.stringify(ossyfile.resourceTemplates)
-  }
+      Api.uploadResourceTemplates(apiUrl, token, workspaceId, resourceTemplates)
+          .then(response => {
+            logInfo({ message: '[CMS] Done' })
+          })
+          .catch(error => logError({ message: '[CMS] Error', error }))
+    })
 
-  fetch(endpoint, fetchOptions)
-    .then(() => logInfo({ message: '[CMS] Done' }))
-    .catch(error => logError({ message: '[CMS] Error', error }))
 }
 
-module.exports = {
-  handler: ([command, ...options]) => {
-    !!command
-      ? { 'import-resource-templates': importResourceTemplates }[command](options)
-      : logError({ message: '[CMS] No command provided' })
-  }
+export const handler = ([command, ...options]) => {
+  !!command
+    ? { 'import-resource-templates': importResourceTemplates }[command](options)
+    : logError({ message: '[CMS] No command provided' })
 }

package/src/index.js

@@ -4,7 +4,7 @@
 const [_, __, handlerName, ...restArgs] = process.argv
 
 const loadHandler = {
-  cms: () => require('./cms/cli.js')
+  cms: () => import('./cms/cli.js')
 }[handlerName]
 
-!!loadHandler && loadHandler().handler(restArgs)
+!!loadHandler && loadHandler().then(({ handler })=> handler(restArgs))

package/src/log.js

@@ -11,15 +11,15 @@ const TypeOfMessage = {
   Debug: 'DEBUG'
 }
 
-const log = (...params) => { console.log(...params) }
+export const log = (...params) => { console.log(...params) }
 const prefixTo = (prefix, message) => `[${prefix}]${message.startsWith('[') ? '' : ': '}`
 
-const logInfo = logInput => {
+export const logInfo = logInput => {
   const messagePrefix = prefixTo(TypeOfMessage.Info, logInput.message)
   log(`${messagePrefix}${logInput.message}`)
 }
 
-const logError = logInput => {
+export const logError = logInput => {
   const messagePrefix = prefixTo(TypeOfMessage.Error, logInput.message)
   log('\n')
   log(`${messagePrefix}${logInput.message}`)
@@ -27,7 +27,7 @@ const logError = logInput => {
   log('\n')
 }
 
-const logDebug = logInput => {
+export const logDebug = logInput => {
   const isDebugOn = process.env.DEBUG || true
   if (!isDebugOn) return
   const messagePrefix = prefixTo(TypeOfMessage.Debug, logInput.message)
@@ -37,14 +37,7 @@ const logDebug = logInput => {
   log('\n')
 }
 
-const logErrorAndReject = message => error => {
-  logError({ message, error })
-  return Promise.reject(error)
-}
-
-module.exports = {
-  logInfo,
-  logError,
-  logErrorAndReject,
-  logDebug
+export const logErrorAndReject = logInput => {
+  logError(logInput)
+  return Promise.reject(logInput.error)
 }