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

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "1.0.0-beta-1",
+  "version": "1.0.0-beta-4",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/jsf.js",
   "scripts": {
-    "test": "mocha -r ts-node/register ./src/test/typescript/**/**/*Test*.ts",
+    "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",
     "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 build-development && npm run build-production"
+    "build": "npm run doc && npm run build-development && npm run build-production"
   },
   "keywords": [
     "myfaces",
@@ -18,32 +19,32 @@
   "author": "Werner Punz werpu@apache.org",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@types/chai": "^4.2.16",
-    "@types/mocha": "^8.2.2",
-    "@types/sinon": "^10.0.0",
+    "@istanbuljs/nyc-config-typescript": "^1.0.2",
+    "@types/chai": "^4.3.3",
+    "@types/mocha": "^9.1.1",
+    "@types/sinon": "^10.0.13",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "brotli-webpack-plugin": "^1.1.0",
-    "chai": "^4.3.4",
-    "compression-webpack-plugin": "^7.1.2",
-    "html-webpack-plugin": "^5.3.1",
-    "jsdom": "^16.5.3",
+    "chai": "^4.3.6",
+    "compression-webpack-plugin": "^10.0.0",
+    "html-webpack-plugin": "^5.5.0",
+    "jsdom": "^20.0.0",
     "jsdom-global": "^3.0.2",
-    "mocha": "^8.3.2",
-    "npm-check-updates": "^11.5.0",
+    "mocha": "^10.0.0",
+    "npm-check-updates": "^16.1.0",
     "nyc": "^15.1.0",
-    "replace-in-file": "^6.2.0",
-    "rxjs": "^6.6.7",
-    "sinon": "^10.0.0",
-    "terser-webpack-plugin": "^5.1.1",
-    "ts-loader": "^9.0.2",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.2.4",
-    "webpack": "^5.34.0",
-    "webpack-cli": "^4.6.0",
-    "webpack-dev-server": "^3.11.2"
+    "replace-in-file": "^6.3.5",
+    "rxjs": "^7.5.6",
+    "sinon": "^14.0.0",
+    "terser-webpack-plugin": "^5.3.6",
+    "ts-loader": "^9.3.1",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.23.14",
+    "typescript": "^4.8.2",
+    "webpack": "^5.74.0",
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.10.1"
   },
   "dependencies": {
-    "mona-dish": "0.20.3"
+    "mona-dish": "0.21.2"
   }
 }

package/remap.js

@@ -0,0 +1,44 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * we are remapping the mappings in our dist file, to meet the expected
+ * jsf loading criteria...
+ * luckily we can use more than one source map entry
+ * so either one is found and the other is not
+ */
+//the replace in file plugin meets our system independent grep/awk criteria
+//does pretty much what grep and awk do on unix systems
+var replace = require('replace-in-file');
+// we ned to fetch the proper argument
+var args = process.argv.slice(2);
+// and remap it into our proper option
+var buildStage = (args[0] == "--development") ? "-development" : "";
+console.log("fixing mapping file references for jsf");
+var option = {
+    //development
+    files: 'dist/**/*.js',
+    from: (buildStage == "-development") ? /jsf-development.js\.map/g : /jsf.js\.map/g,
+    to: "jsf".concat(buildStage, ".js.map\n//# sourceMappingURL=jsf").concat(buildStage, ".js.map.jsf?ln=scripts")
+};
+try {
+    var result = replace.sync(option);
+    console.log("mapping file references fixed!");
+    console.log('Replacement results:', result);
+}
+catch (error) {
+    console.error('Error occurred:', error);
+}
+//# sourceMappingURL=remap.js.map

package/remap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remap.js","sourceRoot":"","sources":["remap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;GAKG;AAEH,2EAA2E;AAC3E,uDAAuD;AACvD,IAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE3C,sCAAsC;AACtC,IAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,sCAAsC;AACtC,IAAM,UAAU,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;AACtE,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;AAEtD,IAAI,MAAM,GAAG;IACT,aAAa;IACb,KAAK,EAAE,cAAc;IACrB,IAAI,EAAE,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,cAAc;IAClF,EAAE,EAAE,aAAM,UAAU,8CAAoC,UAAU,2BAAwB;CAC7F,CAAA;AAED,IAAI;IACA,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;CAC/C;AAAC,OAAO,KAAK,EAAE;IACZ,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;CAC3C"}

package/remap.ts

@@ -21,7 +21,7 @@
  * so either one is found and the other is not
  */
 
-//the replace in file plugin meets our system independend grep/awk criteria
+//the replace in file plugin meets our system independent grep/awk criteria
 //does pretty much what grep and awk do on unix systems
 const replace = require('replace-in-file');
 

package/src/main/typescript/impl/util/AsyncQueue.ts

@@ -14,7 +14,7 @@ import {AsyncRunnable} from "./AsyncRunnable";
 export class AsynchronouseQueue<T extends AsyncRunnable<any>> {
 
     private runnableQueue = [];
-    private delayTimeout: number;
+    private delayTimeout: null | ReturnType<typeof setTimeout>;
 
     currentlyRunning: AsyncRunnable<any>;
 

package/src/main/typescript/impl/xhrCore/RequestDataResolver.ts

@@ -57,7 +57,7 @@ export function resolveTargetUrl(srcFormElement: HTMLFormElement) {
 }
 
 export function resolveFinalUrl(sourceForm: DomQuery, formData: XhrFormData, ajaxType = REQ_TYPE_POST) {
-    let targetUrl = this.resolveTargetUrl(<HTMLFormElement>sourceForm.getAsElem(0).value);
+    let targetUrl = resolveTargetUrl(<HTMLFormElement>sourceForm.getAsElem(0).value);
 
     return targetUrl + (ajaxType == REQ_TYPE_GET ? "?" + formData.toString() : EMPTY_STR);
 }

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

@@ -0,0 +1,20 @@
+/*
+Special config to generate the tsdocs
+*/
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "skipLibCheck": true
+  },
+  "typedocOptions": {
+    "entryPoints": ["api/Jsf.ts"],
+    "out": "../../../dist/docs",
+    "externalPattern": "**/node_modules/**",
+    "exclude": "**/{node_modules,test,doc,impl,myfaces}/**/*",
+    "excludeExternals": true,
+    "excludePrivate": true,
+    "excludeProtected": true,
+    "emit": "both",
+    "disableSources": true
+  }
+}

package/src/test/typescript/frameworkBase/LangTest.ts

@@ -33,7 +33,7 @@ const dom = new JSDOM(`
     `)
 
 export const window = dom.window;
-;
+
 
 function hello_world() {
     return "Hello World!"
@@ -71,8 +71,6 @@ describe('Lang tests', () => {
     });
 
     it('strToArray working', () => {
-        const lang = Lang;
-
         let arr = strToArray("hello.world.from.me", /\./gi);
 
         expect(arr).to.exist;
@@ -82,7 +80,6 @@ describe('Lang tests', () => {
     });
 
     it('trim working', () => {
-        const lang = Lang;
         let origStr = " hello world from me    ";
         let trimmed = trim(origStr);
         expect(trimmed).to.exist;
@@ -91,7 +88,6 @@ describe('Lang tests', () => {
     });
 
     it('isString working', () => {
-        const lang = Lang;
         expect(isString(" ")).to.be.true;
         expect(isString('')).to.be.true;
         expect(isString(null)).to.be.false;
@@ -103,7 +99,6 @@ describe('Lang tests', () => {
     });
 
     it('isFunc working', () => {
-        const lang = Lang;
         expect(isFunc(() => {
         })).to.be.true;
         expect(isFunc(function () {
@@ -114,7 +109,6 @@ describe('Lang tests', () => {
     });
 
     it('objToArray working', () => {
-        const lang = Lang;
         let obj_probe = new Probe();
         let resultArr = objToArray(obj_probe);
         expect(assertType(resultArr, Array)).to.be.true;
@@ -126,15 +120,13 @@ describe('Lang tests', () => {
     });
 
     it('keyval to string working', () => {
-        const lang = Lang;
         let keyval = keyValToStr("key", "val", ":")
         expect(keyval).to.eq("key:val");
 
     });
 
     it('equals ignore case test', () => {
-        const lang = Lang;
-        expect(equalsIgnoreCase(null, null)).to.be.true;
+        expect(equalsIgnoreCase(<any>null, <any>null)).to.be.true;
         expect(equalsIgnoreCase("", "")).to.be.true;
         expect(equalsIgnoreCase("null", "NuLL")).to.be.true;
         expect(equalsIgnoreCase("null ", "NuLL")).to.be.false;

package/src/test/typescript/frameworkBase/_ext/monadish/DomQueryTest.ts

@@ -1,3 +1,5 @@
+// noinspection HtmlUnknownAttribute
+
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -24,7 +26,6 @@ import trim = Lang.trim;
 const jsdom = require("jsdom");
 const {JSDOM} = jsdom;
 
-
 describe('DOMQuery tests', function () {
 
     beforeEach(function () {
@@ -60,7 +61,7 @@ describe('DOMQuery tests', function () {
 
         this.xhr = sinon.useFakeXMLHttpRequest();
         this.requests = [];
-        this.xhr.onCreate = (xhr) => {
+        this.xhr.onCreate = (xhr: any) => {
             this.requests.push(xhr);
         };
         (<any>global).XMLHttpRequest = this.xhr;
@@ -118,7 +119,7 @@ describe('DOMQuery tests', function () {
     it('domquery ops test2 eachNode', function () {
         let probe2 = DomQuery.querySelectorAll("div");
         let noIter = 0;
-        probe2 = probe2.each((item, cnt) => {
+        probe2.each((item, cnt) => {
             expect(item instanceof DomQuery).to.be.true;
             expect(noIter == cnt).to.be.true;
             noIter++;
@@ -229,19 +230,19 @@ describe('DOMQuery tests', function () {
     it("must have a working input handling", function () {
         DomQuery.querySelectorAll("body").innerHtml = `<form id="blarg">
     <div id="embed1">
-        <input type="text" id="id_1" name="id_1" value="id_1_val"></input>
-        <input type="text" id="id_2" name="id_2" value="id_2_val" disabled="disabled"> </input>
+        <input type="text" id="id_1" name="id_1" value="id_1_val"/>
+        <input type="text" id="id_2" name="id_2" value="id_2_val" disabled="disabled"/>
         <textarea type="text" id="id_3" name="id_3">textareaVal</textarea>
 
         <fieldset>
-            <input type="radio" id="mc" name="cc_1" value="Mastercard" checked="checked"></input>
+            <input type="radio" id="mc" name="cc_1" value="Mastercard" checked="checked"/>
             <label for="mc"> Mastercard</label>
-            <input type="radio" id="vi" name="cc_1" value="Visa"></input>
+            <input type="radio" id="vi" name="cc_1" value="Visa"/>
             <label for="vi"> Visa</label>
-            <input type="radio" id="ae" name="cc_1" value="AmericanExpress"></input>
+            <input type="radio" id="ae" name="cc_1" value="AmericanExpress"/>
             <label for="ae"> American Express</label>
         </fieldset>
-        <select id="val_5" name="val_5" name="top5" size="5">
+        <select id="val_5" name="val_5" size="5">
             <option>barg</option>
             <option>jjj</option>
             <option selected>akaka</option>
@@ -343,7 +344,7 @@ describe('DOMQuery tests', function () {
             //-->   
             </script>
         
-            <style type="text/css">
+            <style>
                 #first {
                     border: 1px solid black;
                 }
@@ -380,7 +381,7 @@ describe('DOMQuery tests', function () {
 
     it("it must handle events properly", function () {
         let clicked = 0;
-        let listener = (evt: any) => {
+        let listener = () => {
             clicked++;
         };
         let eventReceiver = DomQuery.byId("id_1");

package/src/test/typescript/frameworkBase/_ext/monadish/LangTest.ts

@@ -117,7 +117,7 @@ describe('Lang tests', () => {
 
     it('equals ignore case test', () => {
         const lang = Lang;
-        expect(lang.equalsIgnoreCase(null, null)).to.be.true;
+        expect(lang.equalsIgnoreCase(<any>null, <any>null)).to.be.true;
         expect(lang.equalsIgnoreCase("", "")).to.be.true;
         expect(lang.equalsIgnoreCase("null", "NuLL")).to.be.true;
         expect(lang.equalsIgnoreCase("null ", "NuLL")).to.be.false;

package/src/test/typescript/frameworkBase/_ext/monadish/MappingProbes.ts

@@ -52,14 +52,10 @@ class DtoUils {
                 (<any>target)[key] = {};
 
                 for (let key2 in newVal) {
-                    let subTarget = new mappings[key].clazz(newVal[key2]);
-                    //   subTarget = this.mapIt(subTarget, <any> newVal[key2]);
-                    (<any>target)[key][key2] = subTarget;
+                    (<any>target)[key][key2] = new mappings[key].clazz(newVal[key2]);
                 }
             } else if (mappings && mappings[key]) {
-                let subTarget = new mappings[key](newVal);
-
-                (<any>target)[key] = subTarget;
+                (<any>target)[key] = new mappings[key](newVal);
             } else {
                 (<any>target)[key] = newVal
             }
@@ -71,13 +67,14 @@ class DtoUils {
 
 }
 
+// noinspection JSUnusedLocalSymbols
 class BaseDto<T> {
 
     TYPES = "___mappable_types___";
 
     constructor(data?: T, dtoTypes: any = {}) {
 
-        this[this.TYPES] = dtoTypes;
+        (<any>this)[this.TYPES] = dtoTypes;
 
         if (data) {
             this.mapIt(this, data);
@@ -99,14 +96,11 @@ class BaseDto<T> {
                 (<any>target)[key] = {};
 
                 for (let key2 in newVal) {
-                    let subTarget = new target[this.TYPES][key].clazz(newVal[key2]);
-                 //   subTarget = this.mapIt(subTarget, <any> newVal[key2]);
-                    (<any>target)[key][key2] = subTarget;
+                    //   subTarget = this.mapIt(subTarget, <any> newVal[key2]);
+                    (<any>target)[key][key2] = new target[this.TYPES][key].clazz(newVal[key2]);
                 }
             } else if (target[this.TYPES] && target[this.TYPES][key]) {
-                let subTarget = new target[this.TYPES][key](newVal);
-
-                (<any>target)[key] = subTarget;
+                (<any>target)[key] = new target[this.TYPES][key](newVal);
             } else {
                 (<any>target)[key] = newVal
             }
@@ -136,12 +130,12 @@ function mixMaps(target: any, src: any): any {
 
 export class Probe1Impl  implements Probe1 {
 
-    val1: string;
-    val2: Date;
-    val3: any;
-    val4: Probe2[];
-    val5: Probe2;
-    val6: any;
+    val1!: string;
+    val2!: Date;
+    val3!: any;
+    val4!: Probe2[];
+    val5!: Probe2;
+    val6!: any;
 
     constructor(data: Probe1, mixin: any = {} /*put your own arguments in here*/) {
         DtoUils.mapIt(this, data, mixMaps({

package/src/test/typescript/frameworkBase/_ext/monadish/StreamTest.ts

@@ -75,11 +75,9 @@ describe('early stream tests', () => {
     })
 
     it("must have a correct first last", function () {
-        let stream = Stream.of<number>(...this.probe);
-
-        let first = Stream.of<number>(...this.probe).filter((data) => data != 5).onElem((data) => {
+        let first = Stream.of<number>(...this.probe).filter((data) => data != 5).onElem(() => {
         }).first().value;
-        let last = Stream.of<number>(...this.probe).filter((data) => data != 5).onElem((data) => {
+        let last = Stream.of<number>(...this.probe).filter((data) => data != 5).onElem(() => {
         }).last().value;
         expect(first).to.eq(1);
         expect(last).to.eq(4);
@@ -87,8 +85,6 @@ describe('early stream tests', () => {
     });
 
     it("must have a correct first last lazy", function () {
-        let stream = LazyStream.of<number>(...this.probe);
-
         let first = LazyStream.of<number>(...this.probe).filter((data) => data != 5).onElem((data) => {
             data;
         }).first().value;
@@ -102,7 +98,7 @@ describe('early stream tests', () => {
 
     it("must have a correct limits", function () {
         let cnt = 0;
-        let last = Stream.of<number>(...this.probe).filter((data) => data != 5).limits(2).onElem((data) => {
+        let last = Stream.of<number>(...this.probe).filter((data) => data != 5).limits(2).onElem(() => {
             cnt++;
         }).last().value;
 
@@ -118,8 +114,8 @@ describe('early stream tests', () => {
             key3: "val3"
         }
 
-        let arr1 = [];
-        let arr2 = [];
+        let arr1: Array<string | number> = [];
+        let arr2: Array<string | number> = [];
 
         Stream.ofAssoc(probe).each(item => {
             expect(item.length).to.eq(2);