@mirascript/mirascript 0.1.2 → 0.1.3

package/dist/{chunk-AOINGBRS.js → chunk-MVHCSH3E.js}

@@ -67,6 +67,11 @@ var VmWrapper = class {
     return `<${this.type} ${this.describe}>`;
   }
 };
+var kVmWrapper = Symbol.for("mirascript.vm.wrapper");
+Object.defineProperty(VmWrapper.prototype, kVmWrapper, { value: true });
+function isVmWrapper(value) {
+  return value != null && typeof value == "object" && kVmWrapper in value;
+}
 
 // src/vm/helpers.ts
 var helpers_exports = {};
@@ -143,8 +148,8 @@ var isSame = (a, b) => {
   if (typeof a == "number" && typeof b == "number") return a === b || isNaN(a) && isNaN(b);
   if (a === b) return true;
   if (a == null || typeof a != "object" || b == null || typeof b != "object") return false;
-  if (a instanceof VmWrapper) return a.same(b);
-  if (b instanceof VmWrapper) return b.same(a);
+  if (isVmWrapper(a)) return a.same(b);
+  if (isVmWrapper(b)) return b.same(a);
   if (isVmArray(a) && isVmArray(b)) {
     const len2 = a.length;
     if (len2 !== b.length) {
@@ -241,11 +246,6 @@ var $Eq = (a, b) => {
 var $Neq = (a, b) => {
   return !$Eq(a, b);
 };
-var stringComparer = new Intl.Collator("en", {
-  usage: "sort",
-  numeric: false,
-  sensitivity: "base"
-});
 var $Aeq = (a, b) => {
   if (overloadNumberString(a, b)) {
     const an = $ToNumber(a);
@@ -261,7 +261,12 @@ var $Aeq = (a, b) => {
     const as = $ToString(a);
     const bs = $ToString(b);
     if (as === bs) return true;
-    return stringComparer.compare(as, bs) === 0;
+    const ai = as.toLowerCase();
+    const bi = bs.toLowerCase();
+    if (ai === bi) return true;
+    const an = ai.normalize("NFC");
+    const bn = bi.normalize("NFC");
+    return an === bn;
   }
 };
 var $Naeq = (a, b) => {
@@ -290,7 +295,7 @@ var $In = (value, iterable) => {
     value;
     return iterable.some((item = null) => isSame(item, value));
   }
-  if (iterable instanceof VmWrapper) return iterable.has($ToString(value));
+  if (isVmWrapper(iterable)) return iterable.has($ToString(value));
   if (typeof iterable == "object") return hasOwnEnumerable(iterable, $ToString(value));
   iterable;
   return false;
@@ -311,7 +316,7 @@ var $Length = (value) => {
   $AssertInit(value);
   if (isVmArray(value)) return value.length;
   if (isVmRecord(value)) return keys(value).length;
-  if (value instanceof VmWrapper) {
+  if (isVmWrapper(value)) {
     return value.keys().length;
   }
   return Number.NaN;
@@ -376,7 +381,7 @@ var $Call = (func, args) => {
   for (const a of args) {
     $AssertInit(a);
   }
-  if (func instanceof VmExtern) {
+  if (isVmExtern(func)) {
     return func.call(args) ?? null;
   }
   if (isVmFunction(func)) {
@@ -386,8 +391,8 @@ var $Call = (func, args) => {
 };
 var $Type = (value) => {
   if (value === void 0 || value === null) return "nil";
-  if (value instanceof VmExtern) return "extern";
-  if (value instanceof VmModule) return "module";
+  if (isVmExtern(value)) return "extern";
+  if (isVmModule(value)) return "module";
   if (isVmArray(value)) return "array";
   if (typeof value == "object") return "record";
   return typeof value;
@@ -404,7 +409,7 @@ function numberToString(value) {
 }
 function innerToString(value, useBraces) {
   if (value == null) return "nil";
-  if (value instanceof VmWrapper) return value.toString();
+  if (isVmWrapper(value)) return value.toString();
   if (typeof value == "function") {
     const name = getVmFunctionInfo(value)?.fullName;
     return name ? `<function ${name}>` : `<function>`;
@@ -481,7 +486,7 @@ var $Has = (obj, key) => {
   $AssertInit(obj);
   const pk = $ToString(key);
   if (obj == null || typeof obj != "object") return false;
-  if (obj instanceof VmWrapper) return obj.has(pk);
+  if (isVmWrapper(obj)) return obj.has(pk);
   return hasOwnEnumerable(obj, pk);
 };
 var $Get = (obj, key) => {
@@ -493,7 +498,7 @@ var $Get = (obj, key) => {
   }
   const pk = $ToString(key);
   if (obj == null || typeof obj != "object") return null;
-  if (obj instanceof VmWrapper) return obj.get(pk) ?? null;
+  if (isVmWrapper(obj)) return obj.get(pk) ?? null;
   if (!hasOwnEnumerable(obj, pk)) return null;
   return obj[pk] ?? null;
 };
@@ -507,7 +512,7 @@ var $Set = (obj, key, value) => {
 };
 var $Iterable = (value) => {
   $AssertInit(value);
-  if (value instanceof VmWrapper) return value.keys();
+  if (isVmWrapper(value)) return value.keys();
   if (isVmArray(value)) return value;
   if (value != null && typeof value == "object") return keys(value);
   throw new VmError(`Value is not iterable`, isVmFunction(value) ? [] : [value]);
@@ -766,7 +771,7 @@ function wrapToVmValue(value, thisArg = null, assumeVmValue) {
       return new VmExtern(value, thisArg);
     }
     case "object": {
-      if (value instanceof VmWrapper) return value;
+      if (isVmWrapper(value)) return value;
       if (value instanceof Date) return value.valueOf();
       if (assumeVmValue?.(value)) return value;
       return new VmExtern(value);
@@ -788,7 +793,7 @@ function unwrapFromVmValue(value) {
     return toVmFunctionProxy(value);
   }
   if (value == null || typeof value != "object") return value;
-  if (!(value instanceof VmExtern)) return value;
+  if (!isVmExtern(value)) return value;
   if (value.thisArg == null || typeof value.value != "function") {
     return value.value;
   }
@@ -804,7 +809,8 @@ function unwrapFromVmValue(value) {
 // src/vm/types/extern.ts
 var ObjectPrototype = Object.prototype;
 var ObjectToString = ObjectPrototype.toString;
-var VmExtern = class _VmExtern extends VmWrapper {
+var FunctionToString = Function.prototype.toString;
+var VmExtern = class extends VmWrapper {
   constructor(value, thisArg = null) {
     super(value);
     this.thisArg = thisArg;
@@ -871,13 +877,13 @@ var VmExtern = class _VmExtern extends VmWrapper {
   }
   /** @inheritdoc */
   same(other) {
-    if (!(other instanceof _VmExtern)) return false;
+    if (!isVmExtern(other)) return false;
     return this.value === other.value && this.thisArg === other.thisArg;
   }
   /** @inheritdoc */
   toString() {
     const { toString } = this.value;
-    if (typeof toString != "function" || toString === ObjectToString) {
+    if (typeof toString != "function" || toString === ObjectToString || toString === FunctionToString) {
       return super.toString();
     }
     try {
@@ -915,6 +921,11 @@ var VmExtern = class _VmExtern extends VmWrapper {
     return tag;
   }
 };
+var kVmExtern = Symbol.for("mirascript.vm.extern");
+Object.defineProperty(VmExtern.prototype, kVmExtern, { value: true });
+function isVmExtern(value) {
+  return value != null && typeof value == "object" && kVmExtern in value;
+}
 
 // src/vm/types/module.ts
 var VmModule = class extends VmWrapper {
@@ -948,6 +959,11 @@ var VmModule = class extends VmWrapper {
     return this.name;
   }
 };
+var kVmModule = Symbol.for("mirascript.vm.module");
+Object.defineProperty(VmModule.prototype, kVmModule, { value: true });
+function isVmModule(value) {
+  return value != null && typeof value == "object" && kVmModule in value;
+}
 
 // src/vm/types/script.ts
 var kVmScript = Symbol.for("mirascript.vm.script");
@@ -990,7 +1006,7 @@ function isVmConstInner(value, depth) {
       return true;
     case "object":
       if (value == null) return true;
-      if (value instanceof VmWrapper) return false;
+      if (isVmWrapper(value)) return false;
       if (isArray(value)) {
         return isVmArrayDeep(value, depth);
       } else {
@@ -1011,7 +1027,7 @@ function isVmConst(value, checkDeep = false) {
       return true;
     case "object":
       if (value == null) return true;
-      if (value instanceof VmWrapper) return false;
+      if (isVmWrapper(value)) return false;
       if (!checkDeep) {
         if (isArray(value)) {
           return isVmArrayDeep(value, 0);
@@ -1030,7 +1046,7 @@ function isVmConst(value, checkDeep = false) {
   }
 }
 function isVmImmutable(value, checkDeep = false) {
-  return value instanceof VmModule || isVmFunction(value) || isVmConst(value, checkDeep);
+  return isVmModule(value) || isVmFunction(value) || isVmConst(value, checkDeep);
 }
 function isVmValue(value, checkDeep = false) {
   if (value === void 0) return false;
@@ -1045,7 +1061,7 @@ function isVmAny(value, checkDeep) {
       return true;
     case "object":
       if (value == null) return true;
-      if (value instanceof VmWrapper) return true;
+      if (isVmWrapper(value)) return true;
       return isVmConst(value, checkDeep);
     case "function":
       return isVmFunction(value);
@@ -1064,7 +1080,7 @@ function isVmArray(value) {
 }
 function isVmRecord(value) {
   if (value == null || typeof value !== "object") return false;
-  if (value instanceof VmWrapper) return false;
+  if (isVmWrapper(value)) return false;
   if (isVmArray(value)) return false;
   value;
   return true;
@@ -1077,15 +1093,9 @@ function isVmPrimitive(value) {
   }
   return false;
 }
-function isVmExtern(value) {
-  return value instanceof VmExtern;
-}
 function isVmCallable(value) {
   return isVmFunction(value) || isVmExtern(value) && typeof value.value == "function";
 }
-function isVmModule(value) {
-  return value instanceof VmModule;
-}
 var VM_ARRAY_MAX_LENGTH = 2 ** 31 - 1;
 
 // src/vm/types/context.ts
@@ -1122,8 +1132,9 @@ var DefaultVmContext = Object.freeze({
 var _a;
 _a = kVmContext;
 var ValueVmContext = class {
-  constructor(env) {
+  constructor(env, describe) {
     this.env = env;
+    this.describe = describe;
     this[_a] = true;
     this.cachedKeys = null;
   }
@@ -1144,9 +1155,10 @@ var ValueVmContext = class {
 var _a2;
 _a2 = kVmContext;
 var FactoryVmContext = class {
-  constructor(getter, enumerator) {
+  constructor(getter, enumerator, describe) {
     this.getter = getter;
     this.enumerator = enumerator;
+    this.describe = describe;
     this[_a2] = true;
   }
   /** @inheritdoc */
@@ -1170,9 +1182,10 @@ function createVmContext(...args) {
     return { ...DefaultVmContext };
   }
   if (typeof args[0] == "function") {
-    return new FactoryVmContext(args[0], args[1]);
+    const [getter, enumerator, describer2] = args;
+    return new FactoryVmContext(getter, enumerator ?? void 0, describer2 ?? void 0);
   }
-  const [vmValues, externValues] = args;
+  const [vmValues, externValues, describer] = args;
   const env = create(VmSharedContext);
   if (vmValues) {
     for (const [key, value] of entries(vmValues)) {
@@ -1185,7 +1198,7 @@ function createVmContext(...args) {
       env[key] = value == null ? null : wrapToVmValue(value, null);
     }
   }
-  return new ValueVmContext(env);
+  return new ValueVmContext(env, describer ?? void 0);
 }
 function isVmContext(context) {
   if (context == null || typeof context != "object") return false;
@@ -1359,11 +1372,7 @@ function map(data, mapper) {
       Cp();
       const ret = mapper(data[i] ?? null, i, data);
       if (ret === void 0) continue;
-      if (isVmConst(ret)) {
-        result.push(ret);
-      } else {
-        result.push(null);
-      }
+      result.push(ret);
     }
     return result;
   } else {
@@ -1372,11 +1381,7 @@ function map(data, mapper) {
       Cp();
       const ret = mapper(value ?? null, key, data);
       if (ret === void 0) continue;
-      if (isVmConst(ret)) {
-        e.push([key, ret]);
-      } else {
-        e.push([key, null]);
-      }
+      e.push([key, ret]);
     }
     return fromEntries(e);
   }
@@ -1783,40 +1788,123 @@ var shr = VmLib(
 );
 
 // src/vm/lib/global/sequence/with.ts
+var arrIndex = (index) => {
+  const idx = Math.trunc($ToNumber(index));
+  if (!isSafeInteger(idx) || idx < 0 || idx >= VM_ARRAY_MAX_LENGTH) {
+    return -1;
+  }
+  return idx;
+};
+var withInner = (obj, key, keyIndex, value) => {
+  if (keyIndex >= key.length) {
+    return value;
+  }
+  const k = key[keyIndex];
+  let result;
+  if (isVmArray(obj)) {
+    result = [...obj];
+  } else if (isVmRecord(obj)) {
+    result = { ...obj };
+  } else if (arrIndex(k) === k) {
+    result = [];
+  } else {
+    result = {};
+  }
+  if (isArray(result)) {
+    const index = arrIndex(k);
+    while (index > result.length) {
+      result.push(null);
+    }
+    result[index] = withInner(result[index], key, keyIndex + 1, value);
+  } else {
+    const prop = $ToString(k);
+    result[prop] = withInner(result[prop], key, keyIndex + 1, value);
+  }
+  return result;
+};
+var normalizeEntries = (data, entries3) => {
+  if (entries3.length % 2 !== 0) {
+    throwError("Expected even number of entries", data);
+  }
+  const entryData = /* @__PURE__ */ new Map();
+  for (let i = 0; i < entries3.length; i += 2) {
+    let key = entries3[i];
+    expectConst("key", key, data);
+    if (key == null) {
+      continue;
+    }
+    if (isVmArray(key)) {
+      if (key.length === 0 || key.includes(null) || key.includes(void 0)) {
+        continue;
+      } else if (key.length === 1) {
+        key = key[0];
+      }
+    }
+    const value = entries3[i + 1];
+    entryData.set(key, Element(value));
+  }
+  return entryData;
+};
 var _with = VmLib(
   (data, ...entries3) => {
     expectArrayOrRecord("data", data, data);
-    if (entries3.length % 2 !== 0) {
-      throwError("Expected even number of entries", data);
+    if (entries3.length === 0) {
+      return data;
     }
+    const entryData = normalizeEntries(data, entries3);
     if (isVmArray(data)) {
       const result = [...data];
-      for (let i = 0; i < entries3.length; i += 2) {
-        const index = Math.trunc($ToNumber(entries3[i]));
-        if (!isSafeInteger(index) || index < 0) continue;
-        const value = entries3[i + 1];
+      for (const [key, value] of entryData) {
+        let index;
+        let val;
+        if (isVmArray(key)) {
+          index = arrIndex(key[0]);
+          if (index < 0) continue;
+          val = withInner(result[index], key, 1, value);
+        } else {
+          index = arrIndex(key);
+          if (index < 0) continue;
+          val = value;
+        }
         while (index > result.length) {
           result.push(null);
         }
-        result[index] = Element(value);
+        result[index] = val;
       }
       return result;
     } else {
       const result = { ...data };
-      for (let i = 0; i < entries3.length; i += 2) {
-        const key = $ToString(entries3[i]);
-        const value = entries3[i + 1];
-        result[key] = Element(value);
+      for (const [key, value] of entryData) {
+        let prop;
+        let val;
+        if (isVmArray(key)) {
+          const firstKey = key[0];
+          prop = $ToString(firstKey);
+          val = withInner(result[prop], key, 1, value);
+        } else {
+          prop = $ToString(key);
+          val = value;
+        }
+        result[prop] = val;
       }
       return result;
     }
   },
   {
     summary: "在数组或记录中设置多个键值对",
-    params: { data: "要设置的数组或记录", "..entries": "要设置的键值对，成对出现" },
-    paramsType: { data: "array | record", "..entries": "[..[string | number, any][]]" },
+    params: {
+      data: "要设置的数组或记录",
+      "..entries": "要设置的键值对，成对出现"
+    },
+    paramsType: {
+      data: "array | record",
+      "..entries": `[..[string | number | (string | number)[], any][]]`
+    },
     returnsType: "type(data)",
-    examples: ["with([10, 20], 2, 99) // [10, 20, 99]", 'with((a: 1), "b", 2) // (a: 1, b: 2)']
+    examples: [
+      `with([10, 20], 2, 99, 3 ,100) // [10, 20, 99, 100]`,
+      `(a: 1)::with(["b", 1], 2) // (a: 1, b: [nil, 2])`
+    ]
   }
 );
 
@@ -3596,6 +3684,7 @@ function compileSync(source, options = {}) {
 
 export {
   VmError,
+  isVmWrapper,
   operations_exports,
   VmSharedContext,
   defineVmContextValue,
@@ -3611,7 +3700,9 @@ export {
   wrapToVmValue,
   unwrapFromVmValue,
   VmExtern,
+  isVmExtern,
   VmModule,
+  isVmModule,
   isVmScript,
   isVmConst,
   isVmImmutable,
@@ -3620,9 +3711,7 @@ export {
   isVmArray,
   isVmRecord,
   isVmPrimitive,
-  isVmExtern,
   isVmCallable,
-  isVmModule,
   VM_ARRAY_MAX_LENGTH,
   constants_exports,
   DiagnosticCode,
@@ -3638,4 +3727,4 @@ export {
   serializePropName,
   serialize
 };
-//# sourceMappingURL=chunk-AOINGBRS.js.map
+//# sourceMappingURL=chunk-MVHCSH3E.js.map