@produtype/core 0.29.1 → 0.30.0

package/dist/analyzer/detectMobile.js

@@ -37,7 +37,21 @@ const textSearch_1 = require("../utils/textSearch");
  */
 /** Files that say which platform this is, without reading their contents. */
 const IOS_MARKERS = [/(^|\/)Info\.plist$/i, /(^|\/)Podfile$/, /\.xcodeproj\//, /(^|\/)Package\.swift$/];
-const ANDROID_MARKERS = [/(^|\/)AndroidManifest\.xml$/i, /(^|\/)build\.gradle(\.kts)?$/];
+/**
+ * `AndroidManifest.xml` says Android. `build.gradle` says the JVM.
+ *
+ * Gradle builds Android applications, Spring services, Kotlin libraries and most of the
+ * Java world. Treating its presence as a platform made spring-petclinic — the canonical
+ * Spring web application — a mobile app at high confidence, and it would do the same to
+ * every JVM server ever written.
+ *
+ * A Gradle file earns the label by applying the Android plugin, which is the line that
+ * makes a build an Android build. That has to be read rather than matched on a path,
+ * which is why the two lists are separate.
+ */
+const ANDROID_MARKERS = [/(^|\/)AndroidManifest\.xml$/i];
+const GRADLE_FILES = /(^|\/)build\.gradle(\.kts)?$/;
+const ANDROID_GRADLE_PLUGIN = /com\.android\.(application|library)|(^|\s)android\s*\{/m;
 /** Gradle coordinates that put a secret in the Android keystore rather than in a file. */
 const SECURE_STORAGE_GRADLE = ['androidx.security:security-crypto', 'com.scottyab:secure-preferences'];
 /**
@@ -110,9 +124,75 @@ function matchesAny(files, patterns) {
         .filter((file) => !GENERATED_OR_VENDORED.test(file))
         .filter((file) => patterns.some((pattern) => pattern.test(file)));
 }
+async function androidGradleFiles(ctx) {
+    const found = [];
+    for (const file of ctx.files.all.filter((candidate) => GRADLE_FILES.test(candidate))) {
+        const text = await (0, readTextFileSafe_1.readTextFileSafe)(ctx.root, file);
+        if (text && ANDROID_GRADLE_PLUGIN.test(text))
+            found.push(file);
+    }
+    return found;
+}
+/**
+ * Directory names that are part of a platform's layout rather than the project's.
+ *
+ * `src/ClientApp/Platforms/Android/AndroidManifest.xml` belongs to a project called
+ * ClientApp; the three segments after it are how MAUI arranges a project, not where the
+ * project begins. Walking past them finds the root a person would name.
+ */
+const PLATFORM_LAYOUT = new Set([
+    'platforms', 'android', 'ios', 'maccatalyst', 'app', 'src', 'main', 'res', 'xcshareddata',
+]);
+function mobileProjectRoot(marker) {
+    const segments = marker.split('/').slice(0, -1);
+    /**
+     * `.xcodeproj` sits beside the sources, not above them.
+     *
+     * `DonGeremIA.xcodeproj/project.pbxproj` names a project whose Swift files are in
+     * `DonGeremIA/`, a sibling. Stopping at the bundle put the project root somewhere no
+     * source file lives and scored a Swift application at zero.
+     */
+    while (segments.length > 0
+        && (PLATFORM_LAYOUT.has(segments[segments.length - 1].toLowerCase())
+            || /\.(xcodeproj|xcworkspace)$/i.test(segments[segments.length - 1]))) {
+        segments.pop();
+    }
+    return segments.join('/');
+}
+/**
+ * How much of the repository the mobile project actually is.
+ *
+ * dotnet/eShop contains a real MAUI client — the markers are not a false positive — and
+ * it is one project of a dozen: 137 source files of 515, beside a web application and
+ * eight services. The repository was reported as a mobile application because a true
+ * signal about a part was read as a fact about the whole.
+ *
+ * Every repository in the verification corpus that *is* a phone application scores 1
+ * here: the manifest sits at its root. The gap between that and eShop's 0.27 is where
+ * the line goes.
+ */
+function mobileSourceShare(sourceFiles, markers) {
+    if (sourceFiles.length === 0)
+        return 0;
+    /**
+     * No file marker means the platform came from a dependency.
+     *
+     * A Flutter project is recognised by `flutter` in its `pubspec.yaml`, and a React
+     * Native one by its `package.json` — a fact about the project's own manifest rather
+     * than about a subdirectory. Scoring those at zero made every Flutter application in
+     * the corpus stop being a mobile application.
+     */
+    if (markers.length === 0)
+        return 1;
+    const roots = new Set(markers.map(mobileProjectRoot));
+    if (roots.has(''))
+        return 1;
+    const inside = sourceFiles.filter((file) => [...roots].some((root) => file.startsWith(`${root}/`)));
+    return inside.length / sourceFiles.length;
+}
 async function detectMobile(ctx) {
     const iosFiles = matchesAny(ctx.files.all, IOS_MARKERS);
-    const androidFiles = matchesAny(ctx.files.all, ANDROID_MARKERS);
+    const androidFiles = [...matchesAny(ctx.files.all, ANDROID_MARKERS), ...(await androidGradleFiles(ctx))];
     const flutterDeps = (0, detectContext_1.hasAnyDartDep)(ctx, ['flutter']);
     const reactNativeDeps = (0, detectContext_1.hasAnyDep)(ctx, ['react-native', 'expo']);
     const platforms = [];
@@ -135,6 +215,7 @@ async function detectMobile(ctx) {
         platformEvidence.push({ type: 'file', value: androidFiles[0], file: androidFiles[0] });
     }
     const isMobile = platforms.length > 0;
+    const share = mobileSourceShare(ctx.files.source, [...iosFiles, ...androidFiles]);
     /**
      * Every capability below reports `present: false` when this is not a mobile project,
      * with no evidence — the profile that asks about them is the only one that applies
@@ -263,7 +344,7 @@ async function detectMobile(ctx) {
             key: 'mobile.platform',
             present: true,
             evidence: platformEvidence,
-            details: { platforms },
+            details: { platforms, sourceShare: share },
         },
         {
             key: 'mobile.permissions',

package/dist/expectations/profileSignals.d.ts

@@ -56,6 +56,14 @@ export interface ProfileFacts {
     gameSignals: number;
     /** Ships to a phone: Flutter, React Native, or an iOS/Android project in the tree. */
     mobilePlatforms: string[];
+    /**
+     * How much of the repository the mobile project is, between 0 and 1.
+     *
+     * A true signal about one project was being read as a fact about the whole: eShop's
+     * MAUI client is 137 source files of 515, beside a web application and eight services,
+     * and the repository came back as a phone application.
+     */
+    mobileShare: number;
     sourceFiles: number;
 }
 export declare function readFacts(analysis: ProjectAnalysis): ProfileFacts;

package/dist/expectations/profileSignals.js

@@ -33,6 +33,7 @@ function readFacts(analysis) {
         tests: present('quality.tests'),
         gameSignals: Number(analysis.detectors['game.engine']?.details?.supportingSignals ?? 0),
         mobilePlatforms: analysis.detectors['mobile.platform']?.details?.platforms ?? [],
+        mobileShare: analysis.detectors['mobile.platform']?.details?.sourceShare ?? 0,
         sourceFiles: analysis.files.source.length,
     };
 }
@@ -134,7 +135,15 @@ const RULES = [
          */
         profile: 'mobile-app',
         refines: 'client-app',
-        admissible: (f) => f.mobilePlatforms.length > 0 && !f.tenancy,
+        /**
+         * The mobile project has to be the repository, not a project inside it.
+         *
+         * Every repository in the corpus that is a phone application has its manifest at the
+         * root and scores 1. eShop scores 0.27 and is a .NET system with a MAUI client in it.
+         * Half is the line, and it sits in the gap between those two rather than in the
+         * middle of a distribution.
+         */
+        admissible: (f) => f.mobilePlatforms.length > 0 && f.mobileShare >= 0.5 && !f.tenancy,
         signals: [
             { identifies: true, label: 'a mobile project in the repository', weight: 5, holds: (f) => f.mobilePlatforms.length > 0 },
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@produtype/core",
-  "version": "0.29.1",
+  "version": "0.30.0",
   "description": "Deterministic CLI and library that analyzes a web application repository and reports how far it is from production-ready for the kind of product it is meant to be.",
   "license": "MIT",
   "bin": {