@atproto/syntax 0.5.3 → 0.6.0-next.0

package/tests/aturi-string.test.ts

@@ -1,6 +1,10 @@
 import { readFileSync } from 'node:fs'
 import { describe, expect, test } from 'vitest'
-import { ensureValidAtUri, isValidAtUri } from '../src'
+import {
+  InvalidAtUriError,
+  assertAtUriString,
+  isAtUriString,
+} from '../src/index.js'
 
 describe('valid interop', () => {
   for (const value of readLines(
@@ -10,13 +14,13 @@ describe('valid interop', () => {
   }
 })
 
-// describe('invalid interop', () => {
-//   for (const value of readLines(
-//     `${__dirname}/../../../interop-test-files/syntax/aturi_syntax_invalid.txt`,
-//   )) {
-//     testInvalid(value)
-//   }
-// })
+describe('invalid interop', () => {
+  for (const value of readLines(
+    `${__dirname}/../../../interop-test-files/syntax/aturi_syntax_invalid.txt`,
+  )) {
+    testInvalid(value)
+  }
+})
 
 describe('custom cases', () => {
   describe('valid spec basics', () => {
@@ -65,6 +69,16 @@ describe('custom cases', () => {
     testInvalid('at://did:plc:asdf123/-com.atproto.feed.post')
     testInvalid('at://did:plc:asdf@123/com.atproto.feed.post')
 
+    testInvalid('at://did:plc:asdf123?a')
+    testInvalid('at://user.bsky.social?a=B')
+    testInvalid('at://did:plc:asdf123/com.atproto.feed.post?foo=bar')
+    testInvalid('at://did:plc:asdf123/com.atproto.feed.post/record?q=3')
+
+    testInvalid('at://did:plc:asdf123?a=b#/frag')
+    testInvalid('at://user.bsky.social?a=b#/frag')
+    testInvalid('at://did:plc:asdf123/com.atproto.feed.post?a=b#/frag')
+    testInvalid('at://did:plc:asdf123/com.atproto.feed.post/record?a=b#/frag')
+
     testInvalid('at://DID:plc:asdf123')
     testInvalid('at://user.bsky.123')
     testInvalid('at://bsky')
@@ -74,8 +88,11 @@ describe('custom cases', () => {
   })
 
   describe('very long strings', () => {
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/' + 'o'.repeat(800))
+    testValid('at://did:plc:asdf123/com.atproto.feed.post/' + 'o'.repeat(512))
+    testValid(`at://did:web:x${'.y'.repeat(100)}/com.atproto.feed.post/record`)
     testInvalid(`at://did:plc:${'o'.repeat(8200)}/com.atproto.feed.post/record`)
+    testInvalid('at://did:plc:asdf123/com.atproto.feed.post/' + 'o'.repeat(513))
+    testInvalid('at://did:plc:asdf123/com.atproto.feed.post/' + 'o'.repeat(800))
   })
 
   describe('invalid collection', () => {
@@ -107,36 +124,39 @@ describe('custom cases', () => {
     testValid('at://did:plc:asdf123/com.atproto.feed.post/asdf123')
   })
 
-  describe('invalid trailing slash', () => {
-    testInvalid('at://did:plc:asdf123/')
-    testInvalid('at://user.bsky.social/')
-    testInvalid('at://did:plc:asdf123/com.atproto.feed.post/')
-    testInvalid('at://did:plc:asdf123/com.atproto.feed.post/record/')
-    testInvalid('at://did:plc:asdf123/com.atproto.feed.post/record/#/frag')
+  describe('loosely valid trailing slash', () => {
+    testLoose('at://did:plc:asdf123/')
+    testLoose('at://user.bsky.social/')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/record/')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/record/#/frag')
   })
 
-  describe('invalid record keys', () => {
-    // is probably too permissive about URL encoding
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/%30')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/%3')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/%')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/%zz')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/%%%')
-
-    // is very permissive about fragments
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/%23')
-
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/$@!*)(:,;~.sdf123')
-    testValid("at://did:plc:asdf123/com.atproto.feed.post/~'sdf123")
-
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/$')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/@')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/!')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/*')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/(')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/,')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/;')
-    testValid('at://did:plc:asdf123/com.atproto.feed.post/abc%30123')
+  describe('loosely valid record keys', () => {
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/%23')
+
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/$@!*)(:,;~.sdf123')
+    testLoose("at://did:plc:asdf123/com.atproto.feed.post/~'sdf123")
+
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/$')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/@')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/!')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/*')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/(')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/,')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/;')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/abc%30123')
+
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/%30')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/%3')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/%')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/%zz')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/%%%')
+
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/[]')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/foo[')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/bar]')
+    testLoose('at://did:plc:asdf123/com.atproto.feed.post/[baz]')
   })
 
   describe('valid fragment', () => {
@@ -165,14 +185,26 @@ describe('custom cases', () => {
 
 function testValid(value: string) {
   test(value, () => {
-    expect(isValidAtUri(value)).toBe(true)
-    expect(() => ensureValidAtUri(value)).not.toThrow()
+    expect(isAtUriString(value)).toBe(true)
+    expect(isAtUriString(value, { strict: false })).toBe(true)
+    expect(() => assertAtUriString(value)).not.toThrow()
+    expect(() => assertAtUriString(value, { strict: false })).not.toThrow()
   })
 }
 
 function testInvalid(value: string) {
   test(value, () => {
-    expect(isValidAtUri(value)).toBe(false)
+    expect(isAtUriString(value)).toBe(false)
+    expect(() => assertAtUriString(value)).toThrow(InvalidAtUriError)
+  })
+}
+
+function testLoose(value: string) {
+  test(value, () => {
+    expect(isAtUriString(value)).toBe(false)
+    expect(isAtUriString(value, { strict: false })).toBe(true)
+    expect(() => assertAtUriString(value)).toThrow()
+    expect(() => assertAtUriString(value, { strict: false })).not.toThrow()
   })
 }
 

package/tests/aturi.test.ts

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs'
 import { describe, expect, it, test } from 'vitest'
-import { AtUri } from '../src'
+import { AtUri } from '../src/index.js'
 
 describe(AtUri, () => {
   describe('parses valid interop', () => {
@@ -294,16 +294,16 @@ describe(AtUri, () => {
 
   it('supports modifications', () => {
     const urip = new AtUri('at://foo.com')
-    expect(urip.toString()).toBe('at://foo.com/')
+    expect(urip.toString()).toBe('at://foo.com')
 
     urip.host = 'bar.com'
-    expect(urip.toString()).toBe('at://bar.com/')
+    expect(urip.toString()).toBe('at://bar.com')
     urip.host = 'did:web:localhost%3A1234'
-    expect(urip.toString()).toBe('at://did:web:localhost%3A1234/')
+    expect(urip.toString()).toBe('at://did:web:localhost%3A1234')
     urip.host = 'foo.com'
 
     urip.pathname = '/'
-    expect(urip.toString()).toBe('at://foo.com/')
+    expect(urip.toString()).toBe('at://foo.com')
     urip.pathname = '/foo'
     expect(urip.toString()).toBe('at://foo.com/foo')
     urip.pathname = 'foo'

package/tests/datetime.test.ts

@@ -6,7 +6,7 @@ import {
   isValidDatetime,
   normalizeDatetime,
   normalizeDatetimeAlways,
-} from '../src'
+} from '../src/index.js'
 
 const interopValid = readLines(
   `${__dirname}/interop-files/datetime_syntax_valid.txt`,
@@ -128,9 +128,28 @@ describe(normalizeDatetime, () => {
     expect(normalizeDatetime('1985-04-12T10:20:50.1+01:00')).toEqual(
       '1985-04-12T09:20:50.100Z',
     )
+    expect(normalizeDatetime('Fri, 02 Jan 1999 12:34:56+1212')).toEqual(
+      '1999-01-02T00:22:56.000Z',
+    )
+    expect(normalizeDatetime('Fri, 02 Jan 1999 12:34:56Z')).toEqual(
+      '1999-01-02T12:34:56.000Z',
+    )
     expect(normalizeDatetime('Fri, 02 Jan 1999 12:34:56 GMT')).toEqual(
       '1999-01-02T12:34:56.000Z',
     )
+    expect(normalizeDatetime('Fri, 02 Jan 1999 12:34:56 PST')).toEqual(
+      '1999-01-02T20:34:56.000Z',
+    )
+    expect(normalizeDatetime('Fri, 02 Jan 1999 12:34:56 EST')).toEqual(
+      '1999-01-02T17:34:56.000Z',
+    )
+    // @NOTE "(Central European Standard Time)" is not used by "Date" to infer
+    // the right timezone offset, so these will be parsed as UTC
+    expect(
+      normalizeDatetime(
+        'Fri, 02 Jan 1999 12:34:56 (Central European Standard Time)',
+      ),
+    ).toEqual('1999-01-02T12:34:56.000Z')
     expect(normalizeDatetime('0001-01-01T00:00:00+01:00')).toEqual(
       '0000-12-31T23:00:00.000Z',
     )
@@ -170,6 +189,9 @@ describe(normalizeDatetime, () => {
     expect(() => normalizeDatetime('1999-19-39T23:20:50.123Z')).toThrow(
       InvalidDatetimeError,
     )
+    expect(() => normalizeDatetime('Fri, 02 Jan 1999 12:34:56 AFT')).toThrow(
+      InvalidDatetimeError,
+    )
     expect(() => normalizeDatetime('-000001-12-31T23:00:00.000Z')).toThrow(
       InvalidDatetimeError,
     )

package/tests/did.test.ts

@@ -1,7 +1,11 @@
 import * as fs from 'node:fs'
 import * as readline from 'node:readline'
 import { describe, expect, it } from 'vitest'
-import { InvalidDidError, ensureValidDid, ensureValidDidRegex } from '../src'
+import {
+  InvalidDidError,
+  ensureValidDid,
+  ensureValidDidRegex,
+} from '../src/index.js'
 
 describe('DID permissive validation', () => {
   const expectValid = (h: string) => {

package/tests/handle.test.ts

@@ -6,7 +6,7 @@ import {
   ensureValidHandle,
   ensureValidHandleRegex,
   normalizeAndEnsureValidHandle,
-} from '../src'
+} from '../src/index.js'
 
 describe('handle validation', () => {
   const expectValid = (h: string) => {

package/tests/language.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { isValidLanguage, parseLanguageString } from '../src'
+import { isValidLanguage, parseLanguageString } from '../src/index.js'
 
 describe(isValidLanguage, () => {
   it('validates BCP 47', () => {

package/tests/nsid.test.ts

@@ -8,7 +8,7 @@ import {
   parseNsid,
   validateNsid,
   validateNsidRegex,
-} from '../src'
+} from '../src/index.js'
 
 describe('NSID parsing & creation', () => {
   it('parses valid NSIDs', () => {

package/tests/recordkey.test.ts

@@ -1,7 +1,7 @@
 import * as fs from 'node:fs'
 import * as readline from 'node:readline'
 import { describe, expect, it } from 'vitest'
-import { InvalidRecordKeyError, ensureValidRecordKey } from '../src'
+import { InvalidRecordKeyError, ensureValidRecordKey } from '../src/index.js'
 
 describe('recordkey validation', () => {
   const expectValid = (r: string) => {

package/tests/tid.test.ts

@@ -1,7 +1,7 @@
 import * as fs from 'node:fs'
 import * as readline from 'node:readline'
 import { describe, expect, it } from 'vitest'
-import { InvalidTidError, ensureValidTid } from '../src'
+import { InvalidTidError, ensureValidTid } from '../src/index.js'
 
 describe('tid validation', () => {
   const expectValid = (t: string) => {

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/at-identifier.ts","./src/aturi.ts","./src/aturi_validation.ts","./src/datetime.ts","./src/did.ts","./src/handle.ts","./src/index.ts","./src/language.ts","./src/nsid.ts","./src/recordkey.ts","./src/tid.ts","./src/uri.ts"],"version":"5.8.2"}
+{"root":["./src/at-identifier.ts","./src/aturi.ts","./src/aturi_validation.ts","./src/datetime.ts","./src/did.ts","./src/handle.ts","./src/index.ts","./src/language.ts","./src/nsid.ts","./src/recordkey.ts","./src/tid.ts","./src/uri.ts","./src/lib/result.ts"],"version":"6.0.3"}