diff --git a/telefunc/node/server/Abort.ts b/telefunc/node/server/Abort.ts index b61bc214..6d3e650a 100644 --- a/telefunc/node/server/Abort.ts +++ b/telefunc/node/server/Abort.ts @@ -2,7 +2,7 @@ export { Abort } export { isAbort } import { assert, assertUsage, objectAssign } from '../utils' -const stamp = Symbol('isAbort') +const stamp = '__telefunc_isAbort' function isAbort(thing: unknown): thing is ReturnType { assert(thing !== Abort) // Catched earlier in `executeTelefunction()` diff --git a/telefunc/node/server/shield.ts b/telefunc/node/server/shield.ts index 401a71c9..cae55f5c 100644 --- a/telefunc/node/server/shield.ts +++ b/telefunc/node/server/shield.ts @@ -5,11 +5,11 @@ export { shieldToHumandReadable } import { isPlainObject, unique, isCallable, assert, assertUsage } from '../utils' -const shielKey = Symbol('shielKey') -const isVerifierKey = Symbol('isVerifierKey') -const isVerifierTupleKey = Symbol('isVerifierTupleKey') +const shieldKey = '__telefunc_shield' +const isVerifierKey = '__telefunc_isVerifier' +const isVerifierTupleKey = '__telefunc_isVerifierTuple' -type ShieldOptions = { __autoGenerated ?: boolean } +type ShieldOptions = { __autoGenerated?: boolean } const shield: { < @@ -71,12 +71,12 @@ function isTelefunction(thing: unknown): thing is Telefunction { } function installShield(telefunction: Function, telefunctionShield: any, generated: boolean) { - const installedShield = (telefunction as any as Record)[shielKey as any] + const installedShield = (telefunction as any as Record)[shieldKey as any] if (installedShield && generated) { // another shield is already installed, so not installing generated shield - return; + return } - ;(telefunction as any as Record)[shielKey as any] = telefunctionShield + ;(telefunction as any as Record)[shieldKey as any] = telefunctionShield } function shieldIsMissing(telefunction: Telefunction): boolean { @@ -92,7 +92,7 @@ function shieldApply(telefunction: Telefunction, args: unknown[]): true | string type TelefunctionShield = unknown[] | Verifier function getTelefunctionShield(telefunction: Telefunction): TelefunctionShield | null { - return (telefunction as any)[shielKey] || null + return (telefunction as any)[shieldKey] || null } function shieldToHumandReadable(telefunctionShield: TelefunctionShield): string {