From a6f9e3d0de94efcf0b283e1883e0026fe8cf0036 Mon Sep 17 00:00:00 2001
From: Zaid Abdulla <zaid@genieacs.com>
Date: Tue, 8 Sep 2020 20:11:00 -0700
Subject: [PATCH] Renaming yebool to espresso-iisojs

---
 build/build.ts                   | 14 +++++++++-----
 lib/common/boolean-expression.ts |  2 +-
 npm-shrinkwrap.json              | 16 ++++++++--------
 package.json                     |  4 ++--
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/build/build.ts b/build/build.ts
index a50bbc8..21e39a3 100644
--- a/build/build.ts
+++ b/build/build.ts
@@ -81,7 +81,7 @@ const externals = [
   "codemirror/mode/yaml/yaml",
   "ipaddr.js",
   "jsbi",
-  "yebool",
+  "espresso-iisojs",
 ];
 
 function rmDirSync(dirPath): void {
@@ -297,7 +297,7 @@ async function generateFrontendJs(): Promise<void> {
   const inputFile = path.resolve(INPUT_DIR, "ui/app.ts");
   const outputFile = path.resolve(OUTPUT_DIR, "public/app.js");
 
-  const inlineDeps = ["mithril", "parsimmon", "jsbi", "yebool"];
+  const inlineDeps = ["mithril", "parsimmon", "jsbi", "espresso-iisojs"];
   const bundle = await rollup({
     input: inputFile,
     external: externals.filter((e) => !inlineDeps.includes(e)),
@@ -306,10 +306,14 @@ async function generateFrontendJs(): Promise<void> {
       {
         name: "",
         resolveId: function (importee, importer) {
-          if (importee.endsWith("/bigint"))
+          if (importee.endsWith("/bigint")) {
             return this.resolve(importee + "-jsbi", importer);
-          else if (importee === "yebool")
-            return this.resolve("yebool/dist/yebool-jsbi.mjs", importer);
+          } else if (importee === "espresso-iisojs") {
+            return this.resolve(
+              "espresso-iisojs/dist/espresso-iisojs-jsbi.mjs",
+              importer
+            );
+          }
           return null;
         },
       },
diff --git a/lib/common/boolean-expression.ts b/lib/common/boolean-expression.ts
index 33f3355..b5ab587 100644
--- a/lib/common/boolean-expression.ts
+++ b/lib/common/boolean-expression.ts
@@ -18,7 +18,7 @@
  */
 
 import * as BI from "./bigint";
-import { espresso, complement, tautology } from "yebool";
+import { espresso, complement, tautology } from "espresso-iisojs";
 import { Expression } from "../types";
 import { map } from "./expression-parser";
 import { and, evaluateCallback } from "./expression";
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d458179..55b615c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -3385,6 +3385,14 @@
         }
       }
     },
+    "espresso-iisojs": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/espresso-iisojs/-/espresso-iisojs-1.0.3.tgz",
+      "integrity": "sha512-VOu80fa4cEH5RVJ0Qqe+EcJKvDxVYWYyUsXybXXAsCTxO5CTvNSb0A5rhVSlp7++zCFg+r03FRUVgsXq6y6kVQ==",
+      "requires": {
+        "jsbi": "^3.1.3"
+      }
+    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
@@ -9470,14 +9478,6 @@
         "decamelize": "^1.2.0"
       }
     },
-    "yebool": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/yebool/-/yebool-1.0.2.tgz",
-      "integrity": "sha512-3sgfZ1jSZNWyU5Xu0uIlA98tNl/Aj1sZVt89qZL4IXJVNG2+eWF4hp9NzQrOng6nO/ohvIPnzbIfp8qtBykBfw==",
-      "requires": {
-        "jsbi": "^3.1.3"
-      }
-    },
     "ylru": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz",
diff --git a/package.json b/package.json
index 49f57bc..a99d170 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "tools": "tools"
   },
   "dependencies": {
+    "espresso-iisojs": "^1.0.3",
     "iconv-lite": "^0.6.2",
     "ipaddr.js": "^2.0.0",
     "jsonwebtoken": "^8.5.1",
@@ -33,8 +34,7 @@
     "mongodb": "^3.6.0",
     "parsimmon": "^1.16.0",
     "seedrandom": "^3.0.5",
-    "yaml": "^1.10.0",
-    "yebool": "^1.0.2"
+    "yaml": "^1.10.0"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^15.0.0",