@harperfast/harper 5.2.0-alpha.6 → 5.2.0-beta.2

package/utility/install/installer.ts

@@ -27,6 +27,7 @@ import * as globalSchema from '../globalSchema.ts';
 import { promisify } from 'util';
 const pSchemaToGlobal = promisify(globalSchema.setSchemaDataToGlobal);
 import * as keys from '../../security/keys.ts';
+import { resolveConfiguredPath } from '../../config/componentEnvPrepass.ts';
 
 // Removes the color formatting that was being applied to the prompt answer.
 const PROMPT_ANSWER_TRANSFORMER = (answer) => answer;
@@ -84,9 +85,20 @@ let ignoreExisting = false;
  * This module orchestrates the installation of Harper.
  */
 
-export { install, updateConfigEnv, setIgnoreExisting };
+export { install, updateConfigEnv, setIgnoreExisting, resolveInstallDestination };
 install.createSuperUser = createSuperUser;
 
+/**
+ * Expands a `~/...` install destination to an absolute path so every downstream consumer
+ * (directory creation, boot props file, harperdb-config.yaml) resolves the same location instead
+ * of each independently (and inconsistently) trying to expand it (harper#672). Absolute paths and
+ * plain relative paths (no `~`, no leading `/`) are returned unchanged, preserving the existing
+ * cwd-relative behavior for relative paths.
+ */
+function resolveInstallDestination(value: string): string {
+	return resolveConfiguredPath(value, undefined) ?? value;
+}
+
 /**
  * Calls all the functions that are needed to install Harper.
  * @returns {Promise<void>}
@@ -103,6 +115,16 @@ async function install() {
 	// Check to see if any cmd/env vars are passed that override install prompts.
 	const promptOverride = checkForPromptOverride();
 	Object.assign(promptOverride, configFromFile);
+
+	// A cmd/env/config-file-sourced ROOTPATH skips the install prompt (and its `~/...`-expanding
+	// filter) entirely, so resolve it here - before it's validated (installValidator, below) or
+	// used anywhere else - to keep it consistent with the interactively-entered path (harper#672).
+	if (promptOverride[hdbTerms.INSTALL_PROMPTS.ROOTPATH] != null) {
+		promptOverride[hdbTerms.INSTALL_PROMPTS.ROOTPATH] = resolveInstallDestination(
+			promptOverride[hdbTerms.INSTALL_PROMPTS.ROOTPATH]
+		);
+	}
+
 	const hasRequiredPromptOverrides =
 		promptOverride[hdbTerms.INSTALL_PROMPTS.ROOTPATH] &&
 		promptOverride[hdbTerms.INSTALL_PROMPTS.HDB_ADMIN_USERNAME] &&
@@ -237,6 +259,9 @@ async function installPrompts(promptOverride) {
 			name: hdbTerms.INSTALL_PROMPTS.ROOTPATH,
 			prefix: PROMPT_PREFIX,
 			default: DEFAULT_HDB_ROOT,
+			// Runs before validate, so the existing-install check below (and everything after it)
+			// sees the same expanded path rather than a literal, unresolved `~/...` string.
+			filter: resolveInstallDestination,
 			validate: async (value) => {
 				if (checkForEmptyValue(value)) return checkForEmptyValue(value);
 				if (await fs.pathExists(path.join(value, 'system', 'hdb_user.mdb')))

package/validation/configValidator.ts

@@ -329,6 +329,9 @@ export function configValidator(configJson, skipFsValidation = false) {
 				}),
 			]),
 			threadRange: Joi.alternatives([array.optional(), string.optional()]),
+			securityHeaders: Joi.object()
+				.pattern(string, Joi.alternatives([string, number, boolean]))
+				.optional(),
 		}).required(),
 		threads: Joi.alternatives(
 			threadsConstraints.optional(),

package/validation/deleteValidator.ts

@@ -2,12 +2,21 @@ import * as validator from './validationWrapper.ts';
 import Joi from 'joi';
 import { hdbTable, hdbDatabase } from './common_validators.ts';
 
+// `hash_values`/`ids` are lists of primary keys. Items may be strings, numbers, or composite
+// (array/object) keys, but never `null`/`undefined`: a null key is coerced downstream into a
+// whole-collection target that wipes the table (see HarperFast/studio#1199), reject at the boundary.
+// `{#label}` resolves to the offending field/index (e.g. `hash_values[0]` or `ids[0]`) so the error
+// names the right field whether the null came in via `hash_values` or `ids`.
+const hashValue = Joi.any().invalid(null).messages({
+	'any.invalid': `{#label} must not contain null`,
+});
+
 const deleteSchema = Joi.object({
 	schema: hdbDatabase,
 	database: hdbDatabase,
 	table: hdbTable,
-	hash_values: Joi.array().required(),
-	ids: Joi.array(),
+	hash_values: Joi.array().items(hashValue).required(),
+	ids: Joi.array().items(hashValue),
 });
 
 export default function (deleteObject: any) {