@nauticana/sail 0.8.0 → 0.8.1

package/src/service/auth.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, WritableSignal, inject, signal } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
+import { HttpParams } from '@angular/common/http';
 import { map, take, tap } from 'rxjs/operators';
 import { ApplicationData, AuthSummary, ConfirmRegisterResponse, DictionaryPath, LoginResponse2FA, PartnerRegistration, RestReport, TableDefinition, TrustedDevice, TwoFactorSetupResponse, TwoFactorVerifyRequest, TwoFactorVerifyResponse } from '../model/appdata';
 import {
@@ -14,39 +14,39 @@ import { Observable, ReplaySubject } from 'rxjs';
 import { ApplicationMenu, ConstantValue } from '../model/common';
 import { CanActivateFn, Router, Routes } from '@angular/router';
 import { SAIL_GUI_CONFIG, SailGuiConfig, DEFAULT_CONFIG } from '../config';
+import { BaseRestService } from './base_rest.service';
 
 @Injectable()
-export abstract class BaseAuthService {
-  private readonly http = inject(HttpClient);
+export abstract class BaseAuthService extends BaseRestService {
   protected readonly router = inject(Router);
   protected readonly guiConfig: SailGuiConfig = inject(SAIL_GUI_CONFIG, {optional: true}) ?? DEFAULT_CONFIG;
   protected cache!: ApplicationData;
   private readonly appData$ = new ReplaySubject<ApplicationData>(1);
   private readonly authIndex = new Map<string, AuthSummary[]>();
 
-  protected get appdataUrl() { return RestURL.httpHost + RestURL.appdataURL; }
-  protected get loginUrl() { return RestURL.httpHost + RestURL.loginURL; }
-  protected get registerUrl() { return RestURL.httpHost + RestURL.registerURL; }
-  protected get chpassUrl() { return RestURL.httpHost + RestURL.chpassURL; }
-  protected get confirmRegisterUrl() { return RestURL.httpHost + RestURL.confirmRegisterURL; }
-  protected get confirmChpassUrl() { return RestURL.httpHost + RestURL.confirmChpassURL; }
-  protected get loginGoogleUrl() { return RestURL.httpHost + RestURL.loginGoogleURL; }
-  protected get twoFactorSetupUrl() { return RestURL.httpHost + RestURL.twoFactorSetupURL; }
-  protected get twoFactorVerifyUrl() { return RestURL.httpHost + RestURL.twoFactorVerifyURL; }
-  protected get twoFactorDisableUrl() { return RestURL.httpHost + RestURL.twoFactorDisableURL; }
-  protected get twoFactorLoginVerifyUrl() { return RestURL.httpHost + RestURL.twoFactorLoginVerifyURL; }
-  protected get twoFactorBackupVerifyUrl() { return RestURL.httpHost + RestURL.twoFactorBackupVerifyURL; }
-  protected get trustedDeviceListUrl() { return RestURL.httpHost + RestURL.trustedDeviceListURL; }
-  protected get trustedDeviceRegisterUrl() { return RestURL.httpHost + RestURL.trustedDeviceRegisterURL; }
-  protected get trustedDeviceRevokeUrl() { return RestURL.httpHost + RestURL.trustedDeviceRevokeURL; }
-  protected get otpSendUrl()          { return RestURL.httpHost + RestURL.otpSendURL; }
-  protected get otpVerifyUrl()        { return RestURL.httpHost + RestURL.otpVerifyURL; }
-  protected get otpResendUrl()        { return RestURL.httpHost + RestURL.otpResendURL; }
-  protected get loginSocialUrl()      { return RestURL.httpHost + RestURL.loginSocialURL; }
-  protected get logoutEverywhereUrl() { return RestURL.httpHost + RestURL.logoutEverywhereURL; }
-  protected get deleteAccountUrl()    { return RestURL.httpHost + RestURL.deleteAccountURL; }
-  protected get pushRegisterUrl()     { return RestURL.httpHost + RestURL.pushRegisterURL; }
-  protected get pushRevokeUrl()       { return RestURL.httpHost + RestURL.pushRevokeURL; }
+  protected readonly appdataUrl                = this.url(RestURL.appdataURL);
+  protected readonly loginUrl                  = this.url(RestURL.loginURL);
+  protected readonly registerUrl               = this.url(RestURL.registerURL);
+  protected readonly chpassUrl                 = this.url(RestURL.chpassURL);
+  protected readonly confirmRegisterUrl        = this.url(RestURL.confirmRegisterURL);
+  protected readonly confirmChpassUrl          = this.url(RestURL.confirmChpassURL);
+  protected readonly loginGoogleUrl            = this.url(RestURL.loginGoogleURL);
+  protected readonly twoFactorSetupUrl         = this.url(RestURL.twoFactorSetupURL);
+  protected readonly twoFactorVerifyUrl        = this.url(RestURL.twoFactorVerifyURL);
+  protected readonly twoFactorDisableUrl       = this.url(RestURL.twoFactorDisableURL);
+  protected readonly twoFactorLoginVerifyUrl   = this.url(RestURL.twoFactorLoginVerifyURL);
+  protected readonly twoFactorBackupVerifyUrl  = this.url(RestURL.twoFactorBackupVerifyURL);
+  protected readonly trustedDeviceListUrl      = this.url(RestURL.trustedDeviceListURL);
+  protected readonly trustedDeviceRegisterUrl  = this.url(RestURL.trustedDeviceRegisterURL);
+  protected readonly trustedDeviceRevokeUrl    = this.url(RestURL.trustedDeviceRevokeURL);
+  protected readonly otpSendUrl                = this.url(RestURL.otpSendURL);
+  protected readonly otpVerifyUrl              = this.url(RestURL.otpVerifyURL);
+  protected readonly otpResendUrl              = this.url(RestURL.otpResendURL);
+  protected readonly loginSocialUrl            = this.url(RestURL.loginSocialURL);
+  protected readonly logoutEverywhereUrl       = this.url(RestURL.logoutEverywhereURL);
+  protected readonly deleteAccountUrl          = this.url(RestURL.deleteAccountURL);
+  protected readonly pushRegisterUrl           = this.url(RestURL.pushRegisterURL);
+  protected readonly pushRevokeUrl             = this.url(RestURL.pushRevokeURL);
 
   token: string | null = null;
   readonly isLoggedIn = signal(false);

package/src/service/base_rest.service.ts

@@ -0,0 +1,20 @@
+import { HttpClient } from '@angular/common/http';
+import { inject } from '@angular/core';
+import { RestURL } from './rest_url';
+
+/**
+ * Foundation for sail's REST API clients. Owns the shared `http` injection
+ * and the `host + path` URL builder so subclasses don't repeat them.
+ *
+ * Subclasses set `providedIn: 'root'` on their own `@Injectable` decorator
+ * (this class itself stays unannotated — Angular resolves it through the
+ * subclass).
+ */
+export abstract class BaseRestService {
+  protected readonly http = inject(HttpClient);
+
+  /** Prefix any `RestURL.*URL` path with the configured backend host. */
+  protected url(path: string): string {
+    return RestURL.httpHost + path;
+  }
+}

package/src/service/billing.service.ts

@@ -1,7 +1,7 @@
-import { Injectable, inject } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { RestURL } from './rest_url';
+import { BaseRestService } from './base_rest.service';
 import {
   CheckoutRequest,
   CheckoutResponse,
@@ -19,13 +19,7 @@ import {
  * keel/SHARED_PAYMENT.md for the backend contract.
  */
 @Injectable({ providedIn: 'root' })
-export class BillingService {
-  private readonly http = inject(HttpClient);
-
-  private url(path: string): string {
-    return RestURL.httpHost + path;
-  }
-
+export class BillingService extends BaseRestService {
   /** Public catalog — safe to call before login. */
   listPlans(): Observable<PublicPlan[]> {
     return this.http.get<PublicPlan[]>(this.url(RestURL.plansURL));

package/src/service/payout.service.ts

@@ -1,7 +1,7 @@
-import { inject, Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { RestURL } from './rest_url';
+import { BaseRestService } from './base_rest.service';
 import {
   PayoutOnboardingSession,
   ReusableAccount,
@@ -19,13 +19,7 @@ import {
  * RestURL.payout*URL.
  */
 @Injectable({ providedIn: 'root' })
-export class PayoutService {
-  private readonly http = inject(HttpClient);
-
-  private url(path: string): string {
-    return RestURL.httpHost + path;
-  }
-
+export class PayoutService extends BaseRestService {
   /** Launch the hosted-KYC flow. Returns a URL to open + provider-side handle. */
   startOnboarding(): Observable<PayoutOnboardingSession> {
     return this.http.post<PayoutOnboardingSession>(this.url(RestURL.payoutOnboardStartURL), {});

package/src/service/rest_service.ts

@@ -1,13 +1,13 @@
-import { HttpClient, HttpErrorResponse, HttpParams } from "@angular/common/http";
-import { inject, Injectable } from "@angular/core";
+import { HttpErrorResponse, HttpParams } from "@angular/common/http";
+import { Injectable } from "@angular/core";
 import { catchError, map, Observable, throwError } from "rxjs";
 import { PaginatedList } from "../model/appdata";
 import { RestURL } from "./rest_url";
+import { BaseRestService } from "./base_rest.service";
 
 @Injectable({providedIn: 'root'})
-export class BackendService {
-    protected readonly prefix = RestURL.httpHost + RestURL.api_prefix;
-    protected readonly http = inject(HttpClient);
+export class BackendService extends BaseRestService {
+    protected readonly prefix = this.url(RestURL.api_prefix);
 
     protected handleError(error: HttpErrorResponse) {
         if (error.status === 0) {

package/src/service/user_payment_method.service.ts

@@ -1,8 +1,8 @@
-import { inject, Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { RestURL } from './rest_url';
 import { BackendService } from './rest_service';
+import { BaseRestService } from './base_rest.service';
 import { UserPaymentMethod } from '../model/appdata';
 
 /**
@@ -17,8 +17,7 @@ import { UserPaymentMethod } from '../model/appdata';
  * single-row CRUD can't express.
  */
 @Injectable({ providedIn: 'root' })
-export class UserPaymentMethodService {
-  private readonly http = inject(HttpClient);
+export class UserPaymentMethodService extends BaseRestService {
   private readonly backend = inject(BackendService);
 
   /**
@@ -40,9 +39,6 @@ export class UserPaymentMethodService {
    * Custom endpoint — see service-class doc for the rationale.
    */
   setDefault(id: number): Observable<{ message: string }> {
-    return this.http.post<{ message: string }>(
-      RestURL.httpHost + RestURL.paymentMethodSetDefaultURL,
-      { id },
-    );
+    return this.http.post<{ message: string }>(this.url(RestURL.paymentMethodSetDefaultURL), { id });
   }
 }

package/src/util/text.ts

@@ -0,0 +1,19 @@
+/**
+ * Convert a snake_case / lower_case identifier to Title Case.
+ *
+ *   titleCase('user_payment_method') -> 'User Payment Method'
+ *   titleCase('UserId')              -> 'Userid'   (no camelCase split)
+ *
+ * Used as the fallback label for tables and columns when no explicit
+ * caption is set in `basis.table_header.Caption` / `basis.column.Caption`.
+ * Mirrors keel's `common.PascalCase`-style helpers on the frontend side
+ * so caption rendering is consistent across consumers.
+ */
+export function titleCase(str: string): string {
+  return str
+    .replaceAll('_', ' ')
+    .toLowerCase()
+    .split(' ')
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ');
+}