@blinkk/root-cms 2.0.10 → 2.1.2-alpha.0

package/dist/app.js

@@ -1,13 +1,13 @@
 // 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 { fileURLToPath } from "url";
 import { render as renderToString } from "preact-render-to-string";
 
 // package.json
 var package_default = {
   name: "@blinkk/root-cms",
-  version: "2.0.10",
+  version: "2.1.2-alpha.0",
   author: "s@blinkk.com",
   license: "MIT",
   engines: {
@@ -71,9 +71,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 +83,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 +103,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 +129,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",
+    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,20 +143,20 @@ 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: {
-    "@blinkk/root": "2.0.10",
+    "@blinkk/root": "2.1.2-alpha.0",
     "firebase-admin": ">=11",
     "firebase-functions": ">=4",
     preact: ">=10",
@@ -168,16 +170,18 @@ var package_default = {
 };
 
 // core/project.ts
-var IGNORED_SCHEMA_FOLDERS = ["/appengine/", "/functions/", "/gae/"];
-var SCHEMA_MODULES = import.meta.glob("/**/*.schema.ts", {
-  eager: true
-});
-function getProjectSchemas() {
+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) {
-    if (IGNORED_SCHEMA_FOLDERS.some((prefix) => fileId.startsWith(prefix))) {
-      continue;
-    }
     const schemaModule = SCHEMA_MODULES[fileId];
     if (schemaModule.default) {
       schemas[fileId] = schemaModule.default;
@@ -185,6 +189,62 @@ function getProjectSchemas() {
   }
   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;
+}
 
 // core/app.tsx
 import { jsx, jsxs } from "preact/jsx-runtime";
@@ -259,9 +319,11 @@ function App(props) {
 }
 async function renderApp(req, res, options) {
   const collections = {};
-  Object.entries(getCollections()).forEach(([collectionId, collection]) => {
-    collections[collectionId] = serializeCollection(collection);
-  });
+  Object.entries(await getCollections()).forEach(
+    ([collectionId, collection]) => {
+      collections[collectionId] = serializeCollection(collection);
+    }
+  );
   const rootConfig = options.rootConfig || {};
   const cmsConfig = options.cmsConfig || {};
   let gci = cmsConfig.gci;
@@ -324,7 +386,8 @@ function serializeCollection(collection) {
     preview: collection.preview,
     slugRegex: collection.slugRegex,
     autolock: collection.autolock,
-    autolockReason: collection.autolockReason
+    autolockReason: collection.autolockReason,
+    sortOptions: collection.sortOptions
   };
 }
 function SignIn(props) {
@@ -407,18 +470,21 @@ ${mainHtml}`;
   res.status(403);
   res.send(html);
 }
-function getCollections() {
+async function getCollections() {
   const collections = {};
-  const schemas = getProjectSchemas();
+  const schemas = await getProjectSchemas();
   Object.entries(schemas).forEach(([fileId, schema]) => {
     if (fileId.startsWith("/collections/")) {
-      const collectionId = parseCollectionId(fileId);
-      collections[collectionId] = { ...schema, id: collectionId };
+      const collectionId = toCollectionId(fileId);
+      collections[collectionId] = { id: collectionId, ...schema };
     }
   });
   return collections;
 }
-function parseCollectionId(fileId) {
+async function getCollection(collectionId) {
+  return getCollectionSchema(collectionId);
+}
+function toCollectionId(fileId) {
   return path.basename(fileId).split(".")[0];
 }
 function generateNonce() {
@@ -461,6 +527,7 @@ function cachebust(req, url) {
   return `${url}?c=${value}`;
 }
 export {
+  getCollection,
   getCollections,
   renderApp,
   renderSignIn

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));
@@ -17,7 +17,7 @@ async function generateTypes() {
     rootConfig,
     modulePath
   );
-  const schemas = project.getProjectSchemas();
+  const schemas = await project.getProjectSchemas();
   const outputPath = path.resolve(rootDir, "root-cms.d.ts");
   await generateSchemaDts(outputPath, schemas);
   console.log("saved root-cms.d.ts!");
@@ -231,12 +231,19 @@ function fieldType(field, options) {
     if (field.types && Array.isArray(field.types)) {
       const unionTypes = [];
       field.types.forEach((schema) => {
-        if (!schema.name) {
+        let typeName;
+        if (typeof schema === "string") {
+          typeName = schema;
           return;
+        } else {
+          typeName = schema.name;
         }
-        const cleanName = alphanumeric(schema.name);
+        if (!typeName) {
+          return;
+        }
+        const cleanName = alphanumeric(typeName);
         const oneOfTypeId = `${cleanName}Fields`;
-        if (!options.oneOfTypes[oneOfTypeId]) {
+        if (typeof schema === "object" && !options.oneOfTypes[oneOfTypeId]) {
           const oneOfTypeInterface = dom.create.interface(
             oneOfTypeId,
             dom.DeclarationFlags.Export
@@ -252,7 +259,7 @@ function fieldType(field, options) {
         }
         const oneOfOption = dom.create.namedTypeReference("RootCMSOneOfOption");
         oneOfOption.typeArguments = [
-          dom.type.stringLiteral(schema.name),
+          dom.type.stringLiteral(typeName),
           dom.create.namedTypeReference(oneOfTypeId)
         ];
         unionTypes.push(oneOfOption);
@@ -267,6 +274,10 @@ function fieldType(field, options) {
     const referenceType = dom.create.namedTypeReference("RootCMSReference");
     return referenceType;
   }
+  if (field.type === "references") {
+    const referenceType = dom.create.namedTypeReference("RootCMSReference");
+    return dom.type.array(referenceType);
+  }
   if (field.type === "richtext") {
     const richtextType = dom.create.namedTypeReference("RootCMSRichText");
     return richtextType;
@@ -293,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,10 +1,9 @@
-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-KpQGOA1Z.js';
+export { s as schema } from './schema-FB6Ck9sN.js';
 import 'firebase-admin/app';
-import 'preact';
 
 /** @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
@@ -1700,51 +1700,55 @@ __export(schema_exports, {
   object: () => object,
   oneOf: () => oneOf,
   reference: () => reference,
+  references: () => references,
   richtext: () => richtext,
   select: () => select,
   string: () => string
 });
 function string(field) {
-  return { ...field, type: "string" };
+  return { type: "string", ...field };
 }
 function number(field) {
-  return { ...field, type: "number" };
+  return { type: "number", ...field };
 }
 function date(field) {
-  return { ...field, type: "date" };
+  return { type: "date", ...field };
 }
 function datetime(field) {
-  return { ...field, type: "datetime" };
+  return { type: "datetime", ...field };
 }
 function boolean(field) {
-  return { ...field, type: "boolean" };
+  return { type: "boolean", ...field };
 }
 function select(field) {
-  return { ...field, type: "select" };
+  return { type: "select", ...field };
 }
 function multiselect(field) {
-  return { ...field, type: "multiselect" };
+  return { type: "multiselect", ...field };
 }
 function image(field) {
-  return { ...field, type: "image" };
+  return { type: "image", ...field };
 }
 function file(field) {
-  return { ...field, type: "file" };
+  return { type: "file", ...field };
 }
 function object(field) {
-  return { ...field, type: "object" };
+  return { type: "object", ...field };
 }
 function array(field) {
-  return { ...field, type: "array" };
+  return { type: "array", ...field };
 }
 function oneOf(field) {
-  return { ...field, type: "oneof" };
+  return { type: "oneof", ...field };
 }
 function richtext(field) {
-  return { ...field, type: "richtext" };
+  return { type: "richtext", ...field };
 }
 function reference(field) {
-  return { ...field, type: "reference" };
+  return { type: "reference", ...field };
+}
+function references(field) {
+  return { ...field, type: "references" };
 }
 function defineSchema(schema) {
   return schema;

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';