@forthic/interp 0.9.0 → 0.11.0

package/dist/cjs/forthic/utils.js

@@ -7,10 +7,10 @@ exports.is_array = is_array;
 exports.is_empty_object = is_empty_object;
 exports.pretty_print = pretty_print;
 exports.to_string = to_string;
-exports.is_valid_date = is_valid_date;
 exports.to_date = to_date;
 exports.date_to_string = date_to_string;
 exports.date_to_int = date_to_int;
+const temporal_polyfill_1 = require("temporal-polyfill");
 function is_string(value) {
     return typeof value === "string" || value instanceof String;
 }
@@ -37,36 +37,30 @@ function pretty_print(value) {
 function to_string(obj) {
     return pretty_print(obj);
 }
-function is_valid_date(date) {
-    if (date instanceof Date) {
-        return !isNaN(date.getTime());
-    }
-    else if (typeof date === "string" || typeof date === "number") {
-        const parsedDate = new Date(date);
-        return !isNaN(parsedDate.getTime());
-    }
-    return false;
-}
 function to_date(obj) {
     let result;
-    if (obj instanceof Date) {
+    if (obj instanceof temporal_polyfill_1.Temporal.PlainDate) {
         result = obj;
     }
-    else if (is_valid_date(obj)) {
-        result = new Date(obj);
+    else if (obj instanceof temporal_polyfill_1.Temporal.PlainDateTime) {
+        result = temporal_polyfill_1.Temporal.PlainDate.from(obj);
+    }
+    else if (typeof obj === "number" || typeof obj === "string") {
+        // Assume number is seconds since epoch
+        const date = new Date(obj);
+        result = temporal_polyfill_1.Temporal.PlainDate.from({ year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate() });
     }
     else {
         return null;
     }
-    result.setHours(0, 0, 0, 0);
     return result;
 }
 function date_to_string(date) {
     let result = "";
-    if (date instanceof Date) {
-        const m = date.getUTCMonth() + 1;
-        const d = date.getUTCDate();
-        const y = date.getUTCFullYear();
+    if (date instanceof temporal_polyfill_1.Temporal.PlainDate) {
+        const m = date.month;
+        const d = date.day;
+        const y = date.year;
         let m_str = `${m}`;
         let d_str = `${d}`;
         if (m < 10)

package/dist/cjs/forthic/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/forthic/utils.ts"],"names":[],"mappings":";;AAAA,8BAEG;AAED,8BAGC;AAED,8BAEC;AAED,4BAEC;AAED,0CAKC;AAED,oCAEC;AAED,8BAEC;AAED,sCAQC;AAED,0BAWC;AAED,wCAcC;AAED,kCAKC;AA5EH,SAAgB,SAAS,CAAC,KAAU;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM,CAAC;AAC9D,CAAC;AAED,SAAgB,SAAS,CAAC,KAAU;IAClC,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IACjC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC5D,CAAC;AAED,SAAgB,SAAS,CAAC,KAAU;IAClC,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC;AAED,SAAgB,QAAQ,CAAC,KAAU;IACjC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC3D,CAAC;AAED,SAAgB,eAAe,CAAC,KAAU;IACxC,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,YAAY,CAAC,KAAU;IACrC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED,SAAgB,SAAS,CAAC,GAAQ;IAChC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED,SAAgB,aAAa,CAAC,IAAS;IACrC,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAChC,CAAC;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAChE,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,OAAO,CAAC,GAAQ;IAC9B,IAAI,MAAY,CAAC;IACjB,IAAI,GAAG,YAAY,IAAI,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,CAAC;IACf,CAAC;SAAM,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,cAAc,CAAC,IAAS;IACtC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAEhC,IAAI,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;QACnB,IAAI,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;QACnB,IAAI,CAAC,GAAG,EAAE;YAAE,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,EAAE;YAAE,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,CAAC,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;IACpC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,WAAW,CAAC,IAAS;IACnC,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAChC,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/forthic/utils.ts"],"names":[],"mappings":"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"}

package/dist/esm/forthic/global_module.d.ts

@@ -1,4 +1,5 @@
 import { Module, Word } from "./module";
+import { Temporal } from "temporal-polyfill";
 import { type Interpreter } from "./interpreter";
 export declare class GlobalModule extends Module {
     literal_handlers: Array<(value: any) => any>;
@@ -9,8 +10,8 @@ export declare class GlobalModule extends Module {
     to_bool(str_val: string): boolean | null;
     to_int(str_val: string): number | null;
     to_float(str_val: string): number | null;
-    to_literal_date(str_val: string): Date | null;
-    to_time(str_val: string): Date | null;
+    to_literal_date(str_val: string): Temporal.PlainDate | null;
+    to_time(str_val: string): Temporal.PlainTime | null;
     make_element_word(element_name: string): (interp: Interpreter) => Promise<void>;
     add_element_word(element_name: string): void;
     word_VARIABLES(interp: Interpreter): void;
@@ -94,7 +95,7 @@ export declare class GlobalModule extends Module {
     word_FRIDAY(interp: Interpreter): void;
     word_SATURDAY(interp: Interpreter): void;
     word_SUNDAY(interp: Interpreter): void;
-    static get_day_this_week(day_of_week: any): Date;
+    static get_day_this_week(day_of_week: number, timezone: Temporal.TimeZoneLike): Temporal.PlainDate;
     word_ADD_DAYS(interp: Interpreter): void;
     word_SUBTRACT_DATES(interp: Interpreter): void;
     word_DATE_to_STR(interp: Interpreter): void;

package/dist/esm/forthic/global_module.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlobalModule = void 0;
 const module_1 = require("./module");
 const utils_1 = require("./utils");
+const temporal_polyfill_1 = require("temporal-polyfill");
 const map_word_1 = require("./global_module/map_word");
 const tokenizer_1 = require("./tokenizer");
 const errors_1 = require("./errors");
@@ -261,9 +262,11 @@ class GlobalModule extends module_1.Module {
         const year = Number(match[1]);
         const month = Number(match[2]);
         const day = Number(match[3]);
-        const result = new Date();
-        result.setUTCFullYear(year, month - 1, day);
-        result.setUTCHours(0, 0, 0, 0);
+        const result = temporal_polyfill_1.Temporal.PlainDate.from({
+            year,
+            month,
+            day,
+        });
         return result;
     }
     to_time(str_val) {
@@ -276,8 +279,10 @@ class GlobalModule extends module_1.Module {
             return null;
         if (minutes >= 60)
             return null;
-        const result = new Date();
-        result.setHours(hours, minutes, 0, 0);
+        const result = temporal_polyfill_1.Temporal.PlainTime.from({
+            hour: hours,
+            minute: minutes,
+        });
         return result;
     }
     // Convenience function to create element word handlers
@@ -1581,45 +1586,54 @@ class GlobalModule extends module_1.Module {
     // ( time -- time )
     word_AM(interp) {
         const time = interp.stack_pop();
-        if (!(time instanceof Date))
+        if (!(time instanceof temporal_polyfill_1.Temporal.PlainTime))
             throw "AM expecting a time";
         let result = time;
-        if (time.getHours() >= 12) {
-            result = new Date();
-            result.setHours(time.getHours() - 12);
-            result.setMinutes(time.getMinutes());
+        if (time.hour >= 12) {
+            result = temporal_polyfill_1.Temporal.PlainTime.from({
+                hour: time.hour - 12,
+                minute: time.minute,
+            });
         }
         interp.stack_push(result);
     }
     // ( time -- time )
     word_PM(interp) {
         const time = interp.stack_pop();
-        if (!(time instanceof Date))
+        if (!(time instanceof temporal_polyfill_1.Temporal.PlainTime))
             throw "PM expecting a time";
         let result = time;
-        if (time.getHours() < 12) {
-            result = new Date();
-            result.setHours(time.getHours() + 12);
-            result.setMinutes(time.getMinutes());
+        if (time.hour < 12) {
+            result = temporal_polyfill_1.Temporal.PlainTime.from({
+                hour: time.hour + 12,
+                minute: time.minute,
+            });
         }
         interp.stack_push(result);
     }
     // ( -- time )
     word_NOW(interp) {
-        const result = new Date();
+        const result = temporal_polyfill_1.Temporal.Now.plainDateTimeISO(interp.get_timezone());
         interp.stack_push(result);
     }
     // ( item -- time )
     word_to_TIME(interp) {
         const item = interp.stack_pop();
         let result;
-        if (item instanceof Date) {
+        if (item instanceof temporal_polyfill_1.Temporal.PlainTime) {
             result = item;
         }
+        else if (item instanceof temporal_polyfill_1.Temporal.PlainDateTime) {
+            result = temporal_polyfill_1.Temporal.PlainTime.from(item);
+        }
         else {
             // NB: We need a date in order for Date.parse to succeed. Also assuming str is a time
             const date_string = "Jan 1, 2000 " + item;
-            result = new Date(Date.parse(date_string));
+            const date = new Date(Date.parse(date_string));
+            result = temporal_polyfill_1.Temporal.PlainTime.from({
+                hour: date.getHours(),
+                minute: date.getMinutes(),
+            });
         }
         interp.stack_push(result);
     }
@@ -1637,64 +1651,57 @@ class GlobalModule extends module_1.Module {
     }
     // ( -- date )
     word_TODAY(interp) {
-        const result = new Date();
-        result.setHours(0, 0, 0, 0);
+        const result = temporal_polyfill_1.Temporal.Now.plainDateISO(interp.get_timezone());
         interp.stack_push(result);
     }
     // ( -- date )
     word_MONDAY(interp) {
-        interp.stack_push(GlobalModule.get_day_this_week(0));
+        interp.stack_push(GlobalModule.get_day_this_week(0, interp.get_timezone()));
     }
     // ( -- date )
     word_TUESDAY(interp) {
-        interp.stack_push(GlobalModule.get_day_this_week(1));
+        interp.stack_push(GlobalModule.get_day_this_week(1, interp.get_timezone()));
     }
     // ( -- date )
     word_WEDNESDAY(interp) {
-        interp.stack_push(GlobalModule.get_day_this_week(2));
+        interp.stack_push(GlobalModule.get_day_this_week(2, interp.get_timezone()));
     }
     // ( -- date )
     word_THURSDAY(interp) {
-        interp.stack_push(GlobalModule.get_day_this_week(3));
+        interp.stack_push(GlobalModule.get_day_this_week(3, interp.get_timezone()));
     }
     // ( -- date )
     word_FRIDAY(interp) {
-        interp.stack_push(GlobalModule.get_day_this_week(4));
+        interp.stack_push(GlobalModule.get_day_this_week(4, interp.get_timezone()));
     }
     // ( -- date )
     word_SATURDAY(interp) {
-        interp.stack_push(GlobalModule.get_day_this_week(5));
+        interp.stack_push(GlobalModule.get_day_this_week(5, interp.get_timezone()));
     }
     // ( -- date )
     word_SUNDAY(interp) {
-        interp.stack_push(GlobalModule.get_day_this_week(6));
-    }
-    static get_day_this_week(day_of_week) {
-        // NOTE: Monday is start of week
-        function normalize_day(day) {
-            return day;
-        }
-        const today = new Date();
-        today.setHours(0, 0, 0, 0);
-        const delta_days = (day_of_week - normalize_day(today.getDay())) % 7;
-        const result = today;
-        result.setDate(result.getDate() + delta_days + 1);
+        interp.stack_push(GlobalModule.get_day_this_week(6, interp.get_timezone()));
+    }
+    static get_day_this_week(day_of_week, timezone) {
+        // Get plain date for day of week
+        const today = temporal_polyfill_1.Temporal.Now.plainDateISO(timezone);
+        const delta_days = (day_of_week - today.dayOfWeek) % 7;
+        const result = today.add({ days: delta_days });
         return result;
     }
     // ( date num-days -- date )
     word_ADD_DAYS(interp) {
         const num_days = interp.stack_pop();
         const date = interp.stack_pop();
-        const result = new Date(date);
-        result.setDate(result.getDate() + num_days);
+        const result = temporal_polyfill_1.Temporal.PlainDate.from(date).add({ days: num_days });
         interp.stack_push(result);
     }
     // ( l_date r_date -- num_days )
     word_SUBTRACT_DATES(interp) {
-        const r_date = interp.stack_pop();
-        const l_date = interp.stack_pop();
-        const ms_per_day = 1000 * 60 * 60 * 24;
-        const result = Math.round((l_date.getTime() - r_date.getTime()) / ms_per_day);
+        const r_date = temporal_polyfill_1.Temporal.PlainDate.from(interp.stack_pop());
+        const l_date = temporal_polyfill_1.Temporal.PlainDate.from(interp.stack_pop());
+        // Subtract the dates and get the difference in days
+        const result = r_date.until(l_date).total({ unit: "days" });
         interp.stack_push(result);
     }
     // ( date -- str )
@@ -1712,28 +1719,36 @@ class GlobalModule extends module_1.Module {
     }
     // ( date time -- datetime )
     word_DATE_TIME_to_DATETIME(interp) {
-        const time = interp.stack_pop();
-        const date = interp.stack_pop();
-        const dt_string = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} ${time.getHours()}:${time.getMinutes()}`;
-        const result = new Date(dt_string);
+        const time = temporal_polyfill_1.Temporal.PlainTime.from(interp.stack_pop());
+        const date = temporal_polyfill_1.Temporal.PlainDate.from(interp.stack_pop());
+        const result = temporal_polyfill_1.Temporal.PlainDateTime.from({
+            year: date.year,
+            month: date.month,
+            day: date.day,
+            hour: time.hour,
+            minute: time.minute,
+        });
         interp.stack_push(result);
     }
     // ( datetime -- timestamp )
     word_DATETIME_to_TIMESTAMP(interp) {
         const datetime = interp.stack_pop();
-        const result = Math.round(datetime.getTime() / 1000);
+        // Convert to ZonedDateTime
+        const zonedDateTime = datetime.toZonedDateTime(interp.get_timezone());
+        const result = zonedDateTime.toInstant().epochSeconds;
         interp.stack_push(result);
     }
     // ( timestamp -- datetime )
     word_TIMESTAMP_to_DATETIME(interp) {
         const timestamp = interp.stack_pop();
-        const result = new Date(timestamp * 1000);
+        const result = temporal_polyfill_1.Temporal.Instant.fromEpochSeconds(timestamp).toZonedDateTime({ timeZone: interp.get_timezone(), calendar: "iso8601" });
         interp.stack_push(result);
     }
     // ( str -- datetime )
     word_STR_to_DATETIME(interp) {
         const s = interp.stack_pop();
-        const result = new Date(s);
+        const date = new Date(s);
+        const result = temporal_polyfill_1.Temporal.Instant.fromEpochMilliseconds(date.getTime()).toZonedDateTime({ timeZone: interp.get_timezone(), calendar: "iso8601" });
         interp.stack_push(result);
     }
     // ( str -- timestamp )