@effect-app/infra 3.5.1 → 3.5.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 3.5.2
+
+### Patch Changes
+
+- 11d21b0: fix: use the proper id
+
 ## 3.5.1
 
 ### Patch Changes

package/dist/Store/Memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Memory.d.ts","sourceRoot":"","sources":["../../src/Store/Memory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,OAAO,EAAE,MAAM,EAA8E,MAAM,YAAY,CAAA;AAC/H,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAGrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,oBAAoB,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGnH,wBAAgB,SAAS,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,IAEpF,GAAG,CAAC,EAAE,KAAG,wCAAG,CA0DtB;;AAGD,qBAAa,OACX,SAAQ,YAA6F;CACrG;AAmBF,wBAAgB,kBAAkB,CAAC,KAAK,SAAS,MAAM,OAAO,EAAE,OAAO,SAAS,WAAW,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAC/G,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7C,cAAc,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,6EA2KlC;AAED,eAAO,MAAM,eAAe;WACnB,KAAK,SAAS,MAAM,OAAO,EAAE,OAAO,SAAS,WAAW,EAAE,CAAC,EAAE,CAAC,aACxD,MAAM,SACV,KAAK,SACL,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,WACpC,WAAW,CAAC,OAAO,CAAC;CA+C/B,CAAA;AAEF,eAAO,MAAM,eAAe,wDAA2D,CAAA"}
+{"version":3,"file":"Memory.d.ts","sourceRoot":"","sources":["../../src/Store/Memory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,OAAO,EAAE,MAAM,EAA8E,MAAM,YAAY,CAAA;AAC/H,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAGrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,oBAAoB,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGnH,wBAAgB,SAAS,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,IAEpF,GAAG,CAAC,EAAE,KAAG,wCAAG,CA0DtB;;AAGD,qBAAa,OACX,SAAQ,YAA6F;CACrG;AAmBF,wBAAgB,kBAAkB,CAAC,KAAK,SAAS,MAAM,OAAO,EAAE,OAAO,SAAS,WAAW,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAC/G,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7C,cAAc,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,6EAyKlC;AAED,eAAO,MAAM,eAAe;WACnB,KAAK,SAAS,MAAM,OAAO,EAAE,OAAO,SAAS,WAAW,EAAE,CAAC,EAAE,CAAC,aACxD,MAAM,SACV,KAAK,SACL,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,WACpC,WAAW,CAAC,OAAO,CAAC;CA+C/B,CAAA;AAEF,eAAO,MAAM,eAAe,wDAA2D,CAAA"}

package/dist/Store/Memory.js

@@ -94,9 +94,7 @@ export function makeMemoryStoreInt(modelName, idKey, namespace, seed, _defaultVa
             .get(store)
             .pipe(Effect
             .map((m) => {
-            const mut = m;
-            items.forEach((e) => mut.delete(e[idKey]));
-            return mut;
+            return new Map([...m].filter(([_k]) => !items.includes(_k)));
         }), Effect
             .flatMap((_) => Ref.set(store, _)))
             .pipe(withPermit);
@@ -207,4 +205,4 @@ export const makeMemoryStore = () => ({
     })
 });
 export const MemoryStoreLive = StoreMaker.toLayer(Effect.sync(() => makeMemoryStore()));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Memory.js","sourceRoot":"","sources":["../../src/Store/Memory.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Memory.js","sourceRoot":"","sources":["../../src/Store/Memory.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "license": "MIT",
   "type": "module",
   "dependencies": {

package/src/Store/Memory.ts

@@ -107,7 +107,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
     const defaultValues = _defaultValues ?? {}
 
     const items = new Map([...items_].map((_) => [_[idKey], { _etag: undefined, ...defaultValues, ..._ }] as const))
-    const store = Ref.unsafeMake<ReadonlyMap<string, PM>>(items)
+    const store = Ref.unsafeMake<ReadonlyMap<Encoded[IdKey], PM>>(items)
     const sem = Effect.unsafeMakeSemaphore(1)
     const withPermit = sem.withPermits(1)
     const values = Effect.map(Ref.get(store), (s) => s.values())
@@ -125,7 +125,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
                 .pipe(
                   Effect
                     .map((m) => {
-                      const mut = m as Map<string, PM>
+                      const mut = m as Map<Encoded[IdKey], PM>
                       items.forEach((e) => mut.set(e[idKey], e))
                       return mut
                     }),
@@ -144,9 +144,7 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
         .pipe(
           Effect
             .map((m) => {
-              const mut = m as Map<string, PM>
-              items.forEach((e) => mut.delete(e[idKey]))
-              return mut
+              return new Map([...m].filter(([_k]) => !items.includes(_k)))
             }),
           Effect
             .flatMap((_) => Ref.set(store, _))