@notionx/create-notionx-app 2.0.0 → 2.0.1

package/dist/templates/lib/blog/translations.ts.tmpl

@@ -11,7 +11,7 @@ import {
 import { i18n } from "@/lib/i18n";
 import { blogContract } from "@/lib/locale-contract";
 import { blogTranslationsSource } from "@/lib/content/models";
-import type { NotionPageLike } from "@notionx/core";
+import type { NotionPageLike } from "@notionx/core/notion";
 
 export type BlogTranslationExtra = {
   summary: string;

package/dist/templates/lib/locale-contract/index.ts.tmpl

@@ -1,3 +1,3 @@
 export * from "./built-in";
 export * from "./paths";
-export { defineLocaleContract } from "@notionx/core";
+export { defineLocaleContract } from "@notionx/core/locale-contract";

package/dist/templates/lib/pages/source.ts.tmpl

@@ -9,7 +9,6 @@ import {
 import {
   createSitePagesApi,
   type SitePage as BaseSitePage,
-  type SitePageBlockRef,
 } from "@notionx/core/pages";
 import { blocksSource, contentSources } from "@/lib/content/models";
 import { getRequestLocale } from "@/lib/site/request-env";
@@ -53,6 +52,10 @@ export type SitePage = Omit<BaseSitePage, "structuredBlocks"> & {
   structuredBlocks: StructuredPageBlock[];
 };
 
+// `SitePageBlockRef` is not exported from `@notionx/core/pages`,
+// but it is the element type of `SitePage.structuredBlocks`.
+type SitePageBlockRef = BaseSitePage["structuredBlocks"][number];
+
 const fallbackStructuredBlocks: Record<string, StructuredPageBlock> = {
   "home-hero": {
     slug: "home-hero",

package/dist/templates/lib/search/config.ts.tmpl

@@ -9,15 +9,28 @@
 
 import { createD1SearchAdapter } from "@notionx/core/search";
 import type { SearchAdapter } from "@notionx/core/search";
+import type { SqlDatabaseAdapter } from "@notionx/core/platform";
 import { getRequestEnv } from "../site/request-env";
 
 /**
- * Lazily resolve the D1 database binding from the request environment.
- * The adapter is created once and reused across requests.
+ * Lazily resolve the D1 database binding from the request environment
+ * and wrap it in the `SqlDatabaseAdapter` shape expected by
+ * `@notionx/core/search`. The adapter is created once and reused
+ * across requests.
  */
-function getDatabase() {
+function getDatabase(): SqlDatabaseAdapter {
   const env = getRequestEnv();
-  return env.DB;
+  if (!env?.DB) {
+    throw new Error(
+      "D1 database binding DB is not available in the request environment."
+    );
+  }
+  return {
+    kind: "d1",
+    prepare: (query) => env.DB!.prepare(query),
+    batch: (statements) =>
+      env.DB!.batch(statements as D1PreparedStatement[]),
+  };
 }
 
 export const searchAdapter: SearchAdapter = createD1SearchAdapter(getDatabase);

package/dist/templates/lib/site/request-env.ts.tmpl

@@ -40,12 +40,14 @@ import { AsyncLocalStorage } from "node:async_hooks";
 
 /**
  * Shape of the Cloudflare `env` parameter as far as this project
- * is concerned. The KV binding is the only one we read at
- * runtime; other bindings (D1, R2, secrets) are accessed by the
- * foundation worker directly and don't need ALS propagation.
+ * is concerned. Bindings read outside the worker entry (e.g. D1
+ * from the search adapter, KV from site settings) are propagated
+ * through ALS; others are accessed by the foundation worker
+ * directly and don't need to be listed here.
  */
 export interface RequestEnv {
   CONTENT_CACHE?: KVNamespace;
+  DB?: D1Database;
   /**
    * Locale resolved by the middleware from the `/{locale}` path
    * prefix. Server components and data loaders read this via

package/dist/templates/lib/site/settings.ts.tmpl

@@ -50,9 +50,12 @@ function readKv(): KVNamespace | null {
   return getRequestEnv()?.CONTENT_CACHE ?? null;
 }
 
+// Mirrors `SiteConfig["navigation"]["main"]`: the JSON stored in
+// Notion's "Nav" field should include `modelId` for each item.
 type RawNavItem = {
   label: string;
   href: string;
+  modelId: string;
   children?: RawNavItem[];
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notionx/create-notionx-app",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Scaffold a new vinext (Next.js on Cloudflare Workers + D1 + R2) project backed by @notionx/core, with one-step provisioning of D1 / KV / R2 / Turnstile / Notion / Resend / Google OAuth.",
   "type": "module",
   "bin": {