simplify

bluesky-social · Dec 2, 2024 · 2714235 · 2714235
1 parent 617d86c
commit 2714235
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 35 deletions.
diff --git a/packages/api/src/client/util.ts b/packages/api/src/client/util.ts
@@ -16,13 +16,7 @@ function check$type<Id extends string, Hash extends string>(
 ): $type is $Type<Id, Hash> {
   return (
     typeof $type === 'string' &&
-    ($type === id
-      ? hash === 'main'
-      : // $type === `${id}#${hash}`
-        $type.length === id.length + 1 + hash.length &&
-        $type[id.length] === '#' &&
-        $type.startsWith(id) &&
-        $type.endsWith(hash))
+    ($type === id ? hash === 'main' : $type === `${id}#${hash}`)
   )
 }
 

diff --git a/packages/bsky/src/lexicon/util.ts b/packages/bsky/src/lexicon/util.ts
@@ -16,13 +16,7 @@ function check$type<Id extends string, Hash extends string>(
 ): $type is $Type<Id, Hash> {
   return (
     typeof $type === 'string' &&
-    ($type === id
-      ? hash === 'main'
-      : // $type === `${id}#${hash}`
-        $type.length === id.length + 1 + hash.length &&
-        $type[id.length] === '#' &&
-        $type.startsWith(id) &&
-        $type.endsWith(hash))
+    ($type === id ? hash === 'main' : $type === `${id}#${hash}`)
   )
 }
 

diff --git a/packages/lex-cli/src/codegen/common.ts b/packages/lex-cli/src/codegen/common.ts
@@ -29,13 +29,7 @@ function check$type<Id extends string, Hash extends string>(
 ): $type is $Type<Id, Hash> {
   return (
     typeof $type === 'string' &&
-    ($type === id
-      ? hash === 'main'
-      : // $type === \`\${id}#\${hash}\`
-        $type.length === id.length + 1 + hash.length &&
-        $type[id.length] === '#' &&
-        $type.startsWith(id) &&
-        $type.endsWith(hash))
+    ($type === id ? hash === 'main' : $type === \`\${id}#\${hash}\`)
   )
 }
 

diff --git a/packages/ozone/src/lexicon/util.ts b/packages/ozone/src/lexicon/util.ts
@@ -16,13 +16,7 @@ function check$type<Id extends string, Hash extends string>(
 ): $type is $Type<Id, Hash> {
   return (
     typeof $type === 'string' &&
-    ($type === id
-      ? hash === 'main'
-      : // $type === `${id}#${hash}`
-        $type.length === id.length + 1 + hash.length &&
-        $type[id.length] === '#' &&
-        $type.startsWith(id) &&
-        $type.endsWith(hash))
+    ($type === id ? hash === 'main' : $type === `${id}#${hash}`)
   )
 }
 

diff --git a/packages/pds/src/lexicon/util.ts b/packages/pds/src/lexicon/util.ts
@@ -16,13 +16,7 @@ function check$type<Id extends string, Hash extends string>(
 ): $type is $Type<Id, Hash> {
   return (
     typeof $type === 'string' &&
-    ($type === id
-      ? hash === 'main'
-      : // $type === `${id}#${hash}`
-        $type.length === id.length + 1 + hash.length &&
-        $type[id.length] === '#' &&
-        $type.startsWith(id) &&
-        $type.endsWith(hash))
+    ($type === id ? hash === 'main' : $type === `${id}#${hash}`)
   )
 }