Merge branch 'main' into npm

Author: max-sixty

.config/.markdown-link-check-local.json

@@ -1,7 +1,7 @@
 {
   "ignorePatterns": [
     {
-      "_comment_1": "Our pipeline depends only on our assets.",
+      "_comment_1": "Our pipeline should only depend on our assets.",
       "_comment_2": "If some third-party website breaks a link, we cover that in ./.markdown-link-check-all.json",
       "_comment_3": "So this excludes anything that's not a relative link to a file in our repo or a link to our file on the web.",
       "pattern": "^(?!https://github\\.com/(PRQL|prql)|https://prql-lang\\.org|https://raw\\.githubusercontent\\.com/(PRQL|prql)|[./]+|file://).*$"

.config/vscode-recommended/launch.json

@@ -0,0 +1,21 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "prqlc _a.prql",
+      "program": "${workspaceFolder}/target/debug/prqlc",
+      "args": ["debug", "semantics", "_a.prql"],
+      "env": {
+        "RUST_LOG": "debug",
+        "RUST_BACKTRACE": "1"
+      },
+      "preLaunchTask": "prqlc-build",
+      "cwd": "${workspaceFolder}"
+    }
+  ]
+}

.config/vscode-recommended/settings.json

@@ -0,0 +1,19 @@
+{
+  "nixEnvSelector.args": ".#full",
+  "nixEnvSelector.suggestion": false,
+  "nixEnvSelector.nixFile": "${workspaceRoot}/flake.nix",
+  //   "prettier.configPath": ".config/prettier.yaml",
+  "files.exclude": {
+    "**/.git": true,
+    "**/.svn": true,
+    "**/.hg": true,
+    "**/CVS": true,
+    "**/.DS_Store": true,
+    "**/Thumbs.db": true,
+    "web/book/book": true,
+    "web/build": true,
+    ".direnv": true,
+    ".pytest_cache": true,
+    ".mypy_cache": true
+  }
+}

.config/vscode-recommended/tasks.json

@@ -0,0 +1,16 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "prqlc-build",
+      "type": "cargo",
+      "command": "build",
+      "args": ["--package=prqlc"],
+      "presentation": {
+        "reveal": "silent",
+        "clear": true
+      },
+      "problemMatcher": ["$rustc"]
+    }
+  ]
+}

.github/.codecov.yml

@@ -2,7 +2,7 @@ comment: false
 
 ignore:
   # Contains code for integration tests which don't run in coverage
-  - "crates/prql-compiler/tests/integration/**"
+  - "prqlc/prql-compiler/tests/integration/**"
 
 coverage:
   status:

.github/actions/build-prql-python/action.yaml

@@ -1,6 +1,6 @@
 name: build-wheel
 description:
-  "Use maturin to build python dists of prql-python. Conditional if checks
+  "Use maturin to build python dists of prql-python. Conditional `if` checks
   ensure only the correct OS build is called."
 inputs:
   target:
@@ -10,37 +10,33 @@ inputs:
 runs:
   using: composite
   steps:
-    - run: ./.github/set_version.sh
-      shell: bash
-    - uses: Swatinem/rust-cache@v2
-      with:
-        save-if: ${{ github.ref == 'refs/heads/main' }}
-        prefix-key: ${{ env.version }}
-        shared-key: python
+    # There's no point caching here, because the maturin action uses a container.
     - uses: messense/maturin-action@v1
       if: inputs.target == 'source'
       with:
         command: sdist
-        args: -o dist -m bindings/prql-python/Cargo.toml
+        args: -o target/python -m prqlc/bindings/python/Cargo.toml
     - uses: messense/maturin-action@v1
       if: runner.os == 'Linux' && inputs.target != 'source'
       with:
         target: ${{ inputs.target }}
         manylinux: auto
         command: build
-        args: --release -o dist -m bindings/prql-python/Cargo.toml
+        args: --release -o target/python -m prqlc/bindings/python/Cargo.toml
     - uses: messense/maturin-action@v1
       if: runner.os == 'Windows' && inputs.target != 'source'
       with:
         command: build
-        args: --release -o dist -m bindings/prql-python/Cargo.toml
+        args: --release -o target/python -m prqlc/bindings/python/Cargo.toml
     - uses: messense/maturin-action@v1
       if: runner.os == 'macOS' && inputs.target != 'source'
       with:
         command: build
-        args: --release -o dist --universal2 -m bindings/prql-python/Cargo.toml
+        args:
+          --release -o target/python --universal2 -m
+          prqlc/bindings/python/Cargo.toml
     - name: Upload wheels
       uses: actions/upload-artifact@v3
       with:
         name: wheels
-        path: dist
+        path: target/python

.github/actions/build-prqlc/action.yaml

@@ -22,7 +22,7 @@ runs:
     - run: rustup target add ${{ inputs.target }}
       shell: bash
 
-    - run: ./.github/set_version.sh
+    - run: ./.github/workflows/scripts/set_version.sh
       shell: bash
 
     - uses: Swatinem/rust-cache@v2
@@ -75,7 +75,7 @@ runs:
         export ARTIFACT_NAME="prqlc-v${{ github.ref_type == 'tag' && github.ref_name || 0 }}-${{ matrix.target }}.tar.gz"
         echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >>"$GITHUB_ENV"
         cd target/${{ matrix.target }}/${{ inputs.profile == 'release' && 'release' || 'debug' }}
-        tar czf "../../../${ARTIFACT_NAME}" prqlc ../../../LICENSE -C ../../../crates/prqlc/ README.md
+        tar czf "../../../${ARTIFACT_NAME}" prqlc ../../../LICENSE ../../../prqlc/prqlc/README.md
 
     - name: Create artifact for Windows
       shell: bash
@@ -84,7 +84,7 @@ runs:
         export ARTIFACT_NAME="prqlc-v${{ github.ref_type == 'tag' && github.ref_name || 0 }}-${{ matrix.target }}.zip"
         echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >>"$GITHUB_ENV"
         cd target/${{ matrix.target }}/${{ inputs.profile == 'release' && 'release' || 'debug' }}
-        7z a "../../../${ARTIFACT_NAME}" prqlc.exe ../../../LICENSE ../../../crates/prqlc/README.md
+        7z a "../../../${ARTIFACT_NAME}" prqlc.exe ../../../LICENSE ../../../prqlc/prqlc/README.md
 
     - name: Upload prqlc
       uses: actions/upload-artifact@v3

.github/actions/time-compilation/action.yaml

@@ -9,7 +9,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - run: ./.github/set_version.sh
+    - run: ./.github/workflows/scripts/set_version.sh
       shell: bash
     - name: 💰 Cache
       id: cache

.github/dependabot.yml

@@ -22,7 +22,7 @@ updates:
       prefix: "chore: "
 
   - package-ecosystem: "npm"
-    directory: "/bindings/prql-js"
+    directory: "/prqlc/bindings/js"
     schedule:
       interval: daily
     ignore:

.github/workflows/build-devcontainer.yaml

@@ -12,19 +12,15 @@ on:
         type: boolean
         default: false
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     runs-on: ubuntu-latest
     timeout-minutes: 3600
     steps:
       - name: 📂 Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - uses: docker/metadata-action@v4
+      - uses: docker/metadata-action@v5
         id: meta
         with:
           images: ghcr.io/${{ github.repository_owner }}/prql-devcontainer-base
@@ -33,32 +29,32 @@ jobs:
             type=raw,latest
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Prep args
         run: |
           echo "cargo_crates=$(yq -r '.vars.cargo_crates' Taskfile.yml)" >>"$GITHUB_ENV"
 
       - name: Build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         timeout-minutes: 3600
         with:
           context: .devcontainer/base-image
           build-args: |
             cargo_crates=${{ env.cargo_crates }}
           tags: ${{ steps.meta.outputs.tags }}
           platforms: linux/amd64, linux/arm64
-          push: ${{ inputs.push == 'true' }}
+          push: ${{ inputs.push }}
           # `type=gha` not active, see below
           cache-from: |
             ${{ steps.meta.outputs.tags }}

.github/workflows/build-web.yaml

@@ -10,11 +10,6 @@ env:
   RUSTFLAGS: "-C debuginfo=0"
   RUSTDOCFLAGS: "-Dwarnings"
 
-concurrency:
-  # See notes in `tests.yaml`
-  group: ${{ github.workflow }}-${{ github.ref }}-web
-  cancel-in-progress: true
-
 jobs:
   build-web:
     runs-on: ubuntu-latest
@@ -26,10 +21,10 @@ jobs:
 
     steps:
       - name: 📂 Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      # Website requires hugo
-      - name: Setup hugo
+      # Website requires Hugo
+      - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2.6.0
 
       - uses: baptiste0928/cargo-install@v2
@@ -54,7 +49,7 @@ jobs:
           cache: "npm"
           cache-dependency-path: "**/package-lock.json"
 
-      - run: ./.github/set_version.sh
+      - run: ./.github/workflows/scripts/set_version.sh
 
       - name: 💰 Cache
         uses: Swatinem/rust-cache@v2
@@ -75,3 +70,31 @@ jobs:
       - uses: actions/upload-pages-artifact@v2.0.0
         with:
           path: web/website/public/
+
+  build-codemirror-demo:
+    runs-on: ubuntu-latest
+
+    if: github.repository_owner == 'prql'
+
+    steps:
+      - name: 📂 Checkout code
+        uses: actions/checkout@v4
+      - name: 🧅 Setup Bun
+        uses: oven-sh/setup-bun@v1
+      - name: Install CodeMirror demo dependencies
+        working-directory: web/prql-codemirror-demo/
+        run: bun install
+      - name: Install Lezer dependencies
+        working-directory: grammars/prql-lezer/
+        run: bun install
+      - name: Build Lezer grammar
+        working-directory: grammars/prql-lezer/
+        run: bun run build
+      - name: Copy Lezer grammar into demo
+        working-directory: web/prql-codemirror-demo/
+        run: |
+          mkdir src/lang-prql/prql-lezer
+          cp ../../grammars/prql-lezer/dist/* src/lang-prql/prql-lezer/
+      - name: Build CodeMirror demo
+        working-directory: web/prql-codemirror-demo/
+        run: bun run build

.github/workflows/lint-megalinter.yaml

@@ -15,16 +15,12 @@ env: # Comment env block if you do not want to apply fixes
   APPLY_FIXES_EVENT: pull_request # Decide which event triggers application of fixes in a commit or a PR (pull_request, push, all)
   APPLY_FIXES_MODE: commit # If APPLY_FIXES is used, defines if the fixes are directly committed (commit) or posted in a PR (pull_request)
 
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   build:
     name: lint-megalinter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # If you use VALIDATE_ALL_CODEBASE = true, you can remove this line to improve performances
 
@@ -33,7 +29,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v7.3.0
+        uses: oxsecurity/megalinter@v7.4.0
         env:
           # All available variables are described in documentation
           # https://megalinter.io/configuration/
@@ -44,7 +40,7 @@ jobs:
 
       # Upload MegaLinter artifacts
       - name: Archive production artifacts
-        if: ${{ success() }} || ${{ failure() }}
+        if: always()
         uses: actions/upload-artifact@v3
         with:
           name: MegaLinter reports
@@ -92,7 +88,7 @@ jobs:
           env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' &&
           (github.event_name == 'push' ||
           github.event.pull_request.head.repo.full_name == github.repository)
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           branch:
             ${{ github.event.pull_request.head.ref || github.head_ref ||