validate color by using the same pattern on the schema instead of an

external library
digidem · May 14, 2024 · e99cc47 · e99cc47
1 parent dc578fe
commit e99cc47
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,8 +56,7 @@
     "protobufjs": "^7.2.5",
     "type-fest": "^4.1.0",
     "typedoc": "^0.24.8",
-    "typedoc-plugin-markdown": "^3.15.4",
-    "validate-color": "^2.2.4"
+    "typedoc-plugin-markdown": "^3.15.4"
   },
   "eslintConfig": {
     "env": {

diff --git a/src/lib/encode-conversions.ts b/src/lib/encode-conversions.ts
@@ -17,8 +17,12 @@ import {
   type Observation_5_Attachment,
 } from '../proto/observation/v5.js'
 import { ExhaustivenessError, parseVersionId } from './utils.js'
-import { CoreOwnership, type Observation, type Track } from '../index.js'
-import validateColor from 'validate-color'
+import {
+  CoreOwnership,
+  valueSchemas,
+  type Observation,
+  type Track,
+} from '../index.js'
 
 /** Function type for converting a protobuf type of any version for a particular
  * schema name, and returning the most recent JSONSchema type */
@@ -67,7 +71,8 @@ export const convertField: ConvertFunction<'field'> = (mapeoDoc) => {
 }
 
 export const convertPreset: ConvertFunction<'preset'> = (mapeoDoc) => {
-  if (!validateColor.validateHTMLColorHex(mapeoDoc.color)) {
+  const colorRegex = valueSchemas.preset.properties.color.pattern
+  if (!mapeoDoc.color.match(colorRegex)) {
     throw new Error(`invalid color string ${mapeoDoc.color}`)
   }
   return {