fix: filter icon/mockup/skeleton components, fix Prisma type leak

Real-world testing against TourVault (164-file Next.js app) found:
- 20 SVG icon components (ArrowRightIcon, etc.) treated as screens → filtered
- Mockup/Skeleton/Placeholder components treated as screens → filtered
- Prisma enum imports (Import("...").$Enums.Status) leaked into Swift → sanitized
- SwiftData model filenames and class names collided with @observable stores
  → SwiftData classes renamed from {Entity}Store to {Entity}Record
  → SwiftData files renamed to {Entity}DataStore.swift

Result: TourVault output 129→107 files, 0 syntax errors, 0 junk views

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: masonwyatt23

src/generator/model-generator.ts

@@ -40,6 +40,10 @@ function typeDefinitionToSwiftType(td: TypeDefinition): string {
     if (/[<>|{}]|=>/.test(result)) {
         result = 'String';
     }
+    // Catch leaked import paths (e.g., Prisma enums: Import("...").$Enums.Status)
+    if (/Import\(|import\(|node_modules|\.prisma|\.\/|\.\.\//.test(result)) {
+        result = 'String';
+    }
     return result;
 }
 
@@ -632,7 +636,7 @@ function swiftDataFieldType(swiftType: string): string {
 
 function generateSwiftDataModel(entity: Entity, model: SemanticAppModel): string {
     const structName = pascalCase(entity.name);
-    const storeName = `${structName}Store`;
+    const storeName = `${structName}Record`;
     const fields = filterSwiftFields(entity.fields ?? []).map(analyseField);
     const hasId = fields.some((f) => f.isId);
     const relationships = entity.relationships ?? [];
@@ -648,7 +652,7 @@ function generateSwiftDataModel(entity: Entity, model: SemanticAppModel): string
         if (relationshipFieldNames.has(field.name)) {
             const rel = relationships.find(r => camelCase(r.fieldName) === field.name);
             if (rel) {
-                const targetStore = `${pascalCase(rel.targetEntity)}Store`;
+                const targetStore = `${pascalCase(rel.targetEntity)}Record`;
                 if (rel.type === 'one-to-many' || rel.type === 'many-to-many') {
                     lines.push(`    @Relationship var ${field.name}: [${targetStore}]`);
                 } else {
@@ -716,8 +720,8 @@ export function generateSwiftDataModels(model: SemanticAppModel): GeneratedFile[
     for (const [groupKey, groupEntities] of groups) {
         const lines: string[] = [];
         const groupFileName = groupEntities.length === 1
-            ? `${pascalCase(groupEntities[0].name)}Store.swift`
-            : `${pascalCase(groupKey)}Stores.swift`;
+            ? `${pascalCase(groupEntities[0].name)}DataStore.swift`
+            : `${pascalCase(groupKey)}DataStores.swift`;
         const sourceRef = groupEntities[0]?.sourceFile ? relativeSourcePath(groupEntities[0].sourceFile) : groupKey;
         lines.push(`// Generated by Morphkit`);
         lines.push(`// SwiftData persistence models from: ${sourceRef}`);
@@ -753,7 +757,7 @@ export function generateDataManager(model: SemanticAppModel): GeneratedFile | nu
 
     for (const entity of eligible) {
         const structName = pascalCase(entity.name);
-        const storeName = `${structName}Store`;
+        const storeName = `${structName}Record`;
         const varName = camelCase(entity.name);
         const pluralVar = varName.endsWith('s') ? varName : `${varName}s`;
         lines.push('');

src/generator/project-generator.ts

@@ -61,7 +61,7 @@ function generateAppEntry(model: SemanticAppModel): GeneratedFile {
     lines.push('            ContentView()');
     lines.push('        }');
     if (hasSwiftData) {
-        const storeTypes = eligible.map(e => `${pascalCase(e.name)}Store.self`);
+        const storeTypes = eligible.map(e => `${pascalCase(e.name)}Record.self`);
         lines.push(`        .modelContainer(for: [${storeTypes.join(', ')}])`);
     }
     lines.push('    }');

src/generator/swiftui-generator.ts

@@ -257,6 +257,8 @@ function sanitizeSwiftTypeName(name: string | undefined): string | undefined {
     if (JS_DOM_TYPES.has(name)) return undefined;
     // Reject names containing TS syntax (generics, unions, object literals, arrow fns)
     if (/[<>|{}]|=>/.test(name)) return undefined;
+    // Reject leaked import paths (Prisma enums, relative paths, node_modules)
+    if (/Import\(|import\(|node_modules|\.prisma|\.\/|\.\.\/|\$Enums/.test(name)) return undefined;
     return name;
 }
 
@@ -4047,6 +4049,13 @@ export function isMarketingScreen(screen: Screen): boolean {
 
     if (matchesMarketingName) return true;
 
+    // Filter icon components — SVG/icon wrappers are not screens
+    if (/Icon$/i.test(screen.name) || /^(Arrow|Check|Play|Chart|Users|Mic|Folder|Message|Sparkles|Trophy|Map|Upload|Search|File|Status|Trend|Star|Heart|Bell|Settings|Lock|Eye|Pen|Trash|Plus|Minus|Close|Menu|Calendar|Clock|Download|Share|Link|Filter|Sort|Grid|List|Home|Mail|Phone|Camera|Video|Globe|Flag|Tag|Pin|Bookmark|Shield|Zap|Sun|Moon|Cloud|Wifi|Battery|Volume|Pause|Stop|Skip|Refresh|Rotate|Crop|Layers|Copy|Clipboard|Info|Help|Alert|Warning)Icon$/i.test(screen.name)) return true;
+
+    // Filter mockup/demo/skeleton/placeholder components — these are UI decorations, not screens
+    if (/Mockup$|Skeleton$|Placeholder$|Shimmer$|Loader$/i.test(screen.name)) return true;
+    if (/^(Animated|Loading|Skeleton|Shimmer)/i.test(screen.name) && screen.dataRequirements.length === 0 && screen.actions.length === 0) return true;
+
     // Blog-prefixed screens that are purely static (no data, state, or actions)
     const isStatic =
         screen.dataRequirements.length === 0 &&

test/generator/swiftdata-persistence.test.ts

@@ -166,7 +166,7 @@ describe('SwiftData Persistence Layer', () => {
             const files = generateSwiftDataModels(model);
 
             expect(files.length).toBeGreaterThan(0);
-            const storeFile = files.find(f => f.path.includes('ProductStore'));
+            const storeFile = files.find(f => f.path.includes('DataStore'));
             expect(storeFile).toBeDefined();
         });
 
@@ -176,7 +176,7 @@ describe('SwiftData Persistence Layer', () => {
             const content = files[0].content;
 
             expect(content).toContain('@Model');
-            expect(content).toContain('final class ProductStore');
+            expect(content).toContain('final class ProductRecord');
         });
 
         test('SwiftData model imports SwiftData', () => {
@@ -211,12 +211,12 @@ describe('SwiftData Persistence Layer', () => {
             expect(content).toContain('@Attribute(.unique)');
         });
 
-        test('SwiftData model uses Store suffix naming', () => {
+        test('SwiftData model uses Record suffix naming', () => {
             const model = createMinimalModel([productEntity, userEntity]);
             const files = generateSwiftDataModels(model);
 
-            const productStore = files.find(f => f.content.includes('ProductStore'));
-            const userStore = files.find(f => f.content.includes('UserStore'));
+            const productStore = files.find(f => f.content.includes('ProductRecord'));
+            const userStore = files.find(f => f.content.includes('UserRecord'));
 
             expect(productStore).toBeDefined();
             expect(userStore).toBeDefined();
@@ -275,7 +275,7 @@ describe('SwiftData Persistence Layer', () => {
             const content = files[0].content;
 
             expect(content).toContain('@Relationship');
-            expect(content).toContain('[ProductStore]');
+            expect(content).toContain('[ProductRecord]');
         });
     });
 
@@ -327,7 +327,7 @@ describe('SwiftData Persistence Layer', () => {
             const file = generateDataManager(model);
             const content = file!.content;
 
-            expect(content).toContain('FetchDescriptor<ProductStore>');
+            expect(content).toContain('FetchDescriptor<ProductRecord>');
         });
 
         test('DataManager imports SwiftData', () => {
@@ -371,11 +371,11 @@ describe('SwiftData Persistence Layer', () => {
             // Verify the naming convention that project-generator uses
             const storeTypeNames = eligible.map(e => {
                 const name = e.name.charAt(0).toUpperCase() + e.name.slice(1);
-                return `${name}Store.self`;
+                return `${name}Record.self`;
             });
 
-            expect(storeTypeNames).toContain('ProductStore.self');
-            expect(storeTypeNames).toContain('UserStore.self');
+            expect(storeTypeNames).toContain('ProductRecord.self');
+            expect(storeTypeNames).toContain('UserRecord.self');
         });
     });
 });