@objectstack/objectql 1.1.0 → 2.0.0

package/src/engine.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { QueryAST, HookContext } from '@objectstack/spec/data';
 import { 
   DataEngineQueryOptions, 
@@ -219,8 +221,20 @@ export class ObjectQL implements IDataEngine {
 
       // 5. Register all other metadata types generically
       const metadataArrayKeys = [
-        'actions', 'dashboards', 'reports', 'flows', 'agents',
-        'apis', 'ragPipelines', 'profiles', 'sharingRules'
+        // UI Protocol
+        'actions', 'views', 'pages', 'dashboards', 'reports', 'themes',
+        // Automation Protocol
+        'flows', 'workflows', 'approvals', 'webhooks',
+        // Security Protocol
+        'roles', 'permissions', 'profiles', 'sharingRules', 'policies',
+        // AI Protocol
+        'agents', 'ragPipelines',
+        // API Protocol
+        'apis',
+        // Data Extensions
+        'hooks', 'mappings', 'analyticsCubes',
+        // Integration Protocol
+        'connectors',
       ];
       for (const key of metadataArrayKeys) {
           const items = (manifest as any)[key];
@@ -425,13 +439,13 @@ export class ObjectQL implements IDataEngine {
     await this.triggerHooks('beforeFind', hookContext);
 
     try {
-        const result = await driver.find(object, hookContext.input.ast, hookContext.input.options);
+        const result = await driver.find(object, hookContext.input.ast as QueryAST, hookContext.input.options as any);
         
         hookContext.event = 'afterFind';
         hookContext.result = result;
         await this.triggerHooks('afterFind', hookContext);
         
-        return hookContext.result;
+        return hookContext.result as any[];
     } catch (e) {
         this.logger.error('Find operation failed', e as Error, { object });
         throw e;
@@ -468,13 +482,13 @@ export class ObjectQL implements IDataEngine {
       if (Array.isArray(hookContext.input.data)) {
         // Bulk Create
         if (driver.bulkCreate) {
-             result = await driver.bulkCreate(object, hookContext.input.data, hookContext.input.options);
+             result = await driver.bulkCreate(object, hookContext.input.data as any[], hookContext.input.options as any);
         } else {
              // Fallback loop
-             result = await Promise.all(hookContext.input.data.map((item: any) => driver.create(object, item, hookContext.input.options)));
+             result = await Promise.all((hookContext.input.data as any[]).map((item: any) => driver.create(object, item, hookContext.input.options as any)));
         }
       } else {
-        result = await driver.create(object, hookContext.input.data, hookContext.input.options);
+        result = await driver.create(object, hookContext.input.data, hookContext.input.options as any);
       }
 
       hookContext.event = 'afterInsert';
@@ -517,11 +531,11 @@ export class ObjectQL implements IDataEngine {
          let result;
          if (hookContext.input.id) {
              // Single update by ID
-             result = await driver.update(object, hookContext.input.id, hookContext.input.data, hookContext.input.options);
+             result = await driver.update(object, hookContext.input.id as string, hookContext.input.data, hookContext.input.options as any);
          } else if (options?.multi && driver.updateMany) {
              // Bulk update by Query
              const ast = this.toQueryAST(object, { filter: options.filter });
-             result = await driver.updateMany(object, ast, hookContext.input.data, hookContext.input.options);
+             result = await driver.updateMany(object, ast, hookContext.input.data, hookContext.input.options as any);
          } else {
              throw new Error('Update requires an ID or options.multi=true');
          }
@@ -560,10 +574,10 @@ export class ObjectQL implements IDataEngine {
     try {
         let result;
         if (hookContext.input.id) {
-            result = await driver.delete(object, hookContext.input.id, hookContext.input.options);
+            result = await driver.delete(object, hookContext.input.id as string, hookContext.input.options as any);
         } else if (options?.multi && driver.deleteMany) {
              const ast = this.toQueryAST(object, { filter: options.filter });
-             result = await driver.deleteMany(object, ast, hookContext.input.options);
+             result = await driver.deleteMany(object, ast, hookContext.input.options as any);
         } else {
              throw new Error('Delete requires an ID or options.multi=true');
         }

package/src/index.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 // Export Registry
 export { 
   SchemaRegistry,

package/src/plugin.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { ObjectQL } from './engine.js';
 import { ObjectStackProtocolImplementation } from './protocol.js';
 import { Plugin, PluginContext } from '@objectstack/core';

package/src/protocol.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { ObjectStackProtocol } from '@objectstack/spec/api';
 import { IDataEngine } from '@objectstack/core';
 import type { 
@@ -32,7 +34,7 @@ export class ObjectStackProtocolImplementation implements ObjectStackProtocol {
         this.engine = engine;
     }
 
-    async getDiscovery(_request: {}) {
+    async getDiscovery() {
         return {
             version: '1.0',
             apiName: 'ObjectStack API',
@@ -42,7 +44,11 @@ export class ObjectStackProtocolImplementation implements ObjectStackProtocol {
                 websockets: false,
                 files: true,
                 analytics: false,
-                hub: false
+                hub: false,
+                ai: false,
+                workflow: false,
+                notifications: false,
+                i18n: false,
             },
             endpoints: {
                 data: '/api/data',
@@ -52,24 +58,36 @@ export class ObjectStackProtocolImplementation implements ObjectStackProtocol {
         };
     }
 
-    async getMetaTypes(_request: {}) {
+    async getMetaTypes() {
         return {
             types: SchemaRegistry.getRegisteredTypes()
         };
     }
 
-    async getMetaItems(request: { type: string; packageId?: string }) {
+    async getMetaItems(request: { type: string }) {
+        let items = SchemaRegistry.listItems(request.type);
+        // Normalize singular/plural: REST uses singular ('app') but registry may store as plural ('apps')
+        if (items.length === 0) {
+            const alt = request.type.endsWith('s') ? request.type.slice(0, -1) : request.type + 's';
+            items = SchemaRegistry.listItems(alt);
+        }
         return {
             type: request.type,
-            items: SchemaRegistry.listItems(request.type, request.packageId)
+            items
         };
     }
 
     async getMetaItem(request: { type: string, name: string }) {
+        let item = SchemaRegistry.getItem(request.type, request.name);
+        // Normalize singular/plural
+        if (item === undefined) {
+            const alt = request.type.endsWith('s') ? request.type.slice(0, -1) : request.type + 's';
+            item = SchemaRegistry.getItem(alt, request.name);
+        }
         return {
             type: request.type,
             name: request.name,
-            item: SchemaRegistry.getItem(request.type, request.name)
+            item
         };
     }
 

package/src/registry.ts

@@ -1,3 +1,5 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
 import { ServiceObject, ObjectSchema, ObjectOwnership } from '@objectstack/spec/data';
 import { ObjectStackManifest, ManifestSchema, InstalledPackage, InstalledPackageSchema } from '@objectstack/spec/kernel';
 import { AppSchema } from '@objectstack/spec/ui';