gg.easy.airship 0.1.2115 → 0.1.2117

package/Editor/AirshipComponentEditor.cs

@@ -7,7 +7,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Airship.Editor;
 using Code.Luau;
+using Editor.EditorInternal;
 using JetBrains.Annotations;
 using Luau;
 using UnityEditor.IMGUI.Controls;
@@ -62,7 +64,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
 
         if (binding.script != null && binding.script.m_metadata != null) {
             if (ShouldReconcile(binding)) {
-                binding.ReconcileMetadata();
+                binding.ReconcileMetadata(ReconcileSource.Inspector);
                 serializedObject.ApplyModifiedProperties();
                 serializedObject.Update();
             }
@@ -160,16 +162,23 @@ public class ScriptBindingEditor : UnityEditor.Editor {
 
     private void CheckDefaults(AirshipComponent binding) {
         var metadata = serializedObject.FindProperty("metadata");
+        if (metadata == null) {
+            Debug.LogError($"Metadata is null on binding {binding.name}");
+            return;
+        }
         
         var metadataProperties = metadata.FindPropertyRelative("properties");
         var originalMetadataProperties = binding.script.m_metadata.properties;
-
+        
         var setDefault = false;
 
         for (var i = 0; i < metadataProperties.arraySize; i++) {
             var metadataProperty = metadataProperties.GetArrayElementAtIndex(i);
             var propName = metadataProperty.FindPropertyRelative("name").stringValue;
             var originalProperty = originalMetadataProperties.Find((p) => p.name == propName);
+            if (originalProperty == null) {
+                continue;
+            }
             
             var modified = metadataProperty.FindPropertyRelative("modified");
             if (modified.boolValue) {
@@ -338,15 +347,28 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         var propertyList = new List<SerializedProperty>();
         var indexDictionary = new Dictionary<string, int>();
 
-        if (binding.script.m_metadata != null) {
-            for (var i = 0; i < metadataProperties.arraySize; i++) {
-                var property = metadataProperties.GetArrayElementAtIndex(i);
-                propertyList.Add(property);
-                indexDictionary.Add(binding.script.m_metadata.properties[i].name, i);
+        var bindingMetadata = binding.script.m_metadata;
+        var bindingProperties = bindingMetadata.properties;
+
+        var dataIsInvalid = false;
+        
+        for (var i = 0; i < metadataProperties.arraySize; i++) {
+            var property = metadataProperties.GetArrayElementAtIndex(i);
+            var propertyName = property.FindPropertyRelative("name").stringValue;
+            var bindingPropertyIndex = bindingProperties.FindIndex(p => p.name == propertyName);
+            if (bindingPropertyIndex == -1) {
+//#if AIRSHIP_INTERNAL
+                EditorGUILayout.LabelField(propertyName, "(Missing)", EditorStyles.miniLabel);
+                dataIsInvalid = true;
+//#endif
+                continue;
             }
+            
+            var bindingProperty = bindingProperties[bindingPropertyIndex];
+            propertyList.Add(property);
+            indexDictionary.Add(bindingProperty.name, bindingPropertyIndex);
         }
-
-
+        
         // Sort properties by order in non-serialized object
         propertyList.Sort((p1, p2) =>
             indexDictionary[p1.FindPropertyRelative("name").stringValue] > indexDictionary[p2.FindPropertyRelative("name").stringValue] ? 1 : -1
@@ -355,8 +377,32 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         foreach (var prop in propertyList) {
             DrawCustomProperty(binding.GetInstanceID(), binding.script.m_metadata, prop);   
         }
+        
+#if AIRSHIP_DEBUG
+        AirshipEditorGUI.HorizontalLine();
+        EditorGUILayout.LabelField("Debug", EditorStyles.boldLabel);
+        
+        GUI.enabled = false;
+        EditorGUILayout.LabelField("GUID", binding.guid);
+        EditorGUILayout.Toggle("Instance", PrefabUtility.IsPartOfAnyPrefab(binding));
+        EditorGUILayout.LabelField("File Hash", binding.script.sourceFileHash);
+        EditorGUILayout.LabelField("Component Hash", binding.componentHash);
+        
+        GUI.enabled = true;
+
+        EditorGUILayout.BeginHorizontal();
+        {
+            GUILayout.FlexibleSpace();
+            if (GUILayout.Button("Reconcile")) {
+                AirshipReconciliationService.ReconcileComponent(binding);
+            }
+        }
+        EditorGUILayout.EndHorizontal();
+#endif
     }
 
+    private bool showDebug = true;
+
     // NOTE: This will probably change. Whole "decorators" structure will probably be redesigned.
     private bool HasDecorator(SerializedProperty modifiers, string modifier) {
         for (var i = 0; i < modifiers.arraySize; i++) {
@@ -390,7 +436,12 @@ public class ScriptBindingEditor : UnityEditor.Editor {
 
         var documentation = bindingProp.Documentation;
         var tooltip = GetTooltip(documentation ?? "", decoratorDictionary);
-        
+
+        var wasBold = AirshipEditorInternals.GetBoldDefaultFont();
+        var hasOverride = modified.boolValue && value.prefabOverride;
+        if (hasOverride) {
+            AirshipEditorInternals.SetBoldDefaultFont(true);
+        }
         
         var guiContent = new GUIContent(propNameDisplay, tooltip);
         
@@ -471,7 +522,20 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                 GUILayout.Label($"{propName.stringValue}: {type.stringValue} not yet supported");
                 break;
         }
+        
+        if (hasOverride && Event.current.type == EventType.Repaint) {
+            var lastRect = GUILayoutUtility.GetLastRect();
+
+            var modifiedRect = lastRect;
+            modifiedRect.x = 1;
+            modifiedRect.width = 2;
+            Graphics.DrawTexture(modifiedRect, EditorGUIUtility.whiteTexture, new Rect(), 0, 0, 0, 0, k_LiveModifiedMarginDarkThemeColor);
+        }
+        
+        AirshipEditorInternals.SetBoldDefaultFont(wasBold);
     }
+    
+    internal static Color k_LiveModifiedMarginDarkThemeColor = new(1f / 255f, 153f / 255f, 235f / 255f, 0.2f);
 
     private void DrawCustomArrayProperty(string scriptName, int componentInstanceId, string propName, GUIContent guiContent, SerializedProperty type, SerializedProperty modifiers, AirshipComponentPropertyType arrayElementType, SerializedProperty property, SerializedProperty modified) {
         if (!_openPropertyFoldouts.TryGetValue((scriptName, propName), out bool open))

package/Editor/AirshipScriptGUI.cs

@@ -136,7 +136,7 @@ namespace Code.Luau {
                                     var itemScriptBinding = item.ToObject<AirshipComponent>();
                                     return itemScriptBinding != null && IsBindableAsComponent(itemScriptBinding, script);
                                 }, null, script.m_metadata?.displayName ?? "AirshipBehaviour");
-                            view.SetSearchText($"h:t:ScriptBinding"); // #m_fileFullPath={script.m_path}
+                            view.SetSearchText($"h:t:AirshipComponent airshipcomponent.script=\"{script.assetPath}\""); // #m_fileFullPath={script.m_path}
 
                             evt.Use();
                             GUIUtility.ExitGUI();

package/Editor/Artifacts/AirshipLocalArtifactDatabase.cs

@@ -0,0 +1,224 @@
+#if UNITY_EDITOR
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using Luau;
+using UnityEditor;
+using UnityEditor.AssetImporters;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace Airship.Editor {
+    [Serializable]
+    internal class ComponentData {
+        
+        /// <summary>
+        /// The script path of this component
+        /// </summary>
+        public string script;
+        /// <summary>
+        /// The asset path of this component (if it's in a prefab)
+        /// </summary>
+        public string asset;
+        /// <summary>
+        /// The globally-unique identifier of this component
+        /// </summary>
+        public string guid;
+        /// <summary>
+        /// Metadata of this component
+        /// </summary>
+        public TypescriptCompilerMetadata metadata;
+        
+        private AirshipComponent _component;
+        /// <summary>
+        /// Will find the component via <tt>Resources.FindObjectsOfTypeAll&lt;T&gt;</tt>, and cache the result
+        /// </summary>
+        [CanBeNull] public AirshipComponent Component {
+            get {
+                if (_component) return _component;
+                var components = Resources.FindObjectsOfTypeAll<AirshipComponent>();
+                foreach (var component in components) {
+                    if (component.guid != guid) continue; 
+                    
+                    _component = component;
+                    break;
+                }
+
+                return _component;
+            }
+        }
+
+        [CanBeNull] public GameObject Prefab => asset != null ? AssetDatabase.LoadAssetAtPath<GameObject>(asset) : null;
+        
+        /// <summary>
+        /// Will return if the given component is synchronized with this data
+        /// </summary>
+        /// <param name="component">The component</param>
+        /// <returns>True if the component matches this data</returns>
+        public bool IsSyncedWith(AirshipComponent component) {
+            if (guid != component.guid) return false;
+            if (metadata == null) return false;
+            
+            return component.componentHash == metadata.hash;
+        }
+    }
+    
+    [Serializable]
+    internal class ComponentScriptAssetData {
+        public string script;
+        public TypescriptCompilerMetadata metadata;
+        
+        /// <summary>
+        /// Will find the script via <tt>AssetDatabase.LoadAssetAtPath&lt;T&gt;(assetPath)</tt>
+        /// </summary>
+        public AirshipScript Script => AssetDatabase.LoadAssetAtPath<AirshipScript>(script);
+        
+        /// <summary>
+        /// Will return whether or not the given component data is newer than the script data
+        /// </summary>
+        public bool IsNewerThan(ComponentData componentData) {
+            if (componentData.metadata == null) return true;
+            var componentMetadata = componentData.metadata;
+            
+            // If the component is newer, than yes the script is outdated
+            return componentMetadata < metadata;
+        }
+
+        /// <summary>
+        /// Returns whether this component script data hash matches the given component script data hash
+        /// </summary>
+        public bool HasSameHashAs(ComponentData componentData) {
+            if (componentData.metadata == null) return false;
+            return componentData.metadata.hash == metadata.hash;
+        }
+
+
+        /// <summary>
+        /// Will return true if the hash of the component isn't the same as the DB stored script hash
+        /// </summary>
+        public bool IsNotSameHashAsComponent(AirshipComponent component) {
+            return component.componentHash != metadata.hash;
+        }
+    }
+
+    /// <summary>
+    /// The local artifact database for Airship's Editor - stored in <code>Library/AirshipArtifactDB</code>
+    /// This contains the state of the scripts and components for the local project
+    /// </summary>
+    [FilePath("Library/AirshipArtifactDB", FilePathAttribute.Location.ProjectFolder)]
+    internal class AirshipLocalArtifactDatabase : ScriptableSingleton<AirshipLocalArtifactDatabase> {
+        [SerializeField] internal ReconcilerVersion reconcilerVersion = ReconcilerVersion.Default;
+        [SerializeField] internal List<ComponentScriptAssetData> scripts = new();
+        [SerializeField] internal List<ComponentData> components = new();
+        
+        /// <summary>
+        /// Gets or creates the script asset data in the artifact database for the given script
+        /// </summary>
+        internal ComponentScriptAssetData GetOrCreateScriptAssetData(AirshipScript script) {
+            var item = scripts.FirstOrDefault(f => f.script == script.assetPath);
+            if (item == null) {
+                item = new ComponentScriptAssetData() {
+                    script = script.assetPath,
+                    metadata = null,
+                };
+                scripts.Add(item);
+            }
+            return item;
+        }
+
+        /// <summary>
+        /// Will try to get the component data associated with the specified component (if applicable)
+        /// </summary>
+        internal bool TryGetComponentData(AirshipComponent component, out ComponentData componentData, string assetPath = null) {
+            var item = components.FirstOrDefault(f => f.guid == component.guid);
+            if (item != null) {
+                componentData = item;
+                return true;
+            }
+
+            componentData = null;
+            return false;   
+        }
+        
+        /// <summary>
+        /// Will try to get the script asset data associated with the specified script (if applicable)
+        /// </summary>
+        internal bool TryGetScriptAssetData(AirshipScript script, out ComponentScriptAssetData assetData) {
+            var item = scripts.FirstOrDefault(f => f.script == script.assetPath);
+            if (item != null) {
+                assetData = item;
+                return true;
+            }
+            assetData = null;
+            return false;
+        }
+
+        /// <summary>
+        /// Remove the component data for the given component - usually called when the component is destroyed or
+        /// no longer wants to be referenced in the database
+        /// </summary>
+        internal bool RemoveComponentData(AirshipComponent component) {
+            var item = components.FirstOrDefault(f => f.guid == component.guid);
+            if (item == null) return false;
+            components.Remove(item);
+            return true;
+        }
+
+        private void OnEnable() {
+#if AIRSHIP_DEBUG
+            Debug.Log($"[LocalArtifactDB] Artifact DB enabled");
+#endif
+            
+            // Dictionary<string, AirshipScript> pathToScript = new();
+            // foreach (var script in Resources.FindObjectsOfTypeAll<AirshipScript>()) {
+            //     if (pathToScript.ContainsKey(script.assetPath)) continue; // skip duplicates
+            //     pathToScript.Add(script.assetPath, script);
+            // }
+            
+            // When enabled we kind of want to run a validation of the component list
+            Dictionary<string, AirshipComponent> guidToComponent = new();
+            foreach (var component in Resources.FindObjectsOfTypeAll<AirshipComponent>()) {
+                if (component != null && guidToComponent.ContainsKey(component.guid)) continue; // skip duplicates
+                guidToComponent.Add(component.guid, component);
+            }
+
+            // Check each entry, if it has an active matching guid in memory we wanna skip, otherwise
+            // we'll yeet it from existence - we don't care, and unity isn't going to try to reconcile it.
+            foreach (var componentData in components.ToArray()) {
+                if (guidToComponent.TryGetValue(componentData.guid, out _)) continue;
+                components.Remove(componentData); // ??
+#if AIRSHIP_DEBUG
+                Debug.Log($"[LocalArtifactDB] Clean out component guid {componentData.guid}");
+#endif
+            }
+            
+//             foreach (var scriptAssetData in scripts.ToArray()) { /// ???
+//                 if (pathToScript.TryGetValue(scriptAssetData.assetPath, out _)) continue;
+//                 scripts.Remove(scriptAssetData);
+// #if AIRSHIP_DEBUG
+//                 Debug.Log($"[LocalArtifactDB] Clean out script {scriptAssetData.assetPath}");
+// #endif
+//             }
+        }
+
+        internal void Rebuild() {
+            this.components.Clear();
+            this.scripts.Clear();
+        }
+
+        private void OnDisable() {
+#if AIRSHIP_DEBUG
+            Debug.Log($"[LocalArtifactDB] Artifact DB disabled");
+#endif
+        }
+
+        /// <summary>
+        /// Modifies any changes to the artifact database
+        /// </summary>
+        internal void Modify() {
+            Save(true);
+        }
+    }
+}
+#endif

package/Editor/Artifacts/AirshipLocalArtifactDatabase.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c8837870c53d42dc8cd6708f85a6bf24
+timeCreated: 1742970275