@elaraai/east 0.0.1-beta.28 → 0.0.1-beta.29

package/dist/src/error.d.ts

@@ -3,12 +3,19 @@
  * Dual-licensed under AGPL-3.0 and commercial license. See LICENSE for details.
  */
 import type { LocationValue } from "./ir.js";
+/**
+ * Internal error for invariant violations in the East compiler/runtime.
+ * These indicate bugs in East itself, not user errors.
+ */
+export declare class InternalError extends Error {
+    constructor(message: string);
+}
 export declare class EastError extends Error {
     location: LocationValue[];
     eastMessage: string;
     constructor(message: string, options: {
         cause?: any;
-        location: LocationValue;
+        location: LocationValue[];
     });
     toString(): string;
     /** Format for use with Error.message */

package/dist/src/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/error.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,qBAAa,SAAU,SAAQ,KAAK;IAC3B,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;gBAEf,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,KAAK,CAAC,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,aAAa,CAAA;KAAE;IAMrE,QAAQ,IAAI,MAAM;IAkB3B,wCAAwC;IACxC,IAAI,gBAAgB,IAAI,MAAM,CAE7B;CACF"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/error.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C;;;GAGG;AACH,qBAAa,aAAc,SAAQ,KAAK;gBAC1B,OAAO,EAAE,MAAM;CAI5B;AAED,qBAAa,SAAU,SAAQ,KAAK;IAC3B,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;gBAEf,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,KAAK,CAAC,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,aAAa,EAAE,CAAA;KAAE;IAMvE,QAAQ,IAAI,MAAM;IAkB3B,wCAAwC;IACxC,IAAI,gBAAgB,IAAI,MAAM,CAE7B;CACF"}

package/dist/src/error.js

@@ -1,10 +1,20 @@
+/**
+ * Internal error for invariant violations in the East compiler/runtime.
+ * These indicate bugs in East itself, not user errors.
+ */
+export class InternalError extends Error {
+    constructor(message) {
+        super(`Internal East error: ${message}`);
+        this.name = "InternalError";
+    }
+}
 export class EastError extends Error {
     location;
     eastMessage;
     constructor(message, options) {
         super(message, options.cause === undefined ? undefined : { cause: options.cause });
         this.eastMessage = message;
-        this.location = [options.location];
+        this.location = [...options.location];
     }
     toString() {
         const loc = this.location[0];

package/dist/src/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/error.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,SAAU,SAAQ,KAAK;IAC3B,QAAQ,CAAkB;IAC1B,WAAW,CAAS;IAE3B,YAAY,OAAe,EAAE,OAAiD;QAC5E,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACnF,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAEQ,QAAQ;QACf,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;QAEhF,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC9B,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,0DAA0D;QAC1D,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QACvC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,wCAAwC;IACxC,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;CACF"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/error.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,OAAO,aAAc,SAAQ,KAAK;IACtC,YAAY,OAAe;QACzB,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,CAAC;CACF;AAED,MAAM,OAAO,SAAU,SAAQ,KAAK;IAC3B,QAAQ,CAAkB;IAC1B,WAAW,CAAS;IAE3B,YAAY,OAAe,EAAE,OAAmD;QAC9E,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACnF,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAEQ,QAAQ;QACf,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;QAEhF,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC9B,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,0DAA0D;QAC1D,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QACvC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,wCAAwC;IACxC,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;CACF"}

package/dist/src/expr/array.js

@@ -59,7 +59,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: IntegerType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArraySize",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol]],
@@ -84,7 +84,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: IntegerType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArraySize",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol]],
@@ -112,7 +112,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: BooleanType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayHas",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], keyAst],
@@ -151,7 +151,7 @@ export class ArrayExpr extends Expr {
             return this[FactorySymbol]({
                 ast_type: "Builtin",
                 type: this.value_type,
-                location: get_location(2),
+                location: get_location(),
                 builtin: "ArrayGetOrDefault",
                 type_parameters: [this.value_type],
                 arguments: [this[AstSymbol], keyAst, defaultFnAst],
@@ -161,7 +161,7 @@ export class ArrayExpr extends Expr {
             return this[FactorySymbol]({
                 ast_type: "Builtin",
                 type: this.value_type,
-                location: get_location(2),
+                location: get_location(),
                 builtin: "ArrayGet",
                 type_parameters: [this.value_type],
                 arguments: [this[AstSymbol], keyAst],
@@ -201,7 +201,7 @@ export class ArrayExpr extends Expr {
             return this[FactorySymbol]({
                 ast_type: "Builtin",
                 type: this.value_type,
-                location: get_location(2),
+                location: get_location(),
                 builtin: "ArrayGetOrDefault",
                 type_parameters: [this.value_type],
                 arguments: [this[AstSymbol], keyAst, defaultFnAst],
@@ -211,7 +211,7 @@ export class ArrayExpr extends Expr {
             return this[FactorySymbol]({
                 ast_type: "Builtin",
                 type: this.value_type,
-                location: get_location(2),
+                location: get_location(),
                 builtin: "ArrayGet",
                 type_parameters: [this.value_type],
                 arguments: [this[AstSymbol], keyAst],
@@ -239,7 +239,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: OptionType(this.value_type),
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayTryGet",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], keyAst],
@@ -270,7 +270,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayUpdate",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], keyAst, valueAst],
@@ -283,7 +283,7 @@ export class ArrayExpr extends Expr {
      * @see {@link update} for simply replacing the value.
      */
     merge(key, value, updateFn) {
-        const location = get_location(2);
+        const location = get_location();
         const keyAst = valueOrExprToAstTyped(key, IntegerType);
         const value2Type = value[TypeSymbol];
         const updateFnExpr = Expr.from(updateFn, FunctionType([value2Type, this.value_type, IntegerType], this.value_type));
@@ -317,7 +317,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayPushLast",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], valueAst],
@@ -343,7 +343,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: this.value_type,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayPopLast",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol]],
@@ -370,7 +370,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayPushFirst",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], valueAst],
@@ -396,7 +396,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: this.value_type,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayPopFirst",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol]],
@@ -423,7 +423,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayAppend",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], arrayExpr[AstSymbol]],
@@ -451,7 +451,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayPrepend",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], arrayExpr[AstSymbol]],
@@ -499,7 +499,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayMergeAll",
             type_parameters: [this.value_type, value2Type],
             arguments: [this[AstSymbol], array[AstSymbol], mergeFnExpr[AstSymbol]],
@@ -524,7 +524,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayClear",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol]],
@@ -580,7 +580,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArraySortInPlace",
             type_parameters: [this.value_type, projectedType],
             arguments: [this[AstSymbol], byExpr[AstSymbol]],
@@ -635,7 +635,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: this[TypeSymbol],
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArraySort",
             type_parameters: [this.value_type, projectedType],
             arguments: [this[AstSymbol], byExpr[AstSymbol]],
@@ -662,7 +662,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayReverseInPlace",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol]],
@@ -691,7 +691,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: this[TypeSymbol],
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayReverse",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol]],
@@ -740,7 +740,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: BooleanType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayIsSorted",
             type_parameters: [this.value_type, projectedType],
             arguments: [this[AstSymbol], byExpr[AstSymbol]],
@@ -797,7 +797,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: IntegerType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayFindSortedFirst",
             type_parameters: [this.value_type, projectedType],
             arguments: [this[AstSymbol], valueAst, byExpr[AstSymbol]],
@@ -842,7 +842,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: IntegerType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayFindSortedLast",
             type_parameters: [this.value_type, projectedType],
             arguments: [this[AstSymbol], valueAst, byExpr[AstSymbol]],
@@ -886,7 +886,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: StructType({ start: IntegerType, end: IntegerType }),
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayFindSortedRange",
             type_parameters: [this.value_type, projectedType],
             arguments: [this[AstSymbol], valueAst, byExpr[AstSymbol]],
@@ -918,7 +918,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: this[TypeSymbol],
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArraySlice",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], startExpr[AstSymbol], endExpr[AstSymbol]],
@@ -947,7 +947,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: this[TypeSymbol],
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayConcat",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], otherExpr[AstSymbol]],
@@ -985,7 +985,7 @@ export class ArrayExpr extends Expr {
         const keysExpr = Expr.from(keys, ArrayType(IntegerType));
         let default_function_ast;
         if (onMissing === undefined) {
-            const location = get_location(2);
+            const location = get_location();
             const default_function = Expr.function([IntegerType], this.value_type, ($, key) => $.error(Expr.str `Cannot get key ${key} from array`, location));
             default_function_ast = Expr.ast(default_function);
         }
@@ -996,7 +996,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: this[TypeSymbol],
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayGetKeys",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol], keysExpr[AstSymbol], default_function_ast],
@@ -1031,7 +1031,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayForEach",
             type_parameters: [this.value_type, returnType],
             arguments: [this[AstSymbol], fn[AstSymbol]],
@@ -1062,7 +1062,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: this[TypeSymbol],
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayCopy",
             type_parameters: [this.value_type],
             arguments: [this[AstSymbol]],
@@ -1088,7 +1088,7 @@ export class ArrayExpr extends Expr {
                 return this[FactorySymbol]({
                     ast_type: "Builtin",
                     type: ArrayType(output_type),
-                    location: get_location(2),
+                    location: get_location(),
                     builtin: "ArrayMap",
                     type_parameters: [this.value_type, output_type],
                     arguments: [this[AstSymbol], fn[AstSymbol]],
@@ -1160,7 +1160,7 @@ export class ArrayExpr extends Expr {
             }
             return this[FactorySymbol]({
                 ast_type: "Builtin",
-                location: get_location(2),
+                location: get_location(),
                 type: this[TypeSymbol],
                 builtin: "ArrayFilter",
                 type_parameters: [this.value_type],
@@ -1184,7 +1184,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: ArrayType(someType),
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayFilterMap",
             type_parameters: [this.value_type, someType],
             arguments: [this[AstSymbol], fnAst],
@@ -1203,7 +1203,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: returnType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayFirstMap",
             type_parameters: [this.value_type, someType],
             arguments: [this[AstSymbol], fnAst],
@@ -1290,7 +1290,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: returnType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayFold",
             type_parameters: [this.value_type, returnType],
             arguments: [this[AstSymbol], initAst, combineAst],
@@ -1303,7 +1303,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: mapType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayMapReduce",
             type_parameters: [this.value_type, mapType],
             arguments: [this[AstSymbol], mapAst, combineAst],
@@ -1593,7 +1593,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: StringType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayStringJoin",
             type_parameters: [],
             arguments: [this[AstSymbol], stringAst],
@@ -1605,7 +1605,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: SetType(keyType),
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayToSet",
             type_parameters: [this.value_type, keyType],
             arguments: [this[AstSymbol], keyFnAst],
@@ -1618,7 +1618,7 @@ export class ArrayExpr extends Expr {
         const valueType = valueFnAst.type.output;
         let onConflictAst;
         if (onConflictFn === undefined) {
-            const location = get_location(2);
+            const location = get_location();
             const onConflictFunction = Expr.function([valueType, valueType, keyType], valueType, ($, existing, value, key) => $.error(Expr.str `Cannot insert duplicate key ${key} into dict`, location));
             onConflictAst = Expr.ast(onConflictFunction);
         }
@@ -1628,7 +1628,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: DictType(keyType, valueType),
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayToDict",
             type_parameters: [this.value_type, keyType, valueType],
             arguments: [this[AstSymbol], keyFnAst, valueFnAst, onConflictAst],
@@ -1644,7 +1644,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: ArrayType(elementType),
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayFlattenToArray",
             type_parameters: [this.value_type, elementType],
             arguments: [this[AstSymbol], fnAst],
@@ -1660,7 +1660,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: SetType(elementType),
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayFlattenToSet",
             type_parameters: [this.value_type, elementType],
             arguments: [this[AstSymbol], fnAst],
@@ -1676,7 +1676,7 @@ export class ArrayExpr extends Expr {
         const valueType = returnType.value;
         let onConflictAst;
         if (onConflictFn === undefined) {
-            const location = get_location(2);
+            const location = get_location();
             const onConflictFunction = Expr.function([valueType, valueType, keyType], valueType, ($, existing, value, key) => $.error(Expr.str `Cannot insert duplicate key ${key} into dict`, location));
             onConflictAst = Expr.ast(onConflictFunction);
         }
@@ -1686,7 +1686,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: DictType(keyType, valueType),
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayFlattenToDict",
             type_parameters: [this.value_type, keyType, valueType],
             arguments: [this[AstSymbol], fnAst, onConflictAst],
@@ -1702,7 +1702,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: DictType(keyType, initType),
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayGroupFold",
             type_parameters: [this.value_type, keyType, initType],
             arguments: [this[AstSymbol], keyFnAst, initFnAst, reduceFnAst],
@@ -1906,7 +1906,7 @@ export class ArrayExpr extends Expr {
         return this[FactorySymbol]({
             ast_type: "Builtin",
             type: BlobType,
-            location: get_location(2),
+            location: get_location(),
             builtin: "ArrayEncodeCsv",
             type_parameters: [this.value_type, CsvSerializeConfigType],
             arguments: [this[AstSymbol], configAst],