add module types to statistics, types tweaks

Author: Simek

pages/api/libraries/statistic.ts

@@ -35,6 +35,11 @@ export default function handler(_: NextApiRequest, res: NextApiResponse) {
       npm: 0,
       yarn: 0,
     },
+    moduleType: {
+      expo: 0,
+      nitro: 0,
+      turbo: 0,
+    },
     lintTools: {
       oxlint: 0,
       oxfmt: 0,
@@ -132,6 +137,16 @@ export default function handler(_: NextApiRequest, res: NextApiResponse) {
       result.lintTools[tool]++;
     });
 
+    if (library.github.moduleType) {
+      if (library.github.moduleType === 'expo') {
+        result.moduleType.expo++;
+      } else if (library.github.moduleType === 'nitro') {
+        result.moduleType.nitro++;
+      } else if (library.github.moduleType === 'turbo') {
+        result.moduleType.turbo++;
+      }
+    }
+
     if (library.github.packageManager) {
       if (library.github.packageManager.includes('bun')) {
         result.packageManager.bun++;

types/index.ts

@@ -100,8 +100,8 @@ export type LibraryType = LibraryDataEntryType & {
     hasSecurity?: boolean;
     configPlugin?: boolean;
     moduleType?: ModuleType;
-    packageManager?: string;
-    lintTools?: LintTool[];
+    packageManager?: PackageManagerType;
+    lintTools?: LintToolType[];
     urls: {
       repo: string;
       homepage?: string | null;
@@ -253,13 +253,9 @@ export type StatisticResultType = {
   tvos: number;
   visionos: number;
   vegaos: number;
-  lintTools: Record<LintTool, number>;
-  packageManager: {
-    bun: number;
-    pnpm: number;
-    npm: number;
-    yarn: number;
-  };
+  packageManager: Record<PackageManagerType, number>;
+  moduleType: Record<ModuleType, number>;
+  lintTools: Record<LintToolType, number>;
 };
 
 type NpmRegistryCommonData = {
@@ -425,6 +421,6 @@ export type PackageNavigationTab = {
   counter?: number | string;
 };
 
+export type PackageManagerType = 'bun' | 'pnpm' | 'npm' | 'yarn';
 export type ModuleType = 'expo' | 'nitro' | 'turbo';
-
-export type LintTool = 'oxlint' | 'oxfmt' | 'eslint' | 'prettier' | 'biome' | 'commitlint';
+export type LintToolType = 'oxlint' | 'oxfmt' | 'eslint' | 'prettier' | 'biome' | 'commitlint';

util/github/hasFiles.ts

@@ -1,4 +1,4 @@
-import { type LintTool, type RepositoryTreeNode } from '~/types';
+import { type LintToolType, type RepositoryTreeNode } from '~/types';
 
 type RootFiles = { entries: RepositoryTreeNode[] } | null;
 
@@ -132,7 +132,7 @@ const COMMITLINT_CONFIG_FILE_NAMES = new Set([
 ]);
 
 export function detectLintStack(rootFiles: RootFiles) {
-  const lintTools: LintTool[] = [];
+  const lintTools: LintToolType[] = [];
   if (hasMatchingFiles(rootFiles, OXLINT_CONFIG_FILE_NAMES)) {
     lintTools.push('oxlint');
   }

util/strings.ts

@@ -1,6 +1,6 @@
 import { Children, isValidElement, type PropsWithChildren, type ReactNode } from 'react';
 
-import { type LintTool } from '~/types';
+import { type LintToolType } from '~/types';
 
 export const NUMBER_FORMATTER = new Intl.NumberFormat('en-US', {
   notation: 'compact',
@@ -63,7 +63,7 @@ export function formatPackageManager(pmRaw?: string) {
   }
 }
 
-export function formatLintTools(lintTool: LintTool) {
+export function formatLintTools(lintTool: LintToolType) {
   switch (lintTool) {
     case 'oxlint':
       return 'Oxlint';