Address code review feedback - extract utility, fix types, improve test

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

Author: Copilot

packages/drivers/sdk/src/index.ts

@@ -179,7 +179,7 @@ export class DataApiClient implements IDataApiClient {
     private timeout: number;
     private dataPath: string;
 
-    constructor(config: DataApiClientConfig & { dataPath?: string }) {
+    constructor(config: DataApiClientConfig) {
         this.baseUrl = config.baseUrl.replace(/\/$/, '');
         this.token = config.token;
         this.headers = config.headers || {};
@@ -340,7 +340,7 @@ export class MetadataApiClient implements IMetadataApiClient {
     private timeout: number;
     private metadataPath: string;
 
-    constructor(config: MetadataApiClientConfig & { metadataPath?: string }) {
+    constructor(config: MetadataApiClientConfig) {
         this.baseUrl = config.baseUrl.replace(/\/$/, '');
         this.token = config.token;
         this.headers = config.headers || {};

packages/foundation/types/src/api.ts

@@ -367,6 +367,8 @@ export interface DataApiClientConfig {
     headers?: Record<string, string>;
     /** Request timeout in milliseconds */
     timeout?: number;
+    /** Custom data API path (defaults to /api/data) */
+    dataPath?: string;
 }
 
 /**
@@ -381,6 +383,8 @@ export interface MetadataApiClientConfig {
     headers?: Record<string, string>;
     /** Request timeout in milliseconds */
     timeout?: number;
+    /** Custom metadata API path (defaults to /api/metadata) */
+    metadataPath?: string;
 }
 
 /**

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

@@ -5,6 +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';
 
 /**
  * Options for createNodeHandler
@@ -116,7 +117,7 @@ export function createNodeHandler(app: IObjectQL, options?: NodeHandlerOptions)
 
         // 2. REST API: {dataPath}/:object and {dataPath}/:object/:id
         // Regex to match {dataPath}/objectName(/id)?
-        const escapedDataPath = routes.data.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const escapedDataPath = escapeRegexPath(routes.data);
         const restMatch = pathName.match(new RegExp(`^${escapedDataPath}/([^/]+)(?:/(.+))?$`));
 
         if (restMatch) {
@@ -204,7 +205,7 @@ export function createNodeHandler(app: IObjectQL, options?: NodeHandlerOptions)
         }
 
         // GET {filesPath}/:fileId - Download file
-        const escapedFilesPath = routes.files.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const escapedFilesPath = escapeRegexPath(routes.files);
         const fileMatch = pathName.match(new RegExp(`^${escapedFilesPath}/([^/]+)$`));
         if (fileMatch && method === 'GET') {
             const fileId = fileMatch[1];

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

@@ -2,6 +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';
 
 /**
  * Parse query string parameters
@@ -115,7 +116,7 @@ export function createRESTHandler(app: IObjectQL, options?: RESTHandlerOptions)
             const method = req.method || 'GET';
 
             // Parse URL: {dataPath}/:object or {dataPath}/:object/:id or {dataPath}/:object/bulk-*
-            const escapedPath = dataPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            const escapedPath = escapeRegexPath(dataPath);
             const match = url.match(new RegExp(`^${escapedPath}/([^/\\?]+)(?:/([^/\\?]+))?(\\?.*)?$`));
 
             if (!match) {

packages/runtime/server/src/metadata.ts

@@ -1,6 +1,7 @@
 import { IObjectQL, ApiRouteConfig, resolveApiRoutes } from '@objectql/types';
 import { IncomingMessage, ServerResponse } from 'http';
 import { ErrorCode } from './types';
+import { escapeRegexPath } from './types';
 
 function readBody(req: IncomingMessage): Promise<any> {
     return new Promise((resolve, reject) => {
@@ -70,7 +71,7 @@ export function createMetadataHandler(app: IObjectQL, options?: MetadataHandlerO
 
             // Generic List: {metadataPath}/:type
             // Also handles legacy {metadataPath} (defaults to objects)
-            const escapedPath = metadataPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            const escapedPath = escapeRegexPath(metadataPath);
             const listMatch = url.match(new RegExp(`^${escapedPath}/([^/]+)$`));
             const isRootMetadata = url === metadataPath;
 

packages/runtime/server/src/types.ts

@@ -171,3 +171,16 @@ 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/test/custom-routes.test.ts

@@ -66,7 +66,7 @@ class MockDriver implements Driver {
     }
 
     async createMany(objectName: string, data: any[]) {
-        return data.map(item => this.create(objectName, item));
+        return Promise.all(data.map(item => this.create(objectName, item)));
     }
 
     async updateMany(objectName: string, filters: any, data: any) {