diff --git a/bun.lock b/bun.lock index 777f94c7..705686b7 100644 --- a/bun.lock +++ b/bun.lock @@ -5,11 +5,11 @@ "name": "postgres_lsp", "devDependencies": { "@biomejs/biome": "1.9.4", - "@types/bun": "latest", + "@types/bun": "latest" }, "peerDependencies": { - "typescript": "^5", - }, + "typescript": "^5" + } }, "packages/@postgrestools/backend-jsonrpc": { "name": "@postgrestools/backend-jsonrpc", @@ -19,57 +19,148 @@ "@postgrestools/cli-linux-arm64": "", "@postgrestools/cli-linux-x64": "", "@postgrestools/cli-win32-arm64": "", - "@postgrestools/cli-win32-x64": "", - }, + "@postgrestools/cli-win32-x64": "" + } }, "packages/@postgrestools/postgrestools": { - "name": "postgrestools", + "name": "@postgrestools/postgrestools", "bin": { - "postgrestools": "bin/postgrestools", + "postgrestools": "bin/postgrestools" }, "optionalDependencies": { - "postgrestools-aarch64-apple-darwin": "", - "postgrestools-aarch64-linux-gnu": "", - "postgrestools-aarch64-windows-msvc": "", - "postgrestools-x86_64-apple-darwin": "", - "postgrestools-x86_64-linux-gnu": "", - "postgrestools-x86_64-windows-msvc": "", - }, - }, + "@postgrestools/cli-aarch64-apple-darwin": "", + "@postgrestools/cli-aarch64-linux-gnu": "", + "@postgrestools/cli-aarch64-windows-msvc": "", + "@postgrestools/cli-x86_64-apple-darwin": "", + "@postgrestools/cli-x86_64-linux-gnu": "", + "@postgrestools/cli-x86_64-windows-msvc": "" + } + } }, "packages": { - "@biomejs/biome": ["@biomejs/biome@1.9.4", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "1.9.4", "@biomejs/cli-darwin-x64": "1.9.4", "@biomejs/cli-linux-arm64": "1.9.4", "@biomejs/cli-linux-arm64-musl": "1.9.4", "@biomejs/cli-linux-x64": "1.9.4", "@biomejs/cli-linux-x64-musl": "1.9.4", "@biomejs/cli-win32-arm64": "1.9.4", "@biomejs/cli-win32-x64": "1.9.4" }, "bin": { "biome": "bin/biome" } }, "sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog=="], - - "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@1.9.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw=="], - - "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@1.9.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg=="], - - "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@1.9.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g=="], - - "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@1.9.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA=="], - - "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@1.9.4", "", { "os": "linux", "cpu": "x64" }, "sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg=="], - - "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@1.9.4", "", { "os": "linux", "cpu": "x64" }, "sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg=="], - - "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@1.9.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg=="], - - "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@1.9.4", "", { "os": "win32", "cpu": "x64" }, "sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA=="], - - "@postgrestools/backend-jsonrpc": ["@postgrestools/backend-jsonrpc@workspace:packages/@postgrestools/backend-jsonrpc"], - - "@types/bun": ["@types/bun@1.2.5", "", { "dependencies": { "bun-types": "1.2.5" } }, "sha512-w2OZTzrZTVtbnJew1pdFmgV99H0/L+Pvw+z1P67HaR18MHOzYnTYOi6qzErhK8HyT+DB782ADVPPE92Xu2/Opg=="], - - "@types/node": ["@types/node@22.13.10", "", { "dependencies": { "undici-types": "~6.20.0" } }, "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw=="], - - "@types/ws": ["@types/ws@8.5.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw=="], - - "bun-types": ["bun-types@1.2.5", "", { "dependencies": { "@types/node": "*", "@types/ws": "~8.5.10" } }, "sha512-3oO6LVGGRRKI4kHINx5PIdIgnLRb7l/SprhzqXapmoYkFl5m4j6EvALvbDVuuBFaamB46Ap6HCUxIXNLCGy+tg=="], - - "postgrestools": ["postgrestools@workspace:packages/@postgrestools/postgrestools"], - - "typescript": ["typescript@5.8.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ=="], - - "undici-types": ["undici-types@6.20.0", "", {}, "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="], + "@biomejs/biome": [ + "@biomejs/biome@1.9.4", + "", + { + "optionalDependencies": { + "@biomejs/cli-darwin-arm64": "1.9.4", + "@biomejs/cli-darwin-x64": "1.9.4", + "@biomejs/cli-linux-arm64": "1.9.4", + "@biomejs/cli-linux-arm64-musl": "1.9.4", + "@biomejs/cli-linux-x64": "1.9.4", + "@biomejs/cli-linux-x64-musl": "1.9.4", + "@biomejs/cli-win32-arm64": "1.9.4", + "@biomejs/cli-win32-x64": "1.9.4" + }, + "bin": { "biome": "bin/biome" } + }, + "sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog==" + ], + + "@biomejs/cli-darwin-arm64": [ + "@biomejs/cli-darwin-arm64@1.9.4", + "", + { "os": "darwin", "cpu": "arm64" }, + "sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw==" + ], + + "@biomejs/cli-darwin-x64": [ + "@biomejs/cli-darwin-x64@1.9.4", + "", + { "os": "darwin", "cpu": "x64" }, + "sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg==" + ], + + "@biomejs/cli-linux-arm64": [ + "@biomejs/cli-linux-arm64@1.9.4", + "", + { "os": "linux", "cpu": "arm64" }, + "sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g==" + ], + + "@biomejs/cli-linux-arm64-musl": [ + "@biomejs/cli-linux-arm64-musl@1.9.4", + "", + { "os": "linux", "cpu": "arm64" }, + "sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA==" + ], + + "@biomejs/cli-linux-x64": [ + "@biomejs/cli-linux-x64@1.9.4", + "", + { "os": "linux", "cpu": "x64" }, + "sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg==" + ], + + "@biomejs/cli-linux-x64-musl": [ + "@biomejs/cli-linux-x64-musl@1.9.4", + "", + { "os": "linux", "cpu": "x64" }, + "sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg==" + ], + + "@biomejs/cli-win32-arm64": [ + "@biomejs/cli-win32-arm64@1.9.4", + "", + { "os": "win32", "cpu": "arm64" }, + "sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg==" + ], + + "@biomejs/cli-win32-x64": [ + "@biomejs/cli-win32-x64@1.9.4", + "", + { "os": "win32", "cpu": "x64" }, + "sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA==" + ], + + "@postgrestools/backend-jsonrpc": [ + "@postgrestools/backend-jsonrpc@workspace:packages/@postgrestools/backend-jsonrpc" + ], + + "@postgrestools/postgrestools": [ + "@postgrestools/postgrestools@workspace:packages/@postgrestools/postgrestools" + ], + + "@types/bun": [ + "@types/bun@1.2.5", + "", + { "dependencies": { "bun-types": "1.2.5" } }, + "sha512-w2OZTzrZTVtbnJew1pdFmgV99H0/L+Pvw+z1P67HaR18MHOzYnTYOi6qzErhK8HyT+DB782ADVPPE92Xu2/Opg==" + ], + + "@types/node": [ + "@types/node@22.13.10", + "", + { "dependencies": { "undici-types": "~6.20.0" } }, + "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==" + ], + + "@types/ws": [ + "@types/ws@8.5.14", + "", + { "dependencies": { "@types/node": "*" } }, + "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==" + ], + + "bun-types": [ + "bun-types@1.2.5", + "", + { "dependencies": { "@types/node": "*", "@types/ws": "~8.5.10" } }, + "sha512-3oO6LVGGRRKI4kHINx5PIdIgnLRb7l/SprhzqXapmoYkFl5m4j6EvALvbDVuuBFaamB46Ap6HCUxIXNLCGy+tg==" + ], + + "typescript": [ + "typescript@5.8.2", + "", + { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, + "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==" + ], + + "undici-types": [ + "undici-types@6.20.0", + "", + {}, + "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==" + ] } } diff --git a/packages/@postgrestools/postgrestools/bin/pglt b/packages/@postgrestools/postgrestools/bin/postgrestools similarity index 67% rename from packages/@postgrestools/postgrestools/bin/pglt rename to packages/@postgrestools/postgrestools/bin/postgrestools index 47d78bb6..63461f0c 100755 --- a/packages/@postgrestools/postgrestools/bin/pglt +++ b/packages/@postgrestools/postgrestools/bin/postgrestools @@ -7,16 +7,16 @@ const { platform, arch, env } = process; */ const PLATFORMS = { win32: { - x64: "postgrestools-x86_64-windows-msvc/postgrestools.exe", - arm64: "postgrestools-aarch64-windows-msvc/postgrestools.exe", + x64: "@postgrestools/cli-x86_64-windows-msvc/postgrestools.exe", + arm64: "@postgrestools/cli-aarch64-windows-msvc/postgrestools.exe", }, darwin: { - x64: "postgrestools-x86_64-apple-darwin/postgrestools", - arm64: "postgrestools-aarch64-apple-darwin/postgrestools", + x64: "@postgrestools/cli-x86_64-apple-darwin/postgrestools", + arm64: "@postgrestools/cli-aarch64-apple-darwin/postgrestools", }, linux: { - x64: "postgrestools-x86_64-linux-gnu/postgrestools", - arm64: "postgrestools-aarch64-linux-gnu/postgrestools", + x64: "@postgrestools/cli-x86_64-linux-gnu/postgrestools", + arm64: "@postgrestools/cli-aarch64-linux-gnu/postgrestools", }, }; diff --git a/packages/@postgrestools/postgrestools/package.json b/packages/@postgrestools/postgrestools/package.json index 573ab808..769ba454 100644 --- a/packages/@postgrestools/postgrestools/package.json +++ b/packages/@postgrestools/postgrestools/package.json @@ -30,11 +30,11 @@ "provenance": true }, "optionalDependencies": { - "postgrestools-x86_64-windows-msvc": "", - "postgrestools-aarch64-windows-msvc": "", - "postgrestools-x86_64-apple-darwin": "", - "postgrestools-aarch64-apple-darwin": "", - "postgrestools-x86_64-linux-gnu": "", - "postgrestools-aarch64-linux-gnu": "" + "@postgrestools/cli-x86_64-windows-msvc": "", + "@postgrestools/cli-aarch64-windows-msvc": "", + "@postgrestools/cli-x86_64-apple-darwin": "", + "@postgrestools/cli-aarch64-apple-darwin": "", + "@postgrestools/cli-x86_64-linux-gnu": "", + "@postgrestools/cli-aarch64-linux-gnu": "" } } diff --git a/packages/@postgrestools/postgrestools/scripts/generate-packages.mjs b/packages/@postgrestools/postgrestools/scripts/generate-packages.mjs index 6f59358f..b017aa14 100644 --- a/packages/@postgrestools/postgrestools/scripts/generate-packages.mjs +++ b/packages/@postgrestools/postgrestools/scripts/generate-packages.mjs @@ -80,7 +80,7 @@ async function writeManifest(packagePath, version) { const nativePackages = SUPPORTED_PLATFORMS.flatMap((platform) => SUPPORTED_ARCHITECTURES.map((arch) => [ - `@postgrestools/${getName(platform, arch)}`, + getPackageName(platform, arch), version, ]), ); @@ -217,7 +217,7 @@ function getBuildName(platform, arch) { function getPackageName(platform, arch) { // trim the "unknown" from linux and the "pc" from windows const platformName = platform.split("-").slice(-2).join("-"); - return `postgrestools-${arch}-${platformName}`; + return `@postgrestools/cli-${arch}-${platformName}`; } function getOs(platform) {