From 9ea752e858e4d35b7b9b824b2f398dad5aa25db7 Mon Sep 17 00:00:00 2001 From: cha0s Date: Tue, 15 Mar 2022 10:20:39 -0500 Subject: [PATCH] refactor: ded --- packages/timing/src/base-animation.js | 13 -------- packages/timing/src/index.js | 5 --- packages/timing/src/resources/animation.js | 4 +-- packages/timing/src/types-decorator.js | 37 ---------------------- packages/timing/src/types.js | 8 ----- 5 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 packages/timing/src/base-animation.js delete mode 100644 packages/timing/src/types-decorator.js delete mode 100644 packages/timing/src/types.js diff --git a/packages/timing/src/base-animation.js b/packages/timing/src/base-animation.js deleted file mode 100644 index 330bc29..0000000 --- a/packages/timing/src/base-animation.js +++ /dev/null @@ -1,13 +0,0 @@ -import {JsonResource} from '@avocado/resource'; - -export default class BaseAnimation extends JsonResource { - - static children() { - return { - frameRate: { - type: 'number', - }, - }; - } - -} diff --git a/packages/timing/src/index.js b/packages/timing/src/index.js index b7ee564..5e30a42 100644 --- a/packages/timing/src/index.js +++ b/packages/timing/src/index.js @@ -1,8 +1,5 @@ import {Flecks, Hooks} from '@flecks/core'; -import types from './types'; -import typesDecorator from './types-decorator'; - export { cancelAnimationFrame, clearAnimation, @@ -18,8 +15,6 @@ export {default as Transition, TransitionResult} from './transition'; export default { [Hooks]: { - '@avocado/behavior.types': types, - '@avocado/behavior.types.decorate': typesDecorator, '@avocado/resource.resources': Flecks.provide(require.context('./resources', false, /\.js$/)), '@avocado/resource.resources.decorate': ( Flecks.decorate(require.context('./resources/decorators', false, /\.js$/)) diff --git a/packages/timing/src/resources/animation.js b/packages/timing/src/resources/animation.js index 5891b9d..847afc9 100644 --- a/packages/timing/src/resources/animation.js +++ b/packages/timing/src/resources/animation.js @@ -1,8 +1,8 @@ import {Property} from '@avocado/core'; import {Rectangle, Vector} from '@avocado/math'; +import {JsonResource} from '@avocado/resource'; import {compose, EventEmitter} from '@flecks/core'; -import BaseAnimation from '../base-animation'; import TimedIndex from '../timed-index'; const decorate = compose( @@ -20,7 +20,7 @@ const decorate = compose( }), ); -export default () => class Animation extends decorate(BaseAnimation) { +export default () => class Animation extends decorate(JsonResource) { constructor() { super(); diff --git a/packages/timing/src/types-decorator.js b/packages/timing/src/types-decorator.js deleted file mode 100644 index 33a237e..0000000 --- a/packages/timing/src/types-decorator.js +++ /dev/null @@ -1,37 +0,0 @@ -export default (types) => ({ - ...types, - entity: { - ...types.entity, - children: (entity) => ({ - ...types.entity.children(entity), - lfo: { - args: [ - { - label: 'Properties', - type: 'object', - }, - { - label: 'Duration', - type: 'number', - }, - ], - label: 'Oscillates properties.', - type: 'void', - }, - transition: { - args: [ - { - label: 'Properties', - type: 'object', - }, - { - label: 'Duration', - type: 'number', - }, - ], - label: 'Transitions properties for $2 seconds.', - type: 'void', - }, - }), - }, -}); diff --git a/packages/timing/src/types.js b/packages/timing/src/types.js deleted file mode 100644 index 67ac942..0000000 --- a/packages/timing/src/types.js +++ /dev/null @@ -1,8 +0,0 @@ -import BaseAnimation from './base-animation'; - -export default () => ({ - animation: { - children: BaseAnimation.children, - infer: (v) => v?.constructor?.children === BaseAnimation.children, - }, -});