@tremho/mist-lift 1.1.4 → 1.1.5

package/src/commands/actions/initQuestions.ts

@@ -1,133 +1,133 @@
-/** Handles the input the user must supply upon init
- */
-
-import * as path from 'path'
-import * as fs from 'fs'
-import { executeCommand } from '../../lib/executeCommand'
-import { ask } from '../../lib/askQuestion'
-
-export async function interrogateUserForPackageJsonSettings (
-  projectPath: string,
-  defaults?: boolean
-): 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 ?? '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'
-
-  if (defaults !== true) {
-    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 !== ''
-    }
-  }
-  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 (
-): 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
-): string {
-  return `(C) ${new Date(Date.now()).getFullYear()} ${name}. All rights reserved.`
-}
-
-function nameFromProjectPath (
-  refPath: string
-): string {
-  const n = refPath.lastIndexOf(path.sep) + 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.
-    }
-  }
-  return packageJson
-}
+/** Handles the input the user must supply upon init
+ */
+
+import * as path from 'path'
+import * as fs from 'fs'
+import { executeCommand } from '../../lib/executeCommand'
+import { ask } from '../../lib/askQuestion'
+
+export async function interrogateUserForPackageJsonSettings (
+  projectPath: string,
+  defaults?: boolean
+): 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 ?? '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'
+
+  if (defaults !== true) {
+    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 !== ''
+    }
+  }
+  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 (
+): 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
+): string {
+  return `(C) ${new Date(Date.now()).getFullYear()} ${name}. All rights reserved.`
+}
+
+function nameFromProjectPath (
+  refPath: string
+): string {
+  const n = refPath.lastIndexOf(path.sep) + 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.
+    }
+  }
+  return packageJson
+}

package/src/commands/actions/setupPackageJson.ts

@@ -1,32 +1,32 @@
-/** Adds necessary scripts to package.json */
-
-import * as path from 'path'
-import * as fs from 'fs'
-import { executeCommand } from '../../lib/executeCommand'
-
-/**
- * Adds necessary scripts to package.json
- */
-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
-): Promise<void> {
-  await executeCommand('npm', ['i', packageName], projectPath, true)
-}
-
-export async function installDevPackage (
-  projectPath: string,
-  packageName: string
-): Promise<void> {
-  await executeCommand('npm', ['i', '--save-dev', packageName], projectPath, true)
-}
+/** Adds necessary scripts to package.json */
+
+import * as path from 'path'
+import * as fs from 'fs'
+import { executeCommand } from '../../lib/executeCommand'
+
+/**
+ * Adds necessary scripts to package.json
+ */
+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
+): Promise<void> {
+  await executeCommand('npm', ['i', packageName], projectPath, true)
+}
+
+export async function installDevPackage (
+  projectPath: string,
+  packageName: string
+): Promise<void> {
+  await executeCommand('npm', ['i', '--save-dev', packageName], projectPath, true)
+}