@forgeailab/create-spark 0.1.3 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeailab/create-spark",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Interactive scaffolder for spark projects with guided pack picker.",
   "type": "module",
   "publishConfig": {
@@ -20,8 +20,8 @@
     "create-spark": "./src/cli.ts"
   },
   "dependencies": {
-    "@forgeailab/spark": "^0.1.3",
-    "@forgeailab/spark-schema": "^0.1.3",
+    "@forgeailab/spark": "^0.2.0",
+    "@forgeailab/spark-schema": "^0.2.0",
     "@clack/prompts": "latest",
     "citty": "latest",
     "picocolors": "latest"

package/packs/README.md

@@ -91,32 +91,30 @@ See `packs/example/pack.toml` for a manifest that exercises every field.
 
 ## v1 catalog
 
-Each pack is either **copy** (ships file trees the user owns) or **hybrid** (ships thin wiring + imports runtime logic from a versioned `@forgeailab/spark-*` helper under `libs/`). The mode is inferred from the presence of a `[runtime_package]` block in the manifest.
-
-| Pack | Category | Mode | Runtime helper |
-|---|---|---|---|
-| `auth-better-auth` | auth | **hybrid** | `@forgeailab/spark-auth-better-auth` (SQLite) |
-| `auth-better-auth-pg` | auth | **hybrid** | `@forgeailab/spark-auth-better-auth` (Postgres) |
-| `auth-supabase` | auth | copy | — |
-| `db-sqlite` | db | copy | — |
-| `db-postgres` | db | copy | — |
-| `db-supabase` | db | copy | — |
-| `sync-zero` | infra | **hybrid** | `@forgeailab/spark-sync-zero` |
-| `payments-stripe` | payments | **hybrid** | `@forgeailab/spark-stripe-helpers` |
-| `ai-anthropic` | ai | **hybrid** | `@forgeailab/spark-anthropic` |
-| `ai-openai` | ai | copy | — |
-| `ui-shadcn` | ui | copy | — |
-| `email-resend` | email | copy | — |
-| `analytics-posthog` | analytics | copy | — |
-| `docker-compose-dev` | infra | copy | — |
-| `testing-playwright` | testing | copy | — |
-| `deploy-vercel` | deploy | copy | — |
+| Pack | Category |
+|---|---|
+| `auth-better-auth` | auth |
+| `auth-better-auth-pg` | auth |
+| `auth-supabase` | auth |
+| `db-sqlite` | db |
+| `db-postgres` | db |
+| `db-supabase` | db |
+| `sync-zero` | infra |
+| `payments-stripe` | payments |
+| `ai-anthropic` | ai |
+| `ai-openai` | ai |
+| `ui-shadcn` | ui |
+| `email-resend` | email |
+| `analytics-posthog` | analytics |
+| `docker-compose-dev` | infra |
+| `testing-playwright` | testing |
+| `deploy-vercel` | deploy |
 
 ### Picking a db + auth pair
 
-`auth-better-auth` and `auth-better-auth-pg` share the same runtime helper
-(`@forgeailab/spark-auth-better-auth`) — they differ only in the `provider:`
-their generated `lib/auth.ts` template hands to `drizzleAdapter`. Pair them:
+`auth-better-auth` and `auth-better-auth-pg` share the same Better Auth factory
+code in their generated `lib/auth.ts` templates — they differ only in the
+`provider:` handed to `drizzleAdapter`. Pair them:
 
 - `db-sqlite` + `auth-better-auth` — fastest path, single file db, no infra.
 - `db-postgres` + `auth-better-auth-pg` — production-shaped, **required for `sync-zero`** (Zero needs Postgres logical replication).
@@ -127,6 +125,6 @@ installing both. Mixing wrong pairs (e.g. `db-sqlite` + `auth-better-auth-pg`)
 typechecks but fails at runtime — the drizzle adapter will reject sqlite tables
 with `provider: 'pg'`.
 
-The hybrid packs were authored against [`reference/full-stack-saas/`](../reference/full-stack-saas/) — the canonical integration showing all four helpers working together. When debugging a hybrid pack, start there.
+The copy-mode packs were authored against [`reference/full-stack-saas/`](../reference/full-stack-saas/) — the canonical integration showing the copied templates working together. When debugging one of these packs, start there.
 
 See the root `README.md` for the catalog summary.

package/packs/ai-anthropic/files/lib/anthropic.ts

@@ -1,5 +1,49 @@
-import type Anthropic from '@anthropic-ai/sdk';
-import { createAnthropicClient, streamResponse } from '@forgeailab/spark-anthropic';
+import Anthropic from '@anthropic-ai/sdk';
+
+export function createAnthropicClient(
+  apiKey: string,
+  options?: ConstructorParameters<typeof Anthropic>[0],
+): Anthropic {
+  return new Anthropic({ apiKey, ...options });
+}
+
+const encoder = new TextEncoder();
+
+function isContentBlockDeltaEvent(event: unknown): event is { type: 'content_block_delta' } {
+  return (
+    typeof event === 'object' &&
+    event !== null &&
+    (event as { type?: unknown }).type === 'content_block_delta'
+  );
+}
+
+function encodeSse(payload: unknown) {
+  return encoder.encode(`data: ${JSON.stringify(payload)}\n\n`);
+}
+
+export function streamResponse(
+  client: Anthropic,
+  params: Parameters<Anthropic['messages']['stream']>[0],
+): ReadableStream<Uint8Array> {
+  return new ReadableStream<Uint8Array>({
+    async start(controller) {
+      try {
+        const stream = client.messages.stream(params);
+
+        for await (const event of stream) {
+          if (isContentBlockDeltaEvent(event)) {
+            controller.enqueue(encodeSse(event));
+          }
+        }
+
+        controller.enqueue(encoder.encode('data: [DONE]\n\n'));
+        controller.close();
+      } catch (error) {
+        controller.error(error);
+      }
+    },
+  });
+}
 
 function requireEnv(name: string): string {
   const value = process.env[name];
@@ -11,5 +55,4 @@ function requireEnv(name: string): string {
 
 export const anthropic = createAnthropicClient(requireEnv('ANTHROPIC_API_KEY'));
 
-export { streamResponse };
 export type AnthropicChatMessage = Anthropic.Messages.MessageParam;

package/packs/ai-anthropic/pack.toml

@@ -8,9 +8,8 @@ conflicts = []
 requires_runtime = ["server"]
 compatible_scaffolds = []
 
-[runtime_package]
-package = "@forgeailab/spark-anthropic"
-version = "^0.1"
+[dependencies]
+runtime = ["@anthropic-ai/sdk"]
 
 [env]
 required = ["ANTHROPIC_API_KEY"]

package/packs/auth-better-auth/files/app/api/auth/[...all]/route.ts

@@ -1,4 +1,4 @@
-import { createAuthHandler } from '@forgeailab/spark-auth-better-auth';
+import { toNextJsHandler } from 'better-auth/next-js';
 import { auth } from '@/lib/auth';
 
-export const { GET, POST } = createAuthHandler(auth);
+export const { GET, POST } = toNextJsHandler(auth);

package/packs/auth-better-auth/files/lib/auth.ts

@@ -1,4 +1,43 @@
-import { createAuth as createBetterAuth } from '@forgeailab/spark-auth-better-auth';
+import { betterAuth } from 'better-auth';
+
+type BetterAuthOptions = Parameters<typeof betterAuth>[0];
+
+export type AuthInstance = ReturnType<typeof betterAuth>;
+
+export type CreateBetterAuthOptions = {
+  adapter: BetterAuthOptions['database'];
+  basePath?: BetterAuthOptions['basePath'];
+  plugins?: BetterAuthOptions['plugins'];
+  emailAndPassword?: BetterAuthOptions['emailAndPassword'];
+  socialProviders?: BetterAuthOptions['socialProviders'];
+  secret?: BetterAuthOptions['secret'];
+  baseURL?: BetterAuthOptions['baseURL'];
+  trustedOrigins?: string[];
+};
+
+export function createBetterAuth({
+  adapter,
+  basePath,
+  plugins,
+  emailAndPassword,
+  socialProviders,
+  secret,
+  baseURL,
+  trustedOrigins,
+}: CreateBetterAuthOptions) {
+  const authOptions: BetterAuthOptions = {
+    database: adapter,
+    basePath,
+    plugins,
+    emailAndPassword,
+    socialProviders,
+    secret,
+    baseURL,
+    trustedOrigins: trustedOrigins ?? (typeof baseURL === 'string' ? [baseURL] : undefined),
+  };
+
+  return betterAuth(authOptions);
+}
 
 // Wire your database adapter here. Example (drizzle + sqlite):
 //

package/packs/auth-better-auth/pack.toml

@@ -8,12 +8,8 @@ conflicts = ["auth"]
 requires_runtime = ["server"]
 compatible_scaffolds = ["nextjs"]
 
-[runtime_package]
-package = "@forgeailab/spark-auth-better-auth"
-version = "^0.1"
-
 [dependencies]
-runtime = ["@better-auth/drizzle-adapter"]
+runtime = ["@better-auth/drizzle-adapter", "better-auth"]
 
 [env]
 required = ["BETTER_AUTH_SECRET", "BETTER_AUTH_URL"]

package/packs/auth-better-auth-pg/files/app/api/auth/[...all]/route.ts

@@ -1,4 +1,4 @@
-import { createAuthHandler } from '@forgeailab/spark-auth-better-auth';
+import { toNextJsHandler } from 'better-auth/next-js';
 import { auth } from '@/lib/auth';
 
-export const { GET, POST } = createAuthHandler(auth);
+export const { GET, POST } = toNextJsHandler(auth);

package/packs/auth-better-auth-pg/files/lib/auth.ts

@@ -1,8 +1,47 @@
 import { drizzleAdapter } from '@better-auth/drizzle-adapter';
-import { createAuth as createBetterAuth } from '@forgeailab/spark-auth-better-auth';
+import { betterAuth } from 'better-auth';
 import { db } from '@/lib/db';
 import * as schema from '@/lib/db/schema';
 
+type BetterAuthOptions = Parameters<typeof betterAuth>[0];
+
+export type AuthInstance = ReturnType<typeof betterAuth>;
+
+export type CreateBetterAuthOptions = {
+  adapter: BetterAuthOptions['database'];
+  basePath?: BetterAuthOptions['basePath'];
+  plugins?: BetterAuthOptions['plugins'];
+  emailAndPassword?: BetterAuthOptions['emailAndPassword'];
+  socialProviders?: BetterAuthOptions['socialProviders'];
+  secret?: BetterAuthOptions['secret'];
+  baseURL?: BetterAuthOptions['baseURL'];
+  trustedOrigins?: string[];
+};
+
+export function createBetterAuth({
+  adapter,
+  basePath,
+  plugins,
+  emailAndPassword,
+  socialProviders,
+  secret,
+  baseURL,
+  trustedOrigins,
+}: CreateBetterAuthOptions) {
+  const authOptions: BetterAuthOptions = {
+    database: adapter,
+    basePath,
+    plugins,
+    emailAndPassword,
+    socialProviders,
+    secret,
+    baseURL,
+    trustedOrigins: trustedOrigins ?? (typeof baseURL === 'string' ? [baseURL] : undefined),
+  };
+
+  return betterAuth(authOptions);
+}
+
 // Postgres-flavored Better Auth wiring. Pair this pack with `db-postgres`
 // (or `db-supabase`), and add the four Better Auth tables to your
 // `lib/db/schema.ts`: `user`, `session`, `account`, `verification`. Snake-case

package/packs/auth-better-auth-pg/pack.toml

@@ -8,12 +8,8 @@ conflicts = ["auth"]
 requires_runtime = ["server"]
 compatible_scaffolds = ["nextjs"]
 
-[runtime_package]
-package = "@forgeailab/spark-auth-better-auth"
-version = "^0.1"
-
 [dependencies]
-runtime = ["@better-auth/drizzle-adapter"]
+runtime = ["@better-auth/drizzle-adapter", "better-auth"]
 
 [env]
 required = ["BETTER_AUTH_SECRET", "BETTER_AUTH_URL"]

package/packs/payments-stripe/files/lib/stripe.ts

@@ -1,9 +1,107 @@
-import {
-  createStripeClient,
-  createCheckoutSession as createStripeCheckoutSession,
-  createBillingPortalSession as createStripeBillingPortalSession,
-  verifyWebhookSignature as verifyStripeWebhookSignature,
-} from '@forgeailab/spark-stripe-helpers';
+import Stripe from 'stripe';
+
+type StripeClientOptions = ConstructorParameters<typeof Stripe>[1];
+
+declare module 'stripe' {
+  namespace Stripe {
+    export type StripeConstructorOptions = StripeClientOptions;
+  }
+}
+
+export function createStripeClient(
+  secretKey: string,
+  options?: Stripe.StripeConstructorOptions,
+): Stripe {
+  return new Stripe(secretKey, options);
+}
+
+type CheckoutSessionCreateParams = NonNullable<
+  Parameters<Stripe['checkout']['sessions']['create']>[0]
+>;
+
+export type CreateCheckoutSessionInput = {
+  priceId: string;
+  customerId?: string;
+  customerEmail?: string;
+  successUrl: string;
+  cancelUrl: string;
+  mode?: CheckoutSessionCreateParams['mode'];
+  metadata?: Record<string, string>;
+};
+
+async function createStripeCheckoutSession(
+  stripeClient: Stripe,
+  {
+    priceId,
+    customerId,
+    customerEmail,
+    successUrl,
+    cancelUrl,
+    mode = 'subscription',
+    metadata,
+  }: CreateCheckoutSessionInput,
+): Promise<{ url: string; sessionId: string }> {
+  if (!customerId && !customerEmail) {
+    throw new Error('customerId or customerEmail is required');
+  }
+
+  const session = await stripeClient.checkout.sessions.create({
+    mode,
+    customer: customerId,
+    customer_email: customerId ? undefined : customerEmail,
+    line_items: [
+      {
+        price: priceId,
+        quantity: 1,
+      },
+    ],
+    allow_promotion_codes: true,
+    success_url: successUrl,
+    cancel_url: cancelUrl,
+    metadata,
+  });
+
+  if (!session.url) {
+    throw new Error('Stripe did not return a checkout URL');
+  }
+
+  return {
+    url: session.url,
+    sessionId: session.id,
+  };
+}
+
+export type VerifyWebhookSignatureInput = {
+  payload: string | Buffer;
+  signatureHeader: string;
+  secret: string;
+};
+
+function verifyStripeWebhookSignature(
+  stripeClient: Stripe,
+  { payload, signatureHeader, secret }: VerifyWebhookSignatureInput,
+): Promise<Stripe.Event> {
+  return stripeClient.webhooks.constructEventAsync(payload, signatureHeader, secret);
+}
+
+export type CreateBillingPortalSessionInput = {
+  customerId: string;
+  returnUrl: string;
+};
+
+async function createStripeBillingPortalSession(
+  stripeClient: Stripe,
+  { customerId, returnUrl }: CreateBillingPortalSessionInput,
+): Promise<{ url: string }> {
+  const session = await stripeClient.billingPortal.sessions.create({
+    customer: customerId,
+    return_url: returnUrl,
+  });
+
+  return {
+    url: session.url,
+  };
+}
 
 function requireEnv(name: string): string {
   const value = process.env[name];

package/packs/payments-stripe/pack.toml

@@ -8,12 +8,8 @@ conflicts = ["payments"]
 requires_runtime = ["server"]
 compatible_scaffolds = ["nextjs"]
 
-[runtime_package]
-package = "@forgeailab/spark-stripe-helpers"
-version = "^0.1"
-
 [dependencies]
-runtime = ["@stripe/stripe-js"]
+runtime = ["@stripe/stripe-js", "stripe"]
 
 [env]
 required = [

package/packs/sync-zero/files/components/ZeroProvider.tsx

@@ -1,3 +1,13 @@
 'use client';
 
-export { ZeroProvider } from '@forgeailab/spark-sync-zero';
+import type { ReactNode } from 'react';
+import type { ZeroOptions } from '@rocicorp/zero';
+import { ZeroProvider as RocicorpZeroProvider } from '@rocicorp/zero/react';
+
+type ZeroProviderProps = ZeroOptions & {
+  children: ReactNode;
+};
+
+export function ZeroProvider({ children, ...options }: ZeroProviderProps) {
+  return <RocicorpZeroProvider {...options}>{children}</RocicorpZeroProvider>;
+}

package/packs/sync-zero/files/lib/zero/client.ts

@@ -1,7 +1,7 @@
 'use client';
 
-import { createZeroClient as createSparkZeroClient } from '@forgeailab/spark-sync-zero';
-import type { ZeroOptions } from '@forgeailab/spark-sync-zero';
+import { Zero } from '@rocicorp/zero';
+import type { ZeroOptions } from '@rocicorp/zero';
 import { schema } from './schema';
 
 const DEFAULT_ZERO_URL = 'http://localhost:4848';
@@ -14,5 +14,5 @@ export function createZeroOptions(): ZeroOptions {
 }
 
 export function createZeroClient(options: ZeroOptions = createZeroOptions()) {
-  return createSparkZeroClient(options);
+  return new Zero(options);
 }

package/packs/sync-zero/files/lib/zero/schema.ts

@@ -1,4 +1,12 @@
-import { defineZeroSchema, number, string, table } from '@forgeailab/spark-sync-zero';
+import {
+  ANYONE_CAN,
+  createBuilder,
+  createSchema,
+  definePermissions,
+  number,
+  string,
+  table,
+} from '@rocicorp/zero';
 
 // Example schema. Replace with your app's tables.
 const users = table('user')
@@ -10,8 +18,13 @@ const users = table('user')
   })
   .primaryKey('id');
 
-export const { schema, zql } = defineZeroSchema({
+export const schema = createSchema({
   tables: [users],
 });
+export const zql = createBuilder(schema);
 
 export type Schema = typeof schema;
+
+export const permissions = definePermissions<unknown, Schema>(schema, () => ({
+  user: { row: { select: ANYONE_CAN } },
+}));

package/packs/sync-zero/pack.toml

@@ -8,10 +8,6 @@ conflicts = ["sync"]
 requires_runtime = ["server"]
 compatible_scaffolds = ["nextjs"]
 
-[runtime_package]
-package = "@forgeailab/spark-sync-zero"
-version = "^0.1"
-
 [dependencies]
 runtime = ["@rocicorp/zero"]
 

package/scripts/sync-skills.ts

@@ -6,7 +6,7 @@ import {
   parseSkillFrontmatter,
   serializeSkillFrontmatter,
   toCodexFrontmatter,
-} from "@forgeailab/spark-skill-utils";
+} from "../packages/spark/src/internal/skill-utils.ts";
 
 type SkillOutput = {
   name: string;