efront 4.20.1 → 4.21.0

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,6 @@
+- zh-CN: 路径$1未找到入口文件
+  en:    Path $1 entry file not found
+
 - zh-CN: 数据标识不能有“.”符号
   en:    "Data identification cannot have a '.' symbol"
 

package/coms/basic/#loader.js

@@ -247,7 +247,7 @@ var multiModules = Object.create(null);
 // -->
 var hasOwnProperty = {}.hasOwnProperty;
 var loadModule = function (url, then, prebuilds = {}) {
-    var name = url.replace(/[\#\*~\?][\s\S]*$/, '');
+    var name = url.replace(/[\*~][\s\S]*$/, '');
     if (/^(?:module|exports|define|import_meta|require|window|global|undefined)$/.test(name)) return then();
     if ((hasOwnProperty.call(prebuilds, url)) || hasOwnProperty.call(modules, url) || (!hasOwnProperty.call(forceRequest, name) && !/^on/.test(name) && window[name] !== null && window[name] !== void 0)
     ) return then();
@@ -381,7 +381,7 @@ var getArgs = function (text, aftfix) {
     } else {
         functionBody = text;
     }
-    var [, isAsync, isYield] = /^(@?)(\*?)/.exec(functionBody);
+    var [, isAsync, isYield] = /^(~?)(\*?)/.exec(functionBody);
     if (isAsync || isYield) functionBody = functionBody.slice(+!!isAsync + +!!isYield);
     return [argNames || [], functionBody, args || [], required || '', strs || [], !!isAsync, !!isYield];
 };
@@ -443,7 +443,7 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
     var required = exec.required;
     if (required) required = required.map(a => loadedModules[keyprefix + a]);
     var argsList = originNames.map(function (aName) {
-        var argName = aName.replace(/[\#\*~\?][\s\S]*$/, '');
+        var argName = aName.replace(/[\*~][\s\S]*$/, '');
         if (hasOwnProperty.call(prebuilds, argName)) {
             return prebuilds[argName];
         }
@@ -523,7 +523,7 @@ var init = function (url, then, prebuilds, keeppage) {
         if (then) then(modules[url]);
         return modules[url];
     }
-    var name = url.replace(/[\#\*~\?][\s\S]*$/, '');
+    var name = url.replace(/[\*~][\s\S]*$/, '');
     if (!hasOwnProperty.call(forceRequest, name) && name in window && !/^on/.test(name)) {
         try {
             var value = window[name];

package/coms/basic/ArrayFill.js

@@ -1,5 +1 @@
-function ArrayFill(size, item) {
-    var result = Array(size);
-    for (var cx = 0; cx < size; cx++)result[cx] = item;
-    return result;
-}
+&ArrayFill;

package/coms/basic/extend.js

@@ -1,17 +1 @@
-/* 
- * 不枝雀
- * 2017-3-18 11:18:18
- */
-
-var hasOwnProperty = {}.hasOwnProperty, Object = {}.constructor;
-
-var extend = Object.assign || function (o1) {
-    o1 = Object(o1);
-    for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
-        var o2 = arguments[cx];
-        for (var k in o2) {
-            if (hasOwnProperty.call(o2, k)) o1[k] = o2[k];
-        }
-    }
-    return o1;
-};
+Object.assign;

package/coms/basic/isSubpath.js

@@ -1,5 +1,7 @@
 var normalize = function (url) {
     var normal = [];
+    if (!isHandled(url)) return normal;
+    url = String(url);
     var protocol = /^\w+\:/.exec(url);
     if (protocol) {
         url = url.slice(protocol[0].length).replace(/^[\\\/]+/, '');

package/coms/basic_/{Array2.js → &Array.js}

@@ -63,4 +63,5 @@ function Array2() {
     var obj = setPrototypeOf(Array.apply(this, arguments), proto);
     return obj;
 }
-Array2.prototype = Array.prototype;
+Array2.prototype = Array.prototype;
+return Array2;

package/coms/basic_/&ArrayFill.js

@@ -0,0 +1,5 @@
+function ArrayFill(size, item) {
+    var result = Array(size);
+    for (var cx = 0; cx < size; cx++)result[cx] = item;
+    return result;
+}

package/coms/basic_/{aster_.js → &aster.js}

@@ -31,5 +31,6 @@ class Generator {
 }
 
 function aster_() {
-    return new Generator(exec_.bind(this, arguments));
-}
+    return new Generator(&exec.bind(this, arguments));
+}
+return aster_;

package/coms/basic_/&async.js

@@ -0,0 +1,5 @@
+
+function async_() {
+    return new Promise(&exec.bind(this, arguments));
+}
+return async_;

package/coms/basic_/{asyncAster_.js → &asyncAster.js}

@@ -50,5 +50,6 @@ class AsyncGenerator {
     }
 }
 function asyncAster_() {
-    return new AsyncGenerator(exec_.bind(this, arguments));
-}
+    return new AsyncGenerator(&exec.bind(this, arguments));
+}
+return asyncAster_;

package/coms/basic_/&async_test.js

@@ -0,0 +1,15 @@
+var async_ = require("./&async.js");
+var test = async function (queue, expect) {
+    var res = await async_.apply(null, queue);
+    assert(res, expect);
+}
+test([function () {
+    return [1, 0]
+}, function () {
+    return [2, 2];
+}], 2);
+
+var i = 0;
+test(compile$unstruct(compile$scanner2(`return 1+2`), a => '_' + ++i).map(a => {
+    return new Function(compile$common.createString(a))
+}), 3);

package/coms/basic_/{exec_.js → &exec.js}

@@ -90,4 +90,5 @@ var exec_ = function (args, ok, oh, int) {
         ticked = true;
     })
     next();
-};
+};
+return exec_;

package/coms/basic_/&extend.js

@@ -0,0 +1,18 @@
+/* 
+ * 不枝雀
+ * 2017-3-18 11:18:18
+ */
+
+var hasOwnProperty = {}.hasOwnProperty, Object = {}.constructor;
+
+var extend = Object.assign || function (o1) {
+    o1 = Object(o1);
+    for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
+        var o2 = arguments[cx];
+        for (var k in o2) {
+            if (hasOwnProperty.call(o2, k)) o1[k] = o2[k];
+        }
+    }
+    return o1;
+};
+return extend;

package/coms/basic_/{extends_.js → &extends.js}

@@ -11,4 +11,5 @@ function extends_(A, B) {
     __static(A, B);
     A.prototype = B === null ? Object.create(null) : new (_ = function () { setConstructor(this, A) }, _.prototype = B.prototype, _);
     var _;
-}
+}
+return extends_;

package/coms/basic_/readme-en.md

@@ -5,12 +5,12 @@
 1.  ```javascript
     class ... extends Array {...} 
     ```
-    Because if one level of prototype is added, the characteristics of the array will disappear, and `efront` has not yet implemented a perfect downgrade plan, and the possibility of future implementation is also unlikely. After similar statements are converted by `typescript`, the newly defined methods will be lost. `efront` uses `class extends Array2 {...}` will be replaced, and `Array2` will mount the defined method to the newly generated object.
+    Because if one level of prototype is added, the characteristics of the array will disappear, and `efront` has not yet implemented a perfect downgrade plan, and the possibility of future implementation is also unlikely. After similar statements are converted by `typescript`, the newly defined methods will be lost. `efront` uses `class extends &Array {...}` will be replaced, and `&Array` will mount the defined method to the newly generated object.
 
 2. ```javascript
     import(...)
     ```
-    The result imported with `import (...)`, efront will not actively wrap a layer of Promise. If you use `await` in the root scope of the module, the returned result is an instance of `Promise`. Otherwise, what you export in the imported file will be the result of this `import(...)`. If you are unsure about the content of the imported file and do not blindly use methods such as `import(...).then (...)`, you can use `await import(...)` to wait for the import to complete.
+    The result imported with `import(...)`, efront will not actively wrap a layer of Promise. If you use `await` in the root scope of the module, the returned result is an instance of `Promise`. Otherwise, what you export in the imported file will be the result of this `import(...)`. If you are unsure about the content of the imported file and do not blindly use methods such as `import(...).then(...)`, you can use `await import(...)` to wait for the import to complete.
 
 3. ```javascript
     import.meta
@@ -86,7 +86,7 @@
 9. ```javascript
     Object.assign
     ```
-    Object.assign and `ie` series browsers are not supported. Because they are often used by `efront` developers, during the downgrade Compile time period, if the '--no-polyfill' parameter is not specified, `efront` will be processed as a substitute [extend](../basic/extend.js)
+    Object.assign and `ie` series browsers are not supported. Because they are often used by `efront` developers, during the downgrade Compile time period, if the '--no-polyfill' parameter is not specified, `efront` will be processed as a substitute [&extend](../basic_/&extend.js)
 
 10. ```javascript
     Promise

package/coms/basic_/readme.md

@@ -5,7 +5,7 @@
 1.  ```javascript
     class ... extends Array {...} 
     ```
-    因为如果增加一级原型，数组的特性便会消失，`efront`暂时并没有实现完美的降级方案，未来实现的可能性也不大。类似语句经`typescript`转换后新定义的方法会丢失, `efront` 在降级编译期使用 `class ... extends Array2 {...}` 进行替换，`Array2`会将定义的方法挂载到新生成的对象上。
+    因为如果增加一级原型，数组的特性便会消失，`efront`暂时并没有实现完美的降级方案，未来实现的可能性也不大。类似语句经`typescript`转换后新定义的方法会丢失, `efront` 在降级编译期使用 `class ... extends &Array {...}` 进行替换，`&Array`会将定义的方法挂载到新生成的对象上。
 
 2. ```javascript
     import(...)
@@ -75,14 +75,14 @@
     Array.prototype.fill
     Array(3).fill(0) // 类似这种的将变成[0,0,0]一个常量数组
     var [a,b,c]=Array(3).fill(0).map((_,i)=>i+1) // 类似这种用于生成常量并赋值的，将直接变成赋值语句 var a=1,b=2,c=3
-    Array(3).fill(a)// 类似这种非常量的，将由类似 ArrayFill(3,a) 的语句替换
+    Array(3).fill(a)// 类似这种非常量的，将由类似 &ArrayFill(3,a) 的语句替换
     ```
     `Array(...).fill(...).map(...)`这种写法经常被`efront`开发者用来生成自增赋值序列，并且非所有运行环境都支持，所以包括其它显式用到`Array.prototype.fill`的几种写法都会被替换。为了目标代码的性能考虑，这种替换在自动常量化之前就要执行，所以不再支持用`polyfill`的开关进行关闭。如果要关闭，请使用参数`--no-autoeval`将自动常量化的功能一同关闭。
 
 9.  ```javascript
     Object.assign
     ```
-    Object.assign,`ie`系列浏览器均不支持，由于经常被`efront`开发者使用，在降级编译期，如果没有指定`--no-polyfill`参数，将由`efront`处理成替代品[extend](../basic/extend.js)
+    Object.assign,`ie`系列浏览器均不支持，由于经常被`efront`开发者使用，在降级编译期，如果没有指定`--no-polyfill`参数，将由`efront`处理成替代品[&extend](../basic_/&extend.js)
 10. ```javascript
     Promise
     Promise.prototype.then

package/coms/compile/Javascript.js

@@ -357,7 +357,7 @@ var detectLabel = function (o) {
             if (!queue.isargl && last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
                 // label
                 var lp = last.prev;
-                if (!lp || lp.type !== STRAP || lp.isend) {
+                if (!lp || lp.type !== STRAP || !lp.transive || lp.isend) {
                     last.type = LABEL;
                     last.text += ":";
                     last.end = end;
@@ -492,8 +492,8 @@ var scan = function (data) {
 };
 var detourTemplate = function (raw, params) {
     var spliter = { text: ",", type: STAMP };
-    var template = scan(`extend([],{["raw"]:[]})`);
-    rootenvs.extend = true;
+    var template = scan(`&extend([],{["raw"]:[]})`);
+    rootenvs["&extend"] = true;
     var str0 = template[1].first;
     var str1 = template[1][2][2];
     for (var r of raw) {

package/coms/compile/Program.js

@@ -79,7 +79,8 @@ class Program {
         ["[", "]"],
         ["{", "}"],
     ]
-    stamps = "/=+;|:?<>-!~%^&*,".split("")
+    stamps = "/=+;|:?<>-!~%^&*,".split("");
+    prefix = '&^%?:'.split('');
     value_reg = /^(false|true|null)$/
     number_reg = number_reg;
     digit_reg = digit_reg;
@@ -226,7 +227,7 @@ class Program {
                 o.unary = true;
             }
             else if (!last || last.type === STAMP && (!(last.text in powermap)) && !last.istype) {
-                if (!queue.istype && powermap[o.text] > powermap["="]) o.unary = true;
+                if (powermap[o.text] > powermap["="]) o.unary = true;
             }
             else if (last.type === STRAP && !last.isend || last.type === STAMP && !last.istype && !/^(\+\+|\-\-)$/.test(last.text) || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
                 o.unary = /^[^=;,\:]$/.test(o.text);
@@ -267,6 +268,7 @@ class Program {
             lasttype = cache_stamp.type;
             cache_stamp = null;
         }
+        var prefix_reg = this.prefix_reg;
         var save = (type) => {
             if (type === STAMP) {
                 if (cache_stamp) {
@@ -284,6 +286,18 @@ class Program {
             else {
                 if (cache_stamp) push_stamp();
             }
+            var last = queue.last;
+            if (type & (EXPRESS | STRAP | VALUE) && lasttype === STAMP && prefix_reg.test(last.text) && last.unary) {
+                m = last.text + m;
+                delete last.unary;
+                if (value_reg.test(m)) last.type = VALUE;
+                else if (strap_reg.test(m)) last.type = STRAP;
+                else last.type = EXPRESS;
+                last.text = m;
+                last.end = end;
+                return;
+            }
+
             var scope = {
                 type,
                 start,
@@ -296,7 +310,7 @@ class Program {
             lasttype = type;
             if (type === STAMP) {
                 cache_stamp = scope;
-                scope.prev = queue.last;
+                scope.prev = last;
                 return;
             }
             if (type === STRAP) {
@@ -860,7 +874,7 @@ class Program {
                             scope.istype = true;
                         }
                     }
-                    if (!last || (last.type & (SCOPED | STAMP))) queue.inExpress = true;
+                    if (!last || (last.type !== STRAP && (!last.isObject || m === '(') || last.transive)) queue.inExpress = true;
                     scope.isExpress = queue.inExpress;
                     scope.inExpress = true;
                 }
@@ -996,6 +1010,8 @@ class Program {
         var entries_reg = new RegExp(`^(${powers_entries}|${quotes_entries}|${scopes})$`, this.nocase ? 'iu' : '');
         stamps = this.compile(this.stamps.filter(s => !entries_reg.test(s)).join(''));
         var number_reg = this.number_reg;
+        var prefix_reg = new RegExp(`^[${this.prefix.join('')}]$`);
+        this.prefix_reg = prefix_reg;
         var numbers = number_reg.source.replace(/^\^|\$$/g, "");
         this.digit_reg = new RegExp(/^[+\-]?/.source + numbers, number_reg.flags);
         this.entry_reg = new RegExp([`${spaceDefined.reg.source}|${quotes_entries}|[${scopes}]|${numbers}(?:${spaceDefined.avoid(tokens)})*|${express}|${powers_entries}|[${stamps}]`], "gi");

package/coms/compile/common.js

@@ -1137,7 +1137,7 @@ var getDeclared = function (o, kind, queue) {
                 o = f.next;
                 break;
             default:
-                console.log(createString(pickSentence(queue)), o.text, o.type);
+                console.log(createString(pickSentence(o.queue)), o.text, o.type);
                 throw new Error(i18n`代码结构异常`);
         }
         if (!o) break;

package/coms/compile/downLevel.js

@@ -167,8 +167,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
             i += init.length;
         }
         return() {
-            var retn = scanner2(`${index++ > 0 ? "," : ''}${this.tname}=(!${this.tname}||!${this.tname}["done"])&& isFunction(${this.iname}["return"])&&${this.iname}["return"]()`);
-            rootenvs.isFunction = true;
+            var retn = scanner2(`${index++ > 0 ? "," : ''}${this.tname}=(!${this.tname}||!${this.tname}["done"])&&typeof ${this.iname}["return"]==="function"&&${this.iname}["return"]()`);
             splice(queue, i, 0, ...retn);
             i += retn.length;
         }
@@ -219,7 +218,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
                 map[a] = a;
             });
             d.attributes.forEach(dec);
-            write(name, `${patchMark}rest_(${tmpname},[${Object.keys(map)}])`, false), rootenvs[patchMark + "rest_"] = true;
+            write(name, `${patchMark}rest(${tmpname},[${Object.keys(map)}])`, false), rootenvs[patchMark + "rest"] = true;
         }
         else {
             doged = at + 1;
@@ -227,9 +226,9 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
             if (iter) {
                 while (iter.index < a) iter.next();
                 iter.done = true;
-                write(name, `${patchMark}restIter_(${tmpname})`), rootenvs[patchMark + "restIter_"] = true;
+                write(name, `${patchMark}restIter(${tmpname})`), rootenvs[patchMark + "restIter"] = true;
             }
-            else write(name, `slice_["call"](${tmpname},${at}${a > at ? `,${at - a}` : ''})`, rest.length > 0), rootenvs.slice_ = true;
+            else write(name, `${patchMark}slice["call"](${tmpname},${at}${a > at ? `,${at - a}` : ''})`, rest.length > 0), rootenvs[patchMark + 'slice'] = true;
             total = rest.length;
             rest.forEach(dec);
         }
@@ -477,13 +476,13 @@ var killmap = function (body, i, _getobjname, _getnewname, killobj) {
                 }
                 if (q) {
                     t = scanner2(`${patchMark}extend(${_getobjname()},)`);
-                    rootenvs.extend = true;
+                    rootenvs[patchMark + "extend"] = true;
                     insert1(q, null, ...t);
                 }
                 else {
                     if (!t) {
                         t = scanner2(`${patchMark}extend()`);
-                        rootenvs.extend = true;
+                        rootenvs[patchMark + "extend"] = true;
                         var [o0] = splice(body, i, 1, ...t);
                         t[1].push(o0);
                         l = 2;
@@ -635,7 +634,7 @@ var killcls = function (body, i, letname_, getname_) {
         while (next && !next.isClass) next = next.next;
         base = createString(splice2(body, o, o = next));
     }
-    if (base === 'Array') base = 'Array2', rootenvs.Array2 = true;
+    if (base === 'Array') base = patchMark + 'Array', rootenvs[patchMark + "Array"] = true;
     var index = 0;
     while (o && o.isClass) {
         var scoped = o.scoped;
@@ -723,7 +722,7 @@ var killcls = function (body, i, letname_, getname_) {
         }
         insert1(invokes, null, ...constructor);
         o = o.next;
-        if (base) defines.unshift(...scanner2(`${patchMark}extends_(${clz.name},${base})${defines.length ? "\r\n" : ""}`)), rootenvs[patchMark + "extends_"] = true;
+        if (base) defines.unshift(...scanner2(`${patchMark}extends(${clz.name},${base})${defines.length ? "\r\n" : ""}`)), rootenvs[patchMark + "extends"] = true;
         base = clz.name;
         if (clz.name) insert1(head, null, ...scanner2(`${head.length ? ',' : ''}${clz.name}`));
         index++;
@@ -775,8 +774,8 @@ var killspr = function (body, i, _getobjname, killobj) {
         if (!s.text) v.shift();
         if (m) splice2(o, m, m = m.next);
         killobj(v);
-        var q = scanner2(`slice_["call"]()`);
-        rootenvs.slice_ = true;
+        var q = scanner2(`${patchMark}slice["call"]()`);
+        rootenvs[patchMark + "slice"] = true;
         insert1(q[q.length - 1], null, ...v);
         return q;
     };
@@ -1242,9 +1241,8 @@ var unforof = function (o, getnewname, used, killobj) {
         else splice(o[o.length - 7 - hasawait], 0, 1);
         var n = o.next;
         n = skipSentenceQueue(n);
-        var tf = scanner2(`try{}finally{if(${iname}&&!${iname}["done"]&&isFunction(${gname}["return"]))${gname}["return"]()}`);
+        var tf = scanner2(`try{}finally{if(${iname}&&!${iname}["done"]&&typeof ${gname}["return"]==="function")${gname}["return"]()}`);
         splice(tf[1], 0, 0, ...splice2(r.queue, r, n, ...tf));
-        rootenvs.isFunction = true;
     }
 };
 var unarrow = function (body, i, killobj, letname_) {
@@ -1366,7 +1364,7 @@ var killarg = function (head, body, _getname, setarg = true) {
             return `${a}=arguments["length"]>${collect + n - 1}?arguments[arguments["length"] - ${n}]:undefined`;
         }));
 
-        if (cname) argcodes.unshift(`var ${cname}=slice_["call"](arguments,${collect}${index > collect ? `,${collect - index}` : ""})`), rootenvs.slice_ = true;
+        if (cname) argcodes.unshift(`var ${cname}=${patchMark}slice["call"](arguments,${collect}${index > collect ? `,${collect - index}` : ""})`), rootenvs[patchMark + 'slice'] = true;
     }
     if (argcodes.length && setarg) {
         if (!body) {
@@ -1633,7 +1631,7 @@ var newpunc = function (body, i, newname) {
             var r = puncRight(o);
             var li = body.lastIndexOf(l, i);
             var ri = body.indexOf(r, i);
-            var name = t === '??' ? 'nullish_' : "power_";
+            var name = t === '??' ? 'nullish' : "power";
             name = patchMark + name;
             rootenvs[name] = true;
             o.text = ',';
@@ -1649,7 +1647,7 @@ var newpunc = function (body, i, newname) {
 var down = function (scoped) {
     var inAsync = scoped.async;
     var inAster = scoped.yield;
-    var funcMark = [, "aster_", "async_", "asyncAster_"][inAsync << 1 | inAster];
+    var funcMark = [, "aster", "async", "asyncAster"][inAsync << 1 | inAster];
     if (funcMark) funcMark = patchMark + funcMark;
     if (funcMark) rootenvs[funcMark] = true;
     var vars = Object.assign(Object.create(null), scoped.vars);
@@ -1887,7 +1885,7 @@ function downLevel(data) {
     code = downcode(code);
     return code.toString();
 }
-var patchMark = '';
+var patchMark = '&';
 var downcode = downLevel.code = function (code) {
     rootenvs = code.envs;
     rootHyper = rootenvs.Symbol || code.yield || code.async;
@@ -1895,9 +1893,11 @@ var downcode = downLevel.code = function (code) {
     if (code.patchMark) patchMark = code.patchMark;
     down(code.scoped);
     code.keepcolor = false;
-    if (rootenvs.slice_) {
-        delete rootenvs.slice_;
-        if (!code.vars.slice_) splice(code, 0, 0, ...scanner2('var slice_ = Array["prototype"]["slice"];\r\n'));
+    var slice_ = patchMark + 'slice';
+    if (rootenvs[slice_]) {
+        delete rootenvs[slice_];
+        if (!code.vars[slice_]) splice(code, 0, 0, ...scanner2(`var ${slice_} = Array["prototype"]["slice"];\r\n`));
+        code.vars[slice_] = true;
     }
     rootenvs = null;
     patchMark = patchMark_;