@atproto/lex-schema 0.0.4 → 0.0.5

package/src/schema/query.test.ts

@@ -1,16 +1,16 @@
-import { asNsid } from '../core.js'
+import { asNsidString } from '../core.js'
 import { IntegerSchema } from './integer.js'
 import { ObjectSchema } from './object.js'
 import { OptionalSchema } from './optional.js'
 import { ParamsSchema } from './params.js'
 import { Payload } from './payload.js'
-import { InferQueryOutputBody, InferQueryParameters, Query } from './query.js'
+import { Query } from './query.js'
 import { StringSchema } from './string.js'
 
 describe('Query', () => {
   describe('constructor', () => {
     it('creates a Query instance with all parameters', () => {
-      const nsid = asNsid('app.bsky.feed.getFeedSkeleton')
+      const nsid = asNsidString('app.bsky.feed.getFeedSkeleton')
       const parameters = new ParamsSchema({
         feed: new StringSchema({ format: 'at-uri' }),
         limit: new OptionalSchema(
@@ -35,7 +35,7 @@ describe('Query', () => {
     })
 
     it('creates a Query instance without errors', () => {
-      const nsid = asNsid('app.bsky.feed.getFeedSkeleton')
+      const nsid = asNsidString('app.bsky.feed.getFeedSkeleton')
       const parameters = new ParamsSchema({
         feed: new StringSchema({ format: 'at-uri' }),
       })
@@ -56,7 +56,7 @@ describe('Query', () => {
     })
 
     it('creates a Query instance with empty parameters', () => {
-      const nsid = asNsid('app.bsky.actor.getProfile')
+      const nsid = asNsidString('app.bsky.actor.getProfile')
       const parameters = new ParamsSchema({})
       const output = new Payload(
         'application/json',
@@ -74,7 +74,7 @@ describe('Query', () => {
 
   describe('properties', () => {
     it('has nsid property', () => {
-      const nsid = asNsid('app.bsky.feed.getFeedSkeleton')
+      const nsid = asNsidString('app.bsky.feed.getFeedSkeleton')
       const parameters = new ParamsSchema({})
       const output = new Payload('application/json', undefined)
 
@@ -85,7 +85,7 @@ describe('Query', () => {
     })
 
     it('has parameters property', () => {
-      const nsid = asNsid('app.bsky.feed.getFeedSkeleton')
+      const nsid = asNsidString('app.bsky.feed.getFeedSkeleton')
       const parameters = new ParamsSchema({
         feed: new StringSchema({ format: 'at-uri' }),
       })
@@ -98,7 +98,7 @@ describe('Query', () => {
     })
 
     it('has output property', () => {
-      const nsid = asNsid('app.bsky.feed.getFeedSkeleton')
+      const nsid = asNsidString('app.bsky.feed.getFeedSkeleton')
       const parameters = new ParamsSchema({})
       const output = new Payload('application/json', undefined)
 
@@ -109,7 +109,7 @@ describe('Query', () => {
     })
 
     it('has errors property', () => {
-      const nsid = asNsid('app.bsky.feed.getFeedSkeleton')
+      const nsid = asNsidString('app.bsky.feed.getFeedSkeleton')
       const parameters = new ParamsSchema({})
       const output = new Payload('application/json', undefined)
       const errors = ['NotFound', 'RateLimitExceeded'] as const
@@ -123,7 +123,7 @@ describe('Query', () => {
 
   describe('with complex parameters', () => {
     it('creates a Query with multiple parameter types', () => {
-      const nsid = asNsid('app.bsky.feed.searchPosts')
+      const nsid = asNsidString('app.bsky.feed.searchPosts')
       const parameters = new ParamsSchema({
         q: new StringSchema({ minLength: 1 }),
         limit: new OptionalSchema(
@@ -151,7 +151,7 @@ describe('Query', () => {
 
   describe('with various output payloads', () => {
     it('creates a Query with undefined output payload', () => {
-      const nsid = asNsid('app.bsky.actor.getProfile')
+      const nsid = asNsidString('app.bsky.actor.getProfile')
       const parameters = new ParamsSchema({
         actor: new StringSchema({ format: 'at-identifier' }),
       })
@@ -165,7 +165,7 @@ describe('Query', () => {
     })
 
     it('creates a Query with JSON payload', () => {
-      const nsid = asNsid('app.bsky.actor.getProfile')
+      const nsid = asNsidString('app.bsky.actor.getProfile')
       const parameters = new ParamsSchema({
         actor: new StringSchema({ format: 'at-identifier' }),
       })
@@ -185,7 +185,7 @@ describe('Query', () => {
     })
 
     it('creates a Query with text payload', () => {
-      const nsid = asNsid('app.bsky.feed.getPost')
+      const nsid = asNsidString('app.bsky.feed.getPost')
       const parameters = new ParamsSchema({
         uri: new StringSchema({ format: 'at-uri' }),
       })
@@ -200,7 +200,7 @@ describe('Query', () => {
 
   describe('with different error configurations', () => {
     it('creates a Query with a single error', () => {
-      const nsid = asNsid('app.bsky.feed.getPost')
+      const nsid = asNsidString('app.bsky.feed.getPost')
       const parameters = new ParamsSchema({})
       const output = new Payload('application/json', undefined)
       const errors = ['NotFound'] as const
@@ -211,7 +211,7 @@ describe('Query', () => {
     })
 
     it('creates a Query with multiple errors', () => {
-      const nsid = asNsid('app.bsky.feed.getPost')
+      const nsid = asNsidString('app.bsky.feed.getPost')
       const parameters = new ParamsSchema({})
       const output = new Payload('application/json', undefined)
       const errors = ['NotFound', 'Unauthorized', 'RateLimitExceeded'] as const
@@ -226,7 +226,7 @@ describe('Query', () => {
     })
 
     it('creates a Query with empty errors array', () => {
-      const nsid = asNsid('app.bsky.feed.getPost')
+      const nsid = asNsidString('app.bsky.feed.getPost')
       const parameters = new ParamsSchema({})
       const output = new Payload('application/json', undefined)
       const errors = [] as const
@@ -237,56 +237,9 @@ describe('Query', () => {
     })
   })
 
-  describe('type inference', () => {
-    it('InferQueryParameters correctly infers parameter types', () => {
-      const nsid = asNsid('app.bsky.feed.getFeedSkeleton')
-      const parameters = new ParamsSchema({
-        feed: new StringSchema({ format: 'at-uri' }),
-        limit: new OptionalSchema(new IntegerSchema({})),
-      })
-      const output = new Payload('application/json', undefined)
-
-      const query = new Query(nsid, parameters, output, undefined)
-
-      type Params = InferQueryParameters<typeof query>
-
-      // Type-level test - this should compile without errors
-      const params: Params = {
-        feed: 'at://did:plc:abc123/app.bsky.feed.post/xyz',
-        limit: 50,
-      }
-
-      expect(params.feed).toBeDefined()
-    })
-
-    it('InferQueryOutputBody correctly infers output body type', () => {
-      const nsid = asNsid('app.bsky.feed.getFeedSkeleton')
-      const parameters = new ParamsSchema({})
-      const output = new Payload(
-        'application/json',
-        new ObjectSchema({
-          cursor: new OptionalSchema(new StringSchema({})),
-          feed: new StringSchema({ format: 'at-uri' }),
-        }),
-      )
-
-      const query = new Query(nsid, parameters, output, undefined)
-
-      type OutputBody = InferQueryOutputBody<typeof query>
-
-      // Type-level test - this should compile without errors
-      const outputBody: OutputBody = {
-        cursor: 'abc123',
-        feed: 'at://did:plc:abc123/app.bsky.feed.post/xyz',
-      }
-
-      expect(outputBody.feed).toBeDefined()
-    })
-  })
-
   describe('edge cases', () => {
     it('handles very long NSID', () => {
-      const nsid = asNsid(
+      const nsid = asNsidString(
         'com.example.very.long.namespace.identifier.method.name',
       )
       const parameters = new ParamsSchema({})
@@ -298,7 +251,7 @@ describe('Query', () => {
     })
 
     it('handles query with all optional parameters', () => {
-      const nsid = asNsid('app.bsky.feed.search')
+      const nsid = asNsidString('app.bsky.feed.search')
       const parameters = new ParamsSchema({
         q: new OptionalSchema(new StringSchema({})),
         limit: new OptionalSchema(new IntegerSchema({})),
@@ -312,7 +265,7 @@ describe('Query', () => {
     })
 
     it('handles query with complex nested output schema', () => {
-      const nsid = asNsid('app.bsky.feed.getTimeline')
+      const nsid = asNsidString('app.bsky.feed.getTimeline')
       const parameters = new ParamsSchema({})
       const output = new Payload(
         'application/json',
@@ -335,7 +288,7 @@ describe('Query', () => {
 
   describe('real-world query examples', () => {
     it('creates a getFeedSkeleton query', () => {
-      const nsid = asNsid('app.bsky.feed.getFeedSkeleton')
+      const nsid = asNsidString('app.bsky.feed.getFeedSkeleton')
       const parameters = new ParamsSchema({
         feed: new StringSchema({ format: 'at-uri' }),
         limit: new OptionalSchema(
@@ -357,7 +310,7 @@ describe('Query', () => {
     })
 
     it('creates a searchPosts query', () => {
-      const nsid = asNsid('app.bsky.feed.searchPosts')
+      const nsid = asNsidString('app.bsky.feed.searchPosts')
       const parameters = new ParamsSchema({
         q: new StringSchema({ minLength: 1, maxLength: 300 }),
         limit: new OptionalSchema(
@@ -382,7 +335,7 @@ describe('Query', () => {
     })
 
     it('creates a getProfile query', () => {
-      const nsid = asNsid('app.bsky.actor.getProfile')
+      const nsid = asNsidString('app.bsky.actor.getProfile')
       const parameters = new ParamsSchema({
         actor: new StringSchema({ format: 'at-identifier' }),
       })

package/src/schema/query.ts

@@ -1,22 +1,15 @@
 import { NsidString } from '../core.js'
-import { Infer } from '../validation.js'
 import { ParamsSchema } from './params.js'
-import { InferPayloadBody, Payload } from './payload.js'
-
-export type InferQueryParameters<Q extends Query> =
-  Q extends Query<any, infer P extends ParamsSchema, any> ? Infer<P> : never
-
-export type InferQueryOutputBody<Q extends Query> =
-  Q extends Query<any, any, infer O extends Payload>
-    ? InferPayloadBody<O>
-    : never
+import { Payload } from './payload.js'
 
 export class Query<
-  TNsid extends NsidString = any,
-  TParameters extends ParamsSchema = any,
-  TOutputPayload extends Payload = any,
-  TErrors extends undefined | readonly string[] = any,
+  TNsid extends NsidString = NsidString,
+  TParameters extends ParamsSchema = ParamsSchema,
+  TOutputPayload extends Payload = Payload,
+  TErrors extends undefined | readonly string[] = undefined | readonly string[],
 > {
+  readonly type = 'query' as const
+
   constructor(
     readonly nsid: TNsid,
     readonly parameters: TParameters,

package/src/schema/record.ts

@@ -8,19 +8,20 @@ import {
 } from '../validation.js'
 import { LiteralSchema } from './literal.js'
 import { StringSchema } from './string.js'
+import { TypedObject } from './typed-union.js'
 
 export type InferRecordKey<R extends RecordSchema> =
   R extends RecordSchema<infer K> ? RecordKeySchemaOutput<K> : never
 
 export type RecordSchemaOutput<
   T extends NsidString,
-  S extends Validator<{ [_ in string]?: unknown }>,
-> = Simplify<Omit<Infer<S>, '$type'> & { $type: T }>
+  S extends Validator<{ [k: string]: unknown }>,
+> = Simplify<{ $type: T } & Omit<Infer<S>, '$type'>>
 
 export class RecordSchema<
   K extends LexiconRecordKey = any,
   T extends NsidString = any,
-  S extends Validator<{ [_ in string]?: unknown }> = any,
+  S extends Validator<{ [k: string]: unknown }> = any,
 > extends Schema<RecordSchemaOutput<T, S>> {
   keySchema: RecordKeySchema<K>
 
@@ -35,7 +36,10 @@ export class RecordSchema<
 
   isTypeOf<X extends { $type?: unknown }>(
     value: X,
-  ): value is X extends { $type: T } ? X : X & { $type: T } {
+  ): value is Exclude<
+    X extends { $type?: T } ? X : X & { $type?: T },
+    TypedObject
+  > {
     return value.$type === this.$type
   }
 

package/src/schema/refine.ts

@@ -78,7 +78,7 @@ function validateInContextUnbound<S extends Validator>(
   const checkResult = this.refinement.check.call(null, result.value, ctx)
   if (!checkResult) {
     const path = ctx.concatPath(this.refinement.path)
-    return ctx.failure(new IssueCustom(path, input, this.refinement.message))
+    return ctx.issue(new IssueCustom(path, input, this.refinement.message))
   }
 
   return result

package/src/schema/subscription.test.ts

@@ -1,4 +1,4 @@
-import { asNsid } from '../core.js'
+import { asNsidString } from '../core.js'
 import { IntegerSchema } from './integer.js'
 import { ObjectSchema } from './object.js'
 import { OptionalSchema } from './optional.js'
@@ -14,7 +14,7 @@ import {
 describe('Subscription', () => {
   describe('constructor', () => {
     it('creates a Subscription instance with all parameters', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({
         cursor: new OptionalSchema(new IntegerSchema({})),
       })
@@ -34,7 +34,7 @@ describe('Subscription', () => {
     })
 
     it('creates a Subscription instance without errors', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({
         cursor: new OptionalSchema(new IntegerSchema({})),
       })
@@ -57,7 +57,7 @@ describe('Subscription', () => {
     })
 
     it('creates a Subscription instance with empty parameters', () => {
-      const nsid = asNsid('app.bsky.notification.subscribe')
+      const nsid = asNsidString('app.bsky.notification.subscribe')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         type: new StringSchema({}),
@@ -73,26 +73,11 @@ describe('Subscription', () => {
       expect(subscription).toBeInstanceOf(Subscription)
       expect(subscription.parameters).toBe(parameters)
     })
-
-    it('creates a Subscription instance with undefined message', () => {
-      const nsid = asNsid('app.bsky.feed.subscribe')
-      const parameters = new ParamsSchema({})
-
-      const subscription = new Subscription(
-        nsid,
-        parameters,
-        undefined,
-        undefined,
-      )
-
-      expect(subscription).toBeInstanceOf(Subscription)
-      expect(subscription.message).toBeUndefined()
-    })
   })
 
   describe('type property', () => {
     it('has type set to "subscription"', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({}),
@@ -109,7 +94,7 @@ describe('Subscription', () => {
     })
 
     it('type is a constant value', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({}),
@@ -130,7 +115,7 @@ describe('Subscription', () => {
 
   describe('properties', () => {
     it('has nsid property', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({}),
@@ -148,7 +133,7 @@ describe('Subscription', () => {
     })
 
     it('has parameters property', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({}),
@@ -166,7 +151,7 @@ describe('Subscription', () => {
     })
 
     it('has message property', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({}),
@@ -184,7 +169,7 @@ describe('Subscription', () => {
     })
 
     it('has errors property', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({}),
@@ -200,7 +185,7 @@ describe('Subscription', () => {
 
   describe('with complex parameters', () => {
     it('creates a Subscription with multiple parameter types', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({
         cursor: new OptionalSchema(new IntegerSchema({ minimum: 0 })),
         includeDeletes: new OptionalSchema(
@@ -223,7 +208,7 @@ describe('Subscription', () => {
 
   describe('with various message types', () => {
     it('creates a Subscription with ObjectSchema message', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({}),
@@ -242,7 +227,7 @@ describe('Subscription', () => {
     })
 
     it('creates a Subscription with RefSchema message', () => {
-      const nsid = asNsid('app.bsky.feed.subscribe')
+      const nsid = asNsidString('app.bsky.feed.subscribe')
       const parameters = new ParamsSchema({})
       const message = new RefSchema(() => new StringSchema({}))
 
@@ -256,26 +241,11 @@ describe('Subscription', () => {
       expect(subscription).toBeInstanceOf(Subscription)
       expect(subscription.message).toBeInstanceOf(RefSchema)
     })
-
-    it('creates a Subscription with undefined message', () => {
-      const nsid = asNsid('app.bsky.feed.subscribe')
-      const parameters = new ParamsSchema({})
-
-      const subscription = new Subscription(
-        nsid,
-        parameters,
-        undefined,
-        undefined,
-      )
-
-      expect(subscription).toBeInstanceOf(Subscription)
-      expect(subscription.message).toBeUndefined()
-    })
   })
 
   describe('with different error configurations', () => {
     it('creates a Subscription with a single error', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({})
       const errors = ['ConsumerTooSlow'] as const
@@ -286,7 +256,7 @@ describe('Subscription', () => {
     })
 
     it('creates a Subscription with multiple errors', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({})
       const errors = [
@@ -305,7 +275,7 @@ describe('Subscription', () => {
     })
 
     it('creates a Subscription with empty errors array', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({})
       const errors = [] as const
@@ -318,7 +288,7 @@ describe('Subscription', () => {
 
   describe('type inference', () => {
     it('InferSubscriptionParameters correctly infers parameter types', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({
         cursor: new OptionalSchema(new IntegerSchema({})),
       })
@@ -344,7 +314,7 @@ describe('Subscription', () => {
     })
 
     it('InferSubscriptionMessage correctly infers message type', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({}),
@@ -369,30 +339,11 @@ describe('Subscription', () => {
       expect(msg.seq).toBeDefined()
       expect(msg.data).toBeDefined()
     })
-
-    it('InferSubscriptionMessage returns unknown for undefined message', () => {
-      const nsid = asNsid('app.bsky.feed.subscribe')
-      const parameters = new ParamsSchema({})
-
-      const subscription = new Subscription(
-        nsid,
-        parameters,
-        undefined,
-        undefined,
-      )
-
-      type Message = InferSubscriptionMessage<typeof subscription>
-
-      // Type-level test - unknown should accept any value
-      const msg: Message = { anything: 'value' }
-
-      expect(msg).toBeDefined()
-    })
   })
 
   describe('edge cases', () => {
     it('handles very long NSID', () => {
-      const nsid = asNsid(
+      const nsid = asNsidString(
         'com.example.very.long.namespace.identifier.subscription.name',
       )
       const parameters = new ParamsSchema({})
@@ -409,7 +360,7 @@ describe('Subscription', () => {
     })
 
     it('handles subscription with all optional parameters', () => {
-      const nsid = asNsid('app.bsky.feed.subscribe')
+      const nsid = asNsidString('app.bsky.feed.subscribe')
       const parameters = new ParamsSchema({
         cursor: new OptionalSchema(new IntegerSchema({})),
         includeDeletes: new OptionalSchema(new IntegerSchema({})),
@@ -428,7 +379,7 @@ describe('Subscription', () => {
     })
 
     it('handles subscription with complex nested message schema', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({}),
@@ -454,7 +405,7 @@ describe('Subscription', () => {
 
   describe('real-world subscription examples', () => {
     it('creates a subscribeLabels subscription', () => {
-      const nsid = asNsid('com.atproto.label.subscribeLabels')
+      const nsid = asNsidString('com.atproto.label.subscribeLabels')
       const parameters = new ParamsSchema({
         cursor: new OptionalSchema(new IntegerSchema({ minimum: 0 })),
       })
@@ -492,7 +443,7 @@ describe('Subscription', () => {
     })
 
     it('creates a notification subscription', () => {
-      const nsid = asNsid('app.bsky.notification.subscribe')
+      const nsid = asNsidString('app.bsky.notification.subscribe')
       const parameters = new ParamsSchema({
         cursor: new OptionalSchema(new StringSchema({})),
       })
@@ -516,7 +467,7 @@ describe('Subscription', () => {
 
   describe('with mixed parameter and message types', () => {
     it('handles required and optional parameters with complex message', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({
         cursor: new OptionalSchema(new IntegerSchema({ minimum: 0 })),
         includeDeletes: new OptionalSchema(
@@ -552,7 +503,7 @@ describe('Subscription', () => {
 
   describe('validation through nested schemas', () => {
     it('parameters can validate input through ParamsSchema', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({
         cursor: new IntegerSchema({ minimum: 0 }),
       })
@@ -574,7 +525,7 @@ describe('Subscription', () => {
     })
 
     it('message can validate input through ObjectSchema', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         seq: new IntegerSchema({ minimum: 0 }),
@@ -605,7 +556,7 @@ describe('Subscription', () => {
 
   describe('property access', () => {
     it('can access nsid after construction', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({})
 
@@ -621,7 +572,7 @@ describe('Subscription', () => {
     })
 
     it('can access type after construction', () => {
-      const nsid = asNsid('com.atproto.sync.subscribeRepos')
+      const nsid = asNsidString('com.atproto.sync.subscribeRepos')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({})
 
@@ -639,7 +590,7 @@ describe('Subscription', () => {
 
   describe('different message schema types', () => {
     it('constructs with ObjectSchema message', () => {
-      const nsid = asNsid('app.bsky.test')
+      const nsid = asNsidString('app.bsky.test')
       const parameters = new ParamsSchema({})
       const message = new ObjectSchema({
         field: new StringSchema({}),
@@ -657,7 +608,7 @@ describe('Subscription', () => {
     })
 
     it('constructs with RefSchema message', () => {
-      const nsid = asNsid('app.bsky.test')
+      const nsid = asNsidString('app.bsky.test')
       const parameters = new ParamsSchema({})
       const message = new RefSchema(() => new ObjectSchema({}))
 
@@ -671,19 +622,5 @@ describe('Subscription', () => {
       expect(subscription.message).toBeInstanceOf(RefSchema)
       expect(subscription.message).toBe(message)
     })
-
-    it('constructs with undefined message', () => {
-      const nsid = asNsid('app.bsky.test')
-      const parameters = new ParamsSchema({})
-
-      const subscription = new Subscription(
-        nsid,
-        parameters,
-        undefined,
-        undefined,
-      )
-
-      expect(subscription.message).toBeUndefined()
-    })
   })
 })