#65 Provide standalone modelserver-client

- Move packages into dedicated `packages` dir
- Move downloading of theia plugins from root `package.json` to browser-app
- Introduce  root script for upgrading the fluent theia dependencies (`yarn ugprade:theia`)
- Upgrade effective Theia version  to 1.19.0 and swapt to ES2017 as default target.
Add mocha dependencies and add config

- Restructure repo and move packages and examples in dedicated directories
- Extract ModelServerClient from modelserver-theia into separate package
 Rework ModelServerClient API so that 
-- The API is iinline with the current Java API
-- The API returns concrete data objects instead of low level responses
-- Overrides are provided to retrieve typed results where suitable (#22)
-- The default impl uses  the well established axios  library for rest calls instead of a custom solution
-- The implementation is isomorph and can be used in both web  frontends and node backends.
-- Rework can clean up Subscriptions  API

- Provide generic mocha test setup
-  Add simple request tests for the modelserver client (using moxios)

Contributed on behalf of ST Microelectronics

.gitignore

@@ -2,9 +2,11 @@ node_modules
 .browser_modules
 lib
 *.log
-example/*-app/*
-!example/*-app/package.json
+examples/*-app/*
+!examples/*-app/package.json
 
-example/coffee-theia/build/*\.jar
+examples/coffee-theia/build/*\.jar
 
 plugins
+
+.temp

.vscode/launch.json

@@ -8,13 +8,13 @@
       "type": "node",
       "request": "launch",
       "name": "Start Browser Backend",
-      "program": "${workspaceRoot}/example/browser-app/src-gen/backend/main.js",
+      "program": "${workspaceRoot}/examples/browser-app/src-gen/backend/main.js",
       "args": [
         "--loglevel=debug",
         "--port=3000",
         "--no-cluster",
-        "--root-dir=${workspaceRoot}/example/workspace",
-        "--app-project-path=${workspaceRoot}/example/browser-app",
+        "--root-dir=${workspaceRoot}/examples/workspace",
+        "--app-project-path=${workspaceRoot}/examples/browser-app",
         "--plugins=local-dir:${workspaceRoot}/plugins"
       ],
       "env": {
@@ -23,9 +23,9 @@
       "sourceMaps": true,
       "outFiles": [
         "${workspaceRoot}/node_modules/@theia/*/lib/**/*.js",
-        "${workspaceRoot}/example/browser-app/lib/**/*.js",
-        "${workspaceRoot}/example/browser-app/src-gen/**/*.js",
-        "${workspaceRoot}/example/dev-example/lib/**/*.js",
+        "${workspaceRoot}/examples/browser-app/lib/**/*.js",
+        "${workspaceRoot}/examples/browser-app/src-gen/**/*.js",
+        "${workspaceRoot}/examples/dev-examples/lib/**/*.js",
         "${workspaceRoot}/modelserver-theia/lib/**/*.js"
       ],
       "smartStep": true,
@@ -39,6 +39,32 @@
       "url": "http://localhost:3000/",
       "sourceMaps": true,
       "webRoot": "${workspaceRoot}"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Run current test",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+      "args": ["--config", "${workspaceFolder}/configs/.mocharc.json", "${file}"],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Run all tests",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+      "args": [
+        "--config",
+        "${workspaceFolder}/configs/.mocharc.json",
+        "--no-timeouts",
+        "${workspaceFolder}/packages/*/src/**/*.spec.ts"
+      ],
+      "env": {
+        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.json"
+      },
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
     }
   ]
 }

.vscode/tasks.json

@@ -20,7 +20,7 @@
     {
       "label": "Start Theia Browser Backend",
       "type": "shell",
-      "command": "cd example/browser-app && yarn start",
+      "command": "yarn start",
       "presentation": {
         "reveal": "always",
         "panel": "new"
@@ -50,4 +50,4 @@
       "problemMatcher": []
     }
   ]
-}
+}

configs/.mocharc.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "https://json.schemastore.org/mocharc",
+  "require": [
+    "ts-node/register",
+    "reflect-metadata/Reflect"
+  ],
+  "reporter": "spec",
+  "color": true,
+  "watch-files": [
+    "*.ts",
+    "*.tsx"
+  ],
+  "timeout": 2000
+}

configs/base.eslintrc.json

@@ -11,6 +11,7 @@
     "@typescript-eslint",
     "header",
     "import",
+    "chai-friendly",
     "no-null"
   ],
   "extends": [

configs/base.tsconfig.json

@@ -14,10 +14,10 @@
     "downlevelIteration": true,
     "module": "commonjs",
     "moduleResolution": "node",
-    "target": "es5",
+    "target": "ES2017",
     "jsx": "react",
     "lib": [
-      "es6",
+      "ES2017",
       "dom"
     ],
     "sourceMap": true

configs/errors.eslintrc.json

@@ -14,7 +14,7 @@
     "no-caller": "error",
     "no-eval": "error",
     "no-redeclare": [
-      "error",
+      "off",
       {
         "builtinGlobals": false
       }
@@ -28,12 +28,13 @@
     ],
     "no-sequences": "error",
     "no-throw-literal": "error",
-    "no-unused-expressions": [
-      "error",
-      {
-        "allowShortCircuit": true,
-        "allowTernary": true
-      }
+    "no-no-unused-expressions":"off",
+    "chai-friendly/no-unused-expressions": [
+        "error",
+        {
+            "allowShortCircuit": true,
+            "allowTernary": true
+        }
     ],
     // Variables
     "no-unused-vars": "off", // typescript-eslint rule activated instead
@@ -81,7 +82,6 @@
       }
     ],
     // @typescript-eslint/eslint-plugin
-    "@typescript-eslint/class-name-casing": "error",
     "@typescript-eslint/consistent-type-definitions": "error",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-misused-new": "error",

configs/warnings.eslintrc.json

@@ -6,7 +6,8 @@
       "1tbs"
     ],
     "comma-dangle": "warn",
-    "indent": [
+    "indent":"off",
+    "@typescript-eslint/indent": [
       "warn",
       4,
       {

example/browser-app/package.json → examples/browser-app/package.json

@@ -19,20 +19,27 @@
     "@modelserver/dev-example": "0.7.0"
   },
   "devDependencies": {
-    "@theia/cli": "latest"
+    "@theia/cli": "^1.0.0"
   },
   "scripts": {
-    "prepare": "yarn run clean && yarn build",
+    "prepare": "yarn  clean && yarn build && yarn download:plugins",
     "clean": "theia clean",
     "build": "theia build --mode development",
-    "start": "theia start --plugins=local-dir:../../plugins --root-dir=../example/workspace",
-    "watch": "theia build --watch --mode development"
+    "start": "theia start --plugins=local-dir:./plugins --root-dir=../workspace",
+    "watch": "theia build --watch --mode development",
+    "download:plugins": "theia download:plugins"
   },
   "theia": {
     "frontend": {
       "config": {
         "applicationName": "modelserver-theia Browser Example"
       }
     }
+  },
+  "theiaPluginsDir": "plugins",
+  "theiaPlugins": {
+    "vscode-builtin-json": "https://open-vsx.org/api/vscode/json/1.46.1/file/vscode.json-1.46.1.vsix",
+    "vscode-builtin-json-language-features": "https://open-vsx.org/api/vscode/json-language-features/1.46.1/file/vscode.json-language-features-1.46.1.vsix",
+    "vscode-builtin-xml": "https://open-vsx.org/api/vscode/xml/1.44.2/file/vscode.xml-1.44.2.vsix"
   }
 }

example/coffee-theia/package.json → examples/coffee-theia/package.json

@@ -37,7 +37,7 @@
     "clean": "rimraf lib",
     "build": "tsc && yarn run lint",
     "download:server": "cd ./scripts && ./download-server.sh",
-    "lint": "eslint -c ./.eslintrc.js --ext .ts ./src",
+    "lint": "eslint -c ../../.eslintrc.js --ext .ts ./src",
     "watch": "tsc -w"
   },
   "theiaExtensions": [

example/coffee-theia/src/node/backend-module.ts → examples/coffee-theia/src/node/backend-module.ts

@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR MIT
  ********************************************************************************/
-import { LaunchOptions } from '@eclipse-emfcloud/modelserver-theia';
+import { LaunchOptions } from '@eclipse-emfcloud/modelserver-theia/lib/node';
 import { ContainerModule, injectable } from 'inversify';
 import { join, resolve } from 'path';
 

example/dev-example/package.json → examples/dev-example/package.json

@@ -36,7 +36,7 @@
     "prepare": "yarn run clean && yarn run build",
     "clean": "rimraf lib",
     "build": "tsc && yarn run lint",
-    "lint": "eslint -c ./.eslintrc.js --ext .ts ./src",
+    "lint": "eslint -c ../../.eslintrc.js --ext .ts ./src",
     "watch": "tsc -w"
   },
   "theiaExtensions": [