affinirum 1.2.4 → 1.2.7

package/README.md

@@ -196,9 +196,12 @@ Unknown or variant type is declared as **??**.
 - **?? ??.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
+- **buffer ??.Encode(encoding: string?)** — Encode value to buffer
 - **string ??.Format(formatting: integer? | string?)** — Format value to string
 
+#### Aggregable Functions
+- **float | integer | buffer | string | array float | integer | buffer | string | array.Add(values: array...)** — Add or concatenate values
+
 #### Array Functions
 - **?? array.First(condition: function)** — First item satisfying condition
 - **?? array.Last(condition: function)** — Last item satisfying condition
@@ -220,7 +223,6 @@ Unknown or variant type is declared as **??**.
 - **string Buffer.FormatBuffer(value: buffer)** — Hexadecimal string from buffer
 
 #### Enumerable Functions
-- **float | integer | buffer | string | array.Add(values: array...)** — Add or concatenate values
 - **buffer | string | array.Slice(start: integer?, end: integer?)** — Slice section
 - **buffer | string | array.Splice(start: integer, remove: integer, inject: array...)** — Splice section
 - **buffer | string | array.Inject(start: integer, inject: array...)** — Inject section

package/dst/Affinirum.d.ts

@@ -54,6 +54,13 @@ export declare class Affinirum {
         @returns Calculated value.
     */
     evaluate(values?: Record<string, Value>): Value;
+    /**
+        Produces string in Affinirum Notation.
+        @param value Value to format.
+        @param whitespace Optional white space characters for readability.
+        @returns String formatted in Affinirum Notation.
+    */
+    static format(value: Value, whitespace?: string): string;
     protected _list(state: ParserState, scope: StaticScope): Node;
     protected _unit(state: ParserState, scope: StaticScope): Node;
     protected _coalescence(state: ParserState, scope: StaticScope): Node;

package/dst/Affinirum.js

@@ -1,5 +1,6 @@
+import { formatAN } from "./constant/notation/AN.js";
 import { funcOr, funcAnd, funcNot } from "./constant/Boolean.js";
-import { funcAdd } from "./constant/Enumerable.js";
+import { funcAdd } from "./constant/Aggregable.js";
 import { funcAt, funcHas } from "./constant/Iterable.js";
 import { funcGreaterThan, funcLessThan, funcGreaterOrEqual, funcLessOrEqual, funcSubtract, funcMultiply, funcDivide, funcRemainder, funcPower, funcNegate } from "./constant/Number.js";
 import { funcCoalesce, funcEqual, funcNotEqual } from "./constant/Unknown.js";
@@ -117,6 +118,15 @@ export class Affinirum {
             throw e;
         }
     }
+    /**
+        Produces string in Affinirum Notation.
+        @param value Value to format.
+        @param whitespace Optional white space characters for readability.
+        @returns String formatted in Affinirum Notation.
+    */
+    static format(value, whitespace) {
+        return formatAN(value, whitespace);
+    }
     _list(state, scope) {
         const frame = state.starts();
         const subnodes = [];

package/dst/Functions.js

@@ -1,6 +1,7 @@
+import { funcAdd } from "./constant/Aggregable.js";
 import { funcFirst, funcLast, funcFirstIndex, funcLastIndex, funcEvery, funcAny, funcFlatten, funcReverse, funcDerive, funcFilter, funcReduce, funcCompose, funcPrepend, funcAppend } from "./constant/Array.js";
 import { funcByte } from "./constant/Buffer.js";
-import { funcAdd, funcSlice, funcSplice, funcInject } from "./constant/Enumerable.js";
+import { funcSlice, funcSplice, funcInject } from "./constant/Enumerable.js";
 import { funcLength, funcContains, funcAt, funcHas } from "./constant/Iterable.js";
 import { funcGreaterThan, funcLessThan, funcGreaterOrEqual, funcLessOrEqual, funcSubtract, funcMultiply, funcDivide, funcRemainder, funcModulo, funcPower, funcRoot, funcNegate, funcCast, funcCastToFloat, funcCastToInteger } from "./constant/Number.js";
 import { funcEntries, funcKeys, funcValues } from "./constant/Object.js";
@@ -8,6 +9,8 @@ import { funcLike, funcUnlike, funcStartsWith, funcEndsWith, funcChar, funcCharC
 import { funcYear, funcMonth, funcMonthIndex, funcWeekdayIndex, funcDay, funcHour, funcMinute, funcSecond, funcMillisecond, funcEpochTime, funcDaysSince, funcHoursSince, funcMinutesSince, funcSecondsSince } from "./constant/Timestamp.js";
 import { funcCoalesce, funcEqual, funcNotEqual, funcEncode, funcFormat } from "./constant/Unknown.js";
 export const Functions = [
+    // Aggregable
+    ["Add", funcAdd],
     // Array
     ["First", funcFirst],
     ["Last", funcLast],
@@ -26,7 +29,6 @@ export const Functions = [
     // Buffer
     ["Byte", funcByte],
     // Enumerable
-    ["Add", funcAdd],
     ["Slice", funcSlice],
     ["Splice", funcSplice],
     ["Inject", funcInject],

package/dst/ParserState.js

@@ -1,6 +1,6 @@
 import { funcOr, funcAnd, funcNot } from "./constant/Boolean.js";
 import { parseBuffer } from "./constant/Buffer.js";
-import { funcAdd } from "./constant/Enumerable.js";
+import { funcAdd } from "./constant/Aggregable.js";
 import { isSignSymbol, isTokenStartSymbol, isNumericSymbol, isTokenSymbol, isDateSymbol, isTimeSymbol, isDateTimeSeparatorSymbol, replaceWith } from "./constant/String.js";
 import { Constant } from "./Constant.js";
 import { funcGreaterThan, funcLessThan, funcGreaterOrEqual, funcLessOrEqual, funcSubtract, funcMultiply, funcDivide, funcRemainder, funcPower } from "./constant/Number.js";

package/dst/Value.d.ts

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

package/dst/cjs/Affinirum.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Affinirum = void 0;
+const AN_js_1 = require("./constant/notation/AN.js");
 const Boolean_js_1 = require("./constant/Boolean.js");
-const Enumerable_js_1 = require("./constant/Enumerable.js");
+const Aggregable_js_1 = require("./constant/Aggregable.js");
 const Iterable_js_1 = require("./constant/Iterable.js");
 const Number_js_1 = require("./constant/Number.js");
 const Unknown_js_1 = require("./constant/Unknown.js");
@@ -120,6 +121,15 @@ class Affinirum {
             throw e;
         }
     }
+    /**
+        Produces string in Affinirum Notation.
+        @param value Value to format.
+        @param whitespace Optional white space characters for readability.
+        @returns String formatted in Affinirum Notation.
+    */
+    static format(value, whitespace) {
+        return (0, AN_js_1.formatAN)(value, whitespace);
+    }
     _list(state, scope) {
         const frame = state.starts();
         const subnodes = [];
@@ -188,7 +198,7 @@ class Affinirum {
     }
     _aggregate(state, scope) {
         let node = this._product(state, scope);
-        while (state.operator === Enumerable_js_1.funcAdd || state.operator === Number_js_1.funcSubtract) {
+        while (state.operator === Aggregable_js_1.funcAdd || state.operator === Number_js_1.funcSubtract) {
             const fnode = new ConstantNode_js_1.ConstantNode(state, state.operator);
             node = new FunctionNode_js_1.FunctionNode(state, fnode, [node, this._product(state.next(), scope)]);
         }
@@ -205,7 +215,7 @@ class Affinirum {
     _signum(state, scope) {
         const frame = state.starts();
         let negate = false;
-        while (state.operator === Enumerable_js_1.funcAdd || state.operator === Number_js_1.funcSubtract) {
+        while (state.operator === Aggregable_js_1.funcAdd || state.operator === Number_js_1.funcSubtract) {
             if (state.operator === Number_js_1.funcSubtract) {
                 negate = !negate;
             }

package/dst/cjs/Functions.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Functions = void 0;
+const Aggregable_js_1 = require("./constant/Aggregable.js");
 const Array_js_1 = require("./constant/Array.js");
 const Buffer_js_1 = require("./constant/Buffer.js");
 const Enumerable_js_1 = require("./constant/Enumerable.js");
@@ -11,6 +12,8 @@ const String_js_1 = require("./constant/String.js");
 const Timestamp_js_1 = require("./constant/Timestamp.js");
 const Unknown_js_1 = require("./constant/Unknown.js");
 exports.Functions = [
+    // Aggregable
+    ["Add", Aggregable_js_1.funcAdd],
     // Array
     ["First", Array_js_1.funcFirst],
     ["Last", Array_js_1.funcLast],
@@ -29,7 +32,6 @@ exports.Functions = [
     // Buffer
     ["Byte", Buffer_js_1.funcByte],
     // Enumerable
-    ["Add", Enumerable_js_1.funcAdd],
     ["Slice", Enumerable_js_1.funcSlice],
     ["Splice", Enumerable_js_1.funcSplice],
     ["Inject", Enumerable_js_1.funcInject],

package/dst/cjs/ParserState.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParserState = void 0;
 const Boolean_js_1 = require("./constant/Boolean.js");
 const Buffer_js_1 = require("./constant/Buffer.js");
-const Enumerable_js_1 = require("./constant/Enumerable.js");
+const Aggregable_js_1 = require("./constant/Aggregable.js");
 const String_js_1 = require("./constant/String.js");
 const Constant_js_1 = require("./Constant.js");
 const Number_js_1 = require("./constant/Number.js");
@@ -28,7 +28,7 @@ class Assignment {
 const funcAssignment = new Assignment();
 const funcOrAssignment = new Assignment(Boolean_js_1.funcOr);
 const funcAndAssignment = new Assignment(Boolean_js_1.funcAnd);
-const funcAddAssignment = new Assignment(Enumerable_js_1.funcAdd);
+const funcAddAssignment = new Assignment(Aggregable_js_1.funcAdd);
 const funcSubtractAssignment = new Assignment(Number_js_1.funcSubtract);
 const funcMultiplyAssignment = new Assignment(Number_js_1.funcMultiply);
 const funcDivideAssignment = new Assignment(Number_js_1.funcDivide);
@@ -351,7 +351,7 @@ class ParserState extends ParserFrame_js_1.ParserFrame {
                             this._fragment = funcAddAssignment;
                             break;
                         default:
-                            this._fragment = Enumerable_js_1.funcAdd;
+                            this._fragment = Aggregable_js_1.funcAdd;
                             break;
                     }
                     break;

package/dst/cjs/constant/Aggregable.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.funcAdd = exports.aggregate = void 0;
+const Constant_js_1 = require("../Constant.js");
+const Type_js_1 = require("../Type.js");
+const Buffer_js_1 = require("./Buffer.js");
+const aggregate = (value1, value2) => {
+    if (value1 == null || value2 == null) {
+        return undefined;
+    }
+    if (value1 instanceof ArrayBuffer && value2 instanceof ArrayBuffer) {
+        return (0, Buffer_js_1.concatBuffers)(value1, value2);
+    }
+    if (typeof value1 === "string" && typeof value2 === "string") {
+        return value1.concat(value2);
+    }
+    return [value1].flat().concat([value2].flat());
+};
+exports.aggregate = aggregate;
+const add = (value1, value2) => {
+    if (typeof value1 === "bigint" && typeof value2 === "bigint") {
+        return BigInt.asIntN(64, value1 + value2);
+    }
+    if ((typeof value1 === "number" || typeof value1 === "bigint") && (typeof value2 === "number" || typeof value2 === "bigint")) {
+        return Number(value1) + Number(value2);
+    }
+    return (0, exports.aggregate)(value1, value2);
+};
+exports.funcAdd = new Constant_js_1.Constant((value1, value2) => add(value1, value2), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.Float, [Type_js_1.Type.Float, Type_js_1.Type.Integer]), Type_js_1.Type.functionType(Type_js_1.Type.Float, [Type_js_1.Type.Integer, Type_js_1.Type.Float]), Type_js_1.Type.functionType(Type_js_1.Type.Integer, [Type_js_1.Type.Integer, Type_js_1.Type.Integer]), Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Buffer, Type_js_1.Type.Buffer]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.String, Type_js_1.Type.String]), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array, Type_js_1.Type.Array])));

package/dst/cjs/constant/Buffer.js

@@ -72,10 +72,20 @@ const concatBuffers = (value1, value2) => {
     return bytes.buffer;
 };
 exports.concatBuffers = concatBuffers;
-const formatBuffer = (value) => {
+const formatBuffer = (value, formatting = "hex") => {
     if (value == null) {
         return "";
     }
+    if (formatting === "base64") {
+        let binary = "";
+        const bytes = new Uint8Array(value);
+        const chunkSize = 0x4000;
+        for (let i = 0; i < bytes.length; i += chunkSize) {
+            const chunk = bytes.subarray(i, i + chunkSize);
+            binary += String.fromCharCode(...chunk);
+        }
+        return btoa(binary);
+    }
     const bytes = new Uint8Array(value);
     let str = "";
     for (let i = 0; i < bytes.byteLength; ++i) {

package/dst/cjs/constant/Enumerable.js

@@ -1,37 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.funcInject = exports.funcSplice = exports.funcSlice = exports.funcAdd = void 0;
+exports.funcInject = exports.funcSplice = exports.funcSlice = void 0;
 const Constant_js_1 = require("../Constant.js");
 const Type_js_1 = require("../Type.js");
-const Buffer_js_1 = require("./Buffer.js");
-const aggregate = (value1, value2) => {
-    if (value1 == null || value2 == null) {
-        return undefined;
-    }
-    if (value1 instanceof ArrayBuffer && value2 instanceof ArrayBuffer) {
-        return (0, Buffer_js_1.concatBuffers)(value1, value2);
-    }
-    if (typeof value1 === "string" && typeof value2 === "string") {
-        return value1.concat(value2);
-    }
-    return [value1].flat().concat([value2].flat());
-};
-const add = (value1, value2) => {
-    if (typeof value1 === "bigint" && typeof value2 === "bigint") {
-        return BigInt.asIntN(64, value1 + value2);
-    }
-    if ((typeof value1 === "number" || typeof value1 === "bigint") && (typeof value2 === "number" || typeof value2 === "bigint")) {
-        return Number(value1) + Number(value2);
-    }
-    return aggregate(value1, value2);
-};
-exports.funcAdd = new Constant_js_1.Constant((value1, value2) => add(value1, value2), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.Float, [Type_js_1.Type.Float, Type_js_1.Type.Integer]), Type_js_1.Type.functionType(Type_js_1.Type.Float, [Type_js_1.Type.Integer, Type_js_1.Type.Float]), Type_js_1.Type.functionType(Type_js_1.Type.Integer, [Type_js_1.Type.Integer, Type_js_1.Type.Integer]), Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Buffer, Type_js_1.Type.Buffer]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.String, Type_js_1.Type.String]), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array, Type_js_1.Type.Array])));
+const Aggregable_js_1 = require("./Aggregable.js");
 exports.funcSlice = new Constant_js_1.Constant((value, start = 0n, end) => value == null
     ? undefined
     : value.slice(Number(start), end == null ? undefined : Number(end)), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Buffer, Type_js_1.Type.OptionalInteger, Type_js_1.Type.OptionalInteger]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.String, Type_js_1.Type.OptionalInteger, Type_js_1.Type.OptionalInteger]), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array, Type_js_1.Type.OptionalInteger, Type_js_1.Type.OptionalInteger])));
 exports.funcSplice = new Constant_js_1.Constant((value, start, remove, ...inject) => value == null
     ? undefined
-    : aggregate(inject.reduce((acc, val) => aggregate(acc, val), value.slice(0, Number(start))), value.slice(Number(start + remove))), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Buffer, Type_js_1.Type.Integer, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.String, Type_js_1.Type.Integer, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array, Type_js_1.Type.Integer, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true)));
+    : (0, Aggregable_js_1.aggregate)(inject.reduce((acc, val) => (0, Aggregable_js_1.aggregate)(acc, val), value.slice(0, Number(start))), value.slice(Number(start + remove))), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Buffer, Type_js_1.Type.Integer, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.String, Type_js_1.Type.Integer, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array, Type_js_1.Type.Integer, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true)));
 exports.funcInject = new Constant_js_1.Constant((value, start, ...inject) => value == null
     ? undefined
-    : aggregate(inject.reduce((acc, val) => aggregate(acc, val), value.slice(0, Number(start))), value.slice(Number(start))), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Buffer, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.String, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true)));
+    : (0, Aggregable_js_1.aggregate)(inject.reduce((acc, val) => (0, Aggregable_js_1.aggregate)(acc, val), value.slice(0, Number(start))), value.slice(Number(start))), Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Buffer, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.String, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true), Type_js_1.Type.functionType(Type_js_1.Type.Array, [Type_js_1.Type.Array, Type_js_1.Type.Integer, Type_js_1.Type.Enumerable], true)));

package/dst/cjs/constant/Float.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.constFloat = exports.formatReal = exports.encodeFloat = void 0;
+exports.constFloat = exports.encodeFloat = void 0;
 const Constant_js_1 = require("../Constant.js");
 const Type_js_1 = require("../Type.js");
 const encodeFloat = (value, encoding = "f64") => {
@@ -46,8 +46,6 @@ const decodeFloat = (value, encoding = "f64", byteOffset) => {
         default: throw new Error(`${encoding} encoding not supported`);
     }
 };
-const formatReal = (value, radix) => value.toString(radix) + (Number.isInteger(value) ? ".0" : "");
-exports.formatReal = formatReal;
 const typeNumberOrArray = Type_js_1.Type.union(Type_js_1.Type.Float, Type_js_1.Type.arrayType([Type_js_1.Type.Float]));
 const typeAggregator = Type_js_1.Type.functionType(Type_js_1.Type.Float, [typeNumberOrArray], true);
 const typeTransform = Type_js_1.Type.functionType(Type_js_1.Type.Float, [Type_js_1.Type.Float]);

package/dst/cjs/constant/Number.js

@@ -1,8 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.funcCastToInteger = exports.funcCastToFloat = exports.funcCast = exports.funcNegate = exports.funcRoot = exports.funcPower = exports.funcModulo = exports.funcRemainder = exports.funcDivide = exports.funcMultiply = exports.funcSubtract = exports.funcLessOrEqual = exports.funcGreaterOrEqual = exports.funcLessThan = exports.funcGreaterThan = void 0;
+exports.funcCastToInteger = exports.funcCastToFloat = exports.funcCast = exports.funcNegate = exports.funcRoot = exports.funcPower = exports.funcModulo = exports.funcRemainder = exports.funcDivide = exports.funcMultiply = exports.funcSubtract = exports.funcLessOrEqual = exports.funcGreaterOrEqual = exports.funcLessThan = exports.funcGreaterThan = exports.formatNumber = void 0;
 const Constant_js_1 = require("../Constant.js");
 const Type_js_1 = require("../Type.js");
+const formatNumber = (value, formatting) => {
+    if (formatting) {
+        const nformat = JSON.parse(`{${formatting}}`);
+        if (typeof nformat === "object") {
+            return new Intl.NumberFormat(undefined, {
+                minimumIntegerDigits: nformat?.min_integer_digits,
+                minimumFractionDigits: nformat?.min_fraction_digits,
+                maximumFractionDigits: nformat?.max_fraction_digits,
+                minimumSignificantDigits: nformat?.min_significant_digits,
+                maximumSignificantDigits: nformat?.max_significant_digits,
+                notation: nformat?.notation,
+            }).format(value);
+        }
+    }
+    return typeof value === "number" && Number.isInteger(value)
+        ? `${value.toString()}.0`
+        : value.toString();
+};
+exports.formatNumber = formatNumber;
 const castToInteger = (value) => {
     if (value == null || Number.isNaN(value)) {
         return 0n;

package/dst/cjs/constant/String.js

@@ -168,14 +168,12 @@ const encodeString = (value, encoding = "utf8") => {
     if (encoding === "utf8") {
         return new TextEncoder().encode(value).buffer;
     }
-    else {
-        const dv = new DataView(new Uint16Array(value.length).buffer);
-        const lessOrEqual = encoding.endsWith("le");
-        for (let i = 0; i < value.length; ++i) {
-            dv.setUint16(i << 1, value.charCodeAt(i), lessOrEqual);
-        }
-        return dv.buffer;
+    const dv = new DataView(new Uint16Array(value.length).buffer);
+    const lessOrEqual = encoding.endsWith("le");
+    for (let i = 0; i < value.length; ++i) {
+        dv.setUint16(i << 1, value.charCodeAt(i), lessOrEqual);
     }
+    return dv.buffer;
 };
 exports.encodeString = encodeString;
 const decodeString = (value, encoding = "utf8", byteOffset, byteLength) => {

package/dst/cjs/constant/Unknown.js

@@ -5,6 +5,7 @@ const Constant_js_1 = require("../Constant.js");
 const Type_js_1 = require("../Type.js");
 const Float_js_1 = require("./Float.js");
 const Integer_js_1 = require("./Integer.js");
+const Number_js_1 = require("./Number.js");
 const Buffer_js_1 = require("./Buffer.js");
 const String_js_1 = require("./String.js");
 const Timestamp_js_1 = require("./Timestamp.js");
@@ -70,7 +71,9 @@ const encode = (value, encoding) => value == null
                             : Array.isArray(value)
                                 ? value.map((i) => (0, exports.encode)(i, encoding)).reduce((acc, val) => (0, Buffer_js_1.concatBuffers)(acc, val))
                                 : typeof value === "object"
-                                    ? 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))
+                                    ? 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, formatting) => value == null
@@ -78,24 +81,26 @@ const format = (value, formatting) => value == null
     : typeof value === "boolean"
         ? value.toString()
         : value instanceof Date
-            ? (0, Timestamp_js_1.formatTimestamp)(value, String(formatting))
+            ? (0, Timestamp_js_1.formatTimestamp)(value, formatting)
             : typeof value === "number"
-                ? (0, Float_js_1.formatReal)(value, formatting ? Number(formatting) : undefined)
+                ? (0, Number_js_1.formatNumber)(value, formatting)
                 : typeof value === "bigint"
-                    ? value.toString(formatting ? Number(formatting) : undefined)
+                    ? (0, Number_js_1.formatNumber)(value, formatting)
                     : value instanceof ArrayBuffer
-                        ? (0, Buffer_js_1.formatBuffer)(value)
+                        ? (0, Buffer_js_1.formatBuffer)(value, formatting)
                         : typeof value === "string"
                             ? value
                             : Array.isArray(value)
-                                ? "array"
+                                ? value.map((i) => (0, exports.format)(i, formatting)).reduce((acc, val) => acc + val)
                                 : typeof value === "object"
-                                    ? "object"
+                                    ? Object.entries(value)
+                                        .map(([k, v]) => (0, exports.format)(k, formatting) + (0, exports.format)(v, formatting))
+                                        .reduce((acc, val) => acc + val)
                                     : "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]);
 exports.funcCoalesce = new Constant_js_1.Constant((value, valueOtherwise) => value ?? valueOtherwise, Type_js_1.Type.union(Type_js_1.Type.functionType(Type_js_1.Type.Unknown, [Type_js_1.Type.Unknown, Type_js_1.Type.Unknown]), Type_js_1.Type.functionType(Type_js_1.Type.OptionalFloat, [Type_js_1.Type.OptionalFloat, Type_js_1.Type.OptionalFloat]), Type_js_1.Type.functionType(Type_js_1.Type.OptionalBoolean, [Type_js_1.Type.OptionalBoolean, Type_js_1.Type.OptionalBoolean]), Type_js_1.Type.functionType(Type_js_1.Type.OptionalTimestamp, [Type_js_1.Type.OptionalTimestamp, Type_js_1.Type.OptionalTimestamp]), Type_js_1.Type.functionType(Type_js_1.Type.OptionalInteger, [Type_js_1.Type.OptionalInteger, Type_js_1.Type.OptionalInteger]), Type_js_1.Type.functionType(Type_js_1.Type.OptionalBuffer, [Type_js_1.Type.OptionalBuffer, Type_js_1.Type.OptionalBuffer]), Type_js_1.Type.functionType(Type_js_1.Type.OptionalString, [Type_js_1.Type.OptionalString, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.OptionalArray, [Type_js_1.Type.OptionalArray, Type_js_1.Type.OptionalArray]), Type_js_1.Type.functionType(Type_js_1.Type.OptionalObject, [Type_js_1.Type.OptionalObject, Type_js_1.Type.OptionalObject]), Type_js_1.Type.functionType(Type_js_1.Type.OptionalFunction, [Type_js_1.Type.OptionalFunction, Type_js_1.Type.OptionalFunction])));
 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, 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])));
+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.Buffer]), 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]), Type_js_1.Type.functionType(Type_js_1.Type.Buffer, [Type_js_1.Type.Function])));
+exports.funcFormat = new Constant_js_1.Constant((value, formatting) => (0, exports.format)(value, 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.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Integer, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Buffer, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.String]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Array, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Object, Type_js_1.Type.OptionalString]), Type_js_1.Type.functionType(Type_js_1.Type.String, [Type_js_1.Type.Function])));

package/dst/cjs/constant/notation/AN.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.constAN = exports.formatAN = void 0;
 const Constant_js_1 = require("../../Constant.js");
 const Type_js_1 = require("../../Type.js");
-const Float_js_1 = require("../Float.js");
+const Number_js_1 = require("../Number.js");
 const Buffer_js_1 = require("../Buffer.js");
 const formatAN = (value, whitespace) => {
     if (value == null) {
@@ -16,10 +16,10 @@ const formatAN = (value, whitespace) => {
         return `@${value.toISOString()}`;
     }
     if (typeof value === "number") {
-        return (0, Float_js_1.formatReal)(value);
+        return (0, Number_js_1.formatNumber)(value);
     }
     if (typeof value === "bigint") {
-        return value.toString();
+        return (0, Number_js_1.formatNumber)(value);
     }
     if (value instanceof ArrayBuffer) {
         return `#${(0, Buffer_js_1.formatBuffer)(value)}`;
@@ -33,8 +33,8 @@ const formatAN = (value, whitespace) => {
         return `[${lines.join(",")}${suffix}]`;
     }
     if (typeof value === "object") {
-        const [prefix, suffix] = whitespace ? ["\n" + whitespace, "\n"] : ["", ""];
-        const lines = Object.entries(value).map(([k, v]) => `${prefix}"${k}":${(0, exports.formatAN)(v, whitespace).split("\n").join(prefix)}`);
+        const [prefix, suffix, separator] = whitespace ? ["\n" + whitespace, "\n", ": "] : ["", "", ":"];
+        const lines = Object.entries(value).map(([k, v]) => `${prefix}"${k}"${separator}${(0, exports.formatAN)(v, whitespace).split("\n").join(prefix)}`);
         return `[${lines.join(",")}${suffix}]`;
     }
     return "function";

package/dst/constant/Aggregable.d.ts

@@ -0,0 +1,4 @@
+import { Constant } from "../Constant.js";
+import { Value } from "../Value.js";
+export declare const aggregate: (value1: ArrayBuffer | string | Value[] | null | undefined, value2: ArrayBuffer | string | Value[] | null | undefined) => string | ArrayBuffer | Value[] | undefined;
+export declare const funcAdd: Constant;

package/dst/constant/Aggregable.js

@@ -0,0 +1,25 @@
+import { Constant } from "../Constant.js";
+import { Type } from "../Type.js";
+import { concatBuffers } from "./Buffer.js";
+export const aggregate = (value1, value2) => {
+    if (value1 == null || value2 == null) {
+        return undefined;
+    }
+    if (value1 instanceof ArrayBuffer && value2 instanceof ArrayBuffer) {
+        return concatBuffers(value1, value2);
+    }
+    if (typeof value1 === "string" && typeof value2 === "string") {
+        return value1.concat(value2);
+    }
+    return [value1].flat().concat([value2].flat());
+};
+const add = (value1, value2) => {
+    if (typeof value1 === "bigint" && typeof value2 === "bigint") {
+        return BigInt.asIntN(64, value1 + value2);
+    }
+    if ((typeof value1 === "number" || typeof value1 === "bigint") && (typeof value2 === "number" || typeof value2 === "bigint")) {
+        return Number(value1) + Number(value2);
+    }
+    return aggregate(value1, value2);
+};
+export const funcAdd = new Constant((value1, value2) => add(value1, value2), Type.union(Type.functionType(Type.Float, [Type.Float, Type.Integer]), Type.functionType(Type.Float, [Type.Integer, Type.Float]), Type.functionType(Type.Integer, [Type.Integer, Type.Integer]), Type.functionType(Type.Buffer, [Type.Buffer, Type.Buffer]), Type.functionType(Type.String, [Type.String, Type.String]), Type.functionType(Type.Array, [Type.Array, Type.Array])));

package/dst/constant/Buffer.d.ts

@@ -1,8 +1,9 @@
 import { Constant } from "../Constant.js";
+export type BufferFormatting = "hex" | "base64";
 export declare const equateBuffers: (value1: ArrayBuffer, value2: ArrayBuffer) => boolean;
 export declare const containsBuffer: (value: ArrayBuffer, search: ArrayBuffer, startPos?: number) => boolean;
 export declare const concatBuffers: (value1: ArrayBuffer, value2: ArrayBuffer) => ArrayBuffer;
-export declare const formatBuffer: (value?: ArrayBuffer) => string;
+export declare const formatBuffer: (value?: ArrayBuffer, formatting?: BufferFormatting) => string;
 export declare const parseBuffer: (value?: string) => ArrayBuffer | undefined;
 export declare const funcByte: Constant;
 export declare const constBuffer: {

package/dst/constant/Buffer.js

@@ -66,10 +66,20 @@ export const concatBuffers = (value1, value2) => {
     bytes.set(new Uint8Array(value2), value1.byteLength);
     return bytes.buffer;
 };
-export const formatBuffer = (value) => {
+export const formatBuffer = (value, formatting = "hex") => {
     if (value == null) {
         return "";
     }
+    if (formatting === "base64") {
+        let binary = "";
+        const bytes = new Uint8Array(value);
+        const chunkSize = 0x4000;
+        for (let i = 0; i < bytes.length; i += chunkSize) {
+            const chunk = bytes.subarray(i, i + chunkSize);
+            binary += String.fromCharCode(...chunk);
+        }
+        return btoa(binary);
+    }
     const bytes = new Uint8Array(value);
     let str = "";
     for (let i = 0; i < bytes.byteLength; ++i) {

package/dst/constant/Enumerable.d.ts

@@ -1,5 +1,4 @@
 import { Constant } from "../Constant.js";
-export declare const funcAdd: Constant;
 export declare const funcSlice: Constant;
 export declare const funcSplice: Constant;
 export declare const funcInject: Constant;

package/dst/constant/Enumerable.js

@@ -1,28 +1,6 @@
 import { Constant } from "../Constant.js";
 import { Type } from "../Type.js";
-import { concatBuffers } from "./Buffer.js";
-const aggregate = (value1, value2) => {
-    if (value1 == null || value2 == null) {
-        return undefined;
-    }
-    if (value1 instanceof ArrayBuffer && value2 instanceof ArrayBuffer) {
-        return concatBuffers(value1, value2);
-    }
-    if (typeof value1 === "string" && typeof value2 === "string") {
-        return value1.concat(value2);
-    }
-    return [value1].flat().concat([value2].flat());
-};
-const add = (value1, value2) => {
-    if (typeof value1 === "bigint" && typeof value2 === "bigint") {
-        return BigInt.asIntN(64, value1 + value2);
-    }
-    if ((typeof value1 === "number" || typeof value1 === "bigint") && (typeof value2 === "number" || typeof value2 === "bigint")) {
-        return Number(value1) + Number(value2);
-    }
-    return aggregate(value1, value2);
-};
-export const funcAdd = new Constant((value1, value2) => add(value1, value2), Type.union(Type.functionType(Type.Float, [Type.Float, Type.Integer]), Type.functionType(Type.Float, [Type.Integer, Type.Float]), Type.functionType(Type.Integer, [Type.Integer, Type.Integer]), Type.functionType(Type.Buffer, [Type.Buffer, Type.Buffer]), Type.functionType(Type.String, [Type.String, Type.String]), Type.functionType(Type.Array, [Type.Array, Type.Array])));
+import { aggregate } from "./Aggregable.js";
 export const funcSlice = new Constant((value, start = 0n, end) => value == null
     ? undefined
     : value.slice(Number(start), end == null ? undefined : Number(end)), Type.union(Type.functionType(Type.Buffer, [Type.Buffer, Type.OptionalInteger, Type.OptionalInteger]), Type.functionType(Type.String, [Type.String, Type.OptionalInteger, Type.OptionalInteger]), Type.functionType(Type.Array, [Type.Array, Type.OptionalInteger, Type.OptionalInteger])));

package/dst/constant/Float.d.ts

@@ -1,7 +1,6 @@
 import { Constant } from "../Constant.js";
 export type FloatEncoding = "f32" | "f32le" | "f64" | "f64le";
 export declare const encodeFloat: (value?: number, encoding?: FloatEncoding) => ArrayBuffer;
-export declare const formatReal: (value: number, radix?: number) => string;
 export declare const constFloat: {
     NAN: Constant;
     PositiveInfinity: Constant;

package/dst/constant/Float.js

@@ -42,7 +42,6 @@ const decodeFloat = (value, encoding = "f64", byteOffset) => {
         default: throw new Error(`${encoding} encoding not supported`);
     }
 };
-export const formatReal = (value, radix) => value.toString(radix) + (Number.isInteger(value) ? ".0" : "");
 const typeNumberOrArray = Type.union(Type.Float, Type.arrayType([Type.Float]));
 const typeAggregator = Type.functionType(Type.Float, [typeNumberOrArray], true);
 const typeTransform = Type.functionType(Type.Float, [Type.Float]);

package/dst/constant/Number.d.ts

@@ -1,4 +1,13 @@
 import { Constant } from "../Constant.js";
+export interface NumberFormatting {
+    min_integer_digits?: number;
+    min_fraction_digits?: number;
+    max_fraction_digits?: number;
+    min_significant_digits?: number;
+    max_significant_digits?: number;
+    notation?: "standard" | "scientific";
+}
+export declare const formatNumber: (value: bigint | number, formatting?: string) => string;
 export declare const funcGreaterThan: Constant;
 export declare const funcLessThan: Constant;
 export declare const funcGreaterOrEqual: Constant;

package/dst/constant/Number.js

@@ -1,5 +1,23 @@
 import { Constant } from "../Constant.js";
 import { Type } from "../Type.js";
+export const formatNumber = (value, formatting) => {
+    if (formatting) {
+        const nformat = JSON.parse(`{${formatting}}`);
+        if (typeof nformat === "object") {
+            return new Intl.NumberFormat(undefined, {
+                minimumIntegerDigits: nformat?.min_integer_digits,
+                minimumFractionDigits: nformat?.min_fraction_digits,
+                maximumFractionDigits: nformat?.max_fraction_digits,
+                minimumSignificantDigits: nformat?.min_significant_digits,
+                maximumSignificantDigits: nformat?.max_significant_digits,
+                notation: nformat?.notation,
+            }).format(value);
+        }
+    }
+    return typeof value === "number" && Number.isInteger(value)
+        ? `${value.toString()}.0`
+        : value.toString();
+};
 const castToInteger = (value) => {
     if (value == null || Number.isNaN(value)) {
         return 0n;

package/dst/constant/String.js

@@ -149,14 +149,12 @@ export const encodeString = (value, encoding = "utf8") => {
     if (encoding === "utf8") {
         return new TextEncoder().encode(value).buffer;
     }
-    else {
-        const dv = new DataView(new Uint16Array(value.length).buffer);
-        const lessOrEqual = encoding.endsWith("le");
-        for (let i = 0; i < value.length; ++i) {
-            dv.setUint16(i << 1, value.charCodeAt(i), lessOrEqual);
-        }
-        return dv.buffer;
+    const dv = new DataView(new Uint16Array(value.length).buffer);
+    const lessOrEqual = encoding.endsWith("le");
+    for (let i = 0; i < value.length; ++i) {
+        dv.setUint16(i << 1, value.charCodeAt(i), lessOrEqual);
     }
+    return dv.buffer;
 };
 const decodeString = (value, encoding = "utf8", byteOffset, byteLength) => {
     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, formatting?: number | string) => string;
+export declare const format: (value: Value, formatting?: string) => string;
 export declare const funcCoalesce: Constant;
 export declare const funcEqual: Constant;
 export declare const funcNotEqual: Constant;

package/dst/constant/Unknown.js

@@ -1,8 +1,9 @@
 import { Constant } from "../Constant.js";
 import { Type } from "../Type.js";
-import { encodeFloat, formatReal } from "./Float.js";
+import { encodeFloat } from "./Float.js";
 import { encodeInteger } from "./Integer.js";
-import { concatBuffers, equateBuffers, formatBuffer } from "./Buffer.js";
+import { formatNumber } from "./Number.js";
+import { formatBuffer, concatBuffers, equateBuffers } from "./Buffer.js";
 import { encodeString } from "./String.js";
 import { encodeTimestamp, formatTimestamp } from "./Timestamp.js";
 export const equate = (value1, value2) => {
@@ -66,30 +67,34 @@ export const encode = (value, encoding) => value == null
                             : Array.isArray(value)
                                 ? value.map((i) => encode(i, encoding)).reduce((acc, val) => concatBuffers(acc, val))
                                 : typeof value === "object"
-                                    ? Object.entries(value).map(([k, v]) => concatBuffers(encode(k, encoding), encode(v, encoding))).reduce((acc, val) => concatBuffers(acc, val))
+                                    ? 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, formatting) => value == null
     ? "null"
     : typeof value === "boolean"
         ? value.toString()
         : value instanceof Date
-            ? formatTimestamp(value, String(formatting))
+            ? formatTimestamp(value, formatting)
             : typeof value === "number"
-                ? formatReal(value, formatting ? Number(formatting) : undefined)
+                ? formatNumber(value, formatting)
                 : typeof value === "bigint"
-                    ? value.toString(formatting ? Number(formatting) : undefined)
+                    ? formatNumber(value, formatting)
                     : value instanceof ArrayBuffer
-                        ? formatBuffer(value)
+                        ? formatBuffer(value, formatting)
                         : typeof value === "string"
                             ? value
                             : Array.isArray(value)
-                                ? "array"
+                                ? value.map((i) => format(i, formatting)).reduce((acc, val) => acc + val)
                                 : typeof value === "object"
-                                    ? "object"
+                                    ? Object.entries(value)
+                                        .map(([k, v]) => format(k, formatting) + format(v, formatting))
+                                        .reduce((acc, val) => acc + val)
                                     : "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, 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])));
+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.Buffer]), Type.functionType(Type.Buffer, [Type.String, Type.OptionalString]), Type.functionType(Type.Buffer, [Type.Array, Type.OptionalString]), Type.functionType(Type.Buffer, [Type.Object, Type.OptionalString]), Type.functionType(Type.Buffer, [Type.Function])));
+export const funcFormat = new Constant((value, formatting) => format(value, formatting), Type.union(Type.functionType(Type.String, [Type.Boolean]), Type.functionType(Type.String, [Type.Timestamp, Type.OptionalString]), Type.functionType(Type.String, [Type.Float, Type.OptionalString]), Type.functionType(Type.String, [Type.Integer, Type.OptionalString]), Type.functionType(Type.String, [Type.Buffer, Type.OptionalString]), Type.functionType(Type.String, [Type.String]), Type.functionType(Type.String, [Type.Array, Type.OptionalString]), Type.functionType(Type.String, [Type.Object, Type.OptionalString]), Type.functionType(Type.String, [Type.Function])));

package/dst/constant/notation/AN.js

@@ -1,6 +1,6 @@
 import { Constant } from "../../Constant.js";
 import { Type } from "../../Type.js";
-import { formatReal } from "../Float.js";
+import { formatNumber } from "../Number.js";
 import { formatBuffer } from "../Buffer.js";
 export const formatAN = (value, whitespace) => {
     if (value == null) {
@@ -13,10 +13,10 @@ export const formatAN = (value, whitespace) => {
         return `@${value.toISOString()}`;
     }
     if (typeof value === "number") {
-        return formatReal(value);
+        return formatNumber(value);
     }
     if (typeof value === "bigint") {
-        return value.toString();
+        return formatNumber(value);
     }
     if (value instanceof ArrayBuffer) {
         return `#${formatBuffer(value)}`;
@@ -30,8 +30,8 @@ export const formatAN = (value, whitespace) => {
         return `[${lines.join(",")}${suffix}]`;
     }
     if (typeof value === "object") {
-        const [prefix, suffix] = whitespace ? ["\n" + whitespace, "\n"] : ["", ""];
-        const lines = Object.entries(value).map(([k, v]) => `${prefix}"${k}":${formatAN(v, whitespace).split("\n").join(prefix)}`);
+        const [prefix, suffix, separator] = whitespace ? ["\n" + whitespace, "\n", ": "] : ["", "", ":"];
+        const lines = Object.entries(value).map(([k, v]) => `${prefix}"${k}"${separator}${formatAN(v, whitespace).split("\n").join(prefix)}`);
         return `[${lines.join(",")}${suffix}]`;
     }
     return "function";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "affinirum",
-	"version": "1.2.4",
+	"version": "1.2.7",
 	"description": "Affinirum Scripting Language",
 	"main": "dst/cjs/index.js",
 	"module": "dst/index.js",