brighterscript 1.0.0-alpha.1 → 1.0.0-alpha.13

package/dist/types/BscType.d.ts

@@ -1,7 +1,21 @@
+import type { Position } from '../astUtils';
+import type { BrsFile } from '../files/BrsFile';
+import type { Scope } from '../Scope';
+import type { SymbolTable } from '../SymbolTable';
 export interface BscType {
-    isAssignableTo(targetType: BscType): boolean;
-    isConvertibleTo(targetType: BscType): boolean;
-    toString(): string;
-    toTypeString(): string;
-    equals(targetType: BscType): boolean;
+    isAssignableTo(targetType: BscType, context?: TypeContext): boolean;
+    isConvertibleTo(targetType: BscType, context?: TypeContext): boolean;
+    toString(context?: TypeContext): string;
+    toTypeString(context?: TypeContext): string;
+    equals(targetType: BscType, context?: TypeContext): boolean;
+    memberTable?: SymbolTable;
 }
+export interface SymbolContainer {
+    memberTable: SymbolTable;
+}
+export interface TypeContext {
+    file: BrsFile;
+    scope: Scope;
+    position?: Position;
+}
+export declare function getTypeFromContext(type: BscType, context?: TypeContext): BscType;

package/dist/types/BscType.js

@@ -1,3 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTypeFromContext = void 0;
+const reflection_1 = require("../astUtils/reflection");
+function getTypeFromContext(type, context) {
+    if ((0, reflection_1.isLazyType)(type)) {
+        return type.getTypeFromContext(context);
+    }
+    return type;
+}
+exports.getTypeFromContext = getTypeFromContext;
 //# sourceMappingURL=BscType.js.map

package/dist/types/BscType.js.map

@@ -1 +1 @@
-{"version":3,"file":"BscType.js","sourceRoot":"","sources":["../../src/types/BscType.ts"],"names":[],"mappings":""}
+{"version":3,"file":"BscType.js","sourceRoot":"","sources":["../../src/types/BscType.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAyBpD,SAAgB,kBAAkB,CAAC,IAAa,EAAE,OAAqB;IACnE,IAAI,IAAA,uBAAU,EAAC,IAAI,CAAC,EAAE;QAClB,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;KAC3C;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AALD,gDAKC"}

package/dist/types/CustomType.d.ts

@@ -1,9 +1,12 @@
-import type { BscType } from './BscType';
-import { ObjectType } from './ObjectType';
-export declare class CustomType extends ObjectType implements BscType {
+import type { SymbolTable } from '../SymbolTable';
+import type { BscType, SymbolContainer, TypeContext } from './BscType';
+export declare class CustomType implements BscType, SymbolContainer {
     name: string;
-    constructor(name: string);
+    memberTable: SymbolTable;
+    constructor(name: string, memberTable?: SymbolTable);
     toString(): string;
     toTypeString(): string;
-    equals(targetType: BscType): boolean;
+    isAssignableTo(targetType: BscType, context?: TypeContext, ancestorTypes?: CustomType[]): boolean;
+    isConvertibleTo(targetType: BscType, context?: TypeContext): boolean;
+    equals(targetType: BscType, context?: TypeContext): boolean;
 }

package/dist/types/CustomType.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomType = void 0;
-const ObjectType_1 = require("./ObjectType");
-class CustomType extends ObjectType_1.ObjectType {
-    constructor(name) {
-        super();
+const reflection_1 = require("../astUtils/reflection");
+class CustomType {
+    constructor(name, memberTable = null) {
         this.name = name;
+        this.memberTable = memberTable;
     }
     toString() {
         return this.name;
@@ -13,8 +13,19 @@ class CustomType extends ObjectType_1.ObjectType {
     toTypeString() {
         return 'object';
     }
-    equals(targetType) {
-        return this.toString() === targetType.toString();
+    isAssignableTo(targetType, context, ancestorTypes) {
+        if (ancestorTypes === null || ancestorTypes === void 0 ? void 0 : ancestorTypes.find(ancestorType => targetType.equals(ancestorType, context))) {
+            return true;
+        }
+        return (this.equals(targetType, context) ||
+            (0, reflection_1.isObjectType)(targetType) ||
+            (0, reflection_1.isDynamicType)(targetType));
+    }
+    isConvertibleTo(targetType, context) {
+        return this.isAssignableTo(targetType, context);
+    }
+    equals(targetType, context) {
+        return this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString(context));
     }
 }
 exports.CustomType = CustomType;

package/dist/types/CustomType.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomType.js","sourceRoot":"","sources":["../../src/types/CustomType.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAE1C,MAAa,UAAW,SAAQ,uBAAU;IAEtC,YAAmB,IAAY;QAC3B,KAAK,EAAE,CAAC;QADO,SAAI,GAAJ,IAAI,CAAQ;IAE/B,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;IACrD,CAAC;CACJ;AAjBD,gCAiBC"}
+{"version":3,"file":"CustomType.js","sourceRoot":"","sources":["../../src/types/CustomType.ts"],"names":[],"mappings":";;;AAAA,uDAAqE;AAIrE,MAAa,UAAU;IAEnB,YAAmB,IAAY,EAAS,cAA2B,IAAI;QAApD,SAAI,GAAJ,IAAI,CAAQ;QAAS,gBAAW,GAAX,WAAW,CAAoB;IACvE,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,cAAc,CAAC,UAAmB,EAAE,OAAqB,EAAE,aAA4B;QAC1F,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,EAAE;YAC/E,OAAO,IAAI,CAAC;SACf;QACD,OAAO,CACH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC;YAChC,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB,EAAE,OAAqB;QAC7D,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,MAAM,CAAC,UAAmB,EAAE,OAAqB;QACpD,OAAO,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,CAAC;IAC7D,CAAC;CACJ;AA/BD,gCA+BC"}

package/dist/types/DoubleType.js

@@ -4,15 +4,15 @@ exports.DoubleType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 class DoubleType {
     isAssignableTo(targetType) {
-        return (reflection_1.isDoubleType(targetType) ||
-            reflection_1.isDynamicType(targetType));
+        return ((0, reflection_1.isDoubleType)(targetType) ||
+            (0, reflection_1.isDynamicType)(targetType));
     }
     isConvertibleTo(targetType) {
-        if (reflection_1.isDynamicType(targetType) ||
-            reflection_1.isIntegerType(targetType) ||
-            reflection_1.isFloatType(targetType) ||
-            reflection_1.isDoubleType(targetType) ||
-            reflection_1.isLongIntegerType(targetType)) {
+        if ((0, reflection_1.isDynamicType)(targetType) ||
+            (0, reflection_1.isIntegerType)(targetType) ||
+            (0, reflection_1.isFloatType)(targetType) ||
+            (0, reflection_1.isDoubleType)(targetType) ||
+            (0, reflection_1.isLongIntegerType)(targetType)) {
             return true;
         }
         else {
@@ -26,7 +26,7 @@ class DoubleType {
         return this.toString();
     }
     equals(targetType) {
-        return this.toString() === targetType.toString();
+        return this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString());
     }
 }
 exports.DoubleType = DoubleType;

package/dist/types/DoubleType.js.map

@@ -1 +1 @@
-{"version":3,"file":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,UAAU;IACZ,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,yBAAY,CAAC,UAAU,CAAC;YACxB,0BAAa,CAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,0BAAa,CAAC,UAAU,CAAC;YACzB,0BAAa,CAAC,UAAU,CAAC;YACzB,wBAAW,CAAC,UAAU,CAAC;YACvB,yBAAY,CAAC,UAAU,CAAC;YACxB,8BAAiB,CAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IACM,QAAQ;QACX,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;IACrD,CAAC;CACJ;AAhCD,gCAgCC"}
+{"version":3,"file":"DoubleType.js","sourceRoot":"","sources":["../../src/types/DoubleType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,UAAU;IACZ,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IACM,QAAQ;QACX,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,CAAA,CAAC;IACtD,CAAC;CACJ;AAhCD,gCAgCC"}

package/dist/types/DoubleType.spec.js

@@ -5,8 +5,8 @@ const DoubleType_1 = require("./DoubleType");
 const DynamicType_1 = require("./DynamicType");
 describe('DoubleType', () => {
     it('is equivalent to double types', () => {
-        chai_1.expect(new DoubleType_1.DoubleType().isAssignableTo(new DoubleType_1.DoubleType())).to.be.true;
-        chai_1.expect(new DoubleType_1.DoubleType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+        (0, chai_1.expect)(new DoubleType_1.DoubleType().isAssignableTo(new DoubleType_1.DoubleType())).to.be.true;
+        (0, chai_1.expect)(new DoubleType_1.DoubleType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
     });
 });
 //# sourceMappingURL=DoubleType.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"DoubleType.spec.js","sourceRoot":"","sources":["../../src/types/DoubleType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,6CAA0C;AAC1C,+CAA4C;AAE5C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,aAAM,CAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACrE,aAAM,CAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC1E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"DoubleType.spec.js","sourceRoot":"","sources":["../../src/types/DoubleType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,6CAA0C;AAC1C,+CAA4C;AAE5C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAA,aAAM,EAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACrE,IAAA,aAAM,EAAC,IAAI,uBAAU,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC1E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/types/DynamicType.js

@@ -22,7 +22,7 @@ class DynamicType {
         return this.toString();
     }
     equals(targetType) {
-        return reflection_1.isDynamicType(targetType);
+        return (0, reflection_1.isDynamicType)(targetType);
     }
 }
 exports.DynamicType = DynamicType;

package/dist/types/DynamicType.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamicType.js","sourceRoot":"","sources":["../../src/types/DynamicType.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AAGvD,MAAa,WAAW;IAEb,cAAc,CAAC,UAAmB;QACrC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,eAAe,CAAC,UAAmB;QACtC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,0BAAa,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACJ;AA3BD,kCA2BC"}
+{"version":3,"file":"DynamicType.js","sourceRoot":"","sources":["../../src/types/DynamicType.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AAGvD,MAAa,WAAW;IAEb,cAAc,CAAC,UAAmB;QACrC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;;OAGG;IACI,eAAe,CAAC,UAAmB;QACtC,2EAA2E;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC;IACxB,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACJ;AA3BD,kCA2BC"}

package/dist/types/DynamicType.spec.js

@@ -5,8 +5,8 @@ const DynamicType_1 = require("./DynamicType");
 const StringType_1 = require("./StringType");
 describe('DynamicType', () => {
     it('is equivalent to dynamic types', () => {
-        chai_1.expect(new DynamicType_1.DynamicType().isAssignableTo(new StringType_1.StringType())).to.be.true;
-        chai_1.expect(new DynamicType_1.DynamicType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+        (0, chai_1.expect)(new DynamicType_1.DynamicType().isAssignableTo(new StringType_1.StringType())).to.be.true;
+        (0, chai_1.expect)(new DynamicType_1.DynamicType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
     });
 });
 //# sourceMappingURL=DynamicType.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"DynamicType.spec.js","sourceRoot":"","sources":["../../src/types/DynamicType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,6CAA0C;AAE1C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,aAAM,CAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACtE,aAAM,CAAC,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"}
+{"version":3,"file":"DynamicType.spec.js","sourceRoot":"","sources":["../../src/types/DynamicType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,6CAA0C;AAE1C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,IAAA,aAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,uBAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACtE,IAAA,aAAM,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/FloatType.d.ts

@@ -1,6 +1,6 @@
 import type { BscType } from './BscType';
 export declare class FloatType implements BscType {
-    isAssignableTo(targetType: BscType): boolean;
+    isAssignableTo(targetType: BscType): any;
     isConvertibleTo(targetType: BscType): boolean;
     toString(): string;
     toTypeString(): string;

package/dist/types/FloatType.js

@@ -4,15 +4,15 @@ exports.FloatType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 class FloatType {
     isAssignableTo(targetType) {
-        return (reflection_1.isFloatType(targetType) ||
-            reflection_1.isDynamicType(targetType));
+        return ((0, reflection_1.isFloatType)(targetType) ||
+            (0, reflection_1.isDynamicType)(targetType));
     }
     isConvertibleTo(targetType) {
-        if (reflection_1.isDynamicType(targetType) ||
-            reflection_1.isIntegerType(targetType) ||
-            reflection_1.isFloatType(targetType) ||
-            reflection_1.isDoubleType(targetType) ||
-            reflection_1.isLongIntegerType(targetType)) {
+        if ((0, reflection_1.isDynamicType)(targetType) ||
+            (0, reflection_1.isIntegerType)(targetType) ||
+            (0, reflection_1.isFloatType)(targetType) ||
+            (0, reflection_1.isDoubleType)(targetType) ||
+            (0, reflection_1.isLongIntegerType)(targetType)) {
             return true;
         }
         else {
@@ -26,7 +26,7 @@ class FloatType {
         return this.toString();
     }
     equals(targetType) {
-        return this.toString() === targetType.toString();
+        return this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString());
     }
 }
 exports.FloatType = FloatType;

package/dist/types/FloatType.js.map

@@ -1 +1 @@
-{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,SAAS;IACX,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,wBAAW,CAAC,UAAU,CAAC;YACvB,0BAAa,CAAC,UAAU,CAAC,CAE5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,0BAAa,CAAC,UAAU,CAAC;YACzB,0BAAa,CAAC,UAAU,CAAC;YACzB,wBAAW,CAAC,UAAU,CAAC;YACvB,yBAAY,CAAC,UAAU,CAAC;YACxB,8BAAiB,CAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEM,QAAQ;QACX,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;IACrD,CAAC;CACJ;AAlCD,8BAkCC"}
+{"version":3,"file":"FloatType.js","sourceRoot":"","sources":["../../src/types/FloatType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAGpH,MAAa,SAAS;IACX,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAE5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEM,QAAQ;QACX,OAAO,OAAO,CAAC;IACnB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,CAAA,CAAC;IACtD,CAAC;CACJ;AAlCD,8BAkCC"}

package/dist/types/FloatType.spec.js

@@ -5,8 +5,8 @@ const DynamicType_1 = require("./DynamicType");
 const FloatType_1 = require("./FloatType");
 describe('FloatType', () => {
     it('is equivalent to double types', () => {
-        chai_1.expect(new FloatType_1.FloatType().isAssignableTo(new FloatType_1.FloatType())).to.be.true;
-        chai_1.expect(new FloatType_1.FloatType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+        (0, chai_1.expect)(new FloatType_1.FloatType().isAssignableTo(new FloatType_1.FloatType())).to.be.true;
+        (0, chai_1.expect)(new FloatType_1.FloatType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
     });
 });
 //# sourceMappingURL=FloatType.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"FloatType.spec.js","sourceRoot":"","sources":["../../src/types/FloatType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,2CAAwC;AAExC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,aAAM,CAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,qBAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACnE,aAAM,CAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"FloatType.spec.js","sourceRoot":"","sources":["../../src/types/FloatType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,2CAAwC;AAExC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAA,aAAM,EAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,qBAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACnE,IAAA,aAAM,EAAC,IAAI,qBAAS,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/types/FunctionType.d.ts

@@ -1,3 +1,4 @@
+import type { CallableParam } from '../interfaces';
 import type { BscType } from './BscType';
 export declare class FunctionType implements BscType {
     returnType: BscType;
@@ -5,26 +6,19 @@ export declare class FunctionType implements BscType {
      * Determines if this is a sub or not
      */
     isSub: boolean;
-    params: {
-        name: string;
-        type: BscType;
-        isRequired: boolean;
-    }[];
+    params: CallableParam[];
+    isNew: boolean;
     constructor(returnType: BscType, 
     /**
      * Determines if this is a sub or not
      */
-    isSub?: boolean, params?: {
-        name: string;
-        type: BscType;
-        isRequired: boolean;
-    }[]);
+    isSub?: boolean, params?: CallableParam[], isNew?: boolean);
     /**
      * The name of the function for this type. Can be null
      */
     name: string;
     setName(name: string): this;
-    addParameter(name: string, type: BscType, isRequired: boolean): this;
+    addParameter(paramOrName: CallableParam | string, type?: BscType, isOptional?: boolean): this;
     isAssignableTo(targetType: BscType): boolean;
     isConvertibleTo(targetType: BscType): boolean;
     toString(): string;

package/dist/types/FunctionType.js

@@ -2,30 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionType = void 0;
 const reflection_1 = require("../astUtils/reflection");
+const DynamicType_1 = require("./DynamicType");
 class FunctionType {
     constructor(returnType, 
     /**
      * Determines if this is a sub or not
      */
-    isSub = false, params = []) {
+    isSub = false, params = [], isNew = false) {
         this.returnType = returnType;
         this.isSub = isSub;
         this.params = params;
+        this.isNew = isNew;
     }
     setName(name) {
         this.name = name;
         return this;
     }
-    addParameter(name, type, isRequired) {
-        this.params.push({
-            name: name,
-            type: type,
-            isRequired: isRequired === false ? false : true
-        });
+    addParameter(paramOrName, type, isOptional) {
+        if (typeof paramOrName === 'string') {
+            this.params.push({
+                name: paramOrName,
+                type: type !== null && type !== void 0 ? type : new DynamicType_1.DynamicType(),
+                isOptional: !!isOptional,
+                isRestArgument: false
+            });
+        }
+        else {
+            this.params.push(paramOrName);
+        }
         return this;
     }
     isAssignableTo(targetType) {
-        if (reflection_1.isFunctionType(targetType)) {
+        if ((0, reflection_1.isFunctionType)(targetType)) {
             //compare all parameters
             let len = Math.max(this.params.length, targetType.params.length);
             for (let i = 0; i < len; i++) {
@@ -42,7 +50,7 @@ class FunctionType {
             //made it here, all params and return type are equivalent
             return true;
         }
-        else if (reflection_1.isDynamicType(targetType)) {
+        else if ((0, reflection_1.isDynamicType)(targetType)) {
             return true;
         }
         else {
@@ -53,18 +61,21 @@ class FunctionType {
         return this.isAssignableTo(targetType);
     }
     toString() {
-        var _a;
+        var _a, _b;
         let paramTexts = [];
         for (let param of this.params) {
-            paramTexts.push(`${param.name}${param.isRequired ? '' : '?'} as ${param.type.toString()}`);
+            paramTexts.push(`${param.name}${param.isOptional ? '?' : ''} as ${param.type.toString()}`);
+        }
+        if (this.isNew) {
+            return `new ${(_a = this.name) !== null && _a !== void 0 ? _a : ''}(${paramTexts.join(', ')})`;
         }
-        return `${this.isSub ? 'sub' : 'function'} ${(_a = this.name) !== null && _a !== void 0 ? _a : ''}(${paramTexts.join(', ')}) as ${this.returnType.toString()}`;
+        return `${this.isSub ? 'sub' : 'function'} ${(_b = this.name) !== null && _b !== void 0 ? _b : ''}(${paramTexts.join(', ')}) as ${this.returnType.toString()}`;
     }
     toTypeString() {
         return 'Function';
     }
     equals(targetType) {
-        return (reflection_1.isFunctionType(targetType)) && this.isAssignableTo(targetType);
+        return ((0, reflection_1.isFunctionType)(targetType)) && this.isAssignableTo(targetType);
     }
 }
 exports.FunctionType = FunctionType;

package/dist/types/FunctionType.js.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionType.js","sourceRoot":"","sources":["../../src/types/FunctionType.ts"],"names":[],"mappings":";;;AAAA,uDAAuE;AAGvE,MAAa,YAAY;IACrB,YACW,UAAmB;IAC1B;;OAEG;IACI,QAAQ,KAAK,EACb,SAAS,EAAiE;QAL1E,eAAU,GAAV,UAAU,CAAS;QAInB,UAAK,GAAL,KAAK,CAAQ;QACb,WAAM,GAAN,MAAM,CAAoE;IAErF,CAAC;IAOM,OAAO,CAAC,IAAY;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,IAAY,EAAE,IAAa,EAAE,UAAmB;QAChE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;SAClD,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,cAAc,CAAC,UAAmB;QACrC,IAAI,2BAAc,CAAC,UAAU,CAAC,EAAE;YAC5B,wBAAwB;YACxB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;gBAC1B,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvC,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBAC5E,OAAO,KAAK,CAAC;iBAChB;aACJ;YAED,qBAAqB;YACrB,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBACtG,OAAO,KAAK,CAAC;aAChB;YAED,yDAAyD;YACzD,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,0BAAa,CAAC,UAAU,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC;SACf;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,UAAU,GAAG,EAAE,CAAC;QACpB,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;YAC3B,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC9F;QACD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,MAAA,IAAI,CAAC,IAAI,mCAAI,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;IAE9H,CAAC;IAEM,YAAY;QACf,OAAO,UAAU,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,CAAC,2BAAc,CAAC,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3E,CAAC;CACJ;AA5ED,oCA4EC"}
+{"version":3,"file":"FunctionType.js","sourceRoot":"","sources":["../../src/types/FunctionType.ts"],"names":[],"mappings":"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"}

package/dist/types/FunctionType.spec.js

@@ -2,22 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const DynamicType_1 = require("./DynamicType");
+const FloatType_1 = require("./FloatType");
 const FunctionType_1 = require("./FunctionType");
 const IntegerType_1 = require("./IntegerType");
 const StringType_1 = require("./StringType");
 const VoidType_1 = require("./VoidType");
 describe('FunctionType', () => {
     it('is equivalent to dynamic type', () => {
-        chai_1.expect(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+        (0, chai_1.expect)(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
     });
     it('validates using param and return types', () => {
-        chai_1.expect(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).isAssignableTo(new FunctionType_1.FunctionType(new VoidType_1.VoidType()))).to.be.true;
+        (0, chai_1.expect)(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).isAssignableTo(new FunctionType_1.FunctionType(new VoidType_1.VoidType()))).to.be.true;
         //different parameter count
-        chai_1.expect(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).addParameter('a', new IntegerType_1.IntegerType(), true).isAssignableTo(new FunctionType_1.FunctionType(new VoidType_1.VoidType()))).to.be.false;
+        (0, chai_1.expect)(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).addParameter('a', new IntegerType_1.IntegerType(), false).isAssignableTo(new FunctionType_1.FunctionType(new VoidType_1.VoidType()))).to.be.false;
         //different parameter types
-        chai_1.expect(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).addParameter('a', new IntegerType_1.IntegerType(), true).isAssignableTo(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).addParameter('a', new StringType_1.StringType(), true))).to.be.false;
+        (0, chai_1.expect)(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).addParameter('a', new IntegerType_1.IntegerType(), false).isAssignableTo(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).addParameter('a', new StringType_1.StringType(), false))).to.be.false;
         //different return type
-        chai_1.expect(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).isAssignableTo(new FunctionType_1.FunctionType(new IntegerType_1.IntegerType()))).to.be.false;
+        (0, chai_1.expect)(new FunctionType_1.FunctionType(new VoidType_1.VoidType()).isAssignableTo(new FunctionType_1.FunctionType(new IntegerType_1.IntegerType()))).to.be.false;
+    });
+    it('adds a callableParam object as a parameter', () => {
+        const myFunc = new FunctionType_1.FunctionType(new IntegerType_1.IntegerType(), false, [{ name: 'a', type: new StringType_1.StringType(), isOptional: false }, { name: 'b', type: new DynamicType_1.DynamicType(), isOptional: true }]);
+        myFunc.addParameter({ name: 'c', type: new FloatType_1.FloatType(), isOptional: true });
+        (0, chai_1.expect)(myFunc.params.length).to.equal(3);
     });
 });
 //# sourceMappingURL=FunctionType.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"FunctionType.spec.js","sourceRoot":"","sources":["../../src/types/FunctionType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,iDAA8C;AAC9C,+CAA4C;AAC5C,6CAA0C;AAC1C,yCAAsC;AAEtC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,aAAM,CAAC,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC9C,aAAM,CAAC,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAErG,2BAA2B;QAC3B,aAAM,CACF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,yBAAW,EAAE,EAAE,IAAI,CAAC,CAAC,cAAc,CACtF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CACnC,CACJ,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QAEd,2BAA2B;QAC3B,aAAM,CACF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,yBAAW,EAAE,EAAE,IAAI,CAAC,CAAC,cAAc,CACtF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,uBAAU,EAAE,EAAE,IAAI,CAAC,CAC7E,CACJ,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QAEd,uBAAuB;QACvB,aAAM,CACF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,cAAc,CAC3C,IAAI,2BAAY,CAAC,IAAI,yBAAW,EAAE,CAAC,CACtC,CACJ,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"FunctionType.spec.js","sourceRoot":"","sources":["../../src/types/FunctionType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,2CAAwC;AACxC,iDAA8C;AAC9C,+CAA4C;AAC5C,6CAA0C;AAC1C,yCAAsC;AAEtC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,IAAA,aAAM,EAAC,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC9C,IAAA,aAAM,EAAC,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAErG,2BAA2B;QAC3B,IAAA,aAAM,EACF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,yBAAW,EAAE,EAAE,KAAK,CAAC,CAAC,cAAc,CACvF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CACnC,CACJ,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QAEd,2BAA2B;QAC3B,IAAA,aAAM,EACF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,yBAAW,EAAE,EAAE,KAAK,CAAC,CAAC,cAAc,CACvF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,uBAAU,EAAE,EAAE,KAAK,CAAC,CAC9E,CACJ,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QAEd,uBAAuB;QACvB,IAAA,aAAM,EACF,IAAI,2BAAY,CAAC,IAAI,mBAAQ,EAAE,CAAC,CAAC,cAAc,CAC3C,IAAI,2BAAY,CAAC,IAAI,yBAAW,EAAE,CAAC,CACtC,CACJ,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAG,IAAI,2BAAY,CAAC,IAAI,yBAAW,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,uBAAU,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,yBAAW,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAChL,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,qBAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5E,IAAA,aAAM,EAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/types/IntegerType.d.ts

@@ -1,6 +1,6 @@
 import type { BscType } from './BscType';
 export declare class IntegerType implements BscType {
-    isAssignableTo(targetType: BscType): boolean;
+    isAssignableTo(targetType: BscType): any;
     isConvertibleTo(targetType: BscType): boolean;
     toString(): string;
     toTypeString(): string;

package/dist/types/IntegerType.js

@@ -4,15 +4,15 @@ exports.IntegerType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 class IntegerType {
     isAssignableTo(targetType) {
-        return (reflection_1.isIntegerType(targetType) ||
-            reflection_1.isDynamicType(targetType));
+        return ((0, reflection_1.isIntegerType)(targetType) ||
+            (0, reflection_1.isDynamicType)(targetType));
     }
     isConvertibleTo(targetType) {
-        if (reflection_1.isDynamicType(targetType) ||
-            reflection_1.isIntegerType(targetType) ||
-            reflection_1.isFloatType(targetType) ||
-            reflection_1.isDoubleType(targetType) ||
-            reflection_1.isLongIntegerType(targetType)) {
+        if ((0, reflection_1.isDynamicType)(targetType) ||
+            (0, reflection_1.isIntegerType)(targetType) ||
+            (0, reflection_1.isFloatType)(targetType) ||
+            (0, reflection_1.isDoubleType)(targetType) ||
+            (0, reflection_1.isLongIntegerType)(targetType)) {
             return true;
         }
         else {
@@ -26,7 +26,7 @@ class IntegerType {
         return this.toString();
     }
     equals(targetType) {
-        return this.toString() === targetType.toString();
+        return this.toString() === (targetType === null || targetType === void 0 ? void 0 : targetType.toString());
     }
 }
 exports.IntegerType = IntegerType;

package/dist/types/IntegerType.js.map

@@ -1 +1 @@
-{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAIpH,MAAa,WAAW;IACb,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,0BAAa,CAAC,UAAU,CAAC;YACzB,0BAAa,CAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,0BAAa,CAAC,UAAU,CAAC;YACzB,0BAAa,CAAC,UAAU,CAAC;YACzB,wBAAW,CAAC,UAAU,CAAC;YACvB,yBAAY,CAAC,UAAU,CAAC;YACxB,8BAAiB,CAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;IACrD,CAAC;CACJ;AAjCD,kCAiCC"}
+{"version":3,"file":"IntegerType.js","sourceRoot":"","sources":["../../src/types/IntegerType.ts"],"names":[],"mappings":";;;AAAA,uDAAoH;AAIpH,MAAa,WAAW;IACb,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,IACI,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,0BAAa,EAAC,UAAU,CAAC;YACzB,IAAA,wBAAW,EAAC,UAAU,CAAC;YACvB,IAAA,yBAAY,EAAC,UAAU,CAAC;YACxB,IAAA,8BAAiB,EAAC,UAAU,CAAC,EAC/B;YACE,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEM,QAAQ;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,MAAK,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,EAAE,CAAA,CAAC;IACtD,CAAC;CACJ;AAjCD,kCAiCC"}

package/dist/types/IntegerType.spec.js

@@ -5,8 +5,8 @@ const DynamicType_1 = require("./DynamicType");
 const IntegerType_1 = require("./IntegerType");
 describe('IntegerType', () => {
     it('is equivalent to other integer types', () => {
-        chai_1.expect(new IntegerType_1.IntegerType().isAssignableTo(new IntegerType_1.IntegerType())).to.be.true;
-        chai_1.expect(new IntegerType_1.IntegerType().isAssignableTo(new DynamicType_1.DynamicType())).to.be.true;
+        (0, chai_1.expect)(new IntegerType_1.IntegerType().isAssignableTo(new IntegerType_1.IntegerType())).to.be.true;
+        (0, chai_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,+BAA8B;AAE9B,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC5C,aAAM,CAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvE,aAAM,CAAC,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"}
+{"version":3,"file":"IntegerType.spec.js","sourceRoot":"","sources":["../../src/types/IntegerType.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,+CAA4C;AAC5C,+CAA4C;AAE5C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC5C,IAAA,aAAM,EAAC,IAAI,yBAAW,EAAE,CAAC,cAAc,CAAC,IAAI,yBAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACvE,IAAA,aAAM,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,7 +1,13 @@
 import type { BscType } from './BscType';
 export declare class InterfaceType implements BscType {
-    isAssignableTo(targetType: BscType): any;
-    isConvertibleTo(targetType: BscType): any;
+    members: Map<string, BscType>;
+    constructor(members: Map<string, BscType>);
+    /**
+     * The name of the interface. Can be null.
+     */
+    name: string;
+    isAssignableTo(targetType: BscType): boolean;
+    isConvertibleTo(targetType: BscType): boolean;
     toString(): string;
     toTypeString(): string;
     equals(targetType: BscType): boolean;

package/dist/types/InterfaceType.js

@@ -3,22 +3,58 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InterfaceType = void 0;
 const reflection_1 = require("../astUtils/reflection");
 class InterfaceType {
+    constructor(members) {
+        this.members = members;
+    }
     isAssignableTo(targetType) {
-        return (reflection_1.isInterfaceType(targetType) ||
-            reflection_1.isDynamicType(targetType));
+        //we must have all of the members of the target type, and they must be equivalent types
+        if ((0, reflection_1.isInterfaceType)(targetType)) {
+            for (const [targetMemberName, targetMemberType] of targetType.members) {
+                //we don't have the target member
+                if (!this.members.has(targetMemberName)) {
+                    return false;
+                }
+                //our member's type is not assignable to the target member type
+                if (!this.members.get(targetMemberName).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
+        }
+        else if ((0, reflection_1.isDynamicType)(targetType) || (0, reflection_1.isObjectType)(targetType)) {
+            return true;
+            //not assignable to any other object types
+        }
+        else {
+            return false;
+        }
     }
     isConvertibleTo(targetType) {
         return this.isAssignableTo(targetType);
     }
     toString() {
-        //TODO make this match the actual interface of the object
-        return 'interface';
+        let result = '{';
+        for (const [key, type] of this.members.entries()) {
+            result += ' ' + key + ': ' + type.toString() + ';';
+        }
+        if (this.members.size > 0) {
+            result += ' ';
+        }
+        return result + '}';
     }
     toTypeString() {
-        return this.toString();
+        return 'object';
     }
     equals(targetType) {
-        return reflection_1.isInterfaceType(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":";;;AAAA,uDAAwE;AAGxE,MAAa,aAAa;IACf,cAAc,CAAC,UAAmB;QACrC,OAAO,CACH,4BAAe,CAAC,UAAU,CAAC;YAC3B,0BAAa,CAAC,UAAU,CAAC,CAC5B,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,QAAQ;QACX,yDAAyD;QACzD,OAAO,WAAW,CAAC;IACvB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,UAAmB;QAC7B,OAAO,4BAAe,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;CACJ;AAxBD,sCAwBC"}
+{"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,iCAAiC;gBACjC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;oBACrC,OAAO,KAAK,CAAC;iBAChB;gBACD,+DAA+D;gBAC/D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;oBACtE,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;AAlED,sCAkEC"}

package/dist/types/InterfaceType.spec.d.ts

@@ -0,0 +1 @@
+export {};