pumuki 6.3.339 → 6.3.341

package/core/facts/detectors/text/ios.test.ts

@@ -1129,6 +1129,53 @@ struct FeedView: View {
   assert.equal(hasSwiftUiForEachConditionalViewCountUsage(safe), false);
 });
 
+test('hasSwiftUiForEachConditionalViewCountUsage preserva filas ForEach extraidas con branching interno', () => {
+  const source = `
+struct OnboardingCarouselView: View {
+  let pages: [OnboardingPage]
+  let indicators: [OnboardingIndicator]
+
+  var body: some View {
+    LazyVStack {
+      ForEach(pages) { page in
+        OnboardingPageView(page: page)
+      }
+      LazyHStack {
+        ForEach(indicators) { indicator in
+          OnboardingPageIndicatorView(indicator: indicator)
+        }
+      }
+    }
+  }
+}
+
+private struct OnboardingPageView: View {
+  let page: OnboardingPage
+
+  var body: some View {
+    switch page.kind {
+    case .hero:
+      OnboardingHeroStepView(page: page)
+    case .feature:
+      OnboardingFeatureStepView(page: page)
+    }
+  }
+}
+
+private struct OnboardingPageIndicatorView: View {
+  let indicator: OnboardingIndicator
+
+  var body: some View {
+    Capsule()
+      .fill(indicator.isSelected ? Color.primary : Color.secondary)
+  }
+}
+`;
+
+  assert.equal(hasSwiftUiForEachConditionalViewCountUsage(source), false);
+  assert.deepEqual(collectSwiftUiForEachConditionalViewCountLines(source), []);
+});
+
 test('hasSwiftViewBodyObjectCreationUsage detecta formatter creado en body y preserva dependencia externa', () => {
   const source = `
 struct PriceView: View {
@@ -1979,12 +2026,21 @@ final class Credentials {
   let label = "public title"
   // let apiKey = "sk_live_123456789"
 }
+`;
+  const emptyFormDefaults = `
+@MainActor
+public final class BuyerAppViewModel {
+  public var authEmail: String = ""
+  public var authPassword: String = ""
+}
 `;
 
   assert.equal(hasSwiftHardcodedSensitiveStringUsage(source), true);
   assert.deepEqual(collectSwiftHardcodedSensitiveStringLines(source), [3, 4]);
   assert.equal(hasSwiftHardcodedSensitiveStringUsage(safe), false);
   assert.deepEqual(collectSwiftHardcodedSensitiveStringLines(safe), []);
+  assert.equal(hasSwiftHardcodedSensitiveStringUsage(emptyFormDefaults), false);
+  assert.deepEqual(collectSwiftHardcodedSensitiveStringLines(emptyFormDefaults), []);
 });
 
 test('hasSwiftUnlocalizedDateFormatterUsage detecta dateFormat fijo sin locale explicito', () => {
@@ -2772,7 +2828,7 @@ struct StoresView: View {
   assert.deepEqual(collectSwiftNonLazyScrollForEachLines(source), [4, 6, 11]);
   assert.deepEqual(collectSwiftForEachIndicesLines(source), [6]);
   assert.deepEqual(collectSwiftForEachSelfIdentityLines(source), [6]);
-  assert.deepEqual(collectSwiftUiForEachConditionalViewCountLines(source), [6, 7, 11, 14, 20]);
+  assert.deepEqual(collectSwiftUiForEachConditionalViewCountLines(source), [6, 7]);
   assert.deepEqual(collectSwiftInlineForEachTransformLines(source), [11]);
   assert.deepEqual(collectSwiftUiConditionalSameViewIdentityLines(source), [7, 14, 20]);
   assert.deepEqual(collectSwiftUiInlineActionLogicLines(source), [19]);

package/core/facts/detectors/text/ios.ts

@@ -660,24 +660,99 @@ export const collectSwiftNonLazyScrollForEachLines = (source: string): readonly
   ]);
 };
 
-export const hasSwiftUiForEachConditionalViewCountUsage = (source: string): boolean => {
-  const swiftSource = sanitizeSwiftSourceForMultilineRegex(source);
-  const conditionalForEachPattern =
-    /\bForEach\s*\([^)]*\)\s*\{[\s\S]{0,1600}\b(?:if|switch)\b[\s\S]{0,1600}\}/;
+const findMatchingSwiftParen = (source: string, openParenIndex: number): number => {
+  let depth = 0;
+  for (let index = openParenIndex; index < source.length; index += 1) {
+    const current = source[index];
+    if (current === '(') {
+      depth += 1;
+    } else if (current === ')') {
+      depth -= 1;
+      if (depth === 0) {
+        return index;
+      }
+    }
+  }
+  return -1;
+};
 
-  return conditionalForEachPattern.test(swiftSource);
+const getLineNumberAtIndex = (source: string, targetIndex: number): number => {
+  let lineNumber = 1;
+  for (let index = 0; index < targetIndex && index < source.length; index += 1) {
+    if (source[index] === '\n') {
+      lineNumber += 1;
+    }
+  }
+  return lineNumber;
+};
+
+const collectSwiftUiForEachDirectConditionalLines = (source: string): readonly number[] => {
+  const sanitized = sanitizeSwiftSourceForMultilineRegex(source);
+  const lines: number[] = [];
+  const forEachPattern = /\bForEach\s*\(/g;
+
+  for (const match of sanitized.matchAll(forEachPattern)) {
+    const matchIndex = match.index ?? 0;
+    const openParenIndex = sanitized.indexOf('(', matchIndex);
+    if (openParenIndex < 0) {
+      continue;
+    }
+
+    const closeParenIndex = findMatchingSwiftParen(sanitized, openParenIndex);
+    if (closeParenIndex < 0) {
+      continue;
+    }
+
+    const openBraceIndex = sanitized.indexOf('{', closeParenIndex);
+    if (openBraceIndex < 0) {
+      continue;
+    }
+
+    const closeBraceIndex = findMatchingSwiftBrace(sanitized, openBraceIndex);
+    if (closeBraceIndex < 0) {
+      continue;
+    }
+
+    const body = sanitized.slice(openBraceIndex + 1, closeBraceIndex);
+    let depth = 0;
+    let hasDirectConditional = false;
+    const conditionalPattern = /\b(?:if|switch)\b/g;
+
+    for (const conditionalMatch of body.matchAll(conditionalPattern)) {
+      const conditionalIndex = conditionalMatch.index ?? 0;
+      for (let index = 0; index < conditionalIndex; index += 1) {
+        const current = body[index];
+        if (current === '{') {
+          depth += 1;
+        } else if (current === '}') {
+          depth = Math.max(0, depth - 1);
+        }
+      }
+      if (depth === 0) {
+        lines.push(getLineNumberAtIndex(sanitized, matchIndex));
+        lines.push(getLineNumberAtIndex(sanitized, openBraceIndex + 1 + conditionalIndex));
+        hasDirectConditional = true;
+        break;
+      }
+      depth = 0;
+    }
+
+    if (!hasDirectConditional) {
+      continue;
+    }
+  }
+
+  return sortedUniqueLines(lines);
+};
+
+export const hasSwiftUiForEachConditionalViewCountUsage = (source: string): boolean => {
+  return collectSwiftUiForEachDirectConditionalLines(source).length > 0;
 };
 
 export const collectSwiftUiForEachConditionalViewCountLines = (
   source: string
 ): readonly number[] => {
-  if (!hasSwiftUiForEachConditionalViewCountUsage(source)) {
-    return [];
-  }
-  return sortedUniqueLines([
-    ...collectSwiftRegexLines(source, /\bForEach\s*\(/),
-    ...collectSwiftRegexLines(source, /\b(?:if|switch)\b/),
-  ]);
+  return collectSwiftUiForEachDirectConditionalLines(source);
 };
 
 export const hasSwiftViewBodyObjectCreationUsage = (source: string): boolean => {
@@ -1718,18 +1793,26 @@ export const collectSwiftSensitiveLoggingLines = (source: string): readonly numb
   return sortedUniqueLines(lines);
 };
 
-export const hasSwiftHardcodedSensitiveStringUsage = (source: string): boolean => {
-  return collectSwiftRegexLines(
-    source,
-    /\b(?:(?:private|fileprivate|internal|public|open|static|class|final|lazy)\s+)*(?:let|var)\s+(?=[A-Za-z_])[A-Za-z0-9_]*(?:token|secret|password|apikey|clientsecret|privatekey|sessionid)[A-Za-z0-9_]*\s*(?::\s*String\s*)?=\s*""/i
-  ).length > 0;
-};
+const swiftHardcodedSensitiveStringPattern =
+  /\b(?:(?:private|fileprivate|internal|public|open|static|class|final|lazy)\s+)*(?:let|var)\s+(?=[A-Za-z_])[A-Za-z0-9_]*(?:token|secret|password|apikey|clientsecret|privatekey|sessionid)[A-Za-z0-9_]*\s*(?::\s*String\s*)?=\s*"((?:\\.|[^"\\])*)"/i;
 
 export const collectSwiftHardcodedSensitiveStringLines = (source: string): readonly number[] => {
-  return collectSwiftRegexLines(
-    source,
-    /\b(?:(?:private|fileprivate|internal|public|open|static|class|final|lazy)\s+)*(?:let|var)\s+(?=[A-Za-z_])[A-Za-z0-9_]*(?:token|secret|password|apikey|clientsecret|privatekey|sessionid)[A-Za-z0-9_]*\s*(?::\s*String\s*)?=\s*""/i
-  );
+  const matches: number[] = [];
+
+  source.split(/\r?\n/).forEach((rawLine, index) => {
+    const line = rawLine.replace(/\/\/.*$/, '');
+    const match = swiftHardcodedSensitiveStringPattern.exec(line);
+    const literalValue = match?.[1] ?? '';
+    if (literalValue.length > 0) {
+      matches.push(index + 1);
+    }
+  });
+
+  return matches;
+};
+
+export const hasSwiftHardcodedSensitiveStringUsage = (source: string): boolean => {
+  return collectSwiftHardcodedSensitiveStringLines(source).length > 0;
 };
 
 export const hasSwiftUnlocalizedDateFormatterUsage = (source: string): boolean => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pumuki",
-  "version": "6.3.339",
+  "version": "6.3.341",
   "description": "Enterprise-grade AST Intelligence System with multi-platform support (iOS, Android, Backend, Frontend) and Feature-First + DDD + Clean Architecture enforcement. Includes dynamic violations API for intelligent querying.",
   "main": "index.js",
   "bin": {