1
0
mirror of https://github.com/robonen/tools.git synced 2026-03-20 10:54:44 +00:00

Merge pull request #91 from robonen/refactor/web/vue

refactor(web/vue): reuse injection context composable in injection store
This commit is contained in:
2025-08-07 05:28:14 +07:00
committed by GitHub
3 changed files with 24 additions and 23 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "@robonen/vue", "name": "@robonen/vue",
"version": "0.0.9", "version": "0.0.10",
"license": "Apache-2.0", "license": "Apache-2.0",
"description": "Collection of powerful tools for Vue", "description": "Collection of powerful tools for Vue",
"keywords": [ "keywords": [

View File

@@ -1,4 +1,4 @@
import { inject, provide, type InjectionKey, type App } from 'vue'; import { inject as vueInject, provide as vueProvide, type InjectionKey, type App } from 'vue';
import { VueToolsError } from '../..'; import { VueToolsError } from '../..';
/** /**
@@ -34,8 +34,8 @@ import { VueToolsError } from '../..';
export function useContextFactory<ContextValue>(name: string) { export function useContextFactory<ContextValue>(name: string) {
const injectionKey: InjectionKey<ContextValue> = Symbol(name); const injectionKey: InjectionKey<ContextValue> = Symbol(name);
const injectContext = <Fallback extends ContextValue = ContextValue>(fallback?: Fallback) => { const inject = <Fallback extends ContextValue = ContextValue>(fallback?: Fallback) => {
const context = inject(injectionKey, fallback); const context = vueInject(injectionKey, fallback);
if (context !== undefined) if (context !== undefined)
return context; return context;
@@ -43,8 +43,8 @@ export function useContextFactory<ContextValue>(name: string) {
throw new VueToolsError(`useContextFactory: '${name}' context is not provided`); throw new VueToolsError(`useContextFactory: '${name}' context is not provided`);
}; };
const provideContext = (context: ContextValue) => { const provide = (context: ContextValue) => {
provide(injectionKey, context); vueProvide(injectionKey, context);
return context; return context;
}; };
@@ -54,8 +54,8 @@ export function useContextFactory<ContextValue>(name: string) {
}; };
return { return {
inject: injectContext, inject,
provide: provideContext, provide,
appProvide, appProvide,
key: injectionKey, key: injectionKey,
} }

View File

@@ -1,7 +1,8 @@
import { inject, provide, type App, type InjectionKey } from 'vue'; import { useContextFactory } from '../useContextFactory';
import type { App, InjectionKey } from 'vue';
export interface useInjectionStoreOptions<Return> { export interface useInjectionStoreOptions<Return> {
injectionKey: string | InjectionKey<Return>; injectionName?: string;
defaultValue?: Return; defaultValue?: Return;
} }
@@ -46,23 +47,23 @@ export interface useInjectionStoreOptions<Return> {
*/ */
export function useInjectionStore<Args extends any[], Return>( export function useInjectionStore<Args extends any[], Return>(
stateFactory: (...args: Args) => Return, stateFactory: (...args: Args) => Return,
options?: useInjectionStoreOptions<Return>, options?: useInjectionStoreOptions<Return>
) { ) {
const key = options?.injectionKey ?? Symbol(stateFactory.name ?? 'InjectionStore'); const ctx = useContextFactory<Return>(options?.injectionName ?? stateFactory.name ?? 'InjectionStore');
const useProvidingState = (...args: Args) => { const useProvidingState = (...args: Args) => {
const state = stateFactory(...args); const state = stateFactory(...args);
provide(key, state); ctx.provide(state);
return state; return state;
}; };
const useAppProvidingState = (app: App) => (...args: Args) => { const useAppProvidingState = (app: App) => (...args: Args) => {
const state = stateFactory(...args); const state = stateFactory(...args);
app.provide(key, state); ctx.appProvide(app)(state);
return state; return state;
}; };
const useInjectedState = () => inject(key, options?.defaultValue); const useInjectedState = () => ctx.inject(options?.defaultValue);
return { return {
useProvidingState, useProvidingState,