@effect-app/infra 0.173.0 → 0.174.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @effect-app/infra
 
+## 0.174.0
+
+### Minor Changes
+
+- c8a07bc: fix path
+
+### Patch Changes
+
+- Updated dependencies [c8a07bc]
+  - @effect-app/core@0.131.0
+  - @effect-app/fluent-extensions@0.126.0
+  - @effect-app/infra-adapters@0.119.0
+  - effect-app@0.153.0
+  - @effect-app/schema@0.184.0
+
 ## 0.173.0
 
 ### Minor Changes

package/_cjs/_ext/Array.cjs

@@ -7,7 +7,7 @@ exports.RecordInspect = RecordInspect;
 exports.getFirstById_ = getFirstById_;
 var tsplus_module_1 = _interopRequireWildcard(require("effect/Equal"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Chunk"));
-var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
+var tsplus_module_3 = _interopRequireWildcard(require("effect-app/_ext/misc"));
 var _util = require("util");
 var _errors = require("../errors.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }

package/_cjs/services/Operations/live.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Live = void 0;
 var tsplus_module_1 = _interopRequireWildcard(require("effect/Effect"));
-var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/prelude/_ext/date"));
+var tsplus_module_2 = _interopRequireWildcard(require("effect-app/_ext/date"));
 var tsplus_module_3 = _interopRequireWildcard(require("effect/Option"));
 var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/core/Array"));
 var tsplus_module_5 = _interopRequireWildcard(require("effect/Chunk"));
@@ -13,7 +13,7 @@ var tsplus_module_6 = _interopRequireWildcard(require("effect/Exit"));
 var tsplus_module_7 = _interopRequireWildcard(require("effect/Cause"));
 var tsplus_module_8 = _interopRequireWildcard(require("effect-app/schema"));
 var tsplus_module_9 = _interopRequireWildcard(require("@effect/schema/Parser"));
-var tsplus_module_10 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
+var tsplus_module_10 = _interopRequireWildcard(require("effect-app/_ext/misc"));
 var tsplus_module_11 = _interopRequireWildcard(require("effect/Duration"));
 var tsplus_module_12 = _interopRequireWildcard(require("effect/Schedule"));
 var tsplus_module_13 = _interopRequireWildcard(require("effect/Layer"));

package/_cjs/services/Repository/dsl.cjs

@@ -11,7 +11,7 @@ exports.makeDSL = makeDSL;
 exports.makeOneDSL = makeOneDSL;
 exports.updateWith = updateWith;
 exports.updateWithOne = updateWithOne;
-var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/Pure"));
+var tsplus_module_1 = _interopRequireWildcard(require("effect-app/Pure"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Effect"));
 var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/Array"));
 var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/core/Effect"));

package/_cjs/services/Repository/ext.cjs

@@ -26,10 +26,10 @@ exports.saveManyWithPureBatched = saveManyWithPureBatched;
 exports.saveManyWithPure_ = exports.saveManyWithPureBatched_ = void 0;
 exports.saveWithEvents = saveWithEvents;
 exports.saveWithPure_ = void 0;
-var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
+var tsplus_module_1 = _interopRequireWildcard(require("effect-app/_ext/misc"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Effect"));
 var tsplus_module_3 = _interopRequireWildcard(require("effect-app/schema"));
-var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/prelude/Pure"));
+var tsplus_module_4 = _interopRequireWildcard(require("effect-app/Pure"));
 var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/core/Array"));
 var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
 var _errors = require("../../errors.cjs");

package/_cjs/services/RepositoryBase.cjs

@@ -8,11 +8,11 @@ exports.makeRepo = makeRepo;
 exports.makeStore = makeStore;
 exports.makeWhere = makeWhere;
 exports.removeById = removeById;
-var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
+var tsplus_module_1 = _interopRequireWildcard(require("effect-app/_ext/misc"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Effect"));
 var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/infra/services/Repository/ext"));
 var tsplus_module_4 = _interopRequireWildcard(require("effect-app/schema"));
-var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/Pure"));
+var tsplus_module_5 = _interopRequireWildcard(require("effect-app/Pure"));
 var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/core/Array"));
 var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
 var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/core/Effect"));

package/_cjs/services/Store/Redis.cjs

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.RedisStoreLayer = RedisStoreLayer;
 var tsplus_module_1 = _interopRequireWildcard(require("effect/Effect"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Option"));
-var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
+var tsplus_module_3 = _interopRequireWildcard(require("effect-app/_ext/misc"));
 var tsplus_module_4 = _interopRequireWildcard(require("effect/ReadonlyArray"));
 var tsplus_module_5 = _interopRequireWildcard(require("effect/Secret"));
 var tsplus_module_6 = _interopRequireWildcard(require("effect/Layer"));

package/_cjs/services/Store/utils.cjs

@@ -12,7 +12,7 @@ exports.lowerThan = lowerThan;
 exports.lowerThanExclusive = lowerThanExclusive;
 exports.lowercaseIfString = lowercaseIfString;
 exports.makeUpdateETag = exports.makeETag = void 0;
-var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
+var tsplus_module_1 = _interopRequireWildcard(require("effect-app/_ext/misc"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Option"));
 var tsplus_module_3 = _interopRequireWildcard(require("effect/Effect"));
 var _utils = require("effect-app/utils");

package/dist/_ext/Array.js

@@ -1,6 +1,6 @@
 import * as tsplus_module_1 from "effect/Equal";
 import * as tsplus_module_2 from "effect/Chunk";
-import * as tsplus_module_3 from "@effect-app/prelude/_ext/misc";
+import * as tsplus_module_3 from "effect-app/_ext/misc";
 import { inspect } from "util";
 import { NotFoundError } from "../errors.js";
 /**

package/dist/services/Operations/live.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "effect/Effect";
-import * as tsplus_module_2 from "@effect-app/prelude/_ext/date";
+import * as tsplus_module_2 from "effect-app/_ext/date";
 import * as tsplus_module_3 from "effect/Option";
 import * as tsplus_module_4 from "@effect-app/core/Array";
 import * as tsplus_module_5 from "effect/Chunk";
@@ -7,7 +7,7 @@ import * as tsplus_module_6 from "effect/Exit";
 import * as tsplus_module_7 from "effect/Cause";
 import * as tsplus_module_8 from "effect-app/schema";
 import * as tsplus_module_9 from "@effect/schema/Parser";
-import * as tsplus_module_10 from "@effect-app/prelude/_ext/misc";
+import * as tsplus_module_10 from "effect-app/_ext/misc";
 import * as tsplus_module_11 from "effect/Duration";
 import * as tsplus_module_12 from "effect/Schedule";
 import * as tsplus_module_13 from "effect/Layer";

package/dist/services/QueueMaker/service.d.ts

@@ -17,8 +17,8 @@ export declare const QueueMaker: QueueMakerOps;
 export declare const QueueMeta: import("@effect-app/schema").Schema<{
     readonly requestContext: RequestContext;
     readonly span?: {
-        readonly traceId: string;
         readonly spanId: string;
+        readonly traceId: string;
         readonly sampled?: boolean | undefined;
     } | undefined;
 }, {
@@ -45,8 +45,8 @@ export declare const QueueMeta: import("@effect-app/schema").Schema<{
         readonly namespace?: string | undefined;
     };
     readonly span?: {
-        readonly traceId: string;
         readonly spanId: string;
+        readonly traceId: string;
         readonly sampled?: boolean | undefined;
     } | undefined;
 }, never>;

package/dist/services/Repository/dsl.js

@@ -1,4 +1,4 @@
-import * as tsplus_module_1 from "@effect-app/prelude/Pure";
+import * as tsplus_module_1 from "effect-app/Pure";
 import * as tsplus_module_2 from "effect/Effect";
 import * as tsplus_module_3 from "@effect-app/core/Array";
 import * as tsplus_module_4 from "@effect-app/core/Effect";

package/dist/services/Repository/ext.js

@@ -1,7 +1,7 @@
-import * as tsplus_module_1 from "@effect-app/prelude/_ext/misc";
+import * as tsplus_module_1 from "effect-app/_ext/misc";
 import * as tsplus_module_2 from "effect/Effect";
 import * as tsplus_module_3 from "effect-app/schema";
-import * as tsplus_module_4 from "@effect-app/prelude/Pure";
+import * as tsplus_module_4 from "effect-app/Pure";
 import * as tsplus_module_5 from "@effect-app/core/Array";
 import * as tsplus_module_6 from "@effect-app/core/_ext/Iterable";
 export const get = get_1;

package/dist/services/RepositoryBase.js

@@ -1,8 +1,8 @@
-import * as tsplus_module_1 from "@effect-app/prelude/_ext/misc";
+import * as tsplus_module_1 from "effect-app/_ext/misc";
 import * as tsplus_module_2 from "effect/Effect";
 import * as tsplus_module_3 from "@effect-app/infra/services/Repository/ext";
 import * as tsplus_module_4 from "effect-app/schema";
-import * as tsplus_module_5 from "@effect-app/prelude/Pure";
+import * as tsplus_module_5 from "effect-app/Pure";
 import * as tsplus_module_6 from "@effect-app/core/Array";
 import * as tsplus_module_7 from "@effect-app/core/_ext/Iterable";
 import * as tsplus_module_8 from "@effect-app/core/Effect";

package/dist/services/Store/Redis.js

@@ -1,6 +1,6 @@
 import * as tsplus_module_1 from "effect/Effect";
 import * as tsplus_module_2 from "effect/Option";
-import * as tsplus_module_3 from "@effect-app/prelude/_ext/misc";
+import * as tsplus_module_3 from "effect-app/_ext/misc";
 import * as tsplus_module_4 from "effect/ReadonlyArray";
 import * as tsplus_module_5 from "effect/Secret";
 import * as tsplus_module_6 from "effect/Layer";

package/dist/services/Store/utils.js

@@ -1,4 +1,4 @@
-import * as tsplus_module_1 from "@effect-app/prelude/_ext/misc";
+import * as tsplus_module_1 from "effect-app/_ext/misc";
 import * as tsplus_module_2 from "effect/Option";
 import * as tsplus_module_3 from "effect/Effect";
 import { get } from "effect-app/utils";

package/dist/services/simpledb/cosmosdb.d.ts

@@ -7,8 +7,8 @@ import type { DBRecord } from "./shared.js";
 import { OptimisticLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<EA, never, REncode>, decode: (d: EA) => Effect<A, EDecode, RDecode>, indexes: IndexingPolicy) => import("effect/Effect").Effect<{
-    find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, import("effect/Cause").UnknownException | simpledb.InvalidStateError, RDecode | Cosmos.CosmosClient | simpledb.RecordCache>;
+    find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, import("effect/Cause").UnknownException | simpledb.InvalidStateError, Cosmos.CosmosClient | simpledb.RecordCache | RDecode>;
     findBy: (parameters: Record<string, string>) => import("effect/Effect").Effect<import("effect/Option").Option<any>, import("effect/Cause").UnknownException, Cosmos.CosmosClient>;
-    save: (record: A) => import("effect/Effect").Effect<A, OptimisticLockException, REncode | Cosmos.CosmosClient | simpledb.RecordCache>;
+    save: (record: A) => import("effect/Effect").Effect<A, OptimisticLockException, Cosmos.CosmosClient | simpledb.RecordCache | REncode>;
 }, import("effect/Cause").UnknownException, Cosmos.CosmosClient>;
 //# sourceMappingURL=cosmosdb.d.ts.map

package/dist/services/simpledb/diskdb.d.ts

@@ -6,7 +6,7 @@ import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<EA, never, REncode>, decode: (d: EA) => Effect<A, EDecode, RDecode>, schemaVersion: string, makeIndexKey: (r: A) => Index, dir?: string) => {
     find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, simpledb.InvalidStateError, simpledb.RecordCache | RDecode>;
     findByIndex: (index: Index) => import("effect/Effect").Effect<import("effect/Option").Option<TKey>, never, never>;
-    save: (record: A) => import("effect/Effect").Effect<A, import("./shared.js").OptimisticLockException | simpledb.InvalidStateError | CouldNotAquireDbLockException, simpledb.RecordCache | REncode>;
+    save: (record: A) => import("effect/Effect").Effect<A, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, simpledb.RecordCache | REncode>;
 };
 export declare function initialise(dir: string): void;
 //# sourceMappingURL=diskdb.d.ts.map

package/dist/services/simpledb/redisdb.d.ts

@@ -6,22 +6,22 @@ import type { DBRecord, Index } from "./shared.js";
 import { CouldNotAquireDbLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<EA, never, REncode>, decode: (d: EA) => Effect<A, EDecode, RDecode>, schemaVersion: string, makeIndexKey: (r: A) => Index) => {
-    find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, simpledb.InvalidStateError, simpledb.RecordCache | RDecode | RedisClient>;
+    find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, simpledb.InvalidStateError, RedisClient | simpledb.RecordCache | RDecode>;
     findByIndex: (index: Index) => import("effect/Effect").Effect<import("effect/Option").Option<TKey>, import("@effect-app/infra-adapters/redis-client").ConnectionException, RedisClient>;
-    save: (record: A) => import("effect/Effect").Effect<A, import("./shared.js").OptimisticLockException | simpledb.InvalidStateError | CouldNotAquireDbLockException, simpledb.RecordCache | REncode | RedisClient>;
+    save: (record: A) => import("effect/Effect").Effect<A, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, RedisClient | simpledb.RecordCache | REncode>;
 };
 declare const RedisSerializedDBRecord_base: S.EnhancedClass<{
     readonly data: string;
-    readonly timestamp: Date;
     readonly version: string;
+    readonly timestamp: Date;
 }, {
     readonly data: string;
-    readonly timestamp: string;
     readonly version: string;
+    readonly timestamp: string;
 }, never, {
     readonly data: string;
-    readonly timestamp: Date;
     readonly version: string;
+    readonly timestamp: Date;
 }, RedisSerializedDBRecord, {
     version: S.Schema<string, string, never>;
     timestamp: S.Schema<Date, string, never> & {

package/dist/services/simpledb/shared.d.ts

@@ -39,16 +39,16 @@ export interface DBRecord<TKey extends string> {
 }
 declare const SerializedDBRecord_base: S.EnhancedClass<{
     readonly data: string;
-    readonly timestamp: Date;
     readonly version: string;
+    readonly timestamp: Date;
 }, {
     readonly data: string;
-    readonly timestamp: string;
     readonly version: string;
+    readonly timestamp: string;
 }, never, {
     readonly data: string;
-    readonly timestamp: Date;
     readonly version: string;
+    readonly timestamp: Date;
 }, SerializedDBRecord, {
     version: S.Schema<string, string, never>;
     timestamp: S.Schema<Date, string, never> & {
@@ -60,12 +60,12 @@ export declare class SerializedDBRecord extends SerializedDBRecord_base {
 }
 export declare function makeSerialisedDBRecord(s: Schema<any>): S.Schema<{
     readonly data: any;
-    readonly timestamp: Date;
     readonly version: number;
+    readonly timestamp: Date;
 }, {
     readonly data: any;
-    readonly timestamp: string;
     readonly version: number;
+    readonly timestamp: string;
 }, never>;
 export interface CachedRecord<T> {
     version: string;

package/dist/services/simpledb/simpledb.d.ts

@@ -17,7 +17,7 @@ export interface RecordCache extends ReturnType<typeof makeLiveRecordCache> {
 }
 export declare const RecordCache: import("effect/Context").Tag<RecordCache, RecordCache>;
 export declare const LiveRecordCache: import("effect/Layer").Layer<RecordCache, never, never>;
-export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<Option<CachedRecord<EA>>, E, R>, decode: (d: EA) => Effect<A, EDecode, RDecode>, type: string): (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, E | InvalidStateError, R | RDecode | RecordCache>;
-export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<CachedRecord<A>, E, R>, type: string): (record: A) => import("effect/Effect").Effect<A, E, R | RecordCache>;
+export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<Option<CachedRecord<EA>>, E, R>, decode: (d: EA) => Effect<A, EDecode, RDecode>, type: string): (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, InvalidStateError | E, RecordCache | R | RDecode>;
+export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<CachedRecord<A>, E, R>, type: string): (record: A) => import("effect/Effect").Effect<A, E, RecordCache | R>;
 export declare function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(tryRead: (id: string) => Effect<Option<CachedRecord<EA>>, E, R>, save: (r: A, version: Option<Version>) => Effect<CachedRecord<A>, E, R>, lock: (id: string) => Effect<unknown, E2, R2 | Scope>, type: string): (record: A) => import("effect/Effect").Effect<A, OptimisticLockException | InvalidStateError | E | E2, RecordCache | R | Exclude<R2, import("effect/Scope").Scope>>;
 //# sourceMappingURL=simpledb.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.173.0",
+  "version": "0.174.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -21,11 +21,11 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
-    "@effect-app/fluent-extensions": "0.125.9",
-    "@effect-app/infra-adapters": "0.118.0",
-    "@effect-app/core": "0.130.0",
-    "effect-app": "0.152.0",
-    "@effect-app/schema": "0.183.14"
+    "@effect-app/fluent-extensions": "0.126.0",
+    "@effect-app/core": "0.131.0",
+    "@effect-app/schema": "0.184.0",
+    "@effect-app/infra-adapters": "0.119.0",
+    "effect-app": "0.153.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",
@@ -43,7 +43,7 @@
     "ts-node": "^10.9.2",
     "typescript": "npm:@effect-app/typescript@5.4.0-tsplus.20240124",
     "vitest": "^1.2.2",
-    "@effect-app/compiler": "0.61.0"
+    "@effect-app/compiler": "0.62.0"
   },
   "peerDependencies": {
     "express": "^4.18.2"

package/tsplus.config.json

@@ -1,6 +1,8 @@
 {
   "importMap": {
+    "^(.*)/packages/prelude/_src/(.*)\\.[cm]?[tj]s$": "effect-app/$2",
     "^(.*)/packages/(.*)/_src/(.*)\\.[cm]?[tj]s$": "@effect-app/$2/$3",
+    "^(.*)/node_modules/@effect-app/prelude/_src/(.*)\\.[cm]?[tj]s$": "effect-app/$2",
     "^(.*)/node_modules/@effect-app/(.*)/_src/(.*)\\.[cm]?[tj]s$": "@effect-app/$2/$3",
     ".pnpm/[^\/]*/node_modules/(.*)": "$1"
   }