@diy-accounting-uk/diya-gl 1.2.47 → 1.2.49

package/README.md

@@ -196,9 +196,10 @@ format text is CC BY 4.0, so you can implement the format in anything with attri
 The workbook templates are not part of this package. `write-workbook` and the MCP `save_workbook`
 tool fetch the template they need from
 [spreadsheets.diyaccounting.co.uk](https://spreadsheets.diyaccounting.co.uk) the first time they run,
-print the terms, and cache it for later runs. The templates are the company's own work, under the
-PolyForm Internal Use License 1.0.0 with an additional grant: use them for your own accounts, or for
-your clients' accounts if you are an accountant or a bookkeeper, and do not redistribute them.
+print the terms, and cache it for later runs of the same version. The templates are the company's
+own work, under the PolyForm Internal Use License 1.0.0 with an additional grant: use them for your
+own accounts, or for your clients' accounts if you are an accountant or a bookkeeper, and do not
+redistribute them.
 
 This repository does not accept contributions.
 

package/dist/app/bin/view.js

@@ -15,30 +15,16 @@
 // one directory per package version and origin host.
 
 import { spawn } from "child_process";
-import { existsSync, readFileSync } from "fs";
 import { tmpdir } from "os";
-import { dirname, join, resolve } from "path";
-import { fileURLToPath } from "url";
+import { join, resolve } from "path";
 import { readBookFragment } from "./link.js";
 import { FRAGMENT_KEY } from "../lib/diya-gl-link.js";
 import { DEFAULT_ORIGIN, startViewServer } from "../lib/diya-gl-view-server.js";
+import { packageVersion } from "../lib/package-version.js";
 
 const USAGE =
   "Usage: diya-gl view <book directory | diya-gl zip | diya-gl JSON file | workbook> [--port <number>] [--origin <url>] [--no-open]";
 
-// The nearest package.json above this file: the package's own in dist/, the
-// repository's in a checkout. Both carry the version the cache is keyed on.
-function packageVersion() {
-  let directory = dirname(fileURLToPath(import.meta.url));
-  for (;;) {
-    const candidate = join(directory, "package.json");
-    if (existsSync(candidate)) return JSON.parse(readFileSync(candidate, "utf8")).version;
-    const parent = dirname(directory);
-    if (parent === directory) throw new Error("No package.json found above " + import.meta.url);
-    directory = parent;
-  }
-}
-
 function parseArgs(argv) {
   const args = argv.slice(2);
   let port = 0;
@@ -86,7 +72,7 @@ function openInBrowser(url) {
 async function main() {
   const { source, port, origin, open } = parseArgs(process.argv);
   const { product, fragment, length, warning } = await readBookFragment(source);
-  const cacheDir = join(tmpdir(), "diya-gl-view", packageVersion(), new URL(origin).host.replace(/[^A-Za-z0-9.-]/g, "_"));
+  const cacheDir = join(tmpdir(), "diya-gl-view", await packageVersion(), new URL(origin).host.replace(/[^A-Za-z0-9.-]/g, "_"));
   const running = await startViewServer({ cacheDir, origin, port });
   const url = `http://${running.host}:${running.port}/${product}.html#${FRAGMENT_KEY}=${fragment}`;
   console.log(url);

package/dist/app/data/releases.json

@@ -1455,6 +1455,58 @@
           "scorecard": "101608 passed, 0 warnings, 0 failed"
         }
       }
+    },
+    {
+      "tag": "diya-gl-v1.2.47",
+      "date": "2026-10-05",
+      "formatVersion": "diya-gl/1",
+      "engineVersion": "1.2.47+26b9e6ec",
+      "taxDataHash": "51bdff60e993",
+      "reconciledCommit": "54e8731a91279975e61b1a232fbb67fda89515f0",
+      "templates": {
+        "bst": {
+          "hash": "0d003e10e00c",
+          "scorecard": "812 passed, 0 warnings, 0 failed"
+        },
+        "taxi": {
+          "hash": "1ff69654d64d",
+          "scorecard": "700 passed, 0 warnings, 0 failed"
+        },
+        "se": {
+          "hash": "064605ae76ed",
+          "scorecard": "8015 passed, 0 warnings, 0 failed"
+        },
+        "ltd": {
+          "hash": "a65ab09cf35c",
+          "scorecard": "101608 passed, 0 warnings, 0 failed"
+        }
+      }
+    },
+    {
+      "tag": "diya-gl-v1.2.48",
+      "date": "2026-10-05",
+      "formatVersion": "diya-gl/1",
+      "engineVersion": "1.2.48+bf25fb49",
+      "taxDataHash": "51bdff60e993",
+      "reconciledCommit": "54e8731a91279975e61b1a232fbb67fda89515f0",
+      "templates": {
+        "bst": {
+          "hash": "0d003e10e00c",
+          "scorecard": "812 passed, 0 warnings, 0 failed"
+        },
+        "taxi": {
+          "hash": "1ff69654d64d",
+          "scorecard": "700 passed, 0 warnings, 0 failed"
+        },
+        "se": {
+          "hash": "064605ae76ed",
+          "scorecard": "8015 passed, 0 warnings, 0 failed"
+        },
+        "ltd": {
+          "hash": "a65ab09cf35c",
+          "scorecard": "101608 passed, 0 warnings, 0 failed"
+        }
+      }
     }
   ]
 }

package/dist/app/lib/app-resources.js

@@ -19,6 +19,8 @@
 // Node's own modules load on the first read rather than with this file, so a
 // bundle whose caller supplies a loader never pulls them in.
 
+import { packageVersion } from "./package-version.js";
+
 // The resource space is app/ with one named exception. The two v2 schemas are
 // published by the site, not carried in app/, and the site serves them at
 // /schema/ — so "schema/" is a root of its own rather than a directory under
@@ -31,7 +33,10 @@ const SCHEMA_ROOT_FROM_APP = ["..", "web", "spreadsheets.diyaccounting.co.uk", "
 // checkout has app/templates and reads it straight off disk. A packaged install
 // has not, so the loader takes the same file from the site, which already
 // serves the templates the DIYA-GL pages use, and keeps it in a user cache so
-// every later run works with no network.
+// every later run of the same version works with no network. The cache is keyed
+// on the package version and the source host, because the anchors the reader
+// checks a package against move with the version: a template cached by an
+// older version writes a package the newer reader refuses.
 //
 // Both the current /diya-gl/ and legacy /books/ paths resolve — the old one
 // through a redirect — so published versions built before the path moved keep
@@ -71,11 +76,12 @@ async function fetchTemplate(path) {
   const { dirname, resolve } = await import("path");
   const { homedir } = await import("os");
 
+  const source = templateSource();
   const cacheRoot = process.env.XDG_CACHE_HOME || resolve(homedir(), ".cache");
-  const cached = resolve(cacheRoot, "diya-gl", path);
+  const sourceHost = new URL(source).host.replace(/[^A-Za-z0-9.-]/g, "_");
+  const cached = resolve(cacheRoot, "diya-gl", await packageVersion(), sourceHost, path);
   if (existsSync(cached)) return readFileSync(cached);
 
-  const source = templateSource();
   announceTemplateTerms(source);
 
   const url = `${source}/${path}`;

package/dist/app/lib/calculators/se-derivations.js

@@ -12,9 +12,7 @@
 // this module never restates a box's API field name in code, so a mapping
 // correction there reaches both derivations with no code change.
 
-import { readFileSync } from "fs";
-import { resolve, dirname } from "path";
-import { fileURLToPath } from "url";
+import mapping from "../../data/hmrc/sa103-mtd-mapping.json" with { type: "json" };
 import { diyaGlToScenario } from "../diya-gl-loader.js";
 import { calculateSeCells } from "./se.js";
 import { SE_YEAR_END_MONTH, SBA_CLAIM_ROWS } from "../../products/se.js";
@@ -22,17 +20,8 @@ import { extractTaxYearStart, parseDate } from "../scenario-loader.js";
 import { shiftMonths, periodShiftMonths } from "../period-shift.js";
 import { splitVat } from "../tax/vat.js";
 
-let cachedMapping = null;
-
-// Resolved on first use, not at import: the engine bundle loads in the browser,
-// where import.meta.url is an http URL and fileURLToPath throws.
 export function loadMapping() {
-  if (!cachedMapping) {
-    const here = dirname(fileURLToPath(import.meta.url));
-    const mappingPath = resolve(here, "..", "..", "data", "hmrc", "sa103-mtd-mapping.json");
-    cachedMapping = JSON.parse(readFileSync(mappingPath, "utf8"));
-  }
-  return cachedMapping;
+  return mapping;
 }
 
 function sa103fBoxes() {

package/dist/app/lib/derivations/itsa.js

@@ -49,8 +49,8 @@ function taxYearFileNameFor(label) {
   return `se-${start}-${end}`;
 }
 
-async function taxDataFor(book, taxYear) {
-  const options = taxYear ? { taxYearName: taxYearFileNameFor(taxYear) } : {};
+async function taxDataFor(book, taxYear, resources) {
+  const options = taxYear ? { taxYearName: taxYearFileNameFor(taxYear), resources } : { resources };
   const taxData = await loadTaxDataForBook(book, options);
   const label = taxData?.tax_year?.label;
   if (!label) throw new Error("the tax year file declares no tax_year.label");
@@ -153,13 +153,13 @@ function periodLabel(period) {
  * @param {Object} book - parsed book.toml
  * @param {Array} lines - parsed lines.jsonl entries
  * @param {{periodEndDate?: string, quarterlyPeriodType?: "standard"|"calendar", taxYear?: string}} [params] -
- *   quarterlyPeriodType defaults to standard (6 April quarters); taxYear (as 2025-26) overrides the year the
+ *   resources is the loader the tax data reads through (defaults to reading app/); quarterlyPeriodType defaults to standard (6 April quarters); taxYear (as 2025-26) overrides the year the
  *   book's dates imply
  * @returns {Promise<Object>} { taxYear, shape, quarterlyPeriodType, fieldSlots, periods, warnings }
  */
-export async function deriveItsaQuarterlyUpdate(book, lines, { periodEndDate, quarterlyPeriodType, taxYear } = {}) {
+export async function deriveItsaQuarterlyUpdate(book, lines, { periodEndDate, quarterlyPeriodType, taxYear, resources } = {}) {
   requireSelfEmployedBook(book, lines, "deriveItsaQuarterlyUpdate");
-  const taxData = await taxDataFor(book, taxYear);
+  const taxData = await taxDataFor(book, taxYear, resources);
   const label = taxData.tax_year.label;
   const shape = loadMapping().api.years[label].quarterly;
   const periodType = quarterlyPeriodType || "standard";
@@ -217,9 +217,9 @@ export async function deriveItsaQuarterlyUpdate(book, lines, { periodEndDate, qu
  * @param {{taxYear?: string}} [params] - taxYear (as 2025-26) overrides the year the book's dates imply
  * @returns {Promise<Object>} { taxYear, fieldSlots, allowances, adjustments, omitted, warnings }
  */
-export async function deriveItsaAnnualSubmission(book, lines, { taxYear } = {}) {
+export async function deriveItsaAnnualSubmission(book, lines, { taxYear, resources } = {}) {
   requireSelfEmployedBook(book, lines, "deriveItsaAnnualSubmission");
-  const taxData = await taxDataFor(book, taxYear);
+  const taxData = await taxDataFor(book, taxYear, resources);
   const label = taxData.tax_year.label;
   const slots = annualFieldSlotsForTaxYear(label);
 

package/dist/app/lib/derivations/vat-return.js

@@ -141,12 +141,12 @@ function reconcile(label, attributed, engine) {
  * @param {Object} book - parsed book.toml
  * @param {Array} lines - parsed lines.jsonl entries
  * @param {{periodEnd: string, periodStart?: string, periodKey?: string}} params - periodEnd is the
- *   obligation's period end (YYYY-MM-DD); periodStart, when given, must open that quarter; periodKey is
+ *   obligation's period end (YYYY-MM-DD); resources is the loader the tax data reads through (defaults to reading app/); periodStart, when given, must open that quarter; periodKey is
  *   echoed back untouched
  * @returns {Promise<Object>} { vatRegistrationNumber, periodKey, periodStart, periodEnd, dueDate, scheme,
  *   months, boxes, hmrc, lines, notes }
  */
-export async function deriveVatReturn(book, lines, { periodEnd, periodStart, periodKey } = {}) {
+export async function deriveVatReturn(book, lines, { periodEnd, periodStart, periodKey, resources } = {}) {
   if (!book || !lines) throw new Error("deriveVatReturn requires a book and its lines");
   if (!periodEnd) throw new Error("deriveVatReturn requires periodEnd (the obligation's period end, YYYY-MM-DD)");
   const entity = book.entityInformation ?? {};
@@ -157,7 +157,7 @@ export async function deriveVatReturn(book, lines, { periodEnd, periodStart, per
   }
 
   const product = productOf(book);
-  const taxData = await loadTaxDataForBook(book);
+  const taxData = await loadTaxDataForBook(book, { resources });
   const results = calculateFromDiyaGl(book, lines, product, taxData, diyaGlToScenario(book, lines, product));
   const rows = interfaceRows(results);
   const wantedEnd = isoDate(periodEnd);

package/dist/app/lib/package-version.js

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2006-2026 DIY Accounting Limited
+//
+// package-version.js — the version of the engine that is running, read from
+// the nearest package.json above this file: the package's own in an install,
+// the repository's in a checkout. Both carry the same version, and the caches
+// of files fetched from the site are keyed on it.
+//
+// Node's own modules load on the call rather than with this file, so a bundle
+// that never asks for the version never pulls them in.
+
+/**
+ * @returns {Promise<string>}
+ */
+export async function packageVersion() {
+  const { existsSync, readFileSync } = await import("fs");
+  const { dirname, join } = await import("path");
+  const { fileURLToPath } = await import("url");
+
+  let directory = dirname(fileURLToPath(import.meta.url));
+  for (;;) {
+    const candidate = join(directory, "package.json");
+    if (existsSync(candidate)) return JSON.parse(readFileSync(candidate, "utf8")).version;
+    const parent = dirname(directory);
+    if (parent === directory) throw new Error("No package.json found above " + import.meta.url);
+    directory = parent;
+  }
+}

package/dist/app/lib/provenance-data.js

@@ -12,7 +12,7 @@
 
 export const PROVENANCE_DATA = {
   formatVersion: "diya-gl/1",
-  engineVersion: "1.2.47+26b9e6ec",
+  engineVersion: "1.2.49+f18282c3",
   taxDataHash: "51bdff60e993",
   reconciledCommit: "54e8731a91279975e61b1a232fbb67fda89515f0",
   templates: {

package/dist/app/lib/xlsx-exporter.js

@@ -2258,6 +2258,27 @@ async function seAccountingPeriodFromSheet(set) {
   return { start, end };
 }
 
+// The Taxi package's own accounting period. Its end is the box "Date your
+// books or accounts are made up to" (Business Details!N25, a formula on
+// Admin!B17, the 5 April the writer sets for the package's tax year); the
+// period opens the day after the same date a year earlier. periodCovered()'s
+// guess would run the period 1 April to 31 March instead.
+const TAXI_PERIOD_END_CELL = { sheet: "Business Details", cell: "N25" };
+
+async function taxiAccountingPeriodFromSheet(set) {
+  const workbookName = singleWorkbookName(set);
+  const sheet = await openSheet(await openWorkbook(set, workbookName), TAXI_PERIOD_END_CELL.sheet);
+  const end = sheet ? dateAt(sheet.xml, TAXI_PERIOD_END_CELL.cell, sheet.sharedStrings) : undefined;
+  if (!end) {
+    throw new Error(
+      `${workbookName}: no date in ${TAXI_PERIOD_END_CELL.sheet}!${TAXI_PERIOD_END_CELL.cell}, the date the books are made up to`,
+    );
+  }
+  const [year, month, day] = end.split("-").map(Number);
+  const start = new Date(Date.UTC(year - 1, month - 1, day + 1)).toISOString().slice(0, 10);
+  return { start, end };
+}
+
 function assign(target, key, value) {
   if (value !== undefined && value !== "" && value !== 0) target[key] = value;
 }
@@ -2685,11 +2706,13 @@ export async function extractBook(set, product, lines, cellMap, options = {}) {
     }
   }
 
-  // SE reads its true accounting period off the printed boxes, since a book
-  // whose dates do not run April to March still has every posting written
-  // onto the package's own April-March tab grid.
+  // SE and Taxi read their true accounting period off the printed boxes,
+  // since a book whose dates do not run April to March still has every
+  // posting written onto the package's own April-March tab grid.
   const period =
-    (product === "se" && (await seAccountingPeriodFromSheet(set))) || periodCovered(await extractPeriodStartMonth(set, product), lines);
+    product === "taxi"
+      ? await taxiAccountingPeriodFromSheet(set)
+      : (product === "se" && (await seAccountingPeriodFromSheet(set))) || periodCovered(await extractPeriodStartMonth(set, product), lines);
   const book = {
     documentInfo: {
       entriesType: "journal",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diy-accounting-uk/diya-gl",
-  "version": "1.2.47",
+  "version": "1.2.49",
   "type": "module",
   "description": "Recalculate, read and write DIYA-GL books from the command line",
   "license": "Apache-2.0",