@decafhub/decaf-client-extras 0.5.0 → 0.5.2

package/.husky/commit-msg

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx --no -- commitlint --edit "${1}"

package/.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-./node_modules/.bin/lint-staged
+npx lint-staged

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.5.0"
+  ".": "0.5.2"
 }

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.5.2](https://github.com/teloscube/decaf-client-javascript-extras/compare/v0.5.1...v0.5.2) (2024-09-05)
+
+
+### Miscellaneous Chores
+
+* upgrade dependencies ([81f3b80](https://github.com/teloscube/decaf-client-javascript-extras/commit/81f3b80307f17e0a85f88e9f1202551b77155004))
+
+## [0.5.1](https://github.com/teloscube/decaf-client-javascript-extras/compare/v0.5.0...v0.5.1) (2024-08-31)
+
+
+### Bug Fixes
+
+* make grouping option configurable for holdings tree function ([ae97991](https://github.com/teloscube/decaf-client-javascript-extras/commit/ae97991f23393d04d85f782baedbd635a247db88))
+
 ## [0.5.0](https://github.com/teloscube/decaf-client-javascript-extras/compare/v0.4.0...v0.5.0) (2024-08-14)
 
 

package/commons/-currency.js

@@ -5,7 +5,10 @@
  * @module
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unCurrencyCode = exports.mkCurrencyCodeError = exports.mkCurrencyCode = exports.REGEXP_CURRENCY_CODE = void 0;
+exports.REGEXP_CURRENCY_CODE = void 0;
+exports.mkCurrencyCode = mkCurrencyCode;
+exports.mkCurrencyCodeError = mkCurrencyCodeError;
+exports.unCurrencyCode = unCurrencyCode;
 var prelude_1 = require("@telostat/prelude");
 /**
  * Regular expression for currency codes in our concept.
@@ -24,7 +27,6 @@ exports.REGEXP_CURRENCY_CODE = /^[A-Z][a-zA-Z]*$/;
 function mkCurrencyCode(x) {
     return exports.REGEXP_CURRENCY_CODE.test(x) ? (0, prelude_1.Just)(x) : prelude_1.Nothing;
 }
-exports.mkCurrencyCode = mkCurrencyCode;
 /**
  * (Unsafely) attempts to create a {@link CurrencyCode} value with the given
  * currency code.
@@ -41,7 +43,6 @@ function mkCurrencyCodeError(x) {
         throw new Error("Invalid currency code: ".concat(x));
     });
 }
-exports.mkCurrencyCodeError = mkCurrencyCodeError;
 /**
  * Return the currency code as a string value.
  *
@@ -53,4 +54,3 @@ exports.mkCurrencyCodeError = mkCurrencyCodeError;
 function unCurrencyCode(x) {
     return x;
 }
-exports.unCurrencyCode = unCurrencyCode;

package/commons/-id.js

@@ -52,7 +52,8 @@
  * @module
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unDecafRecordId = exports.mkDecafRecordId = void 0;
+exports.mkDecafRecordId = mkDecafRecordId;
+exports.unDecafRecordId = unDecafRecordId;
 /**
  * Constructor for DECAF record identifiers.
  *
@@ -62,7 +63,6 @@ exports.unDecafRecordId = exports.mkDecafRecordId = void 0;
 function mkDecafRecordId(x) {
     return x;
 }
-exports.mkDecafRecordId = mkDecafRecordId;
 /**
  * Deconstructor for DECAF record identifiers.
  *
@@ -72,4 +72,3 @@ exports.mkDecafRecordId = mkDecafRecordId;
 function unDecafRecordId(x) {
     return x;
 }
-exports.unDecafRecordId = unDecafRecordId;

package/es/reports/valuation/-valuation-report-holdings-tree/-machinery.d.ts

@@ -1,10 +1,10 @@
 import { Decimal } from '@telostat/prelude';
 import { ValuationReportHolding, ValuationReportHoldingClassification } from '../-valuation-report-shared';
-import { ValuationReportHoldingsTreeNode, ValuationReportHoldingsTreeNodeValue } from './-types';
+import { AvailableAddresserKeys, ValuationReportHoldingsTreeNode, ValuationReportHoldingsTreeNodeValue } from './-types';
 export declare function makeValuationReportHoldingsTreeNodeValue(): ValuationReportHoldingsTreeNodeValue;
 export declare function updateTotals(nav: Decimal, investment: Decimal, tree: ValuationReportHoldingsTreeNode): ValuationReportHoldingsTreeNodeValue;
 export declare function resortChildren(node: ValuationReportHoldingsTreeNode): ValuationReportHoldingsTreeNode[];
 export declare function retreatTree(nav: Decimal, investment: Decimal, tree: ValuationReportHoldingsTreeNode): void;
 export declare function makeValuationReportHoldingsTreeNode(address: ValuationReportHoldingClassification): ValuationReportHoldingsTreeNode;
 export declare function addValuationReportHoldingToTree(tree: ValuationReportHoldingsTreeNode, address: ValuationReportHoldingClassification, holding: ValuationReportHolding): void;
-export declare function makeValuationReportHoldingsTree(nav: Decimal, investment: Decimal, holdings: ValuationReportHolding[]): ValuationReportHoldingsTreeNode;
+export declare function makeValuationReportHoldingsTree(nav: Decimal, investment: Decimal, holdings: ValuationReportHolding[], addressKey?: AvailableAddresserKeys): ValuationReportHoldingsTreeNode;

package/es/reports/valuation/-valuation-report-holdings-tree/-machinery.js

@@ -1,5 +1,5 @@
 import { Just, List, Maybe, Nothing, safeDiv, sumDecimals, Tuple, zero } from '@telostat/prelude';
-import { compareStringArrays } from './-utils';
+import { addressers, compareStringArrays } from './-utils';
 export function makeValuationReportHoldingsTreeNodeValue() {
     return {
         investment: zero,
@@ -102,13 +102,15 @@ export function addValuationReportHoldingToTree(tree, address, holding) {
     // Done, we append the holding to the current node and return from the procedure:
     node.holdings.push(holding);
 }
-export function makeValuationReportHoldingsTree(nav, investment, holdings) {
+export function makeValuationReportHoldingsTree(nav, investment, holdings, addressKey = 'classification') {
     // Initialize the tree:
     const tree = makeValuationReportHoldingsTreeNode([]);
     tree.name = '« Total »';
     // Iterate over the holdings and attempt to add to the tree:
     for (const holding of holdings) {
-        addValuationReportHoldingToTree(tree, holding.classification, holding);
+        // Get the address of the holding:
+        const address = addressers[addressKey](holding);
+        addValuationReportHoldingToTree(tree, address, holding);
     }
     // Retreat the tree:
     retreatTree(nav, investment, tree);

package/es/reports/valuation/-valuation-report-holdings-tree/-types.d.ts

@@ -21,3 +21,6 @@ export interface ValuationReportHoldingsTreeNodeValue {
     pnl: Decimal;
     pnlRatio: Decimal;
 }
+export type HoldingAddress = ValuationReportHoldingClassification;
+export type HoldingAddresser = (holding: ValuationReportHolding) => HoldingAddress;
+export type AvailableAddresserKeys = 'classification' | 'currency' | 'country' | 'issuer' | 'sector';

package/es/reports/valuation/-valuation-report-holdings-tree/-utils.d.ts

@@ -1 +1,7 @@
+import { Maybe } from '@telostat/prelude';
+import { ValuationReportHolding } from '../-valuation-report-shared';
+import { AvailableAddresserKeys, HoldingAddresser } from './-types';
 export declare function compareStringArrays(x: string[], y: string[]): number;
+export declare function composeHoldingAddressers(addressers: Array<HoldingAddresser>): HoldingAddresser;
+export declare function makeSimpleAddresser(def: string, labeler: (holding: ValuationReportHolding) => Maybe<string>): HoldingAddresser;
+export declare const addressers: Record<AvailableAddresserKeys, HoldingAddresser>;

package/es/reports/valuation/-valuation-report-holdings-tree/-utils.js

@@ -10,3 +10,32 @@ export function compareStringArrays(x, y) {
     }
     return Math.sign(xLen - yLen);
 }
+export function composeHoldingAddressers(addressers) {
+    return (holding) => addressers.reduce((p, c) => [...p, ...c(holding)], []);
+}
+export function makeSimpleAddresser(def, labeler) {
+    return (holding) => {
+        // Attempt to get the label:
+        const label = labeler(holding).orDefault('') || def;
+        // Get the value:
+        const value = label.toUpperCase();
+        // Done, return:
+        return [{ name: value, order: value }];
+    };
+}
+export const addressers = {
+    classification: (holding) => {
+        // Get the classification:
+        const classification = holding.classification;
+        // Build the address and return:
+        return classification.map((x) => ({
+            // label: x.name,
+            name: x.name.toUpperCase(),
+            order: `${x.order}`.toUpperCase(),
+        }));
+    },
+    currency: makeSimpleAddresser('[Undefined Currency]', (holding) => holding.artifact.ccy),
+    country: makeSimpleAddresser('[Undefined Country]', (holding) => holding.artifact.country),
+    issuer: makeSimpleAddresser('[Undefined Issuer]', (holding) => holding.artifact.issuer),
+    sector: makeSimpleAddresser('[Undefined Sector]', (holding) => holding.artifact.sector),
+};

package/eslint.config.mjs

@@ -0,0 +1,54 @@
+import { FlatCompat } from '@eslint/eslintrc';
+import js from '@eslint/js';
+import typescriptEslint from '@typescript-eslint/eslint-plugin';
+import tsParser from '@typescript-eslint/parser';
+import prettier from 'eslint-plugin-prettier';
+import globals from 'globals';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+});
+
+export default [
+  {
+    ignores: ['**/lib', '**/docs', '**/.husky'],
+  },
+  ...compat.extends(
+    'standard',
+    'prettier',
+    'plugin:prettier/recommended',
+    'plugin:@typescript-eslint/eslint-recommended'
+  ),
+  {
+    plugins: {
+      '@typescript-eslint': typescriptEslint,
+      prettier,
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        Atomics: 'readonly',
+        SharedArrayBuffer: 'readonly',
+      },
+
+      parser: tsParser,
+      ecmaVersion: 2018,
+      sourceType: 'module',
+    },
+
+    rules: {
+      'prettier/prettier': 'error',
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      'no-use-before-define': 'off',
+      '@typescript-eslint/no-use-before-define': ['error'],
+    },
+  },
+];
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decafhub/decaf-client-extras",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "DECAF Client Extras",
   "author": "Teloscube Pte Ltd",
   "license": "MIT",
@@ -30,33 +30,35 @@
   },
   "dependencies": {
     "@telostat/prelude": "^0.5.0",
-    "dayjs": "^1.11.10"
+    "dayjs": "^1.11.13"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "@decafhub/decaf-client": "^0.5.0",
-    "@types/jest": "^29.5.10",
-    "@types/node": "^20.10.3",
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.13.2",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.55.0",
+    "@commitlint/cli": "^19.4.1",
+    "@commitlint/config-conventional": "^19.4.1",
+    "@decafhub/decaf-client": "^0.5.1",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.9.1",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^22.5.4",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
+    "@typescript-eslint/parser": "^8.4.0",
+    "dotenv": "^16.4.5",
+    "eslint": "^9.9.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-n": "^16.3.1",
-    "eslint-plugin-prettier": "^5.0.1",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-n": "^17.10.2",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-promise": "^7.1.0",
     "eslint-plugin-standard": "^5.0.0",
-    "gh-pages": "^6.1.0",
-    "husky": "^8.0.3",
+    "gh-pages": "^6.1.1",
+    "globals": "^15.9.0",
+    "husky": "^9.1.5",
     "jest": "^29.7.0",
-    "lint-staged": "^15.2.0",
-    "prettier": "^3.1.0",
-    "ts-jest": "^29.1.1",
-    "typedoc": "^0.25.4",
-    "typescript": "^5.3.2"
+    "lint-staged": "^15.2.10",
+    "prettier": "^3.3.3",
+    "prettier-plugin-organize-imports": "^4.0.0",
+    "ts-jest": "^29.2.5",
+    "typedoc": "^0.26.6",
+    "typescript": "^5.5.4"
   },
   "lint-staged": {
     "src/**/*.{ts,tsx}": [
@@ -70,7 +72,10 @@
     "useTabs": false,
     "semi": true,
     "singleQuote": true,
-    "trailingComma": "es5"
+    "trailingComma": "es5",
+    "plugins": [
+      "prettier-plugin-organize-imports"
+    ]
   },
   "commitlint": {
     "extends": [

package/postinstall.sh

@@ -6,7 +6,7 @@ if [ -f .env ]; then
 fi
 
 if [ -n "$DECAF_JS_SKIP_POSTINSTALL" ]; then
-  npx --no -- husky install
+  npx --no -- husky
   echo "Local Env detected. Skipping lib/ relocation..."
   exit 0
 fi

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

@@ -47,7 +47,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchAccountValuationReport = exports.recompileAccountValuationReport = exports.toShareClassValue = exports.fetchRemoteAccountValuationReport = void 0;
+exports.fetchRemoteAccountValuationReport = fetchRemoteAccountValuationReport;
+exports.toShareClassValue = toShareClassValue;
+exports.recompileAccountValuationReport = recompileAccountValuationReport;
+exports.fetchAccountValuationReport = fetchAccountValuationReport;
 var prelude_1 = require("@telostat/prelude");
 var _remote_valuation_report_shared_1 = require("./-remote-valuation-report-shared");
 /**
@@ -74,7 +77,6 @@ function fetchRemoteAccountValuationReport(client, query) {
         });
     });
 }
-exports.fetchRemoteAccountValuationReport = fetchRemoteAccountValuationReport;
 /**
  * Attempts to recompile remote valuation report share class value.
  *
@@ -153,7 +155,6 @@ function toShareClassValue(s) {
         ytdInt: (0, prelude_1.decimalFromNullable)(s.ytdint),
     };
 }
-exports.toShareClassValue = toShareClassValue;
 /**
  * Attempts to re-compile the raw, remote account valuation report and
  * return it.
@@ -170,7 +171,6 @@ function recompileAccountValuationReport(x) {
         return __assign(__assign({}, report), { account: x.account, subscriptions: (0, prelude_1.decimalFromNullable)(x.subscriptions).orDefault(prelude_1.zero), shareClassValues: x.scvals.map(toShareClassValue) });
     });
 }
-exports.recompileAccountValuationReport = recompileAccountValuationReport;
 /**
  * Attempts to retrieve remote account valuation report, compiles it to
  * {@link AccountValuationReport} and return it.
@@ -193,4 +193,3 @@ function fetchAccountValuationReport(client, query) {
         });
     });
 }
-exports.fetchAccountValuationReport = fetchAccountValuationReport;

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

@@ -47,7 +47,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchConsolidatedValuationReport = exports.recompileConsolidatedValuationReport = exports.fetchRemoteConsolidatedValuationReport = void 0;
+exports.fetchRemoteConsolidatedValuationReport = fetchRemoteConsolidatedValuationReport;
+exports.recompileConsolidatedValuationReport = recompileConsolidatedValuationReport;
+exports.fetchConsolidatedValuationReport = fetchConsolidatedValuationReport;
 var prelude_1 = require("@telostat/prelude");
 var _remote_valuation_report_shared_1 = require("./-remote-valuation-report-shared");
 /**
@@ -72,7 +74,6 @@ function fetchRemoteConsolidatedValuationReport(client, query) {
         .then(function (x) { return (0, prelude_1.Right)(x.data); })
         .catch(function (err) { return (0, prelude_1.Left)((0, prelude_1.customError)('Error while attempting to fetch remote consolidated valuation report', err)); });
 }
-exports.fetchRemoteConsolidatedValuationReport = fetchRemoteConsolidatedValuationReport;
 /**
  * Attempts to re-compile the raw, remote consolidated valuation report and
  * return it.
@@ -87,7 +88,6 @@ function recompileConsolidatedValuationReport(x) {
     // Add consolidated valuation report specific fields and return:
     return baseReport.map(function (report) { return (__assign(__assign({}, report), { containerType: x.containers.level, containers: x.containers.containers })); });
 }
-exports.recompileConsolidatedValuationReport = recompileConsolidatedValuationReport;
 /**
  * Attempts to retrieve remote consolidated valuation report, compiles it to
  * {@link ConsolidatedValuationReport} and return it.
@@ -110,4 +110,3 @@ function fetchConsolidatedValuationReport(client, query) {
         });
     });
 }
-exports.fetchConsolidatedValuationReport = fetchConsolidatedValuationReport;

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

@@ -47,7 +47,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchPortfolioValuationReport = exports.recompilePortfolioValuationReport = exports.toShareClassValue = exports.fetchRemotePortfolioValuationReport = void 0;
+exports.fetchRemotePortfolioValuationReport = fetchRemotePortfolioValuationReport;
+exports.toShareClassValue = toShareClassValue;
+exports.recompilePortfolioValuationReport = recompilePortfolioValuationReport;
+exports.fetchPortfolioValuationReport = fetchPortfolioValuationReport;
 var prelude_1 = require("@telostat/prelude");
 var _remote_valuation_report_shared_1 = require("./-remote-valuation-report-shared");
 /**
@@ -70,7 +73,6 @@ function fetchRemotePortfolioValuationReport(client, query) {
         .then(function (x) { return (0, prelude_1.Right)(x.data); })
         .catch(function (err) { return (0, prelude_1.Left)((0, prelude_1.customError)('Error while attempting to fetch remote portfolio valuation report', err)); });
 }
-exports.fetchRemotePortfolioValuationReport = fetchRemotePortfolioValuationReport;
 /**
  * Attempts to recompile remote valuation report share class value.
  *
@@ -149,7 +151,6 @@ function toShareClassValue(s) {
         ytdInt: (0, prelude_1.decimalFromNullable)(s.ytdint),
     };
 }
-exports.toShareClassValue = toShareClassValue;
 /**
  * Attempts to re-compile the raw, remote portfolio valuation report and
  * return it.
@@ -166,7 +167,6 @@ function recompilePortfolioValuationReport(x) {
         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;
 /**
  * Attempts to retrieve remote portfolio valuation report, compiles it to
  * {@link PortfolioValuationReport} and return it.
@@ -189,4 +189,3 @@ function fetchPortfolioValuationReport(client, query) {
         });
     });
 }
-exports.fetchPortfolioValuationReport = fetchPortfolioValuationReport;

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

@@ -11,7 +11,13 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recompileBaseValuationReport = exports.toHolding = exports.toBaseHolding = exports.toMaybeOrgRef = exports.toOrgRef = exports.toAccrual = exports.toArtifact = void 0;
+exports.toArtifact = toArtifact;
+exports.toAccrual = toAccrual;
+exports.toOrgRef = toOrgRef;
+exports.toMaybeOrgRef = toMaybeOrgRef;
+exports.toBaseHolding = toBaseHolding;
+exports.toHolding = toHolding;
+exports.recompileBaseValuationReport = recompileBaseValuationReport;
 var prelude_1 = require("@telostat/prelude");
 function toArtifact(x) {
     return {
@@ -34,7 +40,6 @@ function toArtifact(x) {
         underlyingId: prelude_1.Maybe.fromNullable(x.underlying_id),
     };
 }
-exports.toArtifact = toArtifact;
 function toAccrual(x) {
     return {
         name: x.name,
@@ -53,21 +58,18 @@ function toAccrual(x) {
         }); }),
     };
 }
-exports.toAccrual = toAccrual;
 function toOrgRef(x) {
     return {
         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.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),
@@ -100,7 +102,6 @@ function toBaseHolding(nav, x) {
         lastdate: x.lastdate,
     };
 }
-exports.toBaseHolding = toBaseHolding;
 function toHolding(nav, x) {
     return __assign(__assign({}, toBaseHolding(nav, x)), { classification: x.tags.classification.map(function (n) { return (__assign(__assign({}, n), { order: n.order || '' })); }), accounts: x.accounts, children: prelude_1.Maybe.fromNullable(x.children)
             .filter(function (mc) { return mc.length !== 0; })
@@ -108,7 +109,6 @@ function toHolding(nav, x) {
             return mc.map(function (c) { return (__assign(__assign({}, toBaseHolding(nav, c)), { account: c.accounts[0] })); });
         }) });
 }
-exports.toHolding = toHolding;
 /**
  * Attempts to re-compile the raw, remote base valuation report and
  * return it.
@@ -145,4 +145,3 @@ function recompileBaseValuationReport(x) {
     };
     return (0, prelude_1.Right)(report);
 }
-exports.recompileBaseValuationReport = recompileBaseValuationReport;

package/reports/valuation/-valuation-report-holdings-tree/-machinery.d.ts

@@ -1,10 +1,10 @@
 import { Decimal } from '@telostat/prelude';
 import { ValuationReportHolding, ValuationReportHoldingClassification } from '../-valuation-report-shared';
-import { ValuationReportHoldingsTreeNode, ValuationReportHoldingsTreeNodeValue } from './-types';
+import { AvailableAddresserKeys, ValuationReportHoldingsTreeNode, ValuationReportHoldingsTreeNodeValue } from './-types';
 export declare function makeValuationReportHoldingsTreeNodeValue(): ValuationReportHoldingsTreeNodeValue;
 export declare function updateTotals(nav: Decimal, investment: Decimal, tree: ValuationReportHoldingsTreeNode): ValuationReportHoldingsTreeNodeValue;
 export declare function resortChildren(node: ValuationReportHoldingsTreeNode): ValuationReportHoldingsTreeNode[];
 export declare function retreatTree(nav: Decimal, investment: Decimal, tree: ValuationReportHoldingsTreeNode): void;
 export declare function makeValuationReportHoldingsTreeNode(address: ValuationReportHoldingClassification): ValuationReportHoldingsTreeNode;
 export declare function addValuationReportHoldingToTree(tree: ValuationReportHoldingsTreeNode, address: ValuationReportHoldingClassification, holding: ValuationReportHolding): void;
-export declare function makeValuationReportHoldingsTree(nav: Decimal, investment: Decimal, holdings: ValuationReportHolding[]): ValuationReportHoldingsTreeNode;
+export declare function makeValuationReportHoldingsTree(nav: Decimal, investment: Decimal, holdings: ValuationReportHolding[], addressKey?: AvailableAddresserKeys): ValuationReportHoldingsTreeNode;

package/reports/valuation/-valuation-report-holdings-tree/-machinery.js

@@ -36,7 +36,13 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeValuationReportHoldingsTree = exports.addValuationReportHoldingToTree = exports.makeValuationReportHoldingsTreeNode = exports.retreatTree = exports.resortChildren = exports.updateTotals = exports.makeValuationReportHoldingsTreeNodeValue = void 0;
+exports.makeValuationReportHoldingsTreeNodeValue = makeValuationReportHoldingsTreeNodeValue;
+exports.updateTotals = updateTotals;
+exports.resortChildren = resortChildren;
+exports.retreatTree = retreatTree;
+exports.makeValuationReportHoldingsTreeNode = makeValuationReportHoldingsTreeNode;
+exports.addValuationReportHoldingToTree = addValuationReportHoldingToTree;
+exports.makeValuationReportHoldingsTree = makeValuationReportHoldingsTree;
 var prelude_1 = require("@telostat/prelude");
 var _utils_1 = require("./-utils");
 function makeValuationReportHoldingsTreeNodeValue() {
@@ -55,7 +61,6 @@ function makeValuationReportHoldingsTreeNodeValue() {
         pnlRatio: prelude_1.zero,
     };
 }
-exports.makeValuationReportHoldingsTreeNodeValue = makeValuationReportHoldingsTreeNodeValue;
 function updateTotals(nav, investment, tree) {
     var holdings = tree.holdings;
     var children = tree.children;
@@ -87,7 +92,6 @@ function updateTotals(nav, investment, tree) {
         pnlRatio: (0, prelude_1.safeDiv)(pnl, investment).orDefault(prelude_1.zero),
     };
 }
-exports.updateTotals = updateTotals;
 function resortChildren(node) {
     return node.children.sort(function (t1, t2) {
         // Get current address segments:
@@ -104,7 +108,6 @@ function resortChildren(node) {
             .orDefaultLazy(function () { return (segment1.isNothing() ? -1 : 1); });
     });
 }
-exports.resortChildren = resortChildren;
 function retreatTree(nav, investment, tree) {
     // First, retreat all children (recursive):
     tree.children.forEach(function (x) { return retreatTree(nav, investment, x); });
@@ -113,7 +116,6 @@ function retreatTree(nav, investment, tree) {
     // Resort children:
     tree.children = resortChildren(tree);
 }
-exports.retreatTree = retreatTree;
 function makeValuationReportHoldingsTreeNode(address) {
     return {
         name: prelude_1.List.last(address)
@@ -125,7 +127,6 @@ function makeValuationReportHoldingsTreeNode(address) {
         totals: makeValuationReportHoldingsTreeNodeValue(),
     };
 }
-exports.makeValuationReportHoldingsTreeNode = makeValuationReportHoldingsTreeNode;
 function addValuationReportHoldingToTree(tree, address, holding) {
     var e_1, _a;
     // Get the starting (current) node:
@@ -164,9 +165,9 @@ function addValuationReportHoldingToTree(tree, address, holding) {
     // Done, we append the holding to the current node and return from the procedure:
     node.holdings.push(holding);
 }
-exports.addValuationReportHoldingToTree = addValuationReportHoldingToTree;
-function makeValuationReportHoldingsTree(nav, investment, holdings) {
+function makeValuationReportHoldingsTree(nav, investment, holdings, addressKey) {
     var e_2, _a;
+    if (addressKey === void 0) { addressKey = 'classification'; }
     // Initialize the tree:
     var tree = makeValuationReportHoldingsTreeNode([]);
     tree.name = '« Total »';
@@ -174,7 +175,9 @@ function makeValuationReportHoldingsTree(nav, investment, holdings) {
         // Iterate over the holdings and attempt to add to the tree:
         for (var holdings_1 = __values(holdings), holdings_1_1 = holdings_1.next(); !holdings_1_1.done; holdings_1_1 = holdings_1.next()) {
             var holding = holdings_1_1.value;
-            addValuationReportHoldingToTree(tree, holding.classification, holding);
+            // Get the address of the holding:
+            var address = _utils_1.addressers[addressKey](holding);
+            addValuationReportHoldingToTree(tree, address, holding);
         }
     }
     catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -189,4 +192,3 @@ function makeValuationReportHoldingsTree(nav, investment, holdings) {
     // Done, return:
     return tree;
 }
-exports.makeValuationReportHoldingsTree = makeValuationReportHoldingsTree;

package/reports/valuation/-valuation-report-holdings-tree/-types.d.ts

@@ -21,3 +21,6 @@ export interface ValuationReportHoldingsTreeNodeValue {
     pnl: Decimal;
     pnlRatio: Decimal;
 }
+export type HoldingAddress = ValuationReportHoldingClassification;
+export type HoldingAddresser = (holding: ValuationReportHolding) => HoldingAddress;
+export type AvailableAddresserKeys = 'classification' | 'currency' | 'country' | 'issuer' | 'sector';

package/reports/valuation/-valuation-report-holdings-tree/-utils.d.ts

@@ -1 +1,7 @@
+import { Maybe } from '@telostat/prelude';
+import { ValuationReportHolding } from '../-valuation-report-shared';
+import { AvailableAddresserKeys, HoldingAddresser } from './-types';
 export declare function compareStringArrays(x: string[], y: string[]): number;
+export declare function composeHoldingAddressers(addressers: Array<HoldingAddresser>): HoldingAddresser;
+export declare function makeSimpleAddresser(def: string, labeler: (holding: ValuationReportHolding) => Maybe<string>): HoldingAddresser;
+export declare const addressers: Record<AvailableAddresserKeys, HoldingAddresser>;

package/reports/valuation/-valuation-report-holdings-tree/-utils.js

@@ -1,6 +1,34 @@
 "use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareStringArrays = void 0;
+exports.addressers = void 0;
+exports.compareStringArrays = compareStringArrays;
+exports.composeHoldingAddressers = composeHoldingAddressers;
+exports.makeSimpleAddresser = makeSimpleAddresser;
 function compareStringArrays(x, y) {
     var xLen = x.length;
     var yLen = y.length;
@@ -13,4 +41,34 @@ function compareStringArrays(x, y) {
     }
     return Math.sign(xLen - yLen);
 }
-exports.compareStringArrays = compareStringArrays;
+function composeHoldingAddressers(addressers) {
+    return function (holding) {
+        return addressers.reduce(function (p, c) { return __spreadArray(__spreadArray([], __read(p), false), __read(c(holding)), false); }, []);
+    };
+}
+function makeSimpleAddresser(def, labeler) {
+    return function (holding) {
+        // Attempt to get the label:
+        var label = labeler(holding).orDefault('') || def;
+        // Get the value:
+        var value = label.toUpperCase();
+        // Done, return:
+        return [{ name: value, order: value }];
+    };
+}
+exports.addressers = {
+    classification: function (holding) {
+        // Get the classification:
+        var classification = holding.classification;
+        // Build the address and return:
+        return classification.map(function (x) { return ({
+            // label: x.name,
+            name: x.name.toUpperCase(),
+            order: "".concat(x.order).toUpperCase(),
+        }); });
+    },
+    currency: makeSimpleAddresser('[Undefined Currency]', function (holding) { return holding.artifact.ccy; }),
+    country: makeSimpleAddresser('[Undefined Country]', function (holding) { return holding.artifact.country; }),
+    issuer: makeSimpleAddresser('[Undefined Issuer]', function (holding) { return holding.artifact.issuer; }),
+    sector: makeSimpleAddresser('[Undefined Sector]', function (holding) { return holding.artifact.sector; }),
+};

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

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValuationChildHolding = exports.isValuationHolding = void 0;
+exports.isValuationHolding = isValuationHolding;
+exports.isValuationChildHolding = isValuationChildHolding;
 function isValuationHolding(x) {
     return 'accounts' in x;
 }
-exports.isValuationHolding = isValuationHolding;
 function isValuationChildHolding(x) {
     return 'account' in x;
 }
-exports.isValuationChildHolding = isValuationChildHolding;

package/shell.nix

@@ -1,6 +1,11 @@
-{ ... }:
+with import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/24.05.tar.gz") { };
 
-let
-  nix = import ./nix { };
-in
-nix.shell
+stdenv.mkDerivation {
+  name = "decaf-client-javascript-extras";
+
+  buildInputs = with pkgs; [
+    nodejs_18
+  ];
+
+  NODE_OPTIONS = "--max-old-space-size=4096";
+}

package/src/reports/index.test.ts

@@ -154,7 +154,7 @@ describe('Reports', () => {
         const nav = value.figures.nav;
         const inv = value.figures.investment;
         const holdings = value.holdings;
-        const tree = makeValuationReportHoldingsTree(nav, inv, holdings);
+        const tree = makeValuationReportHoldingsTree(nav, inv, holdings, 'country');
         expect(tree).toBeDefined();
         expect(safeDiv(tree.totals.netExposure, nav).orDefault(zero)).toEqual(tree.totals.netExposureRatio);
       },

package/src/reports/valuation/-valuation-report-holdings-tree/-machinery.ts

@@ -1,8 +1,12 @@
 import { Decimal, Just, List, Maybe, Nothing, safeDiv, sumDecimals, Tuple, zero } from '@telostat/prelude';
 import { ValuationReportHolding, ValuationReportHoldingClassification } from '../-valuation-report-shared';
 import { DecafArtifactTypeId } from '../../../commons';
-import { ValuationReportHoldingsTreeNode, ValuationReportHoldingsTreeNodeValue } from './-types';
-import { compareStringArrays } from './-utils';
+import {
+  AvailableAddresserKeys,
+  ValuationReportHoldingsTreeNode,
+  ValuationReportHoldingsTreeNodeValue,
+} from './-types';
+import { addressers, compareStringArrays } from './-utils';
 
 export function makeValuationReportHoldingsTreeNodeValue(): ValuationReportHoldingsTreeNodeValue {
   return {
@@ -161,7 +165,8 @@ export function addValuationReportHoldingToTree(
 export function makeValuationReportHoldingsTree(
   nav: Decimal,
   investment: Decimal,
-  holdings: ValuationReportHolding[]
+  holdings: ValuationReportHolding[],
+  addressKey: AvailableAddresserKeys = 'classification'
 ): ValuationReportHoldingsTreeNode {
   // Initialize the tree:
   const tree = makeValuationReportHoldingsTreeNode([]);
@@ -169,7 +174,10 @@ export function makeValuationReportHoldingsTree(
 
   // Iterate over the holdings and attempt to add to the tree:
   for (const holding of holdings) {
-    addValuationReportHoldingToTree(tree, holding.classification, holding);
+    // Get the address of the holding:
+    const address = addressers[addressKey](holding);
+
+    addValuationReportHoldingToTree(tree, address, holding);
   }
 
   // Retreat the tree:

package/src/reports/valuation/-valuation-report-holdings-tree/-types.ts

@@ -23,3 +23,13 @@ export interface ValuationReportHoldingsTreeNodeValue {
   pnl: Decimal;
   pnlRatio: Decimal;
 }
+
+// export interface HoldingAddressSegment {
+//   value: string;
+//   label: string;
+//   order: string | number;
+// }
+
+export type HoldingAddress = ValuationReportHoldingClassification; // HoldingAddressSegment[];
+export type HoldingAddresser = (holding: ValuationReportHolding) => HoldingAddress;
+export type AvailableAddresserKeys = 'classification' | 'currency' | 'country' | 'issuer' | 'sector';

package/src/reports/valuation/-valuation-report-holdings-tree/-utils.ts

@@ -1,3 +1,7 @@
+import { Maybe } from '@telostat/prelude';
+import { ValuationReportHolding } from '../-valuation-report-shared';
+import { AvailableAddresserKeys, HoldingAddress, HoldingAddresser } from './-types';
+
 export function compareStringArrays(x: string[], y: string[]): number {
   const xLen = x.length;
   const yLen = y.length;
@@ -13,3 +17,42 @@ export function compareStringArrays(x: string[], y: string[]): number {
 
   return Math.sign(xLen - yLen);
 }
+
+export function composeHoldingAddressers(addressers: Array<HoldingAddresser>): HoldingAddresser {
+  return (holding: ValuationReportHolding) =>
+    addressers.reduce((p: HoldingAddress, c: HoldingAddresser) => [...p, ...c(holding)], []);
+}
+
+export function makeSimpleAddresser(
+  def: string,
+  labeler: (holding: ValuationReportHolding) => Maybe<string>
+): HoldingAddresser {
+  return (holding: ValuationReportHolding) => {
+    // Attempt to get the label:
+    const label = labeler(holding).orDefault('') || def;
+
+    // Get the value:
+    const value = label.toUpperCase();
+
+    // Done, return:
+    return [{ name: value, order: value }];
+  };
+}
+
+export const addressers: Record<AvailableAddresserKeys, HoldingAddresser> = {
+  classification: (holding: ValuationReportHolding) => {
+    // Get the classification:
+    const classification = holding.classification;
+
+    // Build the address and return:
+    return classification.map((x) => ({
+      // label: x.name,
+      name: x.name.toUpperCase(),
+      order: `${x.order}`.toUpperCase(),
+    }));
+  },
+  currency: makeSimpleAddresser('[Undefined Currency]', (holding: ValuationReportHolding) => holding.artifact.ccy),
+  country: makeSimpleAddresser('[Undefined Country]', (holding: ValuationReportHolding) => holding.artifact.country),
+  issuer: makeSimpleAddresser('[Undefined Issuer]', (holding: ValuationReportHolding) => holding.artifact.issuer),
+  sector: makeSimpleAddresser('[Undefined Sector]', (holding: ValuationReportHolding) => holding.artifact.sector),
+};

package/.eslintignore

@@ -1,3 +0,0 @@
-lib
-docs
-.husky

package/.eslintrc.js

@@ -1,23 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    es6: true,
-  },
-  globals: {
-    Atomics: 'readonly',
-    SharedArrayBuffer: 'readonly',
-  },
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: 'module',
-  },
-  plugins: ['@typescript-eslint', 'prettier'],
-  extends: ['standard', 'prettier', 'plugin:prettier/recommended', 'plugin:@typescript-eslint/eslint-recommended'],
-  rules: {
-    'prettier/prettier': 'error',
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    'no-use-before-define': 'off',
-    '@typescript-eslint/no-use-before-define': ['error'],
-  },
-};

package/nix/default.nix

@@ -1,58 +0,0 @@
-{ ... }:
-
-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
-
-    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

@@ -1,14 +0,0 @@
-{
-    "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

@@ -1,194 +0,0 @@
-# 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); }