@open-mercato/core 0.6.2-develop.3439.1.94b9d9733c → 0.6.2-develop.3446.1.bd060c6017

package/dist/helpers/integration/queue-runner.js

@@ -0,0 +1,58 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { bootstrapFromAppRoot } from "@open-mercato/shared/lib/bootstrap/dynamicLoader";
+import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
+import { createQueue } from "@open-mercato/queue";
+async function drainQueueFromAppRoot(queueName, options) {
+  const data = await bootstrapFromAppRoot(options.appRoot);
+  const worker = data.modules.flatMap((module) => module.workers ?? []).find((entry) => entry.queue === queueName);
+  if (!worker) return 0;
+  const container = await createRequestContainer();
+  const queue = createQueue(queueName, "local", {
+    baseDir: path.resolve(options.appRoot, ".mercato/queue"),
+    concurrency: 1
+  });
+  const resolve = (name) => container.resolve(name);
+  try {
+    let processedJobs = 0;
+    while (true) {
+      const result = await queue.process(
+        async (job, ctx) => {
+          await Promise.resolve(worker.handler(job, { ...ctx, resolve }));
+        },
+        { limit: options.jobLimit }
+      );
+      const handled = result.processed + result.failed;
+      processedJobs += handled;
+      if (handled === 0) return processedJobs;
+    }
+  } finally {
+    await queue.close();
+  }
+}
+async function runQueueDrainFromEnv() {
+  const queueName = process.env.OM_INTEGRATION_QUEUE_NAME?.trim();
+  const appRoot = process.env.OM_INTEGRATION_APP_ROOT?.trim();
+  const jobLimit = Number.parseInt(process.env.OM_INTEGRATION_QUEUE_JOB_LIMIT || "100", 10) || 100;
+  if (!queueName || !appRoot) throw new Error("Missing queue drain environment");
+  const processed = await drainQueueFromAppRoot(queueName, {
+    appRoot: path.resolve(appRoot),
+    jobLimit
+  });
+  console.log(JSON.stringify({ processed }));
+}
+const currentFile = fileURLToPath(import.meta.url);
+const invokedFile = process.argv[1] ? path.resolve(process.argv[1]) : null;
+if (invokedFile === currentFile) {
+  runQueueDrainFromEnv().then(() => {
+    process.exit(0);
+  }).catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
+}
+export {
+  drainQueueFromAppRoot,
+  runQueueDrainFromEnv
+};
+//# sourceMappingURL=queue-runner.js.map

package/dist/helpers/integration/queue-runner.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/integration/queue-runner.ts"],
+  "sourcesContent": ["import path from 'node:path'\nimport { fileURLToPath } from 'node:url'\nimport { bootstrapFromAppRoot } from '@open-mercato/shared/lib/bootstrap/dynamicLoader'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { createQueue } from '@open-mercato/queue'\n\nexport type QueueDrainRunnerOptions = {\n  appRoot: string\n  jobLimit: number\n}\n\nexport async function drainQueueFromAppRoot(\n  queueName: string,\n  options: QueueDrainRunnerOptions,\n): Promise<number> {\n  const data = await bootstrapFromAppRoot(options.appRoot)\n  const worker = data.modules\n    .flatMap((module) => module.workers ?? [])\n    .find((entry) => entry.queue === queueName)\n  if (!worker) return 0\n\n  const container = await createRequestContainer()\n  const queue = createQueue(queueName, 'local', {\n    baseDir: path.resolve(options.appRoot, '.mercato/queue'),\n    concurrency: 1,\n  })\n  const resolve = <T = unknown>(name: string): T => container.resolve(name) as T\n\n  try {\n    let processedJobs = 0\n    while (true) {\n      const result = await queue.process(\n        async (job, ctx) => {\n          await Promise.resolve(worker.handler(job, { ...ctx, resolve }))\n        },\n        { limit: options.jobLimit },\n      )\n      const handled = result.processed + result.failed\n      processedJobs += handled\n      if (handled === 0) return processedJobs\n    }\n  } finally {\n    await queue.close()\n  }\n}\n\nexport async function runQueueDrainFromEnv(): Promise<void> {\n  const queueName = process.env.OM_INTEGRATION_QUEUE_NAME?.trim()\n  const appRoot = process.env.OM_INTEGRATION_APP_ROOT?.trim()\n  const jobLimit = Number.parseInt(process.env.OM_INTEGRATION_QUEUE_JOB_LIMIT || '100', 10) || 100\n  if (!queueName || !appRoot) throw new Error('Missing queue drain environment')\n\n  const processed = await drainQueueFromAppRoot(queueName, {\n    appRoot: path.resolve(appRoot),\n    jobLimit,\n  })\n  console.log(JSON.stringify({ processed }))\n}\n\nconst currentFile = fileURLToPath(import.meta.url)\nconst invokedFile = process.argv[1] ? path.resolve(process.argv[1]) : null\n\nif (invokedFile === currentFile) {\n  runQueueDrainFromEnv()\n    .then(() => {\n      process.exit(0)\n    })\n    .catch((error) => {\n      console.error(error)\n      process.exit(1)\n    })\n}\n"],
+  "mappings": "AAAA,OAAO,UAAU;AACjB,SAAS,qBAAqB;AAC9B,SAAS,4BAA4B;AACrC,SAAS,8BAA8B;AACvC,SAAS,mBAAmB;AAO5B,eAAsB,sBACpB,WACA,SACiB;AACjB,QAAM,OAAO,MAAM,qBAAqB,QAAQ,OAAO;AACvD,QAAM,SAAS,KAAK,QACjB,QAAQ,CAAC,WAAW,OAAO,WAAW,CAAC,CAAC,EACxC,KAAK,CAAC,UAAU,MAAM,UAAU,SAAS;AAC5C,MAAI,CAAC,OAAQ,QAAO;AAEpB,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,QAAQ,YAAY,WAAW,SAAS;AAAA,IAC5C,SAAS,KAAK,QAAQ,QAAQ,SAAS,gBAAgB;AAAA,IACvD,aAAa;AAAA,EACf,CAAC;AACD,QAAM,UAAU,CAAc,SAAoB,UAAU,QAAQ,IAAI;AAExE,MAAI;AACF,QAAI,gBAAgB;AACpB,WAAO,MAAM;AACX,YAAM,SAAS,MAAM,MAAM;AAAA,QACzB,OAAO,KAAK,QAAQ;AAClB,gBAAM,QAAQ,QAAQ,OAAO,QAAQ,KAAK,EAAE,GAAG,KAAK,QAAQ,CAAC,CAAC;AAAA,QAChE;AAAA,QACA,EAAE,OAAO,QAAQ,SAAS;AAAA,MAC5B;AACA,YAAM,UAAU,OAAO,YAAY,OAAO;AAC1C,uBAAiB;AACjB,UAAI,YAAY,EAAG,QAAO;AAAA,IAC5B;AAAA,EACF,UAAE;AACA,UAAM,MAAM,MAAM;AAAA,EACpB;AACF;AAEA,eAAsB,uBAAsC;AAC1D,QAAM,YAAY,QAAQ,IAAI,2BAA2B,KAAK;AAC9D,QAAM,UAAU,QAAQ,IAAI,yBAAyB,KAAK;AAC1D,QAAM,WAAW,OAAO,SAAS,QAAQ,IAAI,kCAAkC,OAAO,EAAE,KAAK;AAC7F,MAAI,CAAC,aAAa,CAAC,QAAS,OAAM,IAAI,MAAM,iCAAiC;AAE7E,QAAM,YAAY,MAAM,sBAAsB,WAAW;AAAA,IACvD,SAAS,KAAK,QAAQ,OAAO;AAAA,IAC7B;AAAA,EACF,CAAC;AACD,UAAQ,IAAI,KAAK,UAAU,EAAE,UAAU,CAAC,CAAC;AAC3C;AAEA,MAAM,cAAc,cAAc,YAAY,GAAG;AACjD,MAAM,cAAc,QAAQ,KAAK,CAAC,IAAI,KAAK,QAAQ,QAAQ,KAAK,CAAC,CAAC,IAAI;AAEtE,IAAI,gBAAgB,aAAa;AAC/B,uBAAqB,EAClB,KAAK,MAAM;AACV,YAAQ,KAAK,CAAC;AAAA,EAChB,CAAC,EACA,MAAM,CAAC,UAAU;AAChB,YAAQ,MAAM,KAAK;AACnB,YAAQ,KAAK,CAAC;AAAA,EAChB,CAAC;AACL;",
+  "names": []
+}

package/dist/helpers/integration/queue.js

@@ -0,0 +1,67 @@
+import { spawn } from "node:child_process";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { drainQueueFromAppRoot } from "./queue-runner.js";
+const DEFAULT_JOB_LIMIT = 100;
+function resolveAppRoot(input) {
+  return path.resolve(input?.trim() || process.env.OM_TEST_APP_ROOT?.trim() || path.resolve(process.cwd(), "apps/mercato"));
+}
+async function drainQueueInCurrentProcess(queueName, options) {
+  return drainQueueFromAppRoot(queueName, options);
+}
+function resolveAppRunnerPath(appRoot) {
+  const requireFromApp = createRequire(path.join(appRoot, "package.json"));
+  return requireFromApp.resolve("@open-mercato/core/helpers/integration/queue-runner");
+}
+function drainQueueInAppProcess(queueName, options) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, [resolveAppRunnerPath(options.appRoot)], {
+      cwd: options.appRoot,
+      env: {
+        ...process.env,
+        OM_INTEGRATION_APP_ROOT: options.appRoot,
+        OM_INTEGRATION_QUEUE_NAME: queueName,
+        OM_INTEGRATION_QUEUE_JOB_LIMIT: String(options.jobLimit),
+        QUEUE_BASE_DIR: path.resolve(options.appRoot, ".mercato/queue")
+      },
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    child.on("error", reject);
+    child.on("close", (code) => {
+      if (code !== 0) {
+        reject(new Error(`Queue drain failed for "${queueName}" in ${options.appRoot} (exit ${code}).
+${stderr || stdout}`));
+        return;
+      }
+      const lastLine = stdout.trim().split(/\r?\n/).reverse().find((line) => line.trim().startsWith("{")) ?? "{}";
+      try {
+        const parsed = JSON.parse(lastLine);
+        resolve(Number(parsed.processed ?? 0));
+      } catch {
+        resolve(0);
+      }
+    });
+  });
+}
+async function drainIntegrationQueue(queueName, options = {}) {
+  const resolved = {
+    appRoot: resolveAppRoot(options.appRoot),
+    jobLimit: options.jobLimit ?? DEFAULT_JOB_LIMIT
+  };
+  if (process.env.OM_TEST_APP_ROOT?.trim()) {
+    return drainQueueInAppProcess(queueName, resolved);
+  }
+  return drainQueueInCurrentProcess(queueName, resolved);
+}
+export {
+  drainIntegrationQueue
+};
+//# sourceMappingURL=queue.js.map

package/dist/helpers/integration/queue.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/integration/queue.ts"],
+  "sourcesContent": ["import { spawn } from 'node:child_process'\nimport { createRequire } from 'node:module'\nimport path from 'node:path'\nimport { drainQueueFromAppRoot } from './queue-runner'\n\ntype DrainQueueOptions = {\n  appRoot?: string\n  jobLimit?: number\n}\n\nconst DEFAULT_JOB_LIMIT = 100\n\nfunction resolveAppRoot(input?: string): string {\n  return path.resolve(input?.trim() || process.env.OM_TEST_APP_ROOT?.trim() || path.resolve(process.cwd(), 'apps/mercato'))\n}\n\nasync function drainQueueInCurrentProcess(queueName: string, options: Required<DrainQueueOptions>): Promise<number> {\n  return drainQueueFromAppRoot(queueName, options)\n}\n\nfunction resolveAppRunnerPath(appRoot: string): string {\n  const requireFromApp = createRequire(path.join(appRoot, 'package.json'))\n  return requireFromApp.resolve('@open-mercato/core/helpers/integration/queue-runner')\n}\n\nfunction drainQueueInAppProcess(queueName: string, options: Required<DrainQueueOptions>): Promise<number> {\n  return new Promise((resolve, reject) => {\n    const child = spawn(process.execPath, [resolveAppRunnerPath(options.appRoot)], {\n      cwd: options.appRoot,\n      env: {\n        ...process.env,\n        OM_INTEGRATION_APP_ROOT: options.appRoot,\n        OM_INTEGRATION_QUEUE_NAME: queueName,\n        OM_INTEGRATION_QUEUE_JOB_LIMIT: String(options.jobLimit),\n        QUEUE_BASE_DIR: path.resolve(options.appRoot, '.mercato/queue'),\n      },\n      stdio: ['ignore', 'pipe', 'pipe'],\n    })\n\n    let stdout = ''\n    let stderr = ''\n    child.stdout.on('data', (chunk) => { stdout += chunk.toString() })\n    child.stderr.on('data', (chunk) => { stderr += chunk.toString() })\n    child.on('error', reject)\n    child.on('close', (code) => {\n      if (code !== 0) {\n        reject(new Error(`Queue drain failed for \"${queueName}\" in ${options.appRoot} (exit ${code}).\\n${stderr || stdout}`))\n        return\n      }\n      const lastLine = stdout.trim().split(/\\r?\\n/).reverse().find((line) => line.trim().startsWith('{')) ?? '{}'\n      try {\n        const parsed = JSON.parse(lastLine) as { processed?: unknown }\n        resolve(Number(parsed.processed ?? 0))\n      } catch {\n        resolve(0)\n      }\n    })\n  })\n}\n\nexport async function drainIntegrationQueue(queueName: string, options: DrainQueueOptions = {}): Promise<number> {\n  const resolved = {\n    appRoot: resolveAppRoot(options.appRoot),\n    jobLimit: options.jobLimit ?? DEFAULT_JOB_LIMIT,\n  }\n  if (process.env.OM_TEST_APP_ROOT?.trim()) {\n    return drainQueueInAppProcess(queueName, resolved)\n  }\n  return drainQueueInCurrentProcess(queueName, resolved)\n}\n"],
+  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,qBAAqB;AAC9B,OAAO,UAAU;AACjB,SAAS,6BAA6B;AAOtC,MAAM,oBAAoB;AAE1B,SAAS,eAAe,OAAwB;AAC9C,SAAO,KAAK,QAAQ,OAAO,KAAK,KAAK,QAAQ,IAAI,kBAAkB,KAAK,KAAK,KAAK,QAAQ,QAAQ,IAAI,GAAG,cAAc,CAAC;AAC1H;AAEA,eAAe,2BAA2B,WAAmB,SAAuD;AAClH,SAAO,sBAAsB,WAAW,OAAO;AACjD;AAEA,SAAS,qBAAqB,SAAyB;AACrD,QAAM,iBAAiB,cAAc,KAAK,KAAK,SAAS,cAAc,CAAC;AACvE,SAAO,eAAe,QAAQ,qDAAqD;AACrF;AAEA,SAAS,uBAAuB,WAAmB,SAAuD;AACxG,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,UAAM,QAAQ,MAAM,QAAQ,UAAU,CAAC,qBAAqB,QAAQ,OAAO,CAAC,GAAG;AAAA,MAC7E,KAAK,QAAQ;AAAA,MACb,KAAK;AAAA,QACH,GAAG,QAAQ;AAAA,QACX,yBAAyB,QAAQ;AAAA,QACjC,2BAA2B;AAAA,QAC3B,gCAAgC,OAAO,QAAQ,QAAQ;AAAA,QACvD,gBAAgB,KAAK,QAAQ,QAAQ,SAAS,gBAAgB;AAAA,MAChE;AAAA,MACA,OAAO,CAAC,UAAU,QAAQ,MAAM;AAAA,IAClC,CAAC;AAED,QAAI,SAAS;AACb,QAAI,SAAS;AACb,UAAM,OAAO,GAAG,QAAQ,CAAC,UAAU;AAAE,gBAAU,MAAM,SAAS;AAAA,IAAE,CAAC;AACjE,UAAM,OAAO,GAAG,QAAQ,CAAC,UAAU;AAAE,gBAAU,MAAM,SAAS;AAAA,IAAE,CAAC;AACjE,UAAM,GAAG,SAAS,MAAM;AACxB,UAAM,GAAG,SAAS,CAAC,SAAS;AAC1B,UAAI,SAAS,GAAG;AACd,eAAO,IAAI,MAAM,2BAA2B,SAAS,QAAQ,QAAQ,OAAO,UAAU,IAAI;AAAA,EAAO,UAAU,MAAM,EAAE,CAAC;AACpH;AAAA,MACF;AACA,YAAM,WAAW,OAAO,KAAK,EAAE,MAAM,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,KAAK,KAAK,EAAE,WAAW,GAAG,CAAC,KAAK;AACvG,UAAI;AACF,cAAM,SAAS,KAAK,MAAM,QAAQ;AAClC,gBAAQ,OAAO,OAAO,aAAa,CAAC,CAAC;AAAA,MACvC,QAAQ;AACN,gBAAQ,CAAC;AAAA,MACX;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACH;AAEA,eAAsB,sBAAsB,WAAmB,UAA6B,CAAC,GAAoB;AAC/G,QAAM,WAAW;AAAA,IACf,SAAS,eAAe,QAAQ,OAAO;AAAA,IACvC,UAAU,QAAQ,YAAY;AAAA,EAChC;AACA,MAAI,QAAQ,IAAI,kBAAkB,KAAK,GAAG;AACxC,WAAO,uBAAuB,WAAW,QAAQ;AAAA,EACnD;AACA,SAAO,2BAA2B,WAAW,QAAQ;AACvD;",
+  "names": []
+}

package/dist/helpers/integration/salesUi.js

@@ -765,12 +765,19 @@ async function addCustomLine(page, options) {
   await dialog.getByRole("textbox", { name: "0.00" }).fill(String(options.unitPriceGross));
   await dialog.getByRole("textbox", { name: "1" }).fill(String(options.quantity));
   if (options.taxClassName) {
-    const taxClassTrigger = dialog.locator('[role="combobox"]').filter({ hasText: /No tax class selected/i }).first();
+    const taxClassTrigger = dialog.locator('[data-crud-field-id="taxRateId"] [role="combobox"]').first();
     if (await taxClassTrigger.count() > 0) {
-      await taxClassTrigger.click();
-      const opt = page.getByRole("option", { name: options.taxClassName, exact: true });
-      await opt.first().waitFor({ state: "visible", timeout: 3e3 });
-      await opt.first().click({ force: true });
+      await expect(taxClassTrigger).toBeEnabled({ timeout: TEST_WAIT_TIMEOUT_MS });
+      const selectedLabel = options.taxClassName.split("\u2022")[0].trim();
+      for (let attempt = 0; attempt < 3; attempt += 1) {
+        await taxClassTrigger.click();
+        const opt = page.getByRole("option", { name: options.taxClassName, exact: true }).first();
+        await opt.waitFor({ state: "visible", timeout: 3e3 });
+        await opt.click();
+        const selected = await taxClassTrigger.filter({ hasText: new RegExp(escapeRegExp(selectedLabel), "i") }).waitFor({ state: "visible", timeout: 1500 }).then(() => true, () => false);
+        if (selected) break;
+      }
+      await expect(taxClassTrigger).toContainText(selectedLabel, { timeout: TEST_WAIT_TIMEOUT_MS });
     }
   }
   const submitButton = dialog.getByRole("button", { name: /Add item/i });
@@ -843,17 +850,28 @@ async function addAdjustment(page, options) {
         TEST_WAIT_TIMEOUT_MS
       );
       await expect(kindTrigger).toBeEnabled({ timeout: TEST_WAIT_TIMEOUT_MS });
-      await kindTrigger.click();
-      const kindOption = page.getByRole("option", { name: new RegExp(`^${escapeRegExp(kindLabel)}$`, "i") }).first();
-      const optionVisible = await kindOption.waitFor({ state: "visible", timeout: TEST_WAIT_TIMEOUT_MS }).then(() => true, () => false);
-      if (optionVisible) {
-        await kindOption.click({ force: true });
-      } else {
-        await page.keyboard.type(kindLabel.charAt(0));
-        await page.waitForTimeout(150);
-        await page.keyboard.press("Enter");
+      for (let attempt = 0; attempt < 3; attempt += 1) {
+        const currentLabel = await kindTrigger.textContent().catch(() => "");
+        if (currentLabel?.includes(kindLabel)) return;
+        const expanded = await kindTrigger.getAttribute("aria-expanded").catch(() => null);
+        if (expanded === "true") {
+          await page.keyboard.press("Escape").catch(() => {
+          });
+        }
+        await kindTrigger.click();
+        const kindOption = page.getByRole("option", { name: new RegExp(`^${escapeRegExp(kindLabel)}$`, "i") }).first();
+        const optionVisible = await kindOption.waitFor({ state: "visible", timeout: TEST_WAIT_TIMEOUT_MS }).then(() => true, () => false);
+        if (optionVisible) {
+          await kindOption.click({ force: true });
+        } else {
+          await page.keyboard.type(kindLabel.charAt(0));
+          await page.waitForTimeout(150);
+          await page.keyboard.press("Enter");
+        }
+        await expect(kindTrigger).toContainText(kindLabel, { timeout: 2e3 }).catch(() => {
+        });
       }
-      await expect(kindTrigger).toContainText(kindLabel, { timeout: 2e3 });
+      await expect(kindTrigger).toContainText(kindLabel, { timeout: 5e3 });
     };
     await selectKindOption();
     const labelInput = dialog.getByPlaceholder(/e\.g\. Shipping fee/i).first();