affinirum 1.2.2 → 1.2.4

package/README.md

@@ -22,13 +22,15 @@ Target: ES2022 [browser+NodeJS][ESM+CJS].
 
 ## Specifications
 
-Script can contain multiple semicolon-separated expressions, and blocks of statements.
-The value of a block is determined by the value of the last expression.
+A script may contain multiple expressions separated by semicolons, as well as blocks of statements.
+The value of a block is defined by the value of its last expression.
 - Scientific notation is supported for floating point numbers, like *0.1281e+2*.
 - ISO Timestamps prefixed with **@**, like *@2025-05-11T19:09:21.320Z*.
-- Hexadecimal buffer values are enclosed in backtick (**\`**) quotes, like *\`10ab0901\`*.
-- String literals are enclosed in single (**'**), or double (**"**) quotes, like *'string value1'*, or *"string value2"*.
+- Hexadecimal buffer values are enclosed in backticks (**\`**), like *\`10ab0901\`*.
+- String literals may be enclosed in single (**'**), or double (**"**) quotes, like *'string value1'*, or *"string value2"*.
+- Line comments begin with a double slash (**//**), while block comments are enclosed in triple slashes (**///**).
 
+### Arrays
 Array is an ordered sequence of values of any type.
 It is defined by comma-separated values enclosed in brackets (**[]**),
  like  *[0,1,2]*, *["a","b","c"]*.
@@ -39,6 +41,7 @@ Array elements can be accessed using the access operator (**.**),
 
 Easy way to check if array contains an index is to use presence operator (**?**), like *theArray?50*.
 
+### Objects
 Object is a container of named values of any type.
 It is defined by comma-separated key-value pair enclosed in brackets (**[]**) where key is separated from value by colon (**:**),
  like *["key1":100, "key2":"abc"]*, *["a":0,"b":"str":"c":valueVar]*.
@@ -50,13 +53,14 @@ Object properties can be accessed using the access operator (**.**) with a strin
 
 Easy way to check if object contains a key is to use presence operator (**?**), like *theObject?myKey*.
 
+### Functions
 A function is a callable code unit that produces a value.
 The set of built-in functions can be extended through configuration entries.
 Additionally, subroutines (functions defined in code) can be created.
 
-Valid variable and function names must start with a letter or underscore (**\_**)
- and can be followed by any combination of alphanumeric characters or underscores,
- like *x*, *\_a1*, *abc25*.
+Valid variable and function names must start with a letter, number sign (**\#**), dollar sign (**\$**), or underscore (**\_**)
+ and can be followed by any combination of alphanumeric characters, number signs, dollar signs, or underscores,
+ like *x*, *\_a1$*, *abc25*.
 
 Whitespace characters are ignored.
 
@@ -118,7 +122,7 @@ Unknown or variant type is declared as **??**.
 - Arithmetic division assignment: **/=**
 - Arithmetic remainder assignment: **%=**
 
-### Constants
+### Predefined Constants
 
 #### Boolean
 - **boolean Boolean.Or(values:array...)** — Boolean disjunction
@@ -179,21 +183,21 @@ Unknown or variant type is declared as **??**.
 - **object Object.Merge(values: array...)** — Merge multiple objects
 
 #### AN
-- **string AN.Format(value: string, whitespace: string?)** — Format string as AN
+- **string AN.Format(value: ??, whitespace: string?)** — Format string as AN
 
 #### JSON
 - **string JSON.Format(value: void | boolean | float | string | array | object, whitespace: string?)** — Format as JSON string
 - **void | boolean | float | string | array | object JSON.Parse(value: string)** — Parse JSON-formatted string
 
 
-### Functions
+### Predefined Functions
 
 #### General Functions
 - **?? ??.Coalesce(otherwise: ??)** — Null coalescence
 - **boolean ??.Equal(value: ??)** — Equals to
 - **boolean ??.Unequal(value: ??)** — Not equals to
 - **buffer float | integer | string.Encode(encoding: string?)** — Encode value to buffer
-- **string boolean | float | integer | buffer | string | array | object.Format(radix: integer?, separator: string?)** — Format value to string
+- **string ??.Format(formatting: integer? | string?)** — Format value to string
 
 #### Array Functions
 - **?? array.First(condition: function)** — First item satisfying condition

package/dst/ParserState.js

@@ -380,6 +380,28 @@ export class ParserState extends ParserFrame {
                             ++this._end;
                             this._fragment = funcDivideAssignment;
                             break;
+                        case "/":
+                            if (this._expr.charAt(++this._end) === '/') {
+                                ++this._end;
+                                while (this._expr.charAt(this._end) !== ""
+                                    && (this._expr.charAt(this._end) !== c
+                                        || this._expr.charAt(this._end - 1) !== c
+                                        || this._expr.charAt(this._end - 2) !== c)) {
+                                    ++this._end;
+                                }
+                                if (this._end >= this._expr.length) {
+                                    this._start = this._expr.length;
+                                    throw new Error(`missing closing comment mark`);
+                                }
+                                ++this._end;
+                            }
+                            else {
+                                while (this._expr.charAt(this._end) !== ""
+                                    && this._expr.charAt(this._end) !== "\n") {
+                                    ++this._end;
+                                }
+                            }
+                            break;
                         default:
                             this._fragment = funcDivide;
                             break;
@@ -396,25 +418,6 @@ export class ParserState extends ParserFrame {
                             break;
                     }
                     break;
-                case "$":
-                    switch (this._expr.charAt(this._end)) {
-                        case "$":
-                            while (this._expr.charAt(this._end) !== "" && this._expr.charAt(this._end) !== "\n") {
-                                ++this._end;
-                            }
-                            break;
-                        default:
-                            while (this._expr.charAt(this._end) !== "" && this._expr.charAt(this._end) !== c) {
-                                ++this._end;
-                            }
-                            if (this._end >= this._expr.length) {
-                                this._start = this._expr.length;
-                                throw new Error(`missing closing comment mark ${c}`);
-                            }
-                            ++this._end;
-                            break;
-                    }
-                    break;
                 case "^":
                     this._fragment = funcPower;
                     break;
@@ -443,7 +446,8 @@ export class ParserState extends ParserFrame {
                         while (isTimeSymbol(this._expr.charAt(this._end))) {
                             ++this._end;
                         }
-                        if (this._expr.charAt(this._end) === "." && isNumericSymbol(this._expr.charAt(this._end + 1))) {
+                        if (this._expr.charAt(this._end) === "."
+                            && isNumericSymbol(this._expr.charAt(this._end + 1))) {
                             ++this._end;
                             while (isNumericSymbol(this._expr.charAt(this._end))) {
                                 ++this._end;
@@ -456,7 +460,8 @@ export class ParserState extends ParserFrame {
                     this._fragment = new Literal(new Date(this._expr.substring(this._start + 1, this._end)));
                     break;
                 case "`":
-                    while (this._expr.charAt(this._end) !== "" && this._expr.charAt(this._end) !== c) {
+                    while (this._expr.charAt(this._end) !== ""
+                        && this._expr.charAt(this._end) !== c) {
                         ++this._end;
                     }
                     if (this._end >= this._expr.length) {
@@ -468,7 +473,8 @@ export class ParserState extends ParserFrame {
                     break;
                 case "\"":
                 case "'":
-                    while (this._expr.charAt(this._end) !== "" && this._expr.charAt(this._end) !== c) {
+                    while (this._expr.charAt(this._end) !== ""
+                        && this._expr.charAt(this._end) !== c) {
                         ++this._end;
                     }
                     if (this._end >= this._expr.length) {
@@ -570,7 +576,8 @@ export class ParserState extends ParserFrame {
                         }
                         if (this._expr.charAt(this._end) === "e") {
                             ++this._end;
-                            if (isNumericSymbol(this._expr.charAt(this._end)) || isSignSymbol(this._expr.charAt(this._end))) {
+                            if (isNumericSymbol(this._expr.charAt(this._end))
+                                || isSignSymbol(this._expr.charAt(this._end))) {
                                 ++this._end;
                                 while (isNumericSymbol(this._expr.charAt(this._end))) {
                                     ++this._end;

package/dst/Value.d.ts

@@ -1,3 +1,5 @@
-export type Value = undefined | null | number | boolean | Date | bigint | ArrayBuffer | string | Value[] | {
+export type PrimitiveValue = undefined | null | number | boolean | Date | bigint | ArrayBuffer | string;
+export type DataValue = PrimitiveValue | Value[] | {
     [key: string]: Value;
-} | ((...args: any[]) => Value);
+};
+export type Value = DataValue | ((...args: any[]) => Value);

package/dst/cjs/ParserState.js

@@ -383,6 +383,28 @@ class ParserState extends ParserFrame_js_1.ParserFrame {
                             ++this._end;
                             this._fragment = funcDivideAssignment;
                             break;
+                        case "/":
+                            if (this._expr.charAt(++this._end) === '/') {
+                                ++this._end;
+                                while (this._expr.charAt(this._end) !== ""
+                                    && (this._expr.charAt(this._end) !== c
+                                        || this._expr.charAt(this._end - 1) !== c
+                                        || this._expr.charAt(this._end - 2) !== c)) {
+                                    ++this._end;
+                                }
+                                if (this._end >= this._expr.length) {
+                                    this._start = this._expr.length;
+                                    throw new Error(`missing closing comment mark`);
+                                }
+                                ++this._end;
+                            }
+                            else {
+                                while (this._expr.charAt(this._end) !== ""
+                                    && this._expr.charAt(this._end) !== "\n") {
+                                    ++this._end;
+                                }
+                            }
+                            break;
                         default:
                             this._fragment = Number_js_1.funcDivide;
                             break;
@@ -399,25 +421,6 @@ class ParserState extends ParserFrame_js_1.ParserFrame {
                             break;
                     }
                     break;
-                case "$":
-                    switch (this._expr.charAt(this._end)) {
-                        case "$":
-                            while (this._expr.charAt(this._end) !== "" && this._expr.charAt(this._end) !== "\n") {
-                                ++this._end;
-                            }
-                            break;
-                        default:
-                            while (this._expr.charAt(this._end) !== "" && this._expr.charAt(this._end) !== c) {
-                                ++this._end;
-                            }
-                            if (this._end >= this._expr.length) {
-                                this._start = this._expr.length;
-                                throw new Error(`missing closing comment mark ${c}`);
-                            }
-                            ++this._end;
-                            break;
-                    }
-                    break;
                 case "^":
                     this._fragment = Number_js_1.funcPower;
                     break;
@@ -446,7 +449,8 @@ class ParserState extends ParserFrame_js_1.ParserFrame {
                         while ((0, String_js_1.isTimeSymbol)(this._expr.charAt(this._end))) {
                             ++this._end;
                         }
-                        if (this._expr.charAt(this._end) === "." && (0, String_js_1.isNumericSymbol)(this._expr.charAt(this._end + 1))) {
+                        if (this._expr.charAt(this._end) === "."
+                            && (0, String_js_1.isNumericSymbol)(this._expr.charAt(this._end + 1))) {
                             ++this._end;
                             while ((0, String_js_1.isNumericSymbol)(this._expr.charAt(this._end))) {
                                 ++this._end;
@@ -459,7 +463,8 @@ class ParserState extends ParserFrame_js_1.ParserFrame {
                     this._fragment = new Literal(new Date(this._expr.substring(this._start + 1, this._end)));
                     break;
                 case "`":
-                    while (this._expr.charAt(this._end) !== "" && this._expr.charAt(this._end) !== c) {
+                    while (this._expr.charAt(this._end) !== ""
+                        && this._expr.charAt(this._end) !== c) {
                         ++this._end;
                     }
                     if (this._end >= this._expr.length) {
@@ -471,7 +476,8 @@ class ParserState extends ParserFrame_js_1.ParserFrame {
                     break;
                 case "\"":
                 case "'":
-                    while (this._expr.charAt(this._end) !== "" && this._expr.charAt(this._end) !== c) {
+                    while (this._expr.charAt(this._end) !== ""
+                        && this._expr.charAt(this._end) !== c) {
                         ++this._end;
                     }
                     if (this._end >= this._expr.length) {
@@ -573,7 +579,8 @@ class ParserState extends ParserFrame_js_1.ParserFrame {
                         }
                         if (this._expr.charAt(this._end) === "e") {
                             ++this._end;
-                            if ((0, String_js_1.isNumericSymbol)(this._expr.charAt(this._end)) || (0, String_js_1.isSignSymbol)(this._expr.charAt(this._end))) {
+                            if ((0, String_js_1.isNumericSymbol)(this._expr.charAt(this._end))
+                                || (0, String_js_1.isSignSymbol)(this._expr.charAt(this._end))) {
                                 ++this._end;
                                 while ((0, String_js_1.isNumericSymbol)(this._expr.charAt(this._end))) {
                                     ++this._end;

package/dst/cjs/constant/Array.js

@@ -48,7 +48,7 @@ exports.funcDerive = new Constant_js_1.Constant((value, transform) => value?.map
 exports.funcFilter = new Constant_js_1.Constant((value, predicate) => value?.filter((v, i, a) => predicate(v, BigInt(i), a)), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array, typePredicate]));
 exports.funcReduce = new Constant_js_1.Constant((value, reducer, initial) => initial != null
     ? value?.reduce((p, v, i, a) => reducer(p, v, BigInt(i), a), initial)
-    : value?.reduce((p, v, i, a) => reducer(p, v, BigInt(i), a)), Type_js_1.Type.functionType(Type_js_1.Type.Unknown, [Type_js_1.Type.Array, Type_js_1.Type.functionType(Type_js_1.Type.Unknown, [Type_js_1.Type.Unknown, Type_js_1.Type.Unknown, Type_js_1.Type.OptionalInteger, Type_js_1.Type.OptionalArray])]));
+    : value?.reduce((p, v, i, a) => reducer(p, v, BigInt(i), a)), Type_js_1.Type.functionType(Type_js_1.Type.Unknown, [Type_js_1.Type.Array, Type_js_1.Type.functionType(Type_js_1.Type.Unknown, [Type_js_1.Type.Unknown, Type_js_1.Type.Unknown, Type_js_1.Type.OptionalInteger, Type_js_1.Type.OptionalArray]), Type_js_1.Type.Unknown]));
 exports.funcCompose = new Constant_js_1.Constant((value, callback) => {
     if (value == null) {
         return undefined;
@@ -68,7 +68,7 @@ exports.funcAppend = new Constant_js_1.Constant((value, ...items) => {
     value?.push(items);
     return value;
 }, typeVariadicInsert);
-const funcJoin = new Constant_js_1.Constant((...values) => values.flat(Infinity).reduce((acc, val) => [...acc, val], []), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array], true));
+const funcJoin = new Constant_js_1.Constant((...values) => values.flat(Infinity), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array], true));
 const funcRange = new Constant_js_1.Constant((value1, value2) => {
     const min = value1 < value2 ? value1 : value2;
     const max = value1 > value2 ? value1 : value2;

package/dst/cjs/constant/String.js

@@ -9,7 +9,7 @@ const isNumericSymbol = (c) => c >= "0" && c <= "9";
 exports.isNumericSymbol = isNumericSymbol;
 const isAlphanumericSymbol = (c) => c >= "a" && c <= "z" || c >= "0" && c <= "9";
 exports.isAlphanumericSymbol = isAlphanumericSymbol;
-const isTokenStartSymbol = (c) => c >= "a" && c <= "z" || c >= "A" && c <= "Z" || c === "_";
+const isTokenStartSymbol = (c) => c >= "a" && c <= "z" || c >= "A" && c <= "Z" || c === "_" || c === "#" || c === "$";
 exports.isTokenStartSymbol = isTokenStartSymbol;
 const isTokenSymbol = (c) => (0, exports.isTokenStartSymbol)(c) || (0, exports.isNumericSymbol)(c);
 exports.isTokenSymbol = isTokenSymbol;

package/dst/cjs/constant/Timestamp.js

@@ -14,21 +14,43 @@ const encodeTimestamp = (value, encoding = "int64") => {
 exports.encodeTimestamp = encodeTimestamp;
 const decodeTimestamp = (value, encoding = "int64", byteOffset) => value ? new Date(Number(new DataView(value).getBigInt64(byteOffset == null ? 0 : Number(byteOffset), encoding === "int64le"))) : undefined;
 exports.decodeTimestamp = decodeTimestamp;
-const formatTimestamp = (value, radix) => {
+const formatTimestamp = (value, template) => {
     if (value == null) {
         return "";
     }
-    const str = value.toISOString();
-    switch (radix) {
-        case 1: return str.slice(0, 4);
-        case 2: return str.slice(5, 7);
-        case 3: return str.slice(8, 10);
-        case 4: return str.slice(11, 13);
-        case 5: return str.slice(14, 16);
-        case 6: return str.slice(17, 19);
-        case 7: return str.slice(20, 23);
-        default: return str;
+    if (!template || typeof template !== "string") {
+        return value.toISOString();
     }
+    const map = template.includes("Z")
+        ? {
+            YYYY: value.getUTCFullYear(),
+            YY: value.getUTCFullYear() % 100,
+            MM: value.getUTCMonth() + 1,
+            DD: value.getUTCDate(),
+            hh: value.getUTCHours(),
+            mm: value.getUTCMinutes(),
+            ss: value.getUTCSeconds(),
+            fff: value.getUTCMilliseconds(),
+        }
+        : {
+            YYYY: value.getFullYear(),
+            YY: value.getFullYear() % 100,
+            MM: value.getMonth() + 1,
+            DD: value.getDate(),
+            hh: value.getHours(),
+            mm: value.getMinutes(),
+            ss: value.getSeconds(),
+            fff: value.getMilliseconds(),
+        };
+    return template.replaceAll("Z", "")
+        .replace("YYYY", map.YYYY.toString())
+        .replace("YY", map.YY.toString().padStart(2, "0"))
+        .replace("MM", map.MM.toString().padStart(2, "0"))
+        .replace("DD", map.DD.toString().padStart(2, "0"))
+        .replace("hh", map.hh.toString().padStart(2, "0"))
+        .replace("mm", map.mm.toString().padStart(2, "0"))
+        .replace("ss", map.ss.toString().padStart(2, "0"))
+        .replace("fff", map.fff.toString().padStart(3, "0"));
 };
 exports.formatTimestamp = formatTimestamp;
 const parseTimestamp = (value) => {

package/dst/cjs/constant/Unknown.js

@@ -73,24 +73,24 @@ const encode = (value, encoding) => value == null
                                     ? Object.entries(value).map(([k, v]) => (0, Buffer_js_1.concatBuffers)((0, exports.encode)(k, encoding), (0, exports.encode)(v, encoding))).reduce((acc, val) => (0, Buffer_js_1.concatBuffers)(acc, val))
                                     : new Uint8Array(0).buffer;
 exports.encode = encode;
-const format = (value, radix, separator = "") => value == null
+const format = (value, formatting) => value == null
     ? "null"
     : typeof value === "boolean"
         ? value.toString()
         : value instanceof Date
-            ? (0, Timestamp_js_1.formatTimestamp)(value, radix ? Number(radix) : undefined)
+            ? (0, Timestamp_js_1.formatTimestamp)(value, String(formatting))
             : typeof value === "number"
-                ? (0, Float_js_1.formatReal)(value, radix ? Number(radix) : undefined)
+                ? (0, Float_js_1.formatReal)(value, formatting ? Number(formatting) : undefined)
                 : typeof value === "bigint"
-                    ? value.toString(radix ? Number(radix) : undefined)
+                    ? value.toString(formatting ? Number(formatting) : undefined)
                     : value instanceof ArrayBuffer
                         ? (0, Buffer_js_1.formatBuffer)(value)
                         : typeof value === "string"
                             ? value
                             : Array.isArray(value)
-                                ? value.map((i) => (0, exports.format)(i, radix)).join(separator)
+                                ? "array"
                                 : typeof value === "object"
-                                    ? Object.entries(value).map(([k, v]) => `${(0, exports.format)(k)}${radix}${(0, exports.format)(v)}`).join(separator)
+                                    ? "object"
                                     : "function";
 exports.format = format;
 const typeEquator = Type_js_1.Type.functionType(Type_js_1.Type.Boolean, [Type_js_1.Type.Unknown, Type_js_1.Type.Unknown]);
@@ -98,4 +98,4 @@ exports.funcCoalesce = new Constant_js_1.Constant((value, valueOtherwise) => val
 exports.funcEqual = new Constant_js_1.Constant((value1, value2) => (0, exports.equate)(value1, value2), typeEquator);
 exports.funcNotEqual = new Constant_js_1.Constant((value1, value2) => !(0, exports.equate)(value1, value2), typeEquator);
 exports.funcEncode = new Constant_js_1.Constant((value, encoding) => (0, exports.encode)(value, encoding), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Boolean]), Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Timestamp, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Float, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Integer, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.String, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Array, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Object, Type_js_1.Type.OptionalString])));
-exports.funcFormat = new Constant_js_1.Constant((value, radix, separator = "") => (0, exports.format)(value, radix == null ? undefined : Number(radix), separator), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Boolean]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Timestamp, Type_js_1.Type.OptionalInteger]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Float, Type_js_1.Type.OptionalInteger]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Integer, Type_js_1.Type.OptionalInteger]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Buffer]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Array, Type_js_1.Type.OptionalInteger, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Object, Type_js_1.Type.OptionalInteger, Type_js_1.Type.OptionalString])));
+exports.funcFormat = new Constant_js_1.Constant((value, formatting) => (0, exports.format)(value, formatting == null ? undefined : typeof formatting === 'string' ? formatting : Number(formatting)), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Boolean]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Timestamp, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Float, Type_js_1.Type.OptionalInteger]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Integer, Type_js_1.Type.OptionalInteger]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Buffer]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Array]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Object]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Function])));

package/dst/constant/Array.js

@@ -45,7 +45,7 @@ export const funcDerive = new Constant((value, transform) => value?.map((v, i, a
 export const funcFilter = new Constant((value, predicate) => value?.filter((v, i, a) => predicate(v, BigInt(i), a)), Type.functionType(Type.Array, [Type.Array, typePredicate]));
 export const funcReduce = new Constant((value, reducer, initial) => initial != null
     ? value?.reduce((p, v, i, a) => reducer(p, v, BigInt(i), a), initial)
-    : value?.reduce((p, v, i, a) => reducer(p, v, BigInt(i), a)), Type.functionType(Type.Unknown, [Type.Array, Type.functionType(Type.Unknown, [Type.Unknown, Type.Unknown, Type.OptionalInteger, Type.OptionalArray])]));
+    : value?.reduce((p, v, i, a) => reducer(p, v, BigInt(i), a)), Type.functionType(Type.Unknown, [Type.Array, Type.functionType(Type.Unknown, [Type.Unknown, Type.Unknown, Type.OptionalInteger, Type.OptionalArray]), Type.Unknown]));
 export const funcCompose = new Constant((value, callback) => {
     if (value == null) {
         return undefined;
@@ -65,7 +65,7 @@ export const funcAppend = new Constant((value, ...items) => {
     value?.push(items);
     return value;
 }, typeVariadicInsert);
-const funcJoin = new Constant((...values) => values.flat(Infinity).reduce((acc, val) => [...acc, val], []), Type.functionType(Type.Array, [Type.Array], true));
+const funcJoin = new Constant((...values) => values.flat(Infinity), Type.functionType(Type.Array, [Type.Array], true));
 const funcRange = new Constant((value1, value2) => {
     const min = value1 < value2 ? value1 : value2;
     const max = value1 > value2 ? value1 : value2;

package/dst/constant/String.js

@@ -3,7 +3,7 @@ import { Type } from "../Type.js";
 export const isSignSymbol = (c) => c === "+" || c === "-";
 export const isNumericSymbol = (c) => c >= "0" && c <= "9";
 export const isAlphanumericSymbol = (c) => c >= "a" && c <= "z" || c >= "0" && c <= "9";
-export const isTokenStartSymbol = (c) => c >= "a" && c <= "z" || c >= "A" && c <= "Z" || c === "_";
+export const isTokenStartSymbol = (c) => c >= "a" && c <= "z" || c >= "A" && c <= "Z" || c === "_" || c === "#" || c === "$";
 export const isTokenSymbol = (c) => isTokenStartSymbol(c) || isNumericSymbol(c);
 export const isDateSeparatorSymbol = (c) => c === "-";
 export const isTimeSeparatorSymbol = (c) => c === ":";

package/dst/constant/Timestamp.d.ts

@@ -2,7 +2,7 @@ import { Constant } from "../Constant.js";
 export type TimestampEncoding = "int64" | "int64le";
 export declare const encodeTimestamp: (value?: Date, encoding?: TimestampEncoding) => ArrayBuffer;
 export declare const decodeTimestamp: (value?: ArrayBuffer, encoding?: TimestampEncoding, byteOffset?: bigint) => Date | undefined;
-export declare const formatTimestamp: (value?: Date, radix?: number) => string;
+export declare const formatTimestamp: (value?: Date, template?: string) => string;
 export declare const funcYear: Constant;
 export declare const funcMonth: Constant;
 export declare const funcMonthIndex: Constant;

package/dst/constant/Timestamp.js

@@ -9,21 +9,43 @@ export const encodeTimestamp = (value, encoding = "int64") => {
     return buf;
 };
 export const decodeTimestamp = (value, encoding = "int64", byteOffset) => value ? new Date(Number(new DataView(value).getBigInt64(byteOffset == null ? 0 : Number(byteOffset), encoding === "int64le"))) : undefined;
-export const formatTimestamp = (value, radix) => {
+export const formatTimestamp = (value, template) => {
     if (value == null) {
         return "";
     }
-    const str = value.toISOString();
-    switch (radix) {
-        case 1: return str.slice(0, 4);
-        case 2: return str.slice(5, 7);
-        case 3: return str.slice(8, 10);
-        case 4: return str.slice(11, 13);
-        case 5: return str.slice(14, 16);
-        case 6: return str.slice(17, 19);
-        case 7: return str.slice(20, 23);
-        default: return str;
+    if (!template || typeof template !== "string") {
+        return value.toISOString();
     }
+    const map = template.includes("Z")
+        ? {
+            YYYY: value.getUTCFullYear(),
+            YY: value.getUTCFullYear() % 100,
+            MM: value.getUTCMonth() + 1,
+            DD: value.getUTCDate(),
+            hh: value.getUTCHours(),
+            mm: value.getUTCMinutes(),
+            ss: value.getUTCSeconds(),
+            fff: value.getUTCMilliseconds(),
+        }
+        : {
+            YYYY: value.getFullYear(),
+            YY: value.getFullYear() % 100,
+            MM: value.getMonth() + 1,
+            DD: value.getDate(),
+            hh: value.getHours(),
+            mm: value.getMinutes(),
+            ss: value.getSeconds(),
+            fff: value.getMilliseconds(),
+        };
+    return template.replaceAll("Z", "")
+        .replace("YYYY", map.YYYY.toString())
+        .replace("YY", map.YY.toString().padStart(2, "0"))
+        .replace("MM", map.MM.toString().padStart(2, "0"))
+        .replace("DD", map.DD.toString().padStart(2, "0"))
+        .replace("hh", map.hh.toString().padStart(2, "0"))
+        .replace("mm", map.mm.toString().padStart(2, "0"))
+        .replace("ss", map.ss.toString().padStart(2, "0"))
+        .replace("fff", map.fff.toString().padStart(3, "0"));
 };
 const parseTimestamp = (value) => {
     if (value == null) {

package/dst/constant/Unknown.d.ts

@@ -6,7 +6,7 @@ import { StringEncoding } from "./String.js";
 import { TimestampEncoding } from "./Timestamp.js";
 export declare const equate: (value1: Value, value2: Value) => boolean;
 export declare const encode: (value: Value, encoding?: FloatEncoding | IntegerEncoding | TimestampEncoding | StringEncoding) => ArrayBuffer;
-export declare const format: (value: Value, radix?: number, separator?: string) => string;
+export declare const format: (value: Value, formatting?: number | string) => string;
 export declare const funcCoalesce: Constant;
 export declare const funcEqual: Constant;
 export declare const funcNotEqual: Constant;

package/dst/constant/Unknown.js

@@ -68,28 +68,28 @@ export const encode = (value, encoding) => value == null
                                 : typeof value === "object"
                                     ? Object.entries(value).map(([k, v]) => concatBuffers(encode(k, encoding), encode(v, encoding))).reduce((acc, val) => concatBuffers(acc, val))
                                     : new Uint8Array(0).buffer;
-export const format = (value, radix, separator = "") => value == null
+export const format = (value, formatting) => value == null
     ? "null"
     : typeof value === "boolean"
         ? value.toString()
         : value instanceof Date
-            ? formatTimestamp(value, radix ? Number(radix) : undefined)
+            ? formatTimestamp(value, String(formatting))
             : typeof value === "number"
-                ? formatReal(value, radix ? Number(radix) : undefined)
+                ? formatReal(value, formatting ? Number(formatting) : undefined)
                 : typeof value === "bigint"
-                    ? value.toString(radix ? Number(radix) : undefined)
+                    ? value.toString(formatting ? Number(formatting) : undefined)
                     : value instanceof ArrayBuffer
                         ? formatBuffer(value)
                         : typeof value === "string"
                             ? value
                             : Array.isArray(value)
-                                ? value.map((i) => format(i, radix)).join(separator)
+                                ? "array"
                                 : typeof value === "object"
-                                    ? Object.entries(value).map(([k, v]) => `${format(k)}${radix}${format(v)}`).join(separator)
+                                    ? "object"
                                     : "function";
 const typeEquator = Type.functionType(Type.Boolean, [Type.Unknown, Type.Unknown]);
 export const funcCoalesce = new Constant((value, valueOtherwise) => value ?? valueOtherwise, Type.union(Type.functionType(Type.Unknown, [Type.Unknown, Type.Unknown]), Type.functionType(Type.OptionalFloat, [Type.OptionalFloat, Type.OptionalFloat]), Type.functionType(Type.OptionalBoolean, [Type.OptionalBoolean, Type.OptionalBoolean]), Type.functionType(Type.OptionalTimestamp, [Type.OptionalTimestamp, Type.OptionalTimestamp]), Type.functionType(Type.OptionalInteger, [Type.OptionalInteger, Type.OptionalInteger]), Type.functionType(Type.OptionalBuffer, [Type.OptionalBuffer, Type.OptionalBuffer]), Type.functionType(Type.OptionalString, [Type.OptionalString, Type.OptionalString]), Type.functionType(Type.OptionalArray, [Type.OptionalArray, Type.OptionalArray]), Type.functionType(Type.OptionalObject, [Type.OptionalObject, Type.OptionalObject]), Type.functionType(Type.OptionalFunction, [Type.OptionalFunction, Type.OptionalFunction])));
 export const funcEqual = new Constant((value1, value2) => equate(value1, value2), typeEquator);
 export const funcNotEqual = new Constant((value1, value2) => !equate(value1, value2), typeEquator);
 export const funcEncode = new Constant((value, encoding) => encode(value, encoding), Type.union(Type.functionType(Type.Buffer, [Type.Boolean]), Type.functionType(Type.Buffer, [Type.Timestamp, Type.OptionalString]), Type.functionType(Type.Buffer, [Type.Float, Type.OptionalString]), Type.functionType(Type.Buffer, [Type.Integer, Type.OptionalString]), Type.functionType(Type.Buffer, [Type.String, Type.OptionalString]), Type.functionType(Type.Buffer, [Type.Array, Type.OptionalString]), Type.functionType(Type.Buffer, [Type.Object, Type.OptionalString])));
-export const funcFormat = new Constant((value, radix, separator = "") => format(value, radix == null ? undefined : Number(radix), separator), Type.union(Type.functionType(Type.String, [Type.Boolean]), Type.functionType(Type.String, [Type.Timestamp, Type.OptionalInteger]), Type.functionType(Type.String, [Type.Float, Type.OptionalInteger]), Type.functionType(Type.String, [Type.Integer, Type.OptionalInteger]), Type.functionType(Type.String, [Type.Buffer]), Type.functionType(Type.String, [Type.Array, Type.OptionalInteger, Type.OptionalString]), Type.functionType(Type.String, [Type.Object, Type.OptionalInteger, Type.OptionalString])));
+export const funcFormat = new Constant((value, formatting) => format(value, formatting == null ? undefined : typeof formatting === 'string' ? formatting : Number(formatting)), Type.union(Type.functionType(Type.String, [Type.Boolean]), Type.functionType(Type.String, [Type.Timestamp, Type.OptionalString]), Type.functionType(Type.String, [Type.Float, Type.OptionalInteger]), Type.functionType(Type.String, [Type.Integer, Type.OptionalInteger]), Type.functionType(Type.String, [Type.Buffer]), Type.functionType(Type.String, [Type.Array]), Type.functionType(Type.String, [Type.Object]), Type.functionType(Type.String, [Type.Function])));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "affinirum",
-	"version": "1.2.2",
+	"version": "1.2.4",
 	"description": "Affinirum Scripting Language",
 	"main": "dst/cjs/index.js",
 	"module": "dst/index.js",
@@ -56,12 +56,12 @@
 	},
 	"dependencies": {},
 	"devDependencies": {
-		"@types/jasmine": "~5.1.13",
+		"@types/jasmine": "~5.1.15",
 		"copyfiles": "~2.4.1",
-		"eslint": "~9.39.1",
-		"jasmine": "~5.12.0",
+		"eslint": "~9.39.2",
+		"jasmine": "~5.13.0",
 		"rimraf": "~6.1.2",
 		"typescript": "~5.9.3",
-		"typescript-eslint": "~8.48.0"
+		"typescript-eslint": "~8.53.0"
 	}
 }