@objectstack/objectql 7.6.0 → 7.7.0

package/dist/index.d.mts

@@ -81,11 +81,13 @@ type RegistryLogLevel = 'debug' | 'info' | 'warn' | 'error' | 'silent';
  */
 interface SchemaRegistryOptions {
     /**
-     * Whether the host kernel runs in multi-tenant mode. When `true`, the
-     * registry auto-injects `organization_id` (lookup → sys_organization)
-     * into every registered user object that doesn't already declare it and
-     * isn't `managedBy` an external subsystem or explicitly opted-out via
-     * `systemFields: false`.
+     * Whether the host kernel runs in multi-tenant mode. The `organization_id`
+     * column itself is auto-injected regardless of this flag (lookup →
+     * sys_organization, on every registered object that doesn't already declare
+     * it, isn't `managedBy` an external subsystem, and hasn't opted out via
+     * `systemFields`/`tenancy.enabled:false`). When `true` the injected column
+     * is additionally INDEXED — single-tenant stacks skip the index since
+     * nothing ever filters by organization.
      *
      * Sourced from the `OS_MULTI_TENANT` env var when not explicitly set —
      * matches how the SecurityPlugin and CLI startup banner pick the mode.
@@ -107,9 +109,12 @@ interface SchemaRegistryOptions {
  * via the natural `{ ...sys, ...authored }` merge.
  *
  * Currently injects:
- *   - `organization_id` — multi-tenant deployments. Required-false (the
- *     SecurityPlugin populates it on insert; nullable rows are still
- *     filtered out by the `tenant_isolation` RLS USING clause).
+ *   - `organization_id` — always provisioned (unless the object opts out via
+ *     `systemFields`/`tenancy.enabled:false` or is `better-auth` managed) so
+ *     the column never depends on the global multi-tenant flag. Required-false;
+ *     org-scoping populates it on insert in multi-tenant mode, and it stays
+ *     NULL on single-tenant stacks. Only the column's INDEX is gated on
+ *     `multiTenant` (no per-tenant filtering exists single-tenant).
  *   - `created_at` / `created_by` / `updated_at` / `updated_by` — audit
  *     fields. Marked `system: true, readonly: true` so detail views can
  *     surface them in a dedicated "System Information" section while

package/dist/index.d.ts

@@ -81,11 +81,13 @@ type RegistryLogLevel = 'debug' | 'info' | 'warn' | 'error' | 'silent';
  */
 interface SchemaRegistryOptions {
     /**
-     * Whether the host kernel runs in multi-tenant mode. When `true`, the
-     * registry auto-injects `organization_id` (lookup → sys_organization)
-     * into every registered user object that doesn't already declare it and
-     * isn't `managedBy` an external subsystem or explicitly opted-out via
-     * `systemFields: false`.
+     * Whether the host kernel runs in multi-tenant mode. The `organization_id`
+     * column itself is auto-injected regardless of this flag (lookup →
+     * sys_organization, on every registered object that doesn't already declare
+     * it, isn't `managedBy` an external subsystem, and hasn't opted out via
+     * `systemFields`/`tenancy.enabled:false`). When `true` the injected column
+     * is additionally INDEXED — single-tenant stacks skip the index since
+     * nothing ever filters by organization.
      *
      * Sourced from the `OS_MULTI_TENANT` env var when not explicitly set —
      * matches how the SecurityPlugin and CLI startup banner pick the mode.
@@ -107,9 +109,12 @@ interface SchemaRegistryOptions {
  * via the natural `{ ...sys, ...authored }` merge.
  *
  * Currently injects:
- *   - `organization_id` — multi-tenant deployments. Required-false (the
- *     SecurityPlugin populates it on insert; nullable rows are still
- *     filtered out by the `tenant_isolation` RLS USING clause).
+ *   - `organization_id` — always provisioned (unless the object opts out via
+ *     `systemFields`/`tenancy.enabled:false` or is `better-auth` managed) so
+ *     the column never depends on the global multi-tenant flag. Required-false;
+ *     org-scoping populates it on insert in multi-tenant mode, and it stays
+ *     NULL on single-tenant stacks. Only the column's INDEX is gated on
+ *     `multiTenant` (no per-tenant filtering exists single-tenant).
  *   - `created_at` / `created_by` / `updated_at` / `updated_by` — audit
  *     fields. Marked `system: true, readonly: true` so detail views can
  *     surface them in a dedicated "System Information" section while

package/dist/index.js

@@ -110,7 +110,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) {
@@ -119,11 +119,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) {
@@ -7078,7 +7078,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,
@@ -7803,6 +7807,7 @@ var MetadataFacade = class {
 
 // src/plugin.ts
 var import_system3 = require("@objectstack/spec/system");
+var import_metadata_core3 = require("@objectstack/metadata-core");
 function hasLoadMetaFromDb(service) {
   return typeof service === "object" && service !== null && typeof service["loadMetaFromDb"] === "function";
 }
@@ -7839,6 +7844,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: [
+            import_metadata_core3.SysMetadataObject,
+            import_metadata_core3.SysMetadataHistoryObject,
+            import_metadata_core3.SysMetadataAuditObject,
+            import_metadata_core3.SysViewDefinitionObject
+          ]
+        });
+      }
       const protocolShim = new ObjectStackProtocolImplementation(
         this.ql,
         () => ctx.getServices ? ctx.getServices() : /* @__PURE__ */ new Map(),