brighterscript 0.66.0-alpha.9 → 0.67.1

package/dist/types/IntegerType.js

@@ -1,27 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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 {
+const DoubleType_1 = require("./DoubleType");
+const DynamicType_1 = require("./DynamicType");
+const FloatType_1 = require("./FloatType");
+const LongIntegerType_1 = require("./LongIntegerType");
+class IntegerType {
     constructor(typeText) {
-        super();
         this.typeText = typeText;
-        this.kind = BscTypeKind_1.BscTypeKind.IntegerType;
     }
-    isTypeCompatible(targetType, data) {
-        return ((0, reflection_1.isDynamicType)(targetType) ||
-            (0, reflection_1.isObjectType)(targetType) ||
-            (0, reflection_1.isIntegerType)(targetType) ||
-            (0, reflection_1.isFloatType)(targetType) ||
-            (0, reflection_1.isDoubleType)(targetType) ||
-            (0, reflection_1.isLongIntegerType)(targetType) ||
-            (0, helpers_1.isUnionTypeCompatible)(this, targetType, data) ||
-            (0, helpers_1.isEnumTypeCompatible)(this, targetType, data) ||
-            (0, helpers_1.isNativeInterfaceCompatibleNumber)(this, targetType, data));
+    isAssignableTo(targetType) {
+        return (targetType instanceof IntegerType ||
+            targetType instanceof DynamicType_1.DynamicType);
+    }
+    isConvertibleTo(targetType) {
+        if (targetType instanceof DynamicType_1.DynamicType ||
+            targetType instanceof IntegerType ||
+            targetType instanceof FloatType_1.FloatType ||
+            targetType instanceof DoubleType_1.DoubleType ||
+            targetType instanceof LongIntegerType_1.LongIntegerType) {
+            return true;
+        }
+        else {
+            return false;
+        }
     }
     toString() {
         var _a;
@@ -30,11 +32,6 @@ class IntegerType extends BscType_1.BscType {
     toTypeString() {
         return this.toString();
     }
-    isEqual(otherType) {
-        return (0, reflection_1.isIntegerType)(otherType);
-    }
 }
 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;AAC5C,uCAA2G;AAC3G,mEAAgE;AAGhE,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,EAAE,IAA4B;QACrE,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,EAAE,IAAI,CAAC;YAC7C,IAAA,8BAAoB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC;YAC5C,IAAA,2CAAiC,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAC5D,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;;AAnCL,kCAoCC;AA3BiB,oBAAQ,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;AA6BxD,6CAAqB,CAAC,0BAA0B,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAC1C,+CAA4C;AAC5C,2CAAwC;AACxC,uDAAoD;AAEpD,MAAa,WAAW;IACpB,YACW,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IACxB,CAAC;IAEE,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,UAAU,YAAY,WAAW;YACjC,UAAU,YAAY,yBAAW,CACpC,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,UAAU,YAAY,yBAAW;YACjC,UAAU,YAAY,WAAW;YACjC,UAAU,YAAY,qBAAS;YAC/B,UAAU,YAAY,uBAAU;YAChC,UAAU,YAAY,iCAAe,EACvC;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,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;CACJ;AAjCD,kCAiCC"}

package/dist/types/IntegerType.spec.js

@@ -4,13 +4,9 @@ const chai_config_spec_1 = require("../chai-config.spec");
 const DynamicType_1 = require("./DynamicType");
 const IntegerType_1 = require("./IntegerType");
 describe('IntegerType', () => {
-    it('is equal to other integer types', () => {
-        (0, chai_config_spec_1.expect)(new IntegerType_1.IntegerType().isEqual(new IntegerType_1.IntegerType())).to.be.true;
-        (0, chai_config_spec_1.expect)(new IntegerType_1.IntegerType().isEqual(new DynamicType_1.DynamicType())).to.be.false;
-    });
-    it('is compatible with to other integer types', () => {
-        (0, chai_config_spec_1.expect)(new IntegerType_1.IntegerType().isTypeCompatible(new IntegerType_1.IntegerType())).to.be.true;
-        (0, chai_config_spec_1.expect)(new IntegerType_1.IntegerType().isTypeCompatible(new DynamicType_1.DynamicType())).to.be.true;
+    it('is equivalent to other integer types', () => {
+        (0, chai_config_spec_1.expect)(new IntegerType_1.IntegerType().isAssignableTo(new IntegerType_1.IntegerType())).to.be.true;
+        (0, chai_config_spec_1.expect)(new IntegerType_1.IntegerType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
     });
 });
 //# sourceMappingURL=IntegerType.spec.js.map

package/dist/types/IntegerType.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"IntegerType.spec.js","sourceRoot":"","sources":["../../src/types/IntegerType.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAC7C,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACvC,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,OAAO,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAChE,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,OAAO,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACjD,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACzE,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC7E,CAAC,CAAC,CAAC;AAGP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"IntegerType.spec.js","sourceRoot":"","sources":["../../src/types/IntegerType.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAE7C,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC5C,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvE,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/types/InterfaceType.d.ts

@@ -1,16 +1,14 @@
-import type { TypeCompatibilityData } from '../interfaces';
 import type { BscType } from './BscType';
-import { BscTypeKind } from './BscTypeKind';
-import { InheritableType } from './InheritableType';
-import type { ReferenceType } from './ReferenceType';
-export declare class InterfaceType extends InheritableType {
-    name: string;
-    readonly superInterface?: InterfaceType | ReferenceType;
-    constructor(name: string, superInterface?: InterfaceType | ReferenceType);
-    readonly kind = BscTypeKind.InterfaceType;
-    isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean;
+export declare class InterfaceType implements BscType {
+    members: Map<string, BscType>;
+    constructor(members: Map<string, BscType>);
     /**
-     *  Is this the exact same interface as the target?
+     * The name of the interface. Can be undefined.
      */
-    isEqual(targetType: BscType, data?: TypeCompatibilityData): boolean;
+    name: string | undefined;
+    isAssignableTo(targetType: BscType): boolean;
+    isConvertibleTo(targetType: BscType): boolean;
+    toString(): string;
+    toTypeString(): string;
+    equals(targetType: BscType): boolean;
 }

package/dist/types/InterfaceType.js

@@ -1,36 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InterfaceType = void 0;
-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);
-        this.name = name;
-        this.superInterface = superInterface;
-        this.kind = BscTypeKind_1.BscTypeKind.InterfaceType;
+class InterfaceType {
+    constructor(members) {
+        this.members = members;
     }
-    isTypeCompatible(targetType, data) {
-        if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType) || (0, helpers_1.isUnionTypeCompatible)(this, targetType, data)) {
-            return true;
-        }
+    isAssignableTo(targetType) {
+        //we must have all of the members of the target type, and they must be equivalent types
         if ((0, reflection_1.isInterfaceType)(targetType)) {
-            return this.checkCompatibilityBasedOnMembers(targetType, SymbolTable_1.SymbolTypeFlag.runtime, data);
+            for (const [targetMemberName, targetMemberType] of targetType.members) {
+                const ourMemberType = this.members.get(targetMemberName);
+                //we don't have the target member
+                if (!ourMemberType) {
+                    return false;
+                }
+                //our member's type is not assignable to the target member type
+                if (!ourMemberType.isAssignableTo(targetMemberType)) {
+                    return false;
+                }
+            }
+            //we have all of the target member's types. we are assignable!
+            return true;
+            //we are always assignable to dynamic or object
         }
-        const ancestorTypes = this.getAncestorTypeList();
-        if (ancestorTypes === null || ancestorTypes === void 0 ? void 0 : ancestorTypes.find(ancestorType => ancestorType.isEqual(targetType))) {
+        else if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType)) {
             return true;
+            //not assignable to any other object types
         }
-        return this.checkCompatibilityBasedOnMembers(targetType, SymbolTable_1.SymbolTypeFlag.runtime, data);
+        else {
+            return false;
+        }
+    }
+    isConvertibleTo(targetType) {
+        return this.isAssignableTo(targetType);
     }
-    /**
-     *  Is this the exact same interface as the target?
-     */
-    isEqual(targetType, data) {
-        return (0, reflection_1.isInterfaceType)(targetType) && super.isEqual(targetType, data);
+    toString() {
+        let result = '{';
+        for (const [key, type] of this.members.entries()) {
+            result += ' ' + key + ': ' + type.toString() + ';';
+        }
+        if (this.members.size > 0) {
+            result += ' ';
+        }
+        return result + '}';
+    }
+    toTypeString() {
+        return 'object';
+    }
+    equals(targetType) {
+        if ((0, reflection_1.isInterfaceType)(targetType)) {
+            if (targetType.members.size !== this.members.size) {
+                return false;
+            }
+            return targetType.isAssignableTo(this);
+        }
+        return false;
     }
 }
 exports.InterfaceType = InterfaceType;

package/dist/types/InterfaceType.js.map

@@ -1 +1 @@
-{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AACA,gDAAgD;AAChD,uDAAsF;AAEtF,+CAA4C;AAC5C,uDAAoD;AACpD,uCAAkD;AAGlD,MAAa,aAAc,SAAQ,iCAAe;IAC9C,YACW,IAAY,EACH,cAA8C;QAE9D,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAHrB,SAAI,GAAJ,IAAI,CAAQ;QACH,mBAAc,GAAd,cAAc,CAAgC;QAKlD,SAAI,GAAG,yBAAW,CAAC,aAAa,CAAC;IAFjD,CAAC;IAIM,gBAAgB,CAAC,UAAmB,EAAE,IAA4B;QACrE,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,IAAI,IAAA,+BAAqB,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE;YACxG,OAAO,IAAI,CAAC;SACf;QACD,IAAI,IAAA,4BAAe,EAAC,UAAU,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,4BAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;SAC1F;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,OAAO,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,4BAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3F,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,UAAmB,EAAE,IAA4B;QACrD,OAAO,IAAA,4BAAe,EAAC,UAAU,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;CACJ;AA9BD,sCA8BC"}
+{"version":3,"file":"InterfaceType.js","sourceRoot":"","sources":["../../src/types/InterfaceType.ts"],"names":[],"mappings":";;;AAAA,uDAAsF;AAGtF,MAAa,aAAa;IACtB,YACW,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;IAGxC,CAAC;IAOM,cAAc,CAAC,UAAmB;QACrC,uFAAuF;QACvF,IAAI,IAAA,4BAAe,EAAC,UAAU,CAAC,EAAE;YAC7B,KAAK,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE;gBACnE,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBACzD,iCAAiC;gBACjC,IAAI,CAAC,aAAa,EAAE;oBAChB,OAAO,KAAK,CAAC;iBAChB;gBACD,+DAA+D;gBAC/D,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;oBACjD,OAAO,KAAK,CAAC;iBAChB;aACJ;YACD,8DAA8D;YAC9D,OAAO,IAAI,CAAC;YAEZ,+CAA+C;SAClD;aAAM,IAAI,IAAA,0BAAa,EAAC,UAAU,CAAC,IAAI,IAAA,yBAAY,EAAC,UAAU,CAAC,EAAE;YAC9D,OAAO,IAAI,CAAC;YAEZ,0CAA0C;SAC7C;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,QAAQ;QACX,IAAI,MAAM,GAAG,GAAG,CAAC;QACjB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;YAC9C,MAAM,IAAI,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,GAAG,CAAC;SACtD;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE;YACvB,MAAM,IAAI,GAAG,CAAC;SACjB;QACD,OAAO,MAAM,GAAG,GAAG,CAAC;IACxB,CAAC;IAEM,YAAY;QACf,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,IAAI,IAAA,4BAAe,EAAC,UAAU,CAAC,EAAE;YAC7B,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;gBAC/C,OAAO,KAAK,CAAC;aAChB;YACD,OAAO,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;SAC1C;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAnED,sCAmEC"}

package/dist/types/InterfaceType.spec.js

@@ -2,23 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_config_spec_1 = require("../chai-config.spec");
 const sinon_1 = require("sinon");
+const testHelpers_spec_1 = require("../testHelpers.spec");
 const DynamicType_1 = require("./DynamicType");
 const IntegerType_1 = require("./IntegerType");
 const InterfaceType_1 = require("./InterfaceType");
 const ObjectType_1 = require("./ObjectType");
 const StringType_1 = require("./StringType");
-const SymbolTable_1 = require("../SymbolTable");
-const AssociativeArrayType_1 = require("./AssociativeArrayType");
-const ArrayType_1 = require("./ArrayType");
-const BooleanType_1 = require("./BooleanType");
-const DiagnosticMessages_1 = require("../DiagnosticMessages");
 describe('InterfaceType', () => {
-    describe('toJSString', () => {
+    describe('toString', () => {
         it('returns empty curly braces when no members', () => {
-            (0, chai_config_spec_1.expect)(iface({}).toJSString()).to.eql('{}');
+            (0, chai_config_spec_1.expect)(iface({}).toString()).to.eql('{}');
         });
         it('includes member types', () => {
-            (0, chai_config_spec_1.expect)(iface({ name: new StringType_1.StringType() }).toJSString()).to.eql('{ name: string; }');
+            (0, chai_config_spec_1.expect)(iface({ name: new StringType_1.StringType() }).toString()).to.eql('{ name: string; }');
         });
         it('includes nested object types', () => {
             (0, chai_config_spec_1.expect)(iface({
@@ -26,54 +22,41 @@ describe('InterfaceType', () => {
                 parent: iface({
                     age: new IntegerType_1.IntegerType()
                 })
-            }).toJSString()).to.eql('{ name: string; parent: { age: integer; }; }');
+            }).toString()).to.eql('{ name: string; parent: { age: integer; }; }');
         });
     });
-    describe('isTypeCompatible', () => {
+    describe('isConvertibleTo', () => {
         it('works', () => {
-            expectCompatible({
+            expectAssignable({
                 name: new StringType_1.StringType()
             }, {
                 name: new StringType_1.StringType()
             });
         });
-        it('roku component types are compatible with BscTypes', () => {
-            // TODO: Fix String type compatibility -  reason is because of overloaded members (Mid(), StartsWith(), etc)
-            // SEE: https://github.com/rokucommunity/brighterscript/issues/926
-            // expectTypeCrossCompatible(new StringType(), new InterfaceType('roString'));
-            expectTypeCrossCompatible(new ArrayType_1.ArrayType(), new InterfaceType_1.InterfaceType('roArray'));
-            expectTypeCrossCompatible(new AssociativeArrayType_1.AssociativeArrayType(), new InterfaceType_1.InterfaceType('roAssociativeArray'));
-            expectTypeCrossCompatible(new BooleanType_1.BooleanType(), new InterfaceType_1.InterfaceType('roBoolean'));
-            expectTypeCrossCompatible(new IntegerType_1.IntegerType(), new InterfaceType_1.InterfaceType('roInt'));
-        });
     });
     describe('equals', () => {
-        it('matches same objects', () => {
-            const ifaceObj = iface({ name: new StringType_1.StringType() });
-            (0, chai_config_spec_1.expect)(ifaceObj.isEqual(ifaceObj)).to.be.true;
-        });
-        it('does not match interfaces with same members', () => {
-            (0, chai_config_spec_1.expect)(iface({ name: new StringType_1.StringType() }).isEqual(iface({ name: new StringType_1.StringType() }))).to.be.false;
+        it('matches equal objects', () => {
+            (0, chai_config_spec_1.expect)(iface({ name: new StringType_1.StringType() }).equals(iface({ name: new StringType_1.StringType() }))).to.be.true;
         });
         it('does not match inequal objects', () => {
-            (0, chai_config_spec_1.expect)(iface({ name: new StringType_1.StringType() }).isEqual(iface({ name: new IntegerType_1.IntegerType() }))).to.be.false;
+            (0, chai_config_spec_1.expect)(iface({ name: new StringType_1.StringType() }).equals(iface({ name: new IntegerType_1.IntegerType() }))).to.be.false;
         });
     });
-    describe('isTypeCompatible', () => {
-        it('rejects being able to assign other types to this', () => {
+    describe('isAssignableTo', () => {
+        it('rejects being assignable to other types', () => {
             (0, chai_config_spec_1.expect)(iface({
                 name: new StringType_1.StringType()
-            }).isTypeCompatible(new IntegerType_1.IntegerType())).to.be.false;
+            }).isAssignableTo(new IntegerType_1.IntegerType())).to.be.false;
         });
         it('matches exact properties', () => {
-            expectCompatible({
+            expectAssignable({
                 name: new StringType_1.StringType()
             }, {
                 name: new StringType_1.StringType()
             });
         });
         it('matches an object with more properties being assigned to an object with less', () => {
-            expectCompatible({
+            expectAssignable({
                 name: new StringType_1.StringType()
             }, {
                 name: new StringType_1.StringType(),
@@ -81,7 +64,7 @@ describe('InterfaceType', () => {
             });
         });
         it('rejects assigning an object with less properties to one with more', () => {
-            expectNotCompatible({
+            expectNotAssignable({
                 name: new StringType_1.StringType(),
                 age: new IntegerType_1.IntegerType()
             }, {
@@ -89,26 +72,23 @@ describe('InterfaceType', () => {
             });
         });
         it('matches properties in mismatched order', () => {
-            const ifaceOne = iface({
-                name: new StringType_1.StringType(),
-                age: new IntegerType_1.IntegerType()
-            });
-            const ifaceTwo = iface({
-                age: new IntegerType_1.IntegerType(),
-                name: new StringType_1.StringType()
-            });
-            (0, chai_config_spec_1.expect)(ifaceOne.isTypeCompatible(ifaceTwo)).to.be.true;
-            (0, chai_config_spec_1.expect)(ifaceTwo.isTypeCompatible(ifaceOne)).to.be.true;
+            (0, chai_config_spec_1.expect)(new InterfaceType_1.InterfaceType(new Map([
+                ['name', new StringType_1.StringType()],
+                ['age', new IntegerType_1.IntegerType()]
+            ])).isAssignableTo(new InterfaceType_1.InterfaceType(new Map([
+                ['age', new IntegerType_1.IntegerType()],
+                ['name', new StringType_1.StringType()]
+            ])))).to.be.true;
         });
         it('rejects with member having mismatched type', () => {
-            expectNotCompatible({
+            expectNotAssignable({
                 name: new StringType_1.StringType()
             }, {
                 name: new IntegerType_1.IntegerType()
             });
         });
         it('rejects with object member having mismatched type', () => {
-            expectNotCompatible({
+            expectNotAssignable({
                 parent: iface({
                     name: new StringType_1.StringType()
                 })
@@ -119,7 +99,7 @@ describe('InterfaceType', () => {
             });
         });
         it('rejects with object member having missing prop type', () => {
-            expectNotCompatible({
+            expectNotAssignable({
                 parent: iface({
                     name: new StringType_1.StringType(),
                     age: new IntegerType_1.IntegerType()
@@ -131,7 +111,7 @@ describe('InterfaceType', () => {
             });
         });
         it('accepts with object member having same prop types', () => {
-            expectCompatible({
+            expectAssignable({
                 parent: iface({
                     name: new StringType_1.StringType(),
                     age: new IntegerType_1.IntegerType()
@@ -144,69 +124,52 @@ describe('InterfaceType', () => {
             });
         });
         it('accepts with source member having dyanmic prop type', () => {
-            expectCompatible({
-                parent: new DynamicType_1.DynamicType()
-            }, {
+            expectAssignable({
                 parent: iface({
                     name: new StringType_1.StringType(),
                     age: new IntegerType_1.IntegerType()
                 })
+            }, {
+                parent: new DynamicType_1.DynamicType()
             });
         });
-        it('accepts with target member having dynamic prop type', () => {
-            expectCompatible({
+        it('accepts with target member having dyanmic prop type', () => {
+            expectAssignable({
+                parent: new DynamicType_1.DynamicType()
+            }, {
                 parent: iface({
                     name: new StringType_1.StringType(),
                     age: new IntegerType_1.IntegerType()
                 })
-            }, {
-                parent: new DynamicType_1.DynamicType()
             });
         });
         it('accepts with target member having "object" prop type', () => {
-            expectCompatible({
+            expectAssignable({
+                parent: new ObjectType_1.ObjectType()
+            }, {
                 parent: iface({
                     name: new StringType_1.StringType(),
                     age: new IntegerType_1.IntegerType()
                 })
-            }, {
-                parent: new ObjectType_1.ObjectType()
             });
         });
     });
 });
-let ifaceCount = 0;
-function iface(members, name, parentType) {
-    name = name !== null && name !== void 0 ? name : 'SomeIFace' + ifaceCount;
-    ifaceCount++;
-    const ifaceType = new InterfaceType_1.InterfaceType(name, parentType);
-    for (const key in members) {
-        ifaceType.addMember(key, null, members[key], SymbolTable_1.SymbolTypeFlag.runtime);
-    }
-    return ifaceType;
+function iface(members) {
+    return new InterfaceType_1.InterfaceType((0, testHelpers_spec_1.objectToMap)(members));
 }
-function expectCompatible(sourceMembers, targetMembers) {
+function expectAssignable(targetMembers, sourceMembers) {
     const targetIface = iface(targetMembers);
     const sourceIface = iface(sourceMembers);
-    if (!sourceIface.isTypeCompatible(targetIface)) {
-        sinon_1.assert.fail(`expected type ${targetIface.toJSString()} to be assignable to type ${sourceIface.toJSString()}`);
+    if (!sourceIface.isAssignableTo(targetIface)) {
+        sinon_1.assert.fail(`expected type ${targetIface.toString()} to be assignable to type ${sourceIface.toString()}`);
     }
 }
-function expectNotCompatible(sourceMembers, targetMembers) {
+function expectNotAssignable(targetMembers, sourceMembers) {
     const targetIface = iface(targetMembers);
     const sourceIface = iface(sourceMembers);
-    if (sourceIface.isTypeCompatible(targetIface)) {
-        sinon_1.assert.fail(`expected type ${targetIface.toJSString()} to not be assignable to type ${sourceIface.toJSString()}`);
-    }
-}
-function expectTypeCrossCompatible(source, target) {
-    let data = {};
-    if (!source.isTypeCompatible(target, data)) {
-        sinon_1.assert.fail((0, DiagnosticMessages_1.typeCompatibilityMessage)(target.toString(), source.toString(), data));
-    }
-    data = {};
-    if (!target.isTypeCompatible(source, data)) {
-        sinon_1.assert.fail((0, DiagnosticMessages_1.typeCompatibilityMessage)(source.toString(), target.toString(), data));
+    if (sourceIface.isAssignableTo(targetIface)) {
+        sinon_1.assert.fail(`expected type ${targetIface.toString()} to not be assignable to type ${sourceIface.toString()}`);
     }
 }
 //# sourceMappingURL=InterfaceType.spec.js.map

package/dist/types/InterfaceType.spec.js.map

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

package/dist/types/InvalidType.d.ts

@@ -1,12 +1,9 @@
-import { BscType } from './BscType';
-import { BscTypeKind } from './BscTypeKind';
-export declare class InvalidType extends BscType {
+import type { BscType } from './BscType';
+export declare class InvalidType implements BscType {
     typeText?: string;
     constructor(typeText?: string);
-    readonly kind = BscTypeKind.InvalidType;
-    static instance: InvalidType;
-    isTypeCompatible(targetType: BscType): any;
+    isAssignableTo(targetType: BscType): boolean;
+    isConvertibleTo(targetType: BscType): boolean;
     toString(): string;
     toTypeString(): string;
-    isEqual(targetType: BscType): boolean;
 }

package/dist/types/InvalidType.js

@@ -1,22 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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 {
+const DynamicType_1 = require("./DynamicType");
+class InvalidType {
     constructor(typeText) {
-        super();
         this.typeText = typeText;
-        this.kind = BscTypeKind_1.BscTypeKind.InvalidType;
     }
-    isTypeCompatible(targetType) {
-        return ((0, reflection_1.isInvalidType)(targetType) ||
-            (0, reflection_1.isDynamicType)(targetType) ||
-            (0, reflection_1.isObjectType)(targetType) ||
-            (0, helpers_1.isUnionTypeCompatible)(this, targetType));
+    isAssignableTo(targetType) {
+        return (targetType instanceof InvalidType ||
+            targetType instanceof DynamicType_1.DynamicType);
+    }
+    isConvertibleTo(targetType) {
+        return this.isAssignableTo(targetType);
     }
     toString() {
         var _a;
@@ -25,11 +20,6 @@ class InvalidType extends BscType_1.BscType {
     toTypeString() {
         return this.toString();
     }
-    isEqual(targetType) {
-        return (0, reflection_1.isInvalidType)(targetType);
-    }
 }
 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;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"}
+{"version":3,"file":"InvalidType.js","sourceRoot":"","sources":["../../src/types/InvalidType.ts"],"names":[],"mappings":";;;AACA,+CAA4C;AAE5C,MAAa,WAAW;IACpB,YACW,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IACxB,CAAC;IAEE,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,UAAU,YAAY,WAAW;YACjC,UAAU,YAAY,yBAAW,CACpC,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,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;CACJ;AAvBD,kCAuBC"}

package/dist/types/InvalidType.spec.js

@@ -4,13 +4,9 @@ const chai_config_spec_1 = require("../chai-config.spec");
 const DynamicType_1 = require("./DynamicType");
 const InvalidType_1 = require("./InvalidType");
 describe('InvalidType', () => {
-    it('is compatible to invalid types', () => {
-        (0, chai_config_spec_1.expect)(new InvalidType_1.InvalidType().isTypeCompatible(new InvalidType_1.InvalidType())).to.be.true;
-        (0, chai_config_spec_1.expect)(new InvalidType_1.InvalidType().isTypeCompatible(new DynamicType_1.DynamicType())).to.be.true;
-    });
-    it('is equal to invalid types', () => {
-        (0, chai_config_spec_1.expect)(new InvalidType_1.InvalidType().isEqual(new InvalidType_1.InvalidType())).to.be.true;
-        (0, chai_config_spec_1.expect)(new InvalidType_1.InvalidType().isEqual(new DynamicType_1.DynamicType())).to.be.false;
+    it('is equivalent to invalid types', () => {
+        (0, chai_config_spec_1.expect)(new InvalidType_1.InvalidType().isAssignableTo(new InvalidType_1.InvalidType())).to.be.true;
+        (0, chai_config_spec_1.expect)(new InvalidType_1.InvalidType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
     });
 });
 //# sourceMappingURL=InvalidType.spec.js.map

package/dist/types/InvalidType.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"InvalidType.spec.js","sourceRoot":"","sources":["../../src/types/InvalidType.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAE7C,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACzE,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACjC,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,OAAO,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAChE,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,OAAO,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IACrE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"InvalidType.spec.js","sourceRoot":"","sources":["../../src/types/InvalidType.spec.ts"],"names":[],"mappings":";;AAAA,0DAA6C;AAE7C,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvE,IAAA,yBAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/types/LongIntegerType.d.ts

@@ -1,13 +1,9 @@
-import { BscType } from './BscType';
-import { BscTypeKind } from './BscTypeKind';
-import type { TypeCompatibilityData } from '../interfaces';
-export declare class LongIntegerType extends BscType {
+import type { BscType } from './BscType';
+export declare class LongIntegerType implements BscType {
     typeText?: string;
     constructor(typeText?: string);
-    readonly kind = BscTypeKind.LongIntegerType;
-    static instance: LongIntegerType;
-    isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): any;
+    isAssignableTo(targetType: BscType): boolean;
+    isConvertibleTo(targetType: BscType): boolean;
     toString(): string;
     toTypeString(): string;
-    isEqual(targetType: BscType): boolean;
 }