Enforce properties field on lexicon object schemas (#1628)

* add empty properites to thread gate schema fragments * tweak lexicon type
bluesky-social · Sep 19, 2023 · 828dfa8 · 828dfa8
1 parent a5a0e4a
commit 828dfa8
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 13 deletions.
diff --git a/lexicons/app/bsky/feed/threadgate.json b/lexicons/app/bsky/feed/threadgate.json
@@ -25,11 +25,13 @@
     },
     "mentionRule": {
       "type": "object",
-      "description": "Allow replies from actors mentioned in your post."
+      "description": "Allow replies from actors mentioned in your post.",
+      "properties": {}
     },
     "followingRule": {
       "type": "object",
-      "description": "Allow replies from actors you follow."
+      "description": "Allow replies from actors you follow.",
+      "properties": {}
     },
     "listRule": {
       "type": "object",

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -5693,10 +5693,12 @@ export const schemaDict = {
       mentionRule: {
         type: 'object',
         description: 'Allow replies from actors mentioned in your post.',
+        properties: {},
       },
       followingRule: {
         type: 'object',
         description: 'Allow replies from actors you follow.',
+        properties: {},
       },
       listRule: {
         type: 'object',

diff --git a/packages/api/src/client/types/app/bsky/feed/threadgate.ts b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
@@ -32,7 +32,9 @@ export function validateRecord(v: unknown): ValidationResult {
 }
 
 /** Allow replies from actors mentioned in your post. */
-export interface MentionRule {}
+export interface MentionRule {
+  [k: string]: unknown
+}
 
 export function isMentionRule(v: unknown): v is MentionRule {
   return (
@@ -47,7 +49,9 @@ export function validateMentionRule(v: unknown): ValidationResult {
 }
 
 /** Allow replies from actors you follow. */
-export interface FollowingRule {}
+export interface FollowingRule {
+  [k: string]: unknown
+}
 
 export function isFollowingRule(v: unknown): v is FollowingRule {
   return (

diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
@@ -5693,10 +5693,12 @@ export const schemaDict = {
       mentionRule: {
         type: 'object',
         description: 'Allow replies from actors mentioned in your post.',
+        properties: {},
       },
       followingRule: {
         type: 'object',
         description: 'Allow replies from actors you follow.',
+        properties: {},
       },
       listRule: {
         type: 'object',

diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -32,7 +32,9 @@ export function validateRecord(v: unknown): ValidationResult {
 }
 
 /** Allow replies from actors mentioned in your post. */
-export interface MentionRule {}
+export interface MentionRule {
+  [k: string]: unknown
+}
 
 export function isMentionRule(v: unknown): v is MentionRule {
   return (
@@ -47,7 +49,9 @@ export function validateMentionRule(v: unknown): ValidationResult {
 }
 
 /** Allow replies from actors you follow. */
-export interface FollowingRule {}
+export interface FollowingRule {
+  [k: string]: unknown
+}
 
 export function isFollowingRule(v: unknown): v is FollowingRule {
   return (

diff --git a/packages/lexicon/src/types.ts b/packages/lexicon/src/types.ts
@@ -173,11 +173,9 @@ export const lexObject = z
     description: z.string().optional(),
     required: z.string().array().optional(),
     nullable: z.string().array().optional(),
-    properties: z
-      .record(
-        z.union([lexRefVariant, lexIpldType, lexArray, lexBlob, lexPrimitive]),
-      )
-      .optional(),
+    properties: z.record(
+      z.union([lexRefVariant, lexIpldType, lexArray, lexBlob, lexPrimitive]),
+    ),
   })
   .strict()
   .superRefine(requiredPropertiesRefinement)

diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
@@ -5693,10 +5693,12 @@ export const schemaDict = {
       mentionRule: {
         type: 'object',
         description: 'Allow replies from actors mentioned in your post.',
+        properties: {},
       },
       followingRule: {
         type: 'object',
         description: 'Allow replies from actors you follow.',
+        properties: {},
       },
       listRule: {
         type: 'object',

diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -32,7 +32,9 @@ export function validateRecord(v: unknown): ValidationResult {
 }
 
 /** Allow replies from actors mentioned in your post. */
-export interface MentionRule {}
+export interface MentionRule {
+  [k: string]: unknown
+}
 
 export function isMentionRule(v: unknown): v is MentionRule {
   return (
@@ -47,7 +49,9 @@ export function validateMentionRule(v: unknown): ValidationResult {
 }
 
 /** Allow replies from actors you follow. */
-export interface FollowingRule {}
+export interface FollowingRule {
+  [k: string]: unknown
+}
 
 export function isFollowingRule(v: unknown): v is FollowingRule {
   return (