fix: native module fuse plubin

examples/native-build/build.js

@@ -1,22 +1,14 @@
-const { FuseBox } = require('fuse-box')
-const { NativeModulePlugin } = require('../../lib/bundling')
-const fuse = FuseBox.init({
-  homeDir: './',
-  cache: false,
-  log: true,
-  debug: true,
-  output: '$name.js',
-  plugins: [
-    new NativeModulePlugin({
-      zmq: {
-        additionalFiles: [
-          '../../windows/lib/x64/libzmq-v100-mt-4_0_4.dll'
-        ]
-      }
-    })
-  ]
+const nexe = require('../..')
+
+nexe.compile({
+  output: 'native-build',
+  silent: true,
+  native: {
+    zmq: {
+      additionalFiles: [
+        '../../windows/lib/x64/libzmq-v100-mt-4_0_4.dll'
+      ]
+    }
+  }
 })
-fuse.bundle('app')
-    .target('server')
-    .instructions(`> index.js`)
-fuse.run()
+

examples/native-build/index.js

@@ -8,7 +8,6 @@ setInterval(function(){
   console.log('sending a multipart message envelope')
   pub.send(['kitty cats', 'meow!'])
 }, 2500)
-console.log('global', global.require.main)
 var sub = zmq.socket('sub')
 sub.connect('tcp://127.0.0.1:3000')
 sub.subscribe('kitty cats')

examples/native-build/package.json

@@ -4,15 +4,13 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "bundle": "node build",
-    "build-windows": "nexe -i app.js -o app.exe"
+    "build": "node build"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "sqlite3": "^3.1.10",
     "zmq": "^2.15.3"
   },
-  "devDependencies": {
-    "fuse-box": "^2.2.31"
-  }
+  "devDependencies": {}
 }

package-lock.json

@@ -1,15 +1,9 @@
 {
   "name": "nexe",
-  "version": "2.0.0-rc.4",
+  "version": "2.0.0-rc.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@types/bluebird": {
-      "version": "3.5.8",
-      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.8.tgz",
-      "integrity": "sha512-rBfrD56OxaqVjghtVqp2EEX0ieHkRk6IefDVrQXIVGvlhDOEBTvZff4Q02uo84ukVkH4k5eB1cPKGDM2NlFL8A==",
-      "dev": true
-    },
     "@types/chai": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.0.4.tgz",

package.json

@@ -45,7 +45,6 @@
     "uglify-js": "3.0.28"
   },
   "devDependencies": {
-    "@types/bluebird": "^3.5.8",
     "@types/chai": "^4.0.4",
     "@types/chalk": "^0.4.31",
     "@types/globby": "^0.6.0",

src/bundling/bindings-rewrite.ts

@@ -20,9 +20,8 @@ export function embedDotNode(
   file: { contents: string; absPath: string }
 ) {
   const contents = fs.readFileSync(file.absPath)
-  const module = Object.keys(options).find(x =>
-    Boolean(~file.absPath.indexOf(path.join('node_modules', x)))
-  )!
+  const modulePathParts = file.absPath.split(path.sep).reverse()
+  const module = modulePathParts[modulePathParts.findIndex(x => x === 'node_modules') - 1]
   const bindingName = path.basename(file.absPath)
   const settings = options[module]
   const moduleDir = hashName(contents)
@@ -31,7 +30,7 @@ export function embedDotNode(
     'base64'
   )}';function mkdirp(r,t){t=t||null,r=path.resolve(r);try{fs.mkdirSync(r),t=t||r}catch(c){if("ENOENT"===c.code)t=mkdirp(path.dirname(r),t),mkdirp(r,t);else{var i;try{i=fs.statSync(r)}catch(r){throw c}if(!i.isDirectory())throw c}}return t};`
 
-  if (settings === true) {
+  if (!settings || settings === true) {
     file.contents += `
       mkdirp('${moduleDir}');
       var bindingPath = path.join(process.cwd(), '${moduleDir}', '${bindingName}')
@@ -105,13 +104,13 @@ export class BindingsRewrite {
   public nativeModulePaths: string[] = []
   public rewrite = false
 
-  isRequireBindings(node: any) {
-    return node.callee.name === 'require' && node.arguments[0].value === 'bindings'
+  isRequire(node: any, moduleName: string) {
+    return node.callee.name === 'require' && node.arguments[0].value === moduleName
   }
 
   onNode(absolutePath: string, node: any, parent: any) {
     if (node.type === 'CallExpression') {
-      if (this.isRequireBindings(node) && parent.type === 'VariableDeclarator') {
+      if (this.isRequire(node, 'bindings') && parent.type === 'VariableDeclarator') {
         /**
          * const loadBindings = require('bindings');
          *   -> const loadBindings = String('');
@@ -123,7 +122,7 @@ export class BindingsRewrite {
         return
       }
 
-      if (this.isRequireBindings(node) && parent.type === 'CallExpression') {
+      if (this.isRequire(node, 'bindings') && parent.type === 'CallExpression') {
         /**
          *const bindings = require('bindings')('native-module')....
          *  -> const bindings = require('./path/to/native/module.node').....

src/bundling/fuse-native-module-plugin.ts

@@ -8,6 +8,7 @@ export interface FuseBoxFile {
     dependencies: string[]
     requiresRegeneration: boolean
   }
+  consume(): void
   loadContents(): void
   makeAnalysis(
     parsingOptions?: any,
@@ -20,19 +21,16 @@ export interface FuseBoxFile {
   ): void
 }
 
-export default function(options: ExtractNodeModuleOptions) {
+export default function(options: ExtractNodeModuleOptions = {}) {
   return new NativeModulePlugin(options)
 }
 
 export class NativeModulePlugin {
-  public test: RegExp
+  public test = /node_modules.*(\.js|\.node)$|\.node$/
   public limit2Project = false
   private modules: (keyof ExtractNodeModuleOptions)[]
 
-  constructor(public options: ExtractNodeModuleOptions) {
-    this.options = options
-    this.test = new RegExp(`node_modules\/(${Object.keys(options).join('|')}).*\.js|\.node$`)
-  }
+  constructor(public options = {}) {}
 
   init(context: any) {
     context.allowExtension('.node')
@@ -47,6 +45,7 @@ export class NativeModulePlugin {
     }
 
     const bindingsRewrite = new BindingsRewrite()
+
     file.makeAnalysis(null, {
       plugins: [
         {

src/options.ts

@@ -30,6 +30,7 @@ export interface NexeOptions {
   enableNodeCli: boolean
   bundle: boolean | string
   patches: (string | NexePatch)[]
+  native: any
   empty: boolean
   sourceUrl?: string
   python?: string
@@ -161,7 +162,8 @@ function extractName(options: NexeOptions) {
   if (!name && typeof options.input === 'string') {
     name = basename(options.input).replace(extname(options.input), '')
   }
-  name = name || tryResolveMainFileName(options.cwd)
+  name = name === 'index' ? tryResolveMainFileName(options.cwd) : name
+
   return name.replace(/\.exe$/, '')
 }
 

src/steps/bundle.ts

@@ -1,11 +1,12 @@
 import { NexeCompiler } from '../compiler'
 import { FuseBox, JSONPlugin, CSSPlugin, HTMLPlugin, QuantumPlugin } from 'fuse-box'
 import { readFileAsync, writeFileAsync } from '../util'
-//import NativeModulePlugin from './fuse-native-module-plugin'
+import NativeModulePlugin from '../bundling/fuse-native-module-plugin'
+import { NexeOptions } from '../options'
 
-function createBundle(filename: string, options: { name: string; minify: any; cwd: string }) {
-  const plugins: any = [JSONPlugin(), CSSPlugin(), HTMLPlugin()]
-  if (options.minify) {
+function createBundle(options: NexeOptions) {
+  const plugins: any = [JSONPlugin(), CSSPlugin(), HTMLPlugin(), NativeModulePlugin(options.native)]
+  if (options.compress) {
     plugins.push(
       QuantumPlugin({
         target: 'server',
@@ -24,7 +25,7 @@ function createBundle(filename: string, options: { name: string; minify: any; cw
     target: 'server',
     plugins
   })
-  fuse.bundle(options.name).instructions(`> ${filename}`)
+  fuse.bundle(options.name).instructions(`> ${options.input}`)
   return fuse.run().then(x => {
     let output = ''
     x.bundles.forEach(y => (output = y.context.output.lastPrimaryOutput.content!.toString()))
@@ -48,11 +49,7 @@ export default async function bundle(compiler: NexeCompiler, next: any) {
     producer = require(compiler.options.bundle).createBundle
   }
 
-  compiler.input = await producer(compiler.options.input, {
-    cwd: compiler.options.cwd,
-    name: compiler.options.name,
-    minify: compiler.options.compress
-  })
+  compiler.input = await producer(compiler.options)
 
   if ('string' === typeof compiler.options.debugBundle) {
     await writeFileAsync(compiler.options.debugBundle, compiler.input)