@viewfly/core 1.0.0-alpha.4 → 1.0.0-alpha.6

package/bundles/foundation/_utils.d.ts

@@ -21,6 +21,7 @@ export declare function classToString(config: unknown): string;
 export declare function styleToObject(style: string | Record<string, any>): Record<string, any>;
 export interface TextAtom {
     type: 'text';
+    index: number;
     jsxNode: string;
     nativeNode: NativeNode | null;
     child: Atom | null;
@@ -29,6 +30,7 @@ export interface TextAtom {
 }
 export interface ElementAtom {
     type: 'element';
+    index: number;
     jsxNode: JSXNode<string>;
     nativeNode: NativeNode | null;
     child: Atom | null;
@@ -37,6 +39,7 @@ export interface ElementAtom {
 }
 export interface ComponentAtom {
     type: 'component';
+    index: number;
     jsxNode: JSXNode<JSXInternal.ComponentSetup> | Component;
     nativeNode: NativeNode | null;
     child: Atom | null;

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

@@ -4,14 +4,14 @@ export interface Props {
 }
 export declare function Fragment(props: Props): () => any;
 export type Key = number | string;
-export declare function jsx(type: string | JSXInternal.ComponentSetup, props: Props, key?: Key): JSXNode;
+export declare function jsx(type: string | JSXInternal.ComponentSetup, props: Props & Record<string, any>, key?: Key): JSXNode;
 export declare const jsxs: typeof jsx;
 export interface JSXNode<T = string | JSXInternal.ComponentSetup> {
     type: T;
-    props: Props;
+    props: Props & Record<string, any>;
     key?: Key;
     on?: Record<string, ListenDelegate>;
 }
 export declare const JSXNodeFactory: {
-    createNode<T = string | JSXInternal.ComponentSetup<any>>(type: T, props: Props, key?: Key): JSXNode<T>;
+    createNode<T = string | JSXInternal.ComponentSetup<any>>(type: T, props: Props & Record<string, any>, key?: Key): JSXNode<T>;
 };

package/bundles/index.esm.js

@@ -1289,6 +1289,7 @@ function createRenderer(component, nativeRenderer) {
             isInit = false;
             const atom = {
                 type: 'component',
+                index: 0,
                 jsxNode: component,
                 sibling: null,
                 child: null,
@@ -1367,58 +1368,34 @@ function applyChanges(nativeRenderer, component) {
         isParent,
         rootHost
     };
-    diff(nativeRenderer, component, atom.child, diffAtom, context, 0, 0);
+    diff(nativeRenderer, component, atom.child, diffAtom, context);
     const next = atom.sibling;
     if (next && next.jsxNode instanceof Component) {
         next.jsxNode.$$view.host = context.host;
         next.jsxNode.$$view.isParent = context.isParent;
     }
 }
-function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expectIndex, index) {
-    let prevDiffAtom = null;
-    let firstDiffAtomIndexed = null;
-    if (oldAtom) {
-        prevDiffAtom = {
-            index,
-            atom: oldAtom,
-            prev: null
-        };
-        index++;
-        firstDiffAtomIndexed = prevDiffAtom;
-        oldAtom = oldAtom.sibling;
-        while (oldAtom) {
-            const diffAtom = {
-                index,
-                atom: oldAtom,
-                prev: prevDiffAtom
-            };
-            prevDiffAtom.next = diffAtom;
-            prevDiffAtom = diffAtom;
-            oldAtom = oldAtom.sibling;
-            index++;
-        }
-    }
+function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
     const commits = [];
     function changeOffset() {
         offset++;
     }
     while (newAtom) {
-        firstDiffAtomIndexed = createChanges(newAtom, expectIndex, firstDiffAtomIndexed, nativeRenderer, commits, context, parentComponent, changeOffset);
+        oldAtom = createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, changeOffset);
         newAtom = newAtom.sibling;
-        expectIndex++;
     }
-    let dirtyDiffAtom = firstDiffAtomIndexed;
+    let dirtyDiffAtom = oldAtom;
     while (dirtyDiffAtom) {
-        cleanView(nativeRenderer, dirtyDiffAtom.atom, false);
-        dirtyDiffAtom = dirtyDiffAtom.next;
+        cleanView(nativeRenderer, dirtyDiffAtom, false);
+        dirtyDiffAtom = dirtyDiffAtom.sibling;
     }
     let offset = 0;
     for (let i = 0; i < commits.length; i++) {
         const commit = commits[i];
-        while (firstDiffAtomIndexed) {
-            if (firstDiffAtomIndexed.index <= i) {
+        while (oldAtom) {
+            if (oldAtom.index <= i) {
                 offset--;
-                firstDiffAtomIndexed = firstDiffAtomIndexed.next;
+                oldAtom = oldAtom.sibling;
                 continue;
             }
             break;
@@ -1426,47 +1403,42 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
         commit(offset);
     }
 }
-function createChanges(newAtom, expectIndex, diffAtomIndexed, nativeRenderer, commits, context, parentComponent, effect) {
-    const startDiffAtom = diffAtomIndexed;
+function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, effect) {
+    const startDiffAtom = oldAtom;
     const { jsxNode: newJsxNode, type } = newAtom;
     const key = newJsxNode.key;
-    while (diffAtomIndexed) {
-        const { atom: diffAtom, index: diffIndex } = diffAtomIndexed;
-        if (type === diffAtom.type) {
+    let prev = null;
+    while (oldAtom) {
+        const diffIndex = oldAtom.index;
+        if (type === oldAtom.type) {
             let commit;
             if (type === 'text') {
-                commit = updateText(newAtom, diffAtom, nativeRenderer, context);
+                commit = updateText(newAtom, oldAtom, nativeRenderer, context);
             }
             else {
-                const { key: diffKey, type: diffType } = diffAtom.jsxNode;
+                const { key: diffKey, type: diffType } = oldAtom.jsxNode;
                 if (diffKey !== key || newJsxNode.type !== diffType) {
-                    diffAtomIndexed = diffAtomIndexed.next;
+                    prev = oldAtom;
+                    oldAtom = oldAtom.sibling;
                     continue;
                 }
                 if (type === 'component') {
-                    commit = updateComponent(newAtom, diffAtom, expectIndex, diffIndex, nativeRenderer, context);
+                    commit = updateComponent(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context);
                 }
                 else {
-                    commit = updateElement(newAtom, diffAtom, expectIndex, diffIndex, nativeRenderer, context, parentComponent);
+                    commit = updateElement(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context, parentComponent);
                 }
             }
             commits.push(commit);
-            const next = diffAtomIndexed.next;
-            const prev = diffAtomIndexed.prev;
+            const next = oldAtom.sibling;
             if (!prev) {
-                diffAtomIndexed = next;
-                if (diffAtomIndexed) {
-                    diffAtomIndexed.prev = null;
-                }
-                return diffAtomIndexed;
-            }
-            prev.next = next;
-            if (next) {
-                next.prev = prev;
+                return next;
             }
+            prev.sibling = next;
             return startDiffAtom;
         }
-        diffAtomIndexed = diffAtomIndexed.next;
+        prev = oldAtom;
+        oldAtom = oldAtom.sibling;
     }
     commits.push(createNewView(newAtom, nativeRenderer, context, parentComponent, effect));
     return startDiffAtom;
@@ -1502,7 +1474,7 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
                 host: newAtom.nativeNode,
                 isParent: true,
                 rootHost: context.rootHost
-            }, 0, 0);
+            });
         }
         else if (oldAtom.child) {
             let atom = oldAtom.child;
@@ -1534,7 +1506,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 + offset);
+            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context);
         }
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;
@@ -1608,6 +1580,7 @@ function componentRender(nativeRenderer, component, from, context) {
 function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
     const atom = {
         type: 'component',
+        index: prevAtom.index + 1,
         jsxNode,
         sibling: null,
         child: null,
@@ -1620,6 +1593,7 @@ function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
 function createChainByJSXText(jsxNode, prevAtom, isSvg) {
     const atom = {
         type: 'text',
+        index: prevAtom.index + 1,
         jsxNode,
         sibling: null,
         child: null,
@@ -1633,6 +1607,7 @@ function createChainByJSXElement(element, prevAtom, isSvg) {
     isSvg = isSvg || element.type === 'svg';
     const atom = {
         type: 'element',
+        index: prevAtom.index + 1,
         jsxNode: element,
         sibling: null,
         child: null,
@@ -1672,7 +1647,7 @@ function createChainByChildren(children, prevAtom, isSvg) {
     return prevAtom;
 }
 function createChildChain(template, isSvg) {
-    const beforeAtom = { sibling: null };
+    const beforeAtom = { sibling: null, index: -1 };
     createChainByNode(template, beforeAtom, isSvg);
     return beforeAtom.sibling;
 }

package/bundles/index.js

@@ -1291,6 +1291,7 @@ function createRenderer(component, nativeRenderer) {
             isInit = false;
             const atom = {
                 type: 'component',
+                index: 0,
                 jsxNode: component,
                 sibling: null,
                 child: null,
@@ -1369,58 +1370,34 @@ function applyChanges(nativeRenderer, component) {
         isParent,
         rootHost
     };
-    diff(nativeRenderer, component, atom.child, diffAtom, context, 0, 0);
+    diff(nativeRenderer, component, atom.child, diffAtom, context);
     const next = atom.sibling;
     if (next && next.jsxNode instanceof Component) {
         next.jsxNode.$$view.host = context.host;
         next.jsxNode.$$view.isParent = context.isParent;
     }
 }
-function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expectIndex, index) {
-    let prevDiffAtom = null;
-    let firstDiffAtomIndexed = null;
-    if (oldAtom) {
-        prevDiffAtom = {
-            index,
-            atom: oldAtom,
-            prev: null
-        };
-        index++;
-        firstDiffAtomIndexed = prevDiffAtom;
-        oldAtom = oldAtom.sibling;
-        while (oldAtom) {
-            const diffAtom = {
-                index,
-                atom: oldAtom,
-                prev: prevDiffAtom
-            };
-            prevDiffAtom.next = diffAtom;
-            prevDiffAtom = diffAtom;
-            oldAtom = oldAtom.sibling;
-            index++;
-        }
-    }
+function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
     const commits = [];
     function changeOffset() {
         offset++;
     }
     while (newAtom) {
-        firstDiffAtomIndexed = createChanges(newAtom, expectIndex, firstDiffAtomIndexed, nativeRenderer, commits, context, parentComponent, changeOffset);
+        oldAtom = createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, changeOffset);
         newAtom = newAtom.sibling;
-        expectIndex++;
     }
-    let dirtyDiffAtom = firstDiffAtomIndexed;
+    let dirtyDiffAtom = oldAtom;
     while (dirtyDiffAtom) {
-        cleanView(nativeRenderer, dirtyDiffAtom.atom, false);
-        dirtyDiffAtom = dirtyDiffAtom.next;
+        cleanView(nativeRenderer, dirtyDiffAtom, false);
+        dirtyDiffAtom = dirtyDiffAtom.sibling;
     }
     let offset = 0;
     for (let i = 0; i < commits.length; i++) {
         const commit = commits[i];
-        while (firstDiffAtomIndexed) {
-            if (firstDiffAtomIndexed.index <= i) {
+        while (oldAtom) {
+            if (oldAtom.index <= i) {
                 offset--;
-                firstDiffAtomIndexed = firstDiffAtomIndexed.next;
+                oldAtom = oldAtom.sibling;
                 continue;
             }
             break;
@@ -1428,47 +1405,42 @@ function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context, expect
         commit(offset);
     }
 }
-function createChanges(newAtom, expectIndex, diffAtomIndexed, nativeRenderer, commits, context, parentComponent, effect) {
-    const startDiffAtom = diffAtomIndexed;
+function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, effect) {
+    const startDiffAtom = oldAtom;
     const { jsxNode: newJsxNode, type } = newAtom;
     const key = newJsxNode.key;
-    while (diffAtomIndexed) {
-        const { atom: diffAtom, index: diffIndex } = diffAtomIndexed;
-        if (type === diffAtom.type) {
+    let prev = null;
+    while (oldAtom) {
+        const diffIndex = oldAtom.index;
+        if (type === oldAtom.type) {
             let commit;
             if (type === 'text') {
-                commit = updateText(newAtom, diffAtom, nativeRenderer, context);
+                commit = updateText(newAtom, oldAtom, nativeRenderer, context);
             }
             else {
-                const { key: diffKey, type: diffType } = diffAtom.jsxNode;
+                const { key: diffKey, type: diffType } = oldAtom.jsxNode;
                 if (diffKey !== key || newJsxNode.type !== diffType) {
-                    diffAtomIndexed = diffAtomIndexed.next;
+                    prev = oldAtom;
+                    oldAtom = oldAtom.sibling;
                     continue;
                 }
                 if (type === 'component') {
-                    commit = updateComponent(newAtom, diffAtom, expectIndex, diffIndex, nativeRenderer, context);
+                    commit = updateComponent(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context);
                 }
                 else {
-                    commit = updateElement(newAtom, diffAtom, expectIndex, diffIndex, nativeRenderer, context, parentComponent);
+                    commit = updateElement(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context, parentComponent);
                 }
             }
             commits.push(commit);
-            const next = diffAtomIndexed.next;
-            const prev = diffAtomIndexed.prev;
+            const next = oldAtom.sibling;
             if (!prev) {
-                diffAtomIndexed = next;
-                if (diffAtomIndexed) {
-                    diffAtomIndexed.prev = null;
-                }
-                return diffAtomIndexed;
-            }
-            prev.next = next;
-            if (next) {
-                next.prev = prev;
+                return next;
             }
+            prev.sibling = next;
             return startDiffAtom;
         }
-        diffAtomIndexed = diffAtomIndexed.next;
+        prev = oldAtom;
+        oldAtom = oldAtom.sibling;
     }
     commits.push(createNewView(newAtom, nativeRenderer, context, parentComponent, effect));
     return startDiffAtom;
@@ -1504,7 +1476,7 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
                 host: newAtom.nativeNode,
                 isParent: true,
                 rootHost: context.rootHost
-            }, 0, 0);
+            });
         }
         else if (oldAtom.child) {
             let atom = oldAtom.child;
@@ -1536,7 +1508,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 + offset);
+            diff(nativeRenderer, component, newAtom.child, reusedAtom.child, context);
         }
         else if (reusedAtom.child) {
             let atom = reusedAtom.child;
@@ -1610,6 +1582,7 @@ function componentRender(nativeRenderer, component, from, context) {
 function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
     const atom = {
         type: 'component',
+        index: prevAtom.index + 1,
         jsxNode,
         sibling: null,
         child: null,
@@ -1622,6 +1595,7 @@ function createChainByJSXComponent(jsxNode, prevAtom, isSvg) {
 function createChainByJSXText(jsxNode, prevAtom, isSvg) {
     const atom = {
         type: 'text',
+        index: prevAtom.index + 1,
         jsxNode,
         sibling: null,
         child: null,
@@ -1635,6 +1609,7 @@ function createChainByJSXElement(element, prevAtom, isSvg) {
     isSvg = isSvg || element.type === 'svg';
     const atom = {
         type: 'element',
+        index: prevAtom.index + 1,
         jsxNode: element,
         sibling: null,
         child: null,
@@ -1674,7 +1649,7 @@ function createChainByChildren(children, prevAtom, isSvg) {
     return prevAtom;
 }
 function createChildChain(template, isSvg) {
-    const beforeAtom = { sibling: null };
+    const beforeAtom = { sibling: null, index: -1 };
     createChainByNode(template, beforeAtom, isSvg);
     return beforeAtom.sibling;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.6",
   "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,8 +47,8 @@
   "bugs": {
     "url": "https://github.com/viewfly/viewfly.git/issues"
   },
-  "gitHead": "176e9fdb7415d029541a1da102001d9bab6c3319",
+  "gitHead": "f92d3c923b1b9f115b928bc57f4d8adf1f8100c9",
   "dependencies": {
-    "reflect-metadata": "^0.1.13"
+    "reflect-metadata": "^0.2.2"
   }
 }