@objectstack/objectql 9.4.0 → 9.5.0

package/dist/index.js

@@ -2089,8 +2089,10 @@ var SysMetadataRepository = class {
    */
   async promoteDraft(ref, opts) {
     this.assertOpen();
-    const draft = await this.get(ref, { state: "draft" });
-    if (!draft) {
+    const draftRow = await this.engine.findOne("sys_metadata", {
+      where: this.whereFor(ref, "draft")
+    });
+    if (!draftRow) {
       const err = new Error(
         `[no_draft] No pending draft exists for ${ref.type}/${ref.name} \u2014 nothing to publish.`
       );
@@ -2098,7 +2100,9 @@ var SysMetadataRepository = class {
       err.status = 404;
       throw err;
     }
-    const currentActive = await this.get(ref, { state: "active" });
+    const draftPackageId = draftRow.package_id ?? null;
+    const draft = this.rowToItem(ref, draftRow);
+    const currentActive = await this.get(ref, { state: "active", packageId: draftPackageId });
     const result = await this.put(ref, draft.body, {
       parentVersion: currentActive?.hash ?? null,
       actor: opts.actor,
@@ -2106,7 +2110,8 @@ var SysMetadataRepository = class {
       message: opts.message ?? `publish draft (hash ${draft.hash})`,
       intent: opts.intent ?? "override-artifact",
       state: "active",
-      opType: "publish"
+      opType: "publish",
+      packageId: draftPackageId
     });
     try {
       await this.delete(ref, {
@@ -2199,10 +2204,15 @@ var SysMetadataRepository = class {
    */
   async listDrafts(filter) {
     this.assertOpen();
-    const where = {
-      organization_id: this.organizationId,
-      state: "draft"
-    };
+    const where = { state: "draft" };
+    if (this.organizationId != null) {
+      where.$or = [
+        { organization_id: this.organizationId },
+        { organization_id: null }
+      ];
+    } else {
+      where.organization_id = null;
+    }
     if (filter?.type) where.type = filter.type;
     if (filter?.packageId) where.package_id = filter.packageId;
     const rows = await this.engine.find("sys_metadata", { where });