@saastemly/voidcommerce 0.2.0 → 0.2.1

package/dist/catalog.js

@@ -14,7 +14,7 @@ import {
   SIGN_IN,
   TAX,
   UI
-} from "./index-yk361vn2.js";
+} from "./index-z4qazajn.js";
 export {
   UI,
   TAX,

package/dist/cli.js

@@ -22,16 +22,16 @@ import {
   runVoid,
   version,
   voidAppsIn
-} from "./index-9x9q9ng2.js";
+} from "./index-xdsp97e4.js";
 import {
   LAYOUTS,
   readManifest,
   validate,
   zoneOf
-} from "./index-0vt6g4cb.js";
+} from "./index-zh3tmj08.js";
 import {
   GROUPS
-} from "./index-yk361vn2.js";
+} from "./index-z4qazajn.js";
 
 // src/deploy/index.ts
 import color from "picocolors";

package/dist/generate/support.d.ts

@@ -20,4 +20,17 @@ export declare function renderNotificationsTs(): string;
  * because the choice lives on the line, not in the catalogue.
  */
 export declare function renderMintTs(): string;
+/**
+ * Where parcels leave from. Written once, then yours.
+ *
+ * Every carrier needs an origin to quote against, and it is shop data rather
+ * than a credential — a postcode changes when you move, not when a key
+ * rotates. So it is a file you edit, not an env var, and it ships with your
+ * own details already in the shape the carriers want.
+ *
+ * DHL in particular rejects a shipment whose origin has no name and phone,
+ * which is a failure that shows up at the first real order rather than at
+ * deploy, so both are marked rather than left blank.
+ */
+export declare function renderShippingTs(manifest: Manifest): string;
 export declare function renderErpTs(): string;

package/dist/{index-9x9q9ng2.js → index-xdsp97e4.js}

@@ -11,11 +11,11 @@ import {
   workerHosts,
   writeManifest,
   zone
-} from "./index-0vt6g4cb.js";
+} from "./index-zh3tmj08.js";
 import {
   CHOICES,
   __require
-} from "./index-yk361vn2.js";
+} from "./index-z4qazajn.js";
 
 // src/generate/auth.ts
 var VAT = {
@@ -41,14 +41,29 @@ function renderAuthTs(manifest) {
   const CARRIER_CALLS = {
     "dhl-express": {
       label: "DHL Express",
-      call: `dhlExpressProvider({ apiKey: must(env, "DHL_API_KEY") })`,
+      call: `dhlExpressProvider({ apiKey: must(env, "DHL_API_KEY"), apiSecret: must(env, "DHL_API_SECRET"), accountNumber: must(env, "DHL_ACCOUNT_NUMBER"), from: shipFrom })`,
       import: `import { dhlExpressProvider } from "@saastemly/better-commerce/providers/dhl-express";`
     },
-    shippo: { label: "Shippo", call: `shippoProvider({ apiKey: must(env, "SHIPPO_API_KEY") })`, import: `import { shippoProvider } from "@saastemly/better-commerce/providers/shippo";` },
-    easypost: { label: "EasyPost", call: `easypostProvider({ apiKey: must(env, "EASYPOST_API_KEY") })`, import: `import { easypostProvider } from "@saastemly/better-commerce/providers/easypost";` },
-    ups: { label: "UPS", call: `upsProvider({ clientId: must(env, "UPS_CLIENT_ID"), clientSecret: must(env, "UPS_CLIENT_SECRET") })`, import: `import { upsProvider } from "@saastemly/better-commerce/providers/ups";` },
-    fedex: { label: "FedEx", call: `fedexProvider({ clientId: must(env, "FEDEX_CLIENT_ID"), clientSecret: must(env, "FEDEX_CLIENT_SECRET") })`, import: `import { fedexProvider } from "@saastemly/better-commerce/providers/fedex";` },
-    "royal-mail": { label: "Royal Mail", call: `royalMailProvider({ clientId: must(env, "ROYAL_MAIL_CLIENT_ID") })`, import: `import { royalMailProvider } from "@saastemly/better-commerce/providers/royal-mail";` },
+    shippo: {
+      label: "Shippo",
+      call: `shippoProvider({ apiToken: must(env, "SHIPPO_API_TOKEN"), from: shipFrom })`,
+      import: `import { shippoProvider } from "@saastemly/better-commerce/providers/shippo";`
+    },
+    easypost: {
+      label: "EasyPost",
+      call: `easypostProvider({ apiKey: must(env, "EASYPOST_API_KEY"), from: shipFrom })`,
+      import: `import { easypostProvider } from "@saastemly/better-commerce/providers/easypost";`
+    },
+    ups: {
+      label: "UPS",
+      call: `upsProvider({ clientId: must(env, "UPS_CLIENT_ID"), clientSecret: must(env, "UPS_CLIENT_SECRET"), accountNumber: must(env, "UPS_ACCOUNT_NUMBER"), from: shipFrom })`,
+      import: `import { upsProvider } from "@saastemly/better-commerce/providers/ups";`
+    },
+    fedex: {
+      label: "FedEx",
+      call: `fedexProvider({ clientId: must(env, "FEDEX_CLIENT_ID"), clientSecret: must(env, "FEDEX_CLIENT_SECRET"), accountNumber: must(env, "FEDEX_ACCOUNT_NUMBER"), from: shipFrom })`,
+      import: `import { fedexProvider } from "@saastemly/better-commerce/providers/fedex";`
+    },
     nft: {
       label: "A token, not a parcel",
       call: `nftDelivery({ mint: mintProvider, destinationFor })`,
@@ -58,6 +73,8 @@ import { mintProvider, destinationFor } from "./lib/mint.ts";`
   };
   const carriers = Object.keys(CARRIER_CALLS).filter((id) => has(manifest, id));
   const carrierImports = carriers.map((id) => CARRIER_CALLS[id].import);
+  if (carriers.some((id) => id !== "nft"))
+    carrierImports.push(`import { shipFrom } from "./lib/shipping.ts";`);
   const wantsNft = has(manifest, "nft");
   const carrierFulfillment = carriers.length ? `, deliveryFulfillment([${carriers.map((id) => CARRIER_CALLS[id].call).join(", ")}])` : "";
   const nftDefault = carriers.length ? `, defaultProvider: "delivery:${carriers.join("+")}"` : "";
@@ -1419,7 +1436,7 @@ import color from "picocolors";
 // package.json
 var package_default = {
   name: "@saastemly/voidcommerce",
-  version: "0.2.0",
+  version: "0.2.1",
   description: "Void, with a shop in it. `vc init` walks you through Better Auth, betterCommerce and every plugin; everything else passes through to `void`.",
   type: "module",
   license: "MIT",
@@ -2197,6 +2214,25 @@ export async function destinationFor(orderId: string): Promise<string | null> {
 }
 `;
 }
+function renderShippingTs(manifest) {
+  return `import type { DeliveryAddress } from "@saastemly/better-commerce/providers/delivery";
+
+/**
+ * The address every parcel is quoted and shipped FROM.
+ *
+ * TODO VERIFY: this is a placeholder. A carrier quotes against it, and DHL
+ * refuses a shipment whose origin has no \`name\` and \`phone\`.
+ */
+export const shipFrom: DeliveryAddress = {
+	name: "${manifest.shop.name}",
+	line1: "TODO VERIFY: street",
+	city: "TODO VERIFY: town",
+	postalCode: "TODO VERIFY",
+	country: "${manifest.shop.country}",
+	phone: "TODO VERIFY: +44…",
+};
+`;
+}
 function renderErpTs() {
   return `import { businessCentralProvider } from "@saastemly/better-commerce/providers/business-central";
 import type { FulfillmentProvider } from "@saastemly/better-commerce/plugins/fulfillments";
@@ -2305,6 +2341,9 @@ async function generateApi(root, dir, manifest, result, opts) {
   if (has(manifest, "nft")) {
     await put(root, at("lib/mint.ts"), renderMintTs(), result, own);
   }
+  if (["dhl-express", "shippo", "easypost", "ups", "fedex"].some((id) => has(manifest, id))) {
+    await put(root, at("lib/shipping.ts"), renderShippingTs(manifest), result, own);
+  }
   if (has(manifest, "business-central")) {
     await put(root, at("lib/erp.ts"), renderErpTs(), result, own);
   }

package/dist/{index-yk361vn2.js → index-z4qazajn.js}

@@ -443,11 +443,11 @@ var CARRIERS = {
   intro: "Live rates at checkout, quoted per carrier. Flat-rate shipping needs none of these.",
   kind: "multiselect",
   choices: [
-    { id: "shippo", label: "Shippo", hint: "many carriers through one API", env: [{ key: "SHIPPO_API_KEY", breaks: "calculated rates fall back to flat" }] },
+    { id: "shippo", label: "Shippo", hint: "many carriers through one API", env: [{ key: "SHIPPO_API_TOKEN", breaks: "calculated rates fall back to flat" }] },
     { id: "easypost", label: "EasyPost", hint: "the same, US-leaning", env: [{ key: "EASYPOST_API_KEY", breaks: "calculated rates fall back to flat" }] },
-    { id: "ups", label: "UPS", hint: "your own UPS account, for negotiated rates an aggregator cannot see", env: [{ key: "UPS_CLIENT_ID", breaks: "UPS rates are not quoted" }, { key: "UPS_CLIENT_SECRET", breaks: "the same" }] },
-    { id: "fedex", label: "FedEx", hint: "your own FedEx account, for negotiated rates an aggregator cannot see", env: [{ key: "FEDEX_CLIENT_ID", breaks: "FedEx rates are not quoted" }, { key: "FEDEX_CLIENT_SECRET", breaks: "the same" }] },
-    { id: "dhl-express", label: "DHL Express", hint: "international", env: [{ key: "DHL_API_KEY", breaks: "DHL rates are not quoted" }] },
+    { id: "ups", label: "UPS", hint: "your own UPS account, for negotiated rates an aggregator cannot see", env: [{ key: "UPS_CLIENT_ID", breaks: "UPS rates are not quoted" }, { key: "UPS_CLIENT_SECRET", breaks: "the same" }, { key: "UPS_ACCOUNT_NUMBER", breaks: "UPS has no account to bill the transport to" }] },
+    { id: "fedex", label: "FedEx", hint: "your own FedEx account, for negotiated rates an aggregator cannot see", env: [{ key: "FEDEX_CLIENT_ID", breaks: "FedEx rates are not quoted" }, { key: "FEDEX_CLIENT_SECRET", breaks: "the same" }, { key: "FEDEX_ACCOUNT_NUMBER", breaks: "FedEx has no account to bill the transport to" }] },
+    { id: "dhl-express", label: "DHL Express", hint: "international express, and the one worth having for a shop that posts abroad", env: [{ key: "DHL_API_KEY", breaks: "DHL rates are not quoted" }, { key: "DHL_API_SECRET", breaks: "the same" }, { key: "DHL_ACCOUNT_NUMBER", breaks: "DHL has no account to bill the transport to" }] },
     { id: "usps", label: "USPS", hint: "US domestic post — the cheapest way to ship a small parcel inside the US", env: [{ key: "USPS_CLIENT_ID", breaks: "USPS rates are not quoted" }, { key: "USPS_CLIENT_SECRET", breaks: "the same" }] },
     { id: "royal-mail", label: "Royal Mail", hint: "UK post, for a shop whose customers are mostly in Britain", env: [{ key: "ROYAL_MAIL_CLIENT_ID", breaks: "Royal Mail rates are not quoted" }] },
     { id: "aramex", label: "Aramex", hint: "the carrier to reach the Gulf and wider Middle East reliably", env: [{ key: "ARAMEX_API_KEY", breaks: "Aramex rates are not quoted" }] },

package/dist/{index-0vt6g4cb.js → index-zh3tmj08.js}

@@ -1,7 +1,7 @@
 import {
   CHOICES,
   GROUPS
-} from "./index-yk361vn2.js";
+} from "./index-z4qazajn.js";
 
 // src/manifest.ts
 import { readFile, writeFile } from "node:fs/promises";

package/dist/index.js

@@ -57,7 +57,7 @@ import {
   routeProblem,
   strictDependencies,
   upsertJsonc
-} from "./index-9x9q9ng2.js";
+} from "./index-xdsp97e4.js";
 import {
   LAYOUTS,
   MANIFEST_FILE,
@@ -77,7 +77,7 @@ import {
   writeManifest,
   zone,
   zoneOf
-} from "./index-0vt6g4cb.js";
+} from "./index-zh3tmj08.js";
 import {
   AUTH_PLUGINS,
   CARRIERS,
@@ -94,7 +94,7 @@ import {
   SIGN_IN,
   TAX,
   UI
-} from "./index-yk361vn2.js";
+} from "./index-z4qazajn.js";
 export {
   zoneOf,
   zone,

package/dist/manifest.js

@@ -17,8 +17,8 @@ import {
   writeManifest,
   zone,
   zoneOf
-} from "./index-0vt6g4cb.js";
-import"./index-yk361vn2.js";
+} from "./index-zh3tmj08.js";
+import"./index-z4qazajn.js";
 export {
   zoneOf,
   zone,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saastemly/voidcommerce",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Void, with a shop in it. `vc init` walks you through Better Auth, betterCommerce and every plugin; everything else passes through to `void`.",
   "type": "module",
   "license": "MIT",

package/src/catalog.ts

@@ -513,11 +513,11 @@ export const CARRIERS: Group = {
 	intro: "Live rates at checkout, quoted per carrier. Flat-rate shipping needs none of these.",
 	kind: "multiselect",
 	choices: [
-		{ id: "shippo", label: "Shippo", hint: "many carriers through one API", env: [{ key: "SHIPPO_API_KEY", breaks: "calculated rates fall back to flat" }] },
+		{ id: "shippo", label: "Shippo", hint: "many carriers through one API", env: [{ key: "SHIPPO_API_TOKEN", breaks: "calculated rates fall back to flat" }] },
 		{ id: "easypost", label: "EasyPost", hint: "the same, US-leaning", env: [{ key: "EASYPOST_API_KEY", breaks: "calculated rates fall back to flat" }] },
-		{ id: "ups", label: "UPS", hint: "your own UPS account, for negotiated rates an aggregator cannot see", env: [{ key: "UPS_CLIENT_ID", breaks: "UPS rates are not quoted" }, { key: "UPS_CLIENT_SECRET", breaks: "the same" }] },
-		{ id: "fedex", label: "FedEx", hint: "your own FedEx account, for negotiated rates an aggregator cannot see", env: [{ key: "FEDEX_CLIENT_ID", breaks: "FedEx rates are not quoted" }, { key: "FEDEX_CLIENT_SECRET", breaks: "the same" }] },
-		{ id: "dhl-express", label: "DHL Express", hint: "international", env: [{ key: "DHL_API_KEY", breaks: "DHL rates are not quoted" }] },
+		{ id: "ups", label: "UPS", hint: "your own UPS account, for negotiated rates an aggregator cannot see", env: [{ key: "UPS_CLIENT_ID", breaks: "UPS rates are not quoted" }, { key: "UPS_CLIENT_SECRET", breaks: "the same" }, { key: "UPS_ACCOUNT_NUMBER", breaks: "UPS has no account to bill the transport to" }] },
+		{ id: "fedex", label: "FedEx", hint: "your own FedEx account, for negotiated rates an aggregator cannot see", env: [{ key: "FEDEX_CLIENT_ID", breaks: "FedEx rates are not quoted" }, { key: "FEDEX_CLIENT_SECRET", breaks: "the same" }, { key: "FEDEX_ACCOUNT_NUMBER", breaks: "FedEx has no account to bill the transport to" }] },
+		{ id: "dhl-express", label: "DHL Express", hint: "international express, and the one worth having for a shop that posts abroad", env: [{ key: "DHL_API_KEY", breaks: "DHL rates are not quoted" }, { key: "DHL_API_SECRET", breaks: "the same" }, { key: "DHL_ACCOUNT_NUMBER", breaks: "DHL has no account to bill the transport to" }] },
 		{ id: "usps", label: "USPS", hint: "US domestic post — the cheapest way to ship a small parcel inside the US", env: [{ key: "USPS_CLIENT_ID", breaks: "USPS rates are not quoted" }, { key: "USPS_CLIENT_SECRET", breaks: "the same" }] },
 		{ id: "royal-mail", label: "Royal Mail", hint: "UK post, for a shop whose customers are mostly in Britain", env: [{ key: "ROYAL_MAIL_CLIENT_ID", breaks: "Royal Mail rates are not quoted" }] },
 		{ id: "aramex", label: "Aramex", hint: "the carrier to reach the Gulf and wider Middle East reliably", env: [{ key: "ARAMEX_API_KEY", breaks: "Aramex rates are not quoted" }] },

package/src/generate/auth.ts

@@ -66,16 +66,33 @@ export function renderAuthTs(manifest: Manifest): string {
 	 * follows — including the token, which quotes zero and ships nothing.
 	 */
 	const CARRIER_CALLS: Record<string, { call: string; label: string; import: string }> = {
+		// Every real carrier needs the ORIGIN it ships from, which is shop data
+		// rather than a credential — so it lives in an owned lib/shipping.ts.
 		"dhl-express": {
 			label: "DHL Express",
-			call: `dhlExpressProvider({ apiKey: must(env, "DHL_API_KEY") })`,
+			call: `dhlExpressProvider({ apiKey: must(env, "DHL_API_KEY"), apiSecret: must(env, "DHL_API_SECRET"), accountNumber: must(env, "DHL_ACCOUNT_NUMBER"), from: shipFrom })`,
 			import: `import { dhlExpressProvider } from "@saastemly/better-commerce/providers/dhl-express";`,
 		},
-		shippo: { label: "Shippo", call: `shippoProvider({ apiKey: must(env, "SHIPPO_API_KEY") })`, import: `import { shippoProvider } from "@saastemly/better-commerce/providers/shippo";` },
-		easypost: { label: "EasyPost", call: `easypostProvider({ apiKey: must(env, "EASYPOST_API_KEY") })`, import: `import { easypostProvider } from "@saastemly/better-commerce/providers/easypost";` },
-		ups: { label: "UPS", call: `upsProvider({ clientId: must(env, "UPS_CLIENT_ID"), clientSecret: must(env, "UPS_CLIENT_SECRET") })`, import: `import { upsProvider } from "@saastemly/better-commerce/providers/ups";` },
-		fedex: { label: "FedEx", call: `fedexProvider({ clientId: must(env, "FEDEX_CLIENT_ID"), clientSecret: must(env, "FEDEX_CLIENT_SECRET") })`, import: `import { fedexProvider } from "@saastemly/better-commerce/providers/fedex";` },
-		"royal-mail": { label: "Royal Mail", call: `royalMailProvider({ clientId: must(env, "ROYAL_MAIL_CLIENT_ID") })`, import: `import { royalMailProvider } from "@saastemly/better-commerce/providers/royal-mail";` },
+		shippo: {
+			label: "Shippo",
+			call: `shippoProvider({ apiToken: must(env, "SHIPPO_API_TOKEN"), from: shipFrom })`,
+			import: `import { shippoProvider } from "@saastemly/better-commerce/providers/shippo";`,
+		},
+		easypost: {
+			label: "EasyPost",
+			call: `easypostProvider({ apiKey: must(env, "EASYPOST_API_KEY"), from: shipFrom })`,
+			import: `import { easypostProvider } from "@saastemly/better-commerce/providers/easypost";`,
+		},
+		ups: {
+			label: "UPS",
+			call: `upsProvider({ clientId: must(env, "UPS_CLIENT_ID"), clientSecret: must(env, "UPS_CLIENT_SECRET"), accountNumber: must(env, "UPS_ACCOUNT_NUMBER"), from: shipFrom })`,
+			import: `import { upsProvider } from "@saastemly/better-commerce/providers/ups";`,
+		},
+		fedex: {
+			label: "FedEx",
+			call: `fedexProvider({ clientId: must(env, "FEDEX_CLIENT_ID"), clientSecret: must(env, "FEDEX_CLIENT_SECRET"), accountNumber: must(env, "FEDEX_ACCOUNT_NUMBER"), from: shipFrom })`,
+			import: `import { fedexProvider } from "@saastemly/better-commerce/providers/fedex";`,
+		},
 		nft: {
 			label: "A token, not a parcel",
 			call: `nftDelivery({ mint: mintProvider, destinationFor })`,
@@ -84,6 +101,8 @@ export function renderAuthTs(manifest: Manifest): string {
 	};
 	const carriers = Object.keys(CARRIER_CALLS).filter((id) => has(manifest, id));
 	const carrierImports = carriers.map((id) => CARRIER_CALLS[id]!.import);
+	// The token needs no origin; every other carrier does.
+	if (carriers.some((id) => id !== "nft")) carrierImports.push(`import { shipFrom } from "./lib/shipping.ts";`);
 	const wantsNft = has(manifest, "nft");
 	// One bridge for every carrier: which ships is decided by whose rate the
 	// buyer paid for, so a token order mints and a parcel order posts.

package/src/generate/index.ts

@@ -50,7 +50,7 @@ import {
 	renderVoidPatch,
 	strictDependencies,
 } from "./strict";
-import { renderDomainTs, renderErpTs, renderMintTs, renderNotificationsTs, renderPaymentTs } from "./support";
+import { renderDomainTs, renderErpTs, renderMintTs, renderNotificationsTs, renderPaymentTs, renderShippingTs } from "./support";
 
 /**
  * Turn a manifest into files.
@@ -173,6 +173,10 @@ async function generateApi(root: string, dir: string, manifest: Manifest, result
 	if (has(manifest, "nft")) {
 		await put(root, at("lib/mint.ts"), renderMintTs(), result, own);
 	}
+	// Any carrier but the token quotes against an origin, which is shop data.
+	if (["dhl-express", "shippo", "easypost", "ups", "fedex"].some((id) => has(manifest, id))) {
+		await put(root, at("lib/shipping.ts"), renderShippingTs(manifest), result, own);
+	}
 	if (has(manifest, "business-central")) {
 		await put(root, at("lib/erp.ts"), renderErpTs(), result, own);
 	}

package/src/generate/support.ts

@@ -258,6 +258,38 @@ export async function destinationFor(orderId: string): Promise<string | null> {
 `;
 }
 
+/**
+ * Where parcels leave from. Written once, then yours.
+ *
+ * Every carrier needs an origin to quote against, and it is shop data rather
+ * than a credential — a postcode changes when you move, not when a key
+ * rotates. So it is a file you edit, not an env var, and it ships with your
+ * own details already in the shape the carriers want.
+ *
+ * DHL in particular rejects a shipment whose origin has no name and phone,
+ * which is a failure that shows up at the first real order rather than at
+ * deploy, so both are marked rather than left blank.
+ */
+export function renderShippingTs(manifest: Manifest): string {
+	return `import type { DeliveryAddress } from "@saastemly/better-commerce/providers/delivery";
+
+/**
+ * The address every parcel is quoted and shipped FROM.
+ *
+ * TODO VERIFY: this is a placeholder. A carrier quotes against it, and DHL
+ * refuses a shipment whose origin has no \`name\` and \`phone\`.
+ */
+export const shipFrom: DeliveryAddress = {
+	name: "${manifest.shop.name}",
+	line1: "TODO VERIFY: street",
+	city: "TODO VERIFY: town",
+	postalCode: "TODO VERIFY",
+	country: "${manifest.shop.country}",
+	phone: "TODO VERIFY: +44…",
+};
+`;
+}
+
 export function renderErpTs(): string {
 	return `import { businessCentralProvider } from "@saastemly/better-commerce/providers/business-central";
 import type { FulfillmentProvider } from "@saastemly/better-commerce/plugins/fulfillments";