kempo 4.2.36 → 4.2.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kempo",
-  "version": "4.2.36",
+  "version": "4.2.38",
   "type": "module",
   "description": "A fullstack CMS framework for creating websites with user authentication",
   "scripts": {
@@ -58,7 +58,7 @@
   },
   "peerDependencies": {
     "kempo-css": ">=2.2.5",
-    "kempo-server": ">=3.1.4",
+    "kempo-server": ">=3.3.0",
     "kempo-ui": ">=0.4.39"
   },
   "devDependencies": {

package/server/sdk.js

@@ -82,6 +82,7 @@ export { default as userHasSomePermissions } from './utils/permissions/userHasSo
   Settings
 */
 
+export { default as declaredValue } from './utils/settings/declaredValue.js';
 export { default as deleteSetting } from './utils/settings/deleteSetting.js';
 export { default as getPublicSettings } from './utils/settings/getPublicSettings.js';
 export { default as getSetting } from './utils/settings/getSetting.js';

package/server/utils/extensions/installExtension.js

@@ -9,6 +9,7 @@ import { randomUUID } from 'crypto';
 import triggerHook, { clearHandlerCache } from '../hooks/triggerHook.js';
 import createHook from '../hooks/createHook.js';
 import setSetting from '../settings/setSetting.js';
+import declaredValue from '../settings/declaredValue.js';
 import createTablesFromSchema from './createTablesFromSchema.js';
 import { invalidateScopeCache } from './scopeCache.js';
 import { getUnmetDependencies } from './dependencies.js';
@@ -91,7 +92,7 @@ export default async ({ name }) => {
     Create declarative settings
   */
   for(const { name: settingName, value, type, description } of kempoConfig.settings || []){
-    await setSetting(name, settingName, value, type || null, false, description || null);
+    await setSetting(name, settingName, declaredValue(value, type), type || null, false, description || null);
   }
 
   /*

package/server/utils/extensions/updateExtension.js

@@ -9,6 +9,7 @@ import { execSync } from 'child_process';
 import triggerHook, { clearHandlerCache } from '../hooks/triggerHook.js';
 import createHook from '../hooks/createHook.js';
 import setSetting from '../settings/setSetting.js';
+import declaredValue from '../settings/declaredValue.js';
 import createTablesFromSchema from './createTablesFromSchema.js';
 
 const requireFromProject = createRequire(join(process.cwd(), 'package.json'));
@@ -97,7 +98,7 @@ export default async ({ name, version = 'latest' }) => {
   const oldSettingNames = new Set((oldKempo.settings || []).map(s => s.name));
   for(const { name: settingName, value, type, description } of newKempo.settings || []){
     if(!oldSettingNames.has(settingName)){
-      await setSetting(name, settingName, value, type || null, false, description || null);
+      await setSetting(name, settingName, declaredValue(value, type), type || null, false, description || null);
     }
   }
 

package/server/utils/settings/declaredValue.js

@@ -0,0 +1,28 @@
+/*
+  A declared setting's default, turned into the value `setSetting` expects.
+
+  kempo-config.json declares defaults as strings — `"value": "10"` for a number, `"value": "true"`
+  for a boolean — and that is what the extension docs tell authors to write. `setSetting` takes the
+  *real* value and serialises it according to the type it is given, and for every scalar type the
+  two happen to agree: `serializeValue('10', 'number')` is `String('10')`, which is `'10'`.
+
+  For `json` they do not. A declared `"value": "[{\"label\":\"sm\"}]"` is a string, and
+  `serializeValue(aString, 'json')` is `JSON.stringify(aString)` — the array gets encoded a second
+  time, and reading the setting back returns the JSON *text* rather than the array. Nothing errors;
+  the extension simply behaves as though the setting were empty, which is a very quiet way to break.
+
+  So a json default is parsed here before it is stored. A value that is already a real array or
+  object (perfectly legal in kempo-config.json, and what you get if you write the JSON inline) is
+  passed through untouched, and a string that is not valid JSON is left as-is rather than thrown —
+  a malformed default is the author's problem to see in their own settings screen, not a reason to
+  fail the whole install.
+*/
+export default (value, type) => {
+  if(type !== 'json' || typeof value !== 'string') return value;
+
+  try {
+    return JSON.parse(value);
+  } catch {
+    return value;
+  }
+};