api-def 0.9.1 → 0.9.3

package/esm/util/retry/lib/retryOperation.js

@@ -1,132 +1,126 @@
-function RetryOperation(timeouts, options) {
-    // Compatibility for the old (timeouts, retryForever) signature
-    if (typeof options === "boolean") {
-        options = { forever: options };
-    }
-    this._originalTimeouts = JSON.parse(JSON.stringify(timeouts));
-    this._timeouts = timeouts;
-    this._options = options || {};
-    this._maxRetryTime = options && options.maxRetryTime || Infinity;
-    this._fn = null;
-    this._errors = [];
-    this._attempts = 1;
-    this._operationTimeout = null;
-    this._operationTimeoutCb = null;
-    this._timeout = null;
-    this._operationStart = null;
-    this._timer = null;
-    if (this._options.forever) {
-        this._cachedTimeouts = this._timeouts.slice(0);
-    }
-}
-RetryOperation.prototype.reset = function () {
-    this._attempts = 1;
-    this._timeouts = this._originalTimeouts.slice(0);
-};
-RetryOperation.prototype.stop = function () {
-    if (this._timeout) {
-        clearTimeout(this._timeout);
-    }
-    if (this._timer) {
-        clearTimeout(this._timer);
-    }
-    this._timeouts = [];
-    this._cachedTimeouts = null;
-};
-RetryOperation.prototype.retry = function (err) {
-    if (this._timeout) {
-        clearTimeout(this._timeout);
-    }
-    if (!err) {
-        return false;
-    }
-    var currentTime = new Date().getTime();
-    if (err && currentTime - this._operationStart >= this._maxRetryTime) {
-        this._errors.push(err);
-        this._errors.unshift(new Error("RetryOperation timeout occurred"));
-        return false;
-    }
-    this._errors.push(err);
-    var timeout = this._timeouts.shift();
-    if (timeout === undefined) {
-        if (this._cachedTimeouts) {
-            // retry forever, only keep last error
-            this._errors.splice(0, this._errors.length - 1);
-            timeout = this._cachedTimeouts.slice(-1);
-        }
-        else {
-            return false;
-        }
-    }
-    var self = this;
-    this._timer = setTimeout(function () {
-        self._attempts++;
-        if (self._operationTimeoutCb) {
-            self._timeout = setTimeout(function () {
-                self._operationTimeoutCb(self._attempts);
-            }, self._operationTimeout);
-            if (self._options.unref) {
-                self._timeout.unref();
-            }
-        }
-        self._fn(self._attempts);
-    }, timeout);
-    if (this._options.unref) {
-        this._timer.unref();
-    }
-    return true;
-};
-RetryOperation.prototype.attempt = function (fn, timeoutOps) {
-    this._fn = fn;
-    if (timeoutOps) {
-        if (timeoutOps.timeout) {
-            this._operationTimeout = timeoutOps.timeout;
-        }
-        if (timeoutOps.cb) {
-            this._operationTimeoutCb = timeoutOps.cb;
-        }
-    }
-    var self = this;
-    if (this._operationTimeoutCb) {
-        this._timeout = setTimeout(function () {
-            self._operationTimeoutCb();
-        }, self._operationTimeout);
-    }
-    this._operationStart = new Date().getTime();
-    this._fn(this._attempts);
-};
-RetryOperation.prototype.try = function (fn) {
-    // console.log("Using RetryOperation.try() is deprecated");
-    this.attempt(fn);
-};
-RetryOperation.prototype.start = function (fn) {
-    // console.log("Using RetryOperation.start() is deprecated");
-    this.attempt(fn);
-};
-RetryOperation.prototype.start = RetryOperation.prototype.try;
-RetryOperation.prototype.errors = function () {
-    return this._errors;
-};
-RetryOperation.prototype.attempts = function () {
-    return this._attempts;
-};
-RetryOperation.prototype.mainError = function () {
-    if (this._errors.length === 0) {
-        return null;
-    }
-    var counts = {};
-    var mainError = null;
-    var mainErrorCount = 0;
-    for (var i = 0; i < this._errors.length; i++) {
-        var error = this._errors[i];
-        var message = error.message;
-        var count = (counts[message] || 0) + 1;
-        counts[message] = count;
-        if (count >= mainErrorCount) {
-            mainError = error;
-            mainErrorCount = count;
-        }
-    }
-    return mainError;
-};
-export default RetryOperation;
+function RetryOperation(timeouts, options) {
+    this._originalTimeouts = JSON.parse(JSON.stringify(timeouts));
+    this._timeouts = timeouts;
+    this._options = options || {};
+    this._maxRetryTime = (options === null || options === void 0 ? void 0 : options.maxRetryTime) || Infinity;
+    this._fn = null;
+    this._errors = [];
+    this._attempts = 1;
+    this._operationTimeout = null;
+    this._operationTimeoutCb = null;
+    this._timeout = null;
+    this._operationStart = null;
+    this._timer = null;
+    if (this._options.forever) {
+        this._cachedTimeouts = this._timeouts.slice(0);
+    }
+}
+RetryOperation.prototype.reset = function () {
+    this._attempts = 1;
+    this._timeouts = this._originalTimeouts.slice(0);
+};
+RetryOperation.prototype.stop = function () {
+    if (this._timeout) {
+        clearTimeout(this._timeout);
+    }
+    if (this._timer) {
+        clearTimeout(this._timer);
+    }
+    this._timeouts = [];
+    this._cachedTimeouts = null;
+};
+RetryOperation.prototype.retry = function (err) {
+    if (this._timeout) {
+        clearTimeout(this._timeout);
+    }
+    if (!err) {
+        return false;
+    }
+    const currentTime = new Date().getTime();
+    if (err && currentTime - this._operationStart >= this._maxRetryTime) {
+        this._errors.push(err);
+        this._errors.unshift(new Error("RetryOperation timeout occurred"));
+        return false;
+    }
+    this._errors.push(err);
+    let timeout = this._timeouts.shift();
+    if (timeout === undefined) {
+        if (this._cachedTimeouts) {
+            // retry forever, only keep last error
+            this._errors.splice(0, this._errors.length - 1);
+            timeout = this._cachedTimeouts.slice(-1);
+        }
+        else {
+            return false;
+        }
+    }
+    this._timer = setTimeout(() => {
+        this._attempts++;
+        if (this._operationTimeoutCb) {
+            this._timeout = setTimeout(() => {
+                this._operationTimeoutCb(this._attempts);
+            }, this._operationTimeout);
+            if (this._options.unref) {
+                this._timeout.unref();
+            }
+        }
+        this._fn(this._attempts);
+    }, timeout);
+    if (this._options.unref) {
+        this._timer.unref();
+    }
+    return true;
+};
+RetryOperation.prototype.attempt = function (fn, timeoutOps) {
+    this._fn = fn;
+    if (timeoutOps) {
+        if (timeoutOps.timeout) {
+            this._operationTimeout = timeoutOps.timeout;
+        }
+        if (timeoutOps.cb) {
+            this._operationTimeoutCb = timeoutOps.cb;
+        }
+    }
+    if (this._operationTimeoutCb) {
+        this._timeout = setTimeout(() => {
+            this._operationTimeoutCb();
+        }, this._operationTimeout);
+    }
+    this._operationStart = new Date().getTime();
+    this._fn(this._attempts);
+};
+RetryOperation.prototype.try = function (fn) {
+    // console.log("Using RetryOperation.try() is deprecated");
+    this.attempt(fn);
+};
+RetryOperation.prototype.start = function (fn) {
+    // console.log("Using RetryOperation.start() is deprecated");
+    this.attempt(fn);
+};
+RetryOperation.prototype.start = RetryOperation.prototype.try;
+RetryOperation.prototype.errors = function () {
+    return this._errors;
+};
+RetryOperation.prototype.attempts = function () {
+    return this._attempts;
+};
+RetryOperation.prototype.mainError = function () {
+    if (this._errors.length === 0) {
+        return null;
+    }
+    const counts = {};
+    let mainError = null;
+    let mainErrorCount = 0;
+    for (let i = 0; i < this._errors.length; i++) {
+        const error = this._errors[i];
+        const message = error.message;
+        const count = (counts[message] || 0) + 1;
+        counts[message] = count;
+        if (count >= mainErrorCount) {
+            mainError = error;
+            mainErrorCount = count;
+        }
+    }
+    return mainError;
+};
+export default RetryOperation;

package/package.json

@@ -1,27 +1,21 @@
 {
   "name": "api-def",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Typed API definitions with middleware support",
   "main": "cjs/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",
   "sideEffects": false,
   "scripts": {
-    "prepublishOnly": "npm run test && npm run build",
-    "test": "npm run test:types && npm run test:lint && npm run test:unit",
-    "test:unit": "ava",
-    "test:lint": "npm run lint:strict",
-    "test:types": "tsc --noEmit -p .",
+    "prepublishOnly": "npm run check && npm run test && npm run build",
+    "test": "jest",
     "example:start": "cd example && npm run start",
-    "lint": "esw --ext .tsx,.ts src",
-    "lint:watch": "npm run lint -- --watch",
-    "lint:fix": "npm run lint -- --fix",
-    "lint:strict": "npm run lint -- --max-warnings 0",
+    "check:fix": "tsc --noEmit --project tsconfig.json && npx @biomejs/biome check --apply-unsafe .",
+    "check": "tsc --noEmit --project tsconfig.json && npx @biomejs/biome check .",
     "cleanup": "rimraf esm && rimraf cjs",
     "build": "npm run cleanup && npm run build:esm && npm run build:cjs",
     "build:esm": "tsc --module es2015 --target es2016 --outDir esm --preserveWatchOutput",
     "build:cjs": "tsc --module commonjs --target es5 --outDir cjs --preserveWatchOutput",
-    "build:watch": "npm-run-all -p \"build:esm -- -w\" \"build:cjs -- -w\" \"lint:watch\"",
     "website:dev": "cd website && npm run start",
     "website:deploy": "cd website && npm run deploy"
   },
@@ -45,35 +39,26 @@
     "esm/",
     "cjs/"
   ],
-  "repository": "https://github.com/Censkh/api-def",
-  "ava": {
-    "extensions": [
-      "ts"
-    ],
-    "files": [
-      "src/tests/**/*.test.ts"
-    ],
-    "nodeArguments": [
-      "--require=@esbuild-kit/cjs-loader"
-    ]
+  "jest": {
+    "transform": {
+      "^.+\\.(t|j)sx?$": "@swc/jest"
+    }
   },
+  "repository": "https://github.com/Censkh/api-def",
   "devDependencies": {
-    "@babel/preset-env": "7.14.8",
-    "@babel/preset-typescript": "7.14.5",
-    "@esbuild-kit/cjs-loader": "2.4.0",
+    "@biomejs/biome": "^1.5.3",
+    "@swc/jest": "0.2.31",
     "@types/axios": "0.14.0",
-    "@types/node": "16.4.6",
-    "@types/qs": "6.9.8",
-    "@typescript-eslint/eslint-plugin": "4.28.5",
-    "@typescript-eslint/parser": "4.28.5",
-    "ava": "5.0.1",
-    "axios": "1.1.3",
+    "@types/jest": "^29.5.11",
+    "@types/node": "20.11.6",
+    "@types/qs": "6.9.11",
+    "axios": "1.6.6",
     "cross-env": "7.0.3",
-    "eslint": "7.31.0",
-    "eslint-watch": "7.0.0",
+    "jest": "29.7.0",
     "npm-run-all": "4.1.5",
     "qs": "6.11.2",
-    "typescript": "4.8.4",
+    "rimraf": "5.0.5",
+    "typescript": "5.3.3",
     "zod": "3.22.4"
   }
 }