@coasys/ad4m-connect 0.13.0-postmessage-ws-proxy.0 → 0.13.0-postmessage-ws-proxy.2

package/dist/web.js

@@ -2415,6 +2415,41 @@ var SHACLShape = class {
           target: `literal:string:${JSON.stringify(prop.in)}`
         });
       }
+      if (prop.relationKind) {
+        links.push({
+          source: propShapeId,
+          predicate: "ad4m://relationKind",
+          target: `literal:string:${prop.relationKind}`
+        });
+      }
+      if (prop.targetClassName) {
+        links.push({
+          source: propShapeId,
+          predicate: "ad4m://targetClassName",
+          target: `literal:string:${prop.targetClassName}`
+        });
+      }
+      if (prop.whereFilter !== void 0 && prop.whereFilter !== null) {
+        links.push({
+          source: propShapeId,
+          predicate: "ad4m://whereFilter",
+          target: `literal:string:${JSON.stringify(prop.whereFilter)}`
+        });
+      }
+      if (prop.wherePredicates && Object.keys(prop.wherePredicates).length > 0) {
+        links.push({
+          source: propShapeId,
+          predicate: "ad4m://wherePredicates",
+          target: `literal:string:${JSON.stringify(prop.wherePredicates)}`
+        });
+      }
+      if (prop.filter !== void 0) {
+        links.push({
+          source: propShapeId,
+          predicate: "ad4m://filter",
+          target: `literal:${prop.filter}`
+        });
+      }
     }
     return links;
   }
@@ -2563,6 +2598,40 @@ var SHACLShape = class {
         } catch (e7) {
         }
       }
+      const relationKindLink = links.find((l5) => l5.source === propShapeId && l5.predicate === "ad4m://relationKind");
+      if (relationKindLink) {
+        const val = relationKindLink.target.replace(/^literal:\/\/string:|^literal:string:/, "");
+        if (val === "hasMany" || val === "hasOne" || val === "belongsToOne" || val === "belongsToMany") {
+          prop.relationKind = val;
+        }
+      }
+      const targetClassNameLink = links.find((l5) => l5.source === propShapeId && l5.predicate === "ad4m://targetClassName");
+      if (targetClassNameLink) {
+        prop.targetClassName = targetClassNameLink.target.replace(/^literal:\/\/string:|^literal:string:/, "");
+      }
+      const whereFilterLink = links.find((l5) => l5.source === propShapeId && l5.predicate === "ad4m://whereFilter");
+      if (whereFilterLink) {
+        try {
+          const jsonStr = whereFilterLink.target.replace(/^literal:\/\/string:|^literal:string:/, "");
+          prop.whereFilter = JSON.parse(jsonStr);
+        } catch (e7) {
+        }
+      }
+      const wherePredicatesLink = links.find((l5) => l5.source === propShapeId && l5.predicate === "ad4m://wherePredicates");
+      if (wherePredicatesLink) {
+        try {
+          const jsonStr = wherePredicatesLink.target.replace(/^literal:\/\/string:|^literal:string:/, "");
+          prop.wherePredicates = JSON.parse(jsonStr);
+        } catch (e7) {
+        }
+      }
+      const filterLink = links.find((l5) => l5.source === propShapeId && l5.predicate === "ad4m://filter");
+      if (filterLink) {
+        let val = filterLink.target.replace(/^literal:\/\/|^literal:/, "");
+        if (val.startsWith("boolean:"))
+          val = val.substring(8);
+        prop.filter = val === "true";
+      }
       shape.addProperty(prop);
     }
     return shape;
@@ -2592,7 +2661,12 @@ var SHACLShape = class {
         getter: p2.getter,
         conformance_conditions: p2.conformanceConditions,
         class: p2.class,
-        in: p2.in
+        in: p2.in,
+        relation_kind: p2.relationKind,
+        target_class_name: p2.targetClassName,
+        where_filter: p2.whereFilter,
+        where_predicates: p2.wherePredicates,
+        filter: p2.filter
       })),
       constructor_actions: this.constructor_actions,
       destructor_actions: this.destructor_actions
@@ -2621,7 +2695,12 @@ var SHACLShape = class {
         getter: p2.getter,
         conformanceConditions: p2.conformance_conditions,
         class: p2.class,
-        in: p2.in
+        in: p2.in,
+        relationKind: p2.relation_kind,
+        targetClassName: p2.target_class_name,
+        whereFilter: p2.where_filter,
+        wherePredicates: p2.where_predicates,
+        filter: p2.filter
       });
     }
     if (json.constructor_actions) {
@@ -2638,114 +2717,9 @@ var SHACLShape = class {
     return shape;
   }
 };
-function formatList(list) {
-  if (!list?.length) {
-    return "";
-  }
-  if (list.length === 1) {
-    return list.toString();
-  }
-  if (list.length === 2) {
-    return list.join(" and ");
-  }
-  return list.slice(0, -1).join(", ") + ", and " + list.slice(-1);
-}
-function capSentence(cap) {
-  const can = cap.can.includes("*") ? ["READ", "WRITE", "UPDATE"] : cap.can;
-  const domain = cap.with.domain === "*" ? "" : cap.with.domain;
-  const pointers = cap.with.pointers.includes("*") ? ["all AD4M data"] : cap.with.pointers;
-  return `${formatList(can)} your ${domain} actions, with access to ${formatList(pointers)}`;
-}
-function escapeQueryString(value) {
-  return value.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
-}
-function buildWhereCondition(predicate, condition, opts) {
-  const escapedPredicate = escapeQueryString(predicate);
-  const isLiteral = !opts?.resolveLanguage || opts.resolveLanguage === "literal";
-  const varSuffix = opts?.varIndex ?? 0;
-  function formatValue(v2) {
-    if (typeof v2 === "string") {
-      return isLiteral ? `<literal:string:${escapeQueryString(v2)}>` : `<${escapeQueryString(v2)}>`;
-    }
-    return `<literal:string:${v2}>`;
-  }
-  function formatLiteralFilter(varName, v2) {
-    const raw = escapeQueryString(String(v2));
-    const encoded = encodeURIComponent(String(v2)).replace(/!/g, "%21").replace(/'/g, "%27").replace(/\(/g, "%28").replace(/\)/g, "%29").replace(/\*/g, "%2A");
-    if (typeof v2 === "string") {
-      return `FILTER(STR(${varName}) = "${raw}" || STR(${varName}) = "literal:string:${encoded}")`;
-    } else if (typeof v2 === "number") {
-      return `FILTER(STR(${varName}) = "${v2}" || STR(${varName}) = "literal:number:${v2}")`;
-    } else if (typeof v2 === "boolean") {
-      return `FILTER(STR(${varName}) = "${v2}" || STR(${varName}) = "literal:boolean:${v2}")`;
-    }
-    return `FILTER(STR(${varName}) = "${raw}")`;
-  }
-  if (Array.isArray(condition)) {
-    if (isLiteral) {
-      const varName = `?_wc${varSuffix}`;
-      const inValues = condition.flatMap((v2) => {
-        const raw = escapeQueryString(String(v2));
-        const encoded = encodeURIComponent(String(v2)).replace(/!/g, "%21").replace(/'/g, "%27").replace(/\(/g, "%28").replace(/\)/g, "%29").replace(/\*/g, "%2A");
-        return [`"${raw}"`, `"literal:string:${encoded}"`];
-      }).join(", ");
-      return `?target <${escapedPredicate}> ${varName} . FILTER(STR(${varName}) IN (${inValues}))`;
-    }
-    const formattedValues = condition.map(formatValue).join(", ");
-    return `FILTER EXISTS { ?target <${escapedPredicate}> ?_val . FILTER(?_val IN (${formattedValues})) }`;
-  } else if (typeof condition === "object" && condition !== null) {
-    const ops = condition;
-    const parts = [];
-    if (ops.not !== void 0) {
-      if (Array.isArray(ops.not)) {
-        const formattedValues = ops.not.map((v2) => formatValue(v2)).join(", ");
-        parts.push(`FILTER NOT EXISTS { ?target <${escapedPredicate}> ?_nval . FILTER(?_nval IN (${formattedValues})) }`);
-      } else {
-        parts.push(`FILTER NOT EXISTS { ?target <${escapedPredicate}> ${formatValue(ops.not)} }`);
-      }
-    }
-    const hasComparisonOps = ops.gt !== void 0 || ops.gte !== void 0 || ops.lt !== void 0 || ops.lte !== void 0 || ops.between !== void 0 || ops.contains !== void 0;
-    if (hasComparisonOps) {
-      parts.push(`FILTER EXISTS { ?target <${escapedPredicate}> ?_cmp }`);
-    }
-    return parts.join(" ");
-  } else {
-    if (isLiteral) {
-      const varName = `?_wc${varSuffix}`;
-      return `?target <${escapedPredicate}> ${varName} . ${formatLiteralFilter(varName, condition)}`;
-    }
-    return `?target <${escapedPredicate}> ${formatValue(condition)} .`;
-  }
-}
-function compileWhereClause(where, metadata) {
-  const conditions = [];
-  for (const [propertyName, condition] of Object.entries(where)) {
-    if (["id", "author", "timestamp"].includes(propertyName))
-      continue;
-    let predicate;
-    let resolveLanguage;
-    if (metadata) {
-      const propMeta = metadata.properties[propertyName];
-      if (propMeta) {
-        predicate = propMeta.predicate;
-        resolveLanguage = propMeta.resolveLanguage;
-      } else {
-        predicate = propertyName;
-      }
-    } else {
-      predicate = propertyName;
-    }
-    const cond = buildWhereCondition(predicate, condition, { resolveLanguage, varIndex: conditions.length });
-    if (cond) {
-      conditions.push(cond);
-    }
-  }
-  return conditions;
-}
 function buildSHACL(subjectName, target, properties, allRelationsMeta, conformanceFilterFn) {
   const obj = target.prototype;
   let namespace = "ad4m://";
-  const relations = Object.fromEntries(Object.entries(allRelationsMeta).filter(([, r4]) => r4.kind === "hasMany" || r4.kind === "belongsToMany"));
   if (Object.keys(properties).length > 0) {
     const firstProp = properties[Object.keys(properties)[0]];
     if (firstProp.through) {
@@ -2754,8 +2728,8 @@ function buildSHACL(subjectName, target, properties, allRelationsMeta, conforman
         namespace = match[1];
       }
     }
-  } else if (Object.keys(relations).length > 0) {
-    const firstRel = relations[Object.keys(relations)[0]];
+  } else if (Object.keys(allRelationsMeta).length > 0) {
+    const firstRel = allRelationsMeta[Object.keys(allRelationsMeta)[0]];
     if (firstRel.predicate) {
       const match = firstRel.predicate.match(/^([^:]+:\/\/)/);
       if (match) {
@@ -2817,6 +2791,9 @@ function buildSHACL(subjectName, target, properties, allRelationsMeta, conforman
     if (propMeta.resolveLanguage) {
       propShape.resolveLanguage = propMeta.resolveLanguage;
     }
+    if (propMeta.getter) {
+      propShape.getter = propMeta.getter;
+    }
     if (propMeta.prologSetter) {
       console.warn(`[SHACL Generation] Custom Prolog setter for property '${propName}' in class '${subjectName}' is not yet supported. The property will be created without setter actions. Consider using standard writable properties or provide explicit SHACL JSON.`);
     } else if (propMeta.writable && propMeta.through) {
@@ -2848,46 +2825,47 @@ function buildSHACL(subjectName, target, properties, allRelationsMeta, conforman
     }
     shape.addProperty(propShape);
   }
-  for (const relName in relations) {
-    const relMeta = relations[relName];
-    if (!relMeta.predicate)
+  for (const relName in allRelationsMeta) {
+    const relMeta = allRelationsMeta[relName];
+    if (!relMeta.predicate && !relMeta.getter)
       continue;
+    const synthesizedPath = relMeta.predicate || `ad4m://getter/${subjectName}/${relName}`;
     const relShape = {
       name: relName,
-      path: relMeta.predicate
+      path: synthesizedPath
     };
     relShape.nodeKind = "IRI";
+    relShape.relationKind = relMeta.kind;
+    if (relMeta.kind === "hasOne" || relMeta.kind === "belongsToOne") {
+      relShape.maxCount = 1;
+    } else if (relMeta.maxCount !== void 0) {
+      relShape.maxCount = relMeta.maxCount;
+    }
+    if (relMeta.filter === false) {
+      relShape.filter = false;
+    }
     if (relMeta.local !== void 0) {
       relShape.local = relMeta.local;
     }
-    relShape.adder = [{
-      action: "addLink",
-      source: "this",
-      predicate: relMeta.predicate,
-      target: "value",
-      ...relMeta.local && { local: true }
-    }];
-    relShape.remover = [{
-      action: "removeLink",
-      source: "this",
-      predicate: relMeta.predicate,
-      target: "value",
-      ...relMeta.local && { local: true }
-    }];
+    if (relMeta.predicate) {
+      relShape.adder = [{
+        action: "addLink",
+        source: "this",
+        predicate: relMeta.predicate,
+        target: "value",
+        ...relMeta.local && { local: true }
+      }];
+      relShape.remover = [{
+        action: "removeLink",
+        source: "this",
+        predicate: relMeta.predicate,
+        target: "value",
+        ...relMeta.local && { local: true }
+      }];
+    }
     if (relMeta.getter) {
       relShape.getter = relMeta.getter;
-    } else if (relMeta.where) {
-      try {
-        const TargetClass = relMeta.target?.();
-        const targetMetadata = TargetClass ? TargetClass.getModelMetadata?.() ?? null : null;
-        const conditions = compileWhereClause(relMeta.where, targetMetadata);
-        if (conditions.length > 0) {
-          const escapedPredicate = escapeQueryString(relMeta.predicate);
-          relShape.getter = `SELECT ?target WHERE { <Base> <${escapedPredicate}> ?target . ${conditions.join(" ")} }`;
-        }
-      } catch (e7) {
-      }
-    } else if (relMeta.target && relMeta.filter !== false) {
+    } else if (relMeta.target && relMeta.filter !== false && relMeta.kind !== "belongsToOne" && relMeta.kind !== "belongsToMany") {
       const targetThunk = relMeta.target;
       const predicate = relMeta.predicate;
       let resolved = false;
@@ -2939,6 +2917,37 @@ function buildSHACL(subjectName, target, properties, allRelationsMeta, conforman
         if (targetSHACL?.shape?.nodeShapeUri) {
           relShape.class = targetSHACL.shape.nodeShapeUri;
         }
+        if (targetSHACL?.name) {
+          relShape.targetClassName = targetSHACL.name;
+        } else {
+          const targetProto = TargetClass.prototype;
+          if (targetProto?.className) {
+            relShape.targetClassName = targetProto.className;
+          }
+        }
+      } catch (e7) {
+        console.warn(`[shacl-gen] Failed to resolve target class for relation "${subjectName}.${relName}": ${e7 instanceof Error ? e7.message : String(e7)}`);
+      }
+    }
+    if (relMeta.where) {
+      relShape.whereFilter = relMeta.where;
+      try {
+        const TargetClass = relMeta.target?.();
+        const targetMetadata = TargetClass ? TargetClass.getModelMetadata?.() ?? null : null;
+        if (targetMetadata?.properties) {
+          const predicates = {};
+          for (const propName of Object.keys(relMeta.where)) {
+            if (["id", "author", "timestamp"].includes(propName))
+              continue;
+            const propMeta = targetMetadata.properties[propName];
+            if (propMeta?.predicate) {
+              predicates[propName] = propMeta.predicate;
+            }
+          }
+          if (Object.keys(predicates).length > 0) {
+            relShape.wherePredicates = predicates;
+          }
+        }
       } catch (e7) {
       }
     }
@@ -2951,6 +2960,27 @@ function buildSHACL(subjectName, target, properties, allRelationsMeta, conforman
     name: subjectName
   };
 }
+function formatList(list) {
+  if (!list?.length) {
+    return "";
+  }
+  if (list.length === 1) {
+    return list.toString();
+  }
+  if (list.length === 2) {
+    return list.join(" and ");
+  }
+  return list.slice(0, -1).join(", ") + ", and " + list.slice(-1);
+}
+function capSentence(cap) {
+  const can = cap.can.includes("*") ? ["READ", "WRITE", "UPDATE"] : cap.can;
+  const domain = cap.with.domain === "*" ? "" : cap.with.domain;
+  const pointers = cap.with.pointers.includes("*") ? ["all AD4M data"] : cap.with.pointers;
+  return `${formatList(can)} your ${domain} actions, with access to ${formatList(pointers)}`;
+}
+function escapeQueryString(value) {
+  return value.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
+}
 var propertyRegistry = /* @__PURE__ */ new WeakMap();
 var relationRegistry = /* @__PURE__ */ new WeakMap();
 var propertiesMetadataCache = /* @__PURE__ */ new WeakMap();
@@ -3577,14 +3607,14 @@ var PerspectiveProxy = class {
     setCachedResult(__classPrivateFieldGet$a(this, _PerspectiveProxy_handle, "f").uuid, query, result);
     return result;
   }
-  async modelQuery(className, queryJson, shapeJson) {
-    return await __classPrivateFieldGet$a(this, _PerspectiveProxy_client, "f").modelQuery(__classPrivateFieldGet$a(this, _PerspectiveProxy_handle, "f").uuid, className, queryJson, shapeJson);
+  async modelQuery(className, queryJson) {
+    return await __classPrivateFieldGet$a(this, _PerspectiveProxy_client, "f").modelQuery(__classPrivateFieldGet$a(this, _PerspectiveProxy_handle, "f").uuid, className, queryJson);
   }
-  async evaluateGetters(className, instanceIds, shapeJson, propertyNames) {
-    return await __classPrivateFieldGet$a(this, _PerspectiveProxy_client, "f").evaluateGetters(__classPrivateFieldGet$a(this, _PerspectiveProxy_handle, "f").uuid, className, instanceIds, shapeJson, propertyNames);
+  async evaluateGetters(className, instanceIds, propertyNames) {
+    return await __classPrivateFieldGet$a(this, _PerspectiveProxy_client, "f").evaluateGetters(__classPrivateFieldGet$a(this, _PerspectiveProxy_handle, "f").uuid, className, instanceIds, propertyNames);
   }
-  async modelSubscribe(className, queryJson, shapeJson) {
-    return await __classPrivateFieldGet$a(this, _PerspectiveProxy_client, "f").modelSubscribe(__classPrivateFieldGet$a(this, _PerspectiveProxy_handle, "f").uuid, className, queryJson, shapeJson);
+  async modelSubscribe(className, queryJson) {
+    return await __classPrivateFieldGet$a(this, _PerspectiveProxy_client, "f").modelSubscribe(__classPrivateFieldGet$a(this, _PerspectiveProxy_handle, "f").uuid, className, queryJson);
   }
   async add(link, status = "shared", batchId) {
     const result = await __classPrivateFieldGet$a(this, _PerspectiveProxy_client, "f").addLink(__classPrivateFieldGet$a(this, _PerspectiveProxy_handle, "f").uuid, link, status, batchId);
@@ -4631,22 +4661,21 @@ var PerspectiveClient = class {
     }
     return __classPrivateFieldGet$9(this, _PerspectiveClient_apiClient, "f").call("perspective.disposeQuery", { uuid, subscriptionId });
   }
-  async modelQuery(uuid, className, queryJson, shapeJson) {
-    const resultJson = await __classPrivateFieldGet$9(this, _PerspectiveClient_apiClient, "f").call("perspective.modelQuery", { uuid, class_name: className, query_json: queryJson, shape_json: shapeJson });
+  async modelQuery(uuid, className, queryJson) {
+    const resultJson = await __classPrivateFieldGet$9(this, _PerspectiveClient_apiClient, "f").call("perspective.modelQuery", { uuid, class_name: className, query_json: queryJson });
     return JSON.parse(resultJson);
   }
-  async evaluateGetters(uuid, className, instanceIds, shapeJson, propertyNames) {
+  async evaluateGetters(uuid, className, instanceIds, propertyNames) {
     const resultJson = await __classPrivateFieldGet$9(this, _PerspectiveClient_apiClient, "f").call("perspective.evaluateGetters", {
       uuid,
       class_name: className,
       instance_ids: instanceIds,
-      shape_json: shapeJson,
       ...propertyNames && { property_names: propertyNames }
     });
     return JSON.parse(resultJson);
   }
-  async modelSubscribe(uuid, className, queryJson, shapeJson) {
-    const response = await __classPrivateFieldGet$9(this, _PerspectiveClient_apiClient, "f").call("perspective.modelSubscribe", { uuid, class_name: className, query_json: queryJson, shape_json: shapeJson });
+  async modelSubscribe(uuid, className, queryJson) {
+    const response = await __classPrivateFieldGet$9(this, _PerspectiveClient_apiClient, "f").call("perspective.modelSubscribe", { uuid, class_name: className, query_json: queryJson });
     return {
       subscriptionId: response.subscription_id,
       result: JSON.parse(response.result)
@@ -10170,9 +10199,6 @@ var ModelQueryBuilder = class {
     this.modelClassName = className;
     return this;
   }
-  engine(_eng) {
-    return this;
-  }
   async get() {
     return await this.executeSparqlQuery();
   }
@@ -10193,8 +10219,8 @@ var ModelQueryBuilder = class {
   async subscribe(callback) {
     this.dispose();
     const ctor = this.ctor;
-    const { className, queryJson, shapeJson } = ctor.prepareModelQueryParams(this.queryParams, this.modelClassName);
-    const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(className, queryJson, shapeJson);
+    const { className, queryJson } = ctor.prepareModelQueryParams(this.queryParams, this.modelClassName);
+    const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(className, queryJson);
     const parseResults = (raw) => {
       return ctor.parseModelResult(this.perspective, raw, this.queryParams.include, this.queryParams.properties);
     };
@@ -10291,8 +10317,8 @@ var ModelQueryBuilder = class {
   async countSubscribe(callback) {
     this.dispose();
     const countParams = { ...this.queryParams, limit: 0 };
-    const { className, queryJson, shapeJson } = this.ctor.prepareModelQueryParams(countParams, this.modelClassName);
-    const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(className, queryJson, shapeJson);
+    const { className, queryJson } = this.ctor.prepareModelQueryParams(countParams, this.modelClassName);
+    const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(className, queryJson);
     const parseCount = (raw) => {
       const data = typeof raw === "string" ? JSON.parse(raw) : raw;
       return data.totalCount ?? 0;
@@ -10367,8 +10393,8 @@ var ModelQueryBuilder = class {
     const subscriptionParams = { ...this.queryParams || {} };
     delete subscriptionParams.limit;
     delete subscriptionParams.offset;
-    const { className, queryJson, shapeJson } = ctor.prepareModelQueryParams(subscriptionParams, this.modelClassName);
-    const { subscriptionId } = await this.perspective.modelSubscribe(className, queryJson, shapeJson);
+    const { className, queryJson } = ctor.prepareModelQueryParams(subscriptionParams, this.modelClassName);
+    const { subscriptionId } = await this.perspective.modelSubscribe(className, queryJson);
     const paginatedQuery = {
       ...this.queryParams || {},
       limit: pageSize,
@@ -10460,34 +10486,6 @@ function defaultFileDecode(resolved) {
   }
   return resolved;
 }
-function enrichShapeForIncludes(metadata, include, allRelMeta) {
-  for (const [relName, includeVal] of Object.entries(include)) {
-    if (!includeVal)
-      continue;
-    const meta = allRelMeta[relName];
-    if (!meta?.target)
-      continue;
-    const TargetClass = meta.target();
-    const targetMeta = JSON.parse(JSON.stringify(TargetClass.getModelMetadata()));
-    if (!metadata.relations[relName]) {
-      metadata.relations[relName] = {
-        name: relName,
-        predicate: meta.predicate,
-        direction: meta.kind === "belongsToMany" || meta.kind === "belongsToOne" ? "reverse" : "forward"
-      };
-    }
-    const rel = metadata.relations[relName];
-    rel.kind = meta.kind;
-    rel.maxCount = meta.maxCount;
-    rel.targetShape = targetMeta;
-    rel.targetClassName = targetMeta.className;
-    const nested = typeof includeVal === "object" && includeVal !== null ? includeVal.include : void 0;
-    if (nested) {
-      const targetRelMeta = getRelationsMetadata(TargetClass);
-      enrichShapeForIncludes(targetMeta, nested, targetRelMeta);
-    }
-  }
-}
 function jsonToModelInstance(ModelClass, perspective, json, include, properties) {
   const instance = new ModelClass(perspective, json.id || json.baseExpression);
   if (properties) {
@@ -10870,12 +10868,12 @@ var Ad4mModel = class {
         const allRelMeta = getRelationsMetadata(this);
         for (const [, proj] of Object.entries(projections)) {
           const relMeta = allRelMeta[proj.from];
-          if (!proj.targetShape && relMeta?.target) {
+          if (!proj.targetClassName && relMeta?.target) {
             try {
               const TargetClass = relMeta.target();
               const targetMeta = TargetClass.getModelMetadata?.();
-              if (targetMeta) {
-                proj.targetShape = targetMeta;
+              if (targetMeta?.className) {
+                proj.targetClassName = targetMeta.className;
               }
             } catch (e7) {
               console.debug(`prepareModelQueryParams: target class unavailable for projection:`, e7);
@@ -10897,56 +10895,9 @@ var Ad4mModel = class {
     if (query.count !== void 0)
       queryInput.count = query.count;
     queryInput.deepQuery = query.deepQuery ?? true;
-    if (queryInput.include) {
-      const allRelMeta = getRelationsMetadata(this);
-      enrichShapeForIncludes(metadata, queryInput.include, allRelMeta);
-    }
-    {
-      const allRelMeta = getRelationsMetadata(this);
-      for (const [relName, relMeta] of Object.entries(metadata.relations)) {
-        const rel = relMeta;
-        if (rel.getter || rel.direction === "reverse" || rel.filter === false)
-          continue;
-        const meta = allRelMeta[relName];
-        if (!meta?.target)
-          continue;
-        try {
-          const TargetClass = meta.target();
-          const filter = buildConformanceFilter(meta.predicate, TargetClass);
-          if (filter) {
-            rel.getter = filter.getter;
-          }
-          if (rel.where) {
-            try {
-              const targetMetadata = TargetClass.getModelMetadata?.() ?? null;
-              if (targetMetadata) {
-                const predicates = {};
-                for (const propName of Object.keys(rel.where)) {
-                  if (["id", "author", "timestamp"].includes(propName))
-                    continue;
-                  const propMeta = targetMetadata.properties[propName];
-                  if (propMeta?.predicate) {
-                    predicates[propName] = propMeta.predicate;
-                  }
-                }
-                if (Object.keys(predicates).length > 0) {
-                  rel.whereFilter = rel.where;
-                  rel.wherePredicates = predicates;
-                }
-              }
-            } catch (e7) {
-              console.debug(`prepareModelQueryParams: target metadata unavailable for relation '${relName}':`, e7);
-            }
-          }
-        } catch (e7) {
-          console.debug(`prepareModelQueryParams: target class unavailable for relation '${relName}':`, e7);
-        }
-      }
-    }
     return {
       className,
       queryJson: JSON.stringify(queryInput),
-      shapeJson: JSON.stringify(metadata),
       metadata
     };
   }
@@ -10989,8 +10940,8 @@ var Ad4mModel = class {
     }));
   }
   static async executeModelQuery(perspective, query = {}, classNameOverride) {
-    const { className, queryJson, shapeJson } = this.prepareModelQueryParams(query, classNameOverride);
-    const result = await perspective.modelQuery(className, queryJson, shapeJson);
+    const { className, queryJson } = this.prepareModelQueryParams(query, classNameOverride);
+    const result = await perspective.modelQuery(className, queryJson);
     const instances = result.instances.map((json) => {
       return jsonToModelInstance(this, perspective, json, query.include, query.properties);
     });
@@ -11004,28 +10955,30 @@ var Ad4mModel = class {
       totalCount: result.totalCount
     };
   }
-  static async findAll(perspective, query = {}, _engine) {
-    if (query.properties && query.properties.length === 0) {
+  static async findAll(perspective, query) {
+    const q = query ?? {};
+    if (q.properties && q.properties.length === 0) {
       throw new Error("properties[] must not be empty \u2014 omit the field to return all properties, or specify at least one field name");
     }
-    const { results } = await this.executeModelQuery(perspective, query);
+    const { results } = await this.executeModelQuery(perspective, q);
     return results;
   }
-  static async findOne(perspective, query = {}, _engine) {
-    const limitedQuery = { ...query, limit: 1 };
+  static async findOne(perspective, query) {
+    const limitedQuery = { ...query ?? {}, limit: 1 };
     const results = await this.findAll(perspective, limitedQuery);
     return results[0] ?? null;
   }
-  static async findAllAndCount(perspective, query = {}, _engine) {
-    return await this.executeModelQuery(perspective, query);
+  static async findAllAndCount(perspective, query) {
+    const out = await this.executeModelQuery(perspective, query ?? {});
+    return out;
   }
-  static async paginate(perspective, pageSize, pageNumber, query, _engine) {
-    const paginationQuery = { ...query || {}, limit: pageSize, offset: pageSize * (pageNumber - 1), count: true };
+  static async paginate(perspective, pageSize, pageNumber, query) {
+    const paginationQuery = { ...query ?? {}, limit: pageSize, offset: pageSize * (pageNumber - 1), count: true };
     const { results, totalCount } = await this.executeModelQuery(perspective, paginationQuery);
     return { results, totalCount, pageSize, pageNumber };
   }
-  static async count(perspective, query = {}) {
-    const { totalCount } = await this.executeModelQuery(perspective, { ...query, limit: 0 });
+  static async count(perspective, query) {
+    const { totalCount } = await this.executeModelQuery(perspective, { ...query ?? {}, limit: 0 });
     return totalCount;
   }
   async setProperty(key, value, batchId) {
@@ -11221,26 +11174,8 @@ var Ad4mModel = class {
     if (instances.length === 0)
       return;
     const metadata = this.getModelMetadata();
-    const allRelMeta = getRelationsMetadata(this);
-    for (const [relName, relMeta] of Object.entries(metadata.relations)) {
-      const rel = relMeta;
-      if (rel.getter || rel.direction === "reverse" || rel.filter === false)
-        continue;
-      const meta = allRelMeta[relName];
-      if (!meta?.target)
-        continue;
-      try {
-        const TargetClass = meta.target();
-        const filter = buildConformanceFilter(meta.predicate, TargetClass);
-        if (filter)
-          rel.getter = filter.getter;
-      } catch (e7) {
-        console.debug(`evaluateGetters: target class unavailable for relation '${relName}':`, e7);
-      }
-    }
-    const shapeJson = JSON.stringify(metadata);
     const instanceIds = instances.map((inst) => inst.id || inst._baseExpression);
-    const result = await perspective.evaluateGetters(metadata.className, instanceIds, shapeJson, propertyNames);
+    const result = await perspective.evaluateGetters(metadata.className, instanceIds, propertyNames);
     const evaluatedPropertyNames = [];
     for (const [propName, propMeta] of Object.entries(metadata.properties)) {
       if (propMeta.getter) {
@@ -11374,7 +11309,7 @@ var Ad4mModel = class {
     return result;
   }
   static query(perspective, query) {
-    return new ModelQueryBuilder(perspective, this, query);
+    return new ModelQueryBuilder(perspective, this, query ?? {});
   }
   static fromJSONSchema(schema, options) {
     return buildModelFromJSONSchema(this, schema, options);