@atproto/syntax 0.4.1 → 0.4.3

package/src/uri.ts

@@ -0,0 +1,5 @@
+export type UriString = `${string}:${string}`
+
+export function isValidUri<I extends string>(input: I): input is I & UriString {
+  return /^\w+:(?:\/\/)?[^\s/][^\s]*$/.test(input)
+}

package/tests/aturi.test.ts

@@ -1,8 +1,9 @@
 import * as fs from 'node:fs'
 import * as readline from 'node:readline'
-import { AtUri, ensureValidAtUri, ensureValidAtUriRegex } from '../src/index'
+import { describe, expect, it } from 'vitest'
+import { AtUri, ensureValidAtUri, ensureValidAtUriRegex } from '../src'
 
-describe('At Uris', () => {
+describe(AtUri, () => {
   it('parses valid at uris', () => {
     //                 input   host    path    query   hash
     type AtUriTest = [string, string, string, string, string]

package/tests/datetime.test.ts

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs'
 import * as readline from 'node:readline'
+import { describe, expect, it } from 'vitest'
 import {
   InvalidDatetimeError,
   ensureValidDatetime,

package/tests/did.test.ts

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs'
 import * as readline from 'node:readline'
+import { describe, expect, it } from 'vitest'
 import { InvalidDidError, ensureValidDid, ensureValidDidRegex } from '../src'
 
 describe('DID permissive validation', () => {

package/tests/handle.test.ts

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs'
 import * as readline from 'node:readline'
+import { describe, expect, it } from 'vitest'
 import {
   InvalidHandleError,
   ensureValidHandle,

package/tests/language.test.ts

@@ -0,0 +1,88 @@
+import { describe, expect, it } from 'vitest'
+import { isValidLanguage, parseLanguageString } from '../src'
+
+describe(isValidLanguage, () => {
+  it('validates BCP 47', () => {
+    // valid
+    expect(isValidLanguage('de')).toEqual(true)
+    expect(isValidLanguage('de-CH')).toEqual(true)
+    expect(isValidLanguage('de-DE-1901')).toEqual(true)
+    expect(isValidLanguage('es-419')).toEqual(true)
+    expect(isValidLanguage('sl-IT-nedis')).toEqual(true)
+    expect(isValidLanguage('mn-Cyrl-MN')).toEqual(true)
+    expect(isValidLanguage('x-fr-CH')).toEqual(true)
+    expect(
+      isValidLanguage('en-GB-boont-r-extended-sequence-x-private'),
+    ).toEqual(true)
+    expect(isValidLanguage('sr-Cyrl')).toEqual(true)
+    expect(isValidLanguage('hy-Latn-IT-arevela')).toEqual(true)
+    expect(isValidLanguage('i-klingon')).toEqual(true)
+    // invalid
+    expect(isValidLanguage('')).toEqual(false)
+    expect(isValidLanguage('x')).toEqual(false)
+    expect(isValidLanguage('de-CH-')).toEqual(false)
+    expect(isValidLanguage('i-bad-grandfathered')).toEqual(false)
+  })
+})
+
+describe(parseLanguageString, () => {
+  it('parses BCP 47', () => {
+    // valid
+    expect(parseLanguageString('de')).toEqual({
+      language: 'de',
+    })
+    expect(parseLanguageString('de-CH')).toEqual({
+      language: 'de',
+      region: 'CH',
+    })
+    expect(parseLanguageString('de-DE-1901')).toEqual({
+      language: 'de',
+      region: 'DE',
+      variant: '1901',
+    })
+    expect(parseLanguageString('es-419')).toEqual({
+      language: 'es',
+      region: '419',
+    })
+    expect(parseLanguageString('sl-IT-nedis')).toEqual({
+      language: 'sl',
+      region: 'IT',
+      variant: 'nedis',
+    })
+    expect(parseLanguageString('mn-Cyrl-MN')).toEqual({
+      language: 'mn',
+      script: 'Cyrl',
+      region: 'MN',
+    })
+    expect(parseLanguageString('x-fr-CH')).toEqual({
+      privateUse: 'x-fr-CH',
+    })
+    expect(
+      parseLanguageString('en-GB-boont-r-extended-sequence-x-private'),
+    ).toEqual({
+      language: 'en',
+      region: 'GB',
+      variant: 'boont',
+      extension: 'r-extended-sequence',
+      privateUse: 'x-private',
+    })
+    expect(parseLanguageString('sr-Cyrl')).toEqual({
+      language: 'sr',
+      script: 'Cyrl',
+    })
+    expect(parseLanguageString('hy-Latn-IT-arevela')).toEqual({
+      language: 'hy',
+      script: 'Latn',
+      region: 'IT',
+      variant: 'arevela',
+    })
+    expect(parseLanguageString('i-klingon')).toEqual({
+      grandfathered: 'i-klingon',
+    })
+    // invalid
+    expect(parseLanguageString('')).toEqual(null)
+    expect(parseLanguageString('x')).toEqual(null)
+    expect(parseLanguageString('de-CH-')).toEqual(null)
+    expect(parseLanguageString('i-bad-grandfathered')).toEqual(null)
+  })
+})

package/tests/nsid.test.ts

@@ -1,4 +1,5 @@
 import * as fs from 'node:fs'
+import { describe, expect, it } from 'vitest'
 import {
   InvalidNsidError,
   NSID,

package/tests/recordkey.test.ts

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs'
 import * as readline from 'node:readline'
+import { describe, expect, it } from 'vitest'
 import { InvalidRecordKeyError, ensureValidRecordKey } from '../src'
 
 describe('recordkey validation', () => {

package/tests/tid.test.ts

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs'
 import * as readline from 'node:readline'
+import { describe, expect, it } from 'vitest'
 import { InvalidTidError, ensureValidTid } from '../src'
 
 describe('tid validation', () => {

package/tsconfig.build.json

@@ -1,8 +1,12 @@
 {
   "extends": "../../tsconfig/isomorphic.json",
+  "include": ["./src"],
+  "exclude": ["**/*.test.ts"],
   "compilerOptions": {
+    "noImplicitAny": true,
+    "importHelpers": true,
+    "target": "ES2023",
     "rootDir": "./src",
     "outDir": "./dist"
-  },
-  "include": ["./src"]
+  }
 }

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/aturi.ts","./src/aturi_validation.ts","./src/datetime.ts","./src/did.ts","./src/handle.ts","./src/index.ts","./src/nsid.ts","./src/recordkey.ts","./src/tid.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"],"version":"5.8.2"}

package/tsconfig.tests.json

@@ -1,7 +1,9 @@
 {
-  "extends": "../../tsconfig/tests.json",
+  "extends": "../../tsconfig/vitest.json",
+  "include": ["./tests", "./src/**/*.test.ts"],
   "compilerOptions": {
-    "rootDir": "."
-  },
-  "include": ["./tests"]
+    "noImplicitAny": true,
+    "rootDir": "./",
+    "baseUrl": "./"
+  }
 }

package/vitest.config.ts

@@ -0,0 +1,5 @@
+import { defineProject } from 'vitest/config'
+
+export default defineProject({
+  test: {},
+})

package/jest.config.js

@@ -1,7 +0,0 @@
-/** @type {import('jest').Config} */
-module.exports = {
-  displayName: 'Syntax',
-  transform: { '^.+\\.(t|j)s$': '@swc/jest' },
-  setupFiles: ['<rootDir>/../../jest.setup.ts'],
-  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
-}

package/tsconfig.tests.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["./tests/aturi.test.ts","./tests/datetime.test.ts","./tests/did.test.ts","./tests/handle.test.ts","./tests/nsid.test.ts","./tests/recordkey.test.ts","./tests/tid.test.ts"],"version":"5.8.3"}