move and refactor size function

ChromeGG · Mar 14, 2024 · 0c709cc · 0c709cc
1 parent dd7deb2
commit 0c709cc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/helper.ts b/src/helper.ts
@@ -315,3 +315,15 @@ export const getPosition = (
 
   return ctx.children.OpenBracket[0].startOffset
 }
+
+export const size = (arr: unknown) => {
+  if (isString(arr) || isArray(arr)) {
+    return arr.length
+  }
+
+  if (isMap(arr)) {
+    return Object.keys(arr).length
+  }
+
+  throw new CelEvaluationError(`invalid_argument: ${arr}`)
+}
diff --git a/src/visitor.ts b/src/visitor.ts
@@ -26,27 +26,14 @@ import {
   getPosition,
   getResult,
   getUnaryResult,
+  size,
 } from './helper.js'
 import { CelEvaluationError } from './index.js'
 
 const parserInstance = new CelParser()
 
 const BaseCelVisitor = parserInstance.getBaseCstVisitorConstructor()
 
-const size = (arr: unknown) => {
-  switch (getCelType(arr)) {
-    case CelType.list:
-    case CelType.string:
-      // @ts-expect-error type assertion error
-      return arr.length
-    case CelType.map:
-      // @ts-expect-error type assertion error
-      return Object.keys(arr).length
-    default:
-      throw new CelEvaluationError(`invalid_argument: ${arr}`)
-  }
-}
-
 export class CelVisitor
   extends BaseCelVisitor
   implements ICstNodeVisitor<void, unknown>