@cedar-policy/cedar-wasm 4.3.3 → 4.4.0

package/web/cedar_wasm.js

@@ -18,18 +18,9 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
 }
 
-const heap = new Array(128).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-let heap_next = heap.length;
-
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
+function addToExternrefTable0(obj) {
+    const idx = wasm.__externref_table_alloc();
+    wasm.__wbindgen_export_2.set(idx, obj);
     return idx;
 }
 
@@ -37,24 +28,11 @@ function handleError(f, args) {
     try {
         return f.apply(this, args);
     } catch (e) {
-        wasm.__wbindgen_exn_store(addHeapObject(e));
+        const idx = addToExternrefTable0(e);
+        wasm.__wbindgen_exn_store(idx);
     }
 }
 
-function getObject(idx) { return heap[idx]; }
-
-function dropObject(idx) {
-    if (idx < 132) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
 let WASM_VECTOR_LEN = 0;
 
 const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
@@ -130,8 +108,8 @@ function getDataViewMemory0() {
  * @returns {GetValidRequestEnvsResult}
  */
 export function getValidRequestEnvsTemplate(t, s) {
-    const ret = wasm.getValidRequestEnvsTemplate(addHeapObject(t), addHeapObject(s));
-    return takeObject(ret);
+    const ret = wasm.getValidRequestEnvsTemplate(t, s);
+    return ret;
 }
 
 /**
@@ -141,8 +119,8 @@ export function getValidRequestEnvsTemplate(t, s) {
  * @returns {GetValidRequestEnvsResult}
  */
 export function getValidRequestEnvsPolicy(t, s) {
-    const ret = wasm.getValidRequestEnvsPolicy(addHeapObject(t), addHeapObject(s));
-    return takeObject(ret);
+    const ret = wasm.getValidRequestEnvsPolicy(t, s);
+    return ret;
 }
 
 /**
@@ -152,15 +130,11 @@ export function getCedarVersion() {
     let deferred1_0;
     let deferred1_1;
     try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.getCedarSDKVersion(retptr);
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        deferred1_0 = r0;
-        deferred1_1 = r1;
-        return getStringFromWasm0(r0, r1);
+        const ret = wasm.getCedarVersion();
+        deferred1_0 = ret[0];
+        deferred1_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
     } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
         wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
     }
 }
@@ -172,19 +146,65 @@ export function getCedarSDKVersion() {
     let deferred1_0;
     let deferred1_1;
     try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.getCedarSDKVersion(retptr);
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        deferred1_0 = r0;
-        deferred1_1 = r1;
-        return getStringFromWasm0(r0, r1);
+        const ret = wasm.getCedarSDKVersion();
+        deferred1_0 = ret[0];
+        deferred1_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
     } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
         wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
     }
 }
 
+/**
+ * Basic interface, using [`AuthorizationCall`] and [`AuthorizationAnswer`] types
+ * @param {AuthorizationCall} call
+ * @returns {AuthorizationAnswer}
+ */
+export function isAuthorized(call) {
+    const ret = wasm.isAuthorized(call);
+    return ret;
+}
+
+/**
+ * Check whether a policy set successfully parses.
+ * @param {PolicySet} policies
+ * @returns {CheckParseAnswer}
+ */
+export function checkParsePolicySet(policies) {
+    const ret = wasm.checkParsePolicySet(policies);
+    return ret;
+}
+
+/**
+ * Check whether a schema successfully parses.
+ * @param {Schema} schema
+ * @returns {CheckParseAnswer}
+ */
+export function checkParseSchema(schema) {
+    const ret = wasm.checkParseSchema(schema);
+    return ret;
+}
+
+/**
+ * Check whether a set of entities successfully parses.
+ * @param {EntitiesParsingCall} call
+ * @returns {CheckParseAnswer}
+ */
+export function checkParseEntities(call) {
+    const ret = wasm.checkParseEntities(call);
+    return ret;
+}
+
+/**
+ * Check whether a context successfully parses.
+ * @param {ContextParsingCall} call
+ * @returns {CheckParseAnswer}
+ */
+export function checkParseContext(call) {
+    const ret = wasm.checkParseContext(call);
+    return ret;
+}
+
 /**
  * Parse a policy set and optionally validate it against a provided schema
  *
@@ -194,29 +214,18 @@ export function getCedarSDKVersion() {
  * @returns {ValidationAnswer}
  */
 export function validate(call) {
-    const ret = wasm.validate(addHeapObject(call));
-    return takeObject(ret);
+    const ret = wasm.validate(call);
+    return ret;
 }
 
 /**
- * Get language version of Cedar
- * @returns {string}
+ * Apply the Cedar policy formatter to a policy set in the Cedar policy format
+ * @param {FormattingCall} call
+ * @returns {FormattingAnswer}
  */
-export function getCedarLangVersion() {
-    let deferred1_0;
-    let deferred1_1;
-    try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.getCedarLangVersion(retptr);
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        deferred1_0 = r0;
-        deferred1_1 = r1;
-        return getStringFromWasm0(r0, r1);
-    } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
-    }
+export function formatPolicies(call) {
+    const ret = wasm.formatPolicies(call);
+    return ret;
 }
 
 /**
@@ -225,8 +234,8 @@ export function getCedarLangVersion() {
  * @returns {PolicyToTextAnswer}
  */
 export function policyToText(policy) {
-    const ret = wasm.policyToText(addHeapObject(policy));
-    return takeObject(ret);
+    const ret = wasm.policyToText(policy);
+    return ret;
 }
 
 /**
@@ -235,8 +244,8 @@ export function policyToText(policy) {
  * @returns {PolicyToTextAnswer}
  */
 export function templateToText(template) {
-    const ret = wasm.templateToText(addHeapObject(template));
-    return takeObject(ret);
+    const ret = wasm.templateToText(template);
+    return ret;
 }
 
 /**
@@ -245,8 +254,8 @@ export function templateToText(template) {
  * @returns {PolicyToJsonAnswer}
  */
 export function policyToJson(policy) {
-    const ret = wasm.policyToJson(addHeapObject(policy));
-    return takeObject(ret);
+    const ret = wasm.policyToJson(policy);
+    return ret;
 }
 
 /**
@@ -255,8 +264,8 @@ export function policyToJson(policy) {
  * @returns {PolicyToJsonAnswer}
  */
 export function templateToJson(template) {
-    const ret = wasm.templateToJson(addHeapObject(template));
-    return takeObject(ret);
+    const ret = wasm.templateToJson(template);
+    return ret;
 }
 
 /**
@@ -265,8 +274,8 @@ export function templateToJson(template) {
  * @returns {SchemaToTextAnswer}
  */
 export function schemaToText(schema) {
-    const ret = wasm.schemaToText(addHeapObject(schema));
-    return takeObject(ret);
+    const ret = wasm.schemaToText(schema);
+    return ret;
 }
 
 /**
@@ -275,68 +284,25 @@ export function schemaToText(schema) {
  * @returns {SchemaToJsonAnswer}
  */
 export function schemaToJson(schema) {
-    const ret = wasm.schemaToJson(addHeapObject(schema));
-    return takeObject(ret);
-}
-
-/**
- * Check whether a policy set successfully parses.
- * @param {PolicySet} policies
- * @returns {CheckParseAnswer}
- */
-export function checkParsePolicySet(policies) {
-    const ret = wasm.checkParsePolicySet(addHeapObject(policies));
-    return takeObject(ret);
-}
-
-/**
- * Check whether a schema successfully parses.
- * @param {Schema} schema
- * @returns {CheckParseAnswer}
- */
-export function checkParseSchema(schema) {
-    const ret = wasm.checkParseSchema(addHeapObject(schema));
-    return takeObject(ret);
-}
-
-/**
- * Check whether a set of entities successfully parses.
- * @param {EntitiesParsingCall} call
- * @returns {CheckParseAnswer}
- */
-export function checkParseEntities(call) {
-    const ret = wasm.checkParseEntities(addHeapObject(call));
-    return takeObject(ret);
-}
-
-/**
- * Check whether a context successfully parses.
- * @param {ContextParsingCall} call
- * @returns {CheckParseAnswer}
- */
-export function checkParseContext(call) {
-    const ret = wasm.checkParseContext(addHeapObject(call));
-    return takeObject(ret);
-}
-
-/**
- * Basic interface, using [`AuthorizationCall`] and [`AuthorizationAnswer`] types
- * @param {AuthorizationCall} call
- * @returns {AuthorizationAnswer}
- */
-export function isAuthorized(call) {
-    const ret = wasm.isAuthorized(addHeapObject(call));
-    return takeObject(ret);
+    const ret = wasm.schemaToJson(schema);
+    return ret;
 }
 
 /**
- * Apply the Cedar policy formatter to a policy set in the Cedar policy format
- * @param {FormattingCall} call
- * @returns {FormattingAnswer}
+ * Get language version of Cedar
+ * @returns {string}
  */
-export function formatPolicies(call) {
-    const ret = wasm.formatPolicies(addHeapObject(call));
-    return takeObject(ret);
+export function getCedarLangVersion() {
+    let deferred1_0;
+    let deferred1_1;
+    try {
+        const ret = wasm.getCedarLangVersion();
+        deferred1_0 = ret[0];
+        deferred1_1 = ret[1];
+        return getStringFromWasm0(ret[0], ret[1]);
+    } finally {
+        wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
+    }
 }
 
 async function __wbg_load(module, imports) {
@@ -375,25 +341,28 @@ function __wbg_get_imports() {
     imports.wbg = {};
     imports.wbg.__wbg_parse_def2e24ef1252aff = function() { return handleError(function (arg0, arg1) {
         const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
-        return addHeapObject(ret);
+        return ret;
     }, arguments) };
     imports.wbg.__wbg_stringify_f7ed6987935b4a24 = function() { return handleError(function (arg0) {
-        const ret = JSON.stringify(getObject(arg0));
-        return addHeapObject(ret);
+        const ret = JSON.stringify(arg0);
+        return ret;
     }, arguments) };
+    imports.wbg.__wbindgen_init_externref_table = function() {
+        const table = wasm.__wbindgen_export_2;
+        const offset = table.grow(4);
+        table.set(0, undefined);
+        table.set(offset + 0, undefined);
+        table.set(offset + 1, null);
+        table.set(offset + 2, true);
+        table.set(offset + 3, false);
+        ;
+    };
     imports.wbg.__wbindgen_is_undefined = function(arg0) {
-        const ret = getObject(arg0) === undefined;
+        const ret = arg0 === undefined;
         return ret;
     };
-    imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
-        const ret = getObject(arg0);
-        return addHeapObject(ret);
-    };
-    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
-        takeObject(arg0);
-    };
     imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
-        const obj = getObject(arg1);
+        const obj = arg1;
         const ret = typeof(obj) === 'string' ? obj : undefined;
         var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         var len1 = WASM_VECTOR_LEN;
@@ -418,7 +387,7 @@ function __wbg_finalize_init(instance, module) {
     cachedUint8ArrayMemory0 = null;
 
 
-
+    wasm.__wbindgen_start();
     return wasm;
 }
 

package/web/cedar_wasm_bg.wasm.d.ts

@@ -1,26 +1,28 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export const getValidRequestEnvsTemplate: (a: number, b: number) => number;
-export const getValidRequestEnvsPolicy: (a: number, b: number) => number;
-export const getCedarSDKVersion: (a: number) => void;
-export const getCedarVersion: (a: number) => void;
-export const validate: (a: number) => number;
-export const getCedarLangVersion: (a: number) => void;
-export const policyToText: (a: number) => number;
-export const templateToText: (a: number) => number;
-export const policyToJson: (a: number) => number;
-export const templateToJson: (a: number) => number;
-export const schemaToText: (a: number) => number;
-export const schemaToJson: (a: number) => number;
-export const checkParsePolicySet: (a: number) => number;
-export const checkParseSchema: (a: number) => number;
-export const checkParseEntities: (a: number) => number;
-export const checkParseContext: (a: number) => number;
-export const isAuthorized: (a: number) => number;
-export const formatPolicies: (a: number) => number;
+export const getValidRequestEnvsTemplate: (a: any, b: any) => any;
+export const getValidRequestEnvsPolicy: (a: any, b: any) => any;
+export const getCedarSDKVersion: () => [number, number];
+export const getCedarVersion: () => [number, number];
+export const isAuthorized: (a: any) => any;
+export const checkParsePolicySet: (a: any) => any;
+export const checkParseSchema: (a: any) => any;
+export const checkParseEntities: (a: any) => any;
+export const checkParseContext: (a: any) => any;
+export const validate: (a: any) => any;
+export const formatPolicies: (a: any) => any;
+export const policyToText: (a: any) => any;
+export const templateToText: (a: any) => any;
+export const policyToJson: (a: any) => any;
+export const templateToJson: (a: any) => any;
+export const schemaToText: (a: any) => any;
+export const schemaToJson: (a: any) => any;
+export const getCedarLangVersion: () => [number, number];
 export const __wbindgen_exn_store: (a: number) => void;
+export const __externref_table_alloc: () => number;
+export const __wbindgen_export_2: WebAssembly.Table;
 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_add_to_stack_pointer: (a: number) => number;
 export const __wbindgen_free: (a: number, b: number, c: number) => void;
+export const __wbindgen_start: () => void;

package/web/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@cedar-policy/cedar-wasm",
+  "type": "module",
   "description": "Wasm bindings and typescript types for Cedar lib",
-  "version": "4.3.3",
+  "version": "4.4.0",
   "license": "Apache-2.0",
   "files": [
     "cedar_wasm_bg.wasm",
     "cedar_wasm.js",
     "cedar_wasm.d.ts"
   ],
-  "module": "cedar_wasm.js",
+  "main": "cedar_wasm.js",
   "types": "cedar_wasm.d.ts",
   "sideEffects": [
     "./snippets/*"
-  ],
-  "type": "module"
+  ]
 }