Update deploy.yml

Co-authored-by: Oğuzhan Koral <45078678+oguzhankoral@users.noreply.github.com>

.circleci/build-installer.bat

@@ -1,3 +0,0 @@
-for /f "tokens=1 delims=-" %%i in ("%CIRCLE_TAG%") do set "TAG=%%i.%WORKFLOW_NUM%"
-for /f "tokens=1 delims=/" %%j in ("%CIRCLE_TAG%") do set "SEMVER=%%j"
-tools\InnoSetup\ISCC.exe tools\powerbi.iss /Sbyparam=$p /DINFO_VERSION=%TAG% /DVERSION=%SEMVER% %*

.circleci/config.yml

@@ -1,113 +1,16 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine.
-# See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 
-orbs:
-  win: circleci/windows@5.0
-
-commands:
-  setup_digicert:
-    description: Set up Digicert Keylocker certificate for code-signing
-    steps:
-      - run:
-          name: "Digicert Signing Manager Setup"
-          command: |
-            cd C:\
-            curl.exe -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:$env:SM_API_KEY" -o smtools-windows-x64.msi
-            msiexec.exe /i smtools-windows-x64.msi /quiet /qn | Wait-Process
-      - run:
-          name: Setup Digicert ONE Client Cert
-          command: |
-            cd C:\
-            echo $env:SM_CLIENT_CERT_FILE_B64 > certificate.txt
-            certutil -decode certificate.txt certificate.p12
-      - run:
-          name: Sync Certs
-          command: |
-            & $env:SSM\smksp_cert_sync.exe
-
+# Define the jobs we want to run for this project
 jobs:
-  build-connector:
-    executor:
-      name: win/default
-      shell: powershell.exe
-    environment:
-      SSM: 'C:\Program Files\DigiCert\DigiCert One Signing Manager Tools'
-    steps:
-      - checkout
-      - run:
-          name: "Set connector internal version"
-          command: |
-            $env:VERSION = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "2.0.0.$($env:WORKFLOW_NUM)" } else { $env:CIRCLE_TAG }
-            (Get-Content ./src/powerbi-data-connector/Speckle.pq).replace('[Version = "2.0.0"]', '[Version = "'+$($env:VERSION)+'"]') | Set-Content ./src/powerbi-data-connector/Speckle.pq
-      - run:
-          name: "Build Data Connector"
-          command: "msbuild ./src/powerbi-data-connector/Speckle.proj /restore /consoleloggerparameters:NoSummary /property:GenerateFullPaths=true"
-      - run:
-          name: Create PQX file
-          command: .\tools\MakePQX\MakePQX.exe pack -mz src/powerbi-data-connector/bin/Speckle.mez -t src/powerbi-data-connector/bin/Speckle.pqx
-      - unless: # Build installers unsigned on non-tagged builds
-          condition: << pipeline.git.tag >>
-          steps:
-            - run:
-                name: Build Installer
-                shell: cmd.exe #does not work in powershell
-                environment:
-                  WORKFLOW_NUM: << pipeline.number >>
-                  CIRCLE_TAG: 2.0.999-beta/all
-                command: .circleci\build-installer.bat
-      - when: # Setup certificates and build installers signed for tagged builds
-          condition: << pipeline.git.tag >>
-          steps:
-            - setup_digicert
-            - run:
-                name: Build Installer
-                shell: cmd.exe #does not work in powershell
-                environment:
-                  WORKFLOW_NUM: << pipeline.number >>
-                command: .circleci\build-installer.bat /DSIGN_INSTALLER /DCODE_SIGNING_CERT_FINGERPRINT=%SM_CODE_SIGNING_CERT_SHA1_HASH%
-      - store_artifacts:
-          path: ./installer
-      - persist_to_workspace:
-          root: ./
-          paths:
-            - installer/*.exe
-
-  deploy-connector-to-feed:
-    docker:
-      - image: mcr.microsoft.com/dotnet/sdk:6.0
-    steps:
-      - attach_workspace:
-          at: ./
-      - run:
-          name: Install Manager Feed CLI
-          command: dotnet tool install --global Speckle.Manager.Feed
-      - run:
-          name: Upload new version
-          command: |
-            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "2.0.999"; fi;)
-            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
-            VER=$(echo "$SEMVER" | sed -e 's/-.*//')
-            VERSION=$(echo $VER.$WORKFLOW_NUM)
-            /root/.dotnet/tools/Speckle.Manager.Feed deploy -s powerbi -v ${SEMVER} -u https://releases.speckle.dev/installers/powerbi/powerbi-${SEMVER}.exe -o Win -a Any -f ./installer/powerbi-${SEMVER}.exe
-          environment:
-            WORKFLOW_NUM: << pipeline.number >>
-workflows:
   build:
+    docker:
+      - image: cimg/base:2023.03
+    steps:
+      - run: echo "so long and thanks for all the fish"
+
+# Orchestrate our job run sequence
+workflows:
+  build_and_test:
+    when: false
     jobs:
-      - build-connector:
-          context: digicert-keylocker
-  deploy:
-    jobs:
-      - build-connector:
-          filters: &deploy_filter
-            branches:
-              ignore: /.*/ # For testing only: /ci\/.*/
-            tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w{1,10})?$/
-          context: digicert-keylocker
-      - deploy-connector-to-feed:
-          filters: *deploy_filter
-          requires:
-            - build-connector
-          context: do-spaces-speckle-releases
+      - build

.github/workflows/deploy.yml

@@ -0,0 +1,159 @@
+name: Build and deploy Connector and Visual
+on:
+  push:
+    branches: ["installer-test/**"]
+    tags: ["v3.*.*"] # Manual delivery on every 3.x tag
+jobs:
+  build-connector:
+    runs-on: windows-latest
+    outputs:
+      semver: ${{ steps.set-version.outputs.semver }}
+      file-version: ${{ steps.set-version.outputs.file-version }}
+    env:
+      CertFile: "./speckle.pfx"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10"
+
+      - id: set-version
+        name: Set version to output
+        shell: bash
+        run: |
+          TAG=${{ github.ref_name }}
+          if [[ "${{ github.ref }}" != refs/tags/* ]]; then
+            TAG="v3.0.99"
+          fi
+          SEMVER="${TAG#v}"
+          FILE_VERSION=$(echo "$TAG" | sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
+          FILE_VERSION="$FILE_VERSION.${{ github.run_number }}"
+
+          echo "semver=$SEMVER" >> "$GITHUB_OUTPUT"
+          echo "file-version=$FILE_VERSION" >> "$GITHUB_OUTPUT"
+
+          echo $SEMVER
+          echo $FILE_VERSION
+
+      - name: Set connector version
+        run: |
+          python patch_version.py ${{steps.set-version.outputs.file-version}}
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Build Data Connector
+        working-directory: src/powerbi-data-connector
+        run: |
+          msbuild Speckle.proj /restore /consoleloggerparameters:NoSummary /property:GenerateFullPaths=true
+
+      - name: Setup Self-sign certificate
+        run: |
+          echo "${{ secrets.SELF_CERT_FILE_B64 }}" > "certificate.txt"
+          certutil -decode certificate.txt ${{ env.CertFile  }}
+
+      - name: Create PQX file
+        run: |
+          .\tools\MakePQX\MakePQX.exe pack --mez src/powerbi-data-connector/bin/Speckle.mez --target src/powerbi-data-connector/bin/Speckle.pqx --certificate ${{env.CertFile}} --password ${{secrets.SELF_CERT_PASSWORD}}
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: powerbi-connector
+          path: src/powerbi-data-connector/bin/Speckle.pqx
+          if-no-files-found: error
+          retention-days: 1
+
+  build-visual:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - id: set-version
+        name: Set version to output
+        shell: bash
+        run: |
+          TAG=${{ github.ref_name }}
+          if [[ "${{ github.ref }}" != refs/tags/* ]]; then
+            TAG="v3.0.99.${{ github.run_number }}"
+          fi
+          SEMVER="${TAG#v}"
+          FILE_VERSION=$(echo "$TAG" | sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
+          FILE_VERSION="$FILE_VERSION.${{ github.run_number }}"
+
+          echo "semver=$SEMVER" >> "$GITHUB_OUTPUT"
+          echo "file-version=$FILE_VERSION" >> "$GITHUB_OUTPUT"
+
+          echo $SEMVER
+          echo $FILE_VERSION
+
+      - run: npm ci
+        working-directory: src/powerbi-visual
+      - run: npm version ${{steps.set-version.outputs.semver}} --allow-same-version
+        working-directory: src/powerbi-visual
+      - run: npm run build
+        working-directory: src/powerbi-visual
+      - uses: actions/upload-artifact@v4
+        with:
+          name: powerbi-visual
+          path: src/powerbi-visual/dist/*.pbiviz
+          if-no-files-found: error
+          retention-days: 1
+
+  deploy-installers:
+    runs-on: ubuntu-latest
+    needs:
+      - build-connector
+      - build-visual
+    env:
+      IS_TAG_BUILD: ${{ github.ref_type == 'tag' }}
+    steps:
+      - name: download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: powerbi-connector
+          path: artifacts/
+      - name: download artifacts visual
+        uses: actions/download-artifact@v4
+        with:
+          name: powerbi-visual
+          path: artifacts/
+      - name: Zip artifacts
+        run: |
+          cd artifacts && zip -r ../powerbi.zip .
+      - name: upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: output-${{needs.build-connector.outputs.semver}}
+          path: powerbi.zip
+          if-no-files-found: error
+          retention-days: 1
+      - name: 🔫 Trigger Build Installer(s)
+        uses: the-actions-org/workflow-dispatch@v4.0.0
+        with:
+          workflow: Build Installers
+          repo: specklesystems/connector-installers
+          token: ${{ secrets.CONNECTORS_GH_TOKEN }}
+          inputs: '{
+            "run_id": "${{ github.run_id }}",
+            "semver": "${{ needs.build-connector.outputs.semver }}",
+            "file_version": "${{ needs.build-connector.outputs.file-version }}",
+            "repo": "${{ github.repository }}",
+            "is_public_release": ${{ env.IS_TAG_BUILD }}
+            }'
+          ref: main
+          wait-for-completion: true
+          wait-for-completion-interval: 10s
+          wait-for-completion-timeout: 10m
+          display-workflow-run-url: true
+          display-workflow-run-url-interval: 10s
+
+      - uses: geekyeggo/delete-artifact@v5
+        with:
+          name: output-*

.github/workflows/pr.yml

@@ -0,0 +1,30 @@
+name: Test Build Connector and Visual
+on: pull_request
+
+jobs:
+  build-connector:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Build Data Connector
+        working-directory: src/powerbi-data-connector
+        run: |
+          msbuild Speckle.proj /restore /consoleloggerparameters:NoSummary /property:GenerateFullPaths=true
+
+  build-visual:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - run: npm ci
+        working-directory: src/powerbi-visual
+      - run: npm run build
+        working-directory: src/powerbi-visual

.gitignore

@@ -339,4 +339,8 @@ ASALocalRun/
 **/.tmp/
 **/webpack.statistics.*.html
 **/webpack.statistics.html
-**/Thumbs.db
+**/Thumbs.db
+installer/
+
+localhost.pem
+localhost-key.pem

README.md

@@ -1,16 +1,112 @@
-<h1 align="center">
+<<h1 align="center">
   <img src="https://user-images.githubusercontent.com/2679513/131189167-18ea5fe1-c578-47f6-9785-3748178e4312.png" width="150px"/><br/>
-  Speckle | PowerBI
+  Speckle | Power BI
 </h1>
+
+<p align="center"><a href="https://twitter.com/SpeckleSystems"><img src="https://img.shields.io/twitter/follow/SpeckleSystems?style=social" alt="Twitter Follow"></a> <a href="https://speckle.community"><img src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fspeckle.community&amp;style=flat-square&amp;logo=discourse&amp;logoColor=white" alt="Community forum users"></a> <a href="https://speckle.systems"><img src="https://img.shields.io/badge/https://-speckle.systems-royalblue?style=flat-square" alt="website"></a> <a href="https://docs.speckle.systems/"><img src="https://img.shields.io/badge/docs-speckle.systems-orange?style=flat-square&amp;logo=read-the-docs&amp;logoColor=white" alt="docs"></a></p>
+
+> Speckle is the first AEC data hub that connects with your favorite AEC tools. Speckle exists to overcome the challenges of working in a fragmented industry where communication, creative workflows, and the exchange of data are often hindered by siloed software and processes. It is here to make the industry better.
+
 <h3 align="center">
-    Data Connector and 3D Viewer Visual for PowerBI platform
+    Speckle Connector and 3D Visual for Power BI
 </h3>
-<p align="center"><b>Speckle</b> is the data infrastructure for the AEC industry.</p><br/>
 
-<p align="center"><a href="https://twitter.com/SpeckleSystems"><img src="https://img.shields.io/twitter/follow/SpeckleSystems?style=social" alt="Twitter Follow"></a> <a href="https://speckle.community"><img src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fspeckle.community&amp;style=flat-square&amp;logo=discourse&amp;logoColor=white" alt="Community forum users"></a> <a href="https://speckle.systems"><img src="https://img.shields.io/badge/https://-speckle.systems-royalblue?style=flat-square" alt="website"></a> <a href="https://speckle.guide/dev/"><img src="https://img.shields.io/badge/docs-speckle.guide-orange?style=flat-square&amp;logo=read-the-docs&amp;logoColor=white" alt="docs"></a></p>
-<p align="center"></p>
+## Features
 
-# About Speckle
+Speckle Power BI Data Connector lets you easily get data from Speckle into Power BI reports and visualizations. You can access and analyze data from various AEC apps (like Revit, Archicad, Grasshopper, and more) and open-source files (IFC, STL, OBJ, etc.) into Power BI with ease. 
+
+<p align="center">
+  <div align="center">
+    <a href="https://app.speckle.systems/connectors/">
+      Download Power BI Connector
+    </a>
+  </div>
+</p>
+
+Speckle’s connection to Power BI consists of two parts:
+
+- **Data Connector** fetches the data you uploaded from AEC apps to Speckle.
+- **3D Visual** allows you to see those models in 3D within Power BI.
+
+![Desktop - 1 (1)](https://github.com/specklesystems/speckle-powerbi/assets/51519350/6d2c5224-965f-4eae-b869-be26cb48c6b2)
+
+## Repository Structure
+
+This repository is home to our Power BI connector. The Speckle Server provides all the web-facing functionality and can be found [here](https://github.com/specklesystems/Server).
+
+`src/powerbi-data-connector` contains all the code for the Data connector.
+
+`src/powerbi-visual` contains all the code for 3D Visual.
+
+## Installation
+
+Power BI connector installer can be downloaded from the [connectors portal](https://app.speckle.systems/connectors/). Full instructions for [installation](https://docs.speckle.systems/connectors/power-bi#setup) and [configuration](https://docs.speckle.systems/connectors/power-bi#why-dont-i-see-speckle-as-a-data-source-in-power-bi) can be found on our docs.
+
+### 3D Visual
+
+3D Visual can be imported as any other Power BI custom visual.
+
+1. Navigate to the Visualization Pane.
+2. Click the three dots (…) and select “Import a visual from a file”.
+3. Go to `Documents/Power BI Desktop/Custom Visuals` and import `Speckle 3D Visual.pbiviz` file.
+4. Speckle cube will appear in the Visualization pane.
+
+For more on how to use the visual, [check our docs](https://docs.speckle.systems/connectors/power-bi).
+
+## Quick Start
+
+To get started with Power BI connector, please take a look at the [documentation](https://docs.speckle.systems/connectors/power-bi) and extensive [tutorials](https://www.youtube.com/@SpeckleSystems) published. 
+
+## Development Setup
+
+### For local development of the 3D Visual
+
+1. **Clone the repository**:
+   ```bash
+   git clone https://github.com/specklesystems/speckle-powerbi.git
+   cd speckle-powerbi
+   ```
+
+2. **Navigate to the visual directory**:
+   ```bash
+   cd src/powerbi-visual
+   ```
+
+3. **Install dependencies**:
+   ```bash
+   npm install
+   # or
+   yarn install
+   ```
+
+4. **Start development server**:
+   ```bash
+   npm run dev
+   ```
+
+5. **Build the visual**:
+   ```bash
+   # Development build
+   npm run build:dev
+   
+   # Production build
+   npm run build
+   ```
+
+### For local development of the Data Connector
+
+1. **Install PowerQuery SDK**:
+   Follow the instructions from the [official docs](https://docs.microsoft.com/en-us/power-query/installingsdk)
+
+2. **Open the project in Visual Studio Code**:
+   - Open `src/powerbi-data-connector/Speckle.proj`
+   - Build the project to generate the `.mez` file
+
+3. **Testing the connector**:
+   - Visual Studio will automatically copy the `.mez` file to the appropriate location
+   - Restart Power BI Desktop to see the latest changes
+
+## About Speckle
 
 What is Speckle? Check our ![YouTube Video Views](https://img.shields.io/youtube/views/B9humiSpHzM?label=Speckle%20in%201%20minute%20video&style=social)
 
@@ -31,66 +127,10 @@ What is Speckle? Check our ![YouTube Video Views](https://img.shields.io/youtube
 
 Give Speckle a try in no time by:
 
-- [![speckle XYZ](https://img.shields.io/badge/https://-speckle.xyz-0069ff?style=flat-square&logo=hackthebox&logoColor=white)](https://speckle.xyz) ⇒ creating an account at our public server
-- [![create a droplet](https://img.shields.io/badge/Create%20a%20Droplet-0069ff?style=flat-square&logo=digitalocean&logoColor=white)](https://marketplace.digitalocean.com/apps/speckle-server?refcode=947a2b5d7dc1) ⇒ deploying an instance in 1 click 
+- [![app.speckle.systems](https://img.shields.io/badge/https://-app.speckle.systems-0069ff?style=flat-square&logo=hackthebox&logoColor=white)](https://app.speckle.systems) ⇒ creating an account at our public server
 
 ### Resources
 
 - [![Community forum users](https://img.shields.io/badge/community-forum-green?style=for-the-badge&logo=discourse&logoColor=white)](https://speckle.community) for help, feature requests or just to hang with other speckle enthusiasts, check out our community forum!
 - [![website](https://img.shields.io/badge/tutorials-speckle.systems-royalblue?style=for-the-badge&logo=youtube)](https://speckle.systems) our tutorials portal is full of resources to get you started using Speckle
-- [![docs](https://img.shields.io/badge/docs-speckle.guide-orange?style=for-the-badge&logo=read-the-docs&logoColor=white)](https://speckle.guide/dev/) reference on almost any end-user and developer functionality
-
-![Untitled](https://user-images.githubusercontent.com/2679513/132021739-15140299-624d-4410-98dc-b6ae6d9027ab.png)
-
-# Repo structure
-
-This repo is the home to our Speckle 2.0 PowerBI project. The [Speckle Server](https://github.com/specklesystems/Server) is providing all the web-facing functionality and can be found [here](https://github.com/specklesystems/Server).
-
-## Install
-
-Go to the [Releases](https://github.com/specklesystems/speckle-powerbi/releases) page, downlad the `.mez` file of the latest release and copy it into the following folder in your computer:
-
-```
-YOUR_USER_FOLDER\Documents\Power BI Desktop\Custom Connectors\
-```
-If the folder doesn't exist, create it.
-
-### Allow custom extensions to run
-
-Go to `Settings -> Security -> Data Extensions` and activate the following option:
-
-![Allow extensions to run](https://user-images.githubusercontent.com/2316535/130931149-074cf6a8-1910-41f1-99c7-b8b08168f473.png)
-
-### Checking the connector is loaded
-
-Now open PowerBI and you should see `Speckle (beta)` appear in the data source.
-
-![PowerBI](https://user-images.githubusercontent.com/2316535/129580913-02e5e662-f344-419c-9894-e97055930c58.png)
-
-## Usage
-
-> More detailed instructions on how to use the connector will be added shortly!
-
-### Current limitations
-
-Chunked data currently is not automatically de-chunked when received, we are aware of this limitation and are working to resolve it!
-
-## Developing & Debugging
-
-We encourage everyone interested to debug / hack / contribute / give feedback to this project.
-
-### Setup
-
-#### Install PowerQuery SDK
-
-Follow the instructions from the [official docs](https://docs.microsoft.com/en-us/power-query/installingsdk)
-
-#### Build with Visual Studio
-
-Every time you build the connector, VisualStudio will copy the latest `.mez` connector file to the appropriate location. Just restart PowerBI to see the latest changes.
-
-#### Debug
-
-You can start the PowerQuery connector in VisualStudio, this will open a standalone connector you can use for testing purposes.
-
-We don't know of a way to debug the connector live in PowerBI, but we'd be happy to hear about it.
+- [![docs](https://img.shields.io/badge/docs-speckle.systems-orange?style=for-the-badge&logo=read-the-docs&logoColor=white)](https://docs.speckle.systems) reference on almost any end-user and developer functionality

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "speckle-powerbi",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

patch_version.py

@@ -0,0 +1,42 @@
+import re
+import sys
+import os
+
+
+def sanitize_version(tag):
+    """Extracts the first three numeric segments from a tag string, because PowerBI is..."""
+    parts = re.findall(r"\d+", tag)
+    return ".".join(parts[:3]) if len(parts) >= 3 else tag
+
+def patch_connector(tag):
+    """Patches the connector version within the data connector file"""
+    sanitized_tag = sanitize_version(tag)
+    pq_file = os.path.join(os.path.dirname(__file__), "src", "powerbi-data-connector", "Speckle.pq")
+
+    with open(pq_file, "r") as file:
+        lines = file.readlines()
+
+        for (index, line) in enumerate(lines):
+            if '[Version = "3.0.0"]' in line:
+                lines[index] = f'[Version = "{sanitized_tag}"]\n'
+                print(f"Patched connector version number in {pq_file}")
+                break
+
+        with open(pq_file, "w") as file:
+            file.writelines(lines)
+
+
+def main():
+    if len(sys.argv) < 2:
+        return
+
+    tag = sys.argv[1]
+    if not re.match(r"([0-9]+)\.([0-9]+)\.([0-9]+)", tag):
+        raise ValueError(f"Invalid tag provided: {tag}")
+
+    print(f"Patching version: {tag}")
+    patch_connector(tag)
+
+
+if __name__ == "__main__":
+    main()

speckle-powerbi.code-workspace

@@ -1,34 +1,42 @@
 {
   "folders": [
     {
-      "name": "root",
+      "name": "🏠 root",
       "path": "."
     },
     {
-      "name": "DataConnector",
+      "name": "➡️ powerbi-data-connector",
       "path": "src/powerbi-data-connector"
     },
     {
-      "name": "Visual",
+      "name": "👀 powerbi-visual",
       "path": "src/powerbi-visual"
     }
   ],
   "settings": {
     "powerquery.general.mode": "SDK",
     "powerquery.sdk.defaultQueryFile": "${workspaceFolder}\\src\\powerbi-data-connector\\Speckle.query.pq",
-    "powerquery.sdk.defaultExtension": "${workspaceFolder}\\bin\\${workspaceFolderBasename}.mez",
+    "powerquery.sdk.defaultExtension": "${workspaceFolder}\\src\\powerbi-data-connector\\bin\\Speckle.mez",
     "files.eol": "\n",
     "files.watcherExclude": {
       "**/.git/objects/**": true,
       "**/node_modules/**": true,
       ".tmp": true
     },
-    "files.exclude": {
-      ".tmp": true
+    "editor.formatOnPaste": true,
+    "editor.multiCursorModifier": "ctrlCmd",
+    "editor.snippetSuggestions": "top",
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": "explicit"
     },
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
     "search.exclude": {
       ".tmp": true,
-      "typings": true
+      "typings": true,
+      "dist": true,
+      "wepbpack.statistics.dev.html": true,
+      "wepbpack.statistics.html": true
     },
     "json.schemas": [
       {
@@ -47,6 +55,7 @@
   },
   "extensions": {
     "recommendations": [
+      "esbenp.prettier-vscode",
       "ms-dotnettools.csharp",
       "powerquery.vscode-powerquery-sdk"
     ]

src/powerbi-data-connector/Speckle.pq

@@ -1,198 +1,224 @@
-[Version = "2.15.0-rc"]
+[Version = "3.0.0"]
 section Speckle;
 
 AuthAppId = "spklpwerbi";
 AuthAppSecret = "spklpwerbi";
 
-// The data source definition, used when connecting to any speckle server
-Speckle = [
-    // This is used when running the connector on an on-premises data gateway
-    TestConnection = (path) => {"Speckle.Api.GetUser", path},
-    // This is the custom authentication strategy for our Connector
-    Authentication = [
-        OAuth = [
-            Label = "Speckle Account",
-            StartLogin = (clientApplication, dataSourcePath, state, display) =>
-                let
-                    server = Text.Combine(
-                        {Uri.Parts(dataSourcePath)[Scheme], "://", Uri.Parts(dataSourcePath)[Host]}
-                    )
-                in
-                    [
-                        LoginUri = Text.Combine({server, "authn", "verify", AuthAppId, state}, "/"),
-                        CallbackUri = "https://oauth.powerbi.com/views/oauthredirect.html",
-                        WindowHeight = 800,
-                        WindowWidth = 600,
-                        Context = null
-                    ],
-            FinishLogin = (clientApplication, dataSourcePath, context, callbackUri, state) =>
-                let
-                    server = Text.Combine(
-                        {Uri.Parts(dataSourcePath)[Scheme], "://", Uri.Parts(dataSourcePath)[Host]}
-                    ),
-                    Parts = Uri.Parts(callbackUri)[Query],
-                    Source = Web.Contents(
-                        Text.Combine({server, "auth", "token"}, "/"),
-                        [
-                            Headers = [
-                                #"Content-Type" = "application/json"
-                            ],
-                            Content = Json.FromValue(
-                                [
-                                    accessCode = Parts[access_code],
-                                    appId = AuthAppId,
-                                    appSecret = AuthAppSecret,
-                                    challenge = state
-                                ]
-                            )
-                        ]
-                    ),
-                    json = Json.Document(Source)
-                in
-                    [
-                        access_token = json[token],
-                        scope = null,
-                        token_type = "bearer",
-                        refresh_token = json[refreshToken]
-                    ],
-            Refresh = (dataSourcePath, refreshToken) =>
-                let
-                    server = Text.Combine(
-                        {Uri.Parts(dataSourcePath)[Scheme], "://", Uri.Parts(dataSourcePath)[Host]}
-                    ),
-                    Source = Web.Contents(
-                        Text.Combine({server, "auth", "token"}, "/"),
-                        [
-                            Headers = [
-                                #"Content-Type" = "application/json"
-                            ],
-                            Content = Json.FromValue(
-                                [
-                                    refreshToken = refreshToken,
-                                    appId = AuthAppId,
-                                    appSecret = AuthAppSecret
-                                ]
-                            )
-                        ]
-                    ),
-                    json = Json.Document(Source)
-                in
-                    [
-                        access_token = json[token],
-                        scope = null,
-                        token_type = "bearer",
-                        refresh_token = json[refreshToken]
-                    ]
-        ],
-        Key = [
-            KeyLabel = "Personal Access Token",
-            Label = "Private Project"
-        ],
-        Implicit = [
-            Label = "Public Project"
-        ]
-    ],
-    Label = "Speckle"
-];
+// PKCE helper functions for enhanced OAuth2 security
+Base64UrlEncode = (binaryData as binary) =>
+    let
+        // Convert binary to base64
+        base64 = Binary.ToText(binaryData, BinaryEncoding.Base64),
+        // Convert to base64url by replacing characters and removing padding
+        base64url = Text.Replace(Text.Replace(Text.Replace(base64, "+", "-"), "/", "_"), "=", "")
+    in
+        base64url;
 
-// Gets the object referenced by a specific speckle URL
-[DataSource.Kind = "Speckle", Publish = "Get.ByUrl.Publish"]
-shared Speckle.GetByUrl.Structured = Value.ReplaceType(
-    Speckle.LoadFunction("Get.ByUrl.pqm"),
-    type function (
-        url as (
-            Uri.Type meta [
-                Documentation.FieldCaption = "Gets a Speckle Object preserving it's structure",
-                Documentation.FieldDescription = "The url of a model in a Speckle server project. You can copy it directly from your browser.",
-                Documentation.SampleValues = {"https://app.speckle.systems/projects/23401adf/models/1234568"}
-            ]
-        )
-    ) as record meta [
-        Documentation.Name = "Speckle - Get Structured Object by URL",
-        Documentation.LongDescription = "Returns the Speckle object the URL points to, while also preserving it's structure.
-            Supports all types of model url:#(lf)
-            - Model: will get the latest version of the specified model (i.e. 'https://app.speckle.systems/projects/PROJECT_ID/models/MODEL_ID')#(lf)
-            - Version: will get a specific version from the project (i.e. 'https://app.speckle.systems/projects/PROJECT_ID/models/MODEL_ID@VERSION_ID')
-        "
-    ]
+GeneratePKCEVerifier = () =>
+    let
+        // Generate cryptographically secure random string using allowed characters
+        // RFC 7636: [A-Z] / [a-z] / [0-9] / "-" / "." / "_" / "~"
+        allowedChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~",
+        
+        // Generate multiple GUIDs to create entropy
+        guid1 = Text.Replace(Text.Replace(Text.NewGuid(), "-", ""), "{", ""),
+        guid2 = Text.Replace(Text.Replace(Text.NewGuid(), "-", ""), "}", ""),
+        guid3 = Text.Replace(Text.Replace(Text.NewGuid(), "-", ""), "{", ""),
+        guid4 = Text.Replace(Text.Replace(Text.NewGuid(), "-", ""), "}", ""),
+        
+        // Combine and convert to allowed characters
+        combined = guid1 & guid2 & guid3 & guid4,
+        
+        // Map hex characters to allowed PKCE characters
+        mapped = Text.Replace(
+            Text.Replace(
+                Text.Replace(
+                    Text.Replace(
+                        Text.Replace(
+                            Text.Replace(combined, "0", "A"),
+                            "1", "B"),
+                        "2", "C"),
+                    "3", "D"),
+                "4", "E"),
+            "5", "F"),
+        
+        // Continue mapping remaining hex chars to allowed chars
+        verifier = Text.Replace(
+            Text.Replace(
+                Text.Replace(
+                    Text.Replace(
+                        Text.Replace(
+                            Text.Replace(
+                                Text.Replace(
+                                    Text.Replace(
+                                        Text.Replace(
+                                            Text.Replace(mapped, "6", "G"),
+                                            "7", "H"),
+                                        "8", "I"),
+                                    "9", "J"),
+                                "a", "K"),
+                            "b", "L"),
+                        "c", "M"),
+                    "d", "N"),
+                "e", "O"),
+            "f", "P"),
+        
+        // Ensure length is between 43-128 characters as per RFC 7636
+        finalVerifier = Text.Start(verifier, 43)
+    in
+        finalVerifier;
+
+GeneratePKCEChallenge = (verifier as text) =>
+    let
+        // Create SHA256 hash of the verifier as required by RFC 7636
+        hash = Crypto.CreateHash(CryptoAlgorithm.SHA256, Text.ToBinary(verifier, TextEncoding.Ascii)),
+        // Convert to base64url encoding
+        challenge = Base64UrlEncode(hash)
+    in
+        challenge;
+
+// function to load `pqm` files - this is essential and must be kept
+shared Speckle.LoadFunction = (fileName as text) =>
+    let
+        binary = Extension.Contents(fileName),
+        asText = Text.FromBinary(binary)
+    in
+        try
+            Expression.Evaluate(asText, #shared)
+        catch (e) =>
+            error
+                [
+                    Reason = "Speckle.LoadFunction Failure",
+                    Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
+                    Message.Parameters = {fileName, e[Reason], e[Message]},
+                    Detail = [File = fileName, Error = e]
+                ];
+
+// here we register the functions to expose them globally
+[DataSource.Kind = "Speckle"]
+shared Speckle.Parser = Value.ReplaceType(
+    Speckle.LoadFunction("Parser.pqm"), 
+    type function (url as Uri.Type) as record
 );
 
-// [DataSource.Kind = "Speckle", Publish = "NavTable.Publish"]
-// shared Speckle.GetObjectAsNavTable = Value.ReplaceType(
-//     NavigationTable.Simple, type function (url as Uri.Type) as table
-// );
-// Get's a flat list of speckle objects from a URL
-[DataSource.Kind = "Speckle", Publish = "GetByUrl.Publish"]
+[DataSource.Kind = "Speckle"]
+shared Speckle.Api.Fetch = Value.ReplaceType(
+    Speckle.LoadFunction("Api.Fetch.pqm"), 
+    type function (url as Uri.Type, optional query as text, optional variables as record) as record
+);
+
+[DataSource.Kind = "Speckle"]
+shared Speckle.CheckPermissions = Value.ReplaceType(
+    Speckle.LoadFunction("CheckPermissions.pqm"),
+    type function (url as Uri.Type) as record
+);
+
+[DataSource.Kind = "Speckle"]
+shared Speckle.GetUser = Value.ReplaceType(
+    Speckle.LoadFunction("GetUser.pqm"), 
+    type function (url as Uri.Type) as record
+);
+
+[DataSource.Kind = "Speckle"]
+shared Speckle.GetModel = Value.ReplaceType(
+    Speckle.LoadFunction("GetModel.pqm"),
+    type function (url as Uri.Type) as record
+);
+
+[DataSource.Kind = "Speckle"]
+shared Speckle.GetStructuredData = Value.ReplaceType(
+    Speckle.LoadFunction("GetStructuredData.pqm"),
+    type function (url as Uri.Type) as table
+);
+
+shared Speckle.GetVersion = Value.ReplaceType(
+    Speckle.LoadFunction("GetVersion.pqm"),
+    type function () as text
+);
+
+[DataSource.Kind = "Speckle"]
+shared Speckle.SendToServer = Value.ReplaceType(
+    Speckle.LoadFunction("SendToServer.pqm"),
+    type function (url as Uri.Type) as table
+);
+
+[DataSource.Kind = "Speckle"]
+shared Speckle.GetWorkspace = Value.ReplaceType(
+    Speckle.LoadFunction("GetWorkspace.pqm"),
+    type function (url as Uri.Type) as record
+);
+
+shared Speckle.Objects.Properties = Value.ReplaceType(
+    Speckle.LoadFunction("Objects.Properties.pqm"),
+    type function (inputRecord as any, optional filterKeys as list, optional parentPath as text, optional existingFields as list) as record
+);
+
+
+shared Speckle.Utils.ExpandRecord = Value.ReplaceType(
+    Speckle.LoadFunction("Utils.ExpandRecord.pqm"),
+    type function (
+        table as table,
+        columnName as text,
+        optional FieldNames as list,
+        optional UseCombinedNames as logical
+    ) as table
+);
+
+shared Speckle.Objects.Collections = Value.ReplaceType(
+    Speckle.LoadFunction("Objects.Collections.pqm"),
+    type function (inputData as table) as table
+);
+
+shared Speckle.Objects.CompositeStructure = Value.ReplaceType(
+    Speckle.LoadFunction("Objects.CompositeStructure.pqm"),
+    type function (objectRecord as record, optional outputAsList as nullable logical) as any
+);
+
+shared Speckle.Objects.MaterialQuantities = Value.ReplaceType(
+    Speckle.LoadFunction("Objects.MaterialQuantities.pqm"),
+    type function (objectRecord as record, optional outputAsList as logical) as any
+);
+
+shared Speckle.Models.Federate = Value.ReplaceType(
+    Speckle.LoadFunction("Models.Federate.pqm"),
+    type function (tables as list, optional excludeData as logical) as table
+);
+
+shared Speckle.Models.MaterialQuantities = Value.ReplaceType(
+    Speckle.LoadFunction("Models.MaterialQuantities.pqm"),
+    type function (inputTable as table, optional addPrefix as logical) as table
+);
+
+[DataSource.Kind = "Speckle", Publish="GetByUrl.Publish"]
 shared Speckle.GetByUrl = Value.ReplaceType(
     Speckle.LoadFunction("GetByUrl.pqm"),
     type function (
         url as (
             Uri.Type meta [
-                Documentation.FieldCaption = "Model URL",
-                Documentation.FieldDescription = "The url of a model in a Speckle server. You can copy it directly from your browser.",
-                Documentation.SampleValues = {"https://app.speckle.systems/projects/23401adf/models/1234568"}
+                Documentation.FieldCaption = "Speckle Model URL",
+                Documentation.FieldDescription = "The URL of a model in a Speckle server project. You can copy it directly from your browser.",
+                Documentation.SampleValues = {"https://app.speckle.systems/projects/7902de1f57/models/7f890a65df"}
+            ]
+        ),
+        optional ExpandProperties as (
+            type logical meta [
+                Documentation.FieldCaption = "Expand Properties (may slow query)",
+                Documentation.FieldDescription = "Expand the properties column into individual columns for easier analysis. When checked, each property from the 'properties' record column will have its own column. This can slow down the query if you have a lot of properties.",
+                Documentation.AllowedValues = {true, false}
             ]
         )
     ) as table meta [
-        Documentation.Name = "Speckle - Get Model by URL",
-        Documentation.LongDescription = "Returns a flat list of all objects contained in a Speckle model/version of a specific a project.
-            Supports all types of model url:#(lf)
-            - Model: will get the latest version of the specified model (i.e. 'https://app.speckle.systems/projects/PROJECT_ID/models/MODEL_ID')#(lf)
-            - Version: will get a specific version from the project (i.e. 'https://app.speckle.systems/projects/PROJECT_ID/models/MODEL_ID@VERSION_ID')
-        "
+        Documentation.Name = "Speckle - Get Data by URL",
+        Documentation.DisplayName = "Speckle - Get Data by URL",
+        Documentation.LongDescription = "Returns structured data from a Speckle model URL.#(lf)
+            Supports the following URL formats:#(lf)
+            - Model URL: Gets the latest version of the specified model#(lf)
+              (e.g., 'https://app.speckle.systems/projects/PROJECT_ID/models/MODEL_ID')#(lf)
+            - Version URL: Gets a specific version from the project#(lf)
+              (e.g., 'https://app.speckle.systems/projects/PROJECT_ID/models/MODEL_ID@VERSION_ID')"
     ]
 );
 
-// Gets the current authenticated user, if any
-[DataSource.Kind = "Speckle"]
-shared Speckle.Api.GetUser = Value.ReplaceType(
-    Speckle.LoadFunction("Api.GetUser.pqm"), type function (url as Uri.Type) as record
-);
-
-// Generic fetch function to our GraphQL endpoint
-[DataSource.Kind = "Speckle"]
-shared Speckle.Api.Fetch = Value.ReplaceType(
-    Speckle.LoadFunction("Api.Fetch.pqm"),
-    type function (url as Uri.Type, optional query as text, optional variables as record) as record
-);
-
-// Parses a stream url and returns a record with the type and values
-[DataSource.Kind = "Speckle"]
-shared Speckle.ParseUrl = Value.ReplaceType(
-    Speckle.LoadFunction("ParseStreamUrl.pqm"), type function (url as Uri.Type) as record
-);
-
-// [DataSource.Kind = "Speckle"]
-// shared Speckle.Api.REST.GetObject = Value.ReplaceType(
-//     Speckle.LoadFunction("Api.REST.GetObject.pqm"),
-//     type function (url as Uri.Type, optional streamId as text, optional objectId as text) as list
-// );
-Get.ByUrl.Publish = GetPublish("GetStream");
-
-NavTable.Publish = GetPublish("GetObjectAsNavTable");
-
-GetByUrl.Publish = GetPublish("GetByUrl");
-
-GetPublish = Speckle.LoadFunction("GetPublish.pqm");
-
-// Navigation table utility function
-Table.ToNavigationTable = Speckle.LoadFunction("Table.ToNavigationTable.pqm");
-
-// Function to load `pqm` files
-shared Speckle.LoadFunction = (fileName as text) =>
-    let
-        binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-    in
-        try
-            Expression.Evaluate(asText, #shared) catch (e) =>
-                error
-                    [
-                        Reason = "Speckle.LoadFunction Failure",
-                        Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                        Message.Parameters = {fileName, e[Reason], e[Message]},
-                        Detail = [File = fileName, Error = e]
-                    ];
-
 shared Speckle.Revit.Parameters.ToNameValueRecord = (r as record, optional exclude as list) as record =>
     let
         defaultExclude = {"id", "speckle_type", "applicationId", "totalChildrenCount"},
@@ -209,9 +235,136 @@ shared Speckle.Revit.Parameters.ToNameValueRecord = (r as record, optional exclu
     in
         result;
 
-shared Speckle.Utils.DynamicColumnExpand = (tbl as table, col as text) as table =>
-    let
-        uniqueFields = List.Distinct(List.Combine(List.Transform(Table.Column(tbl, col), Record.FieldNames))),
-        expanded = Table.ExpandRecordColumn(tbl, col, uniqueFields)
-    in
-        expanded;
+// here we register the GetByUrl function to power bi ui
+GetByUrl.Publish = [
+    Cateogry = "Other",
+    ButtonText = {"Connect to Speckle"},
+    LearnMoreUrl = "https://speckle.guide/user/powerbi/introduction.html",
+    SourceImage = GetByUrl.Icons,
+    SourceTypeImage = GetByUrl.Icons
+];
+
+GetByUrl.Icons = [
+    Icon16 = { Extension.Contents("SpeckleLogo16.png"), Extension.Contents("SpeckleLogo20.png"), Extension.Contents("SpeckleLogo24.png"), Extension.Contents("SpeckleLogo32.png") },
+    Icon32 = { Extension.Contents("SpeckleLogo32.png"), Extension.Contents("SpeckleLogo40.png"), Extension.Contents("SpeckleLogo48.png"), Extension.Contents("SpeckleLogo64.png") }
+];
+
+
+// The data source definition
+Speckle = [
+    // This is used when running the connector on an on-premises data gateway
+    TestConnection = (path) => {"Speckle.GetUser", path},
+    // Authentication strategy - OAuth only
+    Authentication = [
+        OAuth = [
+            Label = "Speckle Account",
+            StartLogin = (clientApplication, dataSourcePath, state, display) =>
+                let
+                    server = Text.Combine(
+                        {Uri.Parts(dataSourcePath)[Scheme], "://", Uri.Parts(dataSourcePath)[Host]}
+                    ),
+                    // Generate PKCE parameters for enhanced security
+                    codeVerifier = GeneratePKCEVerifier(),
+                    codeChallenge = GeneratePKCEChallenge(codeVerifier),
+                    // Build authorization URL with PKCE parameters
+                    authUrl = Text.Combine({server, "authn", "verify", AuthAppId, state}, "/") &
+                        "?code_challenge=" & codeChallenge &
+                        "&code_challenge_method=S256"
+                in
+                    [
+                        LoginUri = authUrl,
+                        CallbackUri = "https://oauth.powerbi.com/views/oauthredirect.html",
+                        WindowHeight = 800,
+                        WindowWidth = 600,
+                        Context = [code_verifier = codeVerifier]
+                    ],
+            FinishLogin = (clientApplication, dataSourcePath, context, callbackUri, state) =>
+                let
+                    server = Text.Combine(
+                        {Uri.Parts(dataSourcePath)[Scheme], "://", Uri.Parts(dataSourcePath)[Host]}
+                    ),
+                    Parts = Uri.Parts(callbackUri)[Query],
+                    // Extract code verifier from context for PKCE
+                    codeVerifier = if context <> null then context[code_verifier] else null,
+                    // Build token request with PKCE parameters
+                    tokenRequest = [
+                        accessCode = Parts[access_code],
+                        appId = AuthAppId,
+                        appSecret = AuthAppSecret,
+                        challenge = state
+                    ] & (if codeVerifier <> null then [code_verifier = codeVerifier] else []),
+                    Source = Web.Contents(
+                        Text.Combine({server, "auth", "token"}, "/"),
+                        [
+                            Headers = [
+                                #"Content-Type" = "application/json"
+                            ],
+                            Content = Json.FromValue(tokenRequest)
+                        ]
+                    ),
+                    json = Json.Document(Source)
+                in
+                    [
+                        access_token = json[token],
+                        scope = null,
+                        token_type = "bearer",
+                        refresh_token = json[refreshToken]
+                    ],
+            Refresh = (dataSourcePath, refreshToken) =>
+                let
+                    server = Text.Combine(
+                        {Uri.Parts(dataSourcePath)[Scheme], "://", Uri.Parts(dataSourcePath)[Host]}
+                    ),
+                    // Enhanced refresh with error handling for gateway compatibility
+                    Source = try Web.Contents(
+                        Text.Combine({server, "auth", "token"}, "/"),
+                        [
+                            Headers = [
+                                #"Content-Type" = "application/json"
+                            ],
+                            Content = Json.FromValue(
+                                [
+                                    refreshToken = refreshToken,
+                                    appId = AuthAppId,
+                                    appSecret = AuthAppSecret
+                                ]
+                            ),
+                            ManualStatusHandling = {400, 401, 403, 500, 502, 503, 504}
+                        ]
+                    ) otherwise null,
+                    
+                    // Check if request was successful
+                    IsSuccess = Source <> null,
+                    
+                    // If successful, parse the response
+                    json = if IsSuccess then
+                        try Json.Document(Source) otherwise null
+                    else
+                        null,
+                    
+                    // Validate the response contains expected fields
+                    IsValidResponse = json <> null and Record.HasFields(json, {"token"}),
+                    
+                    // Return result with enhanced error handling
+                    result = if IsValidResponse then
+                        [
+                            access_token = json[token],
+                            scope = null,
+                            token_type = "bearer",
+                            refresh_token = json[refreshToken]
+                        ]
+                    else
+                        error [
+                            Reason = "TokenRefreshFailed",
+                            Message = "Failed to refresh OAuth token - please re-authenticate",
+                            Detail = [
+                                Server = server,
+                                RefreshToken = if refreshToken = null then "null" else "present"
+                            ]
+                        ]
+                in
+                    result
+        ]
+    ],
+    Label = "Speckle"
+];

src/powerbi-data-connector/Speckle.proj

@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
-    DefaultTargets="BuildMez">
-    <PropertyGroup>
-        <Version Condition="'$(Version)' == ''">2.0.0-wip</Version>
-        <OutputPath Condition="'$(OutputPath)' == ''">$(MSBuildProjectDirectory)\bin\</OutputPath>
-        <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">
-            $(MSBuildProjectDirectory)\obj\</IntermediateOutputPath>
-        <MezIntermediatePath>$(IntermediateOutputPath)MEZ\</MezIntermediatePath>
-        <MezOutputPath>$(OutputPath)$(MsBuildProjectName).mez</MezOutputPath>
-    </PropertyGroup>
-    <ItemGroup>
-        <MezContent Include="Speckle.pq" />
-        <MezContent Include="utilities\**\*.pqm" />
-        <MezContent Include="speckle\**\*.pqm" />
-        <MezContent Include="assets\SpeckleLogo16.png" />
-        <MezContent Include="assets\SpeckleLogo20.png" />
-        <MezContent Include="assets\SpeckleLogo24.png" />
-        <MezContent Include="assets\SpeckleLogo32.png" />
-        <MezContent Include="assets\SpeckleLogo40.png" />
-        <MezContent Include="assets\SpeckleLogo48.png" />
-        <MezContent Include="assets\SpeckleLogo64.png" />
-        <MezContent Include="assets\SpeckleLogo80.png" />
-        <MezContent Include="assets\resources.resx" />
-    </ItemGroup>
-    <Target Name="BuildMez" AfterTargets="Build" Inputs="@(MezContent)" Outputs="$(MezOutputPath)">
-        <RemoveDir Directories="$(MezIntermediatePath)" />
-        <Copy SourceFiles="@(MezContent)" DestinationFolder="$(MezIntermediatePath)" />
-        <MakeDir Directories="$(OutputPath)" Condition="!Exists('$(OutputPath)')" />
-        <ZipDirectory SourceDirectory="$(MezIntermediatePath)" DestinationFile="$(MezOutputPath)"
-            Overwrite="true" />
-    </Target>
-    <Target Name="CopyToConnectors" AfterTargets="BuildMez">
-        <Message
-            Text="Copying .mez file to: $(UserProfile)\Documents\Power BI Desktop\Custom Connectors"
-            Importance="High" />
-        <MakeDir Directories="$(UserProfile)\Documents\Power BI Desktop\Custom Connectors\" />
-        <Copy SourceFiles="$(MezOutputPath)"
-            DestinationFolder="$(UserProfile)\Documents\Power BI Desktop\Custom Connectors\" />
-    </Target>
-    <Target Name="Clean">
-        <RemoveDir Directories="$(MezIntermediatePath)" />
-        <Delete Files="$(MezOutputPath)" />
-    </Target>
+  DefaultTargets="BuildMez">
+  <PropertyGroup>
+    <Version Condition="'$(Version)' == ''">2.0.0-wip</Version>
+    <OutputPath Condition="'$(OutputPath)' == ''">$(MSBuildProjectDirectory)\bin\</OutputPath>
+    <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">
+      $(MSBuildProjectDirectory)\obj\</IntermediateOutputPath>
+    <MezIntermediatePath>$(IntermediateOutputPath)MEZ\</MezIntermediatePath>
+    <MezOutputPath>$(OutputPath)$(MsBuildProjectName).mez</MezOutputPath>
+    <IsContinuousIntegrationBuild>false</IsContinuousIntegrationBuild>
+  </PropertyGroup>
+  <ItemGroup>
+    <MezContent Include="Speckle.pq" />
+    <MezContent Include="speckle\**\*.pqm" />
+    <MezContent Include="assets\SpeckleLogo16.png" />
+    <MezContent Include="assets\SpeckleLogo20.png" />
+    <MezContent Include="assets\SpeckleLogo24.png" />
+    <MezContent Include="assets\SpeckleLogo32.png" />
+    <MezContent Include="assets\SpeckleLogo40.png" />
+    <MezContent Include="assets\SpeckleLogo48.png" />
+    <MezContent Include="assets\SpeckleLogo64.png" />
+    <MezContent Include="assets\SpeckleLogo80.png" />
+    <MezContent Include="assets\resources.resx" />
+  </ItemGroup>
+  <Target Name="BuildMez" AfterTargets="Build" Inputs="@(MezContent)" Outputs="$(MezOutputPath)">
+    <RemoveDir Directories="$(MezIntermediatePath)" />
+    <Copy SourceFiles="@(MezContent)" DestinationFolder="$(MezIntermediatePath)" />
+    <MakeDir Directories="$(OutputPath)" Condition="!Exists('$(OutputPath)')" />
+    <ZipDirectory SourceDirectory="$(MezIntermediatePath)" DestinationFile="$(MezOutputPath)"
+      Overwrite="true" />
+  </Target>
+  <Target Name="CopyToConnectors" AfterTargets="BuildMez"
+    Condition="$(IsContinuousIntegrationBuild) == 'false'">
+    <Message
+      Text="Copying .mez file to: $(UserProfile)\Documents\Power BI Desktop\Custom Connectors"
+      Importance="High" />
+    <MakeDir Directories="$(UserProfile)\Documents\Power BI Desktop\Custom Connectors\" />
+    <Copy SourceFiles="$(MezOutputPath)"
+      DestinationFolder="$(UserProfile)\Documents\Power BI Desktop\Custom Connectors\" />
+  </Target>
+  <Target Name="Clean">
+    <RemoveDir Directories="$(MezIntermediatePath)" />
+    <Delete Files="$(MezOutputPath)" />
+  </Target>
 </Project>

src/powerbi-data-connector/Speckle.query.pq

@@ -1,7 +1,9 @@
-// Use this file to write queries to test your data connector
+// use this file to write queries to test your data connector
+
+// NOTE! for tests, be make sure you put here a model that in private project to make sure all good.
 let
     result = Speckle.GetByUrl(
-        "https://app.speckle.systems/projects/e2988234fb/models/60b2300470@b1f31a351a,60b2300470"
+        "https://app.speckle.systems/projects/b61ab234b0/models/a8166255b5"
     )
 in
     result

src/powerbi-data-connector/speckle/Get.BranchCommits.pqm

@@ -1,48 +0,0 @@
-let
-    Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    CommitReceived = Extension.LoadFunction("Api.CommitReceived.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (server as text, streamId as text, branchName as text, limit as number) as list =>
-        let
-            decodedBranchName = Record.Field(
-                Record.Field(Uri.Parts("http://www.dummy.com?" & Uri.BuildQueryString([A = branchName])), "Query"),
-                "A"
-            ),
-            // Hacky way to decode base64 strings: Put them in a url query param and parse the URL
-            apiKey = try Extension.CurrentCredential()[Key] otherwise null,
-            query = "query($streamId: String!, $branchName: String!, $limit: Int!) { 
-            stream( id: $streamId ) { 
-                branch (name: $branchName ){
-                    commits (limit: $limit) {
-                        items {
-                            id
-                            referencedObject
-                            sourceApplication
-                        }
-                    }
-                }
-            }
-        }",
-            res = Fetch(server, query, [streamId = streamId, branchName = decodedBranchName, limit = limit]),
-            branch = res[stream][branch],
-            commits = branch[commits][items]
-        in
-            if branch = null then
-                error Text.Format("The branch '#{0}' does not exist in stream '#{1}'", {decodedBranchName, streamId})
-            else if List.Count(branch[commits][items]) = 0 then
-                error Text.Format("The branch '#{0}' in stream #{1} has no commits", {decodedBranchName, streamId})
-            else
-                commits

src/powerbi-data-connector/speckle/Get.ByUrl.pqm

@@ -1,47 +0,0 @@
-let
-    Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    Traverse = Extension.LoadFunction("Traverse.pqm"),
-    GetObject = Extension.LoadFunction("Api.GetObject.pqm"),
-    GetStreamCommit = Extension.LoadFunction("Get.StreamCommit.pqm"),
-    GetBranchCommits = Extension.LoadFunction("Get.BranchCommits.pqm"),
-    CommitReceived = Extension.LoadFunction("Api.CommitReceived.pqm"),
-    ParseStreamUrl = Extension.LoadFunction("ParseStreamUrl.pqm"),
-    CleanUpObject = Extension.LoadFunction("CleanUpObject.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (url as text) as record =>
-        let
-            // Get server and streamId, and branchName / commitId / objectid from the input url
-            stream = ParseStreamUrl(url),
-            id = stream[id],
-            server = stream[server],
-            commit =
-                if (stream[urlType] = "Stream") then
-                    GetBranchCommits(server, id, "main", 1){0}
-                else if (stream[urlType] = "Branch") then
-                    GetBranchCommits(server, id, stream[branch], 1){0}
-                else if (stream[urlType] = "Commit") then
-                    GetStreamCommit(server, id, stream[commit])
-                else
-                    //We deal with object URLs directly
-                    [referencedObject = stream[object]],
-            object = GetObject(server, id, commit[referencedObject]),
-            rr = CommitReceived(server, id, commit),
-            result = Traverse(CleanUpObject(object) meta [server = server, stream = id, commit = commit])
-        in
-            if rr then
-                result
-            else
-                result

src/powerbi-data-connector/speckle/Get.StreamCommit.pqm

@@ -1,36 +0,0 @@
-let
-    Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (server as text, streamId as text, commitId as text) as record =>
-        let
-            apiKey = try Extension.CurrentCredential()[Key] otherwise null,
-            query = "query($streamId: String!, $commitId: String!) {
-            stream( id: $streamId ) {
-                commit (id: $commitId) {
-                    id
-                    sourceApplication
-                    referencedObject
-                }
-            }
-        }",
-            variables = [streamId = streamId, commitId = commitId],
-            #"JSON" = Fetch(server, query, variables),
-            commit = #"JSON"[stream][commit]
-        in
-            if commit = null then
-                error "The commit did not exist on this stream"
-            else
-                commit

src/powerbi-data-connector/speckle/GetApplicationSlug.pqm

@@ -1,64 +0,0 @@
-(appName as text) =>
-    let
-        replaced = Text.Replace(appName, " ", ""), name = Text.Lower(replaced)
-    in
-        if Text.Contains(name, "dynamo") then
-            "dynamo"
-        else if Text.Contains(name, "revit") then
-            "revit"
-        else if Text.Contains(name, "autocad") then
-            "autocad"
-        else if Text.Contains(name, "civil") then
-            "civil"
-        else if Text.Contains(name, "rhino") then
-            "rhino"
-        else if Text.Contains(name, "grasshopper") then
-            "grasshopper"
-        else if Text.Contains(name, "unity") then
-            "unity"
-        else if Text.Contains(name, "gsa") then
-            "gsa"
-        else if Text.Contains(name, "microstation") then
-            "microstation"
-        else if Text.Contains(name, "openroads") then
-            "openroads"
-        else if Text.Contains(name, "openrail") then
-            "openrail"
-        else if Text.Contains(name, "openbuildings") then
-            "openbuildings"
-        else if Text.Contains(name, "etabs") then
-            "etabs"
-        else if Text.Contains(name, "sap") then
-            "sap"
-        else if Text.Contains(name, "csibridge") then
-            "csibridge"
-        else if Text.Contains(name, "safe") then
-            "safe"
-        else if Text.Contains(name, "teklastructures") then
-            "teklastructures"
-        else if Text.Contains(name, "dxf") then
-            "dxf"
-        else if Text.Contains(name, "excel") then
-            "excel"
-        else if Text.Contains(name, "unreal") then
-            "unreal"
-        else if Text.Contains(name, "powerbi") then
-            "powerbi"
-        else if Text.Contains(name, "blender") then
-            "blender"
-        else if Text.Contains(name, "qgis") then
-            "qgis"
-        else if Text.Contains(name, "arcgis") then
-            "arcgis"
-        else if Text.Contains(name, "sketchup") then
-            "sketchup"
-        else if Text.Contains(name, "archicad") then
-            "archicad"
-        else if Text.Contains(name, "topsolid") then
-            "topsolid"
-        else if Text.Contains(name, "python") then
-            "python"
-        else if Text.Contains(name, "net") then
-            "net"
-        else
-            "other"

src/powerbi-data-connector/speckle/GetByUrl.pqm

@@ -1,58 +1,161 @@
-let
-    Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    GetObject = Extension.LoadFunction("Api.GetObject.pqm"),
-    GetAllObjectChildren = Extension.LoadFunction("Api.GetAllObjectChildren.pqm"),
-    GetObjectFromCommit = Extension.LoadFunction("GetObjectFromCommit.pqm"),
-    GetObjectFromBranch = Extension.LoadFunction("GetObjectFromBranch.pqm"),
-    CommitReceived = Extension.LoadFunction("Api.CommitReceived.pqm"),
-    ParseStreamUrl = Extension.LoadFunction("ParseStreamUrl.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
+(url as text, optional ExpandProperties as logical) as table =>
+    let
+        // set default value for ExpandProperties
+        shouldExpandProperties = if ExpandProperties = null then false else ExpandProperties,
+
+        // import required functions
+        GetStructuredData = Extension.LoadFunction("GetStructuredData.pqm"),
+        SendToServer = Extension.LoadFunction("SendToServer.pqm"),
+        GetModel = Extension.LoadFunction("GetModel.pqm"),
+        Parser = Extension.LoadFunction("Parser.pqm"),
+        CheckPermissions = Extension.LoadFunction("CheckPermissions.pqm"),
+
+        // the logic for importing functions from other files
+        Extension.LoadFunction = (fileName as text) =>
+            let
+                binary = Extension.Contents(fileName),
+                asText = Text.FromBinary(binary)
+            in
+                try
+                    Expression.Evaluate(asText, #shared)
+                catch (e) =>
                     error
                         [
                             Reason = "Extension.LoadFunction Failure",
                             Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
                             Message.Parameters = {fileName, e[Reason], e[Message]},
                             Detail = [File = fileName, Error = e]
-                        ]
-in
-    (url as text) as table =>
-        let
-            // Get server and streamId, and branchName / commitId / objectid from the input url
-            stream = ParseStreamUrl(url),
-            id = stream[id],
-            server = stream[server],
-            commitObjectsTable =
-                if (stream[urlType] = "Commit") then
-                    GetObjectFromCommit(server, id, stream[commit])
-                else if (stream[urlType] = "Object") then
-                    GetAllObjectChildren(server, id, stream[object])
-                else if (stream[urlType] = "Branch") then
-                    GetObjectFromBranch(server, id, stream[branch])
-                else
-                    GetObjectFromBranch(server, id, "main"),
-            addStreamUrl = Table.AddColumn(commitObjectsTable, "Model URL", each server & "/streams/" & id),
-            addParentObjectId = Table.AddColumn(
-                addStreamUrl, "Version Object ID", each Value.Metadata(commitObjectsTable)[objectId]
-            ),
-            addUrlType = Table.AddColumn(addParentObjectId, "URL Type", each stream[urlType]),
-            addObjectIdCol = Table.AddColumn(addUrlType, "Object ID", each try[data][id] otherwise null),
-            addSpeckleTypeCol = Table.AddColumn(
-                addObjectIdCol, "speckle_type", each try[data][speckle_type] otherwise null
-            ),
-            final = Table.ReorderColumns(
-                addSpeckleTypeCol, {
-                    "Model URL",
-                    "URL Type",
-                    "Version Object ID",
-                    "Object ID",
-                    "speckle_type",
-                    "data"
-                }
+                        ],
+
+        // parse the URL to determine if it's a federated model
+        parsedUrl = Parser(url),
+        
+        // check if user has permission to load the model
+        permissionCheck = CheckPermissions(url),
+        
+        // assert that permission check returned a valid result
+        permissionAssert = if not Record.HasFields(permissionCheck, {"authorized", "code", "message"}) then
+            error "Invalid permission check result"
+        else
+            null,
+        
+        // if not authorized, throw an error with the message from the server
+        authCheck = if not permissionCheck[authorized] then
+            error Text.Format(
+                "Permission denied: #{0} (Error code: #{1})", 
+                {permissionCheck[message], permissionCheck[code]}
             )
-        in
-            final
+        else
+            null,
+            
+        // only proceed if user has permisson to load
+        results = if permissionCheck[authorized] then
+            if parsedUrl[isFederated] = true then
+                // process each model in the federation
+                let
+                    modelsData = List.Transform(
+                        parsedUrl[federatedModels],
+                        each ProcessSingleModel(
+                            parsedUrl[baseUrl], 
+                            parsedUrl[projectId], 
+                            [modelId], 
+                            [versionId]
+                        )
+                    ),
+                    
+                    // extract all data tables
+                    allTables = List.Transform(modelsData, each [Data]),
+                    
+                    // extract all root object IDs
+                    allRootIds = List.Transform(modelsData, each [RootObjectId]),
+                    
+                    // combine all root object IDs into a comma-separated string
+                    combinedRootIds = Text.Combine(allRootIds, ","),
+                    
+                    // combine all data tables
+                    combinedData = Table.Combine(allTables),
+                    
+                    // replace the "Version Object ID" column with the combined root IDs
+                    transformedData = Table.TransformColumns(
+                        combinedData,
+                        {"Version Object ID", each combinedRootIds}
+                    ),
+
+                    // expand properties column if requested and if it exists
+                    finalData = if shouldExpandProperties and Table.HasColumns(transformedData, {"properties"}) then
+                        try
+                            Speckle.Utils.ExpandRecord(transformedData, "properties")
+                        otherwise
+                            transformedData  // fallback to original data if expansion fails
+                    else
+                        transformedData
+                in
+                    finalData
+            else
+                // use existing functionality for single models
+                let
+                    // get model name
+                    modelInfo = GetModel(url),
+                    modelName = modelInfo[modelName],
+
+                    // get structured data
+                    structuredData = GetStructuredData(url),
+
+                    // rename column based on send status
+                    newColumnName = "Version Object ID",
+                    renamedData = Table.RenameColumns(structuredData, {{"Version Object ID", newColumnName}}),
+
+                    // expand properties column if requested and if it exists
+                    result = if shouldExpandProperties and Table.HasColumns(renamedData, {"properties"}) then
+                        try
+                            Speckle.Utils.ExpandRecord(renamedData, "properties")
+                        otherwise
+                            renamedData  // fallback to original data if expansion fails
+                    else
+                        renamedData
+                in
+                    result
+        else
+            error Text.Format(
+                "Permission denied: #{0} (Error code: #{1})", 
+                {permissionCheck[message], permissionCheck[code]}
+            ),
+                
+        // function to process a single model and get its data
+        ProcessSingleModel = (baseUrl, projectId, modelId, versionId) => 
+            let
+                // construct a standard URL for the model
+                singleModelUrl = Text.Combine({
+                    baseUrl, 
+                    "/projects/", 
+                    projectId, 
+                    "/models/", 
+                    modelId,
+                    if versionId <> null then Text.Combine({"@", versionId}) else ""
+                }),
+                
+                // get model info
+                modelInfo = GetModel(singleModelUrl),
+                rootObjectId = modelInfo[rootObjectId],
+                modelName = modelInfo[modelName],
+                
+                // get structured data
+                structuredData = GetStructuredData(singleModelUrl),
+                
+                // add the model name as context - with version id if exists
+                result = Table.AddColumn(
+                    structuredData,
+                    "Source Model",
+                    each if versionId <> null then
+                        Text.Combine({modelName, "-", versionId})
+                    else
+                        modelName,
+                    type text
+                )
+            in
+                [
+                    Data = result,
+                    RootObjectId = rootObjectId
+                ]
+    in
+        results

src/powerbi-data-connector/speckle/GetObjectFromBranch.pqm

@@ -1,55 +0,0 @@
-let
-    Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    GetAllObjectChildren = Extension.LoadFunction("Api.GetAllObjectChildren.pqm"),
-    CommitReceived = Extension.LoadFunction("Api.CommitReceived.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (server as text, streamId as text, branchName as text) as table =>
-        let
-            decodedBranchName = Record.Field(
-                Record.Field(Uri.Parts("http://www.dummy.com?" & Uri.BuildQueryString([A = branchName])), "Query"),
-                "A"
-            ),
-            // Hacky way to decode base64 strings: Put them in a url query param and parse the URL
-            apiKey = try Extension.CurrentCredential()[Key] otherwise null,
-            query = "query($streamId: String!, $branchName: String!) { 
-            stream( id: $streamId ) { 
-                branch (name: $branchName ){
-                    commits (limit: 1) {
-                        items {
-                            id
-                            referencedObject
-                            sourceApplication
-                        }
-                    }
-                }
-            }
-        }",
-            res = Fetch(server, query, [streamId = streamId, branchName = decodedBranchName]),
-            branch = res[stream][branch],
-            commit = branch[commits][items]{0},
-            objectsTable = GetAllObjectChildren(server, streamId, commit[referencedObject]),
-            rr = CommitReceived(server, streamId, commit)
-        in
-            if branch = null then
-                error Text.Format("The branch '#{0}' does not exist in stream '#{1}'", {decodedBranchName, streamId})
-            else if List.Count(branch[commits][items]) = 0 then
-                error Text.Format("The branch '#{0}' in stream #{1} has no commits", {decodedBranchName, streamId})
-            else
-            // Force evaluation of read receipt (ideally it should happen after fetching, but can't find a way)
-            if rr then
-                objectsTable
-            else
-                objectsTable

src/powerbi-data-connector/speckle/GetObjectFromCommit.pqm

@@ -1,43 +0,0 @@
-let
-    Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    GetAllObjectChildren = Extension.LoadFunction("Api.GetAllObjectChildren.pqm"),
-    CommitReceived = Extension.LoadFunction("Api.CommitReceived.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (server as text, streamId as text, commitId as text) as table =>
-        let
-            apiKey = try Extension.CurrentCredential()[Key] otherwise null,
-            query = "query($streamId: String!, $commitId: String!) {
-            stream( id: $streamId ) {
-                commit (id: $commitId) {
-                    id
-                    sourceApplication
-                    referencedObject
-                    authorId
-                }
-            }
-        }",
-            variables = [streamId = streamId, commitId = commitId],
-            #"JSON" = Fetch(server, query, variables),
-            commit = #"JSON"[stream][commit],
-            objectsTable = GetAllObjectChildren(server, streamId, commit[referencedObject]),
-            rr = CommitReceived(server, streamId, commit)
-        in
-            if commit = null then
-                error "The commit did not exist on this stream"
-            else if rr then
-                objectsTable
-            else
-                objectsTable

src/powerbi-data-connector/speckle/api/Api.CommitReceived.pqm

@@ -1,33 +0,0 @@
-let
-    Speckle.Api.Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    Speckle.LogEvent = Extension.LoadFunction("LogEvent.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (server, streamId, commit) =>
-        let
-            query = "mutation($input: CommitReceivedInput!) {
-            commitReceive(input: $input) 
-        }",
-            variables = [
-                input = [
-                    streamId = streamId,
-                    commitId = commit[id],
-                    sourceApplication = "PowerBI"
-                ]
-            ],
-            s = Speckle.LogEvent(server, commit)
-        in
-            // Read receipts should fail gracefully no matter what
-            try Speckle.Api.Fetch(s, query, variables)[commitReceive] otherwise false

src/powerbi-data-connector/speckle/api/Api.Fetch.pqm

@@ -1,6 +1,8 @@
 (server as text, optional query as text, optional variables as record) as record =>
     let
-        apiKey = try Extension.CurrentCredential()[Key] otherwise null,
+        // Enhanced credential retrieval with OAuth2 support
+        apiKey = try Extension.CurrentCredential()[access_token] otherwise null,
+        
         defaultQuery = "query {
                 activeUser {
                     email 
@@ -12,7 +14,9 @@
                     version
                 }
             }",
-        Source = Web.Contents(
+        
+        // Enhanced API call with comprehensive error handling
+        Source = try Web.Contents(
             Text.Combine({server, "graphql"}, "/"),
             [
                 Headers = [
@@ -20,14 +24,56 @@
                     #"Content-Type" = "application/json",
                     #"Authorization" = if apiKey = null then "" else Text.Format("Bearer #{0}", {apiKey})
                 ],
-                ManualStatusHandling = {400},
+                ManualStatusHandling = {400, 401, 403, 404, 500, 502, 503, 504},
                 Content = Json.FromValue([query = Text.From(query ?? defaultQuery), variables = variables])
             ]
-        ),
-        #"JSON" = Json.Document(Source)
-    in
-        // Check if response contains errors, if so, return first error.
-        if Record.HasFields(#"JSON", {"errors"}) then
-            error #"JSON"[errors]{0}[message]
+        ) otherwise null,
+        
+        // Check if the HTTP request was successful
+        IsHttpSuccess = Source <> null,
+        
+        // Get HTTP status code for detailed error handling
+        StatusCode = if IsHttpSuccess then Value.Metadata(Source)[Response.Status] else null,
+        
+        // Parse JSON response if HTTP request was successful
+        #"JSON" = if IsHttpSuccess then
+            try Json.Document(Source) otherwise null
+        else
+            null,
+        
+        // Comprehensive error handling
+        // Comprehensive error handling
+        result = if not IsHttpSuccess then
+            error [
+                Reason = "HttpRequestFailed",
+                Message = "Failed to connect to Speckle server",
+                Detail = [Server = server, StatusCode = StatusCode]
+            ]
+        else if StatusCode = 401 then
+            error [
+                Reason = "AuthenticationFailed",
+                Message = "Invalid or expired authentication token",
+                Detail = [Server = server, HasToken = apiKey <> null]
+            ]
+        else if StatusCode = 403 then
+            error [
+                Reason = "AuthorizationFailed", 
+                Message = "Insufficient permissions for this operation",
+                Detail = [Server = server]
+            ]
+        else if #"JSON" = null then
+            error [
+                Reason = "InvalidJsonResponse",
+                Message = "Server returned invalid JSON response",
+                Detail = [Server = server, StatusCode = StatusCode]
+            ]
+        else if Record.HasFields(#"JSON", {"errors"}) then
+            error [
+                Reason = "GraphQLError",
+                Message = #"JSON"[errors]{0}[message],
+                Detail = [Server = server, Errors = #"JSON"[errors]]
+            ]
         else
             #"JSON"[data]
+    in
+        result

src/powerbi-data-connector/speckle/api/Api.GetAllObjectChildren.pqm

@@ -1,46 +0,0 @@
-let
-    Table.GenerateByPage = Extension.LoadFunction("Table.GenerateByPage.pqm"),
-    Speckle.Api.GetObjectChildren = Extension.LoadFunction("Api.GetObjectChildren.pqm"),
-    Speckle.Api.GetObject = Extension.LoadFunction("Api.GetObject.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    // Read all pages of data.
-    // After every page, we check the "nextCursor" record on the metadata of the previous request.
-    // Table.GenerateByPage will keep asking for more pages until we return null.
-    (server as text, streamId as text, objectId as text, optional cursor as text) as table =>
-        let
-            parentObject = Speckle.Api.GetObject(server, streamId, objectId),
-            childrenTable = Table.GenerateByPage(
-                (previous) =>
-                    let
-                        // if previous is null, then this is our first page of data
-                        nextCursor = if (previous = null) then cursor else Value.Metadata(previous)[Cursor]?,
-                        // if the cursor is null but the prevous page is not, we've reached the end
-                        page =
-                            if (previous <> null and nextCursor = null) then
-                                null
-                            else
-                                Speckle.Api.GetObjectChildren(server, streamId, objectId, 1000, nextCursor)
-                    in
-                        page
-            ),
-            parentTable = Table.FromRecords({[data = parentObject]}),
-            resultTable =
-                if (Table.ColumnCount(childrenTable) = 0) then
-                    parentTable
-                else
-                    Table.Combine({parentTable, childrenTable})
-        in
-            resultTable meta [server = server, streamId = streamId, objectId = objectId]

src/powerbi-data-connector/speckle/api/Api.GetModel.pqm

@@ -1,32 +0,0 @@
-let
-    Speckle.Api.Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (server as text, projectId as text, modelId as text) =>
-        let
-            query = "query Project($projectId: String!, $modelId: String!) {
-                project(id: $projectId) {
-                    model(id: $modelId) {
-                            name
-                        }
-                    }
-                }",
-            variables = [
-                projectId = projectId,
-                modelId = modelId
-            ]
-        in
-            // Read receipts should fail gracefully no matter what
-            try Speckle.Api.Fetch(server, query, variables)[project][model] otherwise null

src/powerbi-data-connector/speckle/api/Api.GetObject.pqm

@@ -1,28 +0,0 @@
-let
-    Speckle.Api.Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (server as text, streamId as text, objectId as text) =>
-        let
-            query = "query($streamId: String!, $objectId: String!) { 
-            stream( id: $streamId ) { 
-                object (id: $objectId) { 
-                    data
-                }
-            }
-        }",
-            #"JSON" = Speckle.Api.Fetch(server, query, [streamId = streamId, objectId = objectId])
-        in
-            #"JSON"[stream][object][data]

src/powerbi-data-connector/speckle/api/Api.GetObjectChildren.pqm

@@ -1,54 +0,0 @@
-let
-    Speckle.Api.Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    Speckle.CleanUpObjects = Extension.LoadFunction("CleanUpObjects.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (
-        server as text,
-        streamId as text,
-        objectId as text,
-        optional limit as number,
-        optional cursor as text,
-        optional select as list
-    ) =>
-        let
-            query = "query($streamId: String!, $objectId: String!, $limit: Int, $cursor: String, $select: [String]) { 
-            stream( id: $streamId ) { 
-                object (id: $objectId) { 
-                    children(select: $select, limit: $limit, cursor: $cursor) { 
-                        cursor
-                        objects {
-                            data
-                        } 
-                    } 
-                } 
-            } 
-        }",
-            #"JSON" = Speckle.Api.Fetch(
-                server,
-                query,
-                [
-                    streamId = streamId,
-                    objectId = objectId,
-                    limit = limit,
-                    cursor = cursor,
-                    select = select
-                ]
-            ),
-            children = #"JSON"[stream][object][children],
-            nextCursor = children[cursor],
-            clean = Speckle.CleanUpObjects(children[objects])
-        in
-            Table.FromRecords(clean) meta [Cursor = nextCursor]

src/powerbi-data-connector/speckle/api/Api.GetUser.pqm

@@ -1,27 +0,0 @@
-(url as text) =>
-    let
-        userType = type [name = text, email = text, id = text],
-        query = "query {
-            activeUser { name email id }
-        }",
-        // Imports
-        Speckle.Api.Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-        ParseUrl = Extension.LoadFunction("ParseStreamUrl.pqm"),
-        urlObject = ParseUrl(url),
-        Extension.LoadFunction = (fileName as text) =>
-            let
-                binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-            in
-                try
-                    Expression.Evaluate(asText, #shared) catch (e) =>
-                        error
-                            [
-                                Reason = "Extension.LoadFunction Failure",
-                                Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                                Message.Parameters = {fileName, e[Reason], e[Message]},
-                                Detail = [File = fileName, Error = e]
-                            ],
-        user = Speckle.Api.Fetch(urlObject[server], query)[activeUser]
-    in
-        // Read receipts should fail gracefully no matter what
-        Value.ReplaceType(user, userType)

src/powerbi-data-connector/speckle/api/Api.REST.GetObject.pqm

@@ -1,38 +0,0 @@
-(server as text, optional streamId as text, optional objectId as text) as table =>
-    let
-        apiKey = try Extension.CurrentCredential()[Key] otherwise null,
-        Source = Web.Contents(
-            Text.Combine({server, "objects", streamId, objectId}, "/"),
-            [
-                Headers = [
-                    #"Method" = "GET",
-                    #"Content-Type" = "application/json",
-                    #"Authorization" = if apiKey = null then "" else Text.Format("Bearer #{0}", {apiKey})
-                ],
-                ManualStatusHandling = {400}
-            ]
-        ),
-        json = Json.Document(Source),
-        clean = List.Select(json, each _[speckle_type] <> "Speckle.Core.Models.DataChunk"),
-        t = Table.FromColumns({clean}, {"data"}),
-        addStreamUrl = Table.AddColumn(t, "Stream URL", each server & "/streams/" & streamId),
-        addObjectIdCol = Table.AddColumn(addStreamUrl, "Object ID", each try _[data][id] otherwise null),
-        addSpeckleTypeCol = Table.AddColumn(
-            addObjectIdCol, "speckle_type", each try _[data][speckle_type] otherwise null
-        ),
-        Speckle.CleanUpObjects = Extension.LoadFunction("CleanUpObjects.pqm"),
-        Extension.LoadFunction = (fileName as text) =>
-            let
-                binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-            in
-                try
-                    Expression.Evaluate(asText, #shared) catch (e) =>
-                        error
-                            [
-                                Reason = "Extension.LoadFunction Failure",
-                                Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                                Message.Parameters = {fileName, e[Reason], e[Message]},
-                                Detail = [File = fileName, Error = e]
-                            ]
-    in
-        addSpeckleTypeCol

src/powerbi-data-connector/speckle/api/CheckPermissions.pqm

@@ -0,0 +1,66 @@
+(url as text) as record =>
+    let
+        ApiFetch = Extension.LoadFunction("Api.Fetch.pqm"),
+        Parser = Extension.LoadFunction("Parser.pqm"),
+
+        Extension.LoadFunction = (fileName as text) =>
+            let
+                binary = Extension.Contents(fileName),
+                asText = Text.FromBinary(binary)
+            in
+                try
+                    Expression.Evaluate(asText, #shared)
+                catch (e) =>
+                    error
+                        [
+                            Reason = "Extension.LoadFunction Failure",
+                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
+                            Message.Parameters = {fileName, e[Reason], e[Message]},
+                            Detail = [File = fileName, Error = e]
+                        ],
+        
+        // parse the URL to extract project id
+        parsedUrl = Parser(url),
+        server = parsedUrl[baseUrl],
+        projectId = parsedUrl[projectId],
+        
+        // GraphQL query to check permissions
+        query = "query Project($projectId: String!) {
+            data:project(id: $projectId) {
+                data:permissions {
+                    canLoad {
+                        authorized
+                        code
+                        message
+                    }
+                }
+            }
+        }",
+        
+        // variables variable for api fetch (i know)
+        variables = [
+            projectId = projectId
+        ],
+        
+        result = ApiFetch(server, query, variables),
+        
+        // check that the result contains the expected structure
+        // this will throw an error if the structure is not as expected
+        structureCheck = if not (Record.HasFields(result, {"data"}) and 
+                  Record.HasFields(result[data], {"data"}) and 
+                  Record.HasFields(result[data][data], {"canLoad"}) and
+                  Record.HasFields(result[data][data][canLoad], {"authorized", "code", "message"})) then
+            error "Invalid response structure from permission check"
+        else
+            null,
+        
+        canLoad = result[data][data][canLoad],
+        
+        // return the permission result
+        permissionResult = [
+            authorized = canLoad[authorized],
+            code = canLoad[code],
+            message = canLoad[message]
+        ]
+    in
+        permissionResult 

src/powerbi-data-connector/speckle/api/GetModel.pqm

@@ -0,0 +1,122 @@
+// function for getting model information through graphql query
+(url as text) as record =>
+    let
+        // import the parser function
+        Parser = Extension.LoadFunction("Parser.pqm"),
+    
+        // the logic for importing functions from other files
+        Extension.LoadFunction = (fileName as text) =>
+            let
+                binary = Extension.Contents(fileName),
+                asText = Text.FromBinary(binary)
+            in
+                try
+                    Expression.Evaluate(asText, #shared)
+                catch (e) =>
+                    error
+                        [
+                            Reason = "Extension.LoadFunction Failure",
+                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
+                            Message.Parameters = {fileName, e[Reason], e[Message]},
+                            Detail = [File = fileName, Error = e]
+                        ],
+        
+        // parse the url and get necessary fields
+        parsedUrl = Parser(url),
+        server = parsedUrl[baseUrl],
+        projectId = parsedUrl[projectId],
+        modelId = parsedUrl[modelId],
+        versionId = parsedUrl[versionId],
+        
+        // get API key if available
+        apiKey = try Extension.CurrentCredential()[access_token] otherwise null,
+        
+        // graphql query to get model info including root object id
+        // includes specific version if provided
+        query = if versionId = null then
+            "query ($projectId: String!, $modelId: String!) {
+                project(id: $projectId) {
+                    model(id: $modelId) {
+                        id
+                        name
+                        versions {
+                            items {
+                                id
+                                referencedObject
+                                sourceApplication
+                            }
+                        }
+                    }
+                }
+            }"
+        else 
+            "query ($projectId: String!, $modelId: String!, $versionId: String!) {
+                project(id: $projectId) {
+                    model(id: $modelId) {
+                        id
+                        name
+                        version(id: $versionId) {
+                            id
+                            referencedObject
+                            sourceApplication
+                        }
+                    }
+                }
+            }",
+        
+        // include versionId in variables if it exists
+        variables = if versionId = null then
+            [
+                projectId = projectId,
+                modelId = modelId
+            ]
+        else
+            [
+                projectId = projectId,
+                modelId = modelId,
+                versionId = versionId
+            ],
+        
+        // make the api request
+        Source = Web.Contents(
+            Text.Combine({server, "graphql"}, "/"),
+            [
+                Headers = [
+                    #"Method" = "POST",
+                    #"Content-Type" = "application/json",
+                    #"Authorization" = if apiKey = null then "" else Text.Format("Bearer #{0}", {apiKey})
+                ],
+                ManualStatusHandling = {400, 401, 403},
+                Content = Json.FromValue([
+                    query = query,
+                    variables = variables
+                ])
+            ]
+        ),
+        
+        // parse the response
+        JsonResponse = Json.Document(Source),
+        
+        // extract needed information, now handling both version-specific and latest version cases
+        result = if Record.HasFields(JsonResponse, {"errors"}) then
+            error JsonResponse[errors]{0}[message]
+        else if JsonResponse[data]?[project]?[model] = null then
+            error "Model not found or access denied. Please check your authentication and model ID."
+        else if versionId = null then
+            [
+                modelId = JsonResponse[data][project][model][id],
+                modelName = JsonResponse[data][project][model][name],
+                versionId = JsonResponse[data][project][model][versions][items]{0}[id],
+                rootObjectId = JsonResponse[data][project][model][versions][items]{0}[referencedObject],
+                sourceApplication = JsonResponse[data][project][model][versions][items]{0}[sourceApplication]
+            ]
+        else
+            [
+                modelId = JsonResponse[data][project][model][id],
+                modelName = JsonResponse[data][project][model][name],
+                versionId = JsonResponse[data][project][model][version][id],
+                rootObjectId = JsonResponse[data][project][model][version][referencedObject],
+                sourceApplication = JsonResponse[data][project][model][version][sourceApplication]
+            ]
+    in
+        result

src/powerbi-data-connector/speckle/api/GetStructuredData.pqm

@@ -0,0 +1,116 @@
+// function for getting structured object data
+(url as text) as table =>
+    let
+        // import the required functions
+        GetModel = Extension.LoadFunction("GetModel.pqm"),
+        SendToServer = Extension.LoadFunction("SendToServer.pqm"),
+       
+        // the logic for importing functions from other files
+        Extension.LoadFunction = (fileName as text) =>
+            let
+                binary = Extension.Contents(fileName),
+                asText = Text.FromBinary(binary)
+            in
+                try
+                    Expression.Evaluate(asText, #shared)
+                catch (e) =>
+                    error
+                        [
+                            Reason = "Extension.LoadFunction Failure",
+                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
+                            Message.Parameters = {fileName, e[Reason], e[Message]},
+                            Detail = [File = fileName, Error = e]
+                        ],
+       
+        // get model info and server data
+        modelInfo = GetModel(url),
+        rootId = modelInfo[rootObjectId],
+       
+        // Get the data from SendToServer - this is already a response from the service
+        JsonResponse = SendToServer(url),
+       
+        // convert list to table with all columns expanded
+        TableFromList = Table.FromList(
+            JsonResponse,
+            Splitter.SplitByNothing(),
+            null,
+            null,
+            ExtraValues.Error
+        ),
+        // fields to remove from data record
+        FieldsToRemove = {"__closure", "totalChildrenCount", "renderMaterialProxies"},
+        
+        // create basic table with cleaned data records (no properties column yet)
+        BasicTable = Table.FromRecords(
+            List.Transform(
+                TableFromList[Column1],
+                each let
+                    record = _,
+                    fieldsToRemoveForThisRecord = List.Select(
+                        FieldsToRemove,
+                        each Record.HasFields(record, {_})
+                    ),
+                    cleanedRecord = Record.RemoveFields(record, fieldsToRemoveForThisRecord)
+                in
+                    [
+                        #"Object IDs" = record[id], // Object IDs
+                        #"Speckle Type" = record[speckle_type], // Speckle Type
+                        #"Version Object ID" = rootId,
+                        data = cleanedRecord // Data
+                    ]
+            )
+        ),
+       
+        // function to check if a row should be excluded based on speckle type
+        ShouldExcludeRow = (row as record) as logical =>
+            let
+                speckleType = Record.FieldOrDefault(row[data], "speckle_type", "")
+            in
+                speckleType = "Speckle.Core.Models.DataChunk" or 
+                Text.Contains(speckleType, "Objects.Other.RawEncoding"),
+       
+        // Filtering logic here 
+        // If model data contains any DataObject -> fetch only data objects (excluding unwanted types)
+        // If there are no data objects in the data -> fetch everything but exclude DataChunks and RawEncoding
+        // Check if model contains any DataObject
+        HasDataObjects = Table.RowCount(
+            Table.SelectRows(
+                BasicTable, 
+                each Text.Contains(Record.FieldOrDefault([data], "speckle_type", ""), "DataObject") 
+                     and not ShouldExcludeRow(_)
+            )
+        ) > 0,
+
+        // load the Objects.Properties function only if we have DataObjects
+        ObjectsProperties = if HasDataObjects then Extension.LoadFunction("Objects.Properties.pqm") else null,
+        
+        // Add properties column only if model has DataObjects
+        FinalTable = if HasDataObjects then
+            Table.AddColumn(
+                BasicTable,
+                "properties",
+                each let
+                    dataRecord = [data],
+                    isDataObject = Text.Contains(Record.FieldOrDefault(dataRecord, "speckle_type", ""), "DataObject"),
+                    hasProperties = Record.HasFields(dataRecord, {"properties"}),
+                    extractedProperties = if hasProperties and isDataObject then 
+                        try ObjectsProperties(dataRecord) otherwise []
+                    else 
+                        []
+                in
+                    if Record.FieldCount(extractedProperties) > 0 then extractedProperties else null
+            )
+        else
+            BasicTable,
+
+        // Apply the same filtering logic as before
+        FilteredTable = if HasDataObjects then
+            Table.SelectRows(
+                FinalTable, 
+                each Text.Contains(Record.FieldOrDefault([data], "speckle_type", ""), "DataObject") 
+                     and not ShouldExcludeRow(_)
+            )
+        else
+            Table.SelectRows(FinalTable, each not ShouldExcludeRow(_))
+    in
+        FilteredTable

src/powerbi-data-connector/speckle/api/GetUser.pqm

@@ -0,0 +1,66 @@
+// function for getting the user info with graphql query
+let
+    // import the parser function from Parser.pqm file 
+    Parser = Extension.LoadFunction("Parser.pqm"),
+    
+    // the logic for importing functions from other files
+    Extension.LoadFunction = (fileName as text) =>
+        let
+            binary = Extension.Contents(fileName),
+            asText = Text.FromBinary(binary)
+        in
+            try
+                Expression.Evaluate(asText, #shared)
+            catch (e) =>
+                error
+                    [
+                        Reason = "Extension.LoadFunction Failure",
+                        Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
+                        Message.Parameters = {fileName, e[Reason], e[Message]},
+                        Detail = [File = fileName, Error = e]
+                    ]
+in
+    (url as text) as record =>
+        let
+            // get base server URL using the imported function
+            parsedUrl = Parser(url),
+            server = parsedUrl[baseUrl],
+            
+            apiKey = try Extension.CurrentCredential()[access_token] otherwise "",
+            
+            query = "query {
+                    activeUser {
+                        email 
+                        name
+                    }
+                    serverInfo {
+                        name 
+                        company 
+                        version
+                    }
+                }",
+            Source = Web.Contents(
+                Text.Combine({server, "graphql"}, "/"),
+                [
+                    Headers = [
+                        #"Method" = "POST",
+                        #"Content-Type" = "application/json",
+                        #"Authorization" = if apiKey = "" then "" else Text.Format("Bearer #{0}", {apiKey})
+                    ],
+                    ManualStatusHandling = {400},
+                    Content = Json.FromValue([query = query])
+                ]
+            ),
+            JsonResponse = Json.Document(Source)
+        in
+            if Record.HasFields(JsonResponse, {"errors"}) then
+                error JsonResponse[errors]{0}[message]
+            else
+                [
+                    UserEmail = try JsonResponse[data][activeUser][email] otherwise "",
+                    UserName = try JsonResponse[data][activeUser][name] otherwise "",
+                    ServerName = JsonResponse[data][serverInfo][name],
+                    ServerCompany = JsonResponse[data][serverInfo][company],
+                    ServerVersion = JsonResponse[data][serverInfo][version],
+                    Token = if apiKey = "" then null else apiKey
+                ]

src/powerbi-data-connector/speckle/api/GetVersion.pqm

@@ -0,0 +1,46 @@
+() as text =>
+    let
+        // read the Speckle.pq file
+        specklePqContent = try 
+            Text.FromBinary(Extension.Contents("Speckle.pq"))
+        otherwise 
+            error "Could not read Speckle.pq file",
+        
+        lines = Text.Split(specklePqContent, "#(lf)"),
+        
+        versionLine = List.First(
+            List.Select(
+                lines, 
+                each Text.Contains(_, "[Version = ")
+            ),
+            null
+        ),
+        
+        version = if versionLine <> null then
+            let
+                // find the start and end positions of the version string
+                startPos = Text.PositionOf(versionLine, """") + 1,
+                tempText = Text.Middle(versionLine, startPos),
+                endPos = Text.PositionOf(tempText, """"),
+                versionText = Text.Middle(tempText, 0, endPos)
+            in
+                versionText
+        else
+            // fallback version if parsing fails
+            "3.0.0",
+        
+        // validate version format
+        isValidVersion = 
+            let 
+                parts = Text.Split(version, "."),
+                isValid = List.Count(parts) = 3 and 
+                         List.AllTrue(List.Transform(parts, each try Number.From(_) >= 0 otherwise false))
+            in 
+                isValid,
+        
+        result = if isValidVersion then 
+            version 
+        else 
+            error "Invalid version format found: " & version
+    in
+        result

src/powerbi-data-connector/speckle/api/GetWorkspace.pqm

@@ -0,0 +1,76 @@
+// function for getting workspace information
+(url as text) as record =>
+    let
+        ApiFetch = Extension.LoadFunction("Api.Fetch.pqm"),
+        Parser = Extension.LoadFunction("Parser.pqm"),
+        
+        // the logic for importing functions from other files
+        Extension.LoadFunction = (fileName as text) =>
+            let
+                binary = Extension.Contents(fileName),
+                asText = Text.FromBinary(binary)
+            in
+                try
+                    Expression.Evaluate(asText, #shared)
+                catch (e) =>
+                    error
+                        [
+                            Reason = "Extension.LoadFunction Failure",
+                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
+                            Message.Parameters = {fileName, e[Reason], e[Message]},
+                            Detail = [File = fileName, Error = e]
+                        ],
+        
+        parsedUrl = Parser(url),
+        server = parsedUrl[baseUrl],
+        projectId = parsedUrl[projectId],
+        
+        // query to get workspace ID from project
+        projectQuery = "query Project($projectId: String!) {
+            data:project(id: $projectId) {
+                workspaceId
+            }
+        }",
+        
+        projectVariables = [
+            projectId = projectId
+        ],
+        
+        projectResult = ApiFetch(server, projectQuery, projectVariables),
+        workspaceId = projectResult[data][workspaceId],
+        
+        // check if workspaceId is null (personal project)
+        workspaceInfo = if workspaceId = null then
+            [
+                workspaceId = null,
+                workspaceLogo = null,
+                workspaceName = null,
+                canHideBranding = false
+            ]
+        else
+            // query workspace only if workspaceId exists
+            let
+                workspaceQuery = "query Workspace($workspaceId: String!, $featureName: WorkspaceFeatureName!) {
+                    data:workspace(id: $workspaceId) {
+                        logo
+                        name
+                        hasAccessToFeature(featureName: $featureName)
+                    }
+                }",
+                
+                workspaceVariables = [
+                    workspaceId = workspaceId,
+                    featureName = "hideSpeckleBranding"
+                ],
+                
+                workspaceResult = ApiFetch(server, workspaceQuery, workspaceVariables),
+                workspace = workspaceResult[data]
+            in
+                [
+                    workspaceId = workspaceId,
+                    workspaceLogo = workspace[logo],
+                    workspaceName = workspace[name],
+                    canHideBranding = workspace[hasAccessToFeature]
+                ]
+    in
+        workspaceInfo

src/powerbi-data-connector/speckle/api/Models.Federate.pqm

@@ -0,0 +1,30 @@
+// function for federating multiple tables by combining them and creating a concatenated Version Object ID
+(tables as list, optional excludeData as logical) as table =>
+let
+    ViewerOnly = if excludeData = null then false else excludeData,
+    
+    // filter columns from each table if excludeData is true
+    ProcessedTables = List.Transform(
+        tables,
+        each
+            if ViewerOnly then 
+                Table.SelectColumns(_, {"Version Object ID", "Object IDs"}, MissingField.Ignore)
+            else 
+                _
+    ),
+    
+    CombinedTable = Table.Combine(ProcessedTables),
+    
+    DistinctVersionObjectIDs = List.Distinct(CombinedTable[Version Object ID]),
+    ConcatenatedVersionObjectIDs = Text.Combine(DistinctVersionObjectIDs, ","),
+    
+    // Replace all Version Object ID values with the concatenated string
+    FederatedTable = Table.ReplaceValue(
+        CombinedTable, 
+        each [Version Object ID], 
+        ConcatenatedVersionObjectIDs, 
+        Replacer.ReplaceText, 
+        {"Version Object ID"}
+    )
+in
+    FederatedTable

src/powerbi-data-connector/speckle/api/Models.MaterialQuantities.pqm

@@ -0,0 +1,22 @@
+// function for transforming a table to extract and expand Material Quantities data
+(inputTable as table, optional addPrefix as logical) as table =>
+let
+    // Default addPrefix to false if not provided
+    UsePrefix = if addPrefix = null then false else addPrefix,
+    
+    // Add mq column using existing MaterialQuantities function with list output
+    AddedMQ = Table.AddColumn(inputTable, "mq", each Speckle.Objects.MaterialQuantities([data], true)),
+    
+    // Expand the mq list column
+    ExpandMQ = Table.ExpandListColumn(AddedMQ, "mq"),
+    
+    // Add MQProperties column using Properties function with error handling
+    AddedMQProperties = Table.AddColumn(ExpandMQ, "MQ", each try Speckle.Objects.Properties([mq]) otherwise null),
+    
+    // Expand the MQProperties record using Utils.ExpandRecord
+    ExpandMQProperties = Speckle.Utils.ExpandRecord(AddedMQProperties, "MQ", null, UsePrefix),
+    
+    // Remove the temporary mq and MQProperties columns
+    FinalTable = Table.RemoveColumns(ExpandMQProperties, {"mq", "MQ"}, MissingField.Ignore)
+in
+    FinalTable

src/powerbi-data-connector/speckle/api/Objects.Collections.pqm

@@ -0,0 +1,163 @@
+// function for mapping collection names to referenced elements in Speckle data
+(inputData as table) as table =>
+let
+    // Helper function to safely get field value
+    SafeFieldValue = (record as record, fieldName as text) as any =>
+        if Record.HasFields(record, {fieldName}) then 
+            Record.Field(record, fieldName)
+        else 
+            null,
+    
+    // Helper function to safely get nested field value
+    SafeNestedValue = (record as record, path as list) as any =>
+        List.Accumulate(
+            path,
+            record,
+            (current, fieldName) =>
+                if current <> null and Value.Is(current, type record) and Record.HasFields(current, {fieldName}) then
+                    Record.Field(current, fieldName)
+                else
+                    null
+        ),
+    
+    // Step 1: Identify Collection Objects
+    CollectionObjects = Table.SelectRows(
+        inputData, 
+        each 
+            let
+                speckleType = SafeFieldValue(_, "Speckle Type")
+            in
+                speckleType <> null and Text.Contains(speckleType, "Collection")
+    ),
+    
+    // Step 2: Extract Collection Metadata
+    CollectionMetadata = Table.AddColumn(
+        CollectionObjects,
+        "CollectionInfo",
+        each
+            let
+                objectId = SafeFieldValue(_, "Object IDs"),
+                collectionName = SafeNestedValue(_, {"data", "name"}),
+                elements = SafeNestedValue(_, {"data", "elements"})
+            in
+                [
+                    ObjectId = objectId,
+                    CollectionName = if collectionName <> null then collectionName else "Unnamed Collection",
+                    Elements = if elements <> null and Value.Is(elements, type list) then elements else {}
+                ]
+    ),
+    
+    // Step 3: Build Collection Hierarchy Mapping
+    CollectionHierarchy = Table.AddColumn(
+        CollectionMetadata,
+        "CollectionReferences",
+        each
+            let
+                info = [CollectionInfo],
+                collectionName = info[CollectionName],
+                elements = info[Elements]
+            in
+                List.Transform(
+                    elements,
+                    (element) =>
+                        let
+                            referencedId = if Value.Is(element, type record) and Record.HasFields(element, {"referencedId"}) then
+                                element[referencedId]
+                            else
+                                null
+                        in
+                            if referencedId <> null then
+                                [
+                                    ReferencedId = referencedId,
+                                    CollectionName = collectionName,
+                                    ParentCollectionId = info[ObjectId]
+                                ]
+                            else
+                                null
+                )
+    ),
+    
+    // Step 4: Flatten Reference Mapping
+    FlattenedReferences = Table.SelectRows(
+        Table.ExpandListColumn(
+            Table.SelectColumns(CollectionHierarchy, {"CollectionReferences"}),
+            "CollectionReferences"
+        ),
+        each [CollectionReferences] <> null
+    ),
+    
+    ReferenceTable = Table.ExpandRecordColumn(
+        FlattenedReferences,
+        "CollectionReferences",
+        {"ReferencedId", "CollectionName", "ParentCollectionId"},
+        {"ReferencedId", "CollectionName", "ParentCollectionId"}
+    ),
+    
+    // Step 5: Build Hierarchical Collection Paths
+    BuildCollectionPath = (objectId as text, visited as list) as text =>
+        let
+            // Prevent infinite loops
+            _ = if List.Contains(visited, objectId) then
+                error "Circular reference detected in collection hierarchy"
+            else
+                null,
+                
+            newVisited = List.InsertRange(visited, 0, {objectId}),
+            
+            // Find if this object is referenced by any collection
+            parentReferences = Table.SelectRows(ReferenceTable, each [ReferencedId] = objectId),
+            
+            result = if Table.RowCount(parentReferences) = 0 then
+                // No parent collection found
+                ""
+            else
+                let
+                    parentRef = parentReferences{0},
+                    parentCollectionId = parentRef[ParentCollectionId],
+                    currentCollectionName = parentRef[CollectionName],
+                    
+                    // Recursively get parent path
+                    parentPath = @BuildCollectionPath(parentCollectionId, newVisited),
+                    
+                    // Build full path
+                    fullPath = if parentPath = "" then
+                        currentCollectionName
+                    else
+                        parentPath & "::" & currentCollectionName
+                in
+                    fullPath
+        in
+            result,
+    
+    // Step 6: Add Collection Paths to data field
+    FinalData = Table.TransformColumns(
+        inputData,
+        {
+            "data", each 
+                let
+                    currentData = _,
+                    currentRow = Table.SelectRows(inputData, each [data] = currentData){0},
+                    objectId = SafeFieldValue(currentRow, "Object IDs"),
+                    collectionPath = if objectId <> null then
+                        try
+                            BuildCollectionPath(objectId, {})
+                        otherwise
+                            ""
+                    else
+                        "",
+                    
+                    // Add CollectionPath field to the data record, set to null if empty
+                    enhancedData = if Value.Is(currentData, type record) then
+                        Record.AddField(
+                            currentData, 
+                            "collectionPath", 
+                            if collectionPath = "" then null else collectionPath
+                        )
+                    else
+                        currentData
+                in
+                    enhancedData
+        }
+    )
+in
+    FinalData 

src/powerbi-data-connector/speckle/api/Objects.CompositeStructure.pqm

@@ -0,0 +1,18 @@
+(objectRecord as record, optional outputAsList as nullable logical) as any =>
+    let
+        compositeStructure =
+            if Record.HasFields(objectRecord[properties], "Composite Structure") then
+                objectRecord[properties][Composite Structure]
+            else if Record.HasFields(objectRecord[properties], "Parameters") and 
+                    Record.HasFields(objectRecord[properties][Parameters], "Type Parameters") and
+                    Record.HasFields(objectRecord[properties][Parameters][Type Parameters], "Structure") then
+                objectRecord[properties][Parameters][Type Parameters][Structure]
+            else
+                null,
+        result =
+            if outputAsList = true then
+                if compositeStructure <> null then Record.ToList(compositeStructure) else null
+            else
+                compositeStructure
+    in
+        result

src/powerbi-data-connector/speckle/api/Objects.MaterialQuantities.pqm

@@ -0,0 +1,15 @@
+// Helper function to extract [properties][Material Quantities] and optionally output as list
+(objectRecord as record, optional outputAsList as logical) as any =>
+    let
+        // Ensure outputAsList is logical and defaults to false if not provided
+        OutputAsList = if outputAsList = null then false else outputAsList,
+        // Check if 'properties' and 'Material Quantities' exist
+        HasMaterialQuantities = Record.HasFields(objectRecord, {"properties"}) and Record.HasFields(Record.Field(objectRecord, "properties"), {"Material Quantities"}),
+        MaterialQuantities = if HasMaterialQuantities then Record.Field(Record.Field(objectRecord, "properties"), "Material Quantities") else null,
+        Result = if MaterialQuantities = null then null else
+            if OutputAsList then
+                Record.ToList(MaterialQuantities)
+            else
+                MaterialQuantities
+    in
+        Result

src/powerbi-data-connector/speckle/api/Objects.Properties.pqm

@@ -0,0 +1,257 @@
+// function for extracting and flattening properties from Speckle objects
+(inputRecord as any, optional filterKeys as list, optional parentPath as text, optional existingFields as list) as record =>
+let
+    // Define excluded paths
+    ExcludedPaths = {
+        "Composite Structure",
+        "Material Quantities", 
+        "Parameters.Type Parameters.Structure"
+    },
+    
+    // Helper function to check if a path should be excluded
+    IsPathExcluded = (currentPath as text) as logical =>
+        List.AnyTrue(List.Transform(ExcludedPaths, each Text.Contains(currentPath, _))),
+    
+    // Helper function to resolve naming conflicts
+    ResolveFieldName = (fieldName as text, parentPathParam as nullable text, existingFieldsParam as nullable list) as text =>
+        let
+            // Ensure we have valid inputs
+            parentPath = if parentPathParam = null then "" else parentPathParam,
+            existingFields = if existingFieldsParam = null then {} else existingFieldsParam,
+            
+            // Try original field name first
+            candidateName = fieldName,
+            
+            // If no conflict, return original name
+            finalName = if not List.Contains(existingFields, candidateName) then
+                candidateName
+            else if parentPath = "" then 
+                fieldName  // No parent path available, keep original
+            else
+                let
+                    // Split parent path and try adding parents one by one
+                    pathParts = Text.Split(parentPath, "."),
+                    reversedParts = List.Reverse(pathParts),  // Start with immediate parent
+                    
+                    // Use iteration instead of recursion
+                    ResolveWithIteration = () =>
+                        let
+                            // Generate all possible candidates
+                            candidates = List.Generate(
+                                () => [depth = 1, candidate = fieldName & "." & List.First(reversedParts)],
+                                each [depth] <= List.Count(reversedParts),
+                                each [
+                                    depth = [depth] + 1,
+                                    candidate = fieldName & "." & Text.Combine(List.FirstN(reversedParts, [depth]), ".")
+                                ],
+                                each [candidate]
+                            ),
+                            
+                            // Find first non-conflicting candidate
+                            firstNonConflicting = List.First(
+                                List.Select(candidates, each not List.Contains(existingFields, _)),
+                                // If all conflict, use full path
+                                fieldName & "." & Text.Combine(reversedParts, ".")
+                            )
+                        in
+                            firstNonConflicting,
+                    
+                    resolvedName = ResolveWithIteration()
+                in
+                    resolvedName
+        in
+            finalName,
+    
+    // Create the main flattening function with self-reference capability
+    FlattenRecordImpl = (
+        flattenFn as function,
+        inputRecord as any, 
+        filterKeys as nullable list, 
+        parentPathParam as nullable text, 
+        existingFieldsParam as nullable list
+    ) as record =>
+        let
+            // Ensure non-null values for internal use
+            currentParentPath = if parentPathParam = null then "" else parentPathParam,
+            currentExistingFields = if existingFieldsParam = null then {} else existingFieldsParam,
+            currentfilterKeys = filterKeys,
+            
+            // Check if record has "properties" field and use it instead of the root record
+            recordToProcess = if inputRecord = null then 
+                null
+            else if Value.Is(inputRecord, type record) and Record.HasFields(inputRecord, {"properties"}) then
+                Record.Field(inputRecord, "properties")
+            else
+                inputRecord,
+            
+            // Helper function to check if a field should be included
+            ShouldIncludeField = (fieldName as text) as logical =>
+                if currentfilterKeys = null then true
+                else List.Contains(currentfilterKeys, fieldName),
+            
+            // Handle different input types
+            result = if recordToProcess = null then
+                []
+            else if Value.Is(recordToProcess, type record) then
+                let
+                    fieldNames = Record.FieldNames(recordToProcess),
+                    
+                    // Process each field
+                    processedFields = List.Accumulate(
+                        fieldNames,
+                        [FlattenedRecord = [], ExistingFieldsList = currentExistingFields],
+                        (state, fieldName) =>
+                            let
+                                fieldValue = Record.Field(recordToProcess, fieldName),
+                                newPath = if currentParentPath = "" then fieldName else currentParentPath & "." & fieldName,
+                                
+                                // Skip if path is excluded
+                                shouldProcess = not IsPathExcluded(newPath),
+                                
+                                processResult = if not shouldProcess then
+                                    state
+                                else
+                                    let
+                                        // Check if this is a name/value record
+                                        hasNameValue = Value.Is(fieldValue, type record) and 
+                                                     Record.HasFields(fieldValue, {"name", "value"}),
+                                        
+                                        finalResult = if hasNameValue then
+                                            let
+                                                nameField = Record.Field(fieldValue, "name"),
+                                                valueField = Record.Field(fieldValue, "value"),
+                                                // Check if this name field should be included
+                                                shouldInclude = if nameField = null then false else ShouldIncludeField(nameField),
+                                                result = if shouldInclude and nameField <> null then
+                                                    let
+                                                        resolvedName = ResolveFieldName(nameField, currentParentPath, state[ExistingFieldsList]),
+                                                        newRecord = Record.AddField(state[FlattenedRecord], resolvedName, valueField),
+                                                        newFieldsList = state[ExistingFieldsList] & {resolvedName}
+                                                    in
+                                                        [FlattenedRecord = newRecord, ExistingFieldsList = newFieldsList]
+                                                else
+                                                    state
+                                            in
+                                                result
+                                        else if fieldValue = null then
+                                            let
+                                                shouldInclude = ShouldIncludeField(fieldName),
+                                                result = if shouldInclude then
+                                                    let
+                                                        resolvedName = ResolveFieldName(fieldName, currentParentPath, state[ExistingFieldsList]),
+                                                        newRecord = Record.AddField(state[FlattenedRecord], resolvedName, null),
+                                                        newFieldsList = state[ExistingFieldsList] & {resolvedName}
+                                                    in
+                                                        [FlattenedRecord = newRecord, ExistingFieldsList = newFieldsList]
+                                                else
+                                                    state
+                                            in
+                                                result
+                                        else if Value.Is(fieldValue, type record) then
+                                            let
+                                                // Skip empty records
+                                                fieldCount = Record.FieldCount(fieldValue),
+                                                recursiveResult = if fieldCount = 0 then
+                                                    state
+                                                else
+                                                    let
+                                                        // Call the function through the passed reference
+                                                        // IMPORTANT: Pass the current state's existing fields list
+                                                        flattened = flattenFn(flattenFn, fieldValue, currentfilterKeys, newPath, state[ExistingFieldsList]),
+                                                        // Get all field names from the flattened result
+                                                        flattenedFieldNames = Record.FieldNames(flattened),
+                                                        // Merge the flattened record with the current state
+                                                        combinedRecord = flattened & state[FlattenedRecord],
+                                                        // Update the existing fields list with ALL fields from both records
+                                                        allFieldNames = List.Distinct(state[ExistingFieldsList] & flattenedFieldNames)
+                                                    in
+                                                        [FlattenedRecord = combinedRecord, ExistingFieldsList = allFieldNames]
+                                            in
+                                                recursiveResult
+                                        else if Value.Is(fieldValue, type list) then
+                                            let
+                                                listLength = List.Count(fieldValue),
+                                                // Skip empty lists
+                                                listResult = if listLength = 0 then
+                                                    state
+                                                else
+                                                    List.Accumulate(
+                                                        List.Positions(fieldValue),
+                                                        state,
+                                                        (listState, index) =>
+                                                            let
+                                                                listItem = fieldValue{index},
+                                                                indexSuffix = Text.From(index + 1), // 1-based indexing
+                                                                listFieldName = fieldName & "." & indexSuffix,
+                                                                listPath = if currentParentPath = "" then listFieldName else currentParentPath & "." & listFieldName,
+                                                                
+                                                                itemResult = if Value.Is(listItem, type record) then
+                                                                    let
+                                                                        itemFieldCount = Record.FieldCount(listItem),
+                                                                        itemFlattened = if itemFieldCount = 0 then
+                                                                            listState
+                                                                        else
+                                                                            let
+                                                                                // Call the function through the passed reference
+                                                                                flattened = flattenFn(flattenFn, listItem, currentfilterKeys, listPath, listState[ExistingFieldsList]),
+                                                                                // Get all field names from the flattened result
+                                                                                flattenedFieldNames = Record.FieldNames(flattened),
+                                                                                // Merge the flattened record with the current state
+                                                                                combinedRecord = flattened & listState[FlattenedRecord],
+                                                                                // Update the existing fields list with ALL fields
+                                                                                allFieldNames = List.Distinct(listState[ExistingFieldsList] & flattenedFieldNames)
+                                                                            in
+                                                                                [FlattenedRecord = combinedRecord, ExistingFieldsList = allFieldNames]
+                                                                    in
+                                                                        itemFlattened
+                                                                else
+                                                                    let
+                                                                        shouldInclude = ShouldIncludeField(listFieldName),
+                                                                        result = if shouldInclude then
+                                                                            let
+                                                                                resolvedName = ResolveFieldName(listFieldName, currentParentPath, listState[ExistingFieldsList]),
+                                                                                newRecord = Record.AddField(listState[FlattenedRecord], resolvedName, listItem),
+                                                                                newFieldsList = listState[ExistingFieldsList] & {resolvedName}
+                                                                            in
+                                                                                [FlattenedRecord = newRecord, ExistingFieldsList = newFieldsList]
+                                                                        else
+                                                                            listState
+                                                                    in
+                                                                        result
+                                                            in
+                                                                itemResult
+                                                    )
+                                            in
+                                                listResult
+                                        else
+                                            // Handle primitive values
+                                            let
+                                                shouldInclude = ShouldIncludeField(fieldName),
+                                                result = if shouldInclude then
+                                                    let
+                                                        resolvedName = ResolveFieldName(fieldName, currentParentPath, state[ExistingFieldsList]),
+                                                        newRecord = Record.AddField(state[FlattenedRecord], resolvedName, fieldValue),
+                                                        newFieldsList = state[ExistingFieldsList] & {resolvedName}
+                                                    in
+                                                        [FlattenedRecord = newRecord, ExistingFieldsList = newFieldsList]
+                                                else
+                                                    state
+                                            in
+                                                result
+                                    in
+                                        finalResult
+                            in
+                                processResult
+                    )
+                in
+                    processedFields[FlattenedRecord]
+            else
+                // If input is not a record, return it as is in a record wrapper
+                [Value = recordToProcess]
+        in
+            result,
+    
+    // Call the implementation with self-reference
+    result = FlattenRecordImpl(FlattenRecordImpl, inputRecord, filterKeys, parentPath, existingFields)
+in
+    result

src/powerbi-data-connector/speckle/api/Parser.pqm

@@ -0,0 +1,58 @@
+// function for parsing the url into base url, project id, model id and version id
+(url as text) as record =>
+    let
+        urlParts = Uri.Parts(url),
+        baseUrl = Text.Combine({urlParts[Scheme], "://", urlParts[Host]}),
+        
+        pathSegments = List.Select(Text.Split(urlParts[Path], "/"), each _ <> ""),
+        
+        // extract project ID if it exists
+        projectId = if List.Count(pathSegments) >= 2 and pathSegments{0} = "projects" 
+            then pathSegments{1} else null,
+            
+        // extract model ID and version ID if they exist
+        rawModelSegment = if List.Count(pathSegments) >= 4 and pathSegments{2} = "models"
+            then pathSegments{3} else "",
+            
+        // check if this is a federated model (contains commas)
+        isFederated = Text.Contains(rawModelSegment, ","),
+        
+        // if federated, split by comma to get multiple model IDs
+        modelSegments = if isFederated 
+            then Text.Split(rawModelSegment, ",") 
+            else {rawModelSegment},
+            
+        // process each model segment (could be modelID or modelID@versionID)
+        processedModels = List.Transform(
+            modelSegments,
+            each [
+                modelId = if Text.Contains(_, "@") 
+                    then Text.Split(_, "@"){0} 
+                    else _,
+                versionId = if Text.Contains(_, "@") 
+                    then Text.Split(_, "@"){1} 
+                    else null
+            ]
+        ),
+            
+        // extract model IDs and version IDs into separate lists
+        modelIds = List.Transform(processedModels, each [modelId]),
+        versionIds = List.Transform(processedModels, each [versionId]),
+            
+        // validate URL structure
+        isValid = projectId <> null and List.Count(modelIds) > 0 and List.First(modelIds) <> ""
+    in
+        if not isValid then
+            error [
+                Reason = "Invalid URL",
+                Message = "The URL must be in the format 'https://server/projects/PROJECT_ID/models/MODEL_ID' or 'https://server/projects/PROJECT_ID/models/MODEL_ID@VERSION_ID' or 'https://server/projects/PROJECT_ID/models/MODEL_ID1,MODEL_ID2'"
+            ]
+        else
+            [
+                baseUrl = baseUrl,
+                projectId = projectId,
+                modelId = if isFederated then null else processedModels{0}[modelId],
+                versionId = if isFederated then null else processedModels{0}[versionId],
+                isFederated = isFederated,
+                federatedModels = if isFederated then processedModels else null
+            ]

src/powerbi-data-connector/speckle/api/SendToServer.pqm

@@ -0,0 +1,168 @@
+(url as text) as list =>
+    let
+        // Import required functions
+        GetModel = Extension.LoadFunction("GetModel.pqm"),
+        Parser = Extension.LoadFunction("Parser.pqm"),
+        GetUser = Extension.LoadFunction("GetUser.pqm"),
+        GetVersion = Extension.LoadFunction("GetVersion.pqm"),
+        GetWorkspace = Extension.LoadFunction("GetWorkspace.pqm"),
+
+         // the logic for importing functions from other files
+        Extension.LoadFunction = (fileName as text) =>
+            let
+                binary = Extension.Contents(fileName),
+                asText = Text.FromBinary(binary)
+            in
+                try
+                    Expression.Evaluate(asText, #shared)
+                catch (e) =>
+                    error
+                        [
+                            Reason = "Extension.LoadFunction Failure",
+                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
+                            Message.Parameters = {fileName, e[Reason], e[Message]},
+                            Detail = [File = fileName, Error = e]
+                        ],
+
+        // Get required information
+        modelInfo = GetModel(url),
+        parsedUrl = Parser(url),
+        userInfo = GetUser(url),
+        apiKey = userInfo[Token],
+        userEmail = userInfo[UserEmail],
+        connectorVersion = GetVersion(),
+        workspaceInfo = GetWorkspace(url),
+
+        // Function to check if Desktop Service is available
+        IsDesktopServiceAvailable = () =>
+            try
+                let
+                    PingResponse = Web.Contents(
+                        "http://127.0.0.1:29364/ping",
+                        [
+                            Headers = [#"Method" = "GET"],
+                            ManualStatusHandling = {400, 401, 403, 404, 500, 502, 503, 504},
+                            Timeout = #duration(0, 0, 0, 2) // 2 second timeout for ping
+                        ]
+                    ),
+                    StatusCode = Value.Metadata(PingResponse)[Response.Status]
+                in
+                    StatusCode = 200
+            otherwise
+                false,
+
+        // Function to use Desktop Service approach (only called if available)
+        UseDesktopService = () =>
+            let
+                // exchange powerful token for weak token via ds 
+                tokenExchangeData = Json.FromValue([
+                    PowerfulToken = apiKey,
+                    Scopes = {"profile:read", "streams:read", "users:read"},
+                    ProjectId = parsedUrl[projectId],
+                    ServerUrl = parsedUrl[baseUrl]
+                ]),
+                
+                tokenExchangeResponse = Web.Contents(
+                    "http://127.0.0.1:29364/auth/exchange-token",
+                    [
+                        Headers = [
+                            #"Content-Type" = "application/json",
+                            #"Method" = "POST"
+                        ],
+                        Content = tokenExchangeData,
+                        ManualStatusHandling = {400, 401, 403, 404, 500}
+                    ]
+                ),
+                
+                tokenExchangeJson = Json.Document(tokenExchangeResponse),
+                weakToken = tokenExchangeJson[token],
+
+                // prepare request data with weak token
+                requestData = Json.FromValue([
+                    Url = url,
+                    Server = parsedUrl[baseUrl],
+                    Email = userEmail,
+                    ProjectId = parsedUrl[projectId],
+                    RootObjectId = modelInfo[rootObjectId],
+                    SourceApplication = modelInfo[sourceApplication],
+                    Token = weakToken,
+                    Version = connectorVersion,
+                    VersionId = parsedUrl[versionId],
+                    WorkspaceId = workspaceInfo[workspaceId],
+                    WorkspaceName = workspaceInfo[workspaceName],
+                    WorkspaceLogo = workspaceInfo[workspaceLogo],
+                    CanHideBranding = workspaceInfo[canHideBranding]
+                ]),
+                
+                // Send request to local server
+                Response = Web.Contents(
+                    "http://127.0.0.1:29364/download",
+                    [
+                        Headers = [
+                            #"Content-Type" = "application/json",
+                            #"Method" = "POST"
+                        ],
+                        Content = requestData,
+                        ManualStatusHandling = {400, 401, 403, 404, 500}
+                    ]
+                ),
+                
+                // Parse response
+                JsonResponse = Json.Document(Response)
+            in
+                JsonResponse,
+
+        // Function to fallback to direct JSON download from Speckle server
+        FallbackToDirectDownload = () =>
+            let
+                // Construct the direct object URL: {baseUrl}/objects/{projectId}/{rootObjectId}
+                objectUrl = Text.Combine({
+                    parsedUrl[baseUrl], 
+                    "/objects/", 
+                    parsedUrl[projectId], 
+                    "/", 
+                    modelInfo[rootObjectId]
+                }),
+                
+                // Download JSON directly from Speckle server
+                Response = Web.Contents(
+                    objectUrl,
+                    [
+                        Headers = [
+                            #"Authorization" = "Bearer " & apiKey,
+                            #"Accept" = "application/json"
+                        ],
+                        ManualStatusHandling = {400, 401, 403, 404, 500, 502, 503, 504}
+                    ]
+                ),
+                
+                // Check response status
+                StatusCode = Value.Metadata(Response)[Response.Status],
+                
+                // Parse JSON response if successful
+                JsonResponse = if StatusCode >= 200 and StatusCode < 300 then
+                    Json.Document(Response)
+                else
+                    error [
+                        Reason = "DirectDownloadFailed",
+                        Message = "Failed to download model data directly from Speckle server",
+                        Detail = [
+                            StatusCode = StatusCode, 
+                            ObjectUrl = objectUrl,
+                            ProjectId = parsedUrl[projectId],
+                            RootObjectId = modelInfo[rootObjectId]
+                        ]
+                    ]
+            in
+                JsonResponse,
+
+        // Check Desktop Service availability and choose approach
+        DesktopServiceAvailable = IsDesktopServiceAvailable(),
+        
+        FinalResult = if DesktopServiceAvailable then
+            UseDesktopService()
+        else
+            FallbackToDirectDownload()
+
+    in
+        FinalResult

src/powerbi-data-connector/speckle/api/Utils.ExpandRecord.pqm

@@ -0,0 +1,31 @@
+// Expands a record column in a table, adding new columns for each field in the record.
+// If UseCombinedNames is true, columns are named as ColumnName.FieldName, otherwise just FieldName.
+// If FieldNames is provided (list), only those fields are expanded.
+(table as table, columnName as text, optional FieldNames as list, optional UseCombinedNames as logical) as table =>
+let
+    useCombined = if UseCombinedNames = null then false else UseCombinedNames,
+    // Determine which field names to expand
+    allFieldNames = if FieldNames <> null then FieldNames else List.Distinct(
+        List.Combine(
+            List.Transform(
+                Table.Column(table, columnName),
+                each if _ is record then Record.FieldNames(_) else {}
+            )
+        )
+    ),
+    // Add each field as a new column
+    addColumns = List.Accumulate(
+        allFieldNames,
+        table,
+        (state, field) =>
+            Table.AddColumn(
+                state,
+                if useCombined then columnName & "." & field else field,
+                (row) =>
+                    if Record.HasFields(row, columnName) and Record.Field(row, columnName) is record and Record.HasFields(Record.Field(row, columnName), field)
+                    then Record.Field(Record.Field(row, columnName), field)
+                    else null
+            )
+    )
+in
+    addColumns 

src/powerbi-data-connector/speckle/helpers/CleanUpObject.pqm

@@ -1,7 +0,0 @@
-(object as record) as record =>
-    let
-        hiddenFields = {"__closure", "totalChildrenCount"},
-        // remove closures from records
-        clean = Record.RemoveFields(object, hiddenFields, MissingField.Ignore)
-    in
-        clean

src/powerbi-data-connector/speckle/helpers/CleanUpObjects.pqm

@@ -1,17 +0,0 @@
-(objects as list) as list =>
-    let
-        // remove closures from records, and remove DataChunk records
-        removeClosureField = List.Transform(
-            objects, each [data = Record.RemoveFields(_[data], "__closure", MissingField.Ignore)]
-        ),
-        removeTotals = List.Transform(
-            removeClosureField,
-            each
-                [
-                    data = try
-                        Record.RemoveFields(_[data], "totalChildrenCount", MissingField.Ignore) otherwise _[data]
-                ]
-        ),
-        removed = List.Select(removeTotals, each _[data][speckle_type] <> "Speckle.Core.Models.DataChunk")
-    in
-        try removed otherwise objects

src/powerbi-data-connector/speckle/helpers/GetPublish.pqm

@@ -1,30 +0,0 @@
-let
-    beta = true,
-    category = "Other",
-    icons = [
-        Icon16 = {
-            Extension.Contents("SpeckleLogo16.png"),
-            Extension.Contents("SpeckleLogo20.png"),
-            Extension.Contents("SpeckleLogo24.png"),
-            Extension.Contents("SpeckleLogo32.png")
-        },
-        Icon32 = {
-            Extension.Contents("SpeckleLogo32.png"),
-            Extension.Contents("SpeckleLogo40.png"),
-            Extension.Contents("SpeckleLogo48.png"),
-            Extension.Contents("SpeckleLogo64.png")
-        }
-    ]
-in
-    (key as text) as record =>
-        [
-            Beta = beta,
-            Category = category,
-            ButtonText = {
-                Extension.LoadString(Text.Format("#{0}.Title", {key})),
-                Extension.LoadString(Text.Format("#{0}.Label", {key}))
-            },
-            LearnMoreUrl = "https://speckle.guide",
-            SourceImage = icons,
-            SourceTypeImage = icons
-        ]

src/powerbi-data-connector/speckle/helpers/LogEvent.pqm

@@ -1,50 +0,0 @@
-let
-    GetApplicationSlug = Extension.LoadFunction("GetApplicationSlug.pqm"),
-    GetUser = Extension.LoadFunction("Api.GetUser.pqm"),
-    Hash = Extension.LoadFunction("Hash.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    (server as text, commit as any) =>
-        let
-            trackUrl = "https://analytics.speckle.systems/track?ip=1",
-            user = GetUser(server),
-            isMultiplayer = user[id] <> commit[authorId],
-            body = [
-                event = "Receive",
-                properties = [
-                    server_id = Hash(server),
-                    token = "acd87c5a50b56df91a795e999812a3a4",
-                    hostApp = "powerbi",
-                    sourceHostApp = GetApplicationSlug(commit[sourceApplication]),
-                    sourceHostAppVersion = commit[sourceApplication],
-                    isMultiplayer = user[id] <> commit[authorId]
-                ]
-            ],
-            Result = Web.Contents(
-                trackUrl,
-                [
-                    Headers = [
-                        #"Method" = "POST",
-                        #"Accept" = "text/plain",
-                        #"Content-Type" = "application/json"
-                    ],
-                    Content = Text.ToBinary(Text.Combine({"data=", Text.FromBinary(Json.FromValue(body))}))
-                ]
-            ),
-            // Hack to force execution
-            Join = Text.Combine({server, Text.From(Json.Document(Result))}, "_____"),
-            Disjoin = Text.Split(Join, "_____"){0}
-        in
-            Disjoin

src/powerbi-data-connector/speckle/helpers/ParseStreamUrl.pqm

@@ -1,81 +0,0 @@
-let
-    GetModel = Extension.LoadFunction("Api.GetModel.pqm"),
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ],
-    IsFe2Url = (segments as list) as logical => List.Count(segments) = 4 and segments{2} = "models",
-    GetUrlType = (branchName as nullable text, commitId as nullable text, objectId as nullable text) as text =>
-        if (commitId <> null) then
-            "Commit"
-        else if (objectId <> null) then
-            "Object"
-        else if (branchName <> null) then
-            "Branch"
-        else
-            "Stream",
-    ParseFe1Url = (server as text, segments as list) as record =>
-        let
-            streamId = segments{1},
-            branchName = if (List.Count(segments) = 4 and segments{2} = "branches") then segments{3} else null,
-            commitId = if (List.Count(segments) = 4 and segments{2} = "commits") then segments{3} else null,
-            objectId = if (List.Count(segments) = 4 and segments{2} = "objects") then segments{3} else null,
-            urlType = GetUrlType(branchName, commitId, objectId)
-        in
-            [
-                urlType = urlType,
-                server = server as text,
-                id = streamId as nullable text,
-                branch = branchName as nullable text,
-                commit = commitId as nullable text,
-                object = objectId as nullable text
-            ],
-    ParseFe2Url = (server as text, segments as list) as record =>
-        let
-            streamId = segments{1},
-            modelList = segments{3},
-            isMultimodel = Text.Contains(modelList, ","),
-            firstModel = Text.Split(modelList, ","){0},
-            modelAndVersion = Text.Split(firstModel, "@"),
-            modelId = modelAndVersion{0},
-            versionId = if (List.Count(modelAndVersion) > 1) then modelAndVersion{1} else null,
-            model = if (modelId <> null) then GetModel(server, streamId, modelId) else null,
-            urlType = GetUrlType(model[name], versionId, null)
-        in
-            if isMultimodel then
-                error
-                    Error.Record(
-                        "NotSupported",
-                        "Multi-model URLs are not supported.",
-                        "Try to select just one single model in the web app and paste that in."
-                    )
-            else
-                [
-                    urlType = urlType,
-                    server = server,
-                    id = streamId,
-                    branch = model[name],
-                    commit = versionId,
-                    object = null
-                ]
-in
-    (url as text) as record =>
-        let
-            // Get server and streamId, and branchName / commitId / objectid from the input url
-            server = Text.Combine({Uri.Parts(url)[Scheme], "://", Uri.Parts(url)[Host]}),
-            segments = Text.Split(Text.AfterDelimiter(Uri.Parts(url)[Path], "/", 0), "/"),
-            isFe2 = IsFe2Url(segments)
-        in
-            if (isFe2) then
-                ParseFe2Url(server, segments)
-            else
-                ParseFe1Url(server, segments)

src/powerbi-data-connector/speckle/helpers/Traverse.pqm

@@ -1,67 +0,0 @@
-let
-    GetObject = Extension.LoadFunction("Api.GetObject.pqm"),
-    Diagnostics.Log = Extension.LoadFunction("Diagnostics.pqm")[LogValue],
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ],
-    //TODO: Not implemented yet
-    TraverseTable = (item as table) as table => item,
-    // Will traverse an undetermined value (list, table, record).
-    TraverseValue = (i as any) as any =>
-        let
-            item = Diagnostics.Log("Traverse value", i) meta Value.Metadata(i)
-        in
-            if Value.Is(item, type list) then
-                // Return a transformed list by traversing all items
-                Diagnostics.Log(
-                    "List travered",
-                    List.Transform(item, (a) => @TraverseValue(Value.ReplaceMetadata(a, Value.Metadata(i))))
-                )
-            else if Value.Is(item, type record) then
-                // Traverse this record individually
-                TraverseRecord(item)
-            else if Value.Is(item, type table) then
-                // Traverse this table
-                TraverseTable(item)
-            else
-                // If none of the above, assume it's just a primitive type and return it as-is.
-                item,
-    // Traverses a generic record
-    TraverseRecord = (object as record) as any =>
-        let
-            isSpeckle = Diagnostics.Log("Is Speckle", Record.HasFields(object, {"speckle_type"})),
-            isReference = Diagnostics.Log("Is Reference", object[speckle_type] = "reference"),
-            // Get the names of all fields
-            fields = Record.FieldNames(object),
-            // Remove all known fields that don't need traversing
-            cleanFields = List.RemoveItems(fields, {"id", "speckle_type", "applicationId"}),
-            // Transform the list of field names into a set of transform operations
-            transformOps = List.Transform(
-                cleanFields, each {_, (a) => TraverseValue(Value.ReplaceMetadata(a, Value.Metadata(object)))}
-            ),
-            // Get the object's metadata (server and stream will be saved in here)
-            info = Value.Metadata(object)
-        in
-            // Transform all fields and return the modified object
-            if (isReference) then
-                // Swap reference for call to GetObject
-                () =>
-                    TraverseValue(
-                        Value.ReplaceMetadata(
-                            GetObject(info[server], info[stream], object[referencedId]), Value.Metadata(object)
-                        )
-                    )
-            else
-                try Record.TransformFields(object, transformOps, MissingField.Error) otherwise error "oopsies"
-in
-    TraverseValue

src/powerbi-data-connector/tests/api/api.fetch.test.pq

@@ -1,2 +0,0 @@
-// Use this file to write queries to test your data connector
-let result = Speckle.Api.Fetch("https://latest.speckle.dev") in Record.ToTable(result)

src/powerbi-data-connector/tests/api/api.rest.getobject.test.pq

@@ -1,7 +0,0 @@
-// Use this file to write queries to test your data connector
-let
-    result = Speckle.Api.REST.GetObject(
-        "https://latest.speckle.dev", "5f284e5c70", "85e5f250fe591ea74d8d5dc1137a9341"
-    )
-in
-    result

src/powerbi-data-connector/tests/demo.test.pq

@@ -1,30 +0,0 @@
-section UnitTestingUnitTests;
-
-UT = Speckle.LoadFunction("Facts.pqm");
-Fact = UT[Fact];
-
-Facts.Summarize = UT[SummarizeFacts];
-
-shared Speckle.UnitTest = [
-    // Put any common variables here if you only want them to be evaluated once
-    // Fact(<Name of the Test>, <Expected Value>, <Actual Value>)
-    // <Expected Value> and <Actual Value> can be a literal or let statement
-    facts = {
-        Fact(
-            "Check that this function returns 'ABC'",
-            // name of the test
-            "ABC",
-            // expected value
-            UnitTesting.ReturnsABC()
-            // expression to evaluate (let or single statement)
-        ),
-        Fact("Check that this function returns '123'", "123", UnitTesting.Returns123()),
-        Fact("Result should contain 5 rows", 5, Table.RowCount(UnitTesting.ReturnsTableWithFiveRows())),
-        Fact("Values should be equal (using a let statement)", "Hello World", let a = "Hello World" in a)
-    },
-    report = Facts.Summarize(facts)
-][report];
-
-shared UnitTesting.ReturnsABC = () => "ABC";
-shared UnitTesting.Returns123 = () => "123";
-shared UnitTesting.ReturnsTableWithFiveRows = () => Table.Repeat(#table({"a"}, {{1}}), 5);

src/powerbi-data-connector/tests/get.byurl.test.pq

@@ -1,2 +0,0 @@
-// Use this file to write queries to test your data connector
-let result = Speckle.Get.ByUrl("https://latest.speckle.dev/streams/3d25474a18") in Record.ToTable(result)

src/powerbi-data-connector/tests/getbyurl.test.pq

@@ -1,2 +0,0 @@
-// Use this file to write queries to test your data connector
-let result = Speckle.GetByUrl("https://latest.speckle.dev/streams/5f284e5c70/objects/85e5f250fe591ea74d8d5dc1137a9341") in result

src/powerbi-data-connector/utilities/Diagnostics.pqm

@@ -1,376 +0,0 @@
-let
-    Diagnostics.LogValue = (prefix, value) =>
-        Diagnostics.Trace(
-            TraceLevel.Information,
-            prefix & ": " & (try Diagnostics.ValueToText(value) otherwise "<error getting value>"),
-            value
-        ),
-    Diagnostics.LogValue2 = (prefix, value, result, optional delayed) =>
-        Diagnostics.Trace(TraceLevel.Information, prefix & ": " & Diagnostics.ValueToText(value), result, delayed),
-    Diagnostics.LogFailure = (text, function) =>
-        let
-            result = try function()
-        in
-            if result[HasError] then
-                Diagnostics.LogValue2(text, result[Error], () => error result[Error], true)
-            else
-                result[Value],
-    Diagnostics.WrapFunctionResult = (innerFunction as function, outerFunction as function) as function =>
-        Function.From(Value.Type(innerFunction), (list) => outerFunction(() => Function.Invoke(innerFunction, list))),
-    Diagnostics.WrapHandlers = (handlers as record) as record =>
-        Record.FromList(
-            List.Transform(
-                Record.FieldNames(handlers),
-                (h) =>
-                    Diagnostics.WrapFunctionResult(Record.Field(handlers, h), (fn) => Diagnostics.LogFailure(h, fn))
-            ),
-            Record.FieldNames(handlers)
-        ),
-    Diagnostics.ValueToText = (value) =>
-        let
-            _canBeIdentifier = (x) =>
-                let
-                    keywords = {
-                        "and",
-                        "as",
-                        "each",
-                        "else",
-                        "error",
-                        "false",
-                        "if",
-                        "in",
-                        "is",
-                        "let",
-                        "meta",
-                        "not",
-                        "otherwise",
-                        "or",
-                        "section",
-                        "shared",
-                        "then",
-                        "true",
-                        "try",
-                        "type"
-                    },
-                    charAlpha = (c as number) => (c >= 65 and c <= 90) or (c >= 97 and c <= 122) or c = 95,
-                    charDigit = (c as number) => c >= 48 and c <= 57
-                in
-                    try
-                        charAlpha(Character.ToNumber(Text.At(x, 0)))
-                        and List.MatchesAll(
-                            Text.ToList(x), (c) => let num = Character.ToNumber(c) in charAlpha(num)
-                            or charDigit(num)
-                        )
-                        and not List.MatchesAny(keywords, (li) => li = x) otherwise false,
-            Serialize.Binary = (x) => "#binary(" & Serialize(Binary.ToList(x)) & ") ",
-            Serialize.Date = (x) =>
-                "#date(" & Text.From(Date.Year(x)) & ", " & Text.From(Date.Month(x)) & ", " & Text.From(Date.Day(x))
-                    & ") ",
-            Serialize.Datetime = (x) =>
-                "#datetime("
-                    & Text.From(Date.Year(DateTime.Date(x)))
-                    & ", "
-                    & Text.From(Date.Month(DateTime.Date(x)))
-                    & ", "
-                    & Text.From(Date.Day(DateTime.Date(x)))
-                    & ", "
-                    & Text.From(Time.Hour(DateTime.Time(x)))
-                    & ", "
-                    & Text.From(Time.Minute(DateTime.Time(x)))
-                    & ", "
-                    & Text.From(Time.Second(DateTime.Time(x)))
-                    & ") ",
-            Serialize.Datetimezone = (x) =>
-                let
-                    dtz = DateTimeZone.ToRecord(x)
-                in
-                    "#datetimezone("
-                        & Text.From(dtz[Year])
-                        & ", "
-                        & Text.From(dtz[Month])
-                        & ", "
-                        & Text.From(dtz[Day])
-                        & ", "
-                        & Text.From(dtz[Hour])
-                        & ", "
-                        & Text.From(dtz[Minute])
-                        & ", "
-                        & Text.From(dtz[Second])
-                        & ", "
-                        & Text.From(dtz[ZoneHours])
-                        & ", "
-                        & Text.From(dtz[ZoneMinutes])
-                        & ") ",
-            Serialize.Duration = (x) =>
-                let
-                    dur = Duration.ToRecord(x)
-                in
-                    "#duration("
-                        & Text.From(dur[Days])
-                        & ", "
-                        & Text.From(dur[Hours])
-                        & ", "
-                        & Text.From(dur[Minutes])
-                        & ", "
-                        & Text.From(dur[Seconds])
-                        & ") ",
-            Serialize.Function = (x) =>
-                _serialize_function_param_type(
-                    Type.FunctionParameters(Value.Type(x)), Type.FunctionRequiredParameters(Value.Type(x))
-                )
-                    & " as "
-                    & _serialize_function_return_type(Value.Type(x))
-                    & " => (...) ",
-            Serialize.List = (x) =>
-                "{"
-                    & List.Accumulate(
-                        x, "", (seed, item) => if seed = "" then Serialize(item) else seed & ", " & Serialize(item)
-                    )
-                    & "} ",
-            Serialize.Logical = (x) => Text.From(x),
-            Serialize.Null = (x) => "null",
-            Serialize.Number = (x) =>
-                let
-                    Text.From = (i as number) as text =>
-                        if Number.IsNaN(i) then
-                            "#nan"
-                        else if i = Number.PositiveInfinity then
-                            "#infinity"
-                        else if i = Number.NegativeInfinity then
-                            "-#infinity"
-                        else
-                            Text.From(i)
-                in
-                    Text.From(x),
-            Serialize.Record = (x) =>
-                "[ "
-                    & List.Accumulate(
-                        Record.FieldNames(x),
-                        "",
-                        (seed, item) =>
-                            (if seed = "" then Serialize.Identifier(item) else seed & ", " & Serialize.Identifier(
-                                item
-                            ))
-                                & " = "
-                                & Serialize(Record.Field(x, item))
-                    )
-                    & " ] ",
-            Serialize.Table = (x) =>
-                "#table( type " & _serialize_table_type(Value.Type(x)) & ", " & Serialize(Table.ToRows(x)) & ") ",
-            Serialize.Text = (x) => """" & _serialize_text_content(x) & """",
-            _serialize_text_content = (x) =>
-                let
-                    escapeText = (n as number) as text =>
-                        "#(#)(" & Text.PadStart(Number.ToText(n, "X", "en-US"), 4, "0") & ")"
-                in
-                    List.Accumulate(
-                        List.Transform(
-                            Text.ToList(x),
-                            (c) =>
-                                let
-                                    n = Character.ToNumber(c)
-                                in
-                                    if n = 9 then
-                                        "#(#)(tab)"
-                                    else if n = 10 then
-                                        "#(#)(lf)"
-                                    else if n = 13 then
-                                        "#(#)(cr)"
-                                    else if n = 34 then
-                                        """"""
-                                    else if n = 35 then
-                                        "#(#)(#)"
-                                    else if n < 32 then
-                                        escapeText(n)
-                                    else if n < 127 then
-                                        Character.FromNumber(n)
-                                    else
-                                        escapeText(n)
-                        ),
-                        "",
-                        (s, i) => s & i
-                    ),
-            Serialize.Identifier = (x) => if _canBeIdentifier(x) then x else "#""" & _serialize_text_content(x) & """",
-            Serialize.Time = (x) =>
-                "#time("
-                    & Text.From(Time.Hour(x))
-                    & ", "
-                    & Text.From(Time.Minute(x))
-                    & ", "
-                    & Text.From(Time.Second(x))
-                    & ") ",
-            Serialize.Type = (x) => "type " & _serialize_typename(x),
-            _serialize_typename = (x, optional funtype as logical) =>
-                /* Optional parameter: Is this being used as part of a function signature? */ let
-                    isFunctionType = (x as type) =>
-                        try if Type.FunctionReturn(x) is type then true else false otherwise false,
-                    isTableType = (x as type) =>
-                        try if Type.TableSchema(x) is table then true else false otherwise false,
-                    isRecordType = (x as type) =>
-                        try if Type.ClosedRecord(x) is type then true else false otherwise false,
-                    isListType = (x as type) => try if Type.ListItem(x) is type then true else false otherwise false
-                in
-                    if funtype = null and isTableType(x) then
-                        _serialize_table_type(x)
-                    else if funtype = null and isListType(x) then
-                        "{ " & @_serialize_typename(Type.ListItem(x)) & " }"
-                    else if funtype = null and isFunctionType(x) then
-                        "function " & _serialize_function_type(x)
-                    else if funtype = null and isRecordType(x) then
-                        _serialize_record_type(x)
-                    else if x = type any then
-                        "any"
-                    else
-                        let
-                            base = Type.NonNullable(x)
-                        in
-                            (if Type.IsNullable(x) then "nullable " else "")
-                                & (
-                                    if base = type anynonnull then
-                                        "anynonnull"
-                                    else if base = type binary then
-                                        "binary"
-                                    else if base = type date then
-                                        "date"
-                                    else if base = type datetime then
-                                        "datetime"
-                                    else if base = type datetimezone then
-                                        "datetimezone"
-                                    else if base = type duration then
-                                        "duration"
-                                    else if base = type logical then
-                                        "logical"
-                                    else if base = type none then
-                                        "none"
-                                    else if base = type null then
-                                        "null"
-                                    else if base = type number then
-                                        "number"
-                                    else if base = type text then
-                                        "text"
-                                    else if base = type time then
-                                        "time"
-                                    else if base = type type then
-                                        "type"
-                                    else /* Abstract types: */ if base = type function then
-                                        "function"
-                                    else if base = type table then
-                                        "table"
-                                    else if base = type record then
-                                        "record"
-                                    else if base = type list then
-                                        "list"
-                                    else
-                                        "any /*Actually unknown type*/"
-                                ),
-            _serialize_table_type = (x) =>
-                let
-                    schema = Type.TableSchema(x)
-                in
-                    "table "
-                        & (
-                            if Table.IsEmpty(schema) then
-                                ""
-                            else
-                                "["
-                                    & List.Accumulate(
-                                        List.Transform(
-                                            Table.ToRecords(Table.Sort(schema, "Position")),
-                                            each Serialize.Identifier(_[Name]) & " = " & _[Kind]
-                                        ),
-                                        "",
-                                        (seed, item) => (if seed = "" then item else seed & ", " & item)
-                                    )
-                                    & "] "
-                        ),
-            _serialize_record_type = (x) =>
-                let
-                    flds = Type.RecordFields(x)
-                in
-                    if Record.FieldCount(flds) = 0 then
-                        "record"
-                    else
-                        "["
-                            & List.Accumulate(
-                                Record.FieldNames(flds),
-                                "",
-                                (seed, item) =>
-                                    seed
-                                        & (if seed <> "" then ", " else "")
-                                        & (
-                                            Serialize.Identifier(item)
-                                                & "="
-                                                & _serialize_typename(Record.Field(flds, item)[Type])
-                                        )
-                            )
-                            & (if Type.IsOpenRecord(x) then ",..." else "")
-                            & "]",
-            _serialize_function_type = (x) =>
-                _serialize_function_param_type(Type.FunctionParameters(x), Type.FunctionRequiredParameters(x))
-                    & " as "
-                    & _serialize_function_return_type(x),
-            _serialize_function_param_type = (t, n) =>
-                let
-                    funsig = Table.ToRecords(
-                        Table.TransformColumns(
-                            Table.AddIndexColumn(Record.ToTable(t), "isOptional", 1), {"isOptional", (x) => x > n}
-                        )
-                    )
-                in
-                    "("
-                        & List.Accumulate(
-                            funsig,
-                            "",
-                            (seed, item) =>
-                                (if seed = "" then "" else seed & ", ")
-                                    & (if item[isOptional] then "optional " else "")
-                                    & Serialize.Identifier(item[Name])
-                                    & " as "
-                                    & _serialize_typename(item[Value], true)
-                        )
-                        & ")",
-            _serialize_function_return_type = (x) => _serialize_typename(Type.FunctionReturn(x), true),
-            Serialize = (x) as text =>
-                if x is binary then
-                    try Serialize.Binary(x) otherwise "null /*serialize failed*/"
-                else if x is date then
-                    try Serialize.Date(x) otherwise "null /*serialize failed*/"
-                else if x is datetime then
-                    try Serialize.Datetime(x) otherwise "null /*serialize failed*/"
-                else if x is datetimezone then
-                    try Serialize.Datetimezone(x) otherwise "null /*serialize failed*/"
-                else if x is duration then
-                    try Serialize.Duration(x) otherwise "null /*serialize failed*/"
-                else if x is function then
-                    try Serialize.Function(x) otherwise "null /*serialize failed*/"
-                else if x is list then
-                    try Serialize.List(x) otherwise "null /*serialize failed*/"
-                else if x is logical then
-                    try Serialize.Logical(x) otherwise "null /*serialize failed*/"
-                else if x is null then
-                    try Serialize.Null(x) otherwise "null /*serialize failed*/"
-                else if x is number then
-                    try Serialize.Number(x) otherwise "null /*serialize failed*/"
-                else if x is record then
-                    try Serialize.Record(x) otherwise "null /*serialize failed*/"
-                else if x is table then
-                    try Serialize.Table(x) otherwise "null /*serialize failed*/"
-                else if x is text then
-                    try Serialize.Text(x) otherwise "null /*serialize failed*/"
-                else if x is time then
-                    try Serialize.Time(x) otherwise "null /*serialize failed*/"
-                else if x is type then
-                    try Serialize.Type(x) otherwise "null /*serialize failed*/"
-                else
-                    "[#_unable_to_serialize_#]"
-        in
-            try Serialize(value) otherwise "<serialization failed>"
-in
-    [
-        LogValue = Diagnostics.LogValue,
-        LogValue2 = Diagnostics.LogValue2,
-        LogFailure = Diagnostics.LogFailure,
-        WrapFunctionResult = Diagnostics.WrapFunctionResult,
-        WrapHandlers = Diagnostics.WrapHandlers,
-        ValueToText = Diagnostics.ValueToText
-    ]

src/powerbi-data-connector/utilities/Extension.LoadFunction.pqm

@@ -1,17 +0,0 @@
-// This is here as reference for copy/pasting wherever there is need for importing pqm files.
-let
-    Extension.LoadFunction = (fileName as text) =>
-        let
-            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
-        in
-            try
-                Expression.Evaluate(asText, #shared) catch (e) =>
-                    error
-                        [
-                            Reason = "Extension.LoadFunction Failure",
-                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
-                            Message.Parameters = {fileName, e[Reason], e[Message]},
-                            Detail = [File = fileName, Error = e]
-                        ]
-in
-    Extension.LoadFunction

src/powerbi-data-connector/utilities/Facts.pqm

@@ -1,231 +0,0 @@
-let
-    /// COMMON UNIT TESTING CODE
-    Fact = (_subject as text, _expected, _actual) as record =>
-        [
-            expected = try _expected,
-            safeExpected = if expected[HasError] then "Expected : " & @ValueToText(expected[Error]) else expected[
-                Value
-            ],
-            actual = try _actual,
-            safeActual = if actual[HasError] then "Actual : " & @ValueToText(actual[Error]) else actual[Value],
-            attempt = try safeExpected = safeActual,
-            result = if attempt[HasError] or not attempt[Value] then "Failure" else "Success",
-            resultOp = if result = "Success" then " = " else " <> ",
-            addendumEvalAttempt = if attempt[HasError] then @ValueToText(attempt[Error]) else "",
-            addendumEvalExpected = try @ValueToText(safeExpected) otherwise "...",
-            addendumEvalActual = try @ValueToText(safeActual) otherwise "...",
-            fact = [
-                Result = result & " " & addendumEvalAttempt,
-                Notes = _subject,
-                Details = " (" & addendumEvalExpected & resultOp & addendumEvalActual & ")"
-            ]
-        ][fact],
-    Facts = (_subject as text, _predicates as list) => List.Transform(_predicates, each Fact(_subject, _{0}, _{1})),
-    Facts.Summarize = (_facts as list) as table =>
-        [
-            Fact.CountSuccesses = (count, i) =>
-                [
-                    result = try i[Result],
-                    sum = if result[HasError] or not Text.StartsWith(result[Value], "Success") then count else count + 1
-                ][sum],
-            passed = List.Accumulate(_facts, 0, Fact.CountSuccesses),
-            total = List.Count(_facts),
-            format = if passed = total then "All #{0} Passed !!!" else "#{0} Passed - #{1} Failed",
-            result = if passed = total then "Success" else "Failed",
-            rate = Number.IntegerDivide(100 * passed, total),
-            header = [
-                Result = result,
-                Notes = Text.Format(format, {passed, total - passed}),
-                Details = Text.Format("#{0}% success rate", {rate})
-            ],
-            report = Table.FromRecords(List.Combine({{header}, _facts}))
-        ][report],
-    ValueToText = (value, optional depth) =>
-        let
-            List.TransformAndCombine = (list, transform, separator) =>
-                Text.Combine(List.Transform(list, transform), separator),
-            Serialize.Binary = (x) => "#binary(" & Serialize(Binary.ToList(x)) & ") ",
-            Serialize.Function = (x) =>
-                _serialize_function_param_type(
-                    Type.FunctionParameters(Value.Type(x)), Type.FunctionRequiredParameters(Value.Type(x))
-                )
-                    & " as "
-                    & _serialize_function_return_type(Value.Type(x))
-                    & " => (...) ",
-            Serialize.List = (x) => "{" & List.TransformAndCombine(x, Serialize, ", ") & "} ",
-            Serialize.Record = (x) =>
-                "[ "
-                    & List.TransformAndCombine(
-                        Record.FieldNames(x),
-                        (item) => Serialize.Identifier(item) & " = " & Serialize(Record.Field(x, item)),
-                        ", "
-                    )
-                    & " ] ",
-            Serialize.Table = (x) =>
-                "#table( type " & _serialize_table_type(Value.Type(x)) & ", " & Serialize(Table.ToRows(x)) & ") ",
-            Serialize.Identifier = Expression.Identifier,
-            Serialize.Type = (x) => "type " & _serialize_typename(x),
-            _serialize_typename = (x, optional funtype as logical) =>
-                /* Optional parameter: Is this being used as part of a function signature? */ let
-                    isFunctionType = (x as type) =>
-                        try if Type.FunctionReturn(x) is type then true else false otherwise false,
-                    isTableType = (x as type) =>
-                        try if Type.TableSchema(x) is table then true else false otherwise false,
-                    isRecordType = (x as type) =>
-                        try if Type.ClosedRecord(x) is type then true else false otherwise false,
-                    isListType = (x as type) => try if Type.ListItem(x) is type then true else false otherwise false
-                in
-                    if funtype = null and isTableType(x) then
-                        _serialize_table_type(x)
-                    else if funtype = null and isListType(x) then
-                        "{ " & @_serialize_typename(Type.ListItem(x)) & " }"
-                    else if funtype = null and isFunctionType(x) then
-                        "function " & _serialize_function_type(x)
-                    else if funtype = null and isRecordType(x) then
-                        _serialize_record_type(x)
-                    else if x = type any then
-                        "any"
-                    else
-                        let
-                            base = Type.NonNullable(x)
-                        in
-                            (if Type.IsNullable(x) then "nullable " else "")
-                                & (
-                                    if base = type anynonnull then
-                                        "anynonnull"
-                                    else if base = type binary then
-                                        "binary"
-                                    else if base = type date then
-                                        "date"
-                                    else if base = type datetime then
-                                        "datetime"
-                                    else if base = type datetimezone then
-                                        "datetimezone"
-                                    else if base = type duration then
-                                        "duration"
-                                    else if base = type logical then
-                                        "logical"
-                                    else if base = type none then
-                                        "none"
-                                    else if base = type null then
-                                        "null"
-                                    else if base = type number then
-                                        "number"
-                                    else if base = type text then
-                                        "text"
-                                    else if base = type time then
-                                        "time"
-                                    else if base = type type then
-                                        "type"
-                                    else /* Abstract types: */ if base = type function then
-                                        "function"
-                                    else if base = type table then
-                                        "table"
-                                    else if base = type record then
-                                        "record"
-                                    else if base = type list then
-                                        "list"
-                                    else
-                                        "any /*Actually unknown type*/"
-                                ),
-            _serialize_table_type = (x) =>
-                let
-                    schema = Type.TableSchema(x)
-                in
-                    "table "
-                        & (
-                            if Table.IsEmpty(schema) then
-                                ""
-                            else
-                                "["
-                                    & List.TransformAndCombine(
-                                        Table.ToRecords(Table.Sort(schema, "Position")),
-                                        each Serialize.Identifier(_[Name]) & " = " & _[Kind],
-                                        ", "
-                                    )
-                                    & "] "
-                        ),
-            _serialize_record_type = (x) =>
-                let
-                    flds = Type.RecordFields(x)
-                in
-                    if Record.FieldCount(flds) = 0 then
-                        "record"
-                    else
-                        "["
-                            & List.TransformAndCombine(
-                                Record.FieldNames(flds),
-                                (item) =>
-                                    Serialize.Identifier(item)
-                                        & "="
-                                        & _serialize_typename(Record.Field(flds, item)[Type]),
-                                ", "
-                            )
-                            & (if Type.IsOpenRecord(x) then ", ..." else "")
-                            & "]",
-            _serialize_function_type = (x) =>
-                _serialize_function_param_type(Type.FunctionParameters(x), Type.FunctionRequiredParameters(x))
-                    & " as "
-                    & _serialize_function_return_type(x),
-            _serialize_function_param_type = (t, n) =>
-                let
-                    funsig = Table.ToRecords(
-                        Table.TransformColumns(
-                            Table.AddIndexColumn(Record.ToTable(t), "isOptional", 1), {"isOptional", (x) => x > n}
-                        )
-                    )
-                in
-                    "("
-                        & List.TransformAndCombine(
-                            funsig,
-                            (item) =>
-                                (if item[isOptional] then "optional " else "")
-                                    & Serialize.Identifier(item[Name])
-                                    & " as "
-                                    & _serialize_typename(item[Value], true),
-                            ", "
-                        )
-                        & ")",
-            _serialize_function_return_type = (x) => _serialize_typename(Type.FunctionReturn(x), true),
-            Serialize = (x) as text =>
-                if x is binary then
-                    try Serialize.Binary(x) otherwise "null /*serialize failed*/"
-                else if x is date then
-                    try Expression.Constant(x) otherwise "null /*serialize failed*/"
-                else if x is datetime then
-                    try Expression.Constant(x) otherwise "null /*serialize failed*/"
-                else if x is datetimezone then
-                    try Expression.Constant(x) otherwise "null /*serialize failed*/"
-                else if x is duration then
-                    try Expression.Constant(x) otherwise "null /*serialize failed*/"
-                else if x is function then
-                    try Serialize.Function(x) otherwise "null /*serialize failed*/"
-                else if x is list then
-                    try Serialize.List(x) otherwise "null /*serialize failed*/"
-                else if x is logical then
-                    try Expression.Constant(x) otherwise "null /*serialize failed*/"
-                else if x is null then
-                    try Expression.Constant(x) otherwise "null /*serialize failed*/"
-                else if x is number then
-                    try Expression.Constant(x) otherwise "null /*serialize failed*/"
-                else if x is record then
-                    try Serialize.Record(x) otherwise "null /*serialize failed*/"
-                else if x is table then
-                    try Serialize.Table(x) otherwise "null /*serialize failed*/"
-                else if x is text then
-                    try Expression.Constant(x) otherwise "null /*serialize failed*/"
-                else if x is time then
-                    try Expression.Constant(x) otherwise "null /*serialize failed*/"
-                else if x is type then
-                    try Serialize.Type(x) otherwise "null /*serialize failed*/"
-                else
-                    "[#_unable_to_serialize_#]"
-        in
-            try Serialize(value) otherwise "<serialization failed>"
-in
-    [
-        Fact = Fact,
-        Facts = Facts,
-        SummarizeFacts = Facts.Summarize,
-        ValueToText = ValueToText
-    ]

src/powerbi-data-connector/utilities/Hash.pqm

@@ -1,12 +0,0 @@
-(Value as text) =>
-    let
-        Solution = Binary.ToText(
-            Binary.FromList(
-                Binary.ToList(Binary.Compress(Text.ToBinary(Value, BinaryEncoding.Base64), Compression.GZip))
-            )
-        )
-    in
-        if Value = null then
-            null
-        else
-            Solution

src/powerbi-data-connector/utilities/Table.GenerateByPage.pqm

@@ -1,23 +0,0 @@
-(getNextPage as function) as table =>
-    let
-        listOfPages = List.Generate(
-            () => getNextPage(null),
-            // get the first page of data
-            (lastPage) => lastPage <> null,
-            // stop when the function returns null
-            (lastPage) => getNextPage(lastPage)
-            // pass the previous page to the next function call
-        ),
-        // concatenate the pages together
-        tableOfPages = Table.FromList(listOfPages, Splitter.SplitByNothing(), {"Column1"}),
-        firstRow = tableOfPages{0} ?
-    in
-        // if we didn't get back any pages of data, return an empty table
-        // otherwise set the table type based on the columns of the first page
-        if (firstRow = null) then
-            Table.FromRows({})
-        else
-            Value.ReplaceType(
-                Table.ExpandTableColumn(tableOfPages, "Column1", Table.ColumnNames(firstRow[Column1])),
-                Value.Type(firstRow[Column1])
-            )

src/powerbi-data-connector/utilities/Table.ToNavigationTable.pqm

@@ -1,21 +0,0 @@
-(
-    table as table,
-    keyColumns as list,
-    nameColumn as text,
-    dataColumn as text,
-    itemKindColumn as text,
-    itemNameColumn as text,
-    isLeafColumn as text
-) as table =>
-    let
-        tableType = Value.Type(table),
-        newTableType = Type.AddTableKey(tableType, keyColumns, true) meta [
-            NavigationTable.NameColumn = nameColumn,
-            NavigationTable.DataColumn = dataColumn,
-            NavigationTable.ItemKindColumn = itemKindColumn,
-            Preview.DelayColumn = itemNameColumn,
-            NavigationTable.IsLeafColumn = isLeafColumn
-        ],
-        navigationTable = Value.ReplaceType(table, newTableType)
-    in
-        navigationTable

src/powerbi-data-connector/utilities/Value.WaitFor.pqm

@@ -1,14 +0,0 @@
-(producer as function, interval as function, optional count as number) as any =>
-    let
-        list = List.Generate(
-            () => {0, null},
-            (state) => state{0} <> null and (count = null or state{0} < count),
-            (state) =>
-                if state{1} <> null then
-                    {null, state{1}}
-                else
-                    {1 + state{0}, Function.InvokeAfter(() => producer(state{0}), interval(state{0}))},
-            (state) => state{1}
-        )
-    in
-        List.Last(list)

src/powerbi-visual/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "editor.tabSize": 4,
+  "editor.tabSize": 2,
   "editor.insertSpaces": true,
   "files.eol": "\n",
   "files.watcherExclude": {
@@ -7,12 +7,10 @@
     "**/node_modules/**": true,
     ".tmp": true
   },
-  "files.exclude": {
-    ".tmp": true
-  },
   "files.associations": {
     "*.resjson": "json"
   },
+  "editor.formatOnSave": true,
   "search.exclude": {
     ".tmp": true,
     "typings": true

src/powerbi-visual/README.md

@@ -76,6 +76,29 @@ You'll need to properly set up the certificate in order to be able to use the ho
 
 > Hot Reload will only work on PowerBI Web (**not** on Desktop).
 
+### Local dev guide (for powerbi-visual)
+
+1. Cd into `./src/powerbi-visual`
+1. Run `npm install`
+1. To ensure proper SSL cert usage
+   1. Ensure [mkcert](https://github.com/FiloSottile/mkcert) is installed
+   1. Run `npm run generate-certs`
+   1. If you're on Windows or WSL2, you'll need to copy over the root CA to the Windows side and install it there as a trusted root CA.
+      1. WSL2: Typically its in `~/.local/share/mkcert/rootCA.pem` on WSL2. From bash, `cd` to that folder and then do `explorer.exe .` to open it in Windows Explorer and then copy the pem file to someplace better accessible.
+      1. Windows: Typically its in `%LOCALAPPDATA%\mkcert\`.
+   1. Open `crtmgr` and install it into **Trusted Root Certification Authorities**. "Certificates - Current User" > "Trusted Root Certification Authorities" > "Certificates" > Right Click "All Tasks" > "Import" > "Local Machine" > "Place all certificates in the following store" > "Trusted Root Certification Authorities". You may have to set the cert filter to "All Files" to see the `.pem` file.
+   1. After the cert is installed you may have to restart your browser & dev server
+1. Run `npm run dev`
+1. PowerBI -> Home > New Report > Paste Or manually enter date > Auto-create > Create
+1. In the report, click on 'Edit' to open edit mode, and add a "Developer Visual" visual
+
+#### Source map issues
+
+Make sure you're running the dev build (`npm run dev`) and in your browser's dev tools trigger "Clear source maps cache" and "Enable JavaScript source maps". When everything's working, you should be able to click on the "App mounted" console message's file reference link which will take you to the source-mapped source code in dev tools.
+
+Its still a bit janky in that it maye show multiple files with the same name in the file tree,
+but one of those is gonna be the real fully source mapped one.
+
 ### Contributing
 
 Please make sure you read the [contribution guidelines](.github/CONTRIBUTING.md) for an overview of the best practices we try to follow.

src/powerbi-visual/capabilities.json

@@ -1,29 +1,24 @@
 {
   "dataRoles": [
-    {
-      "displayName": "Model URL",
-      "kind": "Grouping",
-      "name": "stream"
-    },
     {
       "displayName": "Version Object ID",
-      "kind": "Grouping",
-      "name": "parentObject"
+      "kind": "Measure",
+      "name": "rootObjectId"
     },
     {
-      "displayName": "Object ID",
+      "displayName": "Object IDs",
       "kind": "Grouping",
-      "name": "object"
+      "name": "objectIds"
+    },
+    {
+      "displayName": "Object Data (Tooltip)",
+      "kind": "Measure",
+      "name": "tooltipData"
     },
     {
       "displayName": "Color By",
       "kind": "Grouping",
-      "name": "objectColorBy"
-    },
-    {
-      "displayName": "Tooltip Data",
-      "kind": "Measure",
-      "name": "objectData"
+      "name": "colorBy"
     }
   ],
   "dataViewMappings": [
@@ -32,28 +27,18 @@
         "rows": {
           "dataReductionAlgorithm": {
             "top": {
-              "count": 30000
+              "count": 150000
             }
           },
           "select": [
             {
               "bind": {
-                "to": "stream"
-              }
-            },
-            {
-              "bind": {
-                "to": "parentObject"
-              }
-            },
-            {
-              "bind": {
-                "to": "objectColorBy"
+                "to": "colorBy"
               }
             },
             {
               "for": {
-                "in": "object"
+                "in": "objectIds"
               }
             }
           ]
@@ -61,71 +46,99 @@
         "values": {
           "select": [
             {
-              "bind": {
-                "to": "objectData"
+              "for": {
+                "in": "rootObjectId"
+              }
+            },
+            {
+              "for": {
+                "in": "tooltipData"
               }
             }
           ]
         }
-      }
+      },
+      "conditions": [
+        {
+          "colorBy": { "max": 1 },
+          "objectIds": { "max": 1 },
+          "rootObjectId": { "max": 1 }
+        }
+      ]
     }
   ],
   "objects": {
+    "storedData": {
+      "properties": {
+        "speckleObjects": {
+          "type": { "text": true }
+        },
+        "receiveInfo": {
+          "type": { "text": true }
+        }
+      }
+    },
+    "workspace": {
+      "properties": {
+        "brandingHidden": {
+          "type": { "bool": true }
+        }
+      }
+    },
+    "viewMode": {
+      "properties": {
+        "defaultViewMode": {
+          "type": { "text": true }
+        },
+        "navbarHidden": {
+          "type": { "bool": true }
+        }
+      }
+    },
     "camera": {
       "properties": {
         "defaultView": {
-          "type": {
-            "enumeration": [
-              {
-                "displayName": "Perspective",
-                "value": "perspective"
-              },
-              {
-                "displayName": "Top",
-                "value": "top"
-              },
-              {
-                "displayName": "Front",
-                "value": "front"
-              },
-              {
-                "displayName": "Left",
-                "value": "left"
-              },
-              {
-                "displayName": "Back",
-                "value": "back"
-              },
-              {
-                "displayName": "Right",
-                "value": "right"
-              }
-            ]
-          }
+          "type": { "text": true }
         },
-        "allowCameraUnder": {
+        "isOrtho": {
+          "type": { "bool": true }
+        },
+        "isGhost": {
+          "type": { "bool": true }
+        },
+        "zoomOnFilter": {
+          "type": { "bool": true }
+        }
+      }
+    },
+    "cameraPosition": {
+      "properties": {
+        "positionX": {
+          "type": { "text": true }
+        },
+        "positionY": {
+          "type": { "text": true }
+        },
+        "positionZ": {
+          "type": { "text": true }
+        },
+        "targetX": {
+          "type": { "text": true }
+        },
+        "targetY": {
+          "type": { "text": true }
+        },
+        "targetZ": {
+          "type": { "text": true }
+        }
+      }
+    },
+    "dataLoading": {
+      "properties": {
+        "internalizeData": {
           "type": {
             "bool": true
           }
-        },
-        "zoomOnDataChange": {
-          "type": {
-            "bool": true
-          }
-        },
-        "projection": {
-          "type": {
-            "enumeration": [
-              {
-                "displayName": "Perspective",
-                "value": "perspective"
-              },
-              {
-                "displayName": "Orthographic",
-                "value": "orthographic"
-              }
-            ]
-          }
         }
       }
     },
@@ -205,14 +218,7 @@
     {
       "essential": true,
       "name": "WebAccess",
-      "parameters": [
-        "https://speckle.xyz",
-        "https://*.speckle.xyz",
-        "https://latest.speckle.dev",
-        "https://*.speckle.dev",
-        "https://analytics.speckle.systems",
-        "*"
-      ]
+      "parameters": ["https://analytics.speckle.systems", "http://localhost:29364", "*"]
     },
     {
       "essential": false,

src/powerbi-visual/package.json

@@ -7,31 +7,36 @@
   },
   "license": "MIT",
   "scripts": {
-    "pack": "webpack --config webpack.config.ts",
-    "build": "webpack --config webpack.config.dev.ts",
-    "serve": "webpack-dev-server --config webpack.config.dev.ts"
+    "generate-certs": "mkcert localhost",
+    "build": "webpack --config webpack.config.ts",
+    "build:dev": "webpack --config webpack.config.dev.ts",
+    "dev": "webpack-dev-server --config webpack.config.dev.ts"
   },
   "dependencies": {
     "@babel/runtime": "^7.21.5",
     "@babel/runtime-corejs3": "^7.21.5",
     "@headlessui/vue": "^1.7.13",
     "@heroicons/vue": "^2.0.12",
-    "@speckle/tailwind-theme": "2.14.7",
-    "@speckle/ui-components": "2.14.7",
-    "@speckle/viewer": "^2.18.14",
+    "@speckle/objectloader2": "2.26.5",
+    "@speckle/tailwind-theme": "2.23.2",
+    "@speckle/ui-components": "2.23.2",
+    "@speckle/viewer": "2.26.5",
     "color-interpolate": "^1.0.5",
     "core-js": "^3.30.2",
     "lodash": "^4.17.21",
+    "nanoevents": "^9.1.0",
+    "pako": "^2.1.0",
+    "pinia": "^2.3.0",
     "postcss-loader": "^7.3.0",
     "postcss-preset-env": "^8.4.1",
-    "powerbi-visuals-api": "~5.4.0",
-    "powerbi-visuals-utils-colorutils": "^6.0.1",
-    "powerbi-visuals-utils-dataviewutils": "^6.0.1",
-    "powerbi-visuals-utils-formattingmodel": "^5.0.0",
-    "powerbi-visuals-utils-interactivityutils": "^6.0.2",
-    "powerbi-visuals-utils-tooltiputils": "^6.0.1",
+    "powerbi-visuals-api": "^5.11.0",
+    "powerbi-visuals-utils-colorutils": "^6.0.5",
+    "powerbi-visuals-utils-dataviewutils": "^6.1.0",
+    "powerbi-visuals-utils-formattingmodel": "^6.0.4",
+    "powerbi-visuals-utils-interactivityutils": "^6.0.4",
+    "powerbi-visuals-utils-tooltiputils": "^6.0.4",
     "regenerator-runtime": "^0.13.11",
-    "vuex": "^4.1.0"
+    "vue-tippy": "^6.7.1"
   },
   "devDependencies": {
     "@babel/core": "^7.21.8",
@@ -41,10 +46,11 @@
     "@types/lodash": "^4.14.194",
     "@types/node": "^20.1.7",
     "@types/regenerator-runtime": "^0.13.1",
-    "@types/three": "^0.152.0",
+    "@types/three": "^0.140.0",
     "@types/webpack": "^5.28.1",
     "@typescript-eslint/eslint-plugin": "^5.59.2",
     "@typescript-eslint/parser": "^5.59.2",
+    "@vueuse/core": "^13.2.0",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
     "base64-inline-loader": "^2.0.1",
@@ -53,11 +59,13 @@
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-vue": "^9.13.0",
     "extra-watch-webpack-plugin": "^1.0.3",
+    "html-webpack-plugin": "^5.6.3",
     "json-loader": "^0.5.7",
     "mini-css-extract-plugin": "^2.7.5",
     "postcss": "^8.4.23",
     "postcss-import": "^15.1.0",
-    "powerbi-visuals-webpack-plugin": "^4.0.0",
+    "powerbi-visuals-tools": "^5.6.0",
+    "powerbi-visuals-webpack-plugin": "^4.1.0",
     "prettier": "^2.8.8",
     "style-loader": "^3.3.2",
     "tailwindcss": "^3.3.2",
@@ -66,12 +74,17 @@
     "tsconfig-paths-webpack-plugin": "^4.0.1",
     "typescript": "^5.0.4",
     "user-agent-data-types": "^0.3.1",
-    "vue": "^3.3.4",
-    "vue-loader": "^17.1.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.83.0",
-    "webpack-bundle-analyzer": "^4.8.0",
-    "webpack-cli": "^5.1.1",
-    "webpack-dev-server": "^4.15.0"
-  }
+    "vue": "^3.5.13",
+    "vue-loader": "^17.4.2",
+    "vue-template-compiler": "^2.7.16",
+    "webpack": "^5.97.1",
+    "webpack-bundle-analyzer": "^4.10.2",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.2"
+  },
+  "version": "3.0.0",
+  "engines": {
+    "node": "^20.17.0"
+  },
+  "packageManager": "yarn@4.9.1+sha512.f95ce356460e05be48d66401c1ae64ef84d163dd689964962c6888a9810865e39097a5e9de748876c2e0bf89b232d583c33982773e9903ae7a76257270986538"
 }

src/powerbi-visual/pbiviz.json

@@ -2,9 +2,9 @@
   "visual": {
     "name": "Speckle PowerBI Viewer",
     "displayName": "Speckle PowerBI Viewer",
-    "guid": "powerbiSpeckleVisualAA98F06515D847E8ACB33BAB487244E0",
+    "guid": "specklePowerBiVisual",
     "visualClassName": "Visual",
-    "version": "2.19.0",
+    "version": "3.0.0.0",
     "description": "An interactive 3D viewer for Speckle Data",
     "supportUrl": "https://speckle.community",
     "gitHubUrl": "https://github.com/specklesystems/speckle-powerbi-visuals"

src/powerbi-visual/src/App.vue

@@ -1,19 +1,42 @@
-<script setup lang="ts">
-import HomeView from './views/HomeView.vue'
-import ViewerView from './views/ViewerView.vue'
-import { computed } from 'vue'
-import { useStore } from 'vuex'
-import { storeKey } from 'src/injectionKeys'
-
-let store = useStore(storeKey)
-let status = computed(() => {
-  return store.state.status
-})
-</script>
-
 <template>
-  <ViewerView v-if="status == 'valid'" />
+  <div
+    v-if="visualStore.loadingProgress"
+    class="absolute top-1/2 left-1/2 w-1/2 -translate-x-1/2 z-50 text-center text-sm"
+  >
+    <!-- Progress Bar -->
+    <LoadingBar :progress="visualStore.loadingProgress"></LoadingBar>
+  </div>
+
+  <div
+    v-if="visualStore.commonError"
+    class="absolute top-11 left-1/2 -translate-x-1/2 z-100 bg-white bg-opacity-70 text-black text-center text-sm px-4 py-1 rounded shadow font-medium cursor-default"
+  >
+    {{ visualStore.commonError }}
+  </div>
+
+  <ViewerView v-if="visualStore.isViewerReadyToLoad" />
   <HomeView v-else />
 </template>
 
-<style scoped></style>
+<script setup lang="ts">
+import HomeView from './views/HomeView.vue'
+import ViewerView from './views/ViewerView.vue'
+import { onMounted } from 'vue'
+import { useVisualStore } from './store/visualStore'
+import LoadingBar from '@src/components/loading/LoadingBar.vue'
+
+const visualStore = useVisualStore()
+
+onMounted(() => {
+  console.log('App mounted')
+})
+</script>
+
+<style>
+.tippy-box[data-theme~='custom'] {
+  font-size: 10px;
+  padding: 0px 0px;
+  border-radius: 4px;
+  text-align: center;
+}
+</style>

src/powerbi-visual/src/components/ViewerControls.vue

@@ -1,111 +1,146 @@
-<script setup lang="ts">
-import {
-  VideoCameraIcon,
-  CubeIcon,
-  ArrowsPointingOutIcon,
-  PaintBrushIcon
-} from '@heroicons/vue/24/solid'
-import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
-import { CanonicalView, SpeckleView } from '@speckle/viewer'
-import ButtonToggle from 'src/components/controls/ButtonToggle.vue'
-import ButtonGroup from 'src/components/controls/ButtonGroup.vue'
-import ButtonSimple from 'src/components/controls/ButtonSimple.vue'
-import { inject, watch } from 'vue'
-import { hostKey, viewerHandlerKey } from 'src/injectionKeys'
-import { resetPalette } from 'src/utils/matrixViewUtils'
-
-const emits = defineEmits(['update:sectionBox', 'view-clicked', 'clear-palette'])
-const props = withDefaults(defineProps<{ sectionBox: boolean; views: SpeckleView[] }>(), {
-  sectionBox: false,
-  views: () => []
-})
-const viewerHandler = inject(viewerHandlerKey)
-const canonicalViews = [
-  { name: 'Top' },
-  { name: 'Front' },
-  { name: 'Left' },
-  { name: 'Back' },
-  { name: 'Right' }
-]
-
-const onZoomExtentsClicked = (ev: MouseEvent) => {
-  console.log('Zoom extents clicked', viewerHandler)
-  viewerHandler.zoomExtents()
-}
-const host = inject(hostKey)
-const onClearPalletteClicked = (ev: MouseEvent) => {
-  console.log('Clear pallette clicked')
-  resetPalette()
-  emits('clear-palette')
-}
-</script>
-
 <template>
-  <ButtonGroup>
-    <ButtonSimple flat secondary @click="onZoomExtentsClicked">
-      <ArrowsPointingOutIcon class="h-5 w-5" />
-    </ButtonSimple>
-    <Menu as="div" class="relative z-30">
-      <MenuButton v-slot="{ open }" as="template">
-        <ButtonToggle flat secondary :active="open">
-          <VideoCameraIcon class="h-5 w-5" />
-        </ButtonToggle>
-      </MenuButton>
-      <Transition
-        enter-active-class="transform ease-out duration-300 transition"
-        enter-from-class="translate-y-2 opacity-0 sm:translate-y-0 sm:translate-x-2"
-        enter-to-class="translate-y-0 opacity-100 sm:translate-x-0"
-        leave-active-class="transition ease-in duration-100"
-        leave-from-class="opacity-100"
-        leave-to-class="opacity-0"
+  <div class="space-y-2">
+    <ViewerControlsButtonGroup>
+      <!-- Zoom extend -->
+      <ViewerControlsButtonToggle flat tooltip="Zoom extends" @click="onZoomExtentsClicked">
+        <ArrowsPointingOutIcon class="h-4 w-4 md:h-5 md:w-5" />
+      </ViewerControlsButtonToggle>
+      <!-- Zoom on Filter -->
+      <ViewerControlsButtonToggle
+        :tooltip="
+          visualStore.isZoomOnFilterActive
+            ? 'Move camera on filter'
+            : 'Keep camera position on filter'
+        "
+        flat
+        @click="toggleZoomOnFilter"
       >
-        <MenuItems
-          class="absolute w-60 left-2 -translate-y-8 bottom-2 bg-foundation max-h-64 simple-scrollbar overflow-y-auto outline outline-2 outline-primary-muted rounded-lg shadow-lg overflow-hidden flex flex-col"
-        >
-          <MenuItem
-            v-for="view in canonicalViews"
-            :key="view.name"
-            v-slot="{ active }"
-            as="template"
-          >
-            <button
-              :class="{
-                'bg-primary text-foreground-on-primary': active,
-                'text-foreground': !active,
-                'text-sm py-2 transition': true
-              }"
-              @click="$emit('view-clicked', view.name.toLowerCase() as CanonicalView)"
-            >
-              {{ view.name }}
-            </button>
-          </MenuItem>
-          <MenuItem v-for="view in views" :key="view.name" v-slot="{ active }" as="template">
-            <button
-              :class="{
-                'bg-primary text-foreground-on-primary': active,
-                'text-foreground': !active,
-                'text-sm py-2 transition': true
-              }"
-              @click="$emit('view-clicked', view)"
-            >
-              {{ view.view.name ?? view.name }}
-            </button>
-          </MenuItem>
-        </MenuItems>
-      </Transition>
-    </Menu>
-    <ButtonToggle
-      flat
-      secondary
-      :active="sectionBox"
-      @click="$emit('update:sectionBox', !sectionBox)"
-    >
-      <CubeIcon class="h-5 w-5" />
-    </ButtonToggle>
-    <ButtonSimple flat secondary @click="onClearPalletteClicked">
-      <PaintBrushIcon class="h-5 w-5" />
-    </ButtonSimple>
-  </ButtonGroup>
+        <ZoomToFit v-if="visualStore.isZoomOnFilterActive" class="h-5 w-5" />
+        <ZoomToFit v-else class="h-5 w-5 opacity-30" />
+      </ViewerControlsButtonToggle>
+      <!-- Ghost / Hidden -->
+      <ViewerControlsButtonToggle
+        :tooltip="
+          visualStore.isGhostActive
+            ? 'Hide ghosted objects on filter'
+            : 'Show ghosted objects on filter'
+        "
+        flat
+        @click="toggleGhostHidden"
+      >
+        <Ghost v-if="visualStore.isGhostActive" class="h-5 w-5" />
+        <Ghost v-else class="h-5 w-5 opacity-30" />
+      </ViewerControlsButtonToggle>
+    </ViewerControlsButtonGroup>
+    <ViewerControlsButtonGroup>
+      <!-- View Modes -->
+      <ViewerViewModesMenu
+        :open="viewModesOpen"
+        @force-close-others="activeControl = 'none'"
+        @update:open="(value) => toggleActiveControl(value ? 'viewModes' : 'none')"
+        @view-mode-clicked="(value) => $emit('view-mode-clicked', value)"
+      />
+      <!-- Views -->
+      <ViewerViewsMenu
+        :open="viewsOpen"
+        :views="views"
+        @force-close-others="activeControl = 'none'"
+        @update:open="(value) => toggleActiveControl(value ? 'views' : 'none')"
+        @view-clicked="(view) => $emit('view-clicked', view)"
+      />
+      <!-- Perspective/Ortho -->
+      <ViewerControlsButtonToggle
+        flat
+        secondary
+        tooltip="Projection"
+        :active="visualStore.isOrthoProjection"
+        @click="toggleProjection"
+      >
+        <Perspective v-if="visualStore.isOrthoProjection" class="h-3.5 md:h-4 w-4" />
+        <PerspectiveMore v-else class="h-3.5 md:h-4 w-4" />
+      </ViewerControlsButtonToggle>
+    </ViewerControlsButtonGroup>
+  </div>
 </template>
 
-<style scoped></style>
+<script setup lang="ts">
+import { ArrowsPointingOutIcon } from '@heroicons/vue/24/solid'
+import { SpeckleView } from '@speckle/viewer'
+import { computed, ref } from 'vue'
+import { useVisualStore } from '@src/store/visualStore'
+import ViewerControlsButtonGroup from './viewer/controls/ViewerControlsButtonGroup.vue'
+import ViewerControlsButtonToggle from './viewer/controls/ViewerControlsButtonToggle.vue'
+
+import ViewerViewModesMenu from './viewer/view-modes/ViewerViewModesMenu.vue'
+import ViewerViewsMenu from './viewer/views/ViewerViewsMenu.vue'
+
+import Perspective from '../components/global/icon/Perspective.vue'
+import PerspectiveMore from '../components/global/icon/PerspectiveMore.vue'
+
+import Ghost from '../components/global/icon/Ghost.vue'
+import ZoomToFit from '../components/global/icon/ZoomToFit.vue'
+
+const visualStore = useVisualStore()
+
+const emits = defineEmits([
+  'update:sectionBox',
+  'view-clicked',
+  'toggle-projection',
+  'clear-palette',
+  'view-mode-clicked'
+])
+withDefaults(defineProps<{ sectionBox: boolean; views: SpeckleView[] }>(), {
+  sectionBox: false
+})
+
+type ActiveControl =
+  | 'none'
+  | 'viewModes'
+  | 'views'
+  | 'sun'
+  | 'projection'
+  | 'sectionBox'
+  | 'explode'
+  | 'settings'
+
+const activeControl = ref<ActiveControl>('none')
+
+const onZoomExtentsClicked = (ev: MouseEvent) => {
+  visualStore.viewerEmit('zoomExtends')
+}
+
+const toggleActiveControl = (control: ActiveControl) => {
+  activeControl.value = activeControl.value === control ? 'none' : control
+}
+
+const toggleProjection = () => {
+  visualStore.viewerEmit('toggleProjection')
+  visualStore.setIsOrthoProjection(!visualStore.isOrthoProjection)
+  visualStore.writeIsOrthoToFile()
+}
+
+const toggleGhostHidden = () => {
+  visualStore.setIsGhost(!visualStore.isGhostActive)
+  visualStore.viewerEmit('toggleGhostHidden', visualStore.isGhostActive)
+  visualStore.writeIsGhostToFile()
+}
+
+const toggleZoomOnFilter = () => {
+  visualStore.setIsZoomOnFilterActive(!visualStore.isZoomOnFilterActive)
+  visualStore.writeZoomOnFilterToFile()
+}
+
+const viewModesOpen = computed({
+  get: () => activeControl.value === 'viewModes',
+  set: (value) => {
+    activeControl.value = value ? 'viewModes' : 'none'
+  }
+})
+
+const viewsOpen = computed({
+  get: () => activeControl.value === 'views',
+  set: (value) => {
+    activeControl.value = value ? 'views' : 'none'
+  }
+})
+</script>

src/powerbi-visual/src/components/ViewerWrapper.vue

@@ -1,184 +1,272 @@
+<template>
+  <div>
+    <transition name="slide-fade">
+      <nav
+        v-show="!visualStore.isNavbarHidden"
+        class="fixed top-0 h-9 flex items-center bg-foundation border border-outline-2 w-full transition z-20 cursor-default"
+      >
+        <div class="flex items-center transition-all justify-between w-full">
+          <div
+            v-if="visualStore.receiveInfo.workspaceName"
+            class="flex items-center gap-2 p-0.5 pr-1.5 hover:bg-highlight-2 rounded ml-2"
+          >
+            <WorkspaceAvatar
+              :name="visualStore.receiveInfo.workspaceName"
+              :logo="visualStore.receiveInfo.workspaceLogo"
+            ></WorkspaceAvatar>
+            <div class="min-w-0 truncate flex-grow text-left text-xs">
+              <span>{{ visualStore.receiveInfo.workspaceName }}</span>
+            </div>
+          </div>
+          <div v-else>
+            <div class="flex items-center hover:cursor-pointer" @click="goToSpeckleWebsite">
+              <div class="max-[200px]:hidden block ml-2">
+                <img class="w-6 h-auto ml-1 mr-2 my-1" src="@assets/logo-big.png" />
+              </div>
+              <div class="font-sans font-medium">Speckle</div>
+            </div>
+          </div>
+
+          <div class="flex items-center space-x-2">
+            <FormButton
+              v-if="visualStore.latestAvailableVersion && !visualStore.isConnectorUpToDate && visualStore.isRunningInDesktop"
+              v-tippy="{
+                content: 'New connector version is available.<br>Click to download.',
+                allowHTML: true
+              }"
+              color="outline"
+              size="sm"
+              @click="visualStore.downloadLatestVersion"
+            >
+              Update
+            </FormButton>
+            <div class="font-thin text-xs text-gray-400">
+              v{{ visualStore.receiveInfo.version }}
+            </div>
+            <button
+              class="text-gray-400 hover:text-gray-700 transition"
+              title="Hide navbar"
+              @click="visualStore.toggleNavbar()"
+            >
+              <ChevronUpIcon class="w-4 h-4" />
+            </button>
+          </div>
+        </div>
+      </nav>
+    </transition>
+
+    <div
+      v-if="!isInteractive"
+      class="absolute left-1/2 -translate-x-1/2 z-20 bg-white bg-opacity-70 text-black text-center text-xs px-4 py-1 rounded shadow font-medium cursor-default transition-all duration-300"
+      :class="visualStore.isNavbarHidden ? 'top-1' : 'top-11'"
+    >
+      <strong>Object IDs</strong>
+      field is needed for interactivity with other visuals.
+    </div>
+
+    <div v-if="visualStore.isNavbarHidden" class="fixed top-0 right-0 z-20">
+      <button
+        class="transition opacity-50 hover:opacity-100"
+        title="Show navbar"
+        @click="visualStore.toggleNavbar()"
+      >
+        <ChevronDownIcon class="w-4 h-4 text-gray-400" />
+      </button>
+    </div>
+
+    <transition name="slide-left">
+      <ViewerControls
+        v-show="!visualStore.isNavbarHidden"
+        v-model:section-box="bboxActive"
+        :views="views"
+        class="fixed top-11 left-2 z-30"
+        @view-clicked="(view) => viewerHandler.setView(view)"
+        @view-mode-clicked="(viewMode) => viewerHandler.setViewMode(viewMode)"
+      />
+    </transition>
+
+    <div v-if="visualStore.isFilterActive" class="absolute bottom-5 left-1/2 -translate-x-1/2 z-50">
+      <FormButton size="sm" @click="visualStore.resetFilters(), selectionHandler.reset()">
+        Reset filters
+      </FormButton>
+    </div>
+
+    <div
+      class="absolute z-10 flex items-center text-xs cursor-pointer"
+      :class="visualStore.isBrandingHidden ? 'bottom-0 right-0' : 'bottom-2 right-2'"
+      @click.stop="goToSpeckleWebsite"
+    >
+      <!-- TODO: fade bottom here as transition -->
+      <transition name="fade-bottom">
+        <div
+          v-if="!visualStore.isBrandingHidden"
+          class="flex items-center justify-center font-thin"
+        >
+          <div class="">Powered by</div>
+          <img class="w-4 h-auto mx-1" src="@assets/logo-big.png" />
+          <div class="font-medium">Speckle</div>
+        </div>
+      </transition>
+      <button
+        v-if="visualStore.receiveInfo && visualStore.receiveInfo.canHideBranding"
+        class="transition opacity-50 hover:opacity-100 ml-1"
+        :title="visualStore.isBrandingHidden ? '' : 'Hide branding'"
+        @click.stop="visualStore.toggleBranding()"
+      >
+        <ChevronUpIcon v-if="visualStore.isBrandingHidden" class="w-4 h-4 text-gray-400" />
+        <ChevronDownIcon v-else class="w-4 h-4" />
+      </button>
+    </div>
+
+    <div
+      ref="container"
+      class="fixed h-full w-full z-0 cursor-default"
+      @click="onCanvasClick"
+      @auxclick="onCanvasAuxClick"
+    />
+  </div>
+</template>
+
 <script async setup lang="ts">
-import {
-  computed,
-  inject,
-  onBeforeUnmount,
-  onMounted,
-  provide,
-  Ref,
-  ref,
-  watch,
-  watchEffect
-} from 'vue'
-import { useStore } from 'vuex'
+import FormButton from '@src/components/form/FormButton.vue'
+import { computed, inject, onBeforeUnmount, onMounted, Ref, ref } from 'vue'
+import { currentOS, OS } from '../utils/detectOS'
 import ViewerControls from 'src/components/ViewerControls.vue'
-import { CanonicalView, SpeckleView } from '@speckle/viewer'
-import { CommonLoadingBar } from '@speckle/ui-components'
-import ViewerHandler from 'src/handlers/viewerHandler'
+import { SpeckleView } from '@speckle/viewer'
 import { useClickDragged } from 'src/composables/useClickDragged'
-import { isMultiSelect } from 'src/utils/isMultiSelect'
-import {
-  selectionHandlerKey,
-  storeKey,
-  tooltipHandlerKey,
-  viewerHandlerKey
-} from 'src/injectionKeys'
-import { SpeckleDataInput } from 'src/types'
-import { debounce, throttle } from 'lodash'
-import { ContextOption } from 'src/settings/colorSettings'
+import { useVisualStore } from '@src/store/visualStore'
+import { ViewerHandler } from '@src/plugins/viewer'
+import { selectionHandlerKey, tooltipHandlerKey } from '@src/injectionKeys'
+import { ChevronDownIcon, ChevronUpIcon } from '@heroicons/vue/24/outline'
+import WorkspaceAvatar from './workspace/WorkspaceAvatar.vue'
+
+const visualStore = useVisualStore()
+const { dragged } = useClickDragged()
 
 const selectionHandler = inject(selectionHandlerKey)
 const tooltipHandler = inject(tooltipHandlerKey)
-const store = useStore(storeKey)
-const { dragged } = useClickDragged()
 
 let viewerHandler: ViewerHandler = null
-let ac = new AbortController()
 
 const container = ref<HTMLElement>()
 let bboxActive = ref(false)
 let views: Ref<SpeckleView[]> = ref([])
-let updateTask: Ref<Promise<void>> = ref(null)
-let setupTask: Promise<void> = null
 
-const isLoading = computed(() => updateTask.value != null)
-const input = computed(() => store.state.input)
-const settings = computed(() => store.state.settings)
+const isInteractive = computed(
+  () => visualStore.fieldInputState.rootObjectId && visualStore.fieldInputState.objectIds
+)
 
-const onCameraMoved = throttle((_) => {
-  const pos = tooltipHandler.currentTooltip?.worldPos
-  if (!pos) return
-  const screenPos = viewerHandler.getScreenPosition(pos)
-  tooltipHandler.move(screenPos)
-}, 50)
+const goToSpeckleWebsite = () => visualStore.host.launchUrl('https://speckle.systems')
 
-onMounted(() => {
-  viewerHandler = new ViewerHandler(container.value)
-  provide<ViewerHandler>(viewerHandlerKey, viewerHandler)
-  setupTask = viewerHandler
-    .init()
-    .then(() => viewerHandler.addCameraUpdateEventListener(onCameraMoved))
-    .finally(async () => {
-      if (input.value) await cancelAndHandleDataUpdate()
-      viewerHandler.updateSettings(settings.value)
-    })
+onMounted(async () => {
+  console.log('Viewer Wrapper mounted')
+  viewerHandler = new ViewerHandler()
+  await viewerHandler.init(container.value)
+  
+  // Set up event listener for object clicks from the FilteredSelectionExtension
+  viewerHandler.emitter.on('objectClicked', handleObjectClicked)
+
+  visualStore.setViewerEmitter(viewerHandler.emit)
 })
 
 onBeforeUnmount(async () => {
   await viewerHandler.dispose()
 })
 
-const debounceUpdate = throttle(cancelAndHandleDataUpdate, 500)
-const debounceSettingsUpdate = throttle(() => viewerHandler.updateSettings(settings.value), 500)
-watch(input, debounceUpdate)
-watch(settings, debounceSettingsUpdate)
-
-watchEffect(() => {
-  if (!isLoading.value) viewerHandler?.setSectionBox(bboxActive.value, input.value.objectIds)
-})
-
-function handleDataUpdate(input: Ref<SpeckleDataInput>, signal: AbortSignal) {
-  updateTask.value = setupTask
-    .then(async () => {
-      signal.throwIfAborted()
-      // Clear previous selection
-      await viewerHandler.selectObjects(null)
-
-      // Load
-      await viewerHandler.loadObjectsWithAutoUnload(
-        input.value.objectsToLoad,
-        console.log,
-        console.error,
-        signal
-      )
-
-      // Color
-      await viewerHandler.colorObjectsByGroup(input.value.colorByIds)
-
-      await viewerHandler.unIsolateObjects()
-      const objectsToIsolate =
-        input.value.selectedIds.length == 0 ? input.value.objectIds : input.value.selectedIds
-      if (settings.value.color.context.value != ContextOption.show)
-        await viewerHandler.isolateObjects(
-          objectsToIsolate,
-          settings.value.color.context.value === ContextOption.ghosted
-        )
-      if (settings.value.camera.zoomOnDataChange.value) viewerHandler.zoom(objectsToIsolate)
-
-      // Update available views
-      views.value = viewerHandler.getViews()
-    })
-    .catch((e: Error) => {
-      console.log('Loading operation was aborted', e)
-    })
-    .finally(() => {
-      updateTask.value = null
-    })
-}
-
-async function cancelAndHandleDataUpdate() {
-  console.log('Input has changed', input.value)
-  if (updateTask.value) {
-    ac.abort('New input is available')
-    console.log('Cancelling previous load job')
-    await updateTask.value
-    ac = new AbortController()
-  }
-  const signal = ac.signal
-  handleDataUpdate(input, signal)
-}
-
-async function onCanvasClick(ev: MouseEvent) {
+async function handleObjectClicked(hit: any, isMultiSelect: boolean, mouseEvent?: PointerEvent) {
+  // Skip if dragging occurred
   if (dragged.value) return
-  const intersectResult = await viewerHandler.intersect({ x: ev.clientX, y: ev.clientY })
-  const multi = isMultiSelect(ev)
-  const hit = intersectResult?.hit
+  
+  console.log('🎯 Object clicked in ViewerWrapper:', hit, isMultiSelect)
+  
   if (hit) {
+    visualStore.setPostClickSkipNeeded(true)
     const id = hit.object.id as string
-    if (multi || !selectionHandler.isSelected(id)) await selectionHandler.select(id, multi)
-    tooltipHandler.show(hit, { x: ev.clientX, y: ev.clientY })
+    if (isMultiSelect || !selectionHandler.isSelected(id)) {
+      await selectionHandler.select(id, isMultiSelect)
+    }
+    
+    // Show tooltip if we have mouse coordinates
+    if (mouseEvent) {
+      tooltipHandler.show(hit, { x: mouseEvent.clientX, y: mouseEvent.clientY })
+    }
+    
     const selection = selectionHandler.getCurrentSelection()
     const ids = selection.map((s) => s.id)
     await viewerHandler.selectObjects(ids)
   } else {
+    visualStore.setPostClickSkipNeeded(false)
     tooltipHandler.hide()
-    if (!multi) {
+    if (!isMultiSelect) {
       selectionHandler.clear()
       await viewerHandler.selectObjects(null)
     }
   }
 }
 
-async function onCanvasAuxClick(ev: MouseEvent) {
-  if (ev.button != 2 || dragged.value) return
-  const intersectResult = await viewerHandler.intersect({ x: ev.clientX, y: ev.clientY })
-  await selectionHandler.showContextMenu(ev, intersectResult?.hit)
+function onCanvasClick(ev: MouseEvent) {
+  // This click handler allows the viewer's built-in input system to handle clicks
+  // The viewer will emit ViewerEvent.ObjectClicked events which the SelectionExtension handles
+  console.log('🖱️ Canvas click detected:', ev.clientX, ev.clientY)
+  
+  // Let the event propagate to the viewer's input system
+  // The viewer should handle the click and emit ViewerEvent.ObjectClicked
 }
 
-function onClearPalette() {
-  cancelAndHandleDataUpdate()
+async function onCanvasAuxClick(ev: MouseEvent) {
+  if (ev.button !== 2 || dragged.value) return
+  
+  // For right-clicks, we need to get the object at the click position
+  // Since FilteredSelectionExtension doesn't handle right-clicks, we'll ask it for current selection
+  const selectedObjects = viewerHandler.selection.getSelectedObjects()
+  const hit = selectedObjects.length > 0 ? {
+    guid: selectedObjects[0].id,
+    object: selectedObjects[0],
+    point: { x: 0, y: 0, z: 0 } // We don't have exact point for context menu
+  } : null
+  
+  await selectionHandler.showContextMenu(ev, hit)
 }
 </script>
 
-<template>
-  <div class="flex flex-col justify-center items-center">
-    <div
-      ref="container"
-      class="fixed h-full w-full z-0"
-      @click="onCanvasClick"
-      @auxclick="onCanvasAuxClick"
-    />
-    <div class="z-30 w-1/2 px-10">
-      <common-loading-bar :loading="isLoading" />
-    </div>
-    <viewer-controls
-      v-if="!isLoading"
-      v-model:section-box="bboxActive"
-      :views="views"
-      class="fixed bottom-6"
-      @view-clicked="(view) => viewerHandler.setView(view)"
-      @clearPalette="onClearPalette"
-    />
-  </div>
-</template>
-<style scoped></style>
+<style scoped>
+.slide-fade-enter-active,
+.slide-fade-leave-active {
+  transition: all 0.3s ease;
+}
+.slide-fade-enter-from,
+.slide-fade-leave-to {
+  opacity: 0;
+  transform: translateY(-100%);
+}
+.slide-fade-enter-to,
+.slide-fade-leave-from {
+  opacity: 1;
+  transform: translateY(0);
+}
+
+.slide-left-enter-active,
+.slide-left-leave-active {
+  transition: all 0.3s ease;
+}
+.slide-left-enter-from,
+.slide-left-leave-to {
+  opacity: 0;
+  transform: translateX(-20px);
+}
+
+.fade-bottom-enter-active,
+.fade-bottom-leave-active {
+  transition: all 0.3s ease;
+}
+.fade-bottom-enter-from,
+.fade-bottom-leave-to {
+  opacity: 0;
+  transform: translateY(10px);
+}
+.fade-bottom-enter-to,
+.fade-bottom-leave-from {
+  opacity: 1;
+  transform: translateY(0);
+}
+</style>

src/powerbi-visual/src/components/controls/ButtonGroup.vue

@@ -1,8 +0,0 @@
-<template>
-  <button
-    class="bg-foundation text-foreground shadow-md rounded-lg h-10 flex justify-center space-x-2 px-1"
-  >
-    <slot></slot>
-  </button>
-</template>
-<script setup lang="ts"></script>

src/powerbi-visual/src/components/controls/ButtonSimple.vue

@@ -1,45 +0,0 @@
-<template>
-  <button
-    ref="button"
-    :class="`transition rounded-lg w-10 h-10 flex items-center justify-center ${shadowClasses} ${colorClasses} active:scale-[0.9] outline-none`"
-  >
-    <slot></slot>
-  </button>
-</template>
-<script setup lang="ts">
-import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
-
-let active = ref(false)
-let button = ref<HTMLElement>()
-
-const props = defineProps<{
-  flat?: boolean
-  secondary?: boolean
-}>()
-
-const shadowClasses = computed(() => (props.flat ? '' : 'shadow-md'))
-
-const colorClasses = computed(() => {
-  const parts = []
-  if (active.value) {
-    if (props.secondary) parts.push('bg-foundation text-primary')
-    else parts.push('bg-primary text-foreground-on-primary')
-  } else {
-    parts.push('bg-foundation text-foreground')
-  }
-  return parts.join(' ')
-})
-
-const onPointerDown = () => (active.value = true)
-const onPointerUp = () => (active.value = false)
-
-onMounted(() => {
-  button.value.addEventListener('pointerdown', onPointerDown)
-  button.value.addEventListener('pointerup', onPointerUp)
-})
-
-onBeforeUnmount(() => {
-  button.value.removeEventListener('pointerdown', onPointerDown)
-  button.value.removeEventListener('pointerup', onPointerUp)
-})
-</script>

src/powerbi-visual/src/components/form/FormButton.vue

@@ -0,0 +1,294 @@
+<template>
+  <Component
+    :is="to ? linkComponent : 'button'"
+    :href="to"
+    :to="to"
+    :type="buttonType"
+    :external="external"
+    :class="buttonClasses"
+    :disabled="isDisabled"
+    role="button"
+    :style="
+      color !== 'subtle' && !text
+        ? `box-shadow: -1px 1px 4px 0px #0000000a inset; box-shadow: 0px 2px 2px 0px #0000000d;`
+        : ''
+    "
+    @click="onClick"
+  >
+    <Component :is="finalLeftIcon" v-if="finalLeftIcon" :class="iconClasses" />
+    <slot v-if="!hideText">Button</slot>
+    <Component :is="iconRight" v-if="iconRight || !loading" :class="iconClasses" />
+  </Component>
+</template>
+<script setup lang="ts">
+import { isObjectLike } from 'lodash'
+import type { PropAnyComponent } from '../../helpers/common/components'
+import { computed, resolveDynamicComponent } from 'vue'
+import type { Nullable } from '@speckle/shared'
+import type { FormButtonStyle, FormButtonSize } from '../../helpers/form/button'
+
+const emit = defineEmits<{
+  /**
+   * Emit MouseEvent on click
+   */
+  (e: 'click', val: MouseEvent): void
+}>()
+
+const props = defineProps<{
+  /**
+   * URL to which to navigate - can be a relative (app) path or an absolute link for an external URL
+   */
+  to?: string
+  /**
+   * Choose from one of 3 button sizes
+   */
+  size?: FormButtonSize
+  /**
+   * If set, will make the button take up all available space horizontally
+   */
+  fullWidth?: boolean
+  /**
+   * Similar to "link", but without an underline and possibly in different colors
+   */
+  text?: boolean
+  /**
+   * Will remove paddings and background. Use for links.
+   */
+  link?: boolean
+  /**
+   * color:
+   * primary: the default primary blue.
+   * outline: foundation background and outline
+   * subtle: no styling
+   */
+  color?: FormButtonStyle
+  /**
+   * Should rounded-full be added?:
+   */
+  rounded?: boolean
+  /**
+   * Whether the target location should be forcefully treated as an external URL
+   * (for relative paths this will likely cause a redirect)
+   */
+  external?: boolean
+  /**
+   * Whether to disable the button so that it can't be pressed
+   */
+  disabled?: boolean
+  /**
+   * If set, will have type set to "submit" to enable it to submit any parent forms
+   */
+  submit?: boolean
+  /**
+   * Add icon to the left from the text
+   */
+  iconLeft?: Nullable<PropAnyComponent>
+  /**
+   * Add icon to the right from the text
+   */
+  iconRight?: Nullable<PropAnyComponent>
+  /**
+   * Hide default slot (when you want to show icons only)
+   */
+  hideText?: boolean
+  /**
+   * Customize component to be used when rendering links.
+   *
+   * The component will try to dynamically resolve NuxtLink and RouterLink and use those, if this is set to null.
+   */
+  linkComponent?: Nullable<PropAnyComponent>
+  /**
+   * Disables the button and shows a spinning loader
+   */
+  loading?: boolean
+}>()
+
+const NuxtLink = resolveDynamicComponent('NuxtLink')
+const RouterLink = resolveDynamicComponent('RouterLink')
+
+const linkComponent = computed(() => {
+  if (props.linkComponent) return props.linkComponent
+  if (props.external) return 'a'
+  if (isObjectLike(NuxtLink)) return NuxtLink
+  if (isObjectLike(RouterLink)) return RouterLink
+  return 'a'
+})
+
+const buttonType = computed(() => {
+  if (props.to) return undefined
+  if (props.submit) return 'submit'
+  return 'button'
+})
+
+const isDisabled = computed(() => props.disabled || props.loading)
+const finalLeftIcon = computed(() => props.iconLeft)
+
+const bgAndBorderClasses = computed(() => {
+  const classParts: string[] = []
+
+  const colorsBgBorder = {
+    subtle: [
+      'bg-transparent border-transparent text-foreground font-medium',
+      'hover:bg-primary-muted disabled:hover:bg-transparent focus-visible:border-foundation'
+    ],
+    outline: [
+      'bg-foundation border-outline-2 text-foreground font-medium',
+      'hover:bg-primary-muted disabled:hover:bg-foundation focus-visible:border-foundation'
+    ],
+    danger: [
+      'bg-danger border-danger-darker text-foundation font-medium',
+      'hover:bg-danger-darker disabled:hover:bg-danger focus-visible:border-foundation'
+    ],
+    primary: [
+      'bg-primary border-outline-1 text-foreground-on-primary font-semibold',
+      'hover:bg-primary-focus disabled:hover:bg-primary focus-visible:border-foundation'
+    ]
+  }
+
+  if (props.rounded) {
+    classParts.push('!rounded-full')
+  }
+
+  if (props.text || props.link) {
+    switch (props.color) {
+      case 'subtle':
+        classParts.push('text-foreground')
+        break
+      case 'outline':
+        classParts.push('text-foreground')
+        break
+      case 'danger':
+        classParts.push('text-danger')
+        break
+      case 'primary':
+      default:
+        classParts.push('text-primary')
+        break
+    }
+  } else {
+    switch (props.color) {
+      case 'subtle':
+        classParts.push(...colorsBgBorder.subtle)
+        break
+      case 'outline':
+        classParts.push(...colorsBgBorder.outline)
+        break
+      case 'danger':
+        classParts.push(...colorsBgBorder.danger)
+        break
+      case 'primary':
+      default:
+        classParts.push(...colorsBgBorder.primary)
+        break
+    }
+  }
+
+  return classParts.join(' ')
+})
+
+const sizeClasses = computed(() => {
+  switch (props.size) {
+    case 'sm':
+      return 'h-6 text-body-2xs'
+    case 'lg':
+      return 'h-10 text-body-sm'
+    default:
+    case 'base':
+      return 'h-8 text-body-xs'
+  }
+})
+
+const paddingClasses = computed(() => {
+  if (props.text || props.link) {
+    return 'p-0'
+  }
+
+  const hasIconLeft = !!props.iconLeft
+  const hasIconRight = !!props.iconRight
+  const hideText = props.hideText
+
+  switch (props.size) {
+    case 'sm':
+      if (hideText) return 'w-6'
+      if (hasIconLeft) return 'py-1 pr-2 pl-1'
+      if (hasIconRight) return 'py-1 pl-2 pr-1'
+      return 'px-2 py-1'
+    case 'lg':
+      if (hideText) return 'w-10'
+      if (hasIconLeft) return 'py-2 pr-6 pl-4'
+      if (hasIconRight) return 'py-2 pl-6 pr-4'
+      return 'px-6 py-2'
+    case 'base':
+    default:
+      if (hideText) return 'w-8'
+      if (hasIconLeft) return 'py-0 pr-4 pl-2'
+      if (hasIconRight) return 'py-0 pl-4 pr-2'
+      return 'px-4 py-0'
+  }
+})
+
+const generalClasses = computed(() => {
+  const baseClasses = [
+    'inline-flex justify-center items-center',
+    'text-center select-none whitespace-nowrap',
+    'outline outline-2 outline-transparent',
+    'transition duration-200 ease-in-out focus-visible:outline-outline-4'
+  ]
+
+  const additionalClasses = []
+
+  if (!props.text && !props.link) {
+    additionalClasses.push('rounded-md border')
+  }
+
+  if (props.fullWidth) {
+    additionalClasses.push('w-full')
+  } else if (!props.hideText) {
+    additionalClasses.push('max-w-max')
+  }
+  if (isDisabled.value) {
+    additionalClasses.push('cursor-not-allowed opacity-60')
+  }
+
+  return [...baseClasses, ...additionalClasses].join(' ')
+})
+
+const buttonClasses = computed(() => {
+  return [
+    generalClasses.value,
+    sizeClasses.value,
+    bgAndBorderClasses.value,
+    paddingClasses.value
+  ].join(' ')
+})
+
+const iconClasses = computed(() => {
+  const classParts: string[] = ['shrink-0']
+
+  switch (props.size) {
+    case 'sm':
+      classParts.push('h-4 w-4 p-0.5')
+      break
+    case 'lg':
+      classParts.push('h-6 w-6 p-1')
+      break
+    case 'base':
+    default:
+      classParts.push('h-6 w-6 p-1')
+      break
+  }
+
+  return classParts.join(' ')
+})
+
+const onClick = (e: MouseEvent) => {
+  if (isDisabled.value) {
+    e.preventDefault()
+    e.stopPropagation()
+    e.stopImmediatePropagation()
+    return
+  }
+
+  emit('click', e)
+}
+</script>

src/powerbi-visual/src/components/global/icon/Account.vue

@@ -0,0 +1,18 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M8 1C6.24288 1 4.81818 2.42334 4.81818 4.18004C4.81818 5.93674 6.24288 7.36008 8 7.36008C9.75712 7.36008 11.1818 5.93674 11.1818 4.18004C11.1818 2.42334 9.75712 1 8 1Z"
+      fill="currentColor"
+    />
+    <path
+      d="M6.18182 9.17649C4.42465 9.17649 3 10.6005 3 12.3578V14.6281H13V12.3578C13 10.6005 11.5754 9.17649 9.81818 9.17649H6.18182Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Bolt.vue

@@ -0,0 +1,18 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="m3.75 13.5 10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75Z"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      vector-effect="non-scaling-stroke"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Calendar.vue

@@ -0,0 +1,14 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M13 11.5H15.5V13H13V15.5H11.5V13H9V11.5H11.5V9H13V11.5ZM10.5 0.75C10.9142 0.75 11.25 1.08579 11.25 1.5V2H12C13.6569 2 15 3.34315 15 5V8H13.5V6.75H1.5V12C1.5 12.8284 2.17157 13.5 3 13.5H8V15H3C1.34315 15 0 13.6569 0 12V5C8.05333e-08 3.34315 1.34315 2 3 2H4.75V1.5C4.75 1.08579 5.08579 0.75 5.5 0.75C5.91421 0.75 6.25 1.08579 6.25 1.5V2H9.75V1.5C9.75 1.08579 10.0858 0.75 10.5 0.75ZM3 3.5C2.17157 3.5 1.5 4.17157 1.5 5V5.25H13.5V5C13.5 4.17157 12.8284 3.5 12 3.5H3Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Changelog.vue

@@ -0,0 +1,16 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M14.5 8C14.5 11.5899 11.5899 14.5 8 14.5C4.41015 14.5 1.5 11.5899 1.5 8C1.5 4.41015 4.41015 1.5 8 1.5C11.5899 1.5 14.5 4.41015 14.5 8ZM16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8ZM8.75 3.75C8.75 3.33579 8.41421 3 8 3C7.58579 3 7.25 3.33579 7.25 3.75V8V8.31066L7.46967 8.53033L9.72358 10.7842C10.0165 11.0771 10.4913 11.0771 10.7842 10.7842C11.0771 10.4913 11.0771 10.0165 10.7842 9.72358L8.75 7.68934V3.75Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Check.vue

@@ -0,0 +1,16 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M12.8849 5.91851L7.25614 11.74L3.99951 8.48337L4.93388 7.549L7.24028 9.8554L11.9349 5L12.8849 5.91851Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Colouring.vue

@@ -0,0 +1,14 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M17 2C17.7652 1.99996 18.5015 2.29233 19.0583 2.81728C19.615 3.34224 19.9501 4.06011 19.995 4.824L20 5C20.7956 5 21.5587 5.31607 22.1213 5.87868C22.6839 6.44129 23 7.20435 23 8C23.0001 9.55238 22.3984 11.0444 21.3215 12.1625C20.2446 13.2806 18.7763 13.9378 17.225 13.996L17 14H13L13.15 14.005C13.6262 14.0408 14.0738 14.2458 14.412 14.5829C14.7502 14.92 14.9567 15.3669 14.994 15.843L15 16V20C15.0002 20.5046 14.8096 20.9906 14.4665 21.3605C14.1234 21.7305 13.6532 21.9572 13.15 21.995L13 22H11C10.4954 22.0002 10.0094 21.8096 9.63945 21.4665C9.26947 21.1234 9.04284 20.6532 9.005 20.15L9 20V16C8.99984 15.4954 9.19041 15.0094 9.5335 14.6395C9.87659 14.2695 10.3468 14.0428 10.85 14.005L11 14V13C11 12.7551 11.09 12.5187 11.2527 12.3356C11.4155 12.1526 11.6397 12.0357 11.883 12.007L12 12H17C18.0609 12 19.0783 11.5786 19.8284 10.8284C20.5786 10.0783 21 9.06087 21 8C21 7.75507 20.91 7.51866 20.7473 7.33563C20.5845 7.15259 20.3603 7.03566 20.117 7.007L20 7L19.995 7.176C19.9519 7.90959 19.6411 8.60186 19.1215 9.12148C18.6019 9.6411 17.9096 9.95193 17.176 9.995L17 10H7C6.23479 10 5.49849 9.70767 4.94174 9.18272C4.38499 8.65776 4.04989 7.93989 4.005 7.176L4 7V5C3.99996 4.23479 4.29233 3.49849 4.81728 2.94174C5.34224 2.38499 6.06011 2.04989 6.824 2.005L7 2H17Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/ColouringOutline.vue

@@ -0,0 +1,31 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M5 5C5 4.46957 5.21071 3.96086 5.58579 3.58579C5.96086 3.21071 6.46957 3 7 3H17C17.5304 3 18.0391 3.21071 18.4142 3.58579C18.7893 3.96086 19 4.46957 19 5V7C19 7.53043 18.7893 8.03914 18.4142 8.41421C18.0391 8.78929 17.5304 9 17 9H7C6.46957 9 5.96086 8.78929 5.58579 8.41421C5.21071 8.03914 5 7.53043 5 7V5Z"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M19 6H20C20.5304 6 21.0391 6.21071 21.4142 6.58579C21.7893 6.96086 22 7.46957 22 8C22 9.32608 21.4732 10.5979 20.5355 11.5355C19.5979 12.4732 18.3261 13 17 13H12V15"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M10 16C10 15.7348 10.1054 15.4804 10.2929 15.2929C10.4804 15.1054 10.7348 15 11 15H13C13.2652 15 13.5196 15.1054 13.7071 15.2929C13.8946 15.4804 14 15.7348 14 16V20C14 20.2652 13.8946 20.5196 13.7071 20.7071C13.5196 20.8946 13.2652 21 13 21H11C10.7348 21 10.4804 20.8946 10.2929 20.7071C10.1054 20.5196 10 20.2652 10 20V16Z"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Community.vue

@@ -0,0 +1,16 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M8 14.5C8.23033 14.5 8.84266 14.2743 9.48679 12.986C9.79275 12.3741 10.0504 11.6156 10.2293 10.75H5.77067C5.94959 11.6156 6.20725 12.3741 6.51321 12.986C7.15734 14.2743 7.76967 14.5 8 14.5ZM5.55361 9.25C5.51859 8.84716 5.5 8.42956 5.5 8C5.5 7.57044 5.51859 7.15284 5.55361 6.75H10.4464C10.4814 7.15284 10.5 7.57044 10.5 8C10.5 8.42956 10.4814 8.84716 10.4464 9.25H5.55361ZM11.7574 10.75C11.5334 11.974 11.1641 13.0579 10.6914 13.9184C12.0984 13.2775 13.2369 12.1496 13.8913 10.75H11.7574ZM14.3799 9.25H11.9515C11.9834 8.84271 12 8.42523 12 8C12 7.57477 11.9834 7.15729 11.9515 6.75H14.3799C14.4587 7.15451 14.5 7.57243 14.5 8C14.5 8.42756 14.4587 8.84549 14.3799 9.25ZM4.04854 9.25H1.62008C1.54128 8.84549 1.5 8.42756 1.5 8C1.5 7.57243 1.54128 7.15451 1.62008 6.75H4.04854C4.01659 7.15729 4 7.57477 4 8C4 8.42523 4.01659 8.84271 4.04854 9.25ZM2.10868 10.75H4.2426C4.46661 11.974 4.83588 13.0579 5.30864 13.9184C3.90156 13.2775 2.7631 12.1496 2.10868 10.75ZM5.77067 5.25H10.2293C10.0504 4.38438 9.79275 3.6259 9.48679 3.01397C8.84266 1.72571 8.23033 1.5 8 1.5C7.76967 1.5 7.15734 1.72571 6.51321 3.01397C6.20725 3.6259 5.94959 4.38438 5.77067 5.25ZM11.7574 5.25H13.8913C13.2369 3.85044 12.0984 2.72251 10.6914 2.08162C11.1641 2.94207 11.5334 4.02603 11.7574 5.25ZM5.30864 2.08162C4.83588 2.94207 4.46661 4.02603 4.2426 5.25H2.10868C2.7631 3.85044 3.90156 2.72251 5.30864 2.08162ZM8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Connectors.vue

@@ -0,0 +1,38 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M6.06301 2.75L13.2511 9.93813L11.4539 11.7354C10.9854 12.2227 10.4243 12.6116 9.80367 12.8795C9.183 13.1473 8.51514 13.2887 7.83918 13.2953C7.16321 13.302 6.49271 13.1737 5.86691 12.9181C5.2411 12.6625 4.67257 12.2846 4.19456 11.8066C3.71656 11.3286 3.33869 10.76 3.08306 10.1342C2.82743 9.50843 2.69918 8.83793 2.70581 8.16196C2.71244 7.486 2.85382 6.81814 3.12167 6.19747C3.38953 5.5768 3.77848 5.01579 4.26576 4.54725L6.06301 2.75Z"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M1 15L4.0625 11.9375"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M10.625 1L7.5625 4.0625"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M15 5.375L11.9375 8.4375"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Cursor.vue

@@ -0,0 +1,5 @@
+<template>
+  <svg width="18" height="19" viewBox="0 0 18 19" xmlns="http://www.w3.org/2000/svg">
+    <path d="M4.33333 17L1 1L16 9.25806L8.5 10.5L4.33333 17Z" stroke="#2563eb" />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Discussions.vue

@@ -0,0 +1,16 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M3 2.5C2.17157 2.5 1.5 3.17157 1.5 4V10C1.5 10.8284 2.17157 11.5 3 11.5H3.75H4.5V12.25V13.1004L6.56675 11.6378L6.76146 11.5H7H13C13.8284 11.5 14.5 10.8284 14.5 10V4C14.5 3.17157 13.8284 2.5 13 2.5H3ZM0 4C0 2.34315 1.34315 1 3 1H13C14.6569 1 16 2.34315 16 4V10C16 11.6569 14.6569 13 13 13H7.23854L4.18325 15.1622L3 15.9996V14.55V13C1.34315 13 0 11.6569 0 10V4Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Documentation.vue

@@ -0,0 +1,16 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M6 1C5.0335 1 4.25 1.7835 4.25 2.75V4H3C1.89543 4 1 4.89543 1 6V13C1 14.1046 1.89543 15 3 15H13C14.1046 15 15 14.1046 15 13V6C15 4.89543 14.1046 4 13 4H11.75V2.75C11.75 1.7835 10.9665 1 10 1H6ZM10.25 4V2.75C10.25 2.61193 10.1381 2.5 10 2.5H6C5.86193 2.5 5.75 2.61193 5.75 2.75V4H10.25ZM3 5.5H13C13.2761 5.5 13.5 5.72386 13.5 6V7H2.5V6C2.5 5.72386 2.72386 5.5 3 5.5ZM2.5 8.5V13C2.5 13.2761 2.72386 13.5 3 13.5H13C13.2761 13.5 13.5 13.2761 13.5 13V8.5H9V10H7V8.5H2.5Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Edit.vue

@@ -0,0 +1,31 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M7.8335 7.83337H7.00016C6.55814 7.83337 6.13421 8.00897 5.82165 8.32153C5.50909 8.63409 5.3335 9.05801 5.3335 9.50004V17C5.3335 17.4421 5.50909 17.866 5.82165 18.1786C6.13421 18.4911 6.55814 18.6667 7.00016 18.6667H14.5002C14.9422 18.6667 15.3661 18.4911 15.6787 18.1786C15.9912 17.866 16.1668 17.4421 16.1668 17V16.1667"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M18.9875 7.48759C19.3157 7.15938 19.5001 6.71424 19.5001 6.25009C19.5001 5.78594 19.3157 5.34079 18.9875 5.01259C18.6593 4.68438 18.2142 4.5 17.75 4.5C17.2858 4.5 16.8407 4.68438 16.5125 5.01259L9.5 12.0001V14.5001H12L18.9875 7.48759Z"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M15.3335 6.16663L17.8335 8.66663"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Explode.vue

@@ -0,0 +1,59 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M17.8438 11.1563L21.9062 7.21875V14.2187L17.9062 18.2188L17.8438 11.1563Z"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M5.19123 15.2186L2.15624 18.2188L2.09375 11.1563L6.15626 7.21875V11.7187"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M14.9062 7.71875L18.4062 3.21875H11.9062L7.90625 7.71875H14.9062Z"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M13.9062 11.7188H5.40625V20.7188H13.9062V11.7188Z"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M11.6562 8.20312V10.9687"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M16.9062 5.46875L20.1563 5.46875L20.1563 8.71875"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M14.6562 14.4531L17.0313 14.4686"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Feedback.vue

@@ -0,0 +1,16 @@
+<template>
+  <svg
+    width="16"
+    height="16"
+    viewBox="0 0 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M3 2.5C2.17157 2.5 1.5 3.17157 1.5 4V10C1.5 10.8284 2.17157 11.5 3 11.5H3.75H4.5V12.25V13.1004L6.56675 11.6378L6.76146 11.5H7H13C13.8284 11.5 14.5 10.8284 14.5 10V4C14.5 3.17157 13.8284 2.5 13 2.5H3ZM0 4C0 2.34315 1.34315 1 3 1H13C14.6569 1 16 2.34315 16 4V10C16 11.6569 14.6569 13 13 13H7.23854L4.18325 15.1622L3 15.9996V14.55V13C1.34315 13 0 11.6569 0 10V4Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/FileExplorer.vue

@@ -0,0 +1,14 @@
+<template>
+  <svg
+    width="18"
+    height="16"
+    viewBox="0 0 18 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    stroke="currentColor"
+  >
+    <path
+      d="M11.4998 3.75H12.2498V3V2.16667C12.2498 1.66177 12.6582 1.25 13.1665 1.25H15.6665C16.1714 1.25 16.5832 1.65832 16.5832 2.16667V5.5C16.5832 6.0049 16.1749 6.41667 15.6665 6.41667H13.1665C12.6641 6.41667 12.2498 6.00245 12.2498 5.5V4.66667V3.91667H11.4998H9.83317H9.08317V4.66667V10.5083C9.08317 11.3725 9.79396 12.0833 10.6582 12.0833H11.4998H12.2498V11.3333V10.5C12.2498 9.9951 12.6582 9.58333 13.1665 9.58333H15.6665C16.1714 9.58333 16.5832 9.99165 16.5832 10.5V13.8333C16.5832 14.3382 16.1749 14.75 15.6665 14.75H13.1665C12.6616 14.75 12.2498 14.3417 12.2498 13.8333V13V12.25H11.4998H10.6582C9.69738 12.25 8.9165 11.4691 8.9165 10.5083V4.66667V3.91667H8.1665H6.49984H5.74984V4.66667V5.5C5.74984 6.0049 5.34152 6.41667 4.83317 6.41667H2.33317C1.82827 6.41667 1.4165 6.00835 1.4165 5.5V2.16667C1.4165 1.66421 1.83072 1.25 2.33317 1.25H4.8415C5.3464 1.25 5.75817 1.65832 5.75817 2.16667V3V3.75H6.50817H11.4998Z"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/FreeOrbit.vue

@@ -0,0 +1,24 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M12 16H16V20"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M19.458 11.042C20.318 8.67599 20.18 6.46199 18.858 5.14199C16.586 2.86799 11.673 4.09699 7.88503 7.88499C4.09703 11.673 2.86803 16.586 5.14103 18.859C7.36803 21.085 12.128 19.952 15.881 16.344"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Gendo.vue

@@ -0,0 +1,16 @@
+<template>
+  <svg
+    width="38"
+    height="37"
+    viewBox="0 0 38 37"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M30.5695 7.84167C30.4459 7.87905 30.4465 8.05327 30.5704 8.08974L30.6008 8.09869C32.0949 8.53857 33.2612 9.70436 33.6956 11.1923C33.7314 11.3148 33.9059 11.3148 33.9425 11.1925C34.386 9.71452 35.5462 8.55207 37.0303 8.10336L37.0652 8.09282C37.1885 8.05553 37.1877 7.88161 37.064 7.84544L37.0283 7.835C35.5338 7.39799 34.3679 6.23128 33.938 4.74249C33.9028 4.62035 33.7287 4.62043 33.6922 4.7422C33.249 6.21893 32.0893 7.38202 30.6065 7.83048L30.5695 7.84167ZM31.4317 23.8166L31.4317 14.0863H31.4318V10.3168H31.4317V10.3162L26.998 10.3162V10.3168H17.2469L11.255 16.849V26.5794H11.2549V30.349H11.255V30.3494H15.6888V30.349L25.4397 30.349L31.4317 23.8166ZM26.998 26.5794L26.998 14.0863H15.6888L15.6888 26.5794H26.998Z"
+      fill="currentColor"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Ghost.vue

@@ -0,0 +1,28 @@
+<template>
+  <svg
+    width="800px"
+    height="800px"
+    viewBox="0 0 36 36"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    aria-hidden="true"
+    role="img"
+    class="iconify iconify--twemoji"
+    preserveAspectRatio="xMidYMid meet"
+  >
+    <path
+      stroke="#000"
+      fill="none"
+      stroke-width="2"
+      d="M36 11a2 2 0 0 0-4 0s-.011 3.285-3 3.894V12c0-6.075-4.925-11-11-11S7 5.925 7 12v3.237C1.778 16.806 0 23.231 0 27a2 2 0 0 0 4 0s.002-3.54 3.336-3.958C7.838 27.883 8.954 33 11 33h1c4 0 3 2 7 2s3-2 6-2s2.395 2 6 2a3 3 0 0 0 3-3c0-.675-2.274-4.994-3.755-9.268C35.981 21.348 36 14.58 36 11z"
+    ></path>
+    <circle fill="#000" stroke-width="1" cx="13" cy="12" r="2"></circle>
+    <circle fill="#000" cx="23" cy="12" r="3"></circle>
+    <path
+      stroke="#000"
+      stroke-width="2"
+      fill="none"
+      d="M22.192 19.491c2.65 1.987 3.591 5.211 2.1 7.199c-1.491 1.988-4.849 1.988-7.5 0c-2.65-1.987-3.591-5.211-2.1-7.199c1.492-1.989 4.849-1.988 7.5 0z"
+    ></path>
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/HandRotate.vue

@@ -0,0 +1,52 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M8 13V4.5C8 4.10218 8.15804 3.72064 8.43934 3.43934C8.72064 3.15804 9.10218 3 9.5 3C9.89782 3 10.2794 3.15804 10.5607 3.43934C10.842 3.72064 11 4.10218 11 4.5V12"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M11 11.5V9.5C11 9.10218 11.158 8.72064 11.4393 8.43934C11.7206 8.15804 12.1022 8 12.5 8C12.8978 8 13.2794 8.15804 13.5607 8.43934C13.842 8.72064 14 9.10218 14 9.5V12"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M14 10.5C14 10.1022 14.158 9.72064 14.4393 9.43934C14.7206 9.15804 15.1022 9 15.5 9C15.8978 9 16.2794 9.15804 16.5607 9.43934C16.842 9.72064 17 10.1022 17 10.5V12"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M17.0002 11.5C17.0002 11.1022 17.1582 10.7206 17.4395 10.4393C17.7208 10.158 18.1024 10 18.5002 10C18.898 10 19.2795 10.158 19.5608 10.4393C19.8421 10.7206 20.0002 11.1022 20.0002 11.5V16C20.0002 17.5913 19.368 19.1174 18.2428 20.2426C17.1176 21.3679 15.5915 22 14.0002 22H12.0002H12.2082C11.2145 22.0002 10.2364 21.7535 9.36157 21.2823C8.48676 20.811 7.7427 20.1299 7.19618 19.3L7.00018 19C6.68818 18.521 5.59318 16.612 3.71418 13.272C3.52263 12.9315 3.47147 12.5298 3.57157 12.1522C3.67166 11.7745 3.91513 11.4509 4.25018 11.25C4.60706 11.0359 5.02526 10.9471 5.43834 10.9978C5.85143 11.0486 6.23572 11.2359 6.53018 11.53L8.00018 13"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M2.54102 5.59497C3.30843 5.03394 4.13302 4.55561 5.00102 4.16797"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M14 3.45703C15.32 3.81103 16.558 4.35903 17.685 5.06903"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/HandSelect.vue

@@ -0,0 +1,66 @@
+<template>
+  <svg
+    width="25"
+    height="24"
+    viewBox="0 0 25 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M8.5 13V4.5C8.5 4.10218 8.65804 3.72064 8.93934 3.43934C9.22064 3.15804 9.60218 3 10 3C10.3978 3 10.7794 3.15804 11.0607 3.43934C11.342 3.72064 11.5 4.10218 11.5 4.5V12"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M11.5 11.5V9.5C11.5 9.10218 11.658 8.72064 11.9393 8.43934C12.2206 8.15804 12.6022 8 13 8C13.3978 8 13.7794 8.15804 14.0607 8.43934C14.342 8.72064 14.5 9.10218 14.5 9.5V12"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M14.5 10.5C14.5 10.1022 14.658 9.72064 14.9393 9.43934C15.2206 9.15804 15.6022 9 16 9C16.3978 9 16.7794 9.15804 17.0607 9.43934C17.342 9.72064 17.5 10.1022 17.5 10.5V12"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M17.5002 11.5C17.5002 11.1022 17.6582 10.7206 17.9395 10.4393C18.2208 10.158 18.6024 10 19.0002 10C19.398 10 19.7795 10.158 20.0608 10.4393C20.3421 10.7206 20.5002 11.1022 20.5002 11.5V16C20.5002 17.5913 19.868 19.1174 18.7428 20.2426C17.6176 21.3679 16.0915 22 14.5002 22H12.5002H12.7082C11.7145 22.0002 10.7364 21.7535 9.86157 21.2823C8.98676 20.811 8.2427 20.1299 7.69618 19.3L7.50018 19C7.18818 18.521 6.09318 16.612 4.21418 13.272C4.02263 12.9315 3.97147 12.5298 4.07157 12.1522C4.17166 11.7745 4.41513 11.4509 4.75018 11.25C5.10706 11.0359 5.52526 10.9471 5.93834 10.9978C6.35143 11.0486 6.73572 11.2359 7.03018 11.53L8.50018 13"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M5.5 3L4.5 2"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M4.5 7H3.5"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M14.5 3L15.5 2"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M15.5 6H16.5"
+      stroke="currentColor"
+      stroke-width="1.5"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/HandZoom.vue

@@ -0,0 +1,73 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <g clip-path="url(#clip0_614_5022)">
+      <path
+        d="M11 14V5.5C11 5.10218 11.158 4.72064 11.4393 4.43934C11.7206 4.15804 12.1022 4 12.5 4C12.8978 4 13.2794 4.15804 13.5607 4.43934C13.842 4.72064 14 5.10218 14 5.5V13"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M14 12.5V10.5C14 10.303 14.0388 10.108 14.1142 9.92597C14.1896 9.74399 14.3001 9.57863 14.4393 9.43934C14.5786 9.30005 14.744 9.18956 14.926 9.11418C15.108 9.0388 15.303 9 15.5 9C15.697 9 15.892 9.0388 16.074 9.11418C16.256 9.18956 16.4214 9.30005 16.5607 9.43934C16.6999 9.57863 16.8104 9.74399 16.8858 9.92597C16.9612 10.108 17 10.303 17 10.5V13"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M17 11.5C17 11.1022 17.158 10.7206 17.4393 10.4393C17.7206 10.158 18.1022 10 18.5 10C18.8978 10 19.2794 10.158 19.5607 10.4393C19.842 10.7206 20 11.1022 20 11.5V13"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M20.0002 12.5C20.0002 12.1022 20.1582 11.7206 20.4395 11.4393C20.7208 11.158 21.1024 11 21.5002 11C21.898 11 22.2795 11.158 22.5608 11.4393C22.8421 11.7206 23.0002 12.1022 23.0002 12.5V17C23.0002 18.5913 22.368 20.1174 21.2428 21.2426C20.1176 22.3679 18.5915 23 17.0002 23H15.0002H15.2082C14.2145 23.0002 13.2364 22.7535 12.3616 22.2823C11.4868 21.811 10.7427 21.1299 10.1962 20.3C10.1306 20.2002 10.0653 20.1002 10.0002 20C9.68818 19.521 8.59318 17.612 6.71418 14.272C6.52263 13.9315 6.47147 13.5298 6.57157 13.1522C6.67166 12.7745 6.91513 12.4509 7.25018 12.25C7.60706 12.0359 8.02526 11.9471 8.43834 11.9978C8.85143 12.0486 9.23572 12.2359 9.53018 12.53L11.0002 14"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M0.750039 6.36034L3.75004 6.36034L3.75004 9.36034"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M3.75068 6.36101C1.75068 8.36101 -0.249322 8.89698 2.25068 11.361"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M5.24999 0.750039L5.24999 3.75004L8.24999 3.75004"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M5.24969 3.7497C7.24969 1.7497 7.78565 -0.250299 10.2497 2.2497"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+    </g>
+    <defs>
+      <clipPath id="clip0_614_5022">
+        <rect width="24" height="24" fill="white" />
+      </clipPath>
+    </defs>
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/MeasurePerpendicular.vue

@@ -0,0 +1,90 @@
+<template>
+  <svg
+    width="36"
+    height="36"
+    viewBox="0 0 36 36"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M1.5 23.9655V3.00003L10.5 10.8621V31.5L1.5 23.9655Z"
+      stroke="#CBD5E1"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M1.5 3.00003L22.5 1.50003"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M1.5 24L22.5 22.5"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-dasharray="2 2"
+    />
+    <path
+      d="M10.5 31.5L31.5 30"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M10.5 11.25L31.5 9.75003"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M22.5 1.50003L31.5 9.34814V30"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M22.5 1.50003V22.5"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-dasharray="2 2"
+    />
+    <path
+      d="M22.5 22.5L31.5 30"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-dasharray="2 2"
+    />
+    <path
+      d="M6.04926 17.378L27.0493 15.878"
+      stroke="#3B82F6"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M4.37823 19.3902L7.10927 15.3896"
+      stroke="#3B82F6"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M25.6345 17.8902L28.3656 13.8896"
+      stroke="#3B82F6"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M4.96887 14.093L7.03114 20.663"
+      stroke="#3B82F6"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M26.2251 12.593L28.2874 19.163"
+      stroke="#3B82F6"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/MeasurePointToPoint.vue

@@ -0,0 +1,68 @@
+<template>
+  <svg
+    width="36"
+    height="36"
+    viewBox="0 0 36 36"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M3 25.4655V4.50003L12 12.3621V33L3 25.4655Z"
+      stroke="#CBD5E1"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M3 4.50003L24 3.00003"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M3 25.5L24 24"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-dasharray="2 2"
+    />
+    <path
+      d="M12 33L33 31.5"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M12 12.75L33 11.25"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M24 3.00003L33 10.8481V31.5"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <path
+      d="M24 3.00003V24"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-dasharray="2 2"
+    />
+    <path
+      d="M24 24L33 31.5"
+      stroke="#CBD5E1"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-dasharray="2 2"
+    />
+    <path
+      d="M3 25.5L33 10.5"
+      stroke="#3B82F6"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    />
+    <circle cx="3" cy="25.5" r="2.25" fill="#3B82F6" />
+    <circle cx="33" cy="10.5" r="2.25" fill="#3B82F6" />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/Measurements.vue

@@ -0,0 +1,27 @@
+<template>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    class="icon icon-tabler icon-tabler-ruler-measure"
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    fill="none"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+  >
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+    <path
+      d="M19.875 12c.621 0 1.125 .512 1.125 1.143v5.714c0 .631 -.504 1.143 -1.125 1.143h-15.875a1 1 0 0 1 -1 -1v-5.857c0 -.631 .504 -1.143 1.125 -1.143h15.75z"
+    />
+    <path d="M9 12v2" />
+    <path d="M6 12v3" />
+    <path d="M12 12v3" />
+    <path d="M18 12v3" />
+    <path d="M15 12v2" />
+    <path d="M3 3v4" />
+    <path d="M3 5h18" />
+    <path d="M21 3v4" />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/MousePan.vue

@@ -0,0 +1,18 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M19 11.5C19 17.299 17.5 22 12.5 22C7.5 22 6 17.299 6 11.5C6 5.70101 6 1 12.5 1C19 1 19 5.70101 19 11.5Z"
+      stroke="#94A3B8"
+    />
+    <path d="M6 9H19" stroke="#94A3B8" />
+    <path d="M19 9C19 6.5 19 1 12.5 1" stroke="#334155" />
+    <path d="M19.5 9H12" stroke="#334155" />
+    <path d="M12.5 0.5V9.5" stroke="#334155" />
+  </svg>
+</template>

src/powerbi-visual/src/components/global/icon/MouseRotate.vue

@@ -0,0 +1,18 @@
+<template>
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M19 11.5C19 17.299 17.5 22 12.5 22C7.5 22 6 17.299 6 11.5C6 5.70101 6 1 12.5 1C19 1 19 5.70101 19 11.5Z"
+      stroke="currentColor"
+    />
+    <path d="M6 9C6 6.5 6 1 12.5 1" stroke="#334155" />
+    <path d="M6 9H19" stroke="#94A3B8" />
+    <path d="M5.5 9H13" stroke="#334155" />
+    <path d="M12.5 0.5V9.5" stroke="#334155" />
+  </svg>
+</template>