@objectstack/objectql 2.0.3 → 2.0.4

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @objectstack/objectql@2.0.3 build /home/runner/work/spec/spec/packages/objectql
+> @objectstack/objectql@2.0.4 build /home/runner/work/spec/spec/packages/objectql
 > tsup --config ../../tsup.config.ts
 
 CLI Building entry: src/index.ts
@@ -10,13 +10,13 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.mjs     58.00 KB
-ESM dist/index.mjs.map 118.58 KB
-ESM ⚡️ Build success in 102ms
-CJS dist/index.js     59.42 KB
-CJS dist/index.js.map 119.30 KB
-CJS ⚡️ Build success in 102ms
+CJS dist/index.js     62.77 KB
+CJS dist/index.js.map 126.84 KB
+CJS ⚡️ Build success in 81ms
+ESM dist/index.mjs     61.35 KB
+ESM dist/index.mjs.map 126.13 KB
+ESM ⚡️ Build success in 94ms
 DTS Build start
-DTS ⚡️ Build success in 9838ms
-DTS dist/index.d.mts 68.20 KB
-DTS dist/index.d.ts  68.20 KB
+DTS ⚡️ Build success in 12002ms
+DTS dist/index.d.mts 66.66 KB
+DTS dist/index.d.ts  66.66 KB

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @objectstack/objectql
 
+## 2.0.4
+
+### Patch Changes
+
+- Patch release for maintenance and stability improvements
+- Updated dependencies
+  - @objectstack/spec@2.0.4
+  - @objectstack/core@2.0.4
+  - @objectstack/types@2.0.4
+
 ## 2.0.3
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1121,7 +1121,8 @@ declare class SchemaRegistry {
 
 declare class ObjectStackProtocolImplementation implements ObjectStackProtocol {
     private engine;
-    constructor(engine: IDataEngine);
+    private getServicesRegistry?;
+    constructor(engine: IDataEngine, getServicesRegistry?: () => Map<string, any>);
     getDiscovery(): Promise<{
         version: string;
         apiName: string;
@@ -1139,99 +1140,26 @@ declare class ObjectStackProtocolImplementation implements ObjectStackProtocol {
         endpoints: {
             data: string;
             metadata: string;
-            analytics: string;
-        };
-        services: {
-            metadata: {
-                enabled: boolean;
-                status: "degraded";
-                route: string;
-                provider: string;
-                message: string;
-            };
-            data: {
-                enabled: boolean;
-                status: "available";
-                route: string;
-                provider: string;
-            };
-            analytics: {
-                enabled: boolean;
-                status: "available";
-                route: string;
-                provider: string;
-            };
-            auth: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            automation: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            cache: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            queue: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            job: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            ui: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            workflow: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            realtime: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            notification: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            ai: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            i18n: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            graphql: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            'file-storage': {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            search: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
+            ui?: string | undefined;
+            auth?: string | undefined;
+            automation?: string | undefined;
+            storage?: string | undefined;
+            analytics?: string | undefined;
+            graphql?: string | undefined;
+            packages?: string | undefined;
+            workflow?: string | undefined;
+            realtime?: string | undefined;
+            notifications?: string | undefined;
+            ai?: string | undefined;
+            i18n?: string | undefined;
         };
+        services: Record<string, {
+            enabled: boolean;
+            status: "degraded" | "available" | "unavailable" | "stub";
+            route?: string | undefined;
+            provider?: string | undefined;
+            message?: string | undefined;
+        }>;
     }>;
     getMetaTypes(): Promise<{
         types: string[];
@@ -1736,6 +1664,11 @@ declare class ObjectQLPlugin implements Plugin {
     constructor(ql?: ObjectQL, hostContext?: Record<string, any>);
     init: (ctx: PluginContext) => Promise<void>;
     start: (ctx: PluginContext) => Promise<void>;
+    /**
+     * Load metadata from external metadata service into ObjectQL registry
+     * This enables ObjectQL to use file-based or remote metadata
+     */
+    private loadMetadataFromService;
 }
 
 export { DEFAULT_EXTENDER_PRIORITY, DEFAULT_OWNER_PRIORITY, type HookHandler, type ObjectContributor, ObjectQL, type ObjectQLHostContext, ObjectQLPlugin, ObjectStackProtocolImplementation, RESERVED_NAMESPACES, SchemaRegistry, computeFQN, parseFQN };

package/dist/index.d.ts

@@ -1121,7 +1121,8 @@ declare class SchemaRegistry {
 
 declare class ObjectStackProtocolImplementation implements ObjectStackProtocol {
     private engine;
-    constructor(engine: IDataEngine);
+    private getServicesRegistry?;
+    constructor(engine: IDataEngine, getServicesRegistry?: () => Map<string, any>);
     getDiscovery(): Promise<{
         version: string;
         apiName: string;
@@ -1139,99 +1140,26 @@ declare class ObjectStackProtocolImplementation implements ObjectStackProtocol {
         endpoints: {
             data: string;
             metadata: string;
-            analytics: string;
-        };
-        services: {
-            metadata: {
-                enabled: boolean;
-                status: "degraded";
-                route: string;
-                provider: string;
-                message: string;
-            };
-            data: {
-                enabled: boolean;
-                status: "available";
-                route: string;
-                provider: string;
-            };
-            analytics: {
-                enabled: boolean;
-                status: "available";
-                route: string;
-                provider: string;
-            };
-            auth: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            automation: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            cache: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            queue: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            job: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            ui: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            workflow: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            realtime: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            notification: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            ai: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            i18n: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            graphql: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            'file-storage': {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
-            search: {
-                enabled: boolean;
-                status: "unavailable";
-                message: string;
-            };
+            ui?: string | undefined;
+            auth?: string | undefined;
+            automation?: string | undefined;
+            storage?: string | undefined;
+            analytics?: string | undefined;
+            graphql?: string | undefined;
+            packages?: string | undefined;
+            workflow?: string | undefined;
+            realtime?: string | undefined;
+            notifications?: string | undefined;
+            ai?: string | undefined;
+            i18n?: string | undefined;
         };
+        services: Record<string, {
+            enabled: boolean;
+            status: "degraded" | "available" | "unavailable" | "stub";
+            route?: string | undefined;
+            provider?: string | undefined;
+            message?: string | undefined;
+        }>;
     }>;
     getMetaTypes(): Promise<{
         types: string[];
@@ -1736,6 +1664,11 @@ declare class ObjectQLPlugin implements Plugin {
     constructor(ql?: ObjectQL, hostContext?: Record<string, any>);
     init: (ctx: PluginContext) => Promise<void>;
     start: (ctx: PluginContext) => Promise<void>;
+    /**
+     * Load metadata from external metadata service into ObjectQL registry
+     * This enables ObjectQL to use file-based or remote metadata
+     */
+    private loadMetadataFromService;
 }
 
 export { DEFAULT_EXTENDER_PRIORITY, DEFAULT_OWNER_PRIORITY, type HookHandler, type ObjectContributor, ObjectQL, type ObjectQLHostContext, ObjectQLPlugin, ObjectStackProtocolImplementation, RESERVED_NAMESPACES, SchemaRegistry, computeFQN, parseFQN };

package/dist/index.js

@@ -534,53 +534,97 @@ function simpleHash(str) {
   }
   return Math.abs(hash).toString(16);
 }
+var SERVICE_CONFIG = {
+  auth: { route: "/api/v1/auth", plugin: "plugin-auth" },
+  automation: { route: "/api/v1/automation", plugin: "plugin-automation", capability: "workflow" },
+  cache: { route: "/api/v1/cache", plugin: "plugin-redis" },
+  queue: { route: "/api/v1/queue", plugin: "plugin-bullmq" },
+  job: { route: "/api/v1/jobs", plugin: "job-scheduler" },
+  ui: { route: "/api/v1/ui", plugin: "ui-plugin" },
+  workflow: { route: "/api/v1/workflow", plugin: "plugin-workflow", capability: "workflow" },
+  realtime: { route: "/api/v1/realtime", plugin: "plugin-realtime", capability: "websockets" },
+  notification: { route: "/api/v1/notifications", plugin: "plugin-notifications", capability: "notifications" },
+  ai: { route: "/api/v1/ai", plugin: "plugin-ai", capability: "ai" },
+  i18n: { route: "/api/v1/i18n", plugin: "plugin-i18n", capability: "i18n" },
+  graphql: { route: "/graphql", plugin: "plugin-graphql", capability: "graphql" },
+  "file-storage": { route: "/api/v1/storage", plugin: "plugin-storage", capability: "files" },
+  search: { route: "/api/v1/search", plugin: "plugin-search", capability: "search" }
+};
 var ObjectStackProtocolImplementation = class {
-  constructor(engine) {
+  constructor(engine, getServicesRegistry) {
     this.engine = engine;
+    this.getServicesRegistry = getServicesRegistry;
   }
   async getDiscovery() {
+    const registeredServices = this.getServicesRegistry ? this.getServicesRegistry() : /* @__PURE__ */ new Map();
+    const services = {
+      // --- Kernel-provided (objectql is an example kernel implementation) ---
+      metadata: { enabled: true, status: "degraded", route: "/api/meta", provider: "objectql", message: "In-memory registry only; DB persistence not yet implemented" },
+      data: { enabled: true, status: "available", route: "/api/data", provider: "objectql" },
+      analytics: { enabled: true, status: "available", route: "/api/analytics", provider: "objectql" }
+    };
+    for (const [serviceName, config] of Object.entries(SERVICE_CONFIG)) {
+      if (registeredServices.has(serviceName)) {
+        services[serviceName] = {
+          enabled: true,
+          status: "available",
+          route: config.route,
+          provider: config.plugin
+        };
+      } else {
+        services[serviceName] = {
+          enabled: false,
+          status: "unavailable",
+          message: `Install ${config.plugin} to enable`
+        };
+      }
+    }
+    const capabilities = {
+      graphql: registeredServices.has("graphql"),
+      search: registeredServices.has("search"),
+      websockets: registeredServices.has("realtime"),
+      files: registeredServices.has("file-storage"),
+      analytics: true,
+      // Always available via objectql
+      ai: registeredServices.has("ai"),
+      workflow: registeredServices.has("workflow") || registeredServices.has("automation"),
+      notifications: registeredServices.has("notification"),
+      i18n: registeredServices.has("i18n")
+    };
+    const serviceToEndpointKey = {
+      auth: "auth",
+      automation: "automation",
+      ui: "ui",
+      workflow: "workflow",
+      realtime: "realtime",
+      notification: "notifications",
+      ai: "ai",
+      i18n: "i18n",
+      graphql: "graphql",
+      "file-storage": "storage"
+    };
+    const optionalEndpoints = {
+      analytics: "/api/analytics"
+    };
+    for (const [serviceName, config] of Object.entries(SERVICE_CONFIG)) {
+      if (registeredServices.has(serviceName)) {
+        const endpointKey = serviceToEndpointKey[serviceName];
+        if (endpointKey) {
+          optionalEndpoints[endpointKey] = config.route;
+        }
+      }
+    }
+    const endpoints = {
+      data: "/api/data",
+      metadata: "/api/meta",
+      ...optionalEndpoints
+    };
     return {
       version: "1.0",
       apiName: "ObjectStack API",
-      capabilities: {
-        graphql: false,
-        search: false,
-        websockets: false,
-        files: false,
-        analytics: true,
-        ai: false,
-        workflow: false,
-        notifications: false,
-        i18n: false
-      },
-      endpoints: {
-        data: "/api/data",
-        metadata: "/api/meta",
-        analytics: "/api/analytics"
-      },
-      services: {
-        // --- Kernel-provided (objectql is an example kernel implementation) ---
-        metadata: { enabled: true, status: "degraded", route: "/api/meta", provider: "objectql", message: "In-memory registry only; DB persistence not yet implemented" },
-        data: { enabled: true, status: "available", route: "/api/data", provider: "objectql" },
-        analytics: { enabled: true, status: "available", route: "/api/analytics", provider: "objectql" },
-        // --- Plugin-provided (kernel does NOT handle these) ---
-        auth: { enabled: false, status: "unavailable", message: "Install an auth plugin (e.g. plugin-auth) to enable" },
-        automation: { enabled: false, status: "unavailable", message: "Install an automation plugin (e.g. plugin-automation) to enable" },
-        // --- Core infrastructure (plugin-provided) ---
-        cache: { enabled: false, status: "unavailable", message: "Install a cache plugin (e.g. plugin-redis) to enable" },
-        queue: { enabled: false, status: "unavailable", message: "Install a queue plugin (e.g. plugin-bullmq) to enable" },
-        job: { enabled: false, status: "unavailable", message: "Install a job scheduler plugin to enable" },
-        // --- Optional services (all plugin-provided) ---
-        ui: { enabled: false, status: "unavailable", message: "Install a UI plugin to enable" },
-        workflow: { enabled: false, status: "unavailable", message: "Install a workflow plugin to enable" },
-        realtime: { enabled: false, status: "unavailable", message: "Install a realtime plugin to enable" },
-        notification: { enabled: false, status: "unavailable", message: "Install a notification plugin to enable" },
-        ai: { enabled: false, status: "unavailable", message: "Install an AI plugin to enable" },
-        i18n: { enabled: false, status: "unavailable", message: "Install an i18n plugin to enable" },
-        graphql: { enabled: false, status: "unavailable", message: "Install a GraphQL plugin to enable" },
-        "file-storage": { enabled: false, status: "unavailable", message: "Install a file-storage plugin to enable" },
-        search: { enabled: false, status: "unavailable", message: "Install a search plugin to enable" }
-      }
+      capabilities,
+      endpoints,
+      services
     };
   }
   async getMetaTypes() {
@@ -1687,32 +1731,54 @@ var ObjectQLPlugin = class {
       }
       ctx.registerService("objectql", this.ql);
       let hasMetadata = false;
+      let metadataProvider = "objectql";
       try {
         if (ctx.getService("metadata")) {
           hasMetadata = true;
+          metadataProvider = "external";
         }
       } catch (e) {
       }
       if (!hasMetadata) {
         try {
           ctx.registerService("metadata", this.ql);
+          ctx.logger.info("ObjectQL providing metadata service (fallback mode)", {
+            mode: "in-memory",
+            features: ["registry", "fast-lookup"]
+          });
         } catch (e) {
           if (!e.message?.includes("already registered")) {
             throw e;
           }
         }
+      } else {
+        ctx.logger.info("External metadata service detected", {
+          provider: metadataProvider,
+          mode: "will-sync-in-start-phase"
+        });
       }
       ctx.registerService("data", this.ql);
-      ctx.registerService("auth", this.ql);
-      ctx.logger.info("ObjectQL engine registered as service", {
-        provides: ["objectql", "metadata", "data", "auth"]
+      ctx.logger.info("ObjectQL engine registered", {
+        services: ["objectql", "data"],
+        metadataProvider
       });
-      const protocolShim = new ObjectStackProtocolImplementation(this.ql);
+      const protocolShim = new ObjectStackProtocolImplementation(
+        this.ql,
+        () => ctx.getServices ? ctx.getServices() : /* @__PURE__ */ new Map()
+      );
       ctx.registerService("protocol", protocolShim);
       ctx.logger.info("Protocol service registered");
     };
     this.start = async (ctx) => {
-      ctx.logger.info("ObjectQL engine initialized");
+      ctx.logger.info("ObjectQL engine starting...");
+      try {
+        const metadataService = ctx.getService("metadata");
+        if (metadataService && metadataService !== this.ql && this.ql) {
+          await this.loadMetadataFromService(metadataService, ctx);
+        }
+      } catch (e) {
+        ctx.logger.debug("No external metadata service to sync from");
+      }
       if (ctx.getServices && this.ql) {
         const services = ctx.getServices();
         for (const [name, service] of services.entries()) {
@@ -1726,6 +1792,10 @@ var ObjectQLPlugin = class {
           }
         }
       }
+      ctx.logger.info("ObjectQL engine started", {
+        driversRegistered: this.ql?.["drivers"]?.size || 0,
+        objectsRegistered: this.ql?.registry?.getAllObjects?.()?.length || 0
+      });
     };
     if (ql) {
       this.ql = ql;
@@ -1733,6 +1803,42 @@ var ObjectQLPlugin = class {
       this.hostContext = hostContext;
     }
   }
+  /**
+   * Load metadata from external metadata service into ObjectQL registry
+   * This enables ObjectQL to use file-based or remote metadata
+   */
+  async loadMetadataFromService(metadataService, ctx) {
+    ctx.logger.info("Syncing metadata from external service into ObjectQL registry...");
+    const metadataTypes = ["object", "view", "app", "flow", "workflow", "function"];
+    let totalLoaded = 0;
+    for (const type of metadataTypes) {
+      try {
+        if (typeof metadataService.loadMany === "function") {
+          const items = await metadataService.loadMany(type);
+          if (items && items.length > 0) {
+            items.forEach((item) => {
+              const keyField = item.id ? "id" : "name";
+              if (type === "object" && this.ql) {
+                return;
+              }
+              if (this.ql?.registry?.registerItem) {
+                this.ql.registry.registerItem(type, item, keyField);
+              }
+            });
+            totalLoaded += items.length;
+            ctx.logger.info(`Synced ${items.length} ${type}(s) from metadata service`);
+          }
+        }
+      } catch (e) {
+        ctx.logger.debug(`No ${type} metadata found or error loading`, {
+          error: e.message
+        });
+      }
+    }
+    if (totalLoaded > 0) {
+      ctx.logger.info(`Metadata sync complete: ${totalLoaded} items loaded into ObjectQL registry`);
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {