@fncts/base 0.0.15 → 0.0.16

package/_cjs/data/Environment/api.cjs

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.empty = exports.clean = exports.add = void 0;
+exports.add = void 0;
+exports.clean = clean;
+exports.empty = void 0;
 exports.get = get;
 exports.getMaybe = getMaybe;
 exports.make = void 0;
@@ -17,17 +19,11 @@ var tsplus_module_2 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require
 
 var tsplus_module_3 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/function/api"));
 
-var tsplus_module_4 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/number/instances"));
-
-var tsplus_module_5 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/typeclass/Ord/api/contramap"));
-
-var tsplus_module_6 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/List/api"));
+var tsplus_module_4 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/List/api/foldLeft"));
 
-var tsplus_module_7 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/List/api/foldLeft"));
+var tsplus_module_5 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/typeclass/Equatable/api"));
 
-var tsplus_module_8 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/typeclass/Equatable/api"));
-
-var tsplus_module_9 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/destructors"));
+var tsplus_module_6 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/destructors"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -37,8 +33,6 @@ const add = add_1;
 exports.add = add;
 const make = make_1;
 exports.make = make;
-const clean = clean_1;
-exports.clean = clean;
 const unsafeGet = unsafeGet_1;
 /**
  * @tsplus fluent fncts.Environment add
@@ -47,8 +41,7 @@ const unsafeGet = unsafeGet_1;
 exports.unsafeGet = unsafeGet;
 
 function add_1(self, service, tag) {
-  const self0 = self.index === Number.MAX_SAFE_INTEGER ? clean_1(self) : self;
-  return new tsplus_module_1.Environment(tsplus_module_2.set_(self0.map, tag, [service, self0.index]), self0.index + 1);
+  return new tsplus_module_1.Environment(tsplus_module_2.set_(self.map, tag, service));
 }
 /**
  * @tsplus static fncts.EnvironmentOps empty
@@ -79,7 +72,7 @@ function getMaybe(self, tag) {
 
 
 function make_1() {
-  return new tsplus_module_1.Environment(tsplus_module_2.makeDefault(), 0, tsplus_module_2.makeDefault());
+  return new tsplus_module_1.Environment(tsplus_module_2.makeDefault(), tsplus_module_2.makeDefault());
 }
 /**
  * @tsplus operator fncts.Environment +
@@ -88,17 +81,16 @@ function make_1() {
 
 
 function union(self, that) {
-  const [self0, that0] = self.index + that.index < self.index ? [clean_1(self), clean_1(that)] : [self, that];
-  return new tsplus_module_1.Environment(tsplus_module_2.union_(self0.map, tsplus_module_2.map_(that0.map, ([service, index]) => [service, self0.index + index])), self0.index + that0.index);
+  return new tsplus_module_1.Environment(tsplus_module_2.union_(self.map, that.map));
 }
 /**
  * @tsplus getter fncts.Environment clean
  */
 
 
-function clean_1(self) {
-  const [map, index] = tsplus_module_7.foldLeft_(tsplus_module_6.sort(tsplus_module_2.toList(self.map), tsplus_module_5.contramap(tsplus_module_4.Ord, ([, [, idx]]) => idx)), [tsplus_module_2.makeDefault(), 0], ([map, index], [tag, [service]]) => [tsplus_module_2.set_(map, tag, [service, index]), index + 1]);
-  return new tsplus_module_1.Environment(map, index);
+function clean(self) {
+  const [map, index] = tsplus_module_4.foldLeft_(tsplus_module_2.toList(self.map), [tsplus_module_2.makeDefault(), 0], ([map, index], [tag, service]) => [tsplus_module_2.set_(map, tag, [service, index]), index + 1]);
+  return new tsplus_module_1.Environment(map);
 }
 /**
  * @tsplus fluent fncts.Environment unsafeGet
@@ -106,17 +98,15 @@ function clean_1(self) {
 
 
 function unsafeGet_1(self, tag) {
-  return tsplus_module_9.match_(tsplus_module_2.get_(self.cache, tag), () => {
-    let index = -1;
+  return tsplus_module_6.match_(tsplus_module_2.get_(self.cache, tag), () => {
     const iterator = self.map[Symbol.iterator]();
     let service = null;
     let r;
 
     while (!(r = iterator.next()).done) {
-      const [curTag, [curService, curIndex]] = r.value;
+      const [curTag, curService] = r.value;
 
-      if (tsplus_module_8.strictEquals(curTag, tag) && curIndex > index) {
-        index = curIndex;
+      if (tsplus_module_5.strictEquals(curTag, tag)) {
         service = curService;
       }
     }

package/_cjs/data/Environment/api.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"api.cjs","mappings":"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","names":["add","make","clean","unsafeGet","self","service","tag","self0","index","Number","MAX_SAFE_INTEGER","clean_1","Environment","tsplus_module_2","map","empty","make_1","get","unsafeGet_1","getMaybe","cache","union","that","that0","tsplus_module_7","tsplus_module_5","idx","tsplus_module_9","iterator","Symbol","r","next","done","curTag","curService","curIndex","value","tsplus_module_8","Error","a","update","f","add_1"],"sourceRoot":"","sources":["../../../_src/data/Environment/api.ts"],"sourcesContent":[null]}
+{"version":3,"file":"api.cjs","mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAGgBA,GAAG;;MA4BHC,IAAI;;MA8BJC,SAAS;AA7DzB;;;;;;AAGA,eAA2CC,IAA3C,EAAiEC,OAAjE,EAA6EC,GAA7E,EAAwF;EACtF,OAAO,oBAAIC,WAAJ,CAAgBC,yBAAI,CAACC,GAAL,EAAaH,GAAb,EAAkBD,OAAlB,CAAhB,CAAP;AACD;AAED;;;;;AAGO,MAAMK,KAAK,gBAAGC,QAAd;AAIP;;;;;;AAGM,SAAUC,GAAV,CAAoCR,IAApC,EAA0DE,GAA1D,EAAgE;EACpE,OAAoBO,kBAAeP,GAAf,CAApB;AACD;AAED;;;;;AAGM,SAAUQ,QAAV,CAAwCV,IAAxC,EAA8DE,GAA9D,EAAyE;EAC7E,OAAOE,yBAAI,CAACO,KAAL,EAAeT,GAAf,CAAP;AACD;AAED;;;;;AAGA;EACE,OAAO,oBAAIC,WAAJ,CAAgBC,6BAAhB,EAAuCA,6BAAvC,CAAP;AACD;AAED;;;;;;AAIM,SAAUQ,KAAV,CAAuBZ,IAAvB,EAA6Ca,IAA7C,EAAkE;EACtE,OAAO,oBAAIV,WAAJ,CACLC,2BAAI,CAACC,GAAL,EAAeQ,IAAI,CAACR,GAApB,CADK,CAAP;AAGD;AAED;;;;;AAGM,SAAUS,KAAV,CAAmBd,IAAnB,EAAuC;EAC3C,MAAM,CAACK,GAAD,EAAMU,KAAN,IAAeC,qDAAI,CAACX,GAAL,GAEjB,CAACD,6BAAD,EAAkE,CAAlE,CAFiB,EAGjB,CAAC,CAACC,GAAD,EAAMU,KAAN,CAAD,EAAe,CAACb,GAAD,EAAMD,OAAN,CAAf,KAAkC,CAACG,0BAAQF,GAAR,EAAa,CAACD,OAAD,EAAUc,KAAV,CAAb,CAAD,EAA0CA,KAAK,GAAG,CAAlD,CAHjB,CAArB;EAMA,OAAO,oBAAIZ,WAAJ,CAAgBE,GAAhB,CAAP;AACD;AAED;;;;;AAGA,qBAAgCL,IAAhC,EAAsDE,GAAtD,EAAiE;EAC/D,OAAOe,gDAAI,CAACN,KAAL,EAAeT,GAAf,GACL,MAAK;IACH,MAAMgB,QAAQ,GAAGlB,IAAI,CAACK,GAAL,CAASc,MAAM,CAACD,QAAhB,GAAjB;IACA,IAAIjB,OAAO,GAAM,IAAjB;IACA,IAAImB,CAAJ;;IACA,OAAO,CAAC,CAACA,CAAC,GAAGF,QAAQ,CAACG,IAAT,EAAL,EAAsBC,IAA9B,EAAoC;MAClC,MAAM,CAACC,MAAD,EAASC,UAAT,IAAuBJ,CAAC,CAACK,KAA/B;;MACA,iCAAIF,MAAJ,EAAcrB,GAAd,GAAmB;QACjBD,OAAO,GAAGuB,UAAV;MACD;IACF;;IACD,IAAIvB,OAAO,KAAK,IAAhB,EAAsB,MAAM,IAAIyB,KAAJ,CAAU,kDAAV,CAAN,CAAtB,KACK;MACH1B,IAAI,CAACW,KAAL,GAAaP,yBAAI,CAACO,KAAL,EAAeT,GAAf,EAAoBD,OAApB,CAAb;MACA,OAAOA,OAAP;IACD;EACF,CAhBI,EAiBJ0B,CAAD,IAAOA,CAjBF,CAAP;AAmBD;AAED;;;;;AAGM,SAAUC,MAAV,CAAiC5B,IAAjC,EAAuD6B,CAAvD,EAAuE3B,GAAvE,EAAkF;EACtF,OAAO4B,YAASD,CAAC,CAACpB,kBAAeP,GAAf,CAAD,CAAV,EAAiCA,GAAjC,CAAP;AACD","names":["add","make","unsafeGet","self","service","tag","Environment","tsplus_module_2","map","empty","make_1","get","unsafeGet_1","getMaybe","cache","union","that","clean","index","tsplus_module_4","tsplus_module_6","iterator","Symbol","r","next","done","curTag","curService","value","Error","a","update","f","add_1"],"sourceRoot":"","sources":["../../../_src/data/Environment/api.ts"],"sourcesContent":[null]}

package/_cjs/data/Environment/definition.cjs

@@ -35,9 +35,8 @@ const EnvSymbol = EnvSymbol_1;
 exports.EnvSymbol = EnvSymbol;
 
 class Environment {
-  constructor(map, index, cache = tsplus_module_1.makeDefault()) {
+  constructor(map, cache = tsplus_module_1.makeDefault()) {
     this.map = map;
-    this.index = index;
     this.cache = cache;
     this._typeId = EnvSymbol_1;
   }

package/_cjs/data/Environment/definition.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"definition.cjs","mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;AAGO,MAAMA,2BAAYC,MAAM,CAACC,GAAP,CAAW,WAAX,CAAlB;MAAMC,SAAS;AAItB;;;;;;;AAIM,MAAOC,WAAP,CAAkB;EAGtBC,YACWC,GADX,EAEWC,KAFX,EAGSC,QAAoCC,6BAH7C,EAGkE;IAFvD;IACA;IACF;IALA,eAAOT,WAAP;EAML;;EAEA,mCAAa;IACf,OAAOU,4BAAiB,KAAKF,KAAtB,CAAP;EACD;;EAED,+BAAgBG,IAAhB,EAA6B;IAC3B,OAAOC,aAAa,CAACD,IAAD,CAAb,GAAqBE,6BAAC,KAAKP,GAAN,EAAaK,IAAI,CAACL,GAAlB,CAArB,GAA6C,KAApD;EACD;;AAfqB;;;;AAkBlB,SAAUM,aAAV,CAAwBE,CAAxB,EAAkC;EACtC,OAAOC,0BAAUD,CAAV,EAAWd,WAAX,CAAP;AACD","names":["EnvSymbol_1","Symbol","for","EnvSymbol","Environment","constructor","map","index","cache","tsplus_module_1","tsplus_module_3","that","isEnvironment","tsplus_module_5","u","tsplus_module_6"],"sourceRoot":"","sources":["../../../_src/data/Environment/definition.ts"],"sourcesContent":[null]}
+{"version":3,"file":"definition.cjs","mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;AAGO,MAAMA,2BAAYC,MAAM,CAACC,GAAP,CAAW,WAAX,CAAlB;MAAMC,SAAS;AAItB;;;;;;;AAIM,MAAOC,WAAP,CAAkB;EAGtBC,YACWC,GADX,EAESC,QAAoCC,6BAF7C,EAEkE;IADvD;IACF;IAJA,eAAOR,WAAP;EAKL;;EAEA,mCAAa;IACf,OAAOS,4BAAiB,KAAKF,KAAtB,CAAP;EACD;;EAED,+BAAgBG,IAAhB,EAA6B;IAC3B,OAAOC,aAAa,CAACD,IAAD,CAAb,GAAqBE,6BAAC,KAAKN,GAAN,EAAaI,IAAI,CAACJ,GAAlB,CAArB,GAA6C,KAApD;EACD;;AAdqB;;;;AAiBlB,SAAUK,aAAV,CAAwBE,CAAxB,EAAkC;EACtC,OAAOC,0BAAUD,CAAV,EAAWb,WAAX,CAAP;AACD","names":["EnvSymbol_1","Symbol","for","EnvSymbol","Environment","constructor","map","cache","tsplus_module_1","tsplus_module_3","that","isEnvironment","tsplus_module_5","u","tsplus_module_6"],"sourceRoot":"","sources":["../../../_src/data/Environment/definition.ts"],"sourcesContent":[null]}

package/_cjs/data/Patch/api.cjs

@@ -118,9 +118,9 @@ const OrdEnvironmentMap = /*#__PURE__*/tsplus_module_5.contramap(tsplus_module_4
  */
 
 function diff(oldValue, newValue) {
-  const sorted = tsplus_module_6.toArray(newValue.map).sort(OrdEnvironmentMap.compare);
-  const [missingServices, patch] = tsplus_module_8.foldLeft(sorted, [tsplus_module_6.beginMutation(oldValue.map), empty_1()], ([map, patch], [tag, [newService, newIndex]]) => tsplus_module_7.match_(tsplus_module_6.get_(map, tag), () => [tsplus_module_6.remove_(map, tag), compose_1(patch, new _Patch.AddService(newService, tag))], ([oldService, oldIndex]) => {
-    if (oldService === newService && oldIndex === newIndex) {
+  const sorted = tsplus_module_6.toArray(newValue.map);
+  const [missingServices, patch] = tsplus_module_8.foldLeft(sorted, [tsplus_module_6.beginMutation(oldValue.map), empty_1()], ([map, patch], [tag, newService]) => tsplus_module_7.match_(tsplus_module_6.get_(map, tag), () => [tsplus_module_6.remove_(map, tag), compose_1(patch, new _Patch.AddService(newService, tag))], oldService => {
+    if (oldService === newService) {
       return [tsplus_module_6.remove_(map, tag), patch];
     } else {
       return [tsplus_module_6.remove_(map, tag), compose_1(patch, new _Patch.UpdateService(_ => newService, tag))];

package/_cjs/data/Patch/api.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"api.cjs","mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AAEA;;;;;;MAsCgBA,OAAO;;MA+BPC,KAAK;;;AAjErB;;;AAGA,SAASC,SAAT,CAAmBC,WAAnB,EAAkDC,OAAlD,EAAgF;sBAA7DD;MAAAE,YAA+BD;sBAA/BD;MAAAG,YAA+BF;;YAAkD;IAClG,IAAIG,kCAAJ,EAAuB;MACrB;IACD;;IACD,MAAMC,IAAI,GAAGH,UAAQG,IAArB;IACA,MAAMC,IAAI,GAAGJ,UAAQI,IAArB;IACA;;IACA,QAAQD,IAAI,CAACE,IAAb;MACE,KAAK,YAAL;wBACmBC,mCAAgBH,IAAI,CAACI,OAArB,EAA8BJ,IAAI,CAACK,GAAnC;oBAAyCJ;;;;;MAC5D,KAAK,SAAL;;oBACgCK,qBAAKN,IAAI,CAACO,KAAV,EAAiBD,qBAAKN,IAAI,CAACQ,MAAV,EAAkBP,IAAlB,CAAjB;;;;;MAChC,KAAK,OAAL;;oBACgCA;;;;;MAChC,KAAK,eAAL;;oBACgCA;;;;;MAChC,KAAK,eAAL;wBACmBE,sCAAmBH,IAAI,CAACS,MAAxB,EAAgCT,IAAI,CAACK,GAArC;oBAA2CJ;;;;IAVhE;EAYD;AAAA;AAED;;;;;AAGM,SAAUS,KAAV,CAAyBC,KAAzB,EAAgDhB,WAAhD,EAA4E;EAChF,OAAOD,SAAS,CAACC,WAAD,EAAcW,qBAAKK,KAAL,CAAd,CAAhB;AACD;AAED;;;;;AAGA,mBAAuCC,IAAvC,EAA6DC,IAA7D,EAAmF;EACjF,OAAO,IAAIC,oBAAJ,CAAYF,IAAZ,EAAkBC,IAAlB,CAAP;AACD;;AAED,MAAME,iBAAiB,gBAAGC,+CAAsBC,CAAD,IAA4DA,CAAC,CAAC,CAAD,CAAD,CAAK,CAAL,CAAjF,CAA1B;AAEA;;;;AAGM,SAAUC,IAAV,CAAwBC,QAAxB,EAAmDC,QAAnD,EAA6E;EACjF,MAAMC,MAAM,GAAqBC,gCAAQ,CAACC,GAAT,EAAqBC,IAArB,CAA0BT,iBAAiB,CAACU,OAA5C,CAAjC;EACA,MAAM,CAACC,eAAD,EAAkBf,KAAlB,IAA2BgB,iCAC/B,+BAACR,QAAQ,CAACI,GAAV,GAA6BK,SAA7B,CAD+B,EAE/B,CAAC,CAACL,GAAD,EAAMZ,KAAN,CAAD,EAAe,CAACN,GAAD,EAAM,CAACwB,UAAD,EAAaC,QAAb,CAAN,CAAf,KACEC,iDAAQ1B,GAAR,GACE,MAAM,CAACiB,6BAAWjB,GAAX,CAAD,EAAkB2B,iBAAc,IAAIC,iBAAJ,CAAeJ,UAAf,EAA2BxB,GAA3B,CAAd,CAAlB,CADR,EAEE,CAAC,CAAC6B,UAAD,EAAaC,QAAb,CAAD,KAA2B;IACzB,IAAID,UAAU,KAAKL,UAAf,IAA6BM,QAAQ,KAAKL,QAA9C,EAAwD;MACtD,OAAO,CAACR,6BAAWjB,GAAX,CAAD,EAAkBM,KAAlB,CAAP;IACD,CAFD,MAEO;MACL,OAAO,CAACW,6BAAWjB,GAAX,CAAD,EAAkB2B,iBAAc,IAAII,oBAAJ,CAAmBnB,CAAD,IAAYY,UAA9B,EAA0CxB,GAA1C,CAAd,CAAlB,CAAP;IACD;EACF,CARH,CAH6B,CAAjC;EAcA,OAAOiB,oDAAkCX,KAAlC,EAAyC,CAACN,GAAD,EAAMM,KAAN,KAAgBqB,iBAAc,IAAIK,oBAAJ,CAAkBhC,GAAlB,CAAd,CAAzD,CAAP;AACD;AAED;;;;;AAGA;EACE,OAAO,IAAIiC,kBAAJ,EAAP;AACD","names":["compose","empty","applyLoop","environment","patches","patches_1","patches_2","tsplus_module_1","head","tail","_tag","tsplus_module_2","service","tag","tsplus_module_3","first","second","update","apply","patch","self","that","Compose","OrdEnvironmentMap","tsplus_module_5","_","diff","oldValue","newValue","sorted","tsplus_module_6","map","sort","compare","missingServices","tsplus_module_8","empty_1","newService","newIndex","tsplus_module_7","compose_1","AddService","oldService","oldIndex","UpdateService","RemoveService","Empty"],"sourceRoot":"","sources":["../../../_src/data/Patch/api.ts"],"sourcesContent":[null]}
+{"version":3,"file":"api.cjs","mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AAEA;;;;;;MAsCgBA,OAAO;;MA+BPC,KAAK;;;AAjErB;;;AAGA,SAASC,SAAT,CAAmBC,WAAnB,EAAkDC,OAAlD,EAAgF;sBAA7DD;MAAAE,YAA+BD;sBAA/BD;MAAAG,YAA+BF;;YAAkD;IAClG,IAAIG,kCAAJ,EAAuB;MACrB;IACD;;IACD,MAAMC,IAAI,GAAGH,UAAQG,IAArB;IACA,MAAMC,IAAI,GAAGJ,UAAQI,IAArB;IACA;;IACA,QAAQD,IAAI,CAACE,IAAb;MACE,KAAK,YAAL;wBACmBC,mCAAgBH,IAAI,CAACI,OAArB,EAA8BJ,IAAI,CAACK,GAAnC;oBAAyCJ;;;;;MAC5D,KAAK,SAAL;;oBACgCK,qBAAKN,IAAI,CAACO,KAAV,EAAiBD,qBAAKN,IAAI,CAACQ,MAAV,EAAkBP,IAAlB,CAAjB;;;;;MAChC,KAAK,OAAL;;oBACgCA;;;;;MAChC,KAAK,eAAL;;oBACgCA;;;;;MAChC,KAAK,eAAL;wBACmBE,sCAAmBH,IAAI,CAACS,MAAxB,EAAgCT,IAAI,CAACK,GAArC;oBAA2CJ;;;;IAVhE;EAYD;AAAA;AAED;;;;;AAGM,SAAUS,KAAV,CAAyBC,KAAzB,EAAgDhB,WAAhD,EAA4E;EAChF,OAAOD,SAAS,CAACC,WAAD,EAAcW,qBAAKK,KAAL,CAAd,CAAhB;AACD;AAED;;;;;AAGA,mBAAuCC,IAAvC,EAA6DC,IAA7D,EAAmF;EACjF,OAAO,IAAIC,oBAAJ,CAAYF,IAAZ,EAAkBC,IAAlB,CAAP;AACD;;AAED,MAAME,iBAAiB,gBAAGC,+CAAsBC,CAAD,IAA4DA,CAAC,CAAC,CAAD,CAAD,CAAK,CAAL,CAAjF,CAA1B;AAEA;;;;AAGM,SAAUC,IAAV,CAAwBC,QAAxB,EAAmDC,QAAnD,EAA6E;EACjF,MAAMC,MAAM,2BAAqBD,QAAQ,CAACE,GAA9B,CAAZ;EACA,MAAM,CAACC,eAAD,EAAkBZ,KAAlB,IAA2Ba,iCAC/B,+BAACL,QAAQ,CAACG,GAAV,GAA6BG,SAA7B,CAD+B,EAE/B,CAAC,CAACH,GAAD,EAAMX,KAAN,CAAD,EAAe,CAACN,GAAD,EAAMqB,UAAN,CAAf,KACEC,iDAAQtB,GAAR,GACE,MAAM,CAACuB,6BAAWvB,GAAX,CAAD,EAAkBwB,iBAAc,IAAIC,iBAAJ,CAAeJ,UAAf,EAA2BrB,GAA3B,CAAd,CAAlB,CADR,EAEG0B,UAAD,IAAe;IACb,IAAIA,UAAU,KAAKL,UAAnB,EAA+B;MAC7B,OAAO,CAACE,6BAAWvB,GAAX,CAAD,EAAkBM,KAAlB,CAAP;IACD,CAFD,MAEO;MACL,OAAO,CAACiB,6BAAWvB,GAAX,CAAD,EAAkBwB,iBAAc,IAAIG,oBAAJ,CAAmBf,CAAD,IAAYS,UAA9B,EAA0CrB,GAA1C,CAAd,CAAlB,CAAP;IACD;EACF,CARH,CAH6B,CAAjC;EAcA,OAAOuB,oDAAkCjB,KAAlC,EAAyC,CAACN,GAAD,EAAMM,KAAN,KAAgBkB,iBAAc,IAAII,oBAAJ,CAAkB5B,GAAlB,CAAd,CAAzD,CAAP;AACD;AAED;;;;;AAGA;EACE,OAAO,IAAI6B,kBAAJ,EAAP;AACD","names":["compose","empty","applyLoop","environment","patches","patches_1","patches_2","tsplus_module_1","head","tail","_tag","tsplus_module_2","service","tag","tsplus_module_3","first","second","update","apply","patch","self","that","Compose","OrdEnvironmentMap","tsplus_module_5","_","diff","oldValue","newValue","sorted","map","missingServices","tsplus_module_8","empty_1","newService","tsplus_module_7","tsplus_module_6","compose_1","AddService","oldService","UpdateService","RemoveService","Empty"],"sourceRoot":"","sources":["../../../_src/data/Patch/api.ts"],"sourcesContent":[null]}

package/_cjs/data/Tag/constructors.cjs

@@ -14,7 +14,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 /**
  * @tsplus static fncts.TagOps __call
  */
-function makeTag() {
-  return new tsplus_module_1.Tag();
+function makeTag(id) {
+  return new tsplus_module_1.Tag(id);
 }
 //# sourceMappingURL=constructors.cjs.map

package/_cjs/data/Tag/constructors.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"constructors.cjs","mappings":";;;;;;;;;;;;;AAAA;;;AAGM,SAAUA,OAAV,GAAiB;EACrB,OAAO,oBAAIC,GAAJ,EAAP;AACD","names":["makeTag","Tag"],"sourceRoot":"","sources":["../../../_src/data/Tag/constructors.ts"],"sourcesContent":[null]}
+{"version":3,"file":"constructors.cjs","mappings":";;;;;;;;;;;;;AAAA;;;AAGM,SAAUA,OAAV,CAAqBC,EAArB,EAA+B;EACnC,OAAO,oBAAIC,GAAJ,CAAQD,EAAR,CAAP;AACD","names":["makeTag","id","Tag"],"sourceRoot":"","sources":["../../../_src/data/Tag/constructors.ts"],"sourcesContent":[null]}

package/_cjs/data/Tag/definition.cjs

@@ -33,13 +33,13 @@ const _tagHash = /*#__PURE__*/tsplus_module_1.hashString("fncts.Tag");
 
 
 class Tag {
-  constructor() {
+  constructor(id) {
+    this.id = id;
     this._typeId = TagTypeId;
-    this.id = Tag.counter.getAndIncrement();
   }
 
   get [tsplus_module_2.hashSymbol]() {
-    return tsplus_module_1.combineHash(_tagHash, tsplus_module_1.hashNumber(this.id));
+    return tsplus_module_1.combineHash(_tagHash, tsplus_module_1.hashString(this.id));
   }
 
   [tsplus_module_3.equalsSymbol](that) {

package/_cjs/data/Tag/definition.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"definition.cjs","mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;AAEO,MAAMA,SAAS,gBAAGC,MAAM,CAACC,GAAP,CAAW,WAAX,CAAlB;;;AAGP,MAAMC,QAAQ,gBAAGC,2BAAgB,WAAhB,CAAjB;AAEA;;;;;;;;AAMM,MAAOC,GAAP,CAAU;EAAhBC;IAEW,eAAqBN,SAArB;IAEA,UAAqBK,GAAG,CAACE,OAAJ,CAAYC,eAAZ,EAArB;EASV;;EAPK,mCAAa;IACf,OAAOJ,4BAAiBD,QAAjB,EAA2BC,2BAAgB,KAAKK,EAArB,CAA3B,CAAP;EACD;;EAED,+BAAgBC,IAAhB,EAA6B;IAC3B,OAAOC,KAAK,CAACD,IAAD,CAAL,IAAe,KAAKD,EAAL,KAAYC,IAAI,CAACD,EAAvC;EACD;;AAZa;;;AAGCJ,2BAAe,IAAIO,0BAAJ,CAAiB,CAAjB,CAAf;;AAYX,SAAUD,KAAV,CAAgBE,CAAhB,EAA0B;EAC9B,OAAOC,0BAAUD,CAAV,EAAab,SAAb,CAAP;AACD","names":["TagTypeId","Symbol","for","_tagHash","tsplus_module_1","Tag","constructor","counter","getAndIncrement","id","that","isTag","AtomicNumber","u","tsplus_module_4"],"sourceRoot":"","sources":["../../../_src/data/Tag/definition.ts"],"sourcesContent":[null]}
+{"version":3,"file":"definition.cjs","mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;AAEO,MAAMA,SAAS,gBAAGC,MAAM,CAACC,GAAP,CAAW,WAAX,CAAlB;;;AAGP,MAAMC,QAAQ,gBAAGC,2BAAgB,WAAhB,CAAjB;AAEA;;;;;;;;AAMM,MAAOC,GAAP,CAAU;EAKdC,YAAqBC,EAArB,EAA+B;IAAV;IAHZ,eAAqBP,SAArB;EAG0B;;EAE/B,mCAAa;IACf,OAAOI,4BAAiBD,QAAjB,EAA2BC,2BAAgB,KAAKG,EAArB,CAA3B,CAAP;EACD;;EAED,+BAAgBC,IAAhB,EAA6B;IAC3B,OAAOC,KAAK,CAACD,IAAD,CAAL,IAAe,KAAKD,EAAL,KAAYC,IAAI,CAACD,EAAvC;EACD;;AAba;;;AAGCF,2BAAe,IAAIK,0BAAJ,CAAiB,CAAjB,CAAf;;AAaX,SAAUD,KAAV,CAAgBE,CAAhB,EAA0B;EAC9B,OAAOC,0BAAUD,CAAV,EAAaX,SAAb,CAAP;AACD","names":["TagTypeId","Symbol","for","_tagHash","tsplus_module_1","Tag","constructor","id","that","isTag","AtomicNumber","u","tsplus_module_4"],"sourceRoot":"","sources":["../../../_src/data/Tag/definition.ts"],"sourcesContent":[null]}

package/_mjs/data/Environment/api.mjs

@@ -1,23 +1,18 @@
 import * as tsplus_module_1 from "@fncts/base/data/Environment/definition";
 import * as tsplus_module_2 from "@fncts/base/collection/immutable/HashMap/api";
 import * as tsplus_module_3 from "@fncts/base/data/function/api";
-import * as tsplus_module_4 from "@fncts/base/data/number/instances";
-import * as tsplus_module_5 from "@fncts/base/typeclass/Ord/api/contramap";
-import * as tsplus_module_6 from "@fncts/base/collection/immutable/List/api";
-import * as tsplus_module_7 from "@fncts/base/collection/immutable/List/api/foldLeft";
-import * as tsplus_module_8 from "@fncts/base/typeclass/Equatable/api";
-import * as tsplus_module_9 from "@fncts/base/data/Maybe/destructors";
+import * as tsplus_module_4 from "@fncts/base/collection/immutable/List/api/foldLeft";
+import * as tsplus_module_5 from "@fncts/base/typeclass/Equatable/api";
+import * as tsplus_module_6 from "@fncts/base/data/Maybe/destructors";
 export const add = add_1;
 export const make = make_1;
-export const clean = clean_1;
 export const unsafeGet = unsafeGet_1;
 /**
  * @tsplus fluent fncts.Environment add
  */
 
 function add_1(self, service, tag) {
-  const self0 = self.index === Number.MAX_SAFE_INTEGER ? clean_1(self) : self;
-  return new tsplus_module_1.Environment(tsplus_module_2.set_(self0.map, tag, [service, self0.index]), self0.index + 1);
+  return new tsplus_module_1.Environment(tsplus_module_2.set_(self.map, tag, service));
 }
 /**
  * @tsplus static fncts.EnvironmentOps empty
@@ -44,7 +39,7 @@ export function getMaybe(self, tag) {
  */
 
 function make_1() {
-  return new tsplus_module_1.Environment(tsplus_module_2.makeDefault(), 0, tsplus_module_2.makeDefault());
+  return new tsplus_module_1.Environment(tsplus_module_2.makeDefault(), tsplus_module_2.makeDefault());
 }
 /**
  * @tsplus operator fncts.Environment +
@@ -53,34 +48,30 @@ function make_1() {
 
 
 export function union(self, that) {
-  const [self0, that0] = self.index + that.index < self.index ? [clean_1(self), clean_1(that)] : [self, that];
-  return new tsplus_module_1.Environment(tsplus_module_2.union_(self0.map, tsplus_module_2.map_(that0.map, ([service, index]) => [service, self0.index + index])), self0.index + that0.index);
+  return new tsplus_module_1.Environment(tsplus_module_2.union_(self.map, that.map));
 }
 /**
  * @tsplus getter fncts.Environment clean
  */
 
-function clean_1(self) {
-  const [map, index] = tsplus_module_7.foldLeft_(tsplus_module_6.sort(tsplus_module_2.toList(self.map), tsplus_module_5.contramap(tsplus_module_4.Ord, ([, [, idx]]) => idx)), [tsplus_module_2.makeDefault(), 0], ([map, index], [tag, [service]]) => [tsplus_module_2.set_(map, tag, [service, index]), index + 1]);
-  return new tsplus_module_1.Environment(map, index);
+export function clean(self) {
+  const [map, index] = tsplus_module_4.foldLeft_(tsplus_module_2.toList(self.map), [tsplus_module_2.makeDefault(), 0], ([map, index], [tag, service]) => [tsplus_module_2.set_(map, tag, [service, index]), index + 1]);
+  return new tsplus_module_1.Environment(map);
 }
 /**
  * @tsplus fluent fncts.Environment unsafeGet
  */
 
-
 function unsafeGet_1(self, tag) {
-  return tsplus_module_9.match_(tsplus_module_2.get_(self.cache, tag), () => {
-    let index = -1;
+  return tsplus_module_6.match_(tsplus_module_2.get_(self.cache, tag), () => {
     const iterator = self.map[Symbol.iterator]();
     let service = null;
     let r;
 
     while (!(r = iterator.next()).done) {
-      const [curTag, [curService, curIndex]] = r.value;
+      const [curTag, curService] = r.value;
 
-      if (tsplus_module_8.strictEquals(curTag, tag) && curIndex > index) {
-        index = curIndex;
+      if (tsplus_module_5.strictEquals(curTag, tag)) {
         service = curService;
       }
     }

package/_mjs/data/Environment/api.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"api.mjs","mappings":"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","names":["add","make","clean","unsafeGet","self","service","tag","self0","index","Number","MAX_SAFE_INTEGER","clean_1","Environment","tsplus_module_2","map","empty","make_1","get","unsafeGet_1","getMaybe","cache","union","that","that0","tsplus_module_7","tsplus_module_5","idx","tsplus_module_9","iterator","Symbol","r","next","done","curTag","curService","curIndex","value","tsplus_module_8","Error","a","update","f","add_1"],"sourceRoot":"","sources":["../../../_src/data/Environment/api.ts"],"sourcesContent":[null]}
+{"version":3,"file":"api.mjs","mappings":";;;;;;aAGgBA,GAAG;aA4BHC,IAAI;aA8BJC,SAAS;AA7DzB;;;;AAGA,eAA2CC,IAA3C,EAAiEC,OAAjE,EAA6EC,GAA7E,EAAwF;EACtF,OAAO,oBAAIC,WAAJ,CAAgBC,yBAAI,CAACC,GAAL,EAAaH,GAAb,EAAkBD,OAAlB,CAAhB,CAAP;AACD;AAED;;;;;AAGA,OAAO,MAAMK,KAAK,gBAAGC,QAAd;AAIP;;;;AAGA,OAAM,SAAUC,GAAV,CAAoCR,IAApC,EAA0DE,GAA1D,EAAgE;EACpE,OAAoBO,kBAAeP,GAAf,CAApB;AACD;AAED;;;;AAGA,OAAM,SAAUQ,QAAV,CAAwCV,IAAxC,EAA8DE,GAA9D,EAAyE;EAC7E,OAAOE,yBAAI,CAACO,KAAL,EAAeT,GAAf,CAAP;AACD;AAED;;;;AAGA;EACE,OAAO,oBAAIC,WAAJ,CAAgBC,6BAAhB,EAAuCA,6BAAvC,CAAP;AACD;AAED;;;;;;AAIA,OAAM,SAAUQ,KAAV,CAAuBZ,IAAvB,EAA6Ca,IAA7C,EAAkE;EACtE,OAAO,oBAAIV,WAAJ,CACLC,2BAAI,CAACC,GAAL,EAAeQ,IAAI,CAACR,GAApB,CADK,CAAP;AAGD;AAED;;;;AAGA,OAAM,SAAUS,KAAV,CAAmBd,IAAnB,EAAuC;EAC3C,MAAM,CAACK,GAAD,EAAMU,KAAN,IAAeC,qDAAI,CAACX,GAAL,GAEjB,CAACD,6BAAD,EAAkE,CAAlE,CAFiB,EAGjB,CAAC,CAACC,GAAD,EAAMU,KAAN,CAAD,EAAe,CAACb,GAAD,EAAMD,OAAN,CAAf,KAAkC,CAACG,0BAAQF,GAAR,EAAa,CAACD,OAAD,EAAUc,KAAV,CAAb,CAAD,EAA0CA,KAAK,GAAG,CAAlD,CAHjB,CAArB;EAMA,OAAO,oBAAIZ,WAAJ,CAAgBE,GAAhB,CAAP;AACD;AAED;;;;AAGA,qBAAgCL,IAAhC,EAAsDE,GAAtD,EAAiE;EAC/D,OAAOe,gDAAI,CAACN,KAAL,EAAeT,GAAf,GACL,MAAK;IACH,MAAMgB,QAAQ,GAAGlB,IAAI,CAACK,GAAL,CAASc,MAAM,CAACD,QAAhB,GAAjB;IACA,IAAIjB,OAAO,GAAM,IAAjB;IACA,IAAImB,CAAJ;;IACA,OAAO,CAAC,CAACA,CAAC,GAAGF,QAAQ,CAACG,IAAT,EAAL,EAAsBC,IAA9B,EAAoC;MAClC,MAAM,CAACC,MAAD,EAASC,UAAT,IAAuBJ,CAAC,CAACK,KAA/B;;MACA,iCAAIF,MAAJ,EAAcrB,GAAd,GAAmB;QACjBD,OAAO,GAAGuB,UAAV;MACD;IACF;;IACD,IAAIvB,OAAO,KAAK,IAAhB,EAAsB,MAAM,IAAIyB,KAAJ,CAAU,kDAAV,CAAN,CAAtB,KACK;MACH1B,IAAI,CAACW,KAAL,GAAaP,yBAAI,CAACO,KAAL,EAAeT,GAAf,EAAoBD,OAApB,CAAb;MACA,OAAOA,OAAP;IACD;EACF,CAhBI,EAiBJ0B,CAAD,IAAOA,CAjBF,CAAP;AAmBD;AAED;;;;;AAGA,OAAM,SAAUC,MAAV,CAAiC5B,IAAjC,EAAuD6B,CAAvD,EAAuE3B,GAAvE,EAAkF;EACtF,OAAO4B,YAASD,CAAC,CAACpB,kBAAeP,GAAf,CAAD,CAAV,EAAiCA,GAAjC,CAAP;AACD","names":["add","make","unsafeGet","self","service","tag","Environment","tsplus_module_2","map","empty","make_1","get","unsafeGet_1","getMaybe","cache","union","that","clean","index","tsplus_module_4","tsplus_module_6","iterator","Symbol","r","next","done","curTag","curService","value","Error","a","update","f","add_1"],"sourceRoot":"","sources":["../../../_src/data/Environment/api.ts"],"sourcesContent":[null]}

package/_mjs/data/Environment/definition.mjs

@@ -16,9 +16,8 @@ export const EnvSymbol = EnvSymbol_1;
  */
 
 export class Environment {
-  constructor(map, index, cache = tsplus_module_1.makeDefault()) {
+  constructor(map, cache = tsplus_module_1.makeDefault()) {
     this.map = map;
-    this.index = index;
     this.cache = cache;
     this._typeId = EnvSymbol_1;
   }

package/_mjs/data/Environment/definition.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"definition.mjs","mappings":";;;;;;AAAA;;;;AAGO,MAAMA,2BAAYC,MAAM,CAACC,GAAP,CAAW,WAAX,CAAlB;aAAMC,SAAS;AAItB;;;;;AAIA,OAAM,MAAOC,WAAP,CAAkB;EAGtBC,YACWC,GADX,EAEWC,KAFX,EAGSC,QAAoCC,6BAH7C,EAGkE;IAFvD;IACA;IACF;IALA,eAAOT,WAAP;EAML;;EAEA,mCAAa;IACf,OAAOU,4BAAiB,KAAKF,KAAtB,CAAP;EACD;;EAED,+BAAgBG,IAAhB,EAA6B;IAC3B,OAAOC,aAAa,CAACD,IAAD,CAAb,GAAqBE,6BAAC,KAAKP,GAAN,EAAaK,IAAI,CAACL,GAAlB,CAArB,GAA6C,KAApD;EACD;;AAfqB;AAkBxB,OAAM,SAAUM,aAAV,CAAwBE,CAAxB,EAAkC;EACtC,OAAOC,0BAAUD,CAAV,EAAWd,WAAX,CAAP;AACD","names":["EnvSymbol_1","Symbol","for","EnvSymbol","Environment","constructor","map","index","cache","tsplus_module_1","tsplus_module_3","that","isEnvironment","tsplus_module_5","u","tsplus_module_6"],"sourceRoot":"","sources":["../../../_src/data/Environment/definition.ts"],"sourcesContent":[null]}
+{"version":3,"file":"definition.mjs","mappings":";;;;;;AAAA;;;;AAGO,MAAMA,2BAAYC,MAAM,CAACC,GAAP,CAAW,WAAX,CAAlB;aAAMC,SAAS;AAItB;;;;;AAIA,OAAM,MAAOC,WAAP,CAAkB;EAGtBC,YACWC,GADX,EAESC,QAAoCC,6BAF7C,EAEkE;IADvD;IACF;IAJA,eAAOR,WAAP;EAKL;;EAEA,mCAAa;IACf,OAAOS,4BAAiB,KAAKF,KAAtB,CAAP;EACD;;EAED,+BAAgBG,IAAhB,EAA6B;IAC3B,OAAOC,aAAa,CAACD,IAAD,CAAb,GAAqBE,6BAAC,KAAKN,GAAN,EAAaI,IAAI,CAACJ,GAAlB,CAArB,GAA6C,KAApD;EACD;;AAdqB;AAiBxB,OAAM,SAAUK,aAAV,CAAwBE,CAAxB,EAAkC;EACtC,OAAOC,0BAAUD,CAAV,EAAWb,WAAX,CAAP;AACD","names":["EnvSymbol_1","Symbol","for","EnvSymbol","Environment","constructor","map","cache","tsplus_module_1","tsplus_module_3","that","isEnvironment","tsplus_module_5","u","tsplus_module_6"],"sourceRoot":"","sources":["../../../_src/data/Environment/definition.ts"],"sourcesContent":[null]}

package/_mjs/data/Patch/api.mjs

@@ -92,9 +92,9 @@ const OrdEnvironmentMap = /*#__PURE__*/tsplus_module_5.contramap(tsplus_module_4
  */
 
 export function diff(oldValue, newValue) {
-  const sorted = tsplus_module_6.toArray(newValue.map).sort(OrdEnvironmentMap.compare);
-  const [missingServices, patch] = tsplus_module_8.foldLeft(sorted, [tsplus_module_6.beginMutation(oldValue.map), empty_1()], ([map, patch], [tag, [newService, newIndex]]) => tsplus_module_7.match_(tsplus_module_6.get_(map, tag), () => [tsplus_module_6.remove_(map, tag), compose_1(patch, new AddService(newService, tag))], ([oldService, oldIndex]) => {
-    if (oldService === newService && oldIndex === newIndex) {
+  const sorted = tsplus_module_6.toArray(newValue.map);
+  const [missingServices, patch] = tsplus_module_8.foldLeft(sorted, [tsplus_module_6.beginMutation(oldValue.map), empty_1()], ([map, patch], [tag, newService]) => tsplus_module_7.match_(tsplus_module_6.get_(map, tag), () => [tsplus_module_6.remove_(map, tag), compose_1(patch, new AddService(newService, tag))], oldService => {
+    if (oldService === newService) {
       return [tsplus_module_6.remove_(map, tag), patch];
     } else {
       return [tsplus_module_6.remove_(map, tag), compose_1(patch, new UpdateService(_ => newService, tag))];

package/_mjs/data/Patch/api.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"api.mjs","mappings":"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","names":["compose","empty","Cons","AddService","RemoveService","UpdateService","Empty","Compose","concrete","applyLoop","environment","patches","patches_1","patches_2","tsplus_module_1","head","tail","_tag","tsplus_module_2","service","tag","tsplus_module_3","first","second","update","apply","patch","self","that","OrdEnvironmentMap","tsplus_module_5","_","diff","oldValue","newValue","sorted","tsplus_module_6","map","sort","compare","missingServices","tsplus_module_8","empty_1","newService","newIndex","tsplus_module_7","compose_1","oldService","oldIndex"],"sourceRoot":"","sources":["../../../_src/data/Patch/api.ts"],"sourcesContent":[null]}
+{"version":3,"file":"api.mjs","mappings":";;;;;;;;aAyCgBA,OAAO;aA+BPC,KAAK;AAxErB,SAASC,IAAT,QAAqB,uCAArB;AACA,SAASC,UAAT,EAAqBC,aAArB,EAAoCC,aAApC,QAAyD,wBAAzD;AAEA,SAASC,KAAT,QAAsB,mCAAtB;AACA,SAASC,OAAT,QAAwB,mCAAxB;AACA,SAASC,QAAT,QAAyB,mCAAzB;AAEA;;;;AAGA,SAASC,SAAT,CAAmBC,WAAnB,EAAkDC,OAAlD,EAAgF;sBAA7DD;MAAAE,YAA+BD;sBAA/BD;MAAAG,YAA+BF;;YAAkD;IAClG,IAAIG,kCAAJ,EAAuB;MACrB;IACD;;IACD,MAAMC,IAAI,GAAGH,UAAQG,IAArB;IACA,MAAMC,IAAI,GAAGJ,UAAQI,IAArB;IACA;;IACA,QAAQD,IAAI,CAACE,IAAb;MACE,KAAK,YAAL;wBACmBC,mCAAgBH,IAAI,CAACI,OAArB,EAA8BJ,IAAI,CAACK,GAAnC;oBAAyCJ;;;;;MAC5D,KAAK,SAAL;;oBACgCK,qBAAKN,IAAI,CAACO,KAAV,EAAiBD,qBAAKN,IAAI,CAACQ,MAAV,EAAkBP,IAAlB,CAAjB;;;;;MAChC,KAAK,OAAL;;oBACgCA;;;;;MAChC,KAAK,eAAL;;oBACgCA;;;;;MAChC,KAAK,eAAL;wBACmBE,sCAAmBH,IAAI,CAACS,MAAxB,EAAgCT,IAAI,CAACK,GAArC;oBAA2CJ;;;;IAVhE;EAYD;AAAA;AAED;;;;;AAGA,OAAM,SAAUS,KAAV,CAAyBC,KAAzB,EAAgDhB,WAAhD,EAA4E;EAChF,OAAOD,SAAS,CAACC,WAAD,EAAcW,qBAAKK,KAAL,CAAd,CAAhB;AACD;AAED;;;;AAGA,mBAAuCC,IAAvC,EAA6DC,IAA7D,EAAmF;EACjF,OAAO,IAAIrB,OAAJ,CAAYoB,IAAZ,EAAkBC,IAAlB,CAAP;AACD;;AAED,MAAMC,iBAAiB,gBAAGC,+CAAsBC,CAAD,IAA4DA,CAAC,CAAC,CAAD,CAAD,CAAK,CAAL,CAAjF,CAA1B;AAEA;;;;AAGA,OAAM,SAAUC,IAAV,CAAwBC,QAAxB,EAAmDC,QAAnD,EAA6E;EACjF,MAAMC,MAAM,2BAAqBD,QAAQ,CAACE,GAA9B,CAAZ;EACA,MAAM,CAACC,eAAD,EAAkBX,KAAlB,IAA2BY,iCAC/B,+BAACL,QAAQ,CAACG,GAAV,GAA6BG,SAA7B,CAD+B,EAE/B,CAAC,CAACH,GAAD,EAAMV,KAAN,CAAD,EAAe,CAACN,GAAD,EAAMoB,UAAN,CAAf,KACEC,iDAAQrB,GAAR,GACE,MAAM,CAACsB,6BAAWtB,GAAX,CAAD,EAAkBuB,iBAAc,IAAIxC,UAAJ,CAAeqC,UAAf,EAA2BpB,GAA3B,CAAd,CAAlB,CADR,EAEGwB,UAAD,IAAe;IACb,IAAIA,UAAU,KAAKJ,UAAnB,EAA+B;MAC7B,OAAO,CAACE,6BAAWtB,GAAX,CAAD,EAAkBM,KAAlB,CAAP;IACD,CAFD,MAEO;MACL,OAAO,CAACgB,6BAAWtB,GAAX,CAAD,EAAkBuB,iBAAc,IAAItC,aAAJ,CAAmB0B,CAAD,IAAYS,UAA9B,EAA0CpB,GAA1C,CAAd,CAAlB,CAAP;IACD;EACF,CARH,CAH6B,CAAjC;EAcA,OAAOsB,oDAAkChB,KAAlC,EAAyC,CAACN,GAAD,EAAMM,KAAN,KAAgBiB,iBAAc,IAAIvC,aAAJ,CAAkBgB,GAAlB,CAAd,CAAzD,CAAP;AACD;AAED;;;;AAGA;EACE,OAAO,IAAId,KAAJ,EAAP;AACD","names":["compose","empty","Cons","AddService","RemoveService","UpdateService","Empty","Compose","concrete","applyLoop","environment","patches","patches_1","patches_2","tsplus_module_1","head","tail","_tag","tsplus_module_2","service","tag","tsplus_module_3","first","second","update","apply","patch","self","that","OrdEnvironmentMap","tsplus_module_5","_","diff","oldValue","newValue","sorted","map","missingServices","tsplus_module_8","empty_1","newService","tsplus_module_7","tsplus_module_6","compose_1","oldService"],"sourceRoot":"","sources":["../../../_src/data/Patch/api.ts"],"sourcesContent":[null]}

package/_mjs/data/Tag/constructors.mjs

@@ -3,7 +3,7 @@ import * as tsplus_module_1 from "@fncts/base/data/Tag/definition";
  * @tsplus static fncts.TagOps __call
  */
 
-export function makeTag() {
-  return new tsplus_module_1.Tag();
+export function makeTag(id) {
+  return new tsplus_module_1.Tag(id);
 }
 //# sourceMappingURL=constructors.mjs.map

package/_mjs/data/Tag/constructors.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"constructors.mjs","mappings":";AAAA;;;;AAGA,OAAM,SAAUA,OAAV,GAAiB;EACrB,OAAO,oBAAIC,GAAJ,EAAP;AACD","names":["makeTag","Tag"],"sourceRoot":"","sources":["../../../_src/data/Tag/constructors.ts"],"sourcesContent":[null]}
+{"version":3,"file":"constructors.mjs","mappings":";AAAA;;;;AAGA,OAAM,SAAUA,OAAV,CAAqBC,EAArB,EAA+B;EACnC,OAAO,oBAAIC,GAAJ,CAAQD,EAAR,CAAP;AACD","names":["makeTag","id","Tag"],"sourceRoot":"","sources":["../../../_src/data/Tag/constructors.ts"],"sourcesContent":[null]}

package/_mjs/data/Tag/definition.mjs

@@ -15,13 +15,13 @@ const _tagHash = /*#__PURE__*/tsplus_module_1.hashString("fncts.Tag");
 
 
 export class Tag {
-  constructor() {
+  constructor(id) {
+    this.id = id;
     this._typeId = TagTypeId;
-    this.id = Tag.counter.getAndIncrement();
   }
 
   get [tsplus_module_2.hashSymbol]() {
-    return tsplus_module_1.combineHash(_tagHash, tsplus_module_1.hashNumber(this.id));
+    return tsplus_module_1.combineHash(_tagHash, tsplus_module_1.hashString(this.id));
   }
 
   [tsplus_module_3.equalsSymbol](that) {

package/_mjs/data/Tag/definition.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"definition.mjs","mappings":";;;;AAAA,SAASA,YAAT,QAA6B,mCAA7B;AAEA,OAAO,MAAMC,SAAS,gBAAGC,MAAM,CAACC,GAAP,CAAW,WAAX,CAAlB;;AAGP,MAAMC,QAAQ,gBAAGC,2BAAgB,WAAhB,CAAjB;AAEA;;;;;;;;AAMA,OAAM,MAAOC,GAAP,CAAU;EAAhBC;IAEW,eAAqBN,SAArB;IAEA,UAAqBK,GAAG,CAACE,OAAJ,CAAYC,eAAZ,EAArB;EASV;;EAPK,mCAAa;IACf,OAAOJ,4BAAiBD,QAAjB,EAA2BC,2BAAgB,KAAKK,EAArB,CAA3B,CAAP;EACD;;EAED,+BAAgBC,IAAhB,EAA6B;IAC3B,OAAOC,KAAK,CAACD,IAAD,CAAL,IAAe,KAAKD,EAAL,KAAYC,IAAI,CAACD,EAAvC;EACD;;AAZa;AAGCJ,2BAAe,IAAIN,YAAJ,CAAiB,CAAjB,CAAf;AAYjB,OAAM,SAAUY,KAAV,CAAgBC,CAAhB,EAA0B;EAC9B,OAAOC,0BAAUD,CAAV,EAAaZ,SAAb,CAAP;AACD","names":["AtomicNumber","TagTypeId","Symbol","for","_tagHash","tsplus_module_1","Tag","constructor","counter","getAndIncrement","id","that","isTag","u","tsplus_module_4"],"sourceRoot":"","sources":["../../../_src/data/Tag/definition.ts"],"sourcesContent":[null]}
+{"version":3,"file":"definition.mjs","mappings":";;;;AAAA,SAASA,YAAT,QAA6B,mCAA7B;AAEA,OAAO,MAAMC,SAAS,gBAAGC,MAAM,CAACC,GAAP,CAAW,WAAX,CAAlB;;AAGP,MAAMC,QAAQ,gBAAGC,2BAAgB,WAAhB,CAAjB;AAEA;;;;;;;;AAMA,OAAM,MAAOC,GAAP,CAAU;EAKdC,YAAqBC,EAArB,EAA+B;IAAV;IAHZ,eAAqBP,SAArB;EAG0B;;EAE/B,mCAAa;IACf,OAAOI,4BAAiBD,QAAjB,EAA2BC,2BAAgB,KAAKG,EAArB,CAA3B,CAAP;EACD;;EAED,+BAAgBC,IAAhB,EAA6B;IAC3B,OAAOC,KAAK,CAACD,IAAD,CAAL,IAAe,KAAKD,EAAL,KAAYC,IAAI,CAACD,EAAvC;EACD;;AAba;AAGCF,2BAAe,IAAIN,YAAJ,CAAiB,CAAjB,CAAf;AAajB,OAAM,SAAUU,KAAV,CAAgBC,CAAhB,EAA0B;EAC9B,OAAOC,0BAAUD,CAAV,EAAaV,SAAb,CAAP;AACD","names":["AtomicNumber","TagTypeId","Symbol","for","_tagHash","tsplus_module_1","Tag","constructor","id","that","isTag","u","tsplus_module_4"],"sourceRoot":"","sources":["../../../_src/data/Tag/definition.ts"],"sourcesContent":[null]}

package/_src/data/Environment/api.ts

@@ -2,8 +2,7 @@
  * @tsplus fluent fncts.Environment add
  */
 export function add<R, H extends S, S = H>(self: Environment<R>, service: H, tag: Tag<S>): Environment<R | S> {
-  const self0 = self.index === Number.MAX_SAFE_INTEGER ? self.clean : self;
-  return new Environment(self0.map.set(tag, [service, self0.index]), self0.index + 1);
+  return new Environment(self.map.set(tag, service));
 }
 
 /**
@@ -31,7 +30,7 @@ export function getMaybe<R extends Has<S>, S>(self: Environment<R>, tag: Tag<S>)
  * @tsplus static fncts.EnvironmentOps __call
  */
 export function make(): Environment<never> {
-  return new Environment(HashMap.makeDefault(), 0, HashMap.makeDefault());
+  return new Environment(HashMap.makeDefault(), HashMap.makeDefault());
 }
 
 /**
@@ -39,10 +38,8 @@ export function make(): Environment<never> {
  * @tsplus fluent fncts.Environment union
  */
 export function union<R, R1>(self: Environment<R>, that: Environment<R1>): Environment<R & R1> {
-  const [self0, that0] = self.index + that.index < self.index ? [self.clean, that.clean] : [self, that];
   return new Environment(
-    self0.map.union(that0.map.map(([service, index]) => [service, self0.index + index] as const)),
-    self0.index + that0.index,
+    self.map.union(that.map),
   );
 }
 
@@ -51,13 +48,12 @@ export function union<R, R1>(self: Environment<R>, that: Environment<R1>): Envir
  */
 export function clean<R>(self: Environment<R>): Environment<R> {
   const [map, index] = self.map.toList
-    .sort(Number.Ord.contramap(([, [, idx]]) => idx))
     .foldLeft(
       [HashMap.makeDefault<Tag<unknown>, readonly [unknown, number]>(), 0],
-      ([map, index], [tag, [service]]) => [map.set(tag, [service, index] as const), index + 1],
+      ([map, index], [tag, service]) => [map.set(tag, [service, index] as const), index + 1],
     );
 
-  return new Environment(map, index);
+  return new Environment(map);
 }
 
 /**
@@ -66,14 +62,12 @@ export function clean<R>(self: Environment<R>): Environment<R> {
 export function unsafeGet<R, S>(self: Environment<R>, tag: Tag<S>): S {
   return self.cache.get(tag).match(
     () => {
-      let index      = -1;
       const iterator = self.map[Symbol.iterator]();
       let service: S = null!;
-      let r: IteratorResult<readonly [Tag<unknown>, readonly [unknown, number]]>;
+      let r: IteratorResult<readonly [Tag<unknown>, unknown]>;
       while (!(r = iterator.next()).done) {
-        const [curTag, [curService, curIndex]] = r.value;
-        if (curTag == tag && curIndex > index) {
-          index   = curIndex;
+        const [curTag, curService] = r.value;
+        if (curTag == tag) {
           service = curService as S;
         }
       }

package/_src/data/Environment/definition.ts

@@ -13,8 +13,7 @@ export class Environment<R> implements Hashable, Equatable {
   readonly _typeId: EnvSymbol = EnvSymbol;
   readonly [EnvSymbol]!: (_: never) => R;
   constructor(
-    readonly map: HashMap<Tag<any>, readonly [unknown, number]>,
-    readonly index: number,
+    readonly map: HashMap<Tag<any>, unknown>,
     public cache: HashMap<Tag<any>, unknown> = HashMap.makeDefault(),
   ) {}
 

package/_src/data/Patch/api.ts

@@ -49,14 +49,14 @@ const OrdEnvironmentMap = Number.Ord.contramap((_: readonly [Tag<unknown>, reado
  * @tsplus static fncts.Environment.PatchOps diff
  */
 export function diff<In, Out>(oldValue: Environment<In>, newValue: Environment<Out>): Patch<In, Out> {
-  const sorted                   = newValue.map.toArray.sort(OrdEnvironmentMap.compare);
+  const sorted                   = newValue.map.toArray;
   const [missingServices, patch] = sorted.foldLeft(
     [oldValue.map.beginMutation, Patch.empty() as Patch<any, any>],
-    ([map, patch], [tag, [newService, newIndex]]) =>
+    ([map, patch], [tag, newService]) =>
       map.get(tag).match(
         () => [map.remove(tag), patch.compose(new AddService(newService, tag))],
-        ([oldService, oldIndex]) => {
-          if (oldService === newService && oldIndex === newIndex) {
+        (oldService) => {
+          if (oldService === newService) {
             return [map.remove(tag), patch];
           } else {
             return [map.remove(tag), patch.compose(new UpdateService((_: any) => newService, tag))];

package/_src/data/Tag/constructors.ts

@@ -1,6 +1,6 @@
 /**
  * @tsplus static fncts.TagOps __call
  */
-export function makeTag<T>(): Tag<T> {
-  return new Tag();
+export function makeTag<T>(id: string): Tag<T> {
+  return new Tag(id);
 }

package/_src/data/Tag/definition.ts

@@ -15,10 +15,11 @@ export class Tag<in out T> implements Hashable, Equatable {
   declare _T: (_: T) => T;
   readonly _typeId: TagTypeId = TagTypeId;
   private static counter      = new AtomicNumber(0);
-  readonly id                 = Tag.counter.getAndIncrement();
+
+  constructor(readonly id: string) {}
 
   get [Symbol.hash](): number {
-    return Hashable.combine(_tagHash, Hashable.number(this.id));
+    return Hashable.combine(_tagHash, Hashable.string(this.id));
   }
 
   [Symbol.equals](that: unknown): boolean {

package/data/Environment/definition.d.ts

@@ -13,12 +13,11 @@ export declare type EnvSymbol = typeof EnvSymbol;
  * @tsplus companion fncts.EnvironmentOps
  */
 export declare class Environment<R> implements Hashable, Equatable {
-    readonly map: HashMap<Tag<any>, readonly [unknown, number]>;
-    readonly index: number;
+    readonly map: HashMap<Tag<any>, unknown>;
     cache: HashMap<Tag<any>, unknown>;
     readonly _typeId: EnvSymbol;
     readonly [EnvSymbol]: (_: never) => R;
-    constructor(map: HashMap<Tag<any>, readonly [unknown, number]>, index: number, cache?: HashMap<Tag<any>, unknown>);
+    constructor(map: HashMap<Tag<any>, unknown>, cache?: HashMap<Tag<any>, unknown>);
     get [Symbol.hash](): number;
     [Symbol.equals](that: unknown): boolean;
 }

package/data/Tag/constructors.d.ts

@@ -3,4 +3,4 @@ import { Tag } from "@fncts/base/data/Tag/definition";
  * @tsplus static fncts.TagOps __call
  * @tsplus location "@fncts/base/data/Tag/constructors"
  */
-export declare function makeTag<T>(): Tag<T>;
+export declare function makeTag<T>(id: string): Tag<T>;

package/data/Tag/definition.d.ts

@@ -9,10 +9,11 @@ export declare type TagTypeId = typeof TagTypeId;
  * @tsplus companion fncts.TagOps
  */
 export declare class Tag<in out T> implements Hashable, Equatable {
+    readonly id: string;
     _T: (_: T) => T;
     readonly _typeId: TagTypeId;
     private static counter;
-    readonly id: number;
+    constructor(id: string);
     get [Symbol.hash](): number;
     [Symbol.equals](that: unknown): boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fncts/base",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "dependencies": {
     "@fncts/typelevel": "0.0.12"
   },