@viewfly/core 0.6.0 → 0.6.2

package/bundles/di/injector.d.ts

@@ -13,10 +13,14 @@ export declare enum InjectFlags {
     /** 可选查找 */
     Optional = "Optional"
 }
+/**
+ * 根据 token 推断返回数据类型
+ */
+export type ExtractValueType<T> = T extends Type<any> ? InstanceType<T> : T extends AbstractType<infer K> ? K : T extends InjectionToken<infer V> ? V : never;
 /**
  * DI 容器抽象基类
  */
 export declare abstract class Injector {
     abstract parentInjector: Injector | null;
-    abstract get<T>(token: Type<T> | AbstractType<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
+    abstract get<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = ExtractValueType<T>>(token: T, notFoundValue?: U, flags?: InjectFlags): U;
 }

package/bundles/di/reflective-injector.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from './provider';
-import { InjectFlags, Injector } from './injector';
+import { ExtractValueType, InjectFlags, Injector } from './injector';
 import { NormalizedProvider } from './reflective-provider';
 import { AbstractType, Type } from './type';
 import { InjectionToken } from './injection-token';
@@ -12,7 +12,7 @@ export declare class ReflectiveInjector extends Injector {
     protected staticProviders: Provider[];
     protected scope?: Scope | undefined;
     protected normalizedProviders: NormalizedProvider[];
-    protected recordValues: Map<InjectionToken<any> | Type<any> | AbstractType<any>, any>;
+    protected recordValues: Map<Type<any> | AbstractType<any> | InjectionToken<any>, any>;
     constructor(parentInjector: Injector | null, staticProviders: Provider[], scope?: Scope | undefined);
     /**
      * 用于获取当前注入器上下文内的实例、对象或数据
@@ -20,7 +20,7 @@ export declare class ReflectiveInjector extends Injector {
      * @param notFoundValue 如未查找到的返回值
      * @param flags 查询规则
      */
-    get<T>(token: Type<T> | AbstractType<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
+    get<T extends Type<any> | AbstractType<any> | InjectionToken<any>, U = ExtractValueType<T>>(token: T, notFoundValue?: U, flags?: InjectFlags): U;
     private getValue;
     /**
      * 解决并获取依赖参数

package/bundles/foundation/_utils.d.ts

@@ -1,7 +1,6 @@
 import { JSXNode } from './jsx-element';
 import { NativeNode } from './injection-tokens';
 import { Component } from './component';
-import { JSXInternal } from './types';
 export interface ListenDelegate {
     delegate: () => any;
     listenFn: ((...args: any[]) => any) | void;

package/bundles/foundation/component.d.ts

@@ -1,7 +1,6 @@
 import { AbstractType, InjectFlags, InjectionToken, Injector, Provider, ReflectiveInjector, Type } from '../di/_api';
 import { Key, Props } from './jsx-element';
 import { ComponentView } from './_utils';
-import { JSXInternal } from './types';
 /**
  * Viewfly 组件管理类，用于管理组件的生命周期，上下文等
  */

package/bundles/foundation/jsx-element.d.ts

@@ -1,4 +1,3 @@
-import { JSXInternal } from './types';
 import { ListenDelegate } from './_utils';
 export interface Props {
     children?: JSXInternal.ViewNode | JSXInternal.ViewNode[];

package/bundles/foundation/memo.d.ts

@@ -1,3 +1,2 @@
 import { Props } from './jsx-element';
-import { JSXInternal } from './types';
 export declare function withMemo<T extends Props = Props>(canUseMemo: JSXInternal.ComponentInstance<T>['$useMemo'], render: () => JSXInternal.ViewNode): JSXInternal.ComponentInstance<T>;

package/bundles/foundation/root.component.d.ts

@@ -1,5 +1,4 @@
 import { Component } from './component';
-import { JSXInternal } from './types';
 import { Injector } from '../di/_api';
 /**
  * Viewfly 根组件，用于实现组件状态更新事件通知

package/bundles/foundation/types.d.ts

@@ -3,34 +3,36 @@ import { ExtractInstanceType, DynamicRef } from './component';
 import { Scope } from '../di/injectable';
 import { NativeNode } from './injection-tokens';
 export type ViewNode = JSXInternal.ViewNode;
-export declare namespace JSXInternal {
-    type ClassNames = string | Record<string, unknown> | false | null | undefined | ClassNames[];
-    interface ComponentInstance<P> {
-        $portalHost?: NativeNode;
-        $render(): ViewNode;
-        $useMemo?(currentProps: P, prevProps: P): boolean;
-    }
-    type ViewNode = Element | JSXInternal.ElementClass | string | number | boolean | null | undefined | Iterable<ViewNode>;
-    interface ComponentSetup<P = any> {
-        (props: P): (() => ViewNode) | ComponentInstance<P>;
-        scope?: Scope;
-    }
-    type Element<P = any, C extends string | ComponentSetup<P> = string | ComponentSetup<P>> = C extends string ? IntrinsicElements[C] : (() => Element) | ComponentInstance<P>;
-    interface IntrinsicAttributes {
-        key?: Key;
-        ref?: any;
-    }
-    interface RefAttributes<T> extends IntrinsicAttributes {
-        ref?: DynamicRef<ExtractInstanceType<T>> | DynamicRef<ExtractInstanceType<T>>[];
-    }
-    interface ElementClass<P = any> extends ComponentInstance<P> {
-    }
-    interface ElementChildrenAttribute {
-    }
-    interface IntrinsicElements {
-        [name: string]: any;
-    }
-    interface IntrinsicClassAttributes<T> {
-        ref?: DynamicRef<T>;
+declare global {
+    namespace JSXInternal {
+        type ClassNames = string | Record<string, unknown> | false | null | undefined | ClassNames[];
+        interface ComponentInstance<P> {
+            $portalHost?: NativeNode;
+            $render(): ViewNode;
+            $useMemo?(currentProps: P, prevProps: P): boolean;
+        }
+        type ViewNode = Element | JSXInternal.ElementClass | string | number | boolean | null | undefined | Iterable<ViewNode>;
+        interface ComponentSetup<P = any> {
+            (props: P): (() => ViewNode) | ComponentInstance<P>;
+            scope?: Scope;
+        }
+        type Element<P = any, C extends string | ComponentSetup<P> = string | ComponentSetup<P>> = C extends string ? IntrinsicElements[C] : (() => Element) | ComponentInstance<P>;
+        interface IntrinsicAttributes {
+            key?: Key;
+            ref?: any;
+        }
+        interface RefAttributes<T> extends IntrinsicAttributes {
+            ref?: DynamicRef<ExtractInstanceType<T>> | DynamicRef<ExtractInstanceType<T>>[];
+        }
+        interface ElementClass<P = any> extends ComponentInstance<P> {
+        }
+        interface ElementChildrenAttribute {
+        }
+        interface IntrinsicElements {
+            [name: string]: any;
+        }
+        interface IntrinsicClassAttributes<T> {
+            ref?: DynamicRef<T>;
+        }
     }
 }

package/bundles/index.esm.js

@@ -1502,7 +1502,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
             newAtom.child = createChildChain(newTemplate, newAtom.isSvg);
         }
         if (newAtom.child) {
-            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex);
+            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex + offset);
         }
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;

package/bundles/index.js

@@ -1504,7 +1504,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
             newAtom.child = createChildChain(newTemplate, newAtom.isSvg);
         }
         if (newAtom.child) {
-            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex);
+            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context, expectIndex, oldIndex + offset);
         }
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;

package/bundles/viewfly.d.ts

@@ -1,5 +1,5 @@
 import type { Provider } from './di/_api';
-import { JSXInternal, NativeNode, NativeRenderer } from './foundation/_api';
+import { NativeNode, NativeRenderer } from './foundation/_api';
 import { Injector } from './di/_api';
 /**
  * Viewfly 配置项

package/jsx-runtime/index.d.ts

@@ -1,5 +1,4 @@
-import { jsx, jsxs, Fragment, JSXInternal } from '@viewfly/core';
-import { NativeElements } from '@viewfly/platform-browser';
+import { jsx, jsxs, Fragment } from '@viewfly/core';
 /**
  * JSX namespace for usage with @jsxImportsSource directive
  * when ts compilerOptions.jsx is 'react-jsx'
@@ -11,7 +10,7 @@ export declare namespace JSX {
     type Element = JSXInternal.Element;
     interface ElementClass extends JSXInternal.ElementClass {
     }
-    interface IntrinsicElements extends NativeElements, JSXInternal.IntrinsicElements {
+    interface IntrinsicElements extends JSXInternal.IntrinsicElements {
     }
     interface IntrinsicAttributes extends JSXInternal.IntrinsicAttributes {
     }

package/jsx-runtime/package.json

@@ -6,8 +6,7 @@
     "build:lib": "rimraf index.esm.js index.js index.d.ts && rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript && tsc index.ts -d"
   },
   "dependencies": {
-    "@viewfly/core": "*",
-    "@viewfly/platform-browser": "*"
+    "@viewfly/core": "*"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "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",
@@ -47,7 +47,7 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "74774f062e956a723313a1b5ad4b8eab8dc78ae8",
+  "gitHead": "f3db648a596358d6966d006a24fb85b3b7d993d1",
   "dependencies": {
     "reflect-metadata": "^0.1.13"
   }