@tremho/mist-lift 2.4.0 → 2.5.2

package/src/commands/publish.ts

@@ -25,7 +25,7 @@ import { resolvePaths } from '../lib/pathResolve'
 import { gatherFunctionDefinitions } from '../lib/openAPI/ApiBuildCollector'
 import { delay } from '../lib/utils'
 import { addBuiltInDefinitions, MakeBuiltinApiDoc } from './builtin/ApiDocMaker'
-import { DeployApiBuiltin, DeployRootFileserves, DeployWebrootBuiltIn } from './builtin/BuiltInHandler'
+import { DeployApiBuiltin /*, DeployRootFileserves, DeployWebrootBuiltIn */ } from './builtin/BuiltInHandler'
 import { esbuilder } from '../lib/ESBuild'
 import { getIdSrc, getIdDelimiter } from '../lib/IdSrc'
 import { ExportWebroot, getWebrootSettings } from './builtin/ExportWebroot'
@@ -35,9 +35,10 @@ import updateDeployedPermissions from './actions/updateDeployedPermissions'
 let projectPaths: any
 
 export async function doPublishAsync (args: string[] = []): Promise<number> {
-  const stageName = 'Dev'
-  const retCode = await doDeployAsync(args)
-  if (retCode) return retCode
+  const stageName: string = 'Dev'
+  const retCode: number | undefined = await doDeployAsync(args)
+
+  if (retCode !== 0) return retCode
   // const retCode = 0
 
   projectPaths = resolvePaths()

package/src/expressRoutes/functionBinder.ts

@@ -7,7 +7,7 @@ import { resolvePaths } from '../lib/pathResolve'
 import express from 'express'
 import { gatherFunctionDefinitions } from '../lib/openAPI/ApiBuildCollector'
 import { buildOpenApi } from '../lib/openAPI/openApiConstruction'
-import { BadRequest, Log } from '@tremho/inverse-y'
+import { Log } from '@tremho/inverse-y'
 import { parseConstraints } from '../lib/TypeCheck'
 
 const clearModule = require('clear-module')
@@ -46,14 +46,16 @@ export function functionBinder (): void {
         if (n !== -1) entryRoot = entryRoot.substring(0, n) + '/*'
 
         const callHandler = (def: any, req: any, res: any): void => {
-          console.log('>>>>>>> YES WE ARE HERE<<<<<<<<<')
+          // console.log('>>>>>>> YES WE ARE HERE<<<<<<<<<')
           if (Buffer.isBuffer(req.body)) {
             const buffer: Buffer = req.body
+            /* eslint-disable */
             console.log('body is a buffer at callHandler. Length is ' + buffer.byteLength)
             console.log('First 16 bytes:', buffer.subarray(0, 16).toString('hex'))
+            /* eslint-enable */
           }
           const message = testPathRoute(def, req)
-          if (message) {
+          if (message !== '') {
             return handleResponse(res, { statusCode: 403, body: { error: message } })
           }
           const event = requestToEvent(def, req)
@@ -91,11 +93,11 @@ export function functionBinder (): void {
 }
 
 // compare request route to the definition of this function to see if it matches
-function testPathRoute (def: any, req: any) {
+function testPathRoute (def: any, req: any): string {
   let path = req.path
   let pathMap = def.pathMap
-  if (path.endsWith('/')) path = path.substring(0, path.length - 1)
-  if (pathMap.endsWith('/')) pathMap = pathMap.substring(0, path.length - 1)
+  if (path.endsWith('/') === true) path = path.substring(0, path.length - 1)
+  if (pathMap.endsWith('/') === true) pathMap = pathMap.substring(0, path.length - 1)
   const defParts = pathMap.split('/')
   const pathParts = path.split('/')
 
@@ -109,7 +111,7 @@ function testPathRoute (def: any, req: any) {
   return message
 }
 
-function performParameterTesting (def: any, event: any) {
+function performParameterTesting (def: any, event: any): void {
   // for every parameter defined in def
   // find the corresponding value in event.parameters (by name)
   // find the constraints for that parameter in def
@@ -118,7 +120,7 @@ function performParameterTesting (def: any, event: any) {
     const constraints = Array.isArray(pdef.constraints) ? parseConstraints(pdef.type, pdef.constraints.join('\n'), '\n') : undefined
     let value: any = event.parameters[pdef.name]
     if (value === undefined) {
-      if (!pdef.required) return // okay to be undefined
+      if (pdef.required !== true) return // okay to be undefined
     }
     if (pdef.type === 'number') value = Number(value) // TODO: Type coercion for all types
     constraints?.test(value)
@@ -126,13 +128,13 @@ function performParameterTesting (def: any, event: any) {
 }
 
 // returns 'text', 'json', or undefined
-function bodyTypeCollapse (type: string) {
+function bodyTypeCollapse (type: string): string | undefined {
   const options: any = {
     text: 'text',
     json: 'json',
     'application/json': 'json'
   }
-  if (type) {
+  if (type !== '') {
     type = type.toLowerCase().trim()
     if (type.substring(0, 5) === 'text/') return 'text'
     return options[type]
@@ -189,11 +191,13 @@ function requestToEvent (def: any, req: any): any {
       req.body = Buffer.from(req.body)
     }
   }
+  /* eslint-disable */
   if (Buffer.isBuffer(req.body)) {
     const buffer: Buffer = req.body
     console.log('body is buffer eventToRequest, Length = ' + buffer.byteLength)
     console.log('First 16 bytes:', buffer.subarray(0, 16).toString('hex'))
   }
+  /* eslint-enable */
   const template = def.pathMap
 
   // unpack weird choice of express when passed from curl.

package/src/integration-tests/quickstart-scenario.test.ts

@@ -23,7 +23,7 @@ async function test (t: any): Promise<void> {
     fs.rmSync('QSTest', { recursive: true })
   }
   // init
-  await doInit('QSTest', true)
+  await doInit('QSTest', '', true)
 
   // verify project got made
   assert.isTrue(fs.existsSync('QSTest'), 'created test project')
@@ -73,13 +73,14 @@ async function test (t: any): Promise<void> {
   const data: string = resp.data.toString()
   assert.isEqual(data, testMessage, 'saw expected data')
 
-  // clean up
-  process.chdir('..')
-  fs.rmSync('QSTest', { recursive: true })
+  console.log(' ---------- test is complete --------')
 
+  // This should end the test, but for some reason doesn;t
   t.end()
 }
 
 Tap.test('Integration Quickstart', async t => {
   await test(t)
+  console.log(' ---------- test ended --------')
+  process.exit(0) // force exit of test harness
 })

package/src/lib/IdSrc.ts

@@ -39,9 +39,9 @@ export function decoratedName (name: string): string {
   return dname
 }
 
-export async function getAccountId () {
+export async function getAccountId (): Promise<string | undefined> {
   const client = new STSClient({} as any)
   const command: any = new GetCallerIdentityCommand({})
   const response: any = await client.send(command)
-  return response.Account // This is your AWS account ID
+  return response.Account ?? '' // This is your AWS account ID
 }

package/src/lib/TypeCheck.ts

@@ -2,6 +2,7 @@
 Module for Constraint definitions and TypeCheck support
  */
 
+/* eslint-disable */ // too screwed up.  This file originated in an old JS project and was converted to TS quickly. TS-Standard is too restrictive for the style.
 /**
  * Enumeration of basic types
  *
@@ -1166,3 +1167,5 @@ export function validate (
   }
   return ok
 }
+
+/* eslint-enable */

package/src/lib/openAPI/openApiConstruction.ts

@@ -7,8 +7,8 @@ import path from 'path'
 import { resolvePaths } from '../pathResolve'
 import * as ac from 'ansi-colors'
 import { decoratedName, getAccountId } from '../IdSrc'
-import { getAWSCredentials, getSettings } from '../LiftConfig'
-import { parseConstraints, TypeConstraint } from '../TypeCheck'
+import { getSettings } from '../LiftConfig'
+import { parseConstraints } from '../TypeCheck'
 import yaml from 'js-yaml'
 
 export async function buildOpenApi (
@@ -117,14 +117,15 @@ export async function buildOpenApi (
 }
 
 function addTypeSchema (builder: any, schemaName: string, schema: any): void {
-  let primType = ''
-  let type = schema?.type ?? 'Empty'
+  let primType: string = ''
+  let type: string = schema?.type ?? 'Empty'
   if (type === 'empty') type = 'Empty' // fix case
-  const isArray = (type.endsWith('[]'))
+  const isArray: boolean = (type.endsWith('[]'))
   if (isArray) type = type.substring(0, type.length - 2)
   if (type === 'string' || type === 'number' || type === 'object') primType = type
-  const mime = schema?.mime ?? primType ? 'text/plain' : 'application/json'
-  const sref = primType ? { type: primType } : { $ref: '#/components/schemas/' + type }
+  // const sm: string = schema?.mime
+  // const mime: string = sm !== '' ?? primType !== '' ? 'text/plain' : 'application/json'
+  const sref: any = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type }
   let ref: any = {}
   if (isArray) {
     ref = { type: 'array', items: sref }
@@ -139,21 +140,22 @@ function addTypeSchema (builder: any, schemaName: string, schema: any): void {
   const constraints = schema.type !== 'object' && Array.isArray(schema?.constraints) ? parseConstraints(schema.type, schema.constraints.join('\n'), '\n') : undefined
 
   const cdesc = (constraints != null) ? '\n  - ' + (constraints.describe() ?? '').split('\n').join('\n  - ') : ''
-  let description = schema.description
-  if (cdesc) description += cdesc
+  let description: string = schema.description
+  if (cdesc !== '') description += cdesc
 
   ref.description = description
 
   const required: string[] = []
 
-  if (ref.properties) {
-    for (const [propName, propDef] of Object.entries(schema.properties || {})) {
+  if ((ref.properties as boolean)) {
+    const sp: any = schema.properties ?? {}
+    for (const [propName, propDef] of Object.entries(sp)) {
       const pda = propDef as any
       const constraints = Array.isArray(pda?.constraints) ? parseConstraints(pda.type, pda.constraints.join('\n'), '\n') : undefined
 
       const cdesc = (constraints != null) ? '\n  - ' + (constraints.describe() ?? '').split('\n').join('\n  - ') : ''
-      let description = (propDef as any).description
-      if (cdesc) description += cdesc
+      let description: string = (propDef as any).description
+      if (cdesc !== '') description += cdesc
 
       // if(constraints) {
       //   console.log("schema definition for "+schemaName+', prop '+propName)
@@ -169,7 +171,8 @@ function addTypeSchema (builder: any, schemaName: string, schema: any): void {
       ref.properties[propName] = propSchema
 
       // Only mark as required if declared explicitly
-      if (schema.required && schema.required.includes(propName)) {
+      const sr: string = schema.required ?? ''
+      if (sr !== '' && sr.includes(propName)) {
         required.push(propName)
       }
     }
@@ -185,13 +188,14 @@ async function addFunctionMethod (pathDef: any, method: string, def: any, includ
   const retDef: any = (def.returns)['200']
   const content: any = {}
   let primType = ''
-  let type = retDef?.type ?? 'Empty'
+  let type: string = retDef?.type ?? 'Empty'
   if (type === 'empty') type = 'Empty' // fix case
-  const isArray = (type.endsWith('[]'))
+  const isArray: boolean = (type.endsWith('[]'))
   if (isArray) type = type.substring(0, type.length - 2)
   if (type === 'string' || type === 'number' || type === 'object') primType = type
-  const mime = retDef?.mime ?? primType ? 'text/plain' : 'application/json'
-  const ref = primType ? { type: primType } : { $ref: '#/components/schemas/' + type }
+  const rdm: string = retDef?.mime ?? ''
+  const mime: string = rdm !== '' ? rdm : primType !== '' ? 'text/plain' : 'application/json'
+  const ref: any = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type }
   let schema: any
   if (isArray) {
     schema = { type: 'array', items: ref }
@@ -202,11 +206,12 @@ async function addFunctionMethod (pathDef: any, method: string, def: any, includ
     schema
   }
 
-  const region = getSettings()?.awsPreferredRegion ?? ''
-  const accountId = await getAccountId()
-  const decName = decoratedName(def.name)
+  const region: string = getSettings()?.awsPreferredRegion ?? ''
+  const accountId: string = await getAccountId() ?? ''
+  const decName: string = decoratedName(def.name) ?? ''
 
-  const isBinary = def.bodyType && !def.bodyType.startsWith('text') && !def.bodyType.endsWith('json')
+  const bodyType: string = def.bodyType ?? ''
+  const isBinary: boolean = bodyType.startsWith('text') && bodyType.endsWith('json')
 
   const methData = {
     summary: def.name,
@@ -251,18 +256,18 @@ async function addFunctionMethod (pathDef: any, method: string, def: any, includ
   if (!includeCORS) {
     // get the other response code declarations
     for (const rcode of Object.getOwnPropertyNames(def.returns)) {
-      if (rcode != '200') {
+      if (rcode !== '200') {
         const retDef = def.returns[rcode] ?? {}
 
         const content: any = {}
-        let primType = ''
-        let type = retDef?.type ?? 'Empty'
+        let primType: string = ''
+        let type: string = retDef?.type ?? 'Empty'
         if (type === 'empty') type = 'Empty' // fix case
-        const isArray = (type.endsWith('[]'))
+        const isArray: boolean = (type.endsWith('[]'))
         if (isArray) type = type.substring(0, type.length - 2)
         if (type === 'string' || type === 'number' || type === 'object') primType = type
-        const mime = retDef?.mime ?? primType ? 'text/plain' : 'application/json'
-        const ref = primType ? { type: primType } : { $ref: '#/components/schemas/' + type }
+        const mime: string = retDef?.mime !== undefined ? primType?.length > 0 ? 'text/plain' : 'application/json' : ''
+        const ref: any = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type }
         let schema: any
         if (isArray) {
           schema = { type: 'array', items: ref }
@@ -347,8 +352,8 @@ function addParameter (pathDef: any, param: any): void {
   const constraints = Array.isArray(param.constraints) ? parseConstraints(param.type, param.constraints.join('\n'), '\n') : undefined
 
   const cdesc = (constraints != null) ? '\n  - ' + (constraints.describe() ?? '').split('\n').join('\n  - ') : ''
-  let description = param.description
-  if (cdesc) description += cdesc
+  let description: string = param.description
+  if (cdesc !== '') description += cdesc
 
   // don't declare parameters marked as 'body'.  OpenAPI doesn't support that.
   if (param.in === 'path' || param.in === 'query') {
@@ -356,7 +361,7 @@ function addParameter (pathDef: any, param: any): void {
       in: param.in,
       name: param.name,
       description,
-      example: example || undefined,
+      example: example ?? undefined,
       required,
       schema: schemaType(deflt, type, true)
     })
@@ -387,6 +392,6 @@ function schemaType (deflt: string | undefined, namedType: string, innerOnly: bo
   }
   if (type === 'int') type = 'integer'
   if (type === 'bool') type = 'boolean'
-  if (!deflt) deflt = undefined
+  if (deflt === null || deflt === '') deflt = undefined
   return innerOnly ? { type, format, example: deflt } : { schema: { type, format, example: deflt } }
 }

package/src/lift.ts

@@ -37,7 +37,7 @@ async function processCommand (): Promise<void> {
       await doDoctor()
       return
     case 'init':
-      return await doInit(args[0] ?? '')
+      return await doInit(args[0] ?? '', args[1]) // folder, clientType (react or js default js)
     case 'create':
       return doCreate(args[0] ?? '')
     case 'build': {

package/templateData/app/MainPage.tsx

@@ -0,0 +1,10 @@
+import React from 'react'
+
+export default function MainPage() {
+    return (
+        <>
+            <h2>Hello MistLift</h2>
+            <p>from the default React app/MainPage.tsx created by MistLift</p>
+        </>
+    )
+}

package/templateData/app/app.tsx

@@ -0,0 +1,39 @@
+import React from 'react'
+import {createRoot} from 'react-dom/client'
+import { BrowserRouter, Route, Routes } from 'react-router-dom'
+
+import MainPage from './MainPage'
+
+let pageComp = <MainPage />
+
+const routes = {
+    home: <MainPage />
+}
+
+// route to the page directed by the ?page= query parameter
+const params = new URLSearchParams(document.location.search)
+// console.log('search params', params)
+let page = params.get("page")?.toLowerCase().trim()
+// console.log('page='+page)
+// if(!page && document.cookie.indexOf("idtbd=") !== -1) {
+//     (IDTBD as any).hasCookie = true
+// }
+pageComp = routes[page] ?? <MainPage />
+
+const container = document.getElementById('root')
+const root = createRoot(container)
+
+root.render(
+    <>
+        <BrowserRouter>
+            <Routes>
+                <Route path = '/index.html' element= {pageComp} />
+                <Route path = '/' element= {pageComp} />
+                <Route path = '/Dev/index.html' element= {pageComp} />
+                <Route path = '/Dev/+' element= {pageComp} />
+                <Route path = '/vod/index.html' element= {pageComp} />
+                <Route path = '/vod/+' element= {pageComp} />
+            </Routes>
+        </BrowserRouter>
+    </>
+)

package/templateData/webroot/app.js

@@ -1,9 +1,9 @@
-/*
-empty template file
+const root = document.getElementById('root')
+const label = document.createElement('H1');
+const message = document.createElement('p');
 
-loaded by template index.html
+label.innerText =  'Hello MistLift'
+message.innerText = "This page content is generated from the default javascript MistLift page in webroot/app.js"
 
-Could be the output of an ESBuild bundle, for example.
-See docs/ESBuild and React support.md
-
- */
+root.appendChild(label);
+root.appendChild(message)

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "sourceMap": true,
+    "rootDir": "./src",
     "outDir": "./build",
     "allowJs": true,
     "target": "ES2015",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
@@ -21,8 +22,7 @@
     "./node_modules/"
   ],
   "include": [
-    "**/*.ts",
-    "src/preload.js"
+    "src/**/*.ts"
   ]
 }