bare-script 3.0.2 → 3.0.4

package/lib/data.js

@@ -74,7 +74,7 @@ const rCSVQuoteEscape = /""/g;
  * Determine data field types and parse/validate field values
  *
  * @param {Object[]} data - The data array. Row objects are updated with parsed/validated values.
- * @param {boolean} [csv=false] - If true, parse number and null strings
+ * @param {boolean} [csv=false] - If true, parse value strings
  * @returns {Object} The map of field name to field type ("datetime", "number", "string")
  * @throws Throws an error if data is invalid
  */

package/lib/library.js

@@ -415,13 +415,14 @@ function dataTop([data = null, count = null, categoryFields = null]) {
 // $group: Data
 // $doc: Validate a data array
 // $arg data: The data array
+// $arg csv: Optional (default is false). If true, parse value strings.
 // $return: The validated data array
-function dataValidate([data = null]) {
+function dataValidate([data = null, csv = false]) {
     if (valueType(data) !== 'array') {
         return null;
     }
 
-    validateData(data);
+    validateData(data, valueBoolean(csv));
     return data;
 }
 
@@ -471,10 +472,10 @@ function datetimeISOFormat([datetime = null, isDate = false]) {
     }
 
     if (valueBoolean(isDate)) {
-        const year = datetime.getFullYear();
-        const month = datetime.getMonth() + 1;
-        const day = datetime.getDate();
-        return `${year}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
+        const year = String(datetime.getFullYear()).padStart(4, '0');
+        const month = String(datetime.getMonth() + 1).padStart(2, '0');
+        const day = String(datetime.getDate()).padStart(2, '0');
+        return `${year}-${month}-${day}`;
     }
 
     return valueString(datetime);
@@ -549,7 +550,7 @@ function datetimeMonth([datetime = null]) {
 // $arg millisecond: Optional (default is 0). The millisecond.
 // $return: The new datetime
 function datetimeNew([year, month, day, hour = 0, minute = 0, second = 0, millisecond = 0]) {
-    if (valueType(year) !== 'number' || Math.floor(year) !== year ||
+    if (valueType(year) !== 'number' || Math.floor(year) !== year || year < 100 ||
         valueType(month) !== 'number' || Math.floor(month) !== month ||
         valueType(day) !== 'number' || Math.floor(day) !== day || day < -10000 || day > 10000 ||
         valueType(hour) !== 'number' || Math.floor(hour) !== hour ||

package/lib/value.js

@@ -54,29 +54,23 @@ export function valueString(value) {
     } else if (type === 'number') {
         return `${value}`;
     } else if (value instanceof Date) {
-        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 year = String(value.getFullYear()).padStart(4, '0');
+        const month = String(value.getMonth() + 1).padStart(2, '0');
+        const day = String(value.getDate()).padStart(2, '0');
+        const hour = String(value.getHours()).padStart(2, '0');
+        const minute = String(value.getMinutes()).padStart(2, '0');
+        const second = String(value.getSeconds()).padStart(2, '0');
+        const millisecond = value.getMilliseconds() === 0 ? '' : `.${String(value.getMilliseconds()).padStart(3, '0')}`;
         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 tzHourStr = String(tzHour).padStart(2, '0');
         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}`;
+        const tzMinuteStr = String(tzMinute).padStart(2, '0');
+        return `${year}-${month}-${day}T${hour}:${minute}:${second}${millisecond}${tzSign}${tzHourStr}:${tzMinuteStr}`;
     } else if (Array.isArray(value)) {
         return valueJSON(value);
     } else if (value instanceof RegExp) {

package/package.json

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