From 6ac135e8763c3b4b59a9f0af980b4f284fbf4363 Mon Sep 17 00:00:00 2001
From: Heiko <hkernbach@users.noreply.github.com>
Date: Wed, 29 Aug 2018 20:26:03 +0200
Subject: [PATCH] semver foxx plain func (#6293)

---
 js/server/modules/@arangodb/index.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/js/server/modules/@arangodb/index.js b/js/server/modules/@arangodb/index.js
index 0295d60228..54978497d5 100644
--- a/js/server/modules/@arangodb/index.js
+++ b/js/server/modules/@arangodb/index.js
@@ -26,6 +26,7 @@
 module.isSystem = true;
 
 var common = require('@arangodb/common');
+const semver = require('semver');
 
 Object.keys(common).forEach(function (key) {
   exports[key] = common[key];
@@ -80,16 +81,20 @@ exports.db = internal.db;
 
 exports.plainServerVersion = function () {
   let version = internal.version;
-  let devel = version.match(/(.*)\.devel/);
-
-  if (devel !== null) {
-    version = devel[1] + '.0';
-  } else {
-    devel = version.match(/(.*)((milestone|alpha|beta|devel|rc)[0-9]*)$/);
 
+  if (semver.valid(version) === null) {
+    let devel = version.match(/(.*)\.devel/);
     if (devel !== null) {
-      version = devel[1] + '0';;
+      version = devel[1] + '.0';
+    } else {
+      devel = version.match(/(.*)((milestone|alpha|beta|devel|rc)[0-9]*)$/);
+
+      if (devel !== null) {
+        version = devel[1] + '0';
+      }
     }
+  } else {
+    version = semver.major(version) + '.' + semver.minor(version) + '.' + semver.patch(version);
   }
 
   return version;