@zapier/policy-schema 0.4.0 → 0.7.0

package/dist/index.cjs

@@ -5,10 +5,20 @@ var zod = require('zod');
 // src/schema.ts
 var ScalarSchema = zod.z.union([zod.z.string(), zod.z.number(), zod.z.boolean()]);
 var PathSchema = zod.z.array(zod.z.union([zod.z.string(), zod.z.number()])).min(1);
+var JsonValueSchema = zod.z.lazy(
+  () => zod.z.union([
+    zod.z.string(),
+    zod.z.number(),
+    zod.z.boolean(),
+    zod.z.null(),
+    zod.z.array(JsonValueSchema),
+    zod.z.record(zod.z.string(), JsonValueSchema)
+  ])
+);
 var EqualsConditionSchema = zod.z.object({
   path: PathSchema,
   operator: zod.z.literal("equals"),
-  value: ScalarSchema
+  value: JsonValueSchema
 }).strict();
 var InConditionSchema = zod.z.object({
   path: PathSchema,
@@ -114,21 +124,15 @@ var OperatorSchema = zod.z.enum([
   "keys_in",
   "size"
 ]);
-var ConditionValueSchema = zod.z.union([
-  ScalarSchema,
-  zod.z.array(ScalarSchema),
-  RangeValueSchema,
-  SizeValueSchema,
-  zod.z.array(zod.z.string())
-]);
+var ConditionValueSchema = JsonValueSchema;
 var StatementSchema = zod.z.object({
-  effect: zod.z.enum(["allow", "deny"]),
+  effect: zod.z.enum(["allow", "ask", "deny"]),
   permissions: zod.z.array(zod.z.string()).min(1),
   resources: zod.z.array(zod.z.string()).min(1),
   conditions: zod.z.array(ConditionSchema).optional()
 }).strict();
 var PolicySchema = zod.z.object({
-  version: zod.z.literal(1),
+  version: zod.z.literal(2),
   statements: zod.z.array(StatementSchema)
 }).strict();
 

package/dist/index.d.cts

@@ -1,6 +1,9 @@
 import { z } from 'zod';
 
 type ScalarOperator = "equals" | "in" | "matches" | "matches_host" | "matches_path" | "range";
+type JsonValue = string | number | boolean | null | JsonValue[] | {
+    [key: string]: JsonValue;
+};
 type ArrayOperator = "values_in";
 type UrlOperator = "matches_url";
 type OtherOperator = "exists" | "keys_in" | "size";
@@ -10,13 +13,13 @@ type RangeValue = {
     max?: number;
 };
 type SizeValue = number | RangeValue;
-type ConditionValue = string | number | boolean | (string | number | boolean)[] | RangeValue | SizeValue;
+type ConditionValue = JsonValue | RangeValue | SizeValue;
 interface Condition {
     path: (string | number)[];
     operator: Operator;
     value?: ConditionValue;
 }
-type Effect = "allow" | "deny";
+type Effect = "allow" | "ask" | "deny";
 interface Statement {
     effect: Effect;
     permissions: string[];
@@ -24,7 +27,7 @@ interface Statement {
     conditions?: Condition[];
 }
 interface Policy {
-    version: 1;
+    version: 2;
     statements: Statement[];
 }
 interface PolicyRequest {
@@ -33,7 +36,7 @@ interface PolicyRequest {
     context?: Record<string, unknown>;
 }
 interface PolicyResult {
-    allowed: boolean;
+    effect: Effect;
     matchedStatement?: Statement;
 }
 interface ParsedUrl {
@@ -62,7 +65,7 @@ declare const SizeValueSchema: z.ZodUnion<readonly [z.ZodNumber, z.ZodObject<{
 declare const ConditionSchema: z.ZodUnion<readonly [z.ZodObject<{
     path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
     operator: z.ZodLiteral<"equals">;
-    value: z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>;
+    value: z.ZodType<JsonValue, unknown, z.core.$ZodTypeInternals<JsonValue, unknown>>;
 }, z.core.$strict>, z.ZodObject<{
     path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
     operator: z.ZodLiteral<"in">;
@@ -141,16 +144,11 @@ declare const OperatorSchema: z.ZodEnum<{
     values_in: "values_in";
     matches_url: "matches_url";
 }>;
-declare const ConditionValueSchema: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>, z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>>, z.ZodObject<{
-    min: z.ZodOptional<z.ZodNumber>;
-    max: z.ZodOptional<z.ZodNumber>;
-}, z.core.$strict>, z.ZodUnion<readonly [z.ZodNumber, z.ZodObject<{
-    min: z.ZodOptional<z.ZodNumber>;
-    max: z.ZodOptional<z.ZodNumber>;
-}, z.core.$strict>]>, z.ZodArray<z.ZodString>]>;
+declare const ConditionValueSchema: z.ZodType<JsonValue, unknown, z.core.$ZodTypeInternals<JsonValue, unknown>>;
 declare const StatementSchema: z.ZodObject<{
     effect: z.ZodEnum<{
         allow: "allow";
+        ask: "ask";
         deny: "deny";
     }>;
     permissions: z.ZodArray<z.ZodString>;
@@ -158,7 +156,7 @@ declare const StatementSchema: z.ZodObject<{
     conditions: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
         operator: z.ZodLiteral<"equals">;
-        value: z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>;
+        value: z.ZodType<JsonValue, unknown, z.core.$ZodTypeInternals<JsonValue, unknown>>;
     }, z.core.$strict>, z.ZodObject<{
         path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
         operator: z.ZodLiteral<"in">;
@@ -207,10 +205,11 @@ declare const StatementSchema: z.ZodObject<{
     }, z.core.$strict>]>>>;
 }, z.core.$strict>;
 declare const PolicySchema: z.ZodObject<{
-    version: z.ZodLiteral<1>;
+    version: z.ZodLiteral<2>;
     statements: z.ZodArray<z.ZodObject<{
         effect: z.ZodEnum<{
             allow: "allow";
+            ask: "ask";
             deny: "deny";
         }>;
         permissions: z.ZodArray<z.ZodString>;
@@ -218,7 +217,7 @@ declare const PolicySchema: z.ZodObject<{
         conditions: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
             path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
             operator: z.ZodLiteral<"equals">;
-            value: z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>;
+            value: z.ZodType<JsonValue, unknown, z.core.$ZodTypeInternals<JsonValue, unknown>>;
         }, z.core.$strict>, z.ZodObject<{
             path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
             operator: z.ZodLiteral<"in">;
@@ -268,4 +267,4 @@ declare const PolicySchema: z.ZodObject<{
     }, z.core.$strict>>;
 }, z.core.$strict>;
 
-export { type ArrayOperator, ArrayOperatorSchema, type Condition, ConditionSchema, type ConditionValue, ConditionValueSchema, type Effect, type Operator, OperatorSchema, type OtherOperator, OtherOperatorSchema, type ParsedUrl, type Policy, type PolicyHttpRequest, type PolicyRequest, type PolicyResult, PolicySchema, type RangeValue, RangeValueSchema, type ScalarOperator, ScalarOperatorSchema, type SizeValue, SizeValueSchema, type Statement, StatementSchema, type UrlOperator, UrlOperatorSchema };
+export { type ArrayOperator, ArrayOperatorSchema, type Condition, ConditionSchema, type ConditionValue, ConditionValueSchema, type Effect, type JsonValue, type Operator, OperatorSchema, type OtherOperator, OtherOperatorSchema, type ParsedUrl, type Policy, type PolicyHttpRequest, type PolicyRequest, type PolicyResult, PolicySchema, type RangeValue, RangeValueSchema, type ScalarOperator, ScalarOperatorSchema, type SizeValue, SizeValueSchema, type Statement, StatementSchema, type UrlOperator, UrlOperatorSchema };

package/dist/index.d.ts

@@ -1,6 +1,9 @@
 import { z } from 'zod';
 
 type ScalarOperator = "equals" | "in" | "matches" | "matches_host" | "matches_path" | "range";
+type JsonValue = string | number | boolean | null | JsonValue[] | {
+    [key: string]: JsonValue;
+};
 type ArrayOperator = "values_in";
 type UrlOperator = "matches_url";
 type OtherOperator = "exists" | "keys_in" | "size";
@@ -10,13 +13,13 @@ type RangeValue = {
     max?: number;
 };
 type SizeValue = number | RangeValue;
-type ConditionValue = string | number | boolean | (string | number | boolean)[] | RangeValue | SizeValue;
+type ConditionValue = JsonValue | RangeValue | SizeValue;
 interface Condition {
     path: (string | number)[];
     operator: Operator;
     value?: ConditionValue;
 }
-type Effect = "allow" | "deny";
+type Effect = "allow" | "ask" | "deny";
 interface Statement {
     effect: Effect;
     permissions: string[];
@@ -24,7 +27,7 @@ interface Statement {
     conditions?: Condition[];
 }
 interface Policy {
-    version: 1;
+    version: 2;
     statements: Statement[];
 }
 interface PolicyRequest {
@@ -33,7 +36,7 @@ interface PolicyRequest {
     context?: Record<string, unknown>;
 }
 interface PolicyResult {
-    allowed: boolean;
+    effect: Effect;
     matchedStatement?: Statement;
 }
 interface ParsedUrl {
@@ -62,7 +65,7 @@ declare const SizeValueSchema: z.ZodUnion<readonly [z.ZodNumber, z.ZodObject<{
 declare const ConditionSchema: z.ZodUnion<readonly [z.ZodObject<{
     path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
     operator: z.ZodLiteral<"equals">;
-    value: z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>;
+    value: z.ZodType<JsonValue, unknown, z.core.$ZodTypeInternals<JsonValue, unknown>>;
 }, z.core.$strict>, z.ZodObject<{
     path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
     operator: z.ZodLiteral<"in">;
@@ -141,16 +144,11 @@ declare const OperatorSchema: z.ZodEnum<{
     values_in: "values_in";
     matches_url: "matches_url";
 }>;
-declare const ConditionValueSchema: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>, z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>>, z.ZodObject<{
-    min: z.ZodOptional<z.ZodNumber>;
-    max: z.ZodOptional<z.ZodNumber>;
-}, z.core.$strict>, z.ZodUnion<readonly [z.ZodNumber, z.ZodObject<{
-    min: z.ZodOptional<z.ZodNumber>;
-    max: z.ZodOptional<z.ZodNumber>;
-}, z.core.$strict>]>, z.ZodArray<z.ZodString>]>;
+declare const ConditionValueSchema: z.ZodType<JsonValue, unknown, z.core.$ZodTypeInternals<JsonValue, unknown>>;
 declare const StatementSchema: z.ZodObject<{
     effect: z.ZodEnum<{
         allow: "allow";
+        ask: "ask";
         deny: "deny";
     }>;
     permissions: z.ZodArray<z.ZodString>;
@@ -158,7 +156,7 @@ declare const StatementSchema: z.ZodObject<{
     conditions: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
         operator: z.ZodLiteral<"equals">;
-        value: z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>;
+        value: z.ZodType<JsonValue, unknown, z.core.$ZodTypeInternals<JsonValue, unknown>>;
     }, z.core.$strict>, z.ZodObject<{
         path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
         operator: z.ZodLiteral<"in">;
@@ -207,10 +205,11 @@ declare const StatementSchema: z.ZodObject<{
     }, z.core.$strict>]>>>;
 }, z.core.$strict>;
 declare const PolicySchema: z.ZodObject<{
-    version: z.ZodLiteral<1>;
+    version: z.ZodLiteral<2>;
     statements: z.ZodArray<z.ZodObject<{
         effect: z.ZodEnum<{
             allow: "allow";
+            ask: "ask";
             deny: "deny";
         }>;
         permissions: z.ZodArray<z.ZodString>;
@@ -218,7 +217,7 @@ declare const PolicySchema: z.ZodObject<{
         conditions: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
             path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
             operator: z.ZodLiteral<"equals">;
-            value: z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>;
+            value: z.ZodType<JsonValue, unknown, z.core.$ZodTypeInternals<JsonValue, unknown>>;
         }, z.core.$strict>, z.ZodObject<{
             path: z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
             operator: z.ZodLiteral<"in">;
@@ -268,4 +267,4 @@ declare const PolicySchema: z.ZodObject<{
     }, z.core.$strict>>;
 }, z.core.$strict>;
 
-export { type ArrayOperator, ArrayOperatorSchema, type Condition, ConditionSchema, type ConditionValue, ConditionValueSchema, type Effect, type Operator, OperatorSchema, type OtherOperator, OtherOperatorSchema, type ParsedUrl, type Policy, type PolicyHttpRequest, type PolicyRequest, type PolicyResult, PolicySchema, type RangeValue, RangeValueSchema, type ScalarOperator, ScalarOperatorSchema, type SizeValue, SizeValueSchema, type Statement, StatementSchema, type UrlOperator, UrlOperatorSchema };
+export { type ArrayOperator, ArrayOperatorSchema, type Condition, ConditionSchema, type ConditionValue, ConditionValueSchema, type Effect, type JsonValue, type Operator, OperatorSchema, type OtherOperator, OtherOperatorSchema, type ParsedUrl, type Policy, type PolicyHttpRequest, type PolicyRequest, type PolicyResult, PolicySchema, type RangeValue, RangeValueSchema, type ScalarOperator, ScalarOperatorSchema, type SizeValue, SizeValueSchema, type Statement, StatementSchema, type UrlOperator, UrlOperatorSchema };

package/dist/index.mjs

@@ -3,10 +3,20 @@ import { z } from 'zod';
 // src/schema.ts
 var ScalarSchema = z.union([z.string(), z.number(), z.boolean()]);
 var PathSchema = z.array(z.union([z.string(), z.number()])).min(1);
+var JsonValueSchema = z.lazy(
+  () => z.union([
+    z.string(),
+    z.number(),
+    z.boolean(),
+    z.null(),
+    z.array(JsonValueSchema),
+    z.record(z.string(), JsonValueSchema)
+  ])
+);
 var EqualsConditionSchema = z.object({
   path: PathSchema,
   operator: z.literal("equals"),
-  value: ScalarSchema
+  value: JsonValueSchema
 }).strict();
 var InConditionSchema = z.object({
   path: PathSchema,
@@ -112,21 +122,15 @@ var OperatorSchema = z.enum([
   "keys_in",
   "size"
 ]);
-var ConditionValueSchema = z.union([
-  ScalarSchema,
-  z.array(ScalarSchema),
-  RangeValueSchema,
-  SizeValueSchema,
-  z.array(z.string())
-]);
+var ConditionValueSchema = JsonValueSchema;
 var StatementSchema = z.object({
-  effect: z.enum(["allow", "deny"]),
+  effect: z.enum(["allow", "ask", "deny"]),
   permissions: z.array(z.string()).min(1),
   resources: z.array(z.string()).min(1),
   conditions: z.array(ConditionSchema).optional()
 }).strict();
 var PolicySchema = z.object({
-  version: z.literal(1),
+  version: z.literal(2),
   statements: z.array(StatementSchema)
 }).strict();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapier/policy-schema",
-  "version": "0.4.0",
+  "version": "0.7.0",
   "description": "Zod schemas and TypeScript types for the Zapier policy engine",
   "type": "module",
   "main": "dist/index.cjs",
@@ -22,6 +22,11 @@
     "dist",
     "README.md"
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.com/zapier/team-identity-platform/policy.git",
+    "directory": "typescript/schema"
+  },
   "publishConfig": {
     "access": "public"
   },