From e8651635589a3a42cd2b469954a6db7c5b66fd69 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Thu, 16 Jul 2020 15:09:04 +0200 Subject: [PATCH] proto-signing: Update define-proto script --- packages/proto-signing/.gitignore | 1 + packages/proto-signing/package.json | 2 +- packages/proto-signing/scripts/define-proto.sh | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 packages/proto-signing/scripts/define-proto.sh diff --git a/packages/proto-signing/.gitignore b/packages/proto-signing/.gitignore index 1f68d6fa..e3cc4341 100644 --- a/packages/proto-signing/.gitignore +++ b/packages/proto-signing/.gitignore @@ -2,3 +2,4 @@ build/ dist/ docs/ proto/ +tmp/ diff --git a/packages/proto-signing/package.json b/packages/proto-signing/package.json index 142f148c..c86f41ef 100644 --- a/packages/proto-signing/package.json +++ b/packages/proto-signing/package.json @@ -40,7 +40,7 @@ "preget-proto": "rm -rf proto", "get-proto": "REF=master ./scripts/get-proto.sh", "predefine-proto": "./scripts/predefine-proto.sh", - "define-proto": "pbts src/generated/codecimpl.tmp.js -o src/generated/codecimpl.d.ts && tsc --removeComments --outFile src/generated/codecimpl.js --allowJs src/generated/codecimpl.tmp.js && rm src/generated/codecimpl.tmp.js", + "define-proto": "./scripts/define-proto.sh", "postdefine-proto": "prettier --write \"src/generated/codecimpl.*\"" }, "dependencies": { diff --git a/packages/proto-signing/scripts/define-proto.sh b/packages/proto-signing/scripts/define-proto.sh new file mode 100755 index 00000000..3c9ae8e7 --- /dev/null +++ b/packages/proto-signing/scripts/define-proto.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -o errexit -o nounset -o pipefail +command -v shellcheck > /dev/null && shellcheck "$0" + +TMP_DIR="./tmp" +JS_SOURCE_FILE="$TMP_DIR/codecimpl.js" +DEFINITIONS_FILE="$TMP_DIR/codecimpl.d.ts" +OUTPUT_DIR="./src/generated/" + + +pbts "$JS_SOURCE_FILE" -o "$DEFINITIONS_FILE" +tsc --removeComments --outDir "$OUTPUT_DIR" --allowJs "$JS_SOURCE_FILE" +cp "$DEFINITIONS_FILE" "$OUTPUT_DIR" +rm "$DEFINITIONS_FILE" "$JS_SOURCE_FILE"