jsf.js_next_gen 1.0.0-beta-4 → 1.0.0-beta-7

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "1.0.0-beta-4",
+  "version": "1.0.0-beta-7",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/jsf.js",
   "scripts": {
     "doc": "npx typedoc --tsconfig src/main/typescript/tsconfig-typedoc.json",
-    "test": "env TS_NODE_PROJECT=./src/test/typescript/tsconfig.json mocha -r ts-node/register ./src/test/typescript/**/**/*Test*.ts",
-    "coverage": "nyc --reporter=html --reporter=text mocha -r ts-node/register ./**/test/typescript/**/**/*Test*.ts",
+    "test": "env TS_NODE_PROJECT=./src/main/typescript/tsconfig.json mocha",
+    "coverage": "env TS_NODE_PROJECT=./src/test/typescript/tsconfig.json nyc --reporter=html --reporter=text mocha",
     "build-production": "webpack --mode production --env FILE_NAME=jsf  && ts-node ./remap.ts --production",
     "build-development": "webpack --mode development --env FILE_NAME=jsf-development  && ts-node ./remap.ts --development",
     "build": "npm run doc && npm run build-development && npm run build-production"
@@ -22,6 +22,7 @@
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/chai": "^4.3.3",
     "@types/mocha": "^9.1.1",
+    "@types/node": "^18.7.16",
     "@types/sinon": "^10.0.13",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "chai": "^4.3.6",
@@ -42,9 +43,9 @@
     "typescript": "^4.8.2",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.10.1"
+    "webpack-dev-server": "^4.11.0"
   },
   "dependencies": {
-    "mona-dish": "0.21.2"
+    "mona-dish": "0.21.4"
   }
 }

package/src/main/typescript/api/Jsf.ts

@@ -176,7 +176,7 @@ export module jsf {
          * @returns true if the chain has succeeded false otherwise
          */
         export function chain(source, event, ...funcs: Array<Function | string>): boolean {
-            return Implementation.chain(source, event, ...funcs);
+            return Implementation.chain(source, event, ...(funcs as EvalFuncs));
         }
     }
 

package/src/{test/typescript/frameworkBase/LangTest.ts → main/typescript/test/frameworkBase/LangTest.spec.ts}

@@ -9,7 +9,7 @@ import isFunc = Lang.isFunc;
 import isString = Lang.isString;
 import trim = Lang.trim;
 import strToArray = Lang.strToArray;
-import {ExtLang} from "../../../main/typescript/impl/util/Lang";
+import {ExtLang} from "../../impl/util/Lang";
 import keyValToStr = ExtLang.keyValToStr;
 
 

package/src/{test/typescript/frameworkBase/_ext/monadish/DomQueryTest.ts → main/typescript/test/frameworkBase/_ext/monadish/DomQueryTest.spec.ts}

@@ -25,6 +25,7 @@ import trim = Lang.trim;
 
 const jsdom = require("jsdom");
 const {JSDOM} = jsdom;
+declare const global;
 
 describe('DOMQuery tests', function () {
 

package/src/{test/typescript → main/typescript/test}/frameworkBase/_ext/shared/StandardInits.ts

@@ -17,6 +17,7 @@
 
 import {DomQuery} from "mona-dish";
 
+declare let global;
 declare let jsf: any;
 
 /**
@@ -325,9 +326,9 @@ export module StandardInits {
      */
     let initJSF = async function () {
         // @ts-ignore
-        return import("../../../../../main/typescript/api/Jsf").then((data) => {
-            let Implementation = require("../../../../../main/typescript/impl/AjaxImpl");
-            let PushImpl = require("../../../../../main/typescript/impl/PushImpl");
+        return import("../../../../api/Jsf").then((data) => {
+            let Implementation = require("../../../../impl/AjaxImpl");
+            let PushImpl = require("../../../../impl/PushImpl");
             applyJsfToGlobals(data, Implementation, PushImpl);
         });
     };

package/src/{test/typescript/impl/ImplTest.ts → main/typescript/test/impl/ImplTest.spec.ts}

@@ -23,7 +23,7 @@ import {DomQuery} from "mona-dish";
 
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
 import defaultMyFaces = StandardInits.defaultMyFaces;
-import {P_EXECUTE, P_RENDER} from "../../../main/typescript/impl/core/Const";
+import {P_EXECUTE, P_RENDER} from "../../impl/core/Const";
 
 sinon.reset();
 

package/src/{test/typescript → main/typescript/test}/queue/AsynchronousProbe.ts

@@ -18,7 +18,7 @@
  * we need a probe to test our asynchronous behavior
  * the asynchronous behavior needs to be in an asynchronous runnable
  */
-import {AsyncRunnable} from "../../../main/typescript/impl/util/AsyncRunnable";
+import {AsyncRunnable} from "../../impl/util/AsyncRunnable";
 import {IValueHolder} from "mona-dish";
 
 export class ProbeClass implements AsyncRunnable<Promise<any>>, IValueHolder<Promise<any>> {

package/src/{test/typescript/queue/AsynchronousQueueTest.ts → main/typescript/test/queue/AsynchronousQueueTest.spec.ts}

@@ -18,9 +18,9 @@ import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import * as sinon from 'sinon';
 import {ProbeClass} from "./AsynchronousProbe";
-import {AsynchronouseQueue} from "../../../main/typescript/impl/util/AsyncQueue";
+import {AsynchronouseQueue} from "../../impl/util/AsyncQueue";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
-import {Implementation} from "../../../main/typescript/impl/AjaxImpl";
+import {Implementation} from "../../impl/AjaxImpl";
 import defaultMyFaces = StandardInits.defaultMyFaces;
 
 describe('Asynchronous Queue tests', () => {

package/src/{test/typescript/xhrCore/EventTests.ts → main/typescript/test/xhrCore/EventTests.spec.ts}

@@ -17,7 +17,7 @@
 import {describe} from "mocha";
 import * as sinon from "sinon";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
-import {Implementation} from "../../../main/typescript/impl/AjaxImpl";
+import {Implementation} from "../../impl/AjaxImpl";
 
 import {expect} from "chai";
 import protocolPage = StandardInits.protocolPage;

package/src/{test/typescript/xhrCore/FileUploadTest.ts → main/typescript/test/xhrCore/FileUploadTest.spec.ts}

@@ -12,11 +12,11 @@ import {
     P_VIEWSTATE,
     P_WINDOW_ID,
     SUCCESS
-} from "../../../main/typescript/impl/core/Const";
+} from "../../impl/core/Const";
 import defaultMyFaces = StandardInits.defaultMyFaces;
 import STD_XML = StandardInits.STD_XML;
 import defaultFileForm = StandardInits.defaultFileForm;
-import {Implementation} from "../../../main/typescript/impl/AjaxImpl";
+import {Implementation} from "../../impl/AjaxImpl";
 
 declare var jsf: any;
 declare var Impl

package/src/{test/typescript/xhrCore/RequestParamsTest.ts → main/typescript/test/xhrCore/RequestParamsTest.spec.ts}

@@ -1,10 +1,10 @@
 import * as sinon from "sinon";
-import {Implementation} from "../../../main/typescript/impl/AjaxImpl";
+import {Implementation} from "../../impl/AjaxImpl";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
 import defaultMyFaces = StandardInits.defaultMyFaces;
 import protocolPage = StandardInits.protocolPage;
 import {DQ} from "mona-dish";
-import {XhrFormData} from "../../../main/typescript/impl/xhrCore/XhrFormData";
+import {XhrFormData} from "../../impl/xhrCore/XhrFormData";
 import { expect } from "chai";
 
 describe("test for proper request param patterns identical to the old implementation", function () {

package/src/{test/typescript/xhrCore/RequestTest.ts → main/typescript/test/xhrCore/RequestTest.spec.ts}

@@ -28,7 +28,7 @@ import {
     P_VIEWSTATE,
     P_WINDOW_ID,
     SUCCESS
-} from "../../../main/typescript/impl/core/Const";
+} from "../../impl/core/Const";
 import defaultMyFaces = StandardInits.defaultMyFaces;
 import STD_XML = StandardInits.STD_XML;
 

package/src/{test/typescript → main/typescript/test}/xhrCore/WebsocketTest.ts

@@ -1,7 +1,7 @@
 import {describe} from "mocha";
 import * as sinon from "sinon";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
-import {Implementation} from "../../../main/typescript/impl/AjaxImpl";
+import {Implementation} from "../../impl/AjaxImpl";
 
 import {expect} from "chai";
 

package/src/{test/typescript/xhrCore/XhrFormDataTest.ts → main/typescript/test/xhrCore/XhrFormDataTest.spec.ts}

@@ -17,7 +17,7 @@
 import {describe, it} from 'mocha';
 import {DQ} from "mona-dish";
 import * as sinon from 'sinon';
-import {XhrFormData} from "../../../main/typescript/impl/xhrCore/XhrFormData";
+import {XhrFormData} from "../../impl/xhrCore/XhrFormData";
 import {expect} from "chai";
 
 const jsdom = require("jsdom");

package/src/main/typescript/tsconfig-typedoc.json

@@ -4,7 +4,8 @@ Special config to generate the tsdocs
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "skipLibCheck": true
+    "skipLibCheck": true,
+
   },
   "typedocOptions": {
     "entryPoints": ["api/Jsf.ts"],

package/src/main/typescript/tsconfig.json

@@ -13,6 +13,7 @@
     "sourceMap": true,
     "typeRoots": [
       "../../build/npm/node_modules/@types"
-    ]
+    ],
+    "types": ["node"]
   }
 }