@ktjs/router 0.7.3 → 0.14.0

package/README.md

@@ -2,10 +2,14 @@
 
 <img src="https://raw.githubusercontent.com/baendlorel/kt.js/dev/.assets/ktjs-0.0.1.svg" alt="KT.js Logo" width="150"/>
 
-> 📦 Part of [KT.js](https://raw.githubusercontent.com/baendlorel/kt.js/dev/README.md) - A simple and easy-to-use web framework that never re-renders.
+[![npm version](https://img.shields.io/npm/v/@ktjs/router.svg)](https://www.npmjs.com/package/@ktjs/router)
+
+> 📦 Part of [KT.js](https://github.com/baendlorel/kt.js) - A simple and easy-to-use web framework that never re-renders.
 
 Client-side router with navigation guards for KT.js.
 
+**Current Version:** 0.13.0
+
 ## Overview
 
 `@ktjs/router` is a lightweight, hash-based client-side router with powerful navigation guards and async/sync auto-adaptation. It provides all the essential routing features you need without the bloat.

package/dist/index.d.ts

@@ -31,8 +31,10 @@ interface RawRouteConfig {
   name?: string;
   /** Optional metadata attached to the route */
   meta?: Record<string, any>;
-  /** Route-level guard executed before entering this route */
-  beforeEnter?: (context: RouteContext) => boolean | void | Promise<boolean | void>;
+  /** Route-level guard executed before entering this route. Return false to block, string/object to redirect */
+  beforeEnter?: (
+    context: RouteContext
+  ) => string | NavBaseOptions | boolean | void | Promise<string | NavBaseOptions | boolean | void>;
   /** Route-level hook executed after navigation */
   after?: (context: RouteContext) => void | Promise<void>;
   /** Nested child routes */
@@ -96,8 +98,11 @@ interface RouterConfig {
   /** Array of route definitions */
   routes: RawRouteConfig[];
 
-  /** Global guard executed before each navigation (except silentPush) */
-  beforeEach?: (to: RouteContext, from: RouteContext | null) => boolean | void | Promise<boolean | void>;
+  /** Global guard executed before each navigation (except silentPush). Return false to block, string/object to redirect */
+  beforeEach?: (
+    to: RouteContext,
+    from: RouteContext | null
+  ) => string | NavBaseOptions | boolean | void | Promise<string | NavBaseOptions | boolean | void>;
 
   /** Global hook executed after each navigation */
   afterEach?: (to: RouteContext, from: RouteContext | null) => void | Promise<void>;

package/dist/index.iife.js

@@ -189,49 +189,75 @@ var __ktjs_router__ = (function (exports) {
         const executeGuardsSync = (to, from, guardLevel) => {
             try {
                 if (guardLevel === 0 /* GuardLevel.None */) {
-                    return true;
+                    return { continue: true };
                 }
                 if (guardLevel & 1 /* GuardLevel.Global */) {
                     const result = beforeEach(to, from);
                     if (result === false) {
-                        return false;
+                        return { continue: false };
+                    }
+                    if (typeof result === 'string') {
+                        return { continue: false, redirectTo: { path: result } };
+                    }
+                    if (result && typeof result === 'object' && !('then' in result)) {
+                        return { continue: false, redirectTo: result };
                     }
                 }
                 if (guardLevel & 2 /* GuardLevel.Route */) {
                     const targetRoute = to.matched[to.matched.length - 1];
                     const result = targetRoute.beforeEnter(to);
                     if (result === false) {
-                        return false;
+                        return { continue: false };
+                    }
+                    if (typeof result === 'string') {
+                        return { continue: false, redirectTo: { path: result } };
+                    }
+                    if (result && typeof result === 'object' && !('then' in result)) {
+                        return { continue: false, redirectTo: result };
                     }
                 }
-                return true;
+                return { continue: true };
             }
             catch (error) {
                 onError(error);
-                return false;
+                return { continue: false };
             }
         };
         const executeGuards = async (to, from, guardLevel) => {
             try {
                 if (guardLevel === 0 /* GuardLevel.None */) {
-                    return true;
+                    return { continue: true };
                 }
                 if (guardLevel & 1 /* GuardLevel.Global */) {
                     const result = await beforeEach(to, from);
                     if (result === false) {
-                        return false;
+                        return { continue: false };
+                    }
+                    if (typeof result === 'string') {
+                        return { continue: false, redirectTo: { path: result } };
+                    }
+                    if (result && typeof result === 'object') {
+                        return { continue: false, redirectTo: result };
                     }
                 }
                 if (guardLevel & 2 /* GuardLevel.Route */) {
                     const targetRoute = to.matched[to.matched.length - 1];
-                    const result = targetRoute.beforeEnter(to);
-                    return result !== false;
+                    const result = await targetRoute.beforeEnter(to);
+                    if (result === false) {
+                        return { continue: false };
+                    }
+                    if (typeof result === 'string') {
+                        return { continue: false, redirectTo: { path: result } };
+                    }
+                    if (result && typeof result === 'object') {
+                        return { continue: false, redirectTo: result };
+                    }
                 }
-                return true;
+                return { continue: true };
             }
             catch (error) {
                 onError(error);
-                return false;
+                return { continue: false };
             }
         };
         const navigatePrepare = (options) => {
@@ -268,9 +294,9 @@ var __ktjs_router__ = (function (exports) {
             const to = {
                 path: targetPath,
                 name: matched.route.name,
-                params: { ...matched.params, ...(options.params || {}) },
-                query: options.query || {},
-                meta: matched.route.meta || {},
+                params: { ...matched.params, ...(options.params ?? {}) },
+                query: options.query ?? {},
+                meta: matched.route.meta ?? {},
                 matched: matched.result,
             };
             return {
@@ -280,15 +306,25 @@ var __ktjs_router__ = (function (exports) {
                 fullPath,
             };
         };
-        const navigateSync = (options) => {
+        const navigateSync = (options, redirectCount = 0) => {
             try {
+                // Prevent infinite redirect loop
+                if (redirectCount > 10) {
+                    onError(new Error('Maximum redirect count exceeded'));
+                    return false;
+                }
                 const prep = navigatePrepare(options);
                 if (!prep) {
                     return false;
                 }
                 const { guardLevel, replace, to, fullPath } = prep;
                 // Execute guards
-                if (!executeGuardsSync(to, current, guardLevel)) {
+                const guardResult = executeGuardsSync(to, current, guardLevel);
+                if (!guardResult.continue) {
+                    // Check if there's a redirect
+                    if (guardResult.redirectTo) {
+                        return navigateSync(guardResult.redirectTo, redirectCount + 1);
+                    }
                     return false;
                 }
                 // Update browser history
@@ -303,7 +339,7 @@ var __ktjs_router__ = (function (exports) {
                 current = to;
                 history.push(to);
                 // Execute after hooks
-                executeAfterHooksSync(to, history[history.length - 2] || null);
+                executeAfterHooksSync(to, history[history.length - 2] ?? null);
                 return true;
             }
             catch (error) {
@@ -311,15 +347,24 @@ var __ktjs_router__ = (function (exports) {
                 return false;
             }
         };
-        const navigateAsync = async (options) => {
+        const navigateAsync = async (options, redirectCount = 0) => {
             try {
+                // Prevent infinite redirect loop
+                if (redirectCount > 10) {
+                    onError(new Error('Maximum redirect count exceeded'));
+                    return false;
+                }
                 const prep = navigatePrepare(options);
                 if (!prep) {
                     return false;
                 }
                 const { guardLevel, replace, to, fullPath } = prep;
-                const passed = await executeGuards(to, current, guardLevel);
-                if (!passed) {
+                const guardResult = await executeGuards(to, current, guardLevel);
+                if (!guardResult.continue) {
+                    // Check if there's a redirect
+                    if (guardResult.redirectTo) {
+                        return navigateAsync(guardResult.redirectTo, redirectCount + 1);
+                    }
                     return false;
                 }
                 // ---- Guards passed ----
@@ -330,7 +375,9 @@ var __ktjs_router__ = (function (exports) {
                 else {
                     window.history.pushState({ path: to.path }, '', url);
                 }
-                executeAfterHooks(to, history[history.length - 2] || null);
+                current = to;
+                history.push(to);
+                executeAfterHooks(to, history[history.length - 2] ?? null);
                 return true;
             }
             catch (error) {

package/dist/index.legacy.js

@@ -67,6 +67,16 @@ var __ktjs_router__ = (function (exports) {
         }
     }
 
+    function __spreadArray(to, from, pack) {
+        if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+            if (ar || !(i in from)) {
+                if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+                ar[i] = from[i];
+            }
+        }
+        return to.concat(ar || Array.prototype.slice.call(from));
+    }
+
     typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
         var e = new Error(message);
         return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
@@ -272,26 +282,38 @@ var __ktjs_router__ = (function (exports) {
         var executeGuardsSync = function (to, from, guardLevel) {
             try {
                 if (guardLevel === 0 /* GuardLevel.None */) {
-                    return true;
+                    return { continue: true };
                 }
                 if (guardLevel & 1 /* GuardLevel.Global */) {
                     var result = beforeEach(to, from);
                     if (result === false) {
-                        return false;
+                        return { continue: false };
+                    }
+                    if (typeof result === 'string') {
+                        return { continue: false, redirectTo: { path: result } };
+                    }
+                    if (result && typeof result === 'object' && !('then' in result)) {
+                        return { continue: false, redirectTo: result };
                     }
                 }
                 if (guardLevel & 2 /* GuardLevel.Route */) {
                     var targetRoute = to.matched[to.matched.length - 1];
                     var result = targetRoute.beforeEnter(to);
                     if (result === false) {
-                        return false;
+                        return { continue: false };
+                    }
+                    if (typeof result === 'string') {
+                        return { continue: false, redirectTo: { path: result } };
+                    }
+                    if (result && typeof result === 'object' && !('then' in result)) {
+                        return { continue: false, redirectTo: result };
                     }
                 }
-                return true;
+                return { continue: true };
             }
             catch (error) {
                 onError(error);
-                return false;
+                return { continue: false };
             }
         };
         var executeGuards = function (to, from, guardLevel) { return __awaiter(void 0, void 0, void 0, function () {
@@ -299,35 +321,51 @@ var __ktjs_router__ = (function (exports) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 3, , 4]);
+                        _a.trys.push([0, 5, , 6]);
                         if (guardLevel === 0 /* GuardLevel.None */) {
-                            return [2 /*return*/, true];
+                            return [2 /*return*/, { continue: true }];
                         }
                         if (!(guardLevel & 1 /* GuardLevel.Global */)) return [3 /*break*/, 2];
                         return [4 /*yield*/, beforeEach(to, from)];
                     case 1:
                         result = _a.sent();
                         if (result === false) {
-                            return [2 /*return*/, false];
+                            return [2 /*return*/, { continue: false }];
+                        }
+                        if (typeof result === 'string') {
+                            return [2 /*return*/, { continue: false, redirectTo: { path: result } }];
+                        }
+                        if (result && typeof result === 'object') {
+                            return [2 /*return*/, { continue: false, redirectTo: result }];
                         }
                         _a.label = 2;
                     case 2:
-                        if (guardLevel & 2 /* GuardLevel.Route */) {
-                            targetRoute = to.matched[to.matched.length - 1];
-                            result = targetRoute.beforeEnter(to);
-                            return [2 /*return*/, result !== false];
-                        }
-                        return [2 /*return*/, true];
+                        if (!(guardLevel & 2 /* GuardLevel.Route */)) return [3 /*break*/, 4];
+                        targetRoute = to.matched[to.matched.length - 1];
+                        return [4 /*yield*/, targetRoute.beforeEnter(to)];
                     case 3:
+                        result = _a.sent();
+                        if (result === false) {
+                            return [2 /*return*/, { continue: false }];
+                        }
+                        if (typeof result === 'string') {
+                            return [2 /*return*/, { continue: false, redirectTo: { path: result } }];
+                        }
+                        if (result && typeof result === 'object') {
+                            return [2 /*return*/, { continue: false, redirectTo: result }];
+                        }
+                        _a.label = 4;
+                    case 4: return [2 /*return*/, { continue: true }];
+                    case 5:
                         error_1 = _a.sent();
                         onError(error_1);
-                        return [2 /*return*/, false];
-                    case 4: return [2 /*return*/];
+                        return [2 /*return*/, { continue: false }];
+                    case 6: return [2 /*return*/];
                 }
             });
         }); };
         var navigatePrepare = function (options) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f;
             // Resolve target route
             var targetPath;
             var targetRoute;
@@ -361,27 +399,39 @@ var __ktjs_router__ = (function (exports) {
             var to = {
                 path: targetPath,
                 name: matched.route.name,
-                params: __assign(__assign({}, matched.params), (options.params || {})),
-                query: options.query || {},
-                meta: matched.route.meta || {},
+                params: __assign(__assign({}, matched.params), ((_b = options.params) !== null && _b !== void 0 ? _b : {})),
+                query: (_c = options.query) !== null && _c !== void 0 ? _c : {},
+                meta: (_d = matched.route.meta) !== null && _d !== void 0 ? _d : {},
                 matched: matched.result,
             };
             return {
-                guardLevel: (_b = options.guardLevel) !== null && _b !== void 0 ? _b : 15 /* GuardLevel.Default */,
-                replace: (_c = options.replace) !== null && _c !== void 0 ? _c : false,
+                guardLevel: (_e = options.guardLevel) !== null && _e !== void 0 ? _e : 15 /* GuardLevel.Default */,
+                replace: (_f = options.replace) !== null && _f !== void 0 ? _f : false,
                 to: to,
                 fullPath: fullPath,
             };
         };
-        var navigateSync = function (options) {
+        var navigateSync = function (options, redirectCount) {
+            var _a;
+            if (redirectCount === void 0) { redirectCount = 0; }
             try {
+                // Prevent infinite redirect loop
+                if (redirectCount > 10) {
+                    onError(new Error('Maximum redirect count exceeded'));
+                    return false;
+                }
                 var prep = navigatePrepare(options);
                 if (!prep) {
                     return false;
                 }
                 var guardLevel = prep.guardLevel, replace = prep.replace, to = prep.to, fullPath = prep.fullPath;
                 // Execute guards
-                if (!executeGuardsSync(to, current, guardLevel)) {
+                var guardResult = executeGuardsSync(to, current, guardLevel);
+                if (!guardResult.continue) {
+                    // Check if there's a redirect
+                    if (guardResult.redirectTo) {
+                        return navigateSync(guardResult.redirectTo, redirectCount + 1);
+                    }
                     return false;
                 }
                 // Update browser history
@@ -396,7 +446,7 @@ var __ktjs_router__ = (function (exports) {
                 current = to;
                 history.push(to);
                 // Execute after hooks
-                executeAfterHooksSync(to, history[history.length - 2] || null);
+                executeAfterHooksSync(to, (_a = history[history.length - 2]) !== null && _a !== void 0 ? _a : null);
                 return true;
             }
             catch (error) {
@@ -404,40 +454,59 @@ var __ktjs_router__ = (function (exports) {
                 return false;
             }
         };
-        var navigateAsync = function (options) { return __awaiter(void 0, void 0, void 0, function () {
-            var prep, guardLevel, replace, to, fullPath, passed, url, error_2;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        prep = navigatePrepare(options);
-                        if (!prep) {
-                            return [2 /*return*/, false];
-                        }
-                        guardLevel = prep.guardLevel, replace = prep.replace, to = prep.to, fullPath = prep.fullPath;
-                        return [4 /*yield*/, executeGuards(to, current, guardLevel)];
-                    case 1:
-                        passed = _a.sent();
-                        if (!passed) {
+        var navigateAsync = function (options_1) {
+            var args_1 = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args_1[_i - 1] = arguments[_i];
+            }
+            return __awaiter(void 0, __spreadArray([options_1], args_1, true), void 0, function (options, redirectCount) {
+                var prep, guardLevel, replace, to, fullPath, guardResult, url, error_2;
+                var _a;
+                if (redirectCount === void 0) { redirectCount = 0; }
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _b.trys.push([0, 2, , 3]);
+                            // Prevent infinite redirect loop
+                            if (redirectCount > 10) {
+                                onError(new Error('Maximum redirect count exceeded'));
+                                return [2 /*return*/, false];
+                            }
+                            prep = navigatePrepare(options);
+                            if (!prep) {
+                                return [2 /*return*/, false];
+                            }
+                            guardLevel = prep.guardLevel, replace = prep.replace, to = prep.to, fullPath = prep.fullPath;
+                            return [4 /*yield*/, executeGuards(to, current, guardLevel)];
+                        case 1:
+                            guardResult = _b.sent();
+                            if (!guardResult.continue) {
+                                // Check if there's a redirect
+                                if (guardResult.redirectTo) {
+                                    return [2 /*return*/, navigateAsync(guardResult.redirectTo, redirectCount + 1)];
+                                }
+                                return [2 /*return*/, false];
+                            }
+                            url = fullPath;
+                            if (replace) {
+                                window.history.replaceState({ path: to.path }, '', url);
+                            }
+                            else {
+                                window.history.pushState({ path: to.path }, '', url);
+                            }
+                            current = to;
+                            history.push(to);
+                            executeAfterHooks(to, (_a = history[history.length - 2]) !== null && _a !== void 0 ? _a : null);
+                            return [2 /*return*/, true];
+                        case 2:
+                            error_2 = _b.sent();
+                            onError(error_2);
                             return [2 /*return*/, false];
-                        }
-                        url = fullPath;
-                        if (replace) {
-                            window.history.replaceState({ path: to.path }, '', url);
-                        }
-                        else {
-                            window.history.pushState({ path: to.path }, '', url);
-                        }
-                        executeAfterHooks(to, history[history.length - 2] || null);
-                        return [2 /*return*/, true];
-                    case 2:
-                        error_2 = _a.sent();
-                        onError(error_2);
-                        return [2 /*return*/, false];
-                    case 3: return [2 /*return*/];
-                }
+                        case 3: return [2 /*return*/];
+                    }
+                });
             });
-        }); };
+        };
         var navigate = asyncGuards ? navigateSync : navigateAsync;
         var executeAfterHooksSync = function (to, from) {
             var targetRoute = to.matched[to.matched.length - 1];

package/dist/index.mjs

@@ -186,49 +186,75 @@ const createRouter = (config) => {
     const executeGuardsSync = (to, from, guardLevel) => {
         try {
             if (guardLevel === 0 /* GuardLevel.None */) {
-                return true;
+                return { continue: true };
             }
             if (guardLevel & 1 /* GuardLevel.Global */) {
                 const result = beforeEach(to, from);
                 if (result === false) {
-                    return false;
+                    return { continue: false };
+                }
+                if (typeof result === 'string') {
+                    return { continue: false, redirectTo: { path: result } };
+                }
+                if (result && typeof result === 'object' && !('then' in result)) {
+                    return { continue: false, redirectTo: result };
                 }
             }
             if (guardLevel & 2 /* GuardLevel.Route */) {
                 const targetRoute = to.matched[to.matched.length - 1];
                 const result = targetRoute.beforeEnter(to);
                 if (result === false) {
-                    return false;
+                    return { continue: false };
+                }
+                if (typeof result === 'string') {
+                    return { continue: false, redirectTo: { path: result } };
+                }
+                if (result && typeof result === 'object' && !('then' in result)) {
+                    return { continue: false, redirectTo: result };
                 }
             }
-            return true;
+            return { continue: true };
         }
         catch (error) {
             onError(error);
-            return false;
+            return { continue: false };
         }
     };
     const executeGuards = async (to, from, guardLevel) => {
         try {
             if (guardLevel === 0 /* GuardLevel.None */) {
-                return true;
+                return { continue: true };
             }
             if (guardLevel & 1 /* GuardLevel.Global */) {
                 const result = await beforeEach(to, from);
                 if (result === false) {
-                    return false;
+                    return { continue: false };
+                }
+                if (typeof result === 'string') {
+                    return { continue: false, redirectTo: { path: result } };
+                }
+                if (result && typeof result === 'object') {
+                    return { continue: false, redirectTo: result };
                 }
             }
             if (guardLevel & 2 /* GuardLevel.Route */) {
                 const targetRoute = to.matched[to.matched.length - 1];
-                const result = targetRoute.beforeEnter(to);
-                return result !== false;
+                const result = await targetRoute.beforeEnter(to);
+                if (result === false) {
+                    return { continue: false };
+                }
+                if (typeof result === 'string') {
+                    return { continue: false, redirectTo: { path: result } };
+                }
+                if (result && typeof result === 'object') {
+                    return { continue: false, redirectTo: result };
+                }
             }
-            return true;
+            return { continue: true };
         }
         catch (error) {
             onError(error);
-            return false;
+            return { continue: false };
         }
     };
     const navigatePrepare = (options) => {
@@ -265,9 +291,9 @@ const createRouter = (config) => {
         const to = {
             path: targetPath,
             name: matched.route.name,
-            params: { ...matched.params, ...(options.params || {}) },
-            query: options.query || {},
-            meta: matched.route.meta || {},
+            params: { ...matched.params, ...(options.params ?? {}) },
+            query: options.query ?? {},
+            meta: matched.route.meta ?? {},
             matched: matched.result,
         };
         return {
@@ -277,15 +303,25 @@ const createRouter = (config) => {
             fullPath,
         };
     };
-    const navigateSync = (options) => {
+    const navigateSync = (options, redirectCount = 0) => {
         try {
+            // Prevent infinite redirect loop
+            if (redirectCount > 10) {
+                onError(new Error('Maximum redirect count exceeded'));
+                return false;
+            }
             const prep = navigatePrepare(options);
             if (!prep) {
                 return false;
             }
             const { guardLevel, replace, to, fullPath } = prep;
             // Execute guards
-            if (!executeGuardsSync(to, current, guardLevel)) {
+            const guardResult = executeGuardsSync(to, current, guardLevel);
+            if (!guardResult.continue) {
+                // Check if there's a redirect
+                if (guardResult.redirectTo) {
+                    return navigateSync(guardResult.redirectTo, redirectCount + 1);
+                }
                 return false;
             }
             // Update browser history
@@ -300,7 +336,7 @@ const createRouter = (config) => {
             current = to;
             history.push(to);
             // Execute after hooks
-            executeAfterHooksSync(to, history[history.length - 2] || null);
+            executeAfterHooksSync(to, history[history.length - 2] ?? null);
             return true;
         }
         catch (error) {
@@ -308,15 +344,24 @@ const createRouter = (config) => {
             return false;
         }
     };
-    const navigateAsync = async (options) => {
+    const navigateAsync = async (options, redirectCount = 0) => {
         try {
+            // Prevent infinite redirect loop
+            if (redirectCount > 10) {
+                onError(new Error('Maximum redirect count exceeded'));
+                return false;
+            }
             const prep = navigatePrepare(options);
             if (!prep) {
                 return false;
             }
             const { guardLevel, replace, to, fullPath } = prep;
-            const passed = await executeGuards(to, current, guardLevel);
-            if (!passed) {
+            const guardResult = await executeGuards(to, current, guardLevel);
+            if (!guardResult.continue) {
+                // Check if there's a redirect
+                if (guardResult.redirectTo) {
+                    return navigateAsync(guardResult.redirectTo, redirectCount + 1);
+                }
                 return false;
             }
             // ---- Guards passed ----
@@ -327,7 +372,9 @@ const createRouter = (config) => {
             else {
                 window.history.pushState({ path: to.path }, '', url);
             }
-            executeAfterHooks(to, history[history.length - 2] || null);
+            current = to;
+            history.push(to);
+            executeAfterHooks(to, history[history.length - 2] ?? null);
             return true;
         }
         catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ktjs/router",
-  "version": "0.7.3",
+  "version": "0.14.0",
   "description": "Router for kt.js - client-side routing with navigation guards",
   "type": "module",
   "module": "./dist/index.mjs",
@@ -31,7 +31,7 @@
     "directory": "packages/router"
   },
   "dependencies": {
-    "@ktjs/core": "0.7.3"
+    "@ktjs/core": "0.13.0"
   },
   "scripts": {
     "build": "rollup -c rollup.config.mjs",