@blinkk/root-cms 2.1.1 → 2.2.1-alpha.0

package/dist/app.js

@@ -1,13 +1,89 @@
 // core/app.tsx
-import crypto from "node:crypto";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
+import crypto from "crypto";
+import path from "path";
 import { render as renderToString } from "preact-render-to-string";
 
+// core/project.ts
+var SCHEMA_MODULES = import.meta.glob(
+  [
+    "/**/*.schema.ts",
+    "!/appengine/**/*.schema.ts",
+    "!/functions/**/*.schema.ts",
+    "!/gae/**/*.schema.ts"
+  ],
+  { eager: true }
+);
+async function getProjectSchemas() {
+  const schemas = {};
+  for (const fileId in SCHEMA_MODULES) {
+    const schemaModule = SCHEMA_MODULES[fileId];
+    if (schemaModule.default) {
+      schemas[fileId] = schemaModule.default;
+    }
+  }
+  return schemas;
+}
+async function getCollectionSchema(collectionId) {
+  if (!testValidCollectionId(collectionId)) {
+    throw new Error(`invalid collection id: ${collectionId}`);
+  }
+  const fileId = `/collections/${collectionId}.schema.ts`;
+  const module = SCHEMA_MODULES[fileId];
+  if (!module.default) {
+    console.warn(`collection schema not exported in: ${fileId}`);
+    return null;
+  }
+  const collection = module.default;
+  collection.id = collectionId;
+  return convertOneOfTypes(collection);
+}
+function testValidCollectionId(id) {
+  return /^[A-Za-z0-9_-]+$/.test(id);
+}
+function convertOneOfTypes(collection) {
+  const clone = structuredClone(collection);
+  const types = clone.types || {};
+  function handleOneOfField(field) {
+    const names = [];
+    (field.types || []).forEach((sub) => {
+      if (typeof sub === "string") {
+        names.push(sub);
+        return;
+      }
+      if (sub.name) {
+        names.push(sub.name);
+        if (!types[sub.name]) {
+          types[sub.name] = sub;
+          if (sub.fields) {
+            walk(sub);
+          }
+        }
+      }
+    });
+    field.types = names;
+  }
+  function handleField(field) {
+    if (field.type === "oneof") {
+      handleOneOfField(field);
+    } else if (field.type === "object") {
+      walk(field);
+    } else if (field.type === "array" && field.of) {
+      handleField(field.of);
+    }
+  }
+  function walk(schema) {
+    const fields = schema?.fields || [];
+    fields.forEach(handleField);
+  }
+  walk(clone);
+  clone.types = types;
+  return clone;
+}
+
 // package.json
 var package_default = {
   name: "@blinkk/root-cms",
-  version: "2.1.1",
+  version: "3.0.0",
   author: "s@blinkk.com",
   license: "MIT",
   engines: {
@@ -61,8 +137,8 @@ var package_default = {
     build: 'rm -rf dist && concurrently -n "core,signin,ui" npm:build:core npm:build:signin npm:build:ui',
     "build:core": "tsup-node --config=./core/tsup.config.ts",
     "//": "NOTE: esbuild is used here because tsup doesn't currently support aliases.",
-    "build:ui": "esbuild ui/ui.tsx --bundle --minify --alias:react=@preact/compat --alias:react-dom=@preact/compat --tsconfig=ui/tsconfig.json --outdir=dist/ui",
-    "build:signin": "esbuild signin/signin.tsx --bundle --minify --tsconfig=signin/tsconfig.json --outdir=dist/ui",
+    "build:ui": "esbuild ui/ui.tsx --bundle --minify --alias:react=@preact/compat --alias:react-dom=@preact/compat --tsconfig=ui/tsconfig.json --outdir=dist/ui --legal-comments=external",
+    "build:signin": "esbuild signin/signin.tsx --bundle --minify --tsconfig=signin/tsconfig.json --outdir=dist/ui --legal-comments=external",
     dev: 'rm -rf dist && concurrently -k -n "core,ui" npm:dev:core npm:dev:signin npm:dev:ui',
     "dev:core": "pnpm build:core --watch",
     "dev:signin": "pnpm build:signin --watch",
@@ -71,9 +147,10 @@ var package_default = {
     "test:watch": "pnpm build && firebase emulators:exec 'vitest'"
   },
   dependencies: {
-    "@genkit-ai/ai": "1.15.5",
-    "@genkit-ai/core": "1.15.5",
-    "@genkit-ai/vertexai": "1.15.5",
+    "@genkit-ai/ai": "1.18.0",
+    "@genkit-ai/core": "1.18.0",
+    "@genkit-ai/vertexai": "1.18.0",
+    "@google-cloud/firestore": "7.11.3",
     "@hello-pangea/dnd": "18.0.1",
     "body-parser": "1.20.2",
     commander: "11.0.0",
@@ -82,11 +159,12 @@ var package_default = {
     diff: "8.0.2",
     "dts-dom": "3.7.0",
     "fnv-plus": "1.3.1",
-    genkit: "1.15.5",
+    genkit: "1.18.0",
     jsonwebtoken: "9.0.2",
     kleur: "4.1.5",
     sirv: "2.0.3",
-    "tiny-glob": "0.2.9"
+    "tiny-glob": "0.2.9",
+    zod: "3.23.8"
   },
   "//": "NOTE(stevenle): due to compat issues with mantine and preact, mantine is pinned to v4.2.12",
   devDependencies: {
@@ -101,9 +179,9 @@ var package_default = {
     "@editorjs/table": "2.4.4",
     "@editorjs/underline": "1.2.1",
     "@emotion/react": "11.10.5",
-    "@firebase/app-compat": "0.2.19",
-    "@firebase/app-types": "0.9.0",
-    "@firebase/rules-unit-testing": "3.0.1",
+    "@firebase/app-compat": "0.5.2",
+    "@firebase/app-types": "0.9.3",
+    "@firebase/rules-unit-testing": "5.0.0",
     "@lexical/code": "0.33.1",
     "@lexical/html": "0.33.1",
     "@lexical/link": "0.33.1",
@@ -127,13 +205,13 @@ var package_default = {
     "@types/gapi.client.sheets-v4": "0.0.4",
     "@types/google.accounts": "0.0.14",
     "@types/jsonwebtoken": "9.0.1",
-    "@types/node": "18.11.8",
+    "@types/node": "24.3.1",
     concurrently: "7.6.0",
-    esbuild: "0.19.9",
-    firebase: "10.5.2",
-    "firebase-admin": "11.11.1",
-    "firebase-functions": "4.8.0",
-    "firebase-tools": "12.9.1",
+    esbuild: "0.25.9",
+    firebase: "12.2.1",
+    "firebase-admin": "13.5.0",
+    "firebase-functions": "6.4.0",
+    "firebase-tools": "14.15.2",
     "highlight.js": "11.6.0",
     "json-diff-kit": "1.0.29",
     lexical: "0.33.1",
@@ -141,16 +219,16 @@ var package_default = {
     "mdast-util-from-markdown": "2.0.1",
     "mdast-util-gfm": "3.0.0",
     "micromark-extension-gfm": "3.0.0",
-    preact: "10.19.3",
-    "preact-render-to-string": "6.3.1",
+    preact: "10.27.1",
+    "preact-render-to-string": "6.6.1",
     "preact-router": "4.1.2",
     react: "npm:@preact/compat@^17.1.2",
     "react-dom": "npm:@preact/compat@^17.1.2",
     "react-json-view-compare": "2.0.2",
-    tsup: "8.0.1",
-    typescript: "5.2.2",
-    vite: "5.0.8",
-    vitest: "0.34.6",
+    tsup: "8.5.0",
+    typescript: "5.9.2",
+    vite: "7.1.4",
+    vitest: "3.2.4",
     yjs: "13.6.27"
   },
   peerDependencies: {
@@ -167,86 +245,17 @@ var package_default = {
   }
 };
 
-// core/project.ts
-var SCHEMA_MODULES = import.meta.glob(
-  [
-    "/**/*.schema.ts",
-    "!/appengine/**/*.schema.ts",
-    "!/functions/**/*.schema.ts",
-    "!/gae/**/*.schema.ts"
-  ],
-  { eager: true }
-);
-async function getProjectSchemas() {
-  const schemas = {};
-  for (const fileId in SCHEMA_MODULES) {
-    const schemaModule = SCHEMA_MODULES[fileId];
-    if (schemaModule.default) {
-      schemas[fileId] = schemaModule.default;
-    }
+// core/server-version.ts
+var SERVER_STARTUP_TS = String(Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3));
+function getServerVersion() {
+  if (process.env.NODE_ENV === "development") {
+    return SERVER_STARTUP_TS;
   }
-  return schemas;
-}
-async function getCollectionSchema(collectionId) {
-  if (!testValidCollectionId(collectionId)) {
-    throw new Error(`invalid collection id: ${collectionId}`);
-  }
-  const fileId = `/collections/${collectionId}.schema.ts`;
-  const module = SCHEMA_MODULES[fileId];
-  if (!module.default) {
-    console.warn(`collection schema not exported in: ${fileId}`);
-    return null;
-  }
-  const collection = module.default;
-  collection.id = collectionId;
-  return convertOneOfTypes(collection);
-}
-function testValidCollectionId(id) {
-  return /^[A-Za-z0-9_-]+$/.test(id);
-}
-function convertOneOfTypes(collection) {
-  const clone = structuredClone(collection);
-  const types = clone.types || {};
-  function handleOneOfField(field) {
-    const names = [];
-    (field.types || []).forEach((sub) => {
-      if (typeof sub === "string") {
-        names.push(sub);
-        return;
-      }
-      if (sub.name) {
-        names.push(sub.name);
-        if (!types[sub.name]) {
-          types[sub.name] = sub;
-          if (sub.fields) {
-            walk(sub);
-          }
-        }
-      }
-    });
-    field.types = names;
-  }
-  function handleField(field) {
-    if (field.type === "oneof") {
-      handleOneOfField(field);
-    } else if (field.type === "object") {
-      walk(field);
-    } else if (field.type === "array" && field.of) {
-      handleField(field.of);
-    }
-  }
-  function walk(schema) {
-    const fields = schema?.fields || [];
-    fields.forEach(handleField);
-  }
-  walk(clone);
-  clone.types = types;
-  return clone;
+  return package_default?.version || "root-3.0.0";
 }
 
 // core/app.tsx
 import { jsx, jsxs } from "preact/jsx-runtime";
-var __dirname = path.dirname(fileURLToPath(import.meta.url));
 var DEFAULT_FAVICON_URL = "https://lh3.googleusercontent.com/ijK50TfQlV_yJw3i-CMlnD6osH4PboZBILZrJcWhoNMEmoyCD5e1bAxXbaOPe5w4gG_Scf37EXrmZ6p8sP2lue5fLZ419m5JyLMs=e385-w256";
 function App(props) {
   return /* @__PURE__ */ jsxs("html", { children: [
@@ -354,21 +363,9 @@ async function renderApp(req, res, options) {
   const mainHtml = renderToString(
     /* @__PURE__ */ jsx(App, { title, ctx, favicon: cmsConfig.favicon })
   );
-  let html = `<!doctype html>
-${mainHtml}`;
   const nonce = generateNonce();
-  if (req.viteServer) {
-    const uiCssPath = path.join(__dirname, "ui/ui.css");
-    const uiJsPath = path.join(__dirname, "ui/ui.js");
-    const tpl = html.replace("{CSS_URL}", cachebust(req, `/@fs${uiCssPath}`)).replace("{JS_URL}", cachebust(req, `/@fs${uiJsPath}`)).replaceAll("{NONCE}", nonce);
-    html = await req.viteServer.transformIndexHtml(req.originalUrl, tpl);
-    html = html.replace(
-      '<script type="module" src="/@vite/client"></script>',
-      `<script type="module" src="/@vite/client" nonce="${nonce}"></script>`
-    );
-  } else {
-    html = html.replace("{CSS_URL}", cachebust(req, "/cms/static/ui.css")).replace("{JS_URL}", cachebust(req, "/cms/static/ui.js")).replaceAll("{NONCE}", nonce);
-  }
+  const html = `<!doctype html>
+${mainHtml}`.replace("{CSS_URL}", cachebust(req, "/cms/static/ui.css")).replace("{JS_URL}", cachebust(req, "/cms/static/ui.js")).replaceAll("{NONCE}", nonce);
   res.setHeader("Content-Type", "text/html");
   setSecurityHeaders(options, req, res, nonce);
   res.send(html);
@@ -448,21 +445,9 @@ async function renderSignIn(req, res, options) {
   const mainHtml = renderToString(
     /* @__PURE__ */ jsx(SignIn, { title: "Sign in", ctx, favicon: options.cmsConfig.favicon })
   );
-  let html = `<!doctype html>
-${mainHtml}`;
   const nonce = generateNonce();
-  if (req.viteServer) {
-    const cssPath = path.join(__dirname, "ui/signin.css");
-    const jsPath = path.join(__dirname, "ui/signin.js");
-    const tpl = html.replace("{CSS_URL}", cachebust(req, `/@fs${cssPath}`)).replace("{JS_URL}", cachebust(req, `/@fs${jsPath}`)).replaceAll("{NONCE}", nonce);
-    html = await req.viteServer.transformIndexHtml(req.originalUrl, tpl);
-    html = html.replace(
-      '<script type="module" src="/@vite/client"></script>',
-      `<script type="module" src="/@vite/client" nonce="${nonce}"></script>`
-    );
-  } else {
-    html = html.replace("{CSS_URL}", cachebust(req, "/cms/static/signin.css")).replace("{JS_URL}", cachebust(req, "/cms/static/signin.js")).replaceAll("{NONCE}", nonce);
-  }
+  const html = `<!doctype html>
+${mainHtml}`.replace("{CSS_URL}", cachebust(req, "/cms/static/signin.css")).replace("{JS_URL}", cachebust(req, "/cms/static/signin.js")).replaceAll("{NONCE}", nonce);
   res.setHeader("Content-Type", "text/html");
   setSecurityHeaders(options, req, res, nonce);
   res.status(403);
@@ -521,8 +506,12 @@ function getRefererOrigin(req) {
   return refererOrigin;
 }
 function cachebust(req, url) {
-  const value = req.hostname === "localhost" ? Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3) : package_default.version;
-  return `${url}?c=${value}`;
+  const cb = getServerVersion();
+  const host = req.get("host");
+  if (host?.includes("localhost")) {
+    return `http://${host}${url}?c=${cb}`;
+  }
+  return `${url}?c=${cb}`;
 }
 export {
   getCollection,

package/dist/cli.js

@@ -3,9 +3,9 @@ import { Command } from "commander";
 import { bgGreen, black } from "kleur/colors";
 
 // cli/generate-types.ts
-import { promises as fs } from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
+import { promises as fs } from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
 import { loadRootConfig, viteSsrLoadModule } from "@blinkk/root/node";
 import * as dom from "dts-dom";
 var __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -304,7 +304,7 @@ function alphanumeric(input) {
 import { loadRootConfig as loadRootConfig2 } from "@blinkk/root/node";
 
 // core/client.ts
-import crypto from "node:crypto";
+import crypto from "crypto";
 import {
   FieldValue as FieldValue2,
   Timestamp as Timestamp2

package/dist/{client-Vr32ZRmC.d.ts → client-BKO9Ikqy.d.ts}

@@ -1,4 +1,4 @@
-import { Request, Plugin, RootConfig } from '@blinkk/root';
+import { Plugin, Request, RootConfig } from '@blinkk/root';
 import { App } from 'firebase-admin/app';
 import { Firestore, WriteBatch, Timestamp, Query } from 'firebase-admin/firestore';
 
@@ -522,7 +522,7 @@ declare class RootCMSClient {
      */
     dbDocRef(collectionId: string, slug: string, options: {
         mode: 'draft' | 'published';
-    }): FirebaseFirestore.DocumentReference<FirebaseFirestore.DocumentData>;
+    }): FirebaseFirestore.DocumentReference<FirebaseFirestore.DocumentData, FirebaseFirestore.DocumentData>;
     /**
      * Saves draft data to a doc.
      *
@@ -638,7 +638,7 @@ declare class RootCMSClient {
      */
     dbTranslationsRef(translationsId: string, options: {
         mode: 'draft' | 'published';
-    }): FirebaseFirestore.DocumentReference<FirebaseFirestore.DocumentData>;
+    }): FirebaseFirestore.DocumentReference<FirebaseFirestore.DocumentData, FirebaseFirestore.DocumentData>;
     /**
      * Returns a data source configuration object.
      */
@@ -676,7 +676,7 @@ declare class RootCMSClient {
      */
     dbDataSourceDataRef(dataSourceId: string, options: {
         mode: 'draft' | 'published';
-    }): FirebaseFirestore.DocumentReference<FirebaseFirestore.DocumentData>;
+    }): FirebaseFirestore.DocumentReference<FirebaseFirestore.DocumentData, FirebaseFirestore.DocumentData>;
     /**
      * Gets the user's role from the project's ACL.
      */

package/dist/client.d.ts

@@ -1,4 +1,4 @@
 import '@blinkk/root';
 import 'firebase-admin/app';
 import 'firebase-admin/firestore';
-export { A as Action, p as ArrayObject, z as BatchRequest, B as BatchRequestOptions, w as BatchRequestQuery, x as BatchRequestQueryOptions, C as BatchResponse, c as DataSource, d as DataSourceData, e as DataSourceMode, D as Doc, b as DocMode, h as GetCountOptions, G as GetDocOptions, H as HttpMethod, j as ListActionsOptions, g as ListDocsOptions, L as LoadTranslationsOptions, a as LocaleTranslations, R as Release, k as RootCMSClient, f as SaveDraftOptions, S as SetDocOptions, i as Translation, y as TranslationsDoc, T as TranslationsMap, U as UserRole, m as getCmsPlugin, l as isRichTextData, q as marshalArray, n as marshalData, o as normalizeData, v as parseDocId, t as toArrayObject, s as translationsForLocale, r as unmarshalArray, u as unmarshalData } from './client-Vr32ZRmC.js';
+export { A as Action, p as ArrayObject, z as BatchRequest, B as BatchRequestOptions, w as BatchRequestQuery, x as BatchRequestQueryOptions, C as BatchResponse, c as DataSource, d as DataSourceData, e as DataSourceMode, D as Doc, b as DocMode, h as GetCountOptions, G as GetDocOptions, H as HttpMethod, j as ListActionsOptions, g as ListDocsOptions, L as LoadTranslationsOptions, a as LocaleTranslations, R as Release, k as RootCMSClient, f as SaveDraftOptions, S as SetDocOptions, i as Translation, y as TranslationsDoc, T as TranslationsMap, U as UserRole, m as getCmsPlugin, l as isRichTextData, q as marshalArray, n as marshalData, o as normalizeData, v as parseDocId, t as toArrayObject, s as translationsForLocale, r as unmarshalArray, u as unmarshalData } from './client-BKO9Ikqy.js';

package/dist/client.js

@@ -1,5 +1,5 @@
 // core/client.ts
-import crypto from "node:crypto";
+import crypto from "crypto";
 import {
   FieldValue as FieldValue2,
   Timestamp as Timestamp2

package/dist/core.d.ts

@@ -1,8 +1,8 @@
-import { L as LoadTranslationsOptions, T as TranslationsMap, a as LocaleTranslations } from './client-Vr32ZRmC.js';
-export { A as Action, p as ArrayObject, z as BatchRequest, B as BatchRequestOptions, w as BatchRequestQuery, x as BatchRequestQueryOptions, C as BatchResponse, c as DataSource, d as DataSourceData, e as DataSourceMode, D as Doc, b as DocMode, h as GetCountOptions, G as GetDocOptions, H as HttpMethod, j as ListActionsOptions, g as ListDocsOptions, E as Locale, N as MultiLocaleTranslationsMap, R as Release, k as RootCMSClient, f as SaveDraftOptions, S as SetDocOptions, O as SingleLocaleTranslationsMap, F as SourceString, I as TranslatedString, i as Translation, y as TranslationsDoc, J as TranslationsDocMode, M as TranslationsLocaleDocEntry, K as TranslationsLocaleDocHashMap, P as TranslationsManager, U as UserRole, Q as buildTranslationsDbPath, V as buildTranslationsLocaleDocDbPath, m as getCmsPlugin, l as isRichTextData, q as marshalArray, n as marshalData, o as normalizeData, v as parseDocId, t as toArrayObject, s as translationsForLocale, r as unmarshalArray, u as unmarshalData } from './client-Vr32ZRmC.js';
+import { L as LoadTranslationsOptions, T as TranslationsMap, a as LocaleTranslations } from './client-BKO9Ikqy.js';
+export { A as Action, p as ArrayObject, z as BatchRequest, B as BatchRequestOptions, w as BatchRequestQuery, x as BatchRequestQueryOptions, C as BatchResponse, c as DataSource, d as DataSourceData, e as DataSourceMode, D as Doc, b as DocMode, h as GetCountOptions, G as GetDocOptions, H as HttpMethod, j as ListActionsOptions, g as ListDocsOptions, E as Locale, N as MultiLocaleTranslationsMap, R as Release, k as RootCMSClient, f as SaveDraftOptions, S as SetDocOptions, O as SingleLocaleTranslationsMap, F as SourceString, I as TranslatedString, i as Translation, y as TranslationsDoc, J as TranslationsDocMode, M as TranslationsLocaleDocEntry, K as TranslationsLocaleDocHashMap, P as TranslationsManager, U as UserRole, Q as buildTranslationsDbPath, V as buildTranslationsLocaleDocDbPath, m as getCmsPlugin, l as isRichTextData, q as marshalArray, n as marshalData, o as normalizeData, v as parseDocId, t as toArrayObject, s as translationsForLocale, r as unmarshalArray, u as unmarshalData } from './client-BKO9Ikqy.js';
 import { RootConfig } from '@blinkk/root';
 import { Query } from 'firebase-admin/firestore';
-export { s as schema } from './schema-UCmjggdA.js';
+export { s as schema } from './schema-FB6Ck9sN.js';
 import 'firebase-admin/app';
 
 /** @deprecated Use client.ts instead. */

package/dist/core.js

@@ -5,7 +5,7 @@ var __export = (target, all) => {
 };
 
 // core/client.ts
-import crypto from "node:crypto";
+import crypto from "crypto";
 import {
   FieldValue as FieldValue2,
   Timestamp as Timestamp2

package/dist/functions.d.ts

@@ -1,4 +1,4 @@
-import * as firebase_functions_v2_scheduler from 'firebase-functions/v2/scheduler';
+import * as firebase_functions_scheduler from 'firebase-functions/scheduler';
 import { ScheduleOptions } from 'firebase-functions/v2/scheduler';
 
 interface CronOptions {
@@ -8,6 +8,6 @@ interface CronOptions {
 /**
  * Runs offline CMS tasks, such as publishing of scheduled docs.
  */
-declare function cron(options?: CronOptions): firebase_functions_v2_scheduler.ScheduleFunction;
+declare function cron(options?: CronOptions): firebase_functions_scheduler.ScheduleFunction;
 
 export { type CronOptions, cron };

package/dist/functions.js

@@ -1,10 +1,10 @@
 // core/functions.ts
-import path2 from "node:path";
+import path2 from "path";
 import { loadBundledConfig } from "@blinkk/root/node";
 import { onSchedule } from "firebase-functions/v2/scheduler";
 
 // core/client.ts
-import crypto from "node:crypto";
+import crypto from "crypto";
 import {
   FieldValue as FieldValue2,
   Timestamp as Timestamp2
@@ -1501,7 +1501,7 @@ var BatchResponse = class {
 };
 
 // core/versions.ts
-import path from "node:path";
+import path from "path";
 import { Timestamp as Timestamp3 } from "firebase-admin/firestore";
 import glob from "tiny-glob";
 var DOCUMENT_SAVE_OFFSET = 5 * 60 * 1e3;

package/dist/plugin.d.ts

@@ -1,4 +1,4 @@
 import '@blinkk/root';
 import 'firebase-admin/app';
 import 'firebase-admin/firestore';
-export { X as CMSAIConfig, _ as CMSPlugin, Z as CMSPluginOptions, Y as CMSSidebarTool, W as CMSUser, $ as cmsPlugin } from './client-Vr32ZRmC.js';
+export { X as CMSAIConfig, _ as CMSPlugin, Z as CMSPluginOptions, Y as CMSSidebarTool, W as CMSUser, $ as cmsPlugin } from './client-BKO9Ikqy.js';