@cedar-policy/cedar-wasm 4.0.1 → 4.1.0

package/esm/cedar_wasm.d.ts

@@ -34,6 +34,30 @@ export function isAuthorized(call: AuthorizationCall): AuthorizationAnswer;
 */
 export function validate(call: ValidationCall): ValidationAnswer;
 /**
+* Check whether a policy set successfully parses.
+* @param {PolicySet} policies
+* @returns {CheckParseAnswer}
+*/
+export function checkParsePolicySet(policies: PolicySet): CheckParseAnswer;
+/**
+* Check whether a schema successfully parses.
+* @param {Schema} schema
+* @returns {CheckParseAnswer}
+*/
+export function checkParseSchema(schema: Schema): CheckParseAnswer;
+/**
+* Check whether a set of entities successfully parses.
+* @param {EntitiesParsingCall} call
+* @returns {CheckParseAnswer}
+*/
+export function checkParseEntities(call: EntitiesParsingCall): CheckParseAnswer;
+/**
+* Check whether a context successfully parses.
+* @param {ContextParsingCall} call
+* @returns {CheckParseAnswer}
+*/
+export function checkParseContext(call: ContextParsingCall): CheckParseAnswer;
+/**
 * Apply the Cedar policy formatter to a policy set in the Cedar policy format
 * @param {FormattingCall} call
 * @returns {FormattingAnswer}
@@ -75,36 +99,8 @@ export function schemaToText(schema: Schema): SchemaToTextAnswer;
 * @returns {SchemaToJsonAnswer}
 */
 export function schemaToJson(schema: Schema): SchemaToJsonAnswer;
-/**
-* Check whether a policy set successfully parses.
-* @param {PolicySet} policies
-* @returns {CheckParseAnswer}
-*/
-export function checkParsePolicySet(policies: PolicySet): CheckParseAnswer;
-/**
-* Check whether a schema successfully parses.
-* @param {Schema} schema
-* @returns {CheckParseAnswer}
-*/
-export function checkParseSchema(schema: Schema): CheckParseAnswer;
-/**
-* Check whether a set of entities successfully parses.
-* @param {EntitiesParsingCall} call
-* @returns {CheckParseAnswer}
-*/
-export function checkParseEntities(call: EntitiesParsingCall): CheckParseAnswer;
-/**
-* Check whether a context successfully parses.
-* @param {ContextParsingCall} call
-* @returns {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,35 @@ export interface ValidationError {
 
 export type ValidationAnswer = { type: "failure"; errors: DetailedError[]; warnings: DetailedError[] } | { type: "success"; validationErrors: ValidationError[]; validationWarnings: ValidationError[]; otherWarnings: 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 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 Schema = string | SchemaJson<string>;
 
 export interface PolicySet {
@@ -199,45 +224,14 @@ export interface 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 SlotId = string;
 
-export type EntityAttributeTypeInternal<N> = { Type: Type<N> } | { EAMap: { value_type: Type<N> } };
+export type PolicyId = string;
 
-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 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 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> {
@@ -294,12 +283,11 @@ export interface PolicyJson {
     annotations?: Record<string, string>;
 }
 
-export type Decision = "allow" | "deny";
-
 export interface EntityJson {
     uid: EntityUidJson;
     attrs: Record<string, CedarValueJson>;
     parents: EntityUidJson[];
+    tags?: Record<string, CedarValueJson>;
 }
 
 export type UnreservedId = string;
@@ -323,6 +311,8 @@ export type ActionConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | (
 
 export type PrincipalConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | ({ op: "in" } & PrincipalOrResourceInConstraint) | ({ op: "is" } & PrincipalOrResourceIsConstraint);
 
+export type Decision = "allow" | "deny";
+
 export type EntityUidJson = { __entity: TypeAndId } | TypeAndId;
 
 export interface FnAndArg {
@@ -339,7 +329,7 @@ export type CedarValueJson = { __entity: TypeAndId } | { __extn: FnAndArg } | bo
 
 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 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 PatternElem = "Wildcard" | { Literal: SmolStr };
 
@@ -348,3 +338,4 @@ export type Expr = ExprNoExt | ExtFuncCall;
 export type Effect = "permit" | "forbid";
 
 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);
@@ -188,6 +188,46 @@ export function validate(call) {
     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);
+}
+
 /**
 * Apply the Cedar policy formatter to a policy set in the Cedar policy format
 * @param {FormattingCall} call
@@ -258,46 +298,6 @@ export function schemaToJson(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);
-}
-
 function handleError(f, args) {
     try {
         return f.apply(this, args);
@@ -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/cedar_wasm_bg.wasm.d.ts

@@ -6,6 +6,10 @@ export function getValidRequestEnvsPolicy(a: number, b: number): number;
 export function getCedarVersion(a: number): void;
 export function isAuthorized(a: number): number;
 export function validate(a: number): number;
+export function checkParsePolicySet(a: number): number;
+export function checkParseSchema(a: number): number;
+export function checkParseEntities(a: number): number;
+export function checkParseContext(a: number): number;
 export function formatPolicies(a: number): number;
 export function policyToText(a: number): number;
 export function templateToText(a: number): number;
@@ -13,10 +17,6 @@ export function policyToJson(a: number): number;
 export function templateToJson(a: number): number;
 export function schemaToText(a: number): number;
 export function schemaToJson(a: number): number;
-export function checkParsePolicySet(a: number): number;
-export function checkParseSchema(a: number): number;
-export function checkParseEntities(a: number): number;
-export function checkParseContext(a: number): number;
 export function __wbindgen_malloc(a: number, b: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number;
 export function __wbindgen_add_to_stack_pointer(a: number): number;

package/esm/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.1.0",
   "license": "Apache-2.0",
   "files": [
     "cedar_wasm_bg.wasm",

package/nodejs/cedar_wasm.d.ts

@@ -34,6 +34,30 @@ export function isAuthorized(call: AuthorizationCall): AuthorizationAnswer;
 */
 export function validate(call: ValidationCall): ValidationAnswer;
 /**
+* Check whether a policy set successfully parses.
+* @param {PolicySet} policies
+* @returns {CheckParseAnswer}
+*/
+export function checkParsePolicySet(policies: PolicySet): CheckParseAnswer;
+/**
+* Check whether a schema successfully parses.
+* @param {Schema} schema
+* @returns {CheckParseAnswer}
+*/
+export function checkParseSchema(schema: Schema): CheckParseAnswer;
+/**
+* Check whether a set of entities successfully parses.
+* @param {EntitiesParsingCall} call
+* @returns {CheckParseAnswer}
+*/
+export function checkParseEntities(call: EntitiesParsingCall): CheckParseAnswer;
+/**
+* Check whether a context successfully parses.
+* @param {ContextParsingCall} call
+* @returns {CheckParseAnswer}
+*/
+export function checkParseContext(call: ContextParsingCall): CheckParseAnswer;
+/**
 * Apply the Cedar policy formatter to a policy set in the Cedar policy format
 * @param {FormattingCall} call
 * @returns {FormattingAnswer}
@@ -75,36 +99,8 @@ export function schemaToText(schema: Schema): SchemaToTextAnswer;
 * @returns {SchemaToJsonAnswer}
 */
 export function schemaToJson(schema: Schema): SchemaToJsonAnswer;
-/**
-* Check whether a policy set successfully parses.
-* @param {PolicySet} policies
-* @returns {CheckParseAnswer}
-*/
-export function checkParsePolicySet(policies: PolicySet): CheckParseAnswer;
-/**
-* Check whether a schema successfully parses.
-* @param {Schema} schema
-* @returns {CheckParseAnswer}
-*/
-export function checkParseSchema(schema: Schema): CheckParseAnswer;
-/**
-* Check whether a set of entities successfully parses.
-* @param {EntitiesParsingCall} call
-* @returns {CheckParseAnswer}
-*/
-export function checkParseEntities(call: EntitiesParsingCall): CheckParseAnswer;
-/**
-* Check whether a context successfully parses.
-* @param {ContextParsingCall} call
-* @returns {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,35 @@ export interface ValidationError {
 
 export type ValidationAnswer = { type: "failure"; errors: DetailedError[]; warnings: DetailedError[] } | { type: "success"; validationErrors: ValidationError[]; validationWarnings: ValidationError[]; otherWarnings: 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 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 Schema = string | SchemaJson<string>;
 
 export interface PolicySet {
@@ -199,45 +224,14 @@ export interface 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 SlotId = string;
 
-export type EntityAttributeTypeInternal<N> = { Type: Type<N> } | { EAMap: { value_type: Type<N> } };
+export type PolicyId = string;
 
-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 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 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> {
@@ -294,12 +283,11 @@ export interface PolicyJson {
     annotations?: Record<string, string>;
 }
 
-export type Decision = "allow" | "deny";
-
 export interface EntityJson {
     uid: EntityUidJson;
     attrs: Record<string, CedarValueJson>;
     parents: EntityUidJson[];
+    tags?: Record<string, CedarValueJson>;
 }
 
 export type UnreservedId = string;
@@ -323,6 +311,8 @@ export type ActionConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | (
 
 export type PrincipalConstraint = { op: "All" } | ({ op: "==" } & EqConstraint) | ({ op: "in" } & PrincipalOrResourceInConstraint) | ({ op: "is" } & PrincipalOrResourceIsConstraint);
 
+export type Decision = "allow" | "deny";
+
 export type EntityUidJson = { __entity: TypeAndId } | TypeAndId;
 
 export interface FnAndArg {
@@ -339,7 +329,7 @@ export type CedarValueJson = { __entity: TypeAndId } | { __extn: FnAndArg } | bo
 
 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 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 PatternElem = "Wildcard" | { Literal: SmolStr };
 
@@ -348,3 +338,4 @@ export type Expr = ExprNoExt | ExtFuncCall;
 export type Effect = "permit" | "forbid";
 
 type SmolStr = string;
+export type TypeOfAttribute<N> = Type<N> & { required?: boolean };