@sonicjs-cms/core 3.0.0-beta.24 → 3.0.0-beta.26

package/bin/db-reset.js

@@ -49,13 +49,16 @@ async function prompt(question) {
   });
 }
 
-function findWranglerToml() {
-  // Look for wrangler.toml in current directory or parent directories
+function findWranglerConfig() {
+  // Prefer wrangler.toml, then wrangler.jsonc, then wrangler.json
+  const candidates = ['wrangler.toml', 'wrangler.jsonc', 'wrangler.json'];
   let dir = process.cwd();
   for (let i = 0; i < 5; i++) {
-    const tomlPath = join(dir, 'wrangler.toml');
-    if (existsSync(tomlPath)) {
-      return { path: tomlPath, dir };
+    for (const filename of candidates) {
+      const configPath = join(dir, filename);
+      if (existsSync(configPath)) {
+        return { path: configPath, dir, format: filename.endsWith('.toml') ? 'toml' : 'json' };
+      }
     }
     dir = dirname(dir);
   }
@@ -66,16 +69,16 @@ async function main() {
   log('\n🔧 SonicJS Database Reset Tool', colors.cyan + colors.bold);
   log('================================\n', colors.cyan);
 
-  // Find wrangler.toml
-  const wranglerInfo = findWranglerToml();
+  // Find wrangler config (toml, jsonc, or json)
+  const wranglerInfo = findWranglerConfig();
   if (!wranglerInfo) {
-    log('Error: Could not find wrangler.toml in current or parent directories', colors.red);
+    log('Error: Could not find wrangler.toml / wrangler.jsonc / wrangler.json in current or parent directories', colors.red);
     log('Please run this command from your SonicJS project directory.', colors.yellow);
     process.exit(1);
   }
 
-  const { path: wranglerPath, dir: projectDir } = wranglerInfo;
-  log(`Found wrangler.toml at: ${wranglerPath}`, colors.green);
+  const { path: wranglerPath, dir: projectDir, format: wranglerFormat } = wranglerInfo;
+  log(`Found wrangler config at: ${wranglerPath}`, colors.green);
 
   // Change to project directory
   process.chdir(projectDir);
@@ -176,22 +179,36 @@ async function main() {
 
   log(`\nDatabase ID: ${dbId}`, colors.green);
 
-  // Update wrangler.toml with the new database ID
-  log('\nUpdating wrangler.toml...', colors.yellow);
+  // Update wrangler config with the new database ID
+  const configBasename = wranglerPath.split('/').pop();
+  log(`\nUpdating ${configBasename}...`, colors.yellow);
   try {
     let wranglerContent = readFileSync(wranglerPath, 'utf-8');
-    wranglerContent = wranglerContent.replace(
-      /database_id\s*=\s*"[^"]*"/,
-      `database_id = "${dbId}"`
-    );
-    wranglerContent = wranglerContent.replace(
-      /database_name\s*=\s*"[^"]*"/,
-      `database_name = "${dbName}"`
-    );
+    if (wranglerFormat === 'toml') {
+      // TOML syntax: database_id = "value"
+      wranglerContent = wranglerContent.replace(
+        /database_id\s*=\s*"[^"]*"/,
+        `database_id = "${dbId}"`
+      );
+      wranglerContent = wranglerContent.replace(
+        /database_name\s*=\s*"[^"]*"/,
+        `database_name = "${dbName}"`
+      );
+    } else {
+      // JSON/JSONC syntax: "database_id": "value"
+      wranglerContent = wranglerContent.replace(
+        /"database_id"\s*:\s*"[^"]*"/,
+        `"database_id": "${dbId}"`
+      );
+      wranglerContent = wranglerContent.replace(
+        /"database_name"\s*:\s*"[^"]*"/,
+        `"database_name": "${dbName}"`
+      );
+    }
     writeFileSync(wranglerPath, wranglerContent);
-    log('Updated wrangler.toml successfully', colors.green);
+    log(`Updated ${configBasename} successfully`, colors.green);
   } catch (error) {
-    log(`Error updating wrangler.toml: ${error.message}`, colors.red);
+    log(`Error updating ${configBasename}: ${error.message}`, colors.red);
     process.exit(1);
   }
 

package/dist/admin-documents-form.template-JWV5GITD.js

@@ -0,0 +1,6 @@
+export { renderDocumentFormPage, renderVersionHistoryFragment } from './chunk-E3TQG7AA.js';
+import './chunk-SXC4HPK6.js';
+import './chunk-TQABQWOP.js';
+import './chunk-V4OQ3NZ2.js';
+//# sourceMappingURL=admin-documents-form.template-JWV5GITD.js.map
+//# sourceMappingURL=admin-documents-form.template-JWV5GITD.js.map

package/dist/{admin-documents-form.template-55V2ZGWT.js.map → admin-documents-form.template-JWV5GITD.js.map}

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"admin-documents-form.template-55V2ZGWT.js"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"admin-documents-form.template-JWV5GITD.js"}

package/dist/admin-documents-form.template-UWKGVAMW.cjs

@@ -0,0 +1,19 @@
+'use strict';
+
+var chunkTT3TQSCZ_cjs = require('./chunk-TT3TQSCZ.cjs');
+require('./chunk-MI2YXCK4.cjs');
+require('./chunk-MNWKYY5E.cjs');
+require('./chunk-IGJUBJBW.cjs');
+
+
+
+Object.defineProperty(exports, "renderDocumentFormPage", {
+  enumerable: true,
+  get: function () { return chunkTT3TQSCZ_cjs.renderDocumentFormPage; }
+});
+Object.defineProperty(exports, "renderVersionHistoryFragment", {
+  enumerable: true,
+  get: function () { return chunkTT3TQSCZ_cjs.renderVersionHistoryFragment; }
+});
+//# sourceMappingURL=admin-documents-form.template-UWKGVAMW.cjs.map
+//# sourceMappingURL=admin-documents-form.template-UWKGVAMW.cjs.map

package/dist/{admin-layout-catalyst.template-6UQGLCKI.js.map → admin-documents-form.template-UWKGVAMW.cjs.map}

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"admin-layout-catalyst.template-6UQGLCKI.js"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"admin-documents-form.template-UWKGVAMW.cjs"}

package/dist/admin-layout-catalyst.template-MOQ3BBXA.cjs

@@ -0,0 +1,21 @@
+'use strict';
+
+var chunkMI2YXCK4_cjs = require('./chunk-MI2YXCK4.cjs');
+require('./chunk-IGJUBJBW.cjs');
+
+chunkMI2YXCK4_cjs.init_admin_layout_catalyst_template();
+
+Object.defineProperty(exports, "renderAdminLayoutCatalyst", {
+  enumerable: true,
+  get: function () { return chunkMI2YXCK4_cjs.renderAdminLayoutCatalyst; }
+});
+Object.defineProperty(exports, "renderCatalystCheckbox", {
+  enumerable: true,
+  get: function () { return chunkMI2YXCK4_cjs.renderCatalystCheckbox; }
+});
+Object.defineProperty(exports, "setBranchLabel", {
+  enumerable: true,
+  get: function () { return chunkMI2YXCK4_cjs.setBranchLabel; }
+});
+//# sourceMappingURL=admin-layout-catalyst.template-MOQ3BBXA.cjs.map
+//# sourceMappingURL=admin-layout-catalyst.template-MOQ3BBXA.cjs.map

package/dist/{admin-layout-catalyst.template-3XZXDGF7.cjs.map → admin-layout-catalyst.template-MOQ3BBXA.cjs.map}

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"admin-layout-catalyst.template-3XZXDGF7.cjs"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"admin-layout-catalyst.template-MOQ3BBXA.cjs"}

package/dist/admin-layout-catalyst.template-WCYMQVTZ.js

@@ -0,0 +1,7 @@
+import { init_admin_layout_catalyst_template } from './chunk-SXC4HPK6.js';
+export { renderAdminLayoutCatalyst, renderCatalystCheckbox, setBranchLabel } from './chunk-SXC4HPK6.js';
+import './chunk-V4OQ3NZ2.js';
+
+init_admin_layout_catalyst_template();
+//# sourceMappingURL=admin-layout-catalyst.template-WCYMQVTZ.js.map
+//# sourceMappingURL=admin-layout-catalyst.template-WCYMQVTZ.js.map

package/dist/{admin-documents-form.template-YNAVMJCV.cjs.map → admin-layout-catalyst.template-WCYMQVTZ.js.map}

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"admin-documents-form.template-YNAVMJCV.cjs"}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"admin-layout-catalyst.template-WCYMQVTZ.js"}

package/dist/{app-01M0dIwt.d.ts → app-BP5IlK94.d.ts}

@@ -1,11 +1,9 @@
-import * as better_auth_client from 'better-auth/client';
-import * as better_auth_plugins_email_otp from 'better-auth/plugins/email-otp';
 import * as better_auth from 'better-auth';
-import * as better_auth_plugins_magic_link from 'better-auth/plugins/magic-link';
-import * as better_call from 'better-call';
+import * as better_auth_plugins from 'better-auth/plugins';
 import * as zod_v4_core from 'zod/v4/core';
 import * as zod from 'zod';
 import { z } from 'zod';
+import * as better_call from 'better-call';
 import { i as HookSystemLike, E as EmailProvider } from './types-DT7XN5TX.js';
 import { Hono, MiddlewareHandler, Context } from 'hono';
 import { D1Database, KVNamespace, R2Bucket } from '@cloudflare/workers-types';
@@ -22,6 +20,7 @@ declare function getDefaultAuthOptions(env: Bindings, requestBaseURL?: string):
             signInMagicLink: better_call.StrictEndpoint<"/sign-in/magic-link", {
                 method: "POST";
                 requireHeaders: true;
+                use: ((inputContext: better_call.MiddlewareInputContext<better_call.MiddlewareOptions>) => Promise<void>)[];
                 body: zod.ZodObject<{
                     email: zod.ZodEmail;
                     name: zod.ZodOptional<zod.ZodString>;
@@ -120,7 +119,7 @@ declare function getDefaultAuthOptions(env: Bindings, requestBaseURL?: string):
             window: number;
             max: number;
         }[];
-        options: better_auth_plugins_magic_link.MagicLinkOptions;
+        options: better_auth_plugins.MagicLinkOptions;
     } | {
         id: "email-otp";
         version: string;
@@ -138,6 +137,7 @@ declare function getDefaultAuthOptions(env: Bindings, requestBaseURL?: string):
         endpoints: {
             sendVerificationOTP: better_call.StrictEndpoint<"/email-otp/send-verification-otp", {
                 method: "POST";
+                use: ((inputContext: better_call.MiddlewareInputContext<better_call.MiddlewareOptions>) => Promise<void>)[];
                 body: zod.ZodObject<{
                     email: zod.ZodString;
                     type: zod.ZodEnum<{
@@ -646,13 +646,13 @@ declare function getDefaultAuthOptions(env: Bindings, requestBaseURL?: string):
             window: number;
             max: number;
         })[];
-        options: better_auth_plugins_email_otp.EmailOTPOptions;
+        options: better_auth_plugins.EmailOTPOptions;
         $ERROR_CODES: {
             OTP_EXPIRED: better_auth.RawError<"OTP_EXPIRED">;
             INVALID_OTP: better_auth.RawError<"INVALID_OTP">;
             TOO_MANY_ATTEMPTS: better_auth.RawError<"TOO_MANY_ATTEMPTS">;
         };
-    } | better_auth_client.DefaultOrganizationPlugin<{
+    } | better_auth_plugins.DefaultOrganizationPlugin<{
         schema: {
             organization: {
                 modelName: string;

package/dist/{app-aj39TGHB.d.cts → app-fdq4K3vw.d.cts}

@@ -1,11 +1,9 @@
-import * as better_auth_client from 'better-auth/client';
-import * as better_auth_plugins_email_otp from 'better-auth/plugins/email-otp';
 import * as better_auth from 'better-auth';
-import * as better_auth_plugins_magic_link from 'better-auth/plugins/magic-link';
-import * as better_call from 'better-call';
+import * as better_auth_plugins from 'better-auth/plugins';
 import * as zod_v4_core from 'zod/v4/core';
 import * as zod from 'zod';
 import { z } from 'zod';
+import * as better_call from 'better-call';
 import { i as HookSystemLike, E as EmailProvider } from './types-DT7XN5TX.cjs';
 import { Hono, MiddlewareHandler, Context } from 'hono';
 import { D1Database, KVNamespace, R2Bucket } from '@cloudflare/workers-types';
@@ -22,6 +20,7 @@ declare function getDefaultAuthOptions(env: Bindings, requestBaseURL?: string):
             signInMagicLink: better_call.StrictEndpoint<"/sign-in/magic-link", {
                 method: "POST";
                 requireHeaders: true;
+                use: ((inputContext: better_call.MiddlewareInputContext<better_call.MiddlewareOptions>) => Promise<void>)[];
                 body: zod.ZodObject<{
                     email: zod.ZodEmail;
                     name: zod.ZodOptional<zod.ZodString>;
@@ -120,7 +119,7 @@ declare function getDefaultAuthOptions(env: Bindings, requestBaseURL?: string):
             window: number;
             max: number;
         }[];
-        options: better_auth_plugins_magic_link.MagicLinkOptions;
+        options: better_auth_plugins.MagicLinkOptions;
     } | {
         id: "email-otp";
         version: string;
@@ -138,6 +137,7 @@ declare function getDefaultAuthOptions(env: Bindings, requestBaseURL?: string):
         endpoints: {
             sendVerificationOTP: better_call.StrictEndpoint<"/email-otp/send-verification-otp", {
                 method: "POST";
+                use: ((inputContext: better_call.MiddlewareInputContext<better_call.MiddlewareOptions>) => Promise<void>)[];
                 body: zod.ZodObject<{
                     email: zod.ZodString;
                     type: zod.ZodEnum<{
@@ -646,13 +646,13 @@ declare function getDefaultAuthOptions(env: Bindings, requestBaseURL?: string):
             window: number;
             max: number;
         })[];
-        options: better_auth_plugins_email_otp.EmailOTPOptions;
+        options: better_auth_plugins.EmailOTPOptions;
         $ERROR_CODES: {
             OTP_EXPIRED: better_auth.RawError<"OTP_EXPIRED">;
             INVALID_OTP: better_auth.RawError<"INVALID_OTP">;
             TOO_MANY_ATTEMPTS: better_auth.RawError<"TOO_MANY_ATTEMPTS">;
         };
-    } | better_auth_client.DefaultOrganizationPlugin<{
+    } | better_auth_plugins.DefaultOrganizationPlugin<{
         schema: {
             organization: {
                 modelName: string;

package/dist/catalog-56DR6OXI.cjs

@@ -0,0 +1,41 @@
+'use strict';
+
+var chunkFZGIU5AZ_cjs = require('./chunk-FZGIU5AZ.cjs');
+require('./chunk-IGJUBJBW.cjs');
+
+
+
+Object.defineProperty(exports, "clearCatalog", {
+  enumerable: true,
+  get: function () { return chunkFZGIU5AZ_cjs.clearCatalog; }
+});
+Object.defineProperty(exports, "clearKvCatalog", {
+  enumerable: true,
+  get: function () { return chunkFZGIU5AZ_cjs.clearKvCatalog; }
+});
+Object.defineProperty(exports, "getCatalog", {
+  enumerable: true,
+  get: function () { return chunkFZGIU5AZ_cjs.getCatalog; }
+});
+Object.defineProperty(exports, "getCatalogStats", {
+  enumerable: true,
+  get: function () { return chunkFZGIU5AZ_cjs.getCatalogStats; }
+});
+Object.defineProperty(exports, "loadKvCatalog", {
+  enumerable: true,
+  get: function () { return chunkFZGIU5AZ_cjs.loadKvCatalog; }
+});
+Object.defineProperty(exports, "recordCatalogRequest", {
+  enumerable: true,
+  get: function () { return chunkFZGIU5AZ_cjs.recordCatalogRequest; }
+});
+Object.defineProperty(exports, "scheduleKvWrite", {
+  enumerable: true,
+  get: function () { return chunkFZGIU5AZ_cjs.scheduleKvWrite; }
+});
+Object.defineProperty(exports, "setGlobalCatalogKv", {
+  enumerable: true,
+  get: function () { return chunkFZGIU5AZ_cjs.setGlobalCatalogKv; }
+});
+//# sourceMappingURL=catalog-56DR6OXI.cjs.map
+//# sourceMappingURL=catalog-56DR6OXI.cjs.map

package/dist/catalog-56DR6OXI.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"catalog-56DR6OXI.cjs"}

package/dist/catalog-6MB37KY7.js

@@ -0,0 +1,4 @@
+export { clearCatalog, clearKvCatalog, getCatalog, getCatalogStats, loadKvCatalog, recordCatalogRequest, scheduleKvWrite, setGlobalCatalogKv } from './chunk-F6BTBE4S.js';
+import './chunk-V4OQ3NZ2.js';
+//# sourceMappingURL=catalog-6MB37KY7.js.map
+//# sourceMappingURL=catalog-6MB37KY7.js.map

package/dist/catalog-6MB37KY7.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"catalog-6MB37KY7.js"}

package/dist/{chunk-QCJHCSOK.cjs → chunk-4DHPR7KR.cjs}

@@ -249,6 +249,58 @@ function validateCollectionConfig(config) {
     errors
   };
 }
+
+// src/middleware/plugin-middleware.ts
+var _pluginStatusCache = /* @__PURE__ */ new Map();
+function invalidatePluginStatusCache(pluginId) {
+  if (pluginId) {
+    _pluginStatusCache.delete(pluginId);
+  } else {
+    _pluginStatusCache.clear();
+  }
+}
+async function isPluginActive(db, pluginId) {
+  if (_pluginStatusCache.has(pluginId)) {
+    return _pluginStatusCache.get(pluginId);
+  }
+  try {
+    const docResult = await db.prepare(
+      `SELECT json_extract(data, '$.status') as status FROM documents
+         WHERE slug = ? AND type_id = 'plugin' AND tenant_id = 'default'
+           AND is_current_draft = 1 AND deleted_at IS NULL`
+    ).bind(pluginId).first();
+    const active = docResult?.status === "active";
+    _pluginStatusCache.set(pluginId, active);
+    return active;
+  } catch (error) {
+    console.error(`[isPluginActive] Error checking plugin status for ${pluginId}:`, error);
+    return false;
+  }
+}
+async function requireActivePlugin(db, pluginId) {
+  const isActive = await isPluginActive(db, pluginId);
+  if (!isActive) {
+    throw new Error(`Plugin '${pluginId}' is required but is not active`);
+  }
+}
+async function requireActivePlugins(db, pluginIds) {
+  for (const pluginId of pluginIds) {
+    await requireActivePlugin(db, pluginId);
+  }
+}
+async function getActivePlugins(db) {
+  try {
+    const { results } = await db.prepare(
+      `SELECT slug as id, json_extract(data, '$.status') as status, data FROM documents
+         WHERE type_id = 'plugin' AND tenant_id = 'default'
+           AND q_plugin_status = 'active' AND is_current_draft = 1 AND deleted_at IS NULL`
+    ).all();
+    return results || [];
+  } catch (error) {
+    console.error("[getActivePlugins] Error fetching active plugins:", error);
+    return [];
+  }
+}
 var TENANT_COOKIE = "sonicjs-tenant";
 var TENANT_SWITCHER_MARKER = "<!-- TENANT_SWITCHER -->";
 var MULTI_TENANT_PLUGIN_ID = "multi-tenant";
@@ -557,6 +609,7 @@ var PluginService = class {
     await this.db.prepare(`UPDATE plugins SET status = 'active' WHERE id = ?`).bind(pluginId).run().catch(() => {
     });
     invalidateTenantCache();
+    invalidatePluginStatusCache(pluginId);
     await this.logActivity(pluginId, "activated", null);
   }
   async deactivatePlugin(pluginId) {
@@ -573,6 +626,7 @@ var PluginService = class {
     await this.db.prepare(`UPDATE plugins SET status = 'inactive' WHERE id = ?`).bind(pluginId).run().catch(() => {
     });
     invalidateTenantCache();
+    invalidatePluginStatusCache(pluginId);
     await this.logActivity(pluginId, "deactivated", null);
   }
   async updatePluginSettings(pluginId, settings) {
@@ -1574,9 +1628,9 @@ var PluginBootstrapService = class {
           );
           await this.updatePlugin(plugin);
         }
-        if (plugin.id === "core-auth" && existingPlugin.status !== "active") {
+        if (existingPlugin.status !== "active") {
           console.log(
-            `[PluginBootstrap] Core-auth plugin is inactive, activating it now...`
+            `[PluginBootstrap] Activating bootstrapped plugin: ${plugin.display_name}`
           );
           await this.pluginService.activatePlugin(plugin.id);
         }
@@ -1616,20 +1670,22 @@ var PluginBootstrapService = class {
    */
   async isBootstrapNeeded() {
     try {
-      for (const corePlugin of this.CORE_PLUGINS.filter(
-        (p) => p.name.startsWith("core-")
-      )) {
-        const exists = await this.pluginService.getPlugin(corePlugin.id);
-        if (!exists) {
-          return true;
-        }
-      }
-      return false;
+      const corePlugins = this.CORE_PLUGINS.filter((p) => p.name.startsWith("core-"));
+      if (!corePlugins.length) return false;
+      const slugs = corePlugins.map((p) => `'${p.id.replace(/'/g, "''")}'`).join(",");
+      const res = await this.db.prepare(
+        `SELECT
+             COUNT(DISTINCT slug) AS installed,
+             COUNT(DISTINCT CASE WHEN json_extract(data, '$.status') = 'active' THEN slug END) AS active
+           FROM documents
+           WHERE slug IN (${slugs}) AND type_id = 'plugin'
+           AND tenant_id = 'default' AND is_current_draft = 1 AND deleted_at IS NULL`
+      ).first();
+      const installed = res?.installed ?? 0;
+      const active = res?.active ?? 0;
+      return installed < corePlugins.length || active < installed;
     } catch (error) {
-      console.error(
-        "[PluginBootstrap] Error checking bootstrap status:",
-        error
-      );
+      console.error("[PluginBootstrap] Error checking bootstrap status:", error);
       return true;
     }
   }
@@ -1896,6 +1952,7 @@ exports.TelemetryService = TelemetryService;
 exports.collectionRecordToRow = collectionRecordToRow;
 exports.createInstallationIdentity = createInstallationIdentity;
 exports.findPluginByCodeName = findPluginByCodeName;
+exports.getActivePlugins = getActivePlugins;
 exports.getAvailableCollectionNames = getAvailableCollectionNames;
 exports.getCollectionRegistry = getCollectionRegistry;
 exports.getTelemetryService = getTelemetryService;
@@ -1904,11 +1961,14 @@ exports.initTelemetry = initTelemetry;
 exports.invalidateTenantCache = invalidateTenantCache;
 exports.isCodeCollectionInternal = isCodeCollectionInternal;
 exports.isDbDocTypeInternal = isDbDocTypeInternal;
+exports.isPluginActive = isPluginActive;
 exports.loadCollectionConfig = loadCollectionConfig;
 exports.loadCollectionConfigs = loadCollectionConfigs;
 exports.registerCollections = registerCollections;
+exports.requireActivePlugin = requireActivePlugin;
+exports.requireActivePlugins = requireActivePlugins;
 exports.resetCollectionRegistry = resetCollectionRegistry;
 exports.tenantMiddleware = tenantMiddleware;
 exports.validateCollectionConfig = validateCollectionConfig;
-//# sourceMappingURL=chunk-QCJHCSOK.cjs.map
-//# sourceMappingURL=chunk-QCJHCSOK.cjs.map
+//# sourceMappingURL=chunk-4DHPR7KR.cjs.map
+//# sourceMappingURL=chunk-4DHPR7KR.cjs.map