@forthic/interp 0.12.0 → 0.14.0

package/dist/esm/forthic/global_module.js

@@ -1,14 +1,11 @@
-"use strict";
-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");
+import { Module, PushValueWord } from "./module";
+import { is_array, is_record, is_string, pretty_print, to_date, date_to_string, date_to_int, } from "./utils";
+import { Temporal } from "temporal-polyfill";
+import { MapWord } from "./global_module/map_word";
+import { CodeLocation } from "./tokenizer";
+import { IntentionalStopError, InvalidVariableNameError } from "./errors";
 const DLE = String.fromCharCode(16); // ASCII char for "Data Link Escape" used as an untypeable quote
-class GlobalModule extends module_1.Module {
+export class GlobalModule extends Module {
     literal_handlers;
     constructor(interp) {
         super("<GLOBAL>", interp);
@@ -226,7 +223,7 @@ class GlobalModule extends module_1.Module {
         for (let i = 0; i < self.literal_handlers.length; i++) {
             value = self.literal_handlers[i](string);
             if (value !== null)
-                return new module_1.PushValueWord(string, value);
+                return new PushValueWord(string, value);
         }
         return null;
     }
@@ -256,16 +253,61 @@ class GlobalModule extends module_1.Module {
             return result;
     }
     to_literal_date(str_val) {
-        const match = str_val.match(/(\d{4})-(\d{2})-(\d{2})/);
-        if (!match)
+        // --------------------
+        // Handle date format strings like "YYYY-MM-DD" or "YYYY-MM-03" or "YYYY-02-03" or "2025-02-03"
+        let year;
+        let month;
+        let day;
+        const date_parts = str_val.split("-");
+        const zonedDateTime = Temporal.Now.zonedDateTimeISO(this.interp?.get_timezone() ?? "UTC");
+        // Case 1: If time is like "YYYY-MM-DD"
+        if (str_val.match(/^YYYY-MM-DD$/)) {
+            year = zonedDateTime.year;
+            month = zonedDateTime.month;
+            day = zonedDateTime.day;
+        } // Case 2: If time is like "YYYY-MM-03"
+        else if (str_val.match(/^YYYY-MM-\d{2}$/)) {
+            year = zonedDateTime.year;
+            month = zonedDateTime.month;
+            day = parseInt(date_parts[2]);
+        } // Case 3: If time is like "YYYY-02-03"
+        else if (str_val.match(/^YYYY-\d{2}-\d{2}$/)) {
+            year = zonedDateTime.year;
+            month = parseInt(date_parts[1]);
+            day = parseInt(date_parts[2]);
+        } // Case 4: If time is like "2025-02-03"
+        else if (str_val.match(/^\d{4}-\d{2}-\d{2}$/)) {
+            year = parseInt(date_parts[0]);
+            month = parseInt(date_parts[1]);
+            day = parseInt(date_parts[2]);
+        } // Case 5: If time is like "2025-MM-DD"
+        else if (str_val.match(/^\d{4}-MM-DD$/)) {
+            year = parseInt(date_parts[0]);
+            month = zonedDateTime.month;
+            day = zonedDateTime.day;
+        } // Case 6: If time is like "2025-02-DD"
+        else if (str_val.match(/^\d{4}-\d{2}-DD$/)) {
+            year = parseInt(date_parts[0]);
+            month = parseInt(date_parts[1]);
+            day = zonedDateTime.day;
+        } // Case 7: If time is like "2025-MM-03"
+        else if (str_val.match(/^\d{4}-MM-\d{2}$/)) {
+            year = parseInt(date_parts[0]);
+            month = zonedDateTime.month;
+            day = parseInt(date_parts[2]);
+        } // Case 8: If time is like "YYYY-03-DD"
+        else if (str_val.match(/^YYYY-\d{2}-DD$/)) {
+            year = zonedDateTime.year;
+            month = parseInt(date_parts[1]);
+            day = zonedDateTime.day;
+        } // Otherwise, return null
+        else {
             return null;
-        const year = Number(match[1]);
-        const month = Number(match[2]);
-        const day = Number(match[3]);
-        const result = temporal_polyfill_1.Temporal.PlainDate.from({
-            year,
-            month,
-            day,
+        }
+        const result = Temporal.PlainDate.from({
+            year: year,
+            month: month,
+            day: day,
         });
         return result;
     }
@@ -279,7 +321,7 @@ class GlobalModule extends module_1.Module {
             return null;
         if (minutes >= 60)
             return null;
-        const result = temporal_polyfill_1.Temporal.PlainTime.from({
+        const result = Temporal.PlainTime.from({
             hour: hours,
             minute: minutes,
         });
@@ -304,7 +346,7 @@ class GlobalModule extends module_1.Module {
         const module = interp.cur_module();
         varnames.forEach((v) => {
             if (v.match(/__.*/)) {
-                throw new errors_1.InvalidVariableNameError(interp.get_top_input_string(), v, "Variable names cannot begin with '__'", interp.get_string_location());
+                throw new InvalidVariableNameError(interp.get_top_input_string(), v, "Variable names cannot begin with '__'", interp.get_string_location());
             }
             module.add_variable(v);
         });
@@ -653,7 +695,7 @@ class GlobalModule extends module_1.Module {
         const string_location = interp.get_string_location();
         const items = interp.stack_pop();
         const flags = interp.get_flags(this.module_id);
-        const map_word = new map_word_1.MapWord(items, forthic, string_location, flags);
+        const map_word = new MapWord(items, forthic, string_location, flags);
         await map_word.execute(interp);
     }
     // ( items word -- ? )
@@ -1586,11 +1628,11 @@ class GlobalModule extends module_1.Module {
     // ( time -- time )
     word_AM(interp) {
         const time = interp.stack_pop();
-        if (!(time instanceof temporal_polyfill_1.Temporal.PlainTime))
+        if (!(time instanceof Temporal.PlainTime))
             throw "AM expecting a time";
         let result = time;
         if (time.hour >= 12) {
-            result = temporal_polyfill_1.Temporal.PlainTime.from({
+            result = Temporal.PlainTime.from({
                 hour: time.hour - 12,
                 minute: time.minute,
             });
@@ -1600,11 +1642,11 @@ class GlobalModule extends module_1.Module {
     // ( time -- time )
     word_PM(interp) {
         const time = interp.stack_pop();
-        if (!(time instanceof temporal_polyfill_1.Temporal.PlainTime))
+        if (!(time instanceof Temporal.PlainTime))
             throw "PM expecting a time";
         let result = time;
         if (time.hour < 12) {
-            result = temporal_polyfill_1.Temporal.PlainTime.from({
+            result = Temporal.PlainTime.from({
                 hour: time.hour + 12,
                 minute: time.minute,
             });
@@ -1613,24 +1655,24 @@ class GlobalModule extends module_1.Module {
     }
     // ( -- time )
     word_NOW(interp) {
-        const result = temporal_polyfill_1.Temporal.Now.plainDateTimeISO(interp.get_timezone());
+        const result = 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 temporal_polyfill_1.Temporal.PlainTime) {
+        if (item instanceof Temporal.PlainTime) {
             result = item;
         }
-        else if (item instanceof temporal_polyfill_1.Temporal.PlainDateTime) {
-            result = temporal_polyfill_1.Temporal.PlainTime.from(item);
+        else if (item instanceof Temporal.PlainDateTime) {
+            result = 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;
             const date = new Date(Date.parse(date_string));
-            result = temporal_polyfill_1.Temporal.PlainTime.from({
+            result = Temporal.PlainTime.from({
                 hour: date.getHours(),
                 minute: date.getMinutes(),
             });
@@ -1646,12 +1688,12 @@ class GlobalModule extends module_1.Module {
     // ( str -- date )
     word_to_DATE(interp) {
         const s = interp.stack_pop();
-        const result = (0, utils_1.to_date)(s);
+        const result = to_date(s);
         interp.stack_push(result);
     }
     // ( -- date )
     word_TODAY(interp) {
-        const result = temporal_polyfill_1.Temporal.Now.plainDateISO(interp.get_timezone());
+        const result = Temporal.Now.plainDateISO(interp.get_timezone());
         interp.stack_push(result);
     }
     // ( -- date )
@@ -1684,7 +1726,7 @@ class GlobalModule extends module_1.Module {
     }
     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 today = Temporal.Now.plainDateISO(timezone);
         const delta_days = (day_of_week - today.dayOfWeek) % 7;
         const result = today.add({ days: delta_days });
         return result;
@@ -1693,13 +1735,13 @@ class GlobalModule extends module_1.Module {
     word_ADD_DAYS(interp) {
         const num_days = interp.stack_pop();
         const date = interp.stack_pop();
-        const result = temporal_polyfill_1.Temporal.PlainDate.from(date).add({ days: num_days });
+        const result = 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 = temporal_polyfill_1.Temporal.PlainDate.from(interp.stack_pop());
-        const l_date = temporal_polyfill_1.Temporal.PlainDate.from(interp.stack_pop());
+        const r_date = Temporal.PlainDate.from(interp.stack_pop());
+        const l_date = 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);
@@ -1707,21 +1749,21 @@ class GlobalModule extends module_1.Module {
     // ( date -- str )
     word_DATE_to_STR(interp) {
         const date = interp.stack_pop();
-        const result = (0, utils_1.date_to_string)(date);
+        const result = date_to_string(date);
         interp.stack_push(result);
     }
     // ( date -- int )
     // Converts a date like 2023-11-12 to 20231112
     word_DATE_to_INT(interp) {
         const date = interp.stack_pop();
-        const result = (0, utils_1.date_to_int)(date);
+        const result = date_to_int(date);
         interp.stack_push(result);
     }
     // ( date time -- datetime )
     word_DATE_TIME_to_DATETIME(interp) {
-        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({
+        const time = Temporal.PlainTime.from(interp.stack_pop());
+        const date = Temporal.PlainDate.from(interp.stack_pop());
+        const result = Temporal.PlainDateTime.from({
             year: date.year,
             month: date.month,
             day: date.day,
@@ -1741,14 +1783,14 @@ class GlobalModule extends module_1.Module {
     // ( timestamp -- datetime )
     word_TIMESTAMP_to_DATETIME(interp) {
         const timestamp = interp.stack_pop();
-        const result = temporal_polyfill_1.Temporal.Instant.fromEpochSeconds(timestamp).toZonedDateTime({ timeZone: interp.get_timezone(), calendar: "iso8601" });
+        const result = 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 date = new Date(s);
-        const result = temporal_polyfill_1.Temporal.Instant.fromEpochMilliseconds(date.getTime()).toZonedDateTime({ timeZone: interp.get_timezone(), calendar: "iso8601" });
+        const result = Temporal.Instant.fromEpochMilliseconds(date.getTime()).toZonedDateTime({ timeZone: interp.get_timezone(), calendar: "iso8601" });
         interp.stack_push(result);
     }
     // ( str -- timestamp )
@@ -1849,7 +1891,7 @@ class GlobalModule extends module_1.Module {
             const non_null_objects = objects.filter((obj) => obj !== null || obj !== undefined);
             const res = {};
             non_null_objects.forEach((obj) => {
-                const obj_str = (0, utils_1.is_string)(obj) ? obj : JSON.stringify(obj);
+                const obj_str = is_string(obj) ? obj : JSON.stringify(obj);
                 if (res[obj_str])
                     res[obj_str]++;
                 else
@@ -1879,14 +1921,14 @@ class GlobalModule extends module_1.Module {
             return values.every((val) => typeof val == "number");
         }
         function is_all_records(values) {
-            return values.every((val) => (0, utils_1.is_record)(val));
+            return values.every((val) => is_record(val));
         }
         function select_non_null_values(values) {
             return values.filter((val) => val !== null && val !== undefined);
         }
         function compute_mean(values) {
             let result;
-            if ((0, utils_1.is_array)(values)) {
+            if (is_array(values)) {
                 const non_null_values = select_non_null_values(values);
                 if (is_all_numbers(non_null_values)) {
                     result = compute_number_mean(non_null_values);
@@ -1911,7 +1953,7 @@ class GlobalModule extends module_1.Module {
     word_MAX(interp) {
         const num2 = interp.stack_pop();
         let numbers = [];
-        if ((0, utils_1.is_array)(num2)) {
+        if (is_array(num2)) {
             numbers = num2;
         }
         else {
@@ -1925,7 +1967,7 @@ class GlobalModule extends module_1.Module {
     word_MIN(interp) {
         const num2 = interp.stack_pop();
         let numbers = [];
-        if ((0, utils_1.is_array)(num2)) {
+        if (is_array(num2)) {
             numbers = num2;
         }
         else {
@@ -2379,7 +2421,7 @@ class GlobalModule extends module_1.Module {
     // ( json -- json )
     word_PRETTIFY(interp) {
         const json = interp.stack_pop();
-        const result = (0, utils_1.pretty_print)(json);
+        const result = pretty_print(json);
         interp.stack_push(result);
     }
     // ( json -- object )
@@ -2394,7 +2436,7 @@ class GlobalModule extends module_1.Module {
     async word_LOAD_SCREEN(interp) {
         const name = interp.stack_pop();
         const screen_forthic = interp.get_screen_forthic(name);
-        const location = new tokenizer_1.CodeLocation({ screen_name: name });
+        const location = new CodeLocation({ screen_name: name });
         // await interp.run(screen_forthic, location);
         await interp.run(screen_forthic, location);
     }
@@ -2407,13 +2449,13 @@ class GlobalModule extends module_1.Module {
         else {
             console.log("<STACK EMPTY>");
         }
-        throw new errors_1.IntentionalStopError(".s");
+        throw new IntentionalStopError(".s");
     }
     // ( -- )
     word_dot_S(interp) {
         const stack = interp.get_stack().get_items().reverse();
         console.log(JSON.stringify(stack, null, 2));
-        throw new errors_1.IntentionalStopError(".S");
+        throw new IntentionalStopError(".S");
     }
     // ( a b -- a - b )
     word_minus(interp) {
@@ -2422,7 +2464,6 @@ class GlobalModule extends module_1.Module {
         interp.stack_push(a - b);
     }
 }
-exports.GlobalModule = GlobalModule;
 // Descends into record using an array of fields, returning final value or null
 function drill_for_value(record, fields) {
     let result = record;