efront 4.31.1 → 4.32.1

package/coms/basic/#loader.js

@@ -254,7 +254,7 @@ var hasOwnProperty = {}.hasOwnProperty;
 "use ./#decrypt.js";
 var loadModule = function (url, then, prebuilds = {}) {
     var name = url.replace(/[\*~][\s\S]*$/, '');
-    if (/^(?:module|exports|define|import_meta|require|window|global|undefined)$/.test(name)) return then();
+    if (/^(?:module|exports|define|\\import|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();
     preLoad(url);
@@ -310,7 +310,7 @@ var loadModule = function (url, then, prebuilds = {}) {
             mod.args = args;
             mod.argNames = argNames;
             mod.strs = strs;
-            var loadingCount = 0;
+            var loadedCount = 0;
             if (required) {
                 required = required.split(';').filter(a => !!a);
                 if (afterfix) required = required.map(r => r + afterfix);
@@ -321,13 +321,13 @@ var loadModule = function (url, then, prebuilds = {}) {
             args = args.concat(required);
             var _errored = [];
             var response = function (error) {
-                loadingCount++;
+                loadedCount++;
                 if (error) {
                     if (!errored[error]) errored[error] = [];
                     errored[error].push(key);
                     if (_errored.indexOf(error) < 0) _errored.push(error);
                 }
-                if (loadingCount === args.length) {
+                if (loadedCount === args.length) {
                     if (_errored.length) loadedModules[key].error = _errored;
                     flushTree(loadedModules, key, mod);
                 }
@@ -338,6 +338,13 @@ var loadModule = function (url, then, prebuilds = {}) {
                 loadedModules[key].args = mod.args;
                 loadedModules[key].mod = mod;
                 for (var moduleName of args) {
+                    if (moduleName === url) {
+                        // <!--
+                        // console.log(`检查到自我引用的代码 %c>> ${url} <<%c `, "color:#c46", 'color:');
+                        // -->
+                        response();
+                        continue;
+                    }
                     loadModule(moduleName, response, prebuilds);
                 }
             }
@@ -432,17 +439,21 @@ function resolve(r1, base, prefix = '') {
     return r2;
 
 }
-function Meta(url) {
-    this.url = url;
+
+function Meta(url, fix) {
+    this.path = url;
+    this.url = url + fix;
 }
 Meta.prototype.resolve = function (url) {
-    return resolve(url, this.url);
+    return resolve(url, this.path);
 }
-
-var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
+function Exports() { }
+var createModule = function (exec, originNames, compiledNames, prebuilds = {}, argfix) {
+    if (argfix in exec) return exec[argfix];
     var module = {};
-    var exports = module.exports = {};
-    var isModuleInit = false;
+    var exports = module.exports = exec[argfix] || new Exports;
+    var isModuleInit = originNames.indexOf('module') >= 0 || originNames.indexOf("exports") >= 0;
+    if (isModuleInit) if (argfix != null) exec[argfix] = exports;
     var required = exec.required;
     if (required) required = required.map(a => loadedModules[keyprefix + a]);
     var argsList = originNames.map(function (aName) {
@@ -451,24 +462,27 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
             return prebuilds[argName];
         }
         if (argName === "module") {
-            isModuleInit = true;
             return module;
         }
         if (argName === "exports") {
-            isModuleInit = true;
             return exports;
         }
-        if (argName === 'import_meta') {
-            return new Meta(exec.file);
+        if (argName === exec.file) {
+            return isModuleInit ? exports : exec;
+        }
+        if (argName === '\\import') {
+            return new Meta(exec.file, argfix);
         }
         if (/^(?:window|global(This)?|undefined)$/.test(argName)) return window[argName];
         if (argName === "require") {
             var r1 = window.require;
-            let r = function (refer) {
+            let r = function (refer, argfix) {
                 if (refer.length) return r1(refer);
                 var mod = required[refer];
-                if ("created" in mod) return mod.created;
-                var c = mod.created = createModule(mod, mod.args || [], mod.argNames, prebuilds);
+                argfix = argfix || '';
+                if (argfix in mod) return mod[argfix];
+                if (mod === exec) return exports;
+                var c = mod[argfix] = createModule(mod, mod.args || [], mod.argNames, prebuilds, argfix);
                 return c;
             };
             for (let k in r1) r[k] = r1[k];
@@ -514,7 +528,7 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
     if (!argsPromises.length) {
         return exec.apply(_this, argsList);
     }
-    return Promise.all(argsList).then(function (args) {
+    else return Promise.all(argsList).then(function (args) {
         return exec.apply(_this, args);
     });
 };
@@ -630,13 +644,13 @@ var init = function (url, then, prebuilds, keeppage) {
 
         if (!args || !args.length) {
             var created = module.call(window);
-            then(module.created = modules[url] = created);
+            then(modules[url] = module[''] = created);
             return;
         }
         var filteredArgs = prebuilds ? args.filter(a => !hasOwnProperty.call(prebuilds, a)) : args;
 
-        var saveAsModule = keeppage || filteredArgs.length === args.length;
-        if (saveAsModule) {
+        keeppage = keeppage || filteredArgs.length === args.length;
+        if (keeppage) {
             if (penddings[key]) {
                 penddings[key].then(then);
                 return;
@@ -652,18 +666,18 @@ var init = function (url, then, prebuilds, keeppage) {
             then(created);
             return;
         }
-        var created = createModule(module, args, module.argNames, prebuilds);
+        var created = createModule(module, args, module.argNames, prebuilds, keeppage ? '' : null);
         if (isThenable(created)) {
-            if (saveAsModule) {
+            if (keeppage) {
                 penddings[key] = created;
                 created.then(function (res) {
                     delete penddings[key];
-                    then(modules[url] = res);
+                    then(modules[url] = module[""] = res);
                 });
                 return;
             }
         } else {
-            if (saveAsModule) module.created = modules[url] = created;
+            if (keeppage) module[''] = modules[url] = created;
         }
         then(created);
     }, prebuilds);

package/coms/basic_/&extendIfNeeded.js

@@ -0,0 +1 @@
+basic$extendIfNeeded;

package/coms/compile/Javascript.js

@@ -857,8 +857,9 @@ var wrapRequire = function (n, i, code) {
     used.require.push(q[0]);
     var cs = code.splice(ni, nsi - ni, ...q);
     q[1].push.apply(q[1], cs);
-    relink(q[1]);
-    setqueue(q[1]);
+    cs = q[1];
+    relink(cs);
+    setqueue(cs);
     return q;
 };
 
@@ -888,10 +889,20 @@ Javascript.prototype.fix = function (code) {
     }, this);
     if (code.exportStars) {
         var exportStars = code.exportStars;
-        if (!code.exportDefault) code.push(...scan(`\r\nexports.default=undefined`));
+        if (code.last.type !== STAMP || code.last.text !== ";") code.push({ text: ",", type: STAMP });
+        if (!code.exportDefault) code.push(...scan(`\r\nexports.default=undefined;`));
+        var extused = [];
         exportStars.forEach(u => {
-            code.push(...scan(`\r\nextendIfNeeded(exports,${u.text})`));
+            var a = scan(`\r\n&extendIfNeeded(exports,${u.text});`)
+            extused.push(a[1]);
+            code.push(a[0], a[1], a[2], a[3]);
+            code.used[u.text].push(a[2][2]);
+            code.used.exports.push(a[2][0]);
         });
+        if (extused.length) {
+            code.used["&extendIfNeeded"] = extused;
+            code.envs["&extendIfNeeded"] = true;
+        }
         delete code.exportStars;
         delete code.exportDefault;
     }
@@ -915,7 +926,7 @@ Javascript.prototype.fix = function (code) {
                 remove(m.next, s);
             }
             if (/^import\.meta($|\.)/.test(m.text)) {
-                m.text = m.text.replace(/\./, '_');
+                m.text = m.text.replace(/^import\.meta/, '\\import');
                 return true;
             }
             m.text = m.text.replace(/^import/g, 'require');
@@ -923,7 +934,7 @@ Javascript.prototype.fix = function (code) {
         });
         delete code.used.import;
         delete code.envs.import;
-        if (imports.length) code.used["import_meta"] = imports, code.envs["import_meta"] = true;
+        if (imports.length) code.used["\\import"] = imports, code.envs["\\import"] = true;
     }
     if (code.exportDecs) {
         var exportDecs = code.exportDecs;

package/coms/compile/Javascript_test.js

@@ -8,7 +8,7 @@ var testFix = function (a, e) {
 js.debug = true;
 assert(scanner2("/a/g", js)[0].type, common.QUOTED);
 testFix(`export default function a(){} a.a=1`, `exports.default = function a() {} exports.default.a = 1`);
-testFix(`export * from "a";`, 'var a = require("a");\r\nexports.default = undefined\r\nextendIfNeeded(exports, a)');
+testFix(`export * from "a";`, 'var a = require("a");\r\nexports.default = undefined;\r\n&extendIfNeeded(exports, a);');
 testFix(`export {A} from "a";`, 'var a = require("a")\r\nexports.A = a.A;');
 testFix(`import a from "a";console.log(a)`, 'var a = require("a"); console.log(a.default)');
 testFix(`import {a} from "a";console.log(a)`, 'var a1 = require("a"); console.log(a1.a)');
@@ -20,7 +20,7 @@ testFix(`import("a")`, 'require("a")');
 testFix(`import "windows.inc"`, 'require("windows.inc")');
 testFix(`import "windows.inc";import "abc.inc";`, 'require("windows.inc"); require("abc.inc");');
 testFix(`import "windows.inc";\r\nimport "abc.inc";`, 'require("windows.inc");\r\nrequire("abc.inc");');
-testFix(`console.log(import.meta)`, `console.log(import_meta)`);
+testFix(`console.log(import.meta)`, `console.log(\\import)`);
 testFix(`export async function a(){}`, 'exports.a = async function a() {}');
 testFix(`export async function *a(){}`, 'exports.a = async function *a() {}');
 testFix(`export function *a(){}`, 'exports.a = function *a() {}');

package/coms/compile/Node.js

@@ -15,7 +15,7 @@ function Node(o) {
         });
         t[types[o.type]] = o.text;
     }
-    else Object.assign(t, o);
+    Object.assign(t, o);
     return t;
 }
 var node_props = [
@@ -41,16 +41,25 @@ defineProperty(Node, 'debug', {
         node_props.forEach(debug ? def : del, Node.prototype);
     }
 });
+
 var def = function (k) {
     var k1 = Symbol(k);
+    var set = function (v) {
+        defineProperty(this, k1, { configurable: true, writable: true, enumerable: false, value: v });
+    };
     defineProperty(this, k, {
         configurable: true, enumerable: false,
         get() {
             return this[k1];
         },
-        set(v) {
-            defineProperty(this, k1, { configurable: true, writable: true, enumerable: false, value: v })
-        }
+        set: k === 'type' ? function (v) {
+            delete this[types[this[k1]]];
+            set.call(this, v);
+            this[types[v]] = this.text;
+        } : k === 'text' ? function (v) {
+            set.call(this, v);
+            this[types[this.type]] = v;
+        } : set,
     });
 };
 var del = function (k) {

package/coms/compile/cloneNode.js

@@ -1,10 +1,11 @@
 var { VALUE, QUOTED, EXPRESS, STRAP, relink } = require("./common");
 var Node = require("./Node");
+var cloneChild = o => cloneNode(o);
 var cloneNode = function (o, keep) {
     var c = o;
     if (c instanceof Array && !c.text) {
         if (keep) return c;
-        c = c.map(cloneNode);
+        c = c.map(cloneChild);
         c.entry = o.entry;
         c.leave = o.leave;
         c.type = o.type;

package/coms/compile/common.js

@@ -710,6 +710,11 @@ var createScoped = function (parsed, wash) {
                                 o = getnext(o);
                                 o.isExpress = p?.isExpress;
                             }
+                            if (n.isprop) {
+                                var nn = n.next;
+                                if (nn.type === STAMP && /^[\:\=]$/.test(nn.text)) break;
+                            }
+
                         case "catch":
                             if (s === 'catch') isCatch = true;
                         case "class":
@@ -788,7 +793,6 @@ var createScoped = function (parsed, wash) {
                 vars = Object.create(null);
                 scoped = [];
                 var isExpress = o.isExpress;
-
                 if (isFunction || isArraw) {
                     scoped.used = used;
                     scoped.vars = vars;

package/coms/compile/common_test.js

@@ -44,3 +44,9 @@ assert(common.createString(common.pickArgument(scanner2(`a={a:1,c:d}`)[2][4])),
 assert(common.createString(common.pickArgument(scanner2(`a=class{a=1\r\nc=d}`)[3][4])), 'c = d')
 assert(common.createString(common.pickArgument(scanner2(`(a=1,c=d)`)[0][4])), 'c = d')
 assert(scanner2(`for (let len of codeLengths) if (len) count[len]++;`).envs, { len: undefined })
+function testCreateScope(code) {
+    code = scanner2(code);
+    common.createScoped(code);
+}
+
+testCreateScope(`class a{ static barch = new arch('b')}`)

package/coms/compile/nametill.js

@@ -1,6 +1,6 @@
 function till(n) {
-    if (/^[&\^%\?@#]/.test(n)) {
-        var s = n = n.replace(/[&\^%\?@#]/g, '_');
+    if (/^[&\^%\?@#\\]/.test(n)) {
+        var s = n = n.replace(/[&\^%\?@#\\]/g, '_');
         var i = 0;
         while (n in this) {
             n = s + i++;

package/coms/compile/unstruct.js

@@ -226,7 +226,7 @@ var _switch = function (body, cx, unblock, result, getname) {
         q = tmp.shift();
         block = tmp.shift();
         if (default_r === q) cy = default_r.index;
-        q.push({ type: VALUE, text: String(result.length - cy) }, { type: STAMP, text: "," }, { type: VALUE, text: '0' });
+        q.push({ type: VALUE, isdigit: true, text: String(result.length - cy) }, { type: STAMP, text: "," }, { type: VALUE, isdigit: true, text: '0' });
         relink(q);
         unblock(block);
         ifpatch(result);
@@ -305,13 +305,29 @@ var getCondition = function (o, unblock, not_) {
     if (not_) not = !not;
     if (f && f === o.last) {
         if (f.type & (EXPRESS | VALUE)) {
-            n = cloneNode(f);
+            n = f;
         }
         if (not && n) {
             if (f.type === VALUE) {
-                n = String(eval("!" + f.text));
+                if (f.isdigit) {
+                    n = cloneNode(String(eval("!" + f.text)));
+                }
+                else switch (f.text) {
+                    case "true":
+                    case "Infinity":
+                    case "-Infinity":
+                        n = cloneNode("false");
+                        break;
+                    case "NaN":
+                    case "null":
+                    case "undefined":
+                        n = cloneNode("true");
+                        break;
+                    default:
+                        n = rescan.keep`!${f}`;
+                }
             }
-            else n = rescan`!${n}`;
+            else n = rescan.keep`!${n}`;
         }
     }
     if (!n) {
@@ -323,9 +339,9 @@ var getCondition = function (o, unblock, not_) {
             n = ret_;
         }
         else n = n.name;
-        if (not) n = rescan`!${n}`;
+        if (not) n = rescan.keep`!${n}`;
     }
-    return cloneNode(n);
+    return n;
 }
 var _while = function (body, cx, unblock, result) {
     var o = body[cx];
@@ -1175,7 +1191,7 @@ var poplabel = function (result) {
                 if (r.indexOf(b) >= 0) { break }
             }
             if (cx < 0) throw console.log(result.map(r => createString(r)), e.text, createString([b.prev, b])), i18n`break语句异常`;
-            end.push({ type: VALUE, text: b.continue ? b.continue.contat - cx : result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
+            end.push({ type: VALUE, isdigit: true, text: String(b.continue ? b.continue.contat - cx : result.length - cx) }, { type: STAMP, text: "," }, { type: VALUE, isdigit: true, text: "0" });
             relink(end);
         }
     }

package/coms/compile/unstruct_test.js

@@ -12,6 +12,9 @@ function test(codetext, expect, ret = false) {
 test('var o = loaded[f.name] = f.isFile() ? new File(p, rebuild, limit) : new Directory(p, rebuild, limit)', "_ = f.name; _0 = f.isFile(); if (!_0) return [1, 0]; _0 = new File(p, rebuild, limit); loaded[_] = _0; o = _0; return [2, 0];\r\n _0 = new Directory(p, rebuild, limit); loaded[_] = _0; o = _0; return [1, 0]");
 test('a+b', "a + b");
 test('var a = b', "a = b");
+test('if(this){}',`if (!this) return [1, 0]; return [1, 0]`);
+test('if(!this){}',`if (this) return [1, 0]; return [1, 0]`);
+test('if(arguments){}',`if (!arguments) return [1, 0]; return [1, 0]`);
 test('a | c & b', "_ = c & b, a | _");
 test('a + !c', "_ = !c, a + _");
 test('a + b * c', "_ = b * c, a + _");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.31.1",
+    "version": "4.32.1",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {