From 7b8a041372a1fb27a481a0d82f11c7065d46a56f Mon Sep 17 00:00:00 2001
From: Gabor Boros <gabor.brs@gmail.com>
Date: Sun, 15 May 2022 20:18:33 +0200
Subject: [PATCH 1/2] chore: update package version to 2.5.0

---
 package-lock.json | 44 +++++++++++++++++++++++++++++++++++++++-----
 package.json      |  6 +++---
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e8685ad..f3a3d67 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13 +1,47 @@
 {
     "name": "rethinkdb",
-    "version": "2.4.2",
-    "lockfileVersion": 1,
+    "version": "2.5.0",
+    "lockfileVersion": 2,
     "requires": true,
+    "packages": {
+        "": {
+            "name": "rethinkdb",
+            "version": "2.5.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "bluebird": "2.9.32"
+            },
+            "devDependencies": {
+                "coffeescript": "1.10.0"
+            },
+            "engines": {
+                "node": ">= 0.10.0"
+            }
+        },
+        "node_modules/bluebird": {
+            "version": "2.9.32",
+            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.32.tgz",
+            "integrity": "sha1-eEWq8oITV1lbpriLD1ZcFLplgOw="
+        },
+        "node_modules/coffeescript": {
+            "version": "1.10.0",
+            "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.10.0.tgz",
+            "integrity": "sha1-56qDAZF+9iGzXYo580jc3R234z4=",
+            "dev": true,
+            "bin": {
+                "cake": "bin/cake",
+                "coffee": "bin/coffee"
+            },
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        }
+    },
     "dependencies": {
         "bluebird": {
-            "version": "3.7.2",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-            "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+            "version": "2.9.32",
+            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.32.tgz",
+            "integrity": "sha1-eEWq8oITV1lbpriLD1ZcFLplgOw="
         },
         "coffeescript": {
             "version": "1.10.0",
diff --git a/package.json b/package.json
index 84aa0d7..3d57495 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rethinkdb",
-    "version": "2.4.2",
+    "version": "2.5.0",
     "main": "rethinkdb",
     "license": "Apache-2.0",
     "description": "This package provides the JavaScript driver library for the RethinkDB database server for use in your node application.",
@@ -17,7 +17,7 @@
     ],
     "homepage": "https://rethinkdb.com",
     "bugs": {
-        "url": "https://github.com/rethinkdb/rethinkdb/issues",
+        "url": "https://github.com/rethinkdb/rethinkdb-javascript/issues",
         "email": "bugs@rethinkdb.com"
     },
     "files": [
@@ -32,7 +32,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "https://github.com/rethinkdb/rethinkdb.git"
+        "url": "https://github.com/rethinkdb/rethinkdb-javascript.git"
     },
     "engines": {
         "node": ">= 0.10.0"

From 9e3aa0a229d2f5759a5215844317dae4e7d58d10 Mon Sep 17 00:00:00 2001
From: Gabor Boros <gabor.brs@gmail.com>
Date: Sun, 15 May 2022 20:19:16 +0200
Subject: [PATCH 2/2] feat: add format command and update proto file

---
 scripts/prepare.sh | 3 +--
 src/ast.coffee     | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index ad3e51e..ecda3f4 100755
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-PACKAGE_NAME="src"
 BUILD_DIR="dist"
 
 PROTO_FILE_NAME="ql2.proto"
-PROTO_FILE_URL="https://raw.githubusercontent.com/rethinkdb/rethinkdb/next/src/rdb_protocol/${PROTO_FILE_NAME}"
+PROTO_FILE_URL="https://raw.githubusercontent.com/rethinkdb/rethinkdb/80b4c72a564230bccc761183ef27bca00fe9a012/src/rdb_protocol/${PROTO_FILE_NAME}"
 TARGET_PROTO_FILE="${BUILD_DIR}/${PROTO_FILE_NAME}"
 
 FILE_CONVERTER_NAME="./scripts/convert_protofile.py"
diff --git a/src/ast.coffee b/src/ast.coffee
index 3f74a5f..82d61cb 100644
--- a/src/ast.coffee
+++ b/src/ast.coffee
@@ -217,6 +217,7 @@ class RDBVal extends TermBase
     bracket: (args...) -> new Bracket {}, @, args...
     toJSON: (args...) -> new ToJsonString {}, @, args...
     toJsonString: (args...) -> new ToJsonString {}, @, args...
+    format: (args...) -> new Format {}, @, args...
     match: (args...) -> new Match {}, @, args...
     split: (args...) -> new Split {}, @, args.map(funcWrap)...
     upcase: (args...) -> new Upcase {}, @, args...
@@ -857,6 +858,10 @@ class ToJsonString extends RDBOp
     tt: protoTermType.TO_JSON_STRING
     mt: 'toJsonString'
 
+class Format extends RDBOp
+    tt: protoTermType.FORMAT
+    mt: 'format'
+
 class Match extends RDBOp
     tt: protoTermType.MATCH
     mt: 'match'
@@ -1368,6 +1373,8 @@ rethinkdb.info = (args...) -> new Info {}, args...
 
 rethinkdb.literal = (args...) -> new Literal {}, args...
 
+rethinkdb.format = (args...) -> new Format {}, args...
+
 rethinkdb.ISO8601 = aropt (str, opts) -> new ISO8601 opts, str
 rethinkdb.epochTime = (args...) -> new EpochTime {}, args...
 rethinkdb.now = (args...) -> new Now {}, args...