kempo 4.2.31 → 4.2.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kempo",
-  "version": "4.2.31",
+  "version": "4.2.33",
   "type": "module",
   "description": "A fullstack CMS framework for creating websites with user authentication",
   "scripts": {

package/server/utils/extensions/dependencies.js

@@ -0,0 +1,26 @@
+import db from '../../db/index.js';
+import { extension } from '../../db/schema.js';
+import { eq } from 'drizzle-orm';
+
+/*
+  An extension declares the other extensions it requires via kempo-config.json's `dependencies`
+  array (a list of extension names). Enforced at install/enable time (a dependency must already be
+  enabled) and in reverse at disable/uninstall time (nothing enabled may be left depending on an
+  extension that is going away).
+*/
+
+export const getUnmetDependencies = async (dependencies = []) => {
+  if(!dependencies.length) return [];
+  const rows = await db.select({ name: extension.name, enabled: extension.enabled }).from(extension);
+  const enabled = new Set(rows.filter(row => row.enabled).map(row => row.name));
+  return dependencies.filter(dep => !enabled.has(dep));
+};
+
+export const getEnabledDependents = async (name) => {
+  const rows = await db.select({ name: extension.name, kempo: extension.kempo })
+    .from(extension)
+    .where(eq(extension.enabled, true));
+  return rows
+    .filter(row => row.name !== name && (row.kempo?.dependencies || []).includes(name))
+    .map(row => row.name);
+};

package/server/utils/extensions/disableExtension.js

@@ -2,12 +2,18 @@ import db from '../../db/index.js';
 import { extension } from '../../db/schema.js';
 import { eq } from 'drizzle-orm';
 import { invalidateScopeCache } from './scopeCache.js';
+import { getEnabledDependents } from './dependencies.js';
 
 export default async ({ name }) => {
   if(!name){
     return [{ code: 400, msg: 'Extension name is required' }, null];
   }
 
+  const dependents = await getEnabledDependents(name);
+  if(dependents.length){
+    return [{ code: 409, msg: `${dependents.join(', ')} depends on this extension and is still enabled` }, null];
+  }
+
   try {
     const updated = await db.update(extension)
       .set({ enabled: false, updatedAt: new Date() })

package/server/utils/extensions/enableExtension.js

@@ -2,6 +2,7 @@ import db from '../../db/index.js';
 import { extension } from '../../db/schema.js';
 import { eq } from 'drizzle-orm';
 import { invalidateScopeCache } from './scopeCache.js';
+import { getUnmetDependencies } from './dependencies.js';
 
 export default async ({ name }) => {
   if(!name){
@@ -9,17 +10,23 @@ export default async ({ name }) => {
   }
 
   try {
-    const updated = await db.update(extension)
+    const [existing] = await db.select().from(extension).where(eq(extension.name, name)).limit(1);
+    if(!existing){
+      return [{ code: 404, msg: 'Extension not found' }, null];
+    }
+
+    const unmet = await getUnmetDependencies(existing.kempo?.dependencies || []);
+    if(unmet.length){
+      return [{ code: 409, msg: `Requires ${unmet.join(', ')} to be enabled first` }, null];
+    }
+
+    const [updated] = await db.update(extension)
       .set({ enabled: true, updatedAt: new Date() })
       .where(eq(extension.name, name))
       .returning();
 
-    if(!updated.length){
-      return [{ code: 404, msg: 'Extension not found' }, null];
-    }
-
     invalidateScopeCache();
-    return [null, updated[0]];
+    return [null, updated];
   } catch(error) {
     return [{ code: 500, msg: 'Failed to enable extension' }, null];
   }

package/server/utils/extensions/installExtension.js

@@ -11,6 +11,7 @@ import createHook from '../hooks/createHook.js';
 import setSetting from '../settings/setSetting.js';
 import createTablesFromSchema from './createTablesFromSchema.js';
 import { invalidateScopeCache } from './scopeCache.js';
+import { getUnmetDependencies } from './dependencies.js';
 
 export default async ({ name }) => {
   if(!name){
@@ -44,6 +45,11 @@ export default async ({ name }) => {
     return [{ code: 500, msg: `Failed to read extension package files` }, null];
   }
 
+  const unmet = await getUnmetDependencies(kempoConfig.dependencies || []);
+  if(unmet.length){
+    return [{ code: 409, msg: `Requires ${unmet.join(', ')} to be installed and enabled first` }, null];
+  }
+
   /*
     Create tables from declarative schema
   */

package/server/utils/extensions/uninstallExtension.js

@@ -6,6 +6,7 @@ import { pathToFileURL } from 'url';
 import { sql } from 'drizzle-orm';
 import triggerHook, { clearHandlerCache } from '../hooks/triggerHook.js';
 import { invalidateScopeCache } from './scopeCache.js';
+import { getEnabledDependents } from './dependencies.js';
 
 /*
   Uninstall an extension.
@@ -38,6 +39,11 @@ export default async ({ name, purgeData = false }) => {
     return [{ code: 500, msg: 'Failed to find extension' }, null];
   }
 
+  const dependents = await getEnabledDependents(name);
+  if(dependents.length){
+    return [{ code: 409, msg: `${dependents.join(', ')} depends on this extension and is still enabled` }, null];
+  }
+
   try {
     const extRoot = join(process.cwd(), 'node_modules', name);
     const uninstallModule = await import(pathToFileURL(join(extRoot, 'uninstall.js')).href + `?t=${Date.now()}`).catch(() => null);

package/server/utils/fragments/createFragment.js

@@ -11,7 +11,7 @@ const slugify = name => name
   .replace(/-+/g, '-')
   .replace(/^-|-$/g, '');
 
-export default async ({ rootDir, directory, name, author, locked = false }) => {
+export default async ({ rootDir, directory, name, author, owner = 'custom', locked = false }) => {
   if(!rootDir){
     return [{ code: 400, msg: 'Root directory is required' }, null];
   }
@@ -38,7 +38,7 @@ export default async ({ rootDir, directory, name, author, locked = false }) => {
   const now = new Date().toISOString();
   const frontmatter = [
     '<!--',
-    `  owner: custom`,
+    `  owner: ${owner}`,
     `  name: ${name}`,
     `  author: ${author || ''}`,
     `  created: ${now}`,

package/server/utils/global-content/createGlobalContent.js

@@ -20,7 +20,7 @@ const serializeEntries = entries => entries.map(e => {
   return `<content ${attrs}>\n${e.markup}\n</content>`;
 }).join('\n');
 
-export default async ({ rootDir, name, location, priority, author }) => {
+export default async ({ rootDir, name, location, priority, author, owner = 'custom' }) => {
   if(!rootDir){
     return [{ code: 400, msg: 'Root directory is required' }, null];
   }
@@ -42,7 +42,7 @@ export default async ({ rootDir, name, location, priority, author }) => {
   const entry = {
     id: crypto.randomUUID(),
     name,
-    owner: 'custom',
+    owner,
     author: author || '',
     locked: false,
     location,

package/server/utils/pages/createPage.js

@@ -13,7 +13,7 @@ const slugify = name => name
   .replace(/-+/g, '-')
   .replace(/^-|-$/g, '');
 
-export default async ({ rootDir, directory, name, template, author, locked = false, extraMetadata = {} }) => {
+export default async ({ rootDir, directory, name, template, author, owner = 'custom', locked = false, extraMetadata = {} }) => {
   if(!rootDir){
     return [{ code: 400, msg: 'Root directory is required' }, null];
   }
@@ -46,7 +46,7 @@ export default async ({ rootDir, directory, name, template, author, locked = fal
 
   const now = new Date().toISOString();
   const defaultLines = [
-    `  owner: custom`,
+    `  owner: ${owner}`,
     `  name: ${name}`,
     `  author: ${author || ''}`,
     `  created: ${now}`,

package/server/utils/templates/createTemplate.js

@@ -11,7 +11,7 @@ const slugify = name => name
   .replace(/-+/g, '-')
   .replace(/^-|-$/g, '');
 
-export default async ({ rootDir, directory, name, author, copyFrom, locked = false }) => {
+export default async ({ rootDir, directory, name, author, owner = 'custom', copyFrom, locked = false }) => {
   if(!rootDir) return [{ code: 400, msg: 'Root directory is required' }, null];
   if(!name) return [{ code: 400, msg: 'Template name is required' }, null];
 
@@ -30,7 +30,7 @@ export default async ({ rootDir, directory, name, author, copyFrom, locked = fal
   const now = new Date().toISOString();
   const frontmatter = [
     '<!--',
-    `  owner: custom`,
+    `  owner: ${owner}`,
     `  author: ${author || ''}`,
     `  created: ${now}`,
     `  updated: ${now}`,