jlens-wasm 0.18.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 };
@@ -527,7 +540,7 @@ export interface InitOutput {
     readonly parseRecover: (a: number, b: number) => any;
     readonly unionReads: (a: any) => [number, number, number];
     readonly version: () => [number, number];
-    readonly wasm_bindgen_dfd3dc8039a2d669___convert__closures_____invoke___js_sys_94575574b531b35c___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_dfd3dc8039a2d669___JsValue__wasm_bindgen_dfd3dc8039a2d669___JsValue___false_: (a: number, b: number, c: any) => [number, number, number];
+    readonly wasm_bindgen_83299752791f6fbb___convert__closures_____invoke___js_sys_f067e63b4fcf480b___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_83299752791f6fbb___JsValue__wasm_bindgen_83299752791f6fbb___JsValue___false_: (a: number, b: number, c: any) => [number, number, number];
     readonly __wbindgen_malloc: (a: number, b: number) => number;
     readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
     readonly __wbindgen_exn_store: (a: number) => void;

package/jlens.js

@@ -1,6 +1,9 @@
 /* @ts-self-types="./jlens.d.ts" */
-import { jlensCallable } from './snippets/jlens-wasm-b5dd6593a6f87d95/inline0.js';
-import { jlensLevel } from './snippets/jlens-wasm-b5dd6593a6f87d95/inline1.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"
 
 
 /**
@@ -463,14 +466,29 @@ function __wbg_get_imports() {
             const ret = Array.isArray(arg0);
             return ret;
         },
-        __wbg_jlensCallable_7d9ffbb6d82e5c6e: function(arg0, arg1) {
+        __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_0776c9a0a6a3f726: function(arg0, arg1) {
             const ret = jlensCallable(arg0, arg1 >>> 0);
             return ret;
         },
-        __wbg_jlensLevel_7fc665e0f96eeefc: 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;
@@ -554,9 +572,9 @@ function __wbg_get_imports() {
         }, arguments); },
         __wbindgen_generic_0000000000000001: function(arg0, arg1) {
             var state0 = {a: arg0, b: arg1};
-            var cb0 = (arg0) => wasm_bindgen_dfd3dc8039a2d669___convert__closures_____invoke___js_sys_94575574b531b35c___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_dfd3dc8039a2d669___JsValue__wasm_bindgen_dfd3dc8039a2d669___JsValue___false_(state0.a, state0.b, arg0);
+            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;
         },
@@ -583,11 +601,12 @@ function __wbg_get_imports() {
     return {
         __proto__: null,
         "./jlens_bg.js": import0,
+        "./snippets/jlens-wasm-f9fad0160b1217f6/inline3.js": import1,
     };
 }
 
-function wasm_bindgen_dfd3dc8039a2d669___convert__closures_____invoke___js_sys_94575574b531b35c___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_dfd3dc8039a2d669___JsValue__wasm_bindgen_dfd3dc8039a2d669___JsValue___false_(arg0, arg1, arg2) {
-    const ret = wasm.wasm_bindgen_dfd3dc8039a2d669___convert__closures_____invoke___js_sys_94575574b531b35c___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_dfd3dc8039a2d669___JsValue__wasm_bindgen_dfd3dc8039a2d669___JsValue___false_(arg0, arg1, arg2);
+function wasm_bindgen_83299752791f6fbb___convert__closures_____invoke___js_sys_f067e63b4fcf480b___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_83299752791f6fbb___JsValue__wasm_bindgen_83299752791f6fbb___JsValue___false_(arg0, arg1, arg2) {
+    const ret = wasm.wasm_bindgen_83299752791f6fbb___convert__closures_____invoke___js_sys_f067e63b4fcf480b___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_83299752791f6fbb___JsValue__wasm_bindgen_83299752791f6fbb___JsValue___false_(arg0, arg1, arg2);
     if (ret[2]) {
         throw takeFromExternrefTable0(ret[1]);
     }
@@ -686,6 +705,11 @@ function getArrayF64FromWasm0(ptr, len) {
     return getFloat64ArrayMemory0().subarray(ptr / 8, ptr / 8 + len);
 }
 
+function getArrayU32FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint32ArrayMemory0().subarray(ptr / 4, ptr / 4 + len);
+}
+
 let cachedDataViewMemory0 = null;
 function getDataViewMemory0() {
     if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
@@ -706,6 +730,14 @@ function getStringFromWasm0(ptr, len) {
     return decodeText(ptr >>> 0, len);
 }
 
+let cachedUint32ArrayMemory0 = null;
+function getUint32ArrayMemory0() {
+    if (cachedUint32ArrayMemory0 === null || cachedUint32ArrayMemory0.byteLength === 0) {
+        cachedUint32ArrayMemory0 = new Uint32Array(wasm.memory.buffer);
+    }
+    return cachedUint32ArrayMemory0;
+}
+
 let cachedUint8ArrayMemory0 = null;
 function getUint8ArrayMemory0() {
     if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
@@ -806,6 +838,7 @@ function __wbg_finalize_init(instance, module) {
     wasmModule = module;
     cachedDataViewMemory0 = null;
     cachedFloat64ArrayMemory0 = null;
+    cachedUint32ArrayMemory0 = null;
     cachedUint8ArrayMemory0 = null;
     wasm.__wbindgen_start();
     return wasm;

package/jlens_bg.wasm.d.ts

@@ -25,7 +25,7 @@ export const languageservice_signatureHelp: (a: number, b: number, c: number, d:
 export const parseRecover: (a: number, b: number) => any;
 export const unionReads: (a: any) => [number, number, number];
 export const version: () => [number, number];
-export const wasm_bindgen_dfd3dc8039a2d669___convert__closures_____invoke___js_sys_94575574b531b35c___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_dfd3dc8039a2d669___JsValue__wasm_bindgen_dfd3dc8039a2d669___JsValue___false_: (a: number, b: number, c: any) => [number, number, number];
+export const wasm_bindgen_83299752791f6fbb___convert__closures_____invoke___js_sys_f067e63b4fcf480b___Array__core_37ee0ce0c4cd57d5___result__Result_wasm_bindgen_83299752791f6fbb___JsValue__wasm_bindgen_83299752791f6fbb___JsValue___false_: (a: number, b: number, c: any) => [number, number, number];
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_exn_store: (a: number) => void;

package/package.json

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

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

@@ -0,0 +1,48 @@
+
+// Builds the values that `ops` describes, in order: a stack holds the values built, and the
+// arrays and objects being filled. `text` holds the strings and the new keys, one after the
+// other (lengths in UTF-16 code units). Returns the last value built: the result.
+export function jlensBuild(ops, nums, text) {
+  const stack = [];
+  const keys = [];
+  // The index of the key `__proto__`, which an assignment would take for the prototype.
+  let proto = -1;
+  let num = 0, pos = 0;
+  for (let i = 0; i < ops.length; i++) {
+    switch (ops[i]) {
+      case 0: stack.push(null); break;
+      case 1: stack.push(false); break;
+      case 2: stack.push(true); break;
+      case 3: stack.push(nums[num++]); break;
+      case 4: { const end = pos + ops[++i]; stack.push(text.slice(pos, end)); pos = end; break; }
+      case 5: stack.push([]); break;
+      case 6: { const item = stack.pop(); stack[stack.length - 1].push(item); break; }
+      case 7: stack.push({}); break;
+      case 8: {
+        const key = ops[++i];
+        const value = stack.pop();
+        if (key === proto) own(stack[stack.length - 1], keys[key], value);
+        else stack[stack.length - 1][keys[key]] = value;
+        break;
+      }
+      case 9: {
+        const end = pos + ops[++i];
+        const key = text.slice(pos, end);
+        pos = end;
+        const value = stack.pop();
+        if (key === "__proto__") {
+          proto = keys.length;
+          own(stack[stack.length - 1], key, value);
+        } else stack[stack.length - 1][key] = value;
+        keys.push(key);
+        break;
+      }
+    }
+  }
+  return stack.pop();
+}
+
+// Defines an own property, as JSON.parse does.
+function own(object, key, value) {
+  Object.defineProperty(object, key, { value, writable: true, enumerable: true, configurable: true });
+}

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;
+}