From 2d3f7ee0108d3c683649adac0670c58cfee9170e Mon Sep 17 00:00:00 2001
From: Kostiantyn Smyrnov <kostysh@gmail.com>
Date: Mon, 3 Apr 2023 22:34:46 +0200
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Updated=20build=20sy?=
 =?UTF-8?q?stem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Esm module only exported
---
 examples/client/package.json             |  4 ++--
 examples/client/src/App.tsx              | 11 +++++-----
 examples/client/tsconfig.json            |  3 ++-
 examples/client/yarn.lock                | 10 ++++-----
 package.json                             | 27 +++++++++++++-----------
 src/index.ts                             |  1 +
 src/storage/local.ts                     |  1 +
 test/shared.queue.spec.ts                |  2 ++
 tsconfig.esm.json => tsconfig.build.json |  4 ++--
 tsconfig.cjs.json                        | 12 -----------
 tsconfig.json                            | 15 ++++++++-----
 11 files changed, 45 insertions(+), 45 deletions(-)
 rename tsconfig.esm.json => tsconfig.build.json (60%)
 delete mode 100644 tsconfig.cjs.json

diff --git a/examples/client/package.json b/examples/client/package.json
index a739bec1..44f66338 100644
--- a/examples/client/package.json
+++ b/examples/client/package.json
@@ -16,10 +16,10 @@
     "eslint-plugin-react-refresh": "^0.3.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "typescript": "^4.9.3",
+    "typescript": "^5.0.3",
     "vite": "^4.1.0",
     "zod": "^3.21.4",
-    "@windingtree/sdk": "^0.1.0-beta.3"
+    "@windingtree/sdk": "latest"
   },
   "eslintConfig": {
     "extends": [
diff --git a/examples/client/src/App.tsx b/examples/client/src/App.tsx
index b20594f6..d84d45b1 100644
--- a/examples/client/src/App.tsx
+++ b/examples/client/src/App.tsx
@@ -7,11 +7,10 @@ import {
   contractConfig,
   serverAddress,
 } from '../../shared/types.js';
-import { isExpired } from '../../../src/utils/time.js';
 import { RequestRecord } from '../../../src/client/requestsRegistry.js';
-import { createClient, Client } from '../../../src/client/index.js';
-import { ClientOptions, storage } from '@windingtree/sdk';
-// import { isExpired } from '@windingtree/sdk/utils';
+import { Client, createClient } from '../../../src/client/index.js';
+import { ClientOptions, storage, utils } from '../../../src/index.js';
+// import { Client, ClientOptions, RequestRecord, createClient, storage } from '@windingtree/sdk';
 
 /** Default request expiration time */
 const defaultExpire = '30s';
@@ -114,10 +113,10 @@ export const Requests = ({ requests, subscribed, onClear, onCancel }: RequestsPr
               <td>{r.data.id}</td>
               <td>{JSON.stringify(r.data.query)}</td>
               <td>{subscribed && subscribed(r.data.id) ? '✅' : 'no'}</td>
-              <td>{isExpired(r.data.expire) || r.cancelled ? '✅' : 'no'}</td>
+              <td>{utils.isExpired(r.data.expire) || r.cancelled ? '✅' : 'no'}</td>
               <td>{r.offers.length}</td>
               <td>
-                {!r.cancelled && !isExpired(r.data.expire) ? (
+                {!r.cancelled && !utils.isExpired(r.data.expire) ? (
                   <button
                     onClick={() => {
                       onCancel(r.data.id);
diff --git a/examples/client/tsconfig.json b/examples/client/tsconfig.json
index 3d0a51a8..a21bb6b7 100644
--- a/examples/client/tsconfig.json
+++ b/examples/client/tsconfig.json
@@ -10,10 +10,11 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "NodeNext",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
+    "noErrorTruncation": true,
     "jsx": "react-jsx"
   },
   "include": ["src"],
diff --git a/examples/client/yarn.lock b/examples/client/yarn.lock
index 42539eb8..64d42268 100644
--- a/examples/client/yarn.lock
+++ b/examples/client/yarn.lock
@@ -2177,7 +2177,7 @@
     magic-string "^0.27.0"
     react-refresh "^0.14.0"
 
-"@windingtree/sdk@^0.1.0-beta.3":
+"@windingtree/sdk@latest":
   version "0.1.0-beta.3"
   resolved "https://registry.yarnpkg.com/@windingtree/sdk/-/sdk-0.1.0-beta.3.tgz#02678fea232da12f493fa3057cba089b2612c55a"
   integrity sha512-9PEjlopjizfkfWSRAT5VTY5I3eCTIipTF59p3vHd/CUjRHGnziFYUPUKSlD8rQ8fpBtrwvFC5Iivo2c6OY1FYQ==
@@ -4514,10 +4514,10 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
-typescript@^4.9.3:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+typescript@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.3.tgz#fe976f0c826a88d0a382007681cbb2da44afdedf"
+  integrity sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==
 
 uint8-varint@^1.0.1, uint8-varint@^1.0.2, uint8-varint@^1.0.6:
   version "1.0.6"
diff --git a/package.json b/package.json
index f6aabb92..23541875 100644
--- a/package.json
+++ b/package.json
@@ -25,26 +25,29 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./lib/cjs/types/index.d.ts",
-      "import": "./lib/esm/index.mjs",
-      "require": "./lib/cjs/index.js"
+      "import": "./lib/index.js"
     },
     "./utils": {
-      "types": "./lib/cjs/types/utils/index.d.ts",
-      "import": "./lib/esm/utils/index.js",
-      "require": "./lib/cjs/utils/index.js"
+      "import": "./lib/utils/index.js"
     }
   },
-  "types": "./lib/cjs/types/index.d.ts",
-  "main": "./lib/cjs/index.js",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "lib/types/*",
+        "lib/types/utils/*"
+      ]
+    }
+  },
+  "types": "./lib/types/index.d.ts",
+  "main": "./lib/index.js",
   "files": [
-    "lib/**/*"
+    "lib/**/*",
+    "!**/*.tsbuildinfo"
   ],
   "scripts": {
     "clean": "rm -rf ./lib",
-    "build": "npm run clean && npm run build:esm && npm run build:cjs",
-    "build:esm": "tsc -p ./tsconfig.esm.json && mv lib/esm/index.js lib/esm/index.mjs",
-    "build:cjs": "tsc -p ./tsconfig.cjs.json",
+    "build": "npm run clean && tsc -p ./tsconfig.build.json",
     "test": "mocha -t 60000 --extension spec.ts",
     "semantic-release": "semantic-release",
     "prepack": "npm run build",
diff --git a/src/index.ts b/src/index.ts
index 6e6a1d89..7665dd16 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,6 @@
 export * as constants from './constants.js';
 export * as storage from './storage/index.js';
+export * as utils from './utils/index.js';
 export * from './server/index.js';
 export * from './client/index.js';
 export * from './node/index.js';
diff --git a/src/storage/local.ts b/src/storage/local.ts
index 4d52ac5b..c69f33ff 100644
--- a/src/storage/local.ts
+++ b/src/storage/local.ts
@@ -96,6 +96,7 @@ export class LocalStorage extends Storage {
     if (value !== null) {
       return this.deserialize<ValueType>(value);
     }
+    return;
   }
 
   /**
diff --git a/test/shared.queue.spec.ts b/test/shared.queue.spec.ts
index 7030b7cb..643823a5 100644
--- a/test/shared.queue.spec.ts
+++ b/test/shared.queue.spec.ts
@@ -155,6 +155,8 @@ describe('Shared.Queue', () => {
       if (job.state.attempts >= counter) {
         return true;
       }
+
+      return;
     };
 
     queue.addJobHandler(name, handler);
diff --git a/tsconfig.esm.json b/tsconfig.build.json
similarity index 60%
rename from tsconfig.esm.json
rename to tsconfig.build.json
index a7a935e9..b9237820 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.build.json
@@ -1,8 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./lib/esm",
-    "declarationDir": "./lib/esm/types"
+    "outDir": "./lib",
+    "declarationDir": "./lib/types"
   },
   "exclude": ["./examples", "./test"]
 }
diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json
deleted file mode 100644
index 129b1116..00000000
--- a/tsconfig.cjs.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "lib": ["ES6", "DOM"],
-    "target": "ES6",
-    "module": "CommonJS",
-    "moduleResolution": "Node",
-    "outDir": "./lib/cjs",
-    "declarationDir": "./lib/cjs/types"
-  },
-  "exclude": ["./examples", "./test"]
-}
diff --git a/tsconfig.json b/tsconfig.json
index 76c19b4f..28c329c5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,10 @@
   "compilerOptions": {
     "strict": true,
     "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
+    "lib": ["ES2022", "DOM"],
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "NodeNext",
     "skipLibCheck": true,
     "checkJs": true,
     "allowJs": true,
@@ -11,10 +14,12 @@
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
     "noErrorTruncation": true,
-    "lib": ["ES2022", "DOM"],
-    "target": "ES2022",
-    "module": "ESNext",
-    "moduleResolution": "NodeNext"
+    "incremental": true,
+    "composite": true,
+    "forceConsistentCasingInFileNames": true,
+    "useUnknownInCatchVariables": true,
+    "importsNotUsedAsValues": "remove",
+    "noImplicitReturns": true
   },
   "include": ["./src/**/*.ts", "./examples/**/*.ts", "./test/**/*.ts"]
 }