@science-corporation/synapse 2.2.9 → 2.3.1

package/package.json

@@ -1,70 +1,70 @@
-{
-  "name": "@science-corporation/synapse",
-  "version": "2.2.9",
-  "description": "Client library and CLI for the Synapse API",
-  "license": "Apache-2.0",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./browser": {
-      "types": "./dist/browser.d.ts",
-      "default": "./dist/browser.js"
-    }
-  },
-  "files": [
-    "dist",
-    "scripts",
-    "src",
-    "synapse-api"
-  ],
-  "scripts": {
-    "build": "bash ./scripts/build.sh",
-    "clean": "rimraf dist src/api",
-    "dist": "npm run generate && npm run build",
-    "generate": "bash ./scripts/generate.sh",
-    "lint": "tsc --noEmit && eslint .",
-    "postinstall": "bash ./scripts/postinstall.sh && npm run dist",
-    "test": "tsc --noEmit && jest"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sciencecorp/synapse-typescript.git"
-  },
-  "author": {
-    "name": "Science Corporation",
-    "email": "team@science.xyz"
-  },
-  "bugs": {
-    "url": "https://github.com/sciencecorp/synapse-typescript/issues"
-  },
-  "homepage": "https://github.com/sciencecorp/synapse-typescript#readme",
-  "engines": {
-    "node": ">=18"
-  },
-  "devDependencies": {
-    "@eslint/compat": "^1.2.6",
-    "@types/jest": "^29.5.14",
-    "@typescript-eslint/eslint-plugin": "^8.23.0",
-    "@typescript-eslint/parser": "^8.23.0",
-    "eslint": "^9.5.0",
-    "eslint-import-resolver-typescript": "^3.7.0",
-    "eslint-plugin-import": "^2.31.0",
-    "jest": "^29.7.0",
-    "rimraf": "^5.0.5",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.5.2"
-  },
-  "dependencies": {
-    "@grpc/grpc-js": "^1.10.10",
-    "@grpc/proto-loader": "^0.7.13",
-    "google-protobuf": "^3.21.2",
-    "long": "^5.3.1",
-    "protobufjs-cli": "^1.1.3",
-    "tmp": "^0.2.5",
-    "yargs": "^17.7.2"
-  }
-}
+{
+  "name": "@science-corporation/synapse",
+  "version": "2.3.1",
+  "description": "Client library and CLI for the Synapse API",
+  "license": "Apache-2.0",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./browser": {
+      "types": "./dist/browser.d.ts",
+      "default": "./dist/browser.js"
+    }
+  },
+  "files": [
+    "dist",
+    "scripts",
+    "src",
+    "synapse-api"
+  ],
+  "scripts": {
+    "build": "bash ./scripts/build.sh",
+    "clean": "rimraf dist src/api",
+    "dist": "npm run generate && npm run build",
+    "generate": "bash ./scripts/generate.sh",
+    "lint": "tsc --noEmit && eslint .",
+    "postinstall": "bash ./scripts/postinstall.sh && npm run dist",
+    "test": "tsc --noEmit && jest"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sciencecorp/synapse-typescript.git"
+  },
+  "author": {
+    "name": "Science Corporation",
+    "email": "team@science.xyz"
+  },
+  "bugs": {
+    "url": "https://github.com/sciencecorp/synapse-typescript/issues"
+  },
+  "homepage": "https://github.com/sciencecorp/synapse-typescript#readme",
+  "engines": {
+    "node": ">=18"
+  },
+  "devDependencies": {
+    "@eslint/compat": "^1.2.6",
+    "@types/jest": "^29.5.14",
+    "@typescript-eslint/eslint-plugin": "^8.23.0",
+    "@typescript-eslint/parser": "^8.23.0",
+    "eslint": "^9.5.0",
+    "eslint-import-resolver-typescript": "^3.7.0",
+    "eslint-plugin-import": "^2.31.0",
+    "jest": "^29.7.0",
+    "rimraf": "^5.0.5",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.5.2"
+  },
+  "dependencies": {
+    "@grpc/grpc-js": "^1.10.10",
+    "@grpc/proto-loader": "^0.7.13",
+    "google-protobuf": "^3.21.2",
+    "long": "^5.3.1",
+    "protobufjs-cli": "^1.1.3",
+    "tmp": "^0.2.5",
+    "yargs": "^17.7.2"
+  }
+}

package/scripts/postinstall.sh

@@ -39,15 +39,49 @@ fi
 # Else, fallback to downloading from github
 echo "Downloading synapse-api..."
 
+# Resolve which synapse-typescript ref to ask the GitHub API about, in order
+# of decreasing fidelity:
+#   1. git HEAD when there's a real working tree (most accurate).
+#   2. The SHA in $npm_package_resolved — npm exports this during install
+#      lifecycle scripts as `git+ssh://...#<sha>`. This is the one that
+#      makes `npm install git://...#<sha>` actually work, since during
+#      pacote's prepare phase the .git dir has been moved away and the
+#      package.json gitHead field has not yet been injected.
+#   3. package.json#gitHead — npm writes this after prepare completes, so
+#      it's available for downstream consumers reading an already-installed
+#      package, just not during the prepare phase itself.
+#   4. v$version tag, as a last resort for vanilla tarball installs after a
+#      release has tagged the version.
+REF_LIB=""
 if [ "$HAS_GIT" = true ]; then
     REF_LIB=$(git rev-parse HEAD)
-else
-    REF_LIB=$(node -p "require('./package.json').version")
-    if [ -z "$REF_LIB" ]; then
+fi
+
+if [ -z "$REF_LIB" ] && [ -n "$npm_package_resolved" ]; then
+    # Strip everything up to and including the last '#' to get the SHA.
+    CANDIDATE="${npm_package_resolved##*#}"
+    # Only accept if it looks like a SHA (40 hex chars). Anything else is
+    # probably a URL with no fragment, which would leave the var untouched.
+    if [ "${#CANDIDATE}" = 40 ] && [ -z "${CANDIDATE//[0-9a-f]/}" ]; then
+        REF_LIB="$CANDIDATE"
+        echo " - Using npm_package_resolved SHA for ref lookup"
+    fi
+fi
+
+if [ -z "$REF_LIB" ]; then
+    REF_LIB=$(node -e "const p=require('./package.json'); if (p.gitHead) process.stdout.write(p.gitHead);" 2>/dev/null)
+    if [ -n "$REF_LIB" ]; then
+        echo " - Using package.json gitHead for ref lookup"
+    fi
+fi
+
+if [ -z "$REF_LIB" ]; then
+    PKG_VERSION=$(node -p "require('./package.json').version")
+    if [ -z "$PKG_VERSION" ]; then
         echo " - Failed to get version from package.json"
         exit 1
     fi
-    REF_LIB=v$REF_LIB
+    REF_LIB=v$PKG_VERSION
 fi
 
 echo "- Looking up synapse-api ref for synapse-typescript ref $REF_LIB"