Merge branch 'main' into format-comments

Author: max-sixty

.gitignore

@@ -42,7 +42,8 @@ codecov.json
 
 # Some paths we don't want to include. We could ignore these further down the
 # tree, but prettier relies on this file rather than resolving all the way down.
-**/.venv
-**/.nox
-**/vendor
+.venv
+.nox
+vendor
 .mypy_cache/
+.hypothesis/

Taskfile.yml

@@ -27,6 +27,9 @@ includes:
   web:
     taskfile: ./web
     dir: ./web
+  python:
+    taskfile: ./prqlc/bindings/prqlc-python
+    dir: ./prqlc/bindings/prqlc-python
 
 vars:
   # Keep in sync with .vscode/extensions.json
@@ -112,13 +115,7 @@ tasks:
 
   install-cargo-tools-binstall:
     cmds:
-      # Currently pinning 1.1.2 because of https://github.com/cargo-bins/cargo-binstall/issues/1292, and using `+stable` because it's not supported by 1.68.2.
-      - cmd:
-          # curl -L --proto '=https' --tlsv1.2 -sSf
-          # https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh
-          # | bash ||
-          rustup toolchain add stable && cargo +stable install --locked
-          cargo-binstall --version=1.1.2
+      - cmd: cargo install --locked cargo-binstall
         platforms: [linux, darwin]
       - "cargo binstall -y --locked {{.cargo_crates}}"
 
@@ -243,6 +240,7 @@ tasks:
       - cargo doc
       - task: web:build
       - task: build-each-crate
+      - task: python:build
 
   build-each-crate:
     summary: |
@@ -284,14 +282,15 @@ tasks:
 
     cmds:
       # TODO:
-      # - Add `prqlc-python` tests.
       # - We could add `prqlc-c` here.
       # - We deliberately don't test some other bindings, such as `prql-php`,
-      #   given they require more dependencies and aren't yet supported.
+      #   given they require more dependencies and aren't yet Supported. They
+      #   run in CI.
       - task: test-lint
       - task: test-rust
       - task: test-js
       - cargo insta test --accept --target=wasm32-unknown-unknown
+      - task: python:test
       - task: build-all
 
   test-rust:
@@ -383,26 +382,12 @@ tasks:
     dir: prqlc/bindings/php
     cmds:
       - vendor/bin/phpunit tests
-# The next three tasks are not used for either:
+# The next two tasks are not used for either:
 #  - the Dockerfile (installing brew takes forever)
 #    so the Dockerfile simply installs hugo & nodejs directly
 #  - the "desktop setup" - it uses other tasks in the Taskfile.yml
 # They remain in the Taskfile.yml as a hint if they should ever be needed
 
-# install-brew:
-#   # Initially added for building Docker container
-#   status:
-#     - which brew
-#   cmds:
-#     # https://stackoverflow.com/questions/58292862/how-to-install-homebrew-on-ubuntu-inside-docker-container
-#     - useradd -m -s /bin/zsh linuxbrew
-#     - usermod -aG sudo linuxbrew
-#     - mkdir -p /home/linuxbrew/.linuxbrew
-#     - chown -R linuxbrew /home/linuxbrew/.linuxbrew
-#     - export HOMEBREW_INSTALL_FROM_API=1
-#     - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
-#     - chown -R $CONTAINER_USER: /home/linuxbrew/.linuxbrew
-
 # install-hugo:
 #   cmds:
 #     # - /home/linuxbrew/.linuxbrew/bin/brew install hugo

prqlc/bindings/prqlc-python/Taskfile.yaml

@@ -5,22 +5,15 @@ vars:
   venv_dir: "../../../target/venv"
 
 tasks:
-  fmt:
-    desc: "Format"
-    cmds:
-      - black .
-      - ruff check
-
   build:
     desc: Build
     vars:
-      mode: "debug"
+      profile: "dev"
     cmds:
       - cmd: |
           maturin build \
-            {{if eq .mode "release"}}--release{{end}} \
-            -o {{.build_dir}} \
-            -m Cargo.toml
+            --profile={{.profile}} \
+            --out={{.build_dir}}
 
   init-venv:
     status:
@@ -34,8 +27,7 @@ tasks:
     cmds:
       - cmd: |
           source {{.venv_dir}}/bin/activate
-          pip install {{.build_dir}}/prql_python-*.whl
-          pip install -r requirements.txt
+          pip install .[dev]
       - cmd: |
           source {{.venv_dir}}/bin/activate
-          pytest
+          python -m pytest

prqlc/bindings/prqlc-python/noxfile.py

@@ -24,7 +24,7 @@ def _install_prqlc(session: Session) -> None:
         # plain pip of doing that (https://github.com/pypa/pip/issues/11440).
         # "--no-index",
         f"--find-links={Path('..', '..', '..', 'target', 'python')}",
-        "prqlc[test]",
+        "prqlc[dev]",
     )
 
 

prqlc/bindings/prqlc-python/pyproject.toml

@@ -25,7 +25,7 @@ features = ["pyo3/extension-module"]
 module-name = "prqlc"
 
 [project.optional-dependencies]
-test = [
+dev = [
   "pytest >= 7",
   "mypy == 1.10.0",
 ]

prqlc/prqlc-parser/src/lexer.rs

@@ -108,6 +108,7 @@ pub fn lex_token() -> impl Parser<char, Token, Error = Cheap<char>> {
         just("internal"),
         just("func"),
         just("import"),
+        just("enum"),
     ))
     .then_ignore(end_expr())
     .map(|x| x.to_string())

prqlc/prqlc-parser/src/types.rs

@@ -81,25 +81,32 @@ pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
             .map(TyKind::Tuple)
             .labelled("tuple");
 
-        let union_parenthesized = ident_part()
-            .then_ignore(ctrl('='))
-            .or_not()
-            .then(nested_type_expr.clone())
-            .padded_by(new_line().repeated())
-            .separated_by(just(TokenKind::Or))
-            .allow_trailing()
-            .then_ignore(new_line().repeated())
-            .delimited_by(ctrl('('), ctrl(')'))
-            .recover_with(nested_delimiters(
-                TokenKind::Control('('),
-                TokenKind::Control(')'),
-                [
-                    (TokenKind::Control('{'), TokenKind::Control('}')),
-                    (TokenKind::Control('('), TokenKind::Control(')')),
-                    (TokenKind::Control('['), TokenKind::Control(']')),
-                ],
-                |_| vec![],
-            ))
+        let enum_ = keyword("enum")
+            .ignore_then(
+                ident_part()
+                    .then(ctrl('=').ignore_then(nested_type_expr.clone()).or_not())
+                    .map(|(name, ty)| {
+                        (
+                            Some(name),
+                            ty.unwrap_or_else(|| Ty::new(TyKind::Tuple(vec![]))),
+                        )
+                    })
+                    .padded_by(new_line().repeated())
+                    .separated_by(ctrl(','))
+                    .allow_trailing()
+                    .then_ignore(new_line().repeated())
+                    .delimited_by(ctrl('{'), ctrl('}'))
+                    .recover_with(nested_delimiters(
+                        TokenKind::Control('{'),
+                        TokenKind::Control('}'),
+                        [
+                            (TokenKind::Control('{'), TokenKind::Control('}')),
+                            (TokenKind::Control('('), TokenKind::Control(')')),
+                            (TokenKind::Control('['), TokenKind::Control(']')),
+                        ],
+                        |_| vec![],
+                    )),
+            )
             .map(TyKind::Union)
             .labelled("union");
 
@@ -120,7 +127,7 @@ pub fn type_expr() -> impl Parser<TokenKind, Ty, Error = PError> {
             .map(TyKind::Array)
             .labelled("array");
 
-        let term = choice((basic, ident, func, tuple, array, union_parenthesized))
+        let term = choice((basic, ident, func, tuple, array, enum_))
             .map_with_span(into_ty)
             .boxed();
 

prqlc/prqlc/tests/integration/resolving.rs

@@ -59,9 +59,9 @@ fn resolve_types_01() {
 #[test]
 fn resolve_types_02() {
     assert_snapshot!(resolve(r#"
-    type A = int || ()
+    type A = int || {}
     "#).unwrap(), @r###"
-    type A = int
+    type A = int || {}
     "###)
 }
 
@@ -78,16 +78,15 @@ fn resolve_types_03() {
 fn resolve_types_04() {
     assert_snapshot!(resolve(
         r#"
-    type Status = (
-        Paid = () ||
-        Unpaid = float ||
-        Canceled = {reason = text, cancelled_at = timestamp} ||
-    )
+    type Status = enum {
+        Paid = {},
+        Unpaid = float,
+        Canceled = {reason = text, cancelled_at = timestamp},
+    }
     "#,
     )
     .unwrap(), @r###"
     type Status = (
-      Paid = () ||
       Unpaid = float ||
       {reason = text, cancelled_at = timestamp} ||
     )

web/Taskfile.yaml

@@ -11,13 +11,13 @@ tasks:
       - cd book && mdbook build
       - mkdir -p website/public
       # Copy the book into the website path, using rsync so it only copies new files
-      - rsync -ai --checksum --delete book/book/ website/public/book/
+      - rsync -ai --checksum --delete --no-times book/book/ website/public/book/
       # (we don't use `build-playground-dependencies`, since that uses the dev profile)
       - cd playground && npm ci && npm run build
       # We place the playground app in a nested path, because we want to use
       # prql-lang.org/playground with an iframe containing the playground.
       # Possibly there's a more elegant way of doing this...
-      - rsync -ai --checksum --delete playground/dist/
+      - rsync -ai --checksum --delete --no-times playground/dist/
         website/public/playground/playground/
 
   run-website: