cordo 2.2.2 → 2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordo",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "A framework for handling complex discord api interactions",
   "exports": {
     ".": "./src/index.ts",

package/src/components/builtin/container.ts

@@ -2,7 +2,7 @@ import { ComponentType, createComponent, renderComponentList, type CordoComponen
 import type { CordoModifier } from "../modifier"
 
 
-type AllowedComponents = CordoComponent<'ActionRow' | 'Button' | 'TextDisplay' | 'Section' | 'MediaGallery' | 'Seperator' | 'File' | 'StringSelect'> | CordoModifier
+export type AllowedComponents = CordoComponent<'ActionRow' | 'Button' | 'TextDisplay' | 'Section' | 'MediaGallery' | 'Seperator' | 'File' | 'StringSelect'> | CordoModifier
 type AllowedComponentArray = Array<AllowedComponents | AllowedComponents[]>
 
 export function container(...components: AllowedComponentArray) {
@@ -27,11 +27,10 @@ export function container(...components: AllowedComponentArray) {
     },
     *[Symbol.iterator]() {
       for (const component of components) {
-        if (Array.isArray(component)) {
+        if (Array.isArray(component))
           yield* component
-        } else {
+        else
           yield component
-        }
       }
     }
   }

package/src/components/component.ts

@@ -1,9 +1,10 @@
 import defu from "defu"
 import { row } from "./builtin/row"
 import { readModifier, type CordoModifier } from "./modifier"
+import type { AllowedComponents as ContainerAllowedComponents } from "./builtin/container"
 
 
-const CordoComponentSymbol = Symbol('CordoComponent')
+const CordoComponentSymbol = Symbol.for('CordoComponent')
 
 export const ComponentType = {
   ActionRow: 1,
@@ -38,7 +39,11 @@ export type CordoComponent<Type extends StringComponentType = StringComponentTyp
   }
   visible: (value: boolean) => CordoComponent<Type>
   attributes: (attrs: Record<string, any>) => CordoComponent<Type>
-} & (Type extends 'Container' ? { [Symbol.iterator]: () => Iterator<CordoComponent<StringComponentType>> } : { [Symbol.iterator]: never })
+} & (
+  Type extends 'Container'
+    ? { [Symbol.iterator]: () => Iterator<ContainerAllowedComponents> }
+    : { [Symbol.iterator]: never }
+)
 export type CordoComponentPayload<Type extends StringComponentType> = CordoComponent<Type>[typeof CordoComponentSymbol]
 
 export function createComponent<Type extends StringComponentType>(
@@ -107,7 +112,7 @@ export function renderComponentList(
 
     if (!isComponent(item)) {
       const mod = readModifier(item)
-      if (!modifiers.some(m => m.name === mod.name))
+      if (mod && !modifiers.some(m => m.name === mod.name))
         modifiers.push(mod)
       continue
     }

package/src/components/modifier.ts

@@ -1,7 +1,7 @@
 import type { CordoComponentPayload, renderComponentList, StringComponentType } from "./component"
 
 
-const CordoModifierSymbol = Symbol('CordoModifier')
+const CordoModifierSymbol = Symbol.for('CordoModifier')
 
 export type CordoModifier = {
   [CordoModifierSymbol]: {

package/src/core/files/config.ts

@@ -9,7 +9,7 @@ import { parseFlags as runParseFlags, type FlagOpts as RunFlagOpts } from '../..
 import { parseFlags as gotoParseFlags, type FlagOpts as GotoFlagOpts } from '../../functions/impl/goto'
 
 
-const CordoConfigSymbol = Symbol('CordoConfigSymbol')
+const CordoConfigSymbol = Symbol.for('CordoConfig')
 
 type HookFor<T, Context = never> = null | ((value: T, context: Context) => Promisable<T | null>)
 type TransformHookFor<T, Context = never> = null | ((value: T, context: Context) => T)

package/src/core/files/error-boundary.ts

@@ -2,7 +2,7 @@ import { CordoError } from "../../errors"
 import type { RouteRequest } from "./route"
 
 
-const CordoErrorBoundarySymbol = Symbol('CordoErrorBoundary')
+const CordoErrorBoundarySymbol = Symbol.for('CordoErrorBoundary')
 
 export type CordoErrorBoundary = {
   [CordoErrorBoundarySymbol]: typeof CordoErrorBoundarySymbol

package/src/core/files/route.ts

@@ -6,7 +6,7 @@ import type { CordoComponent } from "../../components/component"
 import type { CordoModifier } from "../../components/modifier"
 
 
-const CordoRouteSymbol = Symbol('CordoRoute')
+const CordoRouteSymbol = Symbol.for('CordoRoute')
 
 export type RouteResponse = Array<CordoComponent | CordoModifier>
 

package/src/core/interaction.ts

@@ -1,7 +1,7 @@
 import type { APIInteraction } from "discord-api-types/v10"
 
 
-const CordoInteractionSymbol = Symbol('CordoInteraction')
+const CordoInteractionSymbol = Symbol.for('CordoInteraction')
 
 export type CordoInteraction = {
   [CordoInteractionSymbol]: {

package/src/functions/funct.ts

@@ -3,7 +3,7 @@ import { evalGoto } from "./impl/goto"
 import { evalRun } from "./impl/run"
 
 
-const CordoFunctSymbol = Symbol('CordoFunct')
+const CordoFunctSymbol = Symbol.for('CordoFunct')
 
 export type CordoFunctRun = CordoFunct[]