@ball-lang/compiler 1.3.5 → 1.3.7

package/dist/types.d.ts

@@ -49,11 +49,11 @@ export interface TypeAlias {
 }
 export interface EnumDef {
     name: string;
-    values: EnumValue[];
+    value?: EnumValue[];
 }
 export interface EnumValue {
     name: string;
-    intValue?: string | number;
+    number?: number;
 }
 export interface DescriptorProto {
     name: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ball-lang/compiler",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "Ball → TypeScript compiler. Consumes a Ball protobuf Program and emits idiomatic TypeScript via ts-morph. The canonical TS compiler for Ball — lives in TS land so TS syntax knowledge doesn't leak into other languages.",
   "type": "module",
   "main": "dist/index.js",

package/src/compiler.ts

@@ -219,6 +219,26 @@ export class BallCompiler {
       this.emitClass(sf, td, members);
     }
 
+    // Enums declared in Module.enums[] (google.protobuf.EnumDescriptorProto,
+    // proto3 JSON: `{name, value: [{name, number}]}`). Both encoders emit
+    // enum declarations here (the Dart encoder with module-qualified names
+    // like "main:Color"); dropping them left `Color.red` references dangling
+    // in the compiled output (#120).
+    const emittedTypeNames = new Set(allTypeDefs.map((td) => classTsName(td.name)));
+    for (const mod of userModules) {
+      for (const en of mod.enums ?? []) {
+        const tsName = classTsName(en.name);
+        // A typeDef of the same name already produced a class declaration.
+        if (emittedTypeNames.has(tsName)) continue;
+        emittedTypeNames.add(tsName);
+        const entries = (en.value ?? []).map((v, i) => ({
+          name: v.name,
+          index: typeof v.number === "number" ? v.number : i,
+        }));
+        this.emitEnumClass(sf, tsName, entries);
+      }
+    }
+
     // Top-level variables (kind == 'top_level_variable') emit as
     // `const <name> = <body>;` before free functions.
     for (const fn of freeFunctions.filter(
@@ -2350,6 +2370,32 @@ function __isUnknownFnError(e: any): boolean {
     return false;
   }
 
+  /**
+   * Emit a Dart-style enum as a TS class with static singleton instances,
+   * `index`/`name` properties, a `values` list, and `toString()` returning
+   * `'<Enum>.<member>'`. Shared by the two enum declaration paths:
+   * typeDefs with `metadata.kind == "enum"` and `Module.enums[]`
+   * (google.protobuf.EnumDescriptorProto) entries.
+   */
+  private emitEnumClass(
+    sf: ReturnType<Project["createSourceFile"]>,
+    tsName: string,
+    entries: Array<{ name: string; index: number }>,
+  ): void {
+    const staticProps = entries.map(
+      (e) => `static readonly ${sanitize(e.name)} = new ${tsName}(${e.index}, '${e.name}');`,
+    );
+    const valuesArray = entries.map((e) => `${tsName}.${sanitize(e.name)}`).join(", ");
+    sf.addStatements(`export class ${tsName} {
+  readonly index: number;
+  readonly name: string;
+  private constructor(index: number, name: string) { this.index = index; this.name = name; }
+  ${staticProps.join("\n  ")}
+  static readonly values: ${tsName}[] = [${valuesArray}];
+  toString(): string { return '${tsName}.' + this.name; }
+}`);
+  }
+
   private emitClass(
     sf: ReturnType<Project["createSourceFile"]>,
     td: TypeDefinition,
@@ -2361,18 +2407,11 @@ function __isUnknownFnError(e: any): boolean {
     // Enum handling: emit a class with static instances, index, name, values.
     if (meta["kind"] === "enum") {
       const enumValues = Array.isArray(meta["values"]) ? meta["values"] as any[] : [];
-      const valueNames = enumValues.map((v: any) => typeof v === "string" ? v : (v?.name ?? ""));
-      // Build the enum class with index, name, static instances, and values.
-      const staticProps = valueNames.map((name, i) => `static readonly ${sanitize(name)} = new ${tsName}(${i}, '${name}');`);
-      const valuesArray = valueNames.map((name) => `${tsName}.${sanitize(name)}`).join(", ");
-      sf.addStatements(`export class ${tsName} {
-  readonly index: number;
-  readonly name: string;
-  private constructor(index: number, name: string) { this.index = index; this.name = name; }
-  ${staticProps.join("\n  ")}
-  static readonly values: ${tsName}[] = [${valuesArray}];
-  toString(): string { return '${tsName}.' + this.name; }
-}`);
+      const entries = enumValues.map((v: any, i: number) => ({
+        name: typeof v === "string" ? v : (v?.name ?? ""),
+        index: i,
+      }));
+      this.emitEnumClass(sf, tsName, entries);
       return;
     }
 
@@ -3283,10 +3322,12 @@ function __isUnknownFnError(e: any): boolean {
     const start = field(call, "start");
     let initStr: string;
     if (variable && start) {
-      // Use `var` (not `let`) to match Dart's shared-variable loop semantics.
-      // Dart closures in loops capture the shared variable (final value);
-      // JS `let` gives per-iteration copies which breaks this behavior.
-      initStr = `var ${variable} = ${this.expr(start)}`;
+      // Use `let` for a per-iteration binding: Dart's C-style for loop gives
+      // each iteration its OWN copy of the loop variable, so closures created
+      // in the body capture that iteration's value (conformance 229/312).
+      // JS `let` matches this exactly; `var` would share one binding and
+      // leak the final value into every closure (#69).
+      initStr = `let ${variable} = ${this.expr(start)}`;
     } else if (init && init.literal?.stringValue !== undefined) {
       initStr = translateInitString(init.literal.stringValue);
     } else if (init && init.block) {
@@ -3304,7 +3345,7 @@ function __isUnknownFnError(e: any): boolean {
           }
         }
       }
-      initStr = parts.length > 0 ? `var ${parts.join(", ")}` : "";
+      initStr = parts.length > 0 ? `let ${parts.join(", ")}` : "";
     } else if (init) {
       initStr = this.expr(init);
     } else {
@@ -3796,10 +3837,11 @@ function __isUnknownFnError(e: any): boolean {
 
   /**
    * Render a C-style for-init `block` (a single-let, no-result block) as an
-   * inline declaration string like `var i = 0` — NOT an IIFE, so the loop
+   * inline declaration string like `let i = 0` — NOT an IIFE, so the loop
    * variable stays in scope for the condition/update. Mirrors the Dart
-   * compiler's `_renderForInit`. Uses `var` to match Dart's shared-variable
-   * loop-capture semantics. Returns "" on an unrecognized shape.
+   * compiler's `_renderForInit`. Uses `let` so each iteration gets its own
+   * binding, matching Dart's per-iteration loop-variable capture semantics
+   * (#69, conformance 312). Returns "" on an unrecognized shape.
    */
   private renderForInit(initExpr: Expression): string {
     const block = initExpr.block;
@@ -3820,7 +3862,7 @@ function __isUnknownFnError(e: any): boolean {
         bindings.push(name);
       }
     }
-    return bindings.length > 0 ? `var ${bindings.join(", ")}` : "";
+    return bindings.length > 0 ? `let ${bindings.join(", ")}` : "";
   }
 
   private compileFieldAccess(fa: NonNullable<Expression["fieldAccess"]>): string {

package/src/types.ts

@@ -55,14 +55,16 @@ export interface TypeAlias {
   metadata?: Struct;
 }
 
+// google.protobuf.EnumDescriptorProto in proto3 JSON form:
+// `{ "name": "main:Color", "value": [{ "name": "red", "number": 0 }] }`.
 export interface EnumDef {
   name: string;
-  values: EnumValue[];
+  value?: EnumValue[];
 }
 
 export interface EnumValue {
   name: string;
-  intValue?: string | number;
+  number?: number;
 }
 
 export interface DescriptorProto {