coily 0.2.0 → 0.4.0

package/dist/index.cjs

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -71,26 +75,38 @@ var createSpringImpl = (initial, config, options) => {
     },
     set target(val) {
       target = val;
-      if (Math.abs(value - target) > restingDistance) {
+      if (state !== "moving" && Math.abs(value - target) > restingDistance) {
         state = "moving";
         emit("update:state", state);
       }
     },
+    getTarget: () => target,
     get value() {
       return value;
     },
+    getValue: () => value,
     get velocity() {
       return velocity;
     },
+    getVelocity: () => velocity,
     get state() {
       return state;
     },
+    getState: () => state,
     get config() {
       return config;
     },
     set config(value2) {
       config = value2;
     },
+    getConfig: () => config,
+    jumpTo: (_value, killVelocity = true) => {
+      value = _value;
+      if (killVelocity) {
+        velocity = 0;
+      }
+      state = Math.abs(velocity) > restingVelocity || Math.abs(value - target) > restingDistance ? "moving" : "resting";
+    },
     freeze: () => {
       state = "frozen";
       emit("update:state", state);
@@ -100,13 +116,15 @@ var createSpringImpl = (initial, config, options) => {
       emit("update:state", state);
     }
   };
+  const tension = -config.tension * 1e-6;
+  const friction = -config.friction * 1e-3;
   const simulate = (deltaTime) => {
     if (state === "moving") {
       const iterations = Math.ceil(deltaTime);
       for (let n = 0; n < iterations; n++) {
         const previousDelta = value - target;
-        const springForce = -config.tension * 1e-6 * previousDelta;
-        const dampingForce = -config.friction * 1e-3 * velocity;
+        const springForce = tension * previousDelta;
+        const dampingForce = friction * velocity;
         const acceleration = (springForce + dampingForce) / config.mass;
         velocity = velocity + acceleration;
         value = value + velocity;
@@ -237,9 +255,11 @@ var createSpringChainImpl = (initial, links, config, options) => {
         currentTarget = val;
         updateChainState(currentTarget, currentLinks);
       },
+      getTarget: () => targets[0],
       get targets() {
         return targets;
       },
+      getTargets: () => targets,
       get links() {
         return links;
       },
@@ -250,18 +270,23 @@ var createSpringChainImpl = (initial, links, config, options) => {
       get config() {
         return config;
       },
+      getConfig: () => config,
       get values() {
         return values;
       },
+      getValues: () => values,
       get velocities() {
         return velocities;
       },
+      getVelocities: () => velocities,
       get state() {
         return state;
       },
+      getState: () => state,
       get states() {
         return states;
       },
+      getStates: () => states,
       freeze: () => {
         for (const spring of springs) {
           spring.freeze();
@@ -296,9 +321,12 @@ var createSpringChain = (initial, links, config, options) => {
 };
 
 // src/createSpringSystem.ts
+var import_mitt3 = __toESM(require("mitt"), 1);
 var createSpringSystem = () => {
   const springs = /* @__PURE__ */ new Map();
+  const { emit, ...emitterApi } = (0, import_mitt3.default)();
   return {
+    ...emitterApi,
     createSpring: (initial, config, options) => {
       const [spring, simulate] = createSpringImpl(initial, config, options);
       springs.set(spring, simulate);
@@ -319,6 +347,7 @@ var createSpringSystem = () => {
       for (const simulate of springs.values()) {
         simulate(delta);
       }
+      emit("simulate:after", delta);
     }
   };
 };

package/dist/index.d.ts

@@ -19,10 +19,16 @@ type SpringEmitter = Emitter<{
 }>;
 interface Spring extends Omit<SpringEmitter, 'emit'> {
     target: number;
+    readonly getTarget: () => number;
     config: Readonly<SpringConfig>;
+    readonly getConfig: () => Readonly<SpringConfig>;
     readonly value: number;
+    readonly getValue: () => number;
     readonly velocity: number;
+    readonly getVelocity: () => number;
     readonly state: SpringState;
+    readonly getState: () => SpringState;
+    readonly jumpTo: (value: number, killVelocity?: boolean) => void;
     readonly freeze: () => void;
     readonly unfreeze: () => void;
 }
@@ -38,20 +44,31 @@ type SpringChainEmitter = Emitter<{
 }>;
 interface SpringChain extends Omit<SpringChainEmitter, 'emit'> {
     target: number;
+    readonly getTarget: () => number;
     links: SpringChainLinkGetter[];
     config: Readonly<SpringConfig>;
+    readonly getConfig: () => Readonly<SpringConfig>;
     readonly targets: ReadonlyArray<number>;
+    readonly getTargets: () => ReadonlyArray<number>;
     readonly values: ReadonlyArray<number>;
+    readonly getValues: () => ReadonlyArray<number>;
     readonly velocities: ReadonlyArray<number>;
+    readonly getVelocities: () => ReadonlyArray<number>;
     readonly state: SpringState;
+    readonly getState: () => SpringState;
     readonly states: ReadonlyArray<SpringState>;
+    readonly getStates: () => ReadonlyArray<SpringState>;
     readonly freeze: () => void;
     readonly unfreeze: () => void;
 }
 interface StandaloneSpringChain extends SpringChain {
     readonly simulate: SimulateFn;
 }
-interface SpringSystem {
+type SpringSystemEmitter = Emitter<{
+    'simulate:after': number;
+    '*': number;
+}>;
+interface SpringSystem extends Omit<SpringSystemEmitter, 'emit'> {
     createSpring: (initial: number, config: SpringConfig, options?: SpringOptions) => Spring;
     createSpringChain: (initial: number, links: SpringChainLinkGetter[], config: SpringConfig, options?: SpringOptions) => SpringChain;
     cleanup: (spring: Spring | SpringChain) => void;

package/dist/index.js

@@ -37,26 +37,38 @@ var createSpringImpl = (initial, config, options) => {
     },
     set target(val) {
       target = val;
-      if (Math.abs(value - target) > restingDistance) {
+      if (state !== "moving" && Math.abs(value - target) > restingDistance) {
         state = "moving";
         emit("update:state", state);
       }
     },
+    getTarget: () => target,
     get value() {
       return value;
     },
+    getValue: () => value,
     get velocity() {
       return velocity;
     },
+    getVelocity: () => velocity,
     get state() {
       return state;
     },
+    getState: () => state,
     get config() {
       return config;
     },
     set config(value2) {
       config = value2;
     },
+    getConfig: () => config,
+    jumpTo: (_value, killVelocity = true) => {
+      value = _value;
+      if (killVelocity) {
+        velocity = 0;
+      }
+      state = Math.abs(velocity) > restingVelocity || Math.abs(value - target) > restingDistance ? "moving" : "resting";
+    },
     freeze: () => {
       state = "frozen";
       emit("update:state", state);
@@ -66,13 +78,15 @@ var createSpringImpl = (initial, config, options) => {
       emit("update:state", state);
     }
   };
+  const tension = -config.tension * 1e-6;
+  const friction = -config.friction * 1e-3;
   const simulate = (deltaTime) => {
     if (state === "moving") {
       const iterations = Math.ceil(deltaTime);
       for (let n = 0; n < iterations; n++) {
         const previousDelta = value - target;
-        const springForce = -config.tension * 1e-6 * previousDelta;
-        const dampingForce = -config.friction * 1e-3 * velocity;
+        const springForce = tension * previousDelta;
+        const dampingForce = friction * velocity;
         const acceleration = (springForce + dampingForce) / config.mass;
         velocity = velocity + acceleration;
         value = value + velocity;
@@ -203,9 +217,11 @@ var createSpringChainImpl = (initial, links, config, options) => {
         currentTarget = val;
         updateChainState(currentTarget, currentLinks);
       },
+      getTarget: () => targets[0],
       get targets() {
         return targets;
       },
+      getTargets: () => targets,
       get links() {
         return links;
       },
@@ -216,18 +232,23 @@ var createSpringChainImpl = (initial, links, config, options) => {
       get config() {
         return config;
       },
+      getConfig: () => config,
       get values() {
         return values;
       },
+      getValues: () => values,
       get velocities() {
         return velocities;
       },
+      getVelocities: () => velocities,
       get state() {
         return state;
       },
+      getState: () => state,
       get states() {
         return states;
       },
+      getStates: () => states,
       freeze: () => {
         for (const spring of springs) {
           spring.freeze();
@@ -262,9 +283,12 @@ var createSpringChain = (initial, links, config, options) => {
 };
 
 // src/createSpringSystem.ts
+import mitt3 from "mitt";
 var createSpringSystem = () => {
   const springs = /* @__PURE__ */ new Map();
+  const { emit, ...emitterApi } = mitt3();
   return {
+    ...emitterApi,
     createSpring: (initial, config, options) => {
       const [spring, simulate] = createSpringImpl(initial, config, options);
       springs.set(spring, simulate);
@@ -285,6 +309,7 @@ var createSpringSystem = () => {
       for (const simulate of springs.values()) {
         simulate(delta);
       }
+      emit("simulate:after", delta);
     }
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coily",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Simulate values using spring physics",
   "author": "Tim Morris <timthewebguy@gmail.com>",
   "homepage": "https://github.com/tkofh/coily#readme",
@@ -38,12 +38,12 @@
     "url": "https://github.com/tkofh/coily/issues"
   },
   "devDependencies": {
-    "@vitest/ui": "^0.11.0",
-    "tsup": "^6.1.3",
-    "vitest": "^0.16.0"
+    "@vitest/ui": "^0.29.8",
+    "tsup": "^6.7.0",
+    "vitest": "^0.29.8"
   },
   "dependencies": {
     "mitt": "^3.0.0"
   },
-  "gitHead": "f2a3ee966126e974e2fd3576bc0968c03c0287ca"
+  "gitHead": "143ecefa887bfffe5b5caa29fddcf01b3b3e17c1"
 }