From cde1ce17115fd8fa636f3c521daabc0c1bba0c00 Mon Sep 17 00:00:00 2001
From: Jarrod Connolly <jarrod@nestedquotes.ca>
Date: Sun, 3 Feb 2019 23:26:33 -0800
Subject: [PATCH 1/5] n-api: implement date object

Implements `napi_create_date()` as well as `napi_is_date()` to
allow working with JavaScript Date objects.
---
 doc/api/n-api.md                         | 47 +++++++++++++++++++++
 src/js_native_api.h                      | 10 +++++
 src/js_native_api_v8.cc                  | 27 ++++++++++++
 test/js-native-api/test_date/binding.gyp | 11 +++++
 test/js-native-api/test_date/test.js     | 19 +++++++++
 test/js-native-api/test_date/test_date.c | 52 ++++++++++++++++++++++++
 6 files changed, 166 insertions(+)
 create mode 100644 test/js-native-api/test_date/binding.gyp
 create mode 100644 test/js-native-api/test_date/test.js
 create mode 100644 test/js-native-api/test_date/test_date.c

diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index 2b061167f6cf4c..dfe347d7cef5bd 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -1527,6 +1527,31 @@ This API allocates a `node::Buffer` object and initializes it with data copied
 from the passed-in buffer. While this is still a fully-supported data
 structure, in most cases using a `TypedArray` will suffice.
 
+#### napi_create_date
+<!-- YAML
+added:
+napiVersion:
+-->
+
+> Stability: 1 - Experimental
+
+```C
+napi_status napi_create_date(napi_env env,
+                             double time,
+                             napi_value* result);
+```
+
+- `[in] env`: The environment that the API is invoked under.
+- `[in] time`: ECMAScript time value in milliseconds since 01 January, 1970 UTC.
+- `[out] result`: A `napi_value` representing a `node::Date`.
+
+Returns `napi_ok` if the API succeeded.
+
+This API allocates a `node::Date` object.
+
+JavaScript `Date` objects are described in
+[Section 20.3][] of the ECMAScript Language Specification.
+
 #### napi_create_external
 <!-- YAML
 added: v8.0.0
@@ -2731,6 +2756,27 @@ Returns `napi_ok` if the API succeeded.
 
 This API checks if the `Object` passed in is a buffer.
 
+### napi_is_date
+<!-- YAML
+added:
+napiVersion:
+-->
+
+> Stability: 1 - Experimental
+
+```C
+napi_status napi_is_date(napi_env env, napi_value value, bool* result)
+```
+
+- `[in] env`: The environment that the API is invoked under.
+- `[in] value`: The JavaScript value to check.
+- `[out] result`: Whether the given `napi_value` represents a `node::Date`
+object.
+
+Returns `napi_ok` if the API succeeded.
+
+This API checks if the `Object` passed in is a date.
+
 ### napi_is_error
 <!-- YAML
 added: v8.0.0
@@ -4712,6 +4758,7 @@ This API may only be called from the main thread.
 [Object Lifetime Management]: #n_api_object_lifetime_management
 [Object Wrap]: #n_api_object_wrap
 [Section 12.5.5]: https://tc39.github.io/ecma262/#sec-typeof-operator
+[Section 20.3]: https://tc39.github.io/ecma262/#sec-date-objects
 [Section 22.1]: https://tc39.github.io/ecma262/#sec-array-objects
 [Section 22.2]: https://tc39.github.io/ecma262/#sec-typedarray-objects
 [Section 24.1]: https://tc39.github.io/ecma262/#sec-arraybuffer-objects
diff --git a/src/js_native_api.h b/src/js_native_api.h
index 9d0fa811cfa3af..78e48325552d96 100644
--- a/src/js_native_api.h
+++ b/src/js_native_api.h
@@ -449,6 +449,16 @@ NAPI_EXTERN napi_status napi_adjust_external_memory(napi_env env,
 
 #ifdef NAPI_EXPERIMENTAL
 
+// Dates
+NAPI_EXTERN napi_status napi_create_date(napi_env env,
+                                         double time,
+                                         napi_value* result);
+
+NAPI_EXTERN napi_status napi_is_date(napi_env env,
+                                     napi_value value,
+                                     bool* is_date);
+
+// BigInt
 NAPI_EXTERN napi_status napi_create_bigint_int64(napi_env env,
                                                  int64_t value,
                                                  napi_value* result);
diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
index 287142e2658907..dffe8d8a082997 100644
--- a/src/js_native_api_v8.cc
+++ b/src/js_native_api_v8.cc
@@ -2886,6 +2886,33 @@ napi_status napi_is_promise(napi_env env,
   return napi_clear_last_error(env);
 }
 
+napi_status napi_create_date(napi_env env,
+                             double time,
+                             napi_value* result) {
+  NAPI_PREAMBLE(env);
+  CHECK_ARG(env, result);
+
+  auto maybe_date = v8::Date::New(env->context(), time);
+  CHECK_MAYBE_EMPTY(env, maybe_date, napi_generic_failure);
+
+  auto v8_resolver = maybe_date.ToLocalChecked();
+  *result = v8impl::JsValueFromV8LocalValue(v8_resolver);
+
+  return GET_RETURN_STATUS(env);
+}
+
+napi_status napi_is_date(napi_env env,
+                         napi_value value,
+                         bool* is_date) {
+  CHECK_ENV(env);
+  CHECK_ARG(env, value);
+  CHECK_ARG(env, is_date);
+
+  *is_date = v8impl::V8LocalValueFromJsValue(value)->IsDate();
+
+  return napi_clear_last_error(env);
+}
+
 napi_status napi_run_script(napi_env env,
                             napi_value script,
                             napi_value* result) {
diff --git a/test/js-native-api/test_date/binding.gyp b/test/js-native-api/test_date/binding.gyp
new file mode 100644
index 00000000000000..a65a4e1387235a
--- /dev/null
+++ b/test/js-native-api/test_date/binding.gyp
@@ -0,0 +1,11 @@
+{
+  "targets": [
+    {
+      "target_name": "test_date",
+      "sources": [
+        "../entry_point.c",
+        "test_date.c"
+      ]
+    }
+  ]
+}
diff --git a/test/js-native-api/test_date/test.js b/test/js-native-api/test_date/test.js
new file mode 100644
index 00000000000000..5e8b2882ef7911
--- /dev/null
+++ b/test/js-native-api/test_date/test.js
@@ -0,0 +1,19 @@
+'use strict';
+
+const common = require('../../common');
+
+// This tests the date-related n-api calls
+
+const assert = require('assert');
+const test_date = require(`./build/${common.buildType}/test_date`);
+
+const dateTypeTestDate = test_date.createDate(1549183351);
+assert.strictEqual(test_date.isDate(dateTypeTestDate), true);
+
+assert.strictEqual(test_date.isDate(new Date(1549183351)), true);
+
+assert.strictEqual(test_date.isDate(2.4), false);
+assert.strictEqual(test_date.isDate('not a date'), false);
+assert.strictEqual(test_date.isDate(undefined), false);
+assert.strictEqual(test_date.isDate(null), false);
+assert.strictEqual(test_date.isDate({}), false);
diff --git a/test/js-native-api/test_date/test_date.c b/test/js-native-api/test_date/test_date.c
new file mode 100644
index 00000000000000..047d7e219fc0c2
--- /dev/null
+++ b/test/js-native-api/test_date/test_date.c
@@ -0,0 +1,52 @@
+#define NAPI_EXPERIMENTAL
+
+#include <js_native_api.h>
+#include "../common.h"
+
+static napi_value createDate(napi_env env, napi_callback_info info) {
+  size_t argc = 1;
+  napi_value args[1];
+  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
+
+  NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments");
+
+  napi_valuetype valuetype0;
+  NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));
+
+  NAPI_ASSERT(env, valuetype0 == napi_number,
+              "Wrong type of arguments. Expects a number as first argument.");
+
+  double time;
+  NAPI_CALL(env, napi_get_value_double(env, args[0], &time));
+
+  napi_value date;
+  NAPI_CALL(env, napi_create_date(env, time, &date));
+
+  return date;
+}
+
+static napi_value isDate(napi_env env, napi_callback_info info) {
+  napi_value date, result;
+  size_t argc = 1;
+  bool is_date;
+
+  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, &date, NULL, NULL));
+  NAPI_CALL(env, napi_is_date(env, date, &is_date));
+  NAPI_CALL(env, napi_get_boolean(env, is_date, &result));
+
+  return result;
+}
+
+EXTERN_C_START
+napi_value Init(napi_env env, napi_value exports) {
+  napi_property_descriptor descriptors[] = {
+    DECLARE_NAPI_PROPERTY("createDate", createDate),
+    DECLARE_NAPI_PROPERTY("isDate", isDate),
+  };
+
+  NAPI_CALL(env, napi_define_properties(
+      env, exports, sizeof(descriptors) / sizeof(*descriptors), descriptors));
+
+  return exports;
+}
+EXTERN_C_END

From 3a4af6e555f7532c488373fb14bc90253fb2a979 Mon Sep 17 00:00:00 2001
From: Jarrod Connolly <jarrod@nestedquotes.ca>
Date: Mon, 4 Feb 2019 22:27:58 -0800
Subject: [PATCH 2/5] n-api: add method to get date value

Add the `napi_get_date_value` method to get the original
time value from the Date object.
---
 doc/api/n-api.md                         | 26 ++++++++++++++++++++++++
 src/js_native_api.h                      |  4 ++++
 src/js_native_api_types.h                |  1 +
 src/js_native_api_v8.cc                  | 16 +++++++++++++++
 test/js-native-api/test_date/test.js     |  2 ++
 test/js-native-api/test_date/test_date.c | 13 ++++++++++++
 6 files changed, 62 insertions(+)

diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index dfe347d7cef5bd..26b35af7f1d836 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -243,6 +243,7 @@ typedef enum {
   napi_queue_full,
   napi_closing,
   napi_bigint_expected,
+  napi_date_expected,
 } napi_status;
 ```
 If additional information is required upon an API returning a failed status,
@@ -2172,6 +2173,31 @@ Returns `napi_ok` if the API succeeded.
 
 This API returns various properties of a `DataView`.
 
+#### napi_get_date_value
+<!-- YAML
+added:
+napiVersion:
+-->
+
+> Stability: 1 - Experimental
+
+```C
+napi_status napi_get_date_value(napi_env env,
+                                napi_value value,
+                                double* result)
+```
+
+- `[in] env`: The environment that the API is invoked under.
+- `[in] value`: `napi_value` representing JavaScript `Date`.
+- `[out] result`: Time value as a `double` represented as milliseconds
+since midnight at the beginning of 01 January, 1970 UTC.
+
+Returns `napi_ok` if the API succeeded. If a non-date `napi_value` is passed
+in it returns `napi_date_expected`.
+
+This API returns the C double primitive of time value for the given JavaScript
+`Date`.
+
 #### napi_get_value_bool
 <!-- YAML
 added: v8.0.0
diff --git a/src/js_native_api.h b/src/js_native_api.h
index 78e48325552d96..b19113b1f159c3 100644
--- a/src/js_native_api.h
+++ b/src/js_native_api.h
@@ -458,6 +458,10 @@ NAPI_EXTERN napi_status napi_is_date(napi_env env,
                                      napi_value value,
                                      bool* is_date);
 
+NAPI_EXTERN napi_status napi_get_date_value(napi_env env,
+                                            napi_value value,
+                                            double* result);
+
 // BigInt
 NAPI_EXTERN napi_status napi_create_bigint_int64(napi_env env,
                                                  int64_t value,
diff --git a/src/js_native_api_types.h b/src/js_native_api_types.h
index a4739957991e3f..1f46729fc67104 100644
--- a/src/js_native_api_types.h
+++ b/src/js_native_api_types.h
@@ -76,6 +76,7 @@ typedef enum {
   napi_queue_full,
   napi_closing,
   napi_bigint_expected,
+  napi_date_expected,
 } napi_status;
 
 typedef napi_value (*napi_callback)(napi_env env,
diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
index dffe8d8a082997..93cdf9512b6f6a 100644
--- a/src/js_native_api_v8.cc
+++ b/src/js_native_api_v8.cc
@@ -2913,6 +2913,22 @@ napi_status napi_is_date(napi_env env,
   return napi_clear_last_error(env);
 }
 
+napi_status napi_get_date_value(napi_env env,
+                                napi_value value,
+                                double* result) {
+  NAPI_PREAMBLE(env);
+  CHECK_ARG(env, value);
+  CHECK_ARG(env, result);
+
+  v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue(value);
+  RETURN_STATUS_IF_FALSE(env, val->IsDate(), napi_date_expected);
+
+  v8::Local<v8::Date> date = val.As<v8::Date>();
+  *result = date->ValueOf();
+
+  return GET_RETURN_STATUS(env);
+}
+
 napi_status napi_run_script(napi_env env,
                             napi_value script,
                             napi_value* result) {
diff --git a/test/js-native-api/test_date/test.js b/test/js-native-api/test_date/test.js
index 5e8b2882ef7911..e504208520e4d3 100644
--- a/test/js-native-api/test_date/test.js
+++ b/test/js-native-api/test_date/test.js
@@ -17,3 +17,5 @@ assert.strictEqual(test_date.isDate('not a date'), false);
 assert.strictEqual(test_date.isDate(undefined), false);
 assert.strictEqual(test_date.isDate(null), false);
 assert.strictEqual(test_date.isDate({}), false);
+
+assert.strictEqual(test_date.getDateValue(new Date(1549183351)), 1549183351);
diff --git a/test/js-native-api/test_date/test_date.c b/test/js-native-api/test_date/test_date.c
index 047d7e219fc0c2..13de450079ff3b 100644
--- a/test/js-native-api/test_date/test_date.c
+++ b/test/js-native-api/test_date/test_date.c
@@ -37,11 +37,24 @@ static napi_value isDate(napi_env env, napi_callback_info info) {
   return result;
 }
 
+static napi_value getDateValue(napi_env env, napi_callback_info info) {
+  napi_value date, result;
+  size_t argc = 1;
+  double value;
+
+  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, &date, NULL, NULL));
+  NAPI_CALL(env, napi_get_date_value(env, date, &value));
+  NAPI_CALL(env, napi_create_double(env, value, &result));
+
+  return result;
+}
+
 EXTERN_C_START
 napi_value Init(napi_env env, napi_value exports) {
   napi_property_descriptor descriptors[] = {
     DECLARE_NAPI_PROPERTY("createDate", createDate),
     DECLARE_NAPI_PROPERTY("isDate", isDate),
+    DECLARE_NAPI_PROPERTY("getDateValue", getDateValue),
   };
 
   NAPI_CALL(env, napi_define_properties(

From 06f7337ad1a00cbb678d5768fc8415f44c758330 Mon Sep 17 00:00:00 2001
From: Jarrod Connolly <jarrod@nestedquotes.ca>
Date: Wed, 6 Feb 2019 22:50:50 -0800
Subject: [PATCH 3/5] naming convention changes from pr review

---
 src/js_native_api_v8.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
index 93cdf9512b6f6a..8a1448aab88aac 100644
--- a/src/js_native_api_v8.cc
+++ b/src/js_native_api_v8.cc
@@ -2892,11 +2892,10 @@ napi_status napi_create_date(napi_env env,
   NAPI_PREAMBLE(env);
   CHECK_ARG(env, result);
 
-  auto maybe_date = v8::Date::New(env->context(), time);
+  v8::MaybeLocal<v8::Value> maybe_date = v8::Date::New(env->context(), time);
   CHECK_MAYBE_EMPTY(env, maybe_date, napi_generic_failure);
 
-  auto v8_resolver = maybe_date.ToLocalChecked();
-  *result = v8impl::JsValueFromV8LocalValue(v8_resolver);
+  *result = v8impl::JsValueFromV8LocalValue(maybe_date.ToLocalChecked());
 
   return GET_RETURN_STATUS(env);
 }

From bb48cac8b79d98d22855657ef1019542ae1ffe87 Mon Sep 17 00:00:00 2001
From: Jarrod Connolly <jarrod@nestedquotes.ca>
Date: Thu, 7 Feb 2019 22:24:12 -0800
Subject: [PATCH 4/5] documentation changes from pr review

---
 doc/api/n-api.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index 26b35af7f1d836..b6123e24b86729 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -1530,8 +1530,8 @@ structure, in most cases using a `TypedArray` will suffice.
 
 #### napi_create_date
 <!-- YAML
-added:
-napiVersion:
+added: REPLACEME
+napiVersion: REPLACEME
 -->
 
 > Stability: 1 - Experimental
@@ -1544,11 +1544,11 @@ napi_status napi_create_date(napi_env env,
 
 - `[in] env`: The environment that the API is invoked under.
 - `[in] time`: ECMAScript time value in milliseconds since 01 January, 1970 UTC.
-- `[out] result`: A `napi_value` representing a `node::Date`.
+- `[out] result`: A `napi_value` representing a JavaScript `Date`.
 
 Returns `napi_ok` if the API succeeded.
 
-This API allocates a `node::Date` object.
+This API allocates a JavaScript `Date` object.
 
 JavaScript `Date` objects are described in
 [Section 20.3][] of the ECMAScript Language Specification.
@@ -2175,8 +2175,8 @@ This API returns various properties of a `DataView`.
 
 #### napi_get_date_value
 <!-- YAML
-added:
-napiVersion:
+added: REPLACEME
+napiVersion: REPLACEME
 -->
 
 > Stability: 1 - Experimental
@@ -2784,8 +2784,8 @@ This API checks if the `Object` passed in is a buffer.
 
 ### napi_is_date
 <!-- YAML
-added:
-napiVersion:
+added: REPLACEME
+napiVersion: REPLACEME
 -->
 
 > Stability: 1 - Experimental
@@ -2796,7 +2796,7 @@ napi_status napi_is_date(napi_env env, napi_value value, bool* result)
 
 - `[in] env`: The environment that the API is invoked under.
 - `[in] value`: The JavaScript value to check.
-- `[out] result`: Whether the given `napi_value` represents a `node::Date`
+- `[out] result`: Whether the given `napi_value` represents JavaScript `Date`
 object.
 
 Returns `napi_ok` if the API succeeded.

From c21826fbc3604d1c8d397e3607bd7f68bbe81546 Mon Sep 17 00:00:00 2001
From: Jarrod Connolly <jarrod@nestedquotes.ca>
Date: Mon, 11 Feb 2019 21:42:00 -0800
Subject: [PATCH 5/5] grammar changes and setting `napiVersion` to 4 from pr
 review

---
 doc/api/n-api.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index b6123e24b86729..503046a529f6fe 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -1531,7 +1531,7 @@ structure, in most cases using a `TypedArray` will suffice.
 #### napi_create_date
 <!-- YAML
 added: REPLACEME
-napiVersion: REPLACEME
+napiVersion: 4
 -->
 
 > Stability: 1 - Experimental
@@ -2176,7 +2176,7 @@ This API returns various properties of a `DataView`.
 #### napi_get_date_value
 <!-- YAML
 added: REPLACEME
-napiVersion: REPLACEME
+napiVersion: 4
 -->
 
 > Stability: 1 - Experimental
@@ -2188,7 +2188,7 @@ napi_status napi_get_date_value(napi_env env,
 ```
 
 - `[in] env`: The environment that the API is invoked under.
-- `[in] value`: `napi_value` representing JavaScript `Date`.
+- `[in] value`: `napi_value` representing a JavaScript `Date`.
 - `[out] result`: Time value as a `double` represented as milliseconds
 since midnight at the beginning of 01 January, 1970 UTC.
 
@@ -2785,7 +2785,7 @@ This API checks if the `Object` passed in is a buffer.
 ### napi_is_date
 <!-- YAML
 added: REPLACEME
-napiVersion: REPLACEME
+napiVersion: 4
 -->
 
 > Stability: 1 - Experimental
@@ -2796,7 +2796,7 @@ napi_status napi_is_date(napi_env env, napi_value value, bool* result)
 
 - `[in] env`: The environment that the API is invoked under.
 - `[in] value`: The JavaScript value to check.
-- `[out] result`: Whether the given `napi_value` represents JavaScript `Date`
+- `[out] result`: Whether the given `napi_value` represents a JavaScript `Date`
 object.
 
 Returns `napi_ok` if the API succeeded.