zitejs 0.9.62 → 0.9.64

package/dist/cjs/notifications/index.d.ts

@@ -1,20 +1,7 @@
-export type NotificationLink = {
-    type: 'record';
-    basePublicId: string;
-    tableId: string;
-    recordId: string;
-} | {
-    type: 'app';
-    appId: string;
+export interface NotificationLink {
     path?: string;
     params?: Record<string, string>;
-} | {
-    type: 'route';
-    path: string;
-} | {
-    type: 'external';
-    url: string;
-};
+}
 export type NotificationsCreateParams = {
     recipients: string[];
     title: string;

package/dist/cjs/sync/lib.js

@@ -206,11 +206,10 @@ function generateSchema(database, existingSchema) {
 }
 function generateSentinelSdkTypes() {
     return [
-        "export type NotificationLink =",
-        "  | { type: 'record'; basePublicId: string; tableId: string; recordId: string }",
-        "  | { type: 'app'; appId: string; path?: string; params?: Record<string, string> }",
-        "  | { type: 'route'; path: string }",
-        "  | { type: 'external'; url: string };",
+        "export interface NotificationLink {",
+        "  path?: string;",
+        "  params?: Record<string, string>;",
+        "}",
         "",
         "export interface NotificationsCreateParams {",
         "  recipients: string[];",
@@ -241,6 +240,53 @@ function generateSentinelSdkTypes() {
         "",
     ];
 }
+function buildLinkTableComments(schema) {
+    const tablesById = new Map();
+    for (const t of schema.tables)
+        tablesById.set(t.id, t);
+    const seen = new Set();
+    const entries = [];
+    for (const table of schema.tables) {
+        for (const field of table.fields) {
+            if (field.definition.type !== "linked_record")
+                continue;
+            const tpl = field.definition.template;
+            if (tpl.isInverse)
+                continue;
+            const targetId = tpl.tableId;
+            if (!targetId)
+                continue;
+            const target = tablesById.get(targetId);
+            if (!target)
+                continue;
+            const sourceSdk = toPascalCase(table.sdkName);
+            const targetSdk = toPascalCase(target.sdkName);
+            const [first, second] = [sourceSdk, targetSdk].sort();
+            const linkName = `${first}${second}`;
+            if (seen.has(linkName))
+                continue;
+            seen.add(linkName);
+            const isSelf = table.id === targetId;
+            const col1 = isSelf
+                ? `source${first}Id`
+                : `${first.charAt(0).toLowerCase()}${first.slice(1)}Id`;
+            const col2 = isSelf
+                ? `target${second}Id`
+                : `${second.charAt(0).toLowerCase()}${second.slice(1)}Id`;
+            entries.push({ name: linkName, cols: [col1, col2] });
+        }
+    }
+    if (entries.length === 0)
+        return [];
+    const lines = [
+        "//",
+        "// Link tables for zite.sql() JOINs (use these exact names):",
+    ];
+    for (const e of entries) {
+        lines.push(`//   "${e.name}" — columns: "${e.cols[0]}", "${e.cols[1]}"`);
+    }
+    return lines;
+}
 /**
  * Generate .zite/db.ts purely from ZiteSchema.
  * Pure function — no external data needed beyond what's in the schema file.
@@ -272,11 +318,10 @@ function generateDbTs(schema) {
     lines.push("//   - Use SDK names for tables (PascalCase) and fields (camelCase)");
     lines.push('//   - ALWAYS double-quote every identifier: FROM "Orders", WHERE "status" = $1');
     lines.push("//   - Use params array for user input ($1, $2, ...): never interpolate into SQL");
-    lines.push('//   - Link tables: alphabetical PascalCase concat (Items+Orders → "ItemsOrders")');
-    lines.push('//     with id columns: "itemsId", "ordersId"');
     lines.push("//   - Soft-deleted rows are excluded automatically — no WHERE deleted_at IS NULL");
     lines.push("//   - SELECT only — use .create/.update/.delete for writes");
     lines.push('//   - Load the "zite:sql" skill for full SQL reference (formulas, lookups, etc.)');
+    lines.push(...buildLinkTableComments(schema));
     lines.push("import { createTableClient, createSqlClient, createNotificationsClient, createMetaClient } from 'zitejs/runtime';");
     lines.push("");
     for (const table of schema.tables) {

package/dist/esm/notifications/index.d.ts

@@ -1,20 +1,7 @@
-export type NotificationLink = {
-    type: 'record';
-    basePublicId: string;
-    tableId: string;
-    recordId: string;
-} | {
-    type: 'app';
-    appId: string;
+export interface NotificationLink {
     path?: string;
     params?: Record<string, string>;
-} | {
-    type: 'route';
-    path: string;
-} | {
-    type: 'external';
-    url: string;
-};
+}
 export type NotificationsCreateParams = {
     recipients: string[];
     title: string;

package/dist/esm/sync/lib.js

@@ -195,11 +195,10 @@ export function generateSchema(database, existingSchema) {
 }
 function generateSentinelSdkTypes() {
     return [
-        "export type NotificationLink =",
-        "  | { type: 'record'; basePublicId: string; tableId: string; recordId: string }",
-        "  | { type: 'app'; appId: string; path?: string; params?: Record<string, string> }",
-        "  | { type: 'route'; path: string }",
-        "  | { type: 'external'; url: string };",
+        "export interface NotificationLink {",
+        "  path?: string;",
+        "  params?: Record<string, string>;",
+        "}",
         "",
         "export interface NotificationsCreateParams {",
         "  recipients: string[];",
@@ -230,6 +229,53 @@ function generateSentinelSdkTypes() {
         "",
     ];
 }
+function buildLinkTableComments(schema) {
+    const tablesById = new Map();
+    for (const t of schema.tables)
+        tablesById.set(t.id, t);
+    const seen = new Set();
+    const entries = [];
+    for (const table of schema.tables) {
+        for (const field of table.fields) {
+            if (field.definition.type !== "linked_record")
+                continue;
+            const tpl = field.definition.template;
+            if (tpl.isInverse)
+                continue;
+            const targetId = tpl.tableId;
+            if (!targetId)
+                continue;
+            const target = tablesById.get(targetId);
+            if (!target)
+                continue;
+            const sourceSdk = toPascalCase(table.sdkName);
+            const targetSdk = toPascalCase(target.sdkName);
+            const [first, second] = [sourceSdk, targetSdk].sort();
+            const linkName = `${first}${second}`;
+            if (seen.has(linkName))
+                continue;
+            seen.add(linkName);
+            const isSelf = table.id === targetId;
+            const col1 = isSelf
+                ? `source${first}Id`
+                : `${first.charAt(0).toLowerCase()}${first.slice(1)}Id`;
+            const col2 = isSelf
+                ? `target${second}Id`
+                : `${second.charAt(0).toLowerCase()}${second.slice(1)}Id`;
+            entries.push({ name: linkName, cols: [col1, col2] });
+        }
+    }
+    if (entries.length === 0)
+        return [];
+    const lines = [
+        "//",
+        "// Link tables for zite.sql() JOINs (use these exact names):",
+    ];
+    for (const e of entries) {
+        lines.push(`//   "${e.name}" — columns: "${e.cols[0]}", "${e.cols[1]}"`);
+    }
+    return lines;
+}
 /**
  * Generate .zite/db.ts purely from ZiteSchema.
  * Pure function — no external data needed beyond what's in the schema file.
@@ -261,11 +307,10 @@ export function generateDbTs(schema) {
     lines.push("//   - Use SDK names for tables (PascalCase) and fields (camelCase)");
     lines.push('//   - ALWAYS double-quote every identifier: FROM "Orders", WHERE "status" = $1');
     lines.push("//   - Use params array for user input ($1, $2, ...): never interpolate into SQL");
-    lines.push('//   - Link tables: alphabetical PascalCase concat (Items+Orders → "ItemsOrders")');
-    lines.push('//     with id columns: "itemsId", "ordersId"');
     lines.push("//   - Soft-deleted rows are excluded automatically — no WHERE deleted_at IS NULL");
     lines.push("//   - SELECT only — use .create/.update/.delete for writes");
     lines.push('//   - Load the "zite:sql" skill for full SQL reference (formulas, lookups, etc.)');
+    lines.push(...buildLinkTableComments(schema));
     lines.push("import { createTableClient, createSqlClient, createNotificationsClient, createMetaClient } from 'zitejs/runtime';");
     lines.push("");
     for (const table of schema.tables) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zitejs",
-  "version": "0.9.62",
+  "version": "0.9.64",
   "description": "The Zite framework — build apps on Zite Database",
   "type": "module",
   "main": "./dist/cjs/index.js",