@bbn/bbn 2.0.127 → 2.0.128

package/dist/dt/classes/dateTime.js

@@ -26,7 +26,7 @@ export default class bbnDtDateTime extends bbnDt {
             value = new Temporal.PlainDateTime(y, m, d || 1, h || 0, i || 0, s || 0, ms || 0);
         }
         super(value);
-        this.kind = 'datetime';
+        this.kind = 'dateTime';
     }
     format(format) {
         // long

package/dist/dt/classes/dt.d.ts

@@ -34,13 +34,13 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
      */
     protected withValue(newValue: any): this;
     static compare(a: any, b: any, unit: string | undefined): -1 | 0 | 1;
-    static parse(input: string, format: string | string[], cls?: 'auto' | 'zoned' | 'dateTime' | 'date' | 'time' | 'yearMonth' | 'monthDay', locale?: {
+    static parse(input: string, format: string | string[], cls?: bbnDtKindParams, locale?: {
         monthsLong?: string[];
         monthsShort?: string[];
         weekdaysLong?: string[];
         weekdaysShort?: string[];
     }): bbnDt<any>;
-    parse(input: string, format: string, cls?: 'auto' | 'zoned' | 'dateTime' | 'date' | 'time' | 'yearMonth' | 'monthDay'): bbnDt<any>;
+    parse(input: string, format: string, cls?: bbnDtKindParams): bbnDt<any>;
     compare(other: any, unit?: string): -1 | 0 | 1;
     add(amount: number | bbnDtDuration | object, unit?: string): bbnDt<any>;
     subtract(amount: number | bbnDtDuration | object, unit?: string): bbnDt<any>;

package/dist/dt/classes/dt.js

@@ -18,7 +18,6 @@ import each from '../../fn/loop/each.js';
 import getRow from '../../fn/object/getRow.js';
 import isPrimitive from '../../fn/type/isPrimitive.js';
 import bbnDtDuration from './duration.js';
-import camelToCss from '../../fn/string/camelToCss.js';
 export class bbnDt {
     constructor(value) {
         this.__bbnNoData = true;
@@ -84,7 +83,7 @@ export class bbnDt {
                 const v = this.value;
                 return v.toInstant().epochMilliseconds;
             }
-            case 'datetime': {
+            case 'dateTime': {
                 const v = this.value;
                 // RFC 9557 string: "YYYY-MM-DDTHH:mm:ss[Europe/Rome]"
                 const iso = `${v.toString()}[${tz}]`;
@@ -106,14 +105,14 @@ export class bbnDt {
                 const zdt = Temporal.ZonedDateTime.from(iso);
                 return zdt.toInstant().epochMilliseconds;
             }
-            case 'year-month': {
+            case 'yearMonth': {
                 const ym = this.value;
                 const d = ym.toPlainDate({ day: 1 }); // first day of month
                 const iso = `${d.toString()}T00:00[${tz}]`;
                 const zdt = Temporal.ZonedDateTime.from(iso);
                 return zdt.toInstant().epochMilliseconds;
             }
-            case 'month-day': {
+            case 'monthDay': {
                 const md = this.value;
                 const today = Temporal.Now.plainDateISO();
                 const d = md.toPlainDate({ year: today.year }); // current year
@@ -132,17 +131,17 @@ export class bbnDt {
         switch (kind) {
             case 'zoned':
                 return Temporal.Now.zonedDateTimeISO();
-            case 'datetime':
+            case 'dateTime':
                 return Temporal.Now.plainDateTimeISO();
             case 'date':
                 return Temporal.Now.plainDateISO();
             case 'time':
                 return Temporal.Now.plainTimeISO();
-            case 'year-month': {
+            case 'yearMonth': {
                 const d = Temporal.Now.plainDateISO();
                 return new Temporal.PlainYearMonth(d.year, d.month);
             }
-            case 'month-day': {
+            case 'monthDay': {
                 const d = Temporal.Now.plainDateISO();
                 return new Temporal.PlainMonthDay(d.month, d.day, undefined, d.year);
             }
@@ -175,7 +174,7 @@ export class bbnDt {
                     case 'zoned': {
                         return x.value;
                     }
-                    case 'datetime': {
+                    case 'dateTime': {
                         const v = x.value;
                         const iso = `${v.toString()}[${tz}]`;
                         return Temporal.ZonedDateTime.from(iso);
@@ -185,7 +184,7 @@ export class bbnDt {
                         const iso = `${d.toString()}T00:00[${tz}]`;
                         return Temporal.ZonedDateTime.from(iso);
                     }
-                    case 'year-month': {
+                    case 'yearMonth': {
                         const ym = x.value;
                         const d = ym.toPlainDate({ day: 1 });
                         const iso = `${d.toString()}T00:00[${tz}]`;
@@ -221,9 +220,9 @@ export class bbnDt {
         // ---- CASE 2: different constructors, but convertible bbnDt kinds ----
         const convertibleKinds = new Set([
             'zoned',
-            'datetime',
+            'dateTime',
             'date',
-            'year-month',
+            'yearMonth',
         ]);
         if (isBbnDt(a) &&
             isBbnDt(b) &&
@@ -247,7 +246,7 @@ export class bbnDt {
         return bbn.dt(input, format, cls, locale);
     }
     parse(input, format, cls) {
-        return bbnDt.parse(input, format, cls || camelToCss(this.kind));
+        return bbnDt.parse(input, format, cls || this.kind);
     }
     compare(other, unit) {
         if (!(other instanceof bbnDt)) {
@@ -455,7 +454,10 @@ export class bbnDt {
     }
     time(v) {
         if (0 in arguments && (v !== undefined) && !(v instanceof Event)) {
-            if (this.kind === 'date') {
+            if (this.kind === 'zoned') {
+                return this.parse(this.date() + ' ' + v + ' GMT' + this.value.timeZoneId, 'Y-m-d H:i:s[ GMT]Z', 'dateTime');
+            }
+            if (['dateTime', 'date'].includes(this.kind)) {
                 return this.parse(this.date() + ' ' + v, 'Y-m-d H:i:s', 'dateTime');
             }
             return this.parse(v, 'H:i:s');
@@ -906,7 +908,7 @@ export class bbnDt {
             switch (this.kind) {
                 case "zoned":
                     return this.value;
-                case "datetime": {
+                case "dateTime": {
                     const pdt = this.value;
                     const iso = `${pdt.toString()}[${tz}]`;
                     return Temporal.ZonedDateTime.from(iso);
@@ -922,13 +924,13 @@ export class bbnDt {
                     const iso = `${today.toString()}T${t.toString()}[${tz}]`;
                     return Temporal.ZonedDateTime.from(iso);
                 }
-                case "year-month": {
+                case "yearMonth": {
                     const ym = this.value;
                     const d = ym.toPlainDate({ day: 1 });
                     const iso = `${d.toString()}T00:00[${tz}]`;
                     return Temporal.ZonedDateTime.from(iso);
                 }
-                case "month-day": {
+                case "monthDay": {
                     const md = this.value;
                     const today = Temporal.Now.plainDateISO();
                     const d = md.toPlainDate({ year: today.year });
@@ -1006,17 +1008,17 @@ export class bbnDt {
         switch (this.kind) {
             case "zoned":
                 return this.withValue(end);
-            case "datetime":
+            case "dateTime":
                 return this.withValue(end.toPlainDateTime());
             case "date":
                 return this.withValue(end.toPlainDate());
             case "time":
                 return this.withValue(end.toPlainTime());
-            case "year-month": {
+            case "yearMonth": {
                 const p = end.toPlainDate();
                 return this.withValue(new Temporal.PlainYearMonth(p.year, p.month));
             }
-            case "month-day": {
+            case "monthDay": {
                 const p = end.toPlainDate();
                 return this.withValue(new Temporal.PlainMonthDay(p.month, p.day));
             }

package/dist/dt/classes/monthDay.js

@@ -26,7 +26,7 @@ export default class bbnDtMonthDay extends bbnDt {
             value = new Temporal.PlainMonthDay(m, d);
         }
         super(value);
-        this.kind = 'month-day';
+        this.kind = 'monthDay';
     }
     fdate(long = false, withTime = false, weekday = false) {
         if (!this.value) {

package/dist/dt/classes/yearMonth.js

@@ -27,7 +27,7 @@ export default class bbnDtYearMonth extends bbnDt {
             value = new Temporal.PlainYearMonth(y, m);
         }
         super(value);
-        this.kind = 'year-month';
+        this.kind = 'yearMonth';
     }
     format(format) {
         // long

package/dist/dt/functions/guessFormat.js

@@ -7,6 +7,7 @@ const MYSQL_AND_NATIVE_FORMATS = [
     // Date + time
     'YYYY-MM-DD HH:II:SS.ms',
     'YYYY-MM-DD HH:II:SS',
+    'YYYY-MM-DD HH:II:SS[ GMT]Z',
     'YYYY-MM-DD HH:II',
     // Time only
     // --- ISO 8601 / JS toISOString() ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "2.0.127",
+  "version": "2.0.128",
   "description": "Javascript toolkit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",