Implement Float Property Truncation Fix plugin and fix finalizeBuild being consumed

dist/Plugins/AllPlugins.d.ts

@@ -2,9 +2,10 @@ import type { DashFile } from '../Core/DashFile';
 import type { Dash } from '../Dash';
 import { Plugin } from './Plugin';
 import { TCompilerPluginFactory } from './TCompilerPluginFactory';
+import { jsonStringifyWithFloatFix } from './BuiltIn/FloatPropertyTruncationFix';
 import { JsRuntime } from '../Common/JsRuntime';
 declare const availableHooks: readonly ["buildStart", "buildEnd", "include", "ignore", "transformPath", "read", "load", "registerAliases", "require", "transform", "finalizeBuild", "beforeFileUnlinked"];
-export declare type THookType = typeof availableHooks[number];
+export declare type THookType = (typeof availableHooks)[number];
 export declare class AllPlugins {
     protected dash: Dash<any>;
     protected pluginRuntime: JsRuntime;
@@ -39,6 +40,7 @@ export declare class AllPlugins {
         unlinkOutputFiles: (filePaths: string[]) => Promise<void>;
         hasComMojangDirectory: boolean;
         compileFiles: (filePaths: string[], virtual?: boolean) => Promise<void>;
+        jsonStringifyWithFloatFix: typeof jsonStringifyWithFloatFix;
     };
     runBuildStartHooks(): Promise<void>;
     runIncludeHooks(): Promise<(string | [string, {

dist/Plugins/BuiltIn/Components/Plugins.d.ts

@@ -3,7 +3,7 @@ interface IOpts {
     fileType: string;
     getComponentObjects: (fileContent: any) => [string, any][];
 }
-export declare function createCustomComponentPlugin({ fileType, getComponentObjects, }: IOpts): TCompilerPluginFactory<{
+export declare function createCustomComponentPlugin({ fileType, getComponentObjects }: IOpts): TCompilerPluginFactory<{
     v1CompatMode?: boolean;
 }>;
 export declare const CustomEntityComponentPlugin: TCompilerPluginFactory<{

dist/Plugins/BuiltIn/FloatPropertyTruncationFix.d.ts

@@ -0,0 +1,6 @@
+import { TCompilerPluginFactory } from '../TCompilerPluginFactory';
+export declare function jsonStringifyWithFloatFix(json: Object, matches: {
+    pathGlob: string;
+    apply?: (path: string, traversedObjects: any[]) => boolean;
+}[], spacing?: any): string;
+export declare const FloatPropertyTruncationFix: TCompilerPluginFactory;

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bridge-editor/dash-compiler",
-	"version": "0.12.0",
+	"version": "0.13.0-beta",
 	"description": "A fast compiler for Minecraft Add-Ons",
 	"scripts": {
 		"build:types": "tsc --project tsconfig.json",
@@ -27,6 +27,10 @@
 		{
 			"name": "Thomas Orsbourne",
 			"email": "[email protected]"
+		},
+		{
+			"name": "Outer Cloud",
+			"email": "[email protected]"
 		}
 	],
 	"license": "MIT",
@@ -51,4 +55,4 @@
 		"vite": "^2.6.13",
 		"vitest": "^0.22.1"
 	}
-}
+}

src/Core/TransformFiles.ts

@@ -48,12 +48,6 @@ export class FileTransformer {
 
 		if (writeData !== undefined && writeData !== null) {
 			if (!isWritableData(writeData)) {
-				this.dash.console.warn(
-					`File "${
-						file.filePath
-					}" was not in a writable format: "${typeof writeData}". Trying to JSON.stringify(...) it...`,
-					writeData
-				)
 				writeData = JSON.stringify(writeData)
 			}
 		}

src/Plugins/AllPlugins.ts

@@ -13,6 +13,7 @@ import { RewriteForPackaging } from './BuiltIn/RewriteForPackaging'
 import { ContentsFilePlugin } from './BuiltIn/ContentsFile'
 import { FormatVersionCorrection } from './BuiltIn/FormatVersionCorrection'
 import { GeneratorScriptsPlugin } from './BuiltIn/GeneratorScripts/Plugin'
+import { FloatPropertyTruncationFix, jsonStringifyWithFloatFix } from './BuiltIn/FloatPropertyTruncationFix'
 import { JsRuntime } from '../Common/JsRuntime'
 
 const builtInPlugins: Record<string, TCompilerPluginFactory<any>> = {
@@ -29,6 +30,7 @@ const builtInPlugins: Record<string, TCompilerPluginFactory<any>> = {
 	contentsFile: ContentsFilePlugin,
 	formatVersionCorrection: FormatVersionCorrection,
 	generatorScripts: GeneratorScriptsPlugin,
+	floatPropertyTruncationFix: FloatPropertyTruncationFix,
 }
 
 const availableHooks = [
@@ -244,6 +246,7 @@ export class AllPlugins {
 			 */
 			hasComMojangDirectory: this.dash.fileSystem !== this.dash.outputFileSystem,
 			compileFiles: (filePaths: string[], virtual = true) => this.dash.compileAdditionalFiles(filePaths, virtual),
+			jsonStringifyWithFloatFix,
 		}
 	}
 

src/Plugins/BuiltIn/Commands/Plugin.ts

@@ -193,12 +193,6 @@ export const CustomCommandsPlugin: TCompilerPluginFactory<{
 			if (isCommand(filePath) && fileContent) {
 				return (<Command>fileContent).toString()
 			}
-			// Make sure JSON files are transformed back into a format that we can write to disk
-			else if (
-				loadCommandsFor(filePath) &&
-				typeof fileContent !== 'string'
-			)
-				return JSON.stringify(fileContent, null, '\t')
 		},
 	}
 }

src/Plugins/BuiltIn/FloatPropertyTruncationFix.ts

@@ -0,0 +1,112 @@
+import { isMatch } from '@bridge-editor/common-utils'
+import { TCompilerPluginFactory } from '../TCompilerPluginFactory'
+
+/**
+ * @example
+ * jsonStringifyWithFloatFix(fileContent, [
+ * 		{
+ * 			pathGlob: 'minecraft:entity/description/properties/*╱value',
+ * 			apply(path, traversedObjects) {
+ * 				if (traversedObjects.length === 0) return false
+ *
+ * 				if (traversedObjects[traversedObjects.length - 1].type !== 'float') return false
+ *
+ * 				return true
+ * 			},
+ * 		},
+ * 		{
+ * 			pathGlob: 'minecraft:entity/description/properties/*╱range/*',
+ * 			apply(path, traversedObjects) {
+ * 				if (traversedObjects.length < 2) return false
+ *
+ * 				if (traversedObjects[traversedObjects.length - 2].type !== 'float') return false
+ *
+ * 				return true
+ * 			},
+ * 		},
+ * ])
+ * @param json The JSON object that will be stringified
+ * @param matches A list of objects describing where the float fix should be applied. pathGlob is a glob matcher string of the path traversed inside the JSON object. Traversed objects is a list of parent objects in the order that the replacer has traversed down.
+ * @param spacing The spacing to use. Pass null for minimal whitespace
+ * @returns The stringified JSON
+ */
+export function jsonStringifyWithFloatFix(json: Object, matches: { pathGlob: string; apply?: (path: string, traversedObjects: any[]) => boolean }[], spacing: any = '\t') {
+	let traversedKeys: string[] = []
+	let traversedObjects: any[] = []
+	return JSON.stringify(
+		json,
+		function (key, value) {
+			if (key !== '') {
+				traversedKeys.push(key)
+				traversedObjects.push(this)
+			}
+
+			if (typeof value !== 'object') {
+				const path = traversedKeys.join('/')
+				const matcherTraversedObjects = [...traversedObjects]
+
+				console.log(path)
+
+				traversedKeys.pop()
+				traversedObjects.pop()
+
+				if (typeof value === 'number') {
+					for (const matcher of matches) {
+						console.log(path, matcher.pathGlob, isMatch(path, matcher.pathGlob))
+
+						if (isMatch(path, matcher.pathGlob) && (!matcher.apply || matcher.apply(path, matcherTraversedObjects))) {
+							let result = value.toString()
+
+							return `$___dash___floatPropertyTruncationFix___THIS IS AUTO GENERATED AND I HATE IT___${result.includes('.') ? result : result + '.0'}`
+						}
+					}
+				}
+
+				return value
+			} else {
+				return value
+			}
+		},
+		spacing
+	).replaceAll(/"\$___dash___floatPropertyTruncationFix___THIS IS AUTO GENERATED AND I HATE IT___([0-9]|\.|-)+"/g, value => {
+		return value.substring(80, value.length - 1)
+	})
+}
+
+/*
+Fixes the issue where stringified JSON will truncate floats which minecraft expects to be in entity float properties
+*/
+export const FloatPropertyTruncationFix: TCompilerPluginFactory = ({ fileType }) => {
+	return {
+		finalizeBuild(filePath, fileContent) {
+			if (fileType?.getId(filePath) !== 'entity') return
+
+			if (!filePath.endsWith('player.json')) return fileContent
+
+			if (typeof fileContent === 'string') return fileContent
+
+			return jsonStringifyWithFloatFix(fileContent, [
+				{
+					pathGlob: 'minecraft:entity/description/properties/*/value',
+					apply(path, traversedObjects) {
+						if (traversedObjects.length === 0) return false
+
+						if (traversedObjects[traversedObjects.length - 1].type !== 'float') return false
+
+						return true
+					},
+				},
+				{
+					pathGlob: 'minecraft:entity/description/properties/*/range/*',
+					apply(path, traversedObjects) {
+						if (traversedObjects.length < 2) return false
+
+						if (traversedObjects[traversedObjects.length - 2].type !== 'float') return false
+
+						return true
+					},
+				},
+			])
+		},
+	}
+}

src/Plugins/BuiltIn/Molang.ts

@@ -176,12 +176,6 @@ export const MolangPlugin: TCompilerPluginFactory<{
 			}
 		},
 
-		finalizeBuild(filePath, fileContent) {
-			// Make sure JSON files are transformed back into a format that we can write to disk
-			if (loadMolangFrom(filePath) && typeof fileContent !== 'string')
-				return JSON.stringify(fileContent, null, '\t')
-		},
-
 		buildEnd() {
 			astTransformers = []
 		},