@tremho/mist-lift 1.1.4 → 1.1.5

package/src/lib/LiftConfig.ts

@@ -1,74 +1,74 @@
-// configuration for setting cloud provider credentials
-// may expand later for other MistLift settings/preferences
-
-import path from 'path'
-import fs from 'fs'
-import { fromIni } from '@aws-sdk/credential-providers'
-
-let sLiftConfigLoaded: LiftConfig | null = null
-
-// Defines the structure of the .mistlft json file
-// All relevant configuration for the cloud host goes here
-export class LiftConfig {
-  public cloudHost: string = 'AWS' // all we support now
-  public awsIniProfile?: string
-  public awsPreferredRegion?: string
-  public awsNodeRuntime?: RuntimeType
-  public awsServiceRoleARN?: string
-}
-export type RuntimeType = 'nodejs' | 'nodejs4.3' | 'nodejs6.10' | 'nodejs8.10' | 'nodejs10.x' | 'nodejs12.x' | 'nodejs14.x' | 'nodejs16.x' | 'java8' | 'java8.al2' | 'java11' | 'python2.7' | 'python3.6' | 'python3.7' | 'python3.8' | 'python3.9' | 'dotnetcore1.0' | 'dotnetcore2.0' | 'dotnetcore2.1' | 'dotnetcore3.1' | 'dotnet6' | 'dotnet8' | 'nodejs4.3-edge' | 'go1.x' | 'ruby2.5' | 'ruby2.7' | 'provided' | 'provided.al2' | 'nodejs18.x' | 'python3.10' | 'java17' | 'ruby3.2' | 'ruby3.3' | 'python3.11' | 'nodejs20.x' | 'provided.al2023' | 'python3.12' | 'java21'
-
-// Available for general use because, why not?
-export function getUserHome (): string {
-  return process.env.HOME ?? process.env.HOMEPATH ?? process.env.USERPROFILE ?? '~'
-}
-
-export function LoadLiftConfig (): LiftConfig | null {
-  if (sLiftConfigLoaded == null) {
-    const mistlift = path.join(getUserHome(), '.mistlift')
-    let configJson = '{}'
-    if (fs.existsSync(mistlift)) {
-      try {
-        configJson = fs.readFileSync(mistlift).toString()
-        sLiftConfigLoaded = JSON.parse(configJson)
-      } catch (e: any) {
-        //
-      }
-    }
-  }
-  return sLiftConfigLoaded
-}
-export function resetLiftConfig (): void {
-  sLiftConfigLoaded = null
-}
-
-export function areSettingsAvailable (): boolean {
-  const mistlift = path.join(getUserHome(), '.mistlift')
-  return fs.existsSync(mistlift)
-}
-
-export function getSettings (): LiftConfig {
-  if (sLiftConfigLoaded == null) LoadLiftConfig()
-  return sLiftConfigLoaded as LiftConfig
-}
-
-/**
- * Return the credentials required for AWS based upon our config options.
- *
- * We will use the standard .aws config ini file, looked up by profile or default
- * Prior attempts to have it do more than this failed, and resulted in a default profile choice anyway.
- */
-export function getAWSCredentials (): any {
-  let config = LoadLiftConfig()
-  if (config == null) {
-    // console.error("No .mistlift configuration found - using AWS default profile");
-    config = { cloudHost: 'AWS', awsIniProfile: 'default' }
-  }
-  if (config.cloudHost?.toUpperCase() !== 'AWS') {
-    throw Error('HostType Not Supported')
-  }
-  let credentials = {}
-  const profile = config.awsIniProfile ?? 'default'
-  credentials = fromIni({ profile })
-  return credentials
-}
+// configuration for setting cloud provider credentials
+// may expand later for other MistLift settings/preferences
+
+import path from 'path'
+import fs from 'fs'
+import { fromIni } from '@aws-sdk/credential-providers'
+
+let sLiftConfigLoaded: LiftConfig | null = null
+
+// Defines the structure of the .mistlft json file
+// All relevant configuration for the cloud host goes here
+export class LiftConfig {
+  public cloudHost: string = 'AWS' // all we support now
+  public awsIniProfile?: string
+  public awsPreferredRegion?: string
+  public awsNodeRuntime?: RuntimeType
+  public awsServiceRoleARN?: string
+}
+export type RuntimeType = 'nodejs' | 'nodejs4.3' | 'nodejs6.10' | 'nodejs8.10' | 'nodejs10.x' | 'nodejs12.x' | 'nodejs14.x' | 'nodejs16.x' | 'java8' | 'java8.al2' | 'java11' | 'python2.7' | 'python3.6' | 'python3.7' | 'python3.8' | 'python3.9' | 'dotnetcore1.0' | 'dotnetcore2.0' | 'dotnetcore2.1' | 'dotnetcore3.1' | 'dotnet6' | 'dotnet8' | 'nodejs4.3-edge' | 'go1.x' | 'ruby2.5' | 'ruby2.7' | 'provided' | 'provided.al2' | 'nodejs18.x' | 'python3.10' | 'java17' | 'ruby3.2' | 'ruby3.3' | 'python3.11' | 'nodejs20.x' | 'provided.al2023' | 'python3.12' | 'java21'
+
+// Available for general use because, why not?
+export function getUserHome (): string {
+  return process.env.HOME ?? process.env.HOMEPATH ?? process.env.USERPROFILE ?? '~'
+}
+
+export function LoadLiftConfig (): LiftConfig | null {
+  if (sLiftConfigLoaded == null) {
+    const mistlift = path.join(getUserHome(), '.mistlift')
+    let configJson = '{}'
+    if (fs.existsSync(mistlift)) {
+      try {
+        configJson = fs.readFileSync(mistlift).toString()
+        sLiftConfigLoaded = JSON.parse(configJson)
+      } catch (e: any) {
+        //
+      }
+    }
+  }
+  return sLiftConfigLoaded
+}
+export function resetLiftConfig (): void {
+  sLiftConfigLoaded = null
+}
+
+export function areSettingsAvailable (): boolean {
+  const mistlift = path.join(getUserHome(), '.mistlift')
+  return fs.existsSync(mistlift)
+}
+
+export function getSettings (): LiftConfig {
+  if (sLiftConfigLoaded == null) LoadLiftConfig()
+  return sLiftConfigLoaded as LiftConfig
+}
+
+/**
+ * Return the credentials required for AWS based upon our config options.
+ *
+ * We will use the standard .aws config ini file, looked up by profile or default
+ * Prior attempts to have it do more than this failed, and resulted in a default profile choice anyway.
+ */
+export function getAWSCredentials (): any {
+  let config = LoadLiftConfig()
+  if (config == null) {
+    // console.error("No .mistlift configuration found - using AWS default profile");
+    config = { cloudHost: 'AWS', awsIniProfile: 'default' }
+  }
+  if (config.cloudHost?.toUpperCase() !== 'AWS') {
+    throw Error('HostType Not Supported')
+  }
+  let credentials = {}
+  const profile = config.awsIniProfile ?? 'default'
+  credentials = fromIni({ profile })
+  return credentials
+}

package/src/lib/LiftVersion.ts

@@ -1,87 +1,87 @@
-
-import * as path from 'path'
-import * as fs from 'fs'
-import { resolvePaths } from './pathResolve'
-
-export class VersionInfo {
-  public major: number = 0
-  public minor: number = 0
-  public revision: number = 0
-  public suffix: string = ''
-
-  constructor (vstr: string) {
-    this.parse(vstr)
-  }
-
-  public toString = (): string => {
-    let sfx = ''
-    if (this.suffix !== '') sfx = '-' + this.suffix
-    return `${this.major}.${this.minor}.${this.revision}${sfx}`
-  }
-
-  public parse = (vstr: string): VersionInfo => {
-    const sn = vstr.indexOf('-')
-    let suffix = ''
-    if (sn !== -1) {
-      suffix = vstr.substring(sn + 1)
-      vstr = vstr.substring(0, sn)
-    }
-    const parts = vstr.split('.')
-    while (parts.length < 3) parts.push('0')
-    this.major = parseInt(parts[0])
-    this.minor = parseInt(parts[1])
-    this.revision = parseInt(parts[2])
-    if (!isFinite(this.major)) this.major = 0
-    if (!isFinite(this.minor)) this.minor = 0
-    if (!isFinite(this.revision)) this.revision = 0
-    this.suffix = suffix
-    return this
-  }
-
-  public equals (other: VersionInfo | string): boolean {
-    // Note: not really a valid SemVer comparison
-    if (typeof other === 'string') other = new VersionInfo(other)
-    return this.major === other.major &&
-           this.minor === other.minor &&
-           this.revision === other.revision
-  }
-
-  public isGreaterThan (other: VersionInfo | string): boolean {
-    // Note: not really a valid SemVer comparison
-    if (typeof other === 'string') other = new VersionInfo(other)
-    if (this.major > other.major) return true
-    if (this.major < other.major) return false
-    if (this.minor > other.minor) return true
-    if (this.minor < other.minor) return false
-    return (this.revision > other.revision)
-  }
-}
-
-// read version from Lift's package.json
-export function getLiftVersion (): VersionInfo {
-  const pkg = path.join(__dirname, '..', '..', 'package.json')
-  return readPackageVersion(pkg)
-}
-// read version from project's package.json
-export function getProjectVersion (): VersionInfo {
-  const projectPaths = resolvePaths()
-  return readPackageVersion(projectPaths.packagePath)
-}
-
-export function getProjectName (): string {
-  const projectPaths = resolvePaths()
-  let pkgJson: { name?: string } = {}
-  try {
-    pkgJson = JSON.parse(fs.readFileSync(projectPaths.packagePath).toString())
-  } catch (e) {}
-  return pkgJson.name ?? ''
-}
-
-function readPackageVersion (pkgPath: string): VersionInfo {
-  let pkgJson: { version?: string } = {}
-  try {
-    pkgJson = JSON.parse(fs.readFileSync(pkgPath).toString())
-  } catch (e) {}
-
-  return new VersionInfo(pkgJson.version ?? '')
-}
+
+import * as path from 'path'
+import * as fs from 'fs'
+import { resolvePaths } from './pathResolve'
+
+export class VersionInfo {
+  public major: number = 0
+  public minor: number = 0
+  public revision: number = 0
+  public suffix: string = ''
+
+  constructor (vstr: string) {
+    this.parse(vstr)
+  }
+
+  public toString = (): string => {
+    let sfx = ''
+    if (this.suffix !== '') sfx = '-' + this.suffix
+    return `${this.major}.${this.minor}.${this.revision}${sfx}`
+  }
+
+  public parse = (vstr: string): VersionInfo => {
+    const sn = vstr.indexOf('-')
+    let suffix = ''
+    if (sn !== -1) {
+      suffix = vstr.substring(sn + 1)
+      vstr = vstr.substring(0, sn)
+    }
+    const parts = vstr.split('.')
+    while (parts.length < 3) parts.push('0')
+    this.major = parseInt(parts[0])
+    this.minor = parseInt(parts[1])
+    this.revision = parseInt(parts[2])
+    if (!isFinite(this.major)) this.major = 0
+    if (!isFinite(this.minor)) this.minor = 0
+    if (!isFinite(this.revision)) this.revision = 0
+    this.suffix = suffix
+    return this
+  }
+
+  public equals (other: VersionInfo | string): boolean {
+    // Note: not really a valid SemVer comparison
+    if (typeof other === 'string') other = new VersionInfo(other)
+    return this.major === other.major &&
+           this.minor === other.minor &&
+           this.revision === other.revision
+  }
+
+  public isGreaterThan (other: VersionInfo | string): boolean {
+    // Note: not really a valid SemVer comparison
+    if (typeof other === 'string') other = new VersionInfo(other)
+    if (this.major > other.major) return true
+    if (this.major < other.major) return false
+    if (this.minor > other.minor) return true
+    if (this.minor < other.minor) return false
+    return (this.revision > other.revision)
+  }
+}
+
+// read version from Lift's package.json
+export function getLiftVersion (): VersionInfo {
+  const pkg = path.join(__dirname, '..', '..', '..', 'package.json')
+  return readPackageVersion(pkg)
+}
+// read version from project's package.json
+export function getProjectVersion (): VersionInfo {
+  const projectPaths = resolvePaths()
+  return readPackageVersion(projectPaths.packagePath)
+}
+
+export function getProjectName (): string {
+  const projectPaths = resolvePaths()
+  let pkgJson: { name?: string } = {}
+  try {
+    pkgJson = JSON.parse(fs.readFileSync(projectPaths.packagePath).toString())
+  } catch (e) {}
+  return pkgJson.name ?? ''
+}
+
+function readPackageVersion (pkgPath: string): VersionInfo {
+  let pkgJson: { version?: string } = {}
+  try {
+    pkgJson = JSON.parse(fs.readFileSync(pkgPath).toString())
+  } catch (e) {}
+
+  return new VersionInfo(pkgJson.version ?? '')
+}

package/src/lib/Tests/fileCompare.test.ts

@@ -1,35 +1,35 @@
-
-/* eslint @typescript-eslint/no-floating-promises: "off" */
-
-import Tap from 'tap'
-
-import * as path from 'path'
-import { isNewerFile } from '../fileCompare'
-
-function test (t: any): void {
-// ./dir1/file.1 551 < ./dir2/file.1 552
-  // ./dir1/file.2 553 > ./dir2/file.1 552
-  // ./dir1  553 > ./dir2 552
-  // .dir1 (.1) 552 < ./dir2 552
-
-  const dir1 = path.join(__dirname, 'dir1')
-  const dir2 = path.join(__dirname, 'dir2')
-  const dir1File1 = path.join(dir1, 'file.1')
-  const dir1File2 = path.join(dir1, 'file.2')
-  const dir2File1 = path.join(dir2, 'file.1')
-
-  let newer = isNewerFile(dir1File1, dir2File1)
-  t.equal(newer, false, './dir1/file.1 < ./dir2/file.1')
-  newer = isNewerFile(dir1File2, dir2File1)
-  t.equal(newer, true, './dir1/file.2 > ./dir2/file.1')
-  newer = isNewerFile(dir1, dir2)
-  t.ok(newer, 'dir1 > dir2')
-  newer = isNewerFile(dir1, dir2, '.1')
-  t.ok(!newer, './dir1 (.1) < ./dir2')
-
-  t.end()
-}
-
-Tap.test('IsNewer', t => {
-  test(t)
-})
+
+/* eslint @typescript-eslint/no-floating-promises: "off" */
+
+import Tap from 'tap'
+
+import * as path from 'path'
+import { isNewerFile } from '../fileCompare'
+
+function test (t: any): void {
+// ./dir1/file.1 551 < ./dir2/file.1 552
+  // ./dir1/file.2 553 > ./dir2/file.1 552
+  // ./dir1  553 > ./dir2 552
+  // .dir1 (.1) 552 < ./dir2 552
+
+  const dir1 = path.join(__dirname, 'dir1')
+  const dir2 = path.join(__dirname, 'dir2')
+  const dir1File1 = path.join(dir1, 'file.1')
+  const dir1File2 = path.join(dir1, 'file.2')
+  const dir2File1 = path.join(dir2, 'file.1')
+
+  let newer = isNewerFile(dir1File1, dir2File1)
+  t.equal(newer, false, './dir1/file.1 < ./dir2/file.1')
+  newer = isNewerFile(dir1File2, dir2File1)
+  t.equal(newer, true, './dir1/file.2 > ./dir2/file.1')
+  newer = isNewerFile(dir1, dir2)
+  t.ok(newer, 'dir1 > dir2')
+  newer = isNewerFile(dir1, dir2, '.1')
+  t.ok(!newer, './dir1 (.1) < ./dir2')
+
+  t.end()
+}
+
+Tap.test('IsNewer', t => {
+  test(t)
+})

package/src/lib/askQuestion.ts

@@ -1,17 +1,17 @@
-/** handles interaction for asking a question */
-
-/* eslint @typescript-eslint/no-var-requires: "off" */
-import * as ac from 'ansi-colors'
-const readlineSync = require('readline-sync')
-
-export function ask (
-  desc: string, // describes the context
-  query: string, // asks the actual question
-  def: string // default answer
-
-): string { // answer provided
-  console.log(ac.dim.blue.italic(desc))
-  let answer = readlineSync.question(ac.bold.green(query) + ac.dim.grey(` [${def}] `) + '? ')
-  if (answer === '') answer = def
-  return answer
-}
+/** handles interaction for asking a question */
+
+/* eslint @typescript-eslint/no-var-requires: "off" */
+import * as ac from 'ansi-colors'
+const readlineSync = require('readline-sync')
+
+export function ask (
+  desc: string, // describes the context
+  query: string, // asks the actual question
+  def: string // default answer
+
+): string { // answer provided
+  console.log(ac.dim.blue.italic(desc))
+  let answer = readlineSync.question(ac.bold.green(query) + ac.dim.grey(` [${def}] `) + '? ')
+  if (answer === '') answer = def
+  return answer
+}

package/src/lib/executeCommand.ts

@@ -1,45 +1,45 @@
-
-import { exec } from 'child_process'
-
-interface StringObject {
-  toString: () => string
-}
-
-export async function executeCommand (cmd: string, args: any[], cwd = '', consolePass = false, env: any = {}): Promise<any> {
-  const out = {
-    stdStr: '',
-    errStr: '',
-    retcode: 0
-  }
-  return await new Promise(resolve => {
-    const cmdstr = cmd + ' ' + args.join(' ')
-    // console.log('executing ', cmdstr, 'at', cwd)
-    const opts = {
-      cwd,
-      env: Object.assign(env, process.env)
-    }
-    const proc = exec(cmdstr, opts)
-    if (proc.stdout != null) {
-      proc.stdout.on('data', (data: StringObject) => {
-        out.stdStr += data.toString()
-        if (consolePass) process.stdout.write(data.toString())
-      })
-    }
-    if (proc.stderr != null) {
-      proc.stderr.on('data', (data: StringObject) => {
-        out.errStr += data.toString()
-        if (consolePass) process.stdout.write(data.toString())
-      })
-    }
-    proc.on('error', error => {
-      console.error(error)
-      if (out.errStr === '') out.errStr = error.message
-      out.retcode = -1
-      resolve(out)
-    })
-    proc.on('close', code => {
-      out.retcode = code === null ? -1 : code
-      resolve(out)
-    })
-  })
-}
+
+import { exec } from 'child_process'
+
+interface StringObject {
+  toString: () => string
+}
+
+export async function executeCommand (cmd: string, args: any[], cwd = '', consolePass = false, env: any = {}): Promise<any> {
+  const out = {
+    stdStr: '',
+    errStr: '',
+    retcode: 0
+  }
+  return await new Promise(resolve => {
+    const cmdstr = cmd + ' ' + args.join(' ')
+    // console.log('executing ', cmdstr, 'at', cwd)
+    const opts = {
+      cwd,
+      env: Object.assign(env, process.env)
+    }
+    const proc = exec(cmdstr, opts)
+    if (proc.stdout != null) {
+      proc.stdout.on('data', (data: StringObject) => {
+        out.stdStr += data.toString()
+        if (consolePass) process.stdout.write(data.toString())
+      })
+    }
+    if (proc.stderr != null) {
+      proc.stderr.on('data', (data: StringObject) => {
+        out.errStr += data.toString()
+        if (consolePass) process.stdout.write(data.toString())
+      })
+    }
+    proc.on('error', error => {
+      console.error(error)
+      if (out.errStr === '') out.errStr = error.message
+      out.retcode = -1
+      resolve(out)
+    })
+    proc.on('close', code => {
+      out.retcode = code === null ? -1 : code
+      resolve(out)
+    })
+  })
+}

package/src/lib/fileCompare.ts

@@ -1,55 +1,55 @@
-import path from 'path'
-import fs from 'fs'
-import { recurseDirectory } from './DirectoryUtils'
-
-// true if filepath > mapped file in outDir (i.e. .ts > .js)
-export function isNewer (
-  filepath: string,
-  outDir: string,
-  mappingObj: any = { '.ts': '.js' }
-): boolean {
-  let basename = path.basename(filepath)
-  const ext = path.extname(filepath)
-  basename = basename.substring(0, basename.lastIndexOf(ext))
-  let newExt = ''
-
-  if (mappingObj[ext] !== undefined) newExt = mappingObj[ext]
-
-  const outfile = path.join(outDir, basename + newExt)
-  return isNewerFile(filepath, outfile)
-}
-
-// true if filepath is newer than destpath
-export function isNewerFile (
-  filepath: string,
-  destpath: string,
-  srcFilter: string = '',
-  dstFilter: string = ''
-): boolean {
-  const sstat = fs.statSync(filepath)
-  const srcTime = sstat.isDirectory() ? latestInDirectory(filepath, srcFilter) : fs.statSync(filepath).mtime
-  let destTime = new Date(0)
-  if (fs.existsSync((destpath))) {
-    const dstat = fs.statSync(destpath)
-    destTime = dstat.isDirectory() ? latestInDirectory(destpath, dstFilter) : fs.statSync(destpath).mtime
-  }
-  return (srcTime >= destTime)
-}
-function latestInDirectory (
-  dirPath: string,
-  extFilter: string = ''
-): Date {
-  let newestTime = new Date(0)
-  recurseDirectory(dirPath, (filepath, stats) => {
-    if (stats.isFile()) {
-      const ext = path.extname(filepath)
-      if ((extFilter ?? '') === '' || ext === extFilter) {
-        if (stats.mtime > newestTime) {
-          newestTime = stats.mtime
-        }
-      }
-    }
-    return false
-  })
-  return newestTime
-}
+import path from 'path'
+import fs from 'fs'
+import { recurseDirectory } from './DirectoryUtils'
+
+// true if filepath > mapped file in outDir (i.e. .ts > .js)
+export function isNewer (
+  filepath: string,
+  outDir: string,
+  mappingObj: any = { '.ts': '.js' }
+): boolean {
+  let basename = path.basename(filepath)
+  const ext = path.extname(filepath)
+  basename = basename.substring(0, basename.lastIndexOf(ext))
+  let newExt = ''
+
+  if (mappingObj[ext] !== undefined) newExt = mappingObj[ext]
+
+  const outfile = path.join(outDir, basename + newExt)
+  return isNewerFile(filepath, outfile)
+}
+
+// true if filepath is newer than destpath
+export function isNewerFile (
+  filepath: string,
+  destpath: string,
+  srcFilter: string = '',
+  dstFilter: string = ''
+): boolean {
+  const sstat = fs.statSync(filepath)
+  const srcTime = sstat.isDirectory() ? latestInDirectory(filepath, srcFilter) : fs.statSync(filepath).mtime
+  let destTime = new Date(0)
+  if (fs.existsSync((destpath))) {
+    const dstat = fs.statSync(destpath)
+    destTime = dstat.isDirectory() ? latestInDirectory(destpath, dstFilter) : fs.statSync(destpath).mtime
+  }
+  return (srcTime >= destTime)
+}
+function latestInDirectory (
+  dirPath: string,
+  extFilter: string = ''
+): Date {
+  let newestTime = new Date(0)
+  recurseDirectory(dirPath, (filepath, stats) => {
+    if (stats.isFile()) {
+      const ext = path.extname(filepath)
+      if ((extFilter ?? '') === '' || ext === extFilter) {
+        if (stats.mtime > newestTime) {
+          newestTime = stats.mtime
+        }
+      }
+    }
+    return false
+  })
+  return newestTime
+}