Merge branch 'v1' into issue-1397-align-event-names

Author: TwitchBronBron

CHANGELOG.md

@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## [1.0.0-alpha.49](https://github.com/rokucommunity/brighterscript/compare/1.0.0-alpha.48...v1.0.0-alpha.49) - 2025-12-10
+### Added
+ - Adds `TypeStatement` for declaring new types ([#1597](https://github.com/rokucommunity/brighterscript/pull/1597))
+ - Adds Inline interfaces ([#1591](https://github.com/rokucommunity/brighterscript/pull/1591))
+### Changed
+ - Make Invalid compatible with typed arrays ([#1596](https://github.com/rokucommunity/brighterscript/pull/1596))
+ - Limit scope Validation ([#1586](https://github.com/rokucommunity/brighterscript/pull/1586))
+ - Interface extending node includes callfuncs ([#1585](https://github.com/rokucommunity/brighterscript/pull/1585))
+ - Remove zip and sideload ([#1562](https://github.com/rokucommunity/brighterscript/pull/1562))
+ - upgrade to [[email protected]](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#3144---2025-10-30)
+### Fixed
+ - Fix validation exception when calling `roFunction` ([#1588](https://github.com/rokucommunity/brighterscript/pull/1588))
+ - Fix `MaskGroup.maskUri` type ([#1559](https://github.com/rokucommunity/brighterscript/pull/1559))
+### Removed
+ - Remove unused util functions ([#1565](https://github.com/rokucommunity/brighterscript/pull/1565))
+
+
+
 ## [1.0.0-alpha.48](https://github.com/rokucommunity/brighterscript/compare/1.0.0-alpha.47...v1.0.0-alpha.48) - 2025-07-16
 ### Changed
  - Union Return type consistency ([#1508](https://github.com/rokucommunity/brighterscript/pull/1508))

README.md

@@ -11,7 +11,7 @@ A superset of Roku's BrightScript language. Compiles to standard BrightScript.
 
 ## Overview
 
-**WARNING: this is the v0.66.0 branch with experimental features**
+**WARNING: this is the `v1` branch with experimental features**
 
 The BrighterScript language provides new features and syntax enhancements to Roku's BrightScript language. Because the language is a superset of BrightScript, the parser and associated tools (VSCode integration, cli, etc...) work with standard BrightScript (.brs) files. This means you will get benefits (as described in the following section) from using the BrighterScript compiler, whether your project contains BrighterScript (.bs) files or not. The BrighterScript language transpiles to standard BrightScript, so your code is fully compatible with all roku devices.
 

docs/readme.md

@@ -134,6 +134,15 @@ function getY(translation as float[]) as float
 end function
 ```
 
+## [Type Statements](type-statements.md)
+```brighterscript
+type number = integer or float or double
+
+function sum(x as number, y as number) as number
+    return x + y
+end function
+```
+
 ## [Union Types](union-types.md)
 ```brighterscript
 sub logData(data as string or number)

docs/type-statements.md

@@ -0,0 +1,71 @@
+## Type Statements
+
+BrighterScript supports declaring custom named types using the `type` keyword. In this way, new types can be created as wrappers, or aliases for other types. This is useful to create custom names for advanced types like unions, so they can be more easily used throughout the code.
+
+## Syntax
+
+To create a new custom named types, use the syntax `type <customName> = <existingType>` at either the top level of a file, or within a namespace.
+
+For example, if you wanted to create a shorthand for the union type `integer or float or double`, you could do the following:
+
+```BrighterScript
+type number = integer or float or double
+
+function sum(x as number, y as number) as number
+    return x + y
+end function
+
+function product(x as number, y as number) as number
+    return x * y
+end function
+```
+
+<details>
+  <summary>View the transpiled BrightScript code</summary>
+
+```BrightScript
+function sum(x as dynamic, y as dynamic) as dynamic
+    return x + y
+end function
+
+function product(x as dynamic, y as dynamic) as dynamic
+    return x * y
+end function
+```
+
+</details>
+
+## Importing
+
+Types created with the `type` keyword are available through importing the file they are declared in.
+
+For example:
+
+**src/components/Widget.bs**
+
+```BrighterScript
+namespace Widgets
+
+    type widget = Button or Checkbox
+
+    interface Button
+        text as string
+        action as function
+    end interface
+
+    interface Checkbox
+        text as string
+        checked as boolean
+    end interface
+end namespace
+```
+
+**src/components/UI.bs**
+
+```BrighterScript
+import "pkg:/components/Widget.bs" ' provides the "Widgets.widget" type
+
+function getName(w as Widgets.widget) as string
+    return w.text
+end function
+```

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "brighterscript",
-  "version": "1.0.0-alpha.48",
+  "version": "1.0.0-alpha.49",
   "description": "A superset of Roku's BrightScript language.",
   "scripts": {
     "preversion": "npm run build && npm run lint && npm run test",

package.json

@@ -1,5 +1,5 @@
 import type { DottedGetExpression, TypeExpression, VariableExpression } from './parser/Expression';
-import { isAliasStatement, isArrayType, isBinaryExpression, isBlock, isBody, isClassStatement, isConditionalCompileStatement, isDottedGetExpression, isInterfaceStatement, isNamespaceStatement, isTypecastStatement, isTypeExpression, isVariableExpression } from './astUtils/reflection';
+import { isAliasStatement, isArrayType, isBinaryExpression, isBlock, isBody, isClassStatement, isConditionalCompileStatement, isDottedGetExpression, isInterfaceStatement, isNamespaceStatement, isTypecastStatement, isTypeExpression, isTypeStatement, isVariableExpression } from './astUtils/reflection';
 import { ChildrenSkipper, WalkMode, createVisitor } from './astUtils/visitors';
 import type { ExtraSymbolData, GetTypeOptions, TypeChainEntry } from './interfaces';
 import type { AstNode, Expression } from './parser/AstNode';
@@ -81,7 +81,7 @@ export class AstValidationSegmenter {
             if (isArrayType(typeInTypeExpression)) {
                 typeInTypeExpression = typeInTypeExpression.defaultType;
             }
-            if (typeInTypeExpression.isResolvable()) {
+            if (typeInTypeExpression?.isResolvable()) {
                 return this.handleTypeCastTypeExpression(segment, expression);
             }
         }
@@ -115,6 +115,13 @@ export class AstValidationSegmenter {
                     extraData.definingNode.value.getType({ ...options, flags: SymbolTypeFlag.runtime | SymbolTypeFlag.typetime, typeChain: aliasTypeChain });
                     typeChain = [...aliasTypeChain, ...typeChain.slice(1)];
                 }
+                if (extraData.isFromTypeStatement && isTypeStatement(extraData.definingNode)) {
+                    //set the unwrapped version of this symbol as required.
+                    const wrappedTypeChain = [];
+                    // eslint-disable-next-line no-bitwise
+                    extraData.definingNode.getType({ ...options, flags: SymbolTypeFlag.typetime, typeChain: wrappedTypeChain });
+                    typeChain = [...wrappedTypeChain, ...typeChain.slice(1)];
+                }
                 const possibleNamespace = this.currentNamespaceStatement?.getNameParts()?.map(t => t.text)?.join('.').toLowerCase() ?? '';
                 const fullChainName = util.processTypeChain(typeChain).fullChainName?.toLowerCase();
                 const possibleNamesLower = [] as string[];
@@ -180,7 +187,6 @@ export class AstValidationSegmenter {
             return;
         }
 
-
         this.segmentsForValidation.push(segment);
         this.validatedSegments.set(segment, false);
         let foundUnresolvedInSegment = false;
@@ -199,6 +205,12 @@ export class AstValidationSegmenter {
             unresolvedTypeCastTypeExpression = this.unresolvedTypeCastTypeExpressions[this.unresolvedTypeCastTypeExpressions.length - 1];
         }
 
+        if (isTypeStatement(segment)) {
+            // this is a straight assignment,
+            assignedSymbols.add({ token: segment.tokens.name, node: segment });
+            assignedSymbolsNames.add(segment.tokens.name.text.toLowerCase());
+        }
+
         segment.walk(createVisitor({
             AssignmentStatement: (stmt) => {
                 if (stmt.tokens.equals.kind === TokenKind.Equal) {

src/AstValidationSegmenter.ts

@@ -1635,5 +1635,24 @@ describe('CrossScopeValidator', () => {
                 DiagnosticMessages.nameCollision('Interface', 'Const', 'alpha.beta.Test')
             ]);
         });
+
+        it('finds duplicates when using type statements', () => {
+            program.setFile('source/utils.bs', `
+                namespace alpha
+                    type myInt = integer
+
+
+                    interface myInt
+                        value as string
+                    end interface
+                end namespace
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Type', 'Interface', 'alpha.myInt'),
+                DiagnosticMessages.nameCollision('Interface', 'Type', 'alpha.myInt')
+            ]);
+        });
     });
 });