refactor: remap ts typings from types to lib

This was necessary because if we import JSON files and then re-use their schema as types, then the d.ts files will need to have access to said JSON file which does not happen if the typings and the actual .js code are in separate directories because then the relative paths are not working as they should. Moving the lib and the types together means that now the d.ts files can import with the same relative paths that the orignial source code (.ts files) can as well. Signed-off-by: Youngone Lee <[email protected]> Signed-off-by: Peter Somogyvari <[email protected]>
petermetz · Aug 13, 2021 · 22eac9a · 22eac9a
1 parent 3d68fe3
commit 22eac9a
Show file tree

Hide file tree

Showing 64 changed files with 128 additions and 96 deletions.
diff --git a/examples/cactus-example-carbon-accounting-backend/package.json b/examples/cactus-example-carbon-accounting-backend/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-example-carbon-accounting-backend.web.umd.js",
   "browserMinified": "dist/cactus-example-carbon-accounting-backend.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -99,4 +99,4 @@
     "http-status-codes": "2.1.4",
     "jose": "1.27.2"
   }
-}
+}
diff --git a/...-backend/src/main/typescript/infrastructure/carbon-accounting-app-dummy-infrastructure.ts b/...-backend/src/main/typescript/infrastructure/carbon-accounting-app-dummy-infrastructure.ts
@@ -31,7 +31,7 @@ import {
 import {
   ICarbonAccountingFabricContractDeploymentInfo,
   ICarbonAccountingXdaiContractDeploymentInfo,
-} from "@hyperledger/cactus-example-carbon-accounting-business-logic-plugin/dist/types/main/typescript/i-carbon-accounting-contract-deployment-info";
+} from "@hyperledger/cactus-example-carbon-accounting-business-logic-plugin/dist/lib/main/typescript/i-carbon-accounting-contract-deployment-info";
 
 export interface ICarbonAccountingAppDummyInfrastructureOptions {
   logLevel?: LogLevelDesc;

diff --git a/examples/cactus-example-carbon-accounting-backend/tsconfig.json b/examples/cactus-example-carbon-accounting-backend/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-example-carbon-accounting-backend.tsbuildinfo"
   },

diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json b/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-example-carbon-accounting-business-logic-plugin.web.umd.js",
   "browserMinified": "dist/cactus-example-carbon-accounting-business-logic-plugin.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -92,4 +92,4 @@
     "@types/ssh2": "0.5.46",
     "@types/uuid": "8.0.1"
   }
-}
+}
diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/tsconfig.json b/examples/cactus-example-carbon-accounting-business-logic-plugin/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-example-carbon-accounting-business-logic-plugin.tsbuildinfo"
   },

diff --git a/examples/cactus-example-supply-chain-backend/package.json b/examples/cactus-example-supply-chain-backend/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-example-supply-chain-backend.web.umd.js",
   "browserMinified": "dist/cactus-example-supply-chain-backend.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -91,4 +91,4 @@
     "@types/express": "4.17.8",
     "@types/uuid": "8.0.1"
   }
-}
+}
diff --git a/examples/cactus-example-supply-chain-backend/tsconfig.json b/examples/cactus-example-supply-chain-backend/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-example-supply-chain-backend.tsbuildinfo"
   },

diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/package.json b/examples/cactus-example-supply-chain-business-logic-plugin/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-example-supply-chain-business-logic-plugin.web.umd.js",
   "browserMinified": "dist/cactus-example-supply-chain-business-logic-plugin.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -93,4 +93,4 @@
     "@types/ssh2": "0.5.46",
     "@types/uuid": "8.0.1"
   }
-}
+}
diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/tsconfig.json b/examples/cactus-example-supply-chain-business-logic-plugin/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-example-supply-chain-business-logic-plugin.tsbuildinfo"
   },

diff --git a/extensions/cactus-plugin-object-store-ipfs/package.json b/extensions/cactus-plugin-object-store-ipfs/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-plugin-object-store-ipfs.web.umd.js",
   "browserMinified": "dist/cactus-plugin-object-store-ipfs.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -87,4 +87,4 @@
     "express": "4.17.1",
     "ipfs-core-types": "0.5.0"
   }
-}
+}
diff --git a/extensions/cactus-plugin-object-store-ipfs/tsconfig.json b/extensions/cactus-plugin-object-store-ipfs/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-plugin-object-store-ipfs.tsbuildinfo",
     "skipLibCheck": true

diff --git a/packages/cactus-api-client/package.json b/packages/cactus-api-client/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-api-client.web.umd.js",
   "browserMinified": "dist/cactus-api-client.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -68,4 +68,4 @@
     "@hyperledger/cactus-core-api": "0.7.0",
     "@hyperledger/cactus-plugin-consortium-manual": "0.7.0"
   }
-}
+}
diff --git a/packages/cactus-api-client/tsconfig.json b/packages/cactus-api-client/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-api-client.tsbuildinfo"
   },

diff --git a/packages/cactus-cmd-api-server/package.json b/packages/cactus-cmd-api-server/package.json
@@ -10,7 +10,7 @@
   "browser": "dist/cactus-cmd-api-server.web.umd.js",
   "browserMinified": "dist/cactus-cmd-api-server.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "scripts": {
     "generate-sdk": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --reserved-words-mappings protected=protected",
     "codegen:openapi": "npm run generate-sdk",
@@ -120,4 +120,4 @@
     "@types/uuid": "7.0.2",
     "@types/xml2js": "0.4.8"
   }
-}
+}
diff --git a/packages/cactus-cmd-api-server/tsconfig.json b/packages/cactus-cmd-api-server/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-cmd-api-server.tsbuildinfo"
   },

diff --git a/packages/cactus-common/package.json b/packages/cactus-common/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-common.web.umd.js",
   "browserMinified": "dist/cactus-common.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -76,4 +76,4 @@
     "@types/uuid": "8.3.0",
     "uuid": "8.3.1"
   }
-}
+}
diff --git a/packages/cactus-common/tsconfig.json b/packages/cactus-common/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-common.tsbuildinfo"
   },

diff --git a/packages/cactus-core-api/package.json b/packages/cactus-core-api/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-core-api.web.umd.js",
   "browserMinified": "dist/cactus-core-api.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -80,4 +80,4 @@
     "@hyperledger/cactus-common": "0.7.0",
     "axios": "0.21.1"
   }
-}
+}
diff --git a/packages/cactus-core-api/tsconfig.json b/packages/cactus-core-api/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-core-api.tsbuildinfo"
   },

diff --git a/packages/cactus-core/package.json b/packages/cactus-core/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-core.web.umd.js",
   "browserMinified": "dist/cactus-core.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -73,4 +73,4 @@
     "@types/express": "4.17.8",
     "uuid": "8.3.2"
   }
-}
+}
diff --git a/packages/cactus-core/tsconfig.json b/packages/cactus-core/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "resolveJsonModule": true,
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-core.tsbuildinfo"

diff --git a/packages/cactus-plugin-consortium-manual/package.json b/packages/cactus-plugin-consortium-manual/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-plugin-consortium-manual.web.umd.js",
   "browserMinified": "dist/cactus-plugin-consortium-manual.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -89,4 +89,4 @@
     "@types/json-stable-stringify": "1.0.32",
     "@types/uuid": "8.3.0"
   }
-}
+}
diff --git a/packages/cactus-plugin-consortium-manual/tsconfig.json b/packages/cactus-plugin-consortium-manual/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-plugin-consortium-manual.tsbuildinfo"
   },

diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/package.json b/packages/cactus-plugin-htlc-eth-besu-erc20/package.json
@@ -7,7 +7,7 @@
     "browser": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.js",
     "browserMinified": "dist/cactus-plugin-htlc-eth-besu-erc20.web.umd.min.js",
     "module": "dist/lib/main/typescript/index.js",
-    "types": "dist/types/main/typescript/index.d.ts",
+    "types": "dist/lib/main/typescript/index.d.ts",
     "files": [
         "dist/*"
     ],

diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/tsconfig.json b/packages/cactus-plugin-htlc-eth-besu-erc20/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "resolveJsonModule": true,
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-plugin-htlc-eth-besu-erc20.tsbuildinfo"

diff --git a/packages/cactus-plugin-htlc-eth-besu/package.json b/packages/cactus-plugin-htlc-eth-besu/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-plugin-htlc-eth-besu.web.umd.js",
   "browserMinified": "dist/cactus-plugin-htlc-eth-besu.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],

diff --git a/packages/cactus-plugin-htlc-eth-besu/tsconfig.json b/packages/cactus-plugin-htlc-eth-besu/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "resolveJsonModule": true,
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-plugin-htlc-eth-besu.tsbuildinfo"

diff --git a/packages/cactus-plugin-keychain-aws-sm/package.json b/packages/cactus-plugin-keychain-aws-sm/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-plugin-keychain-aws-sm.web.umd.js",
   "browserMinified": "dist/cactus-plugin-keychain-aws-sm.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],

diff --git a/packages/cactus-plugin-keychain-aws-sm/tsconfig.json b/packages/cactus-plugin-keychain-aws-sm/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-plugin-keychain-aws-sm.tsbuildinfo"
   },

diff --git a/packages/cactus-plugin-keychain-azure-kv/package.json b/packages/cactus-plugin-keychain-azure-kv/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-plugin-keychain-azure-kv.web.umd.js",
   "browserMinified": "dist/cactus-plugin-keychain-azure-kv.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],

diff --git a/packages/cactus-plugin-keychain-azure-kv/tsconfig.json b/packages/cactus-plugin-keychain-azure-kv/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-plugin-keychain-azure-kv.tsbuildinfo"
   },

diff --git a/packages/cactus-plugin-keychain-google-sm/package.json b/packages/cactus-plugin-keychain-google-sm/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-plugin-keychain-google-sm.web.umd.js",
   "browserMinified": "dist/cactus-plugin-keychain-google-sm.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],

diff --git a/packages/cactus-plugin-keychain-google-sm/tsconfig.json b/packages/cactus-plugin-keychain-google-sm/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-plugin-keychain-google-sm.tsbuildinfo"
   },

diff --git a/packages/cactus-plugin-keychain-memory/package.json b/packages/cactus-plugin-keychain-memory/package.json
@@ -7,7 +7,7 @@
   "browser": "dist/cactus-plugin-keychain-memory.web.umd.js",
   "browserMinified": "dist/cactus-plugin-keychain-memory.web.umd.min.js",
   "module": "dist/lib/main/typescript/index.js",
-  "types": "dist/types/main/typescript/index.d.ts",
+  "types": "dist/lib/main/typescript/index.d.ts",
   "files": [
     "dist/*"
   ],
@@ -83,4 +83,4 @@
   "devDependencies": {
     "@types/express": "4.17.8"
   }
-}
+}
diff --git a/packages/cactus-plugin-keychain-memory/tsconfig.json b/packages/cactus-plugin-keychain-memory/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "composite": true,
     "outDir": "./dist/lib/",
-    "declarationDir": "dist/types",
+    "declarationDir": "dist/lib",
     "rootDir": "./src",
     "tsBuildInfoFile": "../../.build-cache/cactus-plugin-keychain-memory.tsbuildinfo"
   },