zova-module-a-style 5.0.13 → 5.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-style",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "title": "a-style",
   "zovaModule": {
     "capabilities": {
@@ -34,5 +34,5 @@
     "tsc:publish": "npm run clean && tsc -b",
     "prepublishOnly": "npm run tsc:publish"
   },
-  "gitHead": "7ed3f754f876b8469790f652698b6c116ab377e8"
+  "gitHead": "4694913185e21d7ff9f241cb7fc949dde41cf6fd"
 }

package/src/bean/{store.theme.ts → bean.theme.ts}

@@ -1,11 +1,11 @@
-import { BeanBase, Cast, IBeanRecord, Store } from 'zova';
+import { Bean, BeanBase, Cast, IBeanRecord } from 'zova';
 import { ScopeModule } from '../resource/this.js';
 import { ThemeBase, ThemeHandler } from '../types.js';
 
 export type ThemeDarkMode = 'auto' | boolean;
 
-@Store()
-export class StoreTheme extends BeanBase<ScopeModule> {
+@Bean({ containerScope: 'app' })
+export class BeanTheme extends BeanBase<ScopeModule> {
   private _name: string;
   public get name(): string {
     return this._name;

package/src/monkey.ts

@@ -1,21 +1,21 @@
 import { style } from 'typestyle';
-import { BeanBase, BeanContainerLike, BeanSimple, IMonkeySystem, SymbolModuleName, useComputed } from 'zova';
+import { BeanBase, BeanContainer, BeanSimple, IMonkeySystem, SymbolModuleName, useComputed } from 'zova';
 import { ScopeModule, __ThisModule__ } from './resource/this.js';
-import { StoreTheme } from './bean/store.theme.js';
+import { BeanTheme } from './bean/bean.theme.js';
 
 export class Monkey extends BeanSimple implements IMonkeySystem {
-  private _storeTheme: StoreTheme;
-  private _storeStyleDefault: any;
+  private _beanTheme: BeanTheme;
+  private _beanStyleDefault: any;
 
-  async appInitialize(bean: BeanContainerLike) {
+  async appInitialize(bean: BeanContainer) {
     // theme
-    this._storeTheme = await bean._getBean(StoreTheme, true);
+    this._beanTheme = await bean._getBean(BeanTheme, true);
     // style default
     const scope: ScopeModule = await bean.getScope(__ThisModule__);
-    this._storeStyleDefault = await bean._getBean(scope.config.defaultStyle, true);
+    this._beanStyleDefault = await bean._getBean(scope.config.defaultStyle, true);
   }
-  async appInitialized(_bean: BeanContainerLike) {}
-  async beanInit(bean: BeanContainerLike, beanInstance: BeanBase) {
+  async appInitialized(_bean: BeanContainer) {}
+  async beanInit(bean: BeanContainer, beanInstance: BeanBase) {
     const self = this;
     bean.defineProperty(beanInstance, '$style', {
       enumerable: false,
@@ -30,27 +30,27 @@ export class Monkey extends BeanSimple implements IMonkeySystem {
       enumerable: false,
       configurable: true,
       get() {
-        return self._storeStyleDefault;
+        return self._beanStyleDefault;
       },
     });
     bean.defineProperty(beanInstance, '$theme', {
       enumerable: false,
       configurable: true,
       get() {
-        return self._storeTheme;
+        return self._beanTheme;
       },
     });
     bean.defineProperty(beanInstance, '$token', {
       enumerable: false,
       configurable: true,
       get() {
-        return useComputed(() => self._storeTheme.token);
+        return useComputed(() => self._beanTheme.token);
       },
     });
   }
-  async beanInited(_bean: BeanContainerLike, _beanInstance: BeanBase) {}
-  beanDispose(_bean: BeanContainerLike, _beanInstance: BeanBase) {}
-  beanDisposed(_bean: BeanContainerLike, _beanInstance: BeanBase) {}
+  async beanInited(_bean: BeanContainer, _beanInstance: BeanBase) {}
+  beanDispose(_bean: BeanContainer, _beanInstance: BeanBase) {}
+  beanDisposed(_bean: BeanContainer, _beanInstance: BeanBase) {}
 
   _patchStyle(beanInstance: BeanBase, props, ...args) {
     if (props && typeof props === 'object') {

package/src/resource/beans.ts

@@ -1,8 +1,8 @@
-export * from '../bean/store.theme.js';
-import { StoreTheme } from '../bean/store.theme.js';
+export * from '../bean/bean.theme.js';
+import { BeanTheme } from '../bean/bean.theme.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecord {
-    'a-style.store.theme': StoreTheme;
+    'a-style.bean.theme': BeanTheme;
   }
 }

package/src/types.ts

@@ -1,11 +1,11 @@
 import { style } from 'typestyle';
 import 'zova';
-import { StoreTheme } from './bean/store.theme.js';
+import { BeanTheme } from './bean/bean.theme.js';
 import { IBeanRecord } from 'zova';
 declare module 'zova' {
   export interface BeanBase {
     $style: typeof style;
-    $theme: StoreTheme;
+    $theme: BeanTheme;
   }
 }