@unisian/start 0.7.0 → 0.8.1

package/dist/serve.d.mts

@@ -1,32 +1,25 @@
 import { reportBrowserError } from "./report-browser-error.mjs";
 import * as Schema from "effect/Schema";
 import { AnyContract, Capability, InputOf } from "@unisian/capability";
-import { RequestLogTags, RequestReference } from "@unisian/effect-observability";
-import { ShopifyAdmin, ShopifyLayerConfig } from "@unisian/shopify-admin";
-import { AuthenticatedShop, CurrentShop, ShopifyApp } from "@unisian/shopify-auth";
+import { RequestLogTags, RequestReference, RunTags } from "@unisian/effect-observability";
 import * as Layer from "effect/Layer";
-import { ShopDomain } from "@unisian/shopify-sessions";
-import { HttpClient } from "effect/http";
 //#region src/serve.d.ts
 export interface ServeContext {
-  readonly shopify: AuthenticatedShop;
   readonly log: RequestLogTags;
 }
-export interface ServeConfig<Services, ServicesError> extends ShopifyLayerConfig {
-  readonly services?: Layer.Layer<Services, ServicesError> | undefined;
+export interface Caller<Identity, IdentityError> {
+  readonly tags: RunTags;
+  readonly layer: Layer.Layer<Identity, IdentityError>;
 }
-export type Provided<Services> = CurrentShop | ShopifyAdmin | ShopifyApp | HttpClient.HttpClient | RequestReference | Services;
 export interface ServerFnCall<ContractType extends AnyContract, Context> {
   readonly data: InputOf<ContractType>["Type"];
-  readonly context: Context;
+  readonly context: Context & ServeContext;
   readonly serverFnMeta: {
     readonly name: string;
   };
 }
-export declare const serveWith: <Context, Services, ServicesError>(callerOf: (context: Context) => {
-  readonly shop: ShopDomain;
-  readonly log: RequestLogTags;
-}, layerFor: (context: Context) => Layer.Layer<Services, ServicesError>) => <ContractType extends AnyContract, Requirements extends Services | CurrentShop | RequestReference>(capability: Capability<ContractType, Requirements>) => ({ data, context, serverFnMeta }: ServerFnCall<ContractType, Context>) => Promise<Schema.Json>;
-export declare const makeServe: <Services = never, ServicesError = never>(config: () => ServeConfig<Services, ServicesError>) => <ContractType extends AnyContract, Requirements extends (HttpClient.HttpClient | ShopifyAdmin | ShopifyApp | Exclude<Services, CurrentShop | RequestReference>) | CurrentShop | RequestReference>(capability: Capability<ContractType, Requirements>) => ({ data, context, serverFnMeta }: ServerFnCall<ContractType, ServeContext>) => Promise<Schema.Json>;
+export declare const serveWith: <Context, Identity, IdentityError, Services, ServicesError>(callerOf: (context: Context) => Caller<Identity, IdentityError>, layerFor: (context: Context) => Layer.Layer<Services, ServicesError>) => <ContractType extends AnyContract, Requirements extends Identity | Services | RequestReference>(capability: Capability<ContractType, Requirements>) => ({ data, context, serverFnMeta }: ServerFnCall<ContractType, Context>) => Promise<Schema.Json>;
+export declare function makeServe<Services = never, ServicesError = never>(services: () => Layer.Layer<Services, ServicesError>): ReturnType<typeof serveWith<ServeContext, never, never, Services, ServicesError>>;
+export declare function makeServe<Context, Identity, IdentityError, Services = never, ServicesError = never>(services: () => Layer.Layer<Services, ServicesError>, caller: (context: Context) => Caller<Identity, IdentityError>): ReturnType<typeof serveWith<Context, Identity, IdentityError, Services, ServicesError>>;
 //#endregion
 export { reportBrowserError };

package/dist/serve.mjs

@@ -3,8 +3,6 @@ import { serverFnNameFor } from "./function-id.mjs";
 import { reportBrowserError } from "./report-browser-error.mjs";
 import * as Schema from "effect/Schema";
 import { RequestReference, logFailure, runPromiseExit } from "@unisian/effect-observability";
-import { ShopifyAdmin, shopifyLayer } from "@unisian/shopify-admin";
-import { CurrentShop } from "@unisian/shopify-auth";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 //#region src/serve.ts
@@ -15,21 +13,22 @@ const serveWith = (callerOf, layerFor) => (capability) => {
 	const serverFnName = serverFnNameFor(contract.name);
 	return async ({ data, context, serverFnMeta }) => {
 		if (serverFnMeta.name !== serverFnName) throw new Error(`${serverFnMeta.name} serves ${contract.name}; name it ${serverFnName} so its URL names the contract`);
-		const { shop, log } = callerOf(context);
-		const layer = Layer.mergeAll(layerFor(context), Layer.succeed(CurrentShop, { shop }), Layer.succeed(RequestReference, { reference: log.reference })).pipe(Layer.orDie);
+		const { log } = context;
+		const caller = callerOf(context);
+		const layer = Layer.mergeAll(layerFor(context), caller.layer, Layer.succeed(RequestReference, { reference: log.reference })).pipe(Layer.orDie);
 		const exit = await capability.handler(data).pipe(Effect.flatMap((output) => Effect.orDie(encodeOutput(output))), Effect.provide(layer), Effect.tapCause((cause) => logFailure("server function", cause)), runPromiseExit(contract.name, {
-			...log,
-			shop
+			...caller.tags,
+			...log
 		}));
 		return wire.encode(exit, log.reference);
 	};
 };
-const makeServe = (config) => serveWith((context) => ({
-	log: context.log,
-	shop: context.shopify.shop
-}), (context) => {
-	const { services, ...shopify } = config();
-	return Layer.mergeAll(ShopifyAdmin.layer(context.shopify).pipe(Layer.provideMerge(shopifyLayer(shopify))), services ?? Layer.empty);
-});
+const anonymous = {
+	layer: Layer.empty,
+	tags: {}
+};
+function makeServe(services, caller) {
+	return serveWith(caller ?? (() => anonymous), services);
+}
 //#endregion
 export { makeServe, reportBrowserError, serveWith };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@unisian/start",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/baoagency/unisian-next.git",
+    "url": "git+https://github.com/baoagency/app-template.git",
     "directory": "packages/start"
   },
   "files": [
@@ -32,11 +32,8 @@
     "effect": "4.0.6",
     "react": "19.3.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
-    "@unisian/capability": "0.7.0",
-    "@unisian/shopify-auth": "0.7.0",
-    "@unisian/shopify-sessions": "0.7.0",
-    "@unisian/effect-observability": "0.7.0",
-    "@unisian/shopify-admin": "0.7.0"
+    "@unisian/capability": "0.8.1",
+    "@unisian/effect-observability": "0.8.1"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.104.1",
@@ -45,11 +42,8 @@
     "@tanstack/react-start": "^1.168.60",
     "effect": "^4.0.2",
     "react": "^19.3.0",
-    "@unisian/capability": "0.7.0",
-    "@unisian/effect-observability": "0.7.0",
-    "@unisian/shopify-admin": "0.7.0",
-    "@unisian/shopify-sessions": "0.7.0",
-    "@unisian/shopify-auth": "0.7.0"
+    "@unisian/effect-observability": "0.8.1",
+    "@unisian/capability": "0.8.1"
   },
   "scripts": {}
 }