From 063ad60ddf2fc46cf37391dcecdf29c33a9f8453 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>
(cherry picked from commit 8c1c36ae0978925605ac3bb242fe9dbe91ceabe5)

# Conflicts:
#	asset-transfer-basic/chaincode-javascript/package.json
#	asset-transfer-basic/chaincode-typescript/package.json
#	asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts
---
 asset-transfer-basic/chaincode-javascript/package.json      | 6 ++++++
 asset-transfer-basic/chaincode-typescript/package.json      | 6 ++++++
 .../chaincode-typescript/src/assetTransfer.ts               | 5 +++++
 asset-transfer-basic/chaincode-typescript/tsconfig.json     | 1 +
 4 files changed, 18 insertions(+)

diff --git a/asset-transfer-basic/chaincode-javascript/package.json b/asset-transfer-basic/chaincode-javascript/package.json
index 9cc22242..16298e65 100644
--- a/asset-transfer-basic/chaincode-javascript/package.json
+++ b/asset-transfer-basic/chaincode-javascript/package.json
@@ -18,7 +18,13 @@
     "license": "Apache-2.0",
     "dependencies": {
         "fabric-contract-api": "^2.0.0",
+<<<<<<< HEAD
         "fabric-shim": "^2.0.0"
+=======
+        "fabric-shim": "^2.0.0",
+        "json-stringify-deterministic": "^1.0.1",
+        "sort-keys-recursive": "^2.1.2"
+>>>>>>> 8c1c36a (Fix type error when using the latest sort-keys-recursive)
     },
     "devDependencies": {
         "chai": "^4.1.2",
diff --git a/asset-transfer-basic/chaincode-typescript/package.json b/asset-transfer-basic/chaincode-typescript/package.json
index 2b681fc1..09dad993 100644
--- a/asset-transfer-basic/chaincode-typescript/package.json
+++ b/asset-transfer-basic/chaincode-typescript/package.json
@@ -22,7 +22,13 @@
     "license": "Apache-2.0",
     "dependencies": {
         "fabric-contract-api": "^2.0.0",
+<<<<<<< HEAD
         "fabric-shim": "^2.0.0"
+=======
+        "fabric-shim": "^2.0.0",
+        "json-stringify-deterministic": "^1.0.0",
+        "sort-keys-recursive": "^2.1.2"
+>>>>>>> 8c1c36a (Fix type error when using the latest sort-keys-recursive)
     },
     "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 b21f12ec..6ca6f344 100644
--- a/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts
+++ b/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts
@@ -3,6 +3,11 @@
  */
 
 import {Context, Contract, Info, Returns, Transaction} from 'fabric-contract-api';
+<<<<<<< HEAD
+=======
+import stringify from 'json-stringify-deterministic';
+import sortKeysRecursive from 'sort-keys-recursive';
+>>>>>>> 8c1c36a (Fix type error when using the latest 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
     },