@jxsuite/server 4.4.5 → 4.5.1

package/src/types.ts

@@ -1,3 +1,5 @@
+import type { JsonValue } from "@jxsuite/schema/types";
+
 export interface BuildEntry {
   entrypoints: string[];
   outdir: string;
@@ -16,11 +18,12 @@ export interface ClassJsonField {
   access?: string;
   scope?: string;
   identifier?: string;
-  initializer?: unknown;
-  default?: unknown;
-  type?: Record<string, unknown>;
+  initializer?: JsonValue;
+  default?: JsonValue;
+  /** A JSON Schema fragment; only an object (or array) form is merged into the studio schema. */
+  type?: JsonValue;
   description?: string;
-  examples?: unknown[];
+  examples?: JsonValue[];
 }
 
 export interface ClassJsonMethod {
@@ -31,21 +34,28 @@ export interface ClassJsonMethod {
   getter?: { body: string };
   setter?: { parameters?: ClassJsonParam[]; body: string };
   parameters?: ClassJsonParam[];
-  returns?: Record<string, unknown>;
+  returns?: JsonValue;
+  /** Where a format-extension capability method may run (`compiler`, `server`, `client`). */
+  timing?: string[];
 }
 
 export interface ClassJsonParameterDef {
   identifier?: string;
-  type?: Record<string, unknown>;
+  /** A JSON Schema fragment; only an object (or array) form is merged into the studio schema. */
+  type?: JsonValue;
   format?: string;
   description?: string;
-  examples?: unknown[];
+  examples?: JsonValue[];
 }
 
 export interface ClassJsonDef {
   title?: string;
   description?: string;
   $implementation?: string;
+  /** A format extension's format block, surfaced to the studio verbatim. */
+  format?: JsonValue;
+  /** Studio presentation hints, surfaced verbatim. */
+  $studio?: JsonValue;
   extends?: { $ref?: string };
   $defs?: {
     fields?: Record<string, ClassJsonField>;

package/src/watch.ts

@@ -1,7 +1,8 @@
 /** Watch.js — File watcher + SSE live reload */
 
-import { watch as chokidarWatch } from "chokidar";
+import { watch } from "chokidar";
 import { relative } from "node:path";
+import { errorMessage } from "@jxsuite/schema/parse";
 import { rebuild } from "./build.ts";
 import { coalesceFsEvents, toFsEvent } from "./refactor/fs-events.ts";
 import { createWatchIgnore } from "./watch-policy.ts";
@@ -109,7 +110,7 @@ export function createWatcher(
   let fsTimer: ReturnType<typeof setTimeout> | null = null;
   let fsBuffer: FsEventPayload[] = [];
   const fsDebounceMs = 40;
-  const watcher = chokidarWatch(root, {
+  const watcher = watch(root, {
     awaitWriteFinish: {
       pollInterval: 10,
       stabilityThreshold: debounceMs,
@@ -152,7 +153,7 @@ export function createWatcher(
         try {
           await preReload(filename);
         } catch (error) {
-          console.error(`[watch] preReload failed: ${(error as Error).message}`);
+          console.error(`[watch] preReload failed: ${errorMessage(error)}`);
         }
       }
       if (builds.length > 0) {
@@ -174,11 +175,12 @@ export function createWatcher(
 
   // Gracefully handle watch errors (e.g. EINVAL on transient Bun test dirs).
   watcher.on("error", (err) => {
-    const error = err as Error;
-    if (error.message?.includes("EINVAL")) {
+    // Chokidar forwards the fs watcher's own errors, which are Error instances carrying a message.
+    const message = err instanceof Error ? err.message : undefined;
+    if (message?.includes("EINVAL")) {
       return;
     }
-    console.error("[watch] chokidar error:", error.message ?? error);
+    console.error("[watch] chokidar error:", message ?? err);
   });
 
   return { broadcast, broadcastEvent, handleSSE, watcher };