bare-script 2.2.10 → 2.2.12

package/README.md

@@ -83,7 +83,7 @@ console.log(await executeScriptAsync(script, {'fetchFn': fetch}));
 This outputs:
 
 ~~~
-The BareScript Library has 89 functions
+The BareScript Library has 100 functions
 ~~~
 
 

package/lib/data.js

@@ -160,16 +160,19 @@ function parseNumber(text) {
 
 
 export function parseDatetime(text) {
-    if (rDate.test(text)) {
-        const localDate = new Date(text);
-        return new Date(localDate.getUTCFullYear(), localDate.getUTCMonth(), localDate.getUTCDate());
+    const mDate = text.match(rDate);
+    if (mDate !== null) {
+        const year = Number.parseInt(mDate.groups.year, 10);
+        const month = Number.parseInt(mDate.groups.month, 10);
+        const day = Number.parseInt(mDate.groups.day, 10);
+        return new Date(year, month - 1, day);
     } else if (rDatetime.test(text)) {
         return new Date(text);
     }
     return null;
 }
 
-const rDate = /^\d{4}-\d{2}-\d{2}$/;
+const rDate = /^(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})$/;
 const rDatetime = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{3})?(?:Z|[+-]\d{2}:\d{2})$/;
 
 

package/lib/library.js

@@ -257,15 +257,17 @@ export const scriptFunctions = {
     // $group: Datetime
     // $doc: Get the day of the month of a datetime
     // $arg datetime: The datetime
+    // $arg utc: Optional (default is false). If true, return the UTC day of the month.
     // $return: The day of the month
-    'datetimeDay': ([datetime]) => (datetime instanceof Date ? datetime.getDate() : null),
+    'datetimeDay': ([datetime, utc = false]) => (datetime instanceof Date ? (utc ? datetime.getUTCDate() : datetime.getDate()) : null),
 
     // $function: datetimeHour
     // $group: Datetime
     // $doc: Get the hour of a datetime
     // $arg datetime: The datetime
+    // $arg utc: Optional (default is false). If true, return the UTC hour.
     // $return: The hour
-    'datetimeHour': ([datetime]) => (datetime instanceof Date ? datetime.getHours() : null),
+    'datetimeHour': ([datetime, utc = false]) => (datetime instanceof Date ? (utc ? datetime.getUTCHours() : datetime.getHours()) : null),
 
     // $function: datetimeISOFormat
     // $group: Datetime
@@ -295,15 +297,21 @@ export const scriptFunctions = {
     // $group: Datetime
     // $doc: Get the number of minutes of a datetime
     // $arg datetime: The datetime
+    // $arg utc: Optional (default is false). If true, return the UTC minutes.
     // $return: The number of minutes
-    'datetimeMinute': ([datetime]) => (datetime instanceof Date ? datetime.getMinutes() : null),
+    'datetimeMinute': ([datetime, utc = false]) => (
+        datetime instanceof Date ? (utc ? datetime.getUTCMinutes() : datetime.getMinutes()) : null
+    ),
 
     // $function: datetimeMonth
     // $group: Datetime
     // $doc: Get the number of the month (1-12) of a datetime
     // $arg datetime: The datetime
+    // $arg utc: Optional (default is false). If true, return the UTC month.
     // $return: The number of the month
-    'datetimeMonth': ([datetime]) => (datetime instanceof Date ? datetime.getMonth() + 1 : null),
+    'datetimeMonth': ([datetime, utc = false]) => (
+        datetime instanceof Date ? (utc ? datetime.getUTCMonth() + 1 : datetime.getMonth() + 1) : null
+    ),
 
     // $function: datetimeNew
     // $group: Datetime
@@ -345,8 +353,11 @@ export const scriptFunctions = {
     // $group: Datetime
     // $doc: Get the number of seconds of a datetime
     // $arg datetime: The datetime
+    // $arg utc: Optional (default is false). If true, return the UTC seconds.
     // $return: The number of seconds
-    'datetimeSecond': ([datetime]) => (datetime instanceof Date ? datetime.getSeconds() : null),
+    'datetimeSecond': ([datetime, utc = false]) => (
+        datetime instanceof Date ? (utc ? datetime.getUTCSeconds() : datetime.getSeconds()) : null
+    ),
 
     // $function: datetimeToday
     // $group: Datetime
@@ -361,8 +372,11 @@ export const scriptFunctions = {
     // $group: Datetime
     // $doc: Get the full year of a datetime
     // $arg datetime: The datetime
+    // $arg utc: Optional (default is false). If true, return the UTC year.
     // $return: The full year
-    'datetimeYear': ([datetime]) => (datetime instanceof Date ? datetime.getFullYear() : null),
+    'datetimeYear': ([datetime, utc = false]) => (
+        datetime instanceof Date ? (utc ? datetime.getUTCFullYear() : datetime.getFullYear()) : null
+    ),
 
 
     //

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "2.2.10",
+    "version": "2.2.12",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",
@@ -31,7 +31,7 @@
     },
     "devDependencies": {
         "c8": "~8.0",
-        "eslint": "~8.50",
+        "eslint": "~8.52",
         "jsdoc": "~4.0"
     }
 }