Reject code points between tilde and inverted bang

dingosky · dingosky · commit 06d942e8e2e8 · 2023-01-06T20:47:48.000+01:00
diff --git a/src/lib/chars.spec.ts b/src/lib/chars.spec.ts
@@ -34,7 +34,7 @@ test('invalid characters', (t) => {
   t.regex(invalidChars("dingo'sky"), /Invalid/)
   t.regex(invalidChars('dingo\\sky'), /Invalid/)
   t.regex(invalidChars('dingo`sky'), /Invalid/)
-  t.regex(invalidChars('dingo\x7Fsky'), /Invalid/)
+  t.regex(invalidChars('dingo\u0088sky'), /Invalid/)
 })
 
 test('non-unique character', (t) => t.regex(invalidChars('unique'), /not unique/))
diff --git a/src/lib/chars.ts b/src/lib/chars.ts
@@ -1,4 +1,4 @@
-import { ValidChars } from "../types/puid"
+import { ValidChars } from '../types/puid'
 
 /**
  * Pre-defined character sets
@@ -42,16 +42,17 @@ export const charsName = (chars: string): string => {
 }
 
 const validChar = (char: string): boolean => {
-  const codePoint = codePointOf(char)
+  const codePointNonBreakSpace = 160
 
-  if (160 < codePoint) return true
+  const codePoint = codePointOf(char)
 
-  if (char == '!') return true
-  if (codePoint < codePointOf('#')) return false
+  if (codePoint < codePointOf('!')) return false
+  if (char == '"') return false
   if (char == "'") return false
   if (char == '\\') return false
   if (char == '`') return false
-  if (codePointOf('~') < codePoint) return false
+  if (codePoint <= codePointOf('~')) return true
+  if (codePoint < codePointNonBreakSpace) return false
 
   return true
 }
