Merge branch 'refactor/build'

Author: any86

jest.config.js

@@ -11,8 +11,8 @@ module.exports = {
     collectCoverageFrom: [
         'packages/*/src/**/*.ts'],
     verbose: false,
-    testPathIgnorePatterns: ["<rootDir>/node_modules/","<rootDir>/packages/simulator/"],
-    coveragePathIgnorePatterns: ["<rootDir>/node_modules/","<rootDir>/packages/simulator/"],
+    testPathIgnorePatterns: ["<rootDir>/node_modules/","<rootDir>/packages/simulator/","<rootDir>/packages/vue3/"],
+    coveragePathIgnorePatterns: ["<rootDir>/node_modules/","<rootDir>/packages/simulator/","<rootDir>/packages/vue3/"],
     globals: {
         __TEST__: true,
         __VERSION__: require('./package.json').version,

package.json

@@ -47,26 +47,25 @@
     "@rollup/plugin-alias": "^2.2.0",
     "@rollup/plugin-json": "^4.0.0",
     "@rollup/plugin-replace": "^3.0.0",
-    "@rollup/plugin-typescript": "^8.3.00",
-    "@types/jest": "^24.0.11",
+    "@rollup/plugin-typescript": "^8.3.1",
+    "@types/jest": "^26.0.0",
+    "jest": "^26.0.0",
+    "ts-jest": "^26.0.0",
     "@types/lodash": "^4.14.149",
     "brotli": "^1.3.2",
     "chalk": "^2.4.2",
     "gh-pages": "^2.0.1",
-    "jest": "^24.7.1",
-    "lerna": "^3.19.0",
+    "lerna": "^4.0.0",
     "lodash": "^4.17.15",
     "minimist": "^1.2.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^2.6.2",
     "rollup": "^2.60.2",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.31.1",
     "shelljs": "^0.8.3",
     "standard-version": "^4.4.0",
-    "terser": "^4.6.3",
-    "ts-jest": "^24.0.2",
-    "typescript": "^3.8.3",
+    "terser": "^5.0.0",
+    "typescript": "^4.6.0",
     "zlib": "^1.0.5"
   },
   "sideEffects": false,

packages/any-touch/src/index.ts

@@ -16,16 +16,17 @@ import press from '@any-touch/press';
 import pinch from '@any-touch/pinch';
 import rotate from '@any-touch/rotate';
 import doubletap from '@any-touch/doubletap';
-
-
 import {
     STATE
 } from '@any-touch/shared';
-
 // 类型, 为了兼容
-import { Options } from '@any-touch/core';
+import { Options as O } from '@any-touch/core';
+
+export type Options = O;
+export { AnyTouchEvent } from '@any-touch/shared';
+export type SupportElement = HTMLElement | SVGElement;
 
-export default class extends Core {
+export default class  extends Core {
     // 状态码
     static STATE_POSSIBLE = STATE.POSSIBLE;
     static STATE_START = STATE.START;
@@ -42,7 +43,7 @@ export default class extends Core {
     static pinch = pinch;
     static doubletap = doubletap;
 
-    constructor(el?: HTMLElement, options?: Options) {
+    constructor(el?: SupportElement, options?: O) {
         super(el, options);
         this.use(tap);
         this.use(pan);

packages/core/src/bindElement.ts

@@ -11,41 +11,33 @@
 //     target.addEventListener(type,listener,options);
 // }
 
+import type { SupportElement } from 'any-touch';
 import type { NativeEvent } from '@any-touch/shared';
-
 import { TOUCH_START, TOUCH_MOVE, TOUCH_END, TOUCH_CANCEL, MOUSE_DOWN, MOUSE_MOVE, MOUSE_UP } from '@any-touch/shared';
-
-type WType = typeof MOUSE_MOVE | typeof MOUSE_UP;
-type EType = typeof TOUCH_START | typeof TOUCH_MOVE | typeof TOUCH_END | typeof TOUCH_CANCEL;
-
-
-
-
-
-const eTypes = [TOUCH_START, TOUCH_MOVE, TOUCH_END, TOUCH_CANCEL, MOUSE_DOWN];
-const wTypes = [MOUSE_MOVE, MOUSE_UP];
+const ELEMENT_TYPES = [TOUCH_START, TOUCH_MOVE, TOUCH_END, TOUCH_CANCEL, MOUSE_DOWN];
+const WINDOW_TYPES = [MOUSE_MOVE, MOUSE_UP];
 /*
  * 根据输入设备绑定事件
  */
 export default function (
-    el: HTMLElement,
+    el: SupportElement,
     catchEvent: (e: NativeEvent) => void,
     options?: boolean | AddEventListenerOptions
 ): () => void {
-    eTypes.forEach((type) => {
-        el.addEventListener(type, catchEvent, options);
+    ELEMENT_TYPES.forEach((type) => {
+        el.addEventListener(type, catchEvent as any, options);
     });
 
-    wTypes.forEach((type) => {
+    WINDOW_TYPES.forEach((type) => {
         window.addEventListener(type, catchEvent, options);
     });
 
     return () => {
-        eTypes.forEach((types) => {
-            el.removeEventListener(types, catchEvent);
+        ELEMENT_TYPES.forEach((types) => {
+            el.removeEventListener(types, catchEvent as any);
         });
 
-        wTypes.forEach((type) => {
+        WINDOW_TYPES.forEach((type) => {
             window.removeEventListener(type, catchEvent);
         });
     };

packages/core/src/createInput/inputCreator.ts

@@ -4,6 +4,8 @@
  */
 import type { PubicEvent, InputOnlyHasCurrent, Input, Point } from '@any-touch/shared';
 import { CLIENT_X, CLIENT_Y, TYPE_START, TYPE_CANCEL, TYPE_END } from '@any-touch/shared';
+import type { SupportElement } from 'any-touch';
+
 export default function () {
     let id = 0;
     let prevInput: InputOnlyHasCurrent | undefined;
@@ -90,7 +92,7 @@ function extendInput(basicsInput: PubicEvent, id: number): Omit<Input, 'prevInpu
         pointLength,
         currentTarget,
         // 触点距离指定元素左上角的偏移
-        getOffset(el: HTMLElement = currentTarget as HTMLElement): { x: number, y: number } {
+        getOffset(el: SupportElement = currentTarget as SupportElement): { x: number, y: number } {
             const rect = el.getBoundingClientRect();
             return { x: x - Math.round(rect.left), y: y - Math.round(rect.top) };
         }

packages/core/src/createInput/touch.ts

@@ -3,7 +3,7 @@ import inputCreator from './inputCreator';
 /**
  * 格式化Touch事件对象
  */
-export default function (el?: HTMLElement) {
+export default function (el?: Element) {
     const createInput = inputCreator();
 
     return function (event: TouchEvent) {
@@ -12,7 +12,7 @@ export default function (el?: HTMLElement) {
         const points: { clientX: number, clientY: number, target: EventTarget }[] = [];
         Array.from(event.touches).forEach(({ clientX, clientY, target }) => {
             // 过滤不在根元素上的触点
-            if (el?.contains(target as HTMLElement)) {
+            if (el?.contains(target as Element)) {
                 targets.push(target);
                 points.push({ clientX, clientY, target });
             }

packages/core/src/dispatchDomEvent.ts

@@ -1,4 +1,5 @@
 import { AnyTouchEvent } from '@any-touch/shared';
+import type { SupportElement } from 'any-touch';
 
 /**
  * 触发dom事件
@@ -16,7 +17,7 @@ export default function (typeName: string, el: EventTarget, payload: Partial<Any
 
     Object.assign(event, data, {
         match: () =>
-            payload.targets && 0 < payload.targets.length && payload.targets.every((target) => (event.currentTarget as HTMLElement).contains(target as HTMLElement)),
+            payload.targets && 0 < payload.targets.length && payload.targets.every((target) => (event.currentTarget as SupportElement).contains(target as SupportElement)),
     });
     return el.dispatchEvent(event);
 }

packages/core/src/index.ts

@@ -9,6 +9,8 @@
  * Event(Mouse|Touch) => BaseInput => Input => Computed => AnyTouchEvent
  */
 import AnyEvent from 'any-event';
+import type { SupportElement } from 'any-touch';
+
 import type {
     UnionToIntersection,
     Computed,
@@ -39,22 +41,21 @@ import dispatchDomEvent from './dispatchDomEvent';
 import canPreventDefault from './canPreventDefault';
 import bindElement from './bindElement';
 // type TouchAction = 'auto' | 'none' | 'pan-x' | 'pan-left' | 'pan-right' | 'pan-y' | 'pan-up' | 'pan-down' | 'pinch-zoom' | 'manipulation';
-
-/**
- * 默认设置
- */
+export { AnyTouchEvent } from '@any-touch/shared';
 export interface Options {
     // 是否触发DOM事件
     domEvents?: false | EventInit;
     preventDefault?: boolean | ((e: NativeEvent) => boolean);
 }
 
+
 /**
  * 默认设置
  */
 const DEFAULT_OPTIONS: Options = {
     domEvents: { bubbles: true, cancelable: true },
     preventDefault: (event) => {
+        // console.log((event.target as any).tagName);
         if (event.target && 'tagName' in event.target) {
             const { tagName } = event.target;
             return !/^(?:INPUT|TEXTAREA|BUTTON|SELECT)$/.test(tagName);
@@ -109,7 +110,7 @@ export default class extends AnyEvent<EventMap> {
     /**
      * 当前绑定元素
      */
-    el?: HTMLElement;
+    el?: SupportElement;
     /**
      * 当前插件(仅供插件开发者使用)
      */
@@ -129,7 +130,7 @@ export default class extends AnyEvent<EventMap> {
      * @param el 目标元素, 微信下没有el
      * @param options 选项
      */
-    constructor(el?: HTMLElement, options?: Options) {
+    constructor(el?: SupportElement, options?: Options) {
         super();
         this.el = el;
         this.c = {} as PluginContext;

packages/shared/src/index.ts

@@ -3,10 +3,6 @@ export * from './const';
 export * from './types'
 export * from './pressMoveFlow'
 export * from './createPluginContext'
-export function addEventListener(target:HTMLElement|Window,){
-
-}
-
 export function round2(n: number): number {
     return Math.round(n * 100) / 100;
 }

packages/simulator/src/sleep.ts

@@ -1,4 +1,4 @@
-export default (time=100) => new Promise((resolve, reject) => {
+export default (time=100) => new Promise<void>((resolve, reject) => {
     try {
         setTimeout(() => {
             resolve();