@logixjs/query 0.0.1 → 1.0.0

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/Engine.cjs

@@ -64,7 +64,7 @@ var middleware = (config) => /* @__PURE__ */ (() => {
 })();
 
 // src/Engine.ts
-var EngineTagImpl = class extends import_effect2.Context.Tag("@logixjs/query/Engine")() {
+var EngineTagImpl = class extends import_effect2.ServiceMap.Service()("@logixjs/query/Engine") {
 };
 var Engine = Object.assign(EngineTagImpl, {
   layer: (engine) => import_effect2.Layer.succeed(EngineTagImpl, engine),

package/dist/Engine.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/Engine.ts","../src/internal/middleware/middleware.ts"],"sourcesContent":["import type * as EffectOp from '@logixjs/core/EffectOp'\nimport { Context, Effect, Layer, Option } from 'effect'\nimport { middleware as middlewareImpl, type MiddlewareConfig } from './internal/middleware/middleware.js'\n\nexport type InvalidateRequest =\n  | { readonly kind: 'byResource'; readonly resourceId: string }\n  | { readonly kind: 'byParams'; readonly resourceId: string; readonly keyHash: string }\n  | { readonly kind: 'byTag'; readonly tag: string }\n\nexport interface Engine {\n  readonly fetch: <A>(args: {\n    readonly resourceId: string\n    readonly keyHash: string\n    readonly effect: Effect.Effect<A, unknown, any>\n    /**\n     * MUST be serializable and slim; recommended default is undefined (lazy),\n     * and only populate it when diagnostics/devtools require it.\n     */\n    readonly meta?: unknown\n  }) => Effect.Effect<A, unknown, any>\n\n  /**\n   * perf: optional fast path to avoid allocations on the hot path.\n   * Semantics must match `fetch({ ... })`.\n   */\n  readonly fetchFast?: <A>(\n    resourceId: string,\n    keyHash: string,\n    effect: Effect.Effect<A, unknown, any>,\n    meta?: unknown,\n  ) => Effect.Effect<A, unknown, any>\n\n  readonly invalidate: (request: InvalidateRequest) => Effect.Effect<void, unknown, any>\n\n  /**\n   * Read-only fast path: must not trigger IO; used to short-circuit to success before refresh,\n   * avoiding loading jitter.\n   */\n  readonly peekFresh?: <A>(args: {\n    readonly resourceId: string\n    readonly keyHash: string\n  }) => Effect.Effect<Option.Option<A>, never, any>\n}\n\nclass EngineTagImpl extends Context.Tag('@logixjs/query/Engine')<EngineTagImpl, Engine>() {}\n\nexport const Engine = Object.assign(EngineTagImpl, {\n  layer: (engine: Engine): Layer.Layer<EngineTagImpl, never, never> => Layer.succeed(EngineTagImpl, engine),\n  middleware: (config?: MiddlewareConfig): EffectOp.Middleware => middlewareImpl(config),\n})\n\nexport type { MiddlewareConfig }\n","import type * as EffectOp from '@logixjs/core/EffectOp'\nimport { Effect, Option } from 'effect'\nimport { Engine } from '../../Engine.js'\nimport type { Engine as EngineService } from '../../Engine.js'\n\nexport interface MiddlewareConfig {\n  /**\n   * Default: only applies to EffectOp that carries resourceId+keyHash (from StateTrait.source).\n   * Optional: further filter by resourceId.\n   */\n  readonly useFor?: (resourceId: string) => boolean\n}\n\n/**\n * Query middleware (EffectOp): external engine takeover point.\n * - Delegates ResourceSpec.load execution to Engine (cache / in-flight dedupe / invalidation, etc.)\n * - Still preserves Logix Runtime's keyHash gating and ResourceSnapshot source-of-truth semantics\n */\nexport const middleware = (config?: MiddlewareConfig): EffectOp.Middleware =>\n  (() => {\n    // perf: within the same Runtime instance, Engine injection is stable.\n    // Cache it in the middleware closure to avoid a Context lookup on every fetch.\n    let cachedEngine: EngineService | undefined\n\n    return (op) => {\n      if ((op.kind !== 'service' && op.kind !== 'trait-source') || !op.meta?.resourceId || !op.meta.keyHash) {\n        return op.effect as any\n      }\n\n      const resourceId = op.meta.resourceId\n      if (config?.useFor && !config.useFor(resourceId)) {\n        return op.effect as any\n      }\n\n      const keyHash = op.meta.keyHash as string\n\n      if (cachedEngine) {\n        if (cachedEngine.fetchFast) {\n          return cachedEngine.fetchFast(resourceId, keyHash, op.effect as any)\n        }\n        return cachedEngine.fetch({ resourceId, keyHash, effect: op.effect as any })\n      }\n\n      return Effect.serviceOption(Engine).pipe(\n        Effect.flatMap((engineOpt) => {\n          if (Option.isNone(engineOpt)) {\n            return Effect.fail(\n              new Error(\n                `[Query.Engine.middleware] Missing Query.Engine in the Runtime scope; please provide Query.Engine.layer(Query.TanStack.engine(new QueryClient())) (recommended) or Query.Engine.layer(customEngine).`,\n              ),\n            )\n          }\n          cachedEngine = engineOpt.value\n          if (cachedEngine.fetchFast) {\n            return cachedEngine.fetchFast(resourceId, keyHash, op.effect as any)\n          }\n          return cachedEngine.fetch({ resourceId, keyHash, effect: op.effect as any })\n        }),\n      ) as any\n    }\n  })()\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,IAAAA,iBAA+C;;;ACA/C,oBAA+B;AAiBxB,IAAM,aAAa,CAAC,WACxB,uBAAM;AAGL,MAAI;AAEJ,SAAO,CAAC,OAAO;AACb,QAAK,GAAG,SAAS,aAAa,GAAG,SAAS,kBAAmB,CAAC,GAAG,MAAM,cAAc,CAAC,GAAG,KAAK,SAAS;AACrG,aAAO,GAAG;AAAA,IACZ;AAEA,UAAM,aAAa,GAAG,KAAK;AAC3B,QAAI,QAAQ,UAAU,CAAC,OAAO,OAAO,UAAU,GAAG;AAChD,aAAO,GAAG;AAAA,IACZ;AAEA,UAAM,UAAU,GAAG,KAAK;AAExB,QAAI,cAAc;AAChB,UAAI,aAAa,WAAW;AAC1B,eAAO,aAAa,UAAU,YAAY,SAAS,GAAG,MAAa;AAAA,MACrE;AACA,aAAO,aAAa,MAAM,EAAE,YAAY,SAAS,QAAQ,GAAG,OAAc,CAAC;AAAA,IAC7E;AAEA,WAAO,qBAAO,cAAc,MAAM,EAAE;AAAA,MAClC,qBAAO,QAAQ,CAAC,cAAc;AAC5B,YAAI,qBAAO,OAAO,SAAS,GAAG;AAC5B,iBAAO,qBAAO;AAAA,YACZ,IAAI;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AACA,uBAAe,UAAU;AACzB,YAAI,aAAa,WAAW;AAC1B,iBAAO,aAAa,UAAU,YAAY,SAAS,GAAG,MAAa;AAAA,QACrE;AACA,eAAO,aAAa,MAAM,EAAE,YAAY,SAAS,QAAQ,GAAG,OAAc,CAAC;AAAA,MAC7E,CAAC;AAAA,IACH;AAAA,EACF;AACF,GAAG;;;ADhBL,IAAM,gBAAN,cAA4B,uBAAQ,IAAI,uBAAuB,EAAyB,EAAE;AAAC;AAEpF,IAAM,SAAS,OAAO,OAAO,eAAe;AAAA,EACjD,OAAO,CAAC,WAA6D,qBAAM,QAAQ,eAAe,MAAM;AAAA,EACxG,YAAY,CAAC,WAAmD,WAAe,MAAM;AACvF,CAAC;","names":["import_effect"]}
+{"version":3,"sources":["../src/Engine.ts","../src/internal/middleware/middleware.ts"],"sourcesContent":["import type * as EffectOp from '@logixjs/core/EffectOp'\nimport type { JsonValue } from '@logixjs/core/Observability'\nimport { Effect, Layer, Option, ServiceMap } from 'effect'\nimport { middleware as middlewareImpl, type MiddlewareConfig } from './internal/middleware/middleware.js'\n\nexport type InvalidateRequest =\n  | { readonly kind: 'byResource'; readonly resourceId: string }\n  | { readonly kind: 'byParams'; readonly resourceId: string; readonly keyHash: string }\n  | { readonly kind: 'byTag'; readonly tag: string }\n\nexport interface Engine {\n  readonly fetch: <A>(args: {\n    readonly resourceId: string\n    readonly keyHash: string\n    readonly effect: Effect.Effect<A, unknown, any>\n    /**\n     * MUST be serializable and slim; recommended default is undefined (lazy),\n     * and only populate it when diagnostics/devtools require it.\n     */\n    readonly meta?: JsonValue\n  }) => Effect.Effect<A, unknown, any>\n\n  /**\n   * perf: optional fast path to avoid allocations on the hot path.\n   * Semantics must match `fetch({ ... })`.\n   */\n  readonly fetchFast?: <A>(\n    resourceId: string,\n    keyHash: string,\n    effect: Effect.Effect<A, unknown, any>,\n    meta?: JsonValue,\n  ) => Effect.Effect<A, unknown, any>\n\n  readonly invalidate: (request: InvalidateRequest) => Effect.Effect<void, unknown, any>\n\n  /**\n   * Read-only fast path: must not trigger IO; used to short-circuit to success before refresh,\n   * avoiding loading jitter.\n   */\n  readonly peekFresh?: <A>(args: {\n    readonly resourceId: string\n    readonly keyHash: string\n  }) => Effect.Effect<Option.Option<A>, never, any>\n}\n\nclass EngineTagImpl extends ServiceMap.Service<EngineTagImpl, Engine>()('@logixjs/query/Engine') {}\n\nexport const Engine = Object.assign(EngineTagImpl, {\n  layer: (engine: Engine): Layer.Layer<EngineTagImpl, never, never> => Layer.succeed(EngineTagImpl, engine),\n  middleware: (config?: MiddlewareConfig): EffectOp.Middleware => middlewareImpl(config),\n})\n\nexport type { MiddlewareConfig }\n","import type * as EffectOp from '@logixjs/core/EffectOp'\nimport { Effect, Option, ServiceMap } from 'effect'\nimport { Engine } from '../../Engine.js'\nimport type { Engine as EngineService } from '../../Engine.js'\n\nexport interface MiddlewareConfig {\n  /**\n   * Default: only applies to EffectOp that carries resourceId+keyHash (from StateTrait.source).\n   * Optional: further filter by resourceId.\n   */\n  readonly useFor?: (resourceId: string) => boolean\n}\n\n/**\n * Query middleware (EffectOp): external engine takeover point.\n * - Delegates ResourceSpec.load execution to Engine (cache / in-flight dedupe / invalidation, etc.)\n * - Still preserves Logix Runtime's keyHash gating and ResourceSnapshot source-of-truth semantics\n */\nexport const middleware = (config?: MiddlewareConfig): EffectOp.Middleware =>\n  (() => {\n    // perf: within the same Runtime instance, Engine injection is stable.\n    // Cache it in the middleware closure to avoid a Context lookup on every fetch.\n    let cachedEngine: EngineService | undefined\n\n    return (op) => {\n      if ((op.kind !== 'service' && op.kind !== 'trait-source') || !op.meta?.resourceId || !op.meta.keyHash) {\n        return op.effect as any\n      }\n\n      const resourceId = op.meta.resourceId\n      if (config?.useFor && !config.useFor(resourceId)) {\n        return op.effect as any\n      }\n\n      const keyHash = op.meta.keyHash as string\n\n      if (cachedEngine) {\n        if (cachedEngine.fetchFast) {\n          return cachedEngine.fetchFast(resourceId, keyHash, op.effect as any)\n        }\n        return cachedEngine.fetch({ resourceId, keyHash, effect: op.effect as any })\n      }\n\n      return Effect.serviceOption(Engine as unknown as ServiceMap.Key<any, EngineService>).pipe(\n        Effect.flatMap((engineOpt) => {\n          if (Option.isNone(engineOpt)) {\n            return Effect.fail(\n              new Error(\n                `[Query.Engine.middleware] Missing Query.Engine in the Runtime scope; please provide Query.Engine.layer(Query.TanStack.engine(new QueryClient())) (recommended) or Query.Engine.layer(customEngine).`,\n              ),\n            )\n          }\n          cachedEngine = engineOpt.value\n          if (cachedEngine.fetchFast) {\n            return cachedEngine.fetchFast(resourceId, keyHash, op.effect as any)\n          }\n          return cachedEngine.fetch({ resourceId, keyHash, effect: op.effect as any })\n        }),\n      ) as any\n    }\n  })()\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,IAAAA,iBAAkD;;;ACDlD,oBAA2C;AAiBpC,IAAM,aAAa,CAAC,WACxB,uBAAM;AAGL,MAAI;AAEJ,SAAO,CAAC,OAAO;AACb,QAAK,GAAG,SAAS,aAAa,GAAG,SAAS,kBAAmB,CAAC,GAAG,MAAM,cAAc,CAAC,GAAG,KAAK,SAAS;AACrG,aAAO,GAAG;AAAA,IACZ;AAEA,UAAM,aAAa,GAAG,KAAK;AAC3B,QAAI,QAAQ,UAAU,CAAC,OAAO,OAAO,UAAU,GAAG;AAChD,aAAO,GAAG;AAAA,IACZ;AAEA,UAAM,UAAU,GAAG,KAAK;AAExB,QAAI,cAAc;AAChB,UAAI,aAAa,WAAW;AAC1B,eAAO,aAAa,UAAU,YAAY,SAAS,GAAG,MAAa;AAAA,MACrE;AACA,aAAO,aAAa,MAAM,EAAE,YAAY,SAAS,QAAQ,GAAG,OAAc,CAAC;AAAA,IAC7E;AAEA,WAAO,qBAAO,cAAc,MAAuD,EAAE;AAAA,MACnF,qBAAO,QAAQ,CAAC,cAAc;AAC5B,YAAI,qBAAO,OAAO,SAAS,GAAG;AAC5B,iBAAO,qBAAO;AAAA,YACZ,IAAI;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AACA,uBAAe,UAAU;AACzB,YAAI,aAAa,WAAW;AAC1B,iBAAO,aAAa,UAAU,YAAY,SAAS,GAAG,MAAa;AAAA,QACrE;AACA,eAAO,aAAa,MAAM,EAAE,YAAY,SAAS,QAAQ,GAAG,OAAc,CAAC;AAAA,MAC7E,CAAC;AAAA,IACH;AAAA,EACF;AACF,GAAG;;;ADfL,IAAM,gBAAN,cAA4B,0BAAW,QAA+B,EAAE,uBAAuB,EAAE;AAAC;AAE3F,IAAM,SAAS,OAAO,OAAO,eAAe;AAAA,EACjD,OAAO,CAAC,WAA6D,qBAAM,QAAQ,eAAe,MAAM;AAAA,EACxG,YAAY,CAAC,WAAmD,WAAe,MAAM;AACvF,CAAC;","names":["import_effect"]}

package/dist/Engine.d.cts

@@ -1,5 +1,6 @@
 import * as EffectOp from '@logixjs/core/EffectOp';
-import { Effect, Option, Context, Layer } from 'effect';
+import { JsonValue } from '@logixjs/core/Observability';
+import { Effect, Option, ServiceMap, Layer } from 'effect';
 
 interface MiddlewareConfig {
     /**
@@ -20,7 +21,7 @@ type InvalidateRequest = {
     readonly kind: 'byTag';
     readonly tag: string;
 };
-declare const EngineTagImpl_base: Context.TagClass<EngineTagImpl, "@logixjs/query/Engine", Engine>;
+declare const EngineTagImpl_base: ServiceMap.ServiceClass<EngineTagImpl, "@logixjs/query/Engine", Engine>;
 declare class EngineTagImpl extends EngineTagImpl_base {
 }
 interface Engine {
@@ -32,13 +33,13 @@ interface Engine {
          * MUST be serializable and slim; recommended default is undefined (lazy),
          * and only populate it when diagnostics/devtools require it.
          */
-        readonly meta?: unknown;
+        readonly meta?: JsonValue;
     }) => Effect.Effect<A, unknown, any>;
     /**
      * perf: optional fast path to avoid allocations on the hot path.
      * Semantics must match `fetch({ ... })`.
      */
-    readonly fetchFast?: <A>(resourceId: string, keyHash: string, effect: Effect.Effect<A, unknown, any>, meta?: unknown) => Effect.Effect<A, unknown, any>;
+    readonly fetchFast?: <A>(resourceId: string, keyHash: string, effect: Effect.Effect<A, unknown, any>, meta?: JsonValue) => Effect.Effect<A, unknown, any>;
     readonly invalidate: (request: InvalidateRequest) => Effect.Effect<void, unknown, any>;
     /**
      * Read-only fast path: must not trigger IO; used to short-circuit to success before refresh,

package/dist/Engine.d.ts

@@ -1,5 +1,6 @@
 import * as EffectOp from '@logixjs/core/EffectOp';
-import { Effect, Option, Context, Layer } from 'effect';
+import { JsonValue } from '@logixjs/core/Observability';
+import { Effect, Option, ServiceMap, Layer } from 'effect';
 
 interface MiddlewareConfig {
     /**
@@ -20,7 +21,7 @@ type InvalidateRequest = {
     readonly kind: 'byTag';
     readonly tag: string;
 };
-declare const EngineTagImpl_base: Context.TagClass<EngineTagImpl, "@logixjs/query/Engine", Engine>;
+declare const EngineTagImpl_base: ServiceMap.ServiceClass<EngineTagImpl, "@logixjs/query/Engine", Engine>;
 declare class EngineTagImpl extends EngineTagImpl_base {
 }
 interface Engine {
@@ -32,13 +33,13 @@ interface Engine {
          * MUST be serializable and slim; recommended default is undefined (lazy),
          * and only populate it when diagnostics/devtools require it.
          */
-        readonly meta?: unknown;
+        readonly meta?: JsonValue;
     }) => Effect.Effect<A, unknown, any>;
     /**
      * perf: optional fast path to avoid allocations on the hot path.
      * Semantics must match `fetch({ ... })`.
      */
-    readonly fetchFast?: <A>(resourceId: string, keyHash: string, effect: Effect.Effect<A, unknown, any>, meta?: unknown) => Effect.Effect<A, unknown, any>;
+    readonly fetchFast?: <A>(resourceId: string, keyHash: string, effect: Effect.Effect<A, unknown, any>, meta?: JsonValue) => Effect.Effect<A, unknown, any>;
     readonly invalidate: (request: InvalidateRequest) => Effect.Effect<void, unknown, any>;
     /**
      * Read-only fast path: must not trigger IO; used to short-circuit to success before refresh,

package/dist/Engine.js

@@ -1,6 +1,6 @@
 import {
   Engine
-} from "./chunk-THVAADR2.js";
+} from "./chunk-3P3M3A55.js";
 import "./chunk-PZ5AY32C.js";
 export {
   Engine

package/dist/Query.cjs

@@ -82,7 +82,7 @@ var middleware = (config) => /* @__PURE__ */ (() => {
 })();
 
 // src/Engine.ts
-var EngineTagImpl = class extends import_effect2.Context.Tag("@logixjs/query/Engine")() {
+var EngineTagImpl = class extends import_effect2.ServiceMap.Service()("@logixjs/query/Engine") {
 };
 var Engine = Object.assign(EngineTagImpl, {
   layer: (engine) => import_effect2.Layer.succeed(EngineTagImpl, engine),
@@ -130,7 +130,7 @@ var autoTrigger = (module2, config) => module2.logic(($) => {
     const prev = pending.get(name);
     if (!prev) return;
     pending.delete(name);
-    yield* import_effect3.Fiber.interruptFork(prev);
+    yield* import_effect3.Fiber.interrupt(prev);
   });
   const sourcePathOf = (name) => `queries.${name}`;
   const refresh = (name, options) => $.traits.source.refresh(sourcePathOf(name), options);
@@ -138,9 +138,9 @@ var autoTrigger = (module2, config) => module2.logic(($) => {
     yield* cancelPending(name);
     const fiber = yield* import_effect3.Effect.forkScoped(
       import_effect3.Effect.sleep(import_effect3.Duration.millis(ms)).pipe(
-        import_effect3.Effect.zipRight(refresh(name)),
+        import_effect3.Effect.flatMap(() => refresh(name)),
         import_effect3.Effect.ensuring(import_effect3.Effect.sync(() => pending.delete(name))),
-        import_effect3.Effect.catchAllCause(() => import_effect3.Effect.void)
+        import_effect3.Effect.catchCause(() => import_effect3.Effect.void)
       )
     );
     pending.set(name, fiber);
@@ -212,21 +212,23 @@ var autoTrigger = (module2, config) => module2.logic(($) => {
   });
   const refreshAll = (options) => import_effect3.Effect.forEach(
     Object.keys(config.queries),
-    (name) => cancelPending(name).pipe(import_effect3.Effect.zipRight(refresh(name, options)))
+    (name) => cancelPending(name).pipe(import_effect3.Effect.flatMap(() => refresh(name, options)))
   ).pipe(import_effect3.Effect.asVoid);
   const setup = $.lifecycle.onStart(maybeAutoRefresh("mount"));
   const run = import_effect3.Effect.suspend(
     () => import_effect3.Effect.all(
       [
         // params/ui changes: handled by Query's default logic, avoiding scattered UI-side useEffect triggers.
-        $.onAction("setParams").runFork(
+        // Keep params/ui-driven auto refresh aligned with action stream order.
+        // `source.refresh` already forks IO internally, so the watcher itself can stay ordered.
+        $.onAction("setParams").run(
           (action) => import_effect3.Effect.gen(function* () {
             const state = yield* $.state.read;
             const next = { ...state, params: action.payload };
             yield* maybeAutoRefresh("keyChange", next);
           })
         ),
-        $.onAction("setUi").runFork(
+        $.onAction("setUi").run(
           (action) => import_effect3.Effect.gen(function* () {
             const state = yield* $.state.read;
             const next = { ...state, ui: action.payload };
@@ -309,14 +311,15 @@ var toStateTraitSpec = (input) => {
       triggers,
       debounceMs: q.debounceMs,
       concurrency: q.concurrency === "exhaust" ? "exhaust-trailing" : q.concurrency,
-      key: (...depsValues) => q.key(...depsValues)
+      key: (...depsValues) => q.key(...depsValues),
+      meta: q.meta
     });
   }
   return out;
 };
 
 // src/Query.ts
-var InvalidateRequestSchema = import_effect5.Schema.Union(
+var InvalidateRequestSchema = import_effect5.Schema.Union([
   import_effect5.Schema.Struct({
     kind: import_effect5.Schema.Literal("byResource"),
     resourceId: import_effect5.Schema.String
@@ -330,7 +333,7 @@ var InvalidateRequestSchema = import_effect5.Schema.Union(
     kind: import_effect5.Schema.Literal("byTag"),
     tag: import_effect5.Schema.String
   })
-);
+]);
 var assertQueryName = (name) => {
   if (!name) {
     throw new Error(`[Query.make] query name must be non-empty`);
@@ -342,6 +345,15 @@ var assertQueryName = (name) => {
     throw new Error(`[Query.make] query name "${name}" is reserved`);
   }
 };
+var buildRefreshTargetSchema = (names) => {
+  if (names.length === 0) {
+    return import_effect5.Schema.Never;
+  }
+  return import_effect5.Schema.Literals(names);
+};
+var buildQueriesSchema = (queries) => import_effect5.Schema.Struct(
+  Object.fromEntries(Object.keys(queries).map((key) => [key, import_effect5.Schema.Unknown]))
+);
 var make = (id, config) => {
   const queryBuilder = {
     source: (q) => q
@@ -352,28 +364,13 @@ var make = (id, config) => {
     return raw(queryBuilder);
   })();
   const queriesForTraits = queries;
-  for (const name of Object.keys(queries)) {
+  const queryNames = Object.keys(queries);
+  for (const name of queryNames) {
     assertQueryName(name);
   }
-  const RefreshTargetSchema = (() => {
-    const names = Object.keys(queries);
-    if (names.length === 0) return import_effect5.Schema.Never;
-    if (names.length === 1) {
-      return import_effect5.Schema.Literal(names[0]);
-    }
-    const asUnionMembers = (items) => {
-      if (items.length < 2) {
-        throw new Error(`[Query.make] internal error: expected at least 2 query names for union`);
-      }
-      return items;
-    };
-    const members = names.map((n) => import_effect5.Schema.Literal(n));
-    return import_effect5.Schema.Union(...asUnionMembers(members));
-  })();
+  const RefreshTargetSchema = buildRefreshTargetSchema(queryNames);
   const UiSchema = import_effect5.Schema.Unknown;
-  const QueriesSchema = import_effect5.Schema.Struct(
-    Object.fromEntries(Object.keys(queries).map((k) => [k, import_effect5.Schema.Unknown]))
-  );
+  const QueriesSchema = buildQueriesSchema(queries);
   const StateSchema = import_effect5.Schema.Struct({
     params: config.params,
     ui: UiSchema,
@@ -415,9 +412,7 @@ var make = (id, config) => {
   const initial = (params) => ({
     params: params ?? config.initialParams,
     ui: config.ui ?? {},
-    queries: Object.fromEntries(
-      Object.keys(queries).map((k) => [k, Logix4.Resource.Snapshot.idle()])
-    )
+    queries: Object.fromEntries(Object.keys(queries).map((key) => [key, Logix4.Resource.Snapshot.idle()]))
   });
   const controller = {
     make: (runtime) => {