@forthic/interp 0.8.2 → 0.10.0

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

@@ -1,15 +1,17 @@
 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>;
     constructor(interp: Interpreter);
+    set_interp(_interp: Interpreter): void;
     find_word(name: string): Word | null;
     find_literal_word(string: string): Word | null;
     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;
@@ -93,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/cjs/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");
@@ -210,6 +211,9 @@ class GlobalModule extends module_1.Module {
         this.add_module_word("PROFILE-END", this.word_PROFILE_END);
         this.add_module_word("PROFILE-DATA", this.word_PROFILE_DATA);
     }
+    set_interp(_interp) {
+        throw new Error("Attempt to overwrite interpreter of global module");
+    }
     find_word(name) {
         let result = super.find_word(name);
         if (!result)
@@ -258,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) {
@@ -273,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
@@ -1578,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);
     }
@@ -1634,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 )
@@ -1709,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 )