@viewfly/core 0.0.1-alpha.9 → 0.0.2

package/bundles/jsx.d.ts

@@ -0,0 +1,13 @@
+import { Key, Ref } from '@viewfly/core';
+export declare namespace JSX {
+    interface Attributes<T extends object> {
+        ref?: Ref<T> | Ref<T>[];
+        key?: Key;
+    }
+    interface ElementClass {
+    }
+    interface IntrinsicElements {
+    }
+    interface IntrinsicAttributes {
+    }
+}

package/bundles/model/component.d.ts

@@ -1,26 +1,24 @@
 import { Provider, ReflectiveInjector, AbstractType, Type, InjectionToken, InjectFlags, Injector } from '@tanbo/di';
-import { JSXProps, JSXElement, Props, Key, JSXTypeof } from './jsx-element';
+import { Props, Key, JSXTypeof, JSXChildNode } from './jsx-element';
 export declare class JSXComponent {
     createInstance: (injector: Component) => Component;
     constructor(createInstance: (injector: Component) => Component);
 }
-export type JSXTemplate = JSXElement | JSXComponent | null | void;
-export interface ComponentSetup<T extends JSXProps<any> = JSXProps<any>> {
-    (props?: T): () => JSXTemplate;
+export interface ComponentSetup<T extends Props<any> = Props<any>> {
+    (props?: T): () => JSXChildNode;
 }
 /**
  * Viewfly 组件管理类，用于管理组件的生命周期，上下文等
  */
 export declare class Component extends ReflectiveInjector implements JSXTypeof {
-    setup: ComponentSetup;
-    config?: JSXProps<any> | null | undefined;
+    type: ComponentSetup;
+    props: Props<any>;
     key?: Key | undefined;
-    $$typeOf: ComponentSetup<JSXProps<any>>;
+    $$typeOf: ComponentSetup<Props<any>>;
     destroyCallbacks: LifeCycleCallback[];
     mountCallbacks: LifeCycleCallback[];
     propsChangedCallbacks: PropsChangedCallback<any>[];
     updatedCallbacks: LifeCycleCallback[];
-    props: Props;
     get dirty(): boolean;
     get changed(): boolean;
     protected _dirty: boolean;
@@ -28,18 +26,19 @@ export declare class Component extends ReflectiveInjector implements JSXTypeof {
     private parentComponent;
     private updatedDestroyCallbacks;
     private propsChangedDestroyCallbacks;
+    private unWatch?;
     private isFirstRending;
-    constructor(context: Injector, setup: ComponentSetup, config?: JSXProps<any> | null | undefined, key?: Key | undefined);
+    constructor(context: Injector, type: ComponentSetup, props: Props<any>, key?: Key | undefined);
     is(target: JSXTypeof): boolean;
     addProvide<T>(providers: Provider<T> | Provider<T>[]): void;
     init(): {
-        template: JSXTemplate;
-        render: () => JSXTemplate;
+        template: JSXChildNode;
+        render: () => JSXChildNode;
     };
     markAsDirtied(): void;
     markAsChanged(): void;
     rendered(): void;
-    invokePropsChangedHooks(newProps?: JSXProps<any> | null): void;
+    invokePropsChangedHooks(newProps: Props<any>): void;
     destroy(): void;
     private invokeMountHooks;
     private invokeUpdatedHooks;
@@ -47,7 +46,7 @@ export declare class Component extends ReflectiveInjector implements JSXTypeof {
 export interface LifeCycleCallback {
     (): void | (() => void);
 }
-export interface PropsChangedCallback<T extends JSXProps<any>> {
+export interface PropsChangedCallback<T extends Props<any>> {
     (currentProps: T | null, oldProps: T | null): void | (() => void);
 }
 /**
@@ -62,7 +61,7 @@ export interface PropsChangedCallback<T extends JSXProps<any>> {
  * }
  * ```
  */
-export declare function onMount(callback: LifeCycleCallback): void;
+export declare function onMounted(callback: LifeCycleCallback): void;
 /**
  * 当组件视图更新后调用
  * @param callback
@@ -98,7 +97,7 @@ export declare function onUpdated(callback: LifeCycleCallback): () => void;
  * }
  * ```
  */
-export declare function onPropsChanged<T extends JSXProps<any>>(callback: PropsChangedCallback<T>): () => void;
+export declare function onPropsChanged<T extends Props<any>>(callback: PropsChangedCallback<T>): () => void;
 /**
  * 当组件销毁时调用回调函数
  * @param callback

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

@@ -1,45 +1,31 @@
 import { JSXComponent, ComponentSetup } from './component';
 export type JSXChildNode = JSXElement | JSXComponent | string | number | boolean | null | undefined | JSXChildNode[];
-export interface JSXProps<T = JSXChildNode | JSXChildNode[]> {
+export interface Props<T = JSXChildNode | JSXChildNode[]> {
     children?: T;
     [key: string]: any;
     [key: symbol]: any;
 }
-export declare const Fragment: () => never;
+export declare const Fragment: (props: Props) => () => JSXChildNode | JSXChildNode[];
 export type Key = number | string;
-export declare function jsx<T extends JSXChildNode>(name: string, config?: JSXProps<T> | null, key?: Key): JSXElement;
-export declare function jsx<T extends JSXChildNode>(setup: ComponentSetup, config?: JSXProps<T> | null, key?: Key): JSXComponent;
-export declare function jsxs<T extends JSXChildNode[]>(name: string, config?: JSXProps<T> | null, key?: Key): JSXElement;
-export declare function jsxs<T extends JSXChildNode[]>(setup: ComponentSetup, config?: JSXProps<T> | null, key?: Key): JSXComponent;
+export declare function jsx<T extends JSXChildNode>(name: string, config: Props<T>, key?: Key): JSXElement;
+export declare function jsx<T extends JSXChildNode>(setup: ComponentSetup, config: Props<T>, key?: Key): JSXComponent;
+export declare function jsxs<T extends JSXChildNode[]>(name: string, config: Props<T>, key?: Key): JSXElement;
+export declare function jsxs<T extends JSXChildNode[]>(setup: ComponentSetup, config: Props<T>, key?: Key): JSXComponent;
 export interface JSXTypeof {
     $$typeOf: string | ComponentSetup;
     is(target: JSXTypeof): boolean;
 }
-export interface VElementListeners {
-    [listenKey: string]: <T extends Event>(ev: T) => any;
-}
 export declare class JSXText implements JSXTypeof {
     text: string;
     $$typeOf: string;
     constructor(text: string);
     is(target: JSXTypeof): boolean;
 }
-export declare class Props {
-    attrs: Map<string, any>;
-    styles: Map<string, string | number>;
-    classes: string;
-    listeners: VElementListeners;
-    children: JSXChildNode[];
-    constructor(props?: JSXProps<JSXChildNode> | JSXProps<JSXChildNode[]> | null);
-    static classToString(config: unknown): any;
-    static classToArray(config: unknown): string[];
-}
 export declare class JSXElement implements JSXTypeof {
-    name: string;
-    config?: JSXProps<any> | null | undefined;
+    type: string;
+    props: Props<any>;
     key?: Key | undefined;
     $$typeOf: string;
-    props: Props;
-    constructor(name: string, config?: JSXProps<any> | null | undefined, key?: Key | undefined);
+    constructor(type: string, props: Props<any>, key?: Key | undefined);
     is(target: JSXTypeof): boolean;
 }

package/bundles/public-api.d.ts

@@ -3,4 +3,5 @@ export * from '@tanbo/di';
 export * from './_utils/make-error';
 export * from './foundation/_api';
 export * from './model/_api';
+export * from './jsx';
 export * from './viewfly';

package/bundles/viewfly.d.ts

@@ -6,8 +6,6 @@ export type RootNode = JSXElement | JSXComponent;
  * Viewfly 配置项
  */
 export interface Config {
-    /** 应用根节点 */
-    host: NativeNode;
     /** Viewfly IoC 容器中提供者集合 */
     providers?: Provider[];
     /** 是否自动更新视图 */
@@ -28,8 +26,9 @@ export declare class Viewfly extends ReflectiveInjector {
     constructor(config: Config);
     /**
      * 启动 Viewfly
+     * @param host 应用根节点
      */
-    run(): void;
+    mount(host: NativeNode): void;
     /**
      * 销毁 Viewfly 实例
      */

package/jsx-runtime/index.d.ts

@@ -0,0 +1,18 @@
+import type { JSXComponent, jsx, jsxs, Fragment } from '@viewfly/core'
+import type { NativeElements } from '@viewfly/platform-browser'
+
+/**
+ * JSX namespace for usage with @jsxImportsSource directive
+ * when ts compilerOptions.jsx is 'react-jsx'
+ * https://www.typescriptlang.org/tsconfig#jsxImportSource
+ */
+
+export { jsx, jsxs, Fragment }
+
+export namespace JSX {
+  export interface ElementClass extends JSXComponent {
+  }
+
+  export interface IntrinsicElements extends NativeElements {
+  }
+}

package/jsx-runtime/package.json

@@ -0,0 +1,5 @@
+{
+  "main": "./index.js",
+  "module": "./index.esm.js",
+  "types": "./index.d.ts"
+}

package/package.json

@@ -1,22 +1,19 @@
 {
   "name": "@viewfly/core",
-  "version": "0.0.1-alpha.9",
+  "version": "0.0.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",
   "typings": "./bundles/public-api.d.ts",
   "scripts": {
-    "start": "webpack-dev-server",
-    "test": "cross-env env=test jest",
-    "test-c": "cross-env env=test jest --coverage",
     "build:lib": "rimraf bundles && rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript",
     "publish:lib": "npm run build:lib && npm publish --access=public"
   },
   "license": "MIT",
   "keywords": [],
   "dependencies": {
-    "@tanbo/di": "^1.1.4",
-    "@tanbo/stream": "^1.1.9",
+    "@tanbo/di": "^1.1.5",
+    "@tanbo/stream": "^1.2.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -37,5 +34,5 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "c1ea5cf0163aac7b73beee2868f4ea5caa94bb3f"
+  "gitHead": "65bcb20399ed7e6e14102b649588135a7ebf4a72"
 }

package/jsx-dev-runtime.js

@@ -1,8 +0,0 @@
-import { jsx, jsxs, Fragment } from '@viewfly/core'
-
-export const jsxDEV = jsx
-
-export {
-  jsxs,
-  Fragment
-}

package/jsx-runtime.d.ts

@@ -1,16 +0,0 @@
-import { jsx, jsxs, Fragment, JSXElement } from '@viewfly/core'
-
-export {
-  jsxs,
-  jsx,
-  Fragment
-}
-
-declare namespace JSX {
-  interface IntrinsicElements {
-    [elemName: string]: JSXElement
-  }
-
-  interface Element extends JSXElement {
-  }
-}