Publish scripts

.gitignore

@@ -1,4 +1,4 @@
 target/
 tmp/
-Cargo.lock
 .DS_Store
+result

Cargo.toml

@@ -19,10 +19,13 @@ authors = [
 wasm-opt = ["-Oz", "--enable-mutable-globals"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = "0.2"
+wasm-bindgen = "=0.2.79"
 js-sys = "0.3.56"
 
 [dev-dependencies]
 
 [lib]
 crate-type = ["cdylib", "lib"]
+
+[profile.release]
+lto = true

flake.nix

@@ -0,0 +1,91 @@
+{
+  description = "ADO.net and JDBC Connection String Parser.";
+
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+  };
+
+  outputs = { self, nixpkgs, flake-utils, rust-overlay }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      overlays = [ (import rust-overlay) ];
+      pkgs = import nixpkgs { inherit system overlays; };
+      rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+      inherit (pkgs) wasm-bindgen-cli rustPlatform nodejs;
+    in {
+      defaultPackage = rustPlatform.buildRustPackage {
+        name = "connection-string";
+        src = builtins.path { path = ./.; name = "connection-string"; };
+
+        cargoLock = {
+          lockFile = ./Cargo.lock;
+        };
+
+        nativeBuildInputs = [ rust wasm-bindgen-cli nodejs ];
+
+        buildPhase = ''
+          RUST_BACKTRACE=1
+          cargo build --release --target=wasm32-unknown-unknown
+          echo 'Creating out dir...'
+          mkdir -p $out/src;
+          echo 'Copying package.json...'
+          cp ./package.json $out/;
+          echo 'Copying README.md...'
+          cp README.md $out/;
+          echo 'Generating node module...'
+          wasm-bindgen \
+            --target nodejs \
+            --out-dir $out/src \
+            target/wasm32-unknown-unknown/release/connection_string.wasm;
+        '';
+        checkPhase = "echo 'Check phase: skipped'";
+        installPhase = "echo 'Install phase: skipped'";
+      };
+
+      packages = {
+        cargo = {
+          type = "app";
+          program = "${rust}/bin/cargo";
+        };
+
+        # Takes the new package version as first and only argument, and updates package.json
+        updatePackageVersion = pkgs.writeShellScriptBin "updateNpmPackageVersion" ''
+          ${pkgs.jq}/bin/jq ".version = \"$1\"" package.json > /tmp/package.json
+          rm package.json
+          cp /tmp/package.json package.json
+          sed -i "s/^version\ =.*$/version = \"$1\"/" Cargo.toml
+        '';
+        publishRust = pkgs.writeShellScriptBin "publishRust" ''
+          ${rust}/bin/cargo publish
+        '';
+        publishJavascript = pkgs.writeShellScriptBin "publishRust" ''
+          ${nodejs}/bin/npm publish ./result --access public --tag latest
+        '';
+        npm = {
+          type = "app";
+          program = "${nodejs}/bin/npm";
+        };
+        wasm-bindgen = {
+          type = "app";
+          program = "${wasm-bindgen-cli}/bin/wasm-bindgen";
+        };
+        syncWasmBindgenVersions = pkgs.writeShellScriptBin "updateWasmBindgenVersion" ''
+          echo 'Syncing wasm-bindgen version in crate with that of the installed CLI...'
+          sed -i "s/^wasm-bindgen\ =.*$/wasm-bindgen = \"=${wasm-bindgen-cli.version}\"/" Cargo.toml
+        '';
+      };
+      devShell = pkgs.mkShell {
+        nativeBuildInputs = [ pkgs.bashInteractive ];
+        buildInputs = with pkgs; [
+          nodePackages.prisma
+          nodePackages.npm
+          nodejs-slim
+        ];
+      };
+    });
+}

package.json

@@ -0,0 +1,16 @@
+{
+  "name": "@pimeys/connection-string",
+  "version": "0.1.14",
+  "description": "A parser for ADO.net and JDBC connection strings",
+  "main": "src/connection_string.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/prisma/connection-string"
+  },
+  "author": "Prisma",
+  "license": "MIT OR Apache-2.0",
+  "homepage": "https://github.com/prisma/connection-string"
+}

rust-toolchain.toml

@@ -0,0 +1,5 @@
+[toolchain]
+channel = "stable"
+components = []
+targets = [ "wasm32-unknown-unknown" ]
+profile = "default"

src/ado.rs

@@ -164,6 +164,7 @@ fn read_ident(lexer: &mut Lexer) -> crate::Result<String> {
 #[derive(Debug, Clone)]
 struct Token {
     kind: TokenKind,
+    #[allow(dead_code)] // for future use...
     loc: Location,
 }
 

src/jdbc.rs

@@ -351,6 +351,7 @@ impl Location {
 /// A pair of `Location` and `TokenKind`.
 #[derive(Debug, Clone)]
 struct Token {
+    #[allow(dead_code)] // for future use...
     loc: Location,
     kind: TokenKind,
 }

src/utils.rs

@@ -20,14 +20,14 @@ macro_rules! ensure {
 #[macro_export]
 macro_rules! bail {
     ($msg:literal) => {
-        return Err($crate::Error::new($msg.into()));
+        return Err($crate::Error::new($msg.into()))
     };
 
     ($msg:expr) => {
-        return Err($crate::Error::new($msg.into()));
+        return Err($crate::Error::new($msg.into()))
     };
 
     ($fmt:expr, $($arg:tt)*) => {
-        return Err($crate::Error::new(&*format!($fmt, $($arg)*)));
+        return Err($crate::Error::new(&*format!($fmt, $($arg)*)))
     };
 }