@viewfly/core 1.2.0 → 2.0.0-alpha.1

package/bundles/index.d.ts

@@ -464,30 +464,7 @@ interface ComponentAnnotation {
     scope?: Scope;
     providers?: Provider[];
 }
-/**
- * 给组件添加注解
- * @param annotation
- * @param componentSetup
- * @example
- * ```ts
- * export customScope = new Scope('scopeName')
- * export const App = withAnnotation({
- *   scope: customScope,
- *   providers: [
- *     ExampleService
- *   ]
- * }, function(props: Props) {
- *   return () => {
- *     return <div>...</div>
- *   }
- * })
- * ```
- */
-declare function withAnnotation<T extends ComponentSetup>(annotation: ComponentAnnotation, componentSetup: T): T;
-interface ContextProps extends Props {
-    providers: Provider[];
-}
-declare function Context(props: ContextProps): () => ViewFlyNode<string | ComponentSetup<any>>;
+declare function withAnnotation<T extends ComponentSetup>(annotation: ComponentAnnotation, component: T): T;
 
 declare function withMemo<T extends Props = Props>(canUseMemo: ComponentInstance<T>['$useMemo'], render: () => JSXNode): ComponentInstance<T>;
 
@@ -601,4 +578,4 @@ interface Module {
 }
 declare function viewfly<T extends NativeNode>(config: Config): Application<T>;
 
-export { type AbstractInstanceType, type AbstractProvider, type AbstractType, type Application, type Atom, type ClassNames, type ClassProvider, Component, type ComponentAnnotation, type ComponentInstance, type ComponentSetup, type ComponentView, type Config, type ConstructorProvider, Context, type ContextProps, DynamicRef, type ElementNamespace, ElementNamespaceMap, type ExistingProvider, type ExtractInstanceType, type ExtractValueType, type FactoryProvider, ForwardRef, Fragment, Inject, type InjectDecorator, InjectFlags, Injectable, type InjectableDecorator, type InjectableOptions, InjectionToken, Injector, JSX, type JSXNode, JSXNodeFactory, type Key, type LifeCycleCallback, type Module, type NativeNode, NativeRenderer, type NormalizedProvider, NullInjector, Optional, type OptionalDecorator, Prop, type PropDecorator, type Props, type PropsChangedCallback, type ProvideScope, type Provider, type RefListener, type ReflectiveDependency, ReflectiveInjector, RootComponent, Scope, Self, type SelfDecorator, type Signal, SkipSelf, type SkipSelfDecorator, type StaticProvider, StaticRef, THROW_IF_NOT_FOUND, Type, type TypeProvider, type ValueProvider, type ViewFlyNode, type WatchCallback, computed, createContext, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, getSetupContext, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };
+export { type AbstractInstanceType, type AbstractProvider, type AbstractType, type Application, type Atom, type ClassNames, type ClassProvider, Component, type ComponentAnnotation, type ComponentInstance, type ComponentSetup, type ComponentView, type Config, type ConstructorProvider, DynamicRef, type ElementNamespace, ElementNamespaceMap, type ExistingProvider, type ExtractInstanceType, type ExtractValueType, type FactoryProvider, ForwardRef, Fragment, Inject, type InjectDecorator, InjectFlags, Injectable, type InjectableDecorator, type InjectableOptions, InjectionToken, Injector, JSX, type JSXNode, JSXNodeFactory, type Key, type LifeCycleCallback, type Module, type NativeNode, NativeRenderer, type NormalizedProvider, NullInjector, Optional, type OptionalDecorator, Prop, type PropDecorator, type Props, type PropsChangedCallback, type ProvideScope, type Provider, type RefListener, type ReflectiveDependency, ReflectiveInjector, RootComponent, Scope, Self, type SelfDecorator, type Signal, SkipSelf, type SkipSelfDecorator, type StaticProvider, StaticRef, THROW_IF_NOT_FOUND, Type, type TypeProvider, type ValueProvider, type ViewFlyNode, type WatchCallback, computed, createContext, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, getSetupContext, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };

package/bundles/index.esm.js

@@ -1230,25 +1230,6 @@ function getCurrentInstance() {
     return getSetupContext();
 }
 
-function Fragment(props) {
-    return () => {
-        return props.children;
-    };
-}
-function jsx(type, props, key) {
-    return JSXNodeFactory.createNode(type, props, key);
-}
-const jsxs = jsx;
-const JSXNodeFactory = {
-    createNode(type, props, key) {
-        return {
-            type,
-            props,
-            key
-        };
-    }
-};
-
 const injectMap = new WeakMap();
 function getInjector(start) {
     while (start) {
@@ -1278,60 +1259,37 @@ function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
     const injector = getInjector(component);
     return injector.get(token, notFoundValue, flags);
 }
-/**
- * 给组件添加注解
- * @param annotation
- * @param componentSetup
- * @example
- * ```ts
- * export customScope = new Scope('scopeName')
- * export const App = withAnnotation({
- *   scope: customScope,
- *   providers: [
- *     ExampleService
- *   ]
- * }, function(props: Props) {
- *   return () => {
- *     return <div>...</div>
- *   }
- * })
- * ```
- */
-function withAnnotation(annotation, componentSetup) {
+function withAnnotation(annotation, component) {
     return function (props) {
         const instance = getCurrentInstance();
         const parentInjector = injectMap.get(instance) || getInjector(instance.parentComponent);
         const injector = new ReflectiveInjector(parentInjector, annotation.providers || [], annotation.scope);
         injectMap.set(instance, injector);
-        return componentSetup(props);
+        return component(props);
     };
 }
-function Context(props) {
-    function createContextComponent(providers) {
-        return withAnnotation({
-            providers,
-        }, (childProps) => {
-            return () => {
-                return childProps.children;
-            };
-        });
-    }
-    let contextComponent = createContextComponent(props.providers);
-    onPropsChanged((newProps, oldProps) => {
-        if (newProps.providers === oldProps.providers) {
-            return;
-        }
-        contextComponent = createContextComponent(newProps.providers);
-    });
+
+class NativeRenderer {
+}
+
+function Fragment(props) {
     return () => {
-        return jsx(contextComponent, {
-            children: props.children
-        });
+        return props.children;
     };
 }
-
-class NativeRenderer {
+function jsx(type, props, key) {
+    return JSXNodeFactory.createNode(type, props, key);
 }
+const jsxs = jsx;
+const JSXNodeFactory = {
+    createNode(type, props, key) {
+        return {
+            type,
+            props,
+            key
+        };
+    }
+};
 
 function withMemo(canUseMemo, render) {
     return {
@@ -2127,4 +2085,4 @@ function viewfly(config) {
     return app;
 }
 
-export { Component, Context, DynamicRef, ElementNamespaceMap, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXNodeFactory, NativeRenderer, NullInjector, Optional, Prop, ReflectiveInjector, RootComponent, Scope, Self, SkipSelf, StaticRef, THROW_IF_NOT_FOUND, Type, computed, createContext, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, getSetupContext, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };
+export { Component, DynamicRef, ElementNamespaceMap, ForwardRef, Fragment, Inject, InjectFlags, Injectable, InjectionToken, Injector, JSXNodeFactory, NativeRenderer, NullInjector, Optional, Prop, ReflectiveInjector, RootComponent, Scope, Self, SkipSelf, StaticRef, THROW_IF_NOT_FOUND, Type, computed, createContext, createDerived, createDynamicRef, createRef, createRenderer, createSignal, forwardRef, getCurrentInstance, getSetupContext, inject, jsx, jsxs, makeError, normalizeProvider, onMounted, onPropsChanged, onUnmounted, onUpdated, viewfly, watch, withAnnotation, withMemo };

package/bundles/index.js

@@ -1232,25 +1232,6 @@ function getCurrentInstance() {
     return getSetupContext();
 }
 
-function Fragment(props) {
-    return () => {
-        return props.children;
-    };
-}
-function jsx(type, props, key) {
-    return JSXNodeFactory.createNode(type, props, key);
-}
-const jsxs = jsx;
-const JSXNodeFactory = {
-    createNode(type, props, key) {
-        return {
-            type,
-            props,
-            key
-        };
-    }
-};
-
 const injectMap = new WeakMap();
 function getInjector(start) {
     while (start) {
@@ -1280,60 +1261,37 @@ function inject(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
     const injector = getInjector(component);
     return injector.get(token, notFoundValue, flags);
 }
-/**
- * 给组件添加注解
- * @param annotation
- * @param componentSetup
- * @example
- * ```ts
- * export customScope = new Scope('scopeName')
- * export const App = withAnnotation({
- *   scope: customScope,
- *   providers: [
- *     ExampleService
- *   ]
- * }, function(props: Props) {
- *   return () => {
- *     return <div>...</div>
- *   }
- * })
- * ```
- */
-function withAnnotation(annotation, componentSetup) {
+function withAnnotation(annotation, component) {
     return function (props) {
         const instance = getCurrentInstance();
         const parentInjector = injectMap.get(instance) || getInjector(instance.parentComponent);
         const injector = new ReflectiveInjector(parentInjector, annotation.providers || [], annotation.scope);
         injectMap.set(instance, injector);
-        return componentSetup(props);
+        return component(props);
     };
 }
-function Context(props) {
-    function createContextComponent(providers) {
-        return withAnnotation({
-            providers,
-        }, (childProps) => {
-            return () => {
-                return childProps.children;
-            };
-        });
-    }
-    let contextComponent = createContextComponent(props.providers);
-    onPropsChanged((newProps, oldProps) => {
-        if (newProps.providers === oldProps.providers) {
-            return;
-        }
-        contextComponent = createContextComponent(newProps.providers);
-    });
+
+class NativeRenderer {
+}
+
+function Fragment(props) {
     return () => {
-        return jsx(contextComponent, {
-            children: props.children
-        });
+        return props.children;
     };
 }
-
-class NativeRenderer {
+function jsx(type, props, key) {
+    return JSXNodeFactory.createNode(type, props, key);
 }
+const jsxs = jsx;
+const JSXNodeFactory = {
+    createNode(type, props, key) {
+        return {
+            type,
+            props,
+            key
+        };
+    }
+};
 
 function withMemo(canUseMemo, render) {
     return {
@@ -2130,7 +2088,6 @@ function viewfly(config) {
 }
 
 exports.Component = Component;
-exports.Context = Context;
 exports.DynamicRef = DynamicRef;
 exports.ElementNamespaceMap = ElementNamespaceMap;
 exports.ForwardRef = ForwardRef;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.2.0",
+  "version": "2.0.0-alpha.1",
   "description": "Viewfly is a simple and easy-to-use JavaScript framework with an intuitive development experience.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -50,7 +50,7 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "8d13d8667f8875f24bc5218e9e4136d9efd9565a",
+  "gitHead": "7a4f48b8c21d4450ff837485c191e3d9bf88f5fb",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }