leanweb 1.3.1 → 1.3.4

package/commands/dist.js

@@ -17,8 +17,8 @@ if (args.length >= 3) {
 (async () => {
    const project = require(`${process.cwd()}/${utils.dirs.src}/leanweb.json`);
 
-   await utils.exec(`npx lw clean`);
-   await utils.exec(`npx lw build ${env}`);
+   await utils.exec(`npx leanweb clean`);
+   await utils.exec(`npx leanweb build ${env}`);
 
    const webpackConfig = utils.getWebPackConfig(utils.dirs.dist, project);
 

package/commands/electron.js

@@ -31,8 +31,8 @@ const require = createRequire(import.meta.url);
       fs.writeFileSync(leanwebJSONPath, JSON.stringify(project, null, 2));
    }
 
-   await utils.exec(`npx lw clean`);
-   await utils.exec(`npx lw build ${env}`);
+   await utils.exec(`npx leanweb clean`);
+   await utils.exec(`npx leanweb build ${env}`);
 
    fse.copySync(`./${utils.dirs.build}/electron.js`, `./${utils.dirs.electron}/electron.js`);
    fse.copySync(`./${utils.dirs.build}/index.html`, `./${utils.dirs.electron}/index.html`);

package/commands/help.js

@@ -2,7 +2,7 @@ import * as utils from './utils.js';
 
 (async () => {
    if (process.argv.length < 3) {
-      utils.exec('npx lw version');
+      utils.exec('npx leanweb version');
       console.log('Usage: lw target parameters');
       console.log('Targets:\n');
       Object.keys(utils.targets).forEach(t => {

package/commands/init.js

@@ -66,7 +66,7 @@ const require = createRequire(import.meta.url);
 
    utils.exec(`npm i -D @babel/runtime --loglevel=error`);
 
-   utils.exec(`npx lw generate root`);
+   utils.exec(`npx leanweb generate root`);
 
    fse.copySync(`${__dirname}/../templates/lib`, `./${utils.dirs.src}/lib/`);
 

package/commands/serve.js

@@ -24,7 +24,7 @@ const noopen = process.env.noopen || false;
    const build = async (eventType, filename) => {
       // console.log(eventType + ': ', filename);
       try {
-         await utils.exec(`npx lw build ${env}`);
+         await utils.exec(`npx leanweb build ${env}`);
          fse.copySync(`./${utils.dirs.build}/index.html`, `./${utils.dirs.serve}/index.html`);
          fse.copySync(`./${utils.dirs.build}/${project.name}.css`, `./${utils.dirs.serve}/${project.name}.css`);
          fse.copySync(`./${utils.dirs.build}/favicon.svg`, `./${utils.dirs.serve}/favicon.svg`);

package/leanweb.js

@@ -17,7 +17,7 @@ const __dirname = path.dirname(__filename);
    const args = process.argv;
 
    if (args.length < 3) {
-      utils.exec('npx lw help');
+      utils.exec('npx leanweb help');
       return;
    }
 

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "leanweb",
-   "version": "1.3.1",
+   "version": "1.3.4",
    "description": "Builds framework agnostic web components.",
    "bin": {
       "leanweb": "leanweb.js",
@@ -30,12 +30,12 @@
       "fs-extra": "^10.1.0",
       "globby": "^13.1.2",
       "html-minifier": "^4.0.0",
-      "isomorphic-git": "^1.19.1",
+      "isomorphic-git": "^1.19.2",
       "json5-loader": "^4.0.1",
       "node-watch": "^0.7.3",
       "parse5": "^7.0.0",
       "raw-loader": "^4.0.2",
-      "sass": "^1.54.4",
+      "sass": "^1.54.5",
       "sass-loader": "^13.0.2",
       "semver": "^7.3.7",
       "webpack": "^5.74.0",

package/templates/lib/lw-element.js

@@ -200,6 +200,8 @@ export default class LWElement extends HTMLElement {
       });
    }
 
+   // properties:
+   // lw_input_bound: boolean
    _bindInputs(inputNode) {
       if (inputNode['lw_input_bound']) {
          return;
@@ -237,14 +239,15 @@ export default class LWElement extends HTMLElement {
                   const context = this._getNodeContext(eventNode);
                   const eventContext = { '$event': event, '$node': eventNode };
                   const parsed = parser.evaluate(interpolation.ast, [eventContext, ...context], interpolation.loc);
-
-                  const promises = parsed.filter(p => typeof p?.then === 'function');
+                  const promises = parsed.filter(p => typeof p?.then === 'function' && typeof p?.finally === 'function');
                   if (parsed.length > promises.length) {
                      me.update();
                   }
-                  if (promises.length > 0) {
-                     Promise.allSettled(promises).then(_ => me.update());
-                  }
+                  promises.forEach(p => {
+                     p?.finally(() => {
+                        me.update();
+                     });
+                  });
                }).bind(me));
             });
          }

package/templates/lib/lw-expr-parser.js

@@ -24,6 +24,25 @@ const binaryOperations = {
    //  '|>': (a, b) => a |> b,
 };
 
+const assignmentOperations = {
+   '=': (c, a, b) => { c[a] = b; },
+   '+=': (c, a, b) => { c[a] += b; },
+   '-=': (c, a, b) => { c[a] -= b; },
+   '*=': (c, a, b) => { c[a] *= b; },
+   '/=': (c, a, b) => { c[a] /= b; },
+   '%=': (c, a, b) => { c[a] %= b; },
+   '**=': (c, a, b) => { c[a] **= b; },
+   '&&=': (c, a, b) => { c[a] &&= b; },
+   '??=': (c, a, b) => { c[a] ??= b; },
+   '||=': (c, a, b) => { c[a] ||= b; },
+   '>>=': (c, a, b) => { c[a] >>= b; },
+   '>>>=': (c, a, b) => { c[a] >>>= b; },
+   '<<=': (c, a, b) => { c[a] <<= b; },
+   '&=': (c, a, b) => { c[a] &= b; },
+   '|=': (c, a, b) => { c[a] |= b; },
+   '^=': (c, a, b) => { c[a] ^= b; },
+};
+
 const logicalOperators = {
    '||': (a, b) => a || b,
    '&&': (a, b) => a && b,
@@ -43,9 +62,9 @@ const unaryOperators = {
 
 const updateOperators = (operator, prefix) => {
    if (operator === '++') {
-      return prefix ? a => ++a : a => a++;
+      return (c, a) => prefix ? ++c[a] : c[a]++;
    } else if (operator === '--') {
-      return prefix ? a => --a : a => a--;
+      return (c, a) => prefix ? --c[a] : c[a]--;
    }
 };
 
@@ -75,9 +94,16 @@ const nodeHandlers = {
 
    'ExpressionStatement': (node, context) => evalNode(node.expression, context),
    'BinaryExpression': (node, context) => binaryOperations[node.operator](evalNode(node.left, context), evalNode(node.right, context)),
+   'AssignmentExpression': (node, context) => {
+      const immediateCtx = immediateContext(node.left, context);
+      assignmentOperations[node.operator](immediateCtx, node.left.name, evalNode(node.right, context));
+   },
    'LogicalExpression': (node, context) => logicalOperators[node.operator](evalNode(node.left, context), evalNode(node.right, context)),
    'UnaryExpression': (node, context) => unaryOperators[node.operator](evalNode(node.argument, context)),
-   'UpdateExpression': (node, context) => updateOperators(node.operator, node.prefix)(evalNode(node.argument, context)),
+   'UpdateExpression': (node, context) => {
+      const immediateCtx = immediateContext(node.argument, context);
+      updateOperators(node.operator, node.prefix)(immediateCtx, node.argument.name, evalNode(node.argument, context));
+   },
    'ConditionalExpression': (node, context) => {
       const test = evalNode(node.test, context);
       const consequent = evalNode(node.consequent, context);
@@ -144,6 +170,17 @@ const nodeHandlers = {
    'DirectiveLiteral': (node, context) => node.value,
 };
 
+const immediateContext = (node, context) => {
+   if (Array.isArray(context)) {
+      if (context.length === 0) {
+         return null;
+      }
+      return context.find(contextObj => node.name in contextObj) ?? context[0];
+   } else if (typeof context === 'object') {
+      return context;
+   }
+}
+
 const evalNode = (node, context) => nodeHandlers[node.type](node, context);
 
 const evaluate = (ast, context = {}, loc = {}) => {