efront 2.42.2 → 2.43.6

package/.editorconfig

@@ -0,0 +1,5 @@
+# EditorConfig is awesome: https://EditorConfig.org
+root = true
+[*]
+indent_style = space
+indent_size = 4

package/apps/efront/parse_test.js

@@ -0,0 +1 @@
+console.log('regexp',RegExp)

package/coms/basic/isEmpty.js

@@ -5,4 +5,5 @@ function isEmpty(value) {
         return true;
     }
     return false;
-}
+}
+module.exports = isEmpty;

package/coms/basic/parseURL.js

@@ -1,5 +1,5 @@
-// -----///////// -1 ----------////////////2---3-----/////// --4------2//////5------6-----////////-7--5///8--9----//10--11---10///--12-----8//
-var reg = /^([^\/\:@\?#]+\:)?(?:\/\/)?(?:(([^\/@\:]+)?(?:\:([^\/@\:]+))?)@)?(([^\/\:\?\#]+)?(?:\:(\d+))?)(([^\?#]+)?(\?([^#]*))?(#[\s\S]*)?)$/;
+// -------/// ---------------1-------------//////////////2---3--------//////// ----4----2/////5-----------------------6------------------------//////////////-7--5///8----9----//10--11---10///--12-----8//
+var reg = /^([^\:\/\?#]+\:(?![^\:\/\?\#]*@))?(?:\/\/)?(?:(([^\:\/\?#]+)?(?:\:([^\/\?#]+))?)@)?(([^\/@\:\?\#]*(?:[^\d\@\:\/\?#]|\.)[^\/@\:\?\#]*)?(?:(?:\:|^)(\d+))?)((\/[^\?#]*)?(\?([^#]*))?(#[\s\S]*)?)$/;
 function parseURL(url) {
     if (url === undefined || url === null) url = '';
     var [__, protocol, auth, username, password, host, hostname, port, path, pathname, search, query, hash] = reg.exec(url);

package/coms/compile/breakcode.js

@@ -1,5 +1,6 @@
 var scanner = require("./scanner");
 var keywords = require("./keywords");
+var strings = require("../basic/strings");
 var hasOwnProperty = {}.hasOwnProperty;
 var getReadableKey = function ($key, value) {
     value = value.replace(/-->/g, '--\\>');
@@ -21,9 +22,8 @@ var setMatchedConstString = function (k) {
 
     if (/^(['"])user?\s+strict\1$/i.test(k)) return `"use strict"`;
     if (k.length < 3) return k;
-    k = k.replace(/^(['"])(.*?)\1$/, function (match, quote, string) {
-        return "\"" + string.replace(/\\([\s\S])/g, (a, b) => b === "'" ? b : a).replace(/"/g, "\\\"") + "\"";
-    });
+    k = strings.decode(k);
+    k = strings.encode(k);
     var $key = "str_" + k.replace(/^(['"])([\s\S]*)\1$/g, '$2');
     var key = getReadableKey($key, k);
     return " " + key + " ";
@@ -36,9 +36,7 @@ var setMatchedConstRegExp = function (k) {
 var trimStringLiteral = function (block) {
     var block_string = module_string.slice(block.start, block.end);
     if (block.type === block.single_quote_scanner || block.type === block.double_quote_scanner) {
-        requireReg.lastIndex = block.start;
-        var isRequire = requireReg.exec(module_string);
-        return setMatchedConstString(block_string, isRequire);
+        return setMatchedConstString(block_string);
     }
     if (block.type === block.regexp_quote_scanner) {
         return setMatchedConstRegExp(block_string);
@@ -46,7 +44,6 @@ var trimStringLiteral = function (block) {
     return block_string;
 };
 var paramsMap = Object.create(null);
-var requireReg = /(?<=\brequire\s*\(\s*)['"`]/gy;
 var module_string = '';
 function breakcode(data, args) {
     if (!args) return [data];

package/coms/compile/scanner2.js

@@ -267,7 +267,7 @@ var detour = function (o, ie) {
                 break;
             case EXPRESS:
                 if (!/^\.\.\.|\.\.\.$/.test(o.text)) {
-                    o.text = o.text.replace(/\.([^\.]+)/g, (_, a) => !ie || program.strap_reg.test(a) ? `[${strings.encode(strings.decode(a))}]` : _);
+                    o.text = o.text.replace(/\.([^\.\[]+)/g, (_, a) => !ie || program.strap_reg.test(a) ? `[${strings.encode(strings.decode(a))}]` : _);
                 }
                 break;
             case QUOTED:
@@ -406,7 +406,6 @@ class Program extends Array {
         if (this._scoped) return this._scoped;
         var used = Object.create(null); var vars = Object.create(null), lets = vars;
         var scoped = this._scoped = [];
-        scoped.code = this;
         var run = function (o, id) {
             loop: while (o) {
                 var isCatch = false;
@@ -712,10 +711,18 @@ class Javascript {
         queue.__proto__ = Program.prototype;
         var origin = queue;
         var queue_push = function (scope) {
-            if (~[VALUE, QUOTED, SCOPED, EXPRESS, PROPERTY].indexOf(scope.type)) {
+            var last = queue.lastUncomment;
+            if (~[VALUE, QUOTED].indexOf(scope.type)) {
                 scope.isprop = isProperty();
             }
-            var last = queue.lastUncomment;
+            else if (scope.type === SCOPED && scope.entry === '[') {
+                if (queue.isObject) {
+                    scope.isprop = !last || last.type === STAMP && /^(\+\+|\-\-|;)$/.test(last.text)
+                }
+                else if (queue.isClass) {
+                    scope.isprop = !last || last.type === STAMP && last.text === ','
+                }
+            }
             if (scope.type !== COMMENT && scope.type !== SPACE) {
                 if (last) {
                     scope.prev = last;
@@ -890,7 +897,9 @@ class Javascript {
                 return !prev || prev.type === STAMP && prev.text === "," || prev.type === PROPERTY && /^(get|set|async)$/.test(prev.text);
             }
             if (queue.isClass) {
-                return !prev || prev.type === EXPRESS && !/\.$/.test(prev.text) || ~[SCOPED, VALUE, QUOTED, PROPERTY].indexOf(prev.type) || prev.type === STAMP && /^(\+\+|\-\-|;)$/.test(prev.text);
+                if (!prev) return true;
+                if (prev.type === STAMP) return /^(\+\+|\-\-|;)$/.test(prev.text);
+                return prev.type === EXPRESS && !/\.$/.test(prev.text) || ~[SCOPED, VALUE, QUOTED, PROPERTY].indexOf(prev.type);
             }
             return false;
         };

package/coms/zimoli/anchor2.js

@@ -1,7 +1,6 @@
 function anchor2(label, href) {
     var a = document.createElement("a");
     a.href = href || "";
-    a.href = "";
     if (isString(label)) {
         a.innerHTML = label;
     } else {

package/coms/zimoli/data.js

@@ -114,7 +114,7 @@ function transpile(src, trans, apiMap, delTransMap) {
         }
         return res;
     }
-    data = extend({}, src && src.querySelector ? null : src);
+    var data = extend({}, src && src.querySelector ? null : src);
     for (var k in trans) {
         var v = trans[k];
         if (!(k in data)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "2.42.2",
+    "version": "2.43.6",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {