@shop-on/theme-server 0.1.0 → 0.2.0

package/dist/analytics-proxy.js

@@ -1,3 +1,4 @@
+import { requestTraceHeaders } from "./trace.js";
 import { getStorefrontToken, storefrontApiUrl } from "./graphql.js";
 import { isIP } from "node:net";
 //#region src/analytics-proxy.ts
@@ -8,7 +9,8 @@ const PATHS = {
 async function proxyAnalytics({ endpoint, body, visitToken, visitorToken, userAgent, clientIp, fbp, fbc, eventSourceUrl }) {
 	const headers = {
 		Authorization: `Bearer ${await getStorefrontToken()}`,
-		"Content-Type": "application/json"
+		"Content-Type": "application/json",
+		...requestTraceHeaders()
 	};
 	if (visitToken) headers["Ahoy-Visit"] = visitToken;
 	if (visitorToken) headers["Ahoy-Visitor"] = visitorToken;

package/dist/cart-session.d.ts

@@ -1,10 +1,8 @@
-import { useSession } from "@tanstack/react-start/server";
+import { SealedSession } from "@shop-on/customer-runtime/sealed-session";
 //#region src/cart-session.d.ts
 export interface CartSessionData {
   token?: string;
   expiresAtMs?: number;
 }
-type CartSession = ReturnType<typeof useSession<CartSessionData>>;
-export declare const useCartSession: () => CartSession;
-//#endregion
-export {};
+export declare const useCartSession: () => Promise<SealedSession<CartSessionData>>;
+//#endregion

package/dist/cart-session.js

@@ -22,8 +22,8 @@ const sessionConfig = createServerOnlyFn(async () => {
 	};
 });
 const useCartSession = createServerOnlyFn(async () => {
-	const { useSession } = await import("@tanstack/react-start/server");
-	return useSession(await sessionConfig());
+	const { openSession } = await import("@shop-on/customer-runtime/sealed-session");
+	return openSession(await sessionConfig());
 });
 //#endregion
 export { useCartSession };

package/dist/customer-session.js

@@ -22,8 +22,8 @@ const sessionConfig = createServerOnlyFn(async () => {
 	};
 });
 const loadSession = createServerOnlyFn(async () => {
-	const { useSession } = await import("@tanstack/react-start/server");
-	return useSession(await sessionConfig());
+	const { openSession } = await import("@shop-on/customer-runtime/sealed-session");
+	return openSession(await sessionConfig());
 });
 const readCustomerSession = createServerOnlyFn(async () => {
 	try {

package/dist/graphql-env.d.ts

@@ -2158,6 +2158,22 @@ export type introspection_types = {
         ofType: null;
       };
       defaultValue: null;
+    }, {
+      name: 'latitude';
+      type: {
+        kind: 'SCALAR';
+        name: 'Float';
+        ofType: null;
+      };
+      defaultValue: null;
+    }, {
+      name: 'longitude';
+      type: {
+        kind: 'SCALAR';
+        name: 'Float';
+        ofType: null;
+      };
+      defaultValue: null;
     }, {
       name: 'phone';
       type: {
@@ -2942,6 +2958,22 @@ export type introspection_types = {
           ofType: null;
         };
       };
+      'latitude': {
+        name: 'latitude';
+        type: {
+          kind: 'SCALAR';
+          name: 'Float';
+          ofType: null;
+        };
+      };
+      'longitude': {
+        name: 'longitude';
+        type: {
+          kind: 'SCALAR';
+          name: 'Float';
+          ofType: null;
+        };
+      };
       'phone': {
         name: 'phone';
         type: {
@@ -3654,6 +3686,10 @@ export type introspection_types = {
       };
     };
   };
+  'CourierPromptEnum': {
+    name: 'CourierPromptEnum';
+    enumValues: 'PHONE' | 'PIN' | 'UNAVAILABLE';
+  };
   'CropRegionEnum': {
     name: 'CropRegionEnum';
     enumValues: 'BOTTOM' | 'CENTER' | 'LEFT' | 'RIGHT' | 'TOP';
@@ -6583,6 +6619,22 @@ export type introspection_types = {
           ofType: null;
         };
       };
+      'latitude': {
+        name: 'latitude';
+        type: {
+          kind: 'SCALAR';
+          name: 'Float';
+          ofType: null;
+        };
+      };
+      'longitude': {
+        name: 'longitude';
+        type: {
+          kind: 'SCALAR';
+          name: 'Float';
+          ofType: null;
+        };
+      };
       'phone': {
         name: 'phone';
         type: {
@@ -10473,6 +10525,14 @@ export type introspection_types = {
           ofType: null;
         };
       };
+      'deliveryCourierPrompt': {
+        name: 'deliveryCourierPrompt';
+        type: {
+          kind: 'ENUM';
+          name: 'CourierPromptEnum';
+          ofType: null;
+        };
+      };
       'deliveryOptionHandle': {
         name: 'deliveryOptionHandle';
         type: {
@@ -11877,6 +11937,18 @@ export type introspection_types = {
           };
         };
       };
+      'cashOnDeliveryAllowed': {
+        name: 'cashOnDeliveryAllowed';
+        type: {
+          kind: 'NON_NULL';
+          name: never;
+          ofType: {
+            kind: 'SCALAR';
+            name: 'Boolean';
+            ofType: null;
+          };
+        };
+      };
       'handle': {
         name: 'handle';
         type: {
@@ -12196,6 +12268,14 @@ export type introspection_types = {
           ofType: null;
         };
       };
+      'totalAmount': {
+        name: 'totalAmount';
+        type: {
+          kind: 'SCALAR';
+          name: 'Decimal';
+          ofType: null;
+        };
+      };
       'updatedAt': {
         name: 'updatedAt';
         type: {
@@ -15726,6 +15806,18 @@ export type introspection_types = {
           };
         };
       };
+      'cashOnDeliveryAllowed': {
+        name: 'cashOnDeliveryAllowed';
+        type: {
+          kind: 'NON_NULL';
+          name: never;
+          ofType: {
+            kind: 'SCALAR';
+            name: 'Boolean';
+            ofType: null;
+          };
+        };
+      };
       'handle': {
         name: 'handle';
         type: {
@@ -17848,6 +17940,18 @@ export type introspection_types = {
           };
         };
       };
+      'cashOnDeliveryAllowed': {
+        name: 'cashOnDeliveryAllowed';
+        type: {
+          kind: 'NON_NULL';
+          name: never;
+          ofType: {
+            kind: 'SCALAR';
+            name: 'Boolean';
+            ofType: null;
+          };
+        };
+      };
       'deliveryDetails': {
         name: 'deliveryDetails';
         type: {
@@ -20026,6 +20130,14 @@ export type introspection_types = {
     name: 'ThemeFilter';
     isOneOf: false;
     inputFields: [{
+      name: 'createdAt';
+      type: {
+        kind: 'INPUT_OBJECT';
+        name: 'DateFilter';
+        ofType: null;
+      };
+      defaultValue: null;
+    }, {
       name: 'handleCont';
       type: {
         kind: 'SCALAR';
@@ -20057,6 +20169,30 @@ export type introspection_types = {
         ofType: null;
       };
       defaultValue: null;
+    }, {
+      name: 'query';
+      type: {
+        kind: 'INPUT_OBJECT';
+        name: 'StringFilter';
+        ofType: null;
+      };
+      defaultValue: null;
+    }, {
+      name: 'status';
+      type: {
+        kind: 'INPUT_OBJECT';
+        name: 'EnumStringFilter';
+        ofType: null;
+      };
+      defaultValue: null;
+    }, {
+      name: 'updatedAt';
+      type: {
+        kind: 'INPUT_OBJECT';
+        name: 'DateFilter';
+        ofType: null;
+      };
+      defaultValue: null;
     }];
   };
   'ThemePreset': {

package/dist/graphql.js

@@ -1,5 +1,6 @@
 import { createLease } from "./lease.js";
 import { requestSlot } from "./request-scope.js";
+import { requestTraceHeaders } from "./trace.js";
 import { initGraphQLTada } from "gql.tada";
 import { Kind, print } from "graphql";
 import { ClientError, GraphQLClient } from "graphql-request";
@@ -145,17 +146,18 @@ function extraHeaders(options) {
 	if (options?.acceptLanguage) extra["Accept-Language"] = options.acceptLanguage;
 	return extra;
 }
-function bearerHeaders(token, options) {
+function bearerHeaders(token, options, trace) {
 	return {
 		Authorization: `Bearer ${token}`,
-		...extraHeaders(options)
+		...extraHeaders(options),
+		...trace
 	};
 }
 function invalidateToken(used) {
 	if (cached?.accessToken === used) cached = null;
 }
-async function executeSingle(document, variables, options) {
-	const send = async (token) => await buildClient(bearerHeaders(token, options)).request(document, variables);
+async function executeSingle(document, variables, options, trace) {
+	const send = async (token) => await buildClient(bearerHeaders(token, options, trace)).request(document, variables);
 	const token = await getToken();
 	try {
 		return await send(token);
@@ -179,11 +181,12 @@ function enqueueBatched(queues, query, variables, options) {
 		let queue = queues.get(key);
 		if (!queue) {
 			const scheduled = [];
+			const trace = requestTraceHeaders();
 			queue = scheduled;
 			queues.set(key, scheduled);
 			setTimeout(() => {
 				queues.delete(key);
-				flushBatch(scheduled, options);
+				flushBatch(scheduled, options, trace);
 			}, 0);
 		}
 		queue.push({
@@ -194,15 +197,15 @@ function enqueueBatched(queues, query, variables, options) {
 		});
 	});
 }
-async function flushBatch(entries, options) {
+async function flushBatch(entries, options, trace) {
 	const chunks = [];
 	for (let i = 0; i < entries.length; i += BATCH_MAX_QUERIES) chunks.push(entries.slice(i, i + BATCH_MAX_QUERIES));
 	await Promise.all(chunks.map(async (chunk) => {
 		try {
 			if (chunk.length === 1) {
 				const only = chunk[0];
-				only.resolve(await executeSingle(only.query, only.variables, options));
-			} else await executeBatchChunk(chunk, options);
+				only.resolve(await executeSingle(only.query, only.variables, options, trace));
+			} else await executeBatchChunk(chunk, options, trace);
 		} catch (err) {
 			for (const entry of chunk) entry.reject(err);
 		}
@@ -223,7 +226,7 @@ async function postWithAuthRetry(buildInit) {
 	invalidateToken(token);
 	return await post(await getToken());
 }
-async function executeBatchChunk(chunk, options) {
+async function executeBatchChunk(chunk, options, trace) {
 	const body = JSON.stringify(chunk.map(({ query, variables }) => ({
 		query,
 		variables
@@ -231,7 +234,7 @@ async function executeBatchChunk(chunk, options) {
 	const res = await postWithAuthRetry((token) => ({
 		headers: {
 			"Content-Type": "application/json",
-			...bearerHeaders(token, options)
+			...bearerHeaders(token, options, trace)
 		},
 		body
 	}));
@@ -266,7 +269,7 @@ async function executeBatchChunk(chunk, options) {
 async function request(document, variables, options) {
 	assertServerOnly();
 	const queues = isBatchableQuery(document) ? requestSlot(BATCH_QUEUES, () => /* @__PURE__ */ new Map()) : void 0;
-	if (!queues) return await executeSingle(document, variables, options);
+	if (!queues) return await executeSingle(document, variables, options, requestTraceHeaders());
 	return await enqueueBatched(queues, print(document), variables, options);
 }
 /**
@@ -285,6 +288,7 @@ async function request(document, variables, options) {
 */
 async function requestUpload(document, variables, files, filesPath, options) {
 	assertServerOnly();
+	const trace = requestTraceHeaders();
 	const query = print(document);
 	const map = {};
 	files.forEach((_, i) => {
@@ -305,7 +309,7 @@ async function requestUpload(document, variables, files, filesPath, options) {
 		return form;
 	};
 	const res = await postWithAuthRetry((token) => ({
-		headers: bearerHeaders(token, options),
+		headers: bearerHeaders(token, options, trace),
 		body: buildBody()
 	}));
 	if (!res.ok) throw batchClientError({

package/dist/password-session.js

@@ -22,8 +22,8 @@ const sessionConfig = createServerOnlyFn(async () => {
 	};
 });
 const loadSession = createServerOnlyFn(async () => {
-	const { useSession } = await import("@tanstack/react-start/server");
-	return useSession(await sessionConfig());
+	const { openSession } = await import("@shop-on/customer-runtime/sealed-session");
+	return openSession(await sessionConfig());
 });
 const readPasswordSession = createServerOnlyFn(async () => {
 	try {

package/dist/schema.storefront.graphql

@@ -714,6 +714,16 @@ input CheckoutAddressInput {
   firstName: String
   khorooId: ID
   lastName: String
+
+  """
+  Delivery pin. Send both or neither.
+  """
+  latitude: Float
+
+  """
+  Delivery pin. Send both or neither.
+  """
+  longitude: Float
   phone: String
   provinceId: ID
   zip: String
@@ -963,6 +973,8 @@ type CheckoutShippingAddress {
   formatted(locale: String): [String!]!
   khoroo: AddressKhoroo
   lastName: String
+  latitude: Float
+  longitude: Float
   phone: String
   province: AddressProvince
   provinceCode: String
@@ -1346,6 +1358,26 @@ type CourierDriverLoginPayload {
   userErrors: [UserError!]!
 }
 
+"""
+What the buyer must do, or wait for, to see a delivery a courier prices.
+"""
+enum CourierPromptEnum {
+  """
+  Add a phone number the courier can call.
+  """
+  PHONE
+
+  """
+  Drop a pin on the map: the courier prices from it.
+  """
+  PIN
+
+  """
+  The courier cannot be reached right now; choose another delivery.
+  """
+  UNAVAILABLE
+}
+
 """
 Crop region for image transforms
 """
@@ -2869,6 +2901,8 @@ type OrderShippingAddress {
   formatted(locale: String): [String!]!
   khoroo: AddressKhoroo
   lastName: String
+  latitude: Float
+  longitude: Float
   phone: String
   province: AddressProvince
   provinceCode: String
@@ -4432,8 +4466,8 @@ type Shop implements Node {
 
   """
   Whether this shop issues eBarimt fiscal receipts (a fiscal engine is enabled).
-  Buyer surfaces read this to decide whether to ask the Иргэн / Байгууллага
-  receipt question at checkout.
+  Buyer surfaces and the register read this to decide whether to ask the Иргэн /
+  Байгууллага receipt question at checkout.
   """
   issuesFiscalReceipts: Boolean!
   khoroo: AddressKhoroo
@@ -5062,6 +5096,13 @@ type ShopCheckout implements Node {
   completedAt: ISO8601DateTime
   createdAt: ISO8601DateTime!
   customer: ShopCustomer
+
+  """
+  What stands between the buyer and a delivery a courier prices (drop a pin, add
+  a phone, or the courier is unavailable). Null when nothing does, or no
+  shipping address is set yet.
+  """
+  deliveryCourierPrompt: CourierPromptEnum
   deliveryOptionHandle: String
 
   """
@@ -5597,6 +5638,11 @@ A storefront delivery option.
 interface ShopDeliveryOption {
   amount: Money!
 
+  """
+  False for a delivery a courier prices: the courier carries paid orders only, so the buyer pays online.
+  """
+  cashOnDeliveryAllowed: Boolean!
+
   """
   Stable identifier passed back via deliveryOptionHandle to select this option.
   """
@@ -5861,6 +5907,13 @@ type ShopFiscalReceipt {
   which is the only one `ShopOrder.fiscalReceipt` ever returns.
   """
   supersededAt: ISO8601DateTime
+
+  """
+  What the receipt declared to the tax authority — less than the order total
+  when gift cards paid part of it. With the lottery number, it is what the buyer
+  registers the receipt by hand with when the QR cannot be scanned. Null until issued.
+  """
+  totalAmount: Decimal
   updatedAt: ISO8601DateTime!
 }
 
@@ -6827,9 +6880,10 @@ type ShopOrder implements Node {
 
   """
   How the buyer is paying the balance — the oldest non-credit payment row’s
-  tender (`manual`, `cash_on_delivery`, `cody_pay`). Null when store credit /
-  gift cards covered the whole order and no such row exists. Buyer surfaces read
-  it to tell a cash-on-delivery order from a gateway one on the thanks page.
+  tender (`manual`, `cash_on_delivery`, `cash`, `bank_card`, `bank_transfer`,
+  `cody_pay`). Null when store credit / gift cards covered the whole order and
+  no such row exists. Buyer surfaces read it to tell a cash-on-delivery order
+  from a gateway one on the thanks page.
   """
   paymentMethod: String
   phone: String
@@ -7299,6 +7353,7 @@ type ShopPickupDeliveryOption implements ShopDeliveryOption {
   """
   addressLines: [String!]!
   amount: Money!
+  cashOnDeliveryAllowed: Boolean!
   handle: String!
   instructions: String!
   kind: ShopDeliveryKindEnum!
@@ -8303,6 +8358,7 @@ A storefront ship delivery option (quote result).
 """
 type ShopShipDeliveryOption implements ShopDeliveryOption {
   amount: Money!
+  cashOnDeliveryAllowed: Boolean!
   deliveryDetails: String
   handle: String!
   kind: ShopDeliveryKindEnum!
@@ -9099,10 +9155,29 @@ type ThemeEdge {
 }
 
 input ThemeFilter {
+  """
+  Bounds on the creation time.
+  """
+  createdAt: DateFilter
   handleCont: String
   priceEq: Float
   priceGteq: Float
   priceLteq: Float
+
+  """
+  Match against the theme's name or its handle.
+  """
+  query: StringFilter
+
+  """
+  Predicates on the status, keyed by its lowercase label ("draft", "published", "archived").
+  """
+  status: EnumStringFilter
+
+  """
+  Bounds on the last-update time.
+  """
+  updatedAt: DateFilter
 }
 
 """

package/dist/trace.js

@@ -0,0 +1,5 @@
+import { traceHeaders } from "@shop-on/customer-runtime/trace";
+//#region src/trace.ts
+const requestTraceHeaders = () => traceHeaders({ continueIncoming: true });
+//#endregion
+export { requestTraceHeaders };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shop-on/theme-server",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "SEE LICENSE IN dist/LICENSE.md",
   "files": [
     "dist"
@@ -54,24 +54,24 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "gql.tada": "1.11.3",
+    "gql.tada": "1.11.4",
     "graphql": "17.0.2",
     "graphql-request": "7.4.0",
-    "liquidjs": "10.29.0",
-    "@shop-on/customer-runtime": "0.1.0",
-    "@shop-on/theme-runtime": "0.1.0"
+    "liquidjs": "10.30.0",
+    "@shop-on/theme-runtime": "0.2.0",
+    "@shop-on/customer-runtime": "0.2.0"
   },
   "devDependencies": {
-    "@tanstack/react-start": "1.168.60",
-    "@types/node": "26.6.3",
+    "@tanstack/react-start": "1.169.3",
+    "@types/node": "26.6.5",
     "typescript": "7.0.2",
-    "vitest": "5.0.3"
+    "vitest": "5.0.5"
   },
   "peerDependencies": {
-    "@tanstack/react-start": "~1.168.60"
+    "@tanstack/react-start": "~1.169.3"
   },
   "scripts": {
     "check-types": "tsc --noEmit",
-    "test": "vitest run"
+    "test": "vitest run --maxWorkers=2"
   }
 }