Merge branch 'master' of github.com:krausest/js-framework-benchmark

Author: krausest

frameworks/keyed/doohtml/js/Main.class.js

@@ -96,7 +96,7 @@ Doo.define(
 		add() {
 			let start = this.data.rows.length
 			this.data.rows = this.data.rows.concat(this.buildData())
-			this.append(this.data.rows.slice(start), this.tbody, start)
+			this.append(this.data.rows, this.tbody, start)
 		}    
 
 		runLots() {

frameworks/keyed/doohtml/js/doo.html.min.js

@@ -1,6 +1,6 @@
 {
     "name": "js-framework-benchmark-doohtml",
-    "version": "0.60.11",
+    "version": "0.80.2",
     "description": "DooHTML JS-Benchmark",
     "main": "Main.class.js",
     "js-framework-benchmark": {

frameworks/keyed/doohtml/package.json

@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015", "stage-0"]
+}

frameworks/keyed/san-store/.babelrc

@@ -9,8 +9,8 @@
     ]
   },
   "scripts": {
-    "build-dev": "webpack --watch",
-    "build-prod": "webpack"
+    "build-dev": "webpack -w -d",
+    "build-prod": "webpack -p"
   },
   "keywords": [
     "san",
@@ -24,15 +24,17 @@
     "url": "https://github.com/krausest/js-framework-benchmark.git"
   },
   "devDependencies": {
-    "@babel/core": "7.19.1",
-    "@babel/preset-env": "7.19.1",
-    "babel-loader": "8.2.5",
-    "webpack": "5.68.0",
-    "webpack-cli": "4.9.2"
+    "babel-core": "6.26.3",
+    "babel-loader": "7.1.5",
+    "babel-preset-es2015": "6.24.1",
+    "babel-preset-stage-0": "6.24.1",
+    "css-loader": "1.0.0",
+    "webpack": "4.16.3",
+    "webpack-cli": "3.1.0"
   },
   "dependencies": {
     "san": "3.12.0",
-		"san-update": "2.1.0",
-    "san-store": "2.1.3"
+    "san-store": "2.1.3",
+    "san-update": "2.1.0"
   }
 }

frameworks/keyed/san-store/package-lock.json

@@ -2,6 +2,8 @@ import {Component} from 'san';
 import {connectSan} from './store';
 
 class AppComponent extends Component {
+    static trimWhitespace = 'all';
+    static autoFillStyleAndId = false;
     static template = `
     <div class="container">
         <div class="jumbotron">
@@ -35,7 +37,7 @@ class AppComponent extends Component {
         </div>
         <table class="table table-hover table-striped test-data" on-click="handleClick($event)">
             <tbody>
-                <tr s-for="item in rows trackBy item.id" class="{{selected === item.id ? 'danger':''}}">
+                <tr s-for="item in rows trackBy item.id" class="{{item.selected ? 'danger':''}}">
                     <td class="col-md-1">{{item.id}}</td>
                     <td class="col-md-4">
                         <a data-action="select" data-id="{{item.id}}">{{item.label}}</a>
@@ -87,8 +89,7 @@ class AppComponent extends Component {
 
 export default connectSan(
     {
-        rows: 'rows',
-        selected: 'selected'
+        rows: 'rows'
     },
     {
         run: 'run',

frameworks/keyed/san-store/package.json

@@ -8,59 +8,70 @@ const C = ['red', 'yellow', 'blue', 'green', 'pink', 'brown', 'purple', 'brown',
 const N = ['table', 'chair', 'house', 'bbq', 'desk', 'car', 'pony', 'cookie', 'sandwich', 'burger', 'pizza',
     'mouse', 'keyboard'];
 
-const random = max => Math.round(Math.random() * 1000) % max;
+function random(max) {
+    return Math.round(Math.random() * 1000) % max;
+}
 
 let nextId = 1;
 function buildData(count = 1000) {
     const data = [];
     for (let i = 0; i < count; i++) {
         data.push({
             id: nextId++,
-            label: `${A[random(A.length)]} ${C[random(C.length)]} ${N[random(N.length)]}`
+            label: A[random(A.length)] + " " + C[random(C.length)] + " " + N[random(N.length)],
+            selected: false
         });
     }
     return data;
 }
 
 const store = new Store({
     initData: {
-        rows: [],
-        selected: 0
+        rows: []
     },
 
     actions: {
-        setSelected(id) {
-            return builder().set('selected', id);
+        setSelected(id, {getState, dispatch}) {
+            const rows = getState('rows');
+            const newData = rows.slice(0);
+
+            rows.forEach((el, i) => {
+                if (el.selected) {
+                    newData[i] = {...rows[i], selected: false}
+                }
+                if (el.id === id) {
+                    newData[i] = {...rows[i], selected: true}
+                }
+            });
+            return builder().set('rows', newData);
         },
-        run(n, {dispatch}) {
-            dispatch('setSelected', 0);
+        run(n) {
             return builder().set('rows', buildData(n));
         },
         add(n, {getState}) {
             const rows = getState('rows');
             return builder().set('rows', rows.concat(buildData(n)));
         },
         update(n, {getState}) {
-            const newData = getState('rows').slice();
+            const newData = getState('rows').slice(0);
             for (let i = 0; i < newData.length; i += 10) {
                 const r = newData[i];
                 newData[i] = {id: r.id, label: r.label + ' !!!'};
             }
             return builder().set('rows', newData);
         },
-        clear(n, {dispatch}) {
-            dispatch('setSelected', 0);
+        clear(n) {
             return builder().set('rows', []);
         },
         remove(id, {getState}) {
-            const newData = getState('rows').slice();
+            const newData = getState('rows').slice(0);
             const idx = newData.findIndex(d => d.id === id);
 
             newData.splice(idx, 1);
             return builder().set('rows', newData);
         },
         swapRows(n, {getState}) {
-            const newData = getState('rows').slice();
+            const newData = getState('rows').slice(0);
             if (newData.length > 998) {
                 const tmp = newData[1];
                 newData[1] = newData[998];

frameworks/keyed/san-store/src/App.js

@@ -1,22 +1,28 @@
 'use strict';
 var path = require('path');
+var webpack = require('webpack');
+var cache = {};
+var loaders = [
 
-module.exports = {
-    mode: 'production',
+    {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/
+    },
+    {
+        test: /\.css$/,
+        loader: 'style-loader!css-loader'
+    }
+
+];
+var extensions = [
+    '.js', '.jsx', '.es6.js', '.msx'
+];
+
+module.exports = [{
+    cache: cache,
     module: {
-        rules: [
-            {
-                test: /\.js$/,
-                use: {
-                    loader: 'babel-loader',
-                    options: {
-                        presets: [
-                            ['@babel/preset-env', {targets: 'defaults'}]
-                        ]
-                    }
-                }
-            }
-        ]
+        rules: loaders
     },
     entry: {
         main: './src/main'
@@ -32,9 +38,14 @@ module.exports = {
             path.resolve(__dirname, "src"),
             "node_modules"
         ],
-        extensions: ['.js'],
+        extensions: extensions,
         alias: {
             'san': 'san/dist/san.spa.modern.js'
         }
-    }
-};
+    },
+    plugins: [
+        new webpack.DefinePlugin({
+            'process.env.NODE_ENV': '"production"'
+        })
+    ]
+}];

frameworks/keyed/san-store/src/store.js

@@ -0,0 +1,5 @@
+node_modules
+/target
+/pkg
+/wasm-pack.log
+/yarn-error.log