@atproto/syntax 0.4.0 → 0.4.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atproto/syntax
 
+## 0.4.2
+
+### Patch Changes
+
+- [#4389](https://github.com/bluesky-social/atproto/pull/4389) [`bcae2b7`](https://github.com/bluesky-social/atproto/commit/bcae2b77b68da6dc2ec202651c8bf41fd5769f69) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve typing of various string formats
+
+## 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

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/at-identifier.d.ts

@@ -0,0 +1,5 @@
+import { DidString } from './did.js';
+import { HandleString } from './handle.js';
+export type AtIdentifierString = DidString | HandleString;
+export declare function ensureValidAtIdentifier(input: string): asserts input is AtIdentifierString;
+//# sourceMappingURL=at-identifier.d.ts.map

package/dist/at-identifier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"at-identifier.d.ts","sourceRoot":"","sources":["../src/at-identifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAuB,MAAM,UAAU,CAAA;AACzD,OAAO,EACL,YAAY,EAGb,MAAM,aAAa,CAAA;AAEpB,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,YAAY,CAAA;AAEzD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,KAAK,IAAI,kBAAkB,CAUrC"}

package/dist/at-identifier.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureValidAtIdentifier = ensureValidAtIdentifier;
+const did_js_1 = require("./did.js");
+const handle_js_1 = require("./handle.js");
+function ensureValidAtIdentifier(input) {
+    try {
+        if (input.startsWith('did:')) {
+            (0, did_js_1.ensureValidDidRegex)(input);
+        }
+        else {
+            (0, handle_js_1.ensureValidHandleRegex)(input);
+        }
+    }
+    catch (cause) {
+        throw new handle_js_1.InvalidHandleError('Invalid DID or handle', { cause });
+    }
+}
+//# sourceMappingURL=at-identifier.js.map

package/dist/at-identifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"at-identifier.js","sourceRoot":"","sources":["../src/at-identifier.ts"],"names":[],"mappings":";;AASA,0DAYC;AArBD,qCAAyD;AACzD,2CAIoB;AAIpB,SAAgB,uBAAuB,CACrC,KAAa;IAEb,IAAI,CAAC;QACH,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,IAAA,4BAAmB,EAAC,KAAK,CAAC,CAAA;QAC5B,CAAC;aAAM,CAAC;YACN,IAAA,kCAAsB,EAAC,KAAK,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,8BAAkB,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;IAClE,CAAC;AACH,CAAC","sourcesContent":["import { DidString, ensureValidDidRegex } from './did.js'\nimport {\n  HandleString,\n  InvalidHandleError,\n  ensureValidHandleRegex,\n} from './handle.js'\n\nexport type AtIdentifierString = DidString | HandleString\n\nexport function ensureValidAtIdentifier(\n  input: string,\n): asserts input is AtIdentifierString {\n  try {\n    if (input.startsWith('did:')) {\n      ensureValidDidRegex(input)\n    } else {\n      ensureValidHandleRegex(input)\n    }\n  } catch (cause) {\n    throw new InvalidHandleError('Invalid DID or handle', { cause })\n  }\n}\n"]}

package/dist/aturi.d.ts

@@ -1,14 +1,16 @@
-export * from './aturi_validation';
+import { AtIdentifierString } from './at-identifier.js';
+import { AtUriString } from './aturi_validation.js';
+export * from './aturi_validation.js';
 export declare const ATP_URI_REGEX: RegExp;
 export declare class AtUri {
     hash: string;
-    host: string;
+    host: AtIdentifierString;
     pathname: string;
     searchParams: URLSearchParams;
-    constructor(uri: string, base?: string);
+    constructor(uri: string, base?: string | AtUri);
     static make(handleOrDid: string, collection?: string, rkey?: string): AtUri;
     get protocol(): string;
-    get origin(): string;
+    get origin(): `at://did:${string}:${string}` | `at://${string}.${string}`;
     get hostname(): string;
     set hostname(v: string);
     get search(): string;
@@ -17,7 +19,7 @@ export declare class AtUri {
     set collection(v: string);
     get rkey(): string;
     set rkey(v: string);
-    get href(): string;
-    toString(): string;
+    get href(): AtUriString;
+    toString(): AtUriString;
 }
 //# sourceMappingURL=aturi.d.ts.map

package/dist/aturi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aturi.d.ts","sourceRoot":"","sources":["../src/aturi.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAElC,eAAO,MAAM,aAAa,QAEyE,CAAA;AAInG,qBAAa,KAAK;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,eAAe,CAAA;gBAEjB,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAyBtC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAOnE,IAAI,QAAQ,WAEX;IAED,IAAI,MAAM,WAET;IAED,IAAI,QAAQ,IAII,MAAM,CAFrB;IAED,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,EAErB;IAED,IAAI,MAAM,IAII,MAAM,CAFnB;IAED,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAEnB;IAED,IAAI,UAAU,IAII,MAAM,CAFvB;IAED,IAAI,UAAU,CAAC,CAAC,EAAE,MAAM,EAIvB;IAED,IAAI,IAAI,IAII,MAAM,CAFjB;IAED,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,EAKjB;IAED,IAAI,IAAI,WAEP;IAED,QAAQ;CAeT"}
+{"version":3,"file":"aturi.d.ts","sourceRoot":"","sources":["../src/aturi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA2B,MAAM,oBAAoB,CAAA;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGnD,cAAc,uBAAuB,CAAA;AAErC,eAAO,MAAM,aAAa,QAEyE,CAAA;AAInG,qBAAa,KAAK;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,kBAAkB,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,eAAe,CAAA;gBAEjB,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK;IAgB9C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAOnE,IAAI,QAAQ,WAEX;IAED,IAAI,MAAM,gEAET;IAED,IAAI,QAAQ,IAII,MAAM,CAFrB;IAED,IAAI,QAAQ,CAAC,CAAC,EAAE,MAAM,EAGrB;IAED,IAAI,MAAM,IAII,MAAM,CAFnB;IAED,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAEnB;IAED,IAAI,UAAU,IAII,MAAM,CAFvB;IAED,IAAI,UAAU,CAAC,CAAC,EAAE,MAAM,EAKvB;IAED,IAAI,IAAI,IAII,MAAM,CAFjB;IAED,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,EAKjB;IAED,IAAI,IAAI,gBAEP;IAED,QAAQ,IAAI,WAAW;CAexB"}

package/dist/aturi.js

@@ -15,7 +15,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AtUri = exports.ATP_URI_REGEX = void 0;
-__exportStar(require("./aturi_validation"), exports);
+const at_identifier_js_1 = require("./at-identifier.js");
+const nsid_js_1 = require("./nsid.js");
+__exportStar(require("./aturi_validation.js"), exports);
 exports.ATP_URI_REGEX = 
 // proto-    --did--------------   --name----------------   --path----   --query--   --hash--
 /^(at:\/\/)?((?:did:[a-z0-9:%-]+)|(?:[a-z0-9][a-z0-9.:-]*))(\/[^?#\s]*)?(\?[^#\s]+)?(#[^\s]+)?$/i;
@@ -47,27 +49,15 @@ class AtUri {
             writable: true,
             value: void 0
         });
-        let parsed;
-        if (base) {
-            parsed = parse(base);
-            if (!parsed) {
-                throw new Error(`Invalid at uri: ${base}`);
-            }
-            const relativep = parseRelative(uri);
-            if (!relativep) {
-                throw new Error(`Invalid path: ${uri}`);
-            }
-            Object.assign(parsed, relativep);
-        }
-        else {
-            parsed = parse(uri);
-            if (!parsed) {
-                throw new Error(`Invalid at uri: ${uri}`);
-            }
-        }
-        this.hash = parsed.hash;
+        const parsed = base !== undefined
+            ? typeof base === 'string'
+                ? Object.assign(parse(base), parseRelative(uri))
+                : Object.assign({ host: base.host }, parseRelative(uri))
+            : parse(uri);
+        (0, at_identifier_js_1.ensureValidAtIdentifier)(parsed.host);
+        this.hash = parsed.hash ?? '';
         this.host = parsed.host;
-        this.pathname = parsed.pathname;
+        this.pathname = parsed.pathname ?? '';
         this.searchParams = parsed.searchParams;
     }
     static make(handleOrDid, collection, rkey) {
@@ -88,6 +78,7 @@ class AtUri {
         return this.host;
     }
     set hostname(v) {
+        (0, at_identifier_js_1.ensureValidAtIdentifier)(v);
         this.host = v;
     }
     get search() {
@@ -100,6 +91,7 @@ class AtUri {
         return this.pathname.split('/').filter(Boolean)[0] || '';
     }
     set collection(v) {
+        (0, nsid_js_1.ensureValidNsid)(v);
         const parts = this.pathname.split('/').filter(Boolean);
         parts[0] = v;
         this.pathname = parts.join('/');
@@ -109,8 +101,7 @@ class AtUri {
     }
     set rkey(v) {
         const parts = this.pathname.split('/').filter(Boolean);
-        if (!parts[0])
-            parts[0] = 'undefined';
+        parts[0] || (parts[0] = 'undefined');
         parts[1] = v;
         this.pathname = parts.join('/');
     }
@@ -122,9 +113,9 @@ class AtUri {
         if (!path.startsWith('/')) {
             path = `/${path}`;
         }
-        let qs = this.searchParams.toString();
-        if (qs && !qs.startsWith('?')) {
-            qs = `?${qs}`;
+        let qs = '';
+        if (this.searchParams.size) {
+            qs = `?${this.searchParams.toString()}`;
         }
         let hash = this.hash;
         if (hash && !hash.startsWith('#')) {
@@ -135,26 +126,26 @@ class AtUri {
 }
 exports.AtUri = AtUri;
 function parse(str) {
-    const match = exports.ATP_URI_REGEX.exec(str);
-    if (match) {
-        return {
-            hash: match[5] || '',
-            host: match[2] || '',
-            pathname: match[3] || '',
-            searchParams: new URLSearchParams(match[4] || ''),
-        };
-    }
-    return undefined;
+    const match = str.match(exports.ATP_URI_REGEX);
+    if (!match) {
+        throw new Error(`Invalid AT uri: ${str}`);
+    }
+    return {
+        host: match[2],
+        hash: match[5],
+        pathname: match[3],
+        searchParams: new URLSearchParams(match[4]),
+    };
 }
 function parseRelative(str) {
-    const match = RELATIVE_REGEX.exec(str);
-    if (match) {
-        return {
-            hash: match[3] || '',
-            pathname: match[1] || '',
-            searchParams: new URLSearchParams(match[2] || ''),
-        };
-    }
-    return undefined;
+    const match = str.match(RELATIVE_REGEX);
+    if (!match) {
+        throw new Error(`Invalid path: ${str}`);
+    }
+    return {
+        hash: match[3],
+        pathname: match[1],
+        searchParams: new URLSearchParams(match[2]),
+    };
 }
 //# sourceMappingURL=aturi.js.map

package/dist/aturi.js.map

@@ -1 +1 @@
-{"version":3,"file":"aturi.js","sourceRoot":"","sources":["../src/aturi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aturi.js","sourceRoot":"","sources":["../src/aturi.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtIdentifierString, ensureValidAtIdentifier } from './at-identifier.js'\nimport { AtUriString } from './aturi_validation.js'\nimport { ensureValidNsid } from './nsid.js'\n\nexport * from './aturi_validation.js'\n\nexport const ATP_URI_REGEX =\n  // proto-    --did--------------   --name----------------   --path----   --query--   --hash--\n  /^(at:\\/\\/)?((?:did:[a-z0-9:%-]+)|(?:[a-z0-9][a-z0-9.:-]*))(\\/[^?#\\s]*)?(\\?[^#\\s]+)?(#[^\\s]+)?$/i\n//                       --path-----   --query--  --hash--\nconst RELATIVE_REGEX = /^(\\/[^?#\\s]*)?(\\?[^#\\s]+)?(#[^\\s]+)?$/i\n\nexport class AtUri {\n  hash: string\n  host: AtIdentifierString\n  pathname: string\n  searchParams: URLSearchParams\n\n  constructor(uri: string, base?: string | AtUri) {\n    const parsed =\n      base !== undefined\n        ? typeof base === 'string'\n          ? Object.assign(parse(base), parseRelative(uri))\n          : Object.assign({ host: base.host }, parseRelative(uri))\n        : parse(uri)\n\n    ensureValidAtIdentifier(parsed.host)\n\n    this.hash = parsed.hash ?? ''\n    this.host = parsed.host\n    this.pathname = parsed.pathname ?? ''\n    this.searchParams = parsed.searchParams\n  }\n\n  static make(handleOrDid: string, collection?: string, rkey?: string) {\n    let str = handleOrDid\n    if (collection) str += '/' + collection\n    if (rkey) str += '/' + rkey\n    return new AtUri(str)\n  }\n\n  get protocol() {\n    return 'at:'\n  }\n\n  get origin() {\n    return `at://${this.host}` as const\n  }\n\n  get hostname() {\n    return this.host\n  }\n\n  set hostname(v: string) {\n    ensureValidAtIdentifier(v)\n    this.host = v\n  }\n\n  get search() {\n    return this.searchParams.toString()\n  }\n\n  set search(v: string) {\n    this.searchParams = new URLSearchParams(v)\n  }\n\n  get collection() {\n    return this.pathname.split('/').filter(Boolean)[0] || ''\n  }\n\n  set collection(v: string) {\n    ensureValidNsid(v)\n    const parts = this.pathname.split('/').filter(Boolean)\n    parts[0] = v\n    this.pathname = parts.join('/')\n  }\n\n  get rkey() {\n    return this.pathname.split('/').filter(Boolean)[1] || ''\n  }\n\n  set rkey(v: string) {\n    const parts = this.pathname.split('/').filter(Boolean)\n    parts[0] ||= 'undefined'\n    parts[1] = v\n    this.pathname = parts.join('/')\n  }\n\n  get href() {\n    return this.toString()\n  }\n\n  toString(): AtUriString {\n    let path = this.pathname || '/'\n    if (!path.startsWith('/')) {\n      path = `/${path}`\n    }\n    let qs = ''\n    if (this.searchParams.size) {\n      qs = `?${this.searchParams.toString()}`\n    }\n    let hash = this.hash\n    if (hash && !hash.startsWith('#')) {\n      hash = `#${hash}`\n    }\n    return `at://${this.host}${path}${qs}${hash}` as AtUriString\n  }\n}\n\nfunction parse(str: string) {\n  const match = str.match(ATP_URI_REGEX) as null | {\n    0: string\n    1: string | undefined // proto\n    2: string // host\n    3: string | undefined // path\n    4: string | undefined // query\n    5: string | undefined // hash\n  }\n\n  if (!match) {\n    throw new Error(`Invalid AT uri: ${str}`)\n  }\n\n  return {\n    host: match[2],\n    hash: match[5],\n    pathname: match[3],\n    searchParams: new URLSearchParams(match[4]),\n  }\n}\n\nfunction parseRelative(str: string) {\n  const match = str.match(RELATIVE_REGEX) as null | {\n    0: string\n    1: string | undefined // path\n    2: string | undefined // query\n    3: string | undefined // hash\n  }\n\n  if (!match) {\n    throw new Error(`Invalid path: ${str}`)\n  }\n\n  return {\n    hash: match[3],\n    pathname: match[1],\n    searchParams: new URLSearchParams(match[2]),\n  }\n}\n"]}

package/dist/aturi_validation.d.ts

@@ -1,3 +1,6 @@
-export declare const ensureValidAtUri: (uri: string) => void;
-export declare const ensureValidAtUriRegex: (uri: string) => void;
+import { AtIdentifierString } from './at-identifier.js';
+import { NsidString } from './nsid.js';
+export type AtUriString = `at://${AtIdentifierString}` | `at://${AtIdentifierString}/${NsidString}` | `at://${AtIdentifierString}/${NsidString}/${string}`;
+export declare function ensureValidAtUri(input: string): asserts input is AtUriString;
+export declare function ensureValidAtUriRegex(uri: string): asserts uri is AtUriString;
 //# sourceMappingURL=aturi_validation.d.ts.map

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":"AAAA,OAAO,EAAE,kBAAkB,EAA2B,MAAM,oBAAoB,CAAA;AAGhF,OAAO,EAAE,UAAU,EAAe,MAAM,WAAW,CAAA;AAEnD,MAAM,MAAM,WAAW,GACnB,QAAQ,kBAAkB,EAAE,GAC5B,QAAQ,kBAAkB,IAAI,UAAU,EAAE,GAC1C,QAAQ,kBAAkB,IAAI,UAAU,IAAI,MAAM,EAAE,CAAA;AAgBxD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,IAAI,WAAW,CAiF5E;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,IAAI,WAAW,CA4B7E"}