@tweenjs/tween.js 23.1.0 → 23.1.2

package/README.md

@@ -9,7 +9,7 @@ JavaScript (TypeScript) tweening engine for easy animations, incorporating optim
 
 More languages: [English](./README.md), [简体中文](./README_zh-CN.md)
 
----
+# Example
 
 ```html
 <script src="https://cdnjs.cloudflare.com/ajax/libs/tween.js/20.0.0/tween.umd.js"></script>
@@ -48,7 +48,10 @@ More languages: [English](./README.md), [简体中文](./README_zh-CN.md)
 </script>
 ```
 
-[Try this example on CodePen](https://codepen.io/trusktr/pen/KKGaBVz?editors=1000)
+[Try the above example on CodePen](https://codepen.io/trusktr/pen/KKGaBVz?editors=1000)
+
+Animate numbers in any JavaScript object. For example, [rotate a 3D box made
+with Three.js](https://codepen.io/trusktr/pen/ExJqvgZ):
 
 # Installation
 

package/dist/tween.amd.js

@@ -9,13 +9,13 @@ define(['exports'], (function (exports) { 'use strict';
                 return amount;
             },
             In: function (amount) {
-                return this.None(amount);
+                return amount;
             },
             Out: function (amount) {
-                return this.None(amount);
+                return amount;
             },
             InOut: function (amount) {
-                return this.None(amount);
+                return amount;
             },
         }),
         Quadratic: Object.freeze({
@@ -424,12 +424,12 @@ define(['exports'], (function (exports) { 'use strict';
                 throw new Error('Can not call Tween.to() while Tween is already started or paused. Stop the Tween first.');
             this._valuesEnd = target;
             this._propertiesAreSetUp = false;
-            this._duration = duration;
+            this._duration = duration < 0 ? 0 : duration;
             return this;
         };
         Tween.prototype.duration = function (duration) {
             if (duration === void 0) { duration = 1000; }
-            this._duration = duration;
+            this._duration = duration < 0 ? 0 : duration;
             return this;
         };
         Tween.prototype.dynamic = function (dynamic) {
@@ -678,13 +678,11 @@ define(['exports'], (function (exports) { 'use strict';
          * it is still playing, just paused).
          */
         Tween.prototype.update = function (time, autoStart) {
-            var _this = this;
             var _a;
             if (time === void 0) { time = now(); }
             if (autoStart === void 0) { autoStart = true; }
             if (this._isPaused)
                 return true;
-            var property;
             var endTime = this._startTime + this._duration;
             if (!this._goToEnd && !this._isPlaying) {
                 if (time > endTime)
@@ -711,72 +709,85 @@ define(['exports'], (function (exports) { 'use strict';
             var elapsedTime = time - this._startTime;
             var durationAndDelay = this._duration + ((_a = this._repeatDelayTime) !== null && _a !== void 0 ? _a : this._delayTime);
             var totalTime = this._duration + this._repeat * durationAndDelay;
-            var calculateElapsedPortion = function () {
-                if (_this._duration === 0)
-                    return 1;
-                if (elapsedTime > totalTime) {
-                    return 1;
-                }
-                var timesRepeated = Math.trunc(elapsedTime / durationAndDelay);
-                var timeIntoCurrentRepeat = elapsedTime - timesRepeated * durationAndDelay;
-                // TODO use %?
-                // const timeIntoCurrentRepeat = elapsedTime % durationAndDelay
-                var portion = Math.min(timeIntoCurrentRepeat / _this._duration, 1);
-                if (portion === 0 && elapsedTime === _this._duration) {
-                    return 1;
-                }
-                return portion;
-            };
-            var elapsed = calculateElapsedPortion();
+            var elapsed = this._calculateElapsedPortion(elapsedTime, durationAndDelay, totalTime);
             var value = this._easingFunction(elapsed);
-            // properties transformations
+            var status = this._calculateCompletionStatus(elapsedTime, durationAndDelay);
+            if (status === 'repeat') {
+                // the current update is happening after the instant the tween repeated
+                this._processRepetition(elapsedTime, durationAndDelay);
+            }
             this._updateProperties(this._object, this._valuesStart, this._valuesEnd, value);
+            if (status === 'about-to-repeat') {
+                // the current update is happening at the exact instant the tween is going to repeat
+                // the values should match the end of the tween, not the beginning,
+                // that's why _processRepetition happens after _updateProperties
+                this._processRepetition(elapsedTime, durationAndDelay);
+            }
             if (this._onUpdateCallback) {
                 this._onUpdateCallback(this._object, elapsed);
             }
-            if (this._duration === 0 || elapsedTime >= this._duration) {
-                if (this._repeat > 0) {
-                    var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
-                    if (isFinite(this._repeat)) {
-                        this._repeat -= completeCount;
-                    }
-                    // Reassign starting values, restart by making startTime = now
-                    for (property in this._valuesStartRepeat) {
-                        if (!this._yoyo && typeof this._valuesEnd[property] === 'string') {
-                            this._valuesStartRepeat[property] =
-                                // eslint-disable-next-line
-                                // @ts-ignore FIXME?
-                                this._valuesStartRepeat[property] + parseFloat(this._valuesEnd[property]);
-                        }
-                        if (this._yoyo) {
-                            this._swapEndStartRepeatValues(property);
-                        }
-                        this._valuesStart[property] = this._valuesStartRepeat[property];
-                    }
-                    if (this._yoyo) {
-                        this._reversed = !this._reversed;
-                    }
-                    this._startTime += durationAndDelay * completeCount;
-                    if (this._onRepeatCallback) {
-                        this._onRepeatCallback(this._object);
-                    }
-                    this._onEveryStartCallbackFired = false;
-                    return true;
+            if (status === 'repeat' || status === 'about-to-repeat') {
+                if (this._onRepeatCallback) {
+                    this._onRepeatCallback(this._object);
                 }
-                else {
-                    if (this._onCompleteCallback) {
-                        this._onCompleteCallback(this._object);
-                    }
-                    for (var i = 0, numChainedTweens = this._chainedTweens.length; i < numChainedTweens; i++) {
-                        // Make the chained tweens start exactly at the time they should,
-                        // even if the `update()` method was called way past the duration of the tween
-                        this._chainedTweens[i].start(this._startTime + this._duration, false);
-                    }
-                    this._isPlaying = false;
-                    return false;
+                this._onEveryStartCallbackFired = false;
+            }
+            else if (status === 'completed') {
+                this._isPlaying = false;
+                if (this._onCompleteCallback) {
+                    this._onCompleteCallback(this._object);
+                }
+                for (var i = 0, numChainedTweens = this._chainedTweens.length; i < numChainedTweens; i++) {
+                    // Make the chained tweens start exactly at the time they should,
+                    // even if the `update()` method was called way past the duration of the tween
+                    this._chainedTweens[i].start(this._startTime + this._duration, false);
                 }
             }
-            return true;
+            return status !== 'completed';
+        };
+        Tween.prototype._calculateElapsedPortion = function (elapsedTime, durationAndDelay, totalTime) {
+            if (this._duration === 0 || elapsedTime > totalTime) {
+                return 1;
+            }
+            var timeIntoCurrentRepeat = elapsedTime % durationAndDelay;
+            var portion = Math.min(timeIntoCurrentRepeat / this._duration, 1);
+            if (portion === 0 && elapsedTime !== 0 && elapsedTime % this._duration === 0) {
+                return 1;
+            }
+            return portion;
+        };
+        Tween.prototype._calculateCompletionStatus = function (elapsedTime, durationAndDelay) {
+            if (this._duration !== 0 && elapsedTime < this._duration) {
+                return 'playing';
+            }
+            if (this._repeat <= 0) {
+                return 'completed';
+            }
+            if (elapsedTime === this._duration) {
+                return 'about-to-repeat';
+            }
+            return 'repeat';
+        };
+        Tween.prototype._processRepetition = function (elapsedTime, durationAndDelay) {
+            var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
+            if (isFinite(this._repeat)) {
+                this._repeat -= completeCount;
+            }
+            // Reassign starting values, restart by making startTime = now
+            for (var property in this._valuesStartRepeat) {
+                var valueEnd = this._valuesEnd[property];
+                if (!this._yoyo && typeof valueEnd === 'string') {
+                    this._valuesStartRepeat[property] = this._valuesStartRepeat[property] + parseFloat(valueEnd);
+                }
+                if (this._yoyo) {
+                    this._swapEndStartRepeatValues(property);
+                }
+                this._valuesStart[property] = this._valuesStartRepeat[property];
+            }
+            if (this._yoyo) {
+                this._reversed = !this._reversed;
+            }
+            this._startTime += durationAndDelay * completeCount;
         };
         Tween.prototype._updateProperties = function (_object, _valuesStart, _valuesEnd, value) {
             for (var property in _valuesEnd) {
@@ -832,7 +843,7 @@ define(['exports'], (function (exports) { 'use strict';
         return Tween;
     }());
 
-    var VERSION = '23.1.0';
+    var VERSION = '23.1.2';
 
     /**
      * Tween.js - Licensed under the MIT license

package/dist/tween.cjs

@@ -11,13 +11,13 @@ var Easing = Object.freeze({
             return amount;
         },
         In: function (amount) {
-            return this.None(amount);
+            return amount;
         },
         Out: function (amount) {
-            return this.None(amount);
+            return amount;
         },
         InOut: function (amount) {
-            return this.None(amount);
+            return amount;
         },
     }),
     Quadratic: Object.freeze({
@@ -426,12 +426,12 @@ var Tween = /** @class */ (function () {
             throw new Error('Can not call Tween.to() while Tween is already started or paused. Stop the Tween first.');
         this._valuesEnd = target;
         this._propertiesAreSetUp = false;
-        this._duration = duration;
+        this._duration = duration < 0 ? 0 : duration;
         return this;
     };
     Tween.prototype.duration = function (duration) {
         if (duration === void 0) { duration = 1000; }
-        this._duration = duration;
+        this._duration = duration < 0 ? 0 : duration;
         return this;
     };
     Tween.prototype.dynamic = function (dynamic) {
@@ -680,13 +680,11 @@ var Tween = /** @class */ (function () {
      * it is still playing, just paused).
      */
     Tween.prototype.update = function (time, autoStart) {
-        var _this = this;
         var _a;
         if (time === void 0) { time = now(); }
         if (autoStart === void 0) { autoStart = true; }
         if (this._isPaused)
             return true;
-        var property;
         var endTime = this._startTime + this._duration;
         if (!this._goToEnd && !this._isPlaying) {
             if (time > endTime)
@@ -713,72 +711,85 @@ var Tween = /** @class */ (function () {
         var elapsedTime = time - this._startTime;
         var durationAndDelay = this._duration + ((_a = this._repeatDelayTime) !== null && _a !== void 0 ? _a : this._delayTime);
         var totalTime = this._duration + this._repeat * durationAndDelay;
-        var calculateElapsedPortion = function () {
-            if (_this._duration === 0)
-                return 1;
-            if (elapsedTime > totalTime) {
-                return 1;
-            }
-            var timesRepeated = Math.trunc(elapsedTime / durationAndDelay);
-            var timeIntoCurrentRepeat = elapsedTime - timesRepeated * durationAndDelay;
-            // TODO use %?
-            // const timeIntoCurrentRepeat = elapsedTime % durationAndDelay
-            var portion = Math.min(timeIntoCurrentRepeat / _this._duration, 1);
-            if (portion === 0 && elapsedTime === _this._duration) {
-                return 1;
-            }
-            return portion;
-        };
-        var elapsed = calculateElapsedPortion();
+        var elapsed = this._calculateElapsedPortion(elapsedTime, durationAndDelay, totalTime);
         var value = this._easingFunction(elapsed);
-        // properties transformations
+        var status = this._calculateCompletionStatus(elapsedTime, durationAndDelay);
+        if (status === 'repeat') {
+            // the current update is happening after the instant the tween repeated
+            this._processRepetition(elapsedTime, durationAndDelay);
+        }
         this._updateProperties(this._object, this._valuesStart, this._valuesEnd, value);
+        if (status === 'about-to-repeat') {
+            // the current update is happening at the exact instant the tween is going to repeat
+            // the values should match the end of the tween, not the beginning,
+            // that's why _processRepetition happens after _updateProperties
+            this._processRepetition(elapsedTime, durationAndDelay);
+        }
         if (this._onUpdateCallback) {
             this._onUpdateCallback(this._object, elapsed);
         }
-        if (this._duration === 0 || elapsedTime >= this._duration) {
-            if (this._repeat > 0) {
-                var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
-                if (isFinite(this._repeat)) {
-                    this._repeat -= completeCount;
-                }
-                // Reassign starting values, restart by making startTime = now
-                for (property in this._valuesStartRepeat) {
-                    if (!this._yoyo && typeof this._valuesEnd[property] === 'string') {
-                        this._valuesStartRepeat[property] =
-                            // eslint-disable-next-line
-                            // @ts-ignore FIXME?
-                            this._valuesStartRepeat[property] + parseFloat(this._valuesEnd[property]);
-                    }
-                    if (this._yoyo) {
-                        this._swapEndStartRepeatValues(property);
-                    }
-                    this._valuesStart[property] = this._valuesStartRepeat[property];
-                }
-                if (this._yoyo) {
-                    this._reversed = !this._reversed;
-                }
-                this._startTime += durationAndDelay * completeCount;
-                if (this._onRepeatCallback) {
-                    this._onRepeatCallback(this._object);
-                }
-                this._onEveryStartCallbackFired = false;
-                return true;
+        if (status === 'repeat' || status === 'about-to-repeat') {
+            if (this._onRepeatCallback) {
+                this._onRepeatCallback(this._object);
             }
-            else {
-                if (this._onCompleteCallback) {
-                    this._onCompleteCallback(this._object);
-                }
-                for (var i = 0, numChainedTweens = this._chainedTweens.length; i < numChainedTweens; i++) {
-                    // Make the chained tweens start exactly at the time they should,
-                    // even if the `update()` method was called way past the duration of the tween
-                    this._chainedTweens[i].start(this._startTime + this._duration, false);
-                }
-                this._isPlaying = false;
-                return false;
+            this._onEveryStartCallbackFired = false;
+        }
+        else if (status === 'completed') {
+            this._isPlaying = false;
+            if (this._onCompleteCallback) {
+                this._onCompleteCallback(this._object);
+            }
+            for (var i = 0, numChainedTweens = this._chainedTweens.length; i < numChainedTweens; i++) {
+                // Make the chained tweens start exactly at the time they should,
+                // even if the `update()` method was called way past the duration of the tween
+                this._chainedTweens[i].start(this._startTime + this._duration, false);
             }
         }
-        return true;
+        return status !== 'completed';
+    };
+    Tween.prototype._calculateElapsedPortion = function (elapsedTime, durationAndDelay, totalTime) {
+        if (this._duration === 0 || elapsedTime > totalTime) {
+            return 1;
+        }
+        var timeIntoCurrentRepeat = elapsedTime % durationAndDelay;
+        var portion = Math.min(timeIntoCurrentRepeat / this._duration, 1);
+        if (portion === 0 && elapsedTime !== 0 && elapsedTime % this._duration === 0) {
+            return 1;
+        }
+        return portion;
+    };
+    Tween.prototype._calculateCompletionStatus = function (elapsedTime, durationAndDelay) {
+        if (this._duration !== 0 && elapsedTime < this._duration) {
+            return 'playing';
+        }
+        if (this._repeat <= 0) {
+            return 'completed';
+        }
+        if (elapsedTime === this._duration) {
+            return 'about-to-repeat';
+        }
+        return 'repeat';
+    };
+    Tween.prototype._processRepetition = function (elapsedTime, durationAndDelay) {
+        var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
+        if (isFinite(this._repeat)) {
+            this._repeat -= completeCount;
+        }
+        // Reassign starting values, restart by making startTime = now
+        for (var property in this._valuesStartRepeat) {
+            var valueEnd = this._valuesEnd[property];
+            if (!this._yoyo && typeof valueEnd === 'string') {
+                this._valuesStartRepeat[property] = this._valuesStartRepeat[property] + parseFloat(valueEnd);
+            }
+            if (this._yoyo) {
+                this._swapEndStartRepeatValues(property);
+            }
+            this._valuesStart[property] = this._valuesStartRepeat[property];
+        }
+        if (this._yoyo) {
+            this._reversed = !this._reversed;
+        }
+        this._startTime += durationAndDelay * completeCount;
     };
     Tween.prototype._updateProperties = function (_object, _valuesStart, _valuesEnd, value) {
         for (var property in _valuesEnd) {
@@ -834,7 +845,7 @@ var Tween = /** @class */ (function () {
     return Tween;
 }());
 
-var VERSION = '23.1.0';
+var VERSION = '23.1.2';
 
 /**
  * Tween.js - Licensed under the MIT license

package/dist/tween.d.ts

@@ -137,6 +137,9 @@ declare class Tween<T extends UnknownProps> {
      * it is still playing, just paused).
      */
     update(time?: number, autoStart?: boolean): boolean;
+    private _calculateElapsedPortion;
+    private _calculateCompletionStatus;
+    private _processRepetition;
     private _updateProperties;
     private _handleRelativeValue;
     private _swapEndStartRepeatValues;
@@ -153,7 +156,7 @@ declare class Sequence {
     static nextId(): number;
 }
 
-declare const VERSION = "23.1.0";
+declare const VERSION = "23.1.2";
 
 declare const nextId: typeof Sequence.nextId;
 declare const getAll: () => Tween<UnknownProps>[];

package/dist/tween.esm.js

@@ -7,13 +7,13 @@ var Easing = Object.freeze({
             return amount;
         },
         In: function (amount) {
-            return this.None(amount);
+            return amount;
         },
         Out: function (amount) {
-            return this.None(amount);
+            return amount;
         },
         InOut: function (amount) {
-            return this.None(amount);
+            return amount;
         },
     }),
     Quadratic: Object.freeze({
@@ -422,12 +422,12 @@ var Tween = /** @class */ (function () {
             throw new Error('Can not call Tween.to() while Tween is already started or paused. Stop the Tween first.');
         this._valuesEnd = target;
         this._propertiesAreSetUp = false;
-        this._duration = duration;
+        this._duration = duration < 0 ? 0 : duration;
         return this;
     };
     Tween.prototype.duration = function (duration) {
         if (duration === void 0) { duration = 1000; }
-        this._duration = duration;
+        this._duration = duration < 0 ? 0 : duration;
         return this;
     };
     Tween.prototype.dynamic = function (dynamic) {
@@ -676,13 +676,11 @@ var Tween = /** @class */ (function () {
      * it is still playing, just paused).
      */
     Tween.prototype.update = function (time, autoStart) {
-        var _this = this;
         var _a;
         if (time === void 0) { time = now(); }
         if (autoStart === void 0) { autoStart = true; }
         if (this._isPaused)
             return true;
-        var property;
         var endTime = this._startTime + this._duration;
         if (!this._goToEnd && !this._isPlaying) {
             if (time > endTime)
@@ -709,72 +707,85 @@ var Tween = /** @class */ (function () {
         var elapsedTime = time - this._startTime;
         var durationAndDelay = this._duration + ((_a = this._repeatDelayTime) !== null && _a !== void 0 ? _a : this._delayTime);
         var totalTime = this._duration + this._repeat * durationAndDelay;
-        var calculateElapsedPortion = function () {
-            if (_this._duration === 0)
-                return 1;
-            if (elapsedTime > totalTime) {
-                return 1;
-            }
-            var timesRepeated = Math.trunc(elapsedTime / durationAndDelay);
-            var timeIntoCurrentRepeat = elapsedTime - timesRepeated * durationAndDelay;
-            // TODO use %?
-            // const timeIntoCurrentRepeat = elapsedTime % durationAndDelay
-            var portion = Math.min(timeIntoCurrentRepeat / _this._duration, 1);
-            if (portion === 0 && elapsedTime === _this._duration) {
-                return 1;
-            }
-            return portion;
-        };
-        var elapsed = calculateElapsedPortion();
+        var elapsed = this._calculateElapsedPortion(elapsedTime, durationAndDelay, totalTime);
         var value = this._easingFunction(elapsed);
-        // properties transformations
+        var status = this._calculateCompletionStatus(elapsedTime, durationAndDelay);
+        if (status === 'repeat') {
+            // the current update is happening after the instant the tween repeated
+            this._processRepetition(elapsedTime, durationAndDelay);
+        }
         this._updateProperties(this._object, this._valuesStart, this._valuesEnd, value);
+        if (status === 'about-to-repeat') {
+            // the current update is happening at the exact instant the tween is going to repeat
+            // the values should match the end of the tween, not the beginning,
+            // that's why _processRepetition happens after _updateProperties
+            this._processRepetition(elapsedTime, durationAndDelay);
+        }
         if (this._onUpdateCallback) {
             this._onUpdateCallback(this._object, elapsed);
         }
-        if (this._duration === 0 || elapsedTime >= this._duration) {
-            if (this._repeat > 0) {
-                var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
-                if (isFinite(this._repeat)) {
-                    this._repeat -= completeCount;
-                }
-                // Reassign starting values, restart by making startTime = now
-                for (property in this._valuesStartRepeat) {
-                    if (!this._yoyo && typeof this._valuesEnd[property] === 'string') {
-                        this._valuesStartRepeat[property] =
-                            // eslint-disable-next-line
-                            // @ts-ignore FIXME?
-                            this._valuesStartRepeat[property] + parseFloat(this._valuesEnd[property]);
-                    }
-                    if (this._yoyo) {
-                        this._swapEndStartRepeatValues(property);
-                    }
-                    this._valuesStart[property] = this._valuesStartRepeat[property];
-                }
-                if (this._yoyo) {
-                    this._reversed = !this._reversed;
-                }
-                this._startTime += durationAndDelay * completeCount;
-                if (this._onRepeatCallback) {
-                    this._onRepeatCallback(this._object);
-                }
-                this._onEveryStartCallbackFired = false;
-                return true;
+        if (status === 'repeat' || status === 'about-to-repeat') {
+            if (this._onRepeatCallback) {
+                this._onRepeatCallback(this._object);
             }
-            else {
-                if (this._onCompleteCallback) {
-                    this._onCompleteCallback(this._object);
-                }
-                for (var i = 0, numChainedTweens = this._chainedTweens.length; i < numChainedTweens; i++) {
-                    // Make the chained tweens start exactly at the time they should,
-                    // even if the `update()` method was called way past the duration of the tween
-                    this._chainedTweens[i].start(this._startTime + this._duration, false);
-                }
-                this._isPlaying = false;
-                return false;
+            this._onEveryStartCallbackFired = false;
+        }
+        else if (status === 'completed') {
+            this._isPlaying = false;
+            if (this._onCompleteCallback) {
+                this._onCompleteCallback(this._object);
+            }
+            for (var i = 0, numChainedTweens = this._chainedTweens.length; i < numChainedTweens; i++) {
+                // Make the chained tweens start exactly at the time they should,
+                // even if the `update()` method was called way past the duration of the tween
+                this._chainedTweens[i].start(this._startTime + this._duration, false);
             }
         }
-        return true;
+        return status !== 'completed';
+    };
+    Tween.prototype._calculateElapsedPortion = function (elapsedTime, durationAndDelay, totalTime) {
+        if (this._duration === 0 || elapsedTime > totalTime) {
+            return 1;
+        }
+        var timeIntoCurrentRepeat = elapsedTime % durationAndDelay;
+        var portion = Math.min(timeIntoCurrentRepeat / this._duration, 1);
+        if (portion === 0 && elapsedTime !== 0 && elapsedTime % this._duration === 0) {
+            return 1;
+        }
+        return portion;
+    };
+    Tween.prototype._calculateCompletionStatus = function (elapsedTime, durationAndDelay) {
+        if (this._duration !== 0 && elapsedTime < this._duration) {
+            return 'playing';
+        }
+        if (this._repeat <= 0) {
+            return 'completed';
+        }
+        if (elapsedTime === this._duration) {
+            return 'about-to-repeat';
+        }
+        return 'repeat';
+    };
+    Tween.prototype._processRepetition = function (elapsedTime, durationAndDelay) {
+        var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
+        if (isFinite(this._repeat)) {
+            this._repeat -= completeCount;
+        }
+        // Reassign starting values, restart by making startTime = now
+        for (var property in this._valuesStartRepeat) {
+            var valueEnd = this._valuesEnd[property];
+            if (!this._yoyo && typeof valueEnd === 'string') {
+                this._valuesStartRepeat[property] = this._valuesStartRepeat[property] + parseFloat(valueEnd);
+            }
+            if (this._yoyo) {
+                this._swapEndStartRepeatValues(property);
+            }
+            this._valuesStart[property] = this._valuesStartRepeat[property];
+        }
+        if (this._yoyo) {
+            this._reversed = !this._reversed;
+        }
+        this._startTime += durationAndDelay * completeCount;
     };
     Tween.prototype._updateProperties = function (_object, _valuesStart, _valuesEnd, value) {
         for (var property in _valuesEnd) {
@@ -830,7 +841,7 @@ var Tween = /** @class */ (function () {
     return Tween;
 }());
 
-var VERSION = '23.1.0';
+var VERSION = '23.1.2';
 
 /**
  * Tween.js - Licensed under the MIT license

package/dist/tween.umd.js

@@ -13,13 +13,13 @@
                 return amount;
             },
             In: function (amount) {
-                return this.None(amount);
+                return amount;
             },
             Out: function (amount) {
-                return this.None(amount);
+                return amount;
             },
             InOut: function (amount) {
-                return this.None(amount);
+                return amount;
             },
         }),
         Quadratic: Object.freeze({
@@ -428,12 +428,12 @@
                 throw new Error('Can not call Tween.to() while Tween is already started or paused. Stop the Tween first.');
             this._valuesEnd = target;
             this._propertiesAreSetUp = false;
-            this._duration = duration;
+            this._duration = duration < 0 ? 0 : duration;
             return this;
         };
         Tween.prototype.duration = function (duration) {
             if (duration === void 0) { duration = 1000; }
-            this._duration = duration;
+            this._duration = duration < 0 ? 0 : duration;
             return this;
         };
         Tween.prototype.dynamic = function (dynamic) {
@@ -682,13 +682,11 @@
          * it is still playing, just paused).
          */
         Tween.prototype.update = function (time, autoStart) {
-            var _this = this;
             var _a;
             if (time === void 0) { time = now(); }
             if (autoStart === void 0) { autoStart = true; }
             if (this._isPaused)
                 return true;
-            var property;
             var endTime = this._startTime + this._duration;
             if (!this._goToEnd && !this._isPlaying) {
                 if (time > endTime)
@@ -715,72 +713,85 @@
             var elapsedTime = time - this._startTime;
             var durationAndDelay = this._duration + ((_a = this._repeatDelayTime) !== null && _a !== void 0 ? _a : this._delayTime);
             var totalTime = this._duration + this._repeat * durationAndDelay;
-            var calculateElapsedPortion = function () {
-                if (_this._duration === 0)
-                    return 1;
-                if (elapsedTime > totalTime) {
-                    return 1;
-                }
-                var timesRepeated = Math.trunc(elapsedTime / durationAndDelay);
-                var timeIntoCurrentRepeat = elapsedTime - timesRepeated * durationAndDelay;
-                // TODO use %?
-                // const timeIntoCurrentRepeat = elapsedTime % durationAndDelay
-                var portion = Math.min(timeIntoCurrentRepeat / _this._duration, 1);
-                if (portion === 0 && elapsedTime === _this._duration) {
-                    return 1;
-                }
-                return portion;
-            };
-            var elapsed = calculateElapsedPortion();
+            var elapsed = this._calculateElapsedPortion(elapsedTime, durationAndDelay, totalTime);
             var value = this._easingFunction(elapsed);
-            // properties transformations
+            var status = this._calculateCompletionStatus(elapsedTime, durationAndDelay);
+            if (status === 'repeat') {
+                // the current update is happening after the instant the tween repeated
+                this._processRepetition(elapsedTime, durationAndDelay);
+            }
             this._updateProperties(this._object, this._valuesStart, this._valuesEnd, value);
+            if (status === 'about-to-repeat') {
+                // the current update is happening at the exact instant the tween is going to repeat
+                // the values should match the end of the tween, not the beginning,
+                // that's why _processRepetition happens after _updateProperties
+                this._processRepetition(elapsedTime, durationAndDelay);
+            }
             if (this._onUpdateCallback) {
                 this._onUpdateCallback(this._object, elapsed);
             }
-            if (this._duration === 0 || elapsedTime >= this._duration) {
-                if (this._repeat > 0) {
-                    var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
-                    if (isFinite(this._repeat)) {
-                        this._repeat -= completeCount;
-                    }
-                    // Reassign starting values, restart by making startTime = now
-                    for (property in this._valuesStartRepeat) {
-                        if (!this._yoyo && typeof this._valuesEnd[property] === 'string') {
-                            this._valuesStartRepeat[property] =
-                                // eslint-disable-next-line
-                                // @ts-ignore FIXME?
-                                this._valuesStartRepeat[property] + parseFloat(this._valuesEnd[property]);
-                        }
-                        if (this._yoyo) {
-                            this._swapEndStartRepeatValues(property);
-                        }
-                        this._valuesStart[property] = this._valuesStartRepeat[property];
-                    }
-                    if (this._yoyo) {
-                        this._reversed = !this._reversed;
-                    }
-                    this._startTime += durationAndDelay * completeCount;
-                    if (this._onRepeatCallback) {
-                        this._onRepeatCallback(this._object);
-                    }
-                    this._onEveryStartCallbackFired = false;
-                    return true;
+            if (status === 'repeat' || status === 'about-to-repeat') {
+                if (this._onRepeatCallback) {
+                    this._onRepeatCallback(this._object);
                 }
-                else {
-                    if (this._onCompleteCallback) {
-                        this._onCompleteCallback(this._object);
-                    }
-                    for (var i = 0, numChainedTweens = this._chainedTweens.length; i < numChainedTweens; i++) {
-                        // Make the chained tweens start exactly at the time they should,
-                        // even if the `update()` method was called way past the duration of the tween
-                        this._chainedTweens[i].start(this._startTime + this._duration, false);
-                    }
-                    this._isPlaying = false;
-                    return false;
+                this._onEveryStartCallbackFired = false;
+            }
+            else if (status === 'completed') {
+                this._isPlaying = false;
+                if (this._onCompleteCallback) {
+                    this._onCompleteCallback(this._object);
+                }
+                for (var i = 0, numChainedTweens = this._chainedTweens.length; i < numChainedTweens; i++) {
+                    // Make the chained tweens start exactly at the time they should,
+                    // even if the `update()` method was called way past the duration of the tween
+                    this._chainedTweens[i].start(this._startTime + this._duration, false);
                 }
             }
-            return true;
+            return status !== 'completed';
+        };
+        Tween.prototype._calculateElapsedPortion = function (elapsedTime, durationAndDelay, totalTime) {
+            if (this._duration === 0 || elapsedTime > totalTime) {
+                return 1;
+            }
+            var timeIntoCurrentRepeat = elapsedTime % durationAndDelay;
+            var portion = Math.min(timeIntoCurrentRepeat / this._duration, 1);
+            if (portion === 0 && elapsedTime !== 0 && elapsedTime % this._duration === 0) {
+                return 1;
+            }
+            return portion;
+        };
+        Tween.prototype._calculateCompletionStatus = function (elapsedTime, durationAndDelay) {
+            if (this._duration !== 0 && elapsedTime < this._duration) {
+                return 'playing';
+            }
+            if (this._repeat <= 0) {
+                return 'completed';
+            }
+            if (elapsedTime === this._duration) {
+                return 'about-to-repeat';
+            }
+            return 'repeat';
+        };
+        Tween.prototype._processRepetition = function (elapsedTime, durationAndDelay) {
+            var completeCount = Math.min(Math.trunc((elapsedTime - this._duration) / durationAndDelay) + 1, this._repeat);
+            if (isFinite(this._repeat)) {
+                this._repeat -= completeCount;
+            }
+            // Reassign starting values, restart by making startTime = now
+            for (var property in this._valuesStartRepeat) {
+                var valueEnd = this._valuesEnd[property];
+                if (!this._yoyo && typeof valueEnd === 'string') {
+                    this._valuesStartRepeat[property] = this._valuesStartRepeat[property] + parseFloat(valueEnd);
+                }
+                if (this._yoyo) {
+                    this._swapEndStartRepeatValues(property);
+                }
+                this._valuesStart[property] = this._valuesStartRepeat[property];
+            }
+            if (this._yoyo) {
+                this._reversed = !this._reversed;
+            }
+            this._startTime += durationAndDelay * completeCount;
         };
         Tween.prototype._updateProperties = function (_object, _valuesStart, _valuesEnd, value) {
             for (var property in _valuesEnd) {
@@ -836,7 +847,7 @@
         return Tween;
     }());
 
-    var VERSION = '23.1.0';
+    var VERSION = '23.1.2';
 
     /**
      * Tween.js - Licensed under the MIT license

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@tweenjs/tween.js",
 	"description": "Simple and fast tweening engine with optimised Robert Penner's equations.",
-	"version": "23.1.0",
+	"version": "23.1.2",
 	"type": "module",
 	"main": "dist/tween.cjs",
 	"types": "dist/tween.d.ts",
@@ -39,10 +39,10 @@
 		"tsc": "tsc",
 		"tsc-watch": "tsc --watch",
 		"examples": "npx serve .",
-		"test": "npm run build && npm run test-lint && npm run test-unit",
+		"test": "npm run build && npm run format-check && npm run test-unit",
 		"test-unit": "nodeunit test/unit/nodeunitheadless.cjs",
-		"test-lint": "npm run prettier -- --check",
-		"lint": "npm run prettier -- --write",
+		"format-check": "npm run prettier -- --check",
+		"format": "npm run prettier -- --write",
 		"prettier": "prettier .",
 		"prepare": "npm run build",
 		"version": "npm test && git add .",