bare-script 3.0.0 → 3.0.2

package/lib/value.js

@@ -54,7 +54,29 @@ export function valueString(value) {
     } else if (type === 'number') {
         return `${value}`;
     } else if (value instanceof Date) {
-        return value.toISOString().replaceAll(rValueStringDatetimeZulu, '+00:00');
+        const year = value.getFullYear();
+        const month = value.getMonth() + 1;
+        const monthStr = `${month < 10 ? '0' : ''}${month}`;
+        const day = value.getDate();
+        const dayStr = `${day < 10 ? '0' : ''}${day}`;
+        const hour = value.getHours();
+        const hourStr = `${hour < 10 ? '0' : ''}${hour}`;
+        const minute = value.getMinutes();
+        const minuteStr = `${minute < 10 ? '0' : ''}${minute}`;
+        const second = value.getSeconds();
+        const secondStr = `${second < 10 ? '0' : ''}${second}`;
+        const millisecond = value.getMilliseconds();
+        const millisecondStr = millisecond === 0 ? '' : `.${millisecond < 100 ? '0' : ''}${millisecond < 10 ? '0' : ''}${millisecond}`;
+        const tzOffset = value.getTimezoneOffset();
+        /* c8 ignore next */
+        const tzSign = tzOffset < 0 ? '+' : '-';
+        const tzHour = Math.floor(Math.abs(tzOffset) / 60);
+        /* c8 ignore next */
+        const tzHourStr = `${tzHour < 10 ? '0' : ''}${tzHour}`;
+        const tzMinute = Math.abs(tzOffset) - tzHour * 60;
+        /* c8 ignore next */
+        const tzMinuteStr = `${tzMinute < 10 ? '0' : ''}${tzMinute}`;
+        return `${year}-${monthStr}-${dayStr}T${hourStr}:${minuteStr}:${secondStr}${millisecondStr}${tzSign}${tzHourStr}:${tzMinuteStr}`;
     } else if (Array.isArray(value)) {
         return valueJSON(value);
     } else if (value instanceof RegExp) {
@@ -70,9 +92,6 @@ export function valueString(value) {
 }
 
 
-const rValueStringDatetimeZulu = /(?:\.000)?Z$/g;
-
-
 /**
  * Get a value's JSON string representation
  *
@@ -91,7 +110,7 @@ function valueJSONSort(value) {
     if (value === null || type === 'undefined' || type === 'string' || type === 'boolean' || type === 'number') {
         return value;
     } else if (value instanceof Date) {
-        return value.toISOString().replaceAll(rValueStringDatetimeZulu, '+00:00');
+        return valueString(value);
     } else if (Array.isArray(value)) {
         return value.map(valueJSONSort);
     } else if (type === 'object' && Object.getPrototypeOf(value) === Object.prototype) {
@@ -265,4 +284,4 @@ export function valueParseDatetime(text) {
 
 
 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})$/;
+const rDatetime = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,6})?(?:Z|[+-]\d{2}:\d{2})$/;

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "3.0.0",
+    "version": "3.0.2",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",