@finsemble/finsemble-electron-adapter 6.2.0 → 6.3.0-beta.20211008

package/dist/grpc/grpc.ts

@@ -0,0 +1,9 @@
+// @ts-nocheck
+require("../e2o_view.ts");
+globalThis.grpc = require("@grpc/grpc-js");
+globalThis.grpcProtoLoader = require("@grpc/proto-loader");
+
+if (globalThis.e2o) {
+	globalThis.e2o.grpc = globalThis.grpc;
+	globalThis.e2o.grpcProtoLoader = globalThis.grpcProtoLoader;
+}

package/exports.js

@@ -6,4 +6,5 @@
  * the word "exports" on to the end: `require("@finsemble/finsemble-electron-apapter/exports")`
  */
 
-module.exports = require("./dist/exports");
+const fea = require("./dist/exports").default
+module.exports = fea

package/node_modules/@grpc/proto-loader/build/bin/proto-loader-gen-types.js

@@ -444,6 +444,37 @@ function generateEnumInterface(formatter, enumType, options, nameOverride) {
     formatter.unindent();
     formatter.writeLine('}');
 }
+/**
+ * This is a list of methods that are exist in the generic Client class in the
+ * gRPC libraries. TypeScript has a problem with methods in subclasses with the
+ * same names as methods in the superclass, but with mismatched APIs. So, we
+ * avoid generating methods with these names in the service client interfaces.
+ * We always generate two service client methods per service method: one camel
+ * cased, and one with the original casing. So we will still generate one
+ * service client method for any conflicting name.
+ *
+ * Technically, at runtime conflicting name in the service client method
+ * actually shadows the original method, but TypeScript does not have a good
+ * way to represent that. So this change is not 100% accurate, but it gets the
+ * generated code to compile.
+ *
+ * This is just a list of the methods in the Client class definitions in
+ * grpc@1.24.11 and @grpc/grpc-js@1.4.0.
+ */
+const CLIENT_RESERVED_METHOD_NAMES = new Set([
+    'close',
+    'getChannel',
+    'waitForReady',
+    'makeUnaryRequest',
+    'makeClientStreamRequest',
+    'makeServerStreamRequest',
+    'makeBidiStreamRequest',
+    'resolveCallInterceptors',
+    /* These methods are private, but TypeScript is not happy with overriding even
+     * private methods with mismatched APIs. */
+    'checkOptionalUnaryResponseArguments',
+    'checkMetadataAndOptions'
+]);
 function generateServiceClientInterface(formatter, serviceType, options) {
     if (options.includeComments) {
         formatComment(formatter, serviceType.comment);
@@ -453,6 +484,9 @@ function generateServiceClientInterface(formatter, serviceType, options) {
     for (const methodName of Object.keys(serviceType.methods).sort()) {
         const method = serviceType.methods[methodName];
         for (const name of [methodName, camelCase(methodName)]) {
+            if (CLIENT_RESERVED_METHOD_NAMES.has(name)) {
+                continue;
+            }
             if (options.includeComments) {
                 formatComment(formatter, method.comment);
             }

package/node_modules/@grpc/proto-loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grpc/proto-loader",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "author": "Google Inc.",
   "contributors": [
     {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@finsemble/finsemble-electron-adapter",
   "productName": "finsemble-electron-adapter",
   "description": "Adapter for running finsemble on electron",
-  "version": "6.2.0",
+  "version": "6.3.0-beta.20211008",
   "main": "dist/app.js",
   "types": "types/exports.d.ts",
   "files": [
@@ -20,7 +20,7 @@
     "obfuscate:dev": "set obfuscate=true&& set NODE_ENV=development&& gulp buildE2O",
     "prod": "set NODE_ENV=production&& gulp buildE2O",
     "startbrk": "---need to re-write this---gulp dev:noLaunch --gulpfile=./finsemble-seed/gulpfile.js &  set ELECTRON_DEV=true && electron dist/app.js --inspect-brk=5858  --remote-debugging-port=9090   --manifest http://localhost:3375/configs/application/manifest-local.json",
-    "test": "npx electron-mocha --require ./babel-register.js \"src/**/*.spec.js\" --timeout 10000",
+    "test": "npx electron-mocha --full-trace --require ./babel-register.js --require esm \"src/**/*.spec.ts\" --timeout 10000",
     "test-coverage": "nyc yarn test && nyc merge .nyc_output ../../.nyc_output/electron.json"
   },
   "build": {
@@ -38,28 +38,39 @@
   "author": "Cosaic",
   "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
+    "@electron/remote": "^2.0.1",
     "@grpc/grpc-js": "1.3.7",
-    "@grpc/proto-loader": "0.6.4",
-    "electron": "13.2.1",
+    "@grpc/proto-loader": "0.6.5",
+    "@types/async": "^3.2.8",
+    "@types/electron-installer-dmg": "^3.0.0",
+    "@types/lodash": "^4.14.175",
+    "@types/lodash.get": "^4.4.6",
+    "@types/mkdirp": "^1.0.2",
+    "@types/unzipper": "^0.10.4",
+    "@types/uuid": "^8.3.1",
+    "electron": "13.3.0",
     "electron-installer-dmg": "3.0.0",
-    "electron-packager": "15.3.0",
+    "electron-packager": "15.4.0",
     "electron-winstaller": "5.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.15.0",
+    "@babel/core": "7.15.8",
     "@babel/plugin-proposal-class-properties": "7.14.5",
-    "@babel/preset-env": "7.15.0",
+    "@babel/preset-env": "7.15.6",
     "@babel/preset-typescript": "7.15.0",
     "@babel/register": "7.15.3",
     "@types/archiver": "^5.1.0",
+    "@types/chai-http": "^4.2.0",
     "@types/deepmerge": "^2.2.0",
     "@types/express": "^4.17.11",
     "@types/express-fileupload": "^1.1.6",
     "@types/fs-extra": "^9.0.6",
     "@types/minimist": "^1.2.1",
+    "@types/mocha": "^9.0.0",
     "@types/node": "^14.14.22",
+    "@types/sinon": "^10.0.4",
     "@types/webpack": "^5.28.0",
-    "@types/ws": "7.4.7",
+    "@types/ws": "8.2.0",
     "add-filename-increment": "^1.0.0",
     "archiver": "^5.2.0",
     "async": "3.2.1",
@@ -74,9 +85,10 @@
     "electron-mocha": "10.1.0",
     "eslint": "7.32.0",
     "eslint-plugin-import": "2.24.2",
+    "esm": "^3.2.25",
     "express": "^4.17.1",
     "express-fileupload": "^1.2.1",
-    "fast-safe-stringify": "2.0.8",
+    "fast-safe-stringify": "2.1.1",
     "fs-extra": "^10.0.0",
     "gulp": "4.0.2",
     "image-size": "1.0.0",
@@ -93,16 +105,16 @@
     "signtool": "1.0.0",
     "sinon": "11.1.2",
     "source-map-loader": "3.0.0",
-    "systeminformation": "5.8.6",
-    "ts-loader": "9.2.5",
+    "systeminformation": "5.9.4",
+    "ts-loader": "9.2.6",
     "ts-node": "^10.0.0",
     "typescript": "4.3.5",
     "unzipper": "0.10.11",
     "uuid": "8.3.2",
-    "webpack": "5.51.1",
-    "webpack-cli": "4.8.0",
+    "webpack": "5.57.1",
+    "webpack-cli": "4.9.0",
     "webpack-obfuscator": "3.4.1",
-    "webpack-stream": "6.1.2",
+    "webpack-stream": "7.0.0",
     "winston": "3.3.3",
     "winston-daily-rotate-file": "4.5.5",
     "ws": "7.5.3"

package/dist/e2o.js.LICENSE.txt

@@ -1,12 +0,0 @@
-/*!
- * FileStreamRotator
- * Copyright(c) 2012-2017 Holiday Extras.
- * Copyright(c) 2017 Roger C.
- * MIT Licensed
- */
-
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-//! moment.js
-
-//! moment.js locale configuration

package/dist/e2o_view.js.LICENSE.txt

@@ -1,12 +0,0 @@
-/*!
- * FileStreamRotator
- * Copyright(c) 2012-2017 Holiday Extras.
- * Copyright(c) 2017 Roger C.
- * MIT Licensed
- */
-
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-//! moment.js
-
-//! moment.js locale configuration

package/dist/grpc/grpc.js

@@ -1,8 +0,0 @@
-require("../e2o_view.js");
-window.grpc = require("@grpc/grpc-js");
-window.grpcProtoLoader = require("@grpc/proto-loader");
-
-if (window.e2o) {
-	window.e2o.grpc = window.grpc;
-	window.e2o.grpcProtoLoader = window.grpcProtoLoader;
-}