Inline non-lodash stdlib functions, add all bitwise operators to stdlib

Author: rattrayalex

src/index.js

@@ -574,9 +574,43 @@ export default function (babel) {
     }
   }
 
+  function makeInlineStdlibFn(inlineFnName) {
+    const fnId = t.identifier(inlineFnName);
+    const aParam = t.identifier("a");
+    const bParam = t.identifier("b");
+    const op = {
+      "looseEq": "==",
+      "looseNotEq": "!=",
+      "bitwiseNot": "~",
+      "bitwiseAnd": "&",
+      "bitwiseOr": "|",
+      "bitwiseXor": "^",
+      "bitwiseLeftShift": "<<",
+      "bitwiseRightShift": ">>",
+      "bitwiseZeroFillRightShift": ">>>",
+    }[inlineFnName];
+
+    // bitwiseNot is the only unary fn; rest are binary.
+    if (inlineFnName === "bitwiseNot") {
+      return t.functionDeclaration(fnId, [aParam], t.blockStatement([
+        t.returnStatement(t.unaryExpression(op, aParam)),
+      ]));
+    }
+
+    return t.functionDeclaration(fnId, [aParam, bParam], t.blockStatement([
+      t.returnStatement(t.binaryExpression(op, aParam, bParam)),
+    ]));
+  }
+
   function insertStdlibImports(path, imports: Imports, useRequire) {
     const declarations = [];
+    const inlines = [];
     for (const importPath in imports) {
+      if (importPath === "inline") {
+        inlines.push(...imports[importPath]);
+        continue;
+      }
+
       const specifierNames = imports[importPath];
       const specifiers = [];
 
@@ -605,6 +639,20 @@ export default function (babel) {
       }
     }
     path.unshiftContainer("body", declarations);
+
+    if (inlines.length) {
+      const inlineDeclarations = [];
+      for (const inlineFnName of inlines) {
+        inlineDeclarations.push(makeInlineStdlibFn(inlineFnName));
+      }
+      // insert inline fns before the first statement which isn't an import statement
+      for (const p of path.get("body")) {
+        if (!p.isImportDeclaration()) {
+          p.insertBefore(inlineDeclarations);
+          break;
+        }
+      }
+    }
   }
 
   function generateForInIterator (path, type: "array" | "object") {

src/stdlib.js

@@ -1,15 +1,15 @@
 
-export function looseEq(a, b) {
-  return a == b;
-}
-
-export function looseNotEq(a, b) {
-  return a != b;
-}
-
-export function bitwiseNot(a) {
-  return ~a;
-}
+export const lightscriptImports = {
+  "looseEq": "inline",
+  "looseNotEq": "inline",
+  "bitwiseNot": "inline",
+  "bitwiseAnd": "inline",
+  "bitwiseOr": "inline",
+  "bitwiseXor": "inline",
+  "bitwiseLeftShift": "inline",
+  "bitwiseRightShift": "inline",
+  "bitwiseZeroFillRightShift": "inline",
+};
 
 export const everyLodashMethod = [
   "add",
@@ -320,12 +320,6 @@ export const everyLodashMethod = [
   "zipWith",
 ];
 
-export const lightscriptImports = {
-  "looseEq": "babel-plugin-lightscript/stdlib",
-  "looseNotEq": "babel-plugin-lightscript/stdlib",
-  "bitwiseNot": "babel-plugin-lightscript/stdlib",
-};
-
 export const lodashImports = everyLodashMethod.reduce((obj, methodName) => {
   obj[methodName] = "lodash";
   return obj;

test/fixtures/stdlib/bitwise-ops/actual.js

@@ -0,0 +1,7 @@
+bitwiseNot(1)
+bitwiseAnd(0, 1)
+bitwiseOr(0, 1)
+bitwiseXor(0, 1)
+bitwiseLeftShift(0, 1)
+bitwiseRightShift(0, 1)
+bitwiseZeroFillRightShift(0, 1)

test/fixtures/stdlib/bitwise-ops/exec.js

@@ -0,0 +1,41 @@
+assert.equal(bitwiseNot(1), -2)
+
+assert.equal(bitwiseAnd(0, 0), 0)
+assert.equal(bitwiseAnd(0, 1), 0)
+assert.equal(bitwiseAnd(1, 1), 1)
+assert.equal(bitwiseAnd(1, 2), 0)
+assert.equal(bitwiseAnd(2, 2), 2)
+
+assert.equal(bitwiseOr(0, 0), 0)
+assert.equal(bitwiseOr(0, 1), 1)
+assert.equal(bitwiseOr(1, 1), 1)
+assert.equal(bitwiseOr(1, 2), 3)
+assert.equal(bitwiseOr(2, 2), 2)
+
+assert.equal(bitwiseXor(0, 0), 0)
+assert.equal(bitwiseXor(0, 1), 1)
+assert.equal(bitwiseXor(1, 1), 0)
+assert.equal(bitwiseXor(1, 2), 3)
+assert.equal(bitwiseXor(2, 2), 0)
+
+assert.equal(bitwiseLeftShift(0, 0), 0)
+assert.equal(bitwiseLeftShift(0, 1), 0)
+assert.equal(bitwiseLeftShift(1, 1), 2)
+assert.equal(bitwiseLeftShift(1, 2), 4)
+assert.equal(bitwiseLeftShift(2, 2), 8)
+
+assert.equal(bitwiseRightShift(0, 0), 0)
+assert.equal(bitwiseRightShift(0, 1), 0)
+assert.equal(bitwiseRightShift(1, 1), 0)
+assert.equal(bitwiseRightShift(1, 2), 0)
+assert.equal(bitwiseRightShift(2, 1), 1)
+assert.equal(bitwiseRightShift(2, 0), 2)
+assert.equal(bitwiseRightShift(-1, 2), -1)
+
+assert.equal(bitwiseZeroFillRightShift(0, 0), 0)
+assert.equal(bitwiseZeroFillRightShift(0, 1), 0)
+assert.equal(bitwiseZeroFillRightShift(1, 1), 0)
+assert.equal(bitwiseZeroFillRightShift(1, 2), 0)
+assert.equal(bitwiseZeroFillRightShift(2, 1), 1)
+assert.equal(bitwiseZeroFillRightShift(2, 0), 2)
+assert.equal(bitwiseZeroFillRightShift(-1, 2), 1073741823)

test/fixtures/stdlib/bitwise-ops/expected.js

@@ -0,0 +1,35 @@
+function bitwiseNot(a) {
+  return ~a;
+}
+
+function bitwiseAnd(a, b) {
+  return a & b;
+}
+
+function bitwiseOr(a, b) {
+  return a | b;
+}
+
+function bitwiseXor(a, b) {
+  return a ^ b;
+}
+
+function bitwiseLeftShift(a, b) {
+  return a << b;
+}
+
+function bitwiseRightShift(a, b) {
+  return a >> b;
+}
+
+function bitwiseZeroFillRightShift(a, b) {
+  return a >>> b;
+}
+
+bitwiseNot(1);
+bitwiseAnd(0, 1);
+bitwiseOr(0, 1);
+bitwiseXor(0, 1);
+bitwiseLeftShift(0, 1);
+bitwiseRightShift(0, 1);
+bitwiseZeroFillRightShift(0, 1);

test/fixtures/stdlib/kitchen-sink/expected.js

@@ -1,5 +1,13 @@
-import { looseEq, looseNotEq } from 'babel-plugin-lightscript/stdlib';
 import { map, round } from 'lodash';
+
+function looseEq(a, b) {
+  return a == b;
+}
+
+function looseNotEq(a, b) {
+  return a != b;
+}
+
 looseEq(1, '1');
 looseNotEq(1, '1');
 foo(1, '1');

test/fixtures/stdlib/kitchen-sink/options.json

@@ -1,7 +1,10 @@
-const {
-  looseEq,
-  looseNotEq
-} = require('babel-plugin-lightscript/stdlib');
+function looseEq(a, b) {
+  return a == b;
+}
+
+function looseNotEq(a, b) {
+  return a != b;
+}
 
 const {
   map,