feat: integrate component and board variables

.github/workflows/TypeScript.yml

@@ -31,11 +31,13 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
 
-      - run: corepack enable
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10.12.2
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache-dependency-path: ./TypeScript/pnpm-lock.yaml
           cache: "pnpm"
 

.github/workflows/cpp-build-test.yml

@@ -6,51 +6,61 @@ on:
     paths:
       - "Cpp/**"
       - "grammar/*.g4"
+      - ".github/workflows/cpp-build-test.yml"
   pull_request:
     branches: [main]
     paths:
       - "Cpp/**"
       - "grammar/*.g4"
+      - ".github/workflows/cpp-build-test.yml"
 
 jobs:
   build-and-test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-latest]
+        os: [macos-latest, windows-2022]
       fail-fast: false
-    env:
-      DEMO_DIR: demo/${{ matrix.os == 'windows-latest' && 'Win32/Debug' || 'Mac' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "17"
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
           cmake-version: "3.x"
 
       - name: Generate ANTLR4 files (Windows)
-        if: matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-2022'
         run: .\generate.ps1
 
       - name: Generate ANTLR4 files (macOS)
         if: matrix.os == 'macos-latest'
         run: sh ./generate.sh
         shell: bash
 
-      - name: Configure CMake
-        run: |
-          mkdir -p Cpp/build
-          cd Cpp/build
-          cmake .. -DWITH_TEST=true
+      - name: Configure CMake (Windows)
+        if: matrix.os == 'windows-2022'
+        run: cmake -S Cpp -B Cpp/build -G "Visual Studio 17 2022" -A x64 -DWITH_TEST=true
+
+      - name: Configure CMake (macOS)
+        if: matrix.os == 'macos-latest'
+        run: cmake -S Cpp -B Cpp/build -DCMAKE_BUILD_TYPE=Release -DWITH_TEST=true
 
       - name: Build
-        run: |
-          cd Cpp/build
-          cmake --build .
+        run: cmake --build Cpp/build --config Release
 
       - name: Run tests
-        run: |
-          cd Cpp/build/${{ env.DEMO_DIR }}
-          ls
-          ./ArcscriptTest
+        run: ctest --test-dir Cpp/build --build-config Release --output-on-failure
+
+      - name: Upload native library artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: arcscript-cpp-${{ matrix.os }}-${{ github.sha }}
+          path: Cpp/build/lib/**
+          if-no-files-found: error
+          retention-days: 14

.github/workflows/pkg.pr.new.yml

@@ -13,11 +13,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - run: corepack enable
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10.12.2
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache-dependency-path: ./TypeScript/pnpm-lock.yaml
           cache: "pnpm"
 

CSharp/Interpreter/ArcscriptFunctions.cs

@@ -167,12 +167,12 @@ public object Reset(IList<object> args) {
         }
 
         public object ResetAll(IList<object> args) {
-            List<string> variableNames = new List<string>();
+            HashSet<string> variableIds = new HashSet<string>();
             foreach ( IVariable argument in args ) {
-                variableNames.Add(argument.Name);
+                variableIds.Add(argument.Id);
             }
-            foreach ( IVariable variable in this._project.Variables ) {
-                if ( !variableNames.Contains(variable.Name) ) {
+            foreach ( IVariable variable in this._project.GetAllVariables() ) {
+                if ( !variableIds.Contains(variable.Id) ) {
                     state.SetVarValue(variable, variable.DefaultValue);
                 }
             }
@@ -212,4 +212,4 @@ public object ResetVisits(IList<object> args) {
             return null;
         }
     }
-}
+}

CSharp/Interpreter/ArcscriptParserBase.cs

@@ -26,17 +26,11 @@ public ArcscriptParserBase(ITokenStream input, TextWriter output, TextWriter err
 
         public void SetProject(IProject project) {
             this.Project = project;
-            foreach (var projectVariable in project.Variables)
+            foreach (var projectVariable in project.GetAllVariables())
             {
-                VariableNames.Add(projectVariable.Name);
-            }
-            foreach (var projectBoard in project.Boards)
-            {
-                if (projectBoard.Variables == null) continue;
-                foreach (var projectBoardVariable in projectBoard.Variables)
-                {
-                    VariableNames.Add(projectBoard.CustomId + "." + projectBoardVariable.Name);
-                }
+                VariableNames.Add(projectVariable.Parent == null
+                    ? projectVariable.Name
+                    : projectVariable.Parent.CustomId + "." + projectVariable.Name);
             }
         }
 
@@ -126,4 +120,4 @@ internal void setLineStart(IToken token)
         }
     }
 
-}
+}

CSharp/Interpreter/ArcscriptState.cs

@@ -23,15 +23,8 @@ public ArcscriptState(string elementId, IProject project, System.Action<string>?
             this.currentElement = elementId;
             this.project = project;
 
-            this.Variables = project.Variables.ToDictionary(variable => variable.Id, variable => variable);
-            foreach (var projectBoard in project.Boards)
-            {
-                if (projectBoard.Variables == null) continue;
-                foreach (var projectBoardVariable in projectBoard.Variables)
-                {
-                    Variables.Add(projectBoardVariable.Id, projectBoardVariable);
-                }
-            }
+            this.Variables = project.GetAllVariables()
+                .ToDictionary(variable => variable.Id, variable => variable);
 
             if (emit != null)
             {
@@ -50,7 +43,9 @@ public ArcscriptState(string elementId, IProject project, System.Action<string>?
                 {
                     if (scope != null)
                     {
-                        return variable.Name == name && scope == variable.Parent.CustomId;
+                        return variable.Name == name &&
+                            variable.Parent != null &&
+                            scope == variable.Parent.CustomId;
                     }
 
                     return variable.Name == name && variable.Parent == null;
@@ -109,4 +104,4 @@ public void ResetVisits()
             _emit("resetVisits");
         }
     }
-}
+}

CSharp/Interpreter/ArcscriptTranspiler.cs

@@ -83,7 +83,7 @@ public TranspilerOutput RunScript(string code)
             // List<string> outputs = visitor.state.outputs;
             var outputResult = visitor.state.Outputs.GetText();
 
-            var isCondition = tree.script() != null;
+            var isCondition = tree.condition() != null;
 
             return new TranspilerOutput(outputResult, visitor.state.VariableChanges, result, isCondition);
         }
@@ -112,4 +112,4 @@ public TranspilerOutput(string output, Dictionary<string, object> changes, objec
             }
         }
     }
-}
+}

CSharp/Interpreter/INodes/IAttribute.cs

@@ -4,18 +4,22 @@ public interface IAttribute
     {
         public enum DataType
         {
-            Undefined,
-            StringPlainText,
-            StringRichText,
-            ComponentList,
-            AssetList,
+            Undefined = 0,
+            StringPlainText = 1,
+            StringRichText = 2,
+            ComponentList = 3,
+            AssetList = 4,
+            Boolean = 5,
+            Integer = 6,
+            Float = 7,
         }
 
         public enum ContainerType
         {
-            Undefined,
-            Component,
-            Element,
+            Undefined = 0,
+            Component = 1,
+            Element = 2,
+            Board = 3,
         }
 
         public string Name { get; }

CSharp/Interpreter/INodes/IBoard.cs

@@ -1,6 +1,6 @@
 namespace Arcweave.Interpreter.INodes
 {
-    public interface IBoard : IHasVariables
+    public interface IBoard : IHasVariables, IHasAttributes
     {
     }
 }

CSharp/Interpreter/INodes/IComponent.cs

@@ -1,6 +1,6 @@
 namespace Arcweave.Interpreter.INodes
 {
-    public interface IComponent : IHasAttributes
+    public interface IComponent : IHasAttributes, IHasVariables
     {
     }
 }

CSharp/Interpreter/INodes/IProject.cs

@@ -12,10 +12,13 @@ public interface IProject
 #if GODOT
         public Array<Arcweave.Project.Variable> Variables { get; }
         public Dictionary<string, Arcweave.Project.Board> Boards { get; }
+        public Dictionary<string, Arcweave.Project.Component> Components { get; }
 #else
         public List<Arcweave.Project.Variable> Variables { get; }
         public List<Arcweave.Project.Board> Boards { get; }
+        public List<Arcweave.Project.Component> Components { get; }
 #endif
+        public System.Collections.Generic.IEnumerable<Arcweave.Project.Variable> GetAllVariables();
         public Arcweave.Project.Element ElementWithId(string id);
 
         public Arcweave.Project.Variable GetVariable(string name, string scope = null);

CSharp/Project/Board.cs

@@ -13,13 +13,15 @@ public partial class Board
 #else
         public List<INode> Nodes { get; private set; }
         public List<Variable> Variables { get; private set; }
+        public List<Attribute> Attributes { get; private set; }
 #endif
         public Board(string id, List<INode> nodes, string customId = null)
         {
             Id = id;
             Nodes = nodes;
             CustomId = customId;
             Variables = new List<Variable>();
+            Attributes = new List<Attribute>();
         }
 
         public Board(string id, List<INode> nodes, List<Variable> variables, string customId = null)
@@ -32,6 +34,7 @@ public Board(string id, List<INode> nodes, List<Variable> variables, string cust
             }
             Variables = variables;
             CustomId = customId;
+            Attributes = new List<Attribute>();
         }
 
         public T NodeWithID<T>(string id) where T : INode => Nodes.OfType<T>().FirstOrDefault(x => x.Id == id);
@@ -41,5 +44,10 @@ public void AddVariable(Variable variable)
             variable.Parent = this;
             Variables.Add(variable);
         }
+
+        public void AddAttribute(Attribute attribute)
+        {
+            Attributes.Add(attribute);
+        }
     }
-}
+}

CSharp/Project/Component.cs

@@ -5,11 +5,26 @@ namespace Arcweave.Project
 {
 public partial class Component
 {
+    public string CustomId { get; }
     public List<Attribute> Attributes { get; }
+    public List<Variable> Variables { get; }
+
+    public Component(string customId = null)
+    {
+        CustomId = customId;
+        Attributes = new List<Attribute>();
+        Variables = new List<Variable>();
+    }
+
     public void AddAttribute(Attribute attribute)
     {
-        throw new NotImplementedException();
+        Attributes.Add(attribute);
+    }
+
+    public void AddVariable(Variable variable)
+    {
+        variable.Parent = this;
+        Variables.Add(variable);
     }
 }
 }
-

CSharp/Project/Project.cs

@@ -8,10 +8,12 @@ public partial class Project
 {
     public List<Variable> Variables { get; }
     public List<Board> Boards { get;  }
-    public Project(List<Board> boards, List<Variable> variables)
+    public List<Component> Components { get; }
+    public Project(List<Board> boards, List<Variable> variables, List<Component> components = null)
     {
         Variables = variables;
         Boards = boards;
+        Components = components ?? new List<Component>();
     }
     public Element ElementWithId(string id) => GetNodeWithID<Element>(id);
 
@@ -21,13 +23,17 @@ public Variable GetVariable(string name, string scope = null)
         {
             return Variables.FirstOrDefault(variable => variable.Name == name);
         }
-        var board = Boards.FirstOrDefault(board => board.Id == scope);
-        if (board != null)
-        {
-            return board.Variables.FirstOrDefault(variable => variable.Name == name);
-        }
-        return null;
+        var container = Boards.Cast<IHasVariables>()
+            .Concat(Components)
+            .FirstOrDefault(container => container.CustomId == scope);
+        return container?.Variables.FirstOrDefault(variable => variable.Name == name);
     }
+
+    public IEnumerable<Variable> GetAllVariables() => Variables
+        .Concat(Boards.SelectMany(board =>
+            board.Variables ?? Enumerable.Empty<Variable>()))
+        .Concat(Components.SelectMany(component =>
+            component.Variables ?? Enumerable.Empty<Variable>()));
 
     public T GetNodeWithID<T>(string id) where T : INode {
         T result = default(T);
@@ -39,4 +45,3 @@ public T GetNodeWithID<T>(string id) where T : INode {
     }
 }
 }
-