feat: modernise and update

gulpfile.js

@@ -1,22 +1,17 @@
-'use strict';
+import gulp from 'gulp'
+import { spawn } from 'child_process'
+import path from 'path'
+import fs from 'fs'
 
-const gulp = require('gulp');
-const spawn = require('child_process').spawn;
-const path = require('path');
-const fs = require('fs');
-const fse = require('fs-extra');
-const browserify = require('browserify');
-
-function build(cb) {
-  const emscriptenPath = process.env.EMSCRIPTEN || process.env.EMSCRIPTEN_ROOT;
-  console.log(process.env)
+function build (cb) {
+  const emscriptenPath = process.env.EMSCRIPTEN || process.env.EMSCRIPTEN_ROOT
 
   if (!emscriptenPath || !fs.existsSync(path.resolve(emscriptenPath))) {
-    return cb('Unable to find emscripten root. Use the env variable EMSCRIPTEN or EMSCRIPTEN_ROOT to set it manually.');
+    return cb('Unable to find emscripten root. Use the env variable EMSCRIPTEN or EMSCRIPTEN_ROOT to set it manually.')
   }
 
-  const out = path.resolve('./', 'build', 'anitomyscript.js');
-  const isRelease = process.env.NODE_ENV === 'prod';
+  const out = path.resolve('./', 'dist', 'anitomyscript.js')
+  const isRelease = process.env.NODE_ENV === 'prod'
 
   let spawnArgs = [
     '--memory-init-file', '0',
@@ -27,8 +22,17 @@ function build(cb) {
     '-I', path.resolve('./include'),
     '-s', 'EXPORT_NAME="anitomyscript"',
     '-s', 'WASM=1',
+    '-s', 'ENVIRONMENT=web,node',
     '-s', 'FILESYSTEM=0',
     '-s', 'MODULARIZE=1',
+    '-s', 'EXPORT_ES6=1',
+    '-s', 'AUTO_JS_LIBRARIES=0',
+    '-s', 'AUTO_NATIVE_LIBRARIES=0',
+    '-s', 'HTML5_SUPPORT_DEFERRING_USER_SENSITIVE_REQUESTS=0',
+    '-s', 'USE_SDL=0',
+    '-s', 'INITIAL_MEMORY=5308416',
+    '-s', 'ALLOW_MEMORY_GROWTH=1',
+    '--no-heap-copy',
     path.resolve('./include/anitomy/anitomy.cpp'),
     path.resolve('./include/anitomy/element.cpp'),
     path.resolve('./include/anitomy/keyword.cpp'),
@@ -39,74 +43,35 @@ function build(cb) {
     path.resolve('./include/anitomy/token.cpp'),
     path.resolve('./include/anitomy/tokenizer.cpp'),
     path.resolve('./src/anitomyscript.cpp'),
-    '-o', out,
-  ];
+    '-o', out
+  ]
 
   if (isRelease) {
     spawnArgs = spawnArgs.concat([
       '-O3',
+      '-s', 'USE_CLOSURE_COMPILER=1',
+      '-s', 'IGNORE_CLOSURE_COMPILER_ERRORS=1',
       '--closure', '1',
-      '--llvm-lto', '3',
+      '--llvm-lto', '3'
     ])
   }
 
-  console.log(`Starting ${isRelease ? 'release' : 'debug'} build with emcc args`, spawnArgs);
-
-  const emccExec = process.platform === 'win32' ? 'emcc.bat' : 'emcc';
+  console.log(`Starting ${isRelease ? 'release' : 'debug'} build with emcc args`, spawnArgs)
+  const emccExec = process.platform === 'win32' ? 'emcc.bat' : 'emcc'
   const s = spawn(path.join(emscriptenPath, emccExec), spawnArgs, {
-    cwd: './build',
-  });
+    cwd: './dist'
+  })
 
   s.stdout.on('data', (data) => {
-    console.log(data.toString());
-  });
+    console.log(data.toString())
+  })
 
   s.stderr.on('data', (data) => {
-    console.log(data.toString());
-  });
+    console.log(data.toString())
+  })
 
   s.on('error', (e) => cb(e))
-  s.on('close', () => cb());
-}
-
-function copyWasm() {
-  return gulp.src('./build/anitomyscript.wasm').pipe(gulp.dest('./dist'));
-}
-
-function clearBuild(cb) {
-  const buildPath = path.resolve('./build');
-  fs.readdirSync(buildPath).forEach((file) => {
-    const fileWithPath = path.resolve(buildPath, file);
-    if (file !== '.gitkeep') fse.removeSync(fileWithPath);
-  });
-  cb();
-}
-
-function _babel() {
-  return {
-    presets: ['@babel/preset-env'],
-    plugins: [
-      ['@babel/plugin-transform-runtime', { helpers: false }]
-    ],
-    only: ['index.js'],
-  };
-}
-
-function browser() {
-  return browserify('./index.js', { standalone: 'anitomyscript' })
-    .transform('babelify', _babel())
-    .bundle()
-    .pipe(fs.createWriteStream('./dist/anitomyscript.bundle.js'));
-}
-
-function browserMin() {
-  return browserify('./index.js', { standalone: 'anitomyscript' })
-    .transform('babelify', _babel())
-    .plugin('tinyify')
-    .bundle()
-    .pipe(fs.createWriteStream('./dist/anitomyscript.bundle.min.js'));
+  s.on('close', () => cb())
 }
 
-gulp.task('build', build);
-gulp.task('browser', gulp.series(gulp.parallel(browser, browserMin), copyWasm));
-gulp.task('default', gulp.series(clearBuild, 'build', 'browser'));
+gulp.task('default', build)

index.d.ts

@@ -1,4 +1,4 @@
-declare module "anitomyscript" {
+declare module 'anitomyscript' {
   export interface AnitomyResult {
     file_name: string;
     anime_season?: string;
@@ -29,8 +29,8 @@ declare module "anitomyscript" {
   }
 
   function parse(
-    input: string | string[]
-  ): Promise<AnitomyResult[] | AnitomyResult>;
+    input: string[]
+  ): Promise<AnitomyResult[]>;
 
-  export default parse;
+  export default parse
 }

index.js

@@ -1,42 +1,27 @@
-'use strict';
+import AnitomyNative from './dist/anitomyscript.js'
+let anitomyModule
 
-let AnitomyNative = require('./build/anitomyscript');
-let anitomyModule = undefined;
-
-module.exports = function (file) {
+export default async function (file) {
   if (!Array.isArray(file) && typeof file !== 'string') {
-    return Promise.reject(new Error('Input must be either an Array or a string'));
+    return new Error('Input must be either an Array or a string')
   }
 
   if (anitomyModule) {
-    return parse(file);
+    return parse(file)
   }
 
-  return new Promise((resolve, reject) => {
-    try {
-      AnitomyNative().then((actualModule) => {
-        anitomyModule = actualModule;
-        parse(file).then(resolve).catch(reject);
-      });
-    } catch (err) {
-      reject(err);
-    }
-  });
+  anitomyModule = await AnitomyNative()
+  return parse(file)
 }
 
-async function parse(file) {
-  if (Array.isArray(file)) {
-    const vector = mapArray(file);
-    const result = mapVector(anitomyModule.parseMultiple(vector));
-    vector.delete();
-    return result.map((each) => elements(each));
-  }
-  else {
-    return elements(anitomyModule.parseSingle(file));
-  }
+async function parse (file) {
+  const vector = mapArray(file)
+  const result = mapVector(anitomyModule.parseMultiple(vector))
+  vector.delete()
+  return result.map((each) => elements(each))
 }
 
-function elements(elements) {
+function elements (elements) {
   const returnObj = {
     anime_season: elementEntry(elements, anitomyModule.ElementCategory.kElementAnimeSeason),
     season_prefix: elementEntry(elements, anitomyModule.ElementCategory.kElementAnimeSeasonPrefix),
@@ -62,36 +47,36 @@ function elements(elements) {
     video_term: elementEntry(elements, anitomyModule.ElementCategory.kElementVideoTerm),
     volume_number: elementEntry(elements, anitomyModule.ElementCategory.kElementVolumeNumber),
     volume_prefix: elementEntry(elements, anitomyModule.ElementCategory.kElementVolumePrefix),
-    unknown: elementEntry(elements, anitomyModule.ElementCategory.kElementUnknown),
-  };
-  elements.delete();
-  return returnObj;
+    unknown: elementEntry(elements, anitomyModule.ElementCategory.kElementUnknown)
+  }
+  elements.delete()
+  return returnObj
 }
 
-function elementEntry(elements, key) {
+function elementEntry (elements, key) {
   if (elements.count(key) > 1) {
-    return mapVector(elements.get_all(key));
+    return mapVector(elements.get_all(key))
   } else {
-    return elements.get(key) || undefined;
+    return elements.get(key) || undefined
   }
 }
 
-function mapArray(array) {
-  const vector = new anitomyModule.StringVector();
+function mapArray (array) {
+  const vector = new anitomyModule.StringVector()
   array.forEach((element, index) => {
     if (typeof element !== 'string') {
-      throw new Error(`Element at index ${index} is not a string`);
+      throw new Error(`Element at index ${index} is not a string`)
     }
     vector.push_back(element)
-  });
-  return vector;
+  })
+  return vector
 }
 
-function mapVector(vector) {
-  const array = [];
+function mapVector (vector) {
+  const array = []
   for (let index = 0; index < vector.size(); index++) {
-    array.push(vector.get(index));
+    array.push(vector.get(index))
   }
-  vector.delete();
-  return array;
+  vector.delete()
+  return array
 }

package.json

@@ -1,13 +1,15 @@
 {
   "name": "anitomyscript",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "description": "Pure JavaScript bindings for Anitomy, ported with emscripten",
   "main": "index.js",
+  "type": "module",
   "scripts": {
     "test": "mocha test/*.spec.js",
     "build": "cross-env NODE_ENV=prod gulp",
     "build:dev": "cross-env NODE_ENV=dev gulp"
   },
+  "files": ["index.js", "dist/anitomyscript.js", "dist/anitomyscript.wasm"],
   "types": "index.d.ts",
   "repository": {
     "type": "git",
@@ -20,26 +22,25 @@
     "anime"
   ],
   "author": "Thiago Oliveira <thiago_ogt@outlook.com>",
+  "contributors": [
+    {
+      "name" : "ThaUnknown",
+      "email" : "casistaken@gmail.com",
+      "url" : "https://github.com/ThaUnknown/"
+    }
+  ],
   "license": "BSD-2-Clause",
   "bugs": {
     "url": "https://github.com/skiptirengu/anitomyscript/issues"
   },
   "homepage": "https://github.com/skiptirengu/anitomyscript#readme",
   "devDependencies": {
-    "@babel/core": "^7.6.4",
-    "@babel/plugin-transform-runtime": "^7.6.2",
-    "@babel/preset-env": "^7.6.3",
-    "@babel/runtime": "^7.6.3",
-    "babelify": "^10.0.0",
-    "browserify": "^16.5.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "cross-env": "^6.0.3",
-    "fs-extra": "^8.1.0",
     "gulp": "^4.0.2",
     "mocha": "^6.2.2",
     "mocha-logger": "^1.0.6",
     "tinyify": "^2.5.2"
-  },
-  "dependencies": {}
+  }
 }