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

package/src/commands/actions/initQuestions.ts

@@ -3,129 +3,129 @@
 
 import * as path from 'path'
 import * as fs from 'fs'
-import {executeCommand} from "../../lib/executeCommand";
-import {ask} from "../../lib/askQuestion"
+import { executeCommand } from '../../lib/executeCommand'
+import { ask } from '../../lib/askQuestion'
 
-export async function interrogateUserForPackageJsonSettings(
-    projectPath:string
-)
-{
-    // get existing package.json or {}
-    // name of project - module name, display name, short name
-    // description
-    // set version
-    // gitAuthor ?? Author
-    // create a repository under gitAuthor?
-    // copyright
-    // spdx licence
+export async function interrogateUserForPackageJsonSettings (
+  projectPath: string
+): Promise<void> {
+  // get existing package.json or {}
+  // name of project - module name, display name, short name
+  // description
+  // set version
+  // gitAuthor ?? Author
+  // create a repository under gitAuthor?
+  // copyright
+  // spdx licence
 
-    const gitAuthor = await findGitAuthor()
-    const pkgJson = existingPackageJson(projectPath)
-    let name = pkgJson.name ?? nameFromProjectPath(projectPath);
-    let version = pkgJson.version ?? "0.1.0-prerelease.1"
-    let description = pkgJson.description ?? ""
-    let author = pkgJson.author ?? gitAuthor
-    let copyright = pkgJson.copyright ?? defaultCopyright(author)
-    let spdx = pkgJson.license ?? "MIT"
+  const gitAuthor = await findGitAuthor()
+  const pkgJson = existingPackageJson(projectPath)
+  let name = pkgJson.name ?? nameFromProjectPath(projectPath)
+  let version = pkgJson.version ?? '1.0.0-prerelease.1'
+  let description = pkgJson.description ?? ''
+  let author = pkgJson.author ?? gitAuthor
+  let copyright = pkgJson.copyright ?? defaultCopyright(author)
+  let spdx = pkgJson.license ?? 'MIT'
 
+  let ok = false
+  while (!ok) {
+    name = ask('Module name of this project',
+      'module name',
+      name
+    )
+    ok = name !== undefined && name.indexOf(' ') === -1
+  }
+  ok = false
+  while (!ok) {
+    version = ask('Project version. Use prerelease suffix for development versions. Use Semantic Versioning (https://semver.org).',
+      'version',
+      version ?? '0.1.0-prerelease.1'
+    )
+    ok = version !== undefined && version.indexOf('.') !== -1
+  }
+  ok = false
+  while (!ok) {
+    description = ask('Give a brief description of what this project does / what it is for',
+      'description',
+      description ?? ''
+    )
+    ok = description !== ''
+  }
+  ok = false
+  while (!ok) {
+    author = ask('Identify yourself as the author of this project',
+      'name',
+      author
+    )
+    ok = author !== ''
+  }
+  ok = false
+  while (!ok) {
+    copyright = ask('Specify a displayable copyright notice',
+      'Copyright',
+      copyright
+    )
+    ok = copyright !== ''
+  }
+  ok = false
+  while (!ok) {
+    spdx = ask('Specify the appropriate SPDX license identifier for this project. See https://spdx.org/licenses/ for more info.',
+      'spdx identifier',
+      spdx
+    )
+    ok = spdx !== ''
+  }
 
-    let ok = false;
-    while(!ok) {
-        name = ask("Module name of this project",
-            "module name",
-            name
-        )
-        ok = name && name.indexOf(' ') === -1
-    }
-    ok = false
-    while(!ok) {
-        version = ask("Project version. Use prerelease suffix for development versions. Use Semantic Versioning (https://semver.org).",
-            "version",
-            version ?? "0.1.0-prerelease.1"
-        )
-        ok = version && version.indexOf('.') !== -1
-    }
-    ok = false
-    while(!ok) {
-        description = ask("Give a brief description of what this project does / what it is for",
-            "description",
-            description ?? ""
-        )
-        ok = description !== "";
-    }
-    ok = false
-    while(!ok) {
-        author = ask("Identify yourself as the author of this project",
-            "name",
-            author
-        )
-        ok = author !== "";
-    }
-    ok = false
-    while(!ok) {
-        copyright = ask("Specify a displayable copyright notice",
-            "Copyright",
-            copyright
-        )
-        ok = copyright !== ""
-    }
-    ok = false
-    while(!ok) {
-        spdx = ask("Specify the appropriate SPDX license identifier for this project. See https://spdx.org/licenses/ for more info.",
-            "spdx identifier",
-            spdx
-        )
-        ok = spdx !== ""
-    }
-
-
-    pkgJson.name = name
-    pkgJson.version = version
-    pkgJson.description = description
-    pkgJson.author = author
-    pkgJson.copyright = copyright
-    pkgJson.license = spdx
-
-    const pkgPath = path.join(projectPath, "package.json");
-    fs.writeFileSync(pkgPath,
-        JSON.stringify(pkgJson, null, 2))
+  pkgJson.name = name
+  pkgJson.version = version
+  pkgJson.description = description
+  pkgJson.author = author
+  pkgJson.copyright = copyright
+  pkgJson.license = spdx
 
+  const pkgPath = path.join(projectPath, 'package.json')
+  fs.writeFileSync(pkgPath,
+    JSON.stringify(pkgJson, null, 2))
 }
 
-async function findGitAuthor() {
-    return executeCommand('git', ['config', '--get', 'user.name']).then(rt => {
-        let name = ''
-        if(rt.retcode) {
-            console.error('Error '+rt.retcode, rt.errStr)
-        } else {
-            name = rt.stdStr.trim().toLowerCase()
-        }
-        return name
-    })
-
+async function findGitAuthor (
+): Promise<string> {
+  return await executeCommand('git', ['config', '--get', 'user.name']).then((rt: any) => {
+    const rrt: { retcode: number | undefined, stdStr: string | undefined, errStr: string | undefined } = rt
+    let name: string | undefined = ''
+    if (rrt?.retcode !== 0) {
+      console.error(`Error ${rrt.retcode}`, rrt.errStr)
+    } else {
+      name = rrt?.stdStr?.trim().toLowerCase()
+    }
+    return name ?? ''
+  })
 }
 
-function defaultCopyright(name:string) {
-    return `(C) ${new Date(Date.now()).getFullYear()} ${name}. All rights reserved.`
+function defaultCopyright (
+  name: string
+): string {
+  return `(C) ${new Date(Date.now()).getFullYear()} ${name}. All rights reserved.`
 }
 
-function nameFromProjectPath(refPath:string)
-{
-    const n = refPath.lastIndexOf('/')+1;
-    return refPath.substring(n)
+function nameFromProjectPath (
+  refPath: string
+): string {
+  const n = refPath.lastIndexOf('/') + 1
+  return refPath.substring(n)
 }
 
-function existingPackageJson(refPath:string):any
-{
-    let packageJson:any = {};
-    const pkgPath = path.join(refPath, "package.json");
-    if(fs.existsSync((pkgPath))) {
-        try {
-            packageJson = JSON.parse(fs.readFileSync(pkgPath).toString());
-        }
-        catch(e:any) {
-            // error in existing package.json.  Please fix or remove and try again.
-        }
+function existingPackageJson (
+  refPath: string
+): any {
+  let packageJson: any = {}
+  const pkgPath = path.join(refPath, 'package.json')
+  if (fs.existsSync((pkgPath))) {
+    try {
+      packageJson = JSON.parse(fs.readFileSync(pkgPath).toString())
+    } catch (e: any) {
+      // error in existing package.json.  Please fix or remove and try again.
     }
-    return packageJson;
-}
+  }
+  return packageJson
+}

package/src/commands/actions/setupPackageJson.ts

@@ -2,35 +2,31 @@
 
 import * as path from 'path'
 import * as fs from 'fs'
-import {executeCommand} from "../../lib/executeCommand";
+import { executeCommand } from '../../lib/executeCommand'
 
 /**
  * Adds necessary scripts to package.json
  */
-export function addPackageScripts(
-    projectPath:string
-)
-{
-    const pkgPath = path.join(projectPath, "package.json")
-    let pkgJson:any = {};
-    try { pkgJson = JSON.parse(fs.readFileSync(pkgPath).toString()) } catch {}
-    const script = pkgJson.script ?? {}
-    script.test = "lift test"
-    pkgJson.script = script;
-
+export function addPackageScripts (
+  projectPath: string
+): void {
+  const pkgPath = path.join(projectPath, 'package.json')
+  let pkgJson: any = {}
+  try { pkgJson = JSON.parse(fs.readFileSync(pkgPath).toString()) } catch {}
+  const script = pkgJson.script ?? {}
+  script.test = 'lift test'
+  pkgJson.script = script
 }
-export async function installPackage(
-    projectPath:string,
-    packageName:string
-)
-{
-    return executeCommand("npm", ["i", packageName], projectPath, true)
+export async function installPackage (
+  projectPath: string,
+  packageName: string
+): Promise<void> {
+  await executeCommand('npm', ['i', packageName], projectPath, true)
 }
 
-export async function installDevPackage(
-    projectPath:string,
-    packageName:string
-)
-{
-    return executeCommand("npm", ["i", "--save-dev", packageName], projectPath, true)
-}
+export async function installDevPackage (
+  projectPath: string,
+  packageName: string
+): Promise<void> {
+  await executeCommand('npm', ['i', '--save-dev', packageName], projectPath, true)
+}

package/src/commands/build.ts

@@ -2,164 +2,161 @@
 
 import * as path from 'path'
 import * as fs from 'fs'
-import * as ac from "ansi-colors"
-import {resolvePaths} from "../lib/pathResolve";
-import {recurseDirectory} from "../lib/DirectoryUtils";
-import {helpBuild} from "./help"
-import {isNewer} from "../lib/fileCompare";
-import {executeCommand} from "../lib/executeCommand";
-import {buildOpenApi} from "../lib/openAPI/openApiConstruction";
-import {gatherFunctionDefinitions} from "../lib/openAPI/ApiBuildCollector";
-import {delay} from "../lib/utils"
-import {mkdirSync} from "fs";
-
+import * as ac from 'ansi-colors'
+import { resolvePaths } from '../lib/pathResolve'
+import { recurseDirectory } from '../lib/DirectoryUtils'
+import { isNewer } from '../lib/fileCompare'
+import { executeCommand } from '../lib/executeCommand'
 
 // Build command
-export async function doBuildAsync(
-    args:string[] // zero or more functions to build.  zero means build all
-): Promise<number>
-{
-    const projectPaths = resolvePaths()
-    const funcsToBuild:string[] = []
-    const options:string[] = []
-    for (let arg of args) {
-        if(arg.charAt(0) == '-') {
-            options.push(arg.toLowerCase())
-        }
-        else funcsToBuild.push(arg)
-    }
+export async function doBuildAsync (
+  args: string[] // zero or more functions to build.  zero means build all
+): Promise<number> {
+  const projectPaths = resolvePaths()
+  const funcsToBuild: string[] = []
+  const options: string[] = []
+  for (const arg of args) {
+    if (arg.charAt(0) === '-') {
+      options.push(arg.toLowerCase())
+    } else funcsToBuild.push(arg)
+  }
 
-    if(!funcsToBuild.length)
-    {
-        let firstDepth = 0
-        recurseDirectory(projectPaths.functionPath, (filepath, stats) => {
-            let depth = filepath.split(path.sep).length
-            if(!firstDepth) firstDepth = depth
-            if(stats.isDirectory() && depth == firstDepth) {
-                funcsToBuild.push(path.basename(filepath))
-            }
-        })
-    }
+  if (funcsToBuild.length === 0) {
+    let firstDepth = 0
+    recurseDirectory(projectPaths.functionPath, (filepath, stats) => {
+      const depth = filepath.split(path.sep).length
+      if (firstDepth === 0) firstDepth = depth
+      if (stats.isDirectory() && depth === firstDepth) {
+        funcsToBuild.push(path.basename(filepath))
+      }
+      return false
+    })
+  }
 
-    let fails = 0;
-    let failFast = options.indexOf("--failfast") !== -1
-    if(options.indexOf("--deferfail") !== -1) failFast = false
-    for(let func of funcsToBuild) {
-        const funcDir = path.join(projectPaths.functionPath, func);
-        if(fs.existsSync(funcDir)) {
-            fails += await buildSingleFunction(funcDir, options);
-            if(fails && failFast) break;
-        } else {
-            console.log(ac.red.bold(`${func} does not exist as a function`))
-            fails++;
-            if(failFast) break;
-        }
+  let fails = 0
+  let failFast = options.includes('--failfast')
+  if (options.includes('--deferfail')) failFast = false
+  for (const func of funcsToBuild) {
+    const funcDir = path.join(projectPaths.functionPath, func)
+    if (fs.existsSync(funcDir)) {
+      fails += await buildSingleFunction(funcDir, options)
+      if (fails > 0 && failFast) break
+    } else {
+      console.log(ac.red.bold(`${func} does not exist as a function`))
+      fails++
+      if (failFast) break
     }
-    return fails
+  }
+  return fails
 }
 
-async function buildSingleFunction(funcDir:string, options:string[]):Promise<number> {
-    const funcName = funcDir.substring(funcDir.lastIndexOf('/')+1);
-    const buildPath = path.normalize(path.join(funcDir, '..', '..', 'build', 'functions', funcName));
-    if(options.indexOf('--clean') !== -1) {
-        if(fs.existsSync(buildPath)) {
-            fs.rmSync(buildPath, {recursive: true})
-        }
+// build command for a single function
+async function buildSingleFunction (
+  funcDir: string,
+  options: string[]
+): Promise<number> {
+  const funcName = funcDir.substring(funcDir.lastIndexOf('/') + 1)
+  const buildPath = path.normalize(path.join(funcDir, '..', '..', 'build', 'functions', funcName))
+  if (options.includes('--clean')) {
+    if (fs.existsSync(buildPath)) {
+      fs.rmSync(buildPath, { recursive: true })
     }
-    // strategy here is to invoke tsc on a per-folder basis rather than letting tsc do the recurse because it is easier to control this way
-    return await buildFunctionModules(funcName, funcDir, buildPath, options)
-
+  }
+  // strategy here is to invoke tsc on a per-folder basis rather than letting tsc do the recurse because it is easier to control this way
+  return await buildFunctionModules(funcName, funcDir, buildPath, options)
 }
-async function buildFunctionModules(
-    funcName:string,
-    funcDir:string,
-    buildPath:string,
-    options: string[]
 
-) : Promise<number>
-{
-    const announce = ac.blue.dim(`building ${funcName}...`)
-    let announced = false
-    let fails = 0;
-    let builds = 0;
-    let failFast = options.indexOf("--failfast") !== -1
-    if(options.indexOf("--deferfail") !== -1) failFast = false
-    const all:Promise<void>[] = [];
-    recurseDirectory(funcDir, (filepath, stats) => {
-        if(path.extname(filepath) === ".ts") {
-            let relPath = filepath.substring(funcDir.length);
-            relPath = relPath.substring(0, relPath.lastIndexOf('/'));
-            let outDir = path.join(buildPath, relPath);
-            // console.log(`tsc --esModuleInterop true --outdir ${outDir} ${filepath}`);
-            if(!(fails && failFast)) {
-                if (isNewer(filepath, outDir)) {
-                    if (!announced) {
-                        announced = true
-                        console.log(announce)
-                    }
-                    builds++;
-                    all.push(executeCommand('tsc', [
-                        '--esModuleInterop', 'true',
-                        '--target', 'ES2015',
-                        '--module', 'commonjs',
-                        '--lib', 'dom,es2015,scripthost,es2015.proxy',
-                        '--strict', 'true',
-                        '--noImplicitAny', 'false',
-                        '--skipLibCheck', 'true',
-                        '--forceConsistentCasingInFileNames', 'true',
-                        '--sourceMap', 'true',
-                        '--outdir', outDir,
-                        filepath
-                    ], '', true).then(result => {
-                        if (result.retcode) {
-                            fails++
-                            // console.log("error detected", fails)
-                            const now = new Date()
-                            fs.utimesSync(filepath, now, now) // touch file so it is not skipped next build
-                        }
-                    }))
-                }
-            }
-        }
-    })
-    return Promise.all(all).then( async () => {
-        fails += await doPostBuildSteps(funcDir, buildPath)
-        return fails
-    })
-}
+// build all the function modules in path
+async function buildFunctionModules (
+  funcName: string,
+  funcDir: string,
+  buildPath: string,
+  options: string[]
 
-async function doPostBuildSteps(funcDir: string, buildPath: string) : Promise<number>
-{
-    // copy the definitions,json file over
-    const srcdef = path.join(funcDir, 'src', 'definition.json')
-    const dstdef = path.join(buildPath, 'src', 'definition.json')
-    if(fs.existsSync(srcdef)) {
-        fs.copyFileSync(srcdef, dstdef)
-    } else {
-        console.error(ac.red.bold("no definition file found at "+srcdef));
-        return 1;
-    }
-    // copy the __files__ folder if it exists
-    const filedirPath = path.join(funcDir, "__files__");
-    if(fs.existsSync(filedirPath)) {
-        const bfiles = path.join(buildPath, '__files__');
-        if(!fs.existsSync(bfiles)) fs.mkdirSync(bfiles, {recursive:true});
-        recurseDirectory(filedirPath, (filepath, stats) =>{
-            let relPath = filepath.substring(funcDir.length);
-            relPath = relPath.substring(0, relPath.lastIndexOf('/'));
-            let outDir = path.join(buildPath, relPath);
-            let target = path.join(outDir, path.basename(filepath));
-            if(stats.isDirectory() && !fs.existsSync(target)) {
-                fs.mkdirSync(target, {recursive: true});
-            }
-            if(stats.isFile()) {
-                fs.copyFileSync(filepath, target);
+): Promise<number> {
+  const announce = ac.blue.dim(`building ${funcName}...`)
+  let announced = false
+  let fails = 0
+  // let builds = 0
+  let failFast = options.includes('--failfast')
+  if (options.includes('--deferfail')) failFast = false
+  const all: Array<Promise<void>> = []
+  recurseDirectory(funcDir, (filepath, stats) => {
+    if (path.extname(filepath) === '.ts') {
+      let relPath = filepath.substring(funcDir.length)
+      relPath = relPath.substring(0, relPath.lastIndexOf('/'))
+      const outDir = path.join(buildPath, relPath)
+      // console.log(`tsc --esModuleInterop true --outdir ${outDir} ${filepath}`);
+      if (!(fails > 0 && failFast)) {
+        if (isNewer(filepath, outDir)) {
+          if (!announced) {
+            announced = true
+            console.log(announce)
+          }
+          // builds++
+          all.push(executeCommand('tsc', [
+            '--esModuleInterop', 'true',
+            '--target', 'ES2015',
+            '--module', 'commonjs',
+            '--lib', 'dom,es2015,scripthost,es2015.proxy',
+            '--strict', 'true',
+            '--noImplicitAny', 'false',
+            '--skipLibCheck', 'true',
+            '--forceConsistentCasingInFileNames', 'true',
+            '--sourceMap', 'true',
+            '--outdir', outDir,
+            filepath
+          ], '', true).then((result: { retcode: number | undefined, stdOut:string, stdErr:string }) => {
+            if (result.retcode !== 0) {
+              fails++
+              // console.log("error detected", fails)
+              const now = new Date()
+              fs.utimesSync(filepath, now, now) // touch file so it is not skipped next build
             }
-        })
+          }))
+        }
+      }
     }
-    return 0
+    return false
+  })
+  return await Promise.all(all).then(async () => {
+    fails += await doPostBuildSteps(funcDir, buildPath)
+    return fails
+  })
 }
 
-
-
-
+// do the steps after the build (file copies, etc)
+async function doPostBuildSteps (
+  funcDir: string,
+  buildPath: string
+): Promise<number> {
+  // copy the definitions,json file over
+  const srcdef = path.join(funcDir, 'src', 'definition.json')
+  const dstdef = path.join(buildPath, 'src', 'definition.json')
+  if (fs.existsSync(srcdef)) {
+    fs.copyFileSync(srcdef, dstdef)
+  } else {
+    console.error(ac.red.bold('no definition file found at ' + srcdef))
+    return 1
+  }
+  // copy the __files__ folder if it exists
+  const filedirPath = path.join(funcDir, '__files__')
+  if (fs.existsSync(filedirPath)) {
+    const bfiles = path.join(buildPath, '__files__')
+    if (!fs.existsSync(bfiles)) fs.mkdirSync(bfiles, { recursive: true })
+    recurseDirectory(filedirPath, (filepath, stats) => {
+      let relPath = filepath.substring(funcDir.length)
+      relPath = relPath.substring(0, relPath.lastIndexOf('/'))
+      const outDir = path.join(buildPath, relPath)
+      const target = path.join(outDir, path.basename(filepath))
+      if (stats.isDirectory() && !fs.existsSync(target)) {
+        fs.mkdirSync(target, { recursive: true })
+      }
+      if (stats.isFile()) {
+        fs.copyFileSync(filepath, target)
+      }
+      return false
+    })
+  }
+  return 0
+}