brighterscript 0.65.1 → 0.66.0-alpha.0

package/dist/types/helpers.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUniqueType = exports.reduceTypesToMostGeneric = exports.getUniqueTypesFromArray = exports.findTypeUnion = exports.findTypeIntersection = void 0;
+const reflection_1 = require("../astUtils/reflection");
+function findTypeIntersection(typesArr1, typesArr2) {
+    if (!typesArr1 || !typesArr2) {
+        return undefined;
+    }
+    return typesArr1 === null || typesArr1 === void 0 ? void 0 : typesArr1.filter((currentType) => {
+        if (!currentType) {
+            return false;
+        }
+        const indexOfCurrentTypeInArr2 = typesArr2.findIndex((checkType) => {
+            return currentType.isEqual(checkType);
+        });
+        return indexOfCurrentTypeInArr2 >= 0;
+    });
+}
+exports.findTypeIntersection = findTypeIntersection;
+function findTypeUnion(...typesArr) {
+    return getUniqueTypesFromArray([].concat(...typesArr));
+}
+exports.findTypeUnion = findTypeUnion;
+function getUniqueTypesFromArray(types) {
+    if (!types) {
+        return undefined;
+    }
+    return types === null || types === void 0 ? void 0 : types.filter((currentType, currentIndex) => {
+        if (!currentType) {
+            return false;
+        }
+        const latestIndex = types.findIndex((checkType) => {
+            return currentType.isEqual(checkType);
+        });
+        // the index that was found is the index we're checking --- there are no equal types after this
+        return latestIndex === currentIndex;
+    });
+}
+exports.getUniqueTypesFromArray = getUniqueTypesFromArray;
+/**
+ * Reduces a list of types based on equality or inheritance
+ * If all types are the same - just that type is returned
+ * If one of the types is Dynamic, then Dynamic.instance is returned
+ * If any types inherit another type, the more general type is returned
+ * @param types array of types
+ * @returns an array of the most general types
+ */
+function reduceTypesToMostGeneric(types) {
+    if (!types || (types === null || types === void 0 ? void 0 : types.length) === 0) {
+        return undefined;
+    }
+    if (types.length === 1) {
+        // only one type
+        return [types[0]];
+    }
+    // Get a list of unique types, based on the `isEqual()` method
+    const uniqueTypes = getUniqueTypesFromArray(types).map(t => {
+        // map to object with `shouldIgnore` flag
+        return { type: t, shouldIgnore: false };
+    });
+    if (uniqueTypes.length === 1) {
+        // only one type after filtering
+        return [uniqueTypes[0].type];
+    }
+    const existingDynamicType = uniqueTypes.find(t => !(0, reflection_1.isReferenceType)(t.type) && (0, reflection_1.isDynamicType)(t.type));
+    if (existingDynamicType) {
+        // If it includes dynamic, then the result is dynamic
+        return [existingDynamicType.type];
+    }
+    const generalizedTypes = [];
+    //check assignability:
+    for (let i = 0; i < uniqueTypes.length; i++) {
+        const currentType = uniqueTypes[i].type;
+        if (i === uniqueTypes.length - 1) {
+            if (!uniqueTypes[i].shouldIgnore) {
+                //this type was not convertible to anything else... it is as general as possible
+                generalizedTypes.push(currentType);
+            }
+            break;
+        }
+        for (let j = i + 1; j < uniqueTypes.length; j++) {
+            if (uniqueTypes[j].shouldIgnore) {
+                continue;
+            }
+            const checkType = uniqueTypes[j].type;
+            if (currentType.isEqual(uniqueTypes[j].type)) {
+                uniqueTypes[j].shouldIgnore = true;
+            }
+            else if ((0, reflection_1.isInheritableType)(currentType) && (0, reflection_1.isInheritableType)(checkType)) {
+                if (currentType.isTypeDescendent(checkType)) {
+                    //the type we're checking is less general than the current type... it can be ignored
+                    uniqueTypes[j].shouldIgnore = true;
+                }
+                if (checkType.isTypeDescendent(currentType)) {
+                    // the currentType is a descendent to some other type - it won't be in the final set
+                    break;
+                }
+            }
+            if (j === uniqueTypes.length - 1) {
+                //this type was not convertible to anything else... it is as general as possible
+                generalizedTypes.push(currentType);
+            }
+        }
+    }
+    return generalizedTypes;
+}
+exports.reduceTypesToMostGeneric = reduceTypesToMostGeneric;
+/**
+ * Gets a Unique type from a list of types
+ * @param types array of types
+ * @returns either the singular most general type, if there is one, otherwise a UnionType of the most general types
+ */
+function getUniqueType(types, unionTypeFactory) {
+    types = types === null || types === void 0 ? void 0 : types.map(type => {
+        if (!(0, reflection_1.isReferenceType)(type) && (0, reflection_1.isUnionType)(type)) {
+            return type.types;
+        }
+        return type;
+    }).flat();
+    const generalizedTypes = reduceTypesToMostGeneric(types);
+    if (!generalizedTypes || generalizedTypes.length === 0) {
+        return undefined;
+    }
+    if ((generalizedTypes === null || generalizedTypes === void 0 ? void 0 : generalizedTypes.length) === 1) {
+        // only one type
+        return generalizedTypes[0];
+    }
+    return unionTypeFactory(generalizedTypes);
+}
+exports.getUniqueType = getUniqueType;
+//# sourceMappingURL=helpers.js.map

package/dist/types/helpers.js.map

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

package/dist/types/index.d.ts

@@ -0,0 +1,22 @@
+export * from './ArrayType';
+export * from './BooleanType';
+export * from './BscType';
+export * from './ClassType';
+export * from './DoubleType';
+export * from './DynamicType';
+export * from './EnumType';
+export * from './FloatType';
+export * from './FunctionType';
+export * from './helpers';
+export * from './InheritableType';
+export * from './IntegerType';
+export * from './InterfaceType';
+export * from './InvalidType';
+export * from './LongIntegerType';
+export * from './NamespaceType';
+export * from './ObjectType';
+export * from './ReferenceType';
+export * from './StringType';
+export * from './UninitializedType';
+export * from './UnionType';
+export * from './VoidType';

package/dist/types/index.js

@@ -0,0 +1,39 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ArrayType"), exports);
+__exportStar(require("./BooleanType"), exports);
+__exportStar(require("./BscType"), exports);
+__exportStar(require("./ClassType"), exports);
+__exportStar(require("./DoubleType"), exports);
+__exportStar(require("./DynamicType"), exports);
+__exportStar(require("./EnumType"), exports);
+__exportStar(require("./FloatType"), exports);
+__exportStar(require("./FunctionType"), exports);
+__exportStar(require("./helpers"), exports);
+__exportStar(require("./InheritableType"), exports);
+__exportStar(require("./IntegerType"), exports);
+__exportStar(require("./InterfaceType"), exports);
+__exportStar(require("./InvalidType"), exports);
+__exportStar(require("./LongIntegerType"), exports);
+__exportStar(require("./NamespaceType"), exports);
+__exportStar(require("./ObjectType"), exports);
+__exportStar(require("./ReferenceType"), exports);
+__exportStar(require("./StringType"), exports);
+__exportStar(require("./UninitializedType"), exports);
+__exportStar(require("./UnionType"), exports);
+__exportStar(require("./VoidType"), exports);
+//# sourceMappingURL=index.js.map

package/dist/types/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,gDAA8B;AAC9B,4CAA0B;AAC1B,8CAA4B;AAC5B,+CAA6B;AAC7B,gDAA8B;AAC9B,6CAA2B;AAC3B,8CAA4B;AAC5B,iDAA+B;AAC/B,4CAA0B;AAC1B,oDAAkC;AAClC,gDAA8B;AAC9B,kDAAgC;AAChC,gDAA8B;AAC9B,oDAAkC;AAClC,kDAAgC;AAChC,+CAA6B;AAC7B,kDAAgC;AAChC,+CAA6B;AAC7B,sDAAoC;AACpC,8CAA4B;AAC5B,6CAA2B"}

package/dist/util.d.ts

@@ -1,6 +1,6 @@
 import type { Diagnostic, Position, Range, Location } from 'vscode-languageserver';
 import type { BsConfig } from './BsConfig';
-import type { CallableContainer, BsDiagnostic, FileReference, CallableContainerMap, CompilerPlugin, ExpressionInfo } from './interfaces';
+import type { CallableContainer, BsDiagnostic, FileReference, CallableContainerMap, CompilerPlugin, ExpressionInfo, TypeChainEntry, TypeChainProcessResult } from './interfaces';
 import { BooleanType } from './types/BooleanType';
 import { DoubleType } from './types/DoubleType';
 import { DynamicType } from './types/DynamicType';
@@ -12,11 +12,10 @@ import { LongIntegerType } from './types/LongIntegerType';
 import { ObjectType } from './types/ObjectType';
 import { StringType } from './types/StringType';
 import { VoidType } from './types/VoidType';
+import { ParseMode } from './parser/Parser';
 import type { DottedGetExpression, VariableExpression } from './parser/Expression';
 import type { Identifier, Locatable, Token } from './lexer/Token';
-import { CustomType } from './types/CustomType';
 import { SourceNode } from 'source-map';
-import type { SGAttribute } from './parser/SGTypes';
 import type { BrsFile } from './files/BrsFile';
 import type { XmlFile } from './files/XmlFile';
 import type { Expression, Statement } from './parser/AstNode';
@@ -289,7 +288,7 @@ export declare class Util {
     /**
      * Convert a token into a BscType
      */
-    tokenToBscType(token: Token, allowCustomType?: boolean): DynamicType | BooleanType | LongIntegerType | IntegerType | FloatType | DoubleType | FunctionType | InvalidType | ObjectType | StringType | VoidType | CustomType;
+    tokenToBscType(token: Token): DynamicType | FloatType | IntegerType | DoubleType | LongIntegerType | StringType | BooleanType | InvalidType | VoidType | FunctionType | ObjectType;
     /**
      * Get the extension for the given file path. Basically the part after the final dot, except for
      * `d.bs` which is treated as single extension
@@ -309,10 +308,6 @@ export declare class Util {
      * that haven't changed at all, but we still need the map
      */
     simpleMap(source: string, src: string): SourceNode;
-    /**
-     * Creates a new SGAttribute object, but keeps the existing Range references (since those shouldn't ever get changed directly)
-     */
-    cloneSGAttribute(attr: SGAttribute, value: string): SGAttribute;
     /**
      * Converts a path into a standardized format (drive letter to lower, remove extra slashes, use single slash type, resolve relative parts, etc...)
      */
@@ -365,6 +360,7 @@ export declare class Util {
      * @returns an array of the parts of the dotted get. If not fully a dotted get, then returns undefined
      */
     getAllDottedGetParts(node: Expression | Statement): Identifier[] | undefined;
+    getAllDottedGetPartsAsString(node: Expression | Statement, parseMode?: ParseMode): string;
     /**
      * Break an expression into each part.
      */
@@ -382,6 +378,11 @@ export declare class Util {
      */
     rangeToString(range: Range): string;
     validateTooDeepFile(file: (BrsFile | XmlFile)): void;
+    /**
+     * Find the index of the last item in the array that matches.
+     */
+    findLastIndex<T>(array: T[], matcher: (T: any) => boolean): number;
+    processTypeChain(typeChain: TypeChainEntry[]): TypeChainProcessResult;
 }
 /**
  * A tagged template literal function for standardizing the path. This has to be defined as standalone function since it's a tagged template literal function,

package/dist/util.js

@@ -25,9 +25,9 @@ const Logger_1 = require("./Logger");
 const TokenKind_1 = require("./lexer/TokenKind");
 const reflection_1 = require("./astUtils/reflection");
 const visitors_1 = require("./astUtils/visitors");
-const CustomType_1 = require("./types/CustomType");
 const source_map_1 = require("source-map");
 const requireRelative = require("require-relative");
+const creators_1 = require("./astUtils/creators");
 class Util {
     clearConsole() {
         // process.stdout.write('\x1Bc');
@@ -303,8 +303,7 @@ class Util {
         config.username = (_d = config.username) !== null && _d !== void 0 ? _d : 'rokudev';
         config.watch = config.watch === true ? true : false;
         config.emitFullPaths = config.emitFullPaths === true ? true : false;
-        config.retainStagingDir = ((_e = config.retainStagingDir) !== null && _e !== void 0 ? _e : config.retainStagingFolder) === true ? true : false;
-        config.retainStagingFolder = config.retainStagingDir;
+        config.retainStagingDir = (_e = config.retainStagingDir) !== null && _e !== void 0 ? _e : false;
         config.copyToStaging = config.copyToStaging === false ? false : true;
         config.ignoreErrorCodes = (_f = config.ignoreErrorCodes) !== null && _f !== void 0 ? _f : [];
         config.diagnosticSeverityOverrides = (_g = config.diagnosticSeverityOverrides) !== null && _g !== void 0 ? _g : {};
@@ -316,6 +315,7 @@ class Util {
         config.allowBrighterScriptInBrightScript = config.allowBrighterScriptInBrightScript === true ? true : false;
         config.emitDefinitions = config.emitDefinitions === true ? true : false;
         config.removeParameterTypes = config.removeParameterTypes === true ? true : false;
+        config.enableTypeValidation = config.enableTypeValidation === true ? true : false;
         if (typeof config.logLevel === 'string') {
             config.logLevel = Logger_1.LogLevel[config.logLevel.toLowerCase()];
         }
@@ -919,37 +919,37 @@ class Util {
     /**
      * Convert a token into a BscType
      */
-    tokenToBscType(token, allowCustomType = true) {
+    tokenToBscType(token) {
         // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
         switch (token.kind) {
             case TokenKind_1.TokenKind.Boolean:
                 return new BooleanType_1.BooleanType(token.text);
             case TokenKind_1.TokenKind.True:
             case TokenKind_1.TokenKind.False:
-                return new BooleanType_1.BooleanType();
+                return BooleanType_1.BooleanType.instance;
             case TokenKind_1.TokenKind.Double:
                 return new DoubleType_1.DoubleType(token.text);
             case TokenKind_1.TokenKind.DoubleLiteral:
-                return new DoubleType_1.DoubleType();
+                return DoubleType_1.DoubleType.instance;
             case TokenKind_1.TokenKind.Dynamic:
                 return new DynamicType_1.DynamicType(token.text);
             case TokenKind_1.TokenKind.Float:
                 return new FloatType_1.FloatType(token.text);
             case TokenKind_1.TokenKind.FloatLiteral:
-                return new FloatType_1.FloatType();
+                return FloatType_1.FloatType.instance;
             case TokenKind_1.TokenKind.Function:
                 //TODO should there be a more generic function type without a signature that's assignable to all other function types?
                 return new FunctionType_1.FunctionType(new DynamicType_1.DynamicType(token.text));
             case TokenKind_1.TokenKind.Integer:
                 return new IntegerType_1.IntegerType(token.text);
             case TokenKind_1.TokenKind.IntegerLiteral:
-                return new IntegerType_1.IntegerType();
+                return IntegerType_1.IntegerType.instance;
             case TokenKind_1.TokenKind.Invalid:
                 return new InvalidType_1.InvalidType(token.text);
             case TokenKind_1.TokenKind.LongInteger:
                 return new LongIntegerType_1.LongIntegerType(token.text);
             case TokenKind_1.TokenKind.LongIntegerLiteral:
-                return new LongIntegerType_1.LongIntegerType();
+                return LongIntegerType_1.LongIntegerType.instance;
             case TokenKind_1.TokenKind.Object:
                 return new ObjectType_1.ObjectType(token.text);
             case TokenKind_1.TokenKind.String:
@@ -958,7 +958,7 @@ class Util {
             case TokenKind_1.TokenKind.TemplateStringExpressionBegin:
             case TokenKind_1.TokenKind.TemplateStringExpressionEnd:
             case TokenKind_1.TokenKind.TemplateStringQuasi:
-                return new StringType_1.StringType();
+                return StringType_1.StringType.instance;
             case TokenKind_1.TokenKind.Void:
                 return new VoidType_1.VoidType(token.text);
             case TokenKind_1.TokenKind.Identifier:
@@ -967,6 +967,8 @@ class Util {
                         return new BooleanType_1.BooleanType(token.text);
                     case 'double':
                         return new DoubleType_1.DoubleType(token.text);
+                    case 'dynamic':
+                        return new DynamicType_1.DynamicType(token.text);
                     case 'float':
                         return new FloatType_1.FloatType(token.text);
                     case 'function':
@@ -984,9 +986,6 @@ class Util {
                     case 'void':
                         return new VoidType_1.VoidType(token.text);
                 }
-                if (allowCustomType) {
-                    return new CustomType_1.CustomType(token.text);
-                }
         }
     }
     /**
@@ -1082,22 +1081,6 @@ class Util {
         }
         return new source_map_1.SourceNode(null, null, source, chunks);
     }
-    /**
-     * Creates a new SGAttribute object, but keeps the existing Range references (since those shouldn't ever get changed directly)
-     */
-    cloneSGAttribute(attr, value) {
-        return {
-            key: {
-                text: attr.key.text,
-                range: attr.range
-            },
-            value: {
-                text: value,
-                range: attr.value.range
-            },
-            range: attr.range
-        };
-    }
     /**
      * Converts a path into a standardized format (drive letter to lower, remove extra slashes, use single slash type, resolve relative parts, etc...)
      */
@@ -1249,16 +1232,30 @@ class Util {
                 parts.push(nextPart === null || nextPart === void 0 ? void 0 : nextPart.name);
                 nextPart = nextPart.obj;
             }
-            else if ((0, reflection_1.isNamespacedVariableNameExpression)(nextPart)) {
+            else if ((0, reflection_1.isCallExpression)(nextPart)) {
+                nextPart = nextPart.callee;
+            }
+            else if ((0, reflection_1.isTypeExpression)(nextPart)) {
                 nextPart = nextPart.expression;
             }
             else if ((0, reflection_1.isVariableExpression)(nextPart)) {
                 parts.push(nextPart === null || nextPart === void 0 ? void 0 : nextPart.name);
                 break;
             }
+            else if ((0, reflection_1.isLiteralExpression)(nextPart)) {
+                parts.push(nextPart === null || nextPart === void 0 ? void 0 : nextPart.token);
+                break;
+            }
+            else if ((0, reflection_1.isIndexedGetExpression)(nextPart)) {
+                nextPart = nextPart.obj;
+            }
             else if ((0, reflection_1.isFunctionParameterExpression)(nextPart)) {
                 return [nextPart.name];
             }
+            else if ((0, reflection_1.isGroupingExpression)(nextPart)) {
+                parts.push((0, creators_1.createIdentifier)('()', nextPart.range));
+                break;
+            }
             else {
                 //we found a non-DottedGet expression, so return because this whole operation is invalid.
                 return undefined;
@@ -1266,6 +1263,15 @@ class Util {
         }
         return parts.reverse();
     }
+    getAllDottedGetPartsAsString(node, parseMode = Parser_1.ParseMode.BrighterScript) {
+        var _a;
+        const sep = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
+        const hello = (_a = this.getAllDottedGetParts(node)) === null || _a === void 0 ? void 0 : _a.map(part => part.text).join(sep);
+        if (!hello) {
+            console.log(node);
+        }
+        return hello;
+    }
     /**
      * Break an expression into each part.
      */
@@ -1279,7 +1285,7 @@ class Util {
             else if ((0, reflection_1.isCallExpression)(nextPart) || (0, reflection_1.isCallfuncExpression)(nextPart)) {
                 nextPart = nextPart.callee;
             }
-            else if ((0, reflection_1.isNamespacedVariableNameExpression)(nextPart)) {
+            else if ((0, reflection_1.isTypeExpression)(nextPart)) {
                 nextPart = nextPart.expression;
             }
             else {
@@ -1312,7 +1318,7 @@ class Util {
                 nextPart = nextPart.call.callee;
                 parts = [];
             }
-            else if ((0, reflection_1.isNamespacedVariableNameExpression)(nextPart)) {
+            else if ((0, reflection_1.isTypeExpression)(nextPart)) {
                 nextPart = nextPart.expression;
             }
             else if ((0, reflection_1.isVariableExpression)(nextPart)) {
@@ -1361,6 +1367,46 @@ class Util {
             file.addDiagnostics([Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.detectedTooDeepFileSource(fileDepth)), { file: file, range: this.createRange(0, 0, 0, Number.MAX_VALUE) })]);
         }
     }
+    /**
+     * Find the index of the last item in the array that matches.
+     */
+    findLastIndex(array, matcher) {
+        for (let i = array.length - 1; i >= 0; i--) {
+            if (matcher(array[i])) {
+                return i;
+            }
+        }
+    }
+    processTypeChain(typeChain) {
+        let fullChainName = '';
+        let fullErrorName = '';
+        let missingItemName = '';
+        let previousTypeName = '';
+        let parentTypeName = '';
+        let errorRange;
+        for (let i = 0; i < typeChain.length; i++) {
+            const chainItem = typeChain[i];
+            if (i > 0) {
+                fullChainName += '.';
+            }
+            fullChainName += chainItem.name;
+            parentTypeName = previousTypeName;
+            fullErrorName = previousTypeName ? `${previousTypeName}.${chainItem.name}` : chainItem.name;
+            previousTypeName = chainItem.type.toString();
+            missingItemName = chainItem.name;
+            if (!chainItem.isResolved) {
+                errorRange = chainItem.range;
+                break;
+            }
+        }
+        return {
+            missingItemName: missingItemName,
+            missingItemParentTypeName: parentTypeName,
+            fullNameOfMissingItem: fullErrorName,
+            fullChainName: fullChainName,
+            range: errorRange
+        };
+    }
 }
 exports.Util = Util;
 /**