dbdocs 1.0.1__tar.gz → 1.0.2__tar.gz

{dbdocs-1.0.1 → dbdocs-1.0.2}/.gitignore

@@ -166,3 +166,4 @@ pnpm-debug.log*
 
 # dbdocs DEBUG file log
 logs/
+.DS_Store

{dbdocs-1.0.1 → dbdocs-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbdocs
-Version: 1.0.1
+Version: 1.0.2
 Summary: Alternative dbt docs site: Catalog + ERD + column-level lineage
 Project-URL: Homepage, https://github.com/datnguye/dbt-docs
 Project-URL: Repository, https://github.com/datnguye/dbt-docs

{dbdocs-1.0.1 → dbdocs-1.0.2}/dbdocs/extract/nodes.py

@@ -12,27 +12,52 @@ from typing import Any
 from dbdocs.core.artifacts import NODE_PREFIXES, db_schema, node_name
 
 
+def _column_entry(name: str, manifest_column: Any, col_type: str) -> dict:
+    """One column record. Newlines in the description become ``<br>`` for HTML."""
+    description = getattr(manifest_column, "description", "") or "" if manifest_column else ""
+    return {
+        "name": name,
+        "type": col_type or "",
+        "tags": (getattr(manifest_column, "tags", []) or []) if manifest_column else [],
+        "description": description.replace("\n", "<br>"),
+    }
+
+
 def _columns(model: Any, catalog_node: Any) -> list:
-    """Merge manifest column metadata (description/tags) with catalog types.
+    """Build a node's columns: the manifest is the source of truth, the catalog
+    enriches it.
+
+    The **manifest** decides which columns are documented and carries their
+    metadata (description, tags, ``data_type``); the **catalog** *enriches* — it
+    supplies the warehouse-confirmed type and any columns the manifest didn't
+    document. It never replaces the manifest, so a model absent from a
+    stale/partial ``catalog.json`` still shows every documented column.
 
-    Iterates the catalog's columns (the warehouse truth for which columns exist
-    and their types) and layers on the manifest description/tags when present.
-    Newlines in descriptions become ``<br>`` so they survive HTML rendering.
+    Manifest columns come first, in manifest order, each with its type enriched
+    from the catalog when present (falling back to the manifest ``data_type``).
+    The catalog keys columns by the warehouse's casing (Snowflake upper-cases
+    them) while the manifest keeps the modeled casing, so the catalog type lookup
+    is case-insensitive. Catalog-only columns are appended afterwards.
     """
     manifest_columns = getattr(model, "columns", {}) or {}
     catalog_columns = getattr(catalog_node, "columns", {}) or {} if catalog_node else {}
+    catalog_by_lower = {str(name).lower(): col for name, col in catalog_columns.items()}
+
     columns = []
-    for name in catalog_columns:
-        manifest_column = manifest_columns.get(name)
-        description = getattr(manifest_column, "description", "") or "" if manifest_column else ""
-        columns.append(
-            {
-                "name": name,
-                "type": catalog_columns[name].type,
-                "tags": (getattr(manifest_column, "tags", []) or []) if manifest_column else [],
-                "description": description.replace("\n", "<br>"),
-            }
+    seen_lower = set()
+    for name, manifest_column in manifest_columns.items():
+        lower = str(name).lower()
+        seen_lower.add(lower)
+        catalog_column = catalog_by_lower.get(lower)
+        col_type = getattr(catalog_column, "type", None) or getattr(
+            manifest_column, "data_type", None
         )
+        columns.append(_column_entry(name, manifest_column, col_type or ""))
+
+    for name, catalog_column in catalog_columns.items():
+        if str(name).lower() in seen_lower:
+            continue
+        columns.append(_column_entry(name, None, getattr(catalog_column, "type", "") or ""))
     return columns
 
 

{dbdocs-1.0.1 → dbdocs-1.0.2}/dbdocs/site/bundle/assets/app.js

@@ -120,12 +120,23 @@
       el("span", {}, ["Generated by "]),
       el("a", { href: "https://github.com/datnguye/dbt-docs", target: "_blank", rel: "noopener" }, ["dbdocs"]),
     ]);
+    var meta = footerMeta();
+    if (meta) left.appendChild(el("span", { class: "cf-meta" }, [" · " + meta]));
     var right = el("a", { class: "cf-top", href: "#", onclick: function (e) { e.preventDefault(); app.scrollTop = 0; } }, ["↑ Back to top"]);
     foot.appendChild(left);
     foot.appendChild(right);
     return foot;
   }
 
+  /* "snowflake · N column-lineage edges" — the build metadata shown in the
+     content footer. The "Generated X" part lives in the topbar (see boot). */
+  function footerMeta() {
+    var parts = [];
+    if (META.adapter_type) parts.push(META.adapter_type);
+    parts.push(Object.keys(COLLIN).length + " column-lineage edges");
+    return parts.join(" · ");
+  }
+
   var RTYPE_ORDER = { model: 0, snapshot: 1, seed: 2, source: 3 };
 
   function buildNav() {
@@ -456,17 +467,6 @@
     link.hidden = false;
   }
 
-  function initTopbarMeta() {
-    var box = document.getElementById("topbar-meta");
-    if (!box) return;
-    var parts = [];
-    if (META.generated_at) parts.push("Generated " + META.generated_at);
-    if (META.adapter_type) parts.push(META.adapter_type);
-    parts.push(Object.keys(COLLIN).length + " column-lineage edges");
-    box.textContent = parts.join(" · ");
-    box.hidden = false;
-  }
-
   function initFooter() {
     var footer = document.getElementById("site-footer");
     if (!footer) return;
@@ -486,8 +486,12 @@
   function boot() {
     document.getElementById("brand-name").textContent = META.site_name || "dbt docs";
     document.title = META.site_name || "dbt docs";
+    if (META.generated_at) {
+      var gen = document.getElementById("brand-generated");
+      gen.textContent = "Generated " + META.generated_at;
+      gen.hidden = false;
+    }
     initRepo();
-    initTopbarMeta();
     initFooter();
     initTheme();
     buildNav();

{dbdocs-1.0.1 → dbdocs-1.0.2}/dbdocs/site/bundle/assets/style.css

@@ -52,8 +52,9 @@ code, pre { font-family: "SF Mono", "Roboto Mono", Menlo, Consolas, monospace; }
   background: var(--bg-elev); border-bottom: 1px solid var(--border);
   position: sticky; top: 0; z-index: 30;
 }
-.brand { display: flex; align-items: center; gap: 8px; font-weight: 600; min-width: 160px; }
-.brand-mark { display: block; width: 24px; height: 24px; border-radius: 6px; }
+.brand { display: flex; align-items: baseline; gap: 8px; font-weight: 600; min-width: 160px; }
+.brand-mark { display: block; width: 24px; height: 24px; border-radius: 6px; align-self: center; }
+.brand-generated { color: var(--text-soft); font-size: 12px; font-weight: 400; white-space: nowrap; }
 .search-wrap { position: relative; flex: 1; max-width: 520px; }
 #search {
   width: 100%; padding: 7px 12px; border-radius: var(--radius);
@@ -118,21 +119,16 @@ code, pre { font-family: "SF Mono", "Roboto Mono", Menlo, Consolas, monospace; }
 }
 .footer-copy { color: var(--text-soft); font-size: 12px; }
 
-/* Build metadata in the header (generated / adapter / edges) */
-.topbar-meta {
-  color: var(--text-soft); font-size: 11.5px; white-space: nowrap;
-  padding-right: 6px; flex-shrink: 0;
-}
-@media (max-width: 1100px) { .topbar-meta { display: none; } }
-
 /* End-of-page content footer */
 .content-foot {
   display: flex; align-items: center; justify-content: space-between; gap: 12px;
   margin-top: 40px; padding-top: 16px; border-top: 1px solid var(--border);
   color: var(--text-soft); font-size: 12px;
 }
-.content-foot .cf-left { display: inline-flex; align-items: center; gap: 6px; }
+.content-foot .cf-left { display: inline-flex; align-items: center; gap: 6px; flex-wrap: wrap; }
 .content-foot .cf-left .ic { color: var(--text-soft); }
+/* Build metadata (generated / adapter / edges) appended to the footer's left */
+.content-foot .cf-meta { color: var(--text-soft); }
 .content-foot .cf-top { color: var(--text-soft); }
 .content-foot .cf-top:hover { color: var(--accent); }
 .bmc {

{dbdocs-1.0.1 → dbdocs-1.0.2}/dbdocs/site/bundle/index.html

@@ -14,8 +14,8 @@
     <div class="brand">
       <img class="brand-mark" src="assets/favicon.svg" alt="" width="24" height="24" />
       <span class="brand-name" id="brand-name">dbt docs</span>
+      <span class="brand-generated" id="brand-generated" hidden></span>
     </div>
-    <div class="topbar-meta" id="topbar-meta" hidden></div>
     <div class="search-wrap">
       <input id="search" type="search" placeholder="Search models, sources, columns…" autocomplete="off" />
       <div id="search-results" class="search-results" hidden></div>