Merge branch 'dev' into ryan/2033/add-confirmation-before-dev-tool-removal

Author: ryanzhangofficial

.github/workflows/FissionBuild.yml

@@ -35,3 +35,8 @@ jobs:
         run: |
           cd fission
           bun run build && echo "Build Passed" || (echo "Build Failed" && exit 1)
+
+      - name: Build Electron Version of Fission
+        run: |
+          cd fission
+          bun run electron:make && echo "Build Passed" || (echo "Build Failed" && exit 1)

exporter/SynthesisFusionAddin/web/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "NODE_ENV=dev vite build --watch",
     "dev:ui": "vite --open",
-    "build": "vite build",
+    "build": "tsc -p tsconfig.app.json && vite build",
     "lint": "biome lint",
     "lint:fix": "biome lint --fix",
     "style": "biome format",

exporter/SynthesisFusionAddin/web/src/lib/joints.ts

@@ -28,7 +28,7 @@ export const signalInfo: Record<SignalType, { bg: string; outline: string; fg: s
 
 export function createJoint(fusionJoint: FusionJoint): Joint {
     return {
-        entityToken: fusionJoint.entityToken,
+        jointToken: fusionJoint.entityToken,
         name: fusionJoint.name,
         type: fusionJoint.jointType,
         parent: JointParentType.ROOT,

exporter/SynthesisFusionAddin/web/tsconfig.app.json

@@ -1,4 +1,5 @@
 {
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "target": "ES2022",

exporter/SynthesisFusionAddin/web/tsconfig.node.json

@@ -1,4 +1,5 @@
 {
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
     "target": "ES2023",
@@ -11,7 +12,7 @@
     "verbatimModuleSyntax": true,
     "moduleDetection": "force",
     "noEmit": true,
-
+    "composite": true,
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,

fission/electron/vite.renderer.config.ts

@@ -1,5 +1,8 @@
-import { defineConfig, mergeConfig } from "vite"
+import { defineConfig, mergeConfig, type UserConfig } from "vite"
 import baseConfig from "../vite.config"
 
 // https://vitejs.dev/config
-export default defineConfig((env) => mergeConfig(baseConfig(env), {}))
+export default defineConfig(async (env) => {
+    const base = typeof baseConfig === 'function' ? await baseConfig(env) : baseConfig
+    return mergeConfig(base, {} as UserConfig)
+})

fission/package.json

@@ -22,6 +22,7 @@
     "style": "bun run fmt && bun run lint",
     "style:fix": "bun run fmt:fix && bun run lint:fix",
     "assetpack": "git lfs pull && tar -xf public/assetpack.zip -C public/",
+    "assetpack:update": "cd public && zip -FS -r assetpack.zip Downloadables",
     "playwright:install": "bun x playwright install",
     "electron:start": "electron-forge start",
     "electron:package": "electron-forge package",

fission/public/assetpack.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:985ef0918d3b8200fc076cc31d9af0199b08586e45fda4ecc716555a01660fee
-size 193149510
+oid sha256:23bfaf7899d84b00331c12bf1ada20d27d3c50856b14bb5733821b44848812ba
+size 193147860

fission/src/mirabuf/FieldMiraEditor.ts

@@ -1,10 +1,15 @@
-import type { ScoringZonePreferences } from "@/systems/preferences/PreferenceTypes"
-import { mirabuf } from "../proto/mirabuf"
+import type MirabufSceneObject from "@/mirabuf/MirabufSceneObject.ts"
+import { mirabuf } from "@/proto/mirabuf"
+import {
+    defaultFieldPreferences,
+    type FieldPreferences,
+    type ScoringZonePreferences,
+} from "@/systems/preferences/PreferenceTypes"
 
-interface DevtoolMiraData {
+export interface DevtoolMiraData {
     "devtool:scoring_zones": ScoringZonePreferences[]
     "devtool:camera_locations": unknown
-    "devtool:spawn_points": unknown
+    "devtool:spawn_locations": FieldPreferences["spawnLocations"]
     "devtool:a": unknown
     "devtool:b": unknown
     "devtool:test": unknown
@@ -15,6 +20,87 @@ interface DevtoolMiraData {
     // additional devtool keys to be added in future
 }
 
+export const devtoolHandlers = {
+    "devtool:scoring_zones": {
+        get(field) {
+            return field.fieldPreferences?.scoringZones ?? defaultFieldPreferences().scoringZones
+        },
+        set(field, val) {
+            val ??= defaultFieldPreferences().scoringZones
+            if (!field.fieldPreferences || !this.validate(val)) {
+                console.warn("validation failed", val, field.fieldPreferences)
+                return
+            }
+            field.fieldPreferences.scoringZones = val
+            field.updateScoringZones()
+        },
+        validate(val): val is ScoringZonePreferences[] {
+            if (!Array.isArray(val)) return false
+            return val.every(
+                z =>
+                    typeof z === "object" &&
+                    z !== null &&
+                    typeof z.name === "string" &&
+                    (z.alliance === "red" || z.alliance === "blue") &&
+                    (typeof z.parentNode === "string" || z.parentNode === undefined) &&
+                    typeof z.points === "number" &&
+                    typeof z.destroyGamepiece === "boolean" &&
+                    typeof z.persistentPoints === "boolean" &&
+                    Array.isArray(z.deltaTransformation)
+            )
+        },
+    },
+    "devtool:spawn_locations": {
+        get(field) {
+            return field.fieldPreferences?.spawnLocations ?? defaultFieldPreferences().spawnLocations
+        },
+        set(field, val) {
+            val ??= defaultFieldPreferences().spawnLocations
+            if (!field.fieldPreferences || !this.validate(val)) {
+                console.warn("validation failed", val, field.fieldPreferences)
+                return
+            }
+            field.fieldPreferences.spawnLocations = val
+        },
+        validate(val: unknown): val is FieldPreferences["spawnLocations"] {
+            const isStructureCorrect =
+                typeof val === "object" &&
+                val != null &&
+                "red" in val &&
+                "blue" in val &&
+                "default" in val &&
+                "hasConfiguredLocations" in val
+
+            if (!isStructureCorrect) return false
+            return (["red", "blue"] as const).every(v => {
+                const obj = val[v]
+                if (!(typeof obj === "object" && obj != null && 1 in obj && 2 in obj && 3 in obj)) return false
+                return ([1, 2, 3] as const).every(v => {
+                    const spawnposition = obj[v]
+                    return (
+                        typeof spawnposition == "object" &&
+                        spawnposition != null &&
+                        "pos" in spawnposition &&
+                        "yaw" in spawnposition &&
+                        Array.isArray(spawnposition["pos"]) &&
+                        spawnposition["pos"].length == 3 &&
+                        typeof spawnposition["yaw"] == "number"
+                    )
+                })
+            })
+        },
+    },
+} as const satisfies Partial<{
+    [K in keyof DevtoolMiraData]: {
+        get(field: MirabufSceneObject): DevtoolMiraData[K]
+        set(field: MirabufSceneObject, val: unknown | null): void
+        validate(val: unknown): val is DevtoolMiraData[K]
+    }
+}>
+
+export type DevtoolKey = keyof typeof devtoolHandlers
+export const devtoolKeys = Object.keys(devtoolHandlers) as DevtoolKey[]
+
 /**
  * Utility for reading and writing developer tool data in the mira file's UserData field.
  * Docs: https://www.mirabuf.dev/#mirabuf.UserData