feat(parser): replace with new srcinfo parser (#995)

Co-authored-by: Elsie <[email protected]>

Dockerfile

@@ -32,7 +32,7 @@ COPY --from=client /root/client/dist/ /root/client/dist/
 COPY --from=server /root/server/dist/ /root/server/dist/
 COPY ./Makefile ./Makefile
 
-RUN apt update && apt install make git jo jq -y
+RUN apt update && apt install make git jq -y
 
 RUN make dist \
     && rm -rf server client

client/src/components/package-details/MinimalPackageTable.tsx

@@ -1,10 +1,10 @@
 import { Table, Tbody, Th, Thead, Tr } from '@chakra-ui/react'
 import { FC } from 'react'
-import PackageInfo from '../../types/package-info'
+import { ArchDistroString } from '../../types/package-info'
 import MinimalPackageTableRow from './MinimalPackageTableRow'
 import { useTranslation } from 'react-i18next'
 
-const MinimalPackageTable: FC<{ packages: (PackageInfo | string)[] }> = ({
+const MinimalPackageTable: FC<{ packages: (ArchDistroString | string)[] }> = ({
     packages,
 }) => {
     const { t } = useTranslation()
@@ -22,11 +22,8 @@ const MinimalPackageTable: FC<{ packages: (PackageInfo | string)[] }> = ({
                 {packages.map((pkg, i) => (
                     <MinimalPackageTableRow
                         external={typeof pkg === 'string'}
-                        key={
-                            (typeof pkg === 'string' ? pkg : pkg.packageName) +
-                            i
-                        }
-                        pkg={typeof pkg === 'string' ? pkg : pkg.packageName}
+                        key={(typeof pkg === 'string' ? pkg : pkg.value) + i}
+                        pkg={typeof pkg === 'string' ? pkg : pkg.value}
                     />
                 ))}
             </Tbody>

client/src/components/package-details/MinimalPackageTableRow.tsx

@@ -11,13 +11,13 @@ import { useTranslation } from 'react-i18next'
 import { Link as Rlink } from 'react-router-dom'
 
 const getDescription = (nameWithDescription: string): string | null => {
-    return nameWithDescription.includes(':')
+    return nameWithDescription?.includes(':')
         ? nameWithDescription.split(':')[1].trim()
         : null
 }
 
 const getName = (nameWithDescription: string): string => {
-    return nameWithDescription.includes(':')
+    return nameWithDescription?.includes(':')
         ? nameWithDescription.split(':')[0]
         : nameWithDescription
 }

client/src/components/package-details/PackageDetailsPage.tsx

@@ -1,7 +1,7 @@
 import { Container, UseDisclosureProps } from '@chakra-ui/react'
 import { FC } from 'react'
 import { Helmet } from 'react-helmet'
-import PackageInfo from '../../types/package-info'
+import PackageInfo, { ArchDistroString } from '../../types/package-info'
 import HowToInstall from './HowToInstall'
 import PackageDependenciesModal from './PackageDependenciesModal'
 import PackageDetailsHeader from './PackageDetailsHeader'
@@ -10,7 +10,7 @@ import PackageRequiredByModal from './PackageRequiredByModal'
 
 type PackageDetailsPageProps = {
     data: PackageInfo
-    allDependencies: string[]
+    allDependencies: ArchDistroString[]
     isMobile: boolean
     requiredByModal: UseDisclosureProps
     dependenciesModal: UseDisclosureProps

client/src/components/packages/PackageTableRow.tsx

@@ -53,7 +53,7 @@ const PackageTableRow: FC<{ pkg: PackageInfo; disabled?: boolean }> = ({
                 <Tooltip
                     openDelay={500}
                     label={
-                        pkg.maintainers.length
+                        pkg.maintainers?.length
                             ? t(
                                   'packageSearch.maintainerTooltip.maintainedBy',
                                   {
@@ -68,7 +68,7 @@ const PackageTableRow: FC<{ pkg: PackageInfo; disabled?: boolean }> = ({
                     }
                 >
                     <Text fontSize='sm'>
-                        {pkg.maintainers
+                        {(pkg.maintainers ?? [])
                             .map(maintainer => maintainer.split('<')[0].trim())
                             .join(', ') || t('packageDetails.orphaned')}
                     </Text>
@@ -81,7 +81,7 @@ const PackageTableRow: FC<{ pkg: PackageInfo; disabled?: boolean }> = ({
                     <SemanticVersionColor
                         git={pkg.packageName.endsWith('-git')}
                         fill
-                        version={pkg.version.substring(0, 14)}
+                        version={pkg.version.substring(0, 18)}
                         status={pkg.updateStatus}
                     />
                 </Text>

client/src/types/package-dependencies.ts

@@ -1,8 +1,8 @@
-import PackageInfo from './package-info'
+import PackageInfo, { ArchDistroString } from './package-info'
 
 export default interface PackageDependencies {
-    runtimeDependencies: (PackageInfo | string)[]
-    buildDependencies: (PackageInfo | string)[]
-    optionalDependencies: (PackageInfo | string)[]
-    pacstallDependencies: (PackageInfo | string)[]
+    runtimeDependencies: (ArchDistroString | string)[]
+    buildDependencies: (ArchDistroString | string)[]
+    optionalDependencies: (ArchDistroString | string)[]
+    pacstallDependencies: (ArchDistroString | string)[]
 }

client/src/types/package-info.ts

@@ -1,24 +1,50 @@
 export default interface PackageInfo {
+    architectures: string[]
     version: string
     packageName: string
     maintainers: string[]
     description: string
-    source: string[]
-    runtimeDependencies: string[]
-    buildDependencies: string[]
-    optionalDependencies: string[]
-    conflicts: string[]
-    gives: string
-    replaces: string[]
-    hash?: string
-    ppa: string[]
-    pacstallDependencies: string[]
-    patch: string[]
+    source: ArchDistroString[]
+    runtimeDependencies: ArchDistroString[]
+    buildDependencies: ArchDistroString[]
+    optionalDependencies: ArchDistroString[]
+    checkDependencies: ArchDistroString[]
+    pacstallDependencies: ArchDistroString[]
+    conflicts: ArchDistroString[]
+    gives: ArchDistroString
+    replaces: ArchDistroString[]
+    sha1sums: ArchDistroString[]
+    sha224sums: ArchDistroString[]
+    sha256sums: ArchDistroString[]
+    sha384sums: ArchDistroString[]
+    sha512sums: ArchDistroString[]
+    md5sums: ArchDistroString[]
+    priority: ArchDistroString[]
     requiredBy: string[]
+    suggests: ArchDistroString[]
+    recommends: ArchDistroString[]
     latestVersion?: string
     prettyName: string
     updateStatus: UpdateStatus
     lastUpdatedAt: string
+    enhances: ArchDistroString[]
+    changelog: string
+    backup: string[]
+    compatible: string[]
+    incompatible: string[]
+    epoch: string
+    install: string
+    license: string[]
+    mask: string[]
+    noExtract: string[]
+    validPgpKeys: string[]
+    groups: string[]
+}
+
+export interface ArchDistroString {
+    arch?: string
+    distro?: string
+    value: string
 }
 
 export enum UpdateStatus {

server/consts/consts.go

@@ -1,3 +1,3 @@
 package consts
 
-const PACSCRIPT_FILE_EXTENSION = "pacscript"
+const SRCINFO_FILE_EXTENSION = ".SRCINFO"