diff --git a/package-lock.json b/package-lock.json
index ff45824e..68f7e123 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5381,12 +5381,6 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
-        },
-        "typescript": {
-          "version": "4.4.2",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz",
-          "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==",
-          "dev": true
         }
       }
     },
@@ -6991,6 +6985,11 @@
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
+    "esprima-fb": {
+      "version": "15001.1.0-dev-harmony-fb",
+      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz",
+      "integrity": "sha1-MKlHMDxrjV6VW+4rmbHSMyBqaQE="
+    },
     "esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -9853,9 +9852,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -10146,11 +10145,6 @@
         "source-map": "^0.4.2"
       },
       "dependencies": {
-        "esprima-fb": {
-          "version": "15001.1.0-dev-harmony-fb",
-          "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz",
-          "integrity": "sha1-MKlHMDxrjV6VW+4rmbHSMyBqaQE="
-        },
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
@@ -11338,6 +11332,96 @@
             "@types/react-dom": "*",
             "@types/react-transition-group": "*"
           }
+        },
+        "async": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
+          "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="
+        },
+        "jsonql": {
+          "version": "github:mWater/jsonql#822593e545a601ae9fc665667d2a6eb75a36f987",
+          "from": "github:mWater/jsonql#typescript",
+          "requires": {
+            "js-yaml": "^3.3.1",
+            "lodash": "^3.9.3",
+            "minimist": "^1.1.3"
+          }
+        },
+        "mwater-expressions": {
+          "version": "github:mWater/mwater-expressions#d2d3839bfeeedaf02f51865b7ed9c85b6c31c589",
+          "from": "github:mWater/mwater-expressions#typescript",
+          "requires": {
+            "@babel/runtime": "^7.12.5",
+            "@types/async": "^3.2.5",
+            "async": "^3.2.0",
+            "immer": "^8.0.0",
+            "jsonql": "github:mWater/jsonql",
+            "lodash": "^3.10.1",
+            "lru-cache": "^6.0.0",
+            "moment": "^2.29.1"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.15.3",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
+              "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
+              "requires": {
+                "regenerator-runtime": "^0.13.4"
+              }
+            },
+            "jsonql": {
+              "version": "github:mWater/jsonql#0c48a390b5e7547c096aa6f423dce7c3a4e3f449",
+              "from": "github:mWater/jsonql",
+              "requires": {
+                "js-yaml": "^3.3.1",
+                "lodash": "^3.9.3",
+                "minimist": "^1.1.3"
+              }
+            },
+            "moment": {
+              "version": "2.29.1",
+              "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+              "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+            }
+          }
+        },
+        "react-library": {
+          "version": "github:mWater/react-library#01af5ac21583ff910988594089c838feac0e8e7f",
+          "from": "github:mWater/react-library#typescript",
+          "requires": {
+            "async": "^1.5.0",
+            "classnames": "^2.3.1",
+            "coffeescript": "^2.5.1",
+            "create-react-class": "^15.6.3",
+            "ez-localize": "^2.1.1",
+            "lodash": "^3.10.1",
+            "moment": "^2.27.0",
+            "object-assign": "^4.1.0",
+            "object-path-immutable": "^0.5.1",
+            "prop-types": "^15.5.10",
+            "react": "^16.13.1",
+            "react-bootstrap": "~0.32.4",
+            "react-dnd": "^6.0.0",
+            "react-dnd-html5-backend": "^6.0.0",
+            "react-dom": "^16.13.1",
+            "react-overlays": "^0.8.3",
+            "react-resize-detector": "^6.7.4",
+            "react-select": "^3.1.0",
+            "to-px": "^1.0.1",
+            "uuid": "^3.4.0"
+          },
+          "dependencies": {
+            "async": {
+              "version": "1.5.2",
+              "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+              "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+            },
+            "classnames": {
+              "version": "2.3.1",
+              "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
+              "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+            }
+          }
         }
       }
     },
@@ -15029,9 +15113,9 @@
       "dev": true
     },
     "ua-parser-js": {
-      "version": "0.7.21",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
-      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="
+      "version": "0.7.28",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
+      "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g=="
     },
     "uc.micro": {
       "version": "1.0.6",