@tallyui/connector-woocommerce 3.0.0 → 3.0.1

package/README.md

@@ -13,6 +13,8 @@ It also sends `X-WCPOS-Protocol: 2`, which WCPOS 2.0 requires of POS requests, a
 
 ## Product pull
 
+On WCPOS 1.10.x, the product uuid comes from the `_woocommerce_pos_uuid` meta and the barcode from `global_unique_id`. Non-empty top-level `uuid` / `barcode` fields (WCPOS 2.0) win when present.
+
 The pull works in passes:
 - a small request finds the store's newest `date_modified_gmt`;
 - the pass then pages every product modified since the last pass, by id with an offset;

package/dist/index.js

@@ -148,109 +148,6 @@ var wooProductSchema = {
 
 // src/traits/product.ts
 import { moneyFromMajor } from "@tallyui/core";
-var WOO_STOCK_STATUS = {
-  instock: "in_stock",
-  outofstock: "out_of_stock",
-  onbackorder: "backorder"
-};
-var wooProductTraits = {
-  getId: (doc) => String(doc.id),
-  getName: (doc) => doc.name ?? "",
-  getSku: (doc) => doc.sku || void 0,
-  getPrices: (doc, context) => {
-    const currency = context?.currency ?? "XXX";
-    const prices = [];
-    const base = moneyFromMajor(doc.regular_price || doc.price, currency);
-    if (base) prices.push({ ...base, kind: "base" });
-    const sale = doc.on_sale === true ? moneyFromMajor(doc.sale_price, currency) : void 0;
-    if (sale) prices.push({ ...sale, kind: "sale" });
-    return prices;
-  },
-  getStock: (doc) => ({
-    status: WOO_STOCK_STATUS[doc.stock_status] ?? "unknown",
-    quantity: doc.manage_stock === false ? void 0 : doc.stock_quantity ?? void 0
-  }),
-  getPrice: (doc) => doc.price || void 0,
-  getRegularPrice: (doc) => doc.regular_price || void 0,
-  getSalePrice: (doc) => doc.sale_price || void 0,
-  isOnSale: (doc) => doc.on_sale === true,
-  getImageUrl: (doc) => doc.images?.[0]?.src || void 0,
-  getImageUrls: (doc) => (doc.images ?? []).map((img) => img.src).filter(Boolean),
-  getDescription: (doc) => doc.short_description || doc.description || void 0,
-  getStockStatus: (doc) => {
-    const status = doc.stock_status;
-    if (status === "instock" || status === "outofstock" || status === "onbackorder") {
-      return status;
-    }
-    return "unknown";
-  },
-  getStockQuantity: (doc) => doc.stock_quantity ?? null,
-  hasVariants: (doc) => doc.type === "variable",
-  isSellable: (doc) => doc.status === void 0 || doc.status === "publish",
-  getVariantCount: (doc) => doc.type === "variable" ? doc.variations?.length ?? 0 : 1,
-  getType: (doc) => doc.type ?? "simple",
-  getBarcode: (doc) => doc.barcode || void 0,
-  getCategoryNames: (doc) => (doc.categories ?? []).map((cat) => cat.name).filter(Boolean)
-};
-
-// src/sync/products.ts
-var wooProductSync = {
-  async fetchAllIds(context) {
-    const response = await fetch(`${context.baseUrl}/products`, {
-      headers: {
-        ...context.headers,
-        "Content-Type": "application/json"
-      },
-      signal: context.signal
-    });
-    if (!response.ok) {
-      throw new Error(`WooCommerce API error: ${response.status}`);
-    }
-    const products = await response.json();
-    return products.map((p) => ({
-      id: String(p.id),
-      dateModified: p.date_modified_gmt
-    }));
-  },
-  async fetchByIds(ids, context) {
-    const include = ids.join(",");
-    const response = await fetch(
-      `${context.baseUrl}/products?include=${include}&per_page=${ids.length}`,
-      {
-        headers: {
-          ...context.headers,
-          "Content-Type": "application/json"
-        },
-        signal: context.signal
-      }
-    );
-    if (!response.ok) {
-      throw new Error(`WooCommerce API error: ${response.status}`);
-    }
-    return response.json();
-  },
-  async fetchModifiedAfter(date, context) {
-    const params = new URLSearchParams({
-      modified_after: date,
-      dates_are_gmt: "true",
-      per_page: "100"
-    });
-    const response = await fetch(
-      `${context.baseUrl}/products?${params}`,
-      {
-        headers: {
-          ...context.headers,
-          "Content-Type": "application/json"
-        },
-        signal: context.signal
-      }
-    );
-    if (!response.ok) {
-      throw new Error(`WooCommerce API error: ${response.status}`);
-    }
-    return response.json();
-  }
-};
 
 // src/replication/products.ts
 import { ConnectorUnauthorizedError } from "@tallyui/core";
@@ -295,9 +192,22 @@ var WooMissingUuidError = class extends Error {
     this.productId = id;
   }
 };
+var WCPOS_UUID_META_KEY = "_woocommerce_pos_uuid";
+function wooProductUuid(product) {
+  if (typeof product.uuid === "string" && product.uuid.length > 0) return product.uuid;
+  return product.meta_data?.find((entry) => entry.key === WCPOS_UUID_META_KEY && typeof entry.value === "string" && entry.value.length > 0)?.value;
+}
+function wooProductBarcode(product) {
+  if (typeof product.barcode === "string" && product.barcode.length > 0) return product.barcode;
+  if (typeof product.global_unique_id === "string" && product.global_unique_id.length > 0) return product.global_unique_id;
+  return void 0;
+}
 function toProductDocument(product) {
-  if (typeof product.uuid !== "string" || product.uuid.length === 0) throw new WooMissingUuidError(product.id);
-  return { ...product, _deleted: product.status !== "publish" };
+  const uuid = wooProductUuid(product);
+  if (uuid === void 0) throw new WooMissingUuidError(product.id);
+  const barcode = wooProductBarcode(product);
+  const projected = Object.fromEntries(Object.keys(wooProductSchema.properties).filter((key) => Object.prototype.hasOwnProperty.call(product, key)).map((key) => [key, product[key]]));
+  return { ...projected, uuid, ...barcode !== void 0 ? { barcode } : {}, _deleted: product.status !== "publish" };
 }
 var WooDateFilterError = class extends Error {
   constructor(productId, bound, received) {
@@ -391,6 +301,111 @@ var wooProductReplication = {
   }
 };
 
+// src/traits/product.ts
+var WOO_STOCK_STATUS = {
+  instock: "in_stock",
+  outofstock: "out_of_stock",
+  onbackorder: "backorder"
+};
+var wooProductTraits = {
+  getId: (doc) => String(doc.id),
+  getName: (doc) => doc.name ?? "",
+  getSku: (doc) => doc.sku || void 0,
+  getPrices: (doc, context) => {
+    const currency = context?.currency ?? "XXX";
+    const prices = [];
+    const base = moneyFromMajor(doc.regular_price || doc.price, currency);
+    if (base) prices.push({ ...base, kind: "base" });
+    const sale = doc.on_sale === true ? moneyFromMajor(doc.sale_price, currency) : void 0;
+    if (sale) prices.push({ ...sale, kind: "sale" });
+    return prices;
+  },
+  getStock: (doc) => ({
+    status: WOO_STOCK_STATUS[doc.stock_status] ?? "unknown",
+    quantity: doc.manage_stock === false ? void 0 : doc.stock_quantity ?? void 0
+  }),
+  getPrice: (doc) => doc.price || void 0,
+  getRegularPrice: (doc) => doc.regular_price || void 0,
+  getSalePrice: (doc) => doc.sale_price || void 0,
+  isOnSale: (doc) => doc.on_sale === true,
+  getImageUrl: (doc) => doc.images?.[0]?.src || void 0,
+  getImageUrls: (doc) => (doc.images ?? []).map((img) => img.src).filter(Boolean),
+  getDescription: (doc) => doc.short_description || doc.description || void 0,
+  getStockStatus: (doc) => {
+    const status = doc.stock_status;
+    if (status === "instock" || status === "outofstock" || status === "onbackorder") {
+      return status;
+    }
+    return "unknown";
+  },
+  getStockQuantity: (doc) => doc.stock_quantity ?? null,
+  hasVariants: (doc) => doc.type === "variable",
+  isSellable: (doc) => doc.status === void 0 || doc.status === "publish",
+  getVariantCount: (doc) => doc.type === "variable" ? doc.variations?.length ?? 0 : 1,
+  getType: (doc) => doc.type ?? "simple",
+  getBarcode: (doc) => wooProductBarcode(doc),
+  getCategoryNames: (doc) => (doc.categories ?? []).map((cat) => cat.name).filter(Boolean)
+};
+
+// src/sync/products.ts
+var wooProductSync = {
+  async fetchAllIds(context) {
+    const response = await fetch(`${context.baseUrl}/products`, {
+      headers: {
+        ...context.headers,
+        "Content-Type": "application/json"
+      },
+      signal: context.signal
+    });
+    if (!response.ok) {
+      throw new Error(`WooCommerce API error: ${response.status}`);
+    }
+    const products = await response.json();
+    return products.map((p) => ({
+      id: String(p.id),
+      dateModified: p.date_modified_gmt
+    }));
+  },
+  async fetchByIds(ids, context) {
+    const include = ids.join(",");
+    const response = await fetch(
+      `${context.baseUrl}/products?include=${include}&per_page=${ids.length}`,
+      {
+        headers: {
+          ...context.headers,
+          "Content-Type": "application/json"
+        },
+        signal: context.signal
+      }
+    );
+    if (!response.ok) {
+      throw new Error(`WooCommerce API error: ${response.status}`);
+    }
+    return response.json();
+  },
+  async fetchModifiedAfter(date, context) {
+    const params = new URLSearchParams({
+      modified_after: date,
+      dates_are_gmt: "true",
+      per_page: "100"
+    });
+    const response = await fetch(
+      `${context.baseUrl}/products?${params}`,
+      {
+        headers: {
+          ...context.headers,
+          "Content-Type": "application/json"
+        },
+        signal: context.signal
+      }
+    );
+    if (!response.ok) {
+      throw new Error(`WooCommerce API error: ${response.status}`);
+    }
+    return response.json();
+  }
+};
+
 // src/reconcile/catalogue.ts
 import { errorKind } from "@tallyui/core";
 var PAGE_SIZE = 100;
@@ -461,9 +476,9 @@ function wooCatalogueReconcile(feed) {
     async confirmGone(locals, context) {
       const ids = locals.map((doc) => doc.id).filter((id) => Number.isInteger(id));
       if (!ids.length) return [];
-      const params = new URLSearchParams({ include: ids.join(","), per_page: String(PAGE_SIZE), status: "any", _fields: "id,uuid,status" });
+      const params = new URLSearchParams({ include: ids.join(","), per_page: String(PAGE_SIZE), status: "any", _fields: "id,uuid,status,meta_data" });
       const rows = await get(`/products?${params}`, context);
-      const live = new Map(rows.filter((row) => row.status === "publish").map((row) => [row.id, typeof row.uuid === "string" && row.uuid.length > 0 ? row.uuid : void 0]));
+      const live = new Map(rows.filter((row) => row.status === "publish").map((row) => [row.id, wooProductUuid(row)]));
       return locals.filter((doc) => Number.isInteger(doc.id) && (!live.has(doc.id) || typeof live.get(doc.id) === "string" && live.get(doc.id) !== doc.uuid)).map((doc) => doc.uuid);
     },
     // An entry with no numeric id, locally or in the listing, is dropped: the store cannot be asked about it, so
@@ -495,7 +510,7 @@ function createWooReconcileFeed() {
 }
 
 // package.json
-var version = "3.0.0";
+var version = "3.0.1";
 
 // src/index.ts
 import { ConnectorUnauthorizedError as ConnectorUnauthorizedError3 } from "@tallyui/core";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tallyui/connector-woocommerce",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "type": "module",
   "description": "WooCommerce connector for Tally UI",
   "main": "./dist/index.js",
@@ -26,10 +26,10 @@
     "directory": "connectors/woocommerce"
   },
   "peerDependencies": {
-    "@tallyui/core": "^3.0.0"
+    "@tallyui/core": "^3.0.1"
   },
   "devDependencies": {
-    "@tallyui/database": "3.0.0",
+    "@tallyui/database": "3.0.1",
     "rxdb": "17.5.0"
   },
   "scripts": {

package/src/reconcile/catalogue.ts

@@ -1,5 +1,5 @@
 import { errorKind, type CatalogueReconcileAdapter, type CatalogueReconcileEntry, type ReconcileFeed, type SyncContext } from '@tallyui/core';
-import { checkResponse } from '../replication/products';
+import { checkResponse, wooProductUuid } from '../replication/products';
 
 /** The listing's page size, WordPress's per_page maximum. */
 const PAGE_SIZE = 100;
@@ -107,9 +107,9 @@ export function wooCatalogueReconcile(feed: Pick<ReconcileFeed<any>, 'enqueue'>)
       const ids = locals.map((doc) => doc.id).filter((id) => Number.isInteger(id));
       // An empty include= would list the whole store; a local without a numeric id has no proof and is kept.
       if (!ids.length) return [];
-      const params = new URLSearchParams({ include: ids.join(','), per_page: String(PAGE_SIZE), status: 'any', _fields: 'id,uuid,status' });
+      const params = new URLSearchParams({ include: ids.join(','), per_page: String(PAGE_SIZE), status: 'any', _fields: 'id,uuid,status,meta_data' });
       const rows: Array<{ id: number; uuid: string; status: string }> = await get(`/products?${params}`, context);
-      const live = new Map(rows.filter((row) => row.status === 'publish').map((row) => [row.id, typeof row.uuid === 'string' && row.uuid.length > 0 ? row.uuid : undefined]));
+      const live = new Map(rows.filter((row) => row.status === 'publish').map((row) => [row.id, wooProductUuid(row)]));
       // A live id backs only the store's uuid; other local copies are gone (#369).
       // A row without a uuid can't prove the local copy stale, so a live id keeps it (#375 review).
       return locals.filter((doc) => Number.isInteger(doc.id) && (!live.has(doc.id) || (typeof live.get(doc.id) === 'string' && live.get(doc.id) !== doc.uuid))).map((doc) => doc.uuid);

package/src/replication/products.ts

@@ -1,4 +1,5 @@
 import { ConnectorUnauthorizedError, type ReplicationAdapter } from '@tallyui/core';
+import { wooProductSchema } from '../schemas/products';
 
 export type WooProductCheckpoint = {
   /** Inclusive lower bound (date_modified_gmt) of the current pass; '' = the whole catalogue. */
@@ -65,13 +66,35 @@ export class WooMissingUuidError extends Error {
   }
 }
 
+/** WCPOS's own uuid meta key; 1.10.x sends the product uuid only here (Uuid_Handler.php:29). */
+export const WCPOS_UUID_META_KEY = '_woocommerce_pos_uuid';
+
+/** The product's uuid: top-level `uuid` (the `next` shape) wins, else the `_woocommerce_pos_uuid` meta (1.10.x). */
+export function wooProductUuid(product: any): string | undefined {
+  if (typeof product.uuid === 'string' && product.uuid.length > 0) return product.uuid;
+  return product.meta_data?.find((entry: any) =>
+    entry.key === WCPOS_UUID_META_KEY && typeof entry.value === 'string' && entry.value.length > 0)?.value;
+}
+
+/** The product's barcode: top-level `barcode` wins, else `global_unique_id` (WCPOS's default barcode field), else undefined. */
+export function wooProductBarcode(product: any): string | undefined {
+  if (typeof product.barcode === 'string' && product.barcode.length > 0) return product.barcode;
+  if (typeof product.global_unique_id === 'string' && product.global_unique_id.length > 0) return product.global_unique_id;
+  return undefined;
+}
+
 /**
  * One product row as the till stores it, the rule the pull and the reconcile feed share: a uuid is
  * required (WooMissingUuidError), and a product that is not published arrives deleted (#229).
  */
 export function toProductDocument(product: any): any {
-  if (typeof product.uuid !== 'string' || product.uuid.length === 0) throw new WooMissingUuidError(product.id);
-  return { ...product, _deleted: product.status !== 'publish' };
+  const uuid = wooProductUuid(product);
+  if (uuid === undefined) throw new WooMissingUuidError(product.id);
+  const barcode = wooProductBarcode(product);
+  const projected = Object.fromEntries(Object.keys(wooProductSchema.properties)
+    .filter((key) => Object.prototype.hasOwnProperty.call(product, key))
+    .map((key) => [key, product[key]]));
+  return { ...projected, uuid, ...(barcode !== undefined ? { barcode } : {}), _deleted: product.status !== 'publish' };
 }
 
 /** The store returned a product outside a modified_after window, so it does not apply the filter. */

package/src/traits/product.ts

@@ -1,5 +1,6 @@
 import { moneyFromMajor } from '@tallyui/core';
 import type { ProductPrice, ProductTraits, StockStatus } from '@tallyui/core';
+import { wooProductBarcode } from '../replication/products';
 
 /** WooCommerce's stock_status strings, mapped to the neutral enum. */
 const WOO_STOCK_STATUS: Record<string, StockStatus> = {
@@ -69,7 +70,7 @@ export const wooProductTraits: ProductTraits = {
 
   getType: (doc) => doc.type ?? 'simple',
 
-  getBarcode: (doc) => doc.barcode || undefined,
+  getBarcode: (doc) => wooProductBarcode(doc),
 
   getCategoryNames: (doc) =>
     (doc.categories ?? []).map((cat: any) => cat.name).filter(Boolean),