@openstax/ts-utils 1.47.0 → 1.48.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstax/ts-utils",
-  "version": "1.47.0",
+  "version": "1.48.0",
   "bin": {
     "ts-utils": "./script/bin-entry.bash"
   },
@@ -13,38 +13,34 @@
     "@aws-sdk/s3-presigned-post": "^3.267.0",
     "@aws-sdk/s3-request-presigner": "^3.267.0",
     "@aws-sdk/util-dynamodb": "^3.171.0",
-    "aws-sdk": "^2.1145.0",
-    "cookie": "^0.5.0",
+    "cookie": "^1.1.1",
     "date-fns": "^2.29.2",
     "deep-equal": "^2.1.0",
-    "http-message-signatures": "^1.0.4",
+    "http-message-signatures": "1.0.4",
+    "js-sha1": "^0.7.0",
     "jsonwebtoken": "^9.0.0",
     "jwks-rsa": "^3.1.0",
     "ms": "^2.1.3",
-    "node-jose": "^2.2.0",
     "path-to-regexp": "^6.2.0",
     "query-string": "^7.1.1",
     "structured-headers": "^1.0.1",
-    "tiny-async-pool": "^2.1.0",
-    "uuid": "^9.0.0"
+    "tiny-async-pool": "^2.1.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.1",
     "@opensearch-project/opensearch": "^1.2.0",
     "@types/busboy": "^1.5.0",
-    "@types/cookie": "^0.5.0",
     "@types/deep-equal": "^1.0.1",
     "@types/jest": "^29.5.14",
+    "@types/js-sha1": "^0.6.3",
     "@types/jsonwebtoken": "^9.0.1",
     "@types/lodash": "^4.14.200",
     "@types/ms": "^0.7.34",
     "@types/node": "^24.2.0",
     "@types/node-fetch": "^2.6.11",
-    "@types/node-jose": "^1.1.12",
     "@types/tiny-async-pool": "^2.0.0",
-    "@types/uuid": "^8.3.4",
     "busboy": "^1.6.0",
-    "cspell": "^5.18.5",
+    "cspell": "^10.0.0",
     "eslint": "^9.39.1",
     "eslint-plugin-import-x": "^4.15.0",
     "eslint-plugin-jest": "^28.11.0",
@@ -247,16 +243,16 @@
   },
   "scripts": {
     "build": "./script/build.bash",
-    "build:clean": "yarn clean && yarn build",
+    "build:clean": "npm run clean && npm run build",
     "ci": "CI=true npm-run-all ci:*",
     "ci:lint": "eslint --max-warnings=0 .",
-    "ci:spelling": "git ls-files | yarn cspell -c ../../cspell.json --file-list stdin",
-    "ci:test": "yarn jest --coverage",
+    "ci:spelling": "cspell -c ../../cspell.json --gitignore --gitignore-root ../.. '**'",
+    "ci:test": "jest --coverage",
     "ci:typecheck": "tsc --noEmit",
     "clean": "rm -rf dist",
     "coverage-report": "open coverage/index.html",
     "start": "./script/build.bash --watch",
-    "test": "yarn jest"
+    "test": "jest"
   },
   "sideEffects": false,
   "types": "index.d.ts",

package/script/bin/delete-stack.bash

@@ -8,11 +8,11 @@ name=$1
 region=$2
 
 printf "\nchecking %s stack..." "$name"
-if AWS_DEFAULT_REGION="$region" yarn -s ts-utils stack-exists "$name"; then
+if AWS_DEFAULT_REGION="$region" ts-utils stack-exists "$name"; then
   printf " deleting it"
   AWS_DEFAULT_REGION="$region" aws cloudformation delete-stack --region "$region" --stack-name "$name"
 
-  while AWS_DEFAULT_REGION="$region" yarn -s ts-utils stack-exists "$name"; do
+  while AWS_DEFAULT_REGION="$region" ts-utils stack-exists "$name"; do
     printf "."
     sleep 5
   done

package/script/bin/deploy.bash

@@ -2,7 +2,7 @@
 # spell-checker: ignore pipefail
 set -euo pipefail; if [ -n "${DEBUG-}" ]; then set -x; fi
 
-source $(yarn -s ts-utils which init-constants-script)
+source "$(ts-utils which init-constants-script)"
 
 if [ -z "${APPLICATION:-}" ]; then echo "APPLICATION must be set" > /dev/stderr; exit 1; fi
 if [ -z "${OWNER:-}" ]; then echo "OWNER must be set" > /dev/stderr; exit 1; fi
@@ -12,7 +12,7 @@ if [ -z "${AWS_DEFAULT_REGION:-}" ]; then echo "AWS_DEFAULT_REGION must be set"
 if [ "$#" -lt 1 ]; then
   cat <<HEREDOC
 
-  Usage: yarn -s ts-utils deploy <environment>
+  Usage: npx ts-utils deploy <environment>
 
   Deploys the given $APPLICATION environment
 
@@ -33,12 +33,23 @@ if [ -z "$AWS_ACCOUNT" ]; then
   exit 1
 fi
 
+# deploy.bash triggers the sbom emission workflow via `gh workflow run` after
+# a successful deploy, so the cli has to be installed and authenticated.
+if ! command -v gh > /dev/null 2>&1; then
+  echo "gh cli not found. install from https://cli.github.com/ before deploying" > /dev/stderr
+  exit 1
+fi
+if ! gh auth status > /dev/null 2>&1; then
+  echo "gh cli not authenticated. run 'gh auth login' before deploying" > /dev/stderr
+  exit 1
+fi
+
 if [ ! -f "./deploy/deploy.bash" ]; then
   echo "could not find project deployment script at ./deploy/deploy.bash" > /dev/stderr;
   exit 1
 fi;
 
-source $(yarn -s ts-utils which init-params-script)
+source "$(ts-utils which init-params-script)"
 
 missing_params=$(get_missing_param_names)
 if [ -n "$missing_params" ]; then

package/script/bin/destroy-deployment.bash

@@ -2,7 +2,7 @@
 # spell-checker: ignore pipefail kwarg
 set -euo pipefail; if [ -n "${DEBUG-}" ]; then set -x; fi
 
-source $(yarn -s ts-utils which init-constants-script)
+source "$(ts-utils which init-constants-script)"
 
 if [ -z "${APPLICATION:-}" ]; then echo "APPLICATION must be set" > /dev/stderr; exit 1; fi
 if [ -z "${OWNER:-}" ]; then echo "OWNER must be set" > /dev/stderr; exit 1; fi
@@ -12,7 +12,7 @@ if [ -z "${AWS_DEFAULT_REGION:-}" ]; then echo "AWS_DEFAULT_REGION must be set"
 function print_usage_and_exit() {
   cat <<HEREDOC
 
-  Usage: yarn -s ts-utils destroy-deployment <environment> [options]
+  Usage: npx ts-utils destroy-deployment <environment> [options]
 
   Destroys the given $APPLICATION environment
 
@@ -28,10 +28,10 @@ if [ "$#" -lt 1 ]; then
   print_usage_and_exit
 fi
 
-ENVIRONMENT=$(yarn -s ts-utils get-arg 0 "$@")
+ENVIRONMENT=$(ts-utils get-arg 0 "$@")
 export ENVIRONMENT;
 
-YES=$(yarn -s ts-utils get-kwarg y "$@")
+YES=$(ts-utils get-kwarg y "$@")
 export YES
 
 if [ -z "$YES" ]; then

package/script/bin/get-deployed-environments.bash

@@ -2,7 +2,7 @@
 # spell-checker: ignore pipefail
 set -euo pipefail; if [ -n "${DEBUG-}" ]; then set -x; fi
 
-source $(yarn -s ts-utils which init-constants-script)
+source "$(ts-utils which init-constants-script)"
 
 if [ -z "${AWS_DEFAULT_REGION:-}" ]; then echo "AWS_DEFAULT_REGION must be set" > /dev/stderr; exit 1; fi
 

package/script/bin/get-env-param.bash

@@ -2,11 +2,11 @@
 # spell-checker: ignore pipefail
 set -euo pipefail; if [ -n "${DEBUG-}" ]; then set -x; fi
 
-source $(yarn -s ts-utils which init-constants-script)
-source $(yarn -s ts-utils which init-params-script)
+source "$(ts-utils which init-constants-script)"
+source "$(ts-utils which init-params-script)"
 
-ENVIRONMENT=$(yarn -s ts-utils get-arg 0 "$@")
-param=$(yarn -s ts-utils get-arg 1 "$@")
+ENVIRONMENT=$(ts-utils get-arg 0 "$@")
+param=$(ts-utils get-arg 1 "$@")
 
 if [ -z "$ENVIRONMENT" ] || [ -z "$param" ]; then
   cat <<HEREDOC

package/script/bin/init-constants-script.bash

@@ -11,7 +11,7 @@ if [ "$sourced" == "false" ]; then
   exit 1
 fi;
 
-# yarn seems to naturally run things from the project root, so this is just a safety check
+# npm runs scripts from the project root, so this is just a safety check
 if [ ! -f "./deploy/constants.env" ]; then
   echo "This command must be run from the project root directory" > /dev/stderr;
   exit 1

package/script/bin/init-params-script.bash

@@ -17,7 +17,7 @@ if [ -z "${APPLICATION:-}" ]; then echo "APPLICATION must be set" > /dev/stderr;
 if [ -z "${OWNER:-}" ]; then echo "OWNER must be set" > /dev/stderr; exit 1; fi
 if [ -z "${PROJECT:-}" ]; then echo "PROJECT must be set" > /dev/stderr; exit 1; fi
 
-region=$(yarn -s ts-utils get-kwarg r "$@")
+region=$(ts-utils get-kwarg r "$@")
 region=${region:-us-east-1}
 
 # Prevent bad behavior when trying to upload URL params on aws cli v1

package/script/bin/update-utils.bash

@@ -2,8 +2,8 @@
 # spell-checker: ignore pipefail SIGINT syncpack
 set -euo pipefail; if [ -n "${DEBUG-}" ]; then set -x; fi
 
-newVersion=$(yarn -s info @openstax/ts-utils version)
+newVersion=$(npm view @openstax/ts-utils version)
 
-yarn add -W "@openstax/ts-utils@$newVersion"
+npm install "@openstax/ts-utils@$newVersion"
 
-yarn syncpack fix-mismatches --filter '@openstax/ts-utils'
+syncpack fix-mismatches --filter '@openstax/ts-utils'

package/script/bin/upload-pager-duty-endpoints.bash

@@ -2,8 +2,8 @@
 # spell-checker: ignore pipefail kwarg
 set -euo pipefail; if [ -n "${DEBUG-}" ]; then set -x; fi
 
-source $(yarn -s ts-utils which init-constants-script)
-source $(yarn -s ts-utils which init-params-script)
+source "$(ts-utils which init-constants-script)"
+source "$(ts-utils which init-params-script)"
 
 # List all configured PagerDuty endpoints here
 ENDPOINTS=(
@@ -11,7 +11,7 @@ ENDPOINTS=(
   workday
 )
 
-help=$(yarn -s ts-utils get-kwarg h "$@")
+help=$(ts-utils get-kwarg h "$@")
 
 if [ -n "$help" ]; then
   cat <<HEREDOC

package/script/bin/upload-params.bash

@@ -2,12 +2,12 @@
 # spell-checker: ignore pipefail kwarg sparameters
 set -euo pipefail; if [ -n "${DEBUG-}" ]; then set -x; fi
 
-source $(yarn -s ts-utils which init-constants-script)
-source $(yarn -s ts-utils which init-params-script)
+source "$(ts-utils which init-constants-script)"
+source "$(ts-utils which init-params-script)"
 
 if [ -z "${PARAMS:-}" ]; then echo "PARAMS must be set" > /dev/stderr; exit 1; fi
 
-ENVIRONMENT=$(yarn -s ts-utils get-arg 0 "$@")
+ENVIRONMENT=$(ts-utils get-arg 0 "$@")
 
 if [ -z "$ENVIRONMENT" ]; then
   cat <<HEREDOC
@@ -25,8 +25,8 @@ HEREDOC
   exit 1
 fi
 
-overwrite=$(yarn -s ts-utils get-kwarg o "$@")
-partial=$(yarn -s ts-utils get-kwarg p "$@")
+overwrite=$(ts-utils get-kwarg o "$@")
+partial=$(ts-utils get-kwarg p "$@")
 
 # Check if any params are missing
 params_with_value=

package/script/bin-entry.bash

@@ -10,7 +10,7 @@ bin="$project_dir/script/bin/"
 file="$bin$script.bash"
 
 if [ -z "$script" ]; then
-  printf "specify a command\n\neg:\n  yarn -s ts-utils [command name] [parameters]\n\n"
+  printf "specify a command\n\neg:\n  npx ts-utils [command name] [parameters]\n\n"
 
   find "$bin" -name "*.bash" -exec basename {} \; | sed "s/\.bash//" | sort
 

package/script/build.bash

@@ -8,14 +8,14 @@ cd "$project_dir";
 
 tsc_args=(--noEmit false --declaration --preserveWatchOutput)
 
-if yarn -s ts-utils has-flag watch "$@"; then
+if ts-utils has-flag watch "$@"; then
   tsc_args+=(--watch)
 fi
-if yarn -s ts-utils has-flag clean "$@"; then
+if ts-utils has-flag clean "$@"; then
   rm -rf "$project_dir"/dist
 fi
 
 mkdir -p dist
 
-yarn -s tsc --project tsconfig.without-specs.esm.json "${tsc_args[@]}"
-yarn -s tsc --project tsconfig.without-specs.cjs.json "${tsc_args[@]}"
+tsc --project tsconfig.without-specs.esm.json "${tsc_args[@]}"
+tsc --project tsconfig.without-specs.cjs.json "${tsc_args[@]}"