fusion-framework 1.2.4 → 1.2.6

package/index.js

@@ -134,7 +134,7 @@ header.fingerprint = () =>
     : {
         'X-Powered-By': 'Fusion Framework',
         'X-Framework': 'Fusion',
-        ['X-Fusion-Version']: '1.2.4',
+        ['X-Fusion-Version']: '1.2.6',
       }
 
 function isThenable(value) {
@@ -208,6 +208,26 @@ class FusionBaseApi {
     if (keys.length) out.headers = { ...headers }
     return out
   }
+
+  pagination({
+    page,
+    pageSize,
+    offset,
+    defaultPageSize = 20,
+    maxPageSize = 100,
+  } = {}) {
+    const query = { ...(this.query || {}) }
+    if (page != null) query.page = String(page)
+    if (pageSize != null) query.page_size = String(pageSize)
+    if (offset != null) query.offset = String(offset)
+    return parsePagination(query, { defaultPageSize, maxPageSize })
+  }
+
+  paginated(items, total, params = null, { page, pageSize, status = 200, headers } = {}) {
+    const p = params ?? this.pagination({ page, pageSize })
+    const body = paginatedBody(items, total, p)
+    return this.response(body, status, headers || {})
+  }
 }
 
 function apiResourceName(cls) {
@@ -259,10 +279,13 @@ function resolveHandlerRoute(classBasePath, template, className, methodName) {
 }
 
 function httpRoute(method, route, options = {}) {
+  // tags unset → inherit class route tags; tags: [] clears; tags: [...] overrides.
+  const tagsSet = Object.prototype.hasOwnProperty.call(options, 'tags')
   const meta = {
     method: String(method).toLowerCase(),
     template: route,
-    tags: Array.isArray(options.tags) ? options.tags : [],
+    tagsSet,
+    tags: tagsSet ? (Array.isArray(options.tags) ? options.tags : []) : null,
     desc: options.desc ?? null,
     title: options.title ?? null,
     deprecated: !!options.deprecated,
@@ -274,6 +297,15 @@ function httpRoute(method, route, options = {}) {
   return wrap
 }
 
+function mergeSwagger(methodSwagger, classSwagger) {
+  return {
+    tags: methodSwagger.tagsSet ? methodSwagger.tags : classSwagger.tags,
+    description: methodSwagger.desc ?? classSwagger.description,
+    title: methodSwagger.title ?? classSwagger.title,
+    deprecated: !!(methodSwagger.deprecated || classSwagger.deprecated),
+  }
+}
+
 function httpGet(route, options = {}) {
   return httpRoute('get', route, options)
 }
@@ -311,12 +343,7 @@ function collectRouteSlots(ApiClass, classBasePath, classSwagger) {
       path: resolveHandlerRoute(classBasePath, meta.template, className, key),
       httpMethod: meta.method,
       handlerMethod: key,
-      swagger: {
-        tags: meta.tags,
-        description: meta.desc,
-        title: meta.title,
-        deprecated: meta.deprecated,
-      },
+      swagger: mergeSwagger(meta, classSwagger),
     })
   }
 
@@ -810,7 +837,12 @@ function swaggerUiHtml(swagger, openapiUrl, primaryName = null) {
   const showUrlInput = swagger.navbar?.showUrlInput !== false
   const hideUrlCss =
     navbarEnabled && !showUrlInput
-      ? `<style>.topbar form { display: none !important; }</style>`
+      ? `<style>
+      .swagger-ui .topbar .download-url-wrapper input[type=text],
+      .swagger-ui .topbar .download-url-wrapper .download-url-button {
+        display: none !important;
+      }
+    </style>`
       : ''
   const standaloneScript = navbarEnabled
     ? `<script src="https://unpkg.com/swagger-ui-dist/swagger-ui-standalone-preset.js"></script>`
@@ -961,6 +993,18 @@ function pathToFileUrl(filePath) {
   return require('url').pathToFileURL(resolved).href
 }
 
+function parsePagination(query, { defaultPageSize = 20, maxPageSize = 100 } = {}) {
+  try {
+    return native.parsePagination(query, defaultPageSize, maxPageSize)
+  } catch (err) {
+    throw new HTTPException(400, err?.message || 'invalid pagination')
+  }
+}
+
+function paginatedBody(items, total, params) {
+  return native.paginatedBody(items, total, params)
+}
+
 const route = router
 
 module.exports = {
@@ -994,6 +1038,8 @@ module.exports = {
   frameworkHeaders,
   runMiddlewareChain,
   coerceParam,
+  parsePagination,
+  paginatedBody,
   getHttpMethods: () => HTTP_METHODS,
   apiResourceNameJs: native.apiResourceNameJs,
   resolveRoutePathJs: native.resolveRoutePathJs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fusion-framework",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Class-based HTTP framework for Node.js, powered by a shared Rust core via N-API",
   "keywords": [
     "http",