@tremho/mist-lift 1.0.2-pre-release.4 → 1.0.2-pre-release.5

package/src/commands/settings.ts

@@ -1,76 +1,73 @@
-import path from "path";
-import fs from "fs";
-import {LiftConfig, RuntimeType} from '../lib/LiftConfig'
-import {homedir} from 'os'
-import {ask} from "../lib/askQuestion";
+import path from 'path'
+import fs from 'fs'
+import { LiftConfig, RuntimeType } from '../lib/LiftConfig'
+import { homedir } from 'os'
+import { ask } from '../lib/askQuestion'
 import * as ac from 'ansi-colors'
 
+export async function doSettings (): Promise<number> {
+  try {
+    const mistLiftPath = path.join(homedir(), '.mistlift')
+    let settings: LiftConfig = { cloudHost: 'AWS' }
+    if (fs.existsSync(mistLiftPath)) {
+      settings = JSON.parse(fs.readFileSync(mistLiftPath).toString())
+    }
 
-export async function doSettings()
-{
-
-    try {
-        const mistLiftPath = path.join(homedir(), ".mistlift")
-        let settings:LiftConfig = {cloudHost: "AWS"}
-        if(fs.existsSync(mistLiftPath)) {
-            settings = JSON.parse(fs.readFileSync(mistLiftPath).toString())
-        }
-
-        let ok = false;
-        while(!ok) {
-            settings.cloudHost = ask("Type of cloud host (AWS)",
-                "cloud host",
-                settings.cloudHost
-            )
-            ok = settings.cloudHost == "AWS" // all we support now
-        }
-        ok = false
-
-        if(settings.cloudHost === "AWS") {
-            console.log("Choose from a configured AWS profile, or leave empty to use a custom credentials config file")
-            while (!ok) {
-                settings.awsIniProfile = ask("Name of AWS profile to use",
-                    "AWS Profile",
-                    settings.awsIniProfile??"default"
-                )
-                ok = settings.awsIniProfile !== "";
-            }
-            ok = false;
-            let runtime:string = settings.awsNodeRuntime as string
-            while(!ok) {
-                runtime = ask("AWS Node Runtime Version",
-                    "NodeJS Runtime",
-                    "Nodejs20.x"
-                )
-                ok = !!runtime
-            }
-            settings.awsNodeRuntime = runtime.toLowerCase() as RuntimeType
+    let ok = false
+    while (!ok) {
+      settings.cloudHost = ask('Type of cloud host (AWS)',
+        'cloud host',
+        settings.cloudHost
+      )
+      ok = settings.cloudHost === 'AWS' // all we support now
+    }
+    ok = false
 
-            ok = false;
-            while(!ok) {
-                settings.awsPreferredRegion = ask("Preferred AWS region",
-                    "preferred AWS region",
-                    settings.awsPreferredRegion??"us-east-1"
-                )
-                ok = !!settings.awsPreferredRegion
-            }
-            ok = false;
-            console.log("Supply the ARN for the service role you have created in your AWS IAM account for Lambda, S3, and Cloudwatch access")
-            while(!ok) {
-                settings.awsServiceRoleARN = ask("AWS service role ARN",
-                    "serviceRole ARN",
-                    settings.awsServiceRoleARN??"arn:aws.iam::xxxxxxxxxxxx:role/service-role-name"
-                )
-                ok = settings.awsServiceRoleARN !== "arn:aws.iam::xxxxxxxxxxxx:role/service-role-name"
-                  && settings.awsServiceRoleARN !== ""
-            }
-        }
-        fs.writeFileSync(mistLiftPath, JSON.stringify(settings))
+    if (settings.cloudHost === 'AWS') {
+      ok = false
+      console.log('Choose from a configured AWS profile, or leave empty to use a custom credentials config file')
+      while (!ok) {
+        settings.awsIniProfile = ask('Name of AWS profile to use',
+          'AWS Profile',
+          settings.awsIniProfile ?? 'default'
+        )
+        ok = settings.awsIniProfile !== ''
+      }
+      ok = false
+      let runtime: string = settings.awsNodeRuntime as string
+      while (!ok) {
+        runtime = ask('AWS Node Runtime Version',
+          'NodeJS Runtime',
+          'Nodejs20.x'
+        )
+        ok = runtime !== ''
+      }
+      settings.awsNodeRuntime = runtime.toLowerCase() as RuntimeType
 
-        return 0;
-    }
-    catch(e:any) {
-        console.error(ac.bold.red("Error with settings:"), e)
-        return -1;
+      ok = false
+      while (!ok) {
+        settings.awsPreferredRegion = ask('Preferred AWS region',
+          'preferred AWS region',
+          settings.awsPreferredRegion ?? 'us-east-1'
+        )
+        ok = (settings.awsPreferredRegion ?? '') !== ''
+      }
+      ok = false
+      console.log('Supply the ARN for the service role you have created in your AWS IAM account for Lambda, S3, and Cloudwatch access')
+      while (!ok) {
+        settings.awsServiceRoleARN = ask('AWS service role ARN',
+          'serviceRole ARN',
+          settings.awsServiceRoleARN ?? 'arn:aws.iam::xxxxxxxxxxxx:role/service-role-name'
+        )
+        ok = settings.awsServiceRoleARN !== 'arn:aws.iam::xxxxxxxxxxxx:role/service-role-name' &&
+                  settings.awsServiceRoleARN !== ''
+      }
     }
-}
+    fs.writeFileSync(mistLiftPath, JSON.stringify(settings))
+
+    return 0
+  } catch (e: any) {
+    console.error(ac.bold.red('Error with settings:'), e)
+    return -1
+  }
+}

package/src/commands/start.ts

@@ -1,46 +1,41 @@
 /** Run Express Server */
 import express from 'express'
-import fs from 'fs'
-import path from 'path'
-import bodyParser from 'body-parser'
 
-import functionRouter, {functionBinder} from "../expressRoutes/functionBinder"
+import functionRouter, { functionBinder } from '../expressRoutes/functionBinder'
 
-import apiRouter from "../expressRoutes/api"
-import allRouter, {allBinder} from "../expressRoutes/all"
-import {gatherFunctionDefinitions} from "../lib/openAPI/ApiBuildCollector";
-import {buildOpenApi} from "../lib/openAPI/openApiConstruction";
-import {resolvePaths} from "../lib/pathResolve";
+import apiRouter from '../expressRoutes/api'
+import allRouter, { allBinder } from '../expressRoutes/all'
+import { resolvePaths } from '../lib/pathResolve'
 
-import * as ac from "ansi-colors"
+import * as ac from 'ansi-colors'
 
-export function startLocalServer() {
-    const projectPaths = resolvePaths();
-    if(!projectPaths.verified) {
-        console.log(ac.bold.red("Cannot start local server"))
-        console.log(ac.blue.italic("Not in a valid MistLift project directory"))
-        console.log("")
-        return
-    }
-    const port = 8081
-    allBinder()
-    functionBinder()
-    const app = express()
-    // for JSON posts
-    // app.use(bodyParser.json({limit: '50mb'}))
-    app.use(express.json());
-    // for form posts
-    app.use(express.urlencoded({extended: true}))
+export function startLocalServer (): void {
+  const projectPaths = resolvePaths()
+  if (!projectPaths.verified) {
+    console.log(ac.bold.red('Cannot start local server'))
+    console.log(ac.blue.italic('Not in a valid MistLift project directory'))
+    console.log('')
+    return
+  }
+  const port = 8081
+  allBinder()
+  functionBinder()
+  const app = express()
+  // for JSON posts
+  // app.use(bodyParser.json({limit: '50mb'}))
+  app.use(express.json())
+  // for form posts
+  app.use(express.urlencoded({ extended: true }))
 
-    app.use('/', functionRouter)
-    app.use('/api', apiRouter)
-    app.use('*', allRouter)
+  app.use('/', functionRouter)
+  app.use('/api', apiRouter)
+  app.use('*', allRouter)
 
-// =========================================
-// Start server
-// http only
-    app.listen(port, function () {
-        console.log('http listening on port ' + port)
-    })
+  // =========================================
+  // Start server
+  // http only
+  app.listen(port, function () {
+    console.log(`http listening on port ${port}`)
+  })
 // ================================================
-}
+}

package/src/commands/test.ts

@@ -1,13 +1,12 @@
-import {executeCommand} from "../lib/executeCommand";
-import {doBuildAsync} from "./build";
+import { executeCommand } from '../lib/executeCommand'
+import { doBuildAsync } from './build'
 
-export async function doTestAsync(args:string[] ): Promise<number>
-{
-    if(await doBuildAsync(args)) return 1 // don't test if build fails
-    if(args.length === 0) args = ['*']
-    let ret = 0;
-    for (let funcName of args) {
-        const result = await executeCommand('tap', [
+export async function doTestAsync (args: string[]): Promise<number> {
+  if (await doBuildAsync(args) !== 0) return 1 // don't test if build fails
+  if (args.length === 0) args = ['*']
+  let ret = 0
+  for (const funcName of args) {
+    const result = await executeCommand('tap', [
             `build/functions/${funcName}/*-tests/*.js`,
             /*
                              - base -- looks a lot like terse
@@ -27,12 +26,12 @@ export async function doTestAsync(args:string[] ): Promise<number>
             '--allow-empty-coverage',
             '--allow-incomplete-coverage'
 
-        ], '', true)
+    ], '', true)
 
-        if (result.retcode) {
-            ret = result.retcode
-            break;
-        }
+    if (result.retcode !== 0) {
+      ret = result.retcode
+      break
     }
-    return ret;
-}
+  }
+  return ret
+}

package/src/commands/user.ts

@@ -17,4 +17,4 @@
 
  */
 //    }
-//}
+// }

package/src/expressRoutes/all.ts

@@ -1,18 +1,18 @@
-import path from "path";
-import fs from "fs";
+import path from 'path'
+import fs from 'fs'
 
-import * as ac from "ansi-colors"
-import {resolvePaths} from "../lib/pathResolve";
-import {gatherFunctionDefinitions} from "../lib/openAPI/ApiBuildCollector";
+import * as ac from 'ansi-colors'
+import { resolvePaths } from '../lib/pathResolve'
+import { gatherFunctionDefinitions } from '../lib/openAPI/ApiBuildCollector'
 
 import express from 'express'
-const router = express.Router();
+const router = express.Router()
 
-export function allBinder() {
-    const projectPaths = resolvePaths();
-    const defs = gatherFunctionDefinitions();
+export function allBinder (): void {
+  const projectPaths = resolvePaths()
+  const defs = gatherFunctionDefinitions()
 
-    /**
+  /**
      * @name /all
      * @description
      * Catch-all handler for URLs
@@ -27,78 +27,73 @@ export function allBinder() {
      * - File contents passed through using `sendFile` (will handle its own 404 if not found)
      *
      */
-    router.all('*', (req, res, next) => {
+  router.all('*', (req, res, next) => {
+    // any PHP requests should be ignored
+    // ClogTrace('incoming: '+req.originalUrl)
+    if (req.originalUrl.includes('.php')) {
+      return res.send('')
+    }
+    if (req.originalUrl.includes('.env')) {
+      return res.send('')
+    }
 
-        // any PHP requests should be ignored
-        // ClogTrace('incoming: '+req.originalUrl)
-        if (req.originalUrl.indexOf('.php') !== -1) {
-            return res.send('')
+    let filepath = req.originalUrl ?? '/'
+    // match cloud behavior for docs because /api doesn't change cwd there
+    if (filepath.substring(0, 10) === '/api/docs/') {
+      filepath = filepath.replace('/api', '')
+    }
+    let funcFound = filepath === '/api' // reserved "function"
+    if (!funcFound) {
+      if (filepath.charAt(0) === '/') {
+        let n = filepath.indexOf('/', 1)
+        if (n === -1) n = filepath.length
+        let rootEntity = filepath.substring(0, n)
+        n = rootEntity.indexOf('?')
+        if (n === -1) n = rootEntity.length
+        rootEntity = rootEntity.substring(0, n)
+        for (const entry of defs) {
+          let entryRoot = entry.pathMap
+          const n = entryRoot.indexOf('/{')
+          if (n !== -1) entryRoot = entryRoot.substring(0, n)
+          if (rootEntity === entryRoot) {
+            funcFound = true
+            break
+          }
         }
-        if (req.originalUrl.indexOf('.env') !== -1) {
-            return res.send('')
-        }
-
+      }
+    }
 
+    if (!funcFound) {
+      // check for '/' in path beyond the first one
+      if (filepath.includes('/', 1)) {
+        // console.log(ac.magenta.italic("Warning: / path delimiters will not be honored in a cloud deployment, use + instead ")+filepath)
+      }
+      // convert any incoming + to / to match cloud behavior
+      while (filepath.includes('+')) filepath = filepath.replace('+', '/')
 
-        let filepath = req.originalUrl || '/'
-        // match cloud behavior for docs because /api doesn't change cwd there
-        if(filepath.substring(0, 10) == '/api/docs/') {
-            filepath = filepath.replace('/api', '');
+      // Put any other filtering here
+      if (filepath.includes('?')) {
+        filepath = filepath.substring(0, filepath.indexOf('?'))
+      }
+      if (filepath.substring(filepath.length - 1) === '/') filepath += 'index.html'
+      if (filepath.substring(0, 10) === '/api/docs/') {
+        filepath = filepath.replace('/api', '')
+      }
+      if (filepath.includes('/docs')) {
+        if (filepath.includes('.map')) {
+          return res.sendStatus(200)
         }
-        let funcFound = filepath === '/api'; // reserved "function"
-        if(!funcFound) {
-            if (filepath.charAt(0) === '/') {
-                let n = filepath.indexOf('/', 1);
-                if (n === -1) n = filepath.length;
-                let rootEntity = filepath.substring(0, n)
-                n = rootEntity.indexOf('?');
-                if (n === -1) n = rootEntity.length;
-                rootEntity = rootEntity.substring(0, n);
-                for (const entry of defs) {
-                    let entryRoot = entry.pathMap;
-                    let n = entryRoot.indexOf("/{");
-                    if (n !== -1) entryRoot = entryRoot.substring(0, n);
-                    if (rootEntity === entryRoot) {
-                        funcFound = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (!funcFound) {
-            // check for '/' in path beyond the first one
-            if(filepath.indexOf('/',1) !== -1)
-            {
-                // console.log(ac.magenta.italic("Warning: / path delimiters will not be honored in a cloud deployment, use + instead ")+filepath)
-            }
-            // convert any incoming + to / to match cloud behavior
-            while(filepath.indexOf("+")!== -1) filepath = filepath.replace("+", "/")
-
-            // Put any other filtering here
-            if (filepath.indexOf('?') !== -1) {
-                filepath = filepath.substring(0, filepath.indexOf('?'))
-            }
-            if (filepath.substring(filepath.length - 1) === '/') filepath += 'index.html'
-            if(filepath.substring(0, 10) == '/api/docs/') {
-                filepath = filepath.replace('/api', '');
-            }
-            if(filepath.indexOf("/docs") !== -1) {
-                if(filepath.indexOf('.map') !== -1) {
-                    return res.sendStatus(200)
-                }
-            }
-            filepath = path.resolve(path.join(projectPaths.basePath, 'webroot', filepath)) // .. out of build
-            if (fs.existsSync(filepath)) {
-                return res.sendFile(filepath)
-            } else {
-                console.log(ac.red.bold("can't find " + filepath));
-                return res.sendStatus(404);
-            }
-        }
-        // if none of the above, tickle enumerator so we can process other paths
-        next()
-    })
+      }
+      filepath = path.resolve(path.join(projectPaths.basePath, 'webroot', filepath)) // .. out of build
+      if (fs.existsSync(filepath)) {
+        return res.sendFile(filepath)
+      } else {
+        console.log(ac.red.bold("can't find " + filepath))
+        return res.sendStatus(404)
+      }
+    }
+    // if none of the above, tickle enumerator so we can process other paths
+    next()
+  })
 }
 export default router
-

package/src/expressRoutes/api.ts

@@ -1,24 +1,22 @@
+/* eslint @typescript-eslint/no-var-requires: "off" */
 import express from 'express'
-const router = express.Router();
 
-import {getProjectName, getProjectVersion} from "../lib/LiftVersion";
+import { getProjectName, getProjectVersion } from '../lib/LiftVersion'
 
-const openApiUI = require("openapi-ui");
+const openApiUi = require('openapi-ui')
+const router = express.Router()
 
-
-router.get('/', function(req, res, next) {
+router.get('/', function (req, res, next) {
   res.send(generateApiDoc())
-});
+})
 
 export default router
 
-function generateApiDoc()
-{
-  console.log("---- Serving up api")
-  return openApiUI.generateIndex({
-    baseUrl: "docs",
-    title: `${getProjectName()} ${getProjectVersion()}`,
-    url: "docs/apidoc.yaml"
-  });
-
-}
+function generateApiDoc (): void {
+  console.log('---- Serving up api')
+  return openApiUi.generateIndex({
+    baseUrl: 'docs',
+    title: `${getProjectName() ?? ''} ${getProjectVersion()?.toString() ?? ''}`,
+    url: 'docs/apidoc.yaml'
+  })
+}