jlens-wasm 0.19.0 → 0.20.0

package/jlens.d.ts

@@ -27,12 +27,23 @@ export type HostFunction = (...args: any[]) => unknown;
  */
 export type Callable = ((...args: any[]) => unknown) & { readonly arity: number };
 
-/** Evaluation guardrails, and the clock and seed that make an evaluation reproducible. */
+/**
+ * Evaluation guardrails, and the clock and seed that make an evaluation reproducible. Each
+ * option is read once, as a property (getters and inherited properties included, `toJSON` not
+ * called); `undefined` and `null` mean the default. A number must be finite: `NaN` and
+ * `Infinity` throw a `TypeError`, as other invalid values do.
+ */
 export interface EvaluateOptions {
     /** Maximum duration of one evaluation, in milliseconds (error `D1012`). */
     timeout?: number;
     /** Maximum evaluation depth (default 500; error `D1011`). */
     maxDepth?: number;
+    /**
+     * Maximum number of evaluation steps (error `U1006`): each node evaluated, each function
+     * called back and each 1,024 steps of a regular expression's backtracking. The same
+     * expression, input and options take the same steps on every machine and natively.
+     */
+    maxSteps?: number;
     /** Maximum length, in bytes of UTF-8, of a string the evaluation builds (default 256 MiB; error `U1001`). */
     maxStringLength?: number;
     /** Maximum number of items of an array the evaluation builds (default 16,777,216; error `U1001`). */
@@ -44,8 +55,8 @@ export interface EvaluateOptions {
      */
     maxResultSize?: number;
     /**
-     * The evaluation's timestamp for `$now()` and `$millis()`: milliseconds since the epoch, a
-     * `Date` or an ISO 8601 timestamp. Default: the system clock.
+     * The evaluation's timestamp for `$now()` and `$millis()`: an integer number of milliseconds
+     * since the epoch, a valid `Date` or an ISO 8601 timestamp. Default: the system clock.
      */
     now?: number | Date | string;
     /** Seed for `$random()` and `$shuffle()`: the same seed gives the same results. */
@@ -150,6 +161,8 @@ export interface AuditHeader {
     /** The evaluation timestamp (`$now()`), in ISO 8601. */
     timestamp: string;
     durationMs: number;
+    /** The steps the evaluation took, which an evaluation without an audit takes too. */
+    steps: number;
     level: AuditLevel;
     result?: unknown;
     error?: { code: string; message: string };

package/jlens.js

@@ -1,7 +1,9 @@
 /* @ts-self-types="./jlens.d.ts" */
-import { jlensCallable } from './snippets/jlens-wasm-14c70486967a4dac/inline0.js';
-import { jlensBuild } from './snippets/jlens-wasm-14c70486967a4dac/inline1.js';
-import { jlensLevel } from './snippets/jlens-wasm-14c70486967a4dac/inline2.js';
+import { jlensCallable } from './snippets/jlens-wasm-f9fad0160b1217f6/inline0.js';
+import { jlensBuild } from './snippets/jlens-wasm-f9fad0160b1217f6/inline1.js';
+import { jlensLevel } from './snippets/jlens-wasm-f9fad0160b1217f6/inline2.js';
+import { jlensNow, jlensOptions } from './snippets/jlens-wasm-f9fad0160b1217f6/inline3.js';
+import * as import1 from "./snippets/jlens-wasm-f9fad0160b1217f6/inline3.js"
 
 
 /**
@@ -464,18 +466,29 @@ function __wbg_get_imports() {
             const ret = Array.isArray(arg0);
             return ret;
         },
-        __wbg_jlensBuild_de18e2fe951ffbb5: function(arg0, arg1, arg2, arg3, arg4, arg5) {
+        __wbg_jlensBuild_180aed8bd26138d4: function(arg0, arg1, arg2, arg3, arg4, arg5) {
             const ret = jlensBuild(getArrayU32FromWasm0(arg0, arg1), getArrayF64FromWasm0(arg2, arg3), getStringFromWasm0(arg4, arg5));
             return ret;
         },
-        __wbg_jlensCallable_089c61626da1df71: function(arg0, arg1) {
+        __wbg_jlensCallable_0776c9a0a6a3f726: function(arg0, arg1) {
             const ret = jlensCallable(arg0, arg1 >>> 0);
             return ret;
         },
-        __wbg_jlensLevel_7fa2a312bee944b5: function() { return handleError(function (arg0, arg1, arg2) {
+        __wbg_jlensLevel_8f4ed9a19341e81e: function() { return handleError(function (arg0, arg1, arg2) {
             const ret = jlensLevel(arg0, arg1 >>> 0, arg2 >>> 0);
             return ret;
         }, arguments); },
+        __wbg_jlensNow_f5fae1a30a449dc2: function(arg0) {
+            const ret = jlensNow();
+            const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+            const len1 = WASM_VECTOR_LEN;
+            getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+            getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+        },
+        __wbg_jlensOptions_3891f02712705fec: function() { return handleError(function (arg0) {
+            const ret = jlensOptions(arg0);
+            return ret;
+        }, arguments); },
         __wbg_length_3121141f8e1c8c58: function(arg0) {
             const ret = arg0.length;
             return ret;
@@ -561,7 +574,7 @@ function __wbg_get_imports() {
             var state0 = {a: arg0, b: arg1};
             var cb0 = (arg0) => wasm_bindgen_83299752791f6fbb___convert__closures_____invoke___js_sys_f067e63b4fcf480b___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_83299752791f6fbb___JsValue__wasm_bindgen_83299752791f6fbb___JsValue___false_(state0.a, state0.b, arg0);
             cb0._wbg_cb_unref = () => state0.a = 0;
-            // Cast intrinsic for `Closure(Closure { owned: false, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 10, ret: Result(Externref), inner_ret: Some(Result(Externref)) }, mutable: false }) -> Externref`.
+            // Cast intrinsic for `Closure(Closure { owned: false, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 9, ret: Result(Externref), inner_ret: Some(Result(Externref)) }, mutable: false }) -> Externref`.
             const ret = cb0;
             return ret;
         },
@@ -588,6 +601,7 @@ function __wbg_get_imports() {
     return {
         __proto__: null,
         "./jlens_bg.js": import0,
+        "./snippets/jlens-wasm-f9fad0160b1217f6/inline3.js": import1,
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jlens-wasm",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "JSONata in WebAssembly, with evaluation audits and schema-driven autocomplete",
   "license": "MIT",
   "repository": {

package/snippets/jlens-wasm-f9fad0160b1217f6/inline3.js

@@ -0,0 +1,45 @@
+
+const read = new Float64Array(16);
+let now = "";
+let set = 0;
+
+// Writes the tag and number of option `i` into `read`. The tag is 0 for undefined or null, 1 for
+// a number, 2 for a Date (its time, NaN when invalid), 3 for a string (`now` only, kept for
+// jlensNow) and 4 for anything else.
+function put(i, v) {
+  let tag = 4;
+  let n = 0;
+  if (v === undefined || v === null) tag = 0;
+  else if (typeof v === "number") (tag = 1), (n = v);
+  else if (typeof v === "string" && i === 6) (tag = 3), (now = v);
+  else if (Object.prototype.toString.call(v) === "[object Date]") (tag = 2), (n = Date.prototype.getTime.call(v));
+  read[2 * i] = tag;
+  read[2 * i + 1] = n;
+  if (tag !== 0) set = 1;
+}
+
+// Reads the evaluation options into `read`, in the order of `convert::options`. Each option is
+// read once, as a property (getters and inherited properties included, `toJSON` not called),
+// each at its own site, which V8 caches for the shape of the options. Returns -1 when `options`
+// is not a plain object, 0 when no option is set, and 1 otherwise.
+export function jlensOptions(options) {
+  if (typeof options !== "object" || Array.isArray(options)) return -1;
+  set = 0;
+  put(0, options.timeout);
+  put(1, options.maxDepth);
+  put(2, options.maxSteps);
+  put(3, options.maxStringLength);
+  put(4, options.maxArrayLength);
+  put(5, options.maxResultSize);
+  put(6, options.now);
+  put(7, options.seed);
+  return set;
+}
+
+export function jlensOptionsRead() {
+  return read;
+}
+
+export function jlensNow() {
+  return now;
+}