@fincity/kirun-js 2.8.3 → 2.8.5

package/generator/validation-js.csv

@@ -368,7 +368,7 @@ System.Date.EpochMillisecondsToTimestamp
 Parameter,Type,Schema
 epochMilliseconds,EXPRESSION,integer;long;string
 Events
-isoTimeStamp,output
+output,output
 Event Parameter,,Schema
 isotimestamp,,
 
@@ -376,7 +376,7 @@ System.Date.EpochSecondsToTimestamp
 Parameter,Type,Schema
 epochSeconds,EXPRESSION,integer;long;string
 Events
-isoTimeStamp,output
+output,output
 Event Parameter,,Schema
 isotimestamp,,
 
@@ -384,7 +384,7 @@ System.Date.FirstOf
 Parameter,Type,Schema
 isoTimeStamp,EXPRESSION,
 Events
-isoTimeStamp,output
+output,output
 Event Parameter,,Schema
 isotimestamp,,
 
@@ -399,8 +399,8 @@ isotimestamp,,
 
 System.Date.FromNow
 Parameter,Type,Schema
+base,EXPRESSION,
 format,EXPRESSION,string
-from,EXPRESSION,
 isoTimeStamp,EXPRESSION,
 locale,EXPRESSION,string
 round,EXPRESSION,boolean
@@ -620,7 +620,7 @@ System.Date.LastOf
 Parameter,Type,Schema
 isoTimeStamp,EXPRESSION,
 Events
-isoTimeStamp,output
+output,output
 Event Parameter,,Schema
 isotimestamp,,
 
@@ -631,7 +631,7 @@ number,EXPRESSION,integer
 Events
 output,output
 Event Parameter,,Schema
-result,,integer
+isotimestamp,,
 
 System.Date.SetHours
 Parameter,Type,Schema
@@ -640,7 +640,7 @@ number,EXPRESSION,integer
 Events
 output,output
 Event Parameter,,Schema
-result,,integer
+isotimestamp,,
 
 System.Date.SetMilliseconds
 Parameter,Type,Schema
@@ -649,7 +649,7 @@ number,EXPRESSION,integer
 Events
 output,output
 Event Parameter,,Schema
-result,,integer
+isotimestamp,,
 
 System.Date.SetMinutes
 Parameter,Type,Schema
@@ -658,7 +658,7 @@ number,EXPRESSION,integer
 Events
 output,output
 Event Parameter,,Schema
-result,,integer
+isotimestamp,,
 
 System.Date.SetMonth
 Parameter,Type,Schema
@@ -667,7 +667,7 @@ number,EXPRESSION,integer
 Events
 output,output
 Event Parameter,,Schema
-result,,integer
+isotimestamp,,
 
 System.Date.SetSeconds
 Parameter,Type,Schema
@@ -676,7 +676,7 @@ number,EXPRESSION,integer
 Events
 output,output
 Event Parameter,,Schema
-result,,integer
+isotimestamp,,
 
 System.Date.SetTimeZone
 Parameter,Type,Schema
@@ -694,7 +694,7 @@ number,EXPRESSION,integer
 Events
 output,output
 Event Parameter,,Schema
-result,,integer
+isotimestamp,,
 
 System.Date.StartOf
 Parameter,Type,Schema
@@ -740,7 +740,7 @@ System.Date.TimestampToEpochMilliseconds
 Parameter,Type,Schema
 isoTimeStamp,EXPRESSION,
 Events
-result,output
+output,output
 Event Parameter,,Schema
 result,,long
 
@@ -748,7 +748,7 @@ System.Date.TimestampToEpochSeconds
 Parameter,Type,Schema
 isoTimeStamp,EXPRESSION,
 Events
-result,output
+output,output
 Event Parameter,,Schema
 result,,long
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fincity/kirun-js",
-    "version": "2.8.3",
+    "version": "2.8.5",
     "description": "Javascript Runtime for Kinetic Instructions",
     "source": "src/index.ts",
     "main": "dist/index.js",

package/src/engine/function/system/date/AbstractDateFunction.ts

@@ -222,7 +222,7 @@ export abstract class AbstractDateFunction extends AbstractFunction {
                 }
             })(
                 name,
-                AbstractDateFunction.EVENT_INT,
+                AbstractDateFunction.EVENT_TIMESTAMP,
                 AbstractDateFunction.PARAMETER_TIMESTAMP,
                 AbstractDateFunction.PARAMETER_NUMBER,
             ),

package/src/engine/function/system/date/DateFunctionRepository.ts

@@ -10,7 +10,7 @@ import { EpochToTimestamp } from './EpochToTimestamp';
 import { TimestampToEpoch } from './TimestampToEpoch';
 import { ToDateString } from './ToDateString';
 import { Schema } from '../../../json/schema/Schema';
-import { DateTimeUnit, DurationUnits } from 'luxon';
+import { DateTimeUnit, Duration, DurationUnits } from 'luxon';
 import { SetTimeZone } from './SetTimeZone';
 import { IsBetween } from './IsBetween';
 import { LastFirstOf } from './LastFirstOf';
@@ -107,14 +107,15 @@ export class DateFunctionRepository implements Repository<Function> {
             (ts1: string, ts2: string, extraParams: any[]) => {
                 const dt1 = getDateTime(ts1);
                 const dt2 = getDateTime(ts2);
-                let units: DurationUnits | undefined = undefined;
+                let units: Array<DateTimeUnit> | undefined = undefined;
                 if (extraParams?.[0]?.length) {
                     units = extraParams[0]
                         ?.filter((e: any) => !!e)
                         .map((e: string) => e.toLowerCase() as DateTimeUnit);
                 }
-                const duration = dt1.diff(dt2, units);
-                return duration.toObject();
+                const duration = dt1.diff(dt2);
+                if (!units?.length) return duration.toObject();
+                return duration.shiftTo(...units).toObject();
             },
             AbstractDateFunction.PARAMETER_VARIABLE_UNIT,
         ),

package/src/engine/function/system/date/EpochToTimestamp.ts

@@ -44,7 +44,7 @@ export class EpochToTimestamp extends AbstractFunction {
             .setEvents(
                 new Map([
                     [
-                        AbstractDateFunction.EVENT_TIMESTAMP_NAME,
+                        AbstractDateFunction.EVENT_TIMESTAMP.getName(),
                         AbstractDateFunction.EVENT_TIMESTAMP,
                     ],
                 ]),

package/src/engine/function/system/date/FromNow.ts

@@ -9,9 +9,9 @@ import { MapUtil } from '../../../util/MapUtil';
 import { AbstractDateFunction } from './AbstractDateFunction';
 
 export class FromNow extends AbstractDateFunction {
-    public static readonly PARAMETER_FROM_NAME = 'from';
-    public static readonly PARAMETER_FROM = new Parameter(
-        FromNow.PARAMETER_FROM_NAME,
+    public static readonly PARAMETER_BASE_NAME = 'base';
+    public static readonly PARAMETER_BASE = new Parameter(
+        FromNow.PARAMETER_BASE_NAME,
         Schema.ofRef(Namespaces.DATE + '.Timestamp').setDefaultValue(''),
     );
     public static readonly PARAMETER_LOCALE_NAME = 'locale';
@@ -40,7 +40,7 @@ export class FromNow extends AbstractDateFunction {
             AbstractDateFunction.EVENT_STRING,
             AbstractDateFunction.PARAMETER_TIMESTAMP,
             FromNow.PARAMETER_FORMAT,
-            FromNow.PARAMETER_FROM,
+            FromNow.PARAMETER_BASE,
             AbstractDateFunction.PARAMETER_VARIABLE_UNIT,
             FromNow.PARAMETER_ROUND,
             FromNow.PARAMETER_LOCALE,
@@ -48,8 +48,8 @@ export class FromNow extends AbstractDateFunction {
     }
 
     public internalExecute(context: FunctionExecutionParameters): Promise<FunctionOutput> {
-        const from1 = context.getArguments()?.get(FromNow.PARAMETER_FROM_NAME);
-        const fromDate = from1 === '' ? DateTime.now() : DateTime.fromISO(from1);
+        const base = context.getArguments()?.get(FromNow.PARAMETER_BASE_NAME);
+        const baseDate = base === '' ? DateTime.now() : DateTime.fromISO(base);
         const given = context.getArguments()?.get(AbstractDateFunction.PARAMETER_TIMESTAMP_NAME);
         const givenDate = DateTime.fromISO(given);
 
@@ -58,7 +58,7 @@ export class FromNow extends AbstractDateFunction {
         const round = context.getArguments()?.get(FromNow.PARAMETER_ROUND_NAME);
         const locale = context.getArguments()?.get(FromNow.PARAMETER_LOCALE_NAME);
 
-        const options: any = { base: fromDate, style: format?.toLowerCase(), round, locale };
+        const options: any = { base: baseDate, style: format?.toLowerCase(), round, locale };
         if (units?.length > 0) {
             options.unit = units.map((e: string) => e.toLowerCase());
         }

package/src/engine/function/system/date/LastFirstOf.ts

@@ -35,7 +35,7 @@ export class LastFirstOf extends AbstractFunction {
             .setEvents(
                 new Map([
                     [
-                        AbstractDateFunction.EVENT_TIMESTAMP_NAME,
+                        AbstractDateFunction.EVENT_TIMESTAMP.getName(),
                         AbstractDateFunction.EVENT_TIMESTAMP,
                     ],
                 ]),

package/src/engine/function/system/date/SetTimeZone.ts

@@ -34,7 +34,7 @@ export class SetTimeZone extends AbstractDateFunction {
         return new FunctionOutput([
             EventResult.outputOf(
                 MapUtil.of(
-                    AbstractDateFunction.EVENT_RESULT_NAME,
+                    AbstractDateFunction.EVENT_TIMESTAMP_NAME,
                     dateTime.setZone(timeZone).toISO()!,
                 ),
             ),

package/src/engine/function/system/date/StartEndOf.ts

@@ -1,8 +1,5 @@
-import { DurationLikeObject } from 'luxon';
-import { Schema } from '../../../json/schema/Schema';
 import { EventResult } from '../../../model/EventResult';
 import { FunctionOutput } from '../../../model/FunctionOutput';
-import { Parameter } from '../../../model/Parameter';
 import { FunctionExecutionParameters } from '../../../runtime/FunctionExecutionParameters';
 import { MapUtil } from '../../../util/MapUtil';
 import { AbstractDateFunction } from './AbstractDateFunction';
@@ -28,16 +25,19 @@ export class StartEndOf extends AbstractDateFunction {
 
         const dateTime = getDateTime(timestamp);
 
-        const unit = context
+        let unit = context
             .getArguments()
             ?.get(AbstractDateFunction.PARAMETER_UNIT_NAME)
             ?.toLowerCase();
+        unit = unit.substring(0, unit.length - 1);
 
         const newDateTime = this.isStart ? dateTime.startOf(unit) : dateTime.endOf(unit);
-
         return new FunctionOutput([
             EventResult.outputOf(
-                MapUtil.of(AbstractDateFunction.EVENT_TIMESTAMP_NAME, newDateTime.toISO()),
+                MapUtil.of(
+                    AbstractDateFunction.EVENT_TIMESTAMP_NAME,
+                    newDateTime.toISO({ includeOffset: true }),
+                ),
             ),
         ]);
     }

package/src/engine/function/system/date/TimestampToEpoch.ts

@@ -28,7 +28,10 @@ export class TimestampToEpoch extends AbstractFunction {
             )
             .setEvents(
                 new Map([
-                    [AbstractDateFunction.EVENT_RESULT_NAME, AbstractDateFunction.EVENT_LONG],
+                    [
+                        AbstractDateFunction.EVENT_TIMESTAMP.getName(),
+                        AbstractDateFunction.EVENT_LONG,
+                    ],
                 ]),
             );
     }

package/src/engine/function/system/date/common.ts

@@ -1,7 +1,7 @@
 import { DateTime } from 'luxon';
 
 export function getDateTime(isoTimestamp: string): DateTime {
-    let dt = DateTime.fromISO(isoTimestamp);
+    let dt = DateTime.fromISO(isoTimestamp, { setZone: true });
     if (!dt?.isValid) {
         throw new Error('Invalid ISO timestamp');
     }

package/src/engine/json/schema/validator/SchemaValidator.ts

@@ -60,7 +60,7 @@ export class SchemaValidator {
             return SchemaValidator.constantValidation(parents, schema, element);
         }
 
-        if (schema.getEnums() && !schema.getEnums()?.length) {
+        if (schema.getEnums()?.length) {
             return SchemaValidator.enumCheck(parents, schema, element);
         }
 

package/src/engine/repository/KIRunSchemaRepository.ts

@@ -36,15 +36,15 @@ const map: Map<string, Schema> = new Map([
             .setNamespace(Namespaces.DATE)
             .setProperties(
                 MapUtil.ofArrayEntries(
-                    ['years', Schema.ofInteger('years')],
-                    ['quarters', Schema.ofInteger('quarters')],
-                    ['months', Schema.ofInteger('months')],
-                    ['weeks', Schema.ofInteger('weeks')],
-                    ['days', Schema.ofInteger('days')],
-                    ['hours', Schema.ofInteger('hours')],
-                    ['minutes', Schema.ofInteger('minutes')],
-                    ['seconds', Schema.ofLong('seconds')],
-                    ['milliseconds', Schema.ofLong('milliseconds')],
+                    ['years', Schema.ofNumber('years')],
+                    ['quarters', Schema.ofNumber('quarters')],
+                    ['months', Schema.ofNumber('months')],
+                    ['weeks', Schema.ofNumber('weeks')],
+                    ['days', Schema.ofNumber('days')],
+                    ['hours', Schema.ofNumber('hours')],
+                    ['minutes', Schema.ofNumber('minutes')],
+                    ['seconds', Schema.ofNumber('seconds')],
+                    ['milliseconds', Schema.ofNumber('milliseconds')],
                 ),
             )
             .setAdditionalItems(AdditionalType.from(false)!),
@@ -55,13 +55,13 @@ const map: Map<string, Schema> = new Map([
             .setNamespace(Namespaces.DATE)
             .setProperties(
                 MapUtil.ofArrayEntries(
-                    ['year', Schema.ofInteger('year')],
-                    ['month', Schema.ofInteger('month')],
-                    ['day', Schema.ofInteger('day')],
-                    ['hour', Schema.ofInteger('hour')],
-                    ['minute', Schema.ofInteger('minute')],
-                    ['second', Schema.ofLong('second')],
-                    ['millisecond', Schema.ofLong('millisecond')],
+                    ['year', Schema.ofNumber('year')],
+                    ['month', Schema.ofNumber('month')],
+                    ['day', Schema.ofNumber('day')],
+                    ['hour', Schema.ofNumber('hour')],
+                    ['minute', Schema.ofNumber('minute')],
+                    ['second', Schema.ofNumber('second')],
+                    ['millisecond', Schema.ofNumber('millisecond')],
                 ),
             )
             .setAdditionalItems(AdditionalType.from(false)!),