@develemit/commerce-server 0.7.0 → 0.8.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.8.0 (2026-11-12)
+
+### Features
+
+- `DELETE /admin/products/:id` permanently deletes a draft that has never been live and has no order lines (204), along with its image files and holds; otherwise 409 `PRODUCT_NOT_DELETABLE` with `reason: 'published' | 'has_orders'`. Migration `0009` adds `commerce_products.published_at` (set when a product first goes active; backfilled for existing non-draft products), and admin products report `everPublished`.
+- `orderEmailLines` returns `reference`, the short order reference to print in order emails instead of the full id.
+- `GET /admin/orders?q=` accepts the short reference (with or without the leading `#`).
+
+### Changes
+
+- `GET /admin/products/counts`: `live` counts active pieces with stock, and `sold` counts active pieces at zero stock, so a sold piece is no longer counted in both. Each chip's count equals the list its filter shows (`status=active&stock=in` / `status=active&stock=sold`). Upgrading shows lower Live numbers.
+
 ## 0.7.0 (2026-11-04)
 
 ### Features

package/README.md

@@ -132,6 +132,9 @@ onOrderPaid: async (order) => {
 },
 ```
 
+`lines.reference` is the short order reference (`#A1B2C3D4`, from
+`formatOrderRef` in contracts); print it instead of the full id.
+
 The result also has structured `items`, `subtotal`, `discount` (absent when
 no discount applied), `shipping`, `total` and `address` (absent for pickup).
 HTML output is `<tr>` / `<p>` fragments with `& < > " '` escaped. Override

package/dist/index.d.ts

@@ -214,6 +214,23 @@ declare const commerceSchema: {
                 identity: undefined;
                 generated: undefined;
             }, {}, {}>;
+            publishedAt: drizzle_orm_pg_core.PgColumn<{
+                name: "published_at";
+                tableName: "commerce_products";
+                dataType: "date";
+                columnType: "PgTimestamp";
+                data: Date;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: undefined;
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
             createdAt: drizzle_orm_pg_core.PgColumn<{
                 name: "created_at";
                 tableName: "commerce_products";
@@ -1899,6 +1916,7 @@ interface OrderEmailLinesHtml {
     address: string;
 }
 interface OrderEmailLines {
+    reference: string;
     items: EmailLine[];
     subtotal: EmailLine;
     discount?: EmailLine;

package/dist/index.js

@@ -82,6 +82,7 @@ var products = pgTable(
     quantity: integer("quantity").notNull().default(1),
     status: productStatus("status").notNull().default("draft"),
     featured: boolean("featured").notNull().default(false),
+    publishedAt: timestamp("published_at", { withTimezone: true }),
     createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
     updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow()
   },
@@ -331,9 +332,6 @@ async function setShippingRates(db, rates) {
   return listShippingRates(db);
 }
 
-// src/admin/images.ts
-import { Readable } from "stream";
-
 // src/admin/repo.ts
 import {
   and as and2,
@@ -438,14 +436,23 @@ async function setImageAlt(db, id, alt) {
 async function selectProductCounts(db) {
   const [row] = await db.select({
     all: sql2`count(*) filter (where ${products.status} <> 'archived')::int`,
-    live: sql2`count(*) filter (where ${products.status} = 'active')::int`,
+    live: sql2`count(*) filter (where ${products.status} = 'active' and ${products.quantity} > 0)::int`,
     draft: sql2`count(*) filter (where ${products.status} = 'draft')::int`,
-    sold: sql2`count(*) filter (where ${products.quantity} = 0)::int`,
+    sold: sql2`count(*) filter (where ${products.status} = 'active' and ${products.quantity} = 0)::int`,
     archived: sql2`count(*) filter (where ${products.status} = 'archived')::int`,
     incompleteDrafts: sql2`count(*) filter (where ${products.status} = 'draft' and (${products.name} = '' or ${products.priceCents} is null or ${products.category} is null))::int`
   }).from(products);
   return row;
 }
+async function productHasOrderLines(db, productId) {
+  const rows = await db.select({ id: orderItems.id }).from(orderItems).where(eq2(orderItems.productId, productId)).limit(1);
+  return rows.length > 0;
+}
+async function deleteProductRows(db, id) {
+  await db.delete(inventoryHolds).where(eq2(inventoryHolds.productId, id));
+  await db.delete(productImages).where(eq2(productImages.productId, id));
+  await db.delete(products).where(eq2(products.id, id));
+}
 
 // src/admin/service.ts
 import {
@@ -481,6 +488,17 @@ var ProductIncompleteError = class extends Error {
   missing;
   code = "PRODUCT_INCOMPLETE";
 };
+var ProductNotDeletableError = class extends Error {
+  constructor(reason) {
+    super(
+      reason === "published" ? "This product has been live, so it can only be archived" : "This product is on an order, so it can only be archived"
+    );
+    this.reason = reason;
+    this.name = "ProductNotDeletableError";
+  }
+  reason;
+  code = "PRODUCT_NOT_DELETABLE";
+};
 
 // src/admin/publish.ts
 function temporarySlug(id) {
@@ -529,6 +547,7 @@ function toAdminProduct({ row, images }) {
     quantity: row.quantity,
     status: row.status,
     featured: row.featured,
+    everPublished: row.publishedAt !== null,
     images: images.map((i) => ({
       id: i.id,
       url: i.url,
@@ -578,6 +597,7 @@ async function createAdminProduct(db, currency, input, { requirePhotoToPublish =
     const slug = uniqueSlug(base, await slugsStartingWith(tx, base));
     return insertProduct(tx, {
       ...data,
+      publishedAt: data.status === "active" ? /* @__PURE__ */ new Date() : void 0,
       id: newId,
       slug,
       currency: data.currency ?? currency
@@ -593,6 +613,9 @@ async function patchAdminProduct(db, id, input, { requirePhotoToPublish = true }
     assertPublishable(record, fields, photoNeeded);
   }
   const set = sold ? { ...fields, quantity: 0 } : { ...fields };
+  if (fields.status === "active" && !record.row.publishedAt) {
+    set.publishedAt = /* @__PURE__ */ new Date();
+  }
   const renames = fields.name && record.row.slug === temporarySlug(id);
   await db.transaction(async (tx) => {
     if (renames) {
@@ -607,6 +630,24 @@ async function getAdminProductCounts(db) {
   return selectProductCounts(db);
 }
 
+// src/admin/delete.ts
+async function deleteAdminProduct(db, storage, id) {
+  const { row, images } = await requireProduct(db, id);
+  if (row.status !== "draft" || row.publishedAt) {
+    throw new ProductNotDeletableError("published");
+  }
+  if (await productHasOrderLines(db, id)) {
+    throw new ProductNotDeletableError("has_orders");
+  }
+  await db.transaction((tx) => deleteProductRows(tx, id));
+  for (const image of images) {
+    if (image.storageKey) await storage.delete(image.storageKey);
+  }
+}
+
+// src/admin/images.ts
+import { Readable } from "stream";
+
 // src/admin/upload.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import { fileTypeFromBuffer } from "file-type";
@@ -712,6 +753,13 @@ var adminPlugin = async (app, { db, currency, authorize, storage, requirePhotoTo
         missing: err.missing
       });
     }
+    if (err instanceof ProductNotDeletableError) {
+      return reply.code(409).send({
+        error: err.code,
+        message: err.message,
+        reason: err.reason
+      });
+    }
     if (err instanceof InvalidCursorError || err instanceof InvalidImageError || err instanceof InvalidImageOrderError) {
       return reply.code(400).send({ error: err.code, message: err.message });
     }
@@ -752,6 +800,13 @@ var adminPlugin = async (app, { db, currency, authorize, storage, requirePhotoTo
       { requirePhotoToPublish }
     )
   );
+  app.delete(
+    "/products/:id",
+    async (req, reply) => {
+      await deleteAdminProduct(db, storage, req.params.id);
+      return reply.code(204).send();
+    }
+  );
   app.post(
     "/products/:id/images",
     async (req, reply) => {
@@ -1217,6 +1272,9 @@ import {
   shipOrderInputSchema
 } from "@develemit/commerce-contracts";
 
+// src/orders/admin-service.ts
+import { orderRefSearchTerm } from "@develemit/commerce-contracts";
+
 // src/orders/admin-repo.ts
 import { and as and5, desc as desc2, eq as eq5, ilike as ilike2, lt as lt3, or as or3, sql as sql5 } from "drizzle-orm";
 function escapeLike2(value) {
@@ -1488,7 +1546,7 @@ function decodeOrderCursor(raw) {
 async function listAdminOrders(db, query) {
   const rows = await selectOrderPage(db, {
     status: query.status,
-    q: query.q,
+    q: query.q ? orderRefSearchTerm(query.q) || void 0 : void 0,
     hasPendingRefund: query.hasPendingRefund,
     after: query.cursor ? decodeOrderCursor(query.cursor) : void 0,
     limit: query.limit + 1
@@ -3192,6 +3250,9 @@ function startHoldSweeper(db, { intervalMs = 6e4, onError } = {}) {
 }
 
 // src/emails/order-lines.ts
+import {
+  formatOrderRef
+} from "@develemit/commerce-contracts";
 var defaultLabels = {
   subtotal: "Subtotal",
   discount: (code) => code ? `Discount (${code})` : "Discount",
@@ -3255,6 +3316,7 @@ function orderEmailLines(order, options = {}) {
   const address = addressLines(order);
   const totals = [subtotal, ...discount ? [discount] : [], shipping, total];
   return {
+    reference: formatOrderRef(order.id),
     items,
     subtotal,
     discount,