Merge pull request #77 from TheMrZZ/develop

Fixed a bunch of bugs

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sandstone",
   "description": "Sandstone, a Typescript library for Minecraft datapacks.",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "author": "TheMrZZ - Florian ERNST",
   "bugs": {
     "url": "https://github.com/TheMrZZ/sandstone/issues"

src/arguments/jsonTextComponent.ts

@@ -3,8 +3,9 @@ import type { VectorClass } from '@variables/Coordinates'
 import type { LiteralUnion } from '../generalTypes'
 import type { BASIC_COLORS } from './basics'
 import type { MultipleEntitiesArgument, SelectorArgument } from './selector'
+
 // To be valid, a chat component must contain one content tag: text, translate, score, selector, keybind, or nbt.
-type ContentTag = {
+type ContentTag = ({
   /** A string containing plain text to display directly. Can also be a number or boolean that is displayed directly. */
   text: string | number | boolean
 } | {
@@ -78,12 +79,13 @@ type ContentTag = {
       block: string | VectorClass<[string, string, string]>
     } | {
       /** The target selector for the entity or entities from which the NBT value is obtained. */
-      entity: string
+      entity: MultipleEntitiesArgument
     } | {
       /** The namespaced ID of the command storage from which the NBT value is obtained */
       storage: string
     })
   )
+)
 
 type ChildrenTags = {
   /**
@@ -92,7 +94,7 @@ type ChildrenTags = {
    * Child text components inherit all formatting and interactivity from the parent component,
    * unless they explicitly override them.
    */
-  with?: TextComponentObject[]
+  extra?: TextComponentObject[]
 }
 
 type FormattingTags = {
@@ -224,8 +226,7 @@ type InteractivityTags = {
  * A JSON text component object.
  */
 export type TextComponentObject = (
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  (ContentTag | {}) & ChildrenTags & FormattingTags & InteractivityTags
+  ContentTag & ChildrenTags & FormattingTags & InteractivityTags
 )
 
 /**

src/datapack/BasePath.ts

@@ -21,7 +21,7 @@ export type BasePathOptions<N extends (undefined | string), D extends (undefined
   directory?: D
 }
 
-export type BasePathInstance<N extends (undefined | string), D extends (undefined | string)> = (
+export type BasePathInstance<N extends (undefined | string) = (undefined | string), D extends (undefined | string) = (undefined | string)> = (
   HideFunctionProperties<BasePathClass<N, D>['getResourceName'] & BasePathClass<N, D>>
 )
 
@@ -36,7 +36,7 @@ function pathToArray(path?: string): string[] {
 }
 
 /** Changes the base namespace & directory of nested resources. */
-export class BasePathClass<N extends (undefined | string), D extends (undefined | string)> {
+export class BasePathClass<N extends (undefined | string) = (undefined | string), D extends (undefined | string) = (undefined | string)> {
   protected datapack: Datapack
 
   namespace: N

src/flow/Flow.ts

@@ -577,19 +577,26 @@ export class Flow {
       return undefined as any
     }
 
-    const promise = this.flowStatementAsync(callback, {
-      callbackName: type,
-      initialCondition: type === 'while',
-      loopCondition: true,
-      condition,
-    })
+    const { currentFunction: parentFunction } = this.datapack
 
     return {
-      then: (onfulfilled: () => void) => {
-        promise.then(() => {
-          this.datapack.createEnterChildFunction(ASYNC_CALLBACK_NAME)
-          onfulfilled?.()
+      then: async (onfulfilled: () => void) => {
+        // In theory, we are already in the parent function so we shouldn't need to go back in it.
+
+        // Run the previous code
+        await this.flowStatementAsync(callback, {
+          callbackName: type,
+          initialCondition: type === 'while',
+          loopCondition: true,
+          condition,
         })
+
+        // Go back in the parent function, because we don't know where the last code ended up.
+        this.datapack.currentFunction = parentFunction
+
+        // Finally enter the callback function
+        this.datapack.createEnterChildFunction(ASYNC_CALLBACK_NAME)
+        return onfulfilled?.()
       },
     } as PromiseLike<void> as any
   }

src/index.ts

@@ -1,8 +1,6 @@
 import { dataPack } from './init'
 
 // CORE
-export { SandstoneConfig } from './datapack/Datapack'
-
 export const {
   save: savePack, BasePath, sleep,
 } = dataPack
@@ -37,8 +35,8 @@ export const {
 
 // TYPES
 export * from './arguments'
-export type { BasePathClass, BasePathOptions } from './datapack/BasePath'
-export type { MCFunctionInstance } from './datapack/Datapack'
+export * from './datapack/BasePath'
+export * from './datapack/Datapack'
 export type { LiteralUnion } from './generalTypes'
 export type {
   AdvancementInstance, LootTableInstance, MCFunctionOptions, PredicateInstance, RecipeInstance, ResourceInstance, TagInstance,