@vnejs/plugins.canvas.sprite 0.1.3 → 0.1.5

package/const/const.js

@@ -1,9 +1,3 @@
 export const ACTIONS = { SHOW: "show", HIDE: "hide", CHANGE: "change", MOVE: "move" };
 
-export const LINE_MOVE_REG = /^(?<id>[a-zA-Z_0-9-]+) move (?<position>[a-zA-Z_0-9-]+)( (?<duration>\d+))?( async)?$/;
-export const LINE_SHOW_REG =
-  /^(?<id>[a-zA-Z_0-9-]+) show (?<position>[a-zA-Z_0-9-]+) {(?<variation>[a-zA-Z_0-9-/]+)}( (?<transition>[a-zA-Z_0-9-]+)[:](?<duration>\d+))?( async)?$/;
-export const LINE_HIDE_REG = /^(?<id>[a-zA-Z_0-9-]+) hide( (?<transition>[a-zA-Z_0-9-]+)[:](?<duration>\d+))?( async)?$/;
-export const LINE_CHANGE_REG = /^(?<id>[a-zA-Z_0-9-]+) change {(?<variation>[a-zA-Z_0-9-/]+)}( (?<duration>\d+))?( async)?$/;
-
 export const LAYER_CHILD_TYPE = "sprite";

package/const/params.js

@@ -37,10 +37,10 @@ const mapEyes = (variation, parts, options) => {
 
   return {
     src: [
-      { url: `${variation}/eyes/${parts.eyes}/opened`, duration: 3000, randomDuration: 1000, transition: 600 },
-      { url: `${variation}/eyes/${parts.eyes}/closed`, duration: 100, randomDuration: 0, transition: 400 },
-      { url: `${variation}/eyes/${parts.eyes}/opened`, duration: 200, randomDuration: 300, transition: 600 },
-      { url: `${variation}/eyes/${parts.eyes}/closed`, duration: 100, randomDuration: 0, transition: 400 },
+      { url: `${variation}/eyes/${parts.eyes}/opened`, duration: 3000, randomDuration: 1000, transition: 360 },
+      { url: `${variation}/eyes/${parts.eyes}/closed`, duration: 100, randomDuration: 0, transition: 240 },
+      { url: `${variation}/eyes/${parts.eyes}/opened`, duration: 200, randomDuration: 300, transition: 360 },
+      { url: `${variation}/eyes/${parts.eyes}/closed`, duration: 100, randomDuration: 0, transition: 240 },
     ],
   };
 };

package/modules/change.js

@@ -1,6 +1,8 @@
 import { Module } from "@vnejs/module";
 
-import { getPromiseAndResolve } from "./utils";
+import { createPromiseResolve } from "@vnejs/helpers.create-promise-resolve";
+
+import { getScale } from "./utils";
 
 const EMPTY_IMG = { src: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxIDEiLz4=" };
 
@@ -22,7 +24,7 @@ export class LayerSpriteChange extends Module {
 
     const parts = await this.getTransitionParts(layer, id, partsReal);
 
-    const { resolve: skipResolve, promise: skipPromise } = getPromiseAndResolve();
+    const { resolve: skipResolve, promise: skipPromise } = createPromiseResolve();
     const propsChange = { parts, indexSrc: partsReal[0].src, transition: Number(duration) };
 
     await this.emit(this.EVENTS.INTERACT.PUSH_POP, {
@@ -49,7 +51,7 @@ export class LayerSpriteChange extends Module {
     const props = positions[position] || positions.left;
     const scale = props.scale ?? 1;
 
-    return { ...props, scale: `calc(${100 * scale} * min(calc(1vw / var(--vne-canvas-width, 3840px)), calc(1vh / var(--vne-canvas-height, 2160px))))` };
+    return { ...props, scale: getScale(scale) };
   };
 
   emitChildChange = (layer, childId, duration, props) => this.emit(this.EVENTS.LAYER.CHILD_CHANGE, { layer, childId, duration, props });

package/modules/hide.js

@@ -1,6 +1,6 @@
 import { Module } from "@vnejs/module";
 
-import { getPromiseAndResolve } from "./utils";
+import { createPromiseResolve } from "@vnejs/helpers.create-promise-resolve";
 
 export class LayerSpriteHide extends Module {
   name = "layer.sprite.hide";
@@ -19,7 +19,7 @@ export class LayerSpriteHide extends Module {
     const childOld = await this.emitReal(this.EVENTS.LAYER.CHILD_GET, { layer, childId: id });
 
     const { initialProps = {}, finishProps = {} } = this.getTransitionProps(transition, childOld.boxProps);
-    const { resolve: skipResolve, promise: skipPromise } = getPromiseAndResolve();
+    const { resolve: skipResolve, promise: skipPromise } = createPromiseResolve();
 
     const newBoxProps = { ...childOld.boxProps, transition: duration, ...initialProps };
 

package/modules/move.js

@@ -1,6 +1,8 @@
 import { Module } from "@vnejs/module";
 
-import { getPromiseAndResolve, getScale } from "./utils";
+import { createPromiseResolve } from "@vnejs/helpers.create-promise-resolve";
+
+import { getScale } from "./utils";
 
 export class LayerSpriteMove extends Module {
   name = "layer.sprite.move";
@@ -19,7 +21,7 @@ export class LayerSpriteMove extends Module {
     const childOld = await this.emitReal(this.EVENTS.LAYER.CHILD_GET, { layer, childId: id });
 
     const newProps = { boxProps: { transition: duration, ...this.getBoxProps(position) } };
-    const { resolve: skipResolve, promise: skipPromise } = getPromiseAndResolve();
+    const { resolve: skipResolve, promise: skipPromise } = createPromiseResolve();
 
     await this.emit(this.EVENTS.LAYER.CHILD_CHANGE, { layer, childId: id, duration: 0, props: { boxProps: { ...childOld.boxProps, transition: duration } } });
 

package/modules/show.js

@@ -1,6 +1,8 @@
 import { Module } from "@vnejs/module";
 
-import { getPromiseAndResolve, getScale } from "./utils";
+import { createPromiseResolve } from "@vnejs/helpers.create-promise-resolve";
+
+import { getScale } from "./utils";
 
 export class LayerSpriteShow extends Module {
   name = "layer.sprite.show";
@@ -20,7 +22,7 @@ export class LayerSpriteShow extends Module {
     if (!duration || !transition || this.shared.viewForceAnimationSources.length) return this.emit(this.EVENTS.LAYER.CHILD_ADD, { layer, child: childCommon });
 
     const { initialProps = {}, finishProps = {} } = this.getTransitionProps(transition, boxProps);
-    const { resolve: skipResolve, promise: skipPromise } = getPromiseAndResolve();
+    const { resolve: skipResolve, promise: skipPromise } = createPromiseResolve();
     const newBoxProps = { ...boxProps, transition: duration, ...initialProps };
 
     await this.emit(this.EVENTS.LAYER.CHILD_ADD, { layer, child: { ...childCommon, boxProps: newBoxProps } });

package/modules/utils.js

@@ -1,10 +1 @@
-export const getPromiseAndResolve = () => {
-  const obj = {};
-  obj.promise = new Promise((resolve) => {
-    obj.resolve = resolve;
-  });
-
-  return obj;
-};
-
 export const getScale = (scale) => `calc(${100 * scale} * min(calc(1vw / var(--vne-canvas-width, 3840px)), calc(1vh / var(--vne-canvas-height, 2160px))))`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.canvas.sprite",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",