brighterscript 0.66.0-alpha.3 → 0.66.0-alpha.5

package/dist/types/ClassType.d.ts

@@ -1,3 +1,4 @@
+import { SymbolTable } from '../SymbolTable';
 import type { BscType } from './BscType';
 import { BscTypeKind } from './BscTypeKind';
 import { InheritableType } from './InheritableType';
@@ -8,4 +9,7 @@ export declare class ClassType extends InheritableType {
     readonly kind = BscTypeKind.ClassType;
     isTypeCompatible(targetType: BscType): any;
     isEqual(targetType: BscType): boolean;
+    private builtInMemberTable;
+    getBuiltInMemberTable(): SymbolTable;
+    addBuiltInInterfaces(): void;
 }

package/dist/types/ClassType.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClassType = void 0;
+const SymbolTable_1 = require("../SymbolTable");
 const reflection_1 = require("../astUtils/reflection");
 const BscTypeKind_1 = require("./BscTypeKind");
+const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
 const InheritableType_1 = require("./InheritableType");
+const helpers_1 = require("./helpers");
 class ClassType extends InheritableType_1.InheritableType {
     constructor(name, superClass) {
         super(name, superClass);
@@ -15,7 +18,9 @@ class ClassType extends InheritableType_1.InheritableType {
         if (this.isEqual(targetType)) {
             return true;
         }
-        else if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType)) {
+        else if ((0, reflection_1.isDynamicType)(targetType) ||
+            (0, reflection_1.isObjectType)(targetType) ||
+            (0, helpers_1.isUnionTypeCompatible)(this, targetType)) {
             return true;
         }
         else if ((0, reflection_1.isClassType)(targetType)) {
@@ -26,6 +31,25 @@ class ClassType extends InheritableType_1.InheritableType {
     isEqual(targetType) {
         return (0, reflection_1.isClassType)(targetType) && this.name.toLowerCase() === targetType.name.toLowerCase();
     }
+    getBuiltInMemberTable() {
+        if (!this.parentType) {
+            if (this.builtInMemberTable) {
+                return this.builtInMemberTable;
+            }
+            this.builtInMemberTable = new SymbolTable_1.SymbolTable(`${this.__identifier} Built-in Members`);
+            this.pushMemberProvider(() => this.builtInMemberTable);
+            return this.builtInMemberTable;
+        }
+    }
+    addBuiltInInterfaces() {
+        if (!this.hasAddedBuiltInInterfaces) {
+            if (this.parentType) {
+                this.parentType.addBuiltInInterfaces();
+            }
+            BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.addBuiltInInterfacesToType(this);
+        }
+        this.hasAddedBuiltInInterfaces = true;
+    }
 }
 exports.ClassType = ClassType;
 //# sourceMappingURL=ClassType.js.map

package/dist/types/ClassType.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClassType.js","sourceRoot":"","sources":["../../src/types/ClassType.ts"],"names":[],"mappings":";;;AAAA,uDAAkF;AAElF,+CAA4C;AAC5C,uDAAoD;AAEpD,MAAa,SAAU,SAAQ,iCAAe;IAE1C,YAAmB,IAAY,EAAkB,UAAoB;QACjE,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QADT,SAAI,GAAJ,IAAI,CAAQ;QAAkB,eAAU,GAAV,UAAU,CAAU;QAIrD,SAAI,GAAG,yBAAW,CAAC,SAAS,CAAC;IAF7C,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,EAAE;YAC9D,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,wBAAW,EAAC,UAAU,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;SAC5C;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,wBAAW,EAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAChG,CAAC;CACJ;AAtBD,8BAsBC"}
+{"version":3,"file":"ClassType.js","sourceRoot":"","sources":["../../src/types/ClassType.ts"],"names":[],"mappings":";;;AAAA,gDAA6C;AAC7C,uDAAkF;AAElF,+CAA4C;AAC5C,mEAAgE;AAChE,uDAAoD;AACpD,uCAAkD;AAElD,MAAa,SAAU,SAAQ,iCAAe;IAE1C,YAAmB,IAAY,EAAkB,UAAoB;QACjE,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QADT,SAAI,GAAJ,IAAI,CAAQ;QAAkB,eAAU,GAAV,UAAU,CAAU;QAIrD,SAAI,GAAG,yBAAW,CAAC,SAAS,CAAC;IAF7C,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC;YAChC,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAA,wBAAW,EAAC,UAAU,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;SAC5C;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,wBAAW,EAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAChG,CAAC;IAID,qBAAqB;QACjB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,IAAI,IAAI,CAAC,kBAAkB,EAAE;gBACzB,OAAO,IAAI,CAAC,kBAAkB,CAAC;aAClC;YACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,yBAAW,CAAC,GAAG,IAAI,CAAC,YAAY,mBAAmB,CAAC,CAAC;YACnF,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC,kBAAkB,CAAC;SAClC;IACL,CAAC;IAED,oBAAoB;QAChB,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE;YACjC,IAAI,IAAI,CAAC,UAAU,EAAE;gBACjB,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;aAC1C;YACD,6CAAqB,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;SAC1D;QACD,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;IAC1C,CAAC;CACJ;AA/CD,8BA+CC"}

package/dist/types/DoubleType.d.ts

@@ -5,7 +5,7 @@ export declare class DoubleType extends BscType {
     constructor(typeText?: string);
     readonly kind = BscTypeKind.DoubleType;
     static instance: DoubleType;
-    isTypeCompatible(targetType: BscType): boolean;
+    isTypeCompatible(targetType: BscType): any;
     toString(): string;
     toTypeString(): string;
     isEqual(targetType: BscType): boolean;

package/dist/types/DoubleType.js

@@ -4,6 +4,8 @@ exports.DoubleType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 const BscType_1 = require("./BscType");
 const BscTypeKind_1 = require("./BscTypeKind");
+const helpers_1 = require("./helpers");
+const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
 class DoubleType extends BscType_1.BscType {
     constructor(typeText) {
         super();
@@ -16,7 +18,8 @@ class DoubleType extends BscType_1.BscType {
             (0, reflection_1.isIntegerType)(targetType) ||
             (0, reflection_1.isFloatType)(targetType) ||
             (0, reflection_1.isDoubleType)(targetType) ||
-            (0, reflection_1.isLongIntegerType)(targetType));
+            (0, reflection_1.isLongIntegerType)(targetType) ||
+            (0, helpers_1.isUnionTypeCompatible)(this, targetType));
     }
     toString() {
         var _a;
@@ -31,4 +34,5 @@ class DoubleType extends BscType_1.BscType {
 }
 exports.DoubleType = DoubleType;
 DoubleType.instance = new DoubleType('double');
+BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('double', DoubleType.instance);
 //# sourceMappingURL=DoubleType.js.map

package/dist/types/DoubleType.js.map

@@ -1 +1 @@
-{"version":3,"file":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAG5C,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAChC,CAAC;IACN,CAAC;IACM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,yBAAY,EAAC,UAAU,CAAC,CAAC;IACpC,CAAC;;AA/BL,gCAgCC;AAvBiB,mBAAQ,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,uCAAkD;AAElD,mEAAgE;AAEhE,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC;YAC7B,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,CAAC,CAC1C,CAAC;IACN,CAAC;IACM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,yBAAY,EAAC,UAAU,CAAC,CAAC;IACpC,CAAC;;AAhCL,gCAkCC;AAzBiB,mBAAQ,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;AA2BtD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC"}

package/dist/types/DynamicType.js

@@ -4,6 +4,7 @@ exports.DynamicType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 const BscType_1 = require("./BscType");
 const BscTypeKind_1 = require("./BscTypeKind");
+const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
 class DynamicType extends BscType_1.BscType {
     constructor(typeText) {
         super();
@@ -40,4 +41,5 @@ class DynamicType extends BscType_1.BscType {
 }
 exports.DynamicType = DynamicType;
 DynamicType.instance = new DynamicType();
+BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('dynamic', DynamicType.instance);
 //# sourceMappingURL=DynamicType.js.map

package/dist/types/DynamicType.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamicType.js","sourceRoot":"","sources":["../../src/types/DynamicType.ts"],"names":[],"mappings":";;;AACA,uDAAuD;AACvD,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,WAAY,SAAQ,iBAAO;IACpC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,WAAW,CAAC;IAF/C,CAAC;IAMD,IAAI,UAAU;QACV,OAAO,WAAW,CAAC,QAAQ,CAAC;IAChC,CAAC;IAEM,cAAc,CAAC,UAAmB;QACrC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;OAEG;IACI,gBAAgB,CAAC,UAAmB;QACvC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,SAAS,CAAC;IACtC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,aAAa,CAAC,UAAkB,EAAE,OAAuB;QACrD,OAAO,WAAW,CAAC,QAAQ,CAAC;IAChC,CAAC;;AA1CL,kCA2CC;AAlC0B,oBAAQ,GAAG,IAAI,WAAW,EAAE,CAAC"}
+{"version":3,"file":"DynamicType.js","sourceRoot":"","sources":["../../src/types/DynamicType.ts"],"names":[],"mappings":";;;AACA,uDAAuD;AACvD,uCAAoC;AACpC,+CAA4C;AAC5C,mEAAgE;AAEhE,MAAa,WAAY,SAAQ,iBAAO;IACpC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,WAAW,CAAC;IAF/C,CAAC;IAMD,IAAI,UAAU;QACV,OAAO,WAAW,CAAC,QAAQ,CAAC;IAChC,CAAC;IAEM,cAAc,CAAC,UAAmB;QACrC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;OAEG;IACI,gBAAgB,CAAC,UAAmB;QACvC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,SAAS,CAAC;IACtC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,aAAa,CAAC,UAAkB,EAAE,OAAuB;QACrD,OAAO,WAAW,CAAC,QAAQ,CAAC;IAChC,CAAC;;AA1CL,kCA2CC;AAlC0B,oBAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;AAoCxD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC"}

package/dist/types/EnumType.d.ts

@@ -16,6 +16,7 @@ export declare class EnumType extends BscType {
     toString(): string;
     toTypeString(): string;
     isEqual(targetType: BscType): boolean;
+    get defaultMemberType(): EnumMemberType;
 }
 export declare class EnumMemberType extends BscType {
     enumName: string;

package/dist/types/EnumType.js

@@ -5,6 +5,7 @@ const reflection_1 = require("../astUtils/reflection");
 const BscType_1 = require("./BscType");
 const BscTypeKind_1 = require("./BscTypeKind");
 const DynamicType_1 = require("./DynamicType");
+const helpers_1 = require("./helpers");
 class EnumType extends BscType_1.BscType {
     constructor(name, 
     /**
@@ -20,7 +21,8 @@ class EnumType extends BscType_1.BscType {
         return ((0, reflection_1.isDynamicType)(targetType) ||
             (0, reflection_1.isObjectType)(targetType) ||
             this.isEqual(targetType) ||
-            ((0, reflection_1.isEnumMemberType)(targetType) && (targetType === null || targetType === void 0 ? void 0 : targetType.enumName.toLowerCase()) === this.name.toLowerCase()));
+            ((0, reflection_1.isEnumMemberType)(targetType) && (targetType === null || targetType === void 0 ? void 0 : targetType.enumName.toLowerCase()) === this.name.toLowerCase()) ||
+            (0, helpers_1.isUnionTypeCompatible)(this, targetType));
     }
     toString() {
         return this.name;
@@ -31,6 +33,9 @@ class EnumType extends BscType_1.BscType {
     isEqual(targetType) {
         return (0, reflection_1.isEnumType)(targetType) && (targetType === null || targetType === void 0 ? void 0 : targetType.name.toLowerCase()) === this.name.toLowerCase();
     }
+    get defaultMemberType() {
+        return new EnumMemberType(this.name, 'default', this.underlyingType);
+    }
 }
 exports.EnumType = EnumType;
 class EnumMemberType extends BscType_1.BscType {

package/dist/types/EnumType.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnumType.js","sourceRoot":"","sources":["../../src/types/EnumType.ts"],"names":[],"mappings":";;;AAAA,uDAAmG;AACnG,uCAAoC;AACpC,+CAA4C;AAC5C,+CAA4C;AAE5C,MAAa,QAAS,SAAQ,iBAAO;IACjC,YACW,IAAY;IACnB;;OAEG;IACI,iBAA0B,yBAAW,CAAC,QAAQ;QAErD,KAAK,CAAC,IAAI,CAAC,CAAC;QANL,SAAI,GAAJ,IAAI,CAAQ;QAIZ,mBAAc,GAAd,cAAc,CAAgC;QAKzC,SAAI,GAAG,yBAAW,CAAC,QAAQ,CAAC;IAF5C,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACxB,CAAC,IAAA,6BAAgB,EAAC,UAAU,CAAC,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CACnG,CAAC;IACN,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,uBAAU,EAAC,UAAU,CAAC,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAChG,CAAC;CACJ;AAjCD,4BAiCC;AAGD,MAAa,cAAe,SAAQ,iBAAO;IACvC,YACW,QAAgB,EAChB,UAAkB;IACzB;;OAEG;IACI,iBAA0B,yBAAW,CAAC,QAAQ;QAErD,KAAK,CAAC,GAAG,QAAQ,IAAI,UAAU,EAAE,CAAC,CAAC;QAP5B,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;QAIlB,mBAAc,GAAd,cAAc,CAAgC;QAKzC,SAAI,GAAG,yBAAW,CAAC,cAAc,CAAC;IAFlD,CAAC;IAIM,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACxB,CAAC,IAAA,uBAAU,EAAC,UAAU,CAAC;gBACnB,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YACnE,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,YAAY;QACf,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,6BAAgB,EAAC,UAAU,CAAC;YAC/B,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;YAClE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAC,WAAW,EAAE,MAAK,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;IAC/E,CAAC;CACJ;AA3CD,wCA2CC"}
+{"version":3,"file":"EnumType.js","sourceRoot":"","sources":["../../src/types/EnumType.ts"],"names":[],"mappings":"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"}

package/dist/types/FloatType.d.ts

@@ -5,7 +5,7 @@ export declare class FloatType extends BscType {
     constructor(typeText?: string);
     readonly kind = BscTypeKind.FloatType;
     static instance: FloatType;
-    isTypeCompatible(targetType: BscType): boolean;
+    isTypeCompatible(targetType: BscType): any;
     toString(): string;
     toTypeString(): string;
     isEqual(targetType: BscType): boolean;

package/dist/types/FloatType.js

@@ -4,6 +4,8 @@ exports.FloatType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 const BscType_1 = require("./BscType");
 const BscTypeKind_1 = require("./BscTypeKind");
+const helpers_1 = require("./helpers");
+const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
 class FloatType extends BscType_1.BscType {
     constructor(typeText) {
         super();
@@ -16,7 +18,8 @@ class FloatType extends BscType_1.BscType {
             (0, reflection_1.isIntegerType)(targetType) ||
             (0, reflection_1.isFloatType)(targetType) ||
             (0, reflection_1.isDoubleType)(targetType) ||
-            (0, reflection_1.isLongIntegerType)(targetType));
+            (0, reflection_1.isLongIntegerType)(targetType) ||
+            (0, helpers_1.isUnionTypeCompatible)(this, targetType));
     }
     toString() {
         var _a;
@@ -31,4 +34,5 @@ class FloatType extends BscType_1.BscType {
 }
 exports.FloatType = FloatType;
 FloatType.instance = new FloatType('float');
+BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('float', FloatType.instance);
 //# sourceMappingURL=FloatType.js.map

package/dist/types/FloatType.js.map

@@ -1 +1 @@
-{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,SAAU,SAAQ,iBAAO;IAClC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,SAAS,CAAC;IAF7C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAChC,CAAC;IAEN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,OAAO,CAAC;IACpC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,wBAAW,EAAC,UAAU,CAAC,CAAC;IACnC,CAAC;;AAjCL,8BAkCC;AAzBiB,kBAAQ,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,uCAAkD;AAClD,mEAAgE;AAEhE,MAAa,SAAU,SAAQ,iBAAO;IAClC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,SAAS,CAAC;IAF7C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC;YAC7B,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,CAAC,CAC1C,CAAC;IAEN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,OAAO,CAAC;IACpC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,OAAO,CAAC,UAAmB;QAC9B,OAAO,IAAA,wBAAW,EAAC,UAAU,CAAC,CAAC;IACnC,CAAC;;AAlCL,8BAmCC;AA1BiB,kBAAQ,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;AA4BpD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC"}

package/dist/types/FunctionType.js

@@ -4,6 +4,8 @@ exports.FunctionType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 const BaseFunctionType_1 = require("./BaseFunctionType");
 const BscTypeKind_1 = require("./BscTypeKind");
+const helpers_1 = require("./helpers");
+const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
 class FunctionType extends BaseFunctionType_1.BaseFunctionType {
     constructor(typeText) {
         super();
@@ -13,7 +15,8 @@ class FunctionType extends BaseFunctionType_1.BaseFunctionType {
     isTypeCompatible(targetType) {
         if ((0, reflection_1.isDynamicType)(targetType) ||
             (0, reflection_1.isCallableType)(targetType) ||
-            (0, reflection_1.isObjectType)(targetType)) {
+            (0, reflection_1.isObjectType)(targetType) ||
+            (0, helpers_1.isUnionTypeCompatible)(this, targetType)) {
             return true;
         }
         return false;
@@ -34,4 +37,5 @@ class FunctionType extends BaseFunctionType_1.BaseFunctionType {
 }
 exports.FunctionType = FunctionType;
 FunctionType.instance = new FunctionType('function');
+BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('function', new FunctionType());
 //# sourceMappingURL=FunctionType.js.map

package/dist/types/FunctionType.js.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionType.js","sourceRoot":"","sources":["../../src/types/FunctionType.ts"],"names":[],"mappings":";;;AAAA,uDAAqG;AACrG,yDAAsD;AAEtD,+CAA4C;AAE5C,MAAa,YAAa,SAAQ,mCAAgB;IAC9C,YAAmB,QAAiB;QAChC,KAAK,EAAE,CAAC;QADO,aAAQ,GAAR,QAAQ,CAAS;QAIpB,SAAI,GAAG,yBAAW,CAAC,YAAY,CAAC;IAFhD,CAAC;IAQM,gBAAgB,CAAC,UAAmB;QACvC,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,2BAAc,EAAC,UAAU,CAAC;YAC1B,IAAA,yBAAY,EAAC,UAAU,CAAC,EAC1B;YACE,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAE/B,CAAC;IAEM,YAAY;;QACf,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,UAAU,CAAC;IACvC,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,IAAI,IAAA,2BAAc,EAAC,UAAU,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;;AApCL,oCAqCC;AA7BiB,qBAAQ,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"FunctionType.js","sourceRoot":"","sources":["../../src/types/FunctionType.ts"],"names":[],"mappings":";;;AAAA,uDAAqG;AACrG,yDAAsD;AAEtD,+CAA4C;AAC5C,uCAAkD;AAClD,mEAAgE;AAEhE,MAAa,YAAa,SAAQ,mCAAgB;IAC9C,YAAmB,QAAiB;QAChC,KAAK,EAAE,CAAC;QADO,aAAQ,GAAR,QAAQ,CAAS;QAIpB,SAAI,GAAG,yBAAW,CAAC,YAAY,CAAC;IAFhD,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,2BAAc,EAAC,UAAU,CAAC;YAC1B,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,CAAC,EACzC;YACE,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAE/B,CAAC;IAEM,YAAY;;QACf,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,UAAU,CAAC;IACvC,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,IAAI,IAAA,2BAAc,EAAC,UAAU,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;;AAnCL,oCAoCC;AA7BiB,qBAAQ,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;AA+B1D,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,YAAY,EAAE,CAAC,CAAC"}

package/dist/types/IntegerType.d.ts

@@ -5,7 +5,7 @@ export declare class IntegerType extends BscType {
     constructor(typeText?: string);
     readonly kind = BscTypeKind.IntegerType;
     static instance: IntegerType;
-    isTypeCompatible(targetType: BscType): boolean;
+    isTypeCompatible(targetType: BscType): any;
     toString(): string;
     toTypeString(): string;
     isEqual(otherType: BscType): boolean;

package/dist/types/IntegerType.js

@@ -4,6 +4,8 @@ exports.IntegerType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 const BscType_1 = require("./BscType");
 const BscTypeKind_1 = require("./BscTypeKind");
+const helpers_1 = require("./helpers");
+const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
 class IntegerType extends BscType_1.BscType {
     constructor(typeText) {
         super();
@@ -16,7 +18,8 @@ class IntegerType extends BscType_1.BscType {
             (0, reflection_1.isIntegerType)(targetType) ||
             (0, reflection_1.isFloatType)(targetType) ||
             (0, reflection_1.isDoubleType)(targetType) ||
-            (0, reflection_1.isLongIntegerType)(targetType));
+            (0, reflection_1.isLongIntegerType)(targetType) ||
+            (0, helpers_1.isUnionTypeCompatible)(this, targetType));
     }
     toString() {
         var _a;
@@ -31,4 +34,5 @@ class IntegerType extends BscType_1.BscType {
 }
 exports.IntegerType = IntegerType;
 IntegerType.instance = new IntegerType('integer');
+BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('integer', IntegerType.instance);
 //# sourceMappingURL=IntegerType.js.map

package/dist/types/IntegerType.js.map

@@ -1 +1 @@
-{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,WAAY,SAAQ,iBAAO;IACpC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,WAAW,CAAC;IAF/C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAChC,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,SAAS,CAAC;IACtC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,0BAAa,EAAC,SAAS,CAAC,CAAC;IACpC,CAAC;;AAhCL,kCAiCC;AAxBiB,oBAAQ,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,uCAAkD;AAClD,mEAAgE;AAEhE,MAAa,WAAY,SAAQ,iBAAO;IACpC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,WAAW,CAAC;IAF/C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC;YAC7B,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,CAAC,CAC1C,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,SAAS,CAAC;IACtC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,0BAAa,EAAC,SAAS,CAAC,CAAC;IACpC,CAAC;;AAjCL,kCAkCC;AAzBiB,oBAAQ,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;AA2BxD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC"}

package/dist/types/InterfaceType.js

@@ -5,6 +5,7 @@ const SymbolTable_1 = require("../SymbolTable");
 const reflection_1 = require("../astUtils/reflection");
 const BscTypeKind_1 = require("./BscTypeKind");
 const InheritableType_1 = require("./InheritableType");
+const helpers_1 = require("./helpers");
 class InterfaceType extends InheritableType_1.InheritableType {
     constructor(name, superInterface) {
         super(name, superInterface);
@@ -13,7 +14,7 @@ class InterfaceType extends InheritableType_1.InheritableType {
         this.kind = BscTypeKind_1.BscTypeKind.InterfaceType;
     }
     isTypeCompatible(targetType) {
-        if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType)) {
+        if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType) || (0, helpers_1.isUnionTypeCompatible)(this, targetType)) {
             return true;
         }
         //TODO: We need to make sure that things don't get assigned to built-in types

package/dist/types/InterfaceType.js.map

@@ -1 +1 @@
-{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,uDAAsH;AAEtH,+CAA4C;AAC5C,uDAAoD;AAEpD,MAAa,aAAc,SAAQ,iCAAe;IAC9C,YACW,IAAY,EACH,cAAwB;QAExC,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAHrB,SAAI,GAAJ,IAAI,CAAQ;QACH,mBAAc,GAAd,cAAc,CAAU;QAK5B,SAAI,GAAG,yBAAW,CAAC,aAAa,CAAC;IAFjD,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,EAAE;YACvD,OAAO,IAAI,CAAC;SACf;QACD,6EAA6E;QAC7E,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC;SACf;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACjD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE;YACvE,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAA,8BAAiB,EAAC,UAAU,CAAC,IAAI,IAAA,wBAAW,EAAC,UAAU,CAAC,EAAE;YAC1D,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;SACpF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,4BAAe,EAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACpG,CAAC;CACJ;AAlCD,sCAkCC"}
+{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,uDAAsH;AAEtH,+CAA4C;AAC5C,uDAAoD;AACpD,uCAAkD;AAElD,MAAa,aAAc,SAAQ,iCAAe;IAC9C,YACW,IAAY,EACH,cAAwB;QAExC,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAHrB,SAAI,GAAJ,IAAI,CAAQ;QACH,mBAAc,GAAd,cAAc,CAAU;QAK5B,SAAI,GAAG,yBAAW,CAAC,aAAa,CAAC;IAFjD,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,IAAI,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE;YAClG,OAAO,IAAI,CAAC;SACf;QACD,6EAA6E;QAC7E,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC;SACf;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACjD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE;YACvE,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAA,8BAAiB,EAAC,UAAU,CAAC,IAAI,IAAA,wBAAW,EAAC,UAAU,CAAC,EAAE;YAC1D,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;SACpF;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,4BAAe,EAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACpG,CAAC;CACJ;AAlCD,sCAkCC"}

package/dist/types/InvalidType.d.ts

@@ -5,7 +5,7 @@ export declare class InvalidType extends BscType {
     constructor(typeText?: string);
     readonly kind = BscTypeKind.InvalidType;
     static instance: InvalidType;
-    isTypeCompatible(targetType: BscType): boolean;
+    isTypeCompatible(targetType: BscType): any;
     toString(): string;
     toTypeString(): string;
     isEqual(targetType: BscType): boolean;

package/dist/types/InvalidType.js

@@ -4,6 +4,8 @@ exports.InvalidType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 const BscType_1 = require("./BscType");
 const BscTypeKind_1 = require("./BscTypeKind");
+const helpers_1 = require("./helpers");
+const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
 class InvalidType extends BscType_1.BscType {
     constructor(typeText) {
         super();
@@ -13,7 +15,8 @@ class InvalidType extends BscType_1.BscType {
     isTypeCompatible(targetType) {
         return ((0, reflection_1.isInvalidType)(targetType) ||
             (0, reflection_1.isDynamicType)(targetType) ||
-            (0, reflection_1.isObjectType)(targetType));
+            (0, reflection_1.isObjectType)(targetType) ||
+            (0, helpers_1.isUnionTypeCompatible)(this, targetType));
     }
     toString() {
         var _a;
@@ -28,4 +31,5 @@ class InvalidType extends BscType_1.BscType {
 }
 exports.InvalidType = InvalidType;
 InvalidType.instance = new InvalidType('invalid');
+BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('invalid', InvalidType.instance);
 //# sourceMappingURL=InvalidType.js.map

package/dist/types/InvalidType.js.map

@@ -1 +1 @@
-{"version":3,"file":"InvalidType.js","sourceRoot":"","sources":["../../src/types/InvalidType.ts"],"names":[],"mappings":";;;AAAA,uDAAoF;AACpF,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,WAAY,SAAQ,iBAAO;IACpC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,WAAW,CAAC;IAF/C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC,CAC3B,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,SAAS,CAAC;IACtC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;;AA7BL,kCA8BC;AArBiB,oBAAQ,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"InvalidType.js","sourceRoot":"","sources":["../../src/types/InvalidType.ts"],"names":[],"mappings":";;;AAAA,uDAAoF;AACpF,uCAAoC;AACpC,+CAA4C;AAC5C,uCAAkD;AAClD,mEAAgE;AAEhE,MAAa,WAAY,SAAQ,iBAAO;IACpC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,WAAW,CAAC;IAF/C,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,CAAC,CAC1C,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,SAAS,CAAC;IACtC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;;AA9BL,kCA+BC;AAtBiB,oBAAQ,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;AAwBxD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC"}

package/dist/types/LongIntegerType.d.ts

@@ -5,7 +5,7 @@ export declare class LongIntegerType extends BscType {
     constructor(typeText?: string);
     readonly kind = BscTypeKind.LongIntegerType;
     static instance: LongIntegerType;
-    isTypeCompatible(targetType: BscType): boolean;
+    isTypeCompatible(targetType: BscType): any;
     toString(): string;
     toTypeString(): string;
     isEqual(targetType: BscType): boolean;

package/dist/types/LongIntegerType.js

@@ -4,6 +4,8 @@ exports.LongIntegerType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 const BscType_1 = require("./BscType");
 const BscTypeKind_1 = require("./BscTypeKind");
+const helpers_1 = require("./helpers");
+const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
 class LongIntegerType extends BscType_1.BscType {
     constructor(typeText) {
         super();
@@ -16,7 +18,8 @@ class LongIntegerType extends BscType_1.BscType {
             (0, reflection_1.isIntegerType)(targetType) ||
             (0, reflection_1.isFloatType)(targetType) ||
             (0, reflection_1.isDoubleType)(targetType) ||
-            (0, reflection_1.isLongIntegerType)(targetType));
+            (0, reflection_1.isLongIntegerType)(targetType) ||
+            (0, helpers_1.isUnionTypeCompatible)(this, targetType));
     }
     toString() {
         var _a;
@@ -31,4 +34,5 @@ class LongIntegerType extends BscType_1.BscType {
 }
 exports.LongIntegerType = LongIntegerType;
 LongIntegerType.instance = new LongIntegerType('longinteger');
+BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('longinteger', LongIntegerType.instance);
 //# sourceMappingURL=LongIntegerType.js.map

package/dist/types/LongIntegerType.js.map

@@ -1 +1 @@
-{"version":3,"file":"LongIntegerType.js","sourceRoot":"","sources":["../../src/types/LongIntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAE5C,MAAa,eAAgB,SAAQ,iBAAO;IACxC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,eAAe,CAAC;IAFnD,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAChC,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,aAAa,CAAC;IAC1C,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAAC;IACzC,CAAC;;AAhCL,0CAiCC;AAxBiB,wBAAQ,GAAG,IAAI,eAAe,CAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"LongIntegerType.js","sourceRoot":"","sources":["../../src/types/LongIntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAkI;AAClI,uCAAoC;AACpC,+CAA4C;AAC5C,uCAAkD;AAClD,mEAAgE;AAEhE,MAAa,eAAgB,SAAQ,iBAAO;IACxC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,eAAe,CAAC;IAFnD,CAAC;IAMM,gBAAgB,CAAC,UAAmB;QACvC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC;YAC7B,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,CAAC,CAC1C,CAAC;IACN,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,aAAa,CAAC;IAC1C,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,OAAO,CAAC,UAAmB;QACvB,OAAO,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAAC;IACzC,CAAC;;AAjCL,0CAkCC;AAzBiB,wBAAQ,GAAG,IAAI,eAAe,CAAC,aAAa,CAAC,CAAC;AA2BhE,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,aAAa,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC"}

package/dist/types/ObjectType.js

@@ -5,6 +5,7 @@ const SymbolTable_1 = require("../SymbolTable");
 const reflection_1 = require("../astUtils/reflection");
 const BscType_1 = require("./BscType");
 const BscTypeKind_1 = require("./BscTypeKind");
+const BuiltInInterfaceAdder_1 = require("./BuiltInInterfaceAdder");
 const DynamicType_1 = require("./DynamicType");
 class ObjectType extends BscType_1.BscType {
     constructor(typeText) {
@@ -34,4 +35,5 @@ class ObjectType extends BscType_1.BscType {
     }
 }
 exports.ObjectType = ObjectType;
+BuiltInInterfaceAdder_1.BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('object', new ObjectType('object'));
 //# sourceMappingURL=ObjectType.js.map

package/dist/types/ObjectType.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../src/types/ObjectType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,uDAAsD;AAEtD,uCAAoC;AACpC,+CAA4C;AAC5C,+CAA4C;AAE5C,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,iGAAiG;QACjG,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,OAAuB;;QAC/C,gEAAgE;QAChE,mHAAmH;QACnH,OAAO,MAAA,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,yBAAW,CAAC,QAAQ,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,yBAAY,EAAC,SAAS,CAAC,IAAI,IAAI,CAAC,gCAAgC,CAAC,SAAS,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;IAC/G,CAAC;CACJ;AA/BD,gCA+BC"}
+{"version":3,"file":"ObjectType.js","sourceRoot":"","sources":["../../src/types/ObjectType.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,uDAAsD;AAEtD,uCAAoC;AACpC,+CAA4C;AAC5C,mEAAgE;AAChE,+CAA4C;AAE5C,MAAa,UAAW,SAAQ,iBAAO;IACnC,YACW,QAAiB;QAExB,KAAK,EAAE,CAAC;QAFD,aAAQ,GAAR,QAAQ,CAAS;QAKZ,SAAI,GAAG,yBAAW,CAAC,UAAU,CAAC;IAF9C,CAAC;IAIM,gBAAgB,CAAC,UAAmB;QACvC,iGAAiG;QACjG,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;;QACX,OAAO,MAAA,IAAI,CAAC,QAAQ,mCAAI,QAAQ,CAAC;IACrC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa,CAAC,IAAY,EAAE,OAAuB;;QAC/C,gEAAgE;QAChE,mHAAmH;QACnH,OAAO,MAAA,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,yBAAW,CAAC,QAAQ,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,SAAkB;QACtB,OAAO,IAAA,yBAAY,EAAC,SAAS,CAAC,IAAI,IAAI,CAAC,gCAAgC,CAAC,SAAS,EAAE,4BAAc,CAAC,OAAO,CAAC,CAAC;IAC/G,CAAC;CACJ;AA/BD,gCA+BC;AAGD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC"}

package/dist/types/ReferenceType.d.ts

@@ -2,6 +2,7 @@ import type { SymbolTypeGetterProvider } from '../SymbolTable';
 import type { SymbolTypeFlag } from '../SymbolTable';
 import { BscType } from './BscType';
 import { BscTypeKind } from './BscTypeKind';
+import type { Token } from '../lexer/Token';
 export declare function referenceTypeFactory(memberKey: string, fullName: any, flags: SymbolTypeFlag, tableProvider: SymbolTypeGetterProvider): ReferenceType;
 export declare class ReferenceType extends BscType {
     memberKey: string;
@@ -47,3 +48,14 @@ export declare class TypePropertyReferenceType extends BscType {
     propertyName: string;
     constructor(outerType: BscType, propertyName: string);
 }
+/**
+ * Use this class for when there is a binary operator and either the left hand side and/or the right hand side
+ * are ReferenceTypes
+ */
+export declare class BinaryOperatorReferenceType extends BscType {
+    leftType: BscType;
+    operator: Token;
+    rightType: BscType;
+    cachedType: BscType;
+    constructor(leftType: BscType, operator: Token, rightType: BscType, binaryOpResolver: (lType: BscType, operator: Token, rType: BscType) => BscType);
+}

package/dist/types/ReferenceType.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypePropertyReferenceType = exports.ReferenceType = exports.referenceTypeFactory = void 0;
+exports.BinaryOperatorReferenceType = exports.TypePropertyReferenceType = exports.ReferenceType = exports.referenceTypeFactory = void 0;
 const reflection_1 = require("../astUtils/reflection");
 const BscType_1 = require("./BscType");
 const DynamicType_1 = require("./DynamicType");
@@ -36,10 +36,10 @@ class ReferenceType extends BscType_1.BscType {
                         return resolvedType.getMemberType(innerName, innerOptions);
                     }
                 },
-                setCachedType: (innerName, innerResolvedType, options) => {
+                setCachedType: (innerName, innerResolvedTypeCacheEntry, options) => {
                     const resolvedType = this.resolve();
                     if (resolvedType) {
-                        resolvedType.memberTable.setCachedType(innerName, innerResolvedType, options);
+                        resolvedType.memberTable.setCachedType(innerName, innerResolvedTypeCacheEntry, options);
                     }
                 }
             };
@@ -61,7 +61,7 @@ class ReferenceType extends BscType_1.BscType {
                 if (propName === 'isResolvable') {
                     return () => {
                         let resultSoFar = this.resolve();
-                        while ((0, reflection_1.isReferenceType)(resultSoFar)) {
+                        while (resultSoFar && (0, reflection_1.isReferenceType)(resultSoFar)) {
                             resultSoFar = resultSoFar.getTarget();
                         }
                         return !!resultSoFar;
@@ -134,6 +134,11 @@ class ReferenceType extends BscType_1.BscType {
                     else if (propName === 'memberTable') {
                         return this.memberTable;
                     }
+                    else if (propName === 'getMemberTable') {
+                        return () => {
+                            return this.memberTable;
+                        };
+                    }
                     else if (propName === 'isTypeCompatible') {
                         return (targetType) => {
                             return (0, reflection_1.isDynamicType)(targetType);
@@ -148,6 +153,15 @@ class ReferenceType extends BscType_1.BscType {
                             return false;
                         };
                     }
+                    else if (propName === 'addBuiltInInterfaces') {
+                        // this is an unknown type. There is no use in adding built in interfaces
+                        // return no-op function
+                        return () => { };
+                    }
+                    else if (propName === 'hasAddedBuiltInInterfaces') {
+                        // this is an unknown type. There is no use in adding built in interfaces
+                        return true;
+                    }
                 }
                 if (!innerType) {
                     innerType = DynamicType_1.DynamicType.instance;
@@ -162,7 +176,7 @@ class ReferenceType extends BscType_1.BscType {
                 let innerType = this.resolve();
                 // Look for circular references
                 if (!innerType || this.referenceChain.has(innerType)) {
-                    innerType = DynamicType_1.DynamicType.instance;
+                    return false;
                 }
                 const result = Reflect.set(innerType, name, value, innerType);
                 this.referenceChain.clear();
@@ -184,9 +198,9 @@ class ReferenceType extends BscType_1.BscType {
             // could not find this member
             return;
         }
-        if ((0, reflection_1.isReferenceType)(resolvedType)) {
+        if ((0, reflection_1.isAnyReferenceType)(resolvedType)) {
             // If this is a referenceType, keep digging down until we have a non reference Type.
-            while ((0, reflection_1.isReferenceType)(resolvedType)) {
+            while (resolvedType && (0, reflection_1.isAnyReferenceType)(resolvedType)) {
                 if (this.referenceChain.has(resolvedType)) {
                     // this is a circular reference
                     this.circRefCount++;
@@ -199,9 +213,9 @@ class ReferenceType extends BscType_1.BscType {
                 this.referenceChain.add(resolvedType);
                 resolvedType = resolvedType.getTarget();
             }
-            this.tableProvider().setCachedType(this.memberKey, resolvedType, { flags: this.flags });
+            this.tableProvider().setCachedType(this.memberKey, { type: resolvedType }, { flags: this.flags });
         }
-        if (!(0, reflection_1.isReferenceType)(resolvedType)) {
+        if (resolvedType && !(0, reflection_1.isAnyReferenceType)(resolvedType)) {
             this.circRefCount = 0;
             this.referenceChain.clear();
         }
@@ -238,7 +252,7 @@ class TypePropertyReferenceType extends BscType_1.BscType {
                     // Cheeky way to get `isTypePropertyReferenceType` reflection to work
                     return { name: 'TypePropertyReferenceType' };
                 }
-                if ((0, reflection_1.isReferenceType)(this.outerType) && !this.outerType.isResolvable()) {
+                if ((0, reflection_1.isAnyReferenceType)(this.outerType) && !this.outerType.isResolvable()) {
                     if (propName === 'getMemberType') {
                         //If we're calling `getMemberType()`, we need it to proxy to using the actual symbol table
                         //So if that symbol is ever populated, the correct type is passed through
@@ -250,9 +264,9 @@ class TypePropertyReferenceType extends BscType_1.BscType {
                                         var _a, _b;
                                         return (_b = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName]) === null || _b === void 0 ? void 0 : _b.getMemberType(innerName, innerOptions);
                                     },
-                                    setCachedType: (innerName, innerType, innerOptions) => {
+                                    setCachedType: (innerName, innerTypeCacheEntry, innerOptions) => {
                                         var _a, _b;
-                                        return (_b = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName]) === null || _b === void 0 ? void 0 : _b.memberTable.setCachedType(innerName, innerType, innerOptions);
+                                        return (_b = (_a = this.outerType) === null || _a === void 0 ? void 0 : _a[this.propertyName]) === null || _b === void 0 ? void 0 : _b.memberTable.setCachedType(innerName, innerTypeCacheEntry, innerOptions);
                                     }
                                 };
                             });
@@ -285,4 +299,47 @@ class TypePropertyReferenceType extends BscType_1.BscType {
     }
 }
 exports.TypePropertyReferenceType = TypePropertyReferenceType;
+/**
+ * Use this class for when there is a binary operator and either the left hand side and/or the right hand side
+ * are ReferenceTypes
+ */
+class BinaryOperatorReferenceType extends BscType_1.BscType {
+    constructor(leftType, operator, rightType, binaryOpResolver) {
+        super(operator.text);
+        this.leftType = leftType;
+        this.operator = operator;
+        this.rightType = rightType;
+        // eslint-disable-next-line no-constructor-return
+        return new Proxy(this, {
+            get: (target, propName, receiver) => {
+                var _a;
+                if (propName === '__reflection') {
+                    // Cheeky way to get `BinaryOperatorReferenceType` reflection to work
+                    return { name: 'BinaryOperatorReferenceType' };
+                }
+                let resultType = (_a = this.cachedType) !== null && _a !== void 0 ? _a : DynamicType_1.DynamicType.instance;
+                if (!this.cachedType) {
+                    if (((0, reflection_1.isAnyReferenceType)(this.leftType) && !this.leftType.isResolvable()) ||
+                        ((0, reflection_1.isAnyReferenceType)(this.rightType) && !this.rightType.isResolvable())) {
+                        if (propName === 'isResolvable') {
+                            return () => false;
+                        }
+                        if (propName === 'getTarget') {
+                            return () => undefined;
+                        }
+                    }
+                    else {
+                        resultType = binaryOpResolver(this.leftType, this.operator, this.rightType);
+                        this.cachedType = resultType;
+                    }
+                }
+                if (resultType) {
+                    const result = Reflect.get(resultType, propName, resultType);
+                    return result;
+                }
+            }
+        });
+    }
+}
+exports.BinaryOperatorReferenceType = BinaryOperatorReferenceType;
 //# sourceMappingURL=ReferenceType.js.map