@atproto/syntax 0.3.4 → 0.4.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atproto/syntax
 
+## 0.4.1
+
+### Patch Changes
+
+- [#4108](https://github.com/bluesky-social/atproto/pull/4108) [`f9dc9aa4c`](https://github.com/bluesky-social/atproto/commit/f9dc9aa4c9eaf2f82d140fbf011a9015e7f1a00d) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add `NSID.from(stringifiable)` utility
+
+- [#4108](https://github.com/bluesky-social/atproto/pull/4108) [`f9dc9aa4c`](https://github.com/bluesky-social/atproto/commit/f9dc9aa4c9eaf2f82d140fbf011a9015e7f1a00d) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve performance of NSID validation
+
+## 0.4.0
+
+### Minor Changes
+
+- [#3635](https://github.com/bluesky-social/atproto/pull/3635) [`670b6b5de`](https://github.com/bluesky-social/atproto/commit/670b6b5de2bf91e6944761c98eb1126fb6a681ee) Thanks [@bnewbold](https://github.com/bnewbold)! - update NSID syntax to allow non-leading digits
+
 ## 0.3.4
 
 ### Patch Changes

package/LICENSE.txt

@@ -1,6 +1,6 @@
 Dual MIT/Apache-2.0 License
 
-Copyright (c) 2022-2025 Bluesky PBC, and Contributors
+Copyright (c) 2022-2025 Bluesky Social PBC, and Contributors
 
 Except as otherwise noted in individual files, this software is licensed under the MIT license (<http://opensource.org/licenses/MIT>), or the Apache License, Version 2.0 (<http://www.apache.org/licenses/LICENSE-2.0>).
 

package/benchmark.js

@@ -0,0 +1,208 @@
+/* eslint-env node, commonjs */
+
+const { validateNsid, validateNsidRegex } = require('.')
+
+// $ node benchmark.js
+// valid NSIDs {
+//   parsed: 181.56524884700775,
+//   regexp: 77.61082607507706,
+//   optimized: 60.183539509773254
+// }
+// invalid NSIDs {
+//   parsed: 128.7685609459877,
+//   regexp: 108.75775015354156,
+//   optimized: 53.196488440036774
+// }
+
+bench('valid NSIDs', true, [
+  'com.example.foo',
+  'o'.repeat(63) + '.foo.bar',
+  'com.' + 'o'.repeat(63) + '.foo',
+  'com.example.' + 'o'.repeat(63),
+  'com.' + 'middle.'.repeat(40) + 'foo',
+  'com.example.fooBar',
+  'net.users.bob.ping',
+  'a.b.c',
+  'm.xn--masekowski-d0b.pl',
+  'one.two.three',
+  'one.two.three.four-and.FiVe',
+  'one.2.three',
+  'a-0.b-1.c',
+  'a0.b1.cc',
+  'cn.8.lex.stuff',
+  'test.12345.record',
+  'a01.thing.record',
+  'a.0.c',
+  'xn--fiqs8s.xn--fiqa61au8b7zsevnm8ak20mc4a87e.record.two',
+  'a0.b1.c3',
+  'com.example.f00',
+  'onion.expyuzz4wqqyqhjn.spec.getThing',
+  'onion.g2zyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.lex.deleteThing',
+  'org.4chan.lex.getThing',
+  'cn.8.lex.stuff',
+  'onion.2gzyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.lex.deleteThing',
+  'a.'.repeat(158) + 'a',
+])
+
+bench('invalid NSIDs', false, [
+  'a.'.repeat(158) + '9',
+  'a.'.repeat(154) + 'a😅.9',
+  'o'.repeat(64) + '.foo.bar',
+  'com.' + 'o'.repeat(64) + '.foo',
+  'com.example.' + 'o'.repeat(64),
+  'com.' + 'middle.'.repeat(50) + 'foo',
+  'com.example.foo.*',
+  'com.example.foo.blah*',
+  'com.example.foo.*blah',
+  'com.exa💩ple.thing',
+  'a-0.b-1.c-3',
+  'a-0.b-1.c-o',
+  '1.0.0.127.record',
+  '0two.example.foo',
+  'example.com',
+  'com.example',
+  'a.',
+  '.one.two.three',
+  'one.two.three ',
+  'one.two..three',
+  'one .two.three',
+  ' one.two.three',
+  'com.atproto.feed.p@st',
+  'com.atproto.feed.p_st',
+  'com.atproto.feed.p*st',
+  'com.atproto.feed.po#t',
+  'com.atproto.feed.p!ot',
+  'com.example-.foo',
+  'com.-example.foo',
+  'com.example.0foo',
+  'com.example.f-o',
+])
+
+function bench(name, expectedResult, cases) {
+  const validators = {
+    parsed: (nsid) => validateNsid(nsid).success,
+    regexp: (nsid) => validateNsidRegex(nsid).success,
+    optimized: (nsid) => validateNsidOptimized(nsid).success,
+  }
+
+  const times = Object.fromEntries(Object.keys(validators).map((k) => [k, 0]))
+
+  for (let i = 0; i < 1000; i++) {
+    for (const [name, fn] of Object.entries(validators)) {
+      const start = performance.now()
+      for (let j = 0; j < 20; j++) {
+        for (const value of cases) {
+          if (fn(value) !== expectedResult) {
+            throw new Error(`Validator ${name} gave wrong result`)
+          }
+        }
+      }
+      times[name] += performance.now() - start
+    }
+  }
+
+  console.log(
+    name,
+    Object.fromEntries(
+      Object.entries(times).map(([k, v]) => [k, `${v.toFixed(2)} ms`]),
+    ),
+  )
+}
+
+/** @param value {string} */
+function validateNsidOptimized(value) {
+  const { length } = value
+  if (length > 253 + 1 + 63) {
+    return { success: false, message: 'NSID is too long (317 chars max)' }
+  }
+
+  let partCount = 1
+  let partStart = 0
+  let partHasLeadingDigit = false
+  let partHasHyphen = false
+
+  let charCode
+  for (let i = 0; i < length; i++) {
+    charCode = value.charCodeAt(i)
+
+    // Hot path: check frequent chars first
+    if (
+      (charCode >= 97 && charCode <= 122) /* a-z */ ||
+      (charCode >= 65 && charCode <= 90) /* A-Z */
+    ) {
+      // All good
+    } else if (charCode >= 48 && charCode <= 57 /* 0-9 */) {
+      if (i === 0) {
+        return {
+          success: false,
+          message: 'NSID first part may not start with a digit',
+        }
+      }
+
+      // All good
+
+      if (i === partStart) {
+        partHasLeadingDigit = true
+      }
+    } else if (charCode === 45 /* - */) {
+      if (i === partStart) {
+        return {
+          success: false,
+          message: 'NSID part can not start with hyphen',
+        }
+      }
+      if (i === length - 1 || value.charCodeAt(i + 1) === 46 /* . */) {
+        return { success: false, message: 'NSID part can not end with hyphen' }
+      }
+
+      // All good
+
+      partHasHyphen = true
+    } else if (charCode === 46 /* . */) {
+      // Check prev part size
+      if (i === partStart) {
+        return { success: false, message: 'NSID parts can not be empty' }
+      }
+      if (i - partStart > 63) {
+        return { success: false, message: 'NSID part too long (max 63 chars)' }
+      }
+
+      // All good
+
+      partCount++
+      partStart = i + 1
+      partHasHyphen = false
+      partHasLeadingDigit = false
+    } else {
+      return {
+        success: false,
+        message:
+          'Disallowed characters in NSID (ASCII letters, digits, dashes, periods only)',
+      }
+    }
+  }
+
+  // Check last part size
+  if (length === partStart) {
+    return { success: false, message: 'NSID parts can not be empty' }
+  }
+  if (length - partStart > 63) {
+    return { success: false, message: 'NSID part too long (max 63 chars)' }
+  }
+
+  // Check last part chars
+  if (partHasHyphen || partHasLeadingDigit) {
+    return {
+      success: false,
+      message:
+        'NSID name part must be only letters and digits (and no leading digit)',
+    }
+  }
+
+  // Check part count
+  if (partCount < 3) {
+    return { success: false, message: 'NSID needs at least three parts' }
+  }
+
+  return { success: true, value }
+}

package/dist/aturi_validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aturi_validation.d.ts","sourceRoot":"","sources":["../src/aturi_validation.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,gBAAgB,QAAS,MAAM,SA+E3C,CAAA;AAED,eAAO,MAAM,qBAAqB,QAAS,MAAM,KAAG,IAgCnD,CAAA"}
+{"version":3,"file":"aturi_validation.d.ts","sourceRoot":"","sources":["../src/aturi_validation.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,SA6E3C,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,KAAG,IA4BnD,CAAA"}

package/dist/aturi_validation.js

@@ -51,10 +51,7 @@ const ensureValidAtUri = (uri) => {
         if (parts[3].length === 0) {
             throw new Error('ATURI can not have a slash after authority without a path segment');
         }
-        try {
-            (0, nsid_1.ensureValidNsid)(parts[3]);
-        }
-        catch {
+        if (!(0, nsid_1.isValidNsid)(parts[3])) {
             throw new Error('ATURI requires first path segment (if supplied) to be valid NSID');
         }
     }
@@ -104,13 +101,8 @@ const ensureValidAtUriRegex = (uri) => {
             throw new Error('ATURI authority must be a valid handle or DID');
         }
     }
-    if (groups.collection) {
-        try {
-            (0, nsid_1.ensureValidNsidRegex)(groups.collection);
-        }
-        catch {
-            throw new Error('ATURI collection path segment must be a valid NSID');
-        }
+    if (groups.collection && !(0, nsid_1.isValidNsid)(groups.collection)) {
+        throw new Error('ATURI collection path segment must be a valid NSID');
     }
     if (uri.length > 8 * 1024) {
         throw new Error('ATURI is far too long');

package/dist/aturi_validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"aturi_validation.js","sourceRoot":"","sources":["../src/aturi_validation.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAC3D,qCAAoE;AACpE,iCAA8D;AAE9D,uCAAuC;AACvC,+DAA+D;AAC/D,oCAAoC;AACpC,6EAA6E;AAC7E,wBAAwB;AACxB,sDAAsD;AACtD,iFAAiF;AACjF,kEAAkE;AAClE,8EAA8E;AAC9E,+HAA+H;AAC/H,0CAA0C;AAC1C,0CAA0C;AAC1C,wGAAwG;AACjG,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,EAAE;IAC9C,6EAA6E;IAC7E,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC/B,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAA;IAC5E,CAAC;IACD,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;IACxC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAEjB,wCAAwC;IACxC,IAAI,CAAC,mCAAmC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC5B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAClD,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,CAAC;QACH,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAChC,IAAA,oBAAc,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;aAAM,CAAC;YACN,IAAA,0BAAiB,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;IAClE,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAA;QACH,CAAC;QACD,IAAI,CAAC;YACH,IAAA,sBAAe,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAA;QACH,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAA;QACH,CAAC;QACD,oEAAoE;IACtE,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAA;IACH,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;QAC1E,CAAC;QACD,4EAA4E;QAC5E,IAAI,CAAC,wCAAwC,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;QACpE,CAAC;IACH,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAC1C,CAAC;AACH,CAAC,CAAA;AA/EY,QAAA,gBAAgB,oBA+E5B;AAEM,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAQ,EAAE;IACzD,sEAAsE;IACtE,0DAA0D;IAC1D,MAAM,UAAU,GACd,gLAAgL,CAAA;IAClL,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IAChC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;IACpD,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAA;IAExB,IAAI,CAAC;QACH,IAAA,+BAAsB,EAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,CAAC;YACH,IAAA,yBAAmB,EAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACvC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,IAAA,2BAAoB,EAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACzC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;QACvE,CAAC;IACH,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAC1C,CAAC;AACH,CAAC,CAAA;AAhCY,QAAA,qBAAqB,yBAgCjC"}
+{"version":3,"file":"aturi_validation.js","sourceRoot":"","sources":["../src/aturi_validation.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAC3D,qCAAoE;AACpE,iCAAoC;AAEpC,uCAAuC;AACvC,+DAA+D;AAC/D,oCAAoC;AACpC,6EAA6E;AAC7E,wBAAwB;AACxB,sDAAsD;AACtD,iFAAiF;AACjF,kEAAkE;AAClE,8EAA8E;AAC9E,+HAA+H;AAC/H,0CAA0C;AAC1C,0CAA0C;AAC1C,wGAAwG;AACjG,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,EAAE;IAC9C,6EAA6E;IAC7E,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC/B,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAA;IAC5E,CAAC;IACD,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;IACxC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAEjB,wCAAwC;IACxC,IAAI,CAAC,mCAAmC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC5B,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAClD,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,CAAC;QACH,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAChC,IAAA,oBAAc,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;aAAM,CAAC;YACN,IAAA,0BAAiB,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;IAClE,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAA;QACH,CAAC;QACD,IAAI,CAAC,IAAA,kBAAW,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAA;QACH,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAA;QACH,CAAC;QACD,oEAAoE;IACtE,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAA;IACH,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;IAC1E,CAAC;IAED,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;QAC1E,CAAC;QACD,4EAA4E;QAC5E,IAAI,CAAC,wCAAwC,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;QACpE,CAAC;IACH,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAC1C,CAAC;AACH,CAAC,CAAA;AA7EY,QAAA,gBAAgB,oBA6E5B;AAEM,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAQ,EAAE;IACzD,sEAAsE;IACtE,0DAA0D;IAC1D,MAAM,UAAU,GACd,gLAAgL,CAAA;IAClL,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IAChC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;IACpD,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAA;IAExB,IAAI,CAAC;QACH,IAAA,+BAAsB,EAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,CAAC;YACH,IAAA,yBAAmB,EAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACvC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,UAAU,IAAI,CAAC,IAAA,kBAAW,EAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;IACvE,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAC1C,CAAC;AACH,CAAC,CAAA;AA5BY,QAAA,qBAAqB,yBA4BjC"}

package/dist/datetime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datetime.d.ts","sourceRoot":"","sources":["../src/datetime.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,mBAAmB,UAAW,MAAM,KAAG,IA4BnD,CAAA;AAID,eAAO,MAAM,eAAe,UAAW,MAAM,KAAG,OAW/C,CAAA;AAYD,eAAO,MAAM,iBAAiB,UAAW,MAAM,KAAG,MAkCjD,CAAA;AAMD,eAAO,MAAM,uBAAuB,UAAW,MAAM,KAAG,MASvD,CAAA;AAID,qBAAa,oBAAqB,SAAQ,KAAK;CAAG"}
+{"version":3,"file":"datetime.d.ts","sourceRoot":"","sources":["../src/datetime.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,mBAAmB,GAAI,OAAO,MAAM,KAAG,IA4BnD,CAAA;AAID,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,KAAG,OAW/C,CAAA;AAYD,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,KAAG,MAkCjD,CAAA;AAMD,eAAO,MAAM,uBAAuB,GAAI,OAAO,MAAM,KAAG,MASvD,CAAA;AAID,qBAAa,oBAAqB,SAAQ,KAAK;CAAG"}

package/dist/did.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"did.d.ts","sourceRoot":"","sources":["../src/did.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,cAAc,QAAS,MAAM,KAAG,IA8B5C,CAAA;AAED,eAAO,MAAM,mBAAmB,QAAS,MAAM,KAAG,IAUjD,CAAA;AAED,qBAAa,eAAgB,SAAQ,KAAK;CAAG"}
+{"version":3,"file":"did.d.ts","sourceRoot":"","sources":["../src/did.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,cAAc,GAAI,KAAK,MAAM,KAAG,IA8B5C,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,KAAK,MAAM,KAAG,IAUjD,CAAA;AAED,qBAAa,eAAgB,SAAQ,KAAK;CAAG"}

package/dist/handle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle.d.ts","sourceRoot":"","sources":["../src/handle.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,mBAAmB,CAAA;AAM9C,eAAO,MAAM,eAAe,UAY3B,CAAA;AAqBD,eAAO,MAAM,iBAAiB,WAAY,MAAM,KAAG,IAkClD,CAAA;AAGD,eAAO,MAAM,sBAAsB,WAAY,MAAM,KAAG,IAWvD,CAAA;AAED,eAAO,MAAM,eAAe,WAAY,MAAM,KAAG,MAEhD,CAAA;AAED,eAAO,MAAM,6BAA6B,WAAY,MAAM,KAAG,MAI9D,CAAA;AAED,eAAO,MAAM,aAAa,WAAY,MAAM,KAAG,OAW9C,CAAA;AAED,eAAO,MAAM,UAAU,WAAY,MAAM,KAAG,OAE3C,CAAA;AAED,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAChD,6BAA6B;AAC7B,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,6BAA6B;AAC7B,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,6BAA6B;AAC7B,qBAAa,qBAAsB,SAAQ,KAAK;CAAG"}
+{"version":3,"file":"handle.d.ts","sourceRoot":"","sources":["../src/handle.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,mBAAmB,CAAA;AAM9C,eAAO,MAAM,eAAe,UAY3B,CAAA;AAqBD,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,KAAG,IAkClD,CAAA;AAGD,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,KAAG,IAWvD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,KAAG,MAEhD,CAAA;AAED,eAAO,MAAM,6BAA6B,GAAI,QAAQ,MAAM,KAAG,MAI9D,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,KAAG,OAW9C,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,KAAG,OAE3C,CAAA;AAED,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAChD,6BAA6B;AAC7B,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,6BAA6B;AAC7B,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,6BAA6B;AAC7B,qBAAa,qBAAsB,SAAQ,KAAK;CAAG"}

package/dist/nsid.d.ts

@@ -1,15 +1,39 @@
 export declare class NSID {
-    segments: string[];
-    static parse(nsid: string): NSID;
+    readonly segments: readonly string[];
+    static parse(input: string): NSID;
     static create(authority: string, name: string): NSID;
     static isValid(nsid: string): boolean;
+    static from(input: {
+        toString: () => string;
+    }): NSID;
     constructor(nsid: string);
     get authority(): string;
     get name(): string | undefined;
     toString(): string;
 }
-export declare const ensureValidNsid: (nsid: string) => void;
-export declare const ensureValidNsidRegex: (nsid: string) => void;
+export declare function ensureValidNsid(nsid: string): void;
+export declare function parseNsid(nsid: string): string[];
+export declare function isValidNsid(nsid: string): boolean;
+type ValidateResult<T> = {
+    success: true;
+    value: T;
+} | {
+    success: false;
+    message: string;
+};
+export declare function validateNsid(input: string): ValidateResult<string[]>;
+/**
+ * @deprecated Use {@link ensureValidNsid} if you care about error details,
+ * {@link parseNsid}/{@link NSID.parse} if you need the parsed segments, or
+ * {@link isValidNsid} if you just want a boolean.
+ */
+export declare function ensureValidNsidRegex(nsid: string): void;
+/**
+ * Regexp based validation that behaves identically to the previous code but
+ * provides less detailed error messages (while being 20% to 50% faster).
+ */
+export declare function validateNsidRegex(value: string): ValidateResult<string>;
 export declare class InvalidNsidError extends Error {
 }
+export {};
 //# sourceMappingURL=nsid.d.ts.map

package/dist/nsid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nsid.d.ts","sourceRoot":"","sources":["../src/nsid.ts"],"names":[],"mappings":"AAaA,qBAAa,IAAI;IACf,QAAQ,EAAE,MAAM,EAAE,CAAK;IAEvB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIhC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKpD,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;gBASzB,IAAI,EAAE,MAAM;IAKxB,IAAI,SAAS,WAKZ;IAED,IAAI,IAAI,uBAEP;IAED,QAAQ;CAGT;AAKD,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,IAmC9C,CAAA;AAED,eAAO,MAAM,oBAAoB,SAAU,MAAM,KAAG,IAanD,CAAA;AAED,qBAAa,gBAAiB,SAAQ,KAAK;CAAG"}
+{"version":3,"file":"nsid.d.ts","sourceRoot":"","sources":["../src/nsid.ts"],"names":[],"mappings":"AAaA,qBAAa,IAAI;IACf,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAA;IAEpC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIjC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKpD,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;IAI3B,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;KAAE,GAAG,IAAI;gBAWxC,IAAI,EAAE,MAAM;IAIxB,IAAI,SAAS,WAKZ;IAED,IAAI,IAAI,uBAEP;IAED,QAAQ;CAGT;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAGlD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAIhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAIjD;AAED,KAAK,cAAc,CAAC,CAAC,IACjB;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAC3B;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAKvC,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CA0DpE;AA4BD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAGvD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAuBvE;AAED,qBAAa,gBAAiB,SAAQ,KAAK;CAAG"}

package/dist/nsid.js

@@ -7,38 +7,47 @@ number    = "1" / "2" / "3" / "4" / "5" / "6" / "7" / "8" / "9" / "0"
 delim     = "."
 segment   = alpha *( alpha / number / "-" )
 authority = segment *( delim segment )
-name      = alpha *( alpha )
+name      = alpha *( alpha / number )
 nsid      = authority delim name
 
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InvalidNsidError = exports.ensureValidNsidRegex = exports.ensureValidNsid = exports.NSID = void 0;
+exports.InvalidNsidError = exports.NSID = void 0;
+exports.ensureValidNsid = ensureValidNsid;
+exports.parseNsid = parseNsid;
+exports.isValidNsid = isValidNsid;
+exports.validateNsid = validateNsid;
+exports.ensureValidNsidRegex = ensureValidNsidRegex;
+exports.validateNsidRegex = validateNsidRegex;
 class NSID {
-    static parse(nsid) {
-        return new NSID(nsid);
+    static parse(input) {
+        return new NSID(input);
     }
     static create(authority, name) {
-        const segments = [...authority.split('.').reverse(), name].join('.');
-        return new NSID(segments);
+        const input = [...authority.split('.').reverse(), name].join('.');
+        return new NSID(input);
     }
     static isValid(nsid) {
-        try {
-            NSID.parse(nsid);
-            return true;
+        return isValidNsid(nsid);
+    }
+    static from(input) {
+        if (input instanceof NSID) {
+            // No need to clone, NSID is immutable
+            return input;
         }
-        catch (e) {
-            return false;
+        if (Array.isArray(input)) {
+            return new NSID(input.join('.'));
         }
+        return new NSID(String(input));
     }
     constructor(nsid) {
         Object.defineProperty(this, "segments", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: []
+            value: void 0
         });
-        (0, exports.ensureValidNsid)(nsid);
-        this.segments = nsid.split('.');
+        this.segments = parseNsid(nsid);
     }
     get authority() {
         return this.segments
@@ -54,53 +63,134 @@ class NSID {
     }
 }
 exports.NSID = NSID;
+function ensureValidNsid(nsid) {
+    const result = validateNsid(nsid);
+    if (!result.success)
+        throw new InvalidNsidError(result.message);
+}
+function parseNsid(nsid) {
+    const result = validateNsid(nsid);
+    if (!result.success)
+        throw new InvalidNsidError(result.message);
+    return result.value;
+}
+function isValidNsid(nsid) {
+    // Since the regex version is more performant for valid NSIDs, we use it when
+    // we don't care about error details.
+    return validateNsidRegex(nsid).success;
+}
 // Human readable constraints on NSID:
 // - a valid domain in reversed notation
 // - followed by an additional period-separated name, which is camel-case letters
-const ensureValidNsid = (nsid) => {
-    const toCheck = nsid;
-    // check that all chars are boring ASCII
-    if (!/^[a-zA-Z0-9.-]*$/.test(toCheck)) {
-        throw new InvalidNsidError('Disallowed characters in NSID (ASCII letters, digits, dashes, periods only)');
+function validateNsid(input) {
+    if (input.length > 253 + 1 + 63) {
+        return {
+            success: false,
+            message: 'NSID is too long (317 chars max)',
+        };
     }
-    if (toCheck.length > 253 + 1 + 63) {
-        throw new InvalidNsidError('NSID is too long (317 chars max)');
+    if (hasDisallowedCharacters(input)) {
+        return {
+            success: false,
+            message: 'Disallowed characters in NSID (ASCII letters, digits, dashes, periods only)',
+        };
     }
-    const labels = toCheck.split('.');
-    if (labels.length < 3) {
-        throw new InvalidNsidError('NSID needs at least three parts');
+    const segments = input.split('.');
+    if (segments.length < 3) {
+        return {
+            success: false,
+            message: 'NSID needs at least three parts',
+        };
     }
-    for (let i = 0; i < labels.length; i++) {
-        const l = labels[i];
+    for (const l of segments) {
         if (l.length < 1) {
-            throw new InvalidNsidError('NSID parts can not be empty');
+            return {
+                success: false,
+                message: 'NSID parts can not be empty',
+            };
         }
         if (l.length > 63) {
-            throw new InvalidNsidError('NSID part too long (max 63 chars)');
-        }
-        if (l.endsWith('-') || l.startsWith('-')) {
-            throw new InvalidNsidError('NSID parts can not start or end with hyphen');
-        }
-        if (/^[0-9]/.test(l) && i === 0) {
-            throw new InvalidNsidError('NSID first part may not start with a digit');
+            return {
+                success: false,
+                message: 'NSID part too long (max 63 chars)',
+            };
         }
-        if (!/^[a-zA-Z]+$/.test(l) && i + 1 === labels.length) {
-            throw new InvalidNsidError('NSID name part must be only letters');
+        if (startsWithHyphen(l) || endsWithHyphen(l)) {
+            return {
+                success: false,
+                message: 'NSID parts can not start or end with hyphen',
+            };
         }
     }
-};
-exports.ensureValidNsid = ensureValidNsid;
-const ensureValidNsidRegex = (nsid) => {
-    // simple regex to enforce most constraints via just regex and length.
-    // hand wrote this regex based on above constraints
-    if (!/^[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(\.[a-zA-Z]([a-zA-Z]{0,61}[a-zA-Z])?)$/.test(nsid)) {
-        throw new InvalidNsidError("NSID didn't validate via regex");
+    if (startsWithNumber(segments[0])) {
+        return {
+            success: false,
+            message: 'NSID first part may not start with a digit',
+        };
     }
-    if (nsid.length > 253 + 1 + 63) {
-        throw new InvalidNsidError('NSID is too long (317 chars max)');
+    if (!isValidIdentifier(segments[segments.length - 1])) {
+        return {
+            success: false,
+            message: 'NSID name part must be only letters and digits (and no leading digit)',
+        };
     }
-};
-exports.ensureValidNsidRegex = ensureValidNsidRegex;
+    return {
+        success: true,
+        value: segments,
+    };
+}
+function hasDisallowedCharacters(v) {
+    return !/^[a-zA-Z0-9.-]*$/.test(v);
+}
+function startsWithNumber(v) {
+    const charCode = v.charCodeAt(0);
+    return charCode >= 48 && charCode <= 57;
+}
+function startsWithHyphen(v) {
+    return v.charCodeAt(0) === 45; /* - */
+}
+function endsWithHyphen(v) {
+    return v.charCodeAt(v.length - 1) === 45; /* - */
+}
+function isValidIdentifier(v) {
+    // Note, since we already know that "v" only contains [a-zA-Z0-9-], we can
+    // simplify the following regex by checking only the first char and presence
+    // of "-".
+    // return /^[a-zA-Z][a-zA-Z0-9]*$/.test(v)
+    return !startsWithNumber(v) && !v.includes('-');
+}
+/**
+ * @deprecated Use {@link ensureValidNsid} if you care about error details,
+ * {@link parseNsid}/{@link NSID.parse} if you need the parsed segments, or
+ * {@link isValidNsid} if you just want a boolean.
+ */
+function ensureValidNsidRegex(nsid) {
+    const result = validateNsidRegex(nsid);
+    if (!result.success)
+        throw new InvalidNsidError(result.message);
+}
+/**
+ * Regexp based validation that behaves identically to the previous code but
+ * provides less detailed error messages (while being 20% to 50% faster).
+ */
+function validateNsidRegex(value) {
+    if (value.length > 253 + 1 + 63) {
+        return {
+            success: false,
+            message: 'NSID is too long (317 chars max)',
+        };
+    }
+    if (!/^[a-zA-Z](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?:\.[a-zA-Z](?:[a-zA-Z0-9]{0,62})?)$/.test(value)) {
+        return {
+            success: false,
+            message: "NSID didn't validate via regex",
+        };
+    }
+    return {
+        success: true,
+        value,
+    };
+}
 class InvalidNsidError extends Error {
 }
 exports.InvalidNsidError = InvalidNsidError;

package/dist/nsid.js.map

@@ -1 +1 @@
-{"version":3,"file":"nsid.js","sourceRoot":"","sources":["../src/nsid.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nsid.js","sourceRoot":"","sources":["../src/nsid.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;EAWE;;;AAiDF,0CAGC;AAED,8BAIC;AAED,kCAIC;AASD,oCA0DC;AAiCD,oDAGC;AAMD,8CAuBC;AAlMD,MAAa,IAAI;IAGf,MAAM,CAAC,KAAK,CAAC,KAAa;QACxB,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAA;IACxB,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,SAAiB,EAAE,IAAY;QAC3C,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACjE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAA;IACxB,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,IAAY;QACzB,OAAO,WAAW,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,KAAiC;QAC3C,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC1B,sCAAsC;YACtC,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,IAAI,CAAE,KAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAChD,CAAC;QACD,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IAChC,CAAC;IAED,YAAY,IAAY;QA1Bf;;;;;WAA2B;QA2BlC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;IACjC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ;aACjB,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;aAClC,OAAO,EAAE;aACT,IAAI,CAAC,GAAG,CAAC,CAAA;IACd,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAChC,CAAC;CACF;AA7CD,oBA6CC;AAED,SAAgB,eAAe,CAAC,IAAY;IAC1C,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;IACjC,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,MAAM,IAAI,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AACjE,CAAC;AAED,SAAgB,SAAS,CAAC,IAAY;IACpC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;IACjC,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,MAAM,IAAI,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC/D,OAAO,MAAM,CAAC,KAAK,CAAA;AACrB,CAAC;AAED,SAAgB,WAAW,CAAC,IAAY;IACtC,6EAA6E;IAC7E,qCAAqC;IACrC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAA;AACxC,CAAC;AAMD,sCAAsC;AACtC,wCAAwC;AACxC,iFAAiF;AACjF,SAAgB,YAAY,CAAC,KAAa;IACxC,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC;QAChC,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,kCAAkC;SAC5C,CAAA;IACH,CAAC;IACD,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EACL,6EAA6E;SAChF,CAAA;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,iCAAiC;SAC3C,CAAA;IACH,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,6BAA6B;aACvC,CAAA;QACH,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;YAClB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,mCAAmC;aAC7C,CAAA;QACH,CAAC;QACD,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7C,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,6CAA6C;aACvD,CAAA;QACH,CAAC;IACH,CAAC;IACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClC,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,4CAA4C;SACtD,CAAA;IACH,CAAC;IACD,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EACL,uEAAuE;SAC1E,CAAA;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,QAAQ;KAChB,CAAA;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,CAAC;IAChC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACpC,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAS;IACjC,MAAM,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IAChC,OAAO,QAAQ,IAAI,EAAE,IAAI,QAAQ,IAAI,EAAE,CAAA;AACzC,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAS;IACjC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA,CAAC,OAAO;AACvC,CAAC;AAED,SAAS,cAAc,CAAC,CAAS;IAC/B,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA,CAAC,OAAO;AAClD,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAS;IAClC,0EAA0E;IAC1E,4EAA4E;IAC5E,UAAU;IAEV,0CAA0C;IAC1C,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AACjD,CAAC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,IAAY;IAC/C,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,MAAM,IAAI,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AACjE,CAAC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC;QAChC,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,kCAAkC;SAC5C,CAAA;IACH,CAAC;IAED,IACE,CAAC,sIAAsI,CAAC,IAAI,CAC1I,KAAK,CACN,EACD,CAAC;QACD,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,gCAAgC;SAC1C,CAAA;IACH,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI;QACb,KAAK;KACN,CAAA;AACH,CAAC;AAED,MAAa,gBAAiB,SAAQ,KAAK;CAAG;AAA9C,4CAA8C"}

package/dist/recordkey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recordkey.d.ts","sourceRoot":"","sources":["../src/recordkey.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,SAAU,MAAM,KAAG,IAUnD,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,MAAM,KAAG,OAW/C,CAAA;AAED,qBAAa,qBAAsB,SAAQ,KAAK;CAAG"}
+{"version":3,"file":"recordkey.d.ts","sourceRoot":"","sources":["../src/recordkey.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,KAAG,IAUnD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,KAAG,OAW/C,CAAA;AAED,qBAAa,qBAAsB,SAAQ,KAAK;CAAG"}

package/dist/tid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tid.d.ts","sourceRoot":"","sources":["../src/tid.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc,QAAS,MAAM,KAAG,IAQ5C,CAAA;AAED,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,OAExC,CAAA;AAED,qBAAa,eAAgB,SAAQ,KAAK;CAAG"}
+{"version":3,"file":"tid.d.ts","sourceRoot":"","sources":["../src/tid.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc,GAAI,KAAK,MAAM,KAAG,IAQ5C,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,KAAG,OAExC,CAAA;AAED,qBAAa,eAAgB,SAAQ,KAAK;CAAG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/syntax",
-  "version": "0.3.4",
+  "version": "0.4.1",
   "license": "MIT",
   "description": "Validation for atproto identifiers and formats: DID, handle, NSID, AT URI, etc",
   "keywords": [

package/src/aturi_validation.ts

@@ -1,6 +1,6 @@
 import { ensureValidDid, ensureValidDidRegex } from './did'
 import { ensureValidHandle, ensureValidHandleRegex } from './handle'
-import { ensureValidNsid, ensureValidNsidRegex } from './nsid'
+import { isValidNsid } from './nsid'
 
 // Human-readable constraints on ATURI:
 //   - following regular URLs, a 8KByte hard total length limit
@@ -53,9 +53,7 @@ export const ensureValidAtUri = (uri: string) => {
         'ATURI can not have a slash after authority without a path segment',
       )
     }
-    try {
-      ensureValidNsid(parts[3])
-    } catch {
+    if (!isValidNsid(parts[3])) {
       throw new Error(
         'ATURI requires first path segment (if supplied) to be valid NSID',
       )
@@ -117,12 +115,8 @@ export const ensureValidAtUriRegex = (uri: string): void => {
     }
   }
 
-  if (groups.collection) {
-    try {
-      ensureValidNsidRegex(groups.collection)
-    } catch {
-      throw new Error('ATURI collection path segment must be a valid NSID')
-    }
+  if (groups.collection && !isValidNsid(groups.collection)) {
+    throw new Error('ATURI collection path segment must be a valid NSID')
   }
 
   if (uri.length > 8 * 1024) {

package/src/nsid.ts

@@ -6,35 +6,40 @@ number    = "1" / "2" / "3" / "4" / "5" / "6" / "7" / "8" / "9" / "0"
 delim     = "."
 segment   = alpha *( alpha / number / "-" )
 authority = segment *( delim segment )
-name      = alpha *( alpha )
+name      = alpha *( alpha / number )
 nsid      = authority delim name
 
 */
 
 export class NSID {
-  segments: string[] = []
+  readonly segments: readonly string[]
 
-  static parse(nsid: string): NSID {
-    return new NSID(nsid)
+  static parse(input: string): NSID {
+    return new NSID(input)
   }
 
   static create(authority: string, name: string): NSID {
-    const segments = [...authority.split('.').reverse(), name].join('.')
-    return new NSID(segments)
+    const input = [...authority.split('.').reverse(), name].join('.')
+    return new NSID(input)
   }
 
-  static isValid(nsid: string): boolean {
-    try {
-      NSID.parse(nsid)
-      return true
-    } catch (e) {
-      return false
+  static isValid(nsid: string) {
+    return isValidNsid(nsid)
+  }
+
+  static from(input: { toString: () => string }): NSID {
+    if (input instanceof NSID) {
+      // No need to clone, NSID is immutable
+      return input
+    }
+    if (Array.isArray(input)) {
+      return new NSID((input as string[]).join('.'))
     }
+    return new NSID(String(input))
   }
 
   constructor(nsid: string) {
-    ensureValidNsid(nsid)
-    this.segments = nsid.split('.')
+    this.segments = parseNsid(nsid)
   }
 
   get authority() {
@@ -53,58 +58,152 @@ export class NSID {
   }
 }
 
+export function ensureValidNsid(nsid: string): void {
+  const result = validateNsid(nsid)
+  if (!result.success) throw new InvalidNsidError(result.message)
+}
+
+export function parseNsid(nsid: string): string[] {
+  const result = validateNsid(nsid)
+  if (!result.success) throw new InvalidNsidError(result.message)
+  return result.value
+}
+
+export function isValidNsid(nsid: string): boolean {
+  // Since the regex version is more performant for valid NSIDs, we use it when
+  // we don't care about error details.
+  return validateNsidRegex(nsid).success
+}
+
+type ValidateResult<T> =
+  | { success: true; value: T }
+  | { success: false; message: string }
+
 // Human readable constraints on NSID:
 // - a valid domain in reversed notation
 // - followed by an additional period-separated name, which is camel-case letters
-export const ensureValidNsid = (nsid: string): void => {
-  const toCheck = nsid
-
-  // check that all chars are boring ASCII
-  if (!/^[a-zA-Z0-9.-]*$/.test(toCheck)) {
-    throw new InvalidNsidError(
-      'Disallowed characters in NSID (ASCII letters, digits, dashes, periods only)',
-    )
+export function validateNsid(input: string): ValidateResult<string[]> {
+  if (input.length > 253 + 1 + 63) {
+    return {
+      success: false,
+      message: 'NSID is too long (317 chars max)',
+    }
   }
-
-  if (toCheck.length > 253 + 1 + 63) {
-    throw new InvalidNsidError('NSID is too long (317 chars max)')
+  if (hasDisallowedCharacters(input)) {
+    return {
+      success: false,
+      message:
+        'Disallowed characters in NSID (ASCII letters, digits, dashes, periods only)',
+    }
   }
-  const labels = toCheck.split('.')
-  if (labels.length < 3) {
-    throw new InvalidNsidError('NSID needs at least three parts')
+  const segments = input.split('.')
+  if (segments.length < 3) {
+    return {
+      success: false,
+      message: 'NSID needs at least three parts',
+    }
   }
-  for (let i = 0; i < labels.length; i++) {
-    const l = labels[i]
+  for (const l of segments) {
     if (l.length < 1) {
-      throw new InvalidNsidError('NSID parts can not be empty')
+      return {
+        success: false,
+        message: 'NSID parts can not be empty',
+      }
     }
     if (l.length > 63) {
-      throw new InvalidNsidError('NSID part too long (max 63 chars)')
+      return {
+        success: false,
+        message: 'NSID part too long (max 63 chars)',
+      }
     }
-    if (l.endsWith('-') || l.startsWith('-')) {
-      throw new InvalidNsidError('NSID parts can not start or end with hyphen')
+    if (startsWithHyphen(l) || endsWithHyphen(l)) {
+      return {
+        success: false,
+        message: 'NSID parts can not start or end with hyphen',
+      }
     }
-    if (/^[0-9]/.test(l) && i === 0) {
-      throw new InvalidNsidError('NSID first part may not start with a digit')
+  }
+  if (startsWithNumber(segments[0])) {
+    return {
+      success: false,
+      message: 'NSID first part may not start with a digit',
     }
-    if (!/^[a-zA-Z]+$/.test(l) && i + 1 === labels.length) {
-      throw new InvalidNsidError('NSID name part must be only letters')
+  }
+  if (!isValidIdentifier(segments[segments.length - 1])) {
+    return {
+      success: false,
+      message:
+        'NSID name part must be only letters and digits (and no leading digit)',
     }
   }
+  return {
+    success: true,
+    value: segments,
+  }
 }
 
-export const ensureValidNsidRegex = (nsid: string): void => {
-  // simple regex to enforce most constraints via just regex and length.
-  // hand wrote this regex based on above constraints
+function hasDisallowedCharacters(v) {
+  return !/^[a-zA-Z0-9.-]*$/.test(v)
+}
+
+function startsWithNumber(v: string) {
+  const charCode = v.charCodeAt(0)
+  return charCode >= 48 && charCode <= 57
+}
+
+function startsWithHyphen(v: string) {
+  return v.charCodeAt(0) === 45 /* - */
+}
+
+function endsWithHyphen(v: string) {
+  return v.charCodeAt(v.length - 1) === 45 /* - */
+}
+
+function isValidIdentifier(v: string) {
+  // Note, since we already know that "v" only contains [a-zA-Z0-9-], we can
+  // simplify the following regex by checking only the first char and presence
+  // of "-".
+
+  // return /^[a-zA-Z][a-zA-Z0-9]*$/.test(v)
+  return !startsWithNumber(v) && !v.includes('-')
+}
+
+/**
+ * @deprecated Use {@link ensureValidNsid} if you care about error details,
+ * {@link parseNsid}/{@link NSID.parse} if you need the parsed segments, or
+ * {@link isValidNsid} if you just want a boolean.
+ */
+export function ensureValidNsidRegex(nsid: string): void {
+  const result = validateNsidRegex(nsid)
+  if (!result.success) throw new InvalidNsidError(result.message)
+}
+
+/**
+ * Regexp based validation that behaves identically to the previous code but
+ * provides less detailed error messages (while being 20% to 50% faster).
+ */
+export function validateNsidRegex(value: string): ValidateResult<string> {
+  if (value.length > 253 + 1 + 63) {
+    return {
+      success: false,
+      message: 'NSID is too long (317 chars max)',
+    }
+  }
+
   if (
-    !/^[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(\.[a-zA-Z]([a-zA-Z]{0,61}[a-zA-Z])?)$/.test(
-      nsid,
+    !/^[a-zA-Z](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?:\.[a-zA-Z](?:[a-zA-Z0-9]{0,62})?)$/.test(
+      value,
     )
   ) {
-    throw new InvalidNsidError("NSID didn't validate via regex")
+    return {
+      success: false,
+      message: "NSID didn't validate via regex",
+    }
   }
-  if (nsid.length > 253 + 1 + 63) {
-    throw new InvalidNsidError('NSID is too long (317 chars max)')
+
+  return {
+    success: true,
+    value,
   }
 }
 

package/tests/nsid.test.ts

@@ -1,10 +1,12 @@
 import * as fs from 'node:fs'
-import * as readline from 'node:readline'
 import {
   InvalidNsidError,
   NSID,
   ensureValidNsid,
-  ensureValidNsidRegex,
+  isValidNsid,
+  parseNsid,
+  validateNsid,
+  validateNsidRegex,
 } from '../src'
 
 describe('NSID parsing & creation', () => {
@@ -39,12 +41,30 @@ describe('NSID parsing & creation', () => {
 
 describe('NSID validation', () => {
   const expectValid = (h: string) => {
+    expect(isValidNsid(h)).toBe(true)
     ensureValidNsid(h)
-    ensureValidNsidRegex(h)
+    expect(parseNsid(h)).toEqual(h.split('.'))
+    expect(validateNsidRegex(h)).toMatchObject({
+      success: true,
+      value: expect.any(String),
+    })
+    expect(validateNsid(h)).toMatchObject({
+      success: true,
+      value: expect.any(Array),
+    })
   }
   const expectInvalid = (h: string) => {
+    expect(isValidNsid(h)).toBe(false)
+    expect(() => parseNsid(h)).toThrow(InvalidNsidError)
     expect(() => ensureValidNsid(h)).toThrow(InvalidNsidError)
-    expect(() => ensureValidNsidRegex(h)).toThrow(InvalidNsidError)
+    expect(validateNsidRegex(h)).toMatchObject({
+      success: false,
+      message: expect.any(String),
+    })
+    expect(validateNsid(h)).toMatchObject({
+      success: false,
+      message: expect.any(String),
+    })
   }
 
   it('enforces spec details', () => {
@@ -68,91 +88,111 @@ describe('NSID validation', () => {
     const tooLongOverall = 'com.' + 'middle.'.repeat(50) + 'foo'
     expect(tooLongOverall.length).toBe(357)
     expectInvalid(tooLongOverall)
-
-    expectValid('com.example.fooBar')
-    expectValid('net.users.bob.ping')
-    expectValid('a.b.c')
-    expectValid('m.xn--masekowski-d0b.pl')
-    expectValid('one.two.three')
-    expectValid('one.two.three.four-and.FiVe')
-    expectValid('one.2.three')
-    expectValid('a-0.b-1.c')
-    expectValid('a0.b1.cc')
-    expectValid('cn.8.lex.stuff')
-    expectValid('test.12345.record')
-    expectValid('a01.thing.record')
-    expectValid('a.0.c')
-    expectValid('xn--fiqs8s.xn--fiqa61au8b7zsevnm8ak20mc4a87e.record.two')
-
-    expectInvalid('com.example.foo.*')
-    expectInvalid('com.example.foo.blah*')
-    expectInvalid('com.example.foo.*blah')
-    expectInvalid('com.example.f00')
-    expectInvalid('com.exa💩ple.thing')
-    expectInvalid('a-0.b-1.c-3')
-    expectInvalid('a-0.b-1.c-o')
-    expectInvalid('a0.b1.c3')
-    expectInvalid('1.0.0.127.record')
-    expectInvalid('0two.example.foo')
-    expectInvalid('example.com')
-    expectInvalid('com.example')
-    expectInvalid('a.')
-    expectInvalid('.one.two.three')
-    expectInvalid('one.two.three ')
-    expectInvalid('one.two..three')
-    expectInvalid('one .two.three')
-    expectInvalid(' one.two.three')
-    expectInvalid('com.exa💩ple.thing')
-    expectInvalid('com.atproto.feed.p@st')
-    expectInvalid('com.atproto.feed.p_st')
-    expectInvalid('com.atproto.feed.p*st')
-    expectInvalid('com.atproto.feed.po#t')
-    expectInvalid('com.atproto.feed.p!ot')
-    expectInvalid('com.example-.foo')
   })
 
-  it('allows onion (Tor) NSIDs', () => {
-    expectValid('onion.expyuzz4wqqyqhjn.spec.getThing')
-    expectValid(
+  describe('valid NSIDs', () => {
+    for (const validNsid of [
+      'com.example.foo',
+      'o'.repeat(63) + '.foo.bar',
+      'com.' + 'o'.repeat(63) + '.foo',
+      'com.example.' + 'o'.repeat(63),
+      'com.' + 'middle.'.repeat(40) + 'foo',
+
+      'a-0.b-1.c',
+      'a.0.c',
+      'a.b.c',
+      'a0.b1.c3',
+      'a0.b1.cc',
+      'a01.thing.record',
+      'cn.8.lex.stuff',
+      'com.example.f00',
+      'com.example.fooBar',
+      'm.xn--masekowski-d0b.pl',
+      'net.users.bob.ping',
+      'one.2.three',
+      'one.two.three',
+      'one.two.three.four-and.FiVe',
+      'onion.2gzyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.lex.deleteThing',
+      'onion.expyuzz4wqqyqhjn.spec.getThing',
       'onion.g2zyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.lex.deleteThing',
-    )
+      'org.4chan.lex.getThing',
+      'test.12345.record',
+      'xn--fiqs8s.xn--fiqa61au8b7zsevnm8ak20mc4a87e.record.two',
+    ]) {
+      it(validNsid, () => {
+        expectValid(validNsid)
+      })
+    }
   })
 
-  it('allows starting-with-numeric segments (same as domains)', () => {
-    expectValid('org.4chan.lex.getThing')
-    expectValid('cn.8.lex.stuff')
-    expectValid(
-      'onion.2gzyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.lex.deleteThing',
-    )
+  describe('invalid NSIDs', () => {
+    for (const invalidNsid of [
+      'o'.repeat(64) + '.foo.bar',
+      'com.' + 'o'.repeat(64) + '.foo',
+      'com.example.' + 'o'.repeat(64),
+      'com.' + 'middle.'.repeat(50) + 'foo',
+      'com.example.foo.*',
+      'com.example.foo.blah*',
+      'com.example.foo.*blah',
+      'com.exa💩ple.thing',
+      'a-0.b-1.c-3',
+      'a-0.b-1.c-o',
+      '1.0.0.127.record',
+      '0two.example.foo',
+      'example.com',
+      'com.example',
+      'a.',
+      '.one.two.three',
+      'one.two.three ',
+      'one.two..three',
+      'one .two.three',
+      ' one.two.three',
+      'com.atproto.feed.p@st',
+      'com.atproto.feed.p_st',
+      'com.atproto.feed.p*st',
+      'com.atproto.feed.po#t',
+      'com.atproto.feed.p!ot',
+      'com.example-.foo',
+      'com.-example.foo',
+      'com.example.0foo',
+      'com.example.f-o',
+    ]) {
+      it(invalidNsid, () => {
+        expect(validateNsid(invalidNsid)).toMatchObject({
+          success: false,
+          message: expect.any(String),
+        })
+      })
+    }
   })
 
-  it('conforms to interop valid NSIDs', () => {
-    const lineReader = readline.createInterface({
-      input: fs.createReadStream(
-        `${__dirname}/interop-files/nsid_syntax_valid.txt`,
-      ),
-      terminal: false,
-    })
-    lineReader.on('line', (line) => {
+  describe('conforms to interop valid NSIDs', () => {
+    for (const line of fs
+      .readFileSync(`${__dirname}/interop-files/nsid_syntax_valid.txt`)
+      .toString()
+      .split('\n')) {
       if (line.startsWith('#') || line.length === 0) {
-        return
+        continue
       }
-      expectValid(line)
-    })
+
+      it(line, () => {
+        expectValid(line)
+      })
+    }
   })
 
-  it('conforms to interop invalid NSIDs', () => {
-    const lineReader = readline.createInterface({
-      input: fs.createReadStream(
-        `${__dirname}/interop-files/nsid_syntax_invalid.txt`,
-      ),
-      terminal: false,
-    })
-    lineReader.on('line', (line) => {
+  describe('conforms to interop invalid NSIDs', () => {
+    for (const line of fs
+      .readFileSync(`${__dirname}/interop-files/nsid_syntax_invalid.txt`)
+      .toString()
+      .split('\n')) {
       if (line.startsWith('#') || line.length === 0) {
-        return
+        continue
       }
-      expectInvalid(line)
-    })
+
+      it(line, () => {
+        expectInvalid(line)
+      })
+    }
   })
 })

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.6.3"}
+{"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"}

package/tsconfig.tests.tsbuildinfo

@@ -1 +1 @@
-{"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.6.3"}
+{"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"}