diff --git a/package.json b/package.json index 05d89b8814239a2b80007fa5294a861bc190831e..7e7e0b995ae8549b3c93baa113bf75ef18343eca 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,67 @@ "name": "@coscine/api-client", "version": "1.3.0", "description": "This project contains the generated api connection classes.", + "scripts": { + "build": "tsc --module commonjs && rollup -c rollup.config.ts && typedoc --out docs src/index.ts", + "lint": "eslint './src/**/*.{js,ts,tsx,vue,md}'", + "lint:fix": "eslint './src/**/*.{js,ts,tsx,vue,md}' --fix", + "precommit": "lint-staged", + "test": "jest --coverage", + "test:unit": "jest", + "test:watch": "jest --coverage --watch", + "semantic-release": "semantic-release" + }, + "dependencies": { + "axios": "^0.21.1" + }, + "devDependencies": { + "@commitlint/cli": "^13.1.0", + "@commitlint/config-conventional": "^13.1.0", + "@hutson/semantic-delivery-gitlab": "^9.1.0", + "@rollup/plugin-commonjs": "^20.0.0", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^13.0.4", + "@semantic-release/commit-analyzer": "^8.0.1", + "@semantic-release/git": "^9.0.0", + "@semantic-release/gitlab": "^6.2.2", + "@semantic-release/npm": "^7.1.3", + "@semantic-release/release-notes-generator": "^9.0.3", + "@types/jest": "^27.0.1", + "@types/node": "^16.7.8", + "@typescript-eslint/eslint-plugin": "^4.0.1", + "@typescript-eslint/parser": "^4.0.1", + "colors": "^1.4.0", + "commitizen": "^4.2.4", + "conventional-changelog-eslint": "^3.0.9", + "coveralls": "^3.1.1", + "cross-env": "^7.0.3", + "cz-conventional-changelog": "^3.3.0", + "eslint": "^7.8.0", + "eslint-config-prettier": "^6.11.0", + "eslint-import-resolver-node": "^0.3.6", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-functional": "^3.0.2", + "eslint-plugin-import": "^2.22.0", + "husky": "^7.0.2", + "jest": "^27.1.0", + "jest-config": "^27.1.0", + "lint-staged": "^11.1.2", + "lodash.camelcase": "^4.3.0", + "prettier": "^2.3.2", + "prompt": "^1.2.0", + "replace-in-file": "^6.2.0", + "rimraf": "^3.0.2", + "rollup": "^2.56.3", + "rollup-plugin-sourcemaps": "^0.6.3", + "rollup-plugin-typescript2": "^0.30.0", + "semantic-release": "^17.4.7", + "shelljs": "^0.8.4", + "ts-jest": "^27.0.5", + "ts-node": "^10.2.1", + "tslib": "^2.3.1", + "typedoc": "^0.21.9", + "typescript": "~4.4.4" + }, "keywords": [ "coscine", "api", @@ -23,15 +84,6 @@ "engines": { "node": ">=6.0.0" }, - "scripts": { - "lint": "eslint --fix src/**/*.ts", - "build": "tsc --module commonjs && rollup -c rollup.config.ts && typedoc --out docs src/index.ts", - "precommit": "lint-staged", - "semantic-release": "semantic-release", - "test": "jest --coverage", - "test:unit": "jest", - "test:watch": "jest --coverage --watch" - }, "lint-staged": { "{src,test}/**/*.ts": [ "eslint --fix" @@ -78,56 +130,5 @@ "@commitlint/config-conventional" ] }, - "devDependencies": { - "@commitlint/cli": "^13.1.0", - "@commitlint/config-conventional": "^13.1.0", - "@hutson/semantic-delivery-gitlab": "^9.1.0", - "@rollup/plugin-commonjs": "^20.0.0", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.0.4", - "@semantic-release/commit-analyzer": "^8.0.1", - "@semantic-release/git": "^9.0.0", - "@semantic-release/gitlab": "^6.2.2", - "@semantic-release/npm": "^7.1.3", - "@semantic-release/release-notes-generator": "^9.0.3", - "@types/jest": "^27.0.1", - "@types/node": "^16.7.8", - "@typescript-eslint/eslint-plugin": "^4.0.1", - "@typescript-eslint/parser": "^4.0.1", - "colors": "^1.4.0", - "commitizen": "^4.2.4", - "conventional-changelog-eslint": "^3.0.9", - "coveralls": "^3.1.1", - "cross-env": "^7.0.3", - "cz-conventional-changelog": "^3.3.0", - "eslint": "^7.8.0", - "eslint-config-prettier": "^6.11.0", - "eslint-import-resolver-node": "^0.3.6", - "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-functional": "^3.0.2", - "eslint-plugin-import": "^2.22.0", - "husky": "^7.0.2", - "jest": "^27.1.0", - "jest-config": "^27.1.0", - "lint-staged": "^11.1.2", - "lodash.camelcase": "^4.3.0", - "prettier": "^2.3.2", - "prompt": "^1.2.0", - "replace-in-file": "^6.2.0", - "rimraf": "^3.0.2", - "rollup": "^2.56.3", - "rollup-plugin-sourcemaps": "^0.6.3", - "rollup-plugin-typescript2": "^0.30.0", - "semantic-release": "^17.4.7", - "shelljs": "^0.8.4", - "ts-jest": "^27.0.5", - "ts-node": "^10.2.1", - "tslib": "^2.3.1", - "typedoc": "^0.21.9", - "typescript": "~4.4.4" - }, - "dependencies": { - "axios": "^0.21.1" - }, "packageManager": "yarn@3.1.1" } diff --git a/src/axios-basic.ts b/src/axios-basic.ts index 851e13b04125765c7ef0eedeed8cc69d7a66ab82..d4a9c98a377de77204e52031554695cfd0244958 100644 --- a/src/axios-basic.ts +++ b/src/axios-basic.ts @@ -43,12 +43,18 @@ function increaseLoading() { function decreaseLoading() { if ((typeof coscine !== "undefined") && (typeof coscine.loading !== "undefined") && (typeof coscine.loading.counter !== "undefined")) { - coscine.loading.counter--; + if (coscine.loading.counter > 0) { + coscine.loading.counter--; + } } if (typeof window !== 'undefined') { const localStorageLoading = localStorage.getItem("coscine.loading.counter"); if (localStorageLoading) { - localStorage.setItem("coscine.loading.counter", String(Number(localStorageLoading) - 1)); + let loadingValue = Number(localStorageLoading); + if (loadingValue > 0) { + loadingValue--; + } + localStorage.setItem("coscine.loading.counter", String(loadingValue)); } } } diff --git a/yarn.lock-workspace b/yarn.lock-workspace index 3ca431c4ff9e135ca3f7bc34610c9ed7c97a52c6..f82c93837bdf055e41525dcef5f2ae9e61c0cdc4 100644 --- a/yarn.lock-workspace +++ b/yarn.lock-workspace @@ -1521,12 +1521,12 @@ __metadata: linkType: hard "@rollup/pluginutils@npm:^4.1.0": - version: 4.1.2 - resolution: "@rollup/pluginutils@npm:4.1.2" + version: 4.2.0 + resolution: "@rollup/pluginutils@npm:4.2.0" dependencies: estree-walker: ^2.0.1 picomatch: ^2.2.2 - checksum: 498d67e7b48c707e3e0d9f7ddaa405833d77575b2d9607cd1914be40455ed534235e0512f9d046bf0e4ed1740e7816fd32ab1c673195e897c4fa180bcbfd7283 + checksum: 2e86d9bfb95919727bcba0bbbdbedc98e25a1e51fe3047f18ec6d85e0743d1c73e1c0de3f9fdbd2ff6b90c32f30d4b2706c9e794f3c2e7a80156980081558e2e languageName: node linkType: hard @@ -4807,12 +4807,12 @@ __metadata: linkType: hard "follow-redirects@npm:^1.14.0": - version: 1.14.7 - resolution: "follow-redirects@npm:1.14.7" + version: 1.14.9 + resolution: "follow-redirects@npm:1.14.9" peerDependenciesMeta: debug: optional: true - checksum: f6d03e5e30877431065bca0d1b2e3db93949eb799d368a5c07ea8a4b71205f0349a3f8f0191bf13a07c93885522834dca1dc8e527dc99a772c6911fba24edc5f + checksum: f5982e0eb481818642492d3ca35a86989c98af1128b8e1a62911a3410621bc15d2b079e8170b35b19d3bdee770b73ed431a257ed86195af773771145baa57845 languageName: node linkType: hard @@ -9655,8 +9655,8 @@ __metadata: linkType: hard "rollup@npm:^2.56.3": - version: 2.68.0 - resolution: "rollup@npm:2.68.0" + version: 2.70.1 + resolution: "rollup@npm:2.70.1" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -9664,7 +9664,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: c883f6fb2e10e1c79a32527da0c50ef47a7beb8ddacfdae4197ff2d1911fb8d10bb2704496cf878d3048fbf3524d613bc87f25c5be0afc667fe30b7d04fa8092 + checksum: 06c62933e6e81a1c8c684d7d576e507081aabdb63cc0c91bca86b7348b66df03b77827068e4990b8b6c738bd3ef66dcc8c7ed7e0ea40b736068e7618f693133e languageName: node linkType: hard @@ -9694,11 +9694,11 @@ __metadata: linkType: hard "rxjs@npm:^7.5.1": - version: 7.5.4 - resolution: "rxjs@npm:7.5.4" + version: 7.5.5 + resolution: "rxjs@npm:7.5.5" dependencies: tslib: ^2.1.0 - checksum: 6f55f835f2543bc8214900f9e28b6320e6adc95875011fbca63e80a66eb18c9ff7cfdccb23b2180cbb6412762b98ed158c89fd51cb020799d127c66ea38c3c0e + checksum: e034f60805210cce756dd2f49664a8108780b117cf5d0e2281506e9e6387f7b4f1532d974a8c8b09314fa7a16dd2f6cff3462072a5789672b5dcb45c4173f3c6 languageName: node linkType: hard @@ -10739,7 +10739,45 @@ __metadata: languageName: node linkType: hard -"ts-node@npm:^10.2.1, ts-node@npm:^10.5.0": +"ts-node@npm:^10.2.1": + version: 10.7.0 + resolution: "ts-node@npm:10.7.0" + dependencies: + "@cspotcode/source-map-support": 0.7.0 + "@tsconfig/node10": ^1.0.7 + "@tsconfig/node12": ^1.0.7 + "@tsconfig/node14": ^1.0.0 + "@tsconfig/node16": ^1.0.2 + acorn: ^8.4.1 + acorn-walk: ^8.1.1 + arg: ^4.1.0 + create-require: ^1.1.0 + diff: ^4.0.1 + make-error: ^1.1.1 + v8-compile-cache-lib: ^3.0.0 + yn: 3.1.1 + peerDependencies: + "@swc/core": ">=1.2.50" + "@swc/wasm": ">=1.2.50" + "@types/node": "*" + typescript: ">=2.7" + peerDependenciesMeta: + "@swc/core": + optional: true + "@swc/wasm": + optional: true + bin: + ts-node: dist/bin.js + ts-node-cwd: dist/bin-cwd.js + ts-node-esm: dist/bin-esm.js + ts-node-script: dist/bin-script.js + ts-node-transpile-only: dist/bin-transpile.js + ts-script: dist/bin-script-deprecated.js + checksum: 2a379e43f7478d0b79e1e63af91fe222d83857727957df4bd3bdf3c0a884de5097b12feb9bbf530074526b8874c0338b0e6328cf334f3a5e2c49c71e837273f7 + languageName: node + linkType: hard + +"ts-node@npm:^10.5.0": version: 10.5.0 resolution: "ts-node@npm:10.5.0" dependencies: