Fix ts-scenario TypeScript transpile failure (#675)

ts-scenario tests failed with Node 16 and 18 only, with the following error:

TSError: ⨯ Unable to compile TypeScript:
error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.

The fix is to explicitly specify the location of the tsconfig.json file (containing the required TypeScript compiler configuration) for ts-node using the TS_NODE_PROJECT environment variable.

Also disable runtime type checking in ts-node using the SWC transpiler to provide a performance improvement.

Signed-off-by: Mark S. Lewis <[email protected]>

Author: bestbeforetoday

.eslintignore

@@ -7,4 +7,4 @@
 docs/**
 fabric-network/lib/**
 fabric-protos/**
-test/typescript/**
+test/ts-scenario/lib/**

docs/tutorials/query-peers.md

@@ -140,4 +140,4 @@ The following sample code is in TypeScript to show the object types involved.
 	}
 ```
 
-For a complete sample plug-in query handler implementation, see [sample-query-handler.ts](https://github.com/hyperledger/fabric-sdk-node/blob/main/test/ts-scenario/config/handlers/sample-query-handler.ts).
+For a complete sample plug-in query handler implementation, see [sample-query-handler.ts](https://github.com/hyperledger/fabric-sdk-node/blob/main/test/ts-scenario/src/handlers/sample-query-handler.ts).

docs/tutorials/transaction-commit-events.md

@@ -121,4 +121,4 @@ listener to monitor commit events from endorsing peers by calling
 [Network.addCommitListener](module-fabric-network.Network.html#addCommitListener).
 
 For a complete sample plug-in event handler implementation, see
-[sample-transaction-event-handler.ts](https://github.com/hyperledger/fabric-sdk-node/blob/main/test/ts-scenario/config/handlers/sample-transaction-event-handler.ts).
+[sample-transaction-event-handler.ts](https://github.com/hyperledger/fabric-sdk-node/blob/main/test/ts-scenario/src/handlers/sample-transaction-event-handler.ts).

fabric-network/.eslintignore

@@ -31,13 +31,11 @@
     "unitTest": "ts-mocha --reporter list",
     "dockerReady": "npm run dockerClean && (cd test/fixtures/docker-compose && docker-compose -f docker-compose-tls-level-db.yaml -p node up -d && sleep 15 && docker ps -a)",
     "tapeIntegration": "./scripts/npm_scripts/runTape.sh",
-    "cucumberScenario": "npm run setupCucumbers && export HFC_LOGGING='{\"debug\":\"test/temp/debugc.log\"}' && npm run test:cucumber && npm run dockerClean && nyc --check-coverage --statements 54 --branches 32 --functions 46 --lines 54 npm run test:ts-cucumber",
-    "cucumberScenarioNoHSM": "npm run setupCucumbers && export HFC_LOGGING='{\"debug\":\"test/temp/debugc.log\"}' && npm run test:cucumber && npm run dockerClean && nyc --check-coverage --statements 54 --branches 32 --functions 46 --lines 54 npm run test:ts-cucumberNoHSM",
+    "cucumberScenario": "npm run setupCucumbers && export HFC_LOGGING='{\"debug\":\"test/temp/debugc.log\"}' && npm run dockerClean && nyc --check-coverage --statements 54 --branches 32 --functions 46 --lines 54 npm run test:ts-cucumber",
+    "cucumberScenarioNoHSM": "npm run setupCucumbers && export HFC_LOGGING='{\"debug\":\"test/temp/debugc.log\"}' && npm run dockerClean && nyc --check-coverage --statements 54 --branches 32 --functions 46 --lines 54 npm run test:ts-cucumberNoHSM",
     "setupCucumbers": "node -e 'require(\"./scripts/npm_scripts/testFunctions.js\").createCucumberLogFile()'",
-    "test:cucumber": "cucumber-js -f @cucumber/pretty-formatter ./test/scenario/features/*.feature",
-    "test:ts-cucumber": "cucumber-js -f @cucumber/pretty-formatter ./test/ts-scenario/features/*.feature --require './test/ts-scenario/steps/**/*.ts' --require './test/ts-scenario/support/**/*.ts' --require-module ts-node/register",
-    "test:ts-cucumberNoHSM": "cucumber-js -f @cucumber/pretty-formatter ./test/ts-scenario/features/*.feature --require './test/ts-scenario/steps/**/*.ts' --require './test/ts-scenario/support/**/*.ts' --require-module ts-node/register --tags 'not @gateway_hsm'",
-    "test:ts-cucumber-tagged": "npm run test:ts-cucumber -- --tags @events",
+    "test:ts-cucumber": "tsc --project test/ts-scenario/tsconfig.json && cucumber-js -f @cucumber/pretty-formatter ./test/ts-scenario/features/*.feature --require './test/ts-scenario/lib/**/*.js'",
+    "test:ts-cucumberNoHSM": "npm run test:ts-cucumber -- --tags 'not @gateway_hsm'",
     "testHeadless": "run-s cleanUp compile lint unitTest:all",
     "tapeAndCucumber": "run-s tapeIntegration dockerClean cucumberScenario"
   },
@@ -79,7 +77,6 @@
     "tape-promise": "^4.0.0",
     "ts-mocha": "^9.0.2",
     "ts-mock-imports": "^1.3.4",
-    "ts-node": "^10.5.0",
     "typescript": "~4.4.4",
     "winston": "^2.4.5"
   },

package.json

@@ -18,6 +18,7 @@ CHECK=$(find . -type f \
     -not -path './fabric-protos/types/index.d.ts' \
     -not -path './fabric-network/lib/*' \
     -not -path './.idea/*' \
+    -not -path './test/ts-scenario/lib/*' \
     -not -name '.*' \
     -not -name '*.txt' \
     -not -name '*.rst' \

scripts/npm_scripts/checkLicense.sh

@@ -10,13 +10,17 @@ FABRIC_VERSION=${FABRIC_VERSION:-2.2}
 COUCHDB_VERSION=${COUCHDB_VERSION:-3.2}
 CA_VERSION=${CA_VERSION:-1.5}
 
+pull() {
+    docker pull -q "$1" || docker pull -q --platform amd64 "$1"
+}
+
 for image in peer orderer ccenv baseos nodeenv javaenv tools; do
-    docker pull -q "hyperledger/fabric-${image}:${FABRIC_VERSION}"
+    pull "hyperledger/fabric-${image}:${FABRIC_VERSION}"
     docker tag "hyperledger/fabric-${image}:${FABRIC_VERSION}" "hyperledger/fabric-${image}"
 done
 
-docker pull -q "couchdb:${COUCHDB_VERSION}"
+pull "couchdb:${COUCHDB_VERSION}"
 docker tag "couchdb:${COUCHDB_VERSION}" couchdb
 
-docker pull -q "hyperledger/fabric-ca:${CA_VERSION}"
+pull "hyperledger/fabric-ca:${CA_VERSION}"
 docker tag "hyperledger/fabric-ca:${CA_VERSION}" hyperledger/fabric-ca

scripts/utility/fabric_images.sh

@@ -0,0 +1 @@
+lib/**