parse u2028 char properly

browser/main/lib/dataApi/addStorage.js

@@ -4,7 +4,7 @@ const resolveStorageData = require('./resolveStorageData')
 const resolveStorageNotes = require('./resolveStorageNotes')
 const consts = require('browser/lib/consts')
 const path = require('path')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 /**
  * @param {Object}
  * name, path, type

browser/main/lib/dataApi/createFolder.js

@@ -2,7 +2,7 @@ const _ = require('lodash')
 const keygen = require('browser/lib/keygen')
 const path = require('path')
 const resolveStorageData = require('./resolveStorageData')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 /**
  * @param {String} storageKey

browser/main/lib/dataApi/createNote.js

@@ -3,7 +3,7 @@ const resolveStorageData = require('./resolveStorageData')
 const _ = require('lodash')
 const keygen = require('browser/lib/keygen')
 const path = require('path')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 function validateInput (input) {
   if (!_.isArray(input.tags)) input.tags = []

browser/main/lib/dataApi/deleteFolder.js

@@ -2,7 +2,7 @@ const _ = require('lodash')
 const path = require('path')
 const resolveStorageData = require('./resolveStorageData')
 const resolveStorageNotes = require('./resolveStorageNotes')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const sander = require('sander')
 
 /**

browser/main/lib/dataApi/init.js

@@ -4,7 +4,7 @@ const resolveStorageData = require('./resolveStorageData')
 const resolveStorageNotes = require('./resolveStorageNotes')
 const consts = require('browser/lib/consts')
 const path = require('path')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 /**
  * @return {Object} all storages and notes
  * ```

browser/main/lib/dataApi/migrateFromV5Storage.js

@@ -2,7 +2,7 @@ const _ = require('lodash')
 const keygen = require('browser/lib/keygen')
 const resolveStorageData = require('./resolveStorageData')
 const consts = require('browser/lib/consts')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const path = require('path')
 const sander = require('sander')
 

browser/main/lib/dataApi/migrateFromV6Storage.js

@@ -2,7 +2,7 @@ const path = require('path')
 const sander = require('sander')
 const keygen = require('browser/lib/keygen')
 const _ = require('lodash')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 function migrateFromV5Storage (storagePath) {
   var boostnoteJSONPath = path.join(storagePath, 'boostnote.json')
@@ -45,10 +45,6 @@ function migrateFromV5Storage (storagePath) {
               console.warn('Failed to fetch notes from ', folderDataJSONPath, err)
               return []
             })
-            .then(function deleteFolderDir (data) {
-              sander.rimrafSync(path.join(storagePath, folder.key))
-              return data
-            })
         })
 
       return Promise.all(fetchNotesFromEachFolder)
@@ -58,22 +54,30 @@ function migrateFromV5Storage (storagePath) {
               return sum.concat(notes)
             }, [])
         })
-    })
+        .then(function saveNotes (notes) {
-    .then(function saveNotes (notes) {
+          notes.forEach(function renewKey (note) {
-      notes.forEach(function renewKey (note) {
+            var newKey = keygen()
-        var newKey = keygen()
+            while (notes.some((_note) => _note.key === newKey)) {
-        while (notes.some((_note) => _note.key === newKey)) {
+              newKey = keygen()
-          newKey = keygen()
+            }
-        }
+            note.key = newKey
-        note.key = newKey
+          })
-      })
 
-      const noteDirPath = path.join(storagePath, 'notes')
+          const noteDirPath = path.join(storagePath, 'notes')
-      notes
+          notes
-        .map(function saveNote (note) {
+            .map(function saveNote (note) {
-          CSON.writeFileSync(path.join(noteDirPath, note.key) + '.cson', note)
+              CSON.writeFileSync(path.join(noteDirPath, note.key) + '.cson', note)
+            })
+          return true
+        })
+        .then(function deleteFolderDir (check) {
+          if (check) {
+            boostnoteJSONData.folders.forEach((folder) => {
+              sander.rimrafSync(path.join(storagePath, folder.key))
+            })
+          }
+          return check
         })
-      return true
     })
     .catch(function handleError (err) {
       console.warn(err)

browser/main/lib/dataApi/moveNote.js

@@ -1,7 +1,7 @@
 const resolveStorageData = require('./resolveStorageData')
 const _ = require('lodash')
 const path = require('path')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const keygen = require('browser/lib/keygen')
 const sander = require('sander')
 

browser/main/lib/dataApi/resolveStorageData.js

@@ -1,6 +1,6 @@
 const _ = require('lodash')
 const path = require('path')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const migrateFromV6Storage = require('./migrateFromV6Storage')
 
 function resolveStorageData (storageCache) {

browser/main/lib/dataApi/resolveStorageNotes.js

@@ -1,6 +1,6 @@
 const sander = require('sander')
 const path = require('path')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 function resolveStorageNotes (storage) {
   const notesDirPath = path.join(storage.path, 'notes')

browser/main/lib/dataApi/updateFolder.js

@@ -1,7 +1,7 @@
 const _ = require('lodash')
 const path = require('path')
 const resolveStorageData = require('./resolveStorageData')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 /**
  * @param {String} storageKey

browser/main/lib/dataApi/updateNote.js

@@ -1,7 +1,7 @@
 const resolveStorageData = require('./resolveStorageData')
 const _ = require('lodash')
 const path = require('path')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 function validateInput (input) {
   let validatedInput = {}
@@ -14,7 +14,7 @@ function validateInput (input) {
 
   if (input.title != null) {
     if (!_.isString(input.title)) validatedInput.title = ''
-    else validatedInput.title = input.title.replace(/[\u2028]+/g, '')
+    else validatedInput.title = input.title
   }
 
   if (input.isStarred != null) {
@@ -26,13 +26,13 @@ function validateInput (input) {
     case 'MARKDOWN_NOTE':
       if (input.content != null) {
         if (!_.isString(input.content)) validatedInput.content = ''
-        else validatedInput.content = input.content.replace(/[\u2028]+/g, '')
+        else validatedInput.content = input.content
       }
       return validatedInput
     case 'SNIPPET_NOTE':
       if (input.description != null) {
         if (!_.isString(input.description)) validatedInput.description = ''
-        else validatedInput.description = input.description.replace(/[\u2028]+/g, '')
+        else validatedInput.description = input.description
       }
       if (input.snippets != null) {
         if (!_.isArray(input.snippets)) {
@@ -51,12 +51,6 @@ function validateInput (input) {
             if (!_.isString(snippet.content)) return false
             return true
           })
-          .map((snippet) => {
-            snippet.name = snippet.name.replace(/[\u2028]+/g, '')
-            snippet.mode = snippet.mode.replace(/[\u2028]+/g, '')
-            snippet.content = snippet.content.replace(/[\u2028]+/g, '')
-            return snippet
-          })
       }
       return validatedInput
     default:

browser/main/modals/InitModal.js

@@ -7,7 +7,7 @@ import { hashHistory } from 'react-router'
 import _ from 'lodash'
 import keygen from 'browser/lib/keygen'
 
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const path = require('path')
 const electron = require('electron')
 const { remote } = electron

package.json

@@ -60,7 +60,7 @@
     "moment": "^2.10.3",
     "node-ipc": "^8.1.0",
     "sander": "^0.5.1",
-    "season": "^5.3.0",
+    "@rokt33r/season": "^5.3.0",
     "superagent": "^1.2.0",
     "superagent-promise": "^1.0.3"
   },

tests/dataApi/addStorage.js

@@ -12,7 +12,7 @@ const TestDummy = require('../fixtures/TestDummy')
 const sander = require('sander')
 const _ = require('lodash')
 const os = require('os')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 const v1StoragePath = path.join(os.tmpdir(), 'test/addStorage-v1-storage')
 // const legacyStoragePath = path.join(os.tmpdir(), 'test/addStorage-legacy-storage')

tests/dataApi/createFolder.js

@@ -12,7 +12,7 @@ const _ = require('lodash')
 const TestDummy = require('../fixtures/TestDummy')
 const sander = require('sander')
 const os = require('os')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 const storagePath = path.join(os.tmpdir(), 'test/create-folder')
 

tests/dataApi/createNote.js

@@ -11,7 +11,7 @@ const path = require('path')
 const TestDummy = require('../fixtures/TestDummy')
 const sander = require('sander')
 const os = require('os')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const faker = require('faker')
 
 const storagePath = path.join(os.tmpdir(), 'test/create-note')

tests/dataApi/deleteFolder.js

@@ -12,7 +12,7 @@ const _ = require('lodash')
 const TestDummy = require('../fixtures/TestDummy')
 const sander = require('sander')
 const os = require('os')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 const storagePath = path.join(os.tmpdir(), 'test/delete-folder')
 

tests/dataApi/deleteNote.js

@@ -12,7 +12,7 @@ const path = require('path')
 const TestDummy = require('../fixtures/TestDummy')
 const sander = require('sander')
 const os = require('os')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const faker = require('faker')
 
 const storagePath = path.join(os.tmpdir(), 'test/delete-note')

tests/dataApi/migrateFromV6Storage.js

@@ -10,7 +10,7 @@ const localStorage = window.localStorage = global.localStorage = new Storage(nul
 const path = require('path')
 const TestDummy = require('../fixtures/TestDummy')
 const sander = require('sander')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const _ = require('lodash')
 const os = require('os')
 

tests/dataApi/moveNote.js

@@ -11,7 +11,7 @@ const path = require('path')
 const TestDummy = require('../fixtures/TestDummy')
 const sander = require('sander')
 const os = require('os')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const faker = require('faker')
 
 const storagePath = path.join(os.tmpdir(), 'test/move-note')

tests/dataApi/updateFolder.js

@@ -12,7 +12,7 @@ const _ = require('lodash')
 const TestDummy = require('../fixtures/TestDummy')
 const sander = require('sander')
 const os = require('os')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 
 const storagePath = path.join(os.tmpdir(), 'test/update-folder')
 

tests/dataApi/updateNote.js

@@ -12,7 +12,7 @@ const path = require('path')
 const TestDummy = require('../fixtures/TestDummy')
 const sander = require('sander')
 const os = require('os')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const faker = require('faker')
 
 const storagePath = path.join(os.tmpdir(), 'test/update-note')

tests/fixtures/TestDummy.js

@@ -2,7 +2,7 @@ const faker = require('faker')
 const keygen = require('browser/lib/keygen')
 const _ = require('lodash')
 const sander = require('sander')
-const CSON = require('season')
+const CSON = require('@rokt33r/season')
 const path = require('path')
 
 function dummyFolder (override = {}) {

webpack-skeleton.js

@@ -40,9 +40,9 @@ var config = {
     'fs-jetpack',
     '@rokt33r/markdown-it-math',
     'markdown-it-checkbox',
-    'season',
     'devtron',
     'mixpanel',
+    '@rokt33r/season',
     {
       react: 'var React',
       'react-dom': 'var ReactDOM',