@viewfly/core 1.0.0-alpha.13 → 1.0.0-alpha.14

package/bundles/index.d.ts

@@ -113,7 +113,7 @@ interface Prop {
 declare const Prop: PropDecorator;
 
 declare const THROW_IF_NOT_FOUND: any;
-declare class NullInjector extends Injector {
+declare class NullInjector implements Injector {
     parentInjector: null;
     get(token: any, notFoundValue?: any, _?: InjectFlags): any;
 }
@@ -167,9 +167,8 @@ declare function normalizeProvider(provider: Provider): NormalizedProvider;
 /**
  * 反射注入器
  */
-declare class ReflectiveInjector extends Injector {
+declare class ReflectiveInjector implements Injector {
     parentInjector: Injector | null;
-    protected staticProviders: Provider[];
     protected scope?: Scope | undefined;
     protected normalizedProviders: NormalizedProvider[];
     protected recordValues: Map<Type<any> | AbstractType<any> | InjectionToken<any>, any>;
@@ -531,6 +530,8 @@ interface TextAtom {
     child: Atom | null;
     sibling: Atom | null;
     isSvg: boolean;
+    update: null | ((insertOffset: number) => void);
+    next: Atom | null;
 }
 interface ElementAtom {
     type: typeof ElementAtomType;
@@ -540,6 +541,8 @@ interface ElementAtom {
     child: Atom | null;
     sibling: Atom | null;
     isSvg: boolean;
+    update: null | ((insertOffset: number) => void);
+    next: Atom | null;
 }
 interface ComponentAtom {
     type: typeof ComponentAtomType;
@@ -549,6 +552,8 @@ interface ComponentAtom {
     child: Atom | null;
     sibling: Atom | null;
     isSvg: boolean;
+    update: null | ((insertOffset: number) => void);
+    next: Atom | null;
 }
 type Atom = TextAtom | ElementAtom | ComponentAtom;
 interface ComponentView {

package/bundles/index.esm.js

@@ -234,9 +234,8 @@ const THROW_IF_NOT_FOUND = {
 const nullInjectorErrorFn = (token) => {
     return makeError('NullInjector')(`No provide for \`${stringify(token)}\`!`);
 };
-class NullInjector extends Injector {
+class NullInjector {
     constructor() {
-        super(...arguments);
         this.parentInjector = null;
     }
     /* eslint-disable-next-line */
@@ -411,11 +410,9 @@ const provideScopeError = (token) => {
 /**
  * 反射注入器
  */
-class ReflectiveInjector extends Injector {
+class ReflectiveInjector {
     constructor(parentInjector, staticProviders, scope) {
-        super();
         this.parentInjector = parentInjector;
-        this.staticProviders = staticProviders;
         this.scope = scope;
         this.recordValues = new Map();
         this.normalizedProviders = staticProviders.map(provide => {
@@ -1301,7 +1298,9 @@ function createRenderer(component, nativeRenderer) {
                 sibling: null,
                 child: null,
                 nativeNode: null,
-                isSvg: false
+                isSvg: false,
+                update: null,
+                next: null
             };
             componentRender(nativeRenderer, component, atom, {
                 isParent: true,
@@ -1371,72 +1370,61 @@ function applyChanges(nativeRenderer, component) {
     }
 }
 function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
-    const commits = [];
-    function changeOffset() {
-        offset++;
-    }
-    while (newAtom) {
-        oldAtom = createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, changeOffset);
-        newAtom = newAtom.sibling;
-    }
-    let dirtyDiffAtom = oldAtom;
-    while (dirtyDiffAtom) {
-        cleanView(nativeRenderer, dirtyDiffAtom, true);
-        dirtyDiffAtom = dirtyDiffAtom.sibling;
-    }
-    let offset = 0;
-    for (let i = 0; i < commits.length; i++) {
-        const commit = commits[i];
-        while (oldAtom) {
-            if (oldAtom.index <= i) {
-                offset--;
-                oldAtom = oldAtom.sibling;
-                continue;
-            }
-            break;
-        }
-        commit(offset);
-    }
-}
-function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, effect) {
-    const startDiffAtom = oldAtom;
-    const { jsxNode: newJsxNode, type } = newAtom;
-    const key = newJsxNode.key;
-    let prev = null;
+    let updateAtom = newAtom;
+    let insertOffset = 0;
+    let deleteOffset = 0;
     while (oldAtom) {
-        const diffIndex = oldAtom.index;
-        if (type === oldAtom.type) {
-            let commit;
-            if (type === TextAtomType) {
-                commit = updateText(newAtom, oldAtom, nativeRenderer, context);
-            }
-            else {
-                const { key: diffKey, type: diffType } = oldAtom.jsxNode;
-                if (diffKey !== key || newJsxNode.type !== diffType) {
-                    prev = oldAtom;
-                    oldAtom = oldAtom.sibling;
-                    continue;
-                }
-                if (type === ComponentAtomType) {
-                    commit = updateComponent(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context);
+        const startDiffAtom = newAtom;
+        let prev = null;
+        let isUsed = false;
+        while (newAtom) {
+            const newAtomType = newAtom.type;
+            if (oldAtom.type === newAtomType) {
+                if (newAtomType === TextAtomType) {
+                    newAtom.update = updateText(newAtom, oldAtom, nativeRenderer, context);
+                    isUsed = true;
                 }
                 else {
-                    commit = updateElement(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context, parentComponent);
+                    const { key: newKey, type: newType } = newAtom.jsxNode;
+                    const { key: oldKey, type: oldType } = oldAtom.jsxNode;
+                    if (newType === oldType && newKey === oldKey) {
+                        if (newAtomType === ComponentAtomType) {
+                            newAtom.update = updateComponent(newAtom, oldAtom, deleteOffset, nativeRenderer, context);
+                        }
+                        else {
+                            newAtom.update = updateElement(newAtom, oldAtom, deleteOffset, nativeRenderer, context, parentComponent);
+                        }
+                        isUsed = true;
+                    }
                 }
             }
-            commits.push(commit);
-            const next = oldAtom.sibling;
-            if (!prev) {
-                return next;
+            if (isUsed) {
+                const sibling = newAtom.next || newAtom.sibling;
+                if (prev) {
+                    prev.next = sibling;
+                }
+                newAtom = newAtom === startDiffAtom ? sibling : startDiffAtom;
+                break;
             }
-            prev.sibling = next;
-            return startDiffAtom;
+            prev = newAtom;
+            newAtom = newAtom.next || newAtom.sibling;
+        }
+        if (!isUsed) {
+            newAtom = startDiffAtom;
+            deleteOffset++;
+            cleanView(nativeRenderer, oldAtom, true);
         }
-        prev = oldAtom;
         oldAtom = oldAtom.sibling;
     }
-    commits.push(createNewView(newAtom, nativeRenderer, context, parentComponent, effect));
-    return startDiffAtom;
+    function changeOffset() {
+        insertOffset++;
+    }
+    while (updateAtom) {
+        const update = updateAtom.update || createNewView(updateAtom, nativeRenderer, context, parentComponent, changeOffset);
+        update(insertOffset);
+        updateAtom.next = updateAtom.update = null;
+        updateAtom = updateAtom.sibling;
+    }
 }
 function createNewView(start, nativeRenderer, context, parentComponent, effect) {
     return function () {
@@ -1455,10 +1443,10 @@ function updateText(newAtom, oldAtom, nativeRenderer, context) {
         context.isParent = false;
     };
 }
-function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer, context, parentComponent) {
-    return function (offset) {
+function updateElement(newAtom, oldAtom, deleteOffset, nativeRenderer, context, parentComponent) {
+    return function (insertOffset) {
         newAtom.nativeNode = oldAtom.nativeNode;
-        if (expectIndex - offset !== oldIndex) {
+        if (newAtom.index - insertOffset !== oldAtom.index - deleteOffset) {
             insertNode(nativeRenderer, newAtom, context);
         }
         context.host = newAtom.nativeNode;
@@ -1466,8 +1454,8 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
         updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, context);
     };
 }
-function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRenderer, context) {
-    return function (offset) {
+function updateComponent(newAtom, reusedAtom, deleteOffset, nativeRenderer, context) {
+    return function (insertOffset) {
         const component = reusedAtom.jsxNode;
         const newProps = newAtom.jsxNode.props;
         const oldTemplate = component.template;
@@ -1477,7 +1465,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         componentViewCache.set(component, Object.assign({ atom: newAtom }, context));
         newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
-            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
+            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, newAtom.index - insertOffset !== reusedAtom.index - deleteOffset);
             updateView(nativeRenderer, component);
             return;
         }
@@ -1572,7 +1560,9 @@ function createChainByJSXNode(type, jsxNode, prevAtom, isSvg) {
         sibling: null,
         child: null,
         nativeNode: null,
-        isSvg
+        isSvg,
+        update: null,
+        next: null
     };
     prevAtom.sibling = atom;
     return atom;

package/bundles/index.js

@@ -236,9 +236,8 @@ const THROW_IF_NOT_FOUND = {
 const nullInjectorErrorFn = (token) => {
     return makeError('NullInjector')(`No provide for \`${stringify(token)}\`!`);
 };
-class NullInjector extends Injector {
+class NullInjector {
     constructor() {
-        super(...arguments);
         this.parentInjector = null;
     }
     /* eslint-disable-next-line */
@@ -413,11 +412,9 @@ const provideScopeError = (token) => {
 /**
  * 反射注入器
  */
-class ReflectiveInjector extends Injector {
+class ReflectiveInjector {
     constructor(parentInjector, staticProviders, scope) {
-        super();
         this.parentInjector = parentInjector;
-        this.staticProviders = staticProviders;
         this.scope = scope;
         this.recordValues = new Map();
         this.normalizedProviders = staticProviders.map(provide => {
@@ -1303,7 +1300,9 @@ function createRenderer(component, nativeRenderer) {
                 sibling: null,
                 child: null,
                 nativeNode: null,
-                isSvg: false
+                isSvg: false,
+                update: null,
+                next: null
             };
             componentRender(nativeRenderer, component, atom, {
                 isParent: true,
@@ -1373,72 +1372,61 @@ function applyChanges(nativeRenderer, component) {
     }
 }
 function diff(nativeRenderer, parentComponent, newAtom, oldAtom, context) {
-    const commits = [];
-    function changeOffset() {
-        offset++;
-    }
-    while (newAtom) {
-        oldAtom = createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, changeOffset);
-        newAtom = newAtom.sibling;
-    }
-    let dirtyDiffAtom = oldAtom;
-    while (dirtyDiffAtom) {
-        cleanView(nativeRenderer, dirtyDiffAtom, true);
-        dirtyDiffAtom = dirtyDiffAtom.sibling;
-    }
-    let offset = 0;
-    for (let i = 0; i < commits.length; i++) {
-        const commit = commits[i];
-        while (oldAtom) {
-            if (oldAtom.index <= i) {
-                offset--;
-                oldAtom = oldAtom.sibling;
-                continue;
-            }
-            break;
-        }
-        commit(offset);
-    }
-}
-function createChanges(newAtom, oldAtom, nativeRenderer, commits, context, parentComponent, effect) {
-    const startDiffAtom = oldAtom;
-    const { jsxNode: newJsxNode, type } = newAtom;
-    const key = newJsxNode.key;
-    let prev = null;
+    let updateAtom = newAtom;
+    let insertOffset = 0;
+    let deleteOffset = 0;
     while (oldAtom) {
-        const diffIndex = oldAtom.index;
-        if (type === oldAtom.type) {
-            let commit;
-            if (type === TextAtomType) {
-                commit = updateText(newAtom, oldAtom, nativeRenderer, context);
-            }
-            else {
-                const { key: diffKey, type: diffType } = oldAtom.jsxNode;
-                if (diffKey !== key || newJsxNode.type !== diffType) {
-                    prev = oldAtom;
-                    oldAtom = oldAtom.sibling;
-                    continue;
-                }
-                if (type === ComponentAtomType) {
-                    commit = updateComponent(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context);
+        const startDiffAtom = newAtom;
+        let prev = null;
+        let isUsed = false;
+        while (newAtom) {
+            const newAtomType = newAtom.type;
+            if (oldAtom.type === newAtomType) {
+                if (newAtomType === TextAtomType) {
+                    newAtom.update = updateText(newAtom, oldAtom, nativeRenderer, context);
+                    isUsed = true;
                 }
                 else {
-                    commit = updateElement(newAtom, oldAtom, newAtom.index, diffIndex, nativeRenderer, context, parentComponent);
+                    const { key: newKey, type: newType } = newAtom.jsxNode;
+                    const { key: oldKey, type: oldType } = oldAtom.jsxNode;
+                    if (newType === oldType && newKey === oldKey) {
+                        if (newAtomType === ComponentAtomType) {
+                            newAtom.update = updateComponent(newAtom, oldAtom, deleteOffset, nativeRenderer, context);
+                        }
+                        else {
+                            newAtom.update = updateElement(newAtom, oldAtom, deleteOffset, nativeRenderer, context, parentComponent);
+                        }
+                        isUsed = true;
+                    }
                 }
             }
-            commits.push(commit);
-            const next = oldAtom.sibling;
-            if (!prev) {
-                return next;
+            if (isUsed) {
+                const sibling = newAtom.next || newAtom.sibling;
+                if (prev) {
+                    prev.next = sibling;
+                }
+                newAtom = newAtom === startDiffAtom ? sibling : startDiffAtom;
+                break;
             }
-            prev.sibling = next;
-            return startDiffAtom;
+            prev = newAtom;
+            newAtom = newAtom.next || newAtom.sibling;
+        }
+        if (!isUsed) {
+            newAtom = startDiffAtom;
+            deleteOffset++;
+            cleanView(nativeRenderer, oldAtom, true);
         }
-        prev = oldAtom;
         oldAtom = oldAtom.sibling;
     }
-    commits.push(createNewView(newAtom, nativeRenderer, context, parentComponent, effect));
-    return startDiffAtom;
+    function changeOffset() {
+        insertOffset++;
+    }
+    while (updateAtom) {
+        const update = updateAtom.update || createNewView(updateAtom, nativeRenderer, context, parentComponent, changeOffset);
+        update(insertOffset);
+        updateAtom.next = updateAtom.update = null;
+        updateAtom = updateAtom.sibling;
+    }
 }
 function createNewView(start, nativeRenderer, context, parentComponent, effect) {
     return function () {
@@ -1457,10 +1445,10 @@ function updateText(newAtom, oldAtom, nativeRenderer, context) {
         context.isParent = false;
     };
 }
-function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer, context, parentComponent) {
-    return function (offset) {
+function updateElement(newAtom, oldAtom, deleteOffset, nativeRenderer, context, parentComponent) {
+    return function (insertOffset) {
         newAtom.nativeNode = oldAtom.nativeNode;
-        if (expectIndex - offset !== oldIndex) {
+        if (newAtom.index - insertOffset !== oldAtom.index - deleteOffset) {
             insertNode(nativeRenderer, newAtom, context);
         }
         context.host = newAtom.nativeNode;
@@ -1468,8 +1456,8 @@ function updateElement(newAtom, oldAtom, expectIndex, oldIndex, nativeRenderer,
         updateNativeNodeProperties(nativeRenderer, newAtom, oldAtom, parentComponent, context);
     };
 }
-function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRenderer, context) {
-    return function (offset) {
+function updateComponent(newAtom, reusedAtom, deleteOffset, nativeRenderer, context) {
+    return function (insertOffset) {
         const component = reusedAtom.jsxNode;
         const newProps = newAtom.jsxNode.props;
         const oldTemplate = component.template;
@@ -1479,7 +1467,7 @@ function updateComponent(newAtom, reusedAtom, expectIndex, oldIndex, nativeRende
         componentViewCache.set(component, Object.assign({ atom: newAtom }, context));
         newAtom.jsxNode = component;
         if (newTemplate === oldTemplate) {
-            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, expectIndex - offset !== oldIndex);
+            reuseComponentView(nativeRenderer, newAtom, reusedAtom, context, newAtom.index - insertOffset !== reusedAtom.index - deleteOffset);
             updateView(nativeRenderer, component);
             return;
         }
@@ -1574,7 +1562,9 @@ function createChainByJSXNode(type, jsxNode, prevAtom, isSvg) {
         sibling: null,
         child: null,
         nativeNode: null,
-        isSvg
+        isSvg,
+        update: null,
+        next: null
     };
     prevAtom.sibling = atom;
     return atom;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewfly/core",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "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": "ef79169385a2b104fc58cb0b38123443e5baccd7",
+  "gitHead": "48779d88f1390751bbd06e4c4581bf3dbe613a26",
   "dependencies": {
     "reflect-metadata": "^0.2.2"
   }