Merge branch 'master' of github.com:atelier-saulx/selva

Author: youzi

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saulx/selva",
-  "version": "21.2.2",
+  "version": "21.2.3",
   "license": "MIT",
   "main": "dist/src/index.js",
   "scripts": {
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@types/pg": "^8.6.1",
-    "@saulx/selva-server": "21.2.2",
+    "@saulx/selva-server": "21.2.3",
     "before-exit": "1.0.0",
     "async-exec": "^1.1.0",
     "@sindresorhus/fnv1a": "^2.0.1",
@@ -73,7 +73,7 @@
     "pg-native": "3.0.0",
     "squel": "^5.13.0",
     "data-record": "^1.0.0",
-    "@saulx/selva-query-ast-parser": "^4.2.0",
+    "@saulx/selva-query-ast-parser": "^4.0.2",
     "@types/uuid": "^8.3.0",
     "chalk": "^4.1.0",
     "@saulx/redis-client": "^1.0.0",

client/src/get/executeGetOperations/indexing.ts

@@ -35,30 +35,6 @@ function ast2inlineRpn(schema: Schema, f: FilterAST | null): string | null {
         const num = Number(f.$value)
         return Number.isNaN(num) ? null : `"${f.$field}" g #${num} F`
       }
-    case 'has':
-      if (['ancestors', 'children', 'descendants', 'parents'].includes(f.$field)) {
-        return null
-      }
-
-      if (typeof f.$value === 'string') {
-        return `"${f.$value}" "${f.$field}" a`
-      } else if (typeof f.$value === 'number') {
-        return `#${f.$value} "${f.$field}" a`
-      } else if (Array.isArray(f.$value)) {
-        if (typeof f.$value[0] === 'string') {
-          if (f.$value.some((v: string) => v.includes('"'))) {
-            // We can't inline quotes at the moment
-            return null
-          }
-
-          const a = `{${f.$value.map((v) => `"${v}"`).join(',')}}`
-          return `"${f.$field}" ${a} l`
-        } else if (typeof f.$value[0] === 'number') {
-          const a = `{${f.$value.map((v) => `#${v}`).join(',')}}`
-          return `"${f.$field}" ${a} l`
-        }
-        return null
-      }
     case 'exists':
       return `"${f.$field}" h`
     case 'notExists':

client/test/alias.ts

@@ -740,3 +740,130 @@ test.serial('set alias, get it, remove it, get it again', async (t) => {
   await client.delete('root')
   await client.destroy()
 })
+
+test.serial('should not cache $alias with get', async (t) => {
+  const client = connect({ port }, { loglevel: 'info' })
+
+  const alias = 'this_is_an_alias'
+
+  t.deepEqualIgnoreOrder(
+    await client.get({
+      $language: 'en',
+      $alias: alias,
+      id: true,
+      title: true,
+      aliases: true,
+    }),
+    {
+      $isNull: true,
+    }
+  )
+
+  const id = await client.set({
+    aliases: [alias],
+    type: 'match',
+    title: { en: 'yesh' },
+  })
+
+  const result = await client.get({
+    $language: 'en',
+    $alias: alias,
+    id: true,
+    title: true,
+    aliases: true,
+  })
+
+  t.deepEqualIgnoreOrder(result, {
+    id,
+    title: 'yesh',
+    aliases: [alias],
+  })
+
+  await client.delete('root')
+  await client.destroy()
+})
+
+// This is known behaviour. We will deal with this in the new database
+test.serial.failing('should not cache $alias with observe', async (t) => {
+  const client = connect({ port }, { loglevel: 'info' })
+
+  const alias = 'this_is_an_alias'
+
+  const query = {
+    $language: 'en',
+    $alias: alias,
+    id: true,
+    title: true,
+    aliases: true,
+  }
+
+  const result1 = await new Promise((resolve) => {
+    client.observe(query).subscribe(resolve)
+  })
+
+  t.deepEqualIgnoreOrder(result1, {
+    $isNull: true,
+  })
+
+  await client.set({
+    aliases: [alias],
+    type: 'match',
+    title: { en: 'yesh' },
+  })
+
+  const result2 = await new Promise((resolve) => {
+    client.observe(query).subscribe(resolve)
+  })
+
+  t.deepEqualIgnoreOrder(result2, {
+    title: 'yesh',
+    aliases: [alias],
+  })
+
+  await client.delete('root')
+  await client.destroy()
+})
+
+// This is known behaviour. We will deal with this in the new database
+test.serial.failing('subscribing to alias', async (t) => {
+  t.timeout(3000)
+  const client = connect({ port }, { loglevel: 'info' })
+
+  const alias = 'this_is_an_alias'
+
+  const query = {
+    $language: 'en',
+    $alias: alias,
+    id: true,
+    title: true,
+    aliases: true,
+  }
+
+  let cnt = 0
+  await new Promise((resolve) => {
+    client.observe(query).subscribe((data, checksum) => {
+      cnt++
+      console.log(cnt, data, checksum)
+      if (cnt === 1) {
+        t.deepEqualIgnoreOrder(data, {
+          $isNull: true,
+        })
+        console.log('counting')
+        client.set({
+          aliases: [alias],
+          type: 'match',
+          title: { en: 'yesh' },
+        })
+      } else if (cnt === 2) {
+        t.deepEqualIgnoreOrder(data, {
+          title: 'yesh',
+          aliases: [alias],
+        })
+        resolve
+      }
+    })
+  })
+
+  await client.delete('root')
+  await client.destroy()
+})

server/modules/binaries/darwin_x64/selva.so

@@ -1,6 +1,6 @@
 {
   "name": "@saulx/selva-server",
-  "version": "21.2.1",
+  "version": "21.2.3",
   "license": "MIT",
   "main": "./dist/index.js",
   "scripts": {
@@ -60,7 +60,7 @@
   "dependencies": {
     "@saulx/hash": "^1.0.1",
     "@saulx/diff": "^1.1.3",
-    "@saulx/selva": "21.2.1",
+    "@saulx/selva": "21.2.3",
     "aws-sdk": "^2.841.0",
     "before-exit": "^1.0.0",
     "body-parser": "^1.19.0",

server/modules/binaries/linux_x64/selva.so

@@ -1,19 +1,19 @@
 {
   "name": "tools",
   "private": true,
-  "version": "21.2.2",
+  "version": "21.2.3",
   "license": "MIT",
   "bin": {
     "watch": "index.js"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.168",
-    "@saulx/selva-server": "21.2.2"
+    "@saulx/selva-server": "21.2.3"
   },
   "dependencies": {
     "chokidar": "^3.5.1",
     "execa": "^5.0.0",
     "lodash.chunk": "^4.2.0",
-    "@saulx/selva": "21.2.2"
+    "@saulx/selva": "21.2.3"
   }
 }