Merge branch 'main' into feat/eugene-rules

Author: psteinroe

.github/workflows/publish.reusable.yml

@@ -33,15 +33,23 @@ jobs:
             exit 1
           fi
 
+      - name: Generate Packages (deprecated)
+        id: generate-packages-deprecated
+        run: node packages/@postgrestools/postgrestools/scripts/generate-packages.mjs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RELEASE_TAG: ${{ inputs.release-tag }}
+          PRERELEASE: ${{ inputs.is-prerelease }}
+
       - name: Generate Packages
         id: generate-packages
-        run: node packages/@postgrestools/postgrestools/scripts/generate-packages.mjs
+        run: node packages/@postgres-language-server/cli/scripts/generate-packages.mjs
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RELEASE_TAG: ${{ inputs.release-tag }}
           PRERELEASE: ${{ inputs.is-prerelease }}
 
-      - name: Publish npm packages as nightly
+      - name: Publish npm packages as nightly (deprecated)
         if: inputs.is-prerelease == 'true'
         run: |
           for package in packages/@postgrestools/*; do
@@ -50,7 +58,16 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} #
 
-      - name: Publish npm packages as latest
+      - name: Publish npm packages as nightly
+        if: inputs.is-prerelease == 'true'
+        run: |
+          for package in packages/@postgres-language-server/*; do
+            npm publish "$package" --tag nightly --access public --provenance
+          done
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} #
+
+      - name: Publish npm packages as latest (deprecated)
         if: inputs.is-prerelease != 'true'
         run: |
           for package in packages/@postgrestools/*; do
@@ -66,3 +83,20 @@ jobs:
           done
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Publish npm packages as latest
+        if: inputs.is-prerelease != 'true'
+        run: |
+          for package in packages/@postgres-language-server/*; do
+            version="${{ inputs.release-tag }}"
+            npm_package_name=$(jq -r ".name" "$package/package.json")
+
+            if npm view "$npm_package_name@$version" version 2>/dev/null; then
+              echo "Package $npm_package_name@$version already exists, skipping..."
+            else
+              echo "Publishing $npm_package_name@$version..."
+              npm publish "$package" --tag latest --access public --provenance
+            fi
+          done
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

@@ -47,9 +47,6 @@ jobs:
 
     runs-on: ${{ matrix.config.os }}
 
-    outputs:
-      artifact_url: ${{ steps.upload-artifacts.outputs.artifact-url }}
-
     steps:
       - uses: actions/checkout@v4
         with:
@@ -96,17 +93,22 @@ jobs:
         if: matrix.config.os == 'windows-2022'
         run: |
           mkdir dist
+          # deprecated
           cp target/${{ matrix.config.target }}/release/postgrestools.exe ./dist/postgrestools_${{ matrix.config.target }}
+          cp target/${{ matrix.config.target }}/release/postgres-language-server.exe ./dist/postgres-language-server_${{ matrix.config.target }}
+
       - name: 👦 Name the Binary
         if: matrix.config.os != 'windows-2022'
         run: |
           mkdir dist
+          # deprecated
           cp target/${{ matrix.config.target }}/release/postgrestools ./dist/postgrestools_${{ matrix.config.target }}
+          cp target/${{ matrix.config.target }}/release/postgres-language-server ./dist/postgres-language-server_${{ matrix.config.target }}
 
       # It is not possible to return the artifacts from the matrix jobs individually: Matrix outputs overwrite each other.
       # A common workaround is to upload and download the resulting artifacts.
-      - name: 👆 Upload Artifacts
-        id: upload-artifacts
+      - name: 👆 Upload Artifacts (deprecated)
+        id: upload-artifacts-deprecated
         uses: actions/upload-artifact@v4
         with:
           name: postgrestools_${{ matrix.config.target }}
@@ -117,6 +119,20 @@ jobs:
           compression-level: 2
           if-no-files-found: error
 
+      # It is not possible to return the artifacts from the matrix jobs individually: Matrix outputs overwrite each other.
+      # A common workaround is to upload and download the resulting artifacts.
+      - name: 👆 Upload Artifacts
+        id: upload-artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: postgres-language-server_${{ matrix.config.target }}
+          path: ./dist/postgres-language-server_*
+          # The default compression level is 6; this took the binary down from 350 to 330MB.
+          # It is recommended to use a lower level for binaries, since the compressed result is not much smaller,
+          # and the higher levels of compression take much longer.
+          compression-level: 2
+          if-no-files-found: error
+
   create_changelog_and_release:
     runs-on: ubuntu-latest
     needs: [extract_version, build_and_test] # make sure that tests & build work correctly
@@ -142,12 +158,19 @@ jobs:
           echo "Tag does not match: ${{ steps.create_changelog.outputs.version }} vs ${{ needs.extract_version.outputs.version }}"
           exit 1
 
+      - name: 👇 Download Artifacts (deprecated)
+        uses: actions/download-artifact@v4
+        id: download-deprecated
+        with:
+          merge-multiple: true
+          pattern: postgrestools_*
+
       - name: 👇 Download Artifacts
         uses: actions/download-artifact@v4
         id: download
         with:
           merge-multiple: true
-          pattern: postgrestools_*
+          pattern: postgres-language-server_*
 
       - name: 📂 Create Release
         uses: softprops/action-gh-release@v2

crates/pgt_cli/Cargo.toml

@@ -61,3 +61,7 @@ doctest = false
 [[bin]]
 name = "postgrestools"
 path = "src/main.rs"
+
+[[bin]]
+name = "postgres-language-server"
+path = "src/main.rs"

crates/pgt_cli/src/commands/clean.rs

@@ -1,12 +1,12 @@
 use crate::commands::daemon::default_pgt_log_path;
 use crate::{CliDiagnostic, CliSession};
-use pgt_env::pgt_env;
+use pgt_env::pgls_env;
 use std::fs::{create_dir, remove_dir_all};
 use std::path::PathBuf;
 
 /// Runs the clean command
 pub fn clean(_cli_session: CliSession) -> Result<(), CliDiagnostic> {
-    let logs_path = pgt_env()
+    let logs_path = pgls_env()
         .pgt_log_path
         .value()
         .map_or(default_pgt_log_path(), PathBuf::from);

crates/pgt_cli/src/commands/daemon.rs

@@ -5,7 +5,7 @@ use crate::{
 use pgt_console::{ConsoleExt, markup};
 use pgt_lsp::ServerFactory;
 use pgt_workspace::{TransportError, WorkspaceError, workspace::WorkspaceClient};
-use std::{env, path::PathBuf};
+use std::path::PathBuf;
 use tokio::io;
 use tokio::runtime::Runtime;
 use tracing::subscriber::Interest;
@@ -234,7 +234,12 @@ fn setup_tracing_subscriber(
 }
 
 pub fn default_pgt_log_path() -> PathBuf {
-    match env::var_os("PGT_LOG_PATH") {
+    let env = pgt_env::pgls_env();
+    match env
+        .pgls_log_path
+        .value()
+        .or_else(|| env.pgt_log_path.value())
+    {
         Some(directory) => PathBuf::from(directory),
         None => pgt_fs::ensure_cache_dir().join("pgt-logs"),
     }

crates/pgt_cli/src/commands/mod.rs

@@ -73,6 +73,7 @@ pub enum PgtCommand {
         /// Allows to change the prefix applied to the file name of the logs.
         #[bpaf(
             env("PGT_LOG_PREFIX_NAME"),
+            env("PGLS_LOG_PREFIX_NAME"),
             long("log-prefix-name"),
             argument("STRING"),
             hide_usage,
@@ -84,6 +85,7 @@ pub enum PgtCommand {
         /// Allows to change the folder where logs are stored.
         #[bpaf(
             env("PGT_LOG_PATH"),
+            env("PGLS_LOG_PATH"),
             long("log-path"),
             argument("PATH"),
             hide_usage,
@@ -115,6 +117,7 @@ pub enum PgtCommand {
         /// Allows to change the prefix applied to the file name of the logs.
         #[bpaf(
             env("PGT_LOG_PREFIX_NAME"),
+            env("PGLS_LOG_PREFIX_NAME"),
             long("log-prefix-name"),
             argument("STRING"),
             hide_usage,
@@ -125,6 +128,7 @@ pub enum PgtCommand {
         /// Allows to change the folder where logs are stored.
         #[bpaf(
             env("PGT_LOG_PATH"),
+            env("PGLS_LOG_PATH"),
             long("log-path"),
             argument("PATH"),
             hide_usage,
@@ -154,6 +158,7 @@ pub enum PgtCommand {
         /// Allows to change the prefix applied to the file name of the logs.
         #[bpaf(
             env("PGT_LOG_PREFIX_NAME"),
+            env("PGLS_LOG_PREFIX_NAME"),
             long("log-prefix-name"),
             argument("STRING"),
             hide_usage,
@@ -165,6 +170,7 @@ pub enum PgtCommand {
         /// Allows to change the folder where logs are stored.
         #[bpaf(
             env("PGT_LOG_PATH"),
+            env("PGLS_LOG_PATH"),
             long("log-path"),
             argument("PATH"),
             hide_usage,
@@ -175,6 +181,7 @@ pub enum PgtCommand {
         /// Allows to change the log level. Default is debug. This will only affect "pgt*" crates. All others are logged with info level.
         #[bpaf(
             env("PGT_LOG_LEVEL"),
+            env("PGLS_LOG_LEVEL"),
             long("log-level"),
             argument("trace|debug|info|warn|error|none"),
             fallback(String::from("debug"))
@@ -184,6 +191,7 @@ pub enum PgtCommand {
         /// Allows to change the logging format kind. Default is hierarchical.
         #[bpaf(
             env("PGT_LOG_KIND"),
+            env("PGLS_LOG_KIND"),
             long("log-kind"),
             argument("hierarchical|bunyan"),
             fallback(String::from("hierarchical"))

crates/pgt_completions/src/relevance/filtering.rs

@@ -163,7 +163,7 @@ impl CompletionFilter<'_> {
                             // only autocomplete left side of binary expression
                             WrappingClause::Where => {
                                 ctx.before_cursor_matches_kind(&["keyword_and", "keyword_where"])
-                                    || (ctx.before_cursor_matches_kind(&["."])
+                                    || (ctx.before_cursor_matches_kind(&["field_qualifier"])
                                         && ctx.matches_ancestor_history(&["field"]))
                             }
 

crates/pgt_configuration/src/lib.rs

@@ -33,7 +33,7 @@ use files::{FilesConfiguration, PartialFilesConfiguration, partial_files_configu
 use migrations::{
     MigrationsConfiguration, PartialMigrationsConfiguration, partial_migrations_configuration,
 };
-use pgt_env::PGT_WEBSITE;
+use pgt_env::PGLS_WEBSITE;
 use plpgsql_check::{
     PartialPlPgSqlCheckConfiguration, PlPgSqlCheckConfiguration,
     partial_pl_pg_sql_check_configuration,
@@ -103,7 +103,7 @@ impl PartialConfiguration {
     /// Returns the initial configuration.
     pub fn init() -> Self {
         Self {
-            schema: Some(format!("{}/schemas/{VERSION}/schema.json", PGT_WEBSITE)),
+            schema: Some(format!("{}/schemas/{VERSION}/schema.json", PGLS_WEBSITE)),
             extends: Some(StringSet::default()),
             files: Some(PartialFilesConfiguration {
                 ignore: Some(Default::default()),