Task 1.2: Merge scoped-storage.zod.ts into object-storage.zod.ts

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

packages/spec/src/system/index.ts

@@ -25,7 +25,6 @@ export * from './manifest.zod';
 export * from './plugin.zod';
 export * from './plugin-capability.zod';
 export * from './context.zod';
-export * from './scoped-storage.zod';
 export * from './datasource.zod';
 
 // Driver Protocol
@@ -38,7 +37,7 @@ export * from './driver/postgres.zod';
 // Data Engine Protocol
 export * from './data-engine.zod';
 
-// Object Storage Protocol
+// Object Storage Protocol (includes scoped storage functionality)
 export * from './object-storage.zod';
 
 // Cache Protocol

packages/spec/src/system/object-storage.test.ts

@@ -1,5 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import {
+  StorageScopeSchema,
+  FileMetadataSchema,
   StorageProviderSchema,
   StorageAclSchema,
   StorageClassSchema,
@@ -13,6 +15,8 @@ import {
   BucketConfigSchema,
   StorageConnectionSchema,
   ObjectStorageConfigSchema,
+  type StorageScope,
+  type FileMetadata,
   type StorageProvider,
   type StorageAcl,
   type StorageClass,
@@ -27,6 +31,54 @@ import {
   type ObjectStorageConfig,
 } from './object-storage.zod';
 
+describe('StorageScopeSchema', () => {
+  it('should accept valid storage scopes', () => {
+    expect(() => StorageScopeSchema.parse('global')).not.toThrow();
+    expect(() => StorageScopeSchema.parse('tenant')).not.toThrow();
+    expect(() => StorageScopeSchema.parse('user')).not.toThrow();
+    expect(() => StorageScopeSchema.parse('session')).not.toThrow();
+    expect(() => StorageScopeSchema.parse('temp')).not.toThrow();
+    expect(() => StorageScopeSchema.parse('cache')).not.toThrow();
+    expect(() => StorageScopeSchema.parse('data')).not.toThrow();
+    expect(() => StorageScopeSchema.parse('logs')).not.toThrow();
+    expect(() => StorageScopeSchema.parse('config')).not.toThrow();
+    expect(() => StorageScopeSchema.parse('public')).not.toThrow();
+  });
+
+  it('should reject invalid storage scopes', () => {
+    expect(() => StorageScopeSchema.parse('invalid')).toThrow();
+  });
+});
+
+describe('FileMetadataSchema', () => {
+  it('should accept valid file metadata', () => {
+    const metadata: FileMetadata = {
+      path: '/uploads/file.txt',
+      name: 'file.txt',
+      size: 1024,
+      mimeType: 'text/plain',
+      lastModified: '2024-01-15T10:30:00.000Z',
+      created: '2024-01-15T10:00:00.000Z',
+      etag: '"abc123"',
+    };
+    
+    expect(() => FileMetadataSchema.parse(metadata)).not.toThrow();
+  });
+
+  it('should accept metadata without optional fields', () => {
+    const metadata: FileMetadata = {
+      path: '/uploads/file.txt',
+      name: 'file.txt',
+      size: 1024,
+      mimeType: 'text/plain',
+      lastModified: '2024-01-15T10:30:00.000Z',
+      created: '2024-01-15T10:00:00.000Z',
+    };
+    
+    expect(() => FileMetadataSchema.parse(metadata)).not.toThrow();
+  });
+});
+
 describe('StorageProviderSchema', () => {
   it('should accept valid storage providers', () => {
     expect(() => StorageProviderSchema.parse('s3')).not.toThrow();
@@ -611,6 +663,53 @@ describe('ObjectStorageConfigSchema', () => {
     expect(storage.provider).toBe('s3');
     expect(storage.enabled).toBe(true); // default
     expect(storage.buckets).toHaveLength(0); // default
+    expect(storage.scope).toBe('global'); // default
+  });
+
+  it('should accept storage config with scope', () => {
+    const storage = ObjectStorageConfigSchema.parse({
+      name: 'tenant_storage',
+      label: 'Tenant Storage',
+      provider: 's3',
+      scope: 'tenant',
+      connection: {
+        accessKeyId: 'key',
+        secretAccessKey: 'secret',
+      },
+    });
+
+    expect(storage.scope).toBe('tenant');
+  });
+
+  it('should accept storage config with location and quota', () => {
+    const storage = ObjectStorageConfigSchema.parse({
+      name: 'local_storage',
+      label: 'Local Storage',
+      provider: 'local',
+      scope: 'temp',
+      connection: {},
+      location: '/var/tmp/storage',
+      quota: 10737418240, // 10GB
+    });
+
+    expect(storage.location).toBe('/var/tmp/storage');
+    expect(storage.quota).toBe(10737418240);
+  });
+
+  it('should accept storage config with options', () => {
+    const storage = ObjectStorageConfigSchema.parse({
+      name: 'custom_storage',
+      label: 'Custom Storage',
+      provider: 'minio',
+      connection: {},
+      options: {
+        endpoint: 'http://localhost:9000',
+        pathStyle: true,
+      },
+    });
+
+    expect(storage.options?.endpoint).toBe('http://localhost:9000');
+    expect(storage.options?.pathStyle).toBe(true);
   });
 
   it('should accept full storage config with buckets', () => {

packages/spec/src/system/object-storage.zod.ts

@@ -4,10 +4,9 @@ import { SystemIdentifierSchema } from '../shared/identifiers.zod';
 /**
  * Object Storage Protocol
  * 
- * Defines schemas for object storage systems (S3, Azure Blob, GCS, MinIO)
- * that provide persistent file storage capabilities for ObjectStack applications.
- * 
- * This protocol supports:
+ * Unified storage protocol that combines:
+ * - Object storage systems (S3, Azure Blob, GCS, MinIO)
+ * - Scoped storage configuration (temp, cache, data, logs, config, public)
  * - Multi-cloud storage providers
  * - Bucket/container configuration
  * - Access control and permissions
@@ -16,6 +15,45 @@ import { SystemIdentifierSchema } from '../shared/identifiers.zod';
  * - Multipart uploads for large files
  */
 
+// ============================================================================
+// Storage Scope Protocol (formerly from scoped-storage.zod.ts)
+// ============================================================================
+
+/**
+ * Storage Scope Enum
+ * Defines the lifecycle and persistence guarantee of the storage area.
+ */
+export const StorageScopeSchema = z.enum([
+  'global',     // Global application-wide storage
+  'tenant',     // Tenant-scoped storage (multi-tenant apps)
+  'user',       // User-scoped storage
+  'session',    // Session-scoped storage (ephemeral)
+  'temp',       // Ephemeral, cleared on restart
+  'cache',      // Ephemeral, survives restarts, cleared on LRU/Expiration
+  'data',       // Persistent, backed up
+  'logs',       // Append-only, rotated
+  'config',     // Read-heavy, versioned
+  'public'      // Publicly accessible static assets
+]).describe('Storage scope classification');
+
+export type StorageScope = z.infer<typeof StorageScopeSchema>;
+
+/**
+ * File Metadata Schema
+ * Standardized file attribute structure
+ */
+export const FileMetadataSchema = z.object({
+  path: z.string().describe('File path'),
+  name: z.string().describe('File name'),
+  size: z.number().int().describe('File size in bytes'),
+  mimeType: z.string().describe('MIME type'),
+  lastModified: z.string().datetime().describe('Last modified timestamp'),
+  created: z.string().datetime().describe('Creation timestamp'),
+  etag: z.string().optional().describe('Entity tag'),
+});
+
+export type FileMetadata = z.infer<typeof FileMetadataSchema>;
+
 // ============================================================================
 // Enums
 // ============================================================================
@@ -403,6 +441,7 @@ export type StorageConnection = z.infer<typeof StorageConnectionSchema>;
  *   name: 'production_storage',
  *   label: 'Production File Storage',
  *   provider: 's3',
+ *   scope: 'global',
  *   connection: {
  *     accessKeyId: '${AWS_ACCESS_KEY_ID}',
  *     secretAccessKey: '${AWS_SECRET_ACCESS_KEY}',
@@ -424,9 +463,33 @@ export const ObjectStorageConfigSchema = z.object({
   name: SystemIdentifierSchema.describe('Storage configuration identifier'),
   label: z.string().describe('Display label'),
   provider: StorageProviderSchema.describe('Primary storage provider'),
+  
+  /**
+   * Storage scope
+   * Defines the lifecycle and access pattern for this storage
+   */
+  scope: StorageScopeSchema.optional().default('global').describe('Storage scope'),
+  
   connection: StorageConnectionSchema.describe('Connection credentials'),
   buckets: z.array(BucketConfigSchema).default([]).describe('Configured buckets'),
   defaultBucket: z.string().optional().describe('Default bucket name for operations'),
+  
+  /**
+   * Base path or location
+   * For local/scoped storage configurations
+   */
+  location: z.string().optional().describe('Root path (local) or base location'),
+  
+  /**
+   * Storage quota in bytes
+   */
+  quota: z.number().int().positive().optional().describe('Max size in bytes'),
+  
+  /**
+   * Provider-specific options
+   */
+  options: z.record(z.any()).optional().describe('Provider-specific configuration options'),
+  
   enabled: z.boolean().default(true).describe('Enable this storage configuration'),
   description: z.string().optional().describe('Configuration description'),
 });