Release 0.66.0 performance fixes

.eslintrc.js

@@ -242,6 +242,7 @@ module.exports = {
             '@typescript-eslint/dot-notation': 'off',
             '@typescript-eslint/no-unnecessary-type-assertion': 'off',
             '@typescript-eslint/no-non-null-assertion': 'off',
+            'no-var': 'off',
             'camelcase': 'off'
         }
     }]

benchmarks/index.ts

@@ -22,6 +22,7 @@ interface RunnerOptions {
     quick: boolean;
     profile: boolean;
     tar: boolean;
+    config: string;
 }
 class Runner {
     constructor(
@@ -144,8 +145,9 @@ class Runner {
                     cwd: cwd
                 });
 
-                execSync(`npx ts-node target-runner.ts "${version}" "${maxVersionLength}" "${target}" "${maxTargetLength}" "${alias}" "${this.options.project}" "${this.options.quick}" "${this.options.profile}"`, {
+                execSync(`npx ts-node target-runner.ts "${version}" "${maxVersionLength}" "${target}" "${maxTargetLength}" "${alias}" "${this.options.project}" "${this.options.quick}" "${this.options.profile}" "${(this.options.config ?? '{}').replaceAll('\"', '\\"')}"`, {
                     env: {
+                        ...process.env,
                         'NODE_OPTIONS': `--max-old-space-size=${MAX_OLD_SPACE}`
                     }
                 });
@@ -205,6 +207,11 @@ let options = yargs
         description: 'use a npm-packed tarball for local files instead of using the files directly',
         default: true
     })
+    .option('config', {
+        type: 'string',
+        description: 'add additional BsConfig settings as JSON - eg. \'{"enableTypeValidation":true}\'',
+        default: '{}'
+    })
     .strict()
     .check(argv => {
         const idx = argv.versions.indexOf('latest');

benchmarks/target-runner.ts

@@ -7,6 +7,7 @@ import * as chalk from 'chalk';
 const v8Profiler = require('v8-profiler-next');
 
 let idx = 2;
+const extraNamePadding = 20;
 
 const version = process.argv[idx++];
 const maxVersionLength = parseInt(process.argv[idx++]);
@@ -16,6 +17,7 @@ const bscAlias = process.argv[idx++];
 const projectPath = process.argv[idx++];
 const quick = JSON.parse(process.argv[idx++]);
 const profile = JSON.parse(process.argv[idx++]);
+const config = JSON.parse(process.argv[idx++]);
 
 const profileTitle = `${target}@${version}`;
 
@@ -63,7 +65,7 @@ const addTargetTestFunction = require(path.join(__dirname, 'targets', target));
                 const formattedHz = formatNumber(result.hz.toFixed(3));
                 let [name] = result.name.split('@');
                 console.log(
-                    `${name.padStart(maxTargetLength + 8, ' ')}@${version.padEnd(maxVersionLength, ' ')}`,
+                    `${name.padStart(maxTargetLength + extraNamePadding, ' ')}@${version.padEnd(maxVersionLength, ' ')}`,
                     '-'.repeat(' ###,###,###.###'.length - formattedHz.length),
                     chalk.yellow(formattedHz), 'ops/sec'
                 );
@@ -88,7 +90,8 @@ const addTargetTestFunction = require(path.join(__dirname, 'targets', target));
             projectPath: projectPath,
             suiteOptions: {
                 // minTime: quick ? undefined : 3.5
-            }
+            },
+            additionalConfig: config
         })
     );
 
@@ -104,4 +107,5 @@ export interface TargetOptions {
     brighterscript: typeof import('../src');
     projectPath: string;
     suiteOptions: Benchmark.Options;
+    additionalConfig: Record<string, unknown>;
 }

benchmarks/targets/lex-parse-validate.ts

@@ -28,7 +28,8 @@ module.exports = (options: TargetOptions) => {
             copyToStaging: false,
             //disable diagnostic reporting (they still get collected)
             diagnosticFilters: ['**/*'],
-            logLevel: 'error'
+            logLevel: 'error',
+            ...options.additionalConfig
         }).then(() => {
             if (Object.keys(builder.program.files).length === 0) {
                 throw new Error('No files found in program');

benchmarks/targets/lex.ts

@@ -12,7 +12,8 @@ module.exports = async (options: TargetOptions) => {
         copyToStaging: false,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
+        logLevel: 'error',
+        ...options.additionalConfig
     });
     //collect all the brighterscript files
     const brsFiles = Object.values(builder.program.files).filter(x => x.extension === '.brs' || x.extension === '.bs');

benchmarks/targets/parse-brs.ts

@@ -12,7 +12,8 @@ module.exports = async (options: TargetOptions) => {
         copyToStaging: false,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
+        logLevel: 'error',
+        ...options.additionalConfig
     });
     //collect all the brs file contents
     const files = Object.values(builder.program.files).filter(x => ['.brs', '.bs', '.d.bs'].includes(x.extension)).map(x => ({
@@ -27,7 +28,7 @@ module.exports = async (options: TargetOptions) => {
     const setFileFuncName = builder.program['setFile'] ? 'setFile' : 'addOrReplaceFile';
 
     suite.add(fullName, (deferred) => {
-        const promises = [];
+        const promises: unknown[] = [];
         for (const file of files) {
             promises.push(
                 builder.program[setFileFuncName](file.pkgPath, file.fileContents)

benchmarks/targets/parse-xml.ts

@@ -12,11 +12,12 @@ module.exports = async (options: TargetOptions) => {
         copyToStaging: false,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
+        logLevel: 'error',
+        ...options.additionalConfig
     });
     //collect all the XML file contents
     const xmlFiles = Object.values(builder.program.files).filter(x => x.extension === '.xml').map(x => ({
-        srcPath: x.srcPath ?? x.pathAbsolute,
+        srcPath: x.srcPath ?? (x as any).pathAbsolute,
         pkgPath: x.pkgPath,
         fileContents: x.fileContents
     }));

benchmarks/targets/parse.ts

@@ -13,7 +13,8 @@ module.exports = async (options: TargetOptions) => {
         copyToStaging: false,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
+        logLevel: 'error',
+        ...options.additionalConfig
     });
     //collect all the brighterscript files
     const brsFiles = Object.values(builder.program.files).filter(x => x.extension === '.brs' || x.extension === '.bs') as Array<BrsFile>;

benchmarks/targets/transpile-brs.ts

@@ -12,7 +12,8 @@ module.exports = async (options: TargetOptions) => {
         copyToStaging: false,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
+        logLevel: 'error',
+        ...options.additionalConfig
     });
     //collect all the brs files
     const files = Object.values(builder.program.files).filter(x => ['.brs', '.bs'].includes(x.extension));

benchmarks/targets/transpile-xml.ts

@@ -12,7 +12,8 @@ module.exports = async (options: TargetOptions) => {
         copyToStaging: false,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
+        logLevel: 'error',
+        ...options.additionalConfig
     });
     //collect all the XML files
     const files = Object.values(builder.program.files).filter(x => x.extension === '.xml');

benchmarks/targets/transpile.ts

@@ -12,7 +12,8 @@ module.exports = async (options: TargetOptions) => {
         copyToStaging: false,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
+        logLevel: 'error',
+        ...options.additionalConfig
     });
     if (Object.keys(builder.program.files).length === 0) {
         throw new Error('No files found in program');

benchmarks/targets/validate.ts

@@ -13,7 +13,8 @@ module.exports = async (options: TargetOptions) => {
         enableTypeValidation: false,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
+        logLevel: 'error',
+        ...options.additionalConfig
     } as any);
     if (Object.keys(builder.program.files).length === 0) {
         throw new Error('No files found in program');

src/Cache.ts

@@ -8,12 +8,12 @@ export class Cache<TKey = any, TValue = any> extends Map<TKey, TValue> {
      * otherwise call the factory function to create the value, add it to the cache, and return it.
      */
     public getOrAdd<R extends TValue = TValue>(key: TKey, factory: (key: TKey) => R): R {
-        if (!this.has(key)) {
+        if (!super.has(key)) {
             const value = factory(key);
-            this.set(key, value);
+            super.set(key, value);
             return value;
         } else {
-            return this.get(key);
+            return super.get(key) as R;
         }
     }
 

src/Program.ts

@@ -31,7 +31,7 @@ import { SignatureHelpUtil } from './bscPlugin/SignatureHelpUtil';
 import { DiagnosticSeverityAdjuster } from './DiagnosticSeverityAdjuster';
 import { IntegerType } from './types/IntegerType';
 import { StringType } from './types/StringType';
-import { SymbolTable, SymbolTypeFlag } from './SymbolTable';
+import { SymbolTypeFlag } from './SymbolTable';
 import { BooleanType } from './types/BooleanType';
 import { DoubleType } from './types/DoubleType';
 import { DynamicType } from './types/DynamicType';
@@ -40,9 +40,6 @@ import { FunctionType } from './types/FunctionType';
 import { LongIntegerType } from './types/LongIntegerType';
 import { ObjectType } from './types/ObjectType';
 import { VoidType } from './types/VoidType';
-import { CacheVerifier } from './CacheVerifier';
-import { referenceTypeFactory } from './types/ReferenceType';
-import { unionTypeFactory } from './types/UnionType';
 
 const startOfSourcePkgPath = `source${path.sep}`;
 const bslibNonAliasedRokuModulesPkgPath = s`source/roku_modules/rokucommunity_bslib/bslib.brs`;
@@ -89,8 +86,6 @@ export class Program {
 
     public logger: Logger;
 
-    public typeCacheVerifier = new CacheVerifier();
-
     private createGlobalScope() {
         //create the 'global' scope
         this.globalScope = new Scope('global', this, 'scope:global');
@@ -106,11 +101,6 @@ export class Program {
         this.globalScope.getDiagnostics = () => [];
         //TODO we might need to fix this because the isValidated clears stuff now
         (this.globalScope as any).isValidated = true;
-
-        // Adds a factory to SymbolTable so it can create ReferenceTypes
-        SymbolTable.ReferenceTypeFactory = referenceTypeFactory;
-        SymbolTable.cacheVerifier = this.typeCacheVerifier;
-        SymbolTable.UnionTypeFactory = unionTypeFactory;
     }
 
     /**
@@ -368,14 +358,14 @@ export class Program {
     /**
      * roku filesystem is case INsensitive, so find the scope by key case insensitive
      */
-    public getScopeByName(scopeName: string) {
+    public getScopeByName(scopeName: string): Scope {
         if (!scopeName) {
             return undefined;
         }
         //most scopes are xml file pkg paths. however, the ones that are not are single names like "global" and "scope",
         //so it's safe to run the standardizePkgPath method
-        scopeName = s`${scopeName}`;
-        let key = Object.keys(this.scopes).find(x => x.toLowerCase() === scopeName.toLowerCase());
+        scopeName = s`${scopeName.toLowerCase()}`;
+        let key = Object.keys(this.scopes).find(x => x.toLowerCase() === scopeName);
         return this.scopes[key];
     }
 

src/Scope.spec.ts

@@ -21,6 +21,7 @@ import { DynamicType } from './types/DynamicType';
 import { ObjectType } from './types/ObjectType';
 import { FloatType } from './types/FloatType';
 import { NamespaceType } from './types/NamespaceType';
+import { isFunctionStatement, isNamespaceStatement } from './astUtils/reflection';
 
 describe('Scope', () => {
     let sinon = sinonImport.createSandbox();
@@ -2600,4 +2601,42 @@ describe('Scope', () => {
             expectZeroDiagnostics(program);
         });
     });
+
+    describe('unlinkSymbolTable', () => {
+        it('properly removes sibling symbol tables', () => {
+            const file = program.setFile<BrsFile>('source/lib.bs', `
+                namespace alpha.beta.charlie
+                    function delta()
+                    end function
+                end namespace
+
+                namespace alpha.beta.charlie
+                    function echo()
+                    end function
+                end namespace
+            `);
+            const scope = program.getScopeByName('source');
+
+            scope.linkSymbolTable();
+
+            const opts = { flags: 3 as SymbolTypeFlag };
+            const symbolTables = [
+                file.ast.findChild(x => isFunctionStatement(x) && x.name.text === 'delta').findAncestor(x => isNamespaceStatement(x)).getSymbolTable(),
+                scope.symbolTable.getSymbolType('alpha', opts).memberTable,
+                scope.symbolTable.getSymbolType('alpha', opts).getMemberType('beta', opts).memberTable,
+                scope.symbolTable.getSymbolType('alpha', opts).getMemberType('beta', opts).getMemberType('charlie', opts).memberTable
+            ];
+
+            symbolTables.forEach(x => expect(x['siblings'].size).to.eql(1, `${x.name} has wrong number of siblings`));
+            scope.unlinkSymbolTable();
+            symbolTables.forEach(x => expect(x['siblings'].size).to.eql(0, `${x.name} has wrong number of siblings`));
+
+            //do it again, make sure we don't end up with additional siblings
+
+            scope.linkSymbolTable();
+            symbolTables.forEach(x => expect(x['siblings'].size).to.eql(1, `${x.name} has wrong number of siblings`));
+            scope.unlinkSymbolTable();
+            symbolTables.forEach(x => expect(x['siblings'].size).to.eql(0, `${x.name} has wrong number of siblings`));
+        });
+    });
 });