@webstir-io/webstir 0.1.2 → 0.1.4

package/assets/features/search/search.ts

@@ -313,15 +313,6 @@ function ensureBackdrop(root: HTMLElement): void {
         return;
     }
 
-    const legacy = root.querySelector<HTMLElement>('.webstir-search__backdrop');
-    if (legacy) {
-        legacy.classList.add('ws-drawer-backdrop');
-        legacy.classList.remove('webstir-search__backdrop');
-        legacy.setAttribute('data-webstir-search-close', '');
-        legacy.setAttribute('aria-hidden', 'true');
-        return;
-    }
-
     const created = document.createElement('div');
     created.className = 'ws-drawer-backdrop';
     created.setAttribute('data-webstir-search-close', '');

package/assets/templates/api/src/backend/index.ts

@@ -1,4 +1,6 @@
 import crypto from 'node:crypto';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 import {
   createDefaultBunBackendBootstrap,
@@ -54,19 +56,8 @@ export async function start(): Promise<void> {
   );
 }
 
-const isMain = (() => {
-  try {
-    const argv1 = process.argv?.[1];
-    if (!argv1) return false;
-    const here = new URL(import.meta.url);
-    const run = new URL(`file://${argv1}`);
-    return here.pathname === run.pathname;
-  } catch {
-    return false;
-  }
-})();
-
-if (isMain) {
+const entrypointPath = process.argv[1];
+if (entrypointPath && path.resolve(entrypointPath) === fileURLToPath(import.meta.url)) {
   start().catch((err) => {
     console.error(err);
     process.exitCode = 1;

package/assets/templates/full/src/backend/index.ts

@@ -1,4 +1,6 @@
 import crypto from 'node:crypto';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 import {
   createDefaultBunBackendBootstrap,
@@ -54,19 +56,8 @@ export async function start(): Promise<void> {
   );
 }
 
-const isMain = (() => {
-  try {
-    const argv1 = process.argv?.[1];
-    if (!argv1) return false;
-    const here = new URL(import.meta.url);
-    const run = new URL(`file://${argv1}`);
-    return here.pathname === run.pathname;
-  } catch {
-    return false;
-  }
-})();
-
-if (isMain) {
+const entrypointPath = process.argv[1];
+if (entrypointPath && path.resolve(entrypointPath) === fileURLToPath(import.meta.url)) {
   start().catch((err) => {
     console.error(err);
     process.exitCode = 1;

package/assets/templates/full/src/backend/module.ts

@@ -4,8 +4,8 @@ import { fileURLToPath } from 'node:url';
 
 import type { RouteHandlerResult } from '@webstir-io/webstir-backend/runtime/bun';
 
-const ROOT_PATH = '/';
-const DEMO_PATH = '/demo/progressive-enhancement';
+const ROOT_PATH = '/api';
+const DEMO_PATH = '/api/demo/progressive-enhancement';
 const FRAGMENT_TARGET = 'greeting-preview';
 const SESSION_PANEL_TARGET = 'session-panel';
 const SESSION_COOKIE_NAME = 'webstir_demo_session';

package/assets/templates/full/src/backend/tests/progressive-enhancement.test.ts

@@ -2,7 +2,7 @@ import { assert, test } from '@webstir-io/webstir-testing';
 
 test('progressive enhancement demo page renders a form shell', async () => {
   const ctx = requireBackendTestContext();
-  const response = await ctx.request('/demo/progressive-enhancement');
+  const response = await ctx.request('/api/demo/progressive-enhancement');
   const html = await response.text();
 
   assert.equal(response.status, 200);
@@ -23,7 +23,7 @@ test('progressive enhancement demo page renders a form shell', async () => {
 
 test('native form submissions redirect back to the document route', async () => {
   const ctx = requireBackendTestContext();
-  const response = await ctx.request('/demo/progressive-enhancement', {
+  const response = await ctx.request('/api/demo/progressive-enhancement', {
     method: 'POST',
     headers: {
       'content-type': 'application/x-www-form-urlencoded'
@@ -35,7 +35,7 @@ test('native form submissions redirect back to the document route', async () =>
   assert.equal(response.status, 303);
   assert.equal(
     response.headers.get('location'),
-    '/demo/progressive-enhancement?source=redirect&name=Native%20Flow'
+    '/api/demo/progressive-enhancement?source=redirect&name=Native%20Flow'
   );
   assert.equal(response.headers.get('x-webstir-fragment-target'), null);
   assert.equal(response.headers.get('content-type'), null);
@@ -43,7 +43,7 @@ test('native form submissions redirect back to the document route', async () =>
 
 test('redirected document route preserves the no-javascript form flow', async () => {
   const ctx = requireBackendTestContext();
-  const response = await ctx.request('/demo/progressive-enhancement?source=redirect&name=Native%20Flow');
+  const response = await ctx.request('/api/demo/progressive-enhancement?source=redirect&name=Native%20Flow');
   const html = await response.text();
 
   assert.equal(response.status, 200);
@@ -55,7 +55,7 @@ test('redirected document route preserves the no-javascript form flow', async ()
 
 test('enhanced form submissions return fragment metadata and html', async () => {
   const ctx = requireBackendTestContext();
-  const response = await ctx.request('/demo/progressive-enhancement', {
+  const response = await ctx.request('/api/demo/progressive-enhancement', {
     method: 'POST',
     headers: {
       'content-type': 'application/x-www-form-urlencoded',
@@ -80,7 +80,7 @@ test('enhanced form submissions return fragment metadata and html', async () =>
 
 test('native session sign-in redirects and sets a session cookie', async () => {
   const ctx = requireBackendTestContext();
-  const response = await ctx.request('/demo/progressive-enhancement/session/sign-in', {
+  const response = await ctx.request('/api/demo/progressive-enhancement/session/sign-in', {
     method: 'POST',
     headers: {
       'content-type': 'application/x-www-form-urlencoded'
@@ -90,13 +90,13 @@ test('native session sign-in redirects and sets a session cookie', async () => {
   });
 
   assert.equal(response.status, 303);
-  assert.equal(response.headers.get('location'), '/demo/progressive-enhancement?session=signed-in');
+  assert.equal(response.headers.get('location'), '/api/demo/progressive-enhancement?session=signed-in');
   assert.isTrue(String(response.headers.get('set-cookie')).includes('webstir_demo_session=Casey%20Proxy'));
 });
 
 test('enhanced session sign-in returns a fragment and persists on the next document request', async () => {
   const ctx = requireBackendTestContext();
-  const response = await ctx.request('/demo/progressive-enhancement/session/sign-in', {
+  const response = await ctx.request('/api/demo/progressive-enhancement/session/sign-in', {
     method: 'POST',
     headers: {
       'content-type': 'application/x-www-form-urlencoded',
@@ -115,7 +115,7 @@ test('enhanced session sign-in returns a fragment and persists on the next docum
   assert.isTrue(html.includes('Signed in as <strong>Casey Proxy</strong>'));
   assert.isTrue(html.includes('id="demo-sign-out"'));
 
-  const documentResponse = await ctx.request('/demo/progressive-enhancement', {
+  const documentResponse = await ctx.request('/api/demo/progressive-enhancement', {
     headers: {
       cookie
     }
@@ -129,7 +129,7 @@ test('enhanced session sign-in returns a fragment and persists on the next docum
 
 test('enhanced session sign-out returns a fragment and clears the session cookie', async () => {
   const ctx = requireBackendTestContext();
-  const signInResponse = await ctx.request('/demo/progressive-enhancement/session/sign-in', {
+  const signInResponse = await ctx.request('/api/demo/progressive-enhancement/session/sign-in', {
     method: 'POST',
     headers: {
       'content-type': 'application/x-www-form-urlencoded',
@@ -139,7 +139,7 @@ test('enhanced session sign-out returns a fragment and clears the session cookie
   });
   const cookie = requireCookie(signInResponse.headers.get('set-cookie'));
 
-  const response = await ctx.request('/demo/progressive-enhancement/session/sign-out', {
+  const response = await ctx.request('/api/demo/progressive-enhancement/session/sign-out', {
     method: 'POST',
     headers: {
       'x-webstir-client-nav': '1',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstir-io/webstir",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "bin": {
     "webstir": "src/cli.ts"
@@ -46,8 +46,8 @@
     "@modelcontextprotocol/sdk": "1.28.0",
     "@webstir-io/module-contract": "^0.1.16",
     "@webstir-io/testing-contract": "^0.1.8",
-    "@webstir-io/webstir-backend": "^0.1.16",
-    "@webstir-io/webstir-frontend": "^0.1.41",
+    "@webstir-io/webstir-backend": "^0.1.17",
+    "@webstir-io/webstir-frontend": "^0.1.42",
     "@webstir-io/webstir-testing": "^0.1.6",
     "typescript": "^5.7.2",
     "zod": "^3.23.8"

package/scripts/run-tests.mjs

@@ -17,6 +17,13 @@ const watchBrowserTestFiles = [
 const publishModeFilter = 'publish mode';
 const watchModeFilter = 'watch mode';
 
+function buildSingleFileTestSteps(labelPrefix, files) {
+  return files.map((file) => ({
+    label: `${labelPrefix}: ${path.basename(file)}`,
+    args: ['test', '--bail=1', file],
+  }));
+}
+
 export function listCoreTestFiles() {
   return readdirSync(testsDir)
     .filter((file) => file.endsWith('.ts'))
@@ -27,26 +34,23 @@ export function listCoreTestFiles() {
 }
 
 export function buildTestPlan(mode) {
-  const coreTests = {
-    label: 'core orchestrator tests',
-    args: ['test', '--bail=1', ...listCoreTestFiles()],
-  };
+  const coreTests = buildSingleFileTestSteps('core orchestrator test', listCoreTestFiles());
   const publishBrowserTests = {
     label: 'browser publish proofs',
     args: ['test', '--bail=1', browserTestFile, '-t', publishModeFilter],
   };
-  const integrationWatchBrowserTests = {
-    label: 'browser watch integration proofs',
-    args: ['test', '--bail=1', ...watchBrowserTestFiles],
-  };
+  const integrationWatchBrowserTests = buildSingleFileTestSteps(
+    'browser watch integration proof',
+    watchBrowserTestFiles,
+  );
   const watchBrowserTests = {
     label: 'browser watch proofs',
     args: ['test', '--bail=1', browserTestFile, '-t', watchModeFilter],
   };
   const requiredPlan = [
-    coreTests,
+    ...coreTests,
     publishBrowserTests,
-    integrationWatchBrowserTests,
+    ...integrationWatchBrowserTests,
     watchBrowserTests,
   ];
 
@@ -56,7 +60,7 @@ export function buildTestPlan(mode) {
     case 'publish-browser':
       return [publishBrowserTests];
     case 'watch-browser':
-      return [integrationWatchBrowserTests, watchBrowserTests];
+      return [...integrationWatchBrowserTests, watchBrowserTests];
     case 'all':
     case 'with-watch-browser':
       return requiredPlan;

package/src/add-backend.ts

@@ -1,13 +1,14 @@
-import type {
-  AddJobOptions,
-  AddRouteOptions,
-  UpdateRouteContractOptions as BackendUpdateRouteContractOptions,
+import {
+  runAddJob as runBackendAddJob,
+  runAddRoute as runBackendAddRoute,
+  runUpdateRouteContract as runBackendUpdateRouteContract,
+  type AddJobOptions,
+  type AddRouteOptions,
+  type UpdateRouteContractOptions as BackendUpdateRouteContractOptions,
 } from '@webstir-io/webstir-backend';
 
 import type { AddCommandResult } from './add.ts';
 
-import { monorepoRoot } from './paths.ts';
-
 export interface RunAddBackendOptions {
   readonly workspaceRoot: string;
   readonly rawArgs: readonly string[];
@@ -27,8 +28,7 @@ export async function runAddRouteCommand(options: RunAddBackendOptions): Promise
 export async function runAddRouteScaffold(
   options: AddRouteScaffoldOptions,
 ): Promise<AddCommandResult> {
-  const backendAdd = await loadBackendAddModule();
-  const result = await backendAdd.runAddRoute(options);
+  const result = await runBackendAddRoute(options);
 
   return {
     workspaceRoot: options.workspaceRoot,
@@ -46,8 +46,7 @@ export async function runAddJobCommand(options: RunAddBackendOptions): Promise<A
 }
 
 export async function runAddJobScaffold(options: AddJobScaffoldOptions): Promise<AddCommandResult> {
-  const backendAdd = await loadBackendAddModule();
-  const result = await backendAdd.runAddJob(options);
+  const result = await runBackendAddJob(options);
 
   return {
     workspaceRoot: options.workspaceRoot,
@@ -60,8 +59,7 @@ export async function runAddJobScaffold(options: AddJobScaffoldOptions): Promise
 export async function runUpdateRouteContract(
   options: UpdateRouteContractOptions,
 ): Promise<AddCommandResult> {
-  const backendAdd = await loadBackendAddModule();
-  const result = await backendAdd.runUpdateRouteContract(options);
+  const result = await runBackendUpdateRouteContract(options);
 
   return {
     workspaceRoot: options.workspaceRoot,
@@ -167,66 +165,6 @@ interface ParsedBackendCommandArgs {
   readonly booleans: ReadonlySet<string>;
 }
 
-interface BackendAddResult {
-  readonly target: string;
-  readonly changes: readonly string[];
-}
-
-interface BackendAddModule {
-  readonly runAddRoute: (options: AddRouteOptions) => Promise<BackendAddResult>;
-  readonly runAddJob: (options: AddJobOptions) => Promise<BackendAddResult>;
-  readonly runUpdateRouteContract: (
-    options: UpdateRouteContractOptions,
-  ) => Promise<BackendAddResult>;
-}
-
-let backendAddModulePromise: Promise<BackendAddModule> | null = null;
-
-async function loadBackendAddModule(): Promise<BackendAddModule> {
-  if (backendAddModulePromise) {
-    return await backendAddModulePromise;
-  }
-
-  backendAddModulePromise = import('@webstir-io/webstir-backend').then(async (module) => {
-    if (
-      typeof module.runAddRoute === 'function' &&
-      typeof module.runAddJob === 'function' &&
-      typeof module.runUpdateRouteContract === 'function'
-    ) {
-      return module as BackendAddModule;
-    }
-
-    if (monorepoRoot) {
-      throw new Error(
-        'Installed @webstir-io/webstir-backend package does not export runAddRoute/runAddJob/runUpdateRouteContract.',
-      );
-    }
-
-    const compat = await import('./add-backend-compat.ts');
-    return {
-      async runAddRoute(options: AddRouteOptions): Promise<BackendAddResult> {
-        return await compat.runAddRoute(options);
-      },
-      async runAddJob(options: AddJobOptions): Promise<BackendAddResult> {
-        return await compat.runAddJob({
-          workspaceRoot: options.workspaceRoot,
-          name: options.name,
-          schedule: options.schedule,
-          description: options.description,
-          ...(options.priority !== undefined ? { priority: String(options.priority) } : {}),
-        });
-      },
-      async runUpdateRouteContract(): Promise<BackendAddResult> {
-        throw new Error(
-          'Installed @webstir-io/webstir-backend package does not export runUpdateRouteContract.',
-        );
-      },
-    };
-  });
-
-  return await backendAddModulePromise;
-}
-
 function parseBackendCommandArgs(
   rawArgs: readonly string[],
   spec: ParseSpec,

package/src/bun-spa-routes.ts

@@ -57,15 +57,10 @@ export function createBunFrontendFetchHandler(options: BunFrontendFetchHandlerOp
 }
 
 function getApiProxyPath(pathname: string): string | null {
-  if (pathname === '/api') {
-    return '/';
+  const normalizedPath = pathname.startsWith('/') ? path.posix.normalize(pathname) : null;
+  if (normalizedPath === '/api' || normalizedPath?.startsWith('/api/')) {
+    return normalizedPath;
   }
-
-  if (pathname.startsWith('/api/')) {
-    const normalizedPath = path.posix.normalize(pathname.slice('/api'.length));
-    return normalizedPath.startsWith('/') ? normalizedPath : `/${normalizedPath}`;
-  }
-
   return null;
 }
 
@@ -132,7 +127,7 @@ function rewriteProxyLocation(value: string, targetUrl: URL): string {
   }
 
   if (trimmed.startsWith('/')) {
-    return prefixApiMount(trimmed);
+    return trimmed;
   }
 
   try {
@@ -140,20 +135,12 @@ function rewriteProxyLocation(value: string, targetUrl: URL): string {
     if (resolved.origin !== targetUrl.origin) {
       return value;
     }
-    return prefixApiMount(`${resolved.pathname}${resolved.search}${resolved.hash}`);
+    return `${resolved.pathname}${resolved.search}${resolved.hash}`;
   } catch {
     return value;
   }
 }
 
-function prefixApiMount(pathname: string): string {
-  if (pathname === '/api' || pathname.startsWith('/api/')) {
-    return pathname;
-  }
-
-  return pathname === '/' ? '/api' : `/api${pathname}`;
-}
-
 function methodAllowsBody(method: string): boolean {
   return method !== 'GET' && method !== 'HEAD';
 }

package/src/dev-server.ts

@@ -303,15 +303,10 @@ export function getStaticCandidatePaths(pathname: string): readonly string[] {
 }
 
 export function getApiProxyPath(pathname: string): string | null {
-  if (pathname === '/api') {
-    return '/';
+  const normalizedPath = pathname.startsWith('/') ? path.posix.normalize(pathname) : null;
+  if (normalizedPath === '/api' || normalizedPath?.startsWith('/api/')) {
+    return normalizedPath;
   }
-
-  if (pathname.startsWith('/api/')) {
-    const normalizedPath = path.posix.normalize(pathname.slice('/api'.length));
-    return normalizedPath.startsWith('/') ? normalizedPath : `/${normalizedPath}`;
-  }
-
   return null;
 }
 
@@ -357,7 +352,7 @@ function rewriteProxyLocation(value: string, targetUrl: URL): string {
   }
 
   if (trimmed.startsWith('/')) {
-    return prefixApiMount(trimmed);
+    return trimmed;
   }
 
   try {
@@ -365,20 +360,12 @@ function rewriteProxyLocation(value: string, targetUrl: URL): string {
     if (resolved.origin !== targetUrl.origin) {
       return value;
     }
-    return prefixApiMount(`${resolved.pathname}${resolved.search}${resolved.hash}`);
+    return `${resolved.pathname}${resolved.search}${resolved.hash}`;
   } catch {
     return value;
   }
 }
 
-function prefixApiMount(pathname: string): string {
-  if (pathname === '/api' || pathname.startsWith('/api/')) {
-    return pathname;
-  }
-
-  return pathname === '/' ? '/api' : `/api${pathname}`;
-}
-
 async function resolveStaticFile(
   buildRoot: string,
   relativePaths: readonly string[],
@@ -434,7 +421,7 @@ function setCacheHeaders(headers: Headers, relativePath: string): void {
   }
 
   const extension = path.extname(relativePath).toLowerCase();
-  if (extension === '.html' || extension === '') {
+  if (extension === '.html' || extension === '' || extension === '.json') {
     setNoCacheHeaders(headers);
     return;
   }

package/src/execute.ts

@@ -10,6 +10,7 @@ import type {
   CommandMode,
 } from './types.ts';
 import { readWorkspaceDescriptor } from './workspace.ts';
+import { assertNoActiveWorkspaceWatch } from './workspace-lock.ts';
 
 export interface RunCommandOptions {
   readonly workspaceRoot: string;
@@ -22,6 +23,7 @@ export async function runCommand(
   options: RunCommandOptions,
 ): Promise<CommandExecutionResult> {
   const workspace = await readWorkspaceDescriptor(options.workspaceRoot);
+  await assertNoActiveWorkspaceWatch(workspace.root, mode);
   const providerLoader = options.loadProvider ?? loadProvider;
   const targets = [];
 

package/src/watch.ts

@@ -4,6 +4,7 @@ import { runFrontendWatch } from './frontend-watch.ts';
 import { runFullWatch } from './full-watch.ts';
 import type { WorkspaceDescriptor } from './types.ts';
 import { readWorkspaceDescriptor } from './workspace.ts';
+import { acquireWorkspaceWatchLock } from './workspace-lock.ts';
 
 interface WatchStream {
   write(message: string): void;
@@ -42,24 +43,30 @@ const defaultIo: WatchIo = {
 
 export async function runWatch(options: RunWatchOptions): Promise<void> {
   const io = options.io ?? defaultIo;
-  await materializeRepoLocalWorkspaceDependencies(options.workspaceRoot);
   const workspace = await readWorkspaceDescriptor(options.workspaceRoot);
+  const watchLock = await acquireWorkspaceWatchLock(workspace.root);
 
-  switch (workspace.mode) {
-    case 'spa':
-      await runFrontendWatch(workspace, options, io);
-      return;
-    case 'ssg':
-      await runFrontendWatch(workspace, options, io);
-      return;
-    case 'api':
-      await runApiWatch(workspace, options, io);
-      return;
-    case 'full':
-      await runFullWatch(workspace, options, io);
-      return;
-    default:
-      throwUnsupportedWatchMode(workspace);
+  try {
+    await materializeRepoLocalWorkspaceDependencies(options.workspaceRoot);
+
+    switch (workspace.mode) {
+      case 'spa':
+        await runFrontendWatch(workspace, options, io);
+        return;
+      case 'ssg':
+        await runFrontendWatch(workspace, options, io);
+        return;
+      case 'api':
+        await runApiWatch(workspace, options, io);
+        return;
+      case 'full':
+        await runFullWatch(workspace, options, io);
+        return;
+      default:
+        throwUnsupportedWatchMode(workspace);
+    }
+  } finally {
+    await watchLock.release();
   }
 }