@decafhub/decaf-client-extras 0.0.5 → 0.1.0

package/es/reports/valuation/-valuation-report-shared.d.ts

@@ -1,5 +1,5 @@
 import { Decimal, Maybe, SDate, SDateTime } from '@telostat/prelude';
-import { AccountId, ArtifactId, ArtifactTypeId, CurrencyCode, DateType, PortfolioId } from '../../commons';
+import { CurrencyCode, DateType, DecafAccountId, DecafArtifactId, DecafArtifactTypeId, DecafPortfolioId } from '../../commons';
 /**
  * Type definition for base valuation report.
  */
@@ -31,7 +31,7 @@ export interface BaseValuationReport {
  * Type definition for account reference in valuation reports.
  */
 export interface ValuationReportAccount {
-    id: AccountId;
+    id: DecafAccountId;
     guid: string;
     name: string;
 }
@@ -39,7 +39,7 @@ export interface ValuationReportAccount {
  * Type definition for portfolio reference in valuation reports.
  */
 export interface ValuationReportPortfolio {
-    id: PortfolioId;
+    id: DecafPortfolioId;
     guid: string;
     name: string;
 }
@@ -155,7 +155,7 @@ export interface ValuationReportAccrualByCurrency {
  * Type definition of the FINREA artifact type.
  */
 export interface ValuationReportArtifactType {
-    id: ArtifactTypeId;
+    id: DecafArtifactTypeId;
     name: string;
     order: number;
 }
@@ -163,7 +163,7 @@ export interface ValuationReportArtifactType {
  * Type definition for the artifact as reported in the valuation.
  */
 export interface ValuationReportArtifact {
-    id: ArtifactId;
+    id: DecafArtifactId;
     guid: string;
     type: ValuationReportArtifactType;
     stype: Maybe<string>;
@@ -179,7 +179,7 @@ export interface ValuationReportArtifact {
     isin: Maybe<string>;
     figi: Maybe<string>;
     expiry: Maybe<SDate>;
-    underlyingId: Maybe<ArtifactId>;
+    underlyingId: Maybe<DecafArtifactId>;
 }
 export interface ValuationReportFxRate {
     ccy1: CurrencyCode;

package/nix/default.nix

@@ -0,0 +1,59 @@
+{ ... }:
+
+let
+  ## Set the name:
+  name = "decaf-client-javascript-extras";
+
+  ## Repository root:
+  root = ../.;
+
+  ## Import sources:
+  sources = import ./sources.nix;
+
+  ## Import telosnix:
+  telosnix = import sources.telosnix { };
+
+  ## Import nixpkgs:
+  pkgs = import telosnix.pkgs-sources.stable { };
+
+  ## Get the devshell:
+  devshell = telosnix.tools.devshell {
+    name = "${name}-devshell";
+    src = ./.;
+    quickstart = ../README.md;
+    guide = [
+      { name = "readme"; title = "Introduction"; path = ../README.md; }
+    ];
+    extensions = { };
+  };
+
+  ## Declare dependencies for our shell:
+  deps = [
+    pkgs.git
+    pkgs.nodejs
+    pkgs.yarn
+
+    devshell
+  ];
+
+  ## Define our shell:
+  shell = pkgs.mkShell {
+    buildInputs = deps;
+
+    shellHook = ''
+      ## Greet:
+      devsh welcome
+    '';
+
+    DEVSHELL_ROOT = "${toString root}";
+    DECAF_JS_SKIP_POSTINSTALL = "1";
+  };
+
+in
+{
+  name = name;
+  pkgs = pkgs;
+  sources = sources;
+  telosnix = telosnix;
+  shell = shell;
+}

package/nix/sources.json

@@ -0,0 +1,14 @@
+{
+    "telosnix": {
+        "branch": "v0.0.6",
+        "description": null,
+        "homepage": null,
+        "owner": "telostat",
+        "repo": "telos.nix",
+        "rev": "c0b76b80df8c8cc61383bee9fdcb81e45b53f919",
+        "sha256": "08kd5ivhm3hjkiw28cifmbjywbm7fsvzbwb7prsdnqmam6ij278i",
+        "type": "tarball",
+        "url": "https://github.com/telostat/telos.nix/archive/c0b76b80df8c8cc61383bee9fdcb81e45b53f919.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}

package/nix/sources.nix

@@ -0,0 +1,194 @@
+# This file has been generated by Niv.
+
+let
+
+  #
+  # The fetchers. fetch_<type> fetches specs of type <type>.
+  #
+
+  fetch_file = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+      if spec.builtin or true then
+        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+      else
+        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
+
+  fetch_tarball = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+      if spec.builtin or true then
+        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
+      else
+        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
+
+  fetch_git = name: spec:
+    let
+      ref =
+        if spec ? ref then spec.ref else
+          if spec ? branch then "refs/heads/${spec.branch}" else
+            if spec ? tag then "refs/tags/${spec.tag}" else
+              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+      submodules = if spec ? submodules then spec.submodules else false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules == true
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                {}
+            else {};
+        in
+          if nixSupportsSubmodules
+          then { inherit submodules; }
+          else emptyArgWithWarning;
+    in
+      builtins.fetchGit
+        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
+
+  fetch_local = spec: spec.path;
+
+  fetch_builtin-tarball = name: throw
+    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=tarball -a builtin=true'';
+
+  fetch_builtin-url = name: throw
+    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=file -a builtin=true'';
+
+  #
+  # Various helpers
+  #
+
+  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
+  sanitizeName = name:
+    (
+      concatMapStrings (s: if builtins.isList s then "-" else s)
+        (
+          builtins.split "[^[:alnum:]+._?=-]+"
+            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
+        )
+    );
+
+  # The set of packages used when specs are fetched using non-builtins.
+  mkPkgs = sources: system:
+    let
+      sourcesNixpkgs =
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
+      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
+      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
+    in
+      if builtins.hasAttr "nixpkgs" sources
+      then sourcesNixpkgs
+      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+        import <nixpkgs> {}
+      else
+        abort
+          ''
+            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+            add a package called "nixpkgs" to your sources.json.
+          '';
+
+  # The actual fetching function.
+  fetch = pkgs: name: spec:
+
+    if ! builtins.hasAttr "type" spec then
+      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
+    else if spec.type == "file" then fetch_file pkgs name spec
+    else if spec.type == "tarball" then fetch_tarball pkgs name spec
+    else if spec.type == "git" then fetch_git name spec
+    else if spec.type == "local" then fetch_local spec
+    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
+    else if spec.type == "builtin-url" then fetch_builtin-url name
+    else
+      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+
+  # If the environment variable NIV_OVERRIDE_${name} is set, then use
+  # the path directly as opposed to the fetched source.
+  replace = name: drv:
+    let
+      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
+      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
+    in
+      if ersatz == "" then drv else
+        # this turns the string into an actual Nix path (for both absolute and
+        # relative paths)
+        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
+
+  # Ports of functions for older nix versions
+
+  # a Nix version of mapAttrs if the built-in doesn't exist
+  mapAttrs = builtins.mapAttrs or (
+    f: set: with builtins;
+    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
+  );
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
+  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
+  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
+  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
+  concatMapStrings = f: list: concatStrings (map f list);
+  concatStrings = builtins.concatStringsSep "";
+
+  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
+  optionalAttrs = cond: as: if cond then as else {};
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
+      else
+        fetchTarball attrs;
+
+  # fetchurl version that is compatible between all the versions of Nix
+  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
+      else
+        fetchurl attrs;
+
+  # Create the final "sources" from the config
+  mkSources = config:
+    mapAttrs (
+      name: spec:
+        if builtins.hasAttr "outPath" spec
+        then abort
+          "The values in sources.json should not have an 'outPath' attribute"
+        else
+          spec // { outPath = replace name (fetch config.pkgs name spec); }
+    ) config.sources;
+
+  # The "config" used by the fetchers
+  mkConfig =
+    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
+    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
+    , system ? builtins.currentSystem
+    , pkgs ? mkPkgs sources system
+    }: rec {
+      # The sources, i.e. the attribute set of spec name to spec
+      inherit sources;
+
+      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
+      inherit pkgs;
+    };
+
+in
+mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decafhub/decaf-client-extras",
-  "version": "0.0.5",
+  "version": "0.1.0",
   "description": "DECAF Client Extras",
   "author": "Teloscube Pte Ltd",
   "license": "MIT",
@@ -29,7 +29,7 @@
     "@decafhub/decaf-client": "^0.3.1"
   },
   "dependencies": {
-    "@telostat/prelude": "^0.1.2"
+    "@telostat/prelude": "^0.2.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.3.0",

package/reports/valuation/-remote-valuation-report-portfolio.d.ts

@@ -1,6 +1,6 @@
 import { DecafClient } from '@decafhub/decaf-client';
 import { CustomError, Either, SDate, SDateTime } from '@telostat/prelude';
-import { ActionId, CurrencyCode, DateType, ExternalValuationId, OhlcSeriesId, PortfolioId, PrincipalId, ShareClassFeeScheduleId, ShareClassId } from '../../commons';
+import { CurrencyCode, DateType, DecafActionId, DecafExternalValuationId, DecafOhlcSeriesId, DecafPortfolioId, DecafPrincipalId, DecafShareClassFeeScheduleId, DecafShareClassId } from '../../commons';
 import { RemoteBaseValuationReport } from './-remote-valuation-report-shared';
 import { PortfolioValuationReport, PortfolioValuationReportShareClassValue } from './-valuation-report-portfolio';
 import { ValuationReportPortfolio } from './-valuation-report-shared';
@@ -23,7 +23,7 @@ export interface PortfolioValuationReportQuery {
     /**
      * Portfolio the valuation report is requested for.
      */
-    portfolio: PortfolioId;
+    portfolio: DecafPortfolioId;
 }
 /**
  * Type definition for the remote (raw) portfolio valuation report data.
@@ -58,13 +58,13 @@ export interface RemoteValuationShareClassValue {
  * Type definition for share class on the remote portfolio valuation report.
  */
 export interface RemoteValuationShareClass {
-    id: ShareClassId;
+    id: DecafShareClassId;
     created: SDateTime;
-    creator: PrincipalId;
+    creator: DecafPrincipalId;
     updated: SDateTime;
-    updater: PrincipalId;
+    updater: DecafPrincipalId;
     guid: string;
-    portfolio: PortfolioId;
+    portfolio: DecafPortfolioId;
     name: string;
     currency: CurrencyCode;
     isin?: string;
@@ -76,11 +76,11 @@ export interface RemoteValuationShareClass {
     subredperiod?: string;
     freqmngt?: number;
     freqperf?: number;
-    benchmark?: OhlcSeriesId;
+    benchmark?: DecafOhlcSeriesId;
     description?: string;
-    feeschedules: ShareClassFeeScheduleId[];
-    effectivefeeschedule?: ShareClassFeeScheduleId;
-    subscriptions: ActionId[];
+    feeschedules: DecafShareClassFeeScheduleId[];
+    effectivefeeschedule?: DecafShareClassFeeScheduleId;
+    subscriptions: DecafActionId[];
     outstanding?: number;
 }
 /**
@@ -88,14 +88,14 @@ export interface RemoteValuationShareClass {
  * report.
  */
 export interface RemoteValuationExternalValue {
-    id: ExternalValuationId;
+    id: DecafExternalValuationId;
     created: SDateTime;
-    creator: PrincipalId;
+    creator: DecafPrincipalId;
     updated: SDateTime;
-    updater: PrincipalId;
+    updater: DecafPrincipalId;
     guid: string;
-    portfolio: PortfolioId;
-    shareclass?: ShareClassId;
+    portfolio: DecafPortfolioId;
+    shareclass?: DecafShareClassId;
     date: SDate;
     ccy: CurrencyCode;
     shares?: number;

package/reports/valuation/-remote-valuation-report-portfolio.js

@@ -103,7 +103,7 @@ function toShareClassValue(x) {
             feeScheduleIds: x.shareclass.feeschedules,
             effectiveFeeScheduleId: prelude_1.Maybe.fromNullable(x.shareclass.effectivefeeschedule),
             subscriptionIds: x.shareclass.subscriptions,
-            outstanding: (0, prelude_1.maybeDecimal)(x.shareclass.outstanding),
+            outstanding: (0, prelude_1.decimalFromNullable)(x.shareclass.outstanding),
         },
         external: prelude_1.Maybe.fromNullable(x.external).map(function (ev) { return ({
             id: ev.id,
@@ -116,36 +116,36 @@ function toShareClassValue(x) {
             shareclass: prelude_1.Maybe.fromNullable(ev.shareclass),
             date: ev.date,
             ccy: ev.ccy,
-            shares: (0, prelude_1.maybeDecimal)(ev.shares),
-            price: (0, prelude_1.maybeDecimal)(ev.price),
-            nav: (0, prelude_1.maybeDecimal)(ev.nav),
-            aum: (0, prelude_1.maybeDecimal)(ev.aum),
-            hedgepnl: (0, prelude_1.maybeDecimal)(ev.hedgepnl),
-            feemngt: (0, prelude_1.maybeDecimal)(ev.feemngt),
-            feeperf: (0, prelude_1.maybeDecimal)(ev.feeperf),
-            otheraccrued: (0, prelude_1.maybeDecimal)(ev.otheraccrued),
-            totalaccrued: (0, prelude_1.maybeDecimal)(ev.totalaccrued),
-            subred: (0, prelude_1.maybeDecimal)(ev.subred),
-            perfdaily: (0, prelude_1.maybeDecimal)(ev.perfdaily),
-            perfweekly: (0, prelude_1.maybeDecimal)(ev.perfweekly),
-            perfmonthly: (0, prelude_1.maybeDecimal)(ev.perfmonthly),
-            perfytd: (0, prelude_1.maybeDecimal)(ev.perfytd),
-            perfstart: (0, prelude_1.maybeDecimal)(ev.perfstart),
-            coefficient: (0, prelude_1.maybeDecimal)(ev.coefficient),
+            shares: (0, prelude_1.decimalFromNullable)(ev.shares),
+            price: (0, prelude_1.decimalFromNullable)(ev.price),
+            nav: (0, prelude_1.decimalFromNullable)(ev.nav),
+            aum: (0, prelude_1.decimalFromNullable)(ev.aum),
+            hedgepnl: (0, prelude_1.decimalFromNullable)(ev.hedgepnl),
+            feemngt: (0, prelude_1.decimalFromNullable)(ev.feemngt),
+            feeperf: (0, prelude_1.decimalFromNullable)(ev.feeperf),
+            otheraccrued: (0, prelude_1.decimalFromNullable)(ev.otheraccrued),
+            totalaccrued: (0, prelude_1.decimalFromNullable)(ev.totalaccrued),
+            subred: (0, prelude_1.decimalFromNullable)(ev.subred),
+            perfdaily: (0, prelude_1.decimalFromNullable)(ev.perfdaily),
+            perfweekly: (0, prelude_1.decimalFromNullable)(ev.perfweekly),
+            perfmonthly: (0, prelude_1.decimalFromNullable)(ev.perfmonthly),
+            perfytd: (0, prelude_1.decimalFromNullable)(ev.perfytd),
+            perfstart: (0, prelude_1.decimalFromNullable)(ev.perfstart),
+            coefficient: (0, prelude_1.decimalFromNullable)(ev.coefficient),
         }); }),
-        nav: (0, prelude_1.asDecimal)(x.nav),
-        navAdjusted: (0, prelude_1.asDecimal)(x.nav_adjusted),
-        navAdjustedTotal: (0, prelude_1.asDecimal)(x.nav_adjusted_total),
-        coefficient: (0, prelude_1.asDecimal)(x.coefficient),
-        gavRefccy: (0, prelude_1.asDecimal)(x.gav_refccy),
-        gavClsccy: (0, prelude_1.asDecimal)(x.gav_clsccy),
-        sharecountPrev: (0, prelude_1.asDecimal)(x.sharecount_prev),
-        sharecountCurr: (0, prelude_1.asDecimal)(x.sharecount_curr),
-        sharecountDiff: (0, prelude_1.asDecimal)(x.sharecount_diff),
-        pxRefCcy: (0, prelude_1.maybeDecimal)(x.px_refccy),
-        pxClsCcy: (0, prelude_1.maybeDecimal)(x.px_clsccy),
-        ytdExt: (0, prelude_1.maybeDecimal)(x.ytdext),
-        ytdInt: (0, prelude_1.maybeDecimal)(x.ytdint),
+        nav: (0, prelude_1.unsafeDecimal)(x.nav),
+        navAdjusted: (0, prelude_1.unsafeDecimal)(x.nav_adjusted),
+        navAdjustedTotal: (0, prelude_1.unsafeDecimal)(x.nav_adjusted_total),
+        coefficient: (0, prelude_1.unsafeDecimal)(x.coefficient),
+        gavRefccy: (0, prelude_1.unsafeDecimal)(x.gav_refccy),
+        gavClsccy: (0, prelude_1.unsafeDecimal)(x.gav_clsccy),
+        sharecountPrev: (0, prelude_1.unsafeDecimal)(x.sharecount_prev),
+        sharecountCurr: (0, prelude_1.unsafeDecimal)(x.sharecount_curr),
+        sharecountDiff: (0, prelude_1.unsafeDecimal)(x.sharecount_diff),
+        pxRefCcy: (0, prelude_1.decimalFromNullable)(x.px_refccy),
+        pxClsCcy: (0, prelude_1.decimalFromNullable)(x.px_clsccy),
+        ytdExt: (0, prelude_1.decimalFromNullable)(x.ytdext),
+        ytdInt: (0, prelude_1.decimalFromNullable)(x.ytdint),
     };
 }
 exports.toShareClassValue = toShareClassValue;
@@ -162,7 +162,7 @@ function recompilePortfolioValuationReport(x) {
     var baseReport = (0, _remote_valuation_report_shared_1.recompileBaseValuationReport)(x);
     // Add consolidated valuation report specific fields and return:
     return baseReport.map(function (report) {
-        return __assign(__assign({}, report), { portfolio: x.portfolio, subscriptions: (0, prelude_1.maybeDecimal)(x.subscriptions).orDefault(prelude_1.zero), shareClassValues: x.scvals.map(toShareClassValue) });
+        return __assign(__assign({}, report), { portfolio: x.portfolio, subscriptions: (0, prelude_1.decimalFromNullable)(x.subscriptions).orDefault(prelude_1.zero), shareClassValues: x.scvals.map(toShareClassValue) });
     });
 }
 exports.recompilePortfolioValuationReport = recompilePortfolioValuationReport;

package/reports/valuation/-remote-valuation-report-shared.d.ts

@@ -1,5 +1,5 @@
 import { CustomError, Decimal, Either, Maybe, SDate, SDateTime } from '@telostat/prelude';
-import { ArtifactId, ArtifactTypeId, CurrencyCode, DateType } from '../../commons';
+import { CurrencyCode, DateType, DecafArtifactId, DecafArtifactTypeId } from '../../commons';
 import { BaseValuationReport, BaseValuationReportHolding, ValuationReportAccount, ValuationReportAccounts, ValuationReportAccrual, ValuationReportArtifact, ValuationReportFigureOrgRef, ValuationReportHolding } from './-valuation-report-shared';
 export interface RemoteBaseValuationReport {
     reported: SDateTime;
@@ -161,10 +161,10 @@ export interface RemoteValuationReportChildHolding {
  * Valuation artifact.
  */
 export interface RemoteValuationReportArtifact {
-    id: ArtifactId;
+    id: DecafArtifactId;
     guid: string;
     type: {
-        id: ArtifactTypeId;
+        id: DecafArtifactTypeId;
         name: string;
         order: number;
     };
@@ -181,7 +181,7 @@ export interface RemoteValuationReportArtifact {
     isin?: string;
     figi?: string;
     expiry?: SDate;
-    underlying_id?: ArtifactId;
+    underlying_id?: DecafArtifactId;
 }
 /**
  * Valuation accrual.

package/reports/valuation/-remote-valuation-report-shared.js

@@ -22,7 +22,7 @@ function toArtifact(x) {
         symbol: x.symbol,
         name: (0, prelude_1.sanitizedNonEmptyText)(x.name),
         ccy: prelude_1.Maybe.fromNullable(x.ccy),
-        quantity: (0, prelude_1.asDecimal)(x.quantity),
+        quantity: (0, prelude_1.unsafeDecimal)(x.quantity),
         country: (0, prelude_1.sanitizedNonEmptyText)(x.country),
         issuer: (0, prelude_1.sanitizedNonEmptyText)(x.issuer),
         sector: (0, prelude_1.sanitizedNonEmptyText)(x.sector),
@@ -38,14 +38,17 @@ exports.toArtifact = toArtifact;
 function toAccrual(x) {
     return {
         name: x.name,
-        value: (0, prelude_1.asDecimal)(x.value),
+        value: (0, prelude_1.unsafeDecimal)(x.value),
         accounts: x.accounts.map(function (y) { return ({
             account: y.account,
-            value: (0, prelude_1.asDecimal)(y.value),
+            value: (0, prelude_1.unsafeDecimal)(y.value),
             accruals: y.accruals.map(function (z) { return ({
                 artifact: toArtifact(z.artifact),
                 ccy: z.ccy,
-                value: { org: (0, prelude_1.asDecimal)(z.value.org || 0), ref: (0, prelude_1.asDecimal)(z.value.ref || 0) },
+                value: {
+                    org: (0, prelude_1.decimalFromNullable)(z.value.org).orDefault(prelude_1.zero),
+                    ref: (0, prelude_1.decimalFromNullable)(z.value.ref).orDefault(prelude_1.zero),
+                },
             }); }),
         }); }),
     };
@@ -53,22 +56,22 @@ function toAccrual(x) {
 exports.toAccrual = toAccrual;
 function toOrgRef(x) {
     return {
-        org: (0, prelude_1.maybeDecimal)(x.org).orDefault(prelude_1.zero),
-        ref: (0, prelude_1.maybeDecimal)(x.ref).orDefault(prelude_1.zero),
+        org: (0, prelude_1.decimalFromNullable)(x.org).orDefault(prelude_1.zero),
+        ref: (0, prelude_1.decimalFromNullable)(x.ref).orDefault(prelude_1.zero),
     };
 }
 exports.toOrgRef = toOrgRef;
 function toMaybeOrgRef(x) {
     return prelude_1.Maybe.fromNullable(x).chain(function (_a) {
         var org = _a.org, ref = _a.ref;
-        return (0, prelude_1.maybeDecimal)(org).chain(function (o) { return (0, prelude_1.maybeDecimal)(ref).chain(function (r) { return (0, prelude_1.Just)({ org: o, ref: r }); }); });
+        return (0, prelude_1.decimalFromNullable)(org).chain(function (o) { return (0, prelude_1.decimalFromNullable)(ref).chain(function (r) { return (0, prelude_1.Just)({ org: o, ref: r }); }); });
     });
 }
 exports.toMaybeOrgRef = toMaybeOrgRef;
 function toBaseHolding(nav, x) {
     return {
         artifact: toArtifact(x.artifact),
-        quantity: (0, prelude_1.asDecimal)(x.quantity),
+        quantity: (0, prelude_1.unsafeDecimal)(x.quantity),
         investment: {
             px: toOrgRef(x.investment.px),
             txncosts: toMaybeOrgRef(x.investment.txncosts),
@@ -87,12 +90,12 @@ function toBaseHolding(nav, x) {
                 abs: toOrgRef(x.valuation.exposure.abs),
             },
         },
-        valuePercentage: (0, prelude_1.safeDiv)((0, prelude_1.maybeDecimal)(x.valuation.value.net.ref).orDefault(prelude_1.zero), nav),
-        netExposurePercentage: (0, prelude_1.safeDiv)((0, prelude_1.maybeDecimal)(x.valuation.exposure.net.ref).orDefault(prelude_1.zero), nav),
-        absExposurePercentage: (0, prelude_1.safeDiv)((0, prelude_1.maybeDecimal)(x.valuation.exposure.abs.ref).orDefault(prelude_1.zero), nav),
-        change: (0, prelude_1.maybeDecimal)(x.change),
-        pnl: (0, prelude_1.maybeDecimal)(x.pnl).orDefault(prelude_1.zero),
-        pnlToInvestment: (0, prelude_1.maybeDecimal)(x.pnl_to_investment),
+        valuePercentage: (0, prelude_1.safeDiv)((0, prelude_1.decimalFromNullable)(x.valuation.value.net.ref).orDefault(prelude_1.zero), nav),
+        netExposurePercentage: (0, prelude_1.safeDiv)((0, prelude_1.decimalFromNullable)(x.valuation.exposure.net.ref).orDefault(prelude_1.zero), nav),
+        absExposurePercentage: (0, prelude_1.safeDiv)((0, prelude_1.decimalFromNullable)(x.valuation.exposure.abs.ref).orDefault(prelude_1.zero), nav),
+        change: (0, prelude_1.decimalFromNullable)(x.change),
+        pnl: (0, prelude_1.decimalFromNullable)(x.pnl).orDefault(prelude_1.zero),
+        pnlToInvestment: (0, prelude_1.decimalFromNullable)(x.pnl_to_investment),
         opendate: x.opendate,
         lastdate: x.lastdate,
     };
@@ -115,7 +118,7 @@ exports.toHolding = toHolding;
  * report.
  */
 function recompileBaseValuationReport(x) {
-    var nav = (0, prelude_1.maybeDecimal)(x.nav).orDefault(prelude_1.zero);
+    var nav = (0, prelude_1.decimalFromNullable)(x.nav).orDefault(prelude_1.zero);
     var report = {
         asof: x.reported,
         date: x.asof,
@@ -124,20 +127,20 @@ function recompileBaseValuationReport(x) {
         accounts: x.accounts,
         holdings: x.holdings.map(function (rh) { return toHolding(nav, rh); }),
         accruals: x.accruals.map(toAccrual),
-        fxRates: x.fxrates.map(function (r) { return ({ ccy1: r.ccy1, ccy2: r.ccy2, value: (0, prelude_1.asDecimal)(r.value), asof: r.asof }); }),
+        fxRates: x.fxrates.map(function (r) { return ({ ccy1: r.ccy1, ccy2: r.ccy2, value: (0, prelude_1.unsafeDecimal)(r.value), asof: r.asof }); }),
         figures: {
-            investment: (0, prelude_1.maybeDecimal)(x.investment).orDefault(prelude_1.zero),
+            investment: (0, prelude_1.decimalFromNullable)(x.investment).orDefault(prelude_1.zero),
             valuation: {
-                net: (0, prelude_1.maybeDecimal)(x.valuation_net).orDefault(prelude_1.zero),
-                abs: (0, prelude_1.maybeDecimal)(x.valuation_abs).orDefault(prelude_1.zero),
+                net: (0, prelude_1.decimalFromNullable)(x.valuation_net).orDefault(prelude_1.zero),
+                abs: (0, prelude_1.decimalFromNullable)(x.valuation_abs).orDefault(prelude_1.zero),
             },
-            accrued: (0, prelude_1.maybeDecimal)(x.accrued).orDefault(prelude_1.zero),
-            liabilities: (0, prelude_1.maybeDecimal)(x.liabilities).orDefault(prelude_1.zero),
-            gav: (0, prelude_1.maybeDecimal)(x.gav).orDefault(prelude_1.zero),
+            accrued: (0, prelude_1.decimalFromNullable)(x.accrued).orDefault(prelude_1.zero),
+            liabilities: (0, prelude_1.decimalFromNullable)(x.liabilities).orDefault(prelude_1.zero),
+            gav: (0, prelude_1.decimalFromNullable)(x.gav).orDefault(prelude_1.zero),
             nav: nav,
-            aum: (0, prelude_1.maybeDecimal)(x.aum).orDefault(prelude_1.zero),
-            pnl: (0, prelude_1.maybeDecimal)(x.pnl).orDefault(prelude_1.zero),
-            pnlToInvestment: (0, prelude_1.maybeDecimal)(x.pnl_to_investment),
+            aum: (0, prelude_1.decimalFromNullable)(x.aum).orDefault(prelude_1.zero),
+            pnl: (0, prelude_1.decimalFromNullable)(x.pnl).orDefault(prelude_1.zero),
+            pnlToInvestment: (0, prelude_1.decimalFromNullable)(x.pnl_to_investment),
         },
     };
     return (0, prelude_1.Right)(report);