c063 1.6.4 → 1.6.5

package/dist/utils/index.d.ts

@@ -1,5 +1,15 @@
 import React from "react";
 import { CodeTokenBuilder, CodeTokenProps, CodeTokenType } from "../types";
+/**
+ * 檢查給定的值是否為有效的 `CodeTokenType`。
+ * @param value 要檢查的值
+ * @returns 如果值是有效的 `CodeTokenType`，則返回 `true`，否則返回 `false`
+ * @example
+ * ```ts
+ * isCodeTokenType("keyword1"); // true
+ * isCodeTokenType("invalidType"); // false
+ * ```
+ */
 export declare const isCodeTokenType: (value: any) => value is CodeTokenType;
 /**
  * `c063` 是一組語法高亮 token 建構器集合。

package/dist/utils/index.js

@@ -1,22 +1,32 @@
 import React from "react";
+const CODE_TOKEN_TYPES = new Set([
+    "keyword1",
+    "keyword2",
+    "function",
+    "string",
+    "number",
+    "comment",
+    "type",
+    "variable",
+    "constant",
+    "brackets1",
+    "brackets2",
+    "brackets3",
+    "operator",
+    "default",
+]);
+/**
+ * 檢查給定的值是否為有效的 `CodeTokenType`。
+ * @param value 要檢查的值
+ * @returns 如果值是有效的 `CodeTokenType`，則返回 `true`，否則返回 `false`
+ * @example
+ * ```ts
+ * isCodeTokenType("keyword1"); // true
+ * isCodeTokenType("invalidType"); // false
+ * ```
+ */
 export const isCodeTokenType = (value) => {
-    const codeTokenTypes = [
-        "keyword1",
-        "keyword2",
-        "function",
-        "string",
-        "number",
-        "comment",
-        "type",
-        "variable",
-        "constant",
-        "brackets1",
-        "brackets2",
-        "brackets3",
-        "operator",
-        "default",
-    ];
-    return codeTokenTypes.includes(value);
+    return CODE_TOKEN_TYPES.has(value);
 };
 /**
  * `c063` 是一組語法高亮 token 建構器集合。
@@ -32,7 +42,7 @@ export const isCodeTokenType = (value) => {
  * @returns 以 `CodeTokenType` 為 key 的建構器函式集合。
  */
 const c063 = new Proxy({}, {
-    get: (target, prop, receiver) => {
+    get: (_, prop) => {
         /**
          * 建立指定語法類型的 CodeToken。
          *
@@ -42,7 +52,7 @@ const c063 = new Proxy({}, {
          */
         const builder = (children, props) => {
             if (!isCodeTokenType(prop)) {
-                return Reflect.get(target, prop, receiver);
+                throw new Error(`Invalid CodeTokenType: ${String(prop)}`);
             }
             return {
                 children,
@@ -109,6 +119,9 @@ export const extractTokenContent = (token) => {
  * @returns 是否相等
  */
 export const isTokenEqual = (a, b) => {
+    if (!isCodeTokenType(a.type) || !isCodeTokenType(b.type)) {
+        return false;
+    }
     return a.type === b.type && extractTokenContent(a) === extractTokenContent(b);
 };
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "c063",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "A React component for displaying code snippets with syntax highlighting.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/utils/index.tsx

@@ -6,26 +6,35 @@ import {
   ParsableLanguage,
 } from "../types";
 
+const CODE_TOKEN_TYPES = new Set<CodeTokenType>([
+  "keyword1",
+  "keyword2",
+  "function",
+  "string",
+  "number",
+  "comment",
+  "type",
+  "variable",
+  "constant",
+  "brackets1",
+  "brackets2",
+  "brackets3",
+  "operator",
+  "default",
+]);
+/**
+ * 檢查給定的值是否為有效的 `CodeTokenType`。
+ * @param value 要檢查的值
+ * @returns 如果值是有效的 `CodeTokenType`，則返回 `true`，否則返回 `false`
+ * @example
+ * ```ts
+ * isCodeTokenType("keyword1"); // true
+ * isCodeTokenType("invalidType"); // false
+ * ```
+ */
 export const isCodeTokenType = (value: any): value is CodeTokenType => {
-  const codeTokenTypes: CodeTokenType[] = [
-    "keyword1",
-    "keyword2",
-    "function",
-    "string",
-    "number",
-    "comment",
-    "type",
-    "variable",
-    "constant",
-    "brackets1",
-    "brackets2",
-    "brackets3",
-    "operator",
-    "default",
-  ];
-  return codeTokenTypes.includes(value);
+  return CODE_TOKEN_TYPES.has(value);
 };
-  
 
 /**
  * `c063` 是一組語法高亮 token 建構器集合。
@@ -43,7 +52,7 @@ export const isCodeTokenType = (value: any): value is CodeTokenType => {
 const c063 = new Proxy(
   {},
   {
-    get: (target, prop: CodeTokenType, receiver) => {
+    get: (_, prop: CodeTokenType) => {
       /**
        * 建立指定語法類型的 CodeToken。
        *
@@ -56,7 +65,7 @@ const c063 = new Proxy(
         props?: CodeTokenProps<T>
       ) => {
         if (!isCodeTokenType(prop)) {
-          return Reflect.get(target, prop, receiver);
+          throw new Error(`Invalid CodeTokenType: ${String(prop)}`);
         }
         return {
           children,
@@ -132,6 +141,9 @@ export const isTokenEqual = <T extends React.ElementType>(
   a: CodeTokenProps<T>,
   b: CodeTokenProps<T>
 ): boolean => {
+  if (!isCodeTokenType(a.type) || !isCodeTokenType(b.type)) {
+    return false;
+  }
   return a.type === b.type && extractTokenContent(a) === extractTokenContent(b);
 };