@emeryld/rrroutes-contract 2.2.10 → 2.2.12

package/dist/core/routesV3.builder.d.ts

@@ -1,10 +1,10 @@
 import { z } from 'zod';
 import { AnyLeaf, Append, HttpMethod, Leaf, Merge, MergeArray, MethodCfg, NodeCfg, Prettify } from './routesV3.core';
-declare const paginationField: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-    cursor: z.ZodOptional<z.ZodString>;
-    limit: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
-}, z.core.$strip>>>;
-type PaginationField = typeof paginationField;
+declare const paginationQueryShape: {
+    pagination_cursor: z.ZodOptional<z.ZodString>;
+    pagination_limit: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
+};
+type PaginationShape = typeof paginationQueryShape;
 type ZodTypeAny = z.ZodTypeAny;
 type ParamZod<Name extends string, S extends ZodTypeAny> = z.ZodObject<{
     [K in Name]: S;
@@ -29,11 +29,7 @@ type FeedField<C extends MethodCfg> = C['feed'] extends true ? {
 } : {
     feed?: boolean;
 };
-type AddPaginationToQuery<Q extends AnyZodObject | undefined> = Q extends z.ZodObject<infer Shape> ? z.ZodObject<Shape & {
-    pagination: PaginationField;
-}> : z.ZodObject<{
-    pagination: PaginationField;
-}>;
+type AddPaginationToQuery<Q extends AnyZodObject | undefined> = Q extends z.ZodObject<infer Shape> ? z.ZodObject<Shape & PaginationShape> : z.ZodObject<PaginationShape>;
 type FeedQueryField<C extends MethodCfg> = {
     querySchema: AddPaginationToQuery<C['querySchema'] extends AnyZodObject ? C['querySchema'] : undefined>;
 };

package/dist/crud/routesV3.crud.d.ts

@@ -2,21 +2,17 @@ import { z, ZodType } from 'zod';
 import { resource as baseResource, type Branch as _Branch } from '../core/routesV3.builder';
 import { type AnyLeaf, type Leaf, type NodeCfg } from '../core/routesV3.core';
 /** Default cursor pagination used by list (GET collection). */
+declare const crudPaginationShape: {
+    pagination_cursor: z.ZodOptional<z.ZodString>;
+    pagination_limit: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
+};
 export declare const CrudDefaultPagination: z.ZodObject<{
-    limit: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
-    cursor: z.ZodOptional<z.ZodString>;
+    pagination_cursor: z.ZodOptional<z.ZodString>;
+    pagination_limit: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
 }, z.core.$strip>;
-declare const CrudPaginationField: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-    limit: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
-    cursor: z.ZodOptional<z.ZodString>;
-}, z.core.$strip>>>;
-type CrudPaginationField = typeof CrudPaginationField;
+type CrudPaginationShape = typeof crudPaginationShape;
 type AnyCrudZodObject = z.ZodObject<any>;
-type AddCrudPagination<Q extends AnyCrudZodObject | undefined> = Q extends z.ZodObject<infer Shape> ? z.ZodObject<Shape & {
-    pagination: CrudPaginationField;
-}> : z.ZodObject<{
-    pagination: CrudPaginationField;
-}>;
+type AddCrudPagination<Q extends AnyCrudZodObject | undefined> = Q extends z.ZodObject<infer Shape> ? z.ZodObject<Shape & CrudPaginationShape> : z.ZodObject<CrudPaginationShape>;
 /**
  * Merge two Zod schemas at runtime; matches the typing pattern used in builder.
  * @param a Existing params schema inherited from parent branches.

package/dist/index.cjs

@@ -46,11 +46,30 @@ module.exports = __toCommonJS(index_exports);
 
 // src/core/routesV3.builder.ts
 var import_zod = require("zod");
-var defaultFeedQuerySchema = import_zod.z.object({
-  cursor: import_zod.z.string().optional(),
-  limit: import_zod.z.coerce.number().min(1).max(100).default(20)
-});
-var paginationField = defaultFeedQuerySchema.optional().default(defaultFeedQuerySchema.parse({}));
+var paginationQueryShape = {
+  pagination_cursor: import_zod.z.string().optional(),
+  pagination_limit: import_zod.z.coerce.number().min(1).max(100).default(20)
+};
+var defaultFeedQuerySchema = import_zod.z.object(paginationQueryShape);
+function getZodShape(schema) {
+  const shapeOrGetter = schema.shape ? schema.shape : schema._def?.shape?.();
+  if (!shapeOrGetter) return {};
+  return typeof shapeOrGetter === "function" ? shapeOrGetter.call(schema) : shapeOrGetter;
+}
+function collectNestedFieldSuggestions(shape, prefix = []) {
+  if (!shape) return [];
+  const suggestions = [];
+  for (const [key, value] of Object.entries(shape)) {
+    if (value instanceof import_zod.z.ZodObject) {
+      const nestedShape = getZodShape(value);
+      const nestedSuggestions = collectNestedFieldSuggestions(nestedShape, [...prefix, key]);
+      suggestions.push(...nestedSuggestions.length ? nestedSuggestions : [[...prefix, key].join("_")]);
+    } else if (prefix.length > 0) {
+      suggestions.push([...prefix, key].join("_"));
+    }
+  }
+  return suggestions;
+}
 var defaultFeedOutputSchema = import_zod.z.object({
   items: import_zod.z.array(import_zod.z.unknown()),
   nextCursor: import_zod.z.string().optional()
@@ -58,14 +77,17 @@ var defaultFeedOutputSchema = import_zod.z.object({
 function augmentFeedQuerySchema(schema) {
   if (schema && !(schema instanceof import_zod.z.ZodObject)) {
     console.warn("Feed queries must be a ZodObject; default pagination applied.");
-    return import_zod.z.object({
-      pagination: paginationField
-    });
+    return defaultFeedQuerySchema;
   }
   const base = schema ?? import_zod.z.object({});
-  return base.extend({
-    pagination: paginationField
-  });
+  const shape = getZodShape(base);
+  const nestedSuggestions = collectNestedFieldSuggestions(shape);
+  if (nestedSuggestions.length) {
+    console.warn(
+      `Feed query schemas should avoid nested objects; consider flattening fields like: ${nestedSuggestions.join(", ")}`
+    );
+  }
+  return base.extend(paginationQueryShape);
 }
 function augmentFeedOutputSchema(schema) {
   if (!schema) return defaultFeedOutputSchema;
@@ -227,11 +249,11 @@ function finalize(leaves) {
 
 // src/crud/routesV3.crud.ts
 var import_zod2 = require("zod");
-var CrudDefaultPagination = import_zod2.z.object({
-  limit: import_zod2.z.coerce.number().min(1).max(100).default(20),
-  cursor: import_zod2.z.string().optional()
-});
-var CrudPaginationField = CrudDefaultPagination.optional().default(CrudDefaultPagination.parse({}));
+var crudPaginationShape = {
+  pagination_cursor: import_zod2.z.string().optional(),
+  pagination_limit: import_zod2.z.coerce.number().min(1).max(100).default(20)
+};
+var CrudDefaultPagination = import_zod2.z.object(crudPaginationShape);
 function mergeSchemas2(a, b) {
   if (a && b) return import_zod2.z.intersection(a, b);
   return a ?? b;
@@ -644,6 +666,28 @@ body {
 .schema-toggle:hover { color: var(--text-main); }
 tr[data-hidden="true"] { display: none; }
 
+/* Schema name cell indentation */
+.schema-name-cell {
+  display: flex;
+  align-items: center;
+}
+.schema-name-text {
+  opacity: 0.8;
+}
+.schema-toggle-placeholder {
+  width: 20px;
+  display: inline-block;
+}
+.schema-depth-0 { padding-left: 0; }
+.schema-depth-1 { padding-left: 16px; }
+.schema-depth-2 { padding-left: 32px; }
+.schema-depth-3 { padding-left: 48px; }
+.schema-depth-4 { padding-left: 64px; }
+.schema-depth-5 { padding-left: 80px; }
+.schema-depth-6 { padding-left: 96px; }
+.schema-depth-7 { padding-left: 112px; }
+.schema-depth-8 { padding-left: 128px; }
+
 /* --- Playground Panel --- */
 .playground-overlay {
   position: fixed; top: 0; right: 0; bottom: 0; width: 600px; max-width: 90vw;
@@ -659,6 +703,14 @@ tr[data-hidden="true"] { display: none; }
   padding: 40px;
   color: #64748b;
 }
+
+/* Empty-state for no results */
+.no-results {
+  text-align: center;
+  padding: 40px;
+  color: var(--text-muted);
+}
+
 .section-header-row {
   display:flex;
   justify-content:space-between;
@@ -708,10 +760,25 @@ tr[data-hidden="true"] { display: none; }
 .pg-input:focus, .pg-textarea:focus { outline: none; border-color: var(--accent-primary); }
 .pg-textarea { min-height: 150px; resize: vertical; }
 
+/* Disabled label input in playground */
+.pg-input-disabled-label {
+  opacity: 0.7;
+}
+
 /* Param Grid */
 .param-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 8px; }
 .param-row { display: contents; }
 
+/* Add query button */
+.btn-add-query {
+  font-size: 11px;
+  background: none;
+  border: 1px dashed var(--border-subtle);
+  color: var(--text-muted);
+  padding: 4px;
+  cursor: pointer;
+}
+
 .pg-footer {
   padding: 16px; border-top: 1px solid var(--border-subtle); background: var(--bg-glass);
   display: flex; justify-content: flex-end; gap: 12px;
@@ -734,6 +801,16 @@ tr[data-hidden="true"] { display: none; }
 .status-err { color: var(--accent-error); }
 .response-body { padding: 12px; overflow-x: auto; font-family: var(--font-mono); font-size: 12px; }
 
+/* Response visibility */
+.pg-response-hidden {
+  display: none;
+}
+
+/* Preformatted response text */
+.response-pre {
+  margin: 0;
+}
+
 /* JSON Tree */
 .json-tree { font-family: var(--font-mono); line-height: 1.6; }
 .jt-obj, .jt-arr { margin-left: 14px; }
@@ -749,6 +826,13 @@ tr[data-hidden="true"] { display: none; }
 .jt-toggle:hover { color: var(--text-main); }
 .jt-collapsed .jt-content { display: none; }
 .jt-collapsed::after { content: " ... "; color: var(--text-muted); font-size: 10px; }
+
+/* JSON tree line indentation */
+.json-tree-line {
+  padding-left: 16px;
+}
+
+.hidden-template { display: none; }
 `;
 var DOCS_JS = `
 (function() {
@@ -933,7 +1017,7 @@ var DOCS_JS = `
     });
 
     if (filtered.length === 0) {
-      elRouteList.innerHTML = '<div style="text-align:center; padding:40px; color:var(--text-muted)">No endpoints match filters.</div>';
+      elRouteList.innerHTML = '<div class="no-results">No endpoints match filters.</div>';
       elOverview.innerHTML = '';
       return;
     }
@@ -1021,21 +1105,25 @@ var DOCS_JS = `
   function renderNodeRow(name, node, depth, parentPath) {
     const hasChildren = isComplexNode(node) && ((node.properties && Object.keys(node.properties).length > 0) || (node.element && isComplexNode(node.element)) || (node.union));
     const currentPath = (parentPath ? parentPath + '.' : '') + name;
-    const indent = depth * 16;
 
     // NEW: Collapse by default. Hide deeply nested rows (depth > 0) initially.
     const isExpanded = false;
     const isHidden = depth > 0;
 
-    const styleAttr = isHidden ? 'style="display:none"' : '';
-    const rowAttrs = 'data-depth="'+depth+'" data-path="'+escapeAttr(currentPath)+'" '+styleAttr + (hasChildren ? ' data-has-children="true" data-expanded="'+isExpanded+'"' : '');
+    const classes = [];
+    if (isHidden) classes.push('hidden-template');
+
+    const rowAttrs = 'data-depth="'+depth+'" data-path="'+escapeAttr(currentPath)+'"' +
+      (classes.length ? ' class="'+classes.join(' ')+'"' : '') +
+      (hasChildren ? ' data-has-children="true" data-expanded="'+isExpanded+'"' : '');
 
     const toggleHtml = hasChildren
       ? '<button class="schema-toggle">' + (isExpanded ? '\u25BC' : '\u25B6') + '</button>'
-      : '<span style="width:20px; display:inline-block;"></span>';
+      : '<span class="schema-toggle-placeholder"></span>';
 
-    const nameCell = '<div style="padding-left:'+indent+'px; display:flex; align-items:center;">' +
-      toggleHtml + '<span style="opacity:0.8">'+escapeHtml(name)+'</span></div>';
+    const depthClass = 'schema-depth-' + depth;
+    const nameCell = '<div class="schema-name-cell '+depthClass+'">' +
+      toggleHtml + '<span class="schema-name-text">'+escapeHtml(name)+'</span></div>';
 
     let html = '<tr '+rowAttrs+'>' +
       '<td class="col-name">' + nameCell + '</td>' +
@@ -1091,7 +1179,7 @@ var DOCS_JS = `
         checkVisibility(sibling);
       } else {
         // COLLAPSING: Hide all descendants regardless of their state
-        sibling.style.display = 'none';
+        sibling.classList.add('hidden-template');
       }
       sibling = sibling.nextElementSibling;
     }
@@ -1105,18 +1193,19 @@ var DOCS_JS = `
       const pDepth = parseInt(prev.getAttribute('data-depth'), 10);
       if (pDepth < myDepth) {
         // Found parent
-        // If parent is expanded AND visible, then I should be visible.
-        if (prev.getAttribute('data-expanded') === 'true' && prev.style.display !== 'none') {
-           row.style.display = '';
+        const parentVisible = !prev.classList.contains('hidden-template');
+        // If parent is expanded AND visible, then this should be visible.
+        if (prev.getAttribute('data-expanded') === 'true' && parentVisible) {
+           row.classList.remove('hidden-template');
         } else {
-           row.style.display = 'none';
+           row.classList.add('hidden-template');
         }
         return;
       }
       prev = prev.previousElementSibling;
     }
     // No parent found (depth 0), always visible
-    row.style.display = '';
+    row.classList.remove('hidden-template');
   }
 
   function toggleAllSchema(table, expand) {
@@ -1130,7 +1219,7 @@ var DOCS_JS = `
     // Update visibility for all rows
     const allRows = table.querySelectorAll('tr[data-depth]');
     allRows.forEach(row => {
-      if(parseInt(row.getAttribute('data-depth')) === 0) return;
+      if(parseInt(row.getAttribute('data-depth'), 10) === 0) return;
       checkVisibility(row);
     });
   }
@@ -1174,7 +1263,7 @@ var DOCS_JS = `
       matches.forEach(m => {
         const key = m[1];
         html += '<div class="param-row">' +
-          '<input class="pg-input" placeholder="'+key+'" disabled value="'+key+'" style="opacity:0.7">' +
+          '<input class="pg-input pg-input-disabled-label" placeholder="'+key+'" disabled value="'+key+'">' +
           '<input class="pg-input pg-path-input" data-key="'+key+'" placeholder="value">' +
           '</div>';
       });
@@ -1185,7 +1274,7 @@ var DOCS_JS = `
     // We check leaf.cfg.querySchema or just provide a generic adder
     html += '<div class="pg-section"><div class="pg-label">Query Parameters</div>' +
       '<div class="param-grid" id="pgQueryGrid"></div>' +
-      '<button type="button" id="pgAddQuery" style="font-size:11px;background:none;border:1px dashed var(--border-subtle);color:var(--text-muted);padding:4px;cursor:pointer;">+ Add Parameter</button>' +
+      '<button type="button" id="pgAddQuery" class="btn-add-query">+ Add Parameter</button>' +
       '</div>';
 
     // 4. Body
@@ -1196,7 +1285,7 @@ var DOCS_JS = `
     }
 
     // 5. Response Container
-    html += '<div class="pg-section" id="pgResponseContainer" style="display:none;">' +
+    html += '<div class="pg-section pg-response-hidden" id="pgResponseContainer">' +
       '<div class="pg-label">Response</div>' +
       '<div class="response-box">' +
         '<div class="response-meta" id="pgResponseMeta"></div>' +
@@ -1236,7 +1325,7 @@ var DOCS_JS = `
 
     btn.disabled = true;
     btn.textContent = 'Sending...';
-    resContainer.style.display = 'none';
+    resContainer.classList.add('pg-response-hidden');
 
     try {
       // Build URL
@@ -1296,7 +1385,7 @@ var DOCS_JS = `
       }
 
       // Render Response
-      resContainer.style.display = 'block';
+      resContainer.classList.remove('pg-response-hidden');
       const statusClass = (status >= 200 && status < 300) ? 'status-ok' : 'status-err';
       metaEl.innerHTML = '<div class="meta-item '+statusClass+'">\u2B24 '+status+' '+statusText+'</div><div class="meta-item">\u23F1 '+time+'ms</div>';
 
@@ -1305,13 +1394,13 @@ var DOCS_JS = `
         bodyEl.appendChild(renderJsonTree(resData));
       } else {
         const pre = document.createElement('pre');
-        pre.style.margin = 0;
+        pre.className = 'response-pre';
         pre.textContent = resData;
         bodyEl.appendChild(pre);
       }
 
     } catch (err) {
-      resContainer.style.display = 'block';
+      resContainer.classList.remove('pg-response-hidden');
       metaEl.innerHTML = '<div class="meta-item status-err">Network Error</div>';
       bodyEl.textContent = err.message;
     } finally {
@@ -1352,7 +1441,7 @@ var DOCS_JS = `
 
     keys.forEach((k, i) => {
       const line = document.createElement('div');
-      line.style.paddingLeft = '16px';
+      line.className = 'json-tree-line';
 
       if (!isArr) {
         const keySpan = createSpan('"'+k+'": ', 'jt-key');
@@ -1433,7 +1522,7 @@ var DOCS_JS = `
 `;
 function renderLeafDocsHTML(leaves, options = {}) {
   const leavesJson = JSON.stringify(leaves.map(serializeLeaf));
-  const nonceAttr = options.cspNonce ? ` nonce="${options.cspNonce}"` : "";
+  const nonceAttr = options.cspNonce ? ` nonce="\${options.cspNonce}"` : "";
   return `
 <!DOCTYPE html>
 <html lang="en">
@@ -1478,8 +1567,8 @@ function renderLeafDocsHTML(leaves, options = {}) {
 </main>
   </div>
 
-  <script id="leaf-data" type="application/json">${leavesJson}</script>
-  <script${nonceAttr}>${DOCS_JS}</script>
+  <script id="leaf-data" type="application/json">\${leavesJson}</script>
+  <script ${nonceAttr}> ${DOCS_JS}</script>
   ${options.inlineClientScript ? `<script${nonceAttr}>${options.inlineClientScript}</script>` : ""}
 </body>
 </html>