refactor: serialize ruleIndex in records

gaoding-inc · Dec 13, 2018 · 930775c · 930775c
1 parent c29a36e
commit 930775c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/src/history.js b/src/history.js
@@ -61,7 +61,7 @@ export class History {
     } else if (!this.useChunks) {
       resultState = currentRecord
     } else {
-      resultState = record2State(currentRecord, this.$chunks)
+      resultState = record2State(currentRecord, this.$chunks, this.rules)
     }
     this.onChange(resultState)
     return resultState

diff --git a/src/transform.js b/src/transform.js
@@ -12,10 +12,10 @@ const defaultRule = {
 export const state2Record = (
   stateNode, chunkPool, rules = [], prevRecord = null, pickIndex = -1
 ) => {
-  const rule = rules.find(({ match }) => match(stateNode)) || defaultRule
-  const { toRecord } = rule
+  const ruleIndex = rules.findIndex(({ match }) => match(stateNode))
+  const rule = (rules[ruleIndex] || defaultRule)
 
-  const { chunks, children } = toRecord(stateNode)
+  const { chunks, children } = rule.toRecord(stateNode)
   const recordChildren = children
   const hashes = []
   for (let i = 0; i < chunks.length; i++) {
@@ -30,22 +30,25 @@ export const state2Record = (
     childrenCopy[pickIndex] = state2Record(
       recordChildren[pickIndex], chunkPool, rules
     )
-    return { hashes, rule, children: childrenCopy }
+    return { hashes, ruleIndex, children: childrenCopy }
   } else {
     return {
       hashes,
-      rule,
+      ruleIndex,
       children: children &&
         children.map(node => state2Record(node, chunkPool, rules))
     }
   }
 }
 
-export const record2State = (recordNode, chunkPool) => {
-  const { hashes, rule: { fromRecord }, children } = recordNode
+export const record2State = (recordNode, chunkPool, rules = []) => {
+  const { hashes, ruleIndex, children } = recordNode
   const chunks = hashes.map(hash => JSON.parse(chunkPool[hash]))
-  return fromRecord({
+  const rule = (rules[ruleIndex] || defaultRule)
+  return rule.fromRecord({
     chunks,
-    children: children && children.map(node => record2State(node, chunkPool))
+    children: children && children.map(
+      node => record2State(node, chunkPool, rules)
+    )
   })
 }
diff --git a/src/transform.test.js b/src/transform.test.js
@@ -64,7 +64,7 @@ test('custom match children props', () => {
     ]
   }
 
-  const rule = {
+  const rules = [{
     match: () => true,
     toRecord: node => ({
       chunks: [{ ...node, elements: undefined }],
@@ -74,11 +74,11 @@ test('custom match children props', () => {
       ...chunks[0],
       elements: children
     })
-  }
+  }]
 
   const chunks = {}
-  const record = state2Record(state, chunks, [rule])
-  const resultState = record2State(record, chunks)
+  const record = state2Record(state, chunks, rules)
+  const resultState = record2State(record, chunks, rules)
   expect(resultState).toEqual(state)
 })
 
@@ -108,7 +108,7 @@ test('support node splitting', () => {
 
   const chunks = {}
   const record = state2Record(state, chunks, [rule])
-  const resultState = record2State(record, chunks)
+  const resultState = record2State(record, chunks, [rule])
   expect(resultState).toEqual(state)
   expect(Object.keys(chunks).length).toEqual(1 + 3 * 2) // root + 2 * leaves
 })
@@ -153,7 +153,7 @@ test('support multi rules', () => {
 
   const chunks = {}
   const record = state2Record(state, chunks, rules)
-  const resultState = record2State(record, chunks)
+  const resultState = record2State(record, chunks, rules)
   expect(resultState).toEqual(state)
 })