npm - @emeryld/rrroutes-contract - Versions diffs - 2.7.4 → 2.7.5 - Mend

@emeryld/rrroutes-contract 2.7.4 → 2.7.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/tools/finalized-leaves-viewer.html +111 -134

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@emeryld/rrroutes-contract",
   "description": "TypeScript contract definitions for RRRoutes",
-  "version": "2.7.4",
+  "version": "2.7.5",
   "private": false,
   "type": "module",
   "main": "dist/index.cjs",

package/tools/finalized-leaves-viewer.html CHANGED Viewed

@@ -140,6 +140,12 @@
         grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
       }
+      .grid-3 {
+        display: grid;
+        gap: 6px;
+        grid-template-columns: repeat(3, minmax(0, 1fr));
+      }
       .kv {
         border-bottom: 1px dashed #e2e8f2;
         padding: 4px 0 6px;
@@ -179,6 +185,30 @@
         background: #effbf4;
       }
+      .icon-row {
+        display: flex;
+        gap: 6px;
+        margin-top: 2px;
+      }
+      .icon-badge {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        width: 18px;
+        height: 18px;
+        border: 1px solid #e0e6f0;
+        border-radius: 4px;
+        font-size: 11px;
+        background: #f6f8fc;
+      }
+      .icon-badge.warn {
+        border-color: #f2d5d5;
+        color: #a02424;
+        background: #fff4f4;
+      }
       .empty {
         color: var(--muted);
       }
@@ -244,6 +274,12 @@
         font-size: 11px;
         background: #f2f5fa;
       }
+      @media (max-width: 720px) {
+        .grid-3 {
+          grid-template-columns: 1fr;
+        }
+      }
     </style>
   </head>
   <body>
@@ -260,11 +296,6 @@
           <input id="searchInput" type="text" placeholder="Type to search..." />
         </label>
-        <label>
-          Type filter:
-          <input id="typeFilterInput" type="text" placeholder='Type/kind/enum (e.g. "paid")' />
-        </label>
         <div class="field-row">
           <label class="field-item">
             <input id="caseSensitive" type="checkbox" />
@@ -274,10 +305,6 @@
             <input id="regexSearch" type="checkbox" />
             <span>regex</span>
           </label>
-          <label class="field-item">
-            <input id="hasEnumOnly" type="checkbox" />
-            <span>has enum only</span>
-          </label>
           <label class="field-item">
             <span>type match</span>
             <select id="typeMatchMode">
@@ -319,6 +346,11 @@
         { id: 'tags', label: 'tags', get: (leaf) => leaf.cfg?.tags || [] },
         { id: 'stability', label: 'stability', get: (leaf) => [leaf.cfg?.stability] },
         { id: 'docsMeta', label: 'docsMeta', get: (leaf) => [leaf.cfg?.docsMeta] },
+        {
+          id: 'types',
+          label: 'types',
+          get: (leaf, schemaFlatByLeaf) => schemaTypeTokens(schemaFlatByLeaf?.[leaf.key]),
+        },
         {
           id: 'params',
           label: 'params',
@@ -355,10 +387,8 @@
       const fileInput = document.getElementById('fileInput')
       const searchInput = document.getElementById('searchInput')
-      const typeFilterInput = document.getElementById('typeFilterInput')
       const caseSensitiveInput = document.getElementById('caseSensitive')
       const regexSearchInput = document.getElementById('regexSearch')
-      const hasEnumOnlyInput = document.getElementById('hasEnumOnly')
       const typeMatchModeInput = document.getElementById('typeMatchMode')
       const fieldCheckboxes = document.getElementById('fieldCheckboxes')
       const activeFilterChips = document.getElementById('activeFilterChips')
@@ -394,6 +424,9 @@
         if (!query) {
           return {
             active: false,
+            query,
+            caseSensitive,
+            regex,
             error: null,
             test: () => true,
             highlight: (text) => escapeHtml(text ?? ''),
@@ -406,6 +439,9 @@
             const rx = new RegExp(query, flags)
             return {
               active: true,
+              query,
+              caseSensitive,
+              regex,
               error: null,
               test: (text) => {
                 const source = String(text ?? '')
@@ -423,6 +459,9 @@
           } catch (error) {
             return {
               active: true,
+              query,
+              caseSensitive,
+              regex,
               error: error instanceof Error ? error.message : 'Invalid regex',
               test: () => false,
               highlight: (text) => escapeHtml(text ?? ''),
@@ -436,6 +475,9 @@
         return {
           active: true,
+          query,
+          caseSensitive,
+          regex,
           error: null,
           test: (text) => {
             const source = String(text ?? '')
@@ -499,23 +541,20 @@
         return flatSchemaToSearchTokens(Object.fromEntries(sectionEntries))
       }
-      function typeFilterTokensByLeaf(flatSchema) {
-        if (!flatSchema || typeof flatSchema !== 'object') return { tokens: [], hasEnum: false }
+      function schemaTypeTokens(flatSchema) {
+        if (!flatSchema || typeof flatSchema !== 'object') return []
         const tokens = new Set()
-        let hasEnum = false
         Object.values(flatSchema).forEach((info) => {
           if (!info || typeof info !== 'object') return
           if (info.type) tokens.add(String(info.type))
           if (info.kind) tokens.add(String(info.kind))
-          if (Array.isArray(info.enumValues) && info.enumValues.length > 0) {
-            hasEnum = true
+          if (Array.isArray(info.enumValues)) {
             info.enumValues.forEach((value) => tokens.add(String(value)))
           }
         })
-        return { tokens: Array.from(tokens), hasEnum }
+        return Array.from(tokens)
       }
       function selectedFieldIds() {
@@ -533,46 +572,17 @@
         return SEARCH_FIELDS.some((field) => {
           if (!selectedIds.includes(field.id)) return false
           const tokens = toTokens(field.get(leaf, schemaFlatByLeaf))
+          if (field.id === 'types' && typeMatchModeInput.value === 'exact' && !engine.regex) {
+            const needle = engine.caseSensitive ? engine.query : engine.query.toLowerCase()
+            const normalized = engine.caseSensitive
+              ? tokens
+              : tokens.map((token) => String(token).toLowerCase())
+            return normalized.includes(needle)
+          }
           return tokens.some((token) => engine.test(token))
         })
       }
-      function matchesTypeFilter(leaf, typeEngine, matchMode, hasEnumOnly) {
-        const schemaFlatByLeaf = state.payload?.schemaFlatByLeaf || {}
-        const { tokens, hasEnum } = typeFilterTokensByLeaf(schemaFlatByLeaf?.[leaf.key])
-        if (hasEnumOnly && !hasEnum) return false
-        if (!typeEngine.active) return true
-        if (matchMode === 'exact') {
-          const sourceTokens = typeEngine.caseSensitive
-            ? tokens
-            : tokens.map((token) => token.toLowerCase())
-          const needle = typeEngine.caseSensitive ? typeEngine.query : typeEngine.query.toLowerCase()
-          return sourceTokens.includes(needle)
-        }
-        return tokens.some((token) => typeEngine.test(token))
-      }
-      function createTypeSearchEngine(queryRaw) {
-        const query = queryRaw || ''
-        const caseSensitive = Boolean(caseSensitiveInput.checked)
-        if (!query) return { active: false, query, caseSensitive, test: () => true }
-        const needle = caseSensitive ? query : query.toLowerCase()
-        return {
-          active: true,
-          query,
-          caseSensitive,
-          test: (text) => {
-            const source = String(text ?? '')
-            const hay = caseSensitive ? source : source.toLowerCase()
-            return hay.includes(needle)
-          },
-        }
-      }
       function el(tag, className, text) {
         const node = document.createElement(tag)
         if (className) node.className = className
@@ -728,29 +738,30 @@
       }
       function renderSeparatedSchemas(flatSchema, engine) {
+        if (!flatSchema || typeof flatSchema !== 'object') return null
         const section = el('div', 'section')
         section.appendChild(el('h3', '', 'Schemas (separated by section)'))
         const grouped = splitFlatSchemaBySection(flatSchema)
+        let hasAnySchemaEntries = false
         SCHEMA_SECTIONS.forEach((sectionName) => {
+          const entries = grouped[sectionName]
+          if (!entries || Object.keys(entries).length === 0) return
+          hasAnySchemaEntries = true
           const block = el('div', 'schema-block')
           const header = el('div', 'schema-header mono')
           setHighlighted(header, sectionName, engine)
           block.appendChild(header)
-          const entries = grouped[sectionName]
-          if (!entries || Object.keys(entries).length === 0) {
-            block.appendChild(el('div', 'empty', 'No entries'))
-          } else {
-            const tree = buildSchemaTree(entries, sectionName)
-            block.appendChild(renderTreeNode(tree, engine, true))
-          }
+          const tree = buildSchemaTree(entries, sectionName)
+          block.appendChild(renderTreeNode(tree, engine, true))
           section.appendChild(block)
         })
-        return section
+        return hasAnySchemaEntries ? section : null
       }
       function renderLeaf(leaf, engine) {
@@ -765,60 +776,43 @@
         const overview = el('div', 'section')
         overview.appendChild(el('h3', '', 'Overview'))
-        const grid = el('div', 'grid-2')
-        grid.appendChild(kv('key', leaf.key, engine))
-        grid.appendChild(kv('method', leaf.method, engine))
-        grid.appendChild(kv('path', leaf.path, engine))
-        grid.appendChild(kv('group', cfg.docsGroup, engine))
-        grid.appendChild(kv('stability', cfg.stability, engine))
-        grid.appendChild(kv('feed', cfg.feed ? 'true' : 'false', engine))
-        grid.appendChild(kv('deprecated', cfg.deprecated ? 'true' : 'false', engine))
-        grid.appendChild(kv('hidden', cfg.docsHidden ? 'true' : 'false', engine))
-        overview.appendChild(grid)
-        content.appendChild(overview)
-        const docs = el('div', 'section')
-        docs.appendChild(el('h3', '', 'Documentation'))
-        const docGrid = el('div', 'grid-2')
-        docGrid.appendChild(kv('summary', cfg.summary, engine))
-        docGrid.appendChild(kv('description', cfg.description, engine))
-        docs.appendChild(docGrid)
-        const tagsRow = el('div', 'chips')
-        ;(cfg.tags || []).forEach((tag) => {
-          const chip = el('span', 'chip')
-          setHighlighted(chip, tag, engine)
-          tagsRow.appendChild(chip)
-        })
-        if ((cfg.tags || []).length === 0) {
-          tagsRow.appendChild(el('span', 'empty', 'No tags'))
+        const topGrid = el('div', 'grid-3')
+        topGrid.appendChild(kv('group', cfg.docsGroup, engine))
+        topGrid.appendChild(
+          kv('tags', cfg.tags && cfg.tags.length > 0 ? cfg.tags.join(', ') : undefined, engine),
+        )
+        topGrid.appendChild(kv('stability', cfg.stability, engine))
+        overview.appendChild(topGrid)
+        overview.appendChild(kv('summary', cfg.summary, engine))
+        overview.appendChild(kv('description', cfg.description, engine))
+        const iconRow = el('div', 'icon-row')
+        if (cfg.feed) {
+          const feed = el('span', 'icon-badge')
+          feed.title = 'Feed'
+          setHighlighted(feed, 'F', engine)
+          iconRow.appendChild(feed)
         }
-        docs.appendChild(tagsRow)
-        if (cfg.docsMeta && Object.keys(cfg.docsMeta).length > 0) {
-          Object.entries(cfg.docsMeta).forEach(([k, v]) => {
-            docs.appendChild(kv(`meta.${k}`, typeof v === 'string' ? v : JSON.stringify(v), engine))
-          })
+        if (cfg.deprecated) {
+          const deprecated = el('span', 'icon-badge warn')
+          deprecated.title = 'Deprecated'
+          setHighlighted(deprecated, 'D', engine)
+          iconRow.appendChild(deprecated)
         }
-        content.appendChild(docs)
-        const schemas = el('div', 'section')
-        schemas.appendChild(el('h3', '', 'Schema Summaries'))
-        const schemaGrid = el('div', 'grid-2')
-        const schemaObj = cfg.schemas || {}
-        schemaGrid.appendChild(renderSchemaSummary('params', schemaObj.params, engine))
-        schemaGrid.appendChild(renderSchemaSummary('query', schemaObj.query, engine))
-        schemaGrid.appendChild(renderSchemaSummary('body', schemaObj.body, engine))
-        schemaGrid.appendChild(renderSchemaSummary('output', schemaObj.output, engine))
-        schemaGrid.appendChild(renderSchemaSummary('outputMeta', schemaObj.outputMeta, engine))
-        schemaGrid.appendChild(renderSchemaSummary('queryExtension', schemaObj.queryExtension, engine))
-        schemas.appendChild(schemaGrid)
-        content.appendChild(schemas)
+        if (cfg.docsHidden) {
+          const hidden = el('span', 'icon-badge warn')
+          hidden.title = 'Hidden'
+          setHighlighted(hidden, 'H', engine)
+          iconRow.appendChild(hidden)
+        }
+        if (iconRow.childNodes.length > 0) {
+          overview.appendChild(iconRow)
+        }
+        content.appendChild(overview)
         const files = el('div', 'section')
-        files.appendChild(el('h3', '', 'Body Files'))
         if (Array.isArray(cfg.bodyFiles) && cfg.bodyFiles.length > 0) {
+          files.appendChild(el('h3', '', 'Body Files'))
           const chips = el('div', 'chips')
           cfg.bodyFiles.forEach((file) => {
             const chip = el('span', 'chip ok')
@@ -826,12 +820,13 @@
             chips.appendChild(chip)
           })
           files.appendChild(chips)
-        } else {
-          files.appendChild(el('div', 'empty', 'No file upload fields.'))
+          content.appendChild(files)
         }
-        content.appendChild(files)
-        content.appendChild(renderSeparatedSchemas(flatSchema, engine))
+        const separatedSchemas = renderSeparatedSchemas(flatSchema, engine)
+        if (separatedSchemas) {
+          content.appendChild(separatedSchemas)
+        }
         details.appendChild(content)
         return details
@@ -842,9 +837,6 @@
           caseSensitive: caseSensitiveInput.checked,
           regex: regexSearchInput.checked,
         })
-        const typeEngine = createTypeSearchEngine(typeFilterInput.value.trim())
-        const hasEnumOnly = Boolean(hasEnumOnlyInput.checked)
-        const typeMatchMode = typeMatchModeInput.value === 'exact' ? 'exact' : 'contains'
         if (engine.error) {
           statusEl.textContent = `Invalid regex: ${engine.error}`
@@ -858,11 +850,7 @@
         }
         const selectedIds = selectedFieldIds()
-        const filtered = state.leaves.filter(
-          (leaf) =>
-            matchesLeaf(leaf, engine, selectedIds) &&
-            matchesTypeFilter(leaf, typeEngine, typeMatchMode, hasEnumOnly),
-        )
+        const filtered = state.leaves.filter((leaf) => matchesLeaf(leaf, engine, selectedIds))
         statusEl.textContent = `${filtered.length} / ${state.leaves.length} routes matched.`
         resultsEl.innerHTML = ''
@@ -906,10 +894,8 @@
       function resetFiltersToDefault() {
         searchInput.value = ''
-        typeFilterInput.value = ''
         caseSensitiveInput.checked = false
         regexSearchInput.checked = false
-        hasEnumOnlyInput.checked = false
         typeMatchModeInput.value = 'contains'
         setFieldSelection(new Set(SEARCH_FIELDS.map((field) => field.id)))
       }
@@ -919,14 +905,11 @@
         const chips = []
         const searchValue = searchInput.value.trim()
-        const typeValue = typeFilterInput.value.trim()
         if (searchValue) chips.push(`search: ${searchValue}`)
-        if (typeValue) chips.push(`type: ${typeValue}`)
         if (typeMatchModeInput.value === 'exact') chips.push('type mode: exact')
         if (caseSensitiveInput.checked) chips.push('case sensitive')
         if (regexSearchInput.checked) chips.push('regex')
-        if (hasEnumOnlyInput.checked) chips.push('has enum only')
         if (hasRegexError) chips.push('regex error')
         const allIds = SEARCH_FIELDS.map((field) => field.id)
@@ -949,10 +932,8 @@
       function collectFilterState() {
         return {
           search: searchInput.value,
-          typeFilter: typeFilterInput.value,
           caseSensitive: caseSensitiveInput.checked,
           regex: regexSearchInput.checked,
-          hasEnumOnly: hasEnumOnlyInput.checked,
           typeMatchMode: typeMatchModeInput.value === 'exact' ? 'exact' : 'contains',
           selectedFields: selectedFieldIds(),
         }
@@ -980,10 +961,8 @@
           const parsed = JSON.parse(decodeURIComponent(raw))
           isHydratingFromUrl = true
           if (typeof parsed.search === 'string') searchInput.value = parsed.search
-          if (typeof parsed.typeFilter === 'string') typeFilterInput.value = parsed.typeFilter
           caseSensitiveInput.checked = Boolean(parsed.caseSensitive)
           regexSearchInput.checked = Boolean(parsed.regex)
-          hasEnumOnlyInput.checked = Boolean(parsed.hasEnumOnly)
           if (parsed.typeMatchMode === 'exact' || parsed.typeMatchMode === 'contains') {
             typeMatchModeInput.value = parsed.typeMatchMode
           }
@@ -1038,10 +1017,8 @@
       })
       searchInput.addEventListener('input', renderResults)
-      typeFilterInput.addEventListener('input', renderResults)
       caseSensitiveInput.addEventListener('change', renderResults)
       regexSearchInput.addEventListener('change', renderResults)
-      hasEnumOnlyInput.addEventListener('change', renderResults)
       typeMatchModeInput.addEventListener('change', renderResults)
       selectAllFieldsBtn.addEventListener('click', () =>