oxmc/nexe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix target parsing

Browse Source
This commit is contained in:
calebboyd
2017-09-07 22:56:30 -05:00
parent 280b93b0a8
commit ee529ce9b5
10 changed files with 1800 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+1719 -99
View File
File diff suppressed because it is too large Load Diff
package.json
+8 -6
View File
@@ -2,7 +2,7 @@
"name": "nexe",
"description": "Create a single executable out of your Node.js application",
"license": "MIT",
"version": "2.0.0-rc.2",
"version": "2.0.0-rc.3",
"contributors": [
"Craig Condon <craig.j.condon@gmail.com> (http://crcn.io)",
"Jared Allard <jaredallard@outlook.com>",
@@ -11,7 +11,8 @@
"scripts": {
"nexe-build": "ts-node tasks/build",
"prebuild": "rimraf lib && npm run lint",
"prepublish": "npm run build",
"prepublish": "npm test && npm run build",
"test": "mocha test/**/*.spec.ts",
"lint": "prettier --parser typescript --no-semi --print-width 100 --single-quote --write \"src/**/*.ts\"",
"build": "tsc --declaration"
},
@@ -34,7 +35,7 @@
"app-builder": "^5.1.0",
"chalk": "^1.1.3",
"download": "^6.2.0",
"fuse-box": "^2.2.1",
"fuse-box": "2.2.31",
"globby": "^6.1.0",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
@@ -45,17 +46,18 @@
},
"devDependencies": {
"@types/bluebird": "^3.5.8",
"@types/chai": "^4.0.4",
"@types/chalk": "^0.4.31",
"@types/execa": "0.7.0",
"@types/globby": "^0.6.0",
"@types/minimist": "^1.2.0",
"@types/mkdirp": "^0.3.29",
"@types/mocha": "^2.2.42",
"@types/ora": "^0.3.31",
"@types/pify": "0.0.28",
"@types/rimraf": "0.0.28",
"execa": "0.8.0",
"chai": "^4.1.2",
"got": "^7.1.0",
"mocha": "^3.2.0",
"mocha": "^3.5.0",
"prettier": "^1.6.1",
"ts-node": "3.3.0",
"typescript": "^2.4.1"
src/compiler.ts
+3 -2
View File
@@ -37,7 +37,7 @@ export class NexeCompiler {
public input: string
public bundledInput?: string
public output: string | null
public targets: NexeTarget[]
public resources: { bundle: string; index: { [key: string]: number[] } } = {
index: {},
bundle: ''
@@ -53,6 +53,7 @@ export class NexeCompiler {
constructor(public options: NexeOptions) {
const { python } = (this.options = options)
this.targets = options.targets as NexeTarget[]
this.log.step('nexe ' + nexeVersion, 'info')
if (python) {
if (isWindows) {
@@ -147,7 +148,7 @@ export class NexeCompiler {
const asset = githubRelease.assets.find(x => x.name === assetName)
if (!asset) {
throw new Error(`${assetName} not available, create one using --build --empty`)
throw new Error(`${assetName} not available, create it using the --build flag`)
}
const filename = this.getNodeExecutableLocation(target)
await download(
src/options.ts
+24 -26
View File
@@ -1,11 +1,12 @@
import * as parseArgv from 'minimist'
import { NexeCompiler } from './compiler'
import { isWindows } from './util'
import { isWindows, padRight } from './util'
import { basename, extname, join, isAbsolute, relative } from 'path'
import { getTarget, NexeTarget } from './target'
import { EOL } from 'os'
import * as chalk from 'chalk'
export const nexeVersion = '2.0.0-rc.2'
export const nexeVersion = '2.0.0-rc.3'
export interface NexePatch {
(compiler: NexeCompiler, next: () => Promise<void>): Promise<void>
@@ -48,10 +49,6 @@ export interface NexeOptions {
downloadOptions: any
}
function padRight(str: string, l: number) {
return (str + ' '.repeat(l)).substr(0, l)
}
const defaults = {
version: process.version.slice(1),
flags: [],
@@ -83,24 +80,25 @@ const alias = {
l: 'loglevel'
}
const argv = parseArgv(process.argv, { alias, default: defaults })
const g = chalk.gray
const help =
`
nexe --help CLI OPTIONS
-i --input ${g('=index.js')} -- application entry point
-o --output ${g('=my-app.exe')} -- path to output file
-t --target ${g('=mac-x64-8.4.0')} -- *target a prebuilt binary
-n --name ${g('=my-app')} -- main app module name
-v --version ${g(`=${padRight(process.version.slice(1), 23)}`)}-- node version
-p --python ${g('=/path/to/python2')} -- python executable
-f --flag ${g('="--expose-gc"')} -- *v8 flags to include during compilation
-c --configure ${g('="--with-dtrace"')} -- *pass arguments to the configure step
-m --make ${g('="--loglevel"')} -- *pass arguments to the make/build step
-s --snapshot ${g('=/path/to/snapshot')} -- build with warmup snapshot
-r --resource ${g('=./paths/**/*')} -- *embed file bytes within the binary
-b --build -- build from source
-i --input =index.js -- application entry point
-o --output =my-app.exe -- path to output file
-t --target =win32-x64-6.10.3 -- *target a prebuilt binary
-n --name =my-app -- main app module name
-v --version =${padRight(process.version.slice(1), 23)}-- node version
-p --python =/path/to/python2 -- python executable
-f --flag ="--expose-gc" -- *v8 flags to include during compilation
-c --configure ="--with-dtrace" -- *pass arguments to the configure step
-m --make ="--loglevel" -- *pass arguments to the make/build step
-s --snapshot =/path/to/snapshot -- build with warmup snapshot
-r --resource =./paths/**/* -- *embed file bytes within the binary
--bundle =./path/to/config -- pass a module path that exports nexeBundle
--temp =./path/to/temp -- nexe temp files (for downloads and source builds)
--bundle ${g('=./path/to/config')} -- pass a module path that exports nexeBundle
--temp ${g('=./path/to/temp')} -- default './nexe'
--no-bundle -- set when input is already bundled
--cwd -- set the current working directory for the command
--ico -- file name for alternate icon file (windows)
@@ -198,26 +196,26 @@ function normalizeOptionsAsync(input?: Partial<NexeOptions>): Promise<NexeOption
options.input = findInput(options.input, options.cwd)
options.loglevel = extractLogLevel(options)
options.flags = flattenFilter(opts.flag, options.flags)
options.targets = flattenFilter(opts.target, options.targets)
options.targets = flattenFilter(opts.target, options.targets).map(getTarget)
options.make = flattenFilter(options.vcBuild, options.make)
options.configure = flattenFilter(options.configure)
options.resources = flattenFilter(opts.resource, options.resources)
options.rc = options.rc || extractCliMap(/^rc-.*/, options)
options.targets = options.targets.map(getTarget)
if (!options.targets.length) {
options.targets = [getTarget(options.version)]
}
if (options.build && options.targets.length) {
if (options.build) {
const { arch } = options.targets[0] as NexeTarget
if (isWindows) {
options.make = Array.from(new Set(options.make.concat([arch])))
options.make = Array.from(new Set(options.make.concat(arch)))
} else {
options.configure = Array.from(new Set(options.configure.concat([`--dest-cpu=${arch}`])))
}
}
if (!options.targets.length) {
options.targets = [getTarget(options.version)]
}
options.version = (options.targets[0] as NexeTarget).version
options.patches = options.patches.map(x => {
if (typeof x === 'string') {
src/steps/bundle.ts
+1
View File
@@ -53,6 +53,7 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
name: compiler.options.name,
minify: compiler.options.compress
})
if (compiler.options.debugBundle) {
await writeFileAsync(compiler.options.debugBundle, compiler.input)
}
src/steps/download.ts
+3 -2
View File
@@ -3,6 +3,7 @@ import { pathExistsAsync } from '../util'
import { LogStep } from '../logger'
import { IncomingMessage } from 'http'
import { NexeCompiler } from '../compiler'
import { NexeTarget } from '../target'
function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options = {}) {
const setText = (p: number) => step.modify(`Downloading Node: ${p.toFixed()}%...`)
@@ -27,8 +28,8 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options
* @param {*} next
*/
export default async function downloadNode(compiler: NexeCompiler, next: () => Promise<void>) {
const { src, log } = compiler
const { version, sourceUrl, downloadOptions } = compiler.options
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)) {
src/target.ts
+6 -5
View File
@@ -8,14 +8,15 @@ export { platforms, architectures }
export interface NexeTarget {
version: string
platform: NodePlatform
arch: NodeArch
platform: NodePlatform | string
arch: NodeArch | string
}
//TODO bsd
const prettyPlatform: { [key: string]: NodePlatform } = {
win32: 'windows',
windows: 'windows',
win: 'windows',
darwin: 'mac',
macos: 'mac',
mac: 'mac',
@@ -36,7 +37,7 @@ function isVersion(x: string) {
if (!x) {
return false
}
return /\d/.test(x.replace(/v|\./g, ''))
return /^[\d]+$/.test(x.replace(/v|\.|\s+/g, ''))
}
function isPlatform(x: string): x is NodePlatform {
@@ -61,7 +62,7 @@ export function targetsEqual(a: NexeTarget, b: NexeTarget) {
return a.arch === b.arch && a.platform === b.platform && a.version === b.version
}
export function getTarget(target: string | NexeTarget = ''): NexeTarget {
export function getTarget(target: string | Partial<NexeTarget> = ''): NexeTarget {
let arch = process.arch as NodeArch,
platform = prettyPlatform[process.platform],
version = process.version.slice(1)
@@ -75,7 +76,7 @@ export function getTarget(target: string | NexeTarget = ''): NexeTarget {
.split('-')
.forEach(x => {
if (isVersion(x)) {
version = x
version = x.replace(/v/g, '')
}
if (isPlatform(x)) {
platform = prettyPlatform[x]
src/util.ts
+5
View File
@@ -22,6 +22,10 @@ function falseOnEnoent(e: any) {
throw e
}
function padRight(str: string, l: number) {
return (str + ' '.repeat(l)).substr(0, l)
}
function dequote(input: string) {
input = input.trim()
const singleQuote = input.startsWith("'") && input.endsWith("'")
@@ -57,6 +61,7 @@ function isDirectoryAsync(path: string) {
export {
dequote,
padRight,
isWindows,
rimrafAsync,
statAsync,
test/mocha.opts
+3
View File
@@ -0,0 +1,3 @@
--check-leaks
--require ts-node/register
--recursive
test/target.spec.ts
+28
View File
@@ -0,0 +1,28 @@
import { padRight, isWindows } from '../src/util'
import { expect } from 'chai'
import { blue as b } from 'chalk'
import { getTarget, NexeTarget } from '../src/target'
const arch = (isWindows && process.arch === 'ia32') ? 'x86' : process.arch
describe('Targets', () => {
[
['win-ia32-6.11.2', 'windows-x86-6.11.2'],
[{ version: '6.11.2', platform: 'win', arch: 'ia32' }, 'windows-x86-6.11.2'],
['win32-x64-6.11.2', 'windows-x64-6.11.2'],
['darwin-x64-v8.4.0', 'mac-x64-8.4.0'],
['static-x86-6.10.3', 'alpine-x86-6.10.3'],
['linux-x32', `linux-x86-${process.version.slice(1)}`],
['alpine-notsupported-6.10.3', `alpine-${arch}-6.10.3`],
['not-a-thing', getTarget(process).toString()]
].forEach(([input, expected]) => {
it(`${padRight(JSON.stringify(input), 53)} ${b('->')} ${expected}`, () => {
expect(getTarget(input).toString()).to.equal(expected)
})
})
it ('should stringify and toString', () => {
expect(JSON.stringify(getTarget(process))).to.equal(`"${getTarget(process)}"`)
})
})