@piying/view-svelte 2.4.6 → 2.5.0

package/component/field-template.svelte

@@ -9,7 +9,7 @@
 	const props: {
 		field: PiResolvedViewFieldConfig;
 	} = $props();
-	const injector = getContext<Injector>(InjectorToken)!;
+	const injector = getContext<() => Injector>(InjectorToken)!;
 	const fieldInputs = signalToState(() => {
 		return {
 			...props.field.attributes(),
@@ -24,7 +24,7 @@
 	$effect.pre(() => {
 		let dispose: (() => any) | undefined;
 		if (controlRef?.cva) {
-			dispose = createViewControlLink((() => control) as any, controlRef?.cva, injector);
+			dispose = createViewControlLink((() => control) as any, controlRef?.cva, injector());
 		}
 		return () => {
 			dispose?.();

package/component/piying-view.svelte

@@ -10,8 +10,14 @@
 		type EffectRef
 	} from 'static-injector';
 	import type { Injector } from 'static-injector';
-	import { setContext } from 'svelte';
-	import { InjectorToken, PI_INPUT_MODEL_TOKEN, PI_INPUT_OPTIONS_TOKEN, PI_INPUT_SCHEMA_TOKEN } from '../token';
+	import { getContext, setContext } from 'svelte';
+	import {
+		InjectorToken,
+		PI_INPUT_MODEL_TOKEN,
+		PI_INPUT_OPTIONS_TOKEN,
+		PI_INPUT_SCHEMA_TOKEN,
+		PI_VIEW_FIELD_TOKEN
+	} from '../token';
 	import { SvelteSchemaHandle } from '../svelte-schema';
 	import { SvelteFormBuilder } from '../builder';
 	import FieldTemplate from './field-template.svelte';
@@ -20,18 +26,25 @@
 		schema: v.BaseSchema<any, any, any> | v.SchemaWithPipe<any>;
 		model?: any;
 		modelChange?: (value: any) => void;
-		options: any;
+		options: { injector?: Injector; builder?: any; [name: string]: any };
 	} = $props();
-
-	const rootInjector = createRootInjector({
-		providers: [
-			{
-				provide: ChangeDetectionScheduler,
-				useClass: ChangeDetectionSchedulerImpl
-			}
-		]
+	const maybeParentField = getContext<PI_VIEW_FIELD_TOKEN>(PI_VIEW_FIELD_TOKEN);
+	const rootInjector = $derived.by(() => {
+		return (
+			inputs.options.injector ??
+			maybeParentField?.().injector ??
+			createRootInjector({
+				providers: [
+					{
+						provide: ChangeDetectionScheduler,
+						useClass: ChangeDetectionSchedulerImpl
+					}
+				]
+			})
+		);
 	});
-	setContext(InjectorToken, rootInjector);
+
+	setContext(InjectorToken, () => rootInjector);
 	setContext(PI_INPUT_OPTIONS_TOKEN, () => inputs.options);
 	setContext(PI_INPUT_SCHEMA_TOKEN, () => inputs.schema);
 	setContext(PI_INPUT_MODEL_TOKEN, () => inputs.model);
@@ -45,10 +58,10 @@
 			injectorDispose = undefined;
 		};
 		const field = convert(inputs.schema as any, {
+			...inputs.options,
 			handle: SvelteSchemaHandle as any,
 			builder: SvelteFormBuilder,
-			injector: subInjector,
-			...inputs.options
+			injector: subInjector
 		});
 		return [field, subInjector];
 	});

package/component/piying-view.svelte.d.ts

@@ -1,9 +1,14 @@
 import * as v from 'valibot';
+import type { Injector } from 'static-injector';
 type $$ComponentProps = {
     schema: v.BaseSchema<any, any, any> | v.SchemaWithPipe<any>;
     model?: any;
     modelChange?: (value: any) => void;
-    options: any;
+    options: {
+        injector?: Injector;
+        builder?: any;
+        [name: string]: any;
+    };
 };
 declare const PiyingView: import("svelte").Component<$$ComponentProps, {}, "">;
 type PiyingView = ReturnType<typeof PiyingView>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@piying/view-svelte",
-    "version": "2.4.6",
+    "version": "2.5.0",
     "description": "Piying view For Svelte;Valibot to Component",
     "type": "module",
     "homepage": "https://piying-org.github.io/website/docs/client/intro",
@@ -34,7 +34,7 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@piying/view-core": "^2.4.6",
+        "@piying/view-core": "^2.5.0",
         "static-injector": "^6.1.2"
     },
     "sideEffects": false,

package/util/signal-convert.svelte.js

@@ -11,11 +11,11 @@ export function signalToState(value) {
             if (!Object.is(dataRef, currentValue)) {
                 dataRef = currentValue;
             }
-        }, { injector: injector });
+        }, { injector: injector() });
         return () => {
             ref.destroy();
         };
     });
     return () => dataRef;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmFsLWNvbnZlcnQuc3ZlbHRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic2lnbmFsLWNvbnZlcnQuc3ZlbHRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDbkQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUN6QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBRXBDLE1BQU0sVUFBVSxhQUFhLENBQUksS0FBMEI7SUFDMUQsTUFBTSxRQUFRLEdBQUcsVUFBVSxDQUFXLGFBQWEsQ0FBRSxDQUFDO0lBQ3RELElBQUksT0FBTyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQWdCLFNBQWdCLENBQUMsQ0FBQztJQUMxRCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRTtRQUNoQixPQUFPLEdBQUcsS0FBSyxFQUFFLENBQUM7UUFDbEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUNqQixHQUFHLEVBQUU7WUFDSixNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsQ0FBQztZQUM3QixJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsWUFBWSxDQUFDLEVBQUUsQ0FBQztnQkFDdkMsT0FBTyxHQUFHLFlBQVksQ0FBQztZQUN4QixDQUFDO1FBQ0YsQ0FBQyxFQUNELEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxDQUN0QixDQUFDO1FBQ0YsT0FBTyxHQUFHLEVBQUU7WUFDWCxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDZixDQUFDLENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUNILE9BQU8sR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDO0FBQ3RCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmFsLWNvbnZlcnQuc3ZlbHRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic2lnbmFsLWNvbnZlcnQuc3ZlbHRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDbkQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUN6QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBRXBDLE1BQU0sVUFBVSxhQUFhLENBQUksS0FBMEI7SUFDMUQsTUFBTSxRQUFRLEdBQUcsVUFBVSxDQUFpQixhQUFhLENBQUUsQ0FBQztJQUM1RCxJQUFJLE9BQU8sR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFnQixTQUFnQixDQUFDLENBQUM7SUFDMUQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUU7UUFDaEIsT0FBTyxHQUFHLEtBQUssRUFBRSxDQUFDO1FBQ2xCLE1BQU0sR0FBRyxHQUFHLE1BQU0sQ0FDakIsR0FBRyxFQUFFO1lBQ0osTUFBTSxZQUFZLEdBQUcsS0FBSyxFQUFFLENBQUM7WUFDN0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLFlBQVksQ0FBQyxFQUFFLENBQUM7Z0JBQ3ZDLE9BQU8sR0FBRyxZQUFZLENBQUM7WUFDeEIsQ0FBQztRQUNGLENBQUMsRUFDRCxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsRUFBRSxDQUN4QixDQUFDO1FBQ0YsT0FBTyxHQUFHLEVBQUU7WUFDWCxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDZixDQUFDLENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUNILE9BQU8sR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDO0FBQ3RCLENBQUMifQ==