sandstone 1.1.1 → 1.1.2

package/src/pack/visitors/optimizeMacroTemporaries.ts

@@ -0,0 +1,200 @@
+import { DataCommandNode, ExecuteCommandNode, FunctionCommandNode, type SubCommand } from 'sandstone/commands'
+import type { MCFunctionNode, Node } from 'sandstone/core'
+import { CommandNode, ContainerCommandNode, ContainerNode } from 'sandstone/core'
+import { GenericSandstoneVisitor } from './visitor'
+
+type StoragePoint = {
+  target: string
+  path: string
+}
+
+type MacroCopy = {
+  destination: StoragePoint
+  source: StoragePoint
+}
+
+type Producer = {
+  index: number
+  store: SubCommand
+  destination: StoragePoint
+}
+
+const flattenArgs = (args: unknown[]): unknown[] =>
+  args.flatMap((arg) => Array.isArray(arg) ? flattenArgs(arg) : [arg])
+
+const referencesStoragePoint = (node: Node, point: StoragePoint): number => {
+  let references = 0
+
+  if (node instanceof CommandNode) {
+    const args = flattenArgs(node.args)
+    for (let i = 0; i < args.length - 1; i++) {
+      if (args[i] === point.target && args[i + 1] === point.path) {
+        references++
+      }
+    }
+  }
+
+  if (node instanceof ContainerNode || node instanceof ContainerCommandNode) {
+    for (const child of node.body) {
+      references += referencesStoragePoint(child, point)
+    }
+  }
+
+  return references
+}
+
+const getMacroCopy = (node: Node, macroPoint: StoragePoint): MacroCopy | undefined => {
+  if (!(node instanceof DataCommandNode)) {
+    return undefined
+  }
+
+  const args = node.args
+  if (
+    args[0] !== 'modify'
+    || args[1] !== 'storage'
+    || args[2] !== macroPoint.target
+    || args[4] !== 'set'
+    || args[5] !== 'from'
+    || args[6] !== 'storage'
+    || typeof args[3] !== 'string'
+    || typeof args[7] !== 'string'
+    || typeof args[8] !== 'string'
+  ) {
+    return undefined
+  }
+
+  const parameterPrefix = macroPoint.path ? `${macroPoint.path}.` : ''
+  const destinationPath = args[3]
+  const localPath = destinationPath.slice(parameterPrefix.length)
+  if (
+    !destinationPath.startsWith(parameterPrefix)
+    || (!localPath.startsWith('param_') && !localPath.startsWith('env_'))
+  ) {
+    return undefined
+  }
+
+  return {
+    destination: { target: macroPoint.target, path: destinationPath },
+    source: { target: args[7], path: args[8] },
+  }
+}
+
+const isMacroReset = (node: Node, macroPoint: StoragePoint) => {
+  if (!(node instanceof DataCommandNode)) {
+    return false
+  }
+
+  const args = node.args
+  return args[0] === 'modify'
+    && args[1] === 'storage'
+    && args[2] === macroPoint.target
+    && args[3] === macroPoint.path
+    && args[4] === 'set'
+    && args[5] === 'value'
+    && `${args[6]}` === '{}'
+}
+
+const getExecuteStore = (node: Node, source: StoragePoint) => {
+  if (!(node instanceof ExecuteCommandNode)) {
+    return undefined
+  }
+
+  const hasStoreResult = node.args.some((arg) => arg[0] === 'store')
+    && node.args.some((arg) => arg[0] === 'result')
+  if (!hasStoreResult) {
+    return undefined
+  }
+
+  return node.args.find((arg) =>
+    arg[0] === 'storage'
+    && arg[1] === source.target
+    && arg[2] === source.path
+  )
+}
+
+/**
+ * Writes one-use data temporaries directly into the compound passed to a macro
+ * MCFunction, avoiding a second round of `data modify ... set from` commands.
+ */
+export class OptimizeMacroTemporariesVisitor extends GenericSandstoneVisitor {
+  visitMCFunctionNode = (functionNode: MCFunctionNode) => {
+    this.genericVisit(functionNode)
+
+    for (let callIndex = 0; callIndex < functionNode.body.length; callIndex++) {
+      const call = functionNode.body[callIndex]
+      if (!(call instanceof FunctionCommandNode)) {
+        continue
+      }
+
+      const callArgs = call.args as unknown[]
+      if (
+        callArgs[1] !== 'with'
+        || callArgs[2] !== 'storage'
+        || typeof callArgs[3] !== 'string'
+        || typeof callArgs[4] !== 'string'
+      ) {
+        continue
+      }
+
+      const macroPoint = { target: callArgs[3], path: callArgs[4] }
+      const copies: MacroCopy[] = []
+      let setupStart = callIndex
+
+      while (setupStart > 0) {
+        const copy = getMacroCopy(functionNode.body[setupStart - 1], macroPoint)
+        if (!copy) {
+          break
+        }
+        copies.unshift(copy)
+        setupStart--
+      }
+
+      if (copies.length === 0 || setupStart === 0 || !isMacroReset(functionNode.body[setupStart - 1], macroPoint)) {
+        continue
+      }
+
+      const resetIndex = setupStart - 1
+      const producers: Producer[] = []
+      let canOptimize = true
+
+      for (const copy of copies) {
+        const matches: { index: number; store: SubCommand }[] = []
+        for (const [index, node] of functionNode.body.slice(0, resetIndex).entries()) {
+          const store = getExecuteStore(node, copy.source)
+          if (store) {
+            matches.push({ index, store })
+          }
+        }
+
+        if (
+          matches.length !== 1
+          || referencesStoragePoint(functionNode, copy.source) !== 2
+        ) {
+          canOptimize = false
+          break
+        }
+
+        producers.push({ ...matches[0], destination: copy.destination })
+      }
+
+      if (!canOptimize) {
+        continue
+      }
+
+      const producerIndexes = new Set(producers.map((producer) => producer.index))
+      if (producerIndexes.size !== producers.length) {
+        continue
+      }
+
+      for (const producer of producers) {
+        producer.store[1] = producer.destination.target
+        producer.store[2] = producer.destination.path
+      }
+
+      functionNode.body.splice(resetIndex, copies.length + 1)
+      callIndex = resetIndex
+    }
+
+    return functionNode
+  }
+}

package/src/sandstone.ts

@@ -1,6 +1,6 @@
 import type { JSONTextComponent } from './arguments/jsonTextComponent'
 import type { SandstoneContext } from './context'
-import type { FillCommand, SetBlockCommand } from './commands'
+import type { FillCommand, GiveCommand, SetBlockCommand } from './commands'
 import type {
   AdvancementClassArguments,
   AtlasClassArguments,
@@ -8,7 +8,7 @@ import type {
   BlockStateArguments,
   ChatTypeClassArguments,
   DamageTypeClassArguments,
-  DecoratedPotPatternClassArguments,
+//  DecoratedPotPatternClassArguments,
   DialogClassArguments,
   EnchantmentClassArguments,
   EnchantmentProviderClassArguments,
@@ -28,8 +28,9 @@ import type {
   PredicateClassArguments,
   RecipeClassArguments,
   ShaderClassArguments,
-  SlotSourceClassArguments,
+//  SlotSourceClassArguments,
   SoundEventArguments,
+  SoundsIndexArguments,
   SulfurCubeArchetypeClassArguments,
   TagClassArguments,
   TestEnvironmentClassArguments,
@@ -107,8 +108,8 @@ export { ResolveNBTPart }
 
 // Commands must go through sandstonePack.commands at call time for the same reason as pack methods.
 type SandstoneCommands = SandstonePack['commands']
-// Exclude setblock since it needs explicit type annotation due to complex generics
-type CommandKeys = Exclude<keyof SandstoneCommands, 'setblock' | 'fill'>
+// Exclude a few commands that need explicit type annotation due to complex generics
+type CommandKeys = Exclude<keyof SandstoneCommands, 'give' | 'setblock' | 'fill'>
 
 // Creates a proxy that handles both callable commands and object-based commands.
 // This avoids hardcoding which commands are object-based by detecting at runtime.
@@ -164,7 +165,6 @@ export const {
   forceload,
   gamemode,
   gamerule,
-  give,
   help,
   kill,
   list,
@@ -219,6 +219,10 @@ export const {
   tell,
 } = commandsProxy
 
+// give needs explicit type annotation due to complex generics
+export const give: GiveCommand<false>['give'] = ((...args: unknown[]) =>
+  (sandstonePack.commands.give as CallableFunction)(...args)) as GiveCommand<false>['give']
+
 // setblock needs explicit type annotation due to complex generics
 export const setblock: SetBlockCommand<false>['setblock'] = ((...args: unknown[]) =>
   (sandstonePack.commands.setblock as CallableFunction)(...args)) as SetBlockCommand<false>['setblock']
@@ -291,7 +295,7 @@ export const {
   BannerPattern,
   ChatType,
   DamageType,
-  DecoratedPotPattern,
+//  DecoratedPotPattern,
   Dialog,
   Enchantment,
   EnchantmentProvider,
@@ -301,7 +305,7 @@ export const {
   LootTable,
   Predicate,
   Recipe,
-  SlotSource,
+//  SlotSource,
   SulfurCubeArchetype,
   Tag,
   TestEnvironment,
@@ -326,6 +330,7 @@ export const {
   PostEffect,
   Shader,
   SoundEvent,
+  SoundsIndex,
   PlainText,
   Texture,
   WaypointStyle,
@@ -375,7 +380,7 @@ export {
   BannerPatternClass,
   ChatTypeClass,
   DamageTypeClass,
-  DecoratedPotPatternClass,
+//  DecoratedPotPatternClass,
   DialogClass,
   EnchantmentClass,
   EnchantmentProviderClass,
@@ -385,7 +390,7 @@ export {
   LootTableClass,
   PredicateClass,
   RecipeClass,
-  SlotSourceClass,
+//  SlotSourceClass,
   StructureClass,
   SulfurCubeArchetypeClass,
   TagClass,
@@ -411,6 +416,7 @@ export {
   ParticleClass,
   PostEffectClass,
   SoundEventClass,
+  SoundsIndexClass,
   TextureClass,
   WaypointStyleClass,
 } from './core/resources'
@@ -516,6 +522,8 @@ type PackConfigs<PackType extends LiteralUnion<'datapack' | 'resourcepack'>> = R
   PackType extends 'datapack' ? DatapackConfig : PackType extends 'resourcepack' ? ResourcePackConfig : unknown
 >
 
+export type HandlerFile = string | ArrayBuffer | Buffer
+
 export interface SandstoneConfig {
   /**
    * The default namespace for the packs.
@@ -616,7 +624,7 @@ export interface SandstoneConfig {
     handle?: {
       path: RegExp
 
-      callback: (contents: string | Buffer | Promise<Buffer>) => Promise<Buffer>
+      callback: (contents: HandlerFile | Promise<HandlerFile>) => HandlerFile | Promise<HandlerFile>
     }[]
   }
 }
@@ -669,7 +677,7 @@ type ContentStrategy =
    * The conflict strategy to use for Slot sources.
    * Will override the defined `default` strategy.
    */
-  | ContentStrategyKind<'slot_source', NonNullable<SlotSourceClassArguments['onConflict']>>
+  // | ContentStrategyKind<'slot_source', NonNullable<SlotSourceClassArguments['onConflict']>>
   /**
    * The conflict strategy to use for Sulfur cube archetypes.
    * Will override the defined `default` strategy.
@@ -709,7 +717,7 @@ type ContentStrategy =
    * The conflict strategy to use for Decorated pot patterns.
    * Will override the defined `default` strategy.
    */
-  | ContentStrategyKind<'decorated_pot_pattern', NonNullable<DecoratedPotPatternClassArguments['onConflict']>>
+  // | ContentStrategyKind<'decorated_pot_pattern', NonNullable<DecoratedPotPatternClassArguments['onConflict']>>
   /**
    * The conflict strategy to use for Dialogs.
    * Will override the defined `default` strategy.

package/src/utils.ts

@@ -4,23 +4,12 @@
 import type { Static } from '@sinclair/typebox'
 import { FormatRegistry, Type } from '@sinclair/typebox'
 import fs from 'fs-extra'
-import type FetchType from 'node-fetch'
-import type { Response } from 'node-fetch'
 import { coerce } from 'semver'
 import * as util from 'util'
 import type { MultipleEntitiesArgument } from './arguments/selector'
 import type { Node } from './core/nodes'
 import type { UUIDinNumber } from './variables/UUID'
 
-/* @ts-ignore */
-export const fetch: (input: URL | RequestInfo, init?: RequestInit | undefined) => Promise<Response> = Object.hasOwn(
-  globalThis,
-  'fetch',
-)
-  ? globalThis.fetch
-  : async (...args: Parameters<typeof FetchType>) =>
-    (await import('node-fetch')).default(...args) as unknown as Promise<Response>
-
 /**
  * Allows to get autocompletion on string unions, while still allowing generic strings.
  * @see https://github.com/microsoft/TypeScript/issues/29729#issuecomment-700527227
@@ -125,6 +114,7 @@ export type WithMCNamespace<T extends string> = `minecraft:${T}` | T
 
 export function makeCallableProxy(func: any, object: any) {
   return new Proxy(func, {
+    apply: (_t, _thisArg, args) => Reflect.apply(func, object, args),
     get: (_t, p, _r) => object[p],
     set: (_t, p, value, _r) => {
       object[p] = value

package/src/variables/Coordinates.ts

@@ -22,7 +22,7 @@ export class VectorClass<T extends readonly unknown[]> implements NBTSerializabl
   }
 
   toNBT() {
-    return this.toString()
+    return `'${this.toString()}'`
   }
 
   [Symbol.iterator](): Iterator<T[0]> {
@@ -48,7 +48,7 @@ type MappedArray<T, U> = { [key in keyof T]: U }
  * @see {@link relative} for relative coordinates (e.g. `~10`)
  * @see {@link local} for local coordinates (e.g. `^10`)
  */
-export function absolute(coordinate?: number): string
+export function absolute<T extends number>(coordinate?: T): `${T}`
 
 /**
  * Transforms numbers into absolute coordinates.
@@ -65,14 +65,14 @@ export function absolute(coordinate?: number): string
  * @see {@link relative} for relative coordinates (e.g. `~10`)
  * @see {@link local} for local coordinates (e.g. `^10`)
  */
-export function absolute<T extends Tuple<number>>(...coordinates: T): VectorClass<MappedArray<T, string>>
+export function absolute<T extends Tuple<number>>(...coordinates: T): VectorClass<MappedArray<T, `${number}`>>
 
-export function absolute<T extends Tuple<number>>(...coordinates: T): string | VectorClass<MappedArray<T, string>> {
+export function absolute<T extends Tuple<number>>(...coordinates: T): `${T[0]}`| VectorClass<MappedArray<T, `${number}`>> {
   if (coordinates.length === 1) {
-    return coordinates[0].toString()
+    return coordinates[0].toString() as `${T[0]}`
   }
 
-  return new VectorClass(coordinates.map((coord) => coord.toString()) as unknown as MappedArray<T, string>)
+  return new VectorClass(coordinates.map((coord) => coord.toString()) as unknown as MappedArray<T, `${number}`>)
 }
 
 /**
@@ -109,7 +109,7 @@ export function relative<T extends [0, 0, 0]>(): VectorClass<MappedArray<T, '~'>
  * @see {@link absolute} for absolute coordinates (e.g. `10`)
  * @see {@link local} for local coordinates (e.g. `^10`)
  */
-export function relative(coordinate: number): `~${string}`
+export function relative<T extends number>(coordinate: T): `~${T}`
 
 /**
  * Transforms numbers into relative coordinates, using the tilde notation `~`.
@@ -128,18 +128,18 @@ export function relative(coordinate: number): `~${string}`
  * @see {@link absolute} for absolute coordinates (e.g. `10`)
  * @see {@link local} for local coordinates (e.g. `^10`)
  */
-export function relative<T extends Tuple<number>>(...coordinates: T): VectorClass<MappedArray<T, `~${string}`>>
+export function relative<T extends Tuple<number>>(...coordinates: T): VectorClass<MappedArray<T, `~${number | ''}`>>
 
-export function relative<T extends Tuple<number>>(...coordinates: T): string | VectorClass<MappedArray<T, string>> {
+export function relative<T extends Tuple<number>>(...coordinates: T): '~' | `~${T[0]}`| VectorClass<MappedArray<T, `~${number | ''}`>> {
   if (coordinates.length === 0) {
-    return new VectorClass(['~', '~', '~'] as unknown as MappedArray<T, string>)
+    return new VectorClass(['~', '~', '~'] as unknown as MappedArray<T, `~${number | ''}`>)
   }
 
   if (coordinates.length === 1) {
-    return `~${coordinates[0] || ''}`
+    return `~${coordinates[0]}` as `~${T[0]}`
   }
 
-  return new VectorClass(coordinates.map((coord) => `~${coord || ''}`) as unknown as MappedArray<T, string>)
+  return new VectorClass(coordinates.map((coord) => `~${coord || ''}`) as unknown as MappedArray<T, `~${number | ''}`>)
 }
 
 /**
@@ -178,7 +178,7 @@ export function local<T extends [0, 0, 0]>(): VectorClass<MappedArray<T, '^'>>
  * @see {@link absolute} for absolute coordinates (e.g. `10`)
  * @see {@link relative} for relative coordinates (e.g. `~10`)
  */
-export function local(coordinate: number): `^${string}`
+export function local<T extends number>(coordinate: T): `^${T}`
 
 /**
  * Transforms numbers into local coordinates, using the tilde notation `^`.
@@ -199,16 +199,16 @@ export function local(coordinate: number): `^${string}`
  * @see {@link absolute} for absolute coordinates (e.g. `10`)
  * @see {@link relative} for relative coordinates (e.g. `~10`)
  */
-export function local<T extends Tuple<number>>(...coordinates: T): VectorClass<MappedArray<T, `^${string}`>>
+export function local<T extends Tuple<number>>(...coordinates: T): VectorClass<MappedArray<T, `^${number | ''}`>>
 
-export function local<T extends Tuple<number>>(...coordinates: T): string | VectorClass<MappedArray<T, string>> {
+export function local<T extends Tuple<number>>(...coordinates: T): `^${T[0]}` | VectorClass<MappedArray<T, `^${number | ''}`>> {
   if (coordinates.length === 0) {
-    return new VectorClass(['^', '^', '^'] as unknown as MappedArray<T, string>)
+    return new VectorClass(['^', '^', '^'] as unknown as MappedArray<T, '^'>)
   }
 
   if (coordinates.length === 1) {
-    return `^${coordinates[0] || ''}`
+    return `^${coordinates[0]}` as `^${T[0]}`
   }
 
-  return new VectorClass(coordinates.map((coord) => `^${coord || ''}`) as unknown as MappedArray<T, string>)
+  return new VectorClass(coordinates.map((coord) => `^${coord || ''}`) as unknown as MappedArray<T, `^${number | ''}`>)
 }

package/src/variables/Data.ts

@@ -139,6 +139,9 @@ export class DataClass<TYPE extends DATA_TYPES = any> {
 export class DataPointClass<TYPE extends DATA_TYPES = any>
   extends MacroArgument
   implements ConditionTextComponentClass, NBTSerializable {
+  declare readonly __textComponentClassBrand: true
+  declare readonly __conditionClassBrand: true
+
   path
 
   currentTarget: DATA_TARGET[TYPE]
@@ -311,6 +314,9 @@ export class DataPointClass<TYPE extends DATA_TYPES = any>
 }
 
 export class StringDataPointClass<TYPE extends DATA_TYPES = any> extends DataPointClass {
+  declare readonly __textComponentClassBrand: true
+  declare readonly __conditionClassBrand: true
+
   readonly sliceBounds: [number] | [number, number]
 
   constructor(

package/src/variables/DataSets.ts

@@ -45,7 +45,7 @@ type GetKeys<T> = T extends unknown[]
       : number // other array
   : keyof T // not an array
 
-export type DataIndexMapInitial = RootNBT | Record<string, DataPointClass | DataPointPickClass>
+export type DataIndexMapInitial = RootNBT | Record<`${any}${string}`, DataPointClass | DataPointPickClass>
 
 export class DataIndexMapClass<INITIAL extends DataIndexMapInitial> extends IterableDataClass<'map'> {
   entries: Record<string, number> = {}
@@ -481,14 +481,14 @@ export function DataIndexMap<INITIAL extends DataIndexMapInitial>(
 
       return true
     },
-  }) as DataIndexMapClass<INITIAL> & { [K in keyof INITIAL]: DataIndexMapInitial[string] } & {
-    [K in string]: DataIndexMapInitial[string]
+  }) as DataIndexMapClass<INITIAL> & { [K in keyof INITIAL]: DataIndexMapInitial[`${any}${string}`] } & {
+    [K in string]: DataIndexMapInitial[`${any}${string}`]
   }
 }
 
 export type DataIndexMap<INITIAL extends DataIndexMapInitial> = DataIndexMapClass<INITIAL> & {
-  [K in keyof INITIAL]: DataIndexMapInitial[string]
-} & { [K in string]: DataIndexMapInitial[string] }
+  [K in keyof INITIAL]: DataIndexMapInitial[`${any}${string}`]
+} & { [K in string]: DataIndexMapInitial[`${any}${string}`] }
 
 export function DataArray<INITIAL extends DataArrayInitial>(
   pack: SandstonePack,

package/src/variables/ItemPredicate.ts

@@ -174,7 +174,7 @@ export class ItemPredicateClass {
    * ```
    */
   model(): ItemModelBuilder {
-    // Dynamic import to avoid circular dependency
+    // Dynamic import to avoid circular dependency // TODO: Fix
     const { ItemModelBuilder } = require('sandstone/core/resources/resourcepack/itemDefinition')
     const builder = new ItemModelBuilder(this.pack)
     // Copy test groups to the new builder

package/src/variables/Label.ts

@@ -1,14 +1,12 @@
 /* eslint-disable max-len */
 
+import type { NBTSerializable } from 'sandstone/arguments'
 import type { MakeInstanceCallable } from 'sandstone/utils'
 import { makeClassCallable } from 'sandstone/utils'
-import type { SandstonePack } from '../pack'
 import type { ConditionClass, SelectorPickClass } from './abstractClasses'
 import type { SelectorEntityType, SelectorProperties } from './Selector'
 import { SelectorClass } from './Selector'
-import { NBTSerializable } from 'sandstone/arguments';
-
-type SingleEntity = SelectorClass<false, true, boolean> | SelectorPickClass<true, boolean>
+import type { SandstonePack } from 'sandstone'
 
 /**
  * Label tag (/tag) handler
@@ -45,8 +43,29 @@ export class _RawLabelClass implements NBTSerializable {
     if (description) this.description = description
   }
 
-  public LabelHolder = (entity: SingleEntity | '@s' | '@p' | '@r') => {
-    if (typeof entity === 'string') return new EntityLabel(this.pack, new SelectorClass(this.pack, entity), this)
+  public LabelHolder<IS_SINGLE extends boolean, IS_PLAYER extends boolean>(entity: SelectorClass<false, IS_SINGLE, IS_PLAYER> | SelectorPickClass<IS_SINGLE, IS_PLAYER>): EntityLabel<IS_SINGLE, IS_PLAYER>
+
+  public LabelHolder(target: '@e'): EntityLabel<false, false>
+
+  public LabelHolder(target: '@a'): EntityLabel<false, true>
+
+  public LabelHolder(target: '@s' | '@n'): EntityLabel<true, false>
+
+  public LabelHolder<ENTITY_TYPE extends SelectorEntityType>(target: '@p' | '@r', selectorArguments?: Omit<Omit<SelectorProperties<false, false, ENTITY_TYPE, false>, 'type'>, 'limit'>): EntityLabel<true, true>
+
+  public LabelHolder<ENTITY_TYPE extends SelectorEntityType, PROPERTIES extends Omit<SelectorProperties<false, false, ENTITY_TYPE, false>, 'limit'>>(target: '@s' | '@n', selectorArguments: PROPERTIES):
+    EntityLabel<true, PROPERTIES['type'] extends ('player' | 'minecraft:player') ? true : false>
+
+  public LabelHolder<ENTITY_TYPE extends SelectorEntityType, const PROPERTIES extends Omit<SelectorProperties<false, false, ENTITY_TYPE, false>, 'type'>>(target: '@a', selectorArguments: PROPERTIES):
+    EntityLabel<PROPERTIES['limit'] extends 1 ? true : false, true>
+
+  public LabelHolder<ENTITY_TYPE extends SelectorEntityType, const PROPERTIES extends SelectorProperties<false, false, ENTITY_TYPE, false>>(target: '@e', selectorArguments: PROPERTIES):
+    EntityLabel<PROPERTIES['limit'] extends 1 ? true : false, PROPERTIES['type'] extends ('player' | 'minecraft:player') ? true : false>
+
+  public LabelHolder(entity: '@s' | '@p' | '@a' | '@e' | '@n' | '@r' | SelectorPickClass<boolean, boolean>, selectorArguments?: SelectorProperties<boolean, boolean, SelectorEntityType, false>): EntityLabel<boolean, boolean> {
+    if (typeof entity === 'string') {
+      return new EntityLabel(this.pack, new SelectorClass(this.pack, entity, selectorArguments), this)
+    }
     return new EntityLabel(this.pack, entity, this)
   }
 
@@ -60,17 +79,44 @@ export class _RawLabelClass implements NBTSerializable {
    */
   toNBT = () => `'${this.fullName}'`
 
-  __call__ = (entity: SingleEntity | '@s' | '@p' | '@r') => this.LabelHolder(entity)
+  __call__<IS_SINGLE extends boolean, IS_PLAYER extends boolean>(entity: SelectorClass<false, IS_SINGLE, IS_PLAYER> | SelectorPickClass<IS_SINGLE, IS_PLAYER>): EntityLabel<IS_SINGLE, IS_PLAYER>
+
+  __call__(target: '@e'): EntityLabel<false, false>
+
+  __call__(target: '@a'): EntityLabel<false, true>
+
+  __call__(target: '@s' | '@n'): EntityLabel<true, false>
+
+  __call__<ENTITY_TYPE extends SelectorEntityType>(target: '@p' | '@r', selectorArguments?: Omit<Omit<SelectorProperties<false, false, ENTITY_TYPE, false>, 'type'>, 'limit'>): EntityLabel<true, true>
+
+  __call__<ENTITY_TYPE extends SelectorEntityType, PROPERTIES extends Omit<SelectorProperties<false, false, ENTITY_TYPE, false>, 'limit'>>(target: '@s' | '@n', selectorArguments: PROPERTIES):
+    EntityLabel<true, PROPERTIES['type'] extends ('player' | 'minecraft:player') ? true : false>
+
+  __call__<ENTITY_TYPE extends SelectorEntityType, const PROPERTIES extends Omit<SelectorProperties<false, false, ENTITY_TYPE, false>, 'type'>>(target: '@a', selectorArguments: PROPERTIES):
+    EntityLabel<PROPERTIES['limit'] extends 1 ? true : false, true>
+
+  __call__<ENTITY_TYPE extends SelectorEntityType, const PROPERTIES extends SelectorProperties<false, false, ENTITY_TYPE, false>>(target: '@e', selectorArguments: PROPERTIES):
+    EntityLabel<PROPERTIES['limit'] extends 1 ? true : false, PROPERTIES['type'] extends ('player' | 'minecraft:player') ? true : false>
+
+  __call__(entity: '@s' | '@p' | '@a' | '@e' | '@n' | '@r' | SelectorPickClass<boolean, boolean>, selectorArguments?: SelectorProperties<boolean, boolean, SelectorEntityType, false>): EntityLabel<boolean, boolean> {
+    if (typeof entity === 'string') {
+      return new EntityLabel(this.pack, new SelectorClass(this.pack, entity, selectorArguments), this)
+    }
+    return new EntityLabel(this.pack, entity, this)
+  }
 }
 
 export const LabelClass = makeClassCallable(_RawLabelClass)
 export type LabelClass = MakeInstanceCallable<_RawLabelClass>
 
-export class EntityLabel implements ConditionClass, SelectorPickClass<true, false> {
+export class EntityLabel<IS_SINGLE extends boolean = boolean, IS_PLAYER extends boolean = boolean> implements ConditionClass, SelectorPickClass<IS_SINGLE, IS_PLAYER> {
+  declare readonly __textComponentClassBrand: true
+  declare readonly __conditionClassBrand: true
+
   /**
    * Phantom brand property for TypeScript type discrimination.
    */
-  declare readonly __selectorPickBrand: { single: true; player: false }
+  declare readonly __selectorPickBrand: { single: IS_SINGLE; player: IS_PLAYER }
 
   /** Label */
   public label
@@ -78,19 +124,19 @@ export class EntityLabel implements ConditionClass, SelectorPickClass<true, fals
   /**
    * Selects entity with the label
    */
-  public selector: SelectorClass<false, true, false>
+  public selector: SelectorClass<false, IS_SINGLE, IS_PLAYER>
 
   /**
    * Selects entity
    */
-  public originalSelector: string | SelectorClass<false, true, true> | SelectorClass<false, true, false> | SelectorClass<false, true, boolean>
+  public originalSelector: string | SelectorClass<false, IS_SINGLE, IS_PLAYER>
 
   /** Test for label on entity */
   public test = this as ConditionClass
 
   constructor(
     private pack: SandstonePack,
-    entity: SingleEntity,
+    entity: SelectorClass<false, IS_SINGLE, IS_PLAYER> | SelectorPickClass<IS_SINGLE, IS_PLAYER>,
     label: _RawLabelClass,
   ) {
     this.originalSelector = entity._toSelector()
@@ -101,7 +147,7 @@ export class EntityLabel implements ConditionClass, SelectorPickClass<true, fals
       typeof this.originalSelector === 'string'
         ? new SelectorClass(this.pack, '@s')
         : new SelectorClass(this.pack, this.originalSelector.target, { ...this.originalSelector.arguments })
-    ) as SelectorClass<false, true, false>
+    ) as SelectorClass<false, IS_SINGLE, IS_PLAYER>
 
     if (selector.arguments) {
       if (selector.arguments.tag) {
@@ -111,7 +157,7 @@ export class EntityLabel implements ConditionClass, SelectorPickClass<true, fals
           selector.arguments.tag = [...selector.arguments.tag, label.fullName]
         }
       } else selector.arguments.tag = [label.fullName]
-    } else selector.arguments = { tag: [label.fullName] } as SelectorProperties<true, false, SelectorEntityType, false>
+    } else selector.arguments = { tag: [label.fullName] } as SelectorProperties<IS_SINGLE, IS_PLAYER, SelectorEntityType, false>
 
     this.selector = selector
   }
@@ -164,4 +210,9 @@ export class EntityLabel implements ConditionClass, SelectorPickClass<true, fals
    * @internal
    */
   toNBT = () => this.selector._toSelector().toNBT()
+
+  /**
+   * @internal
+   */
+  _toChatComponent = () => this.selector._toSelector()._toChatComponent()
 }