Move escapeRegexPath to utils.ts, normalize all paths in resolveApiRoutes, remove unused import

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

packages/foundation/types/src/api.ts

@@ -561,12 +561,15 @@ export const DEFAULT_API_ROUTES: ResolvedApiRouteConfig = {
 
 /**
  * Resolve API route configuration by merging user config with defaults
+ * All paths are normalized to start with '/'
  */
 export function resolveApiRoutes(config?: ApiRouteConfig): ResolvedApiRouteConfig {
+    const normalizePath = (path: string): string => path.startsWith('/') ? path : `/${path}`;
+    
     return {
-        rpc: config?.rpc ?? DEFAULT_API_ROUTES.rpc,
-        data: config?.data ?? DEFAULT_API_ROUTES.data,
-        metadata: config?.metadata ?? DEFAULT_API_ROUTES.metadata,
-        files: config?.files ?? DEFAULT_API_ROUTES.files
+        rpc: normalizePath(config?.rpc ?? DEFAULT_API_ROUTES.rpc),
+        data: normalizePath(config?.data ?? DEFAULT_API_ROUTES.data),
+        metadata: normalizePath(config?.metadata ?? DEFAULT_API_ROUTES.metadata),
+        files: normalizePath(config?.files ?? DEFAULT_API_ROUTES.files)
     };
 }

packages/runtime/server/src/adapters/node.ts

@@ -5,7 +5,7 @@ import { IncomingMessage, ServerResponse } from 'http';
 import { generateOpenAPI } from '../openapi';
 import { createFileUploadHandler, createBatchFileUploadHandler, createFileDownloadHandler } from '../file-handler';
 import { LocalFileStorage } from '../storage';
-import { escapeRegexPath } from '../types';
+import { escapeRegexPath } from '../utils';
 
 /**
  * Options for createNodeHandler
@@ -25,8 +25,7 @@ export function createNodeHandler(app: IObjectQL, options?: NodeHandlerOptions)
     const routes = resolveApiRoutes(options?.routes);
 
     // Initialize file storage
-    const filesPath = routes.files.startsWith('/') ? routes.files : `/${routes.files}`;
-    const defaultBaseUrl = process.env.OBJECTQL_BASE_URL || `http://localhost:3000${filesPath}`;
+    const defaultBaseUrl = process.env.OBJECTQL_BASE_URL || `http://localhost:3000${routes.files}`;
     const fileStorage = options?.fileStorage || new LocalFileStorage({
         baseDir: process.env.OBJECTQL_UPLOAD_DIR || './uploads',
         baseUrl: defaultBaseUrl

packages/runtime/server/src/adapters/rest.ts

@@ -2,7 +2,7 @@ import { IObjectQL, ApiRouteConfig, resolveApiRoutes } from '@objectql/types';
 import { ObjectQLServer } from '../server';
 import { ObjectQLRequest, ErrorCode } from '../types';
 import { IncomingMessage, ServerResponse } from 'http';
-import { escapeRegexPath } from '../types';
+import { escapeRegexPath } from '../utils';
 
 /**
  * Parse query string parameters

packages/runtime/server/src/index.ts

@@ -1,4 +1,5 @@
 export * from './types';
+export * from './utils';
 export * from './openapi';
 export * from './server';
 export * from './metadata';

packages/runtime/server/src/metadata.ts

@@ -1,7 +1,7 @@
 import { IObjectQL, ApiRouteConfig, resolveApiRoutes } from '@objectql/types';
 import { IncomingMessage, ServerResponse } from 'http';
 import { ErrorCode } from './types';
-import { escapeRegexPath } from './types';
+import { escapeRegexPath } from './utils';
 
 function readBody(req: IncomingMessage): Promise<any> {
     return new Promise((resolve, reject) => {

packages/runtime/server/src/openapi.ts

@@ -1,4 +1,4 @@
-import { IObjectQL, ObjectConfig, FieldType, FieldConfig, ApiRouteConfig, resolveApiRoutes } from '@objectql/types';
+import { IObjectQL, ObjectConfig, FieldConfig, ApiRouteConfig, resolveApiRoutes } from '@objectql/types';
 
 interface OpenAPISchema {
     openapi: string;

packages/runtime/server/src/types.ts

@@ -171,16 +171,3 @@ export interface FileStorageOptions {
     /** User ID who uploaded the file */
     userId?: string;
 }
-
-/**
- * Utility functions for route handling
- */
-
-/**
- * Escapes special regex characters in a path string for use in RegExp
- * @param path - The path string to escape
- * @returns Escaped path string safe for use in RegExp
- */
-export function escapeRegexPath(path: string): string {
-    return path.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}

packages/runtime/server/src/utils.ts

@@ -0,0 +1,21 @@
+/**
+ * Utility functions for server operations
+ */
+
+/**
+ * Escapes special regex characters in a path string for use in RegExp
+ * @param path - The path string to escape
+ * @returns Escaped path string safe for use in RegExp
+ */
+export function escapeRegexPath(path: string): string {
+    return path.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+/**
+ * Normalizes a path to ensure it starts with a forward slash
+ * @param path - The path string to normalize
+ * @returns Normalized path string starting with '/'
+ */
+export function normalizePath(path: string): string {
+    return path.startsWith('/') ? path : `/${path}`;
+}