Merge pull request #836 from citation-file-format/835-parsing-double-braces

Author: abelsiqueira

src/store/cff.ts

@@ -50,8 +50,16 @@ export const updateCff = (newCffstr: string) => {
             throw new Error('Error: CFF is invalid. It should be a YAML map.')
         }
 
-        cff.value = getInitialData()
         const existingCffProperties = Object.getOwnPropertyNames(existingCff) as Array<keyof typeof existingCff>
+        if (existingCffProperties.length === 0) {
+            throw new Error('Error: CFF is empty.')
+        } else if (existingCffProperties.filter(x => x === '[object Object]').length > 0) {
+            throw new Error('Error: invalid object in keys (did you use {} as key?).')
+        } else if (existingCffProperties.filter(x => !x).length > 0) {
+            throw new Error('Error: invalid null property.')
+        }
+
+        cff.value = getInitialData()
         const cffProperties = Object.getOwnPropertyNames(cff.value) as Array<keyof CffType>
         existingCffProperties.forEach((property) => {
             const camelCaseProperty = camelCase(property) as keyof CffType

test/jest/__tests__/store/cffupdate.jest.spec.ts

@@ -164,4 +164,45 @@ describe('Update of existing CFF', () => {
         expect(msg).toHaveLength(0)
         expect(success).toBe(true)
     })
+    test('catches {}', () => {
+        const { msg, success } = updateCff('{}')
+        expect(msg).toHaveLength(1)
+        expect(msg[0]).toBe('Error: CFF is empty.')
+        expect(success).toBe(false)
+    })
+    test('catches {{}}', () => {
+        const { msg, success } = updateCff('{{}}')
+        expect(msg).toHaveLength(1)
+        expect(msg[0]).toBe('Error: invalid object in keys (did you use {} as key?).')
+        expect(success).toBe(false)
+    })
+    test('catches {[]}', () => {
+        const { msg, success } = updateCff('{[]}')
+        expect(msg).toHaveLength(1)
+        expect(msg[0]).toBe('Error: invalid null property.')
+        expect(success).toBe(false)
+    })
+    test('allow {title: Title, message: CITE ME}', () => {
+        const { msg, success } = updateCff('{title: Title, message: CITE ME}')
+        expect(msg).toHaveLength(0)
+        expect(success).toBe(true)
+    })
+    test('catches {}: 1', () => {
+        const { msg, success } = updateCff('{}: 1\nb: 2')
+        expect(msg).toHaveLength(1)
+        expect(msg[0]).toBe('Error: invalid object in keys (did you use {} as key?).')
+        expect(success).toBe(false)
+    })
+    test('catches []: 1', () => {
+        const { msg, success } = updateCff('[]: 1\nb: 2')
+        expect(msg).toHaveLength(1)
+        expect(msg[0]).toBe('Error: invalid null property.')
+        expect(success).toBe(false)
+    })
+    test("catches '': 1", () => {
+        const { msg, success } = updateCff("'': 1\nb: 2")
+        expect(msg).toHaveLength(1)
+        expect(msg[0]).toBe('Error: invalid null property.')
+        expect(success).toBe(false)
+    })
 })