@kaokei/use-vue-service 4.0.1 → 4.0.2

package/README.md

@@ -17,15 +17,11 @@
 
 本库通过类来声明服务，对 typescript 支持非常棒。
 
-- [入门指南](./docs/guide/index.md)
+- [快速开始](./docs/guide/index.md)
 - [API 文档](./docs/api/index.md)
-- [博客文章](./docs/note/01.父组件与子组件的理解.md)
-- [codesandbox example](https://codesandbox.io/s/di-playground-zjnyv)
-- [online demo](https://use-vue-service.vercel.app/)
+- [示例代码（Example）](./docs/examples/index.md)
+- [笔记文章](./docs/note/00.README.md)
 
 ## Todo List
-1. 优化@Computed
-5. 增加@Raw装饰器
-4. 更新hasOwn
-3. 发布@kaokei/di@5.0.3
-2. 评估是否需要@Watch/@Effect
+
+1. 改成tsdown来打包代码

package/dist/constants.d.cts

@@ -4,4 +4,5 @@ import { FindChildService, FindChildrenServices } from './interface.ts';
 export declare const FIND_CHILD_SERVICE: Token<FindChildService>;
 export declare const FIND_CHILDREN_SERVICES: Token<FindChildrenServices>;
 export declare const SCOPE_KEY: unique symbol;
+export declare const RAW_CLASS_KEY = "__raw__";
 export declare const CONTAINER_TOKEN: InjectionKey<Container>;

package/dist/constants.d.ts

@@ -4,4 +4,5 @@ import { FindChildService, FindChildrenServices } from './interface.ts';
 export declare const FIND_CHILD_SERVICE: Token<FindChildService>;
 export declare const FIND_CHILDREN_SERVICES: Token<FindChildrenServices>;
 export declare const SCOPE_KEY: unique symbol;
+export declare const RAW_CLASS_KEY = "__raw__";
 export declare const CONTAINER_TOKEN: InjectionKey<Container>;

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("@kaokei/di"),o=require("vue"),P=new c.Token("FIND_CHILD_SERVICE"),m=new c.Token("FIND_CHILDREN_SERVICES"),C=Symbol("SCOPE_KEY"),s=Symbol("CONTAINER_TOKEN");function _(t){const e=t,n=o.effectScope(!0);return e[C]=n,n}function b(t){return t[C]}function j(t){const e=t;if(e){const n=b(e);n&&(n.stop(),delete e[C])}}function w(t){const e=b(t);return e||_(t)}function h(t,e,n,r){if(t){for(const i of t)if(i.isCurrentBound(e)&&(n.push(i.get(e)),r)||i.children&&h(i.children,e,n,r))return!0}return!1}function A(t,e){const n=[];return h(e.children,t,n,!0),n[0]}function T(t,e){const n=[];return h(e.children,t,n,!1),n}function V(t,e){return c.isObject(e)?o.reactive(e):e}function H(t){return j(t)}function k({container:t}){return e=>A(e,t)}function F({container:t}){return e=>T(e,t)}function g(t){let e;return t?e=t.createChild():e=new c.Container,e.bind(P).toDynamicValue(k),e.bind(m).toDynamicValue(F),e.onActivation(V),e.onDeactivation(H),e}const d=g();function a(t,e){if(typeof e=="function")e(t);else for(let n=0;n<e.length;n++)t.bind(e[n]).toSelf()}function D(){const t=o.getCurrentInstance();if(t){const e=s,n=t.provides,r=t.parent&&t.parent.provides;if(n&&n!==r&&c.hasOwn(n,e))return n[e]}}function v(){if(o.hasInjectionContext())return o.inject(s,d);throw new Error("getProvideContainer 只能在 setup 中使用")}function L(t){return(D()||v()).get(t)}function K(t){const e=D();if(e)a(e,t);else{const n=v();let r=g(n);a(r,t),o.provide(s,r),o.onUnmounted(()=>{r.destroy(),r=null})}}function q(t){return d.get(t)}function U(t){a(d,t)}function W(t,e){return e.runWithContext(()=>v().get(t))}function N(t,e){e.runWithContext(()=>{const n=o.inject(s,null);if(n)a(n,t);else{let r=g(d);a(r,t),e.provide(s,r),e.onUnmount(()=>{r.destroy(),r=null})}})}function Y(t){return e=>N(t,e)}function R(t,e){const n=e.name;return function(){const r=w(this),i=t,E=o.toRaw(this);let p,f=Object.getPrototypeOf(E);for(;f;){const u=Object.getOwnPropertyDescriptor(f,n);if(u&&u.set){p=u.set;break}f=Object.getPrototypeOf(f)}const S=this,I=p?r.run(()=>o.computed({get:()=>i.call(S),set:u=>p.call(S,u)})):r.run(()=>o.computed(()=>i.call(S)));return Object.defineProperty(E,n,{value:I,writable:!0,configurable:!0,enumerable:!0}),I.value}}function z(t,e){return typeof t=="function"&&(e==null?void 0:e.kind)==="getter"?R(t,e):R}function l(t){return c.isObject(t)?o.markRaw(t):t}function O(t,e){if(e.kind==="accessor")return{get(){return t.get.call(o.toRaw(this))},set(r){t.set.call(o.toRaw(this),l(r))},init:l};const n=e.name;return e.addInitializer(function(){let r;Object.defineProperty(this,n,{configurable:!0,enumerable:!0,get(){return r},set(i){r=l(i)}})}),l}function B(t,e){return(e==null?void 0:e.kind)==="field"||(e==null?void 0:e.kind)==="accessor"?O(t,e):O}function y(t,e){return function(...n){const i=w(this).run(()=>o.effectScope());return i.run(()=>t.call(this,...n)),i}}function G(t,e){return typeof t=="function"&&(e==null?void 0:e.kind)==="method"?y(t):y}exports.Computed=z;exports.FIND_CHILDREN_SERVICES=m;exports.FIND_CHILD_SERVICE=P;exports.Raw=B;exports.RunInScope=G;exports.declareAppProviders=N;exports.declareAppProvidersPlugin=Y;exports.declareProviders=K;exports.declareRootProviders=U;exports.useAppService=W;exports.useRootService=q;exports.useService=L;Object.keys(c).forEach(t=>{t!=="default"&&!Object.prototype.hasOwnProperty.call(exports,t)&&Object.defineProperty(exports,t,{enumerable:!0,get:()=>c[t]})});
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("@kaokei/di"),o=require("vue"),y=new c.Token("FIND_CHILD_SERVICE"),P=new c.Token("FIND_CHILDREN_SERVICES"),C=Symbol("SCOPE_KEY"),b="__raw__",a=Symbol("CONTAINER_TOKEN");function T(n){const e=n,t=o.effectScope(!0);return e[C]=t,t}function D(n){return n[C]}function V(n){const e=n;if(e){const t=D(e);t&&(t.stop(),delete e[C])}}function N(n){const e=D(n);return e||T(n)}function S(n,e,t,r){if(n){for(const i of n)if(i.isCurrentBound(e)&&(t.push(i.get(e)),r)||S(i.getChildren(),e,t,r))return!0}return!1}function F(n,e){const t=[];return S(e.getChildren(),n,t,!0),t[0]}function H(n,e){const t=[];return S(e.getChildren(),n,t,!1),t}function L(n,e,t){return c.isObject(e)?c.getOwnMetadata(b,t)?o.markRaw(e):o.reactive(e):e}function K(n){return V(n)}function W({container:n}){return e=>F(e,n)}function Y({container:n}){return e=>H(e,n)}function h(n){let e;return n?e=n.createChild():e=new c.Container,e.bind(y).toDynamicValue(W),e.bind(P).toDynamicValue(Y),e.onActivation(L),e.onDeactivation(K),e}const d=h();function s(n,e){if(typeof e=="function")e(n);else for(let t=0;t<e.length;t++)n.bind(e[t]).toSelf()}function A(){const n=o.getCurrentInstance();if(n){const e=a,t=n.provides,r=n.parent&&n.parent.provides;if(t&&t!==r&&c.hasOwn(t,e))return t[e]}}function j(n){if(!o.hasInjectionContext())throw new Error(`${n} must inside setup.`)}function g(){return o.inject(a,d)}function q(n){return j("useService"),(A()||g()).get(n)}function M(n){j("declareProviders");const e=A();if(e)s(e,n);else{const t=g(),r=h(t);s(r,n),o.provide(a,r),o.onUnmounted(()=>{r.destroy()})}}function U(n){return d.get(n)}function z(n){s(d,n)}function B(n,e){return e.runWithContext(()=>g().get(n))}function k(n,e){e.runWithContext(()=>{const t=o.inject(a,null);if(t)s(t,n);else{const r=h(d);s(r,n),e.provide(a,r),e.onUnmount(()=>{r.destroy()})}})}function G(n){return e=>k(n,e)}function _(n,e){const t=e.name;return function(){const r=this,i=o.toRaw(this),R=N(i),E=n;let l,f=Object.getPrototypeOf(i);for(;f;){const u=Object.getOwnPropertyDescriptor(f,t);if(u&&u.set){l=u.set;break}f=Object.getPrototypeOf(f)}const I=l?R.run(()=>o.computed({get:()=>E.call(r),set:u=>l.call(r,u)})):R.run(()=>o.computed(()=>E.call(r)));return Object.defineProperty(i,t,{value:I,writable:!0,configurable:!0,enumerable:!0}),I}}function $(n,e){return typeof n=="function"&&(e==null?void 0:e.kind)==="getter"?_(n,e):_}function p(n){return c.isObject(n)?o.markRaw(n):n}function m(n,e){const t=e.name;e.addInitializer(function(){let r;Object.defineProperty(this,t,{configurable:!0,enumerable:!0,get(){return r},set(i){r=p(i)}})})}function O(n,e){return{get(){return n.get.call(o.toRaw(this))},set(t){n.set.call(o.toRaw(this),p(t))},init:p}}function v(n,e){e.metadata&&(e.metadata[b]=!0)}function J(n,e){return(e==null?void 0:e.kind)==="field"?m(n,e):(e==null?void 0:e.kind)==="accessor"?O(n):(e==null?void 0:e.kind)==="class"?v(n,e):(t,r)=>(r==null?void 0:r.kind)==="field"?m(t,r):(r==null?void 0:r.kind)==="accessor"?O(t):v(t,r)}function w(n,e){return function(...t){const i=N(this).run(()=>o.effectScope());return i.run(()=>n.call(this,...t)),i}}function Q(n,e){return typeof n=="function"&&(e==null?void 0:e.kind)==="method"?w(n):w}exports.Computed=$;exports.FIND_CHILDREN_SERVICES=P;exports.FIND_CHILD_SERVICE=y;exports.Raw=J;exports.RunInScope=Q;exports.declareAppProviders=k;exports.declareAppProvidersPlugin=G;exports.declareProviders=M;exports.declareRootProviders=z;exports.useAppService=B;exports.useRootService=U;exports.useService=q;Object.keys(c).forEach(n=>{n!=="default"&&!Object.prototype.hasOwnProperty.call(exports,n)&&Object.defineProperty(exports,n,{enumerable:!0,get:()=>c[n]})});

package/dist/index.d.cts

@@ -1,6 +1,7 @@
 export * from '@kaokei/di';
 export { useService, declareProviders, useRootService, declareRootProviders, useAppService, declareAppProviders, declareAppProvidersPlugin, } from './core.ts';
 export { FIND_CHILD_SERVICE, FIND_CHILDREN_SERVICES } from './constants.ts';
+export type { FindChildService, FindChildrenServices } from './interface.ts';
 export { Computed } from './computed.ts';
 export { Raw } from './raw.ts';
 export { RunInScope } from './effect-scope.ts';

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export * from '@kaokei/di';
 export { useService, declareProviders, useRootService, declareRootProviders, useAppService, declareAppProviders, declareAppProvidersPlugin, } from './core.ts';
 export { FIND_CHILD_SERVICE, FIND_CHILDREN_SERVICES } from './constants.ts';
+export type { FindChildService, FindChildrenServices } from './interface.ts';
 export { Computed } from './computed.ts';
 export { Raw } from './raw.ts';
 export { RunInScope } from './effect-scope.ts';

package/dist/index.js

@@ -1,170 +1,162 @@
-import { Token as R, Container as k, isObject as w, hasOwn as A } from "@kaokei/di";
+import { Token as D, Container as H, isObject as v, getOwnMetadata as j, hasOwn as K } from "@kaokei/di";
 export * from "@kaokei/di";
-import { effectScope as N, reactive as T, inject as P, provide as V, onUnmounted as H, getCurrentInstance as j, hasInjectionContext as F, toRaw as p, computed as I, markRaw as K } from "vue";
-const L = new R(
+import { effectScope as N, markRaw as P, reactive as L, inject as b, provide as W, onUnmounted as Y, hasInjectionContext as U, getCurrentInstance as z, toRaw as d, computed as E } from "vue";
+const B = new D(
   "FIND_CHILD_SERVICE"
-), U = new R(
+), G = new D(
   "FIND_CHILDREN_SERVICES"
-), h = Symbol("SCOPE_KEY"), c = Symbol("CONTAINER_TOKEN");
-function W(n) {
+), p = Symbol("SCOPE_KEY"), k = "__raw__", u = Symbol("CONTAINER_TOKEN");
+function M(n) {
   const e = n, t = N(!0);
-  return e[h] = t, t;
+  return e[p] = t, t;
 }
-function b(n) {
-  return n[h];
+function A(n) {
+  return n[p];
 }
-function Y(n) {
+function $(n) {
   const e = n;
   if (e) {
-    const t = b(e);
-    t && (t.stop(), delete e[h]);
+    const t = A(e);
+    t && (t.stop(), delete e[p]);
   }
 }
-function D(n) {
-  const e = b(n);
-  return e || W(n);
+function T(n) {
+  const e = A(n);
+  return e || M(n);
 }
 function C(n, e, t, r) {
   if (n) {
     for (const o of n)
-      if (o.isCurrentBound(e) && (t.push(o.get(e)), r) || o.children && C(o.children, e, t, r))
+      if (o.isCurrentBound(e) && (t.push(o.get(e)), r) || C(o.getChildren(), e, t, r))
         return !0;
   }
   return !1;
 }
-function z(n, e) {
+function q(n, e) {
   const t = [];
-  return C(e.children, n, t, !0), t[0];
+  return C(e.getChildren(), n, t, !0), t[0];
 }
-function B(n, e) {
+function J(n, e) {
   const t = [];
-  return C(e.children, n, t, !1), t;
+  return C(e.getChildren(), n, t, !1), t;
 }
-function G(n, e) {
-  return w(e) ? T(e) : e;
+function Q(n, e, t) {
+  return v(e) ? j(k, t) ? P(e) : L(e) : e;
 }
-function q(n) {
-  return Y(n);
+function X(n) {
+  return $(n);
 }
-function J({ container: n }) {
-  return (e) => z(e, n);
+function Z({ container: n }) {
+  return (e) => q(e, n);
 }
-function M({
+function x({
   container: n
 }) {
-  return (e) => B(e, n);
+  return (e) => J(e, n);
 }
 function S(n) {
   let e;
-  return n ? e = n.createChild() : e = new k(), e.bind(L).toDynamicValue(J), e.bind(U).toDynamicValue(M), e.onActivation(G), e.onDeactivation(q), e;
+  return n ? e = n.createChild() : e = new H(), e.bind(B).toDynamicValue(Z), e.bind(G).toDynamicValue(x), e.onActivation(Q), e.onDeactivation(X), e;
 }
 const a = S();
-function u(n, e) {
+function c(n, e) {
   if (typeof e == "function")
     e(n);
   else
     for (let t = 0; t < e.length; t++)
       n.bind(e[t]).toSelf();
 }
-function _() {
-  const n = j();
+function V() {
+  const n = z();
   if (n) {
-    const e = c, t = n.provides, r = n.parent && n.parent.provides;
-    if (t && t !== r && A(t, e))
+    const e = u, t = n.provides, r = n.parent && n.parent.provides;
+    if (t && t !== r && K(t, e))
       return t[e];
   }
 }
-function g() {
-  if (F())
-    return P(c, a);
-  throw new Error("getProvideContainer 只能在 setup 中使用");
+function F(n) {
+  if (!U())
+    throw new Error(`${n} must inside setup.`);
 }
-function $(n) {
-  return (_() || g()).get(n);
+function h() {
+  return b(u, a);
+}
+function re(n) {
+  return F("useService"), (V() || h()).get(n);
 }
-function x(n) {
-  const e = _();
+function oe(n) {
+  F("declareProviders");
+  const e = V();
   if (e)
-    u(e, n);
+    c(e, n);
   else {
-    const t = g();
-    let r = S(t);
-    u(r, n), V(c, r), H(() => {
-      r.destroy(), r = null;
+    const t = h(), r = S(t);
+    c(r, n), W(u, r), Y(() => {
+      r.destroy();
     });
   }
 }
-function ee(n) {
+function ie(n) {
   return a.get(n);
 }
-function ne(n) {
-  u(a, n);
+function ue(n) {
+  c(a, n);
 }
-function te(n, e) {
-  return e.runWithContext(() => g().get(n));
+function ce(n, e) {
+  return e.runWithContext(() => h().get(n));
 }
-function Q(n, e) {
+function ee(n, e) {
   e.runWithContext(() => {
-    const t = P(c, null);
+    const t = b(u, null);
     if (t)
-      u(t, n);
+      c(t, n);
     else {
-      let r = S(a);
-      u(r, n), e.provide(c, r), e.onUnmount(() => {
-        r.destroy(), r = null;
+      const r = S(a);
+      c(r, n), e.provide(u, r), e.onUnmount(() => {
+        r.destroy();
       });
     }
   });
 }
-function re(n) {
-  return (e) => Q(n, e);
+function se(n) {
+  return (e) => ee(n, e);
 }
-function O(n, e) {
+function I(n, e) {
   const t = e.name;
   return function() {
-    const r = D(this), o = n, m = p(this);
-    let l, s = Object.getPrototypeOf(m);
+    const r = this, o = d(this), g = T(o), m = n;
+    let f, s = Object.getPrototypeOf(o);
     for (; s; ) {
       const i = Object.getOwnPropertyDescriptor(s, t);
       if (i && i.set) {
-        l = i.set;
+        f = i.set;
         break;
       }
       s = Object.getPrototypeOf(s);
     }
-    const d = this, E = l ? r.run(
-      () => I({
-        get: () => o.call(d),
-        set: (i) => l.call(d, i)
+    const _ = f ? g.run(
+      () => E({
+        get: () => m.call(r),
+        set: (i) => f.call(r, i)
       })
-    ) : r.run(() => I(() => o.call(d)));
-    return Object.defineProperty(m, t, {
-      value: E,
+    ) : g.run(() => E(() => m.call(r)));
+    return Object.defineProperty(o, t, {
+      value: _,
       writable: !0,
       configurable: !0,
       enumerable: !0
-    }), E.value;
+    }), _;
   };
 }
-function oe(n, e) {
-  return typeof n == "function" && (e == null ? void 0 : e.kind) === "getter" ? O(n, e) : O;
+function ae(n, e) {
+  return typeof n == "function" && (e == null ? void 0 : e.kind) === "getter" ? I(n, e) : I;
 }
-function f(n) {
-  return w(n) ? K(n) : n;
+function l(n) {
+  return v(n) ? P(n) : n;
 }
-function v(n, e) {
-  if (e.kind === "accessor")
-    return {
-      get() {
-        return n.get.call(p(this));
-      },
-      set(r) {
-        n.set.call(p(this), f(r));
-      },
-      init: f
-    };
+function w(n, e) {
   const t = e.name;
-  return e.addInitializer(function() {
+  e.addInitializer(function() {
     let r;
     Object.defineProperty(this, t, {
       configurable: !0,
@@ -173,34 +165,48 @@ function v(n, e) {
         return r;
       },
       set(o) {
-        r = f(o);
+        r = l(o);
       }
     });
-  }), f;
+  });
+}
+function O(n, e) {
+  return {
+    get() {
+      return n.get.call(d(this));
+    },
+    set(t) {
+      n.set.call(d(this), l(t));
+    },
+    init: l
+  };
 }
-function ie(n, e) {
-  return (e == null ? void 0 : e.kind) === "field" || (e == null ? void 0 : e.kind) === "accessor" ? v(n, e) : v;
+function R(n, e) {
+  e.metadata && (e.metadata[k] = !0);
+}
+function fe(n, e) {
+  return (e == null ? void 0 : e.kind) === "field" ? w(n, e) : (e == null ? void 0 : e.kind) === "accessor" ? O(n) : (e == null ? void 0 : e.kind) === "class" ? R(n, e) : (t, r) => (r == null ? void 0 : r.kind) === "field" ? w(t, r) : (r == null ? void 0 : r.kind) === "accessor" ? O(t) : R(t, r);
 }
 function y(n, e) {
   return function(...t) {
-    const o = D(this).run(() => N());
+    const o = T(this).run(() => N());
     return o.run(() => n.call(this, ...t)), o;
   };
 }
-function ce(n, e) {
+function de(n, e) {
   return typeof n == "function" && (e == null ? void 0 : e.kind) === "method" ? y(n) : y;
 }
 export {
-  oe as Computed,
-  U as FIND_CHILDREN_SERVICES,
-  L as FIND_CHILD_SERVICE,
-  ie as Raw,
-  ce as RunInScope,
-  Q as declareAppProviders,
-  re as declareAppProvidersPlugin,
-  x as declareProviders,
-  ne as declareRootProviders,
-  te as useAppService,
-  ee as useRootService,
-  $ as useService
+  ae as Computed,
+  G as FIND_CHILDREN_SERVICES,
+  B as FIND_CHILD_SERVICE,
+  fe as Raw,
+  de as RunInScope,
+  ee as declareAppProviders,
+  se as declareAppProvidersPlugin,
+  oe as declareProviders,
+  ue as declareRootProviders,
+  ce as useAppService,
+  ie as useRootService,
+  re as useService
 };

package/dist/raw.d.cts

@@ -2,5 +2,7 @@
  * 将值标记为 raw（如果是对象则调用 markRaw，否则原样返回）
  */
 export declare function ensureRaw(val: unknown): unknown;
-export declare function Raw(): (value: any, context: ClassFieldDecoratorContext | ClassAccessorDecoratorContext) => any;
-export declare function Raw(value: any, context: ClassFieldDecoratorContext | ClassAccessorDecoratorContext): any;
+export declare function Raw(): (value: any, context: ClassFieldDecoratorContext | ClassAccessorDecoratorContext | ClassDecoratorContext) => any;
+export declare function Raw(value: any, context: ClassFieldDecoratorContext): void;
+export declare function Raw(value: any, context: ClassAccessorDecoratorContext): ClassAccessorDecoratorResult<any, any>;
+export declare function Raw(value: any, context: ClassDecoratorContext): void;

package/dist/raw.d.ts

@@ -2,5 +2,7 @@
  * 将值标记为 raw（如果是对象则调用 markRaw，否则原样返回）
  */
 export declare function ensureRaw(val: unknown): unknown;
-export declare function Raw(): (value: any, context: ClassFieldDecoratorContext | ClassAccessorDecoratorContext) => any;
-export declare function Raw(value: any, context: ClassFieldDecoratorContext | ClassAccessorDecoratorContext): any;
+export declare function Raw(): (value: any, context: ClassFieldDecoratorContext | ClassAccessorDecoratorContext | ClassDecoratorContext) => any;
+export declare function Raw(value: any, context: ClassFieldDecoratorContext): void;
+export declare function Raw(value: any, context: ClassAccessorDecoratorContext): ClassAccessorDecoratorResult<any, any>;
+export declare function Raw(value: any, context: ClassDecoratorContext): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaokei/use-vue-service",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "type": "module",
   "description": "Lightweight Vue 3 state management with dependency injection, inspired by Angular services.",
   "main": "./dist/index.cjs",
@@ -53,10 +53,10 @@
     "docs:preview": "vitepress preview docs"
   },
   "peerDependencies": {
-    "@kaokei/di": "^5.0.4"
+    "@kaokei/di": "^5.0.8"
   },
   "devDependencies": {
-    "@kaokei/di": "^5.0.4",
+    "@kaokei/di": "^5.0.8",
     "@types/node": "^22.15.17",
     "@vitejs/plugin-vue": "^6.0.0",
     "@vitest/coverage-v8": "^3.1.1",