@01.software/init 0.10.0 → 0.10.1

package/dist/create-app-templates/ecommerce/lib/commerce/adapters/software.ts

@@ -49,6 +49,7 @@ type CartItemDoc = {
   quantity?: number | null
   unitPrice?: number | null
   discountedTotalPrice?: number | null
+  requiresShipping?: boolean | null
 }
 
 type CartDoc = {
@@ -127,7 +128,6 @@ export type SoftwareSdkClientLike = {
         where?: unknown
         joins?: boolean
       }) => Promise<{ docs: unknown[]; totalDocs?: number }>
-      update: (id: string, data: Record<string, unknown>) => Promise<unknown>
     }
   }
   commerce: {
@@ -171,8 +171,17 @@ export type SoftwareSdkClientLike = {
     orders: {
       checkout: (params: {
         cartId: string
+        cartToken?: string
         orderNumber: string
         customerSnapshot: CustomerSnapshotInput
+        shippingAddress?: {
+          recipientName: string
+          phone: string
+          postalCode: string
+          address: string
+          detailAddress: string
+          deliveryMessage?: string
+        }
         idempotencyKey?: string
       }) => Promise<OrderDoc>
       confirmPaymentReturningOrder: (params: {
@@ -372,28 +381,12 @@ export function buildSoftwareCommerceProvider(
       if (!cartId || lines.length === 0) {
         throw new Error('Cart is empty')
       }
-
-      // The order snapshots `shippingAddress` from the cart, and checkout only
-      // accepts `customerSnapshot` — so persist the buyer-entered address on the
-      // cart first. These fields are caller-writable (only the amount fields are
-      // read-only). Shipping was already computed by the cart on each item
-      // mutation; the base fee does not depend on the address for the default
-      // policy (postalCode-driven zone surcharge recompute is owned by the
-      // Console cart shipping-authority work, not the template).
-      await client.collections.from('carts').update(cartId, {
-        email: input.customerSnapshot.email,
-        shippingAddress: {
-          recipientName: input.shippingAddress.recipientName,
-          phone: input.shippingAddress.phone,
-          postalCode: input.shippingAddress.postalCode,
-          address: input.shippingAddress.address,
-          detailAddress: input.shippingAddress.detailAddress,
-          deliveryMessage: input.shippingAddress.deliveryMessage ?? '',
-        },
-        ...(input.shippingAddress.deliveryMessage
-          ? { customerNote: input.shippingAddress.deliveryMessage }
-          : {}),
-      })
+      const hasShippableItems = lines.some(
+        (item) => item.requiresShipping !== false,
+      )
+      if (hasShippableItems && !input.shippingAddress) {
+        throw new Error('Shipping address is required')
+      }
 
       const orderNumber = generateOrderNumber()
       // pgPaymentId is minted template-side AFTER checkout (the design's "mint
@@ -407,12 +400,25 @@ export function buildSoftwareCommerceProvider(
 
       const placed = await client.commerce.orders.checkout({
         cartId,
+        cartToken: input.cartToken,
         orderNumber,
         customerSnapshot: {
           name: input.customerSnapshot.name,
           email: input.customerSnapshot.email,
           phone: input.customerSnapshot.phone,
         },
+        ...(input.shippingAddress
+          ? {
+              shippingAddress: {
+                recipientName: input.shippingAddress.recipientName,
+                phone: input.shippingAddress.phone,
+                postalCode: input.shippingAddress.postalCode,
+                address: input.shippingAddress.address,
+                detailAddress: input.shippingAddress.detailAddress,
+                deliveryMessage: input.shippingAddress.deliveryMessage,
+              },
+            }
+          : {}),
         idempotencyKey: `checkout-${orderNumber}`,
       })
 
@@ -420,7 +426,9 @@ export function buildSoftwareCommerceProvider(
         fallbackOrderNumber: orderNumber,
         contact: {
           customerSnapshot: input.customerSnapshot,
-          shippingAddress: input.shippingAddress,
+          ...(input.shippingAddress
+            ? { shippingAddress: input.shippingAddress }
+            : {}),
         },
       })
 
@@ -566,6 +574,9 @@ export function buildSoftwareCommerceProvider(
           quantity,
           unitAmount,
           lineAmount,
+          ...(item.requiresShipping !== undefined
+            ? { requiresShipping: item.requiresShipping }
+            : {}),
           productTitle: summary?.title ?? 'Product',
           variantTitle: variant?.title,
           image: variant?.images[0] ?? summary?.image ?? null,
@@ -635,7 +646,9 @@ function createSoftwareCustomerProvider(token: string): CommerceProvider {
  * client. Logged-in `createCart()` therefore mints a **customer-bound** cart
  * (the JWT auto-binds `customer`), never a guest cart.
  */
-export function createSoftwareCustomerCartProvider(token: string): CartProvider {
+export function createSoftwareCustomerCartProvider(
+  token: string,
+): CartProvider {
   return createSoftwareCustomerProvider(token)
 }
 
@@ -758,7 +771,7 @@ function mapOrder(
     fallbackOrderNumber?: string
     contact?: {
       customerSnapshot: Order['customerSnapshot']
-      shippingAddress: Order['shippingAddress']
+      shippingAddress?: Order['shippingAddress']
     }
   } = {},
 ): Order {
@@ -805,32 +818,36 @@ function mapOrder(
         opts.contact?.customerSnapshot.phone ??
         '',
     },
-    shippingAddress: {
-      recipientName:
-        order.shippingAddress?.recipientName ??
-        opts.contact?.shippingAddress.recipientName ??
-        '',
-      phone:
-        order.shippingAddress?.phone ??
-        opts.contact?.shippingAddress.phone ??
-        '',
-      postalCode:
-        order.shippingAddress?.postalCode ??
-        opts.contact?.shippingAddress.postalCode ??
-        '',
-      address:
-        order.shippingAddress?.address ??
-        opts.contact?.shippingAddress.address ??
-        '',
-      detailAddress:
-        order.shippingAddress?.detailAddress ??
-        opts.contact?.shippingAddress.detailAddress ??
-        '',
-      deliveryMessage:
-        order.shippingAddress?.deliveryMessage ??
-        opts.contact?.shippingAddress.deliveryMessage ??
-        '',
-    },
+    ...(order.shippingAddress || opts.contact?.shippingAddress
+      ? {
+          shippingAddress: {
+            recipientName:
+              order.shippingAddress?.recipientName ??
+              opts.contact?.shippingAddress?.recipientName ??
+              '',
+            phone:
+              order.shippingAddress?.phone ??
+              opts.contact?.shippingAddress?.phone ??
+              '',
+            postalCode:
+              order.shippingAddress?.postalCode ??
+              opts.contact?.shippingAddress?.postalCode ??
+              '',
+            address:
+              order.shippingAddress?.address ??
+              opts.contact?.shippingAddress?.address ??
+              '',
+            detailAddress:
+              order.shippingAddress?.detailAddress ??
+              opts.contact?.shippingAddress?.detailAddress ??
+              '',
+            deliveryMessage:
+              order.shippingAddress?.deliveryMessage ??
+              opts.contact?.shippingAddress?.deliveryMessage ??
+              '',
+          },
+        }
+      : {}),
     subtotalAmount: order.subtotalAmount ?? 0,
     shippingAmount: order.shippingAmount ?? 0,
     totalAmount: order.totalAmount ?? 0,

package/dist/create-app-templates/ecommerce/lib/commerce/types.ts

@@ -1,63 +1,64 @@
 export type CommerceImage = {
-  url: string;
-  alt?: string;
-  width?: number;
-  height?: number;
-};
+  url: string
+  alt?: string
+  width?: number
+  height?: number
+}
 
 export type Product = {
-  id: string;
-  slug: string;
-  title: string;
-  description?: string;
-  thumbnail?: CommerceImage | null;
-  images: CommerceImage[];
-  status: "draft" | "published" | "archived";
-};
+  id: string
+  slug: string
+  title: string
+  description?: string
+  thumbnail?: CommerceImage | null
+  images: CommerceImage[]
+  status: 'draft' | 'published' | 'archived'
+}
 
 export type ProductDetail = {
-  product: Product;
-  variants: ProductVariant[];
-  options: ProductOption[];
-};
+  product: Product
+  variants: ProductVariant[]
+  options: ProductOption[]
+}
 
 export type ProductOption = {
-  id: string;
-  slug: string;
-  title: string;
-  values: ProductOptionValue[];
-};
+  id: string
+  slug: string
+  title: string
+  values: ProductOptionValue[]
+}
 
 export type ProductOptionValue = {
-  id: string;
-  slug: string;
-  value: string;
-};
+  id: string
+  slug: string
+  value: string
+}
 
 export type ProductVariantOptionValue = {
-  optionId: string;
-  valueId: string;
-  valueSlug: string;
-  value: string;
-};
+  optionId: string
+  valueId: string
+  valueSlug: string
+  value: string
+}
 
 export type ProductVariant = {
-  id: string;
-  productId: string;
-  title?: string;
-  sku?: string;
-  price: number;
-  stock: number;
-  reservedStock: number;
-  isUnlimited: boolean;
-  optionValues: ProductVariantOptionValue[];
-  images: CommerceImage[];
-};
+  id: string
+  productId: string
+  title?: string
+  sku?: string
+  price: number
+  stock: number
+  reservedStock: number
+  isUnlimited: boolean
+  requiresShipping?: boolean | null
+  optionValues: ProductVariantOptionValue[]
+  images: CommerceImage[]
+}
 
 export type CartLine = {
-  variantId: string;
-  quantity: number;
-};
+  variantId: string
+  quantity: number
+}
 
 /**
  * Reference used to add a line to the server cart. The catalog identity
@@ -65,11 +66,11 @@ export type CartLine = {
  * cart, not the browser, owns price and stock.
  */
 export type CartItemRef = {
-  productId: string;
-  variantId: string;
-  optionId?: string;
-  quantity: number;
-};
+  productId: string
+  variantId: string
+  optionId?: string
+  quantity: number
+}
 
 /**
  * A single line of the server cart, enriched with catalog display fields so the
@@ -77,16 +78,17 @@ export type CartItemRef = {
  * handle used by update/remove.
  */
 export type CartItemView = {
-  cartItemId: string;
-  productId: string;
-  variantId: string;
-  quantity: number;
-  unitAmount: number;
-  lineAmount: number;
-  productTitle: string;
-  variantTitle?: string;
-  image?: CommerceImage | null;
-};
+  cartItemId: string
+  productId: string
+  variantId: string
+  quantity: number
+  unitAmount: number
+  lineAmount: number
+  requiresShipping?: boolean | null
+  productTitle: string
+  variantTitle?: string
+  image?: CommerceImage | null
+}
 
 /**
  * The server cart projected for the storefront. `id` is the cart's DB id used
@@ -96,95 +98,95 @@ export type CartItemView = {
  * computed and stored by the Console cart).
  */
 export type CartView = {
-  id: string;
-  currency: string;
-  subtotalAmount: number;
-  shippingAmount: number;
-  discountAmount: number;
-  totalAmount: number;
-  discountCode?: string;
-  items: CartItemView[];
-};
+  id: string
+  currency: string
+  subtotalAmount: number
+  shippingAmount: number
+  discountAmount: number
+  totalAmount: number
+  discountCode?: string
+  items: CartItemView[]
+}
 
 export type ShippingPolicy = {
-  currency: string;
-  baseAmount: number;
-  freeAboveAmount?: number;
-};
+  currency: string
+  baseAmount: number
+  freeAboveAmount?: number
+}
 
 export type PricedOrderLine = CartLine & {
-  unitAmount: number;
-  lineAmount: number;
-  variant: ProductVariant;
-};
+  unitAmount: number
+  lineAmount: number
+  variant: ProductVariant
+}
 
 export type PricedOrder = {
-  currency: string;
-  lines: PricedOrderLine[];
-  subtotalAmount: number;
-  shippingAmount: number;
-  totalAmount: number;
-};
+  currency: string
+  lines: PricedOrderLine[]
+  subtotalAmount: number
+  shippingAmount: number
+  totalAmount: number
+}
 
 export type StockCheckLine = CartLine & {
-  availableQuantity: number | null;
-  ok: boolean;
-  reason?: "variant_not_found" | "insufficient_stock";
-};
+  availableQuantity: number | null
+  ok: boolean
+  reason?: 'variant_not_found' | 'insufficient_stock'
+}
 
 export type StockCheckResult = {
-  ok: boolean;
-  lines: StockCheckLine[];
-};
+  ok: boolean
+  lines: StockCheckLine[]
+}
 
 export type CustomerSnapshot = {
-  name: string;
-  email: string;
-  phone: string;
-};
+  name: string
+  email: string
+  phone: string
+}
 
 export type ShippingAddress = {
-  recipientName: string;
-  phone: string;
-  postalCode: string;
-  address: string;
-  detailAddress: string;
-  deliveryMessage?: string;
-};
+  recipientName: string
+  phone: string
+  postalCode: string
+  address: string
+  detailAddress: string
+  deliveryMessage?: string
+}
 
 export type OrderItem = {
-  variantId: string;
-  productTitle: string;
-  variantTitle?: string;
-  quantity: number;
-  unitAmount: number;
-  lineAmount: number;
-};
+  variantId: string
+  productTitle: string
+  variantTitle?: string
+  quantity: number
+  unitAmount: number
+  lineAmount: number
+}
 
 export type PaymentTransaction = {
-  paymentId: string;
-  provider: string;
-  status: "pending" | "paid" | "failed" | "canceled";
-  amount: number;
-};
+  paymentId: string
+  provider: string
+  status: 'pending' | 'paid' | 'failed' | 'canceled'
+  amount: number
+}
 
 export type Order = {
-  id: string;
-  orderNumber: string;
-  displayStatus: "pending" | "paid" | "canceled";
-  items: OrderItem[];
-  customerSnapshot: CustomerSnapshot;
-  shippingAddress: ShippingAddress;
-  subtotalAmount: number;
-  shippingAmount: number;
-  totalAmount: number;
-  transactions: PaymentTransaction[];
-};
+  id: string
+  orderNumber: string
+  displayStatus: 'pending' | 'paid' | 'canceled'
+  items: OrderItem[]
+  customerSnapshot: CustomerSnapshot
+  shippingAddress?: ShippingAddress
+  subtotalAmount: number
+  shippingAmount: number
+  totalAmount: number
+  transactions: PaymentTransaction[]
+}
 
 export type ProductListResult = {
-  products: ProductDetail[];
-  total: number;
-};
+  products: ProductDetail[]
+  total: number
+}
 
 /**
  * Checkout input. The cart contents live server-side (addressed by `cartToken`
@@ -192,15 +194,15 @@ export type ProductListResult = {
  * snapshot. No client-supplied lines or totals — the cart is the quote.
  */
 export type CheckoutCartInput = {
-  cartToken: string;
-  customerSnapshot: CustomerSnapshot;
-  shippingAddress: ShippingAddress;
-};
+  cartToken: string
+  customerSnapshot: CustomerSnapshot
+  shippingAddress?: ShippingAddress
+}
 
 export type CreatePendingOrderResult = {
-  order: Order;
-  paymentId: string;
-  paymentName: string;
-  amount: number;
-  currency: string;
-};
+  order: Order
+  paymentId: string
+  paymentName: string
+  amount: number
+  currency: string
+}

package/dist/create-app-templates/ecommerce/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecommerce",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": true,
   "type": "module",
   "scripts": {
@@ -12,7 +12,7 @@
     "check-types": "next typegen && tsc --noEmit"
   },
   "dependencies": {
-    "@01.software/sdk": "^0.42.0",
+    "@01.software/sdk": "^0.43.0",
     "@portone/browser-sdk": "^0.1.8",
     "@portone/server-sdk": "^0.19.0",
     "@tosspayments/tosspayments-sdk": "^2.7.0",

package/dist/create-app-templates/ecommerce/tests/customer-cart.test.ts

@@ -254,8 +254,14 @@ function fakeCheckoutSdkClient(calls: string[]) {
         },
       },
       orders: {
-        async checkout(params: { cartId: string }) {
-          calls.push(`commerce.orders.checkout:${params.cartId}`);
+        async checkout(params: {
+          cartId: string;
+          cartToken?: string;
+          shippingAddress?: { postalCode?: string };
+        }) {
+          calls.push(
+            `commerce.orders.checkout:${params.cartId}:${params.cartToken ?? ""}:${params.shippingAddress?.postalCode ?? ""}`,
+          );
           if (params.cartId === "cart_other") {
             throw Object.assign(new Error("Forbidden"), { status: 403 });
           }
@@ -287,10 +293,6 @@ function fakeCheckoutSdkClient(calls: string[]) {
             calls.push(`collections.${slug}.find`);
             return { docs: [] };
           },
-          async update(id: string) {
-            calls.push(`collections.${slug}.update:${id}`);
-            return {};
-          },
         };
       },
     },
@@ -322,8 +324,11 @@ test("customer checkout provider: own cart checks out through the bound SDK clie
 
   assert.equal(pending.order.orderNumber, "ORD-1");
   assert.ok(calls.includes("commerce.cart.get:cart_owned_token"));
-  assert.ok(calls.includes("collections.carts.update:cart_owned"));
-  assert.ok(calls.includes("commerce.orders.checkout:cart_owned"));
+  assert.ok(
+    calls.includes(
+      "commerce.orders.checkout:cart_owned:cart_owned_token:04524",
+    ),
+  );
 });
 
 test("customer checkout provider: another customer's cart is rejected by the SDK boundary", async () => {
@@ -352,7 +357,11 @@ test("customer checkout provider: another customer's cart is rejected by the SDK
     Object.assign(new Error("Forbidden"), { status: 403 }),
   );
 
-  assert.ok(calls.includes("commerce.orders.checkout:cart_other"));
+  assert.ok(
+    calls.includes(
+      "commerce.orders.checkout:cart_other:cart_other_token:04524",
+    ),
+  );
 });
 
 // ---- logout clears both the session JWT and the cart cookie ---------------