fastapi-voyager 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl

fastapi_voyager/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.9.2"
+__version__ = "0.9.4"

fastapi_voyager/voyager.py

@@ -144,6 +144,11 @@ class Voyager:
         """
         full_name = full_class_name(schema)
         bases_fields = get_bases_fields([s for s in schema.__bases__ if is_inheritance_of_pydantic_base(s)])
+        
+        subset_reference = getattr(schema, const.ENSURE_SUBSET_REFERENCE, None)
+        if subset_reference and is_inheritance_of_pydantic_base(subset_reference):
+            bases_fields.update(get_bases_fields([subset_reference]))
+
         if full_name not in self.node_set:
             # skip meta info for normal queries
             self.node_set[full_name] = SchemaNode(

fastapi_voyager/web/component/route-code-display.js

@@ -3,12 +3,10 @@ const { defineComponent, ref, watch, onMounted } = window.Vue;
 // Component: RouteCodeDisplay
 // Props:
 //   routeId: route id key in routeItems
-//   modelValue: dialog visibility
 export default defineComponent({
   name: "RouteCodeDisplay",
   props: {
     routeId: { type: String, required: true },
-    modelValue: { type: Boolean, default: false },
   },
   emits: ["close"],
   setup(props, { emit }) {
@@ -99,32 +97,26 @@ export default defineComponent({
       }
     }
 
-    watch(
-      () => props.modelValue,
-      (v) => {
-        if (v) load();
-      }
-    );
     watch(
       () => props.routeId,
       () => {
-        if (props.modelValue) load();
+        load();
       }
     );
 
     onMounted(() => {
-      if (props.modelValue) load();
+      load();
     });
 
     return { loading, code, error, close, link };
   },
   template: `
-  <div class="frv-route-code-display" style="border:1px solid #ccc; position:relative; width:50vw; max-width:50vw; height:100%; background:#fff;">
+  <div class="frv-route-code-display" style="border:1px solid #ccc; position:relative; background:#fff;">
     <q-btn dense flat round icon="close" @click="close" aria-label="Close" style="position:absolute; top:6px; right:6px; z-index:10; background:rgba(255,255,255,0.85)" />
     <div v-if="link" class="q-ml-md q-mt-md" style="padding-top:4px;">
       <a :href="link" target="_blank" rel="noopener" style="font-size:12px; color:#3b82f6;">Open in VSCode</a>
     </div>
-    <div style="padding:40px 16px 16px 16px; height:100%; box-sizing:border-box; overflow:auto;">
+    <div style="padding:40px 16px 16px 16px; box-sizing:border-box; overflow:auto;">
       <div v-if="loading" style="font-family:Menlo, monospace; font-size:12px;">Loading source...</div>
       <div v-else-if="error" style="color:#c10015; font-family:Menlo, monospace; font-size:12px;">{{ error }}</div>
       <pre v-else style="margin:0;"><code class="language-python">{{ code }}</code></pre>

fastapi_voyager/web/component/schema-code-display.js

@@ -13,23 +13,17 @@ export default defineComponent({
   name: "SchemaCodeDisplay",
   props: {
     schemaName: { type: String, required: true },
-    modelValue: { type: Boolean, default: false },
     schemas: { type: Object, default: () => ({}) },
   },
-  emits: ["close"],
   setup(props, { emit }) {
-    const loading = ref(false);
     const code = ref("");
     const link = ref("");
     const error = ref("");
     const fields = ref([]); // schema fields list
-    const tab = ref("source");
+    const tab = ref("fields");
 
-    function close() {
-      emit("close");
-    }
 
-    function highlightLater() {
+    async function highlightLater() {
       // wait a tick for DOM update
       requestAnimationFrame(() => {
         try {
@@ -38,6 +32,10 @@ export default defineComponent({
               ".frv-code-display pre code.language-python"
             );
             if (block) {
+              // If already highlighted by highlight.js, remove the flag so it can be highlighted again
+              if (block.dataset && block.dataset.highlighted) {
+                block.removeAttribute("data-highlighted");
+              }
               window.hljs.highlightElement(block);
             }
           }
@@ -50,7 +48,6 @@ export default defineComponent({
     async function loadSource() {
       if (!props.schemaName) return;
 
-      loading.value = true;
       error.value = null;
       code.value = "";
       link.value = "";
@@ -77,7 +74,6 @@ export default defineComponent({
       } catch (e) {
         error.value = "Failed to load source";
       } finally {
-        loading.value = false;
       }
 
       try {
@@ -99,12 +95,12 @@ export default defineComponent({
       } catch (e) {
         error.value = "Failed to load source";
       } finally {
-        loading.value = false;
       }
 
-      fields.value = props.schemas[props.schemaName].fields || []
+      const schema = props.schemas && props.schemas[props.schemaName];
+      fields.value = Array.isArray(schema?.fields) ? schema.fields : [];
 
-      if (!error.value && tab.value === "source") {
+      if (tab.value === "source") {
         highlightLater();
       }
     }
@@ -120,25 +116,21 @@ export default defineComponent({
     );
 
     watch(
-      () => props.modelValue,
-      (val) => {
-        if (val) {
-          loadSource();
-        }
-      }
+      () => props.schemaName,
+      () => {
+        loadSource();
+      },
     );
 
     onMounted(() => {
-      if (props.modelValue) loadSource();
+      loadSource();
     });
 
-    return { loading, link, code, error, close, fields, tab };
+    return { link, code, error, fields, tab };
   },
   template: `
-  <div class="frv-code-display" style="border: 1px solid #ccc; border-left: none; position:relative; width:40vw; max-width:40vw; height:100%; background:#fff;">
-			<q-btn dense flat round icon="close" @click="close" aria-label="Close"
-				style="position:absolute; top:6px; right:6px; z-index:10; background:rgba(255,255,255,0.85)" />
-      <div v-if="link" class="q-ml-md q-mt-md">
+  <div class="frv-code-display" style="border: 1px solid #ccc; border-left: none; position:relative; height:100%; background:#fff;">
+      <div class="q-ml-lg q-mt-md">
         <a :href="link" target="_blank" rel="noopener" style="font-size:12px; color:#3b82f6;">
           Open in VSCode
         </a>
@@ -146,25 +138,21 @@ export default defineComponent({
 
       <div style="padding:8px 12px 0 12px; box-sizing:border-box;">
         <q-tabs v-model="tab" align="left" dense active-color="primary" indicator-color="primary" class="text-grey-8">
-          <q-tab name="source" label="Source Code" />
           <q-tab name="fields" label="Fields" />
+          <q-tab name="source" label="Source Code" />
         </q-tabs>
       </div>
       <q-separator />
-      <div style="padding:8px 16px 16px 16px; height:75%; box-sizing:border-box; overflow:auto;">
-        <div v-if="loading" style="font-family:Menlo, monospace; font-size:12px;">Loading source...</div>
-        <div v-else-if="error" style="color:#c10015; font-family:Menlo, monospace; font-size:12px;">{{ error }}</div>
+      <div style="padding:8px 16px 16px 16px; box-sizing:border-box; overflow:auto;">
+        <div v-if="error" style="color:#c10015; font-family:Menlo, monospace; font-size:12px;">{{ error }}</div>
         <template v-else>
-          <div v-show="tab === 'source'">
-            <pre style="margin:0;"><code class="language-python">{{ code }}</code></pre>
-          </div>
           <div v-show="tab === 'fields'">
             <table style="border-collapse:collapse; width:100%; font-size:12px; font-family:Menlo, monospace;">
               <thead>
                 <tr>
                   <th style="text-align:left; border-bottom:1px solid #ddd; padding:4px 6px;">Field</th>
                   <th style="text-align:left; border-bottom:1px solid #ddd; padding:4px 6px;">Type</th>
-                  <th style="text-align:left; border-bottom:1px solid #ddd; padding:4px 6px;">From Base</th>
+                  <th style="text-align:left; border-bottom:1px solid #ddd; padding:4px 6px;">Inherited</th>
                 </tr>
               </thead>
               <tbody>
@@ -179,6 +167,9 @@ export default defineComponent({
               </tbody>
             </table>
           </div>
+          <div v-show="tab === 'source'">
+            <pre style="margin:0;"><code class="language-python">{{ code }}</code></pre>
+          </div>
         </template>
       </div>
 	</div>

fastapi_voyager/web/graph-ui.js

@@ -69,23 +69,27 @@ export class GraphUI {
           const set = $();
           set.push(this);
           const obj = { set, direction: "bidirectional" };
-          // Shift+Click to trigger schema detail callback (if provided)
+
+          const schemaName = event.currentTarget.dataset.name;
           if (event.shiftKey && self.options.onSchemaClick) {
             // try data-name or title text
-            const schemaName = event.currentTarget.dataset.name;
             if (schemaName) {
               try {
-                self.options.onSchemaClick(schemaName);
+                self.options.onSchemaShiftClick(schemaName);
               } catch (e) {
-                console.warn("onSchemaClick callback failed", e);
+                console.warn("onSchemaShiftClick callback failed", e);
               }
             }
-          } else if (event.altKey && self.options.onSchemaAltClick) {
-            const schemaName = event.currentTarget.dataset.name;
-            self.options.onSchemaAltClick(schemaName);
           } else {
             self.currentSelection = [obj];
             self._highlight();
+            if (schemaName) {
+              try {
+                self.options.onSchemaClick(schemaName);
+              } catch (e) {
+                console.warn("onSchemaClick callback failed", e);
+              }
+            }
           }
         });
 
@@ -101,6 +105,31 @@ export class GraphUI {
           self._highlight();
         });
 
+        // svg 背景点击高亮清空
+
+        $(document).off('click.graphui').on('click.graphui', function (evt) {
+          // 如果点击目标不在 graph 容器内，直接退出
+          const graphContainer = $(self.selector)[0];
+          if (!graphContainer || !evt.target || !graphContainer.contains(evt.target)) {
+            return;
+          }
+
+          let isNode = false;
+          const $nodes = self.gv.nodes();
+          const node = evt.target.parentNode;
+          $nodes.each(function () {
+            if (this === node) {
+              isNode = true;
+            }
+          });
+          if (!isNode && self.gv) {
+            self.gv.highlight();
+            if (self.options.resetCb) {
+              self.options.resetCb();
+            }
+          }
+        });
+
         $(document).on("keydown.graphui", function (evt) {
           if (evt.keyCode === 27 && self.gv) {
             self.gv.highlight();

fastapi_voyager/web/index.html

@@ -55,51 +55,26 @@
       flex: 1 1 auto;
       overflow: auto;
     }
+
+    .adjust-fit {
+      height: calc(100% - 54px);
+    }
   </style>
   <body>
-    <div id="q-app" class="column" style="height: 100%">
-      <div
-        v-if="state.initializing"
-        style="
-          position: fixed;
-          inset: 0;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          z-index: 2000;
-          background: rgba(255, 255, 255, 0.85);
-          font-size: 18px;
-          font-family: Roboto, sans-serif;
-          color: #444;
-        "
-      >
-        <div style="text-align: center">
-          <div class="q-mb-sm">Initializing...</div>
-          <q-spinner color="primary" size="32px" />
-        </div>
-      </div>
-      <div
-        style="
-          padding: 8px;
-          background-color: #fff;
-          border-bottom: 1px solid #ccc;
-          color: #211d1d;
-          flex: 0 0 auto;
-        "
-      >
-        <div class="row items-center q-col-gutter-md">
-          <div class="col-auto">
+    <div id="q-app">
+      <q-layout view="hHh lpR fff">
+        <q-header bordered class="bg-primary text-white">
+          <q-toolbar class="row text-grey-9 bg-white" style="width: 100%">
             <div
-              style="width: 282px; margin-left: 8px"
-              class="text-h6 text-primary"
+              class="col-auto text-primary"
+              style="font-size: 16px; font-weight: bold"
             >
               <q-icon class="q-mr-sm" name="satellite_alt"></q-icon>
               <span> FastAPI Voyager </span>
             </div>
-          </div>
-          <div class="col-auto">
-            <div class="column">
+            <div class="col-auto" style="font-size: 16px">
               <q-option-group
+                style="margin-left: 140px"
                 v-model="state.showFields"
                 :options="state.fieldOptions"
                 @update:model-value="(val) => toggleShowField(val)"
@@ -109,170 +84,188 @@
                 dense
               />
             </div>
-          </div>
-
-          <!-- <div class="col-auto">
-            <q-btn-dropdown
-              class="q-ml-md"
-              split
-              :loading="state.generating"
-              @click="onGenerate"
-              label="Generate"
-              outline
-            >
-              <q-list>
-                <q-item clickable v-close-popup @click="onDumpData">
-                  <q-item-section>Dump data</q-item-section>
-                </q-item>
-                <q-item clickable v-close-popup @click="openImportDialog">
-                  <q-item-section>Import data</q-item-section>
-                </q-item>
-              </q-list>
-            </q-btn-dropdown>
-          </div> -->
+            <div class="col-auto q-ml-auto">
+              <q-toggle
+                class="q-mr-md"
+                v-model="state.brief"
+                label="Brief Mode"
+                @update:model-value="(val) => toggleBrief(val)"
+                title="skip middle classes, config module_prefix to enable it"
+                dense
+              />
+            </div>
+            <div class="col-auto">
+              <q-toggle
+                v-model="state.hidePrimitiveRoute"
+                @update:model-value="(val) => toggleHidePrimitiveRoute(val)"
+                label="Hide Primitive"
+                title="hide routes return primitive"
+                class="q-mr-md"
+                dense
+              />
+            </div>
+            <div class="col-auto">
+              <q-btn
+                outline
+                @click="onReset"
+                title="may be very slow"
+                class="q-mr-md"
+                label="Show All"
+              />
+            </div>
+            <div class="col-auto">
+              <q-btn
+                outline
+                icon="search"
+                label="Search"
+                class="q-mr-md"
+                @click="showDialog()"
+              />
+            </div>
+            <div class="col-auto">
+              <q-btn
+                dense
+                round
+                flat
+                icon="help_outline"
+                aria-label="Help"
+                class="q-mr-sm"
+              >
+                <q-tooltip
+                  anchor="bottom middle"
+                  self="top middle"
+                  :offset="[0,8]"
+                >
+                  <div
+                    class="column items-start text-left"
+                    style="line-height: 1.4; font-size: 12px"
+                  >
+                    <ul>
+                      <li>scroll to zoom in/out</li>
+                      <li>
+                        click node to check highlight related nodes on the
+                        chart, esc to unselect
+                      </li>
+                      <li>
+                        shift + click to see schema's dependencies without
+                        unrelated nodes
+                      </li>
+                      <li>alt + click to see schema details</li>
+                    </ul>
+                  </div>
+                </q-tooltip>
+              </q-btn>
+            </div>
+            <!-- <q-toolbar-title class="text-primary row">
+            </q-toolbar-title> -->
+          </q-toolbar>
+        </q-header>
 
-          <div class="col-auto q-ml-auto">
-            <q-toggle
-              class="q-ml-md"
-              v-model="state.brief"
-              label="Brief Mode"
-              @update:model-value="(val) => toggleBrief(val)"
-              title="skip middle classes, config module_prefix to enable it"
-              dense
-            />
-          </div>
-          <div class="col-auto">
-            <q-toggle
-              v-model="state.hidePrimitiveRoute"
-              @update:model-value="(val) => toggleHidePrimitiveRoute(val)"
-              label="Hide Primitive"
-              title="hide routes return primitive"
-              dense
-            />
-          </div>
-          <div class="col-auto">
-            <q-btn
-              outline
-              @click="onReset"
-              title="may be very slow"
-              label="Show All"
-            />
-          </div>
-          <div class="col-auto">
-            <q-btn outline icon="search" label="Search" @click="showDialog()" />
-          </div>
-          <div class="col-auto">
+        <q-drawer
+          v-model="state.detailDrawer"
+          width="500"
+          side="right"
+          overlay
+          bordered
+        >
+          <div style="z-index: 1; position: absolute; left: -17px; top: 9px">
             <q-btn
-              dense
+              @click="state.detailDrawer = !state.detailDrawer"
               round
-              flat
-              icon="help_outline"
-              aria-label="Help"
-              class="q-mr-md"
-            >
-              <q-tooltip
-                anchor="bottom middle"
-                self="top middle"
-                :offset="[0,8]"
-              >
-                <div
-                  class="column items-start text-left"
-                  style="line-height: 1.4; font-size: 12px"
-                >
-                  <ul>
-                    <li>scroll to zoom in/out</li>
-                    <li>
-                      click node to check highlight related nodes on the chart,
-                      esc to unselect
-                    </li>
-                    <li>
-                      shift + click to see schema's dependencies without
-                      unrelated nodes
-                    </li>
-                    <li>alt + click to see schema details</li>
-                  </ul>
-                </div>
-              </q-tooltip>
-            </q-btn>
+              unelevated
+              color="primary"
+              dense
+              icon="chevron_right"
+            />
           </div>
-        </div>
-      </div>
-      <div style="flex: 1 1 auto; min-height: 10px;">
-        <q-splitter
-          v-model="state.splitter"
-          unit="px"
-          :limits="[200, 800]"
-          class="fit"
-        >
-          <template #before>
-            <div
-              id="tag-navigator"
-              class="column no-wrap"
-              :style="{
+          <schema-code-display
+            :schema-name="schemaCodeName"
+            :schemas="state.rawSchemasFull"
+          />
+        </q-drawer>
+
+        <q-page-container>
+          <q-splitter
+            v-model="state.splitter"
+            unit="px"
+            :limits="[200, 800]"
+            class="adjust-fit"
+          >
+            <template #before>
+              <div
+                id="tag-navigator"
+                class="column no-wrap"
+                :style="{
                 borderRight: '1px solid #e0e0e0',
                 backgroundColor: '#fff',
                 minHeight: 0,
                 height: '100%'
               }"
-            >
-              <q-scroll-area class="fit">
-                <q-list dense separator>
-                  <q-expansion-item
-                    v-for="tag in state.rawTags"
-                    :key="tag.name"
-                    expand-separator
-                    :model-value="state.tag === tag.name"
-                    @update:model-value="(val) => toggleTag(tag.name, val)"
-                    :header-class="state.tag === tag.name ? 'text-primary text-bold' : ''"
-                    content-class="q-pa-none"
-                  >
-                    <template #header>
-                      <div class="row items-center" style="width: 100%">
-                        <div class="row items-end">
-                          <q-icon
-                            class="q-mr-sm"
-                            :name="state.tag == tag.name ? 'folder' : 'folder_open'"
-                          ></q-icon>
-                          <span>{{ tag.name }}</span>
+              >
+                <q-scroll-area class="fit">
+                  <q-list dense separator>
+                    <q-expansion-item
+                      v-for="tag in state.rawTags"
+                      :key="tag.name"
+                      expand-separator
+                      :model-value="state.tag === tag.name"
+                      @update:model-value="(val) => toggleTag(tag.name, val)"
+                      :header-class="state.tag === tag.name ? 'text-primary text-bold' : ''"
+                      content-class="q-pa-none"
+                    >
+                      <template #header>
+                        <div class="row items-center" style="width: 100%">
+                          <div class="row items-end">
+                            <q-icon
+                              class="q-mr-sm"
+                              :name="state.tag == tag.name ? 'folder' : 'folder_open'"
+                            ></q-icon>
+                            <span>{{ tag.name }}</span>
+                          </div>
                         </div>
-                      </div>
-                    </template>
+                      </template>
 
-                    <q-list separator>
-                      <q-item
-                        v-for="route in (state.hidePrimitiveRoute ? tag.routes.filter(r => !r.is_primitive) :tag.routes || [])"
-                        :key="route.id"
-                        clickable
-                        v-ripple
-                        :active="state.routeId === route.id"
-                        active-class=""
-                        @click="selectRoute(route.id)"
-                      >
-                        <q-item-section>
-                          <span class="q-ml-lg" style="white-space: nowrap">
-                            <q-icon class="q-mr-sm" name="data_object"></q-icon>
-                            {{ route.name }}
-                          </span>
-                        </q-item-section>
-                      </q-item>
-                      <q-item v-if="!tag.routes || tag.routes.length === 0" dense>
-                        <q-item-section class="text-grey-6"
-                          >No routes</q-item-section
+                      <q-list separator>
+                        <q-item
+                          v-for="route in (state.hidePrimitiveRoute ? tag.routes.filter(r => !r.is_primitive) :tag.routes || [])"
+                          :key="route.id"
+                          clickable
+                          v-ripple
+                          :active="state.routeId === route.id"
+                          active-class=""
+                          @click="selectRoute(route.id)"
                         >
-                      </q-item>
-                    </q-list>
-                  </q-expansion-item>
-                </q-list>
-              </q-scroll-area>
-            </div>
-          </template>
-
-          <template #after>
-            <div id="graph" class="fit"></div>
-          </template>
-        </q-splitter>
-      </div>
+                          <q-item-section>
+                            <span class="q-ml-lg" style="white-space: nowrap">
+                              <q-icon
+                                class="q-mr-sm"
+                                name="data_object"
+                              ></q-icon>
+                              {{ route.name }}
+                            </span>
+                          </q-item-section>
+                        </q-item>
+                        <q-item
+                          v-if="!tag.routes || tag.routes.length === 0"
+                          dense
+                        >
+                          <q-item-section class="text-grey-6"
+                            >No routes</q-item-section
+                          >
+                        </q-item>
+                      </q-list>
+                    </q-expansion-item>
+                  </q-list>
+                </q-scroll-area>
+              </div>
+            </template>
 
+            <template #after>
+              <div id="graph" class="fit"></div>
+            </template>
+          </q-splitter>
+        </q-page-container>
+      </q-layout>
       <!-- Detail Dialog -->
       <q-dialog v-model="showDetail" :persistent="true" :maximized="true">
         <detail-dialog
@@ -296,35 +289,10 @@
         />
       </q-dialog>
 
-      <!-- Schema Source Code Dialog (Ctrl + Click) -->
-      <q-dialog
-        v-model="showSchemaCode"
-        :maximized="true"
-        :persistent="false"
-        position="left"
-        :seamless="false"
-      >
-        <schema-code-display
-          :schema-name="schemaCodeName"
-          :model-value="showSchemaCode"
-          :schemas="state.rawSchemasFull"
-          @close="showSchemaCode = false"
-        />
-      </q-dialog>
-
-      <!-- Route Source Code Dialog (Alt + Click on route) -->
-      <q-dialog
-        v-model="showRouteCode"
-        :maximized="true"
-        :persistent="false"
-        position="right"
-        :seamless="false"
-      >
-        <route-code-display
-          :route-id="routeCodeId"
-          :model-value="showRouteCode"
-          @close="showRouteCode = false"
-        />
+      <q-dialog v-model="showRouteDetail" seamless position="bottom">
+        <q-card style="width: 1100px; max-width: 1100px; max-height: 40vh">
+          <route-code-display :route-id="routeCodeId" @close="showRouteDetail=false" />
+        </q-card>
       </q-dialog>
 
       <!-- Dump Core Data Dialog -->

fastapi_voyager/web/vue-main.js

@@ -14,7 +14,7 @@ const app = createApp({
       schemaId: null, // picked schema
       showFields: "object",
       fieldOptions: [
-        { label: "No fields", value: "single" },
+        { label: "No field", value: "single" },
         { label: "Object fields", value: "object" },
         { label: "All fields", value: "all" },
       ],
@@ -27,12 +27,11 @@ const app = createApp({
       initializing: true,
       // Splitter size (left panel width in px)
       splitter: 300,
+      detailDrawer: false,
     });
 
     const showDetail = ref(false);
     const showSchemaFieldFilter = ref(false);
-    const showSchemaCode = ref(false);
-    const showRouteCode = ref(false);
     const showDumpDialog = ref(false);
     const dumpJson = ref("");
     const showImportDialog = ref(false);
@@ -43,6 +42,7 @@ const app = createApp({
     const schemaFieldFilterSchema = ref(null); // external schemaName for schema-field-filter
     const schemaCodeName = ref("");
     const routeCodeId = ref("");
+    const showRouteDetail = ref(false);
 
     function openDetail() {
       showDetail.value = true;
@@ -100,24 +100,26 @@ const app = createApp({
 
         // create graph instance once
         const graphUI = new GraphUI("#graph", {
-          onSchemaClick: (id) => {
+          onSchemaShiftClick: (id) => {
             if (state.rawSchemas.has(id)) {
               schemaFieldFilterSchema.value = id;
               showSchemaFieldFilter.value = true;
             }
           },
-          onSchemaAltClick: (id) => {
+          onSchemaClick: (id) => {
             if (state.rawSchemas.has(id)) {
               schemaCodeName.value = id;
-              showSchemaCode.value = true;
-              return;
+              state.detailDrawer = true;
             }
             if (id in state.routeItems) {
               routeCodeId.value = id;
-              showRouteCode.value = true;
-              return;
+              showRouteDetail.value = true;
             }
           },
+          resetCb: () => {
+            state.detailDrawer = false;
+            showRouteDetail.value = false;
+          }
         });
 
         await graphUI.render(dotText, resetZoom);
@@ -204,8 +206,9 @@ const app = createApp({
         state.tag = tagName;
         state.routeId = "";
         onGenerate();
-        return;
       }
+      state.detailDrawer = false;
+      showRouteDetail.value = false;
     }
 
     function selectRoute(routeId) {
@@ -214,6 +217,8 @@ const app = createApp({
       } else {
         state.routeId = routeId;
       }
+      state.detailDrawer = false;
+      showRouteDetail.value = false;
       onGenerate();
     }
 
@@ -245,14 +250,13 @@ const app = createApp({
       onGenerate,
       onReset,
       showDetail,
+      showRouteDetail,
       openDetail,
       closeDetail,
       schemaName,
       showSchemaFieldFilter,
       schemaFieldFilterSchema,
       showDialog,
-      showSchemaCode,
-      showRouteCode,
       schemaCodeName,
       routeCodeId,
       // dump/import

{fastapi_voyager-0.9.2.dist-info → fastapi_voyager-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-voyager
-Version: 0.9.2
+Version: 0.9.4
 Summary: Visualize FastAPI application's routing tree and dependencies
 Project-URL: Homepage, https://github.com/allmonday/fastapi-voyager
 Project-URL: Source, https://github.com/allmonday/fastapi-voyager
@@ -27,6 +27,8 @@ Description-Content-Type: text/markdown
 
 [![pypi](https://img.shields.io/pypi/v/fastapi-voyager.svg)](https://pypi.python.org/pypi/fastapi-voyager)
 ![Python Versions](https://img.shields.io/pypi/pyversions/fastapi-voyager)
+[![PyPI Downloads](https://static.pepy.tech/badge/fastapi-voyager/month)](https://pepy.tech/projects/fastapi-voyager)
+
 
 > This repo is still in early stage, it supports pydantic v2 only
 
@@ -163,7 +165,6 @@ or you can open router_viz.dot with vscode extension `graphviz interactive previ
 - [ ] user can generate nodes/edges manually and connect to generated ones
     - [ ] add owner
     - [ ] add extra info for schema
-- [ ] fixed left/right bar show field information
 - [ ] display standard ER diagram `hard`
     - [ ] display potential invalid links
 - [ ] support dataclass (pending)
@@ -211,6 +212,15 @@ or you can open router_viz.dot with vscode extension `graphviz interactive previ
 - [x] improve initialization time cost
     - [x] query route / schema info through realtime api
     - [x] adjust fe
+- 0.9.3
+    - [x] adjust layout 
+        - [x] show field detail in right panel
+        - [x] show route info in bottom
+- 0.9.4
+    - [x] close schema sidebar when switch tag/route
+    - [x] schema detail panel show fields by default
+    - [x] adjust schema panel's height
+    - [x] show from base information in subset case
 
 #### 0.10
 - [ ] support opening route in swagger
@@ -235,6 +245,9 @@ or you can open router_viz.dot with vscode extension `graphviz interactive previ
     - [ ] show hint for resolve, post fields
     - [ ] display loader as edges
 
+#### 0.13
+- [ ] config release pipeline
+- [ ]
 
 ## Using with pydantic-resolve
 
@@ -256,35 +269,3 @@ pydantic-resolve's @ensure_subset decorator is helpful to pick fields from `sour
 - [pydantic-resolve](https://github.com/allmonday/pydantic-resolve)
 - Quasar
 
-
-## Changelog
-
-- 0.9:
-    - 0.9.2:
-        - fix: missing fields in schema detail panel
-        - optimization: clean up fe codes.
-    - 0.9.1:
-        - api change: from `create_app_with_fastapi` to `create_voyager`, and expose as `from fastapi_voyager import create_voyager`
-        - optimization: lazy load vscode link and source code, speed up the initialization.
-- 0.8:
-    - 0.8.3
-        - upgrade theme
-    - 0.8.2
-        - fix silly typo.
-    - 0.8.1
-        - add feature: hide primitive routes
-- 0.7:
-    - 0.7.5
-        - fix show all display issue
-    - 0.7.4
-        - optimize tag/route, move to left. 
-        - fresh on change, no need to click generate any more.
-    - 0.7.3
-        - fix `module_color` failure
-    - 0.7.2
-        - keep links inside filtered nodes.
-    - 0.7.1
-        - support brief mode, you can use `--module_prefix tests.service` to show links between routes and filtered schemas, to make the graph less complicated.
-- 0.6: 
-    - 0.6.2: 
-        - fix generic related issue

{fastapi_voyager-0.9.2.dist-info → fastapi_voyager-0.9.4.dist-info}/RECORD

@@ -6,18 +6,18 @@ fastapi_voyager/render.py,sha256=qy3g1Rz1s8XkuR_6n1Q1YPwy_oMOjWjNswTHQjdz4N0,776
 fastapi_voyager/server.py,sha256=pg-LHDj4yU0usDA1b2X2Kt2_OCrexFA2G9ifGxb52Uc,6196
 fastapi_voyager/type.py,sha256=pWYKmgb9e0W_JeD7k54Mr2lxUZV_Ir9TNpewGRwHyHQ,1629
 fastapi_voyager/type_helper.py,sha256=hjBC4E0tgBpQDlYxGg74uK07SXjsrAgictEETJfIpYM,9231
-fastapi_voyager/version.py,sha256=Su4VudgwOkDWEBzNahJ3LX1SbIA7uezku9g1zsUddHU,48
-fastapi_voyager/voyager.py,sha256=pXvA3ye5Jq6aJ6YrZFbTHjJ9MzdydqWllIgY8RFK_4A,10793
-fastapi_voyager/web/graph-ui.js,sha256=0hqMCzsPJfhgWDuwiXVXaGQL-_7urT_zryo4sXMN8jQ,4209
+fastapi_voyager/version.py,sha256=IZXkxs2gZAlAzk5SmuL6_BaHzvWZi9m7CX8vM0JMzW8,48
+fastapi_voyager/voyager.py,sha256=QKWletUwZeHm8e8ZRcGm6OuhAdiik3tT7sOU-QnEuGA,11036
+fastapi_voyager/web/graph-ui.js,sha256=FmKA3eeHMEeUDNuay3f54_fv4eGHT7MT0TaGqXhyMWQ,4978
 fastapi_voyager/web/graphviz.svg.css,sha256=zDCjjpT0Idufu5YOiZI76PL70-avP3vTyzGPh9M85Do,1563
 fastapi_voyager/web/graphviz.svg.js,sha256=lvAdbjHc-lMSk4GQp-iqYA2PCFX4RKnW7dFaoe0LUHs,16005
-fastapi_voyager/web/index.html,sha256=pmctp4OizRd8ETKEI0vl0Seu9nIQklfnbFDDyztFoy4,14264
+fastapi_voyager/web/index.html,sha256=tbrtun9cDFMwnUIN5S0gtMEs18bwZLgXuxsSaKxgcI0,13728
 fastapi_voyager/web/quasar.min.css,sha256=F5jQe7X2XT54VlvAaa2V3GsBFdVD-vxDZeaPLf6U9CU,203145
 fastapi_voyager/web/quasar.min.js,sha256=h0ftyPMW_CRiyzeVfQqiup0vrVt4_QWojpqmpnpn07E,502974
-fastapi_voyager/web/vue-main.js,sha256=ZRJQBV54YqoKkLI2a8WHF6uYeFUpqwBl-lykkaYxCXI,8182
+fastapi_voyager/web/vue-main.js,sha256=bn4Q9FqX5RJVG9bA5xgUUt5TJf9CjiXcKtn_ikLsaKQ,8357
 fastapi_voyager/web/component/render-graph.js,sha256=e8Xgh2Kl-nYU0P1gstEmAepCgFnk2J6UdxW8TlMafGs,2322
-fastapi_voyager/web/component/route-code-display.js,sha256=Pdg8JX_yHhoUUGSqgRs_zTciIfw5wYzG6-kQfHtdWFU,3956
-fastapi_voyager/web/component/schema-code-display.js,sha256=Aa_mXxmNgIbImoT1_zuzsPgbPq8QaakUAzNWTxHxM58,6584
+fastapi_voyager/web/component/route-code-display.js,sha256=8NJPPjNRUC21gjpY8XYEQs4RBbhX1pCiqEhJp39ku6k,3678
+fastapi_voyager/web/component/schema-code-display.js,sha256=UgFotzvqSuhnPXNOr6w_r1fV2_savRiCdokEvferutE,6244
 fastapi_voyager/web/component/schema-field-filter.js,sha256=PR8d2_u1UiSLrS5zqAvY2UR8LbvjBqiUDt71tm1DJTs,6345
 fastapi_voyager/web/icon/android-chrome-192x192.png,sha256=35sBy6jmUFJCcquStaafHH1qClZIbd-X3PIKSeLkrNo,37285
 fastapi_voyager/web/icon/android-chrome-512x512.png,sha256=eb2eDjCwIruc05029_0L9hcrkVkv8KceLn1DJMYU0zY,210789
@@ -26,8 +26,8 @@ fastapi_voyager/web/icon/favicon-16x16.png,sha256=JC07jEzfIYxBIoQn_FHXvyHuxESdhW
 fastapi_voyager/web/icon/favicon-32x32.png,sha256=C7v1h58cfWOsiLp9yOIZtlx-dLasBcq3NqpHVGRmpt4,1859
 fastapi_voyager/web/icon/favicon.ico,sha256=tZolYIXkkBcFiYl1A8ksaXN2VjGamzcSdes838dLvNc,15406
 fastapi_voyager/web/icon/site.webmanifest,sha256=ep4Hzh9zhmiZF2At3Fp1dQrYQuYF_3ZPZxc1KcGBvwQ,263
-fastapi_voyager-0.9.2.dist-info/METADATA,sha256=k_l0KTvYeGwMhRPdulVlob3_q-uZ9UTEHo_KLeXTHsQ,9221
-fastapi_voyager-0.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fastapi_voyager-0.9.2.dist-info/entry_points.txt,sha256=pEIKoUnIDXEtdMBq8EmXm70m16vELIu1VPz9-TBUFWM,53
-fastapi_voyager-0.9.2.dist-info/licenses/LICENSE,sha256=lNVRR3y_bFVoFKuK2JM8N4sFaj3m-7j29kvL3olFi5Y,1067
-fastapi_voyager-0.9.2.dist-info/RECORD,,
+fastapi_voyager-0.9.4.dist-info/METADATA,sha256=jYmSddqIU_P3mROi5Rg9jjderpGJ4ASMDY4pZdoYBCs,8642
+fastapi_voyager-0.9.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fastapi_voyager-0.9.4.dist-info/entry_points.txt,sha256=pEIKoUnIDXEtdMBq8EmXm70m16vELIu1VPz9-TBUFWM,53
+fastapi_voyager-0.9.4.dist-info/licenses/LICENSE,sha256=lNVRR3y_bFVoFKuK2JM8N4sFaj3m-7j29kvL3olFi5Y,1067
+fastapi_voyager-0.9.4.dist-info/RECORD,,