@undefineds.co/drizzle-solid 0.2.13 → 0.3.0

package/README.md

@@ -1,123 +1,101 @@
 # drizzle-solid
 
-`drizzle-solid` is a Drizzle-aligned adapter for application-owned data in Solid Pods.
+`drizzle-solid` is a Drizzle-aligned data layer for application-owned data in Solid Pods.
 
-It helps you define typed models, map them to RDF resources/documents/IRIs, and read or write them with a familiar query builder — without pretending Solid is a relational database.
+这次变化的重点不是强迫你把构造函数名字从 `drizzle()` 换成别的东西，而是把语义讲清楚：
 
-The library is intentionally **document-first**, **IRI-native**, **Pod-aware**, and **SPARQL-native**.
+- `table` 更接近 **resource layout / collection definition**
+- `link` 字段更接近 **RDF link / IRI link**
+- 实体最终身份更接近 **IRI / @id**，而不只是本地主键
+- 读取和写入不再默认共享 SQL 式语义
 
-## What it helps with
+## Scope
 
-- Defining typed application data for Solid Pods
-- Mapping fields to RDF predicates and resource layouts
-- Using a Drizzle-style CRUD/query builder over Pod data
-- Performing exact entity operations through full IRIs
-- Building discovery, federation, and notification flows on top of Solid-native storage
+Current v1 solves one problem well:
 
-## Design principles
+- persist application-owned data into Solid Pods with typed schemas
+- keep Pod layout explicit through `base` and `subjectTemplate`
+- make full IRIs part of the public API instead of hiding them behind local-only IDs
+- give Drizzle users a migration-friendly surface without pretending Solid is a SQL database
+- support adjacent Solid flows such as discovery, notifications, and federation where they fit the Pod model
 
-- **Document-first**: model around Solid resources and document boundaries
-- **IRI-native**: treat IRIs as first-class identity, not as an afterthought over local IDs
-- **Pod-aware**: keep resource layout, links, network, and access constraints explicit
-- **Drizzle-aligned**: stay close to Drizzle's builder surface and ergonomics where it makes sense
-- **SPARQL-native**: the native query model is SPARQL/Solid, not SQL emulation
+Not in v1:
 
-## What it is
-
-- A typed persistence layer for application-owned data in Solid Pods
-- A Drizzle-style API surface over RDF resources and documents
-- A practical bridge for teams migrating Drizzle mental models into Solid-native data flows
-
-## What it isn't
-
-- Not a general-purpose SQL ORM
-- Not a universal abstraction over arbitrary RDF on the open web
-- Not a graph database or SPARQL engine replacement
-- Not a black box that hides Pod boundaries, permissions, or network behavior
-- Not a promise that every SQL/driver-specific Drizzle feature maps cleanly to Solid
-
-## Core concepts
-
-### Resource
-
-A resource is the persisted unit in a Pod, usually a Turtle or JSON-LD document addressed by URL.
-
-### Document
-
-A document may contain one entity or many entities. Document layout is part of application design, not an implementation detail.
-
-### Entity
-
-An entity is a typed RDF subject stored in a document. It is closer to a linked-data subject than to a relational row.
-
-### IRI
+- full SQL/database feature parity
+- raw SQL as the primary abstraction
+- hiding Pod boundaries, permissions, or network behavior
+- implicit scan-based `updateMany/deleteMany` on backends that do not support set-based mutation
+- universal querying over arbitrary open-world RDF as the main goal
 
-IRIs are native identity. `drizzle-solid` keeps the full subject IRI available and provides explicit IRI APIs for exact operations.
+## Constructor Choice
 
-### Link
+仓库文档与 examples 默认先用 `pod(session, config?)` 讲主线语义：
 
-Links between entities are represented as IRIs and may cross documents or Pods.
+- `pod(session, config?)`
+- `drizzle(session, config?)`
 
-### Model
+建议这样理解：
 
-`drizzle-solid` supports two modeling styles:
+- `pod()` 是语义优先的正式入口，方便把 API 组织成 `collection()` / `entity()` / `bind()`
+- `drizzle()` 是同一运行时上的 Drizzle-aligned 入口，适合迁移或保留 builder/query 代码形状
+- 重要的不是“入口名”，而是下面这些语义：`base`、`subjectTemplate`、`IRI`、exact-target mutation
 
-- `podTable(...)`: schema plus concrete storage location
-- `solidSchema(...)` + `db.createTable(...)`: reusable schema separated from where data is stored
+## Public Surface
 
-### Pod client
+当前公开表面可以分成两层：
 
-`drizzle(session)` creates the database client bound to an authenticated Solid session.
+### Semantic-first surface
 
-## Modeling vs persistence
+- `pod(session, config?)`
+- `client.bind(schema, options)`
+- `client.collection(table)`
+- `client.entity(table, iri)`
+- `client.sparql(query)`
 
-A Solid application usually needs to answer two different questions:
+### Drizzle-aligned surface
 
-1. **What is the shape of my data?**
-2. **Where does that data live in Pods?**
+- `drizzle(session, config?)`
+- `podTable(name, columns, config)`
+- `solidSchema(...)`
+- `select / insert / update / delete`
+- `db.query.*` read facade
 
-`drizzle-solid` keeps those concerns explicit.
+## Install
 
-- Use `podTable(...)` when your app owns the storage location and you want one place to define shape + location.
-- Use `solidSchema(...)` when the same schema should be reused across different Pod locations, profiles, or discovered data sources.
-- Use `db.createTable(schema, { base, ... })` when you want to bind a reusable schema to a concrete place at runtime.
+```bash
+yarn add @undefineds.co/drizzle-solid drizzle-orm
+# optional, when your app wants the default SPARQL client engine
+yarn add @comunica/query-sparql-solid
+```
 
-This keeps Solid's persistence model visible instead of flattening everything into table-only abstractions.
+```bash
+npm install @undefineds.co/drizzle-solid drizzle-orm
+npm install @comunica/query-sparql-solid
+```
 
-## Why document-first
+`@comunica/query-sparql-solid` is an optional peer dependency.
 
-Solid stores data in resources, not in tables.
+Install it in the consuming app when you need built-in SPARQL query execution, LDP-backed query fallback, or direct SPARQL workflows.
 
-That means application design starts with questions like:
+Current public compatibility stance:
 
-- which entities belong in the same document
-- which entities should be split into separate resources
-- which resources should be public, private, or shared
-- how links should work across documents and Pods
+- officially supported: `@comunica/query-sparql-solid` `4.x`
+- not currently in the supported matrix: `3.x`
 
-`drizzle-solid` follows that reality. It provides a structured API, but keeps resource identity and document layout as part of the model.
+If another in-process runtime already carries Comunica (for example `xpod`), inject that engine instead of forcing a second copy. See `docs/api/README.md` and `docs/guides/installation.md`.
 
 ## Quick start
 
-### Install
+仓库里的主线 quick start 默认使用 `pod(session)`，因为它会把 `collection()` / `entity()` / `bind()` 语义直接写在代码里。
 
-```bash
-yarn add @undefineds.co/drizzle-solid
-# or
-npm install @undefineds.co/drizzle-solid
-```
-
-> In this repository, the examples import `drizzle-solid` through a local TypeScript path alias. In external applications, import the published package name: `@undefineds.co/drizzle-solid`.
-
-### Define a model and run CRUD
+如果你已有大量 Drizzle 风格代码，`drizzle(session)` 仍然是正式可用入口。
 
 ```ts
 import {
-  drizzle,
+  pod,
   podTable,
   string,
   datetime,
-  eq,
 } from '@undefineds.co/drizzle-solid';
 
 const posts = podTable('posts', {
@@ -131,115 +109,84 @@ const posts = podTable('posts', {
   type: 'http://schema.org/CreativeWork',
 });
 
-const db = drizzle(session);
-await db.init([posts]);
+const client = pod(session);
+await client.init(posts);
+
+const postsCollection = client.collection(posts);
 
-await db.insert(posts).values({
+const created = await postsCollection.create({
   id: 'post-1',
   title: 'Hello Solid',
   content: 'Stored as RDF in a Pod document.',
   createdAt: new Date(),
 });
 
-const rows = await db.select()
-  .from(posts)
-  .where(eq(posts.id, 'post-1'));
+const first = await postsCollection.first({
+  where: { id: 'post-1' },
+});
 
-await db.update(posts)
-  .set({ title: 'Updated title' })
-  .where(eq(posts.id, 'post-1'));
+const postIri = created?.['@id'] ?? postsCollection.iriFor({
+  id: 'post-1',
+  title: 'Hello Solid',
+  content: 'Stored as RDF in a Pod document.',
+  createdAt: new Date(),
+});
 
-await db.delete(posts)
-  .where(eq(posts.id, 'post-1'));
+const post = client.entity(posts, postIri);
+await post.update({ title: 'Updated title' });
+await post.delete();
 ```
 
-### Reusable schema + runtime binding
+> 如果你保持 `drizzle(session)` 作为入口，语义并不会变：`base`、`subjectTemplate`、`IRI`、精确写目标这些约束仍然完全成立。
 
-```ts
-import {
-  drizzle,
-  solidSchema,
-  id,
-  string,
-} from '@undefineds.co/drizzle-solid';
+## Reusable schema + runtime binding
 
-const profileSchema = solidSchema({
-  id: id(),
-  name: string('name').predicate('http://xmlns.com/foaf/0.1/name'),
-  bio: string('bio').predicate('http://schema.org/description'),
-}, {
-  type: 'http://xmlns.com/foaf/0.1/Person',
-});
+Use `solidSchema(...)` when you want to separate the reusable data shape from where that data lives in a Pod.
 
-const db = drizzle(session);
+如果你使用 `pod()` façade：
 
-const profileTable = db.createTable(profileSchema, {
+```ts
+const client = pod(session);
+const profileTable = client.bind(profileSchema, {
   base: 'https://alice.example/profile/card',
 });
 ```
 
-## Exact IRI operations
-
-For detail-page flows, remote links, shared resources, or exact mutation targets, use the IRI APIs:
-
-- `db.findByIri(table, iri)`
-- `db.updateByIri(table, iri, data)`
-- `db.deleteByIri(table, iri)`
-- `db.subscribeByIri(table, iri, options)`
+如果你保持 `drizzle()` 入口：
 
 ```ts
-const agent = await db.findByIri(agentTable, 'https://alice.example/data/agents.ttl#assistant');
-
-await db.updateByIri(
-  agentTable,
-  'https://alice.example/data/agents.ttl#assistant',
-  { description: 'Updated through explicit IRI' },
-);
-
-await db.deleteByIri(
-  agentTable,
-  'https://alice.example/data/agents.ttl#assistant',
-);
+const db = drizzle(session);
+const profileTable = db.createTable(profileSchema, {
+  base: 'https://alice.example/profile/card',
+});
 ```
 
-## Subject templates and identity
+## Identity and placement
 
-`subjectTemplate` controls how record identity maps to Pod resources.
+`subjectTemplate` defines how application identity maps onto Pod resources.
 
 Common patterns:
 
-- `#{id}`: fragment mode, many entities in one RDF file
-- `{id}.ttl`: document mode, one file per entity
-- `{id}.ttl#it`: document mode with stable in-document fragment
-- `{chatId}/{yyyy}/{MM}/{dd}/messages.ttl#{id}`: multi-variable, date-partitioned layouts
+- `#{id}`: many entities inside one document
+- `{id}.ttl`: one document per entity
+- `{id}.ttl#it`: one document per entity with stable in-document fragment
+- `{chatId}/messages.ttl#{id}`: multi-variable layouts and partitioned resources
 
-Example:
+这不是命名细节，而是持久化语义本身。
 
-```ts
-const Message = podTable('Message', {
-  id: string('id').primaryKey(),
-  chatId: string('chatId').predicate('http://example.org/chatId'),
-  content: string('content').predicate('http://schema.org/text'),
-  timestamp: datetime('timestamp').predicate('http://schema.org/dateCreated'),
-}, {
-  base: 'https://alice.example/data/chats/',
-  subjectTemplate: '{chatId}/messages.ttl#{id}',
-  type: 'http://schema.org/Message',
-});
-```
+## Exact-target mutation semantics
 
-For reads, the library can often work from:
+Reads and writes do not intentionally behave the same way.
 
-- a full IRI
-- all template variables
-- a narrower partial condition that scans a smaller bounded area
+- list / filter reads can stay collection-oriented
+- writes should prefer exact-target semantics
+- incomplete `where(...)` information should not silently degrade into scan + mutate
+- if a subject can only be resolved by multiple template variables, mutation should use an explicit IRI or provide all required variables
 
-Read-path and write-path semantics are intentionally different:
+所以最重要的变化不是“要不要换成 `pod()`”，而是：
 
-- **Read queries** (`select`, `db.query.*`) may use partial template information for list/filter flows when the resolver can keep the scan bounded.
-- **Mutations** (`update`, `delete`) require deterministic targets by default. If `where()` cannot uniquely resolve the subject from the template, the dialect throws and tells you to use `updateByIri()` / `deleteByIri()` (or to provide the missing template variables).
-- **No implicit scan-based `updateMany/deleteMany` fallback** is performed on backends that do not natively support set-based mutation.
-- **Capability-based enhancement**: if a backend explicitly supports filter-based multi-row mutation in the future (for example, an xpod capability), `drizzle-solid` can expose that path there without pretending every Solid server supports it.
+- 什么时候你只是在做集合读取
+- 什么时候你已经需要一个确定的实体目标
 
 ## Server support
 
@@ -247,118 +194,62 @@ Read-path and write-path semantics are intentionally different:
 
 | Capability | Community Solid Server | xpod |
 | --- | --- | --- |
-| Basic CRUD | ✅ LDP mode | ✅ LDP mode |
-| SPARQL SELECT pushdown | ❌ Client-side / resolver-driven | ✅ `/-/sparql` sidecar |
-| SPARQL UPDATE | ⚠️ Limited / write path stays LDP-oriented | ✅ Better server-side support |
-| Filter / aggregation pushdown | ❌ Fallbacks and client execution | ✅ Single-Pod pushdown |
+| Basic CRUD | ✅ | ✅ |
+| Document notifications | ✅ | ✅ |
+| Drizzle-style read facade | ✅ | ✅ |
+| SPARQL pushdown | ⚠️ Limited / often client-assisted | ✅ Better in-process support |
+| Filter / aggregation pushdown | ❌ Mostly fallback execution | ✅ Better server-side support |
 | Federated queries | ⚠️ Client-side federation | ⚠️ Client-side federation |
-| Notifications | ✅ | ✅ |
-| In-process test runtime | ⚠️ External CSS setup | ✅ via `@undefineds.co/xpod` |
-
-### Community Solid Server (CSS)
-
-On plain CSS, `drizzle-solid` keeps working, but many queries are resolved through client-side execution and Solid-aware fallbacks. This is the compatibility baseline.
-
-### xpod
+| In-process local runtime | ⚠️ External setup | ✅ via `@undefineds.co/xpod` |
 
-`xpod` adds a Solid-compatible SPARQL sidecar and is the recommended development/runtime target when you want stronger query pushdown and a lower-friction local setup.
-
-See `docs/xpod-features.md` for more detail.
+If `xpod` already ships its own Comunica stack, `drizzle-solid` can reuse that copy instead of requiring another app-level install.
 
 ## Verified examples
 
-The canonical examples in `examples/` are verified in the test suite.
-
-- `examples/01-quick-start.ts` — CRUD quick start
-- `examples/02-relational-query.ts` — relational query API surface
-- `examples/03-zero-config-discovery.ts` — zero-config discovery flow
-- `examples/04-notifications.ts` — Solid notifications
-- `examples/05-data-discovery.ts` — discovery API
-- `examples/06-federated-query.ts` — federated query across Pods
-- `examples/07-hooks-and-profile.ts` — hooks and profile management
-- `examples/08-iri-based-operations.ts` — explicit IRI operations
-- `examples/08-schema-inheritance.ts` — schema inheritance
-- `examples/09-multi-variable-templates.ts` — multi-variable subject templates
-
-The example manifest lives at `examples/manifest.json`, and the integration verification lives at `tests/integration/css/examples-verification.test.ts`.
-
-## Query surface and SQL scope
-
-`drizzle-solid` aims to stay close to Drizzle's public builder surface where that maps cleanly to Solid.
+The canonical examples in `examples/` are part of the real integration verification flow:
 
-Current supported surface includes:
+- `examples/01-quick-start.ts`
+- `examples/02-relational-query.ts`
+- `examples/03-zero-config-discovery.ts`
+- `examples/04-notifications.ts`
+- `examples/05-data-discovery.ts`
+- `examples/06-federated-query.ts`
+- `examples/07-hooks-and-profile.ts`
+- `examples/08-iri-based-operations.ts`
+- `examples/08-schema-inheritance.ts`
+- `examples/09-multi-variable-templates.ts`
 
-- CRUD builders: `select`, `insert`, `update`, `delete`
-- Read-oriented query facade: `db.query.*.findMany`, `findFirst`, `findById`, `findByIRI`, `count`
-- Conditions: `eq`, `ne`, `gt`, `gte`, `lt`, `lte`, `like`, `ilike`, `inArray`, `exists`, `and`, `or`, `not`
-- Query features: joins, ordering, limits, offsets, distinct
-- Aggregations: `count`, `sum`, `avg`, `min`, `max`
-- Batch and `returning()` support where implemented by the dialect
-- Raw **SPARQL** workflows where you need explicit graph-native control
-
-Not the mainline contract:
-
-- raw SQL as the primary abstraction
-- transaction semantics identical to SQL databases
-- implicit scan-based `updateMany/deleteMany` on backends that do not support set-based mutation
-- driver-specific DDL, auto-increment, foreign keys, or SQL engine behaviors
+See `examples/manifest.json` and `tests/integration/css/examples-verification.test.ts`.
 
-The migration goal is API familiarity with low migration cost, but the execution model remains Solid/SPARQL-native rather than semantics-faking SQL emulation.
+## Migration
 
-## Discovery, interoperability, and federation
+If you already know `drizzle-orm`, start here:
 
-The library also includes higher-level Solid workflows:
+- `docs/guides/migrating-from-drizzle-orm.md`
 
-- data discovery and interop metadata
-- TypeIndex-driven location discovery
-- shape-aware table generation
-- federated queries across discovered Pod locations
-- notifications for resource/entity updates
+那份指南重点解释的是：
 
-Useful starting points:
+- `table/row` → `resource/document/entity/IRI`
+- `link` / relation fields → RDF link / IRI link
+- `where`-style mutation → exact-target mutation
+- `toSQL()` / raw SQL 主心智 → `toSPARQL()` / SPARQL 主心智
 
-- `docs/guides/data-discovery.md`
-- `docs/guides/notifications.md`
-- `docs/guides/css-notifications.md`
-- `docs/federated-queries.md`
-- `docs/guides/multi-variable-templates.md`
+而不是要求你第一步先改掉构造函数名。
 
 ## Documentation map
 
-- `examples/README.md` — curated walkthroughs and runnable examples
-- `docs/quick-start-local.md` — local setup guide
+- `docs/api/README.md` — current public API and constructor positioning
+- `docs/guides/installation.md` — installation and SPARQL engine setup
+- `docs/guides/migrating-from-drizzle-orm.md` — migration guide for Drizzle users
+- `examples/README.md` — curated runnable examples
 - `docs/guides/data-discovery.md` — discovery workflows
-- `docs/guides/issue-handling.md` — issue reproduction and regression workflow
-- `docs/guides/testing.md` — test conventions and coverage strategy
-- `ACTION-PLAN.md` — current parity and implementation plan
-
-## Planned scope
-
-### Current direction
-
-The current focus is:
-
-- typed models for application-owned Pod data
-- explicit document and subject placement
-- Drizzle-aligned query ergonomics
-- practical CRUD, discovery, federation, and notification flows
-
-### Likely next steps
-
-- better modeling ergonomics around reusable schemas and links
-- clearer guidance around multi-resource layouts and identity strategies
-- continued Drizzle parity on Solid-relevant behaviors
-- stronger documentation around Solid-native tradeoffs and migration paths
-
-### Out of scope
-
-- hiding Solid behind a fake SQL database mental model
-- universal querying over arbitrary open-world RDF as the primary goal
-- promising full relational/database feature parity where Solid semantics differ
+- `docs/guides/notifications.md` — notification flows
+- `docs/xpod-features.md` — xpod runtime notes
+- `ACTION-PLAN.md` — parity and implementation plan
 
 ## Contributing
 
-Before contributing:
+Before pushing:
 
 ```bash
 yarn build

package/dist/core/ast-to-sparql.d.ts

@@ -23,7 +23,7 @@ export declare class ASTToSPARQLConverter {
     private prefixes;
     constructor(podUrl: string, webId?: string | undefined, uriResolver?: UriResolver);
     /**
-     * Set table registry for URI reference resolution
+     * Set table registry for URI link resolution
      */
     setTableRegistry(tableRegistry: Map<string, PodTable[]>, tableNameRegistry: Map<string, PodTable>, baseUri?: string): void;
     convertSelect(ast: any, table: PodTable, targetGraph?: string, fromSources?: string[], allowGraphVariable?: boolean): SPARQLQuery;

package/dist/core/ast-to-sparql.js

@@ -26,7 +26,7 @@ class ASTToSPARQLConverter {
         this.expressionBuilder = new expression_builder_1.ExpressionBuilder(this.uriResolver);
     }
     /**
-     * Set table registry for URI reference resolution
+     * Set table registry for URI link resolution
      */
     setTableRegistry(tableRegistry, tableNameRegistry, baseUri) {
         this.tableContext = { tableRegistry, tableNameRegistry, baseUri };

package/dist/core/comunica-patch.d.ts

@@ -1,7 +1,2 @@
-type NodeCreateRequire = (filename: string) => NodeRequire;
-declare const resolveCreateRequire: () => NodeCreateRequire | null;
-declare const createRequireFn: NodeCreateRequire | null;
-declare const moduleFilename: string;
-declare const requireModule: NodeRequire | null;
-declare const patchActionObserverHttp: (moduleName: string) => boolean;
+export declare const applyComunicaPatches: (requireModule?: NodeRequire | null) => boolean;
 //# sourceMappingURL=comunica-patch.d.ts.map

package/dist/core/comunica-patch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comunica-patch.d.ts","sourceRoot":"","sources":["../../src/core/comunica-patch.ts"],"names":[],"mappings":"AAGA,KAAK,iBAAiB,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,WAAW,CAAC;AAE3D,QAAA,MAAM,oBAAoB,QAAO,iBAAiB,GAAG,IAoBpD,CAAC;AAEF,QAAA,MAAM,eAAe,0BAAyB,CAAC;AAC/C,QAAA,MAAM,cAAc,QAIR,CAAC;AAEb,QAAA,MAAM,aAAa,oBAEX,CAAC;AAGT,QAAA,MAAM,uBAAuB,GAAI,YAAY,MAAM,YAkClD,CAAC"}
+{"version":3,"file":"comunica-patch.d.ts","sourceRoot":"","sources":["../../src/core/comunica-patch.ts"],"names":[],"mappings":"AAkEA,eAAO,MAAM,oBAAoB,GAAI,gBAAe,WAAW,GAAG,IAA2B,KAAG,OAe/F,CAAC"}

package/dist/core/comunica-patch.js

@@ -1,6 +1,8 @@
 "use strict";
 // Comunica 兼容性补丁
 // 修复 ActionObserverHttp 中 observedActors 未定义的问题
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyComunicaPatches = void 0;
 const resolveCreateRequire = () => {
     if (typeof window !== 'undefined') {
         return null;
@@ -26,11 +28,10 @@ const moduleFilename = typeof __filename === 'string'
     : (typeof process !== 'undefined' && typeof process.cwd === 'function'
         ? process.cwd()
         : '/');
-const requireModule = createRequireFn
+const defaultRequireModule = createRequireFn
     ? createRequireFn(moduleFilename)
     : null;
-// 直接修补所有 Comunica 的 ActionObserverHttp 类
-const patchActionObserverHttp = (moduleName) => {
+const patchActionObserverHttp = (requireModule, moduleName) => {
     if (!requireModule) {
         return false;
     }
@@ -39,15 +40,9 @@ const patchActionObserverHttp = (moduleName) => {
         if (comunica && comunica.ActionObserverHttp) {
             const originalOnRun = comunica.ActionObserverHttp.prototype.onRun;
             comunica.ActionObserverHttp.prototype.onRun = function (actor, _action, _output) {
-                // 确保 observedActors 存在且是数组
-                if (!this.observedActors) {
+                if (!this.observedActors || !Array.isArray(this.observedActors)) {
                     this.observedActors = [];
                 }
-                // observedActors 应该是一个数组，如果不是则初始化为空数组
-                if (!Array.isArray(this.observedActors)) {
-                    this.observedActors = [];
-                }
-                // 调用原始方法
                 return originalOnRun.call(this, actor, _action, _output);
             };
             console.log(`[Patch] Successfully patched ActionObserverHttp.onRun in ${moduleName}`);
@@ -55,22 +50,24 @@ const patchActionObserverHttp = (moduleName) => {
         }
         return false;
     }
-    catch (error) {
-        // 静默忽略模块不存在的错误
+    catch {
         return false;
     }
 };
-// 修补所有可能的 ActionObserverHttp 实例
-// 包括顶层和 @comunica/query-sparql-solid 嵌套的 node_modules
-if (requireModule) {
+const applyComunicaPatches = (requireModule = defaultRequireModule) => {
+    if (!requireModule) {
+        return false;
+    }
     const modules = [
-        // 顶层模块
         '@comunica/actor-query-result-serialize-sparql-json',
         '@comunica/actor-query-result-serialize-stats',
-        // 嵌套在 @comunica/query-sparql-solid 下的模块 (Comunica v4)
         '@comunica/query-sparql-solid/node_modules/@comunica/actor-query-result-serialize-sparql-json',
         '@comunica/query-sparql-solid/node_modules/@comunica/actor-query-result-serialize-stats'
     ];
-    modules.forEach(patchActionObserverHttp);
-}
+    return modules
+        .map((moduleName) => patchActionObserverHttp(requireModule, moduleName))
+        .some(Boolean);
+};
+exports.applyComunicaPatches = applyComunicaPatches;
+(0, exports.applyComunicaPatches)();
 //# sourceMappingURL=comunica-patch.js.map

package/dist/core/comunica-patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"comunica-patch.js","sourceRoot":"","sources":["../../src/core/comunica-patch.ts"],"names":[],"mappings":";AAAA,iBAAiB;AACjB,gDAAgD;AAIhD,MAAM,oBAAoB,GAAG,GAA6B,EAAE;IAC1D,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAA4B,CAAC;QAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAsD,CAAC;QAC7F,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,SAAS,CAAC,aAAa,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,oBAAoB,EAAE,CAAC;AAC/C,MAAM,cAAc,GAAG,OAAO,UAAU,KAAK,QAAQ;IACnD,CAAC,CAAC,UAAU;IACZ,CAAC,CAAC,CAAC,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,OAAO,CAAC,GAAG,KAAK,UAAU;QAClE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;QACf,CAAC,CAAC,GAAG,CAAC,CAAC;AAEb,MAAM,aAAa,GAAG,eAAe;IACnC,CAAC,CAAC,eAAe,CAAC,cAAc,CAAC;IACjC,CAAC,CAAC,IAAI,CAAC;AAET,yCAAyC;AACzC,MAAM,uBAAuB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACrD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,QAAQ,IAAI,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAC5C,MAAM,aAAa,GAAG,QAAQ,CAAC,kBAAkB,CAAC,SAAS,CAAC,KAAK,CAAC;YAElE,QAAQ,CAAC,kBAAkB,CAAC,SAAS,CAAC,KAAK,GAAG,UAAS,KAAU,EAAE,OAAY,EAAE,OAAY;gBAC3F,2BAA2B;gBAC3B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;oBACzB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;gBAC3B,CAAC;gBAED,sCAAsC;gBACtC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;oBACxC,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;gBAC3B,CAAC;gBAED,SAAS;gBACT,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC3D,CAAC,CAAC;YAEF,OAAO,CAAC,GAAG,CAAC,4DAA4D,UAAU,EAAE,CAAC,CAAC;YACtF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAe;QACf,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,gCAAgC;AAChC,sDAAsD;AACtD,IAAI,aAAa,EAAE,CAAC;IAClB,MAAM,OAAO,GAAG;QACd,OAAO;QACP,oDAAoD;QACpD,8CAA8C;QAC9C,sDAAsD;QACtD,8FAA8F;QAC9F,wFAAwF;KACzF,CAAC;IAEF,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"comunica-patch.js","sourceRoot":"","sources":["../../src/core/comunica-patch.ts"],"names":[],"mappings":";AAAA,iBAAiB;AACjB,gDAAgD;;;AAIhD,MAAM,oBAAoB,GAAG,GAA6B,EAAE;IAC1D,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAA4B,CAAC;QAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAsD,CAAC;QAC7F,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,SAAS,CAAC,aAAa,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,oBAAoB,EAAE,CAAC;AAC/C,MAAM,cAAc,GAAG,OAAO,UAAU,KAAK,QAAQ;IACnD,CAAC,CAAC,UAAU;IACZ,CAAC,CAAC,CAAC,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,OAAO,CAAC,GAAG,KAAK,UAAU;QAClE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;QACf,CAAC,CAAC,GAAG,CAAC,CAAC;AAEb,MAAM,oBAAoB,GAAG,eAAe;IAC1C,CAAC,CAAC,eAAe,CAAC,cAAc,CAAC;IACjC,CAAC,CAAC,IAAI,CAAC;AAET,MAAM,uBAAuB,GAAG,CAAC,aAAiC,EAAE,UAAkB,EAAE,EAAE;IACxF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,QAAQ,IAAI,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAC5C,MAAM,aAAa,GAAG,QAAQ,CAAC,kBAAkB,CAAC,SAAS,CAAC,KAAK,CAAC;YAElE,QAAQ,CAAC,kBAAkB,CAAC,SAAS,CAAC,KAAK,GAAG,UAAS,KAAU,EAAE,OAAY,EAAE,OAAY;gBAC3F,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;oBAChE,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;gBAC3B,CAAC;gBAED,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC3D,CAAC,CAAC;YAEF,OAAO,CAAC,GAAG,CAAC,4DAA4D,UAAU,EAAE,CAAC,CAAC;YACtF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,CAAC,gBAAoC,oBAAoB,EAAW,EAAE;IACxG,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,OAAO,GAAG;QACd,oDAAoD;QACpD,8CAA8C;QAC9C,8FAA8F;QAC9F,wFAAwF;KACzF,CAAC;IAEF,OAAO,OAAO;SACX,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,uBAAuB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;SACvE,IAAI,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAC;AAfW,QAAA,oBAAoB,wBAe/B;AAEF,IAAA,4BAAoB,GAAE,CAAC"}