Show entity name and parent separately in cmd viewer

Author: SanderMertens

deps/flecs.c

@@ -389,8 +389,8 @@ extern "C" {
 
 #define EcsFilterMatchThis             (1u << 1u)  /* Has terms that match This */
 #define EcsFilterMatchOnlyThis         (1u << 2u)  /* Has only terms that match This */
-#define EcsFilterMatchPrefab           (1u << 3u)  /* Does filter match prefabs */
-#define EcsFilterMatchDisabled         (1u << 4u)  /* Does filter match disabled entities */
+#define EcsQueryMatchPrefab           (1u << 3u)  /* Does filter match prefabs */
+#define EcsQueryMatchDisabled         (1u << 4u)  /* Does filter match disabled entities */
 #define EcsFilterMatchEmptyTables      (1u << 5u)  /* Does filter return empty tables */
 #define EcsFilterMatchAnything         (1u << 6u)  /* False if filter has no/only Not terms */
 #define EcsFilterNoData                (1u << 7u)  /* When true, data fields won't be populated */
@@ -2939,7 +2939,7 @@ typedef enum ecs_oper_kind_t {
 #define EcsTermMatchPrefab            (1u << 8)
 
 /** Type that describes a single identifier in a term */
-typedef struct ecs_term_id_t {
+typedef struct ecs_term_ref_t {
     ecs_entity_t id;            /**< Entity id. If left to 0 and flags does not 
                                  * specify whether id is an entity or a variable
                                  * the id will be initialized to EcsThis. 
@@ -2957,7 +2957,7 @@ typedef struct ecs_term_id_t {
                                  * the Traversable property. Default is IsA. */
 
     ecs_flags32_t flags;        /**< Term flags */
-} ecs_term_id_t;
+} ecs_term_ref_t;
 
 /** Type that describes a term (single element in a query) */
 struct ecs_term_t {
@@ -2966,9 +2966,9 @@ struct ecs_term_t {
                                  * first/second members, which provide more
                                  * flexibility. */
 
-    ecs_term_id_t src;          /**< Source of term */
-    ecs_term_id_t first;        /**< Component or first element of pair */
-    ecs_term_id_t second;       /**< Second element of pair */
+    ecs_term_ref_t src;          /**< Source of term */
+    ecs_term_ref_t first;        /**< Component or first element of pair */
+    ecs_term_ref_t second;       /**< Second element of pair */
 
     ecs_inout_kind_t inout;     /**< Access to contents matched by term */
     ecs_oper_kind_t oper;       /**< Operator of term */
@@ -6771,7 +6771,7 @@ bool ecs_children_next(
  */
 FLECS_API 
 bool ecs_term_id_is_set(
-    const ecs_term_id_t *id);
+    const ecs_term_ref_t *id);
 
 /** Test whether a term is set.
  * This operation can be used to test whether a term has been initialized with
@@ -8777,7 +8777,7 @@ int ecs_value_move_ctor(
  *
  * Example:
  *   ecs_query(world, {
- *     .filter.terms = {{ ecs_id(Position) }}
+ *     .terms = {{ ecs_id(Position) }}
  *   });
  */
 #define ecs_query(world, ...)\
@@ -8787,7 +8787,7 @@ int ecs_value_move_ctor(
  *
  * Example:
  *   ecs_observer(world, {
- *     .filter.terms = {{ ecs_id(Position) }},
+ *     .terms = {{ ecs_id(Position) }},
  *     .events = { EcsOnAdd },
  *     .callback = AddPosition
  *   });
@@ -11211,7 +11211,7 @@ ecs_entity_t ecs_system_init(
  *       .name = "MyEntity",
  *       .add = { ecs_dependson(EcsOnUpdate) }
  *     }),
- *     .query.filter.terms = {
+ *     .query.terms = {
  *       { ecs_id(Position) },
  *       { ecs_id(Velocity) }
  *     },
@@ -15100,7 +15100,7 @@ bool ecs_rule_next_instanced(
  * @return The string
  */
 FLECS_API
-char* ecs_rule_str(
+char* ecs_query_plan(
     const ecs_rule_t *rule);
 
 /** Convert rule to string with profile.
@@ -15112,7 +15112,7 @@ char* ecs_rule_str(
  * @return The string
  */
 FLECS_API
-char* ecs_rule_str_w_profile(
+char* ecs_query_plan_w_profile(
     const ecs_rule_t *rule,
     const ecs_iter_t *it);
 
@@ -15383,7 +15383,7 @@ char* ecs_parse_term(
     const char *expr,
     const char *ptr,
     ecs_term_t *term_out,
-    ecs_term_id_t *extra_args);
+    ecs_term_ref_t *extra_args);
 
 #ifdef __cplusplus
 }
@@ -27246,7 +27246,7 @@ struct term_id_builder_i {
         return *this;
     }
 
-    ecs_term_id_t *m_term_id;
+    ecs_term_ref_t *m_term_id;
 
 protected:
     virtual flecs::world_t* world_v() = 0;
@@ -29022,8 +29022,8 @@ namespace _ {
     {
         ecs_observer_desc_t desc = {};
         desc.events[0] = event;
-        desc.filter.terms[0].id = EcsAny;
-        desc.filter.terms[0].src.id = entity;
+        desc.terms[0].id = EcsAny;
+        desc.terms[0].src.id = entity;
         desc.callback = callback;
         desc.binding_ctx = binding_ctx;
         desc.binding_ctx_free = binding_ctx_free;
@@ -29478,8 +29478,8 @@ struct system final : entity
         m_world = world;
         m_id = ecs_system_init(world, desc);
 
-        if (desc->query.filter.terms_buffer) {
-            ecs_os_free(desc->query.filter.terms_buffer);
+        if (desc->query.terms_buffer) {
+            ecs_os_free(desc->query.terms_buffer);
         }
     }
 
@@ -29669,8 +29669,8 @@ struct pipeline : entity {
             ecs_abort(ECS_INVALID_PARAMETER, NULL);
         }
 
-        if (desc->query.filter.terms_buffer) {
-            ecs_os_free(desc->query.filter.terms_buffer);
+        if (desc->query.terms_buffer) {
+            ecs_os_free(desc->query.terms_buffer);
         }
     }
 };
@@ -30131,10 +30131,10 @@ struct rule_base {
 
     /** Converts this rule to a string that can be used to aid debugging
      * the behavior of the rule.
-     * @see ecs_rule_str
+     * @see ecs_query_plan
      */
     flecs::string rule_str() const {
-        char *result = ecs_rule_str(m_rule);
+        char *result = ecs_query_plan(m_rule);
         return flecs::string(result);
     }
 

deps/flecs.h

@@ -141,7 +141,9 @@ let components = [
   loadModule('js/components/code-editor.vue', options),
   loadModule('js/components/prop-browser.vue', options),
   loadModule('js/components/url-bar.vue', options),
+  loadModule('js/components/entity-path.vue', options),
   loadModule('js/components/entity-parent.vue', options),
+  loadModule('js/components/entity-name.vue', options),
 
   // Queries page
   loadModule('js/components/pages/queries/page.vue', options),

etc/query_editor/js/app.js

@@ -0,0 +1,24 @@
+<template>
+  {{ entityName }}
+</template>
+
+<script>
+export default { name: "entity-name" };
+</script>
+
+<script setup>
+import { computed, defineProps } from 'vue';
+
+const props = defineProps({
+  path: {type: String, required: true}
+});
+
+const entityName = computed(() => {
+  const names = props.path.split(".");
+  return names.pop();
+});
+
+</script>
+
+<style>
+</style>

etc/query_editor/js/components/entity-name.vue

@@ -1,50 +1,25 @@
 <template>
-  <span class="entity-parent">
-    <render/>
-  </span>
+  <entity-path :path="parent"></entity-path>
 </template>
 
 <script>
 export default { name: "entity-parent" };
 </script>
 
 <script setup>
-import { computed, defineProps, h } from 'vue';
+import { computed, defineProps } from 'vue';
 
 const props = defineProps({
-  path: {type: String, required: false}
+  path: {type: String, required: true}
 });
 
-const render = () => {
-  let elems = [];
-  if (!props.path) {
-    return h('span', {}, 'root');
-  }
-
+const parent = computed(() => {
   const names = props.path.split(".");
-  let count = 0;
-  for (const name of names) {
-    if (count) {
-      elems.push(h('span', {class: 'entity-parent-sep'}, ' > '));
-    }
-    elems.push(h('span', {}, name));
-    count ++;
-  }
-
-  return elems;
-}
+  names.pop();
+  return names.join(".");
+});
 
 </script>
 
 <style>
-span.entity-parent {
-  font-size: 0.8em;
-  color: var(--secondary-text);
-  white-space: preserve;
-}
-
-span.entity-parent-sep {
-  color: var(--green);
-  font-weight: 600;
-}
 </style>

etc/query_editor/js/components/entity-parent.vue

@@ -0,0 +1,50 @@
+<template>
+  <span class="entity-path">
+    <render/>
+  </span>
+</template>
+
+<script>
+export default { name: "entity-path" };
+</script>
+
+<script setup>
+import { computed, defineProps, h } from 'vue';
+
+const props = defineProps({
+  path: {type: String, required: false}
+});
+
+const render = () => {
+  let elems = [];
+  if (!props.path) {
+    return h('span', {}, 'root');
+  }
+
+  const names = props.path.split(".");
+  let count = 0;
+  for (const name of names) {
+    if (count) {
+      elems.push(h('span', {class: 'entity-path-sep'}, ' > '));
+    }
+    elems.push(h('span', {}, name));
+    count ++;
+  }
+
+  return elems;
+}
+
+</script>
+
+<style>
+span.entity-path {
+  font-size: 0.8em;
+  color: var(--secondary-text);
+  white-space: preserve;
+}
+
+span.entity-path-sep {
+  color: var(--green);
+  font-weight: 600;
+}
+</style>

etc/query_editor/js/components/entity-path.vue

@@ -5,11 +5,11 @@
     </span>
     <template v-if="cmd.system">
       <span class="commands-cmd-system">
-        <entity-parent :path="cmd.system"></entity-parent>
+        <entity-path :path="cmd.system"></entity-path>
       </span>
     </template>
     <template v-else>
-      <entity-parent path="unknown source"></entity-parent>
+      <entity-path path="unknown source"></entity-path>
     </template>
     <span class="commands-cmd-kind">
       {{ cmd.kind }}
@@ -20,8 +20,12 @@
       </template>
     </span>
     <template v-if="cmd.entity">
-      <span class="commands-cmd-entity code-identifier">
-        {{ cmd.entity }}
+        <span class="commands-cmd-entity-parent code-identifier">
+          <entity-parent :path="cmd.entity"></entity-parent>
+        </span>
+        <span class="commands-cmd-entity code-identifier">
+          <entity-name :path="cmd.entity"></entity-name>
+        </span>
         <template v-if="!cmd.is_alive">
           <span class="commands-cmd-not-alive">not alive</span>
         </template>
@@ -131,9 +135,15 @@ span.commands-cmd-is-alive {
   color: var(--secondary-text);
 }
 
+span.commands-cmd-entity-parent {
+  grid-column: 3;
+  grid-row: 1;
+  overflow: hidden;
+}
+
 span.commands-cmd-entity {
   grid-column: 3;
-  grid-row: 1 / 3;
+  grid-row: 2;
   overflow: hidden;
 }
 

etc/query_editor/js/components/pages/commands/inspect-cmd.vue

@@ -7,7 +7,7 @@
             <icon :src="query_icon" :opacity="0.5" v-if="query_icon"></icon>
           </div>
           <div class="query-inspect-content">
-            <entity-parent :path="query_parent"></entity-parent>
+            <entity-path :path="query_parent"></entity-path>
             <span class="query-inspect-name">{{ query_name }}</span>
           </div>
         </div>

etc/query_editor/js/components/pages/queries/query-inspect.vue

@@ -5,7 +5,7 @@
         <icon :src="img" :opacity="0.5" v-if="img"></icon>
       </div>
       <div class="query-list-item-content">
-        <entity-parent :path="prop.parent"></entity-parent>
+        <entity-path :path="prop.parent"></entity-path>
         <prop_name/>
         <span class="prop-brief" v-if="description">{{ description }}</span>
         <template v-if="show_usage && (isComponent || isRelationship) && !isModule">