Rename assigning functions

Author: immitsu

lib/parse/attrs.js

@@ -28,10 +28,9 @@ const revalueAttr = (attr, val) => {
 export const prepareExcludedAttrs = attrs =>
   attrs && new Set(attrs.map(attr => attr.toLowerCase()))
 
-export const assignAttrs = (item, attrs, excluded) => {
+export const mixinAttrs = (item, attrs, excluded) => {
   for (const attr in attrs) {
     if (excluded?.has(attr)) continue
     item[attr] = revalueAttr(attr, attrs[attr])
   }
-  return item
 }

lib/parse/flat-parse.js

@@ -1,18 +1,18 @@
-import { assignAttrs, prepareExcludedAttrs } from './attrs.js'
+import { mixinAttrs, prepareExcludedAttrs } from './attrs.js'
 import { traverse } from './traverse.js'
 
 export const flatParse = (text, opts = {}) => {
   const bookmarks = []
   const folders = []
 
   let currFolder = []
-  let entityId = 0
+  let itemId = 0
 
   const excludedAttrs = prepareExcludedAttrs(opts.excludeAttrs)
 
   const setupItem = (item, attrs) => {
-    assignAttrs(item, attrs, excludedAttrs)
-    opts.withId && (item.id = entityId++)
+    mixinAttrs(item, attrs, excludedAttrs)
+    opts.withId && (item.id = itemId++)
     return item
   }
 

lib/parse/parse.js

@@ -1,15 +1,14 @@
-import { assignAttrs, prepareExcludedAttrs } from './attrs.js'
+import { mixinAttrs, prepareExcludedAttrs } from './attrs.js'
 import { traverse } from './traverse.js'
 
 export const parse = (text, opts = {}) => {
-  let rootFolder
-  let currFolder
+  let currFolder, rootFolder
 
   const folders = []
 
   const excludedAttrs = prepareExcludedAttrs(opts.excludeAttrs)
 
-  const assignId = item => {
+  const mixinId = item => {
     if (currFolder) {
       const { id, items } = currFolder
       item.pid = id
@@ -20,8 +19,8 @@ export const parse = (text, opts = {}) => {
   }
 
   const setupItem = (item, attrs) => {
-    assignAttrs(item, attrs, excludedAttrs)
-    opts.withId && assignId(item)
+    mixinAttrs(item, attrs, excludedAttrs)
+    opts.withId && mixinId(item)
     return item
   }