npm - canada-api - Versions diffs - 5.1.4 → 5.1.6 - Mend

canada-api 5.1.4 → 5.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md CHANGED Viewed

@@ -1,277 +1,277 @@
-([Français](#canada-api-1))
-# canada-api
-[![NPM Version](https://img.shields.io/npm/v/canada-api?branch=main)](https://www.npmjs.com/package/canada-api) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/dnd-mdn/canada-api/blob/main/LICENSE.md)
-Cross platform API for fetching public data from [canada.ca](https://www.canada.ca).
-## Browser
-```html
-<script src="https://cdn.jsdelivr.net/npm/canada-api@5.1.4"></script>
-```
-## Node 18+
-### Install
-```shell
-npm install canada-api
-```
-### Usage
-```js
-import ca from 'canada-api'
-```
-## Testing
-```shell
-npm test
-```
-Tests use the built-in Node.js test runner (`node:test`) and require Node 18 or later.
-## API
-### `ca.normalize(url)`
-- `url` {string|URL} - Full URL or relative path (e.g. `'/en/page'` or `'https://www.canada.ca/en/page'`)
-- Returns: {URL} Normalized URL object with cleaned pathname
-Validates and normalizes a canada.ca URL. Strips the `/content/canadasite` prefix, file extensions, and trailing slashes.
-Throws {TypeError} if `url` is not a string or URL object.
-Throws {Error} if the URL is not on canada.ca or the path does not start with `/en/` or `/fr/`.
-### `ca.children(url)`
-- `url` {string|URL} - Absolute or relative URL
-- Returns: {Promise} Fulfills with a response whose `data` is an array of sitemap entries
-Fetches and parses the sitemap for the given page, returning its child pages. Entries without a `<loc>` element are skipped.
-```json
-{
-  "data": [
-    {
-      "path": "/en/department-national-defence/maple-leaf",
-      "lastmod": "2022-09-20T00:00:00.000Z"
-    }
-  ],
-  "status": 200,
-  "statusText": "OK",
-  "headers": {
-    "content-type": "text/xml"
-  }
-}
-```
-### `ca.content(url)`
-- `url` {string|URL} - Absolute or relative URL
-- Returns: {Promise} Fulfills with a response whose `data` is the raw HTML string
-Retrieves the HTML content of the page.
-```json
-{
-  "data": "<!DOCTYPE html>...",
-  "status": 200,
-  "statusText": "OK",
-  "headers": {
-    "content-type": "text/html"
-  }
-}
-```
-### `ca.meta(url)`
-- `url` {string|URL} - Absolute or relative URL
-- Returns: {Promise} Fulfills with a response whose `data` is a formatted metadata object
-Fetches JCR metadata for the given page. The following transformations are applied:
-- String `"true"` / `"false"` values are converted to booleans
-- `@TypeHint` properties are removed
-- Empty arrays are removed
-- Date strings are converted to ISO 8601
-- Keys are sorted alphabetically
-- A normalized `peer` field is added when `gcAltLanguagePeer` is present
-```json
-{
-  "data": {
-    "cq:lastModified": "2022-10-25T19:16:28.000Z",
-    "fluidWidth": false,
-    "peer": "/fr/ministere-defense-nationale/feuille-erable"
-  },
-  "status": 200,
-  "statusText": "OK",
-  "headers": {
-    "content-type": "application/json"
-  }
-}
-```
-### `ca.request`
-- `url` {string|URL} - Absolute or relative URL
-- `options` {RequestInit} - Optional fetch options
-- Returns: {Promise} Fulfills with a response object
-Raw HTTP client with `https://www.canada.ca` as the base URL. Use this for any requests not covered by the methods above. No URL transformation is applied. Response bodies with a `application/json` content type are automatically parsed.
-```js
-const response = await ca.request('/en/department-national-defence.html');
-```
-All methods return the same response shape:
-```json
-{
-  "data": "...",
-  "status": 200,
-  "statusText": "OK",
-  "headers": {
-    "content-type": "text/html"
-  }
-}
-```
----
-# canada-api
-[![NPM Version](https://img.shields.io/npm/v/canada-api?branch=main)](https://www.npmjs.com/package/canada-api) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/dnd-mdn/canada-api/blob/main/LICENSE.md)
-API multiplateforme pour récupérer des données publiques de [canada.ca](https://www.canada.ca).
-## Navigateur
-```html
-<script src="https://cdn.jsdelivr.net/npm/canada-api@5.1.4"></script>
-```
-## Node 18+
-### Installation
-```shell
-npm install canada-api
-```
-### Utilisation
-```js
-import ca from 'canada-api'
-```
-## API
-### `ca.normalize(url)`
-- `url` {string|URL} - URL complète ou chemin relatif (p. ex. `'/fr/page'` ou `'https://www.canada.ca/fr/page'`)
-- Retourne: {URL} Objet URL normalisé avec un chemin nettoyé
-Valide et normalise une URL de canada.ca. Supprime le préfixe `/content/canadasite`, les extensions de fichier et les barres obliques finales.
-Lève {TypeError} si `url` n'est pas une chaîne ou un objet URL.
-Lève {Error} si l'URL n'est pas sur canada.ca ou si le chemin ne commence pas par `/en/` ou `/fr/`.
-### `ca.children(url)`
-- `url` {string|URL} - URL absolue ou relative
-- Retourne: {Promise} Résout avec une réponse dont `data` est un tableau d'entrées du plan de site
-Récupère et analyse le plan de site de la page donnée, retournant ses pages enfants. Les entrées sans élément `<loc>` sont ignorées.
-```json
-{
-  "data": [
-    {
-      "path": "/fr/ministere-defense-nationale/feuille-erable",
-      "lastmod": "2022-09-20T00:00:00.000Z"
-    }
-  ],
-  "status": 200,
-  "statusText": "OK",
-  "headers": {
-    "content-type": "text/xml"
-  }
-}
-```
-### `ca.content(url)`
-- `url` {string|URL} - URL absolue ou relative
-- Retourne: {Promise} Résout avec une réponse dont `data` est la chaîne HTML brute
-Récupère le contenu HTML de la page.
-```json
-{
-  "data": "<!DOCTYPE html>...",
-  "status": 200,
-  "statusText": "OK",
-  "headers": {
-    "content-type": "text/html"
-  }
-}
-```
-### `ca.meta(url)`
-- `url` {string|URL} - URL absolue ou relative
-- Retourne: {Promise} Résout avec une réponse dont `data` est un objet de métadonnées formaté
-Récupère les métadonnées JCR de la page donnée. Les transformations suivantes sont appliquées :
-- Les valeurs `"true"` / `"false"` sont converties en booléens
-- Les propriétés `@TypeHint` sont supprimées
-- Les tableaux vides sont supprimés
-- Les chaînes de date sont converties en ISO 8601
-- Les clés sont triées alphabétiquement
-- Un champ `peer` normalisé est ajouté lorsque `gcAltLanguagePeer` est présent
-```json
-{
-  "data": {
-    "cq:lastModified": "2022-10-25T19:16:28.000Z",
-    "fluidWidth": false,
-    "peer": "/en/department-national-defence/maple-leaf"
-  },
-  "status": 200,
-  "statusText": "OK",
-  "headers": {
-    "content-type": "application/json"
-  }
-}
-```
-### `ca.request`
-- `url` {string|URL} - URL absolue ou relative
-- `options` {RequestInit} - Options fetch optionnelles
-- Retourne: {Promise} Résout avec un objet réponse
-Client HTTP brut avec `https://www.canada.ca` comme URL de base. Utilisez-le pour toute requête non couverte par les méthodes ci-dessus. Aucune transformation d'URL n'est appliquée. Les corps de réponse avec un type de contenu `application/json` sont automatiquement analysés.
-```js
-const response = await ca.request('/fr/ministere-defense-nationale.html');
-```
-Toutes les méthodes retournent la même structure de réponse :
-```json
-{
-  "data": "...",
-  "status": 200,
-  "statusText": "OK",
-  "headers": {
-    "content-type": "text/html"
-  }
-}
-```
+([Français](#canada-api-1))
+# canada-api
+[![NPM Version](https://img.shields.io/npm/v/canada-api?branch=main)](https://www.npmjs.com/package/canada-api) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/dnd-mdn/canada-api/blob/main/LICENSE.md)
+Cross platform API for fetching public data from [canada.ca](https://www.canada.ca).
+## Browser
+```html
+<script src="https://cdn.jsdelivr.net/npm/canada-api@5.1.6"></script>
+```
+## Node 18+
+### Install
+```shell
+npm install canada-api
+```
+### Usage
+```js
+import ca from 'canada-api'
+```
+## Testing
+```shell
+npm test
+```
+Tests use the built-in Node.js test runner (`node:test`) and require Node 18 or later.
+## API
+### `ca.normalize(url)`
+- `url` {string|URL} - Full URL or relative path (e.g. `'/en/page'` or `'https://www.canada.ca/en/page'`)
+- Returns: {URL} Normalized URL object with cleaned pathname
+Validates and normalizes a canada.ca URL. Strips the `/content/canadasite` prefix, file extensions, and trailing slashes.
+Throws {TypeError} if `url` is not a string or URL object.
+Throws {Error} if the URL is not on canada.ca or the path does not start with `/en/` or `/fr/`.
+### `ca.children(url)`
+- `url` {string|URL} - Absolute or relative URL
+- Returns: {Promise} Fulfills with a response whose `data` is an array of sitemap entries
+Fetches and parses the sitemap for the given page, returning its child pages. Entries without a `<loc>` element are skipped.
+```json
+{
+  "data": [
+    {
+      "path": "/en/department-national-defence/maple-leaf",
+      "lastmod": "2022-09-20T00:00:00.000Z"
+    }
+  ],
+  "status": 200,
+  "statusText": "OK",
+  "headers": {
+    "content-type": "text/xml"
+  }
+}
+```
+### `ca.content(url)`
+- `url` {string|URL} - Absolute or relative URL
+- Returns: {Promise} Fulfills with a response whose `data` is the raw HTML string
+Retrieves the HTML content of the page.
+```json
+{
+  "data": "<!DOCTYPE html>...",
+  "status": 200,
+  "statusText": "OK",
+  "headers": {
+    "content-type": "text/html"
+  }
+}
+```
+### `ca.meta(url)`
+- `url` {string|URL} - Absolute or relative URL
+- Returns: {Promise} Fulfills with a response whose `data` is a formatted metadata object
+Fetches JCR metadata for the given page. The following transformations are applied:
+- String `"true"` / `"false"` values are converted to booleans
+- `@TypeHint` properties are removed
+- Empty arrays are removed
+- Date strings are converted to ISO 8601
+- Keys are sorted alphabetically
+- A normalized `peer` field is added when `gcAltLanguagePeer` is present
+```json
+{
+  "data": {
+    "cq:lastModified": "2022-10-25T19:16:28.000Z",
+    "fluidWidth": false,
+    "peer": "/fr/ministere-defense-nationale/feuille-erable"
+  },
+  "status": 200,
+  "statusText": "OK",
+  "headers": {
+    "content-type": "application/json"
+  }
+}
+```
+### `ca.request`
+- `url` {string|URL} - Absolute or relative URL
+- `options` {RequestInit} - Optional fetch options
+- Returns: {Promise} Fulfills with a response object
+Raw HTTP client with `https://www.canada.ca` as the base URL. Use this for any requests not covered by the methods above. No URL transformation is applied. Response bodies with a `application/json` content type are automatically parsed.
+```js
+const response = await ca.request('/en/department-national-defence.html');
+```
+All methods return the same response shape:
+```json
+{
+  "data": "...",
+  "status": 200,
+  "statusText": "OK",
+  "headers": {
+    "content-type": "text/html"
+  }
+}
+```
+---
+# canada-api
+[![NPM Version](https://img.shields.io/npm/v/canada-api?branch=main)](https://www.npmjs.com/package/canada-api) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/dnd-mdn/canada-api/blob/main/LICENSE.md)
+API multiplateforme pour récupérer des données publiques de [canada.ca](https://www.canada.ca).
+## Navigateur
+```html
+<script src="https://cdn.jsdelivr.net/npm/canada-api@5.1.6"></script>
+```
+## Node 18+
+### Installation
+```shell
+npm install canada-api
+```
+### Utilisation
+```js
+import ca from 'canada-api'
+```
+## API
+### `ca.normalize(url)`
+- `url` {string|URL} - URL complète ou chemin relatif (p. ex. `'/fr/page'` ou `'https://www.canada.ca/fr/page'`)
+- Retourne: {URL} Objet URL normalisé avec un chemin nettoyé
+Valide et normalise une URL de canada.ca. Supprime le préfixe `/content/canadasite`, les extensions de fichier et les barres obliques finales.
+Lève {TypeError} si `url` n'est pas une chaîne ou un objet URL.
+Lève {Error} si l'URL n'est pas sur canada.ca ou si le chemin ne commence pas par `/en/` ou `/fr/`.
+### `ca.children(url)`
+- `url` {string|URL} - URL absolue ou relative
+- Retourne: {Promise} Résout avec une réponse dont `data` est un tableau d'entrées du plan de site
+Récupère et analyse le plan de site de la page donnée, retournant ses pages enfants. Les entrées sans élément `<loc>` sont ignorées.
+```json
+{
+  "data": [
+    {
+      "path": "/fr/ministere-defense-nationale/feuille-erable",
+      "lastmod": "2022-09-20T00:00:00.000Z"
+    }
+  ],
+  "status": 200,
+  "statusText": "OK",
+  "headers": {
+    "content-type": "text/xml"
+  }
+}
+```
+### `ca.content(url)`
+- `url` {string|URL} - URL absolue ou relative
+- Retourne: {Promise} Résout avec une réponse dont `data` est la chaîne HTML brute
+Récupère le contenu HTML de la page.
+```json
+{
+  "data": "<!DOCTYPE html>...",
+  "status": 200,
+  "statusText": "OK",
+  "headers": {
+    "content-type": "text/html"
+  }
+}
+```
+### `ca.meta(url)`
+- `url` {string|URL} - URL absolue ou relative
+- Retourne: {Promise} Résout avec une réponse dont `data` est un objet de métadonnées formaté
+Récupère les métadonnées JCR de la page donnée. Les transformations suivantes sont appliquées :
+- Les valeurs `"true"` / `"false"` sont converties en booléens
+- Les propriétés `@TypeHint` sont supprimées
+- Les tableaux vides sont supprimés
+- Les chaînes de date sont converties en ISO 8601
+- Les clés sont triées alphabétiquement
+- Un champ `peer` normalisé est ajouté lorsque `gcAltLanguagePeer` est présent
+```json
+{
+  "data": {
+    "cq:lastModified": "2022-10-25T19:16:28.000Z",
+    "fluidWidth": false,
+    "peer": "/en/department-national-defence/maple-leaf"
+  },
+  "status": 200,
+  "statusText": "OK",
+  "headers": {
+    "content-type": "application/json"
+  }
+}
+```
+### `ca.request`
+- `url` {string|URL} - URL absolue ou relative
+- `options` {RequestInit} - Options fetch optionnelles
+- Retourne: {Promise} Résout avec un objet réponse
+Client HTTP brut avec `https://www.canada.ca` comme URL de base. Utilisez-le pour toute requête non couverte par les méthodes ci-dessus. Aucune transformation d'URL n'est appliquée. Les corps de réponse avec un type de contenu `application/json` sont automatiquement analysés.
+```js
+const response = await ca.request('/fr/ministere-defense-nationale.html');
+```
+Toutes les méthodes retournent la même structure de réponse :
+```json
+{
+  "data": "...",
+  "status": 200,
+  "statusText": "OK",
+  "headers": {
+    "content-type": "text/html"
+  }
+}
+```

package/dist/ca.js CHANGED Viewed

	@@ -1 +1 @@
1	- !function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define("ca",[],e):"object"==typeof exports?exports.ca=e():t.ca=e()}(Object("undefined"!=typeof self?self:this),()=>(()=>{"use strict";var t={d:(e,a)=>{for(var r in a)t.o(a,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:a[r]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>c});const a="https://www.canada.ca",r=t=>{if("string"==typeof t)t=new URL(t,a);else{if(!(t instanceof URL))throw new TypeError("string or URL object expected");t=new URL(t.href)}if(t.origin!==a)throw new Error("URL must start with "+a);if(t.pathname=t.pathname.replace(/^\/content\/canadasite/,""),t.pathname=t.pathname.replace(/\.[^/]$/,"").replace(/\/+$/,""),!t.pathname.startsWith("/en/")&&!t.pathname.startsWith("/fr/"))throw new Error(`Invalid path: "${t.pathname}" must start with /en/ or /fr/`);return t},n=async(t,e={})=>{~~const r~~=~~await fetch(~~new URL(t,a),{signal:AbortSignal.timeout(3e4),headers:{"User-Agent":"canada-api/5.1.4",Accept:"/",...e.~~headers},...~~e});if(!r.ok){const e=new Error(`${r.status} ${r.statusText}`);throw e.~~status=r.status,e.~~url=t.toString(),e}~~const~~ n=await r.text(),s=r.headers.get("content-type")?.includes("application/json");~~return~~{~~data:~~s?JSON.parse(n):n,status:r.status,statusText:r.statusText,headers:Object.fromEntries(r.headers)}},s={Jan:"01",Feb:"02",Mar:"03",Apr:"04",May:"05",Jun:"06",Jul:"07",Aug:"08",Sep:"09",Oct:"10",Nov:"11",Dec:"12"};function o(t){if(/^\d{4}-\d{2}-\d{2}$/.test(t))return new Date(t).toISOString();let e=/^\w{3} (\w{3}) (\d{2}) (\d{4}) ([\d:]{8}) GMT([\-+]\d{4})$/.exec(t);return e?new Date(`${e[3]}-${s[e[1]]}-${e[2]}T${e[4]}${e[5]}`).toISOString():t}const c={normalize:r,request:n,children:async t=>{const e=r(t);e.pathname+=".sitemap.xml"~~,e.searchParams.set("_",Date.now())~~;const a=await n(e,{redirect:"error"});return a.data=[...a.data.matchAll(/<url>([\s\S]?)<\/url>/g)].map(([,t])=>{const e=t.match(/<loc>([\s\S]?)<\/loc>/)?.[1],a=t.match(/<lastmod>([\s\S]?)<\/lastmod>/)?.[1];return{loc:e,lastmod:a}}).filter(t=>t.loc).map(t=>({path:r(t.loc).pathname,lastmod:t.lastmod?new Date(t.lastmod).toISOString():null})),a},content:async t=>{const e=r(t);return e.pathname+=".html",~~e.searchParams.set("_",Date.now()),~~n(e,{~~signal:AbortSignal.timeout(1e4),~~redirect:"error"})},meta:async t=>{const e=r(t);e.pathname+="/_jcr_content.json"~~,e.searchParams.set("_",Date.now())~~;const a=await n(e,{~~signal:AbortSignal.timeout(1e4),~~redirect:"error"});return a.data=(t=>{const e={};for(const[a,n]of Object.entries(t))a.endsWith("@TypeHint")\|\|Array.isArray(n)&&0===n.length\|\|("true"===n?e[a]=!0:"false"===n?e[a]=!1:"gcAltLanguagePeer"===a?(e[a]=n,e.peer=r(n).pathname):e[a]="string"==typeof n?o(n.trim()):n);return Object.keys(e).sort().reduce((t,a)=>(t[a]=e[a],t),{})})(a.data),a}};return e.default})());
1	+ !function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define("ca",[],e):"object"==typeof exports?exports.ca=e():t.ca=e()}(Object("undefined"!=typeof self?self:this),()=>(()=>{"use strict";var t={d:(e,r)=>{for(var a in r)t.o(r,a)&&!t.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:r[a]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>c});const r="https://www.canada.ca",a=t=>{if("string"==typeof t)t=new URL(t,r);else{if(!(t instanceof URL))throw new TypeError("string or URL object expected");t=new URL(t.href)}if(t.origin!==r)throw new Error("URL must start with "+r);if(t.pathname=t.pathname.replace(/^\/content\/canadasite/,""),t.pathname=t.pathname.replace(/\.[^/]$/,"").replace(/\/+$/,""),!t.pathname.startsWith("/en/")&&!t.pathname.startsWith("/fr/"))throw new Error(`Invalid path: "${t.pathname}" must start with /en/ or /fr/`);return t},n=async(t,e={})=>{(t=new URL(t,r)).searchParams.set("_",Date.now());const{headers:a={},...n}=e;let o;try{o=await fetch(t,{signal:AbortSignal.timeout(3e4),...n,headers:{"User-Agent":"canada-api/5.1.6",Accept:"/",...a}})}catch(e){throw e.url=t.toString(),e}if(!o.ok){const e=new Error(`Request to ${t} failed: ${o.status} ${o.statusText}`);throw e.url=t.toString(),e}let s=await o.text();const c=o.headers.get("content-type")?.includes("application/json");if(c)try{s=JSON.parse(s)}catch(e){const r=new Error(`Failed to parse JSON response from ${t}: ${e.message}`);throw r.url=t.toString(),r}return{data:s,status:o.status,statusText:o.statusText,headers:Object.fromEntries(o.headers)}},o={Jan:"01",Feb:"02",Mar:"03",Apr:"04",May:"05",Jun:"06",Jul:"07",Aug:"08",Sep:"09",Oct:"10",Nov:"11",Dec:"12"};function s(t){if(/^\d{4}-\d{2}-\d{2}$/.test(t))return new Date(t).toISOString();let e=/^\w{3} (\w{3}) (\d{2}) (\d{4}) ([\d:]{8}) GMT([\-+]\d{4})$/.exec(t);return e?new Date(`${e[3]}-${o[e[1]]}-${e[2]}T${e[4]}${e[5]}`).toISOString():t}const c={normalize:a,request:n,children:async t=>{const e=a(t);e.pathname+=".sitemap.xml";const r=await n(e,{redirect:"error"});return r.data=[...r.data.matchAll(/<url>([\s\S]?)<\/url>/g)].map(([,t])=>{const e=t.match(/<loc>([\s\S]?)<\/loc>/)?.[1],r=t.match(/<lastmod>([\s\S]?)<\/lastmod>/)?.[1];return{loc:e,lastmod:r}}).filter(t=>t.loc).map(t=>({path:a(t.loc).pathname,lastmod:t.lastmod?new Date(t.lastmod).toISOString():null})),r},content:async t=>{const e=a(t);return e.pathname+=".html",n(e,{redirect:"error"})},meta:async t=>{const e=a(t);e.pathname+="/_jcr_content.json";const r=await n(e,{redirect:"error"});return r.data=(t=>{const e={};for(const[r,n]of Object.entries(t))r.endsWith("@TypeHint")\|\|Array.isArray(n)&&0===n.length\|\|("true"===n?e[r]=!0:"false"===n?e[r]=!1:"gcAltLanguagePeer"===r?(e[r]=n,e.peer=a(n).pathname):e[r]="string"==typeof n?s(n.trim()):n);return Object.keys(e).sort().reduce((t,r)=>(t[r]=e[r],t),{})})(r.data),r}};return e.default})());

package/package.json CHANGED Viewed

@@ -1,44 +1,44 @@
-{
-	"name": "canada-api",
-	"version": "5.1.4",
-	"description": "Cross platform API to fetch data from canada.ca",
-	"type": "module",
-	"main": "src/index.js",
-	"browser": "dist/ca.js",
-	"exports": {
-		".": {
-			"browser": "./dist/ca.js",
-			"default": "./src/index.js"
-		}
-	},
-	"files": [
-		"src",
-		"dist"
-	],
-	"scripts": {
-		"test": "node --test tests/*.test.js",
-		"test:integration": "node --test tests/integration/*.js",
-		"build": "webpack",
-		"dev": "webpack --mode development"
-	},
-	"author": "National Defence",
-	"license": "MIT",
-	"engines": {
-		"node": ">=18"
-	},
-	"keywords": [
-		"canada",
-		"api",
-		"fetch"
-	],
-	"homepage": "https://github.com/dnd-mdn/canada-api#readme",
-	"bugs": "https://github.com/dnd-mdn/canada-api/issues",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/dnd-mdn/canada-api.git"
-	},
-	"devDependencies": {
-		"webpack": "^5.105.4",
-		"webpack-cli": "^7.0.2"
-	}
-}
+{
+	"name": "canada-api",
+	"version": "5.1.6",
+	"description": "Cross platform API to fetch data from canada.ca",
+	"type": "module",
+	"main": "src/index.js",
+	"browser": "dist/ca.js",
+	"exports": {
+		".": {
+			"browser": "./dist/ca.js",
+			"default": "./src/index.js"
+		}
+	},
+	"files": [
+		"src",
+		"dist"
+	],
+	"scripts": {
+		"test": "node --test tests/*.test.js",
+		"test:integration": "node --test tests/integration/*.js",
+		"build": "webpack",
+		"dev": "webpack --mode development"
+	},
+	"author": "National Defence",
+	"license": "MIT",
+	"engines": {
+		"node": ">=18"
+	},
+	"keywords": [
+		"canada",
+		"api",
+		"fetch"
+	],
+	"homepage": "https://github.com/dnd-mdn/canada-api#readme",
+	"bugs": "https://github.com/dnd-mdn/canada-api/issues",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/dnd-mdn/canada-api.git"
+	},
+	"devDependencies": {
+		"webpack": "^5.105.4",
+		"webpack-cli": "^7.0.2"
+	}
+}

package/src/children.js CHANGED Viewed

@@ -36,7 +36,6 @@ export const parseSitemap = (xml) => {
 const children = async (url) => {
     const target = normalize(url);
     target.pathname += '.sitemap.xml';
-    target.searchParams.set('_', Date.now());
     const response = await request(target, {
         redirect: 'error'

package/src/content.js CHANGED Viewed

@@ -10,10 +10,8 @@ import request from "./request.js";
 const content = async (url) => {
     const target = normalize(url);
     target.pathname += '.html';
-    target.searchParams.set('_', Date.now());
-    return request(target, {
-        signal: AbortSignal.timeout(10000),
+    return request(target, {
         redirect: 'error'
     });
 };

package/src/meta.js CHANGED Viewed

@@ -89,10 +89,8 @@ export const formatMeta = (data) => {
 const meta = async (url) => {
     const target = normalize(url);
     target.pathname += '/_jcr_content.json';
-    target.searchParams.set('_', Date.now());
     const response = await request(target, {
-        signal: AbortSignal.timeout(10000),
         redirect: 'error'
     });

package/src/request.js CHANGED Viewed

@@ -1,40 +1,62 @@
-import { BASE_URL } from "./config.js";
-/**
- * Raw HTTP client for canada.ca
- * @param {string|URL} url - Relative or absolute URL on canada.ca
- * @param {RequestInit} [options] - Fetch options
- * @returns {Promise<{data: string|object, status: number, statusText: string, headers: object}>}
- * @throws {Error} If the request fails or returns a non-2xx status
- */
-const request = async (url, options = {}) => {
-    const response = await fetch(new URL(url, BASE_URL), {
-        signal: AbortSignal.timeout(30000),
-        headers: {
-            'User-Agent': 'canada-api/5.1.4',
-            'Accept': '*/*',
-            ...options.headers
-        },
-        ...options
-    });
-    if (!response.ok) {
-        const error = new Error(`${response.status} ${response.statusText}`);
-        error.status = response.status;
-        error.url = url.toString();
-        throw error;
-    }
-    const text = await response.text();
-    const isJson = response.headers.get('content-type')?.includes('application/json');
-    const data = isJson ? JSON.parse(text) : text;
-    return {
-        data,
-        status: response.status,
-        statusText: response.statusText,
-        headers: Object.fromEntries(response.headers)
-    };
-};
+import { BASE_URL } from "./config.js";
+/** @type {number} Default request timeout in ms. Callers can override by passing a `signal` in options. */
+const DEFAULT_TIMEOUT = 30000;
+/**
+ * Raw HTTP client for canada.ca
+ * @param {string|URL} url - Relative or absolute URL on canada.ca
+ * @param {RequestInit} [options] - Fetch options
+ * @returns {Promise<{data: string|object, status: number, statusText: string, headers: object}>}
+ * @throws {Error} If the request fails or returns a non-2xx status
+ */
+const request = async (url, options = {}) => {
+    url = new URL(url, BASE_URL);
+    url.searchParams.set('_', Date.now());
+    const { headers: customHeaders = {}, ...requestOptions } = options;
+    let response;
+    try {
+        response = await fetch(url, {
+            signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+            ...requestOptions,
+            headers: {
+                'User-Agent': 'canada-api/5.1.6',
+                'Accept': '*/*',
+                ...customHeaders
+            }
+        });
+    } catch (e) {
+        e.url = url.toString();
+        throw e;
+    }
+    if (!response.ok) {
+        const error = new Error(`Request to ${url} failed: ${response.status} ${response.statusText}`);
+        error.url = url.toString();
+        throw error;
+    }
+    let data = await response.text();
+    const isJson = response.headers.get('content-type')?.includes('application/json');
+    if (isJson) {
+        try {
+            data = JSON.parse(data);
+        } catch (e) {
+            const error = new Error(`Failed to parse JSON response from ${url}: ${e.message}`);
+            error.url = url.toString();
+            throw error;
+        }
+    }
+    return {
+        data,
+        status: response.status,
+        statusText: response.statusText,
+        headers: Object.fromEntries(response.headers)
+    };
+};
 export default request;