brighterscript 1.0.0-alpha.5 → 1.0.0-alpha.51

package/dist/CommentFlagProcessor.js

@@ -16,15 +16,10 @@ class CommentFlagProcessor {
     /**
      * Valid diagnostic codes. Codes NOT in this list will be flagged
      */
-    diagnosticCodes = [], 
-    /**
-     * Diagnostic codes to never filter (these codes will always be flagged)
-     */
-    ignoreDiagnosticCodes = []) {
+    diagnosticCodes = []) {
         this.file = file;
         this.commentStarters = commentStarters;
         this.diagnosticCodes = diagnosticCodes;
-        this.ignoreDiagnosticCodes = ignoreDiagnosticCodes;
         /**
          * List of comment flags generated during processing
          */
@@ -33,75 +28,154 @@ class CommentFlagProcessor {
          * List of diagnostics generated during processing
          */
         this.diagnostics = [];
-        this.allCodesExceptIgnores = this.diagnosticCodes.filter(x => !this.ignoreDiagnosticCodes.includes(x));
+        /**
+         * Block-level `bs:disable` / `bs:enable` directives, recorded in source order
+         * by `tryAdd` and resolved into `CommentFlag`s by `finalize()`.
+         */
+        this.blockDirectives = [];
     }
     tryAdd(text, range) {
         const tokenized = this.tokenize(text, range);
         if (!tokenized) {
             return;
         }
-        let affectedRange;
-        if (tokenized.disableType === 'line') {
-            affectedRange = util_1.util.createRange(range.start.line, 0, range.start.line, range.start.character);
-        }
-        else if (tokenized.disableType === 'next-line') {
-            affectedRange = util_1.util.createRange(range.start.line + 1, 0, range.start.line + 1, Number.MAX_SAFE_INTEGER);
+        //queue block directives with their raw code tokens; finalize() validates and resolves them
+        if (tokenized.directive === 'disable' || tokenized.directive === 'enable') {
+            this.blockDirectives.push({
+                kind: tokenized.directive,
+                rawCodes: tokenized.codes,
+                range: range
+            });
+            return;
         }
-        let commentFlag;
-        //statement to disable EVERYTHING
+        //line-level directives emit a flag inline
+        const affectedRange = tokenized.directive === 'line'
+            ? util_1.util.createRange(range.start.line, 0, range.start.line, range.start.character)
+            : util_1.util.createRange(range.start.line + 1, 0, range.start.line + 1, Number.MAX_SAFE_INTEGER);
         if (tokenized.codes.length === 0) {
-            commentFlag = {
+            //bare `bs:disable-line` / `bs:disable-next-line` suppresses everything
+            this.commentFlags.push({
                 file: this.file,
-                //null means all codes
                 codes: null,
                 range: range,
                 affectedRange: affectedRange
-            };
-            //disable specific diagnostic codes
+            });
+            return;
         }
-        else {
-            let codes = [];
-            for (let codeToken of tokenized.codes) {
-                let codeInt = parseInt(codeToken.code);
-                if (isNaN(codeInt)) {
-                    //don't validate non-numeric codes
-                    continue;
-                    //add a warning for unknown codes
-                }
-                else if (this.diagnosticCodes.includes(codeInt)) {
-                    codes.push(codeInt);
+        const codes = this.collectCodes(tokenized.codes);
+        if (codes && codes.length > 0) {
+            this.commentFlags.push({
+                file: this.file,
+                codes: codes,
+                range: range,
+                affectedRange: affectedRange
+            });
+        }
+    }
+    /**
+     * Resolve any pending `bs:disable` / `bs:enable` block directives into `CommentFlag`s.
+     * Must be called after the file's comment tokens have been fed through `tryAdd`.
+     */
+    finalize() {
+        if (this.blockDirectives.length === 0) {
+            return;
+        }
+        //state across the file: which codes are suppressed within the current block
+        let allSuppressed = false;
+        const carveOuts = new Set();
+        for (let i = 0; i < this.blockDirectives.length; i++) {
+            const directive = this.blockDirectives[i];
+            const codes = this.collectCodes(directive.rawCodes);
+            //apply this directive to the running state
+            if (codes === null) {
+                //bare `bs:disable` / `bs:enable` resets state
+                allSuppressed = directive.kind === 'disable';
+                carveOuts.clear();
+            }
+            else if (directive.kind === 'disable') {
+                //in disable-all mode, "disable: X" cancels a prior carve-out for X
+                //in enable-all mode, "disable: X" adds X to the suppressed set
+                for (const code of codes) {
+                    if (allSuppressed) {
+                        carveOuts.delete(code);
+                    }
+                    else {
+                        carveOuts.add(code);
+                    }
                 }
-                else {
-                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.unknownDiagnosticCode(codeInt)), { file: this.file, range: codeToken.range }));
+            }
+            else {
+                //'enable' with specific codes does the opposite of the disable branch above
+                for (const code of codes) {
+                    if (allSuppressed) {
+                        carveOuts.add(code);
+                    }
+                    else {
+                        carveOuts.delete(code);
+                    }
                 }
             }
-            if (codes.length > 0) {
-                commentFlag = {
+            //affectedRange runs from the line after this directive to just before the next block directive (or EOF)
+            const next = this.blockDirectives[i + 1];
+            const startLine = directive.range.start.line + 1;
+            const endLine = next ? next.range.start.line - 1 : Number.MAX_SAFE_INTEGER;
+            if (endLine < startLine) {
+                continue;
+            }
+            const affectedRange = util_1.util.createRange(startLine, 0, endLine, Number.MAX_SAFE_INTEGER);
+            //emit a flag only when the current state actually suppresses something
+            if (allSuppressed) {
+                this.commentFlags.push({
                     file: this.file,
-                    codes: codes,
-                    range: range,
+                    codes: null,
+                    enableCodes: carveOuts.size > 0 ? [...carveOuts] : undefined,
+                    range: directive.range,
                     affectedRange: affectedRange
-                };
+                });
+            }
+            else if (carveOuts.size > 0) {
+                this.commentFlags.push({
+                    file: this.file,
+                    codes: [...carveOuts],
+                    range: directive.range,
+                    affectedRange: affectedRange
+                });
             }
         }
-        if (commentFlag) {
-            this.commentFlags.push(commentFlag);
-            //add an ignore for everything in this comment except for Unknown_diagnostic_code_1014
-            this.commentFlags.push({
-                affectedRange: commentFlag.range,
-                range: commentFlag.range,
-                codes: this.allCodesExceptIgnores,
-                file: this.file
-            });
+    }
+    /**
+     * Resolve a list of `{ code, range }` tokens into validated diagnostic codes.
+     * Pushes diagnostics for any unknown numeric codes. Returns `null` when no codes were specified
+     * (i.e. a bare `bs:disable` / `bs:enable`), and an array otherwise.
+     */
+    collectCodes(rawCodes) {
+        var _a, _b;
+        if (rawCodes.length === 0) {
+            return null;
+        }
+        const codes = [];
+        for (const codeToken of rawCodes) {
+            const codeInt = parseInt(codeToken.code);
+            if (isNaN(codeInt)) {
+                //plugin-contributed or non-numeric code
+                codes.push((_b = (_a = codeToken.code) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.toLowerCase());
+            }
+            else if (this.diagnosticCodes.includes(codeInt)) {
+                codes.push(codeInt);
+            }
+            else {
+                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.unknownDiagnosticCode(codeInt)), { location: util_1.util.createLocationFromFileRange(this.file, codeToken.range) }));
+            }
         }
+        return codes;
     }
     /**
-     * Small tokenizer for bs:disable comments
+     * Small tokenizer for `bs:` directive comments.
      */
     tokenize(text, range) {
         let lowerText = text.toLowerCase();
         let offset = 0;
-        let commentTokenText;
+        let commentTokenText = null;
         for (const starter of this.commentStarters) {
             if (text.startsWith(starter)) {
                 commentTokenText = starter;
@@ -110,20 +184,31 @@ class CommentFlagProcessor {
                 break;
             }
         }
-        let disableType;
-        //trim leading/trailing whitespace
-        let len = lowerText.length;
+        //trim leading whitespace
+        const len = lowerText.length;
         lowerText = lowerText.trimLeft();
         offset += len - lowerText.length;
+        //match longest-prefix first so `bs:disable-line` doesn't get parsed as `bs:disable`
+        let directive;
         if (lowerText.startsWith('bs:disable-line')) {
             lowerText = lowerText.substring('bs:disable-line'.length);
             offset += 'bs:disable-line'.length;
-            disableType = 'line';
+            directive = 'line';
         }
         else if (lowerText.startsWith('bs:disable-next-line')) {
             lowerText = lowerText.substring('bs:disable-next-line'.length);
             offset += 'bs:disable-next-line'.length;
-            disableType = 'next-line';
+            directive = 'next-line';
+        }
+        else if (lowerText.startsWith('bs:disable')) {
+            lowerText = lowerText.substring('bs:disable'.length);
+            offset += 'bs:disable'.length;
+            directive = 'disable';
+        }
+        else if (lowerText.startsWith('bs:enable')) {
+            lowerText = lowerText.substring('bs:enable'.length);
+            offset += 'bs:enable'.length;
+            directive = 'enable';
         }
         else {
             return null;
@@ -133,9 +218,9 @@ class CommentFlagProcessor {
             lowerText = lowerText.substring(1);
             offset += 1;
         }
-        let items = this.tokenizeByWhitespace(lowerText);
-        let codes = [];
-        for (let item of items) {
+        const items = this.tokenizeByWhitespace(lowerText);
+        const codes = [];
+        for (const item of items) {
             codes.push({
                 code: item.text,
                 range: util_1.util.createRange(range.start.line, range.start.character + offset + item.startIndex, range.start.line, range.start.character + offset + item.startIndex + item.text.length)
@@ -143,13 +228,13 @@ class CommentFlagProcessor {
         }
         return {
             commentTokenText: commentTokenText,
-            disableType: disableType,
+            directive: directive,
             codes: codes
         };
     }
     /**
      * Given a string, extract each item split by whitespace
-     * @param text
+     * @param text the text to tokenize
      */
     tokenizeByWhitespace(text) {
         let tokens = [];

package/dist/CommentFlagProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommentFlagProcessor.js","sourceRoot":"","sources":["../src/CommentFlagProcessor.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAE1D,iCAA8B;AAE9B,MAAa,oBAAoB;IAC7B;IACI;;OAEG;IACI,IAAa;IACpB;;OAEG;IACI,kBAAkB,EAAc;IACvC;;OAEG;IACI,kBAAkB,EAAsB;IAC/C;;OAEG;IACI,wBAAwB,EAAsB;QAZ9C,SAAI,GAAJ,IAAI,CAAS;QAIb,oBAAe,GAAf,eAAe,CAAiB;QAIhC,oBAAe,GAAf,eAAe,CAAyB;QAIxC,0BAAqB,GAArB,qBAAqB,CAAyB;QAOzD;;WAEG;QACI,iBAAY,GAAG,EAAmB,CAAC;QAE1C;;WAEG;QACI,gBAAW,GAAG,EAAoB,CAAC;QAZtC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3G,CAAC;IAiBM,MAAM,CAAC,IAAY,EAAE,KAAY;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO;SACV;QAED,IAAI,aAAoB,CAAC;QACzB,IAAI,SAAS,CAAC,WAAW,KAAK,MAAM,EAAE;YAClC,aAAa,GAAG,WAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SAClG;aAAM,IAAI,SAAS,CAAC,WAAW,KAAK,WAAW,EAAE;YAC9C,aAAa,GAAG,WAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;SAC5G;QAED,IAAI,WAAwB,CAAC;QAE7B,iCAAiC;QACjC,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,WAAW,GAAG;gBACV,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,sBAAsB;gBACtB,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,KAAK;gBACZ,aAAa,EAAE,aAAa;aAC/B,CAAC;YAEF,mCAAmC;SACtC;aAAM;YACH,IAAI,KAAK,GAAG,EAAc,CAAC;YAC3B,KAAK,IAAI,SAAS,IAAI,SAAS,CAAC,KAAK,EAAE;gBACnC,IAAI,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACvC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;oBAChB,kCAAkC;oBAClC,SAAS;oBACT,iCAAiC;iBACpC;qBAAM,IAAI,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;oBAC/C,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACvB;qBAAM;oBACH,IAAI,CAAC,WAAW,CAAC,IAAI,iCACd,uCAAkB,CAAC,qBAAqB,CAAC,OAAO,CAAC,KACpD,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,KAAK,EAAE,SAAS,CAAC,KAAK,IACxB,CAAC;iBACN;aACJ;YACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,WAAW,GAAG;oBACV,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,KAAK;oBACZ,aAAa,EAAE,aAAa;iBAC/B,CAAC;aACL;SACJ;QAED,IAAI,WAAW,EAAE;YACb,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEpC,sFAAsF;YACtF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;gBACnB,aAAa,EAAE,WAAW,CAAC,KAAK;gBAChC,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,KAAK,EAAE,IAAI,CAAC,qBAAqB;gBACjC,IAAI,EAAE,IAAI,CAAC,IAAI;aAClB,CAAC,CAAC;SACN;IACL,CAAC;IAED;;OAEG;IACK,QAAQ,CAAC,IAAY,EAAE,KAAY;QACvC,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACnC,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,gBAAwB,CAAC;QAE7B,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,eAAe,EAAE;YACxC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBAC1B,gBAAgB,GAAG,OAAO,CAAC;gBAC3B,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;gBACxB,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBACzD,MAAM;aACT;SACJ;QAED,IAAI,WAAiC,CAAC;QACtC,kCAAkC;QAClC,IAAI,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC;QAC3B,SAAS,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC;QACjC,IAAI,SAAS,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YACzC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC1D,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC;YACnC,WAAW,GAAG,MAAM,CAAC;SACxB;aAAM,IAAI,SAAS,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE;YACrD,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAC/D,MAAM,IAAI,sBAAsB,CAAC,MAAM,CAAC;YACxC,WAAW,GAAG,WAAW,CAAC;SAC7B;aAAM;YACH,OAAO,IAAI,CAAC;SACf;QAED,mBAAmB;QACnB,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC3B,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,IAAI,CAAC,CAAC;SACf;QAED,IAAI,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,KAAK,GAAG,EAA2C,CAAC;QACxD,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACpB,KAAK,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,WAAI,CAAC,WAAW,CACnB,KAAK,CAAC,KAAK,CAAC,IAAI,EAChB,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC,UAAU,EAChD,KAAK,CAAC,KAAK,CAAC,IAAI,EAChB,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,MAAM,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CACtE;aACJ,CAAC,CAAC;SACN;QAED,OAAO;YACH,gBAAgB,EAAE,gBAAgB;YAClC,WAAW,EAAE,WAAW;YACxB,KAAK,EAAE,KAAK;SACf,CAAC;IACN,CAAC;IAED;;;OAGG;IACK,oBAAoB,CAAC,IAAY;QACrC,IAAI,MAAM,GAAG,EAAiD,CAAC;QAC/D,IAAI,YAAY,GAAG,IAAI,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClC,IAAI,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACnB,sBAAsB;YACtB,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE;gBAC/B,IAAI,YAAY,EAAE;oBACd,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC1B,YAAY,GAAG,IAAI,CAAC;iBACvB;gBAED,uBAAuB;aAC1B;iBAAM;gBACH,IAAI,CAAC,YAAY,EAAE;oBACf,YAAY,GAAG;wBACX,UAAU,EAAE,CAAC;wBACb,IAAI,EAAE,EAAE;qBACX,CAAC;iBACL;gBACD,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC;aAC7B;SACJ;QACD,IAAI,YAAY,EAAE;YACd,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC7B;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAvMD,oDAuMC"}
+{"version":3,"file":"CommentFlagProcessor.js","sourceRoot":"","sources":["../src/CommentFlagProcessor.ts"],"names":[],"mappings":"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"}

package/dist/CrossScopeValidator.d.ts

@@ -0,0 +1,68 @@
+import type { UnresolvedSymbol } from './AstValidationSegmenter';
+import type { Scope } from './Scope';
+import type { BrsFile } from './files/BrsFile';
+import type { Program } from './Program';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import type { BscSymbol } from './SymbolTable';
+import type { BscFile } from './files/BscFile';
+interface FileSymbolPair {
+    file: BscFile;
+    symbol: BscSymbol;
+}
+interface SymbolLookupKeys {
+    potentialTypeKey: string;
+    key: string;
+    namespacedKey: string;
+    namespacedPotentialTypeKey: string;
+}
+export declare class ProvidedNode {
+    key: string;
+    private componentsMap?;
+    namespaces: Map<string, ProvidedNode>;
+    symbols: Map<string, FileSymbolPair>;
+    constructor(key?: string, componentsMap?: Map<string, FileSymbolPair>);
+    getSymbolByKey(symbolKeys: SymbolLookupKeys): FileSymbolPair;
+    getSymbol(symbolName: string): FileSymbolPair;
+    getNamespace(namespaceName: string): ProvidedNode;
+    getSymbolByNameParts(lowerSymbolNameParts: string[], root: ProvidedNode): FileSymbolPair;
+    getNamespaceByNameParts(lowerSymbolNameParts: string[]): ProvidedNode;
+    addSymbol(symbolName: string, symbolPair: FileSymbolPair): any;
+    private addSymbolByNameParts;
+}
+export declare class CrossScopeValidator {
+    program: Program;
+    constructor(program: Program);
+    private symbolMapKeys;
+    resolutionsMap: Map<UnresolvedSymbol, Set<{
+        scope: Scope;
+        sourceFile: BscFile;
+        providedSymbol: BscSymbol;
+    }>>;
+    providedTreeMap: Map<string, {
+        duplicatesMap: Map<string, Set<FileSymbolPair>>;
+        providedTree: ProvidedNode;
+    }>;
+    private componentsMap;
+    getRequiredMap(scope: Scope): Map<SymbolLookupKeys, UnresolvedSymbol>;
+    getProvidedTree(scope: Scope): {
+        duplicatesMap: Map<string, Set<FileSymbolPair>>;
+        providedTree: ProvidedNode;
+    };
+    getIssuesForScope(scope: Scope): {
+        missingSymbols: Set<UnresolvedSymbol>;
+        duplicatesMap: Map<string, Set<FileSymbolPair>>;
+    };
+    clearResolutionsForFile(file: BrsFile): void;
+    clearResolutionsForScopes(scopes: Scope[]): void;
+    getFilesRequiringChangedSymbol(scopes: Scope[], changedSymbols: Map<SymbolTypeFlag, Set<string>>): Set<BscFile>;
+    getScopesRequiringChangedSymbol(scopes: Scope[], changedSymbols: Map<SymbolTypeFlag, Set<string>>): Set<Scope>;
+    buildComponentsMap(): void;
+    addDiagnosticsForScopes(scopes: Scope[]): void;
+    getIncompatibleSymbolResolutions(): {
+        symbol: UnresolvedSymbol;
+        incompatibleScopes: Set<Scope>;
+    }[];
+    private getCannotFindDiagnostic;
+    private getParentTypeDescriptor;
+}
+export {};