@cedar-policy/cedar-wasm 4.0.1 → 4.2.0

package/README.md

@@ -28,7 +28,7 @@ console.log(cedar.getCedarVersion());
 Importing the esm version using esm async import:
 
 ```
-import('@cedar-policy/cedar-wasm')
+import('@cedar-policy/cedar-wasm/nodejs')
   .then(cedar => console.log(cedar.getCedarVersion()));
 ```
 

package/esm/README.md

@@ -28,7 +28,7 @@ console.log(cedar.getCedarVersion());
 Importing the esm version using esm async import:
 
 ```
-import('@cedar-policy/cedar-wasm')
+import('@cedar-policy/cedar-wasm/nodejs')
   .then(cedar => console.log(cedar.getCedarVersion()));
 ```
 

package/esm/cedar_wasm.d.ts

@@ -101,10 +101,6 @@ export function checkParseEntities(call: EntitiesParsingCall): CheckParseAnswer;
 export function checkParseContext(call: ContextParsingCall): CheckParseAnswer;
 export type GetValidRequestEnvsResult = { type: "success"; principals: string[]; actions: string[]; resources: string[] } | { type: "failure"; error: string };
 
-export type SlotId = string;
-
-export type PolicyId = string;
-
 export interface Response {
     decision: Decision;
     diagnostics: Diagnostics;
@@ -150,6 +146,41 @@ export interface ValidationError {
 
 export type ValidationAnswer = { type: "failure"; errors: DetailedError[]; warnings: DetailedError[] } | { type: "success"; validationErrors: ValidationError[]; validationWarnings: ValidationError[]; otherWarnings: DetailedError[] };
 
+export interface FormattingCall {
+    policyText: string;
+    lineWidth?: number;
+    indentWidth?: number;
+}
+
+export type FormattingAnswer = { type: "failure"; errors: DetailedError[] } | { type: "success"; formatted_policy: string };
+
+export type PolicyToTextAnswer = { type: "success"; text: string } | { type: "failure"; errors: DetailedError[] };
+
+export type PolicyToJsonAnswer = { type: "success"; json: PolicyJson } | { type: "failure"; errors: DetailedError[] };
+
+export type SchemaToTextAnswer = { type: "success"; text: string; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
+
+export type SchemaToJsonAnswer = { type: "success"; json: SchemaJson<string>; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
+
+export type ValidationMode = "strict";
+
+export type CheckParseAnswer = { type: "success" } | { type: "failure"; errors: DetailedError[] };
+
+export interface EntitiesParsingCall {
+    entities: Entities;
+    schema?: Schema | null;
+}
+
+export interface ContextParsingCall {
+    context: Context;
+    schema?: Schema | null;
+    action?: EntityUid | null;
+}
+
+export type SlotId = string;
+
+export type PolicyId = string;
+
 export type Schema = string | SchemaJson<string>;
 
 export interface PolicySet {
@@ -197,47 +228,10 @@ export interface DetailedError {
     related?: DetailedError[];
 }
 
-export type ValidationMode = "strict";
-
-export interface FormattingCall {
-    policyText: string;
-    lineWidth?: number;
-    indentWidth?: number;
-}
-
-export type FormattingAnswer = { type: "failure"; errors: DetailedError[] } | { type: "success"; formatted_policy: string };
-
-export type PolicyToTextAnswer = { type: "success"; text: string } | { type: "failure"; errors: DetailedError[] };
-
-export type PolicyToJsonAnswer = { type: "success"; json: PolicyJson } | { type: "failure"; errors: DetailedError[] };
-
-export type SchemaToTextAnswer = { type: "success"; text: string; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
-
-export type SchemaToJsonAnswer = { type: "success"; json: SchemaJson<string>; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
-
-export type CheckParseAnswer = { type: "success" } | { type: "failure"; errors: DetailedError[] };
-
-export interface EntitiesParsingCall {
-    entities: Entities;
-    schema?: Schema | null;
-}
-
-export interface ContextParsingCall {
-    context: Context;
-    schema?: Schema | null;
-    action?: EntityUid | null;
-}
-
-export type RecordAttributeType<N> = { required?: boolean } & Type<N>;
-
-export type EntityAttributeType<N> = { required?: boolean } & EntityAttributeTypeInternal<N>;
+export type TypeVariant<N> = { type: "String" } | { type: "Long" } | { type: "Boolean" } | { type: "Set"; element: Type<N> } | ({ type: "Record" } & RecordType<N>) | { type: "Entity"; name: N } | { type: "EntityOrCommon"; name: N } | { type: "Extension"; name: UnreservedId };
 
-export type EntityAttributeTypeInternal<N> = { Type: Type<N> } | { EAMap: { value_type: Type<N> } };
-
-export type TypeVariant<N> = { type: "String" } | { type: "Long" } | { type: "Boolean" } | { type: "Set"; element: Type<N> } | ({ type: "Record" } & RecordType<RecordAttributeType<N>>) | { type: "Entity"; name: N } | { type: "EntityOrCommon"; name: N } | { type: "Extension"; name: UnreservedId };
-
-export interface RecordType<V> {
-    attributes: Record<SmolStr, V>;
+export interface RecordType<N> {
+    attributes: Record<SmolStr, TypeOfAttribute<N>>;
     additionalAttributes?: boolean;
 }
 
@@ -251,7 +245,7 @@ export interface ActionEntityUID<N> {
 export interface ApplySpec<N> {
     resourceTypes: N[];
     principalTypes: N[];
-    context?: RecordOrContextAttributes<N>;
+    context?: AttributesOrContext<N>;
 }
 
 export interface ActionType<N> {
@@ -260,17 +254,12 @@ export interface ActionType<N> {
     memberOf?: ActionEntityUID<N>[];
 }
 
-export interface EntityAttributesInternal<N> extends RecordType<EntityAttributeType<N>> {
-    type: "Record";
-}
-
-export type EntityAttributes<N> = RecordOrContextAttributes<N> | EntityAttributesInternal<N>;
-
-export type RecordOrContextAttributes<N> = Type<N>;
+export type AttributesOrContext<N> = Type<N>;
 
 export interface EntityType<N> {
     memberOfTypes?: N[];
-    shape?: EntityAttributes<N>;
+    shape?: AttributesOrContext<N>;
+    tags?: Type<N>;
 }
 
 export interface NamespaceDefinition<N> {
@@ -283,6 +272,8 @@ export type CommonTypeId = string;
 
 export type SchemaJson<N> = Record<string, NamespaceDefinition<N>>;
 
+export type Decision = "allow" | "deny";
+
 export type Clause = { kind: "when"; body: Expr } | { kind: "unless"; body: Expr };
 
 export interface PolicyJson {
@@ -294,17 +285,15 @@ export interface PolicyJson {
     annotations?: Record<string, string>;
 }
 
-export type Decision = "allow" | "deny";
+export type ExtFuncCall = {} & Record<string, Array<Expr>>;
 
-export interface EntityJson {
-    uid: EntityUidJson;
-    attrs: Record<string, CedarValueJson>;
-    parents: EntityUidJson[];
-}
+export type ExprNoExt = { Value: CedarValueJson } | { Var: Var } | { Slot: string } | { "!": { arg: Expr } } | { neg: { arg: Expr } } | { "==": { left: Expr; right: Expr } } | { "!=": { left: Expr; right: Expr } } | { in: { left: Expr; right: Expr } } | { "<": { left: Expr; right: Expr } } | { "<=": { left: Expr; right: Expr } } | { ">": { left: Expr; right: Expr } } | { ">=": { left: Expr; right: Expr } } | { "&&": { left: Expr; right: Expr } } | { "||": { left: Expr; right: Expr } } | { "+": { left: Expr; right: Expr } } | { "-": { left: Expr; right: Expr } } | { "*": { left: Expr; right: Expr } } | { contains: { left: Expr; right: Expr } } | { containsAll: { left: Expr; right: Expr } } | { containsAny: { left: Expr; right: Expr } } | { getTag: { left: Expr; right: Expr } } | { hasTag: { left: Expr; right: Expr } } | { ".": { left: Expr; attr: SmolStr } } | { has: { left: Expr; attr: SmolStr } } | { like: { left: Expr; pattern: PatternElem[] } } | { is: { left: Expr; entity_type: SmolStr; in?: Expr } } | { "if-then-else": { if: Expr; then: Expr; else: Expr } } | { Set: Expr[] } | { Record: Record<string, Expr> };
 
-export type UnreservedId = string;
+export type PatternElem = "Wildcard" | { Literal: SmolStr };
 
-export type Var = "principal" | "action" | "resource" | "context";
+export type Expr = ExprNoExt | ExtFuncCall;
+
+export type Effect = "permit" | "forbid";
 
 export type ActionInConstraint = { entity: EntityUidJson } | { entities: EntityUidJson[] };
 
@@ -323,6 +312,13 @@ export type ActionConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | (
 
 export type PrincipalConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | ({ op: "in" } & PrincipalOrResourceInConstraint) | ({ op: "is" } & PrincipalOrResourceIsConstraint);
 
+export interface EntityJson {
+    uid: EntityUidJson;
+    attrs: Record<string, CedarValueJson>;
+    parents: EntityUidJson[];
+    tags?: Record<string, CedarValueJson>;
+}
+
 export type EntityUidJson = { __entity: TypeAndId } | TypeAndId;
 
 export interface FnAndArg {
@@ -337,14 +333,9 @@ export interface TypeAndId {
 
 export type CedarValueJson = { __entity: TypeAndId } | { __extn: FnAndArg } | boolean | number | string | CedarValueJson[] | { [key: string]: CedarValueJson } | null;
 
-export type ExtFuncCall = {} & Record<string, Array<Expr>>;
-
-export type ExprNoExt = { Value: CedarValueJson } | { Var: Var } | { Slot: string } | { "!": { arg: Expr } } | { neg: { arg: Expr } } | { "==": { left: Expr; right: Expr } } | { "!=": { left: Expr; right: Expr } } | { in: { left: Expr; right: Expr } } | { "<": { left: Expr; right: Expr } } | { "<=": { left: Expr; right: Expr } } | { ">": { left: Expr; right: Expr } } | { ">=": { left: Expr; right: Expr } } | { "&&": { left: Expr; right: Expr } } | { "||": { left: Expr; right: Expr } } | { "+": { left: Expr; right: Expr } } | { "-": { left: Expr; right: Expr } } | { "*": { left: Expr; right: Expr } } | { contains: { left: Expr; right: Expr } } | { containsAll: { left: Expr; right: Expr } } | { containsAny: { left: Expr; right: Expr } } | { ".": { left: Expr; attr: SmolStr } } | { has: { left: Expr; attr: SmolStr } } | { like: { left: Expr; pattern: PatternElem[] } } | { is: { left: Expr; entity_type: SmolStr; in?: Expr } } | { "if-then-else": { if: Expr; then: Expr; else: Expr } } | { Set: Expr[] } | { Record: Record<string, Expr> };
-
-export type PatternElem = "Wildcard" | { Literal: SmolStr };
-
-export type Expr = ExprNoExt | ExtFuncCall;
+export type UnreservedId = string;
 
-export type Effect = "permit" | "forbid";
+export type Var = "principal" | "action" | "resource" | "context";
 
 type SmolStr = string;
+export type TypeOfAttribute<N> = Type<N> & { required?: boolean };

package/esm/cedar_wasm.js

@@ -1,3 +1,4 @@
+
 import * as wasm from "./cedar_wasm_bg.wasm";
 import { __wbg_set_wasm } from "./cedar_wasm_bg.js";
 __wbg_set_wasm(wasm);

package/esm/cedar_wasm_bg.js

@@ -35,13 +35,13 @@ function takeObject(idx) {
 
 let WASM_VECTOR_LEN = 0;
 
-let cachedUint8Memory0 = null;
+let cachedUint8ArrayMemory0 = null;
 
-function getUint8Memory0() {
-    if (cachedUint8Memory0 === null || cachedUint8Memory0.byteLength === 0) {
-        cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
+function getUint8ArrayMemory0() {
+    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
+        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
     }
-    return cachedUint8Memory0;
+    return cachedUint8ArrayMemory0;
 }
 
 const lTextEncoder = typeof TextEncoder === 'undefined' ? (0, module.require)('util').TextEncoder : TextEncoder;
@@ -66,7 +66,7 @@ function passStringToWasm0(arg, malloc, realloc) {
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);
         const ptr = malloc(buf.length, 1) >>> 0;
-        getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
+        getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf);
         WASM_VECTOR_LEN = buf.length;
         return ptr;
     }
@@ -74,7 +74,7 @@ function passStringToWasm0(arg, malloc, realloc) {
     let len = arg.length;
     let ptr = malloc(len, 1) >>> 0;
 
-    const mem = getUint8Memory0();
+    const mem = getUint8ArrayMemory0();
 
     let offset = 0;
 
@@ -89,7 +89,7 @@ function passStringToWasm0(arg, malloc, realloc) {
             arg = arg.slice(offset);
         }
         ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
-        const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
+        const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len);
         const ret = encodeString(arg, view);
 
         offset += ret.written;
@@ -104,13 +104,13 @@ function isLikeNone(x) {
     return x === undefined || x === null;
 }
 
-let cachedInt32Memory0 = null;
+let cachedDataViewMemory0 = null;
 
-function getInt32Memory0() {
-    if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
-        cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
+function getDataViewMemory0() {
+    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
+        cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
     }
-    return cachedInt32Memory0;
+    return cachedDataViewMemory0;
 }
 
 const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;
@@ -121,7 +121,7 @@ cachedTextDecoder.decode();
 
 function getStringFromWasm0(ptr, len) {
     ptr = ptr >>> 0;
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
 }
 /**
 * Get valid request environment
@@ -154,8 +154,8 @@ export function getCedarVersion() {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         wasm.getCedarVersion(retptr);
-        var r0 = getInt32Memory0()[retptr / 4 + 0];
-        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        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);
@@ -325,16 +325,16 @@ export function __wbindgen_string_get(arg0, 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;
-    getInt32Memory0()[arg0 / 4 + 1] = len1;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr1;
+    getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+    getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 };
 
-export function __wbg_parse_66d1801634e099ac() { return handleError(function (arg0, arg1) {
+export function __wbg_parse_52202f117ec9ecfa() { return handleError(function (arg0, arg1) {
     const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
     return addHeapObject(ret);
 }, arguments) };
 
-export function __wbg_stringify_8887fe74e1c50d81() { return handleError(function (arg0) {
+export function __wbg_stringify_bbf45426c92a6bf5() { return handleError(function (arg0) {
     const ret = JSON.stringify(getObject(arg0));
     return addHeapObject(ret);
 }, arguments) };

package/esm/package.json

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

package/nodejs/README.md

@@ -28,7 +28,7 @@ console.log(cedar.getCedarVersion());
 Importing the esm version using esm async import:
 
 ```
-import('@cedar-policy/cedar-wasm')
+import('@cedar-policy/cedar-wasm/nodejs')
   .then(cedar => console.log(cedar.getCedarVersion()));
 ```
 

package/nodejs/cedar_wasm.d.ts

@@ -101,10 +101,6 @@ export function checkParseEntities(call: EntitiesParsingCall): CheckParseAnswer;
 export function checkParseContext(call: ContextParsingCall): CheckParseAnswer;
 export type GetValidRequestEnvsResult = { type: "success"; principals: string[]; actions: string[]; resources: string[] } | { type: "failure"; error: string };
 
-export type SlotId = string;
-
-export type PolicyId = string;
-
 export interface Response {
     decision: Decision;
     diagnostics: Diagnostics;
@@ -150,6 +146,41 @@ export interface ValidationError {
 
 export type ValidationAnswer = { type: "failure"; errors: DetailedError[]; warnings: DetailedError[] } | { type: "success"; validationErrors: ValidationError[]; validationWarnings: ValidationError[]; otherWarnings: DetailedError[] };
 
+export interface FormattingCall {
+    policyText: string;
+    lineWidth?: number;
+    indentWidth?: number;
+}
+
+export type FormattingAnswer = { type: "failure"; errors: DetailedError[] } | { type: "success"; formatted_policy: string };
+
+export type PolicyToTextAnswer = { type: "success"; text: string } | { type: "failure"; errors: DetailedError[] };
+
+export type PolicyToJsonAnswer = { type: "success"; json: PolicyJson } | { type: "failure"; errors: DetailedError[] };
+
+export type SchemaToTextAnswer = { type: "success"; text: string; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
+
+export type SchemaToJsonAnswer = { type: "success"; json: SchemaJson<string>; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
+
+export type ValidationMode = "strict";
+
+export type CheckParseAnswer = { type: "success" } | { type: "failure"; errors: DetailedError[] };
+
+export interface EntitiesParsingCall {
+    entities: Entities;
+    schema?: Schema | null;
+}
+
+export interface ContextParsingCall {
+    context: Context;
+    schema?: Schema | null;
+    action?: EntityUid | null;
+}
+
+export type SlotId = string;
+
+export type PolicyId = string;
+
 export type Schema = string | SchemaJson<string>;
 
 export interface PolicySet {
@@ -197,47 +228,10 @@ export interface DetailedError {
     related?: DetailedError[];
 }
 
-export type ValidationMode = "strict";
-
-export interface FormattingCall {
-    policyText: string;
-    lineWidth?: number;
-    indentWidth?: number;
-}
-
-export type FormattingAnswer = { type: "failure"; errors: DetailedError[] } | { type: "success"; formatted_policy: string };
-
-export type PolicyToTextAnswer = { type: "success"; text: string } | { type: "failure"; errors: DetailedError[] };
-
-export type PolicyToJsonAnswer = { type: "success"; json: PolicyJson } | { type: "failure"; errors: DetailedError[] };
-
-export type SchemaToTextAnswer = { type: "success"; text: string; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
-
-export type SchemaToJsonAnswer = { type: "success"; json: SchemaJson<string>; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
-
-export type CheckParseAnswer = { type: "success" } | { type: "failure"; errors: DetailedError[] };
-
-export interface EntitiesParsingCall {
-    entities: Entities;
-    schema?: Schema | null;
-}
-
-export interface ContextParsingCall {
-    context: Context;
-    schema?: Schema | null;
-    action?: EntityUid | null;
-}
-
-export type RecordAttributeType<N> = { required?: boolean } & Type<N>;
-
-export type EntityAttributeType<N> = { required?: boolean } & EntityAttributeTypeInternal<N>;
+export type TypeVariant<N> = { type: "String" } | { type: "Long" } | { type: "Boolean" } | { type: "Set"; element: Type<N> } | ({ type: "Record" } & RecordType<N>) | { type: "Entity"; name: N } | { type: "EntityOrCommon"; name: N } | { type: "Extension"; name: UnreservedId };
 
-export type EntityAttributeTypeInternal<N> = { Type: Type<N> } | { EAMap: { value_type: Type<N> } };
-
-export type TypeVariant<N> = { type: "String" } | { type: "Long" } | { type: "Boolean" } | { type: "Set"; element: Type<N> } | ({ type: "Record" } & RecordType<RecordAttributeType<N>>) | { type: "Entity"; name: N } | { type: "EntityOrCommon"; name: N } | { type: "Extension"; name: UnreservedId };
-
-export interface RecordType<V> {
-    attributes: Record<SmolStr, V>;
+export interface RecordType<N> {
+    attributes: Record<SmolStr, TypeOfAttribute<N>>;
     additionalAttributes?: boolean;
 }
 
@@ -251,7 +245,7 @@ export interface ActionEntityUID<N> {
 export interface ApplySpec<N> {
     resourceTypes: N[];
     principalTypes: N[];
-    context?: RecordOrContextAttributes<N>;
+    context?: AttributesOrContext<N>;
 }
 
 export interface ActionType<N> {
@@ -260,17 +254,12 @@ export interface ActionType<N> {
     memberOf?: ActionEntityUID<N>[];
 }
 
-export interface EntityAttributesInternal<N> extends RecordType<EntityAttributeType<N>> {
-    type: "Record";
-}
-
-export type EntityAttributes<N> = RecordOrContextAttributes<N> | EntityAttributesInternal<N>;
-
-export type RecordOrContextAttributes<N> = Type<N>;
+export type AttributesOrContext<N> = Type<N>;
 
 export interface EntityType<N> {
     memberOfTypes?: N[];
-    shape?: EntityAttributes<N>;
+    shape?: AttributesOrContext<N>;
+    tags?: Type<N>;
 }
 
 export interface NamespaceDefinition<N> {
@@ -283,6 +272,8 @@ export type CommonTypeId = string;
 
 export type SchemaJson<N> = Record<string, NamespaceDefinition<N>>;
 
+export type Decision = "allow" | "deny";
+
 export type Clause = { kind: "when"; body: Expr } | { kind: "unless"; body: Expr };
 
 export interface PolicyJson {
@@ -294,17 +285,15 @@ export interface PolicyJson {
     annotations?: Record<string, string>;
 }
 
-export type Decision = "allow" | "deny";
+export type ExtFuncCall = {} & Record<string, Array<Expr>>;
 
-export interface EntityJson {
-    uid: EntityUidJson;
-    attrs: Record<string, CedarValueJson>;
-    parents: EntityUidJson[];
-}
+export type ExprNoExt = { Value: CedarValueJson } | { Var: Var } | { Slot: string } | { "!": { arg: Expr } } | { neg: { arg: Expr } } | { "==": { left: Expr; right: Expr } } | { "!=": { left: Expr; right: Expr } } | { in: { left: Expr; right: Expr } } | { "<": { left: Expr; right: Expr } } | { "<=": { left: Expr; right: Expr } } | { ">": { left: Expr; right: Expr } } | { ">=": { left: Expr; right: Expr } } | { "&&": { left: Expr; right: Expr } } | { "||": { left: Expr; right: Expr } } | { "+": { left: Expr; right: Expr } } | { "-": { left: Expr; right: Expr } } | { "*": { left: Expr; right: Expr } } | { contains: { left: Expr; right: Expr } } | { containsAll: { left: Expr; right: Expr } } | { containsAny: { left: Expr; right: Expr } } | { getTag: { left: Expr; right: Expr } } | { hasTag: { left: Expr; right: Expr } } | { ".": { left: Expr; attr: SmolStr } } | { has: { left: Expr; attr: SmolStr } } | { like: { left: Expr; pattern: PatternElem[] } } | { is: { left: Expr; entity_type: SmolStr; in?: Expr } } | { "if-then-else": { if: Expr; then: Expr; else: Expr } } | { Set: Expr[] } | { Record: Record<string, Expr> };
 
-export type UnreservedId = string;
+export type PatternElem = "Wildcard" | { Literal: SmolStr };
 
-export type Var = "principal" | "action" | "resource" | "context";
+export type Expr = ExprNoExt | ExtFuncCall;
+
+export type Effect = "permit" | "forbid";
 
 export type ActionInConstraint = { entity: EntityUidJson } | { entities: EntityUidJson[] };
 
@@ -323,6 +312,13 @@ export type ActionConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | (
 
 export type PrincipalConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | ({ op: "in" } & PrincipalOrResourceInConstraint) | ({ op: "is" } & PrincipalOrResourceIsConstraint);
 
+export interface EntityJson {
+    uid: EntityUidJson;
+    attrs: Record<string, CedarValueJson>;
+    parents: EntityUidJson[];
+    tags?: Record<string, CedarValueJson>;
+}
+
 export type EntityUidJson = { __entity: TypeAndId } | TypeAndId;
 
 export interface FnAndArg {
@@ -337,14 +333,9 @@ export interface TypeAndId {
 
 export type CedarValueJson = { __entity: TypeAndId } | { __extn: FnAndArg } | boolean | number | string | CedarValueJson[] | { [key: string]: CedarValueJson } | null;
 
-export type ExtFuncCall = {} & Record<string, Array<Expr>>;
-
-export type ExprNoExt = { Value: CedarValueJson } | { Var: Var } | { Slot: string } | { "!": { arg: Expr } } | { neg: { arg: Expr } } | { "==": { left: Expr; right: Expr } } | { "!=": { left: Expr; right: Expr } } | { in: { left: Expr; right: Expr } } | { "<": { left: Expr; right: Expr } } | { "<=": { left: Expr; right: Expr } } | { ">": { left: Expr; right: Expr } } | { ">=": { left: Expr; right: Expr } } | { "&&": { left: Expr; right: Expr } } | { "||": { left: Expr; right: Expr } } | { "+": { left: Expr; right: Expr } } | { "-": { left: Expr; right: Expr } } | { "*": { left: Expr; right: Expr } } | { contains: { left: Expr; right: Expr } } | { containsAll: { left: Expr; right: Expr } } | { containsAny: { left: Expr; right: Expr } } | { ".": { left: Expr; attr: SmolStr } } | { has: { left: Expr; attr: SmolStr } } | { like: { left: Expr; pattern: PatternElem[] } } | { is: { left: Expr; entity_type: SmolStr; in?: Expr } } | { "if-then-else": { if: Expr; then: Expr; else: Expr } } | { Set: Expr[] } | { Record: Record<string, Expr> };
-
-export type PatternElem = "Wildcard" | { Literal: SmolStr };
-
-export type Expr = ExprNoExt | ExtFuncCall;
+export type UnreservedId = string;
 
-export type Effect = "permit" | "forbid";
+export type Var = "principal" | "action" | "resource" | "context";
 
 type SmolStr = string;
+export type TypeOfAttribute<N> = Type<N> & { required?: boolean };

package/nodejs/cedar_wasm.js

@@ -1,3 +1,4 @@
+
 let imports = {};
 imports['__wbindgen_placeholder__'] = module.exports;
 let wasm;
@@ -34,13 +35,13 @@ function takeObject(idx) {
 
 let WASM_VECTOR_LEN = 0;
 
-let cachedUint8Memory0 = null;
+let cachedUint8ArrayMemory0 = null;
 
-function getUint8Memory0() {
-    if (cachedUint8Memory0 === null || cachedUint8Memory0.byteLength === 0) {
-        cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
+function getUint8ArrayMemory0() {
+    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
+        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
     }
-    return cachedUint8Memory0;
+    return cachedUint8ArrayMemory0;
 }
 
 let cachedTextEncoder = new TextEncoder('utf-8');
@@ -63,7 +64,7 @@ function passStringToWasm0(arg, malloc, realloc) {
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);
         const ptr = malloc(buf.length, 1) >>> 0;
-        getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
+        getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf);
         WASM_VECTOR_LEN = buf.length;
         return ptr;
     }
@@ -71,7 +72,7 @@ function passStringToWasm0(arg, malloc, realloc) {
     let len = arg.length;
     let ptr = malloc(len, 1) >>> 0;
 
-    const mem = getUint8Memory0();
+    const mem = getUint8ArrayMemory0();
 
     let offset = 0;
 
@@ -86,7 +87,7 @@ function passStringToWasm0(arg, malloc, realloc) {
             arg = arg.slice(offset);
         }
         ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
-        const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
+        const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len);
         const ret = encodeString(arg, view);
 
         offset += ret.written;
@@ -101,13 +102,13 @@ function isLikeNone(x) {
     return x === undefined || x === null;
 }
 
-let cachedInt32Memory0 = null;
+let cachedDataViewMemory0 = null;
 
-function getInt32Memory0() {
-    if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
-        cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
+function getDataViewMemory0() {
+    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
+        cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
     }
-    return cachedInt32Memory0;
+    return cachedDataViewMemory0;
 }
 
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
@@ -116,7 +117,7 @@ cachedTextDecoder.decode();
 
 function getStringFromWasm0(ptr, len) {
     ptr = ptr >>> 0;
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
 }
 /**
 * Get valid request environment
@@ -149,8 +150,8 @@ module.exports.getCedarVersion = function() {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         wasm.getCedarVersion(retptr);
-        var r0 = getInt32Memory0()[retptr / 4 + 0];
-        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        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);
@@ -320,16 +321,16 @@ module.exports.__wbindgen_string_get = function(arg0, 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;
-    getInt32Memory0()[arg0 / 4 + 1] = len1;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr1;
+    getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+    getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 };
 
-module.exports.__wbg_parse_66d1801634e099ac = function() { return handleError(function (arg0, arg1) {
+module.exports.__wbg_parse_52202f117ec9ecfa = function() { return handleError(function (arg0, arg1) {
     const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
     return addHeapObject(ret);
 }, arguments) };
 
-module.exports.__wbg_stringify_8887fe74e1c50d81 = function() { return handleError(function (arg0) {
+module.exports.__wbg_stringify_bbf45426c92a6bf5 = function() { return handleError(function (arg0) {
     const ret = JSON.stringify(getObject(arg0));
     return addHeapObject(ret);
 }, arguments) };

package/nodejs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cedar-policy/cedar-wasm",
   "description": "Wasm bindings and typescript types for Cedar lib",
-  "version": "4.0.1",
+  "version": "4.2.0",
   "license": "Apache-2.0",
   "files": [
     "cedar_wasm_bg.wasm",

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@cedar-policy/cedar-wasm",
+  "type": "module",
   "description": "Wasm bindings and typescript types for Cedar lib",
-  "version": "4.0.1",
+  "version": "4.2.0",
   "license": "Apache-2.0",
   "files": [
     "esm/package.json",
@@ -24,11 +25,12 @@
     "web/cedar_wasm.js",
     "web/cedar_wasm.d.ts"
   ],
-  "module": "esm/cedar_wasm.js",
+  "main": "cedar_wasm.js",
   "types": "esm/cedar_wasm.d.ts",
   "sideEffects": [
     "./snippets/*"
   ],
+  "module": "esm/cedar_wasm.js",
   "exports": {
     ".": {
       "import": "./esm/cedar_wasm.js",
@@ -36,6 +38,7 @@
     },
     "./nodejs": {
       "require": "./nodejs/cedar_wasm.js",
+      "import": "./nodejs/cedar_wasm.js",
       "types": "./nodejs/cedar_wasm.d.ts"
     },
     "./web": {

package/web/README.md

@@ -28,7 +28,7 @@ console.log(cedar.getCedarVersion());
 Importing the esm version using esm async import:
 
 ```
-import('@cedar-policy/cedar-wasm')
+import('@cedar-policy/cedar-wasm/nodejs')
   .then(cedar => console.log(cedar.getCedarVersion()));
 ```
 

package/web/cedar_wasm.d.ts

@@ -101,10 +101,6 @@ export function checkParseEntities(call: EntitiesParsingCall): CheckParseAnswer;
 export function checkParseContext(call: ContextParsingCall): CheckParseAnswer;
 export type GetValidRequestEnvsResult = { type: "success"; principals: string[]; actions: string[]; resources: string[] } | { type: "failure"; error: string };
 
-export type SlotId = string;
-
-export type PolicyId = string;
-
 export interface Response {
     decision: Decision;
     diagnostics: Diagnostics;
@@ -150,6 +146,41 @@ export interface ValidationError {
 
 export type ValidationAnswer = { type: "failure"; errors: DetailedError[]; warnings: DetailedError[] } | { type: "success"; validationErrors: ValidationError[]; validationWarnings: ValidationError[]; otherWarnings: DetailedError[] };
 
+export interface FormattingCall {
+    policyText: string;
+    lineWidth?: number;
+    indentWidth?: number;
+}
+
+export type FormattingAnswer = { type: "failure"; errors: DetailedError[] } | { type: "success"; formatted_policy: string };
+
+export type PolicyToTextAnswer = { type: "success"; text: string } | { type: "failure"; errors: DetailedError[] };
+
+export type PolicyToJsonAnswer = { type: "success"; json: PolicyJson } | { type: "failure"; errors: DetailedError[] };
+
+export type SchemaToTextAnswer = { type: "success"; text: string; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
+
+export type SchemaToJsonAnswer = { type: "success"; json: SchemaJson<string>; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
+
+export type ValidationMode = "strict";
+
+export type CheckParseAnswer = { type: "success" } | { type: "failure"; errors: DetailedError[] };
+
+export interface EntitiesParsingCall {
+    entities: Entities;
+    schema?: Schema | null;
+}
+
+export interface ContextParsingCall {
+    context: Context;
+    schema?: Schema | null;
+    action?: EntityUid | null;
+}
+
+export type SlotId = string;
+
+export type PolicyId = string;
+
 export type Schema = string | SchemaJson<string>;
 
 export interface PolicySet {
@@ -197,47 +228,10 @@ export interface DetailedError {
     related?: DetailedError[];
 }
 
-export type ValidationMode = "strict";
-
-export interface FormattingCall {
-    policyText: string;
-    lineWidth?: number;
-    indentWidth?: number;
-}
-
-export type FormattingAnswer = { type: "failure"; errors: DetailedError[] } | { type: "success"; formatted_policy: string };
-
-export type PolicyToTextAnswer = { type: "success"; text: string } | { type: "failure"; errors: DetailedError[] };
-
-export type PolicyToJsonAnswer = { type: "success"; json: PolicyJson } | { type: "failure"; errors: DetailedError[] };
-
-export type SchemaToTextAnswer = { type: "success"; text: string; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
-
-export type SchemaToJsonAnswer = { type: "success"; json: SchemaJson<string>; warnings: DetailedError[] } | { type: "failure"; errors: DetailedError[] };
-
-export type CheckParseAnswer = { type: "success" } | { type: "failure"; errors: DetailedError[] };
-
-export interface EntitiesParsingCall {
-    entities: Entities;
-    schema?: Schema | null;
-}
-
-export interface ContextParsingCall {
-    context: Context;
-    schema?: Schema | null;
-    action?: EntityUid | null;
-}
-
-export type RecordAttributeType<N> = { required?: boolean } & Type<N>;
-
-export type EntityAttributeType<N> = { required?: boolean } & EntityAttributeTypeInternal<N>;
+export type TypeVariant<N> = { type: "String" } | { type: "Long" } | { type: "Boolean" } | { type: "Set"; element: Type<N> } | ({ type: "Record" } & RecordType<N>) | { type: "Entity"; name: N } | { type: "EntityOrCommon"; name: N } | { type: "Extension"; name: UnreservedId };
 
-export type EntityAttributeTypeInternal<N> = { Type: Type<N> } | { EAMap: { value_type: Type<N> } };
-
-export type TypeVariant<N> = { type: "String" } | { type: "Long" } | { type: "Boolean" } | { type: "Set"; element: Type<N> } | ({ type: "Record" } & RecordType<RecordAttributeType<N>>) | { type: "Entity"; name: N } | { type: "EntityOrCommon"; name: N } | { type: "Extension"; name: UnreservedId };
-
-export interface RecordType<V> {
-    attributes: Record<SmolStr, V>;
+export interface RecordType<N> {
+    attributes: Record<SmolStr, TypeOfAttribute<N>>;
     additionalAttributes?: boolean;
 }
 
@@ -251,7 +245,7 @@ export interface ActionEntityUID<N> {
 export interface ApplySpec<N> {
     resourceTypes: N[];
     principalTypes: N[];
-    context?: RecordOrContextAttributes<N>;
+    context?: AttributesOrContext<N>;
 }
 
 export interface ActionType<N> {
@@ -260,17 +254,12 @@ export interface ActionType<N> {
     memberOf?: ActionEntityUID<N>[];
 }
 
-export interface EntityAttributesInternal<N> extends RecordType<EntityAttributeType<N>> {
-    type: "Record";
-}
-
-export type EntityAttributes<N> = RecordOrContextAttributes<N> | EntityAttributesInternal<N>;
-
-export type RecordOrContextAttributes<N> = Type<N>;
+export type AttributesOrContext<N> = Type<N>;
 
 export interface EntityType<N> {
     memberOfTypes?: N[];
-    shape?: EntityAttributes<N>;
+    shape?: AttributesOrContext<N>;
+    tags?: Type<N>;
 }
 
 export interface NamespaceDefinition<N> {
@@ -283,6 +272,8 @@ export type CommonTypeId = string;
 
 export type SchemaJson<N> = Record<string, NamespaceDefinition<N>>;
 
+export type Decision = "allow" | "deny";
+
 export type Clause = { kind: "when"; body: Expr } | { kind: "unless"; body: Expr };
 
 export interface PolicyJson {
@@ -294,17 +285,15 @@ export interface PolicyJson {
     annotations?: Record<string, string>;
 }
 
-export type Decision = "allow" | "deny";
+export type ExtFuncCall = {} & Record<string, Array<Expr>>;
 
-export interface EntityJson {
-    uid: EntityUidJson;
-    attrs: Record<string, CedarValueJson>;
-    parents: EntityUidJson[];
-}
+export type ExprNoExt = { Value: CedarValueJson } | { Var: Var } | { Slot: string } | { "!": { arg: Expr } } | { neg: { arg: Expr } } | { "==": { left: Expr; right: Expr } } | { "!=": { left: Expr; right: Expr } } | { in: { left: Expr; right: Expr } } | { "<": { left: Expr; right: Expr } } | { "<=": { left: Expr; right: Expr } } | { ">": { left: Expr; right: Expr } } | { ">=": { left: Expr; right: Expr } } | { "&&": { left: Expr; right: Expr } } | { "||": { left: Expr; right: Expr } } | { "+": { left: Expr; right: Expr } } | { "-": { left: Expr; right: Expr } } | { "*": { left: Expr; right: Expr } } | { contains: { left: Expr; right: Expr } } | { containsAll: { left: Expr; right: Expr } } | { containsAny: { left: Expr; right: Expr } } | { getTag: { left: Expr; right: Expr } } | { hasTag: { left: Expr; right: Expr } } | { ".": { left: Expr; attr: SmolStr } } | { has: { left: Expr; attr: SmolStr } } | { like: { left: Expr; pattern: PatternElem[] } } | { is: { left: Expr; entity_type: SmolStr; in?: Expr } } | { "if-then-else": { if: Expr; then: Expr; else: Expr } } | { Set: Expr[] } | { Record: Record<string, Expr> };
 
-export type UnreservedId = string;
+export type PatternElem = "Wildcard" | { Literal: SmolStr };
 
-export type Var = "principal" | "action" | "resource" | "context";
+export type Expr = ExprNoExt | ExtFuncCall;
+
+export type Effect = "permit" | "forbid";
 
 export type ActionInConstraint = { entity: EntityUidJson } | { entities: EntityUidJson[] };
 
@@ -323,6 +312,13 @@ export type ActionConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | (
 
 export type PrincipalConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | ({ op: "in" } & PrincipalOrResourceInConstraint) | ({ op: "is" } & PrincipalOrResourceIsConstraint);
 
+export interface EntityJson {
+    uid: EntityUidJson;
+    attrs: Record<string, CedarValueJson>;
+    parents: EntityUidJson[];
+    tags?: Record<string, CedarValueJson>;
+}
+
 export type EntityUidJson = { __entity: TypeAndId } | TypeAndId;
 
 export interface FnAndArg {
@@ -337,15 +333,9 @@ export interface TypeAndId {
 
 export type CedarValueJson = { __entity: TypeAndId } | { __extn: FnAndArg } | boolean | number | string | CedarValueJson[] | { [key: string]: CedarValueJson } | null;
 
-export type ExtFuncCall = {} & Record<string, Array<Expr>>;
-
-export type ExprNoExt = { Value: CedarValueJson } | { Var: Var } | { Slot: string } | { "!": { arg: Expr } } | { neg: { arg: Expr } } | { "==": { left: Expr; right: Expr } } | { "!=": { left: Expr; right: Expr } } | { in: { left: Expr; right: Expr } } | { "<": { left: Expr; right: Expr } } | { "<=": { left: Expr; right: Expr } } | { ">": { left: Expr; right: Expr } } | { ">=": { left: Expr; right: Expr } } | { "&&": { left: Expr; right: Expr } } | { "||": { left: Expr; right: Expr } } | { "+": { left: Expr; right: Expr } } | { "-": { left: Expr; right: Expr } } | { "*": { left: Expr; right: Expr } } | { contains: { left: Expr; right: Expr } } | { containsAll: { left: Expr; right: Expr } } | { containsAny: { left: Expr; right: Expr } } | { ".": { left: Expr; attr: SmolStr } } | { has: { left: Expr; attr: SmolStr } } | { like: { left: Expr; pattern: PatternElem[] } } | { is: { left: Expr; entity_type: SmolStr; in?: Expr } } | { "if-then-else": { if: Expr; then: Expr; else: Expr } } | { Set: Expr[] } | { Record: Record<string, Expr> };
-
-export type PatternElem = "Wildcard" | { Literal: SmolStr };
-
-export type Expr = ExprNoExt | ExtFuncCall;
+export type UnreservedId = string;
 
-export type Effect = "permit" | "forbid";
+export type Var = "principal" | "action" | "resource" | "context";
 
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
@@ -380,19 +370,20 @@ export type SyncInitInput = BufferSource | WebAssembly.Module;
 * Instantiates the given `module`, which can either be bytes or
 * a precompiled `WebAssembly.Module`.
 *
-* @param {SyncInitInput} module
+* @param {{ module: SyncInitInput }} module - Passing `SyncInitInput` directly is deprecated.
 *
 * @returns {InitOutput}
 */
-export function initSync(module: SyncInitInput): InitOutput;
+export function initSync(module: { module: SyncInitInput } | SyncInitInput): InitOutput;
 
 /**
 * If `module_or_path` is {RequestInfo} or {URL}, makes a request and
 * for everything else, calls `WebAssembly.instantiate` directly.
 *
-* @param {InitInput | Promise<InitInput>} module_or_path
+* @param {{ module_or_path: InitInput | Promise<InitInput> }} module_or_path - Passing `InitInput` directly is deprecated.
 *
 * @returns {Promise<InitOutput>}
 */
-export default function __wbg_init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
+export default function __wbg_init (module_or_path?: { module_or_path: InitInput | Promise<InitInput> } | InitInput | Promise<InitInput>): Promise<InitOutput>;
 type SmolStr = string;
+export type TypeOfAttribute<N> = Type<N> & { required?: boolean };

package/web/cedar_wasm.js

@@ -31,13 +31,13 @@ function takeObject(idx) {
 
 let WASM_VECTOR_LEN = 0;
 
-let cachedUint8Memory0 = null;
+let cachedUint8ArrayMemory0 = null;
 
-function getUint8Memory0() {
-    if (cachedUint8Memory0 === null || cachedUint8Memory0.byteLength === 0) {
-        cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
+function getUint8ArrayMemory0() {
+    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
+        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
     }
-    return cachedUint8Memory0;
+    return cachedUint8ArrayMemory0;
 }
 
 const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
@@ -60,7 +60,7 @@ function passStringToWasm0(arg, malloc, realloc) {
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);
         const ptr = malloc(buf.length, 1) >>> 0;
-        getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
+        getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf);
         WASM_VECTOR_LEN = buf.length;
         return ptr;
     }
@@ -68,7 +68,7 @@ function passStringToWasm0(arg, malloc, realloc) {
     let len = arg.length;
     let ptr = malloc(len, 1) >>> 0;
 
-    const mem = getUint8Memory0();
+    const mem = getUint8ArrayMemory0();
 
     let offset = 0;
 
@@ -83,7 +83,7 @@ function passStringToWasm0(arg, malloc, realloc) {
             arg = arg.slice(offset);
         }
         ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
-        const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
+        const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len);
         const ret = encodeString(arg, view);
 
         offset += ret.written;
@@ -98,13 +98,13 @@ function isLikeNone(x) {
     return x === undefined || x === null;
 }
 
-let cachedInt32Memory0 = null;
+let cachedDataViewMemory0 = null;
 
-function getInt32Memory0() {
-    if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
-        cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
+function getDataViewMemory0() {
+    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
+        cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
     }
-    return cachedInt32Memory0;
+    return cachedDataViewMemory0;
 }
 
 const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
@@ -113,7 +113,7 @@ if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
 
 function getStringFromWasm0(ptr, len) {
     ptr = ptr >>> 0;
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
 }
 /**
 * Get valid request environment
@@ -146,8 +146,8 @@ export function getCedarVersion() {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         wasm.getCedarVersion(retptr);
-        var r0 = getInt32Memory0()[retptr / 4 + 0];
-        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        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);
@@ -348,14 +348,14 @@ function __wbg_get_imports() {
         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;
-        getInt32Memory0()[arg0 / 4 + 1] = len1;
-        getInt32Memory0()[arg0 / 4 + 0] = ptr1;
+        getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+        getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
     };
-    imports.wbg.__wbg_parse_66d1801634e099ac = function() { return handleError(function (arg0, arg1) {
+    imports.wbg.__wbg_parse_52202f117ec9ecfa = function() { return handleError(function (arg0, arg1) {
         const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_stringify_8887fe74e1c50d81 = function() { return handleError(function (arg0) {
+    imports.wbg.__wbg_stringify_bbf45426c92a6bf5 = function() { return handleError(function (arg0) {
         const ret = JSON.stringify(getObject(arg0));
         return addHeapObject(ret);
     }, arguments) };
@@ -366,15 +366,16 @@ function __wbg_get_imports() {
     return imports;
 }
 
-function __wbg_init_memory(imports, maybe_memory) {
+function __wbg_init_memory(imports, memory) {
 
 }
 
 function __wbg_finalize_init(instance, module) {
     wasm = instance.exports;
     __wbg_init.__wbindgen_wasm_module = module;
-    cachedInt32Memory0 = null;
-    cachedUint8Memory0 = null;
+    cachedDataViewMemory0 = null;
+    cachedUint8ArrayMemory0 = null;
+
 
 
     return wasm;
@@ -383,6 +384,12 @@ function __wbg_finalize_init(instance, module) {
 function initSync(module) {
     if (wasm !== undefined) return wasm;
 
+
+    if (typeof module !== 'undefined' && Object.getPrototypeOf(module) === Object.prototype)
+    ({module} = module)
+    else
+    console.warn('using deprecated parameters for `initSync()`; pass a single object instead')
+
     const imports = __wbg_get_imports();
 
     __wbg_init_memory(imports);
@@ -396,24 +403,30 @@ function initSync(module) {
     return __wbg_finalize_init(instance, module);
 }
 
-async function __wbg_init(input) {
+async function __wbg_init(module_or_path) {
     if (wasm !== undefined) return wasm;
 
-    if (typeof input === 'undefined') {
-        input = new URL('cedar_wasm_bg.wasm', import.meta.url);
+
+    if (typeof module_or_path !== 'undefined' && Object.getPrototypeOf(module_or_path) === Object.prototype)
+    ({module_or_path} = module_or_path)
+    else
+    console.warn('using deprecated parameters for the initialization function; pass a single object instead')
+
+    if (typeof module_or_path === 'undefined') {
+        module_or_path = new URL('cedar_wasm_bg.wasm', import.meta.url);
     }
     const imports = __wbg_get_imports();
 
-    if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) {
-        input = fetch(input);
+    if (typeof module_or_path === 'string' || (typeof Request === 'function' && module_or_path instanceof Request) || (typeof URL === 'function' && module_or_path instanceof URL)) {
+        module_or_path = fetch(module_or_path);
     }
 
     __wbg_init_memory(imports);
 
-    const { instance, module } = await __wbg_load(await input, imports);
+    const { instance, module } = await __wbg_load(await module_or_path, imports);
 
     return __wbg_finalize_init(instance, module);
 }
 
-export { initSync }
+export { initSync };
 export default __wbg_init;

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.0.1",
+  "version": "4.2.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"
+  ]
 }