@viewfly/core 0.0.14 → 0.0.16

package/bundles/foundation/_utils.d.ts

@@ -5,5 +5,5 @@ export interface ObjectChanges {
 }
 export declare const refKey = "ref";
 export declare function getObjectChanges(newProps: Record<string, any>, oldProps: Record<string, any>): ObjectChanges;
-export declare function classToString(config: unknown): any;
+export declare function classToString(config: unknown): string;
 export declare function styleToObject(style: string | Record<string, any>): Record<string, any>;

package/bundles/index.esm.js

@@ -81,9 +81,14 @@ function classToString(config) {
         return config;
     }
     else if (Array.isArray(config)) {
-        return config.map(i => {
-            return classToString(i);
-        }).join(' ');
+        const classes = [];
+        for (const i of config) {
+            const v = classToString(i);
+            if (v) {
+                classes.push(v);
+            }
+        }
+        return classes.join(' ');
     }
     else if (typeof config === 'object') {
         if (config.toString !== Object.prototype.toString && !config.toString.toString().includes('[native code]')) {
@@ -97,6 +102,7 @@ function classToString(config) {
         }
         return classes.join(' ');
     }
+    return '';
 }
 function styleToObject(style) {
     if (typeof style !== 'string') {
@@ -608,20 +614,12 @@ function inject(token, notFoundValue, flags) {
     return component.parentInjector.get(token, notFoundValue, flags);
 }
 
-const Fragment = function Fragment(props) {
+function Fragment(props) {
     return () => {
         return props.children;
     };
-};
-function jsx(setup, props, key) {
-    if (typeof setup === 'string') {
-        return new JSXElement(setup, props, key);
-    }
-    return new JSXComponent(props, function (context, props) {
-        return new Component(context, setup, props, key);
-    });
 }
-function jsxs(setup, props, key) {
+function jsx(setup, props, key) {
     if (typeof setup === 'string') {
         return new JSXElement(setup, props, key);
     }
@@ -629,6 +627,7 @@ function jsxs(setup, props, key) {
         return new Component(context, setup, props, key);
     });
 }
+const jsxs = jsx;
 class JSXText {
     constructor(text) {
         this.text = text;

package/bundles/index.js

@@ -82,9 +82,14 @@ function classToString(config) {
         return config;
     }
     else if (Array.isArray(config)) {
-        return config.map(i => {
-            return classToString(i);
-        }).join(' ');
+        const classes = [];
+        for (const i of config) {
+            const v = classToString(i);
+            if (v) {
+                classes.push(v);
+            }
+        }
+        return classes.join(' ');
     }
     else if (typeof config === 'object') {
         if (config.toString !== Object.prototype.toString && !config.toString.toString().includes('[native code]')) {
@@ -98,6 +103,7 @@ function classToString(config) {
         }
         return classes.join(' ');
     }
+    return '';
 }
 function styleToObject(style) {
     if (typeof style !== 'string') {
@@ -609,20 +615,12 @@ function inject(token, notFoundValue, flags) {
     return component.parentInjector.get(token, notFoundValue, flags);
 }
 
-const Fragment = function Fragment(props) {
+function Fragment(props) {
     return () => {
         return props.children;
     };
-};
-function jsx(setup, props, key) {
-    if (typeof setup === 'string') {
-        return new JSXElement(setup, props, key);
-    }
-    return new JSXComponent(props, function (context, props) {
-        return new Component(context, setup, props, key);
-    });
 }
-function jsxs(setup, props, key) {
+function jsx(setup, props, key) {
     if (typeof setup === 'string') {
         return new JSXElement(setup, props, key);
     }
@@ -630,6 +628,7 @@ function jsxs(setup, props, key) {
         return new Component(context, setup, props, key);
     });
 }
+const jsxs = jsx;
 class JSXText {
     constructor(text) {
         this.text = text;

package/bundles/model/_api.d.ts

@@ -2,3 +2,4 @@ export * from './component';
 export * from './jsx-element';
 export * from './memo';
 export * from './root.component';
+export * from './types';

package/bundles/model/component.d.ts

@@ -1,29 +1,20 @@
 import { Provider, ReflectiveInjector, AbstractType, Type, InjectionToken, InjectFlags, Injector } from '@tanbo/di';
-import { Props, Key, JSXTypeof, JSXChildNode } from './jsx-element';
+import { Props, Key, JSXTypeof } from './jsx-element';
+import { JSXInternal } from './types';
 export declare class JSXComponent {
     props: Props;
     private factory;
     constructor(props: Props, factory: (injector: Component, props: Props) => Component);
     createInstance(injector: Component): Component;
 }
-export interface ComponentInstance<T> {
-    $render(): JSXChildNode;
-    $shouldUpdate?(currentProps: T, prevProps: T): unknown;
-}
-export interface Renderable {
-    $render(): any;
-}
-export interface ComponentSetup<T extends Props<any> = Props<any>> {
-    (props?: T): (() => JSXChildNode) | ComponentInstance<T>;
-}
 /**
  * Viewfly 组件管理类，用于管理组件的生命周期，上下文等
  */
 export declare class Component extends ReflectiveInjector implements JSXTypeof {
-    type: ComponentSetup;
-    props: Props<any>;
+    type: JSXInternal.ElementClass;
+    props: Props;
     key?: Key | undefined;
-    $$typeOf: ComponentSetup<Props<any>>;
+    $$typeOf: JSXInternal.ElementClass<any>;
     destroyCallbacks: LifeCycleCallback[];
     mountCallbacks: LifeCycleCallback[];
     propsChangedCallbacks: PropsChangedCallback<any>[];
@@ -37,12 +28,12 @@ export declare class Component extends ReflectiveInjector implements JSXTypeof {
     private propsChangedDestroyCallbacks;
     private unWatch?;
     private isFirstRending;
-    constructor(context: Injector, type: ComponentSetup, props: Props<any>, key?: Key | undefined);
+    constructor(context: Injector, type: JSXInternal.ElementClass, props: Props, key?: Key | undefined);
     is(target: JSXTypeof): boolean;
     addProvide<T>(providers: Provider<T> | Provider<T>[]): void;
     init(): {
-        template: JSXChildNode;
-        render: (newProps: Props, oldProps: Props) => JSXChildNode;
+        template: JSXInternal.JSXChildNode;
+        render: (newProps: Props, oldProps: Props) => JSXInternal.JSXChildNode;
     };
     markAsDirtied(): void;
     markAsChanged(): void;
@@ -55,7 +46,7 @@ export declare class Component extends ReflectiveInjector implements JSXTypeof {
 export interface LifeCycleCallback {
     (): void | (() => void);
 }
-export interface PropsChangedCallback<T extends Props<any>> {
+export interface PropsChangedCallback<T extends Props> {
     (currentProps: T | null, oldProps: T | null): void | (() => void);
 }
 /**
@@ -106,7 +97,7 @@ export declare function onUpdated(callback: LifeCycleCallback): () => void;
  * }
  * ```
  */
-export declare function onPropsChanged<T extends Props<any>>(callback: PropsChangedCallback<T>): () => void;
+export declare function onPropsChanged<T extends Props>(callback: PropsChangedCallback<T>): () => void;
 /**
  * 当组件销毁时调用回调函数
  * @param callback
@@ -115,9 +106,9 @@ export declare function onDestroy(callback: () => void): void;
 export interface RefListener<T> {
     (current: T): void | (() => void);
 }
-export type ExtractInstanceType<T, U = T extends (...args: any) => any ? ReturnType<T> : T> = U extends Renderable ? Omit<U, keyof ComponentInstance<any>> : U extends Function ? never : T;
+export type ExtractInstanceType<T, U = T extends (...args: any) => any ? ReturnType<T> : T> = U extends JSXInternal.ComponentInstance<any> ? Omit<U, keyof JSXInternal.ComponentInstance<any>> : U extends Function ? never : T;
 export interface AbstractInstanceType<T extends Record<string, any>> {
-    (): T & Renderable;
+    (): T & JSXInternal.ComponentInstance<any>;
 }
 export declare class Ref<T, U> {
     private callback;

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

@@ -1,18 +1,17 @@
-import { JSXComponent, ComponentSetup } from './component';
-export type JSXChildNode = JSXElement | JSXComponent | string | number | boolean | null | undefined | JSXChildNode[];
-export interface Props<T = JSXChildNode | JSXChildNode[]> {
-    children?: T;
+import { JSXComponent } from './component';
+import { JSXInternal } from './types';
+export interface Props {
+    children?: JSXInternal.JSXChildNode | JSXInternal.JSXChildNode[];
     [key: string]: any;
     [key: symbol]: any;
 }
-export declare const Fragment: (props: Props) => () => JSXChildNode | JSXChildNode[];
+export declare function Fragment(props: Props): () => JSXInternal.JSXChildNode | JSXInternal.JSXChildNode[];
 export type Key = number | string;
-export declare function jsx<T extends JSXChildNode>(name: string, props: Props<T>, key?: Key): JSXElement;
-export declare function jsx<T extends JSXChildNode>(setup: ComponentSetup, props: Props<T>, key?: Key): JSXComponent;
-export declare function jsxs<T extends JSXChildNode[]>(name: string, props: Props<T>, key?: Key): JSXElement;
-export declare function jsxs<T extends JSXChildNode[]>(setup: ComponentSetup, props: Props<T>, key?: Key): JSXComponent;
+export declare function jsx(name: string, props: Props, key?: Key): JSXElement;
+export declare function jsx(setup: JSXInternal.ElementClass, props: Props, key?: Key): JSXComponent;
+export declare const jsxs: typeof jsx;
 export interface JSXTypeof {
-    $$typeOf: string | ComponentSetup;
+    $$typeOf: string | JSXInternal.ElementClass;
     is(target: JSXTypeof): boolean;
 }
 export declare class JSXText implements JSXTypeof {
@@ -27,10 +26,10 @@ export interface ListenDelegate {
 }
 export declare class JSXElement implements JSXTypeof {
     type: string;
-    props: Props<any>;
+    props: Props;
     key?: Key | undefined;
     $$typeOf: string;
     on?: Record<string, ListenDelegate>;
-    constructor(type: string, props: Props<any>, key?: Key | undefined);
+    constructor(type: string, props: Props, key?: Key | undefined);
     is(target: JSXTypeof): boolean;
 }

package/bundles/model/memo.d.ts

@@ -1,6 +1,3 @@
-import { JSXChildNode, Props } from './jsx-element';
-import { ComponentInstance } from './component';
-export interface ShouldUpdate<T extends Props> {
-    (currentProps: T, prevProps: T): unknown;
-}
-export declare function withMemo<T extends Props = Props>(shouldUpdate: ShouldUpdate<T>, render: () => JSXChildNode): ComponentInstance<T>;
+import { Props } from './jsx-element';
+import { JSXInternal } from './types';
+export declare function withMemo<T extends Props = Props>(shouldUpdate: JSXInternal.ComponentInstance<T>['$shouldUpdate'], render: () => JSXInternal.Element): JSXInternal.ComponentInstance<T>;

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

@@ -1,11 +1,12 @@
 import { Subject } from '@tanbo/stream';
 import { NullInjector } from '@tanbo/di';
-import { Component, ComponentSetup } from './component';
+import { Component } from './component';
+import { JSXInternal } from './types';
 /**
  * Viewfly 根组件，用于实现组件状态更新事件通知
  */
 export declare class RootComponent extends Component {
     changeEmitter: Subject<void>;
-    constructor(factory: ComponentSetup, parentInjector?: NullInjector);
+    constructor(factory: JSXInternal.ElementClass, parentInjector?: NullInjector);
     markAsChanged(): void;
 }

package/bundles/model/types.d.ts

@@ -0,0 +1,27 @@
+import { Key, ExtractInstanceType, Ref } from './_api';
+export declare namespace JSXInternal {
+    type ClassNames = string | Record<string, unknown> | ClassNames[];
+    interface ComponentInstance<P> {
+        $render(): JSXChildNode;
+        $shouldUpdate?(currentProps: P, prevProps: P): boolean;
+    }
+    type JSXChildNode = Element | ElementClass | string | number | boolean | null | undefined | JSXChildNode[];
+    interface Element<P = any, C extends string | ElementClass<P> = string | ElementClass<P>> {
+    }
+    interface IntrinsicAttributes {
+        key?: Key;
+        ref?: any;
+    }
+    interface RefAttributes<T> extends IntrinsicAttributes {
+        ref?: Ref<T, ExtractInstanceType<T>> | Ref<T, ExtractInstanceType<T>>[];
+    }
+    interface ElementClass<P = any> {
+        (props?: P): () => (JSXChildNode | ComponentInstance<P>);
+    }
+    interface ElementChildrenAttribute {
+    }
+    interface IntrinsicElements {
+    }
+    interface IntrinsicClassAttributes<T> extends RefAttributes<T> {
+    }
+}

package/bundles/public-api.d.ts

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

package/bundles/viewfly.d.ts

@@ -1,7 +1,6 @@
 import { Injector, Provider, ReflectiveInjector } from '@tanbo/di';
 import { NativeNode } from './foundation/_api';
-import { JSXComponent, JSXElement } from './model/_api';
-export type RootNode = JSXElement | JSXComponent;
+import { JSXInternal } from './model/_api';
 /**
  * Viewfly 配置项
  */
@@ -11,7 +10,7 @@ export interface Config {
     /** 是否自动更新视图 */
     autoUpdate?: boolean;
     /** 根节点 */
-    root: RootNode;
+    root: JSXInternal.JSXChildNode;
     /** 根组件的上下文 */
     context?: Injector;
 }

package/jsx-runtime/index.d.ts

@@ -1,4 +1,4 @@
-import { jsx, jsxs, Fragment, ViewTypes } from '@viewfly/core';
+import { jsx, jsxs, Fragment, JSXInternal } from '@viewfly/core';
 import { NativeElements } from '@viewfly/platform-browser';
 /**
  * JSX namespace for usage with @jsxImportsSource directive
@@ -8,14 +8,16 @@ import { NativeElements } from '@viewfly/platform-browser';
 declare const jsxDEV: typeof jsx;
 export { jsx, jsxs, Fragment, jsxDEV };
 export declare namespace JSX {
-    interface ElementClass extends ViewTypes.ElementClass {
+    interface Element extends JSXInternal.Element {
     }
-    interface IntrinsicElements extends NativeElements, ViewTypes.IntrinsicElements {
+    interface ElementClass extends JSXInternal.ElementClass {
     }
-    interface IntrinsicAttributes extends ViewTypes.IntrinsicAttributes {
+    interface IntrinsicElements extends NativeElements, JSXInternal.IntrinsicElements {
     }
-    interface ElementChildrenAttribute extends ViewTypes.ElementChildrenAttribute {
+    interface IntrinsicAttributes extends JSXInternal.IntrinsicAttributes {
     }
-    interface IntrinsicClassAttributes<T> extends ViewTypes.IntrinsicClassAttributes<T> {
+    interface ElementChildrenAttribute extends JSXInternal.ElementChildrenAttribute {
+    }
+    interface IntrinsicClassAttributes<T> extends JSXInternal.IntrinsicClassAttributes<T> {
     }
 }

package/jsx-runtime/package.json

@@ -6,8 +6,8 @@
     "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": "^0.0.12",
-    "@viewfly/platform-browser": "^0.0.12"
+    "@viewfly/core": "*",
+    "@viewfly/platform-browser": "*"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "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",
@@ -23,8 +23,7 @@
     }
   },
   "scripts": {
-    "build:lib": "rimraf bundles && rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript && npm run build:jsx",
-    "build:jsx": "cd jsx-runtime && npm run build:lib",
+    "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",
@@ -52,5 +51,5 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "bc795457277616f7f448bae91360eb11baf1ad6b"
+  "gitHead": "424aee30ec55010f16a8e055222d42b07fae4b38"
 }

package/bundles/types.d.ts

@@ -1,19 +0,0 @@
-import { Key, ExtractInstanceType, Ref, JSXComponent } from './model/_api';
-export declare namespace ViewTypes {
-    type ClassNames = string | Record<string, unknown> | Array<string | Record<string, unknown>>;
-    interface IntrinsicAttributes {
-        key?: Key;
-        ref?: any;
-    }
-    interface RefAttributes<T> extends IntrinsicAttributes {
-        ref?: Ref<T, ExtractInstanceType<T>> | Ref<T, ExtractInstanceType<T>>[];
-    }
-    interface ElementClass extends JSXComponent {
-    }
-    interface ElementChildrenAttribute {
-    }
-    interface IntrinsicElements {
-    }
-    interface IntrinsicClassAttributes<T> extends IntrinsicAttributes {
-    }
-}