meno-core 1.0.53 → 1.1.0

package/lib/shared/validation/index.ts

@@ -7,3 +7,4 @@ export * from './validators';
 export * from './propValidator';
 export * from './cmsValidators';
 export * from './commentValidators';
+export * from './permissionsValidators';

package/lib/shared/validation/permissionsValidators.test.ts

@@ -0,0 +1,49 @@
+import { describe, test, expect } from 'bun:test';
+import { validatePermissionsPolicy } from './permissionsValidators';
+
+describe('validatePermissionsPolicy', () => {
+  test('accepts a minimal policy', () => {
+    const result = validatePermissionsPolicy({ version: 1 });
+    expect(result.valid).toBe(true);
+  });
+
+  test('accepts a full policy with members, teams, roles and allow-lists', () => {
+    const result = validatePermissionsPolicy({
+      version: 1,
+      defaultRole: 'viewer',
+      members: {
+        alice: { allow: { pages: ['blog/*'], cms: ['posts'] } },
+        carol: { role: 'admin' },
+      },
+      teams: { content: { allow: { cms: ['*'] } } },
+    });
+    expect(result.valid).toBe(true);
+  });
+
+  test('rejects a missing version', () => {
+    expect(validatePermissionsPolicy({ defaultRole: 'viewer' }).valid).toBe(false);
+  });
+
+  test('rejects a version below 1', () => {
+    expect(validatePermissionsPolicy({ version: 0 }).valid).toBe(false);
+  });
+
+  test('rejects an unknown role', () => {
+    const result = validatePermissionsPolicy({ version: 1, members: { a: { role: 'superuser' } } });
+    expect(result.valid).toBe(false);
+  });
+
+  test('rejects a non-array allow-list', () => {
+    const result = validatePermissionsPolicy({ version: 1, members: { a: { allow: { pages: 'blog/*' } } } });
+    expect(result.valid).toBe(false);
+  });
+
+  test('reports a structured error path on failure', () => {
+    const result = validatePermissionsPolicy({ version: 1, members: { a: { role: 'nope' } } });
+    expect(result.valid).toBe(false);
+    if (!result.valid) {
+      expect(result.errors.length).toBeGreaterThan(0);
+      expect(result.errors[0]!.path).toContain('members');
+    }
+  });
+});

package/lib/shared/validation/permissionsValidators.ts

@@ -0,0 +1,49 @@
+/**
+ * Permissions Policy Validators
+ * Zod schema + validator for `.meno/permissions.json`.
+ */
+
+import { z } from 'zod';
+import type { ZodError } from 'zod';
+import type { PermissionsPolicy } from '../types/permissions';
+import { PERMISSION_ROLES } from '../types/permissions';
+import type { ValidationResult, ValidationError } from './validators';
+
+// PERMISSION_ROLES is a precise `as const` tuple, so z.enum consumes it directly.
+export const PermissionRoleSchema = z.enum(PERMISSION_ROLES);
+
+export const PermissionRuleSchema = z.object({
+  pages: z.array(z.string()).optional(),
+  components: z.array(z.string()).optional(),
+  cms: z.array(z.string()).optional(),
+  config: z.array(z.string()).optional(),
+});
+
+export const PermissionGrantSchema = z.object({
+  role: PermissionRoleSchema.optional(),
+  allow: PermissionRuleSchema.optional(),
+});
+
+export const PermissionsPolicySchema = z.object({
+  // Forward-tolerant: accept any positive version; the resolver only knows v1.
+  version: z.number().int().min(1),
+  defaultRole: PermissionRoleSchema.optional(),
+  members: z.record(z.string(), PermissionGrantSchema).optional(),
+  teams: z.record(z.string(), PermissionGrantSchema).optional(),
+});
+
+function zodToValidationErrors(zodError: ZodError): ValidationError[] {
+  return zodError.errors.map((err) => ({
+    path: err.path.join('.') || 'root',
+    message: err.message,
+    code: 'INVALID_TYPE' as const,
+  }));
+}
+
+export function validatePermissionsPolicy(data: unknown): ValidationResult<PermissionsPolicy> {
+  const result = PermissionsPolicySchema.safeParse(data);
+  if (result.success) {
+    return { valid: true, data: result.data as PermissionsPolicy };
+  }
+  return { valid: false, errors: zodToValidationErrors(result.error) };
+}

package/lib/shared/validation/propValidator.test.ts

@@ -14,9 +14,9 @@ describe('Prop Validator', () => {
         title: { type: 'string', default: 'Hello' },
       };
       const passedProps = { title: 'World' };
-      
+
       const result = validateComponentProps(propDefs, passedProps);
-      
+
       expect(result.valid).toBe(true);
       expect(result.props.title).toBe('World');
     });
@@ -26,9 +26,9 @@ describe('Prop Validator', () => {
         count: { type: 'number', default: 0 },
       };
       const passedProps = { count: 42 };
-      
+
       const result = validateComponentProps(propDefs, passedProps);
-      
+
       expect(result.valid).toBe(true);
       expect(result.props.count).toBe(42);
     });
@@ -38,9 +38,9 @@ describe('Prop Validator', () => {
         enabled: { type: 'boolean', default: false },
       };
       const passedProps = { enabled: true };
-      
+
       const result = validateComponentProps(propDefs, passedProps);
-      
+
       expect(result.valid).toBe(true);
       expect(result.props.enabled).toBe(true);
     });
@@ -54,9 +54,9 @@ describe('Prop Validator', () => {
         },
       };
       const passedProps = { variant: 'secondary' };
-      
+
       const result = validateComponentProps(propDefs, passedProps);
-      
+
       expect(result.valid).toBe(true);
       expect(result.props.variant).toBe('secondary');
     });
@@ -68,9 +68,9 @@ describe('Prop Validator', () => {
         title: { type: 'string', default: 'Hello' },
       };
       const passedProps = { title: 123 };
-      
+
       const result = validateComponentProps(propDefs, passedProps);
-      
+
       // Coercion makes this valid (123 -> "123")
       expect(result.valid).toBe(true);
       expect(result.props.title).toBe('123');
@@ -108,7 +108,7 @@ describe('Prop Validator', () => {
       expect(result.valid).toBe(false);
       if (!result.valid) {
         expect(result.errors.length).toBeGreaterThan(0);
-        expect(result.errors[0].message).toContain('not in allowed options');
+        expect(result.errors[0]!.message).toContain('not in allowed options');
       }
       // Should fall back to default
       expect(result.props.variant).toBe('primary');
@@ -121,9 +121,9 @@ describe('Prop Validator', () => {
         count: { type: 'number', default: 0 },
       };
       const passedProps = { count: '123' };
-      
+
       const result = validateComponentProps(propDefs, passedProps);
-      
+
       expect(result.valid).toBe(true);
       expect(result.props.count).toBe(123);
       expect(typeof result.props.count).toBe('number');
@@ -134,9 +134,9 @@ describe('Prop Validator', () => {
         enabled: { type: 'boolean', default: false },
       };
       const passedProps = { enabled: 'true' };
-      
+
       const result = validateComponentProps(propDefs, passedProps);
-      
+
       expect(result.valid).toBe(true);
       expect(result.props.enabled).toBe(true);
       expect(typeof result.props.enabled).toBe('boolean');
@@ -243,9 +243,9 @@ describe('Prop Validator', () => {
         unknownProp: 'allowed',
         anotherUnknown: 123,
       };
-      
+
       const result = validateComponentProps(propDefs, passedProps);
-      
+
       // Should be valid (unknown props don't fail validation)
       expect(result.valid).toBe(true);
       // Unknown props should be preserved
@@ -259,14 +259,12 @@ describe('Prop Validator', () => {
         count: { type: 'number', default: 42 },
       };
       const passedProps = {};
-      
+
       const result = validateComponentProps(propDefs, passedProps);
-      
+
       expect(result.valid).toBe(true);
       expect(result.props.title).toBe('Hello');
       expect(result.props.count).toBe(42);
     });
   });
 });
-
-

package/lib/shared/validation/propValidator.ts

@@ -43,19 +43,19 @@ function coerceValue(value: unknown, expectedType: PropDefinition['type']): unkn
   switch (expectedType) {
     case 'string':
       return String(value);
-    
+
     case 'number':
       if (typeof value === 'number') {
         return value;
       }
       if (typeof value === 'string') {
         const num = Number(value);
-        if (!isNaN(num) && isFinite(num)) {
+        if (!Number.isNaN(num) && Number.isFinite(num)) {
           return num;
         }
       }
       return undefined;
-    
+
     case 'boolean':
       if (typeof value === 'boolean') {
         return value;
@@ -73,10 +73,10 @@ function coerceValue(value: unknown, expectedType: PropDefinition['type']): unkn
         return value !== 0;
       }
       return undefined;
-    
+
     case 'select':
       return String(value);
-    
+
     default:
       return value;
   }
@@ -88,7 +88,7 @@ function coerceValue(value: unknown, expectedType: PropDefinition['type']): unkn
 function validateSingleProp(
   propName: string,
   propDef: PropDefinition,
-  value: unknown
+  value: unknown,
 ): { valid: boolean; error?: PropValidationError; coercedValue?: unknown } {
   // If value is undefined, it's valid (will use default)
   if (value === undefined) {
@@ -158,7 +158,7 @@ function validateSingleProp(
     case 'rich-text':
       // Rich-text accepts both strings and i18n values (i18n values will be resolved later)
       // Coerce numbers/booleans to strings (e.g. from CMS template resolution like {{item.value}})
-      coercedValue = (typeof value === 'number' || typeof value === 'boolean') ? String(value) : value;
+      coercedValue = typeof value === 'number' || typeof value === 'boolean' ? String(value) : value;
       typeValid = typeof coercedValue === 'string' || isI18nValue(coercedValue) || isTiptapDocument(coercedValue);
       break;
 
@@ -209,11 +209,11 @@ function validateSingleProp(
 
 /**
  * Validate component props against their interface definition
- * 
+ *
  * @param propDefs - Component interface definition (prop name -> PropDefinition)
  * @param passedProps - Props passed to the component instance
  * @returns Validation result with validated/coerced props and any errors
- * 
+ *
  * @example
  * ```typescript
  * const result = validateComponentProps(
@@ -227,7 +227,7 @@ function validateSingleProp(
  */
 export function validateComponentProps(
   propDefs: Record<string, PropDefinition>,
-  passedProps: Record<string, unknown>
+  passedProps: Record<string, unknown>,
 ): PropValidationResult {
   const errors: PropValidationError[] = [];
   const validatedProps: Record<string, unknown> = {};
@@ -239,18 +239,15 @@ export function validateComponentProps(
 
     if (validation.valid) {
       // Use coerced value if available, otherwise use original or default
-      validatedProps[propName] = validation.coercedValue !== undefined
-        ? validation.coercedValue
-        : (value !== undefined ? value : propDef.default);
+      validatedProps[propName] =
+        validation.coercedValue !== undefined ? validation.coercedValue : value !== undefined ? value : propDef.default;
     } else {
       // Validation failed - log error but use default if available (backward compatibility)
       if (validation.error) {
         errors.push(validation.error);
       }
       // Use default value if available, otherwise use original value (graceful degradation)
-      validatedProps[propName] = propDef.default !== undefined
-        ? propDef.default
-        : value;
+      validatedProps[propName] = propDef.default !== undefined ? propDef.default : value;
     }
   }
 
@@ -268,5 +265,3 @@ export function validateComponentProps(
 
   return { valid: true, props: validatedProps };
 }
-
-

package/lib/shared/validation/schemas.test.ts

@@ -4,12 +4,7 @@
  */
 
 import { describe, test, expect } from 'bun:test';
-import {
-  PropDefinitionSchema,
-  ComponentNodeSchema,
-  ComponentDefinitionSchema,
-  PageDataSchema,
-} from './schemas';
+import { PropDefinitionSchema, ComponentNodeSchema, ComponentDefinitionSchema, PageDataSchema } from './schemas';
 
 describe('Schema Validation', () => {
   describe('Valid component definitions pass', () => {
@@ -18,9 +13,9 @@ describe('Schema Validation', () => {
         type: 'string',
         default: 'Hello',
       };
-      
+
       const result = PropDefinitionSchema.safeParse(propDef);
-      
+
       expect(result.success).toBe(true);
       if (result.success) {
         expect(result.data.type).toBe('string');
@@ -46,9 +41,7 @@ describe('Schema Validation', () => {
       const propDef = {
         type: 'list',
         itemSchema: { title: { type: 'string' } },
-        default: [
-          { title: { _i18n: true, en: 'Hello', pl: 'Cześć' } },
-        ],
+        default: [{ title: { _i18n: true, en: 'Hello', pl: 'Cześć' } }],
       };
 
       const result = PropDefinitionSchema.safeParse(propDef);
@@ -127,9 +120,9 @@ describe('Schema Validation', () => {
         default: 'primary',
         options: ['primary', 'secondary'],
       };
-      
+
       const result = PropDefinitionSchema.safeParse(propDef);
-      
+
       expect(result.success).toBe(true);
       if (result.success) {
         expect(result.data.type).toBe('select');
@@ -143,9 +136,9 @@ describe('Schema Validation', () => {
         tag: 'div',
         children: [],
       };
-      
+
       const result = ComponentNodeSchema.safeParse(node);
-      
+
       expect(result.success).toBe(true);
     });
 
@@ -163,9 +156,9 @@ describe('Schema Validation', () => {
           },
         },
       };
-      
+
       const result = ComponentDefinitionSchema.safeParse(def);
-      
+
       expect(result.success).toBe(true);
     });
   });
@@ -176,9 +169,9 @@ describe('Schema Validation', () => {
         type: 'invalid-type',
         default: 'Hello',
       };
-      
+
       const result = PropDefinitionSchema.safeParse(propDef);
-      
+
       expect(result.success).toBe(false);
     });
 
@@ -187,9 +180,9 @@ describe('Schema Validation', () => {
         tag: 'div',
         children: [],
       };
-      
+
       const result = ComponentNodeSchema.safeParse(node);
-      
+
       expect(result.success).toBe(false);
     });
 
@@ -199,9 +192,9 @@ describe('Schema Validation', () => {
           // Missing required structure
         },
       };
-      
+
       const result = ComponentDefinitionSchema.safeParse(def);
-      
+
       // Should fail or pass with passthrough (backward compatibility)
       // The schema uses passthrough, so it might pass but log warnings
       expect(result).toBeDefined();
@@ -213,9 +206,9 @@ describe('Schema Validation', () => {
       const propDef = {
         type: 'string',
       };
-      
+
       const result = PropDefinitionSchema.safeParse(propDef);
-      
+
       // Should pass (default is optional)
       expect(result.success).toBe(true);
     });
@@ -225,9 +218,9 @@ describe('Schema Validation', () => {
         type: 'node',
         tag: 'div',
       };
-      
+
       const result = ComponentNodeSchema.safeParse(node);
-      
+
       // Should pass (children is optional)
       expect(result.success).toBe(true);
     });
@@ -240,9 +233,9 @@ describe('Schema Validation', () => {
         default: 'Hello',
         unknownField: 'preserved',
       };
-      
+
       const result = PropDefinitionSchema.safeParse(propDef);
-      
+
       expect(result.success).toBe(true);
       if (result.success) {
         // Passthrough should preserve unknown fields
@@ -257,14 +250,53 @@ describe('Schema Validation', () => {
         unknownField: 'preserved',
         children: [],
       };
-      
+
       const result = ComponentNodeSchema.safeParse(node);
-      
+
       expect(result.success).toBe(true);
       // Passthrough preserves unknown fields
       expect((node as any).unknownField).toBe('preserved');
     });
   });
-});
 
+  describe('meno-astro verbatim-code markers ({ _code, expr }) validate', () => {
+    test('a _code child node is accepted (renders natively at build; nothing in preview)', () => {
+      const node = {
+        type: 'node',
+        tag: 'div',
+        // The shape a promoted custom component produces: `{updateResult && <p>…</p>}`.
+        children: [{ _code: true, expr: 'updateResult && <p class="alert">Saved.</p>' }],
+      };
+      expect(ComponentNodeSchema.safeParse(node).success).toBe(true);
+    });
+
+    test('a _code value is accepted as an `if` condition and as an attribute value', () => {
+      const node = {
+        type: 'node',
+        tag: 'input',
+        if: { _code: true, expr: 'user?.isAdmin' },
+        attributes: { value: { _code: true, expr: "profile?.name ?? ''" } },
+      };
+      expect(ComponentNodeSchema.safeParse(node).success).toBe(true);
+    });
 
+    test('a full component definition whose structure carries _code children + a _frontmatter passthrough opens', () => {
+      const def = {
+        component: {
+          structure: {
+            type: 'node',
+            tag: 'div',
+            children: [{ _code: true, expr: 'error && <p>{error}</p>' }],
+          },
+          _frontmatter: "const error = Astro.url.searchParams.get('error');",
+        },
+      };
+      expect(ComponentDefinitionSchema.safeParse(def).success).toBe(true);
+    });
+
+    test('a bogus marker (missing expr) is still rejected as a child', () => {
+      const node = { type: 'node', tag: 'div', children: [{ _code: true }] };
+      expect(ComponentNodeSchema.safeParse(node).success).toBe(false);
+    });
+  });
+});