summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2023-09-06 13:24:34 +0200
committerFlorian Dold <florian@dold.me>2023-09-06 13:24:34 +0200
commitb63937703ce1e269055497ee14ac90a28de2fc74 (patch)
treea2f9aa841b18f950028b34b17f88bf28c70dd5db /packages
parent7450bede5b5809f6a496b7e68852a454386850e5 (diff)
downloadwallet-core-b63937703ce1e269055497ee14ac90a28de2fc74.tar.gz
wallet-core-b63937703ce1e269055497ee14ac90a28de2fc74.tar.bz2
wallet-core-b63937703ce1e269055497ee14ac90a28de2fc74.zip
move bank API client to taler-util, update typescript config
Diffstat (limited to 'packages')
-rw-r--r--packages/aml-backoffice-ui/package.json2
-rw-r--r--packages/aml-backoffice-ui/tsconfig.json15
-rw-r--r--packages/anastasis-cli/package.json6
-rw-r--r--packages/anastasis-cli/tsconfig.json6
-rw-r--r--packages/anastasis-core/package.json2
-rw-r--r--packages/anastasis-core/tsconfig.json2
-rw-r--r--packages/anastasis-webui/package.json2
-rw-r--r--packages/anastasis-webui/tsconfig.json6
-rw-r--r--packages/demobank-ui/package.json2
-rw-r--r--packages/demobank-ui/tsconfig.json15
-rw-r--r--packages/idb-bridge/package.json2
-rw-r--r--packages/idb-bridge/tsconfig.json4
-rw-r--r--packages/merchant-backend-ui/package.json2
-rw-r--r--packages/merchant-backoffice-ui/package.json4
-rw-r--r--packages/merchant-backoffice-ui/tsconfig.json117
-rw-r--r--packages/pogen/package.json2
-rw-r--r--packages/pogen/tsconfig.json2
-rw-r--r--packages/taler-harness/package.json2
-rw-r--r--packages/taler-harness/src/harness/harness.ts17
-rw-r--r--packages/taler-harness/src/harness/helpers.ts24
-rw-r--r--packages/taler-harness/src/index.ts2
-rw-r--r--packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts12
-rw-r--r--packages/taler-harness/src/integrationtests/test-bank-api.ts5
-rw-r--r--packages/taler-harness/src/integrationtests/test-exchange-management.ts26
-rw-r--r--packages/taler-harness/src/integrationtests/test-kyc.ts6
-rw-r--r--packages/taler-harness/src/integrationtests/test-libeufin-basic.ts6
-rw-r--r--packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts4
-rw-r--r--packages/taler-harness/src/integrationtests/test-payment-fault.ts7
-rw-r--r--packages/taler-harness/src/integrationtests/test-tipping.ts4
-rw-r--r--packages/taler-harness/src/integrationtests/test-wallet-notifications.ts6
-rw-r--r--packages/taler-harness/src/integrationtests/test-withdrawal-abort-bank.ts7
-rw-r--r--packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts8
-rw-r--r--packages/taler-harness/src/integrationtests/test-withdrawal-fees.ts7
-rw-r--r--packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts8
-rw-r--r--packages/taler-harness/tsconfig.json4
-rw-r--r--packages/taler-util/package.json6
-rw-r--r--packages/taler-util/src/bank-api-client.ts (renamed from packages/taler-wallet-core/src/bank-api-client.ts)15
-rw-r--r--packages/taler-util/src/http-common.ts2
-rw-r--r--packages/taler-util/src/index.ts1
-rw-r--r--packages/taler-util/tsconfig.json4
-rw-r--r--packages/taler-wallet-cli/package.json4
-rw-r--r--packages/taler-wallet-cli/tsconfig.json4
-rw-r--r--packages/taler-wallet-core/package.json4
-rw-r--r--packages/taler-wallet-core/src/dbless.ts6
-rw-r--r--packages/taler-wallet-core/src/index.ts2
-rw-r--r--packages/taler-wallet-core/src/wallet.ts6
-rw-r--r--packages/taler-wallet-core/tsconfig.json11
-rw-r--r--packages/taler-wallet-embedded/tsconfig.json4
-rw-r--r--packages/taler-wallet-webextension/package.json2
-rw-r--r--packages/taler-wallet-webextension/src/wxBackend.ts11
-rw-r--r--packages/taler-wallet-webextension/tsconfig.json19
-rw-r--r--packages/web-util/package.json2
-rw-r--r--packages/web-util/tsconfig.json17
53 files changed, 203 insertions, 263 deletions
diff --git a/packages/aml-backoffice-ui/package.json b/packages/aml-backoffice-ui/package.json
index 3fde72b74..a761374df 100644
--- a/packages/aml-backoffice-ui/package.json
+++ b/packages/aml-backoffice-ui/package.json
@@ -59,7 +59,7 @@
"postcss": "^8.4.23",
"postcss-cli": "^10.1.0",
"tailwindcss": "^3.3.2",
- "typescript": "5.1.3"
+ "typescript": "5.2.2"
},
"pogen": {
"domain": "aml-backoffice"
diff --git a/packages/aml-backoffice-ui/tsconfig.json b/packages/aml-backoffice-ui/tsconfig.json
index cc5bdf396..9826fac07 100644
--- a/packages/aml-backoffice-ui/tsconfig.json
+++ b/packages/aml-backoffice-ui/tsconfig.json
@@ -1,12 +1,9 @@
{
"compilerOptions": {
/* Basic Options */
- "target": "ES5",
- "module": "ES6",
- "lib": [
- "DOM",
- "ES2017"
- ],
+ "target": "ES2020",
+ "module": "Node16",
+ "lib": ["DOM", "ES2020"],
"allowJs": true /* Allow javascript files to be compiled. */,
// "checkJs": true, /* Report errors in .js files. */
"jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
@@ -45,7 +42,5 @@
/* Advanced Options */
"skipLibCheck": true /* Skip type checking of declaration files. */
},
- "include": [
- "src/**/*"
- ]
-} \ No newline at end of file
+ "include": ["src/**/*"]
+}
diff --git a/packages/anastasis-cli/package.json b/packages/anastasis-cli/package.json
index 2bbf32c3b..55af7cc06 100644
--- a/packages/anastasis-cli/package.json
+++ b/packages/anastasis-cli/package.json
@@ -33,12 +33,12 @@
"@types/node": "^18.11.17",
"prettier": "^2.8.8",
"rimraf": "^3.0.2",
- "typedoc": "^0.24.8",
- "typescript": "^5.1.3"
+ "typedoc": "^0.25.1",
+ "typescript": "^5.2.2"
},
"dependencies": {
- "@gnu-taler/taler-util": "workspace:*",
"@gnu-taler/anastasis-core": "workspace:*",
+ "@gnu-taler/taler-util": "workspace:*",
"tslib": "^2.5.3"
}
}
diff --git a/packages/anastasis-cli/tsconfig.json b/packages/anastasis-cli/tsconfig.json
index 83da34277..7675edfbc 100644
--- a/packages/anastasis-cli/tsconfig.json
+++ b/packages/anastasis-cli/tsconfig.json
@@ -2,11 +2,11 @@
"compileOnSave": true,
"compilerOptions": {
"composite": true,
- "target": "ES2018",
- "module": "ESNext",
+ "target": "ES2020",
+ "module": "Node16",
"moduleResolution": "Node16",
"sourceMap": true,
- "lib": ["es6"],
+ "lib": ["ES2020"],
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"strict": true,
diff --git a/packages/anastasis-core/package.json b/packages/anastasis-core/package.json
index c3a7106fb..aa182e047 100644
--- a/packages/anastasis-core/package.json
+++ b/packages/anastasis-core/package.json
@@ -18,7 +18,7 @@
"devDependencies": {
"ava": "^4.3.3",
"rimraf": "^3.0.2",
- "typescript": "^5.1.3"
+ "typescript": "^5.2.2"
},
"dependencies": {
"@gnu-taler/taler-util": "workspace:*",
diff --git a/packages/anastasis-core/tsconfig.json b/packages/anastasis-core/tsconfig.json
index 44a159836..a12f2e641 100644
--- a/packages/anastasis-core/tsconfig.json
+++ b/packages/anastasis-core/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"composite": true,
"target": "ES2020",
- "module": "ESNext",
+ "module": "Node16",
"moduleResolution": "Node16",
"sourceMap": true,
"lib": ["ES2020"],
diff --git a/packages/anastasis-webui/package.json b/packages/anastasis-webui/package.json
index eff5ba04d..efee9633e 100644
--- a/packages/anastasis-webui/package.json
+++ b/packages/anastasis-webui/package.json
@@ -44,6 +44,6 @@
"chai": "^4.3.6",
"mocha": "^9.2.0",
"sass": "1.56.1",
- "typescript": "^5.1.3"
+ "typescript": "^5.2.2"
}
}
diff --git a/packages/anastasis-webui/tsconfig.json b/packages/anastasis-webui/tsconfig.json
index 642c34f5a..9e52f2b7e 100644
--- a/packages/anastasis-webui/tsconfig.json
+++ b/packages/anastasis-webui/tsconfig.json
@@ -1,11 +1,11 @@
{
"compilerOptions": {
/* Basic Options */
- "target": "ES5",
- "module": "ES6",
+ "target": "ES2020",
+ "module": "Node16",
"lib": [
"DOM",
- "ES2017"
+ "ES2020"
],
"allowJs": true /* Allow javascript files to be compiled. */,
// "checkJs": true, /* Report errors in .js files. */
diff --git a/packages/demobank-ui/package.json b/packages/demobank-ui/package.json
index a584bbf35..d33fae709 100644
--- a/packages/demobank-ui/package.json
+++ b/packages/demobank-ui/package.json
@@ -60,7 +60,7 @@
"po2json": "^0.4.5",
"preact-render-to-string": "^5.2.6",
"sass": "1.56.1",
- "typescript": "5.1.3"
+ "typescript": "5.2.2"
},
"pogen": {
"domain": "bank"
diff --git a/packages/demobank-ui/tsconfig.json b/packages/demobank-ui/tsconfig.json
index abb9a9f36..9826fac07 100644
--- a/packages/demobank-ui/tsconfig.json
+++ b/packages/demobank-ui/tsconfig.json
@@ -1,12 +1,9 @@
{
"compilerOptions": {
/* Basic Options */
- "target": "ES5",
- "module": "ES6",
- "lib": [
- "DOM",
- "ES2016"
- ],
+ "target": "ES2020",
+ "module": "Node16",
+ "lib": ["DOM", "ES2020"],
"allowJs": true /* Allow javascript files to be compiled. */,
// "checkJs": true, /* Report errors in .js files. */
"jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
@@ -45,7 +42,5 @@
/* Advanced Options */
"skipLibCheck": true /* Skip type checking of declaration files. */
},
- "include": [
- "src/**/*"
- ]
-} \ No newline at end of file
+ "include": ["src/**/*"]
+}
diff --git a/packages/idb-bridge/package.json b/packages/idb-bridge/package.json
index 1c9c46b02..ce64314ff 100644
--- a/packages/idb-bridge/package.json
+++ b/packages/idb-bridge/package.json
@@ -29,7 +29,7 @@
"ava": "^5.3.1",
"prettier": "^2.8.8",
"rimraf": "^5.0.1",
- "typescript": "^5.1.6"
+ "typescript": "^5.2.2"
},
"dependencies": {
"tslib": "^2.6.0"
diff --git a/packages/idb-bridge/tsconfig.json b/packages/idb-bridge/tsconfig.json
index 19e9c2a74..44a27284b 100644
--- a/packages/idb-bridge/tsconfig.json
+++ b/packages/idb-bridge/tsconfig.json
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"composite": true,
- "lib": ["es6"],
- "module": "ES2020",
+ "lib": ["ES2020"],
+ "module": "Node16",
"moduleResolution": "Node16",
"target": "ES2020",
"allowJs": true,
diff --git a/packages/merchant-backend-ui/package.json b/packages/merchant-backend-ui/package.json
index 23e5007e9..03e64308c 100644
--- a/packages/merchant-backend-ui/package.json
+++ b/packages/merchant-backend-ui/package.json
@@ -65,6 +65,6 @@
"sirv-cli": "^1.0.11",
"ts-node": "^10.9.1",
"tslib": "2.5.3",
- "typescript": "5.1.3"
+ "typescript": "5.2.2"
}
}
diff --git a/packages/merchant-backoffice-ui/package.json b/packages/merchant-backoffice-ui/package.json
index 3d568a502..12aeb4b0e 100644
--- a/packages/merchant-backoffice-ui/package.json
+++ b/packages/merchant-backoffice-ui/package.json
@@ -75,8 +75,8 @@
"rimraf": "^3.0.2",
"sass": "1.56.1",
"source-map-support": "^0.5.21",
- "typedoc": "^0.24.8",
- "typescript": "5.1.3"
+ "typedoc": "^0.25.1",
+ "typescript": "5.2.2"
},
"pogen": {
"domain": "taler-merchant-backoffice"
diff --git a/packages/merchant-backoffice-ui/tsconfig.json b/packages/merchant-backoffice-ui/tsconfig.json
index 02c562f96..396f1e9e7 100644
--- a/packages/merchant-backoffice-ui/tsconfig.json
+++ b/packages/merchant-backoffice-ui/tsconfig.json
@@ -1,61 +1,58 @@
{
- "compilerOptions": {
- /* Basic Options */
- "target": "ES6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */
- "module": "ESNext", /* Specify module code generation: 'none', commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
- "lib": [
- "es2021",
- "dom"
- ], /* Specify library files to be included in the compilation: */
- // "allowJs": true, /* Allow javascript files to be compiled. */
- // "checkJs": true, /* Report errors in .js files. */
- "jsx": "react", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
- "jsxFactory": "h", /* Specify the JSX factory function to use when targeting react JSX emit, e.g. React.createElement or h. */
- "jsxFragmentFactory": "Fragment", // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-0.html#custom-jsx-factories
- // "declaration": true, /* Generates corresponding '.d.ts' file. */
- // "sourceMap": true, /* Generates corresponding '.map' file. */
- // "outFile": "./", /* Concatenate and emit output to single file. */
- // "outDir": "./", /* Redirect output structure to the directory. */
- // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
- // "removeComments": true, /* Do not emit comments to output. */
- "noEmit": true, /* Do not emit outputs. */
- // "importHelpers": true, /* Import emit helpers from 'tslib'. */
- // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
- // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
- /* Strict Type-Checking Options */
- "strict": true, /* Enable all strict type-checking options. */
- // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
- // "strictNullChecks": true, /* Enable strict null checks. */
- // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
- // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
- /* Additional Checks */
- // "noUnusedLocals": true, /* Report errors on unused locals. */
- // "noUnusedParameters": true, /* Report errors on unused parameters. */
- // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
- // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
- /* Module Resolution Options */
- "moduleResolution": "node16", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
- "esModuleInterop": true, /* */
- // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
- // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
- // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
- // "typeRoots": [], /* List of folders to include type definitions from. */
- // "types": [], /* Type declaration files to be included in compilation. */
- // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
- // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
- /* Source Map Options */
- // "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
- // "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */
- // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
- // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
- /* Experimental Options */
- // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
- // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
- /* Advanced Options */
- "skipLibCheck": true /* Skip type checking of declaration files. */
- },
- "include": [
- "src/**/*",
- "tests/**/*"
- ]
-} \ No newline at end of file
+ "compilerOptions": {
+ /* Basic Options */
+ "target": "ES2020" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */,
+ "module": "Node16" /* Specify module code generation: 'none', commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+ "lib": [
+ "es2020",
+ "dom"
+ ] /* Specify library files to be included in the compilation: */,
+ // "allowJs": true, /* Allow javascript files to be compiled. */
+ // "checkJs": true, /* Report errors in .js files. */
+ "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
+ "jsxFactory": "h" /* Specify the JSX factory function to use when targeting react JSX emit, e.g. React.createElement or h. */,
+ "jsxFragmentFactory": "Fragment", // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-0.html#custom-jsx-factories
+ // "declaration": true, /* Generates corresponding '.d.ts' file. */
+ // "sourceMap": true, /* Generates corresponding '.map' file. */
+ // "outFile": "./", /* Concatenate and emit output to single file. */
+ // "outDir": "./", /* Redirect output structure to the directory. */
+ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+ // "removeComments": true, /* Do not emit comments to output. */
+ "noEmit": true /* Do not emit outputs. */,
+ // "importHelpers": true, /* Import emit helpers from 'tslib'. */
+ // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+ // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+ /* Strict Type-Checking Options */
+ "strict": true /* Enable all strict type-checking options. */,
+ // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
+ // "strictNullChecks": true, /* Enable strict null checks. */
+ // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
+ // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
+ /* Additional Checks */
+ // "noUnusedLocals": true, /* Report errors on unused locals. */
+ // "noUnusedParameters": true, /* Report errors on unused parameters. */
+ // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
+ // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
+ /* Module Resolution Options */
+ "moduleResolution": "node16" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
+ "esModuleInterop": true /* */,
+ // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
+ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
+ // "typeRoots": [], /* List of folders to include type definitions from. */
+ // "types": [], /* Type declaration files to be included in compilation. */
+ // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+ // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
+ /* Source Map Options */
+ // "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+ // "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */
+ // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
+ // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+ /* Experimental Options */
+ // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
+ // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
+ /* Advanced Options */
+ "skipLibCheck": true /* Skip type checking of declaration files. */
+ },
+ "include": ["src/**/*", "tests/**/*"]
+}
diff --git a/packages/pogen/package.json b/packages/pogen/package.json
index ae1dfac3b..9160e699c 100644
--- a/packages/pogen/package.json
+++ b/packages/pogen/package.json
@@ -11,7 +11,7 @@
},
"devDependencies": {
"po2json": "^0.4.5",
- "typescript": "^5.1.3"
+ "typescript": "^5.2.2"
},
"dependencies": {
"@types/node": "^18.11.17",
diff --git a/packages/pogen/tsconfig.json b/packages/pogen/tsconfig.json
index 68225832d..74cdc6ad7 100644
--- a/packages/pogen/tsconfig.json
+++ b/packages/pogen/tsconfig.json
@@ -7,7 +7,7 @@
"incremental": true,
"moduleResolution": "node",
"sourceMap": true,
- "lib": ["es6"],
+ "lib": ["ES2020"],
"types": ["node"]
},
"include": ["src/**/*.ts"]
diff --git a/packages/taler-harness/package.json b/packages/taler-harness/package.json
index 8916e5e9e..9f2b0d8e3 100644
--- a/packages/taler-harness/package.json
+++ b/packages/taler-harness/package.json
@@ -35,7 +35,7 @@
"esbuild": "^0.17.7",
"prettier": "^2.8.8",
"rimraf": "^3.0.2",
- "typescript": "^5.1.3"
+ "typescript": "^5.2.2"
},
"dependencies": {
"@gnu-taler/taler-util": "workspace:*",
diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts
index d0719b4f7..24e42099e 100644
--- a/packages/taler-harness/src/harness/harness.ts
+++ b/packages/taler-harness/src/harness/harness.ts
@@ -28,6 +28,7 @@ import {
AccountAddDetails,
AmountJson,
Amounts,
+ BankAccessApiClient,
Configuration,
CoreApiResponse,
Duration,
@@ -46,13 +47,11 @@ import {
stringToBytes,
} from "@gnu-taler/taler-util";
import {
+ HttpRequestLibrary,
createPlatformHttpLib,
expectSuccessResponseOrThrow,
} from "@gnu-taler/taler-util/http";
import {
- BankAccessApiClient,
- BankServiceHandle,
- HarnessExchangeBankAccount,
WalletCoreApiClient,
WalletCoreRequestType,
WalletCoreResponseType,
@@ -569,6 +568,13 @@ class BankServiceBase {
) {}
}
+export interface HarnessExchangeBankAccount {
+ accountName: string;
+ accountPassword: string;
+ accountPaytoUri: string;
+ wireGatewayApiBaseUrl: string;
+}
+
/**
* Implementation of the bank service using the "taler-fakebank-run" tool.
*/
@@ -701,6 +707,11 @@ export class FakebankService
// Use libeufin bank instead of pybank.
const useLibeufinBank = false;
+export interface BankServiceHandle {
+ readonly bankAccessApiBaseUrl: string;
+ readonly http: HttpRequestLibrary;
+}
+
export type BankService = BankServiceHandle;
export const BankService = FakebankService;
diff --git a/packages/taler-harness/src/harness/helpers.ts b/packages/taler-harness/src/harness/helpers.ts
index f92fd4dd9..9892e600b 100644
--- a/packages/taler-harness/src/harness/helpers.ts
+++ b/packages/taler-harness/src/harness/helpers.ts
@@ -25,21 +25,18 @@
*/
import {
AmountString,
+ BankAccessApiClient,
ConfirmPayResultType,
- MerchantContractTerms,
Duration,
- PreparePayResultType,
- NotificationType,
- WalletNotification,
- TransactionMajorState,
Logger,
MerchantApiClient,
+ MerchantContractTerms,
+ NotificationType,
+ PreparePayResultType,
+ TransactionMajorState,
+ WalletNotification,
} from "@gnu-taler/taler-util";
-import {
- BankAccessApiClient,
- HarnessExchangeBankAccount,
- WalletApiOperation,
-} from "@gnu-taler/taler-wallet-core";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import { CoinConfig, defaultCoinConfig } from "./denomStructures.js";
import {
FaultInjectedExchangeService,
@@ -51,16 +48,17 @@ import {
ExchangeService,
ExchangeServiceInterface,
FakebankService,
- getPayto,
GlobalTestState,
+ HarnessExchangeBankAccount,
MerchantService,
MerchantServiceInterface,
- setupDb,
- setupSharedDb,
WalletCli,
WalletClient,
WalletService,
WithAuthorization,
+ getPayto,
+ setupDb,
+ setupSharedDb,
} from "./harness.js";
import * as fs from "fs";
diff --git a/packages/taler-harness/src/index.ts b/packages/taler-harness/src/index.ts
index 185f6226d..534aec8c7 100644
--- a/packages/taler-harness/src/index.ts
+++ b/packages/taler-harness/src/index.ts
@@ -20,6 +20,7 @@
import {
addPaytoQueryParams,
Amounts,
+ BankAccessApiClient,
Configuration,
decodeCrock,
j2s,
@@ -31,7 +32,6 @@ import {
import { clk } from "@gnu-taler/taler-util/clk";
import { createPlatformHttpLib } from "@gnu-taler/taler-util/http";
import {
- BankAccessApiClient,
CryptoDispatcher,
downloadExchangeInfo,
SynchronousCryptoWorkerFactoryPlain,
diff --git a/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts b/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts
index bff13ae40..7f936a479 100644
--- a/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts
+++ b/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts
@@ -17,11 +17,7 @@
/**
* Imports.
*/
-import {
- BankAccessApiClient,
- WalletApiOperation,
- WireGatewayApiClient,
-} from "@gnu-taler/taler-wallet-core";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import { defaultCoinConfig } from "../harness/denomStructures.js";
import { getWireMethodForTest, GlobalTestState } from "../harness/harness.js";
import {
@@ -30,7 +26,11 @@ import {
makeTestPaymentV2,
withdrawViaBankV2,
} from "../harness/helpers.js";
-import { MerchantApiClient } from "@gnu-taler/taler-util";
+import {
+ BankAccessApiClient,
+ MerchantApiClient,
+ WireGatewayApiClient,
+} from "@gnu-taler/taler-util";
/**
* Run test for basic, bank-integrated withdrawal and payment.
diff --git a/packages/taler-harness/src/integrationtests/test-bank-api.ts b/packages/taler-harness/src/integrationtests/test-bank-api.ts
index afb06b61a..77a13b791 100644
--- a/packages/taler-harness/src/integrationtests/test-bank-api.ts
+++ b/packages/taler-harness/src/integrationtests/test-bank-api.ts
@@ -17,12 +17,13 @@
/**
* Imports.
*/
-import { createEddsaKeyPair, encodeCrock } from "@gnu-taler/taler-util";
import {
BankAccessApiClient,
CreditDebitIndicator,
WireGatewayApiClient,
-} from "@gnu-taler/taler-wallet-core";
+ createEddsaKeyPair,
+ encodeCrock,
+} from "@gnu-taler/taler-util";
import { defaultCoinConfig } from "../harness/denomStructures.js";
import {
BankService,
diff --git a/packages/taler-harness/src/integrationtests/test-exchange-management.ts b/packages/taler-harness/src/integrationtests/test-exchange-management.ts
index 19be7c962..9338a8988 100644
--- a/packages/taler-harness/src/integrationtests/test-exchange-management.ts
+++ b/packages/taler-harness/src/integrationtests/test-exchange-management.ts
@@ -18,29 +18,27 @@
* Imports.
*/
import {
- GlobalTestState,
- WalletCli,
- setupDb,
- BankService,
- ExchangeService,
- MerchantService,
- getPayto,
-} from "../harness/harness.js";
-import {
- WalletApiOperation,
BankAccessApiClient,
-} from "@gnu-taler/taler-wallet-core";
-import {
ExchangesListResponse,
- URL,
TalerErrorCode,
+ URL,
j2s,
} from "@gnu-taler/taler-util";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
+import { defaultCoinConfig } from "../harness/denomStructures.js";
import {
FaultInjectedExchangeService,
FaultInjectionResponseContext,
} from "../harness/faultInjection.js";
-import { defaultCoinConfig } from "../harness/denomStructures.js";
+import {
+ BankService,
+ ExchangeService,
+ GlobalTestState,
+ MerchantService,
+ WalletCli,
+ getPayto,
+ setupDb,
+} from "../harness/harness.js";
/**
* Test if the wallet handles outdated exchange versions correctly.
diff --git a/packages/taler-harness/src/integrationtests/test-kyc.ts b/packages/taler-harness/src/integrationtests/test-kyc.ts
index 88875d4fc..1f7358b66 100644
--- a/packages/taler-harness/src/integrationtests/test-kyc.ts
+++ b/packages/taler-harness/src/integrationtests/test-kyc.ts
@@ -18,6 +18,7 @@
* Imports.
*/
import {
+ BankAccessApiClient,
Duration,
j2s,
Logger,
@@ -27,10 +28,7 @@ import {
TransactionType,
} from "@gnu-taler/taler-util";
import { createPlatformHttpLib } from "@gnu-taler/taler-util/http";
-import {
- BankAccessApiClient,
- WalletApiOperation,
-} from "@gnu-taler/taler-wallet-core";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import * as http from "node:http";
import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js";
import {
diff --git a/packages/taler-harness/src/integrationtests/test-libeufin-basic.ts b/packages/taler-harness/src/integrationtests/test-libeufin-basic.ts
index 20fa34437..d87278197 100644
--- a/packages/taler-harness/src/integrationtests/test-libeufin-basic.ts
+++ b/packages/taler-harness/src/integrationtests/test-libeufin-basic.ts
@@ -22,15 +22,13 @@ import {
Duration,
MerchantContractTerms,
} from "@gnu-taler/taler-util";
-import {
- HarnessExchangeBankAccount,
- WalletApiOperation,
-} from "@gnu-taler/taler-wallet-core";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js";
import {
DbInfo,
ExchangeService,
GlobalTestState,
+ HarnessExchangeBankAccount,
MerchantService,
WalletClient,
setupDb,
diff --git a/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts b/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts
index 369f261dd..1b69b9de6 100644
--- a/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts
+++ b/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts
@@ -24,11 +24,9 @@ import {
URL,
durationFromSpec,
} from "@gnu-taler/taler-util";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import {
BankServiceHandle,
- WalletApiOperation,
-} from "@gnu-taler/taler-wallet-core";
-import {
ExchangeServiceInterface,
GlobalTestState,
MerchantServiceInterface,
diff --git a/packages/taler-harness/src/integrationtests/test-payment-fault.ts b/packages/taler-harness/src/integrationtests/test-payment-fault.ts
index 3ad11d82d..e57427fac 100644
--- a/packages/taler-harness/src/integrationtests/test-payment-fault.ts
+++ b/packages/taler-harness/src/integrationtests/test-payment-fault.ts
@@ -21,11 +21,12 @@
/**
* Imports.
*/
-import { CoreApiResponse, MerchantApiClient } from "@gnu-taler/taler-util";
import {
BankAccessApiClient,
- WalletApiOperation,
-} from "@gnu-taler/taler-wallet-core";
+ CoreApiResponse,
+ MerchantApiClient,
+} from "@gnu-taler/taler-util";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import { defaultCoinConfig } from "../harness/denomStructures.js";
import {
FaultInjectedExchangeService,
diff --git a/packages/taler-harness/src/integrationtests/test-tipping.ts b/packages/taler-harness/src/integrationtests/test-tipping.ts
index 9b980acad..4140311ab 100644
--- a/packages/taler-harness/src/integrationtests/test-tipping.ts
+++ b/packages/taler-harness/src/integrationtests/test-tipping.ts
@@ -18,13 +18,13 @@
* Imports.
*/
import {
+ BankAccessApiClient,
MerchantApiClient,
TransactionMajorState,
+ WireGatewayApiClient,
} from "@gnu-taler/taler-util";
import {
- BankAccessApiClient,
WalletApiOperation,
- WireGatewayApiClient,
} from "@gnu-taler/taler-wallet-core";
import { GlobalTestState, getWireMethodForTest } from "../harness/harness.js";
import { createSimpleTestkudosEnvironmentV2 } from "../harness/helpers.js";
diff --git a/packages/taler-harness/src/integrationtests/test-wallet-notifications.ts b/packages/taler-harness/src/integrationtests/test-wallet-notifications.ts
index 9b35884f0..9a0eb77ae 100644
--- a/packages/taler-harness/src/integrationtests/test-wallet-notifications.ts
+++ b/packages/taler-harness/src/integrationtests/test-wallet-notifications.ts
@@ -18,14 +18,12 @@
* Imports.
*/
import {
+ BankAccessApiClient,
Duration,
NotificationType,
TransactionMajorState,
} from "@gnu-taler/taler-util";
-import {
- BankAccessApiClient,
- WalletApiOperation,
-} from "@gnu-taler/taler-wallet-core";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js";
import {
ExchangeService,
diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-abort-bank.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-abort-bank.ts
index c62b98623..aa5e2b770 100644
--- a/packages/taler-harness/src/integrationtests/test-withdrawal-abort-bank.ts
+++ b/packages/taler-harness/src/integrationtests/test-withdrawal-abort-bank.ts
@@ -17,11 +17,8 @@
/**
* Imports.
*/
-import { TalerErrorCode } from "@gnu-taler/taler-util";
-import {
- WalletApiOperation,
- BankAccessApiClient,
-} from "@gnu-taler/taler-wallet-core";
+import { BankAccessApiClient, TalerErrorCode } from "@gnu-taler/taler-util";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import { GlobalTestState } from "../harness/harness.js";
import { createSimpleTestkudosEnvironmentV2 } from "../harness/helpers.js";
diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts
index 76c973a12..232b6d7c2 100644
--- a/packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts
+++ b/packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts
@@ -17,13 +17,8 @@
/**
* Imports.
*/
-import { GlobalTestState } from "../harness/harness.js";
-import { createSimpleTestkudosEnvironmentV2 } from "../harness/helpers.js";
import {
BankAccessApiClient,
- WalletApiOperation,
-} from "@gnu-taler/taler-wallet-core";
-import {
j2s,
NotificationType,
TransactionMajorState,
@@ -31,6 +26,9 @@ import {
TransactionType,
WithdrawalType,
} from "@gnu-taler/taler-util";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
+import { GlobalTestState } from "../harness/harness.js";
+import { createSimpleTestkudosEnvironmentV2 } from "../harness/helpers.js";
/**
* Run test for basic, bank-integrated withdrawal.
diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-fees.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-fees.ts
index 9f4631c7e..bc2946a18 100644
--- a/packages/taler-harness/src/integrationtests/test-withdrawal-fees.ts
+++ b/packages/taler-harness/src/integrationtests/test-withdrawal-fees.ts
@@ -17,11 +17,8 @@
/**
* Imports.
*/
-import { j2s } from "@gnu-taler/taler-util";
-import {
- BankAccessApiClient,
- WalletApiOperation,
-} from "@gnu-taler/taler-wallet-core";
+import { BankAccessApiClient, j2s } from "@gnu-taler/taler-util";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import { CoinConfig } from "../harness/denomStructures.js";
import {
BankService,
diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
index 324b8abc5..1d98cd46e 100644
--- a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
+++ b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
@@ -17,12 +17,14 @@
/**
* Imports.
*/
-import { AbsoluteTime, Logger, j2s } from "@gnu-taler/taler-util";
import {
+ AbsoluteTime,
BankAccessApiClient,
- WalletApiOperation,
+ Logger,
WireGatewayApiClient,
-} from "@gnu-taler/taler-wallet-core";
+ j2s,
+} from "@gnu-taler/taler-util";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
import { GlobalTestState } from "../harness/harness.js";
import { createSimpleTestkudosEnvironmentV2 } from "../harness/helpers.js";
diff --git a/packages/taler-harness/tsconfig.json b/packages/taler-harness/tsconfig.json
index d022b16e8..ece83a85f 100644
--- a/packages/taler-harness/tsconfig.json
+++ b/packages/taler-harness/tsconfig.json
@@ -3,10 +3,10 @@
"compilerOptions": {
"composite": true,
"target": "ES2018",
- "module": "ESNext",
+ "module": "Node16",
"moduleResolution": "Node16",
"sourceMap": true,
- "lib": ["es6"],
+ "lib": ["ES2020"],
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"strict": true,
diff --git a/packages/taler-util/package.json b/packages/taler-util/package.json
index 6ac9a2689..0bb98767d 100644
--- a/packages/taler-util/package.json
+++ b/packages/taler-util/package.json
@@ -68,14 +68,14 @@
"esbuild": "^0.17.7",
"prettier": "^2.8.8",
"rimraf": "^3.0.2",
- "typescript": "^5.1.3"
+ "typescript": "^5.2.2"
},
"dependencies": {
"big-integer": "^1.6.51",
"fflate": "^0.7.4",
+ "hash-wasm": "^4.9.0",
"jed": "^1.1.1",
- "tslib": "^2.5.3",
- "hash-wasm": "^4.9.0"
+ "tslib": "^2.5.3"
},
"ava": {
"files": [
diff --git a/packages/taler-wallet-core/src/bank-api-client.ts b/packages/taler-util/src/bank-api-client.ts
index f1289525d..cc4123500 100644
--- a/packages/taler-wallet-core/src/bank-api-client.ts
+++ b/packages/taler-util/src/bank-api-client.ts
@@ -58,11 +58,6 @@ export interface BankAccountBalanceResponse {
};
}
-export interface BankServiceHandle {
- readonly bankAccessApiBaseUrl: string;
- readonly http: HttpRequestLibrary;
-}
-
export interface BankUser {
username: string;
password: string;
@@ -75,16 +70,6 @@ export interface WithdrawalOperationInfo {
}
/**
- * FIXME: Rename, this is not part of the integration test harness anymore.
- */
-export interface HarnessExchangeBankAccount {
- accountName: string;
- accountPassword: string;
- accountPaytoUri: string;
- wireGatewayApiBaseUrl: string;
-}
-
-/**
* Helper function to generate the "Authorization" HTTP header.
*/
function makeBasicAuthHeader(username: string, password: string): string {
diff --git a/packages/taler-util/src/http-common.ts b/packages/taler-util/src/http-common.ts
index 02ec8ce72..f25705545 100644
--- a/packages/taler-util/src/http-common.ts
+++ b/packages/taler-util/src/http-common.ts
@@ -16,7 +16,7 @@
SPDX-License-Identifier: AGPL3.0-or-later
*/
-import { CancellationToken } from "./CancellationToken.js";
+import type { CancellationToken } from "./CancellationToken.js";
import { Codec } from "./codec.js";
import { j2s } from "./helpers.js";
import {
diff --git a/packages/taler-util/src/index.ts b/packages/taler-util/src/index.ts
index 0b75619ab..568e2f438 100644
--- a/packages/taler-util/src/index.ts
+++ b/packages/taler-util/src/index.ts
@@ -41,3 +41,4 @@ export * from "./iban.js";
export * from "./transaction-test-data.js";
export * from "./libeufin-api-types.js";
export * from "./MerchantApiClient.js";
+export * from "./bank-api-client.js";
diff --git a/packages/taler-util/tsconfig.json b/packages/taler-util/tsconfig.json
index 34f35d253..2e97142ce 100644
--- a/packages/taler-util/tsconfig.json
+++ b/packages/taler-util/tsconfig.json
@@ -5,8 +5,8 @@
"declaration": true,
"declarationMap": false,
"target": "ES2020",
- "module": "ES2020",
- "moduleResolution": "node16",
+ "module": "Node16",
+ "moduleResolution": "Node16",
"sourceMap": true,
"lib": ["ES2020"],
"types": ["node"],
diff --git a/packages/taler-wallet-cli/package.json b/packages/taler-wallet-cli/package.json
index 06df1da76..6196c8971 100644
--- a/packages/taler-wallet-cli/package.json
+++ b/packages/taler-wallet-cli/package.json
@@ -33,8 +33,8 @@
"@types/node": "^18.11.17",
"prettier": "^2.8.8",
"rimraf": "^3.0.2",
- "typedoc": "^0.24.8",
- "typescript": "^5.1.3"
+ "typedoc": "^0.25.1",
+ "typescript": "^5.2.2"
},
"dependencies": {
"@gnu-taler/taler-util": "workspace:*",
diff --git a/packages/taler-wallet-cli/tsconfig.json b/packages/taler-wallet-cli/tsconfig.json
index 100339e43..42f0d88a8 100644
--- a/packages/taler-wallet-cli/tsconfig.json
+++ b/packages/taler-wallet-cli/tsconfig.json
@@ -3,10 +3,10 @@
"compilerOptions": {
"composite": true,
"target": "ES2018",
- "module": "ESNext",
+ "module": "Node16",
"moduleResolution": "Node16",
"sourceMap": true,
- "lib": ["es6"],
+ "lib": ["ES2020"],
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"strict": true,
diff --git a/packages/taler-wallet-core/package.json b/packages/taler-wallet-core/package.json
index 9cd6f6466..fda7b6081 100644
--- a/packages/taler-wallet-core/package.json
+++ b/packages/taler-wallet-core/package.json
@@ -65,8 +65,8 @@
"po2json": "^0.4.5",
"prettier": "^2.8.8",
"rimraf": "^3.0.2",
- "typedoc": "^0.24.8",
- "typescript": "^5.1.3"
+ "typedoc": "^0.25.1",
+ "typescript": "^5.2.2"
},
"dependencies": {
"@gnu-taler/idb-bridge": "workspace:*",
diff --git a/packages/taler-wallet-core/src/dbless.ts b/packages/taler-wallet-core/src/dbless.ts
index 357b7d289..0aad477e4 100644
--- a/packages/taler-wallet-core/src/dbless.ts
+++ b/packages/taler-wallet-core/src/dbless.ts
@@ -52,7 +52,7 @@ import {
HttpRequestLibrary,
readSuccessResponseJsonOrThrow,
} from "@gnu-taler/taler-util/http";
-import { BankAccessApiClient, BankServiceHandle } from "./bank-api-client.js";
+import { BankAccessApiClient } from "../../taler-util/src/bank-api-client.js";
import { TalerCryptoInterface } from "./crypto/cryptoImplementation.js";
import { DenominationRecord } from "./db.js";
import { isWithdrawableDenom } from "./index.js";
@@ -117,10 +117,6 @@ export async function topupReserveWithDemobank(
args: TopupReserveWithDemobankArgs,
) {
const { http, bankAccessApiBaseUrl, amount, exchangeInfo, reservePub } = args;
- const bankHandle: BankServiceHandle = {
- bankAccessApiBaseUrl: bankAccessApiBaseUrl,
- http,
- };
const bankClient = new BankAccessApiClient(bankAccessApiBaseUrl);
const bankUser = await bankClient.createRandomBankUser();
const wopi = await bankClient.createWithdrawalOperation(
diff --git a/packages/taler-wallet-core/src/index.ts b/packages/taler-wallet-core/src/index.ts
index d64f7d5e6..643d65620 100644
--- a/packages/taler-wallet-core/src/index.ts
+++ b/packages/taler-wallet-core/src/index.ts
@@ -44,8 +44,6 @@ export * from "./operations/backup/index.js";
export * from "./operations/exchanges.js";
-export * from "./bank-api-client.js";
-
export * from "./operations/withdraw.js";
export * from "./operations/refresh.js";
diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts
index f42365c00..9a3b8f235 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -129,10 +129,8 @@ import {
codecForTestingSetTimetravelRequest,
setDangerousTimetravel,
} from "@gnu-taler/taler-util";
-import {
- HttpRequestLibrary,
- readSuccessResponseJsonOrThrow,
-} from "@gnu-taler/taler-util/http";
+import type { HttpRequestLibrary } from "@gnu-taler/taler-util/http";
+import { readSuccessResponseJsonOrThrow } from "@gnu-taler/taler-util/http";
import { TalerCryptoInterface } from "./crypto/cryptoImplementation.js";
import {
CryptoDispatcher,
diff --git a/packages/taler-wallet-core/tsconfig.json b/packages/taler-wallet-core/tsconfig.json
index 8de28b3d8..663a4dd98 100644
--- a/packages/taler-wallet-core/tsconfig.json
+++ b/packages/taler-wallet-core/tsconfig.json
@@ -4,12 +4,12 @@
"composite": true,
"declaration": true,
"declarationMap": false,
- "target": "ES2017",
- "module": "ESNext",
+ "target": "ES2020",
+ "module": "Node16",
"moduleResolution": "Node16",
"resolveJsonModule": true,
"sourceMap": true,
- "lib": ["es6"],
+ "lib": ["ES2020"],
"resolvePackageJsonImports": true,
"types": ["node"],
"noImplicitReturns": true,
@@ -33,8 +33,5 @@
"path": "../taler-util/"
}
],
- "include": [
- "src/**/*",
- "src/*.json"
- ]
+ "include": ["src/**/*", "src/*.json", "../taler-util/src/bank-api-client.ts"]
}
diff --git a/packages/taler-wallet-embedded/tsconfig.json b/packages/taler-wallet-embedded/tsconfig.json
index 7b27ca6b7..e8b265fb9 100644
--- a/packages/taler-wallet-embedded/tsconfig.json
+++ b/packages/taler-wallet-embedded/tsconfig.json
@@ -5,10 +5,10 @@
"declaration": true,
"declarationMap": true,
"target": "ES6",
- "module": "ESNext",
+ "module": "Node16",
"moduleResolution": "Node16",
"sourceMap": true,
- "lib": ["es6"],
+ "lib": ["ES2020"],
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"strict": true,
diff --git a/packages/taler-wallet-webextension/package.json b/packages/taler-wallet-webextension/package.json
index 040878529..f442b1509 100644
--- a/packages/taler-wallet-webextension/package.json
+++ b/packages/taler-wallet-webextension/package.json
@@ -64,7 +64,7 @@
"preact-cli": "^3.3.5",
"preact-render-to-string": "^5.1.19",
"rimraf": "^3.0.2",
- "typescript": "5.1.3"
+ "typescript": "5.2.2"
},
"nyc": {
"include": [
diff --git a/packages/taler-wallet-webextension/src/wxBackend.ts b/packages/taler-wallet-webextension/src/wxBackend.ts
index e7385abe5..d5f6ca2cd 100644
--- a/packages/taler-wallet-webextension/src/wxBackend.ts
+++ b/packages/taler-wallet-webextension/src/wxBackend.ts
@@ -51,14 +51,11 @@ import {
importDb,
openPromise,
} from "@gnu-taler/taler-wallet-core";
-import {
- MessageFromBackend,
- MessageFromFrontend,
- MessageResponse,
-} from "./platform/api.js";
+import { MessageFromFrontend, MessageResponse } from "./platform/api.js";
import { platform } from "./platform/background.js";
import { ExtensionOperations } from "./taler-wallet-interaction-loader.js";
import { BackgroundOperations } from "./wxApi.js";
+import { HttpRequestLibrary } from "@gnu-taler/taler-util/http";
/**
* Currently active wallet instance. Might be unloaded and
@@ -297,7 +294,7 @@ async function reinitWallet(): Promise<void> {
}
currentDatabase = undefined;
// setBadgeText({ text: "" });
- let httpLib;
+ let httpLib: HttpRequestLibrary;
let cryptoWorker;
let timer;
@@ -318,7 +315,7 @@ async function reinitWallet(): Promise<void> {
logger.info("Setting up wallet");
const wallet = await Wallet.create(
indexedDB as any,
- httpLib,
+ httpLib as any,
timer,
cryptoWorker,
{
diff --git a/packages/taler-wallet-webextension/tsconfig.json b/packages/taler-wallet-webextension/tsconfig.json
index 773853302..08cbc871a 100644
--- a/packages/taler-wallet-webextension/tsconfig.json
+++ b/packages/taler-wallet-webextension/tsconfig.json
@@ -1,15 +1,12 @@
{
"compilerOptions": {
"composite": true,
- "lib": [
- "es2021",
- "DOM"
- ],
- "jsx": "react", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
- "jsxFactory": "h", /* Specify the JSX factory function to use when targeting react JSX emit, e.g. React.createElement or h. */
+ "lib": ["es2020", "DOM"],
+ "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
+ "jsxFactory": "h" /* Specify the JSX factory function to use when targeting react JSX emit, e.g. React.createElement or h. */,
"jsxFragmentFactory": "Fragment", // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-0.html#custom-jsx-factories
"moduleResolution": "Node16",
- "module": "ES2020",
+ "module": "Node16",
"target": "ES6",
"skipLibCheck": true,
"preserveSymlinks": true,
@@ -23,9 +20,7 @@
"esModuleInterop": true,
"importHelpers": true,
"rootDir": "./src",
- "typeRoots": [
- "./node_modules/@types"
- ]
+ "typeRoots": ["./node_modules/@types"]
},
"references": [
{
@@ -35,7 +30,5 @@
"path": "../taler-util/"
}
],
- "include": [
- "src/**/*"
- ]
+ "include": ["src/**/*"]
}
diff --git a/packages/web-util/package.json b/packages/web-util/package.json
index 6cfe19258..81eee949a 100644
--- a/packages/web-util/package.json
+++ b/packages/web-util/package.json
@@ -56,7 +56,7 @@
"sass": "1.56.1",
"swr": "2.0.3",
"tslib": "^2.5.3",
- "typescript": "^5.1.3",
+ "typescript": "^5.2.2",
"ws": "7.4.5"
},
"dependencies": {
diff --git a/packages/web-util/tsconfig.json b/packages/web-util/tsconfig.json
index fc69cad06..a315dda1c 100644
--- a/packages/web-util/tsconfig.json
+++ b/packages/web-util/tsconfig.json
@@ -3,17 +3,14 @@
"composite": true,
"declaration": true,
"declarationMap": true,
- "target": "ES6",
- "module": "ESNext",
+ "target": "ES2020",
+ "module": "Node16",
"jsx": "react",
"jsxFactory": "h",
"jsxFragmentFactory": "Fragment",
"moduleResolution": "Node16",
"sourceMap": true,
- "lib": [
- "DOM",
- "es6"
- ],
+ "lib": ["DOM", "ES2020"],
"outDir": "lib",
"preserveSymlinks": true,
"skipLibCheck": true,
@@ -27,11 +24,7 @@
"esModuleInterop": true,
"importHelpers": true,
"rootDir": "./src",
- "typeRoots": [
- "./node_modules/@types"
- ]
+ "typeRoots": ["./node_modules/@types"]
},
- "include": [
- "src/**/*"
- ]
+ "include": ["src/**/*"]
}