nesoi 3.4.14 → 3.4.16

package/lib/engine/data/datetime.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NesoiDatetime = void 0;
+const date_1 = require("./date");
 const duration_1 = require("./duration");
 const error_1 = require("./error");
 /**
@@ -50,9 +51,39 @@ class NesoiDatetime {
     atTimezone(tz) {
         return new NesoiDatetime(this.epoch, tz);
     }
+    /**
+     * Make a new `NesoiDateTime`
+     * @param year Numeric year
+     * @param month 1~12
+     * @param day 1~31
+     * @param hour 0~24
+     * @param minute 0~60
+     * @param second 0~60
+     * @param ms 0~999
+     * @param tz
+     * @returns
+     */
+    static make(year = 0, month = 1, day = 1, hour = 0, minute = 0, second = 0, ms = 0, tz = 'Z') {
+        const _month = (month < 10 ? '0' : '') + month;
+        const _day = (day < 10 ? '0' : '') + day;
+        const _hour = (hour < 10 ? '0' : '') + hour;
+        const _minute = (minute < 10 ? '0' : '') + minute;
+        const _second = (second < 10 ? '0' : '') + second;
+        const _ms = (ms < 100 ? '0' : '') + (ms < 10 ? '0' : '') + ms;
+        return this.fromISO(`${year}-${_month}-${_day}T${_hour}:${_minute}:${_second}.${_ms}${tz}`);
+    }
     // Parse
+    static parse(value) {
+        if (typeof value === 'string') {
+            return this.fromISO(value);
+        }
+        if (value instanceof NesoiDatetime) {
+            return value;
+        }
+        throw error_1.NesoiError.Data.InvalidDatetime({ value });
+    }
     /**
-     * Parse a timestamp from ISO 8601 format.
+     * Create a NesoiDatetime from a string on the ISO 8601 format.
      *
      * Example: `2025-04-16T23:04:42.000-03:00`
      */
@@ -76,26 +107,8 @@ class NesoiDatetime {
         const jsDate = Date.parse(iso);
         return new NesoiDatetime(jsDate, tz);
     }
-    /**
-     * Make a new `NesoiDateTime`
-     * @param year Numeric year
-     * @param month 1~12
-     * @param day 1~31
-     * @param hour 0~24
-     * @param minute 0~60
-     * @param second 0~60
-     * @param ms 0~999
-     * @param tz
-     * @returns
-     */
-    static make(year = 0, month = 1, day = 1, hour = 0, minute = 0, second = 0, ms = 0, tz = 'Z') {
-        const _month = (month < 10 ? '0' : '') + month;
-        const _day = (day < 10 ? '0' : '') + day;
-        const _hour = (hour < 10 ? '0' : '') + hour;
-        const _minute = (minute < 10 ? '0' : '') + minute;
-        const _second = (second < 10 ? '0' : '') + second;
-        const _ms = (ms < 100 ? '0' : '') + (ms < 10 ? '0' : '') + ms;
-        return this.fromISO(`${year}-${_month}-${_day}T${_hour}:${_minute}:${_second}.${_ms}${tz}`);
+    static fromJSDate(date, tz = 'Z') {
+        return new NesoiDatetime(date.getTime(), tz);
     }
     static fromValues(values) {
         return this.make(values.year, values.month, values.day, values.hour, values.minute, values.second, values.ms, values.tz);
@@ -118,6 +131,19 @@ class NesoiDatetime {
             .replace(',', '.')
             + this.tz;
     }
+    toString() {
+        return this.toISO();
+    }
+    toISODate() {
+        const date = new Date(0);
+        date.setUTCMilliseconds(this.epoch);
+        return date.toLocaleString('sv-SE', {
+            timeZone: NesoiDatetime.tz[this.tz],
+            year: 'numeric',
+            month: 'numeric',
+            day: 'numeric'
+        });
+    }
     toValues() {
         const date = new Date(0);
         date.setUTCMilliseconds(this.epoch);
@@ -160,17 +186,33 @@ class NesoiDatetime {
     }
     // Shift
     plus(period) {
-        return this.shift(`+ ${period}`);
+        return this.shift(true, period);
     }
     minus(period) {
-        return this.shift(`- ${period}`);
+        return this.shift(false, period);
     }
-    shift(period) {
-        const [_, op, val, type] = period.match(/(\+|-) (\d+) (\w+)s?/);
-        const duration = new duration_1.NesoiDuration({
-            [type]: parseInt(val)
-        });
-        const mult = op === '+' ? 1 : -1;
+    shift(plus, period) {
+        let duration;
+        if (typeof period === 'string') {
+            try {
+                const [_, val, type] = period.match(/(\d+) +(\w+)/);
+                duration = new duration_1.NesoiDuration({
+                    [type]: val
+                });
+            }
+            catch {
+                throw new Error(`Attempt to shift NesoiDate failed due to invalid period '${period}'`);
+            }
+        }
+        else {
+            if (period instanceof duration_1.NesoiDuration) {
+                duration = period;
+            }
+            else {
+                duration = new duration_1.NesoiDuration(period);
+            }
+        }
+        const mult = plus ? 1 : -1;
         let epoch = this.epoch;
         switch (duration.unit) {
             case 'miliseconds':
@@ -244,5 +286,59 @@ class NesoiDatetime {
         }
         return NesoiDatetime.fromValues(values);
     }
+    // End Of
+    /**
+     * Returns a new `NesoiDatetime` which refers to the
+     * end of a given period **on the object timezone**.
+     * @param period
+     * @returns
+     */
+    endOf(period) {
+        const values = this.toValues();
+        values.ms = 999;
+        values.second = 59;
+        values.minute = 59;
+        values.hour = 23;
+        switch (period) {
+            case 'month':
+                values.day = new Date(values.year, values.month, 0).getDate();
+                break;
+            case 'year':
+                values.day = new Date(values.year, 12, 0).getDate();
+                values.month = 12;
+                break;
+        }
+        return NesoiDatetime.fromValues(values);
+    }
+    // Comparisons
+    /**
+     * Returns a float with the distance in milliseconds between the datetimes.
+     * - `> 0`: left is greater
+     * - `== 0`: dates match
+     * - `< 0`: right is greater
+     */
+    compare(other) {
+        return (this.epoch - other.epoch);
+    }
+    eq(other) {
+        return this.compare(other) === 0;
+    }
+    gt(other) {
+        return this.compare(other) > 0;
+    }
+    gteq(other) {
+        return this.compare(other) >= 0;
+    }
+    lt(other) {
+        return this.compare(other) < 0;
+    }
+    lteq(other) {
+        return this.compare(other) <= 0;
+    }
+    // to NesoiDate
+    toDate() {
+        const values = this.toValues();
+        return new date_1.NesoiDate(values.day, values.month, values.year);
+    }
 }
 exports.NesoiDatetime = NesoiDatetime;

package/lib/engine/data/duration.d.ts

@@ -1,9 +1,27 @@
+export type TimeDuration = `${number} ${keyof typeof NesoiDuration.TIME_UNITS}` | {
+    miliseconds: number;
+} | {
+    seconds: number;
+} | {
+    minutes: number;
+} | {
+    hours: number;
+};
+export type DateDuration = `${number} ${keyof typeof NesoiDuration.DATE_UNITS}` | {
+    days: number;
+} | {
+    weeks: number;
+} | {
+    months: number;
+} | {
+    years: number;
+};
 /**
  * @category Engine
  * @subcategory Data
  */
 export declare class NesoiDuration {
-    static UNITS: {
+    static TIME_UNITS: {
         ms: "miliseconds";
         milisecond: "miliseconds";
         miliseconds: "miliseconds";
@@ -17,6 +35,21 @@ export declare class NesoiDuration {
         h: "hours";
         hour: "hours";
         hours: "hours";
+    };
+    static DATE_UNITS: {
+        d: "days";
+        day: "days";
+        days: "days";
+        w: "weeks";
+        week: "weeks";
+        weeks: "weeks";
+        month: "months";
+        months: "months";
+        y: "years";
+        year: "years";
+        years: "years";
+    };
+    static UNITS: {
         d: "days";
         day: "days";
         days: "days";
@@ -28,26 +61,27 @@ export declare class NesoiDuration {
         y: "years";
         year: "years";
         years: "years";
+        ms: "miliseconds";
+        milisecond: "miliseconds";
+        miliseconds: "miliseconds";
+        s: "seconds";
+        second: "seconds";
+        seconds: "seconds";
+        min: "minutes";
+        mins: "minutes";
+        minute: "minutes";
+        minutes: "minutes";
+        h: "hours";
+        hour: "hours";
+        hours: "hours";
     };
     value: number;
     unit: typeof NesoiDuration.UNITS[keyof typeof NesoiDuration.UNITS];
     constructor(value: {
-        miliseconds: number;
-    } | {
-        seconds: number;
-    } | {
-        minutes: number;
-    } | {
-        hours: number;
-    } | {
-        days: number;
-    } | {
-        weeks: number;
-    } | {
-        months: number;
-    } | {
-        years: number;
-    });
+        [K in keyof typeof NesoiDuration.UNITS]: {
+            [J in K]: number;
+        };
+    }[keyof typeof NesoiDuration.UNITS]);
     static fromString(value: string): NesoiDuration;
     toString(): string;
 }

package/lib/engine/data/duration.js

@@ -7,7 +7,7 @@ const error_1 = require("./error");
  * @subcategory Data
  */
 class NesoiDuration {
-    static UNITS = {
+    static TIME_UNITS = {
         ms: 'miliseconds',
         milisecond: 'miliseconds',
         miliseconds: 'miliseconds',
@@ -20,7 +20,9 @@ class NesoiDuration {
         minutes: 'minutes',
         h: 'hours',
         hour: 'hours',
-        hours: 'hours',
+        hours: 'hours'
+    };
+    static DATE_UNITS = {
         d: 'days',
         day: 'days',
         days: 'days',
@@ -33,6 +35,10 @@ class NesoiDuration {
         year: 'years',
         years: 'years',
     };
+    static UNITS = {
+        ...this.TIME_UNITS,
+        ...this.DATE_UNITS
+    };
     value;
     unit;
     constructor(value) {

package/lib/engine/data/error.d.ts

@@ -207,6 +207,12 @@ export declare namespace NesoiError {
         function InvalidISOString($: {
             value: string;
         }): BaseError;
+        function InvalidDate($: {
+            value: string;
+        }): BaseError;
+        function InvalidDatetime($: {
+            value: string;
+        }): BaseError;
         function InvalidDuration($: {
             value: string;
         }): BaseError;

package/lib/engine/data/error.js

@@ -347,6 +347,14 @@ var NesoiError;
             return new BaseError('Message.Data.InvalidISOString', `'${$.value}' is not a valid ISO string`, Status.BAD_REQUEST, $);
         }
         Data.InvalidISOString = InvalidISOString;
+        function InvalidDate($) {
+            return new BaseError('Message.Data.InvalidDate', `'${$.value}' is not a valid date`, Status.BAD_REQUEST, $);
+        }
+        Data.InvalidDate = InvalidDate;
+        function InvalidDatetime($) {
+            return new BaseError('Message.Data.InvalidDatetime', `'${$.value}' is not a valid datetime`, Status.BAD_REQUEST, $);
+        }
+        Data.InvalidDatetime = InvalidDatetime;
         function InvalidDuration($) {
             return new BaseError('Message.Data.InvalidDuration', `'${$.value}' is not a valid duration`, Status.BAD_REQUEST, $);
         }

package/lib/engine/transaction/nodes/external.trx_node.js

@@ -57,7 +57,8 @@ class ExternalTrxNode {
                 throw hold.status.error;
             }
             out = hold.status.output;
-            if (!(tag in parent.holds)) {
+            const parentModule = trx_node_1.TrxNode.getModule(parent.root);
+            if (!(tag in parent.holds) && this.tag.module !== parentModule.name) {
                 parent.holds[tag] = hold;
             }
         }

package/lib/engine/transaction/trx_engine.js

@@ -76,7 +76,7 @@ class TrxEngine {
         }
         // Chain/Continue transaction
         else {
-            const trxData = await this.ongoing[id];
+            const trxData = this.ongoing[id];
             // If trxData exists, the transaction to which it refers is non-idempotent,
             // since idempotent transactions are not stored.
             //
@@ -94,16 +94,16 @@ class TrxEngine {
             // On either case, it's allowed to be idempotent or not.
             const idempotent = trxData ? false : req_idempotent;
             trx = new trx_1.Trx(this, this.module, _origin, idempotent, undefined, id);
-            // (Begin/Continue*)
+            // (Begin/Continue)
             // The request is for an idempotent transaction.
             if (req_idempotent) {
                 // A non-idempotent transaction with the same id exists on this module.
-                // so it's being continued as an idempotent transaction.
+                // so it's being continued as an non-idempotent transaction.
                 if (trxData) {
-                    log_1.Log.debug('module', this.module.name, `Continue* ${(0, log_1.scopeTag)('trx', trx.root.globalId)} @ ${(0, log_1.anyScopeTag)(_origin)}`);
-                    if (trxData.state !== 'hold') {
-                        throw new Error(`Attempt to continue transaction ${trxData.id}, currently at '${trxData.state}', failed. Should be at 'hold'. This might mean there are parallel attempts to continue a transaction, which must be handled with a queue.`);
-                    }
+                    log_1.Log.debug('module', this.module.name, `Continue ${(0, log_1.scopeTag)('trx', trx.root.globalId)} @ ${(0, log_1.anyScopeTag)(_origin)}`);
+                    // if (trxData.state !== 'hold') {
+                    //     throw new Error(`Attempt to continue transaction ${trxData.id}, currently at '${trxData.state}', failed. Should be at 'hold'. This might mean there are parallel attempts to continue a transaction, which must be handled with a queue.`)
+                    // }
                     for (const wrap of this.config?.wrap || []) {
                         // The wrappers decide how to continue a db transaction, based on the trx idempotent flag.
                         await wrap.continue(trx, this.services);
@@ -125,9 +125,9 @@ class TrxEngine {
             // so it's being continued.
             if (trxData) {
                 log_1.Log.debug('module', this.module.name, `Continue ${(0, log_1.scopeTag)('trx', trx.root.globalId)} @ ${(0, log_1.anyScopeTag)(_origin)}`);
-                if (trxData.state !== 'hold') {
-                    throw new Error(`Attempt to continue transaction ${trxData.id}, currently at '${trxData.state}', failed. Should be at 'hold'. This might mean there are parallel attempts to continue a transaction, which must be handled with a queue.`);
-                }
+                // if (trxData.state !== 'hold') {
+                //     throw new Error(`Attempt to continue transaction ${trxData.id}, currently at '${trxData.state}', failed. Should be at 'hold'. This might mean there are parallel attempts to continue a transaction, which must be handled with a queue.`)
+                // }
                 // Update transaction with data read from adapter
                 trx.start = trxData.start;
                 trx.end = trxData.end;
@@ -179,7 +179,8 @@ class TrxEngine {
             await this.hold(trx, output);
         }
         catch (e) {
-            await this.error(trx, e, false);
+            // Should only rollback if it's not a chained/continued trx
+            await this.error(trx, e, !!id);
         }
         return {
             id: trx.id,

package/lib/engine/transaction/trx_node.js

@@ -62,7 +62,7 @@ class TrxNode {
         node.input = input;
     }
     static hold(node, output) {
-        node.state = 'ok';
+        node.state = 'hold';
         node.output = output;
         node.time.hold = datetime_1.NesoiDatetime.now();
     }

package/lib/engine/treeshake.js

@@ -252,16 +252,16 @@ class Treeshake {
         Object.values(tree).forEach(child => {
             const c = child;
             if (c.type === 'enum') {
-                if ('dep' in c.meta.enum) {
-                    dependencies.push(c.meta.enum.dep);
+                if ('dep' in c._meta.enum) {
+                    dependencies.push(c._meta.enum.dep);
                 }
             }
             else if (c.type === 'id') {
-                const ref = c.meta.id.bucket;
+                const ref = c._meta.id.bucket;
                 dependencies.push(ref);
             }
             else if (c.type === 'msg') {
-                dependencies.push(c.meta.msg);
+                dependencies.push(c._meta.msg);
             }
             else if (c.children) {
                 dependencies.push(...Treeshake.messageFieldTree(node, c.children));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nesoi",
-    "version": "3.4.14",
+    "version": "3.4.16",
     "description": "Declarative framework for data-driven applications",
     "repository": {
         "type": "git",