@vyriy/static 0.5.4 → 0.5.5

package/README.md

@@ -20,7 +20,7 @@ vyriy-static public
 vyriy-static --port 3000 dist
 ```
 
-When no directory is provided to the CLI, it serves the current directory.
+When no directory is provided to the CLI, it tries `dist`, `build`, `public`, `out`, and then the current directory.
 
 CLI flags:
 
@@ -45,7 +45,10 @@ import { createRouter } from '@vyriy/router';
 export const assets = useStatic();
 export const app = useSpa({ directory: 'dist', index: 'index.html' });
 
-export const router = withStatic(createRouter(), { directory: 'dist' }).static('/');
+export const router = withStatic(createRouter())
+  .get('/api', () => ({ body: JSON.stringify({ ok: true }) }))
+  .static('/dist', { directory: 'dist' })
+  .static('/', { directory: 'public' });
 export const spaRouter = withSpa(createRouter(), 'dist');
 
 const code = await staticServer({ directory: 'dist' });
@@ -53,7 +56,8 @@ const code = await staticServer({ directory: 'dist' });
 
 - `useStatic({ directory, index, error })` serves files from a directory.
 - `useSpa(options)` serves static files and falls back to the configured index file for missing `GET` and `HEAD` paths.
-- `withStatic(router, options).static(path)` adds prefix-based static mounts.
+- `withStatic(router).static(path, options)` adds prefix-based static mounts.
+- `withStatic(router, options).static(path)` keeps a shared default for static mounts.
 - `withSpa(router, directoryOrOptions)` adds static-first SPA fallback behavior.
 
 Defaults are `directory: 'dist'`, `index: 'index.html'`, and `error: '404.html'`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyriy/static",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Static file and SPA serving helpers for Vyriy servers.",
   "type": "module",
   "bin": {
@@ -8,9 +8,9 @@
     "vyriy-static": "./bin/index.js"
   },
   "dependencies": {
-    "@vyriy/handler": "0.5.4",
-    "@vyriy/router": "0.5.4",
-    "@vyriy/server": "0.5.4"
+    "@vyriy/handler": "0.5.5",
+    "@vyriy/router": "0.5.5",
+    "@vyriy/server": "0.5.5"
   },
   "agents": "./AGENTS.md",
   "license": "MIT",

package/server.d.ts

@@ -3,7 +3,7 @@ export type StaticBinCommand = {
     readonly type: 'help' | 'version';
 } | {
     readonly type: 'serve';
-    readonly directory: string;
+    readonly directory?: string;
     readonly port?: string;
 };
 export type RunStaticCli = (args?: readonly string[], command?: string, alias?: false | string) => Promise<void>;

package/server.js

@@ -29,7 +29,7 @@ export const createStaticHelpText = (command = 'vyriy-static', alias = 'vs') =>
     return `Vyriy Static Server
 
 Usage:
-  ${command} [directory]        Serve a static directory (defaults to .)
+  ${command} [directory]        Serve a static directory (defaults to dist when it exists)
   ${command} --port 3000 dist   Serve a directory on a specific port
 ${aliasText}\
   ${command} --help, -h         Show help
@@ -52,7 +52,7 @@ export const parseStaticBinArgs = (args) => {
     }
     return {
         type: 'serve',
-        directory: args.find((arg, index) => !arg.startsWith('-') && !isOptionValue(args, index)) ?? '.',
+        directory: args.find((arg, index) => !arg.startsWith('-') && !isOptionValue(args, index)),
         port: getOptionValue(args, '--port', '-p'),
     };
 };

package/types.d.ts

@@ -5,10 +5,11 @@ export type StaticOptions = {
     readonly index?: string;
     readonly error?: string;
 };
+export type StaticMountOptions = StaticOptions | string;
 export type StaticHandler = Handler<ApiEvent, ApiResult>;
 export type StaticServer = (options?: StaticOptions) => Promise<number>;
 export type StaticRouterApi = Omit<RouterApi, 'delete' | 'fallback' | 'get' | 'patch' | 'post' | 'put'> & {
-    static(path: string): StaticRouterApi;
+    static(path: string, options?: StaticMountOptions): StaticRouterApi;
 } & {
     [Method in Extract<keyof RouterApi, 'delete' | 'fallback' | 'get' | 'patch' | 'post' | 'put'>]: (...args: Parameters<RouterApi[Method]>) => StaticRouterApi;
 };

package/with-spa.js

@@ -17,6 +17,9 @@ export const withSpa = (router, directoryOrOptions = {}) => {
             router.get(path, handler);
             return api;
         },
+        handle() {
+            return (event) => api.route(event);
+        },
         patch(path, handler) {
             router.patch(path, handler);
             return api;

package/with-static.d.ts

@@ -1,3 +1,3 @@
-import type { StaticOptions, StaticRouterApi } from './types.js';
+import type { StaticMountOptions, StaticRouterApi } from './types.js';
 import type { RouterApi } from '@vyriy/router';
-export declare const withStatic: (router: RouterApi, options?: StaticOptions) => StaticRouterApi;
+export declare const withStatic: (router: RouterApi, options?: StaticMountOptions) => StaticRouterApi;

package/with-static.js

@@ -20,10 +20,10 @@ const toStaticPath = (mount, requestPath) => {
     return undefined;
 };
 const isStaticMethod = (method) => method === 'GET' || method === 'HEAD';
-export const withStatic = (router, options = {}) => {
+const toStaticOptions = (options) => typeof options === 'string' ? { directory: options } : (options ?? {});
+export const withStatic = (router, options) => {
     const mounts = [];
     const createStaticHandler = useStatic;
-    const staticHandler = createStaticHandler(options);
     const api = {
         delete(path, handler) {
             router.delete(path, handler);
@@ -37,6 +37,9 @@ export const withStatic = (router, options = {}) => {
             router.get(path, handler);
             return api;
         },
+        handle() {
+            return (event) => api.route(event);
+        },
         patch(path, handler) {
             router.patch(path, handler);
             return api;
@@ -55,11 +58,11 @@ export const withStatic = (router, options = {}) => {
                 return result;
             }
             for (const mount of mounts) {
-                const staticPath = toStaticPath(mount, event.path);
+                const staticPath = toStaticPath(mount.path, event.path);
                 if (staticPath === undefined) {
                     continue;
                 }
-                const staticResult = await staticHandler({
+                const staticResult = await mount.handler({
                     ...event,
                     path: staticPath,
                 }, {});
@@ -67,8 +70,13 @@ export const withStatic = (router, options = {}) => {
             }
             return result;
         },
-        static(path) {
-            mounts.push(normalizeMount(path));
+        static(path, mountOptions) {
+            const staticOptions = mountOptions ?? options;
+            mounts.push({
+                handler: createStaticHandler(toStaticOptions(staticOptions)),
+                path: normalizeMount(path),
+            });
+            mounts.sort((left, right) => right.path.length - left.path.length);
             return api;
         },
     };