fix declaration file dist paths

.vscode/settings.json

@@ -6,10 +6,11 @@
     "**/.git": true,
     "build": true,
     "coverage": true,
-    "dist": true,
     "node_modules": true
   },
-  "search.exclude": {},
+  "search.exclude": {
+    "dist": true
+  },
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "coverage-gutters.showGutterCoverage": true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "atoll-mono",
-  "version": "0.1.1",
+  "version": "0.66.0",
   "description": "Atoll's Monorepo using NPM workspaces",
   "main": "index.ts",
   "homepage": "https://github.com/51ngul4r1ty/atoll-mono#readme",
@@ -21,10 +21,14 @@
     "build-pkg:rest-fetch": "npm run build -w packages/rest-fetch",
     "build-pkg:api-types": "npm run build -w packages/api-types",
     "build-pkgs:shared": "npm run build-pkg:api-types && npm run build-pkg:rest-fetch && npm run build-pkg:rich-types && npm run build-pkg:client-sdk && npm run build-pkg:shared",
+    "build-pkgs:extension": "npm run build-pkgs:client-sdk && npm run build-pkg:extension",
+    "build-pkgs:client-sdk": "npm run build-pkg:rich-types && npm run build-pkgs:rest-fetch && npm run build-pkg:client-sdk",
+    "build-pkgs:rest-fetch": "npm run build-pkg:api-types && npm run build-pkg:rest-fetch",
     "dist-pkg:extension": "npm run build-pkgs:shared && npm run build-pkg:extension && npm run build-vsix -w packages/vscode-extension",
     "check-prereqs-pkg:web-app": "npm run check:prereqs -w packages/web-app",
     "docker-pkg:web-app": "npm run build-pkg:web-app && npm run -w packages/web-app build:docker",
-    "clean-all": "npm run clean-all:node-modules",
+    "clean-all": "npm run clean-all:node-modules && npm run clean-all:dist",
+    "clean-all:dist": "npm run clean:dist -ws --if-present",
     "clean-all:node-modules": "npm run clean:node-modules -ws --if-present",
     "clean:node-modules": "rimraf node_modules",
     "package-pkg:extension": "npm run package -w packages/vscode-extension",
@@ -60,6 +64,6 @@
   "devDependencies": {
     "prettier": "2.7.1",
     "rimraf": "3.0.2",
-    "typescript": "4.2.4"
+    "typescript": "4.6.4"
   }
 }

packages/api-types/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@atoll/api-types",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Atoll REST API shared types",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
-  "types": "dist/index.d.ts",
+  "types": "dist/src/types/index.d.ts",
   "files": [
     "dist"
   ],
@@ -18,7 +18,8 @@
     "build": "rollup -c --bundleConfigAsCjs",
     "prepublishOnly": "npm run clean && npm run build && npm run test",
     "watch": "rollup -cw --bundleConfigAsCjs",
-    "clean": "npx --no-install rimraf dist",
+    "clean": "npm run clean:dist",
+    "clean:dist": "rimraf dist",
     "clean:node-modules": "rimraf node_modules",
     "test": "tsc --noEmit --project tsconfig.json"
   },

packages/client-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atoll/client-sdk",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Atoll REST API client SDK",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
@@ -18,7 +18,8 @@
     "build": "rollup -c",
     "prepublishOnly": "npm run clean && npm run build && npm run test",
     "watch": "rollup -cw",
-    "clean": "npx --no-install rimraf dist",
+    "clean": "npm run clean:dist",
+    "clean:dist": "rimraf dist",
     "clean:node-modules": "rimraf node_modules",
     "test": "npm run test:tsc && npm run test:unit",
     "test:unit": "jest --coverage",
@@ -51,9 +52,9 @@
     "typescript": "4.6.4"
   },
   "dependencies": {
-    "@atoll/api-types": "1.0.0",
-    "@atoll/rest-fetch": "1.1.0",
-    "@atoll/rich-types": "0.1.1",
+    "@atoll/api-types": "1.1.1",
+    "@atoll/rest-fetch": "1.1.1",
+    "@atoll/rich-types": "1.1.1",
     "http-status-codes": "2.2.0"
   }
 }

packages/client-sdk/src/atollClient.ts

@@ -58,6 +58,7 @@ export class AtollClient {
     };
     private onAuthFailureNotification = async (refreshTokenUri: string): Promise<void> => {
         if (this.notificationHandler) {
+            debugger;
             await this.notificationHandler("Re-connecting to Atoll Server...", "info");
         }
     };

packages/rest-fetch/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@atoll/rest-fetch",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "TypeScript async/await RESTful HTTP client for the browser and node.js",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
-  "types": "dist/index.d.ts",
+  "types": "dist/packages/rest-fetch/src/index.d.ts",
   "files": [
     "dist"
   ],
@@ -18,7 +18,8 @@
     "build": "rollup -c --bundleConfigAsCjs",
     "prepublishOnly": "npm run clean && npm run build && npm run test",
     "watch": "rollup -cw --bundleConfigAsCjs",
-    "clean": "npx --no-install rimraf dist",
+    "clean": "npm run clean:dist",
+    "clean:dist": "rimraf dist",
     "clean:node-modules": "rimraf node_modules",
     "test": "npm run test:tsc",
     "test:tsc": "tsc --noEmit --project tsconfig.json",
@@ -34,7 +35,6 @@
     "axios": "0.27.2"
   },
   "devDependencies": {
-    "@atoll/api-types": "0.6.1",
     "@babel/core": "7.17.10",
     "@babel/preset-env": "7.17.10",
     "@babel/preset-typescript": "7.16.7",
@@ -44,6 +44,7 @@
     "jest": "28.0.3"
   },
   "dependencies": {
+    "@atoll/api-types": "1.1.1",
     "http-status-codes": "2.2.0"
   }
 }

packages/rest-fetch/src/restApiFetch.ts

@@ -172,6 +172,7 @@ export class RestApiFetch<ST = any, FT = string> {
         throw this.buildFromCaughtError(errorTyped);
     }
     private async handleErrorAndRetry<T>(error: any, options: ResourceRequestOptions, apiCall: () => T): Promise<T> {
+        debugger;
         const errorTyped = this.fixAxiosError(error);
         if (options.skipRetryOnAuthFailure || errorTyped.status !== 401) {
             this.handleError(error);

packages/rich-types/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@atoll/rich-types",
-  "version": "0.1.1",
+  "version": "1.1.1",
   "description": "Atoll consuming code shared types",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
-  "types": "dist/index.d.ts",
+  "types": "dist/src/types/index.d.ts",
   "files": [
     "dist"
   ],
@@ -18,7 +18,8 @@
     "build": "rollup -c",
     "prepublishOnly": "npm run clean && npm run build && npm run test",
     "watch": "rollup -cw",
-    "clean": "npx --no-install rimraf dist",
+    "clean": "npm run clean:dist",
+    "clean:dist": "rimraf dist",
     "clean:node-modules": "rimraf node_modules",
     "test": "tsc --noEmit --project tsconfig.json"
   },

packages/scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atoll/scripts",
-  "version": "0.1.0",
+  "version": "1.1.1",
   "description": "",
   "main": "index.js",
   "devDependencies": {},

packages/shared/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@atoll/shared",
-  "version": "0.65.0",
+  "version": "0.66.0",
   "description": "Atoll shared code that is common to electron desktop client and web app",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
-  "types": "dist/index.d.ts",
+  "types": "dist/src/index.d.ts",
   "files": [
     "dist"
   ],
   "sideEffects": false,
   "scripts": {
     "build": "echo Node Version && node --version && rollup -c",
-    "clean": "npx --no-install rimraf dist",
+    "clean": "npm run clean:dist",
+    "clean:dist": "rimraf dist",
     "clean:node-modules": "rimraf node_modules",
     "gen:react-svg": "deno run --allow-read --allow-write --unstable ../scripts/build-svg-component/index.ts",
     "open:coverage-report": "npx --no-install opener ./coverage/lcov-report/index.html",

packages/vscode-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atoll-extension",
-  "version": "0.4.2",
+  "version": "0.66.0",
   "description": "Use Atoll from within VS Code",
   "author": "Kevin Berry",
   "repository": {
@@ -72,8 +72,8 @@
     "webpack-cli": "4.9.2"
   },
   "dependencies": {
-    "@atoll/client-sdk": "1.0.0",
-    "@atoll/rich-types": "0.1.1",
+    "@atoll/client-sdk": "1.1.1",
+    "@atoll/rich-types": "1.1.1",
     "axios": "0.27.2"
   },
   "license": "ISC",

packages/web-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atoll/web-app",
-  "version": "0.65.0",
+  "version": "0.66.0",
   "description": "Atoll web app",
   "scripts": {
     "build": "npm run build-only && npm run build-deploy",
@@ -32,7 +32,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@atoll/shared": "0.64.0",
+    "@atoll/shared": "0.66.0",
     "@flopflip/memory-adapter": "1.6.0",
     "@flopflip/react-broadcast": "10.1.11",
     "axios": "0.26.1",