Merge branch 'next/minor' of github.com:Start9Labs/start-os into next/major

web/projects/shared/src/pipes/emver/emver.module.ts

@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core'
-import {
-  EmverComparesPipe,
-  EmverDisplayPipe,
-  EmverSatisfiesPipe,
-} from './emver.pipe'
-
-@NgModule({
-  declarations: [EmverComparesPipe, EmverDisplayPipe, EmverSatisfiesPipe],
-  exports: [EmverComparesPipe, EmverDisplayPipe, EmverSatisfiesPipe],
-})
-export class EmverPipesModule {}

web/projects/shared/src/pipes/emver/emver.pipe.ts

@@ -1,52 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core'
-import { Emver } from '../../services/emver.service'
-
-@Pipe({
-  name: 'satisfiesEmver',
-})
-export class EmverSatisfiesPipe implements PipeTransform {
-  constructor(private readonly emver: Emver) {}
-
-  transform(versionUnderTest?: string, range?: string): boolean {
-    return (
-      !!versionUnderTest &&
-      !!range &&
-      this.emver.satisfies(versionUnderTest, range)
-    )
-  }
-}
-
-@Pipe({
-  name: 'compareEmver',
-})
-export class EmverComparesPipe implements PipeTransform {
-  constructor(private readonly emver: Emver) {}
-
-  transform(first: string, second: string): SemverResult {
-    try {
-      return this.emver.compare(first, second) as SemverResult
-    } catch (e) {
-      console.error(`emver comparison failed`, e, first, second)
-      return 'comparison-impossible'
-    }
-  }
-}
-// left compared to right - if 1, version on left is higher; if 0, values the same; if -1, version on left is lower
-type SemverResult = 0 | 1 | -1 | 'comparison-impossible'
-
-@Pipe({
-  name: 'displayEmver',
-})
-export class EmverDisplayPipe implements PipeTransform {
-  constructor() {}
-
-  transform(version: string): string {
-    return displayEmver(version)
-  }
-}
-
-export function displayEmver(version: string): string {
-  const vs = version.split('.')
-  if (vs.length === 4) return `${vs[0]}.${vs[1]}.${vs[2]}~${vs[3]}`
-  return version
-}

web/projects/shared/src/pipes/exver/exver.module.ts

@@ -0,0 +1,8 @@
+import { NgModule } from '@angular/core'
+import { ExverComparesPipe, ExverSatisfiesPipe } from './exver.pipe'
+
+@NgModule({
+  declarations: [ExverComparesPipe, ExverSatisfiesPipe],
+  exports: [ExverComparesPipe, ExverSatisfiesPipe],
+})
+export class ExverPipesModule {}

web/projects/shared/src/pipes/exver/exver.pipe.ts

@@ -0,0 +1,35 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import { Exver } from '../../services/exver.service'
+
+@Pipe({
+  name: 'satisfiesExver',
+})
+export class ExverSatisfiesPipe implements PipeTransform {
+  constructor(private readonly exver: Exver) {}
+
+  transform(versionUnderTest?: string, range?: string): boolean {
+    return (
+      !!versionUnderTest &&
+      !!range &&
+      this.exver.satisfies(versionUnderTest, range)
+    )
+  }
+}
+
+@Pipe({
+  name: 'compareExver',
+})
+export class ExverComparesPipe implements PipeTransform {
+  constructor(private readonly exver: Exver) {}
+
+  transform(first: string, second: string): SemverResult {
+    try {
+      return this.exver.compareExver(first, second) as SemverResult
+    } catch (e) {
+      console.error(`exver comparison failed`, e, first, second)
+      return 'comparison-impossible'
+    }
+  }
+}
+// left compared to right - if 1, version on left is higher; if 0, values the same; if -1, version on left is lower
+type SemverResult = 0 | 1 | -1 | 'comparison-impossible'