Switch to ES modules

Author: jeswin

.npmignore

@@ -1,7 +1 @@
-src/*
-dist/test/*
-build.sh
-.jshintrc
-.gitignore
-static/bundle.js
-static/bundle.js.map
+dist/test/*

build.sh

@@ -1,27 +1,31 @@
 {
   "name": "basho-eval",
-  "version": "5.0.1",
+  "version": "6.0.0",
+  "main": "dist/index.js",
+  "type": "module",
+  "types": "src/index.ts",
   "author": "Jeswin Kumar<[email protected]>",
   "repository": {
     "type": "git",
     "url": "https://github.com/bashojs/basho-eval"
   },
   "scripts": {
-    "transpile": "./build.sh",
-    "test": "./build.sh && mocha dist/test/test.js"
+    "clean": "rimraf ./dist",
+    "build": "npm run clean && mkdir -p dist && npx tsc && cp src/test/square.js dist/test/",
+    "test": "node --experimental-specifier-resolution=node node_modules/mocha/lib/cli/cli.js dist/test/test.js"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "dependencies": {
-    "@types/node": "^16.4.10",
-    "lazily-async": "^1.0.3"
+    "@types/node": "^16.6.2",
+    "lazily-async": "^2.0.1"
   },
   "devDependencies": {
     "@types/mocha": "^9.0.0",
     "@types/should": "^13.0.0",
     "left-pad": "^1.3.0",
     "mocha": "^9.0.3",
-    "should": "^13.2.3"
+    "rimraf": "^3.0.2",
+    "should": "^13.2.3",
+    "typescript": "^4.3.5"
   },
   "license": "MIT"
 }

package-lock.json

@@ -5,7 +5,7 @@ import {
   BashoLogFn,
   ExpressionStackEntry,
   BashoEvaluationResult,
-  EvaluationEnv
+  EvaluationEnv,
 } from "./types";
 import { PipelineValue, PipelineItem } from "./pipeline";
 import jsExpression from "./operators/jsExpression";
@@ -17,7 +17,7 @@ import execShellCommand from "./operators/execShellCommand";
 import onError from "./operators/onError";
 import filter from "./operators/filter";
 import recurse from "./operators/recurse";
-import doImport from "./operators/doImport";
+import { defaultImport, namedImport } from "./operators/doImport";
 import log from "./operators/log";
 import flatMap from "./operators/flatMap";
 import namedExpression from "./operators/namedExpression";
@@ -67,7 +67,7 @@ function createProxy(): EvaluationStack {
       const outer = evalScope.slice(-1)[0];
       outer[prop] = value;
       return true;
-    }
+    },
   };
 
   const proxy = new Proxy(evalScope, handler);
@@ -76,7 +76,7 @@ function createProxy(): EvaluationStack {
     create: () => evalScope.push({}),
     unwind: () => evalScope.pop(),
     value: evalScope,
-    proxy
+    proxy,
   };
 }
 
@@ -108,7 +108,7 @@ export async function createStackAndEvaluate(
     args,
     [],
     evalScope,
-    Seq.of(pipedValues.map(x => new PipelineValue(x))),
+    Seq.of(pipedValues.map((x) => new PipelineValue(x))),
     mustPrint,
     onLog,
     onWrite,
@@ -145,70 +145,73 @@ export async function evaluateInternal(
 ): Promise<BashoEvaluationResult> {
   const cases: Array<[(arg: string) => boolean, OperatorFn]> = [
     /* Enumerate sequence into an array */
-    [x => x === "-a", toArray],
+    [(x) => x === "-a", toArray],
 
     /* Combine multiple named streams */
-    [x => x === "-c", combineStreams],
+    [(x) => x === "-c", combineStreams],
 
     /* Define an expression */
-    [x => x === "-d", defineExpression],
+    [(x) => x === "-d", defineExpression],
 
     /* Execute shell command */
-    [x => x === "-e", execShellCommand],
+    [(x) => x === "-e", execShellCommand],
 
     /* Error handling */
-    [x => x === "--error", onError],
+    [(x) => x === "--error", onError],
 
     /* Filter */
-    [x => x === "-f", filter],
+    [(x) => x === "-f", filter],
 
     /* Recurse/Goto */
-    [x => x === "-g", recurse],
+    [(x) => x === "-g", recurse],
+
+    /* Import default export from a module */
+    [(x) => x === "--import" || x === "-i", defaultImport()],
 
-    /* Named Export */
-    [x => x === "--import" || x === "-i", doImport],
+    /* Import named export from a module */
+    [(x) => x === "--named-import", namedImport()],
 
     /* JS expressions */
-    [x => x === "-j", jsExpression(1)],
+    [(x) => x === "-j", jsExpression(1)],
 
     /* Treats input as JSON */
-    [x => x === "--json", asJson],
+    [(x) => x === "--json", asJson],
 
     /* Logging */
-    [x => x === "-l", log],
+    [(x) => x === "-l", log],
 
     /* Flatmap */
-    [x => x === "-m", flatMap],
+    [(x) => x === "-m", flatMap],
 
     /* Named Expressions */
-    [x => x === "-n", namedExpression],
+    [(x) => x === "-n", namedExpression],
 
     /* Error handling. Handled by shell, ignore */
-    [x => x === "--ignoreerror" || x === "--printerror", errorHandler],
+    [(x) => x === "--ignoreerror" || x === "--printerror", errorHandler],
 
     /* Print */
-    [x => x === "-p", print],
+    [(x) => x === "-p", print],
 
     /* Reduce */
-    [x => x === "-r", reduce],
+    [(x) => x === "-r", reduce],
 
     /* Seek a named result */
-    [x => x === "-s", seek],
+    [(x) => x === "-s", seek],
 
     /* Convert input to a single string */
-    [x => x === "--str", asString],
+    [(x) => x === "--str", asString],
 
     /* Define a subroutine */
-    [x => x === "--sub", subroutine],
+    [(x) => x === "--sub", subroutine],
 
     /* Terminate the pipeline */
-    [x => x === "-t", terminate],
+    [(x) => x === "-t", terminate],
 
     /* Writing */
-    [x => x === "-w", write],
+    [(x) => x === "-w", write],
 
     /* Everything else as a JS expression */
-    [x => isFirstParam, jsExpression(0)]
+    [(x) => isFirstParam, jsExpression(0)],
   ];
 
   return args.length