@egen-civitas/esm-dynamic-loading 2.1.0 → 2.2.0

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
  # @egen-civitas/esm-dynamic-loading
2
2
 
3
+ ## 2.2.0
4
+
5
+ ### Minor Changes
6
+
7
+ - d9b2c40: L'import map accepte une table facultative `aliases` (`{ "<alias>": "<nom réel>" }`) : `importDynamic` retrouve alors un paquet par un nom alternatif (par exemple un espace de noms i18n différent du nom du paquet). Une clé présente dans `imports` prime toujours sur un alias, la lecture de l'import map reste incluse dans le délai maximal de chargement, et les import maps sans `aliases` se comportent comme avant.
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [d9b2c40]
12
+ - @egen-civitas/esm-globals@2.5.0
13
+
3
14
  ## 2.1.0
4
15
 
5
16
  ### Minor Changes
@@ -26,7 +26,7 @@ export declare function slugify(name: string): string;
26
26
  * script to load before the promise returned from this function will be rejected. Defaults to 600,000 milliseconds,
27
27
  * i.e., 10 minutes.
28
28
  */
29
- export declare function importDynamic<T = any>(jsPackage: string, share?: string, options?: {
29
+ export declare function importDynamic<T = any>(requestedPackage: string, share?: string, options?: {
30
30
  importMap?: ImportMap;
31
31
  maxLoadingTime?: number;
32
32
  }): Promise<T>;
@@ -1 +1 @@
1
- {"version":3,"file":"dynamic-loading.d.ts","sourceRoot":"","sources":["../src/dynamic-loading.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAI/E;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,UAEnC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,aAAa,CAAC,CAAC,GAAG,GAAG,EACzC,SAAS,EAAE,MAAM,EACjB,KAAK,GAAE,MAAkB,EACzB,OAAO,CAAC,EAAE;IACR,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACA,OAAO,CAAC,CAAC,CAAC,CAyCZ;AAuBD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS,oBAoD3E;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,uBAExC"}
1
+ {"version":3,"file":"dynamic-loading.d.ts","sourceRoot":"","sources":["../src/dynamic-loading.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAI/E;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,UAEnC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,aAAa,CAAC,CAAC,GAAG,GAAG,EACzC,gBAAgB,EAAE,MAAM,EACxB,KAAK,GAAE,MAAkB,EACzB,OAAO,CAAC,EAAE;IACR,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACA,OAAO,CAAC,CAAC,CAAC,CAyDZ;AAuBD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS,oBAoD3E;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,uBAExC"}
@@ -29,12 +29,27 @@ import { getCurrentPageMap, getImportMapOverrideMap, resetImportMapOverrides } f
29
29
  * @param options.maxLoadingTime A positive integer representing the maximum number of milliseconds to wait for the
30
30
  * script to load before the promise returned from this function will be rejected. Defaults to 600,000 milliseconds,
31
31
  * i.e., 10 minutes.
32
- */ export async function importDynamic(jsPackage, share = './start', options) {
32
+ */ export async function importDynamic(requestedPackage, share = './start', options) {
33
33
  // default to 10 minutes
34
34
  const maxLoadingTime = !options?.maxLoadingTime || options.maxLoadingTime <= 0 ? 600000 : options.maxLoadingTime;
35
+ // Alias de module (`importMap.aliases`) : permet de retrouver un paquet par un nom alternatif
36
+ // (ex. namespace i18n ≠ nom du paquet). Un nom présent dans `imports` n'est jamais remplacé.
37
+ // La résolution est incluse dans la course contre le délai maximal (la lecture de l'import map aussi).
38
+ let importMap = options?.importMap;
39
+ let jsPackage = requestedPackage;
40
+ const resolveAndPreload = async ()=>{
41
+ if (typeof requestedPackage === 'string' && requestedPackage.trim().length > 0 && !window[slugify(requestedPackage)]) {
42
+ importMap = importMap ?? await getCurrentImportMap();
43
+ const target = importMap.aliases?.[requestedPackage];
44
+ if (target && !Object.prototype.hasOwnProperty.call(importMap.imports, requestedPackage)) {
45
+ jsPackage = target;
46
+ }
47
+ }
48
+ await preloadImport(jsPackage, importMap);
49
+ };
35
50
  let timeout = undefined;
36
51
  await Promise.race([
37
- preloadImport(jsPackage, options?.importMap),
52
+ resolveAndPreload(),
38
53
  new Promise((_, reject)=>{
39
54
  timeout = setTimeout(()=>{
40
55
  reject(new Error(`Could not resolve requested script, ${jsPackage}, within ${humanReadableMs(maxLoadingTime)}.`));
@@ -1 +1 @@
1
- {"version":3,"file":"import-maps.d.ts","sourceRoot":"","sources":["../src/import-maps.ts"],"names":[],"mappings":"AAAA,mCAAmC;AACnC,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AA2E3E;;;GAGG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,SAAS,CAAC,CAO5D;AAED;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,SAAS,CAAC,CAEjE;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,SAAS,CAAC,CAMlE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAmB5E;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,EAAE,CAiBxD;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAKvE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAWpE;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAiB1D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAmB9C;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAgB1D;AAaD,wBAAgB,uBAAuB,SAatC"}
1
+ {"version":3,"file":"import-maps.d.ts","sourceRoot":"","sources":["../src/import-maps.ts"],"names":[],"mappings":"AAAA,mCAAmC;AACnC,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AA8E3E;;;GAGG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,SAAS,CAAC,CAO5D;AAED;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,SAAS,CAAC,CAEjE;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,SAAS,CAAC,CAMlE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAmB5E;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,EAAE,CAiBxD;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAKvE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAWpE;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAiB1D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAmB9C;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAgB1D;AAaD,wBAAgB,uBAAuB,SAatC"}
@@ -37,6 +37,9 @@ function mergeMaps(maps) {
37
37
  if (map?.imports) {
38
38
  Object.assign(merged.imports, map.imports);
39
39
  }
40
+ if (map?.aliases) {
41
+ merged.aliases = Object.assign(merged.aliases ?? {}, map.aliases);
42
+ }
40
43
  }
41
44
  return merged;
42
45
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@egen-civitas/esm-dynamic-loading",
3
- "version": "2.1.0",
3
+ "version": "2.2.0",
4
4
  "license": "MPL-2.0",
5
5
  "description": "Utilities for dynamically loading code in Egen",
6
6
  "type": "module",
@@ -56,11 +56,11 @@
56
56
  "access": "public"
57
57
  },
58
58
  "peerDependencies": {
59
- "@egen-civitas/esm-globals": "^2.1.0",
59
+ "@egen-civitas/esm-globals": "^2.5.0",
60
60
  "@egen-civitas/esm-translations": "^1.0.4"
61
61
  },
62
62
  "devDependencies": {
63
- "@egen-civitas/esm-globals": "^2.1.0",
63
+ "@egen-civitas/esm-globals": "^2.5.0",
64
64
  "@egen-civitas/esm-translations": "^1.0.4",
65
65
  "@swc/cli": "0.8.1",
66
66
  "@swc/core": "1.15.21",
@@ -70,6 +70,7 @@
70
70
  "jsdom": "^29.0.2",
71
71
  "rimraf": "^6.1.3",
72
72
  "single-spa": "^6.0.3",
73
+ "typescript": "^5.8.3",
73
74
  "vitest": "^4.1.2",
74
75
  "vitest-fetch-mock": "^0.4.5"
75
76
  }