@objectstack/objectql 7.6.0 → 7.7.0

package/dist/index.mjs

@@ -41,7 +41,7 @@ function applySystemFields(schema, opts) {
   if (schema.managedBy === "better-auth") return schema;
   const sf = typeof schema.systemFields === "object" && schema.systemFields !== null ? schema.systemFields : void 0;
   const tenancyDisabled = schema.tenancy?.enabled === false;
-  const wantTenant = opts.multiTenant && sf?.tenant !== false && !tenancyDisabled;
+  const wantTenant = sf?.tenant !== false && !tenancyDisabled;
   const wantAudit = sf?.audit !== false;
   const additions = {};
   if (wantTenant && !schema.fields?.organization_id) {
@@ -50,11 +50,11 @@ function applySystemFields(schema, opts) {
       reference: "sys_organization",
       label: "Organization",
       required: false,
-      indexed: true,
+      indexed: opts.multiTenant,
       hidden: true,
       readonly: true,
       system: true,
-      description: "Tenant scope (auto-populated by SecurityPlugin on insert)."
+      description: "Tenant scope (auto-populated by org-scoping on insert; NULL on single-tenant stacks)."
     };
   }
   if (wantAudit) {
@@ -7014,7 +7014,11 @@ var _ObjectQL = class _ObjectQL {
     const driver = this.getDriver(object);
     let id = data.id;
     if (!id && options?.where && typeof options.where === "object" && "id" in options.where) {
-      id = options.where.id;
+      const whereId = options.where.id;
+      const t = typeof whereId;
+      if (whereId !== null && (t === "string" || t === "number" || t === "bigint")) {
+        id = whereId;
+      }
     }
     const opCtx = {
       object,
@@ -7739,6 +7743,12 @@ var MetadataFacade = class {
 
 // src/plugin.ts
 import { StorageNameMapping as StorageNameMapping2 } from "@objectstack/spec/system";
+import {
+  SysMetadataObject,
+  SysMetadataHistoryObject,
+  SysMetadataAuditObject,
+  SysViewDefinitionObject
+} from "@objectstack/metadata-core";
 function hasLoadMetaFromDb(service) {
   return typeof service === "object" && service !== null && typeof service["loadMetaFromDb"] === "function";
 }
@@ -7775,6 +7785,21 @@ var ObjectQLPlugin = class {
       ctx.logger.info("ObjectQL engine registered", {
         services: ["objectql", "data", "manifest"]
       });
+      if (this.environmentId === void 0) {
+        this.ql.registerApp({
+          id: "com.objectstack.metadata-objects",
+          name: "Metadata Platform Objects",
+          version: "1.0.0",
+          type: "plugin",
+          scope: "system",
+          objects: [
+            SysMetadataObject,
+            SysMetadataHistoryObject,
+            SysMetadataAuditObject,
+            SysViewDefinitionObject
+          ]
+        });
+      }
       const protocolShim = new ObjectStackProtocolImplementation(
         this.ql,
         () => ctx.getServices ? ctx.getServices() : /* @__PURE__ */ new Map(),