@notionhq/apps 0.0.16 → 0.0.18

package/AGENTS.md

@@ -11,3 +11,30 @@ matching skill:
 
 Resolve these links relative to this package directory. Check the installed SDK
 declarations for current API details.
+
+## Pull requests for SDK changes
+
+For a change to the public SDK, show the user-facing code change in the pull
+request body. Put a short, complete example near the top:
+
+````md
+## User code
+
+### Before
+
+```ts
+// Existing app code
+```
+
+### After
+
+```ts
+// Updated app code
+```
+````
+
+Use the same small example in both sections so reviewers can compare them
+quickly. Include imports and the call that changed when they matter. Show
+normal app code, not internal types, tests, generated files, or provisioning
+output. Explain any required migration steps in plain language below the
+example.

package/README.md

@@ -95,12 +95,12 @@ export default workflow({
 	name: "Schedule follow-up",
 	description: "Schedules a follow-up after a page is created",
 	triggers: [triggers.notionPageCreated()],
-	connections: [connections.calendar()],
+	connections: { calendar: connections.calendar() },
 	handler: async () => {},
 });
 ```
 
-Declaring the same connection more than once causes the app build to fail.
+The property name is the connection key. Access its typed client with `context.connections.calendar`; use separate keys for separate connections to the same provider.
 
 ## Notion API access
 
@@ -116,22 +116,17 @@ Declare a database with Notion as Code, then pass one of its data-source handles
 import { database, sync } from "@notionhq/apps";
 import { Builder } from "@notionhq/apps/builder";
 
-const issues = database({
-	resourceId: "issues-db",
-	dataSources: [
-		{
-			resourceId: "issues-source",
-			name: "GitHub Issues",
-			properties: [
-				{ resourceId: "name", name: "Name", type: "title" },
-				{ resourceId: "github-id", name: "GitHub ID", type: "text" },
-			],
-		},
-	],
+const issues = database("issues-db", {
+	dataSourceResourceId: "issues-source",
+	name: "GitHub Issues",
+	schema: {
+		Name: { resourceId: "name", type: "title" },
+		"GitHub ID": { resourceId: "github-id", type: "text" },
+	},
 });
 
 export default sync({
-	dataSource: issues.dataSources["issues-source"],
+	dataSource: issues.dataSource,
 	primaryKey: "GitHub ID",
 	handler: async () => ({
 		changes: [
@@ -146,40 +141,95 @@ export default sync({
 ```
 
 Put each default-exported sync directly in `src/syncs/`. A primary key must be a title
-or text property. Do not include that property in an upsert: the SDK fills it from
-the change's `key`.
+or text property. Each upsert must include at least one known non-primary-key schema
+property, while any other non-primary-key properties may be omitted; unknown property keys
+are rejected by TypeScript. Do not include the primary-key property in an upsert: the SDK
+fills it from the change's `key`.
 
 ## Notion-as-Code databases
 
-Use `properties` to declare a database with one data source:
+Use `schema` and an explicit `dataSourceResourceId` to declare a database with one data source:
 
 ```ts
 import { notion } from "@notionhq/apps/notion-as-code";
 
-const issues = notion.database({
-	resourceId: "branch-check-issues",
+const singleSourceIssues = notion.database("branch-check-issues", {
+	dataSourceResourceId: "branch-check-issues-source",
 	name: "Issues",
-	properties: [
-		{ resourceId: "issue-title", name: "Name", type: "title" },
-		{ resourceId: "issue-id", name: "ID", type: "text" },
-	],
+	schema: {
+		Name: { resourceId: "issue-title", type: "title" },
+		ID: { resourceId: "issue-id", type: "text" },
+	},
 });
 ```
 
-Pass `issues.dataSource` as the `dataSource` argument to `sync` from `@notionhq/apps`, or use
-`issues.dataSource.addPage(...)` to declare a page in the source. The database still exposes
-`dataSources` and `addView`.
+Pass `singleSourceIssues.dataSource` as the `dataSource` argument to `sync` from `@notionhq/apps`, or use
+`singleSourceIssues.dataSource.addPage(...)` to declare a page in the source. Both database forms expose `addView`.
 
-For explicit sources, keep using `notion.database({ resourceId, dataSources: [...] })`
-and access each source through `handle.dataSources[sourceResourceId]`.
-`properties` and `dataSources` are mutually exclusive. Both forms also work with
-page and teamspace `addDatabase` helpers.
+For multiple sources, use `datasources` instead of the top-level `schema`:
+
+```ts
+const issues = notion.database("issues-db", {
+	datasources: {
+		Issues: {
+			resourceId: "issues-source",
+			schema: {
+				Name: { resourceId: "issue-title", type: "title" },
+				"GitHub ID": { resourceId: "github-id", type: "text" },
+			},
+		},
+	},
+});
+
+issues.datasources.Issues.schema.Name;
+```
+
+`schema` and `datasources` are mutually exclusive. A database declaration must
+include at least one data source or at least one view. A linked-only database
+may omit `datasources`, or use `datasources: {}`, only when `views` is nonempty;
+`{}`, `{ datasources: {} }`, and `{ datasources: {}, views: [] }` are invalid.
+Page and teamspace child helpers accept the same forms through
+`page.addDatabase("database-id", args)` and `teamspace.addDatabase("database-id", args)`.
+
+Each `datasources` key is the source's name, and each `schema` key is the
+property's name used for typed access, sync keys, and serialized properties.
+Nested data-source configs and property configs do not accept `name`. The
+top-level database `name` remains supported; in the single-source shorthand it
+supplies both the database and data-source display names. In a multi-source
+declaration, it names the database while each data-source name comes from its key.
+
+All database, source, and property IDs remain explicit and must be globally unique.
+No IDs are generated from keys or names. The build emits the existing `dataSources`
+and `properties` arrays with exact IDs and names from those keys; authoring
+`schema`, `datasources`, and database-level `dataSourceResourceId` fields do not
+leak into the serialized database intent. The provisioning JSON envelope and
+server API are unchanged. See [the build guide](docs/BUILD.md#declaring-notion-as-code-databases)
+for complete single-, multi-source, and linked-only examples.
+
+Declare database views with `views` or `addView`, or use the top-level `view`
+function from `@notionhq/apps` (`notion.view` is also available). The standalone
+function accepts `ViewArgs`: a `ViewSchema` plus the owning `databaseResourceId`,
+and returns a handle with `resourceId`. Both types are exported from
+`@notionhq/apps/notion-as-code`, with table, board, calendar, list, gallery, feed,
+and timeline variants. View types include sorting, nested filters, grouping,
+property visibility, and layout-specific options.
+
+```ts
+import { view } from "@notionhq/apps";
+
+view({
+	databaseResourceId: issues.resourceId,
+	resourceId: "issues-table",
+	type: "table",
+	dataSourceResourceId: issues.datasources.Issues.resourceId,
+	properties: [{ property: "issue-title", visible: true }],
+	sorts: [{ propertyId: "issue-title", direction: "ascending" }],
+});
+```
 
-The shorthand emits the existing database intent with one source named after the
-database and identified by `${resourceId}-source`. That ID must be globally unique.
-When converting an existing explicit declaration, use the shorthand only if its
-source already has that ID; changing the source ID creates a different resource.
-No top-level `properties` field is added to the database intent.
+Each view requires a `dataSourceResourceId`. Property references use property
+resource IDs, not display names. Calendar views require `calendarBy`; timeline
+views require `timelineBy`.
 
 ## Custom blocks
 

package/dist/connections.d.ts

@@ -1,15 +1,43 @@
-import { type ConnectionProviders } from "./providers.generated.js";
-/** A setup requirement. The server decides which providers are available. */
-export type WorkflowConnection<TProvider extends string = string, TKey extends string = string> = {
+import { type OAuthConfiguration } from "./oauth.js";
+import { type ConnectionClients } from "./providers.generated.js";
+/** A setup requirement. The property name in a workflow supplies its key. */
+export type WorkflowConnection<TProvider extends string = string> = {
     type: TProvider;
-    key?: TKey;
+    oauth?: OAuthConfiguration;
 };
-/** Keys declared for one provider in a workflow. */
-export type WorkflowConnectionKeys<TConnections extends readonly WorkflowConnection[], TProvider extends string> = WorkflowConnectionKey<Extract<TConnections[number], {
-    type: TProvider;
-}>>;
-type WorkflowConnectionKey<TConnection extends WorkflowConnection> = TConnection extends WorkflowConnection ? "key" extends keyof TConnection ? Exclude<TConnection["key"], undefined> : TConnection["type"] : never;
+export type WorkflowConnectionDeclarations = Readonly<Record<string, WorkflowConnection>>;
+/** Serialized connection requirement sent in the workflow manifest. */
+export type WorkflowConnectionRequirement = WorkflowConnection & {
+    key: string;
+};
+/** Declared property names belonging to one provider. */
+export type WorkflowConnectionKeys<TConnections extends WorkflowConnectionDeclarations, TProvider extends string> = Extract<{
+    [TKey in keyof TConnections]: TConnections[TKey]["type"] extends TProvider ? TKey : never;
+}[keyof TConnections], string>;
 /** Requirements are declarations, not credentials or permission grants. */
-export { connections } from "./providers.generated.js";
-export type WorkflowConnections<TConnections extends readonly WorkflowConnection[] = readonly WorkflowConnection[]> = Pick<ConnectionProviders, Extract<keyof ConnectionProviders, TConnections[number]["type"]>>;
+export declare const connections: {
+    oauth(options: OAuthConfiguration): WorkflowConnection<"oauth">;
+    calendar: () => WorkflowConnection<"calendar">;
+    slack: () => WorkflowConnection<"slack">;
+    googleDriveOauth: () => WorkflowConnection<"googleDriveOauth">;
+    discord: () => WorkflowConnection<"discord">;
+    cursor: () => WorkflowConnection<"cursor">;
+    box: () => WorkflowConnection<"box">;
+    confluence: () => WorkflowConnection<"confluence">;
+    gmail: () => WorkflowConnection<"gmail">;
+    googleCalendar: () => WorkflowConnection<"googleCalendar">;
+    googleDrive: () => WorkflowConnection<"googleDrive">;
+    outlook: () => WorkflowConnection<"outlook">;
+    salesforce: () => WorkflowConnection<"salesforce">;
+};
+export type { OAuthConfiguration } from "./oauth.js";
+export type OAuthConnection = {
+    accessToken(): Promise<string>;
+};
+type WorkflowConnectionClients = ConnectionClients & {
+    oauth: OAuthConnection;
+};
+export type WorkflowConnections<TConnections extends WorkflowConnectionDeclarations = WorkflowConnectionDeclarations> = {
+    readonly [TKey in keyof TConnections]: WorkflowConnectionClients[Extract<keyof WorkflowConnectionClients, TConnections[TKey]["type"]>];
+};
 //# sourceMappingURL=connections.d.ts.map

package/dist/connections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connections.d.ts","sourceRoot":"","sources":["../src/connections.ts"],"names":[],"mappings":"AAGA,OAAO,EAA6B,KAAK,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/F,6EAA6E;AAC7E,MAAM,MAAM,kBAAkB,CAAC,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,IAAI,SAAS,MAAM,GAAG,MAAM,IAAI;IACjG,IAAI,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,IAAI,CAAC;CACX,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,sBAAsB,CACjC,YAAY,SAAS,SAAS,kBAAkB,EAAE,EAClD,SAAS,SAAS,MAAM,IACrB,qBAAqB,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC,CAAC;AAE9E,KAAK,qBAAqB,CAAC,WAAW,SAAS,kBAAkB,IAChE,WAAW,SAAS,kBAAkB,GACnC,KAAK,SAAS,MAAM,WAAW,GAC9B,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,GACtC,WAAW,CAAC,MAAM,CAAC,GACpB,KAAK,CAAC;AAGV,2EAA2E;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,MAAM,MAAM,mBAAmB,CAC9B,YAAY,SAAS,SAAS,kBAAkB,EAAE,GAAG,SAAS,kBAAkB,EAAE,IAC/E,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,MAAM,mBAAmB,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"connections.d.ts","sourceRoot":"","sources":["../src/connections.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAIjF,OAAO,EAGN,KAAK,iBAAiB,EACtB,MAAM,0BAA0B,CAAC;AAGlC,6EAA6E;AAC7E,MAAM,MAAM,kBAAkB,CAAC,SAAS,SAAS,MAAM,GAAG,MAAM,IAAI;IACnE,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;AAE1F,uEAAuE;AACvE,MAAM,MAAM,6BAA6B,GAAG,kBAAkB,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjF,yDAAyD;AACzD,MAAM,MAAM,sBAAsB,CACjC,YAAY,SAAS,8BAA8B,EACnD,SAAS,SAAS,MAAM,IACrB,OAAO,CACV;KACE,IAAI,IAAI,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,SAAS,GAAG,IAAI,GAAG,KAAK;CACzF,CAAC,MAAM,YAAY,CAAC,EACrB,MAAM,CACN,CAAC;AAIF,2EAA2E;AAC3E,eAAO,MAAM,WAAW;mBAER,kBAAkB,GAAG,kBAAkB,CAAC,OAAO,CAAC;;;;;;;;;;;;;CAI/D,CAAC;AACF,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACrD,MAAM,MAAM,eAAe,GAAG;IAAE,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAEjE,KAAK,yBAAyB,GAAG,iBAAiB,GAAG;IAAE,KAAK,EAAE,eAAe,CAAA;CAAE,CAAC;AAIhF,MAAM,MAAM,mBAAmB,CAC9B,YAAY,SAAS,8BAA8B,GAAG,8BAA8B,IACjF;IACH,QAAQ,EAAE,IAAI,IAAI,MAAM,YAAY,GAAG,yBAAyB,CAAC,OAAO,CACvE,MAAM,yBAAyB,EAC/B,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAC1B,CAAC;CACF,CAAC"}

package/dist/connections.js

@@ -1,25 +1,60 @@
+import { validateOAuthConfiguration } from "./oauth.js";
 import { connectionTriggerDefinitions } from "./connection-trigger-definitions.generated.js";
-import { createConnectionProviders } from "./providers.generated.js";
-import { connections } from "./providers.generated.js";
-function validateConnectionRequirements(requirements) {
-  if (requirements.length > 100) throw new Error("Workflows support at most 100 connections.");
-  const keys = /* @__PURE__ */ new Set();
-  for (const requirement of requirements) {
-    if (!requirement.type) throw new Error("A workflow connection needs a provider type.");
-    const key = requirement.key ?? requirement.type;
-    if (!/^[a-zA-Z][a-zA-Z0-9_-]{0,127}$/.test(key)) {
+import {
+  connections as providerConnections,
+  createConnectionClient
+} from "./providers.generated.js";
+const connections = {
+  ...providerConnections,
+  oauth(options) {
+    validateOAuthConfiguration(options);
+    return { type: "oauth", oauth: structuredClone(options) };
+  }
+};
+function normalizeConnectionRequirements(declarations) {
+  if (typeof declarations !== "object" || declarations === null || Array.isArray(declarations)) {
+    throw new Error("Workflow connections must be an object keyed by connection name.");
+  }
+  const prototype = Object.getPrototypeOf(declarations);
+  if (prototype !== Object.prototype && prototype !== null) {
+    throw new Error("Workflow connections must contain only own connection declarations.");
+  }
+  const keys = Object.keys(declarations);
+  if (Reflect.ownKeys(declarations).length !== keys.length) {
+    throw new Error("Workflow connection keys must be enumerable strings.");
+  }
+  if (keys.length > 100) throw new Error("Workflows support at most 100 connections.");
+  return Object.entries(declarations).map(([key, requirement]) => {
+    if (!/^[a-zA-Z][a-zA-Z0-9_-]{0,127}$/.test(key) || ["__proto__", "prototype", "constructor"].includes(key)) {
       throw new Error("Invalid workflow connection key: " + key);
     }
-    if (keys.has(key)) throw new Error("Duplicate workflow connection: " + key);
-    keys.add(key);
-  }
+    if (typeof requirement !== "object" || requirement === null || typeof requirement.type !== "string" || !requirement.type || !Object.hasOwn(requirement, "type")) {
+      throw new Error("A workflow connection needs a provider type.");
+    }
+    if ("key" in requirement)
+      throw new Error(
+        "Declare a connection key as its workflow object property, not in the provider options."
+      );
+    if (requirement.type === "oauth") {
+      if (!requirement.oauth)
+        throw new Error("OAuth connections require provider configuration.");
+      validateOAuthConfiguration(requirement.oauth);
+    } else if (requirement.oauth !== void 0) {
+      throw new Error("OAuth configuration is only valid on OAuth connections.");
+    }
+    return {
+      type: requirement.type,
+      key,
+      ...requirement.oauth === void 0 ? {} : { oauth: structuredClone(requirement.oauth) }
+    };
+  });
 }
 function validateTriggerConnections(triggers, requirements) {
   const seen = /* @__PURE__ */ new Set();
   for (const trigger of triggers) {
     if (!("connectionKey" in trigger) || trigger.connectionKey === void 0) continue;
     const requirement = requirements.find(
-      (connection) => (connection.key ?? connection.type) === trigger.connectionKey
+      (connection) => connection.key === trigger.connectionKey
     );
     const definition = connectionTriggerDefinitions.find(
       (definition2) => definition2.type === trigger.type
@@ -37,8 +72,29 @@ function validateTriggerConnections(triggers, requirements) {
     seen.add(identity);
   }
 }
-function createWorkflowConnections(notion) {
+function createWorkflowConnections(notion, declarations) {
+  const requirements = normalizeConnectionRequirements(declarations ?? {});
   const rawBindings = process.env.NOTION_CONNECTION_BINDINGS;
+  const clients = {};
+  Object.setPrototypeOf(clients, null);
+  for (const requirement of requirements) {
+    let client;
+    Object.defineProperty(clients, requirement.key, {
+      enumerable: true,
+      get() {
+        if (client) return client;
+        const binding = resolveBinding(requirement.key);
+        if (binding.type !== requirement.type) {
+          throw new Error(
+            `Workflow connection "${requirement.key}" is ${binding.type}, not ${requirement.type}.`
+          );
+        }
+        client = requirement.type === "oauth" ? createOAuthConnection(binding) : createConnectionClient(requirement.type, invoker(binding));
+        return client;
+      }
+    });
+  }
+  return Object.freeze(clients);
   function resolveBinding(key) {
     const bindings = JSON.parse(rawBindings ?? "[]");
     if (!Array.isArray(bindings) || !bindings.every(isConnectionBinding)) {
@@ -52,11 +108,7 @@ function createWorkflowConnections(notion) {
     }
     return { ...matches[0] };
   }
-  function invoker(provider, key) {
-    const binding = resolveBinding(key);
-    if (binding.type !== provider) {
-      throw new Error(`Workflow connection "${key}" is ${binding.type}, not ${provider}.`);
-    }
+  function invoker(binding) {
     return async (action, args) => {
       const response = await notion.request({
         path: "tools/run/internal",
@@ -66,7 +118,19 @@ function createWorkflowConnections(notion) {
       return response.result;
     };
   }
-  return createConnectionProviders(invoker);
+}
+function createOAuthConnection(binding) {
+  const envKey = `NOTION_OAUTH_CONNECTION_${binding.id.replaceAll("-", "").toUpperCase()}`;
+  const token = process.env[envKey];
+  return {
+    async accessToken() {
+      if (!token)
+        throw new Error(
+          `Workflow OAuth connection "${binding.key}" requires authorization.`
+        );
+      return token;
+    }
+  };
 }
 function isConnectionBinding(value) {
   return typeof value === "object" && value !== null && "key" in value && typeof value.key === "string" && value.key.length > 0 && "type" in value && typeof value.type === "string" && value.type.length > 0 && "id" in value && typeof value.id === "string" && value.id.length > 0;
@@ -74,6 +138,6 @@ function isConnectionBinding(value) {
 export {
   connections,
   createWorkflowConnections,
-  validateConnectionRequirements,
+  normalizeConnectionRequirements,
   validateTriggerConnections
 };

package/dist/index.d.ts

@@ -3,6 +3,8 @@ export { customAgent } from "./notion-as-code/custom-agent.js";
 export { database } from "./notion-as-code/database.js";
 export { page } from "./notion-as-code/page.js";
 export { teamspace } from "./notion-as-code/teamspace.js";
+export { view } from "./notion-as-code/view.js";
 export { sync } from "./sync.js";
 export { workflow } from "./workflow.js";
+export type { WorkflowState, WorkflowStateValue } from "./workflow-state.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/index.js

@@ -3,6 +3,7 @@ import { customAgent } from "./notion-as-code/custom-agent.js";
 import { database } from "./notion-as-code/database.js";
 import { page } from "./notion-as-code/page.js";
 import { teamspace } from "./notion-as-code/teamspace.js";
+import { view } from "./notion-as-code/view.js";
 import { sync } from "./sync.js";
 import { workflow } from "./workflow.js";
 export {
@@ -12,5 +13,6 @@ export {
   page,
   sync,
   teamspace,
+  view,
   workflow
 };

package/dist/notion-as-code/database.d.ts

@@ -1,67 +1,108 @@
 import type { Database } from "../database.js";
-import { type DataSourceDefinition, type NotionAsCodeIcon, type NotionAsCodeProperty, type Parent, type ResourceId } from "./intents.js";
+import { type DatabaseIntent, type NotionAsCodeIcon, type NotionAsCodeSchema, type Parent, type ResourceId } from "./intents.js";
 import { type ChildPageArgs, type PageHandle } from "./page.js";
-import { type AppsSchemaForProperties } from "./schema.js";
-/** Input for declaring a database and its optional data sources. */
-export type DatabaseArgs<DataSources extends readonly DataSourceDefinition[] = readonly DataSourceDefinition[]> = {
+import { type AppsSchemaForSchema } from "./schema.js";
+import type { ViewSchema } from "./views.js";
+/** Reuse serialized database intent metadata, excluding identity, parent, and sources. */
+type DatabaseMetadata = Omit<DatabaseIntent, "resourceId" | "parent" | "dataSources">;
+type NonEmptyViewSchemas = readonly [ViewSchema, ...ViewSchema[]];
+/** A keyed data-source declaration; the containing map key supplies the serialized source name. */
+export type DataSourceArgs<Schema extends NotionAsCodeSchema = NotionAsCodeSchema> = {
     resourceId: ResourceId;
-    /** Omit to create a private top-level database in the Apps workspace. */
-    parent?: Parent;
-    dataSources?: DataSources;
-    views?: readonly unknown[];
+    name?: never;
+    schema: Schema;
     icon?: NotionAsCodeIcon;
-    cover?: unknown;
-    hideDataSourceTitle?: boolean;
-    hideDatabaseTitleIfEmpty?: boolean;
-    name?: string;
-    description?: string;
 };
-/** Input for adding a database beneath an existing resource. */
-export type ChildDatabaseArgs<DataSources extends readonly DataSourceDefinition[] = readonly DataSourceDefinition[]> = Omit<DatabaseArgs<DataSources>, "parent">;
-/** Single-source shorthand; the source ID is `${resourceId}-source`. */
-export type SingleSourceDatabaseArgs<Properties extends readonly NotionAsCodeProperty[] = readonly NotionAsCodeProperty[]> = Omit<DatabaseArgs, "dataSources" | "name"> & {
+/** Data sources keyed by the names used to access their handles. */
+export type DataSourceMap = Record<string, DataSourceArgs>;
+/**
+ * Single-source inputs require a name for both database and source. `datasources?: never`
+ * keeps this form exclusive even when callers pass a predeclared object.
+ */
+type SingleSourceDatabaseOptions<Schema extends NotionAsCodeSchema = NotionAsCodeSchema> = Omit<DatabaseMetadata, "name"> & {
+    dataSourceResourceId: ResourceId;
     name: string;
-    properties: Properties;
-    dataSources?: never;
+    schema: Schema;
+    datasources?: never;
 };
-export type ChildSingleSourceDatabaseArgs<Properties extends readonly NotionAsCodeProperty[] = readonly NotionAsCodeProperty[]> = Omit<SingleSourceDatabaseArgs<Properties>, "parent">;
-/** Resolves one data source ID to the properties declared for it. */
-type DataSourcePropertiesForResourceId<DataSources extends readonly DataSourceDefinition[], ResourceId extends DataSources[number]["resourceId"]> = Extract<DataSources[number], {
-    resourceId: ResourceId;
-}> extends DataSourceDefinition<infer Properties> ? Properties : never;
-/** Handle for a data source and the Apps database it backs. */
-export type DataSourceHandle<Properties extends readonly NotionAsCodeProperty[] = readonly NotionAsCodeProperty[]> = {
+/** Top-level single-source inputs may choose a parent; page.addDatabase/teamspace.addDatabase bind it instead. */
+export type SingleSourceDatabaseArgs<Schema extends NotionAsCodeSchema = NotionAsCodeSchema> = SingleSourceDatabaseOptions<Schema> & {
+    parent?: Parent;
+};
+/**
+ * Multi-source inputs preserve source-map keys. The NoInfer guard makes the
+ * emptiness check inspect the inferred map instead of widening it to the broad
+ * DataSourceMap constraint.
+ */
+type MultiSourceDatabaseOptions<DataSources extends DataSourceMap = DataSourceMap> = DatabaseMetadata & {
+    datasources: DataSources;
+    dataSourceResourceId?: never;
+    schema?: never;
+} & (keyof NoInfer<DataSources> extends never ? {
+    views: NonEmptyViewSchemas;
+} : {
+    views?: readonly ViewSchema[];
+});
+/** Top-level multi-source inputs may choose a parent; page.addDatabase/teamspace.addDatabase bind it instead. */
+export type MultiSourceDatabaseArgs<DataSources extends DataSourceMap = DataSourceMap> = MultiSourceDatabaseOptions<DataSources> & {
+    parent?: Parent;
+};
+/** Linked-only databases use a nonempty typed view tuple and no authored source map. */
+type ViewOnlyDatabaseOptions = DatabaseMetadata & {
+    datasources?: never;
+    dataSourceResourceId?: never;
+    schema?: never;
+    views: NonEmptyViewSchemas;
+};
+type ViewOnlyDatabaseArgs = ViewOnlyDatabaseOptions & {
+    parent?: Parent;
+};
+/** Remove parent because page.addDatabase/teamspace.addDatabase supplies it. */
+export type ChildSingleSourceDatabaseArgs<Schema extends NotionAsCodeSchema = NotionAsCodeSchema> = Omit<SingleSourceDatabaseArgs<Schema>, "parent">;
+/** Remove parent because page.addDatabase/teamspace.addDatabase supplies it. */
+export type ChildMultiSourceDatabaseArgs<DataSources extends DataSourceMap = DataSourceMap> = Omit<MultiSourceDatabaseArgs<DataSources>, "parent">;
+/** Input for declaring a database and its data sources. */
+export type DatabaseArgs<Schema extends NotionAsCodeSchema = NotionAsCodeSchema, DataSources extends DataSourceMap = DataSourceMap> = SingleSourceDatabaseArgs<Schema> | MultiSourceDatabaseArgs<DataSources> | ViewOnlyDatabaseArgs;
+/**
+ * Child inputs omit parent from each union member separately. `page.addDatabase`
+ * and `teamspace.addDatabase` use this shape for their shared child factory.
+ */
+export type ChildDatabaseArgs<Schema extends NotionAsCodeSchema = NotionAsCodeSchema, DataSources extends DataSourceMap = DataSourceMap> = ChildSingleSourceDatabaseArgs<Schema> | ChildMultiSourceDatabaseArgs<DataSources> | Omit<ViewOnlyDatabaseArgs, "parent">;
+/** A source handle retains its keyed authoring schema for sync inference. */
+export type DataSourceHandle<Schema extends NotionAsCodeSchema = NotionAsCodeSchema> = {
     readonly resourceId: string;
-    readonly schema: Properties;
-    readonly database: Database<AppsSchemaForProperties<Properties>>;
+    readonly schema: Schema;
+    readonly database: Database<AppsSchemaForSchema<Schema>>;
     addPage: (args: ChildPageArgs) => PageHandle;
 };
-/** Handle for a database with data sources indexed by resource ID. */
-export type DatabaseHandle<DataSources extends readonly DataSourceDefinition[] = readonly DataSourceDefinition[]> = {
+type DatabaseHandleBase = {
     readonly resourceId: string;
-    readonly dataSources: {
-        readonly [ResourceId in DataSources[number]["resourceId"]]: DataSourceHandle<DataSourcePropertiesForResourceId<DataSources, ResourceId>>;
+    addView: (view: ViewSchema) => void;
+};
+/** Map each authoring source key to a handle backed by that source's own schema. */
+export type DatabaseHandle<DataSources extends DataSourceMap = DataSourceMap> = DatabaseHandleBase & {
+    readonly datasources: {
+        readonly [DataSourceName in keyof DataSources]: DataSourceHandle<DataSources[DataSourceName]["schema"]>;
     };
-    addView: (view: unknown) => void;
 };
-/** A database whose sole data source is available without an ID lookup. */
-export type SingleSourceDatabaseHandle<Properties extends readonly NotionAsCodeProperty[] = readonly NotionAsCodeProperty[]> = DatabaseHandle<readonly DataSourceDefinition<Properties>[]> & {
-    readonly dataSource: DataSourceHandle<Properties>;
+/** A database whose sole data source is available without a key lookup. */
+export type SingleSourceDatabaseHandle<Schema extends NotionAsCodeSchema = NotionAsCodeSchema> = DatabaseHandleBase & {
+    readonly dataSource: DataSourceHandle<Schema>;
 };
+/**
+ * Overloaded callable used by page.addDatabase/teamspace.addDatabase. Each form
+ * returns its matching handle while preserving literal source and schema inference.
+ */
 export type ChildDatabaseFactory = {
-    <const Properties extends readonly NotionAsCodeProperty[]>(args: ChildSingleSourceDatabaseArgs<Properties>): SingleSourceDatabaseHandle<Properties>;
-    <const DataSources extends readonly DataSourceDefinition[]>(args: ChildDatabaseArgs<DataSources> & {
-        properties?: never;
-    }): DatabaseHandle<DataSources>;
+    <const Schema extends NotionAsCodeSchema>(databaseResourceId: ResourceId, args: ChildSingleSourceDatabaseArgs<Schema>): SingleSourceDatabaseHandle<Schema>;
+    <const DataSources extends DataSourceMap>(databaseResourceId: ResourceId, args: ChildMultiSourceDatabaseArgs<DataSources>): DatabaseHandle<DataSources>;
+    (databaseResourceId: ResourceId, args: Omit<ViewOnlyDatabaseArgs, "parent">): DatabaseHandle<{}>;
 };
-/** Declare a database, defaulting to a private top-level database in the Apps workspace. */
-export declare function database<const Properties extends readonly NotionAsCodeProperty[]>(args: SingleSourceDatabaseArgs<Properties>): SingleSourceDatabaseHandle<Properties>;
-export declare function database<const DataSources extends readonly DataSourceDefinition[]>(args: DatabaseArgs<DataSources> & {
-    properties?: never;
-}): DatabaseHandle<DataSources>;
-/** Bind both database declaration forms to an existing parent. */
+/** Declare a database, defaulting to the Apps workspace. */
+export declare function database<const Schema extends NotionAsCodeSchema>(databaseResourceId: ResourceId, args: SingleSourceDatabaseArgs<Schema>): SingleSourceDatabaseHandle<Schema>;
+export declare function database<const DataSources extends DataSourceMap>(databaseResourceId: ResourceId, args: MultiSourceDatabaseArgs<DataSources>): DatabaseHandle<DataSources>;
+export declare function database(databaseResourceId: ResourceId, args: ViewOnlyDatabaseArgs): DatabaseHandle<{}>;
+/** Bind a parent for page.addDatabase/teamspace.addDatabase. */
 export declare function createChildDatabase(parent: Parent): ChildDatabaseFactory;
-/** Record a database declaration and create handles for each of its data sources. */
-export declare function createDatabase(args: DatabaseArgs, parent: Parent): DatabaseHandle;
 export {};
 //# sourceMappingURL=database.d.ts.map

package/dist/notion-as-code/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/notion-as-code/database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/notion-as-code/database.ts"],"names":[],"mappings":"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"}