@mirascript/mirascript 0.1.18 → 0.1.20

package/dist/{chunk-5AEWM4W6.js → chunk-4T5YE7LC.js}

@@ -10,9 +10,11 @@ __export(constants_exports, {
   REG_BIN: () => REG_BIN,
   REG_HEX: () => REG_HEX,
   REG_IDENTIFIER: () => REG_IDENTIFIER,
+  REG_IDENTIFIER_FULL: () => REG_IDENTIFIER_FULL,
   REG_NUMBER: () => REG_NUMBER,
   REG_OCT: () => REG_OCT,
   REG_ORDINAL: () => REG_ORDINAL,
+  REG_ORDINAL_FULL: () => REG_ORDINAL_FULL,
   REG_WHITESPACE: () => REG_WHITESPACE,
   VM_ARRAY_MAX_LENGTH: () => VM_ARRAY_MAX_LENGTH,
   VM_FUNCTION_ANONYMOUS_NAME: () => VM_FUNCTION_ANONYMOUS_NAME,
@@ -27,19 +29,21 @@ __export(constants_exports, {
 });
 var REG_IDENTIFIER = /(?:_+|@+|\$+|\p{XID_Start})\p{XID_Continue}*/u;
 var REG_ORDINAL = /(?:214748364[0-7]|21474836[0-3]\d|2147483[0-5]\d{2}|214748[0-2]\d{3}|21474[0-7]\d{4}|2147[0-3]\d{5}|214[0-6]\d{6}|21[0-3]\d{7}|20\d{8}|1\d{9}|[1-9]\d{0,8}|0)/;
+var REG_IDENTIFIER_FULL = new RegExp(`^${REG_IDENTIFIER.source}$`, REG_IDENTIFIER.flags);
+var REG_ORDINAL_FULL = new RegExp(`^${REG_ORDINAL.source}$`, REG_ORDINAL.flags);
 var REG_WHITESPACE = /[ \t\v\f\r\n]/u;
 var REG_HEX = /0[xX][a-fA-F0-9_]*[a-fA-F0-9]/;
 var REG_OCT = /0[oO][0-7_]*[0-7]/;
 var REG_BIN = /0[bB][01_]*[01]/;
 var REG_NUMBER = /\d[\d_]*(?:\.[\d_]+)?(?:[eE][+-]?[\d_]*\d)?/u;
 var VM_ARRAY_MAX_LENGTH = 2 ** 31 - 1;
-var kVmScript = Symbol.for("mirascript.vm.script");
-var kVmFunction = Symbol.for("mirascript.vm.function");
-var kVmFunctionProxy = Symbol.for("mirascript.vm.function.proxy");
-var kVmContext = Symbol.for("mirascript.vm.context");
-var kVmExtern = Symbol.for("mirascript.vm.extern");
-var kVmModule = Symbol.for("mirascript.vm.module");
-var kVmWrapper = Symbol.for("mirascript.vm.wrapper");
+var kVmScript = /* @__PURE__ */ Symbol.for("mirascript.vm.script");
+var kVmFunction = /* @__PURE__ */ Symbol.for("mirascript.vm.function");
+var kVmFunctionProxy = /* @__PURE__ */ Symbol.for("mirascript.vm.function.proxy");
+var kVmContext = /* @__PURE__ */ Symbol.for("mirascript.vm.context");
+var kVmExtern = /* @__PURE__ */ Symbol.for("mirascript.vm.extern");
+var kVmModule = /* @__PURE__ */ Symbol.for("mirascript.vm.module");
+var kVmWrapper = /* @__PURE__ */ Symbol.for("mirascript.vm.wrapper");
 var VM_SCRIPT_NAME = `<script_root>`;
 var VM_FUNCTION_ANONYMOUS_NAME = `<anonymous>`;
 
@@ -223,8 +227,6 @@ function isVmValue(value, checkDeep = false) {
 }
 
 // src/helpers/serialize.ts
-var REG_IDENTIFIER_FULL = new RegExp(`^${REG_IDENTIFIER.source}$`, REG_IDENTIFIER.flags);
-var REG_ORDINAL_FULL = new RegExp(`^${REG_ORDINAL.source}$`, REG_ORDINAL.flags);
 var DEFAULT_OPTIONS = Object.freeze({
   maxDepth: 128,
   serializeNil,
@@ -494,6 +496,22 @@ var VmError = class _VmError extends Error {
   }
 };
 
+// src/compiler/generate-bytecode.ts
+import { getModule, loadModule } from "@mirascript/bindings";
+function generateBytecodeSync(script, options) {
+  const module = getModule();
+  const result = module.compileSync(script, options);
+  return [result.chunk, result.diagnostics];
+}
+async function generateBytecode(script, options) {
+  if (options == null) {
+    throw new TypeError("options must be provided");
+  }
+  const module = await loadModule();
+  const result = "compile" in module ? await module.compile(script, options) : module.compileSync(script, options);
+  return [result.chunk, result.diagnostics];
+}
+
 // src/compiler/emit/index.ts
 import { OpCode } from "@mirascript/bindings";
 
@@ -540,11 +558,12 @@ function toString(value, fallback) {
 }
 
 // src/compiler/emit/consts.ts
+var { stringify } = JSON;
 function toJsLiteral(value) {
   if (value === null) return "null";
   if (value === void 0) return "undefined";
   if (typeof value == "string") {
-    return JSON.stringify(value);
+    return stringify(value);
   }
   if (value === 0) {
     if (1 / value === -Infinity) return "-0";
@@ -552,62 +571,172 @@ function toJsLiteral(value) {
   }
   return String(value);
 }
-function readConst(reader, offset) {
-  const type = reader.getUint8(offset);
-  switch (type) {
-    /* c8 ignore next 2 */
-    case 0:
-      return [null, 1];
-    case 1:
-      return [true, 1];
-    case 2:
-      return [false, 1];
-    case 3: {
-      const ordinal = reader.getInt32(offset + 1, true);
-      return [ordinal, 5];
+var DECODER = new TextDecoder();
+var { fromCharCode } = String;
+function shortStringInJS(buf, begin, length) {
+  if (length < 4) {
+    if (length < 2) {
+      if (length === 0) return "";
+      const a3 = buf[begin];
+      if ((a3 & 128) > 0) {
+        return;
+      }
+      return fromCharCode(a3);
     }
-    case 4: {
-      const num = reader.getFloat64(offset + 1, true);
-      return [num, 9];
+    const a2 = buf[begin++];
+    const b2 = buf[begin++];
+    if ((a2 & 128) > 0 || (b2 & 128) > 0) {
+      return;
     }
-    case 5: {
-      const len = reader.getUint32(offset + 1, true);
-      const str = new TextDecoder().decode(new Uint8Array(reader.buffer, reader.byteOffset + offset + 5, len));
-      return [str, 5 + len];
+    if (length < 3) return fromCharCode(a2, b2);
+    const c2 = buf[begin++];
+    if ((c2 & 128) > 0) {
+      return;
     }
-    /* c8 ignore next 2 */
-    default:
-      throw new Error(`Unknown constant type: ${type}`);
+    return fromCharCode(a2, b2, c2);
+  }
+  const a = buf[begin++];
+  const b = buf[begin++];
+  const c = buf[begin++];
+  const d = buf[begin++];
+  if ((a & 128) > 0 || (b & 128) > 0 || (c & 128) > 0 || (d & 128) > 0) {
+    return;
+  }
+  if (length < 6) {
+    if (length === 4) return fromCharCode(a, b, c, d);
+    const e2 = buf[begin++];
+    if ((e2 & 128) > 0) {
+      return;
+    }
+    return fromCharCode(a, b, c, d, e2);
+  }
+  const e = buf[begin++];
+  const f = buf[begin++];
+  if ((e & 128) > 0 || (f & 128) > 0) {
+    return;
+  }
+  if (length < 8) {
+    if (length < 7) return fromCharCode(a, b, c, d, e, f);
+    const g2 = buf[begin++];
+    if ((g2 & 128) > 0) {
+      return;
+    }
+    return fromCharCode(a, b, c, d, e, f, g2);
+  }
+  const g = buf[begin++];
+  const h = buf[begin++];
+  if ((g & 128) > 0 || (h & 128) > 0) {
+    return;
+  }
+  if (length < 10) {
+    if (length === 8) return fromCharCode(a, b, c, d, e, f, g, h);
+    const i2 = buf[begin++];
+    if ((i2 & 128) > 0) {
+      return;
+    }
+    return fromCharCode(a, b, c, d, e, f, g, h, i2);
+  }
+  const i = buf[begin++];
+  const j = buf[begin++];
+  if ((i & 128) > 0 || (j & 128) > 0) {
+    return;
+  }
+  if (length < 12) {
+    if (length < 11) return fromCharCode(a, b, c, d, e, f, g, h, i, j);
+    const k2 = buf[begin++];
+    if ((k2 & 128) > 0) {
+      return;
+    }
+    return fromCharCode(a, b, c, d, e, f, g, h, i, j, k2);
+  }
+  const k = buf[begin++];
+  const l = buf[begin++];
+  if ((k & 128) > 0 || (l & 128) > 0) {
+    return;
+  }
+  if (length < 14) {
+    if (length === 12) return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l);
+    const m2 = buf[begin++];
+    if ((m2 & 128) > 0) {
+      begin -= 13;
+      return;
+    }
+    return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m2);
   }
+  const m = buf[begin++];
+  const n = buf[begin++];
+  if ((m & 128) > 0 || (n & 128) > 0) {
+    return;
+  }
+  if (length < 15) return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n);
+  const o = buf[begin++];
+  if ((o & 128) > 0) {
+    return;
+  }
+  return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o);
 }
-
-// src/compiler/emit/globals.ts
-function readGlobal(emitter, constIdx) {
-  const { globals } = emitter;
-  const cached = globals.get(constIdx);
-  if (cached) return cached;
-  const constName = emitter.constVals[constIdx];
-  let name, lit;
-  if (typeof constName == "string") {
-    name = constName;
-    lit = emitter.constLits[constIdx];
-  } else {
-    name = toString(constName, void 0);
-    lit = toJsLiteral(name);
-  }
-  const val = `g${globals.size + 1}`;
-  const expr = `(${val} === undefined ? (${val} = global.get(${lit})) : ${val})`;
-  const desc = { v: val, l: lit, e: expr, n: name };
-  globals.set(constIdx, desc);
-  return desc;
+function decodeStr(buffer, offset, length) {
+  if (length < 16) {
+    const shortStr = shortStringInJS(buffer, offset, length);
+    if (shortStr !== void 0) {
+      return shortStr;
+    }
+  }
+  return DECODER.decode(buffer.subarray(offset, offset + length));
+}
+function readConsts(constChunk) {
+  const reader = new DataView(constChunk.buffer, constChunk.byteOffset, constChunk.byteLength);
+  const consts = [];
+  let offset = 0;
+  const length = reader.byteLength;
+  while (offset < length) {
+    const type = reader.getUint8(offset);
+    switch (type) {
+      /* c8 ignore next 2 */
+      case 0:
+        consts.push(null);
+        offset += 1;
+        break;
+      case 1:
+        consts.push(true);
+        offset += 1;
+        break;
+      case 2:
+        consts.push(false);
+        offset += 1;
+        break;
+      case 3: {
+        const ordinal = reader.getInt32(offset + 1, true);
+        consts.push(ordinal);
+        offset += 5;
+        break;
+      }
+      case 4: {
+        const num = reader.getFloat64(offset + 1, true);
+        consts.push(num);
+        offset += 9;
+        break;
+      }
+      case 5: {
+        const len = reader.getUint32(offset + 1, true);
+        const str = decodeStr(constChunk, offset + 5, len);
+        consts.push(str);
+        offset += 5 + len;
+        break;
+      }
+      /* c8 ignore next 2 */
+      default:
+        throw new Error(`Unknown constant type: ${type}`);
+    }
+  }
+  return consts;
 }
 
 // src/compiler/emit/sourcemap.ts
 import { SourceMapGenerator } from "source-map-js";
 
 // src/compiler/emit/constants.ts
-var SCRIPT_PREFIX = `'use strict'; return ((global = GlobalFallback()) => { try { CpEnter();`;
-var GLOBAL_HINT = `/* globals */`;
+var SCRIPT_PREFIX = `return ((global = GlobalFallback()) => { try { CpEnter();`;
 
 // src/compiler/emit/sourcemap.ts
 var ORIGIN = `mira://MiraScript/`;
@@ -618,74 +747,10 @@ var { SOURCE_URL, SOURCE_MAPPING_URL } = ((source, mapping, url) => {
     SOURCE_MAPPING_URL: prefix.concat(source, mapping, url)
   };
 })(`source`, `Mapping`, `URL`);
-var SOURCE_OFFSET = 3;
+var SOURCE_OFFSET = 4;
 var toDataUrl = typeof Buffer == "function" && typeof Buffer.from == "function" ? (s) => `data:application/json;base64,${Buffer.from(s, "utf8").toString("base64")}` : (s) => `data:application/json;charset=utf-8,${encodeURIComponent(s)}`;
-function addGlobalMappings(globalLine, fileName, map, globals) {
-  let globalFile = `global;
-`;
-  map.addMapping({
-    generated: {
-      line: 3,
-      column: globalLine.indexOf(`global = `)
-    },
-    original: {
-      line: 1,
-      column: 0
-    },
-    source: fileName,
-    name: "global"
-  });
-  map.addMapping({
-    generated: {
-      line: 3,
-      column: SCRIPT_PREFIX.length
-    },
-    original: {
-      line: 1,
-      column: 7
-    },
-    source: fileName,
-    name: ""
-  });
-  let i = 1;
-  let pos = globalLine.indexOf(GLOBAL_HINT, SCRIPT_PREFIX.length) + GLOBAL_HINT.length;
-  for (const p of globals.values()) {
-    i++;
-    if (pos < 0) break;
-    const { v, n } = p;
-    pos = globalLine.indexOf(v, pos);
-    if (pos < 0) break;
-    map.addMapping({
-      generated: {
-        line: 3,
-        column: pos
-      },
-      original: {
-        line: i,
-        column: 0
-      },
-      source: fileName,
-      name: n
-    });
-    globalFile += `${n};
-`;
-  }
-  map.addMapping({
-    generated: {
-      line: 3,
-      column: pos
-    },
-    original: {
-      line: i,
-      column: 0
-    },
-    source: fileName,
-    name: ""
-  });
-  map.setSourceContent(fileName, globalFile);
-}
 var sourceId = 1;
-function createSourceMap(source, sourcemaps, codeLines, globals, options) {
+function createSourceMap(source, sourcemaps, codeLines, functions, options) {
   let fileName = (options.fileName ?? "").trim();
   const hasSchema = /^\w+:/.test(fileName);
   if (!hasSchema) {
@@ -734,17 +799,25 @@ function createSourceMap(source, sourcemaps, codeLines, globals, options) {
       source: fileName
     });
   }
-  const globalLine = codeLines[0];
-  if (globalLine?.includes(GLOBAL_HINT)) {
-    addGlobalMappings(globalLine, `${fileName} <globals>`, map, globals);
+  let fnNames = `'use strict';`;
+  if (typeof source === "string") {
+    const lines = source.split(/\r?\n/);
+    for (let i = 0; i < functions.length; i++) {
+      const index = functions[i];
+      const mapping = sourcemaps[index];
+      const line = mapping ? lines[mapping.startLineNumber - 1] : void 0;
+      const fnName = mapping && line ? line.slice(mapping.startColumn - 1, mapping.endColumn - 1) : "";
+      fnNames += `var fnName_${i} = ${fnName ? toJsLiteral(fnName) : "null"};`;
+    }
   }
   const sourceURL = hasSchema ? fileName : `${ORIGIN}${fileName}`;
   const dataUrl = toDataUrl(map.toString());
-  return [
+  codeLines.unshift(fnNames);
+  codeLines.push(
     // Prevent source map from being recognized as of this file
     `${SOURCE_URL}=${sourceURL}.js`,
     `${SOURCE_MAPPING_URL}=${dataUrl}`
-  ];
+  );
 }
 
 // src/compiler/emit/index.ts
@@ -761,20 +834,18 @@ function createArray(length, fn) {
   }
   return result;
 }
-var SCRIPT_PREFIX2 = `'use strict'; return ((global = GlobalFallback()) => { try { CpEnter();`;
-var GLOBAL_HINT2 = `/* globals */`;
 var Emitter = class {
   constructor(source, chunk, sourcemaps, options) {
     this.source = source;
     this.chunk = chunk;
     this.sourcemaps = sourcemaps;
     this.options = options;
-    this.constVals = [];
     this.constLits = [];
     this.codeOffset = 0;
     this.closureCounter = 0;
     this.identCounter = 0;
-    this.globals = /* @__PURE__ */ new Map();
+    /** 记录函数声明所在位置 */
+    this.functions = [];
     this.codeLines = [];
     this.pretty = options.pretty ?? false;
     const reader = new DataView(chunk.buffer, chunk.byteOffset, chunk.byteLength);
@@ -782,15 +853,15 @@ var Emitter = class {
     this.codeSize = reader.getUint32(4, true);
     this.constSize = reader.getUint32(8 + this.codeSize, true);
     this.codeReader = new DataView(chunk.buffer, chunk.byteOffset + 8, this.codeSize);
-    this.constReader = new DataView(chunk.buffer, chunk.byteOffset + 12 + this.codeSize, this.constSize);
+    this.constVals = readConsts(
+      new Uint8Array(chunk.buffer, chunk.byteOffset + 12 + this.codeSize, this.constSize)
+    );
   }
   /** 读取常量表 */
   readConsts() {
-    for (let i = 0, index = 0; i < this.constSize; index++) {
-      const [constant, size] = readConst(this.constReader, i);
-      this.constVals.push(constant);
-      this.constLits.push(toJsLiteral(constant));
-      i += size;
+    const { constVals, constLits } = this;
+    for (let i = 0, len = constVals.length; i < len; i++) {
+      constLits.push(toJsLiteral(constVals[i]));
     }
   }
   /** 制造缩进 */
@@ -799,8 +870,15 @@ var Emitter = class {
     return "  ".repeat(this.identCounter + len);
   }
   /** 读取全局变量 */
-  rg(constIdx, eager) {
-    return readGlobal(this, constIdx).e;
+  rg(constIdx) {
+    const constName = this.constVals[constIdx];
+    let lit;
+    if (typeof constName == "string") {
+      lit = this.constLits[constIdx];
+    } else {
+      lit = toJsLiteral(toString(constName, void 0));
+    }
+    return `global.get(${lit})`;
   }
   /** Read variable */
   rv(i, level = 0) {
@@ -1028,14 +1106,21 @@ var Emitter = class {
           }
           return `${wv} = null`;
         });
-        const regs = createArray(regn - argn + 1, (i) => i ? this.wv(i + argn, -1) : this.wv(0, -1)).join(
-          ", "
-        );
+        let regs = "_";
+        for (let i = 1 + argn; i < regn + 1; i++) {
+          regs += "," + this.wv(i, -1);
+        }
         const script = startFunc && !varg && argn === 0;
         if (script) {
-          code = `${SCRIPT_PREFIX2} var ${regs};`;
+          code = `${SCRIPT_PREFIX} var ${regs};`;
         } else {
-          code = `${this.wv(reg)} = Function((${args.join(", ")}) => { try { CpEnter(); var ${regs};`;
+          if (!this.options.sourceMap) {
+            code = `${this.wv(reg)} = Function(null ,(${args.join(", ")}) => { try { CpEnter(); var ${regs};`;
+          } else {
+            const index = this.functions.length;
+            this.functions.push(this.codeLines.length);
+            code = `${this.wv(reg)} = Function(fnName_${index} ,(${args.join(", ")}) => { try { CpEnter(); var ${regs};`;
+          }
         }
         if (varg) {
           code += ` var ${this.wv(argn, -1)} = Vargs(vargs);`;
@@ -1115,7 +1200,7 @@ var Emitter = class {
         const args = createArray(n, () => read());
         const ns = read();
         const spreads = createArray(ns, () => read());
-        const callTarget = opcode === OpCode.Call ? this.rg(func, false) : this.rv(func);
+        const callTarget = opcode === OpCode.Call ? this.rg(func) : this.rv(func);
         code = `${this.wv(reg)} = $Call(${callTarget}, [${args.map((a, i) => {
           if (spreads.includes(i)) return `...$ArraySpread(${this.rv(a)})`;
           else return this.rv(a);
@@ -1218,7 +1303,7 @@ var Emitter = class {
       case OpCode.GetGlobal: {
         reg = read();
         const i = read();
-        code = `${this.wv(reg)} = ${this.rg(i, false)};`;
+        code = `${this.wv(reg)} = ${this.rg(i)};`;
         break;
       }
       case OpCode.GetGlobalDyn: {
@@ -1402,25 +1487,20 @@ var Emitter = class {
   read() {
     this.readConsts();
     this.readCode();
-    if (this.globals.size > 0) {
-      let globalsInit = "";
-      for (const { v } of this.globals.values()) {
-        globalsInit += globalsInit ? `, ${v}` : `var ${GLOBAL_HINT2} ${v}`;
-      }
-      this.codeLines[0] += globalsInit + ";";
-    }
     this.addSourceMap();
   }
   /** 添加源映射 */
   addSourceMap() {
-    if (!this.options.sourceMap) return;
-    const mapLines = createSourceMap(this.source, this.sourcemaps, this.codeLines, this.globals, this.options);
-    this.codeLines.push(...mapLines);
+    if (this.options.sourceMap) {
+      createSourceMap(this.source, this.sourcemaps, this.codeLines, this.functions, this.options);
+    } else {
+      this.codeLines.unshift(`'use strict';`);
+    }
   }
 };
 
 // src/compiler/diagnostic.ts
-import { DiagnosticCode, getModule } from "@mirascript/bindings";
+import { DiagnosticCode, getModule as getModule2 } from "@mirascript/bindings";
 var diagnosticMessages = /* @__PURE__ */ new Map();
 function getDiagnosticMessage(code) {
   if (code < 0 || code >= 65535 || !isSafeInteger(code)) {
@@ -1430,7 +1510,7 @@ function getDiagnosticMessage(code) {
   if (cached !== void 0) {
     return cached;
   }
-  const mod = getModule();
+  const mod = getModule2();
   const msg = mod.getDiagnosticMessage(code);
   diagnosticMessages.set(code, msg);
   return msg;
@@ -1558,22 +1638,6 @@ function formatDiagnostics(diagnostics, source, fileName) {
   return messages;
 }
 
-// src/compiler/generate-bytecode.ts
-import { getModule as getModule2, loadModule } from "@mirascript/bindings";
-function generateBytecodeSync(script, options) {
-  const module = getModule2();
-  const result = module.compileSync(script, options);
-  return [result.chunk, result.diagnostics];
-}
-async function generateBytecode(script, options) {
-  if (options == null) {
-    throw new TypeError("options must be provided");
-  }
-  const module = await loadModule();
-  const result = "compile" in module ? await module.compile(script, options) : module.compileSync(script, options);
-  return [result.chunk, result.diagnostics];
-}
-
 export {
   __export,
   VM_ARRAY_MAX_LENGTH,
@@ -1632,12 +1696,12 @@ export {
   VmError,
   innerToString,
   toString,
+  generateBytecodeSync,
+  generateBytecode,
   emit,
   DiagnosticCode,
   getDiagnosticMessage,
   parseDiagnostics,
-  formatDiagnostics,
-  generateBytecodeSync,
-  generateBytecode
+  formatDiagnostics
 };
-//# sourceMappingURL=chunk-5AEWM4W6.js.map
+//# sourceMappingURL=chunk-4T5YE7LC.js.map