pumuki 6.3.158 → 6.3.160

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

@@ -659,40 +659,70 @@ let text = "XCTUnwrap(optionalValue)"
 });
 
 test('hasSwiftWaitForExpectationsUsage detecta waits legacy y excluye await fulfillment', () => {
-  const legacyWait = `
+  const legacyAsyncWait = `
+func testLegacyAsync() async {
 let expectation = expectation(description: "Done")
 wait(for: [expectation], timeout: 1)
 waitForExpectations(timeout: 1)
+}
+`;
+  const legacySyncWait = `
+func testLegacySync() {
+let expectation = expectation(description: "Done")
+wait(for: [expectation], timeout: 1)
+}
 `;
   const modernWait = `
+func testModernAsync() async {
 let expectation = expectation(description: "Done")
 await fulfillment(of: [expectation], timeout: 1)
+}
 `;
 
-  assert.equal(hasSwiftWaitForExpectationsUsage(legacyWait), true);
+  assert.equal(hasSwiftWaitForExpectationsUsage(legacyAsyncWait), true);
+  assert.equal(hasSwiftWaitForExpectationsUsage(legacySyncWait), false);
   assert.equal(hasSwiftWaitForExpectationsUsage(modernWait), false);
 });
 
-test('hasSwiftLegacyExpectationDescriptionUsage detecta expectation(description:) sin flujo moderno', () => {
-  const legacyExpectation = `
+test('hasSwiftLegacyExpectationDescriptionUsage detecta expectation(description:) en tests async sin flujo moderno', () => {
+  const legacyAsyncExpectation = `
+func testLegacyAsync() async {
 let expectation = expectation(description: "Done")
 doWork { expectation.fulfill() }
-waitForExpectations(timeout: 1)
+}
 `;
-  const modernExpectation = `
+  const legacySyncExpectation = `
+func testLegacySync() {
+let expectation = expectation(description: "Done")
+doWork { expectation.fulfill() }
+}
+`;
+  const modernAsyncExpectation = `
+func testModernAsync() async {
 let expectation = expectation(description: "Done")
 doWork { expectation.fulfill() }
 await fulfillment(of: [expectation], timeout: 1)
+}
 `;
-  const confirmationOnly = `
+  const confirmationFlow = `
+func testConfirmation() async {
 await confirmation("Done") { confirm in
   await doWork { confirm() }
 }
+}
+`;
+  const commentedExpectation = `
+func testModernAsync() async {
+// let expectation = expectation(description: "Done")
+await confirmation("Done") { confirm in confirm() }
+}
 `;
 
-  assert.equal(hasSwiftLegacyExpectationDescriptionUsage(legacyExpectation), true);
-  assert.equal(hasSwiftLegacyExpectationDescriptionUsage(modernExpectation), false);
-  assert.equal(hasSwiftLegacyExpectationDescriptionUsage(confirmationOnly), false);
+  assert.equal(hasSwiftLegacyExpectationDescriptionUsage(legacyAsyncExpectation), true);
+  assert.equal(hasSwiftLegacyExpectationDescriptionUsage(legacySyncExpectation), false);
+  assert.equal(hasSwiftLegacyExpectationDescriptionUsage(modernAsyncExpectation), false);
+  assert.equal(hasSwiftLegacyExpectationDescriptionUsage(confirmationFlow), false);
+  assert.equal(hasSwiftLegacyExpectationDescriptionUsage(commentedExpectation), false);
 });
 
 test('hasSwiftNSManagedObjectBoundaryUsage detecta boundaries con NSManagedObject y excluye IDs o subclases', () => {

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

@@ -100,6 +100,63 @@ const hasSwiftSanitizedRegexMatch = (source: string, regex: RegExp): boolean =>
   return regex.test(sanitizeSwiftSourceForMultilineRegex(source));
 };
 
+type SwiftFunctionDeclaration = {
+  signature: string;
+  body: string;
+};
+
+const collectSwiftFunctionDeclarations = (source: string): readonly SwiftFunctionDeclaration[] => {
+  const lines = source.split(/\r?\n/);
+  const functions: SwiftFunctionDeclaration[] = [];
+
+  for (let index = 0; index < lines.length; index += 1) {
+    const firstLine = stripSwiftLineForSemanticScan(lines[index] ?? '');
+    if (!/\bfunc\b/.test(firstLine)) {
+      continue;
+    }
+
+    const signatureLines: string[] = [];
+    let cursor = index;
+    let openingLineIndex = -1;
+    for (; cursor < lines.length && cursor < index + 24; cursor += 1) {
+      const line = stripSwiftLineForSemanticScan(lines[cursor] ?? '');
+      signatureLines.push(line);
+      if (line.includes('{')) {
+        openingLineIndex = cursor;
+        break;
+      }
+      if (line.includes('}')) {
+        break;
+      }
+    }
+
+    if (openingLineIndex < 0) {
+      continue;
+    }
+
+    const bodyLines: string[] = [];
+    let braceDepth = 0;
+    for (let bodyCursor = openingLineIndex; bodyCursor < lines.length; bodyCursor += 1) {
+      const line = stripSwiftLineForSemanticScan(lines[bodyCursor] ?? '');
+      braceDepth += countTokenOccurrences(line, '{');
+      braceDepth -= countTokenOccurrences(line, '}');
+      bodyLines.push(line);
+      if (bodyCursor > openingLineIndex && braceDepth <= 0) {
+        cursor = bodyCursor;
+        break;
+      }
+    }
+
+    functions.push({
+      signature: signatureLines.join('\n'),
+      body: bodyLines.join('\n'),
+    });
+    index = cursor;
+  }
+
+  return functions;
+};
+
 const hasSwiftUiModernizationSnapshotMatch = (source: string, entryId: string): boolean => {
   const entry = getIosSwiftUiModernizationEntry(entryId);
   if (!entry) {
@@ -855,27 +912,26 @@ const hasSwiftConfirmationUsage = (source: string): boolean => {
 };
 
 export const hasSwiftWaitForExpectationsUsage = (source: string): boolean => {
-  return hasSwiftSanitizedRegexMatch(
-    source,
-    /\bwait\s*\(\s*for\s*:|\bwaitForExpectations\s*\(/
-  );
+  const legacyWaitPattern = /\bwait\s*\(\s*for\s*:|\bwaitForExpectations\s*\(/;
+  return collectSwiftFunctionDeclarations(source).some((declaration) => {
+    if (!/\basync\b/.test(declaration.signature)) {
+      return false;
+    }
+    legacyWaitPattern.lastIndex = 0;
+    return legacyWaitPattern.test(declaration.body);
+  });
 };
 
 export const hasSwiftLegacyExpectationDescriptionUsage = (source: string): boolean => {
-  const hasLegacyExpectation = collectSwiftRegexLines(
-    source,
-    /\bexpectation\s*\(\s*description\s*:/
-  ).length > 0;
-
-  if (!hasLegacyExpectation) {
-    return false;
-  }
-
-  if (hasSwiftAwaitFulfillmentUsage(source) || hasSwiftConfirmationUsage(source)) {
-    return false;
-  }
-
-  return true;
+  return collectSwiftFunctionDeclarations(source).some((declaration) => {
+    if (!/\basync\b/.test(declaration.signature)) {
+      return false;
+    }
+    if (!hasSwiftSanitizedRegexMatch(declaration.body, /\bexpectation\s*\(\s*description\s*:/)) {
+      return false;
+    }
+    return !hasSwiftAwaitFulfillmentUsage(declaration.body) && !hasSwiftConfirmationUsage(declaration.body);
+  });
 };
 
 export const hasSwiftNSManagedObjectBoundaryUsage = (source: string): boolean => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pumuki",
-  "version": "6.3.158",
+  "version": "6.3.160",
   "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": {