chore: analyze resources as entrypoints

Ensure Stat return has correct prototype.
In particular to fix `Reflect.apply(Stats.prototype.isFile, stat, [])`.

.editorconfig

@@ -4,6 +4,5 @@ end_of_line = lf
 charset = utf-8
 indent_style = space
 indent_size = 2
-#https://github.com/Microsoft/vscode/issues/23983#event-1087502108
-#trim_trailing_whitespace = true
+trim_trailing_whitespace = true
 insert_final_newline = true

.travis.yml

@@ -1,3 +1,4 @@
+dist: xenial
 language: node_js
 node_js:
 - '6'

appveyor.yml

@@ -9,6 +9,8 @@ environment:
   GITHUB_TOKEN:
     secure: 3wuEGJsppSKFvdwhp3jprUA9Zkc3WINlc/9oFXjhAR6J05lYMXP7Fl7lXTKpkGZx
 install:
+  - rmdir C:\cygwin /s /q
+  - rmdir C:\QT /s /q
   - ps: Install-Product node 8
   - curl -L -o nasm.exe https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win64/nasm-2.13.03-installer-x64.exe
   - start /wait nasm.exe /S

index.js

@@ -10,7 +10,20 @@ if (require.main === module) {
     process.stderr.write(showHelp ? options.help : options.version + eol)
   } else {
     const nexe = require('./lib/nexe')
-    nexe.compile(argv).catch(() => {
+    nexe.compile(argv).catch((error) => {
+      const NexeError = require('./lib/compiler').NexeError
+      const chalk = require('chalk')
+      const isSilent = Boolean(argv.silent === true || argv.loglevel === 'silent')
+      if (!isSilent) {
+        if (error instanceof NexeError) {
+          process.stderr.write(eol + chalk.red('Error: ') + error.message + eol
+            + eol + 'See nexe -h for usage..' + eol + eol
+          )
+        } else {
+          process.stderr.write(error.stack + eol)
+        }
+      }
+
       process.exit(1)
     })
   }

package.json

@@ -2,7 +2,7 @@
   "name": "nexe",
   "description": "Create a single executable out of your Node.js application",
   "license": "MIT",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0",
   "contributors": [
     "Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
     "Jared Allard <jaredallard@outlook.com>",
@@ -36,40 +36,41 @@
     "@calebboyd/semaphore": "^1.3.1",
     "app-builder": "^5.2.0",
     "caw": "^2.0.1",
-    "chalk": "^2.4.1",
+    "chalk": "^2.4.2",
+    "cherow": "1.6.9",
     "download": "^7.1.0",
-    "globby": "^8.0.1",
-    "cherow": "1.6.8",
-    "got": "^9.5.0",
+    "globby": "^9.1.0",
+    "got": "^9.6.0",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "multistream": "^2.1.1",
-    "ora": "^3.0.0",
+    "ora": "^3.2.0",
     "pify": "^4.0.1",
-    "resolve-dependencies": "^2.2.0",
-    "rimraf": "^2.6.2"
+    "resolve-dependencies": "^2.2.2",
+    "rimraf": "^2.6.3"
   },
   "devDependencies": {
     "@types/chai": "^4.1.7",
+    "@types/download": "^6.2.4",
     "@types/execa": "^0.9.0",
-    "@types/globby": "^8.0.0",
-    "@types/got": "^9.2.2",
+    "@types/globby": "^9.1.0",
+    "@types/got": "^9.4.1",
     "@types/minimist": "^1.2.0",
     "@types/mkdirp": "^0.5.2",
-    "@types/mocha": "^5.2.5",
+    "@types/mocha": "^5.2.6",
     "@types/multistream": "^2.1.1",
-    "@types/ora": "^1.3.4",
+    "@types/ora": "^3.2.0",
     "@types/pify": "3.0.2",
     "@types/rimraf": "2.0.2",
     "@types/semver": "^5.5.0",
     "chai": "^4.2.0",
     "execa": "^1.0.0",
-    "mocha": "^5.2.0",
-    "prettier": "^1.15.3",
-    "ts-node": "^7.0.1",
-    "tslint": "^5.12.0",
-    "tslint-config-prettier": "^1.17.0",
+    "mocha": "^6.0.2",
+    "prettier": "^1.16.4",
+    "ts-node": "^8.0.3",
+    "tslint": "^5.14.0",
+    "tslint-config-prettier": "^1.18.0",
     "tslint-plugin-prettier": "^2.0.1",
-    "typescript": "^3.2.2"
+    "typescript": "^3.4.1"
   }
 }

src/compiler.ts

@@ -1,6 +1,6 @@
 import { delimiter, dirname, normalize, join } from 'path'
 import { Buffer } from 'buffer'
-import { createReadStream } from 'fs'
+import { createReadStream, ReadStream } from 'fs'
 import { spawn } from 'child_process'
 import { Logger, LogStep } from './logger'
 import {
@@ -35,22 +35,28 @@ export interface NexeFile {
 
 export { NexeOptions }
 
+export class NexeError extends Error {
+  constructor(m: string) {
+    super(m)
+    Object.setPrototypeOf(this, NexeError.prototype)
+  }
+}
+
 export class NexeCompiler {
   /**
    * Epoch of when compilation started
    */
   private start = Date.now()
+  private compileStep: LogStep | undefined
+  public log = new Logger(this.options.loglevel)
   /**
    * Copy of process.env
    */
-  private env = { ...process.env }
+  public env = { ...process.env }
   /**
    * Virtual FileSystem
    */
-  private bundle: Bundle
-
-  private compileStep: LogStep | undefined
-  public log = new Logger(this.options.loglevel)
+  public bundle: Bundle
   /**
    * Root directory for the source of the current build
    */
@@ -94,7 +100,7 @@ export class NexeCompiler {
   /**
    * The file path of node binary
    */
-  private nodeSrcBinPath: string
+  public nodeSrcBinPath: string
 
   constructor(public options: NexeOptions) {
     const { python } = (this.options = options)
@@ -179,7 +185,7 @@ export class NexeCompiler {
 
   assertBuild() {
     if (!this.options.build) {
-      throw new Error('This feature is only available with `--build`')
+      throw new NexeError('This feature is only available with `--build`')
     }
   }
 
@@ -212,7 +218,7 @@ export class NexeCompiler {
           }
           if (code != 0) {
             const error = `${command} ${args.join(' ')} exited with code: ${code}`
-            reject(new Error(error))
+            reject(new NexeError(error))
           }
           resolve()
         })
@@ -226,7 +232,7 @@ export class NexeCompiler {
     ])
   }
 
-  private async _buildAsync() {
+  public async build(): Promise<ReadStream> {
     this.compileStep!.log(
       `Configuring node build${
         this.options.configure.length ? ': ' + this.options.configure : '...'
@@ -241,39 +247,6 @@ export class NexeCompiler {
     return createReadStream(this.getNodeExecutableLocation())
   }
 
-  private async _fetchPrebuiltBinaryAsync(target: NexeTarget) {
-    let downloadOptions = this.options.downloadOptions
-
-    if (this.options.ghToken) {
-      downloadOptions = Object.assign({}, downloadOptions)
-      downloadOptions.headers = Object.assign({}, downloadOptions.headers, {
-        Authorization: 'token ' + this.options.ghToken
-      })
-    }
-
-    const githubRelease = await getLatestGitRelease(downloadOptions)
-    const assetName = target.toString()
-    const asset = githubRelease.assets.find(x => x.name === assetName)
-
-    if (!asset) {
-      throw new Error(`${assetName} not available, create it using the --build flag`)
-    }
-    const filename = this.getNodeExecutableLocation(target)
-
-    await download(asset.browser_download_url, dirname(filename), this.options.downloadOptions).on(
-      'response',
-      (res: IncomingMessage) => {
-        const total = +res.headers['content-length']!
-        let current = 0
-        res.on('data', data => {
-          current += data.length
-          this.compileStep!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
-        })
-      }
-    )
-    return createReadStream(filename)
-  }
-
   private async _shouldCompileBinaryAsync(
     binary: NodeJS.ReadableStream | null,
     location: string | undefined
@@ -301,12 +274,9 @@ export class NexeCompiler {
     const build = this.options.build
     const location = this.getNodeExecutableLocation(build ? undefined : target)
     let binary = (await pathExistsAsync(location)) ? createReadStream(location) : null
-    if (!build && !binary) {
-      step.modify('Fetching prebuilt binary')
-      binary = await this._fetchPrebuiltBinaryAsync(target)
-    }
+
     if (await this._shouldCompileBinaryAsync(binary, location)) {
-      binary = await this._buildAsync()
+      binary = await this.build()
       step.log('Node binary compiled')
     }
     return this._assembleDeliverable(binary!)

src/fs/patch.ts

@@ -85,22 +85,21 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) {
     }
   }
 
-  const createStat = function(directoryExtensions: any, fileExtensions?: any) {
-    if (!fileExtensions) {
-      return Object.assign({}, binary.layout.stat, directoryExtensions, { size: 0 }, statTime())
-    }
-    const size = directoryExtensions[1]
-    return Object.assign({}, binary.layout.stat, fileExtensions, { size }, statTime())
+  const createStat = function(extensions: any) {
+    return Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions)
   }
 
   const ownStat = function(filepath: any) {
     setupManifest()
     const key = getKey(filepath)
     if (directories[key]) {
-      return createStat({ isDirectory, isFile: isNotFile })
+      let mode = binary.layout.stat.mode
+      mode |= fs.constants.S_IFDIR
+      mode &= ~fs.constants.S_IFREG
+      return createStat({ mode, size: 0 })
     }
     if (manifest[key]) {
-      return createStat(manifest[key], { isFile, isDirectory: isNotDirectory })
+      return createStat({ size: manifest[key][1] })
     }
   }
 

src/logger.ts

@@ -1,5 +1,5 @@
-import colors = require('chalk')
-import ora = require('ora')
+import colors from 'chalk'
+import ora from 'ora'
 
 const frameLength = 120
 

src/nexe.ts

@@ -1,6 +1,6 @@
 import { EOL } from 'os'
 import { compose } from 'app-builder'
-import { NexeCompiler } from './compiler'
+import { NexeCompiler, NexeError } from './compiler'
 import { normalizeOptions, NexeOptions, NexePatch } from './options'
 import resource from './steps/resource'
 import clean from './steps/clean'
@@ -15,31 +15,29 @@ async function compile(
   compilerOptions?: Partial<NexeOptions>,
   callback?: (err: Error | null) => void
 ) {
-  const options = normalizeOptions(compilerOptions)
-  const compiler = new NexeCompiler(options)
+  let error = null,
+    options: NexeOptions | null = null,
+    compiler: NexeCompiler | null = null
 
-  const nexe = compose(
-    clean,
-    resource,
-    cli,
-    bundle,
-    shim,
-    options.build ? [download, artifacts, ...patches, ...(options.patches as NexePatch[])] : [],
-    options.plugins as NexePatch[]
-  )
-
-  let error = null
   try {
-    await nexe(compiler)
+    options = normalizeOptions(compilerOptions)
+    compiler = new NexeCompiler(options)
+    await compose(
+      clean,
+      resource,
+      cli,
+      bundle,
+      shim,
+      download,
+      options.build ? [artifacts, ...patches, ...(options.patches as NexePatch[])] : [],
+      options.plugins as NexePatch[]
+    )(compiler)
   } catch (e) {
     error = e
   }
 
   if (error) {
-    compiler.quit(error)
-    if (compiler.options.loglevel !== 'silent' && error) {
-      process.stderr.write(EOL + error.message + EOL)
-    }
+    compiler && compiler.quit(error)
     if (callback) return callback(error)
     return Promise.reject(error)
   }

src/options.ts

@@ -1,5 +1,5 @@
 import * as parseArgv from 'minimist'
-import { NexeCompiler } from './compiler'
+import { NexeCompiler, NexeError } from './compiler'
 import { isWindows, STDIN_FLAG } from './util'
 import { basename, extname, join, isAbsolute, resolve } from 'path'
 import { getTarget, NexeTarget } from './target'
@@ -165,7 +165,7 @@ function extractLogLevel(options: NexeOptions) {
 }
 
 function isName(name: string) {
-  return name && name !== 'index'
+  return name && name !== 'index' && name !== STDIN_FLAG
 }
 
 function extractName(options: NexeOptions) {
@@ -222,7 +222,7 @@ export function resolveEntry(
     result = resolveFileNameSync(cwd, '.')
   }
   if (!result.absPath) {
-    throw new Error(`Entry file "${input}" not found!`)
+    throw new NexeError(`Entry file "${input || ''}" not found!`)
   }
   return result.absPath
 }

src/patches/disable-node-cli.ts

@@ -6,7 +6,13 @@ export default async function disableNodeCli(compiler: NexeCompiler, next: () =>
     return next()
   }
 
-  if (semverGt(compiler.target.version, '10.9')) {
+  if (semverGt(compiler.target.version, '11.6.0')) {
+    await compiler.replaceInFileAsync(
+      'src/node.cc',
+      /(?<!int )ProcessGlobalArgs\(/g,
+      '0;//ProcessGlobalArgs('
+    )
+  } else if (semverGt(compiler.target.version, '10.9')) {
     await compiler.replaceInFileAsync('src/node.cc', /(?<!void )ProcessArgv\(/g, '//ProcessArgv(')
   } else if (semverGt(compiler.target.version, '9.999')) {
     await compiler.replaceInFileAsync(

src/steps/bundle.ts

@@ -1,4 +1,4 @@
-import { NexeCompiler } from '../compiler'
+import { NexeCompiler, NexeError } from '../compiler'
 import { resolve, relative } from 'path'
 import { each } from '@calebboyd/semaphore'
 import resolveFiles from 'resolve-dependencies'
@@ -43,12 +43,16 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
     return next()
   }
 
-  const { files, warnings } = await resolveFiles(input, { cwd, expand: true, loadContent: false })
+  const { files, warnings } = await resolveFiles(
+    input,
+    ...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')),
+    { cwd, expand: true, loadContent: false }
+  )
 
   if (
     warnings.filter(x => x.startsWith('Error parsing file') && !x.includes('node_modules')).length
   ) {
-    throw new Error('Parsing Error:\n' + warnings.join('\n'))
+    throw new NexeError('Parsing Error:\n' + warnings.join('\n'))
   }
 
   await each(Object.keys(files), (filename: string) => compiler.addResource(filename), {

src/steps/download.ts

@@ -2,7 +2,9 @@ import download = require('download')
 import { pathExistsAsync } from '../util'
 import { LogStep } from '../logger'
 import { IncomingMessage } from 'http'
-import { NexeCompiler } from '../compiler'
+import { NexeCompiler, NexeError } from '../compiler'
+import { getLatestGitRelease } from '../releases'
+import { dirname } from 'path'
 
 function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options = {}) {
   const setText = (p: number) => step.modify(`Downloading Node: ${p.toFixed()}%...`)
@@ -21,27 +23,65 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
     .then(() => step.log(`Node source extracted to: ${dest}`))
 }
 
+async function fetchPrebuiltBinary(compiler: NexeCompiler, step: any) {
+  let downloadOptions = compiler.options.downloadOptions
+  const target = compiler.target
+
+  if (compiler.options.ghToken) {
+    downloadOptions = Object.assign({}, downloadOptions)
+    downloadOptions.headers = Object.assign({}, downloadOptions.headers, {
+      Authorization: 'token ' + compiler.options.ghToken
+    })
+  }
+
+  const githubRelease = await getLatestGitRelease(downloadOptions)
+  const assetName = target.toString()
+  const asset = githubRelease.assets.find(x => x.name === assetName)
+
+  if (!asset) {
+    throw new NexeError(`${assetName} not available, create it using the --build flag`)
+  }
+  const filename = compiler.getNodeExecutableLocation(target)
+
+  await download(
+    asset.browser_download_url,
+    dirname(filename),
+    compiler.options.downloadOptions
+  ).on('response', (res: IncomingMessage) => {
+    const total = +res.headers['content-length']!
+    let current = 0
+    res.on('data', data => {
+      current += data.length
+      step!.modify(`Downloading...${((current / total) * 100).toFixed()}%`)
+    })
+  })
+}
+
 /**
  * Downloads the node source to the configured temporary directory
  * @param {*} compiler
  * @param {*} next
  */
 export default async function downloadNode(compiler: NexeCompiler, next: () => Promise<void>) {
-  const {
-    src,
-    log,
-    targets: [{ version }]
-  } = compiler
-  const { sourceUrl, downloadOptions } = compiler.options
-  const url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`
-  const step = log.step(`Downloading Node.js source from: ${url}`)
-  if (await pathExistsAsync(src)) {
-    step.log('Source already downloaded')
+  const { src, log, target } = compiler,
+    { version } = target,
+    { sourceUrl, downloadOptions, build } = compiler.options,
+    url = sourceUrl || `https://nodejs.org/dist/v${version}/node-v${version}.tar.gz`
+  const step = log.step(
+    `Downloading ${build ? '' : 'pre-built '}Node.js${build ? `source from: ${url}` : ''}`
+  )
+  const exeLocation = compiler.getNodeExecutableLocation(build ? undefined : target)
+  const downloadExists = await pathExistsAsync(build ? src : exeLocation)
+
+  if (downloadExists) {
+    step.log('Already downloaded...')
     return next()
   }
 
-  if (compiler.options.build) {
+  if (build) {
     await fetchNodeSourceAsync(src, url, step, downloadOptions)
+  } else {
+    await fetchPrebuiltBinary(compiler, step)
   }
 
   return next()

src/steps/resource.ts

@@ -1,5 +1,5 @@
 import { isDirectoryAsync, each } from '../util'
-import * as globs from 'globby'
+import globs from 'globby'
 import { NexeCompiler } from '../compiler'
 
 export default async function resource(compiler: NexeCompiler, next: () => Promise<any>) {

tasks/asset-compile.ts

@@ -2,7 +2,7 @@ import * as nexe from '../lib/nexe'
 import { getUnBuiltReleases, getLatestGitRelease } from '../lib/releases'
 import * as ci from './ci'
 import { runDockerBuild } from './docker'
-import { getTarget } from '../lib/target'
+import { getTarget, targetsEqual } from '../lib/target'
 import { pathExistsAsync, readFileAsync, execFileAsync } from '../lib/util'
 import got = require('got')
 
@@ -70,6 +70,11 @@ async function build() {
     if (await pathExistsAsync(output)) {
       await assertNexeBinary(output)
       const gitRelease = await getLatestGitRelease({ headers })
+      const unbuiltReleases = await getUnBuiltReleases({ headers })
+      if (!unbuiltReleases.some(x => targetsEqual(x, target))) {
+        console.log(`${target} already uploaded.`)
+        return
+      }
       await got(gitRelease.upload_url.split('{')[0], {
         query: { name: target.toString() },
         body: await readFileAsync(output),

tsconfig.json

@@ -3,7 +3,7 @@
     "target":"es5",
     "skipLibCheck": true,
     "experimentalDecorators": true,
-    "lib": ["es2017"],
+    "lib": ["es2018"],
     "module": "commonjs",
     "outDir": "./lib",
     "strict": true