@ball-lang/engine 1.4.3 → 1.4.5

package/src/compiled_engine.ts

@@ -1389,7 +1389,7 @@ export class BallEngine {
     this.moduleHandlers = moduleHandlers;
     this._validateProgramLimits();
     if (enableProfiling) {
-      this._callCounts = new Set();
+      this._callCounts = {};
     }
     for (const handler of this.moduleHandlers) {
       handler.init(this);
@@ -1428,7 +1428,7 @@ export class BallEngine {
   }
 
   profilingReport(): any {
-    return Map.unmodifiable((this._callCounts ?? new Set()));
+    return Map.unmodifiable((this._callCounts ?? {}));
   }
 
   callFunction(module: any, function_: any, input: any): any {
@@ -2212,7 +2212,7 @@ export class BallEngine {
         fields[entry.key] = entry.value;
       }
     }
-    return new BallObject({ typeName: typeName, superObject: __ball_index(instance, '__super__'), fields: fields, methods: (__ball_index(instance, '__methods__') ?? new Set()) });
+    return new BallObject({ typeName: typeName, superObject: __ball_index(instance, '__super__'), fields: fields, methods: (__ball_index(instance, '__methods__') ?? {}) });
   }
 
   async _invokeSuperConstructor(childCtor: any, superclass: any, resolvedParams: any): Promise<any> {
@@ -3385,9 +3385,6 @@ export class BallEngine {
         }
       }
     }
-    if (((__ball_eq(name, 'List') || __ball_eq(name, 'Map')) || __ball_eq(name, 'Set'))) {
-      return { ['__class_ref__']: name, ['__type__']: '__builtin_class__' };
-    }
     if (scope.has(name)) {
       let bound = scope.lookup(name);
       if (!__ball_eq(bound, null)) {
@@ -3499,6 +3496,9 @@ export class BallEngine {
       this._globalScope.bind(staticField.fullName, value);
       return value;
     }
+    if (((__ball_eq(name, 'List') || __ball_eq(name, 'Map')) || __ball_eq(name, 'Set'))) {
+      return { ['__class_ref__']: name, ['__type__']: '__builtin_class__' };
+    }
     return scope.lookup(name);
   }
 
@@ -3992,15 +3992,17 @@ export class BallEngine {
         }
         let instanceFields = {};
         let allFieldNames = this._collectAllFieldNames(msg.typeName);
-        for (const fieldName of typeDef.fieldNames) {
-          instanceFields[fieldName] = null;
-        }
         for (const entry of fields.entries) {
           if (!entry.key.startsWith('arg')) {
             instanceFields[entry.key] = entry.value;
           }
         }
         this._initFieldDefaults(msg.typeName, instanceFields);
+        for (const fieldName of typeDef.fieldNames) {
+          if (!(fieldName in instanceFields)) {
+            instanceFields[fieldName] = null;
+          }
+        }
         let ctorEntry = this._lookupConstructor(msg.typeName);
         let resolvedParams = {};
         if ((!__ball_eq(ctorEntry, null) && hasMetadata(ctorEntry.func))) {
@@ -4282,6 +4284,24 @@ export class BallEngine {
     if ((__ball_eq(trimmed, '""') || __ball_eq(trimmed, '\'\''))) {
       return '';
     }
+    if ((((trimmed.length >= 2) && trimmed.startsWith('[')) && trimmed.endsWith(']'))) {
+      let inner = trimmed.substring(1, __ball_sub(trimmed.length, 1)).trim();
+      if ((inner.length === 0)) {
+        return [];
+      }
+      if ((!inner.includes('[') && !inner.includes('{'))) {
+        return [...inner.split(',').map(((s) => {
+          const input = s;
+          return s.trim();
+        })).filter(((s) => {
+          const input = s;
+          return !(s.length === 0);
+        })).map(((s) => {
+          const input = s;
+          return this._parseInitializer(s);
+        }))];
+      }
+    }
     let intVal = int.tryParse(trimmed);
     if (!__ball_eq(intVal, null)) {
       return intVal;
@@ -4290,7 +4310,7 @@ export class BallEngine {
     if (!__ball_eq(doubleVal, null)) {
       return doubleVal;
     }
-    if (((trimmed.startsWith('\'') && trimmed.endsWith('\'')) || (trimmed.startsWith('"') && trimmed.endsWith('"')))) {
+    if (((trimmed.length >= 2) && ((trimmed.startsWith('\'') && trimmed.endsWith('\'')) || (trimmed.startsWith('"') && trimmed.endsWith('"'))))) {
       return trimmed.substring(1, __ball_sub(trimmed.length, 1));
     }
     return trimmed;
@@ -4334,6 +4354,12 @@ export class BallEngine {
           superFields[fname] = __ball_index(childFields, fname);
         }
       }
+      this._initFieldDefaults(superclass, superFields);
+      for (const fname of parentTypeDef.fieldNames) {
+        if (!(fname in superFields)) {
+          superFields[fname] = null;
+        }
+      }
       let parentMethods = this._resolveTypeMethods(qualifiedSuperclass);
       let parentMethodsMap = parentMethods.cast();
       let grandparent = parentTypeDef.superclass;
@@ -4527,7 +4553,7 @@ export class BallEngine {
   _lazyFields(call: any): any {
     const input = call;
     if ((!hasInput(call) || !__ball_eq(whichExpr(call.input), Expression_Expr.messageCreation))) {
-      return new Set();
+      return {};
     }
     let result = {};
     for (const f of call.input.messageCreation.fields) {
@@ -5796,6 +5822,20 @@ export class BallEngine {
     throw new _FlowSignal('goto', { label: label });
   }
 
+  _gotoSignalLabel(signal: any): any {
+    const input = signal;
+    if ((signal instanceof _FlowSignal)) {
+      return (__ball_eq(signal.kind, 'goto') ? signal.label : null);
+    }
+    if ((typeof signal === 'string')) {
+      return signal;
+    }
+    if (((typeof signal === 'object' && signal !== null && !Array.isArray(signal) && !(signal instanceof BallDouble) && !(signal instanceof Set)) && __ball_eq(__ball_index(signal, 'kind'), 'goto'))) {
+      let l = __ball_index(signal, 'label');
+      return ((typeof l === 'string') ? l : null);
+    }
+  }
+
   async _evalLabel(call: any, scope: any): Promise<any> {
     let fields = this._lazyFields(call);
     let label = this._stringFieldVal(fields, 'name');
@@ -5812,13 +5852,13 @@ export class BallEngine {
       } catch (__ball_active_error) {
         const e = __ball_active_error;
         let signal = e;
-        if ((((signal instanceof _FlowSignal) && __ball_eq(signal.kind, 'goto')) && __ball_eq(signal.label, label))) {
+        if (__ball_eq(this._gotoSignalLabel(signal), label)) {
           repeat = true;
         } else {
           throw __ball_active_error;
         }
       }
-      if ((((!repeat && (result instanceof _FlowSignal)) && __ball_eq(result.kind, 'goto')) && __ball_eq(result.label, label))) {
+      if ((!repeat && __ball_eq(this._gotoSignalLabel(result), label))) {
         repeat = true;
       }
     }
@@ -8294,7 +8334,8 @@ export class BallEngine {
       }
       if (__ball_eq(typeName, null)) {
         let parts = [];
-        for (const e of map.entries) {
+        let rawMap = (((typeof v === 'object' && v !== null && !Array.isArray(v) && !(v instanceof BallDouble) && !(v instanceof Set)) && !(false /* BallMap is Map in TS */)) ? v : map);
+        for (const e of rawMap.entries) {
           let k = await this._ballToStringAsync(e.key);
           let val = await this._ballToStringAsync(e.value);
           parts = (parts.push(((__ball_to_string(k) + ': ') + __ball_to_string(val))), parts);
@@ -9018,7 +9059,7 @@ export class BallEngine {
     }
     let list = this._stdAsList(fields);
     if (__ball_eq(list, null)) {
-      return new Set();
+      return {};
     }
     let result = {};
     let positional = 1;
@@ -9979,7 +10020,7 @@ function _ballToDouble(value: any): any {
 
 function _ballValueIsSet(v: any): any {
   const input = v;
-  return (((typeof v === 'object' && v !== null && !Array.isArray(v) && !(v instanceof BallDouble) && !(v instanceof Set)) && __ball_eq(v.length, 1)) && (_kBallSetTag in v));
+  return ((typeof v === 'object' && v !== null && !Array.isArray(v) && !(v instanceof BallDouble) && !(v instanceof Set)) && (_kBallSetTag in v));
 }
 
 function _ballIsInt(v: any): any {

package/src/engine_setup.ts

@@ -485,8 +485,16 @@ export function createEngineSetup(mod: EngineModule) {
     if (v && typeof v === 'object' && v.__ball_generator__ === true) return __bts(v.values);
     if (Array.isArray(v)) return '[' + v.map(__bts).join(', ') + ']';
     if (v instanceof Map) {
+      // NOT `v.entries()` — the compiled engine's own preamble shadows
+      // `Map.prototype.entries` with a Dart-style GETTER (returning an array
+      // of {key,value} objects, matching Dart's `Map.entries` property) so
+      // Ball's `.entries` field access works. That shadow makes `v.entries`
+      // non-callable, so `v.entries()` throws "not a function" for any real
+      // Map value. Iterate the Map directly instead — a Map's default
+      // iterator already yields [key, value] pairs and is unaffected by the
+      // entries/keys/values property shadowing.
       const parts: string[] = [];
-      for (const [k, val] of v.entries()) parts.push(__bts(k) + ': ' + __bts(val));
+      for (const [k, val] of v) parts.push(__bts(k) + ': ' + __bts(val));
       return '{' + parts.join(', ') + '}';
     }
     if (v instanceof Set) return '{' + [...v].map(__bts).join(', ') + '}';
@@ -906,7 +914,16 @@ export function createEngineSetup(mod: EngineModule) {
     _r('string_char_at', (i: any) => { const m = _m(i); return String(m['value'] ?? m['string'] ?? '').charAt(Number(m['index'] ?? m['arg0'] ?? 0)); });
     _r('string_to_int', (i: any) => {
       const m = _m(i); const s = String(m['value'] ?? m['string'] ?? i ?? '').trim();
-      if (!/^-?\d+$/.test(s)) throw Object.assign(new Error('FormatException: ' + s), { __type__: 'FormatException', message: s });
+      // `.message` must be the bare invalid text (Dart's `FormatException.message`
+      // is never prefixed with the type name — only `.toString()` adds that).
+      // Setting `name: 'FormatException'` (not just a `message` override) lets
+      // the default `Error.prototype.toString()` ("name: message") produce the
+      // Dart-correct "FormatException: <text>" for anything that prints the
+      // caught exception itself rather than `.message`. Previously the message
+      // override clobbered the "FormatException: " prefix right back out,
+      // leaving `.name` as the native "Error" — undetected because no
+      // conformance fixture prints a caught FormatException directly.
+      if (!/^-?\d+$/.test(s)) throw Object.assign(new Error(s), { name: 'FormatException', __type__: 'FormatException' });
       return parseInt(s, 10);
     });
     _r('writeCharCode', (i: any) => { const m = _m(i); const self = m['self']; if (typeof self === 'object' && self !== null) { self['__buffer__'] = (self['__buffer__'] ?? '') + String.fromCharCode(Number(m['arg0'] ?? m['value'] ?? 0)); } return null; });
@@ -965,7 +982,21 @@ export function createEngineSetup(mod: EngineModule) {
       return true;
     });
     _r('concat', (i: any) => { const m = _m(i); return String(m['left'] ?? '') + String(m['right'] ?? ''); });
-    _r('null_check', (i: any) => { const m = _m(i); const v = m['value'] ?? i; if (v == null) throw new Error('Null check operator used on a null value'); return v; });
+    // `?? i` (used by most unary helpers below) can't distinguish "no `value`
+    // field" from "`value` is explicitly null" — for every OTHER helper that's
+    // harmless (a null numeric/string arg just coerces away), but for
+    // null_check it inverts the function's entire purpose: `x!` where `x` is
+    // null must throw (matches the Dart engine's `_extractUnaryArg` + null
+    // check — see engine_std.dart's 'null_check' and its
+    // "throws BallRuntimeError on null" test), yet `m['value'] ?? i` silently
+    // fell back to the (truthy) input map and returned it instead of
+    // throwing. hasOwnProperty-gate so an explicit null is honored.
+    _r('null_check', (i: any) => {
+      const m = _m(i);
+      const v = Object.prototype.hasOwnProperty.call(m, 'value') ? m['value'] : i;
+      if (v == null) throw new Error('Null check operator used on a null value');
+      return v;
+    });
     _r('compare_to', (i: any) => {
       const m = _m(i); const l = m['left'] ?? m['value'] ?? m['self'] ?? m['a'] ?? 0; const r = m['right'] ?? m['other'] ?? m['arg0'] ?? m['b'] ?? 0;
       if (typeof l === 'string' && typeof r === 'string') return l < r ? -1 : l > r ? 1 : 0;