@happyvertical/smrt-core 0.40.59 → 0.40.61

package/dist/vite-plugin/sveltekit-generator.js

@@ -399,6 +399,17 @@ function isTenantScoped(objectDef) {
 	return !!objectDef.decoratorConfig?.tenantScoped;
 }
 /**
+* Whether generated routes must publish the authenticated principal into the
+* tenancy ALS without making the model itself tenant-scoped. This is an
+* explicit model-level opt-in: body data is never an identity source.
+*/
+function usesPrincipalContext(objectDef) {
+	return getApiConfigObject(objectDef.decoratorConfig?.api)?.principalContext === true;
+}
+function needsRouteTenantContext(objectDef) {
+	return isTenantScoped(objectDef) || usesPrincipalContext(objectDef);
+}
+/**
 * Emit the tenant-context establishment + fail-closed read-scope helpers for
 * `@TenantScoped` objects (#1540 facet 2; #1782). Generated handlers call
 * `establishTenantContext(locals)` after the auth guard so every query runs
@@ -418,9 +429,9 @@ function isTenantScoped(objectDef) {
 * active. Both helpers are imported only for tenant-scoped routes, which already
 * depend on `@happyvertical/smrt-tenancy`.
 */
-function generateTenantContextHelper() {
+function generateTenantContextHelper(requirePrincipal, includeReadScope) {
 	return `
-import { enterTenantContext, getCurrentTenant, hasTenantContext, isSuperAdminBypass, isTenancyEnabled } from '@happyvertical/smrt-tenancy';
+import { ${includeReadScope ? "enterTenantContext, getCurrentTenant, hasTenantContext, isSuperAdminBypass, isTenancyEnabled" : "enterTenantContext, hasTenantContext"} } from '@happyvertical/smrt-tenancy';
 
 function establishTenantContext(locals: unknown): void {
   if (hasTenantContext()) return;
@@ -429,11 +440,27 @@ function establishTenantContext(locals: unknown): void {
   const user = l.user as Record<string, unknown> | undefined;
   const session = l.session as Record<string, unknown> | undefined;
   const tenantId = l.tenantId ?? user?.tenantId ?? session?.tenantId;
+  const userId = l.userId ?? user?.id ?? user?.userId ?? session?.userId;
+  const rawPermissions = l.permissions;
+  const permissions =
+    rawPermissions instanceof Set && [...rawPermissions].every((value) => typeof value === 'string')
+      ? rawPermissions
+      : Array.isArray(rawPermissions) && rawPermissions.every((value) => typeof value === 'string')
+        ? new Set(rawPermissions)
+        : undefined;
+${requirePrincipal ? `  if (
+    typeof tenantId !== 'string' || !tenantId ||
+    typeof userId !== 'string' || !userId ||
+    !permissions
+  ) return;
+` : ""}
   if (typeof tenantId === 'string' && tenantId) {
-    enterTenantContext({ tenantId });
+    enterTenantContext(
+      ${requirePrincipal ? "{ tenantId, userId, permissions }" : "{ tenantId }"},
+    );
   }
 }
-
+${includeReadScope ? `
 // Fail-closed read scope (#1782): a public/anonymous read on a @TenantScoped
 // model has no tenant context, so the tenancy interceptor (optional mode) would
 // pass the query through UNFILTERED and return every tenant's rows. When tenancy
@@ -458,6 +485,7 @@ function tenantReadOptionsScope(): { tenantId: string | null } | undefined {
   }
   return { tenantId: getCurrentTenant()?.tenantId ?? null };
 }
+` : ""}
 `;
 }
 /**
@@ -466,7 +494,7 @@ function tenantReadOptionsScope(): { tenantId: string | null } | undefined {
 */
 function routeGuardPreamble(objectDef, mutating) {
 	const lines = [`  requireRouteAuth(locals, ${mutating});`];
-	if (isTenantScoped(objectDef)) lines.push("  establishTenantContext(locals);");
+	if (needsRouteTenantContext(objectDef)) lines.push("  establishTenantContext(locals);");
 	return lines.join("\n");
 }
 function normalizeApiHttpMethod(method) {
@@ -1176,6 +1204,15 @@ function isLocalObject(projectRoot, objectDef) {
 /**
 * Generates collection route template (GET list, POST create)
 */
+function generateTypedRouteErrorHelper() {
+	return `
+function smrtRouteErrorResponse(cause: unknown) {
+  const failure = normalizeTypedHttpError(cause);
+  if (failure) return json({ error: failure }, { status: failure.status });
+  return json({ error: 'Internal server error' }, { status: 500 });
+}
+`;
+}
 function generateCollectionRouteTemplate(projectRoot, className, objectDef, manifest, includedActions, options, routeDir) {
 	const hasGet = includedActions.includes("list");
 	const hasPost = includedActions.includes("create");
@@ -1191,9 +1228,10 @@ function generateCollectionRouteTemplate(projectRoot, className, objectDef, mani
 
 import { error${hasPost ? ", json" : ""} } from '@sveltejs/kit';
 ${serializerImports ? `${serializerImports}\n` : ""}import { getCollection } from '$lib/server/smrt';
+${hasPost ? "import { normalizeTypedHttpError } from '@happyvertical/smrt-core';\n" : ""}
 ${modelType.importStatement ? `${modelType.importStatement}\n` : ""}import type { RequestHandler } from './$types';
 // Note: ${className} is auto-registered by the Vite plugin scanner
-${generateAuthGuardHelper(objectDef, manifest)}${isTenantScoped(objectDef) ? generateTenantContextHelper() : ""}${hasPost ? generateWritablePolicyHelper(objectDef) : ""}${hasGet ? generateConditionalGetRouteHelper(objectDef.decoratorConfig?.api, {
+${generateAuthGuardHelper(objectDef, manifest)}${needsRouteTenantContext(objectDef) ? generateTenantContextHelper(usesPrincipalContext(objectDef), isTenantScoped(objectDef)) : ""}${hasPost ? generateWritablePolicyHelper(objectDef) : ""}${hasPost ? generateTypedRouteErrorHelper() : ""}${hasGet ? generateConditionalGetRouteHelper(objectDef.decoratorConfig?.api, {
 		tenantScoped: isTenantScoped(objectDef),
 		permissionScoped: listUsesPermissionScopedBody,
 		modelName: className,
@@ -1244,16 +1282,19 @@ ${routeGuardPreamble(objectDef, true)}
   const data = applyWritablePolicy(body);
 
 ${generateCollectionLoad(className, { typeName: modelType.typeName })}
-  const item = await collection.create(data);
-  await item.save();
+  try {
+    const item = await collection.create(data);
 ${serializers.itemSerializerName ? `
-  const serializedItem = await ${serializers.itemSerializerName}(item);
-
-  return json(
-    applyReadPermissionRedaction(serializedItem, publicJsonOptions),
-    { status: 201 },
-  );` : `
-  return json(item.toPublicJSON(publicJsonOptions), { status: 201 });`}
+    const serializedItem = await ${serializers.itemSerializerName}(item);
+
+    return json(
+      applyReadPermissionRedaction(serializedItem, publicJsonOptions),
+      { status: 201 },
+    );` : `
+    return json(item.toPublicJSON(publicJsonOptions), { status: 201 });`}
+  } catch (cause) {
+    return smrtRouteErrorResponse(cause);
+  }
 };
 ` : "";
 	return imports + getHandler + postHandler;
@@ -1314,8 +1355,9 @@ function generateItemRouteTemplate(projectRoot, className, objectDef, manifest,
 
 import { error${hasPut || hasDelete ? ", json" : ""} } from '@sveltejs/kit';
 ${serializerImports ? `${serializerImports}\n` : ""}import { getCollection } from '$lib/server/smrt';
+${hasPut || hasDelete ? "import { normalizeTypedHttpError } from '@happyvertical/smrt-core';\n" : ""}
 ${modelType.importStatement ? `${modelType.importStatement}\n` : ""}import type { RequestHandler } from './$types';
-${generateAuthGuardHelper(objectDef, manifest)}${isTenantScoped(objectDef) ? generateTenantContextHelper() : ""}${hasPut ? generateWritablePolicyHelper(objectDef) : ""}${hasGet ? generateConditionalGetRouteHelper(objectDef.decoratorConfig?.api, {
+${generateAuthGuardHelper(objectDef, manifest)}${needsRouteTenantContext(objectDef) ? generateTenantContextHelper(usesPrincipalContext(objectDef), isTenantScoped(objectDef)) : ""}${hasPut ? generateWritablePolicyHelper(objectDef) : ""}${hasPut || hasDelete ? generateTypedRouteErrorHelper() : ""}${hasGet ? generateConditionalGetRouteHelper(objectDef.decoratorConfig?.api, {
 		tenantScoped: isTenantScoped(objectDef),
 		permissionScoped: getUsesPermissionScopedBody,
 		modelName: className,
@@ -1364,7 +1406,11 @@ ${generateNotFoundError(className)}
   const body: unknown = await request.json();
   const data = applyWritablePolicy(body);
   Object.assign(item, data);
-  await item.save();
+  try {
+    await item.save();
+  } catch (cause) {
+    return smrtRouteErrorResponse(cause);
+  }
 ${serializers.itemSerializerName ? `
   const serializedItem = await ${serializers.itemSerializerName}(item);
 
@@ -1380,7 +1426,11 @@ ${generateCollectionLoad(className, { typeName: modelType.typeName })}
   const item = await collection.get(params.id);
 ${generateNotFoundError(className)}
 
-  await item.delete();
+  try {
+    await item.delete();
+  } catch (cause) {
+    return smrtRouteErrorResponse(cause);
+  }
   return json({ success: true });
 };
 ` : "";
@@ -1399,24 +1449,27 @@ function generateActionRouteTemplate(projectRoot, routeDir, routeSpecs, objectDe
 	if (routeSpecs.some((spec) => spec.hostType !== hostType || spec.lookupClassName !== lookupClassName || spec.routeConfig.scope !== routeConfig.scope)) throw new Error(`Cannot generate mixed custom route handlers for ${lookupClassName}. All handlers sharing a route path must target the same host type and scope.`);
 	const importBlock = [
 		"import { error, json } from '@sveltejs/kit';",
-		"import { normalizeCustomActionFailure } from '@happyvertical/smrt-core';",
+		"import { normalizeCustomActionFailure, normalizeTypedHttpError } from '@happyvertical/smrt-core';",
 		hostType === "collection" || routeConfig.scope !== "collection" ? "import { getCollection } from '$lib/server/smrt';" : "import { ObjectRegistry } from '@happyvertical/smrt-core';",
 		typeImports,
 		"import type { RequestHandler } from './$types';"
 	].filter(Boolean).join("\n");
 	const tenantScoped = isTenantScoped(objectDef) || routeSpecs.some((spec) => !!spec.lookupObjectDef && isTenantScoped(spec.lookupObjectDef));
-	const handlers = routeSpecs.map((spec) => generateActionRouteHandler(spec.lookupClassName, spec.actionName, spec.actionDef, spec.routeConfig, spec.hostType, tenantScoped, lookupModelType.typeName, hostModelType.typeName)).join("\n");
+	const principalContext = usesPrincipalContext(objectDef) || routeSpecs.some((spec) => !!spec.lookupObjectDef && usesPrincipalContext(spec.lookupObjectDef));
+	const needsTenantContext = tenantScoped || principalContext;
+	const handlers = routeSpecs.map((spec) => generateActionRouteHandler(spec.lookupClassName, spec.actionName, spec.actionDef, spec.routeConfig, spec.hostType, tenantScoped, needsTenantContext, lookupModelType.typeName, hostModelType.typeName)).join("\n");
 	return `${AUTO_GENERATED_ROUTE_HEADER}
 // DO NOT EDIT - changes will be overwritten
 
 ${importBlock}
-${generateAuthGuardHelper(objectDef, manifest)}${tenantScoped ? generateTenantContextHelper() : ""}
+${generateAuthGuardHelper(objectDef, manifest)}${needsTenantContext ? generateTenantContextHelper(principalContext, tenantScoped) : ""}
+${generateTypedRouteErrorHelper()}
 ${handlers}`;
 }
-function generateActionRouteHandler(lookupClassName, actionName, actionDef, routeConfig, hostType, tenantScoped, lookupTypeName, hostTypeName) {
+function generateActionRouteHandler(lookupClassName, actionName, actionDef, routeConfig, hostType, tenantScoped, needsTenantContext, lookupTypeName, hostTypeName) {
 	const handlerName = routeConfig.method;
 	const guardLines = [`  requireRouteAuth(locals, ${routeConfig.method !== "GET"});`];
-	if (tenantScoped) guardLines.push("  establishTenantContext(locals);");
+	if (needsTenantContext) guardLines.push("  establishTenantContext(locals);");
 	const authGuardLine = guardLines.join("\n");
 	const needsRequest = actionDef.parameters.length > 0;
 	const collectionHandlerArgs = buildRouteHandlerArgs(routeConfig.pathParamNames.length > 0, needsRequest);
@@ -1436,7 +1489,12 @@ ${generateCollectionLoad(lookupClassName, { typeName: lookupTypeName })}
 ${generateCollectionNotRegisteredError(lookupClassName)}
 ${staticTargetLoad}
 
-${optionsLoad}${scopedOptions.source}  const result = ${buildActionInvocationExpression(receiverExpression, actionName, invocationArgs)};
+${optionsLoad}${scopedOptions.source}  let result: unknown;
+  try {
+    result = ${buildActionInvocationExpression(receiverExpression, actionName, invocationArgs)};
+  } catch (cause) {
+    return smrtRouteErrorResponse(cause);
+  }
 
   const failure = normalizeCustomActionFailure(result);
   if (failure) {
@@ -1462,7 +1520,12 @@ ${authGuardLine}
 ${generateClassNotRegisteredError(lookupClassName)}
 
 ${optionsLoad}${scopedOptions.source}  const ClassRef = registered.constructor as typeof ${hostTypeName};
-  const result = ${buildActionInvocationExpression("ClassRef", actionName, invocationArgs)};
+  let result: unknown;
+  try {
+    result = ${buildActionInvocationExpression("ClassRef", actionName, invocationArgs)};
+  } catch (cause) {
+    return smrtRouteErrorResponse(cause);
+  }
 
   const failure = normalizeCustomActionFailure(result);
   if (failure) {
@@ -1490,7 +1553,12 @@ ${generateCollectionLoad(lookupClassName, { typeName: lookupTypeName })}
 ${scopedItemLoad}
 ${generateNotFoundError(lookupClassName)}
 
-${optionsLoad}  const result = ${buildActionInvocationExpression("item", actionName, invocationArgs)};
+${optionsLoad}  let result: unknown;
+  try {
+    result = ${buildActionInvocationExpression("item", actionName, invocationArgs)};
+  } catch (cause) {
+    return smrtRouteErrorResponse(cause);
+  }
 
   const failure = normalizeCustomActionFailure(result);
   if (failure) {