npm - @venizia/ardor-kernel - Versions diffs - 0.1.2-1 → 0.1.2-3 - Mend

@venizia/ardor-kernel 0.1.2-1 → 0.1.2-3

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 (12) hide show

package/dist/base/applications/abstract.d.ts.map +1 -1
package/dist/base/applications/abstract.js +23 -5
package/dist/base/applications/abstract.js.map +1 -1
package/dist/base/metadata/index.d.ts +1 -1
package/dist/base/metadata/index.d.ts.map +1 -1
package/dist/base/metadata/index.js +1 -1
package/dist/base/metadata/index.js.map +1 -1
package/dist/base/services/network-request.d.ts +22 -8
package/dist/base/services/network-request.d.ts.map +1 -1
package/dist/base/services/network-request.js +44 -21
package/dist/base/services/network-request.js.map +1 -1
package/package.json +12 -12

package/dist/base/applications/abstract.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"abstract.d.ts","sourceRoot":"","sources":["../../../src/base/applications/abstract.ts"],"names":[],"mappings":"~~AACA~~,OAAO,EACL,KAAK,OAAO,~~EAGZ~~,SAAS,EAET,KAAK,aAAa,EAClB,KAAK,MAAM,EACZ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACpB,MAAM,UAAU,CAAC;AAElB,kGAAkG;AAClG,MAAM,WAAW,qBAAqB;IACpC,gEAAgE;IAChE,OAAO,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,kEAAkE;IAClE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,8BAAsB,wBAAyB,SAAQ,SAAU,YAAW,iBAAiB;IAC3F,QAAQ,CAAC,WAAW,IAAI,cAAc,CAAC,IAAI,CAAC;IAC5C,QAAQ,CAAC,UAAU,IAAI,cAAc,CAAC,gBAAgB,CAAC;IAEvD,YAAY,IAAI,cAAc,CAAC,IAAI,CAAC;IAepC;;;;;OAKG;IACH,iBAAiB,IAAI,IAAI;~~IAwBzB~~,oEAAoE;IACpE,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAI9C,aAAa,IAAI,cAAc,CAAC,IAAI,CAAC;IAErC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,CAAC;IASvE,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,CAAC;IAS1E,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,CAAC;IAS1E,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,CAAC;IASzE,sFAAsF;IACtF,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC;IAS7D,KAAK;IAKX,oGAAoG;IACpG,OAAO,CAAC,gBAAgB;~~CAwBzB~~;AAED,8BAAsB,oBAAqB,SAAQ,wBAAwB;CAAG"}
1	+ {"version":3,"file":"abstract.d.ts","sourceRoot":"","sources":["../../../src/base/applications/abstract.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,OAAO,EAEZ,SAAS,EAET,KAAK,aAAa,EAClB,KAAK,MAAM,EACZ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACpB,MAAM,UAAU,CAAC;AAElB,kGAAkG;AAClG,MAAM,WAAW,qBAAqB;IACpC,gEAAgE;IAChE,OAAO,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,kEAAkE;IAClE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,8BAAsB,wBAAyB,SAAQ,SAAU,YAAW,iBAAiB;IAC3F,QAAQ,CAAC,WAAW,IAAI,cAAc,CAAC,IAAI,CAAC;IAC5C,QAAQ,CAAC,UAAU,IAAI,cAAc,CAAC,gBAAgB,CAAC;IAEvD,YAAY,IAAI,cAAc,CAAC,IAAI,CAAC;IAepC;;;;;OAKG;IACH,iBAAiB,IAAI,IAAI;IAwCzB,oEAAoE;IACpE,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAI9C,aAAa,IAAI,cAAc,CAAC,IAAI,CAAC;IAErC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,CAAC;IASvE,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,CAAC;IAS1E,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,CAAC;IAS1E,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,CAAC,CAAC;IASzE,sFAAsF;IACtF,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC;IAS7D,KAAK;IAKX,oGAAoG;IACpG,OAAO,CAAC,gBAAgB;CA0BzB;AAED,8BAAsB,oBAAqB,SAAQ,wBAAwB;CAAG"}

package/dist/base/applications/abstract.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { BindingNamespaces, MetadataRegistry } from '@venizia/ignis-kernel/metadata';
-import { BindingKeys, BindingScopes, Container, getError, } from '@venizia/ignis-inversion';
+import { ArtifactBindingKeys, ArtifactNamespaces, BindingNamespaces, MetadataRegistry, } from '@venizia/ignis-kernel/metadata';
+import { BindingScopes, Container, getError, } from '@venizia/ignis-inversion';
 import { CoreBindings, } from '../../common/index.js';
 /**
  * Two ways to register, as in IGNIS: stereotype discovery, or `service()`/`repository()`/
@@ -26,7 +26,21 @@ export class AbstractArdorApplication extends Container {
      */
     registerArtifacts() {
         const registry = MetadataRegistry.getInstance();
-        for (const target of registry.getDiscoveredArtifacts()) {
+        const targets = registry.getDiscoveredArtifacts();
+        // Two classes a minifier named alike derive one key, and the second would silently replace the
+        // first. Checked here, never at decoration, so a hot reload that re-decorates a class is no error.
+        ArtifactBindingKeys.assertNoDerivedCollision({
+            caller: 'registerArtifacts',
+            entries: targets.flatMap((target) => {
+                const metadata = registry.getArtifactMetadata({ target });
+                if (!metadata) {
+                    return [];
+                }
+                const namespace = ArtifactNamespaces.resolve({ type: metadata.type });
+                return [{ target: target, namespace, binding: metadata.binding }];
+            }),
+        });
+        for (const target of targets) {
             const key = this.getMetadataRegistry().getBindingKey({ target });
             if (!key) {
                 continue;
@@ -83,7 +97,7 @@ export class AbstractArdorApplication extends Container {
     }
     /** `<scope>.<ClassName>`, singleton, with tags. Prefer the per-kind methods above. */
     injectable(scope, value, tags) {
-        const key = `${scope}.${value.name}`;
+        const { key } = ArtifactBindingKeys.resolve({ target: value, namespace: scope });
         this.getMetadataRegistry().setBindingKey({ target: value, key });
         this.bind({ key })
             .toClass(value)
@@ -98,7 +112,11 @@ export class AbstractArdorApplication extends Container {
     registerArtifact(opts) {
         const { target, namespace, caller } = opts;
         const declared = MetadataRegistry.getInstance().getArtifactMetadata({ target });
-        const key = BindingKeys.build(opts.opts?.binding ?? declared?.binding ?? { namespace, key: target.name });
+        const { key } = ArtifactBindingKeys.resolve({
+            target,
+            namespace,
+            binding: opts.opts?.binding ?? declared?.binding,
+        });
         const allowOverride = opts.opts?.allowOverride ?? declared?.allowOverride ?? true;
         if (!allowOverride && this.isBound({ key })) {
             throw getError({

package/dist/base/applications/abstract.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../src/base/applications/abstract.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAAE~~,iBAAiB,~~EAAE~~,gBAAgB,~~EAAE~~,MAAM,gCAAgC,CAAC;~~AACrF~~,OAAO,EAEL,~~WAAW,EACX,~~aAAa,EACb,SAAS,EACT,QAAQ,GAGT,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,YAAY,GAIb,MAAM,UAAU,CAAC;AAWlB;;;;GAIG;AACH,MAAM,OAAgB,wBAAyB,SAAQ,SAAS;IAI9D,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAE7E,6FAA6F;QAC7F,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,mBAAmB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACH,iBAAiB;QACf,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,EAAE,CAAC;~~QAEhD~~,~~KAAK~~,MAAM,MAAM,IAAI,QAAQ,CAAC,~~sBAAsB~~,EAAE,EAAE,CAAC;~~YACvD~~,MAAM,GAAG,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACjE,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,SAAS;YACX,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;iBACf,OAAO,CAAC,MAAyB,CAAC;iBAClC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC;YAExF,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;gBAC5D,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;qBAC1B,UAAU,CAAC,CAAC,SAAS,EAAE,EAAE;oBACxB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAyC,EAAE,GAAG,EAAE,CAAC,CAAC;oBAChF,OAAO,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtC,CAAC,CAAC;qBACD,QAAQ,CAAC,KAAK,CAAC,KAAK,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;IACH,CAAC;IAED,oEAAoE;IACpE,WAAW;QACT,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,aAAa,KAA0B,CAAC;IAExC,OAAO,CAAI,MAAiB,EAAE,IAA4B;QACxD,OAAO,IAAI,CAAC,gBAAgB,CAAC;YAC3B,MAAM;YACN,SAAS,EAAE,iBAAiB,CAAC,OAAO;YACpC,MAAM,EAAE,SAAS;YACjB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAI,MAAiB,EAAE,IAA4B;QAC3D,OAAO,IAAI,CAAC,gBAAgB,CAAC;YAC3B,MAAM;YACN,SAAS,EAAE,iBAAiB,CAAC,UAAU;YACvC,MAAM,EAAE,YAAY;YACpB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAI,MAAiB,EAAE,IAA4B;QAC3D,OAAO,IAAI,CAAC,gBAAgB,CAAC;YAC3B,MAAM;YACN,SAAS,EAAE,iBAAiB,CAAC,UAAU;YACvC,MAAM,EAAE,YAAY;YACpB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAI,MAAiB,EAAE,IAA4B;QAC1D,OAAO,IAAI,CAAC,gBAAgB,CAAC;YAC3B,MAAM;YACN,SAAS,EAAE,iBAAiB,CAAC,SAAS;YACtC,MAAM,EAAE,WAAW;YACnB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,sFAAsF;IACtF,UAAU,CAAI,KAAa,EAAE,KAAgB,EAAE,IAAoB;QACjE,MAAM,~~GAAG~~,GAAG,GAAG,~~KAAK~~,~~IAAI~~,~~KAAK~~,CAAC,~~IAAI~~,EAAE,CAAC;~~QACrC~~,IAAI,CAAC,mBAAmB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;aACf,OAAO,CAAC,KAAK,CAAC;aACd,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC;aACjC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAC7B,CAAC;IAED,oGAAoG;IAC5F,gBAAgB,CAAI,IAK3B;QACC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAC3C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,EAAE,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAChF,MAAM,GAAG,GAAG,~~WAAW~~,CAAC,~~KAAK~~,~~CAC3B~~,IAAI,CAAC,IAAI,EAAE,OAAO,IAAI,QAAQ,EAAE,OAAO,~~IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,~~CAAC,~~IAAI,EAAE,CAC3E,~~CAAC;~~QAEF~~,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,aAAa,IAAI,QAAQ,EAAE,aAAa,IAAI,IAAI,CAAC;QAClF,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;YAC5C,MAAM,QAAQ,CAAC;gBACb,OAAO,EAAE,IAAI,MAAM,MAAM,GAAG,6EAA6E;aAC1G,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,IAAI,CAAI,EAAE,GAAG,EAAE,CAAC;aACzB,OAAO,CAAC,MAAM,CAAC;aACf,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,QAAQ,EAAE,KAAK,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC;IAC9E,CAAC;CACF;AAED,MAAM,OAAgB,oBAAqB,SAAQ,wBAAwB;CAAG"}
1	+ {"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../src/base/applications/abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAEL,aAAa,EACb,SAAS,EACT,QAAQ,GAGT,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,YAAY,GAIb,MAAM,UAAU,CAAC;AAWlB;;;;GAIG;AACH,MAAM,OAAgB,wBAAyB,SAAQ,SAAS;IAI9D,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAE7E,6FAA6F;QAC7F,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,mBAAmB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACH,iBAAiB;QACf,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAElD,+FAA+F;QAC/F,mGAAmG;QACnG,mBAAmB,CAAC,wBAAwB,CAAC;YAC3C,MAAM,EAAE,mBAAmB;YAC3B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAClC,MAAM,QAAQ,GAAG,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC1D,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAyB,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;YACvF,CAAC,CAAC;SACH,CAAC,CAAC;QAEH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACjE,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,SAAS;YACX,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;iBACf,OAAO,CAAC,MAAyB,CAAC;iBAClC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC;YAExF,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;gBAC5D,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;qBAC1B,UAAU,CAAC,CAAC,SAAS,EAAE,EAAE;oBACxB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAyC,EAAE,GAAG,EAAE,CAAC,CAAC;oBAChF,OAAO,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtC,CAAC,CAAC;qBACD,QAAQ,CAAC,KAAK,CAAC,KAAK,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;IACH,CAAC;IAED,oEAAoE;IACpE,WAAW;QACT,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,aAAa,KAA0B,CAAC;IAExC,OAAO,CAAI,MAAiB,EAAE,IAA4B;QACxD,OAAO,IAAI,CAAC,gBAAgB,CAAC;YAC3B,MAAM;YACN,SAAS,EAAE,iBAAiB,CAAC,OAAO;YACpC,MAAM,EAAE,SAAS;YACjB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAI,MAAiB,EAAE,IAA4B;QAC3D,OAAO,IAAI,CAAC,gBAAgB,CAAC;YAC3B,MAAM;YACN,SAAS,EAAE,iBAAiB,CAAC,UAAU;YACvC,MAAM,EAAE,YAAY;YACpB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAI,MAAiB,EAAE,IAA4B;QAC3D,OAAO,IAAI,CAAC,gBAAgB,CAAC;YAC3B,MAAM;YACN,SAAS,EAAE,iBAAiB,CAAC,UAAU;YACvC,MAAM,EAAE,YAAY;YACpB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAI,MAAiB,EAAE,IAA4B;QAC1D,OAAO,IAAI,CAAC,gBAAgB,CAAC;YAC3B,MAAM;YACN,SAAS,EAAE,iBAAiB,CAAC,SAAS;YACtC,MAAM,EAAE,WAAW;YACnB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,sFAAsF;IACtF,UAAU,CAAI,KAAa,EAAE,KAAgB,EAAE,IAAoB;QACjE,MAAM,EAAE,GAAG,EAAE,GAAG,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,mBAAmB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;aACf,OAAO,CAAC,KAAK,CAAC;aACd,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC;aACjC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAC7B,CAAC;IAED,oGAAoG;IAC5F,gBAAgB,CAAI,IAK3B;QACC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAC3C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,EAAE,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAChF,MAAM,EAAE,GAAG,EAAE,GAAG,mBAAmB,CAAC,OAAO,CAAC;YAC1C,MAAM;YACN,SAAS;YACT,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,IAAI,QAAQ,EAAE,OAAO;SACjD,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,aAAa,IAAI,QAAQ,EAAE,aAAa,IAAI,IAAI,CAAC;QAClF,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;YAC5C,MAAM,QAAQ,CAAC;gBACb,OAAO,EAAE,IAAI,MAAM,MAAM,GAAG,6EAA6E;aAC1G,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,IAAI,CAAI,EAAE,GAAG,EAAE,CAAC;aACzB,OAAO,CAAC,MAAM,CAAC;aACf,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,QAAQ,EAAE,KAAK,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC;IAC9E,CAAC;CACF;AAED,MAAM,OAAgB,oBAAqB,SAAQ,wBAAwB;CAAG"}

package/dist/base/metadata/index.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@
  * `CoreBindings` is deliberately absent: IGNIS's disagrees with ARDOR's on `APPLICATION_INSTANCE`.
  */
 export { component, configuration, datasource, inject, injectable, model, provide, repository, service, } from '@venizia/ignis-kernel/metadata';
-export { ArtifactNamespaces, ArtifactTypes, BindingKeys, BindingNamespaces, } from '@venizia/ignis-kernel/metadata';
+export { ArtifactBindingKeys, ArtifactNamespaces, ArtifactTypes, BindingKeys, BindingNamespaces, } from '@venizia/ignis-kernel/metadata';
 export type { IArtifactMetadata, IArtifactRegistrationOptions, TBindingNamespace, TBindingScope, } from '@venizia/ignis-kernel/metadata';
 export { RepositoryTypes } from '@venizia/ignis-kernel/repository';
 export type { TRepositoryType } from '@venizia/ignis-kernel/repository';

package/dist/base/metadata/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/base/metadata/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,SAAS,EACT,aAAa,EACb,UAAU,EACV,MAAM,EACN,UAAU,EACV,KAAK,EACL,OAAO,EACP,UAAU,EACV,OAAO,GACR,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AAExC,YAAY,EACV,iBAAiB,EACjB,4BAA4B,EAC5B,iBAAiB,EACjB,aAAa,GACd,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,YAAY,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/base/metadata/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,SAAS,EACT,aAAa,EACb,UAAU,EACV,MAAM,EACN,UAAU,EACV,KAAK,EACL,OAAO,EACP,UAAU,EACV,OAAO,GACR,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AAExC,YAAY,EACV,iBAAiB,EACjB,4BAA4B,EAC5B,iBAAiB,EACjB,aAAa,GACd,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,YAAY,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC"}

package/dist/base/metadata/index.js CHANGED Viewed

@@ -3,7 +3,7 @@
  * `CoreBindings` is deliberately absent: IGNIS's disagrees with ARDOR's on `APPLICATION_INSTANCE`.
  */
 export { component, configuration, datasource, inject, injectable, model, provide, repository, service, } from '@venizia/ignis-kernel/metadata';
-export { ArtifactNamespaces, ArtifactTypes, BindingKeys, BindingNamespaces, } from '@venizia/ignis-kernel/metadata';
+export { ArtifactBindingKeys, ArtifactNamespaces, ArtifactTypes, BindingKeys, BindingNamespaces, } from '@venizia/ignis-kernel/metadata';
 // The `type` of `@repository`: `REMOTE` for an `HttpRepository`, which has no model.
 export { RepositoryTypes } from '@venizia/ignis-kernel/repository';
 //# sourceMappingURL=index.js.map

package/dist/base/metadata/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/base/metadata/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,SAAS,EACT,aAAa,EACb,UAAU,EACV,MAAM,EACN,UAAU,EACV,KAAK,EACL,OAAO,EACP,UAAU,EACV,OAAO,GACR,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AASxC,qFAAqF;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/base/metadata/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,SAAS,EACT,aAAa,EACb,UAAU,EACV,MAAM,EACN,UAAU,EACV,KAAK,EACL,OAAO,EACP,UAAU,EACV,OAAO,GACR,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACb,WAAW,EACX,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AASxC,qFAAqF;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC"}

package/dist/base/services/network-request.d.ts CHANGED Viewed

@@ -13,13 +13,20 @@ export type TAuthTokenResolver = () => IAuthTokenRecord | undefined;
  * `HttpDataSource`, so both transports send the same token.
  */
 export declare const readAuthTokenFromStorage: TAuthTokenResolver;
+/** What an `HttpDataSource` hook reads from the request it is asked about. */
+export interface IDataSourceRequestContext {
+    paths: Array<string>;
+}
 /**
- * The auth settings an `HttpDataSource` takes, bound to one `DefaultNetworkRequestService`, so a
- * repository and the data provider send the same token and share one refresh per 401 burst.
+ * The settings an `HttpDataSource` takes, bound to one `DefaultNetworkRequestService`, so a
+ * repository sends what the data provider sends: the same headers, the same token on the same
+ * paths, and one shared refresh per 401 burst. The hooks run on every send, the retry included.
  */
 export interface IDataSourceAuth {
-    authTokenResolver: TAuthTokenResolver;
-    onUnauthorized: () => Promise<boolean>;
+    authTokenResolver: (context: IDataSourceRequestContext) => IAuthTokenRecord | undefined;
+    headersResolver: (context: IDataSourceRequestContext) => Record<string, string>;
+    onUnauthorized: (context: IDataSourceRequestContext) => Promise<boolean>;
+    errorRootKey: string;
 }
 export declare class DefaultNetworkRequestService extends BaseService {
     protected authToken?: IAuthTokenRecord;
@@ -51,11 +58,14 @@ export declare class DefaultNetworkRequestService extends BaseService {
     /** The token this service sends: the one `setAuthToken` set, else the resolver's. */
     resolveAuthToken(): IAuthTokenRecord | undefined;
     /**
-     * Spread into an `HttpDataSource`'s settings. Its requests then carry this service's token, and
-     * its 401 joins this service's refresh: one `refreshToken` call for every 401 in flight on either
-     * transport, `onAuthFailure` on a failed one, and no retry when no `refreshToken` is configured.
+     * Spread into an `HttpDataSource`'s settings. Each of its requests then carries, as read at send
+     * time, the session headers (`setHeaders`) and the timezone; with the data provider's options,
+     * the request channel and tracing id too. A no-auth path gets no token and no refresh, as on the
+     * data provider. Any other 401 joins this service's refresh: one `refreshToken` call for every
+     * 401 in flight on either transport, `onAuthFailure` on a failed one, and no retry when no
+     * `refreshToken` is configured. The refresh is shared, so one call's abort never cancels it.
      */
-    getDataSourceAuth(): IDataSourceAuth;
+    getDataSourceAuth(opts?: Pick<IGetRequestPropsParams, 'restDataProviderOptions' | 'applicationInfo'>): IDataSourceAuth;
     getRequestAuthorizationHeader(): {
         provider: string | undefined;
         token: string;
@@ -68,6 +78,10 @@ export declare class DefaultNetworkRequestService extends BaseService {
     getAuthRecovery(): IAuthRecoveryOptions | undefined;
     setHeaders(headers: HeadersInit): void;
     removeHeaders(keys: string[]): void;
+    /** The timezone, then whatever `setHeaders` holds now. Both transports send these. */
+    protected getSessionHeaders(): Record<string, string>;
+    /** The request channel, `web` unless configured, and a fresh tracing id. */
+    protected getTracingHeaders(opts: Pick<IGetRequestPropsParams, 'restDataProviderOptions' | 'applicationInfo'>): Record<string, string>;
     getRequestHeader(opts: {
         resource: string;
     }): Record<string, string>;

package/dist/base/services/network-request.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"network-request.d.ts","sourceRoot":"","sources":["../../../src/base/services/network-request.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,OAAO,EAGZ,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EAInB,gBAAgB,EAGhB,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,YAAY,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAsIrC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,GAAG,MAAM,gBAAgB,GAAG,SAAS,CAAC;AAEpE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,kBAetC,CAAC;~~AAEF;;;GAGG~~;AACH,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,~~kBAAkB~~,CAAC;~~IACtC~~,~~cAAc~~,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;~~CACxC~~;AAED,qBAAa,4BAA6B,SAAQ,WAAW;IAC3D,SAAS,CAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IACvC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAChD,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IACtC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,SAAS,CAAC,cAAc,EAAE,uBAAuB,CAAC;IAClD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,YAAY,CAAC,EAAE,oBAAoB,CAAC;IAE9C,OAAO,CAAC,UAAU,CAAiC;gBAGjD,IAAI,EAAE,cAAc,GAAG;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,WAAW,CAAC;QACtB,YAAY,CAAC,EAAE,oBAAoB,CAAC;QACpC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;KACxC;IA2BH,YAAY,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,OAAO;IA+BpE,UAAU,CAAC,OAAO,EAAE,OAAO;IAI3B,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE;IAIrC,kBAAkB,CAAC,eAAe,CAAC,EAAE,gBAAgB;IAIrD,OAAO,CAAC,eAAe;IA4BvB,OAAO,CAAC,UAAU;IAiBlB,qFAAqF;IACrF,gBAAgB,IAAI,gBAAgB,GAAG,SAAS;IAIhD~~;;;;OAIG~~;IACH,iBAAiB,IAAI,eAAe;~~IAOpC~~,6BAA6B;;;;IAgB7B,YAAY,CAAC,IAAI,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAKnD,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,oBAAoB,CAAC;IAI3D,eAAe;IAIf,UAAU,CAAC,OAAO,EAAE,WAAW;IAI/B,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE;IAW5B,gBAAgB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;~~IAyBpE~~,eAAe,CAAC,MAAM,EAAE,sBAAsB;~~IA0F9C~~,eAAe,CAAC,KAAK,GAAG,OAAO,EAAE,IAAI,EAAE;QACrC,QAAQ,EAAE;YACR,IAAI,EAAE,KAAK,GAAG;gBAAE,IAAI,EAAE,KAAK,CAAC;gBAAC,KAAK,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;YAC9C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAClC,CAAC;QACF,IAAI,EAAE,MAAM,CAAC;QACb,gBAAgB,CAAC,EAAE,WAAW,CAAC,OAAO,gBAAgB,CAAC,CAAC;KACzD,GAAG;QACF,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB;YA0Da,aAAa;IA8CrB,SAAS,CAAC,UAAU,GAAG,OAAO,EAClC,IAAI,EAAE,sBAAsB,GAAG;QAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,IAAI,EAAE,YAAY,CAAC;QACnB,MAAM,EAAE,cAAc,CAAC;QACvB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,gBAAgB,CAAC,EAAE,WAAW,CAAC,OAAO,gBAAgB,CAAC,CAAC;KACzD,GACA,OAAO,CAAC;QACT,IAAI,EAAE,UAAU,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;CAyDH"}
1	+ {"version":3,"file":"network-request.d.ts","sourceRoot":"","sources":["../../../src/base/services/network-request.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,OAAO,EAGZ,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EAInB,gBAAgB,EAGhB,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,YAAY,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAsIrC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,GAAG,MAAM,gBAAgB,GAAG,SAAS,CAAC;AAEpE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,kBAetC,CAAC;AAKF,8EAA8E;AAC9E,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACtB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,CAAC,OAAO,EAAE,yBAAyB,KAAK,gBAAgB,GAAG,SAAS,CAAC;IACxF,eAAe,EAAE,CAAC,OAAO,EAAE,yBAAyB,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChF,cAAc,EAAE,CAAC,OAAO,EAAE,yBAAyB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,4BAA6B,SAAQ,WAAW;IAC3D,SAAS,CAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC;IACvC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAChD,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IACtC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,SAAS,CAAC,cAAc,EAAE,uBAAuB,CAAC;IAClD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,YAAY,CAAC,EAAE,oBAAoB,CAAC;IAE9C,OAAO,CAAC,UAAU,CAAiC;gBAGjD,IAAI,EAAE,cAAc,GAAG;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,WAAW,CAAC;QACtB,YAAY,CAAC,EAAE,oBAAoB,CAAC;QACpC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;KACxC;IA2BH,YAAY,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,OAAO;IA+BpE,UAAU,CAAC,OAAO,EAAE,OAAO;IAI3B,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE;IAIrC,kBAAkB,CAAC,eAAe,CAAC,EAAE,gBAAgB;IAIrD,OAAO,CAAC,eAAe;IA4BvB,OAAO,CAAC,UAAU;IAiBlB,qFAAqF;IACrF,gBAAgB,IAAI,gBAAgB,GAAG,SAAS;IAIhD;;;;;;;OAOG;IACH,iBAAiB,CACf,IAAI,CAAC,EAAE,IAAI,CAAC,sBAAsB,EAAE,yBAAyB,GAAG,iBAAiB,CAAC,GACjF,eAAe;IAiBlB,6BAA6B;;;;IAgB7B,YAAY,CAAC,IAAI,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAKnD,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,oBAAoB,CAAC;IAI3D,eAAe;IAIf,UAAU,CAAC,OAAO,EAAE,WAAW;IAI/B,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE;IAW5B,sFAAsF;IACtF,SAAS,CAAC,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAUrD,4EAA4E;IAC5E,SAAS,CAAC,iBAAiB,CACzB,IAAI,EAAE,IAAI,CAAC,sBAAsB,EAAE,yBAAyB,GAAG,iBAAiB,CAAC,GAChF,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAgBzB,gBAAgB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAmBpE,eAAe,CAAC,MAAM,EAAE,sBAAsB;IAkF9C,eAAe,CAAC,KAAK,GAAG,OAAO,EAAE,IAAI,EAAE;QACrC,QAAQ,EAAE;YACR,IAAI,EAAE,KAAK,GAAG;gBAAE,IAAI,EAAE,KAAK,CAAC;gBAAC,KAAK,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;YAC9C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAClC,CAAC;QACF,IAAI,EAAE,MAAM,CAAC;QACb,gBAAgB,CAAC,EAAE,WAAW,CAAC,OAAO,gBAAgB,CAAC,CAAC;KACzD,GAAG;QACF,IAAI,EAAE,KAAK,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB;YA0Da,aAAa;IA8CrB,SAAS,CAAC,UAAU,GAAG,OAAO,EAClC,IAAI,EAAE,sBAAsB,GAAG;QAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,IAAI,EAAE,YAAY,CAAC;QACnB,MAAM,EAAE,cAAc,CAAC;QACvB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,gBAAgB,CAAC,EAAE,WAAW,CAAC,OAAO,gBAAgB,CAAC,CAAC;KACzD,GACA,OAAO,CAAC;QACT,IAAI,EAAE,UAAU,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;CAyDH"}

package/dist/base/services/network-request.js CHANGED Viewed

@@ -130,6 +130,8 @@ export const readAuthTokenFromStorage = () => {
         return undefined;
     }
 };
+/** The server wraps an error body under this key; both transports unwrap it. */
+const ERROR_ROOT_KEY = 'error';
 export class DefaultNetworkRequestService extends BaseService {
     constructor(opts) {
         super({ scope: DefaultNetworkRequestService.name });
@@ -220,14 +222,27 @@ export class DefaultNetworkRequestService extends BaseService {
         return this.authToken ?? this.authTokenResolver();
     }
     /**
-     * Spread into an `HttpDataSource`'s settings. Its requests then carry this service's token, and
-     * its 401 joins this service's refresh: one `refreshToken` call for every 401 in flight on either
-     * transport, `onAuthFailure` on a failed one, and no retry when no `refreshToken` is configured.
+     * Spread into an `HttpDataSource`'s settings. Each of its requests then carries, as read at send
+     * time, the session headers (`setHeaders`) and the timezone; with the data provider's options,
+     * the request channel and tracing id too. A no-auth path gets no token and no refresh, as on the
+     * data provider. Any other 401 joins this service's refresh: one `refreshToken` call for every
+     * 401 in flight on either transport, `onAuthFailure` on a failed one, and no retry when no
+     * `refreshToken` is configured. The refresh is shared, so one call's abort never cancels it.
      */
-    getDataSourceAuth() {
+    getDataSourceAuth(opts) {
         return {
-            authTokenResolver: () => this.resolveAuthToken(),
-            onUnauthorized: () => this.ensureRefreshed(),
+            authTokenResolver: ({ paths }) => {
+                return this.isNoAuthPath({ resource: paths[0], paths })
+                    ? undefined
+                    : this.resolveAuthToken();
+            },
+            headersResolver: () => {
+                return mergeHeaders(this.getSessionHeaders(), opts ? this.getTracingHeaders(opts) : {});
+            },
+            onUnauthorized: ({ paths }) => {
+                return this.canRecover(paths) ? this.ensureRefreshed() : Promise.resolve(false);
+            },
+            errorRootKey: ERROR_ROOT_KEY,
         };
     }
     getRequestAuthorizationHeader() {
@@ -265,12 +280,30 @@ export class DefaultNetworkRequestService extends BaseService {
             delete this.headers[key.toLowerCase()];
         }
     }
-    getRequestHeader(opts) {
-        const { resource } = opts;
-        const defaultHeaders = mergeHeaders({
+    /** The timezone, then whatever `setHeaders` holds now. Both transports send these. */
+    getSessionHeaders() {
+        return mergeHeaders({
             [HeaderConsts.TIMEZONE]: App.TIMEZONE,
             [HeaderConsts.TIMEZONE_OFFSET]: `${App.TIMEZONE_OFFSET}`,
         }, this.headers);
+    }
+    /** The request channel, `web` unless configured, and a fresh tracing id. */
+    getTracingHeaders(opts) {
+        const { restDataProviderOptions, applicationInfo } = opts;
+        const requestTracingId = restDataProviderOptions.requestTracingId;
+        const channel = restDataProviderOptions.requestTracingChannel?.length
+            ? restDataProviderOptions.requestTracingChannel
+            : RequestChannel.WEB;
+        return {
+            [HeaderConsts.REQUEST_CHANNEL]: channel,
+            [HeaderConsts.REQUEST_TRACING_ID]: requestTracingId instanceof Function
+                ? requestTracingId({ applicationInfo })
+                : `${applicationInfo.name}_${uuidV4()}`,
+        };
+    }
+    getRequestHeader(opts) {
+        const { resource } = opts;
+        const defaultHeaders = this.getSessionHeaders();
         if (this.isNoAuthPath({ resource })) {
             return defaultHeaders;
         }
@@ -284,18 +317,8 @@ export class DefaultNetworkRequestService extends BaseService {
     }
     getRequestProps(params) {
         const { bodyType, body, resource, restDataProviderOptions, applicationInfo, requestCountData = RequestCountData.DATA_ONLY, } = params;
-        const requestTracingId = restDataProviderOptions.requestTracingId;
-        const channel = restDataProviderOptions.requestTracingChannel?.length
-            ? restDataProviderOptions.requestTracingChannel
-            : RequestChannel.WEB;
         // Merged, not spread, so a per-request value replaces a static header in any case.
-        const headers = mergeHeaders(this.getRequestHeader({ resource }), {
-            [HeaderConsts.REQUEST_CHANNEL]: channel,
-            [HeaderConsts.REQUEST_COUNT_DATA]: requestCountData,
-            [HeaderConsts.REQUEST_TRACING_ID]: requestTracingId instanceof Function
-                ? requestTracingId({ applicationInfo })
-                : `${applicationInfo.name}_${uuidV4()}`,
-        });
+        const headers = mergeHeaders(this.getRequestHeader({ resource }), this.getTracingHeaders({ restDataProviderOptions, applicationInfo }), { [HeaderConsts.REQUEST_COUNT_DATA]: requestCountData });
         const rs = { headers, body };
         switch (bodyType) {
             case RequestBodyTypes.FORM_URL_ENCODED: {
@@ -450,7 +473,7 @@ export class DefaultNetworkRequestService extends BaseService {
         const status = rs.status;
         if (status < 200 || status >= 300) {
             const jsonRs = await rs.json();
-            throw jsonRs?.error ?? jsonRs;
+            throw jsonRs?.[ERROR_ROOT_KEY] ?? jsonRs;
         }
         return this.parseResponse({ response: rs, type, requestCountData });
     }

package/dist/base/services/network-request.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"network-request.js","sourceRoot":"","sources":["../../../src/base/services/network-request.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"network-request.js","sourceRoot":"","sources":["../../../src/base/services/network-request.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@venizia/ardor-kernel",
-  "version": "0.1.2-1",
+  "version": "0.1.2-3",
   "description": "ARDOR kernel - the isomorphic core of the ARDOR frontend framework: application base on IGNIS inversion, service and CRUD bases, request/auth constants, binding keys, logger, network fetchers and socket client. No React and no react-admin.",
   "keywords": [
     "ardor",
@@ -90,11 +90,11 @@
     "lodash": "^4.18.1"
   },
   "peerDependencies": {
-    "@venizia/ignis-connectors": ">=0.2.1-3 <0.3.0",
-    "@venizia/ignis-filter": ">=0.2.1-0 <0.3.0",
-    "@venizia/ignis-helpers": ">=0.2.1-0 <0.3.0",
-    "@venizia/ignis-inversion": "^0.2.0",
-    "@venizia/ignis-kernel": ">=0.2.1-2 <0.3.0",
+    "@venizia/ignis-connectors": ">=0.2.1-5 <0.3.0",
+    "@venizia/ignis-filter": ">=0.2.1-1 <0.3.0",
+    "@venizia/ignis-helpers": ">=0.2.1-1 <0.3.0",
+    "@venizia/ignis-inversion": ">=0.2.1-0 <0.3.0",
+    "@venizia/ignis-kernel": ">=0.2.1-3 <0.3.0",
     "reflect-metadata": ">=0.2.2",
     "socket.io-client": ">=4.8.3"
   },
@@ -102,12 +102,12 @@
     "@size-limit/preset-small-lib": "^11.2.0",
     "@types/bun": "^1.3.8",
     "@types/lodash": "^4.17.24",
-    "@venizia/dev-configs": "^0.2.0",
-    "@venizia/ignis-connectors": "0.2.1-3",
-    "@venizia/ignis-filter": "0.2.1-0",
-    "@venizia/ignis-helpers": "0.2.1-0",
-    "@venizia/ignis-inversion": "^0.2.0",
-    "@venizia/ignis-kernel": "0.2.1-2",
+    "@venizia/dev-configs": "0.2.1-0",
+    "@venizia/ignis-connectors": "0.2.1-5",
+    "@venizia/ignis-filter": "0.2.1-1",
+    "@venizia/ignis-helpers": "0.2.1-1",
+    "@venizia/ignis-inversion": "0.2.1-0",
+    "@venizia/ignis-kernel": "0.2.1-3",
     "eslint": "^9.36.0",
     "prettier": "^3.8.4",
     "reflect-metadata": "^0.2.2",