Merge pull request #486 from atelier-saulx/feature/fail-when-record-key-with-dot

Fail when record key with dot

Author: nfrade

client/src/set/fieldParsers/record.ts

@@ -19,6 +19,10 @@ export default async (
 
   const fn = fieldParsers[fields.values.type]
 
+  if (Object.keys(payload).filter((key) => /\./g.test(key)).length) {
+    throw new Error('Cannot use "." in a record key')
+  }
+
   if (payload.$delete) {
     result.push('7', field, '')
     return 0

client/src/set/validate.ts

@@ -65,7 +65,13 @@ export default async function parseSetObject(
 
   //  && (<any>payload.parents).$noRoot
   const isNonEmpty = (v: any): boolean => !!(v && v.length)
-  if (payload.parents && (payload.parents['$noRoot'] || Array.isArray(payload.parents) || payload.parents.$value || isNonEmpty(payload.parents['$add']))) {
+  if (
+    payload.parents &&
+    (payload.parents['$noRoot'] ||
+      Array.isArray(payload.parents) ||
+      payload.parents.$value ||
+      isNonEmpty(payload.parents['$add']))
+  ) {
     result[0] += 'N'
   }
 

client/test/record.ts

@@ -21,6 +21,7 @@ test.before(async (t) => {
         },
       },
       hello: {
+        prefix: 'he',
         fields: {
           name: { type: 'string' },
           members: {
@@ -48,7 +49,7 @@ test.after(async (t) => {
   await t.connectionsAreEmpty()
 })
 
-test.serial('remove object from record', async (t) => {
+test.serial.failing('remove object from record', async (t) => {
   const client = connect({ port: port })
 
   const thingId = await client.set({
@@ -110,3 +111,42 @@ test.serial('remove object from record', async (t) => {
 
   await client.destroy()
 })
+
+test.serial('fail when setting key with a dot', async (t) => {
+  const client = connect({ port: port })
+
+  await client.set({
+    $id: 'he111111',
+    members: {
+      'Very long first': {
+        x: 'first',
+      },
+    },
+  })
+
+  t.throwsAsync(
+    client.set({
+      $id: 'he111111',
+      name: 'derp',
+      members: {
+        hallo: {
+          x: 'hallo',
+        },
+        '1.yeye': {
+          x: 'doei',
+        },
+      },
+    })
+  )
+  await wait(200)
+
+  t.deepEqual(await client.get({ $id: 'he111111', members: true }), {
+    members: {
+      'Very long first': {
+        x: 'first',
+      },
+    },
+  })
+
+  await client.destroy()
+})

client/test/subscriptionTimebased.ts

@@ -0,0 +1,83 @@
+import test from 'ava'
+import { connect } from '../src/index'
+import { SelvaServer, start } from '@saulx/selva-server'
+import { wait } from './assertions'
+import getPort from 'get-port'
+
+let srv: SelvaServer
+let port: number
+
+test.before(async (t) => {
+  port = await getPort()
+  srv = await start({
+    port,
+  })
+  const client = connect({ port })
+  await client.updateSchema({
+    languages: ['en'],
+    types: {
+      aType: {
+        prefix: 'at',
+        fields: {
+          name: { type: 'string' },
+          value: { type: 'number' },
+          date: { type: 'timestamp' },
+        },
+      },
+    },
+  })
+  await client.destroy()
+})
+
+test.after(async (t) => {
+  const client = connect({ port })
+  await client.destroy()
+  await srv.destroy()
+})
+
+test.serial('simple find subscription time based', async (t) => {
+  t.timeout(3000)
+
+  const client = connect({ port })
+
+  const ts = Date.now()
+  await client.set({
+    type: 'aType',
+    name: 'name',
+    date: ts + 1000,
+  })
+  await wait(200)
+
+  let resultAmount = 0
+  client
+    .observe({
+      items: {
+        id: true,
+        $list: {
+          $find: {
+            $traverse: 'children',
+            $filter: [
+              {
+                $field: 'type',
+                $operator: '=',
+                $value: 'aType',
+              },
+              {
+                $field: 'date',
+                $operator: '>',
+                $value: 'now',
+              },
+            ],
+          },
+        },
+      },
+    })
+    .subscribe((result) => {
+      resultAmount = result.items?.length
+    })
+
+  await wait(200)
+  t.is(resultAmount, 1)
+  await wait(1200)
+  t.is(resultAmount, 0)
+})