From 8c1c36ae0978925605ac3bb242fe9dbe91ceabe5 Mon Sep 17 00:00:00 2001
From: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
Date: Fri, 5 Nov 2021 06:29:22 +0000
Subject: [PATCH] Fix type error when using the latest sort-keys-recursive

The latest version (2.1.2) of sort-keys-recursive adds TypeScript
typing, which includes export default function.
This change has caused the TS2349 type error.

This patch modifies the import form in assetTransfer.ts to fix the error.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
---
 asset-transfer-basic/chaincode-javascript/package.json        | 2 +-
 asset-transfer-basic/chaincode-typescript/package.json        | 4 ++--
 .../chaincode-typescript/src/assetTransfer.ts                 | 4 ++--
 asset-transfer-basic/chaincode-typescript/tsconfig.json       | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/asset-transfer-basic/chaincode-javascript/package.json b/asset-transfer-basic/chaincode-javascript/package.json
index 6a44f07d..a5e2690f 100644
--- a/asset-transfer-basic/chaincode-javascript/package.json
+++ b/asset-transfer-basic/chaincode-javascript/package.json
@@ -20,7 +20,7 @@
         "fabric-contract-api": "^2.0.0",
         "fabric-shim": "^2.0.0",
         "json-stringify-deterministic": "^1.0.1",
-        "sort-keys-recursive": "^2.0.0"
+        "sort-keys-recursive": "^2.1.2"
     },
     "devDependencies": {
         "chai": "^4.1.2",
diff --git a/asset-transfer-basic/chaincode-typescript/package.json b/asset-transfer-basic/chaincode-typescript/package.json
index befe4a5f..66f41315 100644
--- a/asset-transfer-basic/chaincode-typescript/package.json
+++ b/asset-transfer-basic/chaincode-typescript/package.json
@@ -23,8 +23,8 @@
     "dependencies": {
         "fabric-contract-api": "^2.0.0",
         "fabric-shim": "^2.0.0",
-        "json-stringify-deterministic":"^1.0.0",
-        "sort-keys-recursive":"^2.0.0"
+        "json-stringify-deterministic": "^1.0.0",
+        "sort-keys-recursive": "^2.1.2"
     },
     "devDependencies": {
         "@types/chai": "^4.1.7",
diff --git a/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts b/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts
index 80809475..586c4758 100644
--- a/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts
+++ b/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts
@@ -3,8 +3,8 @@
  */
 // Deterministic JSON.stringify()
 import {Context, Contract, Info, Returns, Transaction} from 'fabric-contract-api';
-import * as stringify from 'json-stringify-deterministic';
-import * as sortKeysRecursive from 'sort-keys-recursive';
+import stringify from 'json-stringify-deterministic';
+import sortKeysRecursive from 'sort-keys-recursive';
 import {Asset} from './asset';
 
 @Info({title: 'AssetTransfer', description: 'Smart contract for trading assets'})
diff --git a/asset-transfer-basic/chaincode-typescript/tsconfig.json b/asset-transfer-basic/chaincode-typescript/tsconfig.json
index 80d8e12d..70cc98c9 100644
--- a/asset-transfer-basic/chaincode-typescript/tsconfig.json
+++ b/asset-transfer-basic/chaincode-typescript/tsconfig.json
@@ -6,6 +6,7 @@
         "target": "es2017",
         "moduleResolution": "node",
         "module": "commonjs",
+        "esModuleInterop": true,
         "declaration": true,
         "sourceMap": true
     },