@prisma/sqlcommenter-query-insights 0.0.1 → 7.2.0-dev.7

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/index.js

@@ -26,19 +26,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/parameterize/parameterize.ts
 var PARAM_PLACEHOLDER = { $type: "Param" };
-function isTaggedValue(value) {
-  return typeof value === "object" && value !== null && "$type" in value && typeof value.$type === "string";
-}
-function isSelectionMarker(key) {
-  return key === "$scalars" || key === "$composites";
-}
-var STRUCTURE_KEYS = /* @__PURE__ */ new Set([
-  // Selection/field specifiers
-  "select",
-  "include",
-  "omit",
-  "selection",
-  // Relation operations
+var RELATION_OPERATION_KEYS = /* @__PURE__ */ new Set([
   "connect",
   "connectOrCreate",
   "disconnect",
@@ -49,88 +37,61 @@ var STRUCTURE_KEYS = /* @__PURE__ */ new Set([
   "updateMany",
   "upsert",
   "delete",
-  "deleteMany",
-  // Query structure
+  "deleteMany"
+]);
+var STRUCTURAL_KEYS_IN_DATA = /* @__PURE__ */ new Set([
   "where",
-  "data",
-  "orderBy",
-  "cursor",
-  "distinct",
-  "relationLoadStrategy",
-  // Aggregation
+  "select",
+  "include",
+  "omit",
   "_count",
   "_sum",
   "_avg",
   "_min",
   "_max"
 ]);
-var STRUCTURAL_VALUE_KEYS = /* @__PURE__ */ new Set([
-  // Sort directions
-  "sort",
-  // Null handling
-  "nulls",
-  // Relation load strategy
-  "relationLoadStrategy"
-]);
-var NUMERIC_STRUCTURE_KEYS = /* @__PURE__ */ new Set(["take", "skip"]);
-var FILTER_OPERATORS = /* @__PURE__ */ new Set([
-  "equals",
-  "not",
-  "in",
-  "notIn",
-  "lt",
-  "lte",
-  "gt",
-  "gte",
-  "contains",
-  "startsWith",
-  "endsWith",
-  "search",
-  "mode",
-  "has",
-  "hasEvery",
-  "hasSome",
-  "isEmpty",
-  // JSON operators
-  "path",
-  "string_contains",
-  "string_starts_with",
-  "string_ends_with",
-  "array_contains",
-  "array_starts_with",
-  "array_ends_with"
-]);
-var LOGICAL_OPERATORS = /* @__PURE__ */ new Set(["AND", "OR", "NOT", "is", "isNot", "some", "every", "none"]);
-var SORT_DIRECTIONS = /* @__PURE__ */ new Set(["asc", "desc"]);
-function parameterizeValue(value, context) {
+var STRUCTURAL_VALUE_KEYS = /* @__PURE__ */ new Set(["take", "skip", "sort", "nulls", "mode", "relationLoadStrategy", "distinct"]);
+function isTaggedValue(value) {
+  return typeof value === "object" && value !== null && "$type" in value && typeof value.$type === "string";
+}
+function isSelectionMarker(key) {
+  return key === "$scalars" || key === "$composites";
+}
+function isSortDirection(value) {
+  return value === "asc" || value === "desc";
+}
+function getChildContext(key, parentContext) {
+  if (key === "arguments") return "default";
+  if (key === "selection") return "selection";
+  if (key === "orderBy") return "orderBy";
+  if (key === "data") return "data";
+  if (parentContext === "data") {
+    if (RELATION_OPERATION_KEYS.has(key) || STRUCTURAL_KEYS_IN_DATA.has(key)) {
+      return "default";
+    }
+  }
+  return parentContext;
+}
+function parameterize(value, context, key) {
   if (value === null || value === void 0) {
     return value;
   }
   if (isTaggedValue(value)) {
-    if (value.$type === "FieldRef") {
-      return value;
-    }
-    if (value.$type === "Enum" && context.isStructuralEnum) {
-      return value;
-    }
-    return PARAM_PLACEHOLDER;
+    return value.$type === "FieldRef" ? value : PARAM_PLACEHOLDER;
   }
   if (Array.isArray(value)) {
-    return value.map((item) => parameterizeValue(item, context));
+    return value.map((item) => parameterize(item, context, key));
   }
   if (typeof value === "object") {
     return parameterizeObject(value, context);
   }
-  if (context.isDataContext) {
-    return PARAM_PLACEHOLDER;
-  }
-  if (context.isSelectionContext && typeof value === "boolean") {
+  if (key && STRUCTURAL_VALUE_KEYS.has(key)) {
     return value;
   }
-  if (context.isStructuralValue) {
+  if (context === "selection" && typeof value === "boolean") {
     return value;
   }
-  if (context.isOrderByContext && typeof value === "string" && SORT_DIRECTIONS.has(value)) {
+  if (context === "orderBy" && typeof value === "string" && isSortDirection(value)) {
     return value;
   }
   return PARAM_PLACEHOLDER;
@@ -142,264 +103,82 @@ function parameterizeObject(obj, context) {
       result[key] = value;
       continue;
     }
-    const newContext = getContextForKey(key, context);
-    result[key] = parameterizeValue(value, newContext);
+    const childContext = getChildContext(key, context);
+    result[key] = parameterize(value, childContext, key);
   }
   return result;
 }
-function isStructuralKey(key) {
-  return key === "arguments" || STRUCTURE_KEYS.has(key);
-}
-function getContextForKey(key, parentContext) {
-  if (key === "arguments") {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (key === "selection" || parentContext.isSelectionContext && !isStructuralKey(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: true,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (key === "data" || parentContext.isDataContext) {
-    if (STRUCTURE_KEYS.has(key)) {
-      return {
-        isDataContext: false,
-        isStructuralValue: false,
-        isStructuralEnum: false,
-        isSelectionContext: false,
-        isOrderByContext: false,
-        parentKey: key
-      };
-    }
-    return {
-      isDataContext: true,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (STRUCTURAL_VALUE_KEYS.has(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: true,
-      isStructuralEnum: true,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (NUMERIC_STRUCTURE_KEYS.has(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: true,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (key === "orderBy" || parentContext.isOrderByContext) {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: true,
-      parentKey: key
-    };
-  }
-  if (FILTER_OPERATORS.has(key)) {
-    if (key === "mode") {
-      return {
-        isDataContext: false,
-        isStructuralValue: true,
-        isStructuralEnum: true,
-        isSelectionContext: false,
-        isOrderByContext: false,
-        parentKey: key
-      };
-    }
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (LOGICAL_OPERATORS.has(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (STRUCTURE_KEYS.has(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: key === "selection",
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  return {
-    isDataContext: parentContext.isDataContext,
-    isStructuralValue: false,
-    isStructuralEnum: false,
-    isSelectionContext: parentContext.isSelectionContext,
-    isOrderByContext: parentContext.isOrderByContext,
-    parentKey: key
-  };
-}
 function parameterizeQuery(query) {
-  const initialContext = {
-    isDataContext: false,
-    isStructuralValue: false,
-    isStructuralEnum: false,
-    isSelectionContext: false,
-    isOrderByContext: false
-  };
-  return parameterizeValue(query, initialContext);
+  return parameterize(query, "default");
 }
 
 // src/shape/shape.ts
-function isNestedQuery(value) {
-  return typeof value === "object" && value !== null && ("arguments" in value || "selection" in value);
-}
-function isEmptyObject(value) {
-  return typeof value === "object" && value !== null && Object.keys(value).length === 0;
-}
-function canSimplifySelectionToTrue(selection) {
-  if (selection.$scalars !== true) {
-    return false;
-  }
-  for (const key of Object.keys(selection)) {
-    if (key !== "$scalars" && key !== "$composites") {
-      return false;
-    }
-  }
-  return true;
-}
-function canSimplifyNestedQueryToTrue(args, selection) {
-  const argsEmpty = args === void 0 || isEmptyObject(args);
-  if (!argsEmpty) {
-    return false;
-  }
-  if (!selection) {
-    return false;
-  }
-  return canSimplifySelectionToTrue(selection);
-}
-function shapeRelation(relation) {
-  if (relation === true) {
-    return true;
-  }
-  if (typeof relation !== "object" || relation === null) {
-    return relation;
-  }
-  const relationObj = relation;
-  if (isNestedQuery(relationObj)) {
-    const args = relationObj.arguments;
-    const selection = relationObj.selection;
-    if (canSimplifyNestedQueryToTrue(args, selection)) {
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isEmpty(obj) {
+  return !obj || Object.keys(obj).length === 0;
+}
+function isSimpleSelection(selection) {
+  if (!selection || selection.$scalars !== true) return false;
+  return Object.keys(selection).every((k) => k === "$scalars" || k === "$composites");
+}
+function shapeValue(value) {
+  if (value === true || !isObject(value)) return value;
+  if ("arguments" in value || "selection" in value) {
+    const args = value.arguments;
+    const selection = value.selection;
+    if (isEmpty(args) && isSimpleSelection(selection)) {
       return true;
     }
-    return shapeQuery(relationObj);
-  } else {
-    if (canSimplifySelectionToTrue(relationObj)) {
-      return true;
-    }
-    const shaped = shapeSelectionObject(relationObj);
-    return shaped || true;
+    return shapeQuery(value);
   }
+  return isSimpleSelection(value) ? true : shapeQuery({ selection: value });
 }
-function shapeSelectionObject(selection) {
+function shapeQuery(query) {
+  if (!isObject(query)) return query;
+  const args = query.arguments;
+  const selection = query.selection;
+  const result = args ? { ...args } : {};
+  if (!selection) return result;
   const hasScalars = selection.$scalars === true;
-  const booleanFields = {};
-  const objectFields = {};
+  const fields = {};
   for (const [key, value] of Object.entries(selection)) {
-    if (key === "$scalars" || key === "$composites") {
-      continue;
-    }
-    if (typeof value === "boolean") {
-      booleanFields[key] = value;
-    } else if (typeof value === "object" && value !== null) {
-      objectFields[key] = value;
-    }
+    if (key === "$scalars" || key === "$composites") continue;
+    if (hasScalars && typeof value === "boolean") continue;
+    fields[key] = typeof value === "boolean" ? value : shapeValue(value);
   }
-  const hasBooleanFields = Object.keys(booleanFields).length > 0;
-  const hasObjectFields = Object.keys(objectFields).length > 0;
-  if (!hasBooleanFields && !hasObjectFields) {
-    return null;
-  }
-  const shapedObjects = {};
-  for (const [key, value] of Object.entries(objectFields)) {
-    shapedObjects[key] = shapeRelation(value);
-  }
-  if (hasScalars) {
-    if (!hasObjectFields) {
-      return null;
-    }
-    return { include: shapedObjects };
-  } else {
-    return { select: { ...booleanFields, ...shapedObjects } };
-  }
-}
-function shapeQuery(query) {
-  if (typeof query !== "object" || query === null) {
-    return query;
-  }
-  const queryObj = query;
-  const args = queryObj.arguments;
-  const selection = queryObj.selection;
-  const result = args ? { ...args } : {};
-  if (selection) {
-    const shaped = shapeSelectionObject(selection);
-    if (shaped) {
-      Object.assign(result, shaped);
-    }
+  if (Object.keys(fields).length > 0) {
+    result[hasScalars ? "include" : "select"] = fields;
   }
   return result;
 }
 
-// src/format.ts
+// src/format/format.ts
 function toBase64Url(data) {
   return Buffer.from(data, "utf-8").toString("base64url");
 }
 function formatQueryInsight(queryInfo) {
-  if (queryInfo.type === "single") {
-    const { modelName: modelName2, action: action2, query } = queryInfo;
-    if (!modelName2) {
-      return action2;
+  switch (queryInfo.type) {
+    case "single": {
+      const { modelName, action, query } = queryInfo;
+      if (!modelName) {
+        return action;
+      }
+      const parameterizedQuery = parameterizeQuery(query);
+      const shapedQuery = shapeQuery(parameterizedQuery);
+      const encoded = toBase64Url(JSON.stringify(shapedQuery));
+      return `${modelName}.${action}:${encoded}`;
+    }
+    case "compacted": {
+      const { modelName, action, queries } = queryInfo;
+      const shapedQueries = queries.map((q) => shapeQuery(parameterizeQuery(q)));
+      const encoded = toBase64Url(JSON.stringify(shapedQueries));
+      return `${modelName}.${action}:${encoded}`;
     }
-    const parameterizedQuery = parameterizeQuery(query);
-    const shapedQuery = shapeQuery(parameterizedQuery);
-    const encoded2 = toBase64Url(JSON.stringify(shapedQuery));
-    return `${modelName2}.${action2}:${encoded2}`;
+    default:
+      throw new Error(`invalid queryInfo.type=${queryInfo.type}`);
   }
-  const { modelName, action, queries } = queryInfo;
-  const shapedQueries = queries.map((q) => shapeQuery(parameterizeQuery(q)));
-  const encoded = toBase64Url(JSON.stringify(shapedQueries));
-  return `${modelName}.${action}:${encoded}`;
 }
 
 // src/index.ts

package/dist/index.mjs

@@ -1,18 +1,6 @@
 // src/parameterize/parameterize.ts
 var PARAM_PLACEHOLDER = { $type: "Param" };
-function isTaggedValue(value) {
-  return typeof value === "object" && value !== null && "$type" in value && typeof value.$type === "string";
-}
-function isSelectionMarker(key) {
-  return key === "$scalars" || key === "$composites";
-}
-var STRUCTURE_KEYS = /* @__PURE__ */ new Set([
-  // Selection/field specifiers
-  "select",
-  "include",
-  "omit",
-  "selection",
-  // Relation operations
+var RELATION_OPERATION_KEYS = /* @__PURE__ */ new Set([
   "connect",
   "connectOrCreate",
   "disconnect",
@@ -23,88 +11,61 @@ var STRUCTURE_KEYS = /* @__PURE__ */ new Set([
   "updateMany",
   "upsert",
   "delete",
-  "deleteMany",
-  // Query structure
+  "deleteMany"
+]);
+var STRUCTURAL_KEYS_IN_DATA = /* @__PURE__ */ new Set([
   "where",
-  "data",
-  "orderBy",
-  "cursor",
-  "distinct",
-  "relationLoadStrategy",
-  // Aggregation
+  "select",
+  "include",
+  "omit",
   "_count",
   "_sum",
   "_avg",
   "_min",
   "_max"
 ]);
-var STRUCTURAL_VALUE_KEYS = /* @__PURE__ */ new Set([
-  // Sort directions
-  "sort",
-  // Null handling
-  "nulls",
-  // Relation load strategy
-  "relationLoadStrategy"
-]);
-var NUMERIC_STRUCTURE_KEYS = /* @__PURE__ */ new Set(["take", "skip"]);
-var FILTER_OPERATORS = /* @__PURE__ */ new Set([
-  "equals",
-  "not",
-  "in",
-  "notIn",
-  "lt",
-  "lte",
-  "gt",
-  "gte",
-  "contains",
-  "startsWith",
-  "endsWith",
-  "search",
-  "mode",
-  "has",
-  "hasEvery",
-  "hasSome",
-  "isEmpty",
-  // JSON operators
-  "path",
-  "string_contains",
-  "string_starts_with",
-  "string_ends_with",
-  "array_contains",
-  "array_starts_with",
-  "array_ends_with"
-]);
-var LOGICAL_OPERATORS = /* @__PURE__ */ new Set(["AND", "OR", "NOT", "is", "isNot", "some", "every", "none"]);
-var SORT_DIRECTIONS = /* @__PURE__ */ new Set(["asc", "desc"]);
-function parameterizeValue(value, context) {
+var STRUCTURAL_VALUE_KEYS = /* @__PURE__ */ new Set(["take", "skip", "sort", "nulls", "mode", "relationLoadStrategy", "distinct"]);
+function isTaggedValue(value) {
+  return typeof value === "object" && value !== null && "$type" in value && typeof value.$type === "string";
+}
+function isSelectionMarker(key) {
+  return key === "$scalars" || key === "$composites";
+}
+function isSortDirection(value) {
+  return value === "asc" || value === "desc";
+}
+function getChildContext(key, parentContext) {
+  if (key === "arguments") return "default";
+  if (key === "selection") return "selection";
+  if (key === "orderBy") return "orderBy";
+  if (key === "data") return "data";
+  if (parentContext === "data") {
+    if (RELATION_OPERATION_KEYS.has(key) || STRUCTURAL_KEYS_IN_DATA.has(key)) {
+      return "default";
+    }
+  }
+  return parentContext;
+}
+function parameterize(value, context, key) {
   if (value === null || value === void 0) {
     return value;
   }
   if (isTaggedValue(value)) {
-    if (value.$type === "FieldRef") {
-      return value;
-    }
-    if (value.$type === "Enum" && context.isStructuralEnum) {
-      return value;
-    }
-    return PARAM_PLACEHOLDER;
+    return value.$type === "FieldRef" ? value : PARAM_PLACEHOLDER;
   }
   if (Array.isArray(value)) {
-    return value.map((item) => parameterizeValue(item, context));
+    return value.map((item) => parameterize(item, context, key));
   }
   if (typeof value === "object") {
     return parameterizeObject(value, context);
   }
-  if (context.isDataContext) {
-    return PARAM_PLACEHOLDER;
-  }
-  if (context.isSelectionContext && typeof value === "boolean") {
+  if (key && STRUCTURAL_VALUE_KEYS.has(key)) {
     return value;
   }
-  if (context.isStructuralValue) {
+  if (context === "selection" && typeof value === "boolean") {
     return value;
   }
-  if (context.isOrderByContext && typeof value === "string" && SORT_DIRECTIONS.has(value)) {
+  if (context === "orderBy" && typeof value === "string" && isSortDirection(value)) {
     return value;
   }
   return PARAM_PLACEHOLDER;
@@ -116,264 +77,82 @@ function parameterizeObject(obj, context) {
       result[key] = value;
       continue;
     }
-    const newContext = getContextForKey(key, context);
-    result[key] = parameterizeValue(value, newContext);
+    const childContext = getChildContext(key, context);
+    result[key] = parameterize(value, childContext, key);
   }
   return result;
 }
-function isStructuralKey(key) {
-  return key === "arguments" || STRUCTURE_KEYS.has(key);
-}
-function getContextForKey(key, parentContext) {
-  if (key === "arguments") {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (key === "selection" || parentContext.isSelectionContext && !isStructuralKey(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: true,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (key === "data" || parentContext.isDataContext) {
-    if (STRUCTURE_KEYS.has(key)) {
-      return {
-        isDataContext: false,
-        isStructuralValue: false,
-        isStructuralEnum: false,
-        isSelectionContext: false,
-        isOrderByContext: false,
-        parentKey: key
-      };
-    }
-    return {
-      isDataContext: true,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (STRUCTURAL_VALUE_KEYS.has(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: true,
-      isStructuralEnum: true,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (NUMERIC_STRUCTURE_KEYS.has(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: true,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (key === "orderBy" || parentContext.isOrderByContext) {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: true,
-      parentKey: key
-    };
-  }
-  if (FILTER_OPERATORS.has(key)) {
-    if (key === "mode") {
-      return {
-        isDataContext: false,
-        isStructuralValue: true,
-        isStructuralEnum: true,
-        isSelectionContext: false,
-        isOrderByContext: false,
-        parentKey: key
-      };
-    }
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (LOGICAL_OPERATORS.has(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: false,
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  if (STRUCTURE_KEYS.has(key)) {
-    return {
-      isDataContext: false,
-      isStructuralValue: false,
-      isStructuralEnum: false,
-      isSelectionContext: key === "selection",
-      isOrderByContext: false,
-      parentKey: key
-    };
-  }
-  return {
-    isDataContext: parentContext.isDataContext,
-    isStructuralValue: false,
-    isStructuralEnum: false,
-    isSelectionContext: parentContext.isSelectionContext,
-    isOrderByContext: parentContext.isOrderByContext,
-    parentKey: key
-  };
-}
 function parameterizeQuery(query) {
-  const initialContext = {
-    isDataContext: false,
-    isStructuralValue: false,
-    isStructuralEnum: false,
-    isSelectionContext: false,
-    isOrderByContext: false
-  };
-  return parameterizeValue(query, initialContext);
+  return parameterize(query, "default");
 }
 
 // src/shape/shape.ts
-function isNestedQuery(value) {
-  return typeof value === "object" && value !== null && ("arguments" in value || "selection" in value);
-}
-function isEmptyObject(value) {
-  return typeof value === "object" && value !== null && Object.keys(value).length === 0;
-}
-function canSimplifySelectionToTrue(selection) {
-  if (selection.$scalars !== true) {
-    return false;
-  }
-  for (const key of Object.keys(selection)) {
-    if (key !== "$scalars" && key !== "$composites") {
-      return false;
-    }
-  }
-  return true;
-}
-function canSimplifyNestedQueryToTrue(args, selection) {
-  const argsEmpty = args === void 0 || isEmptyObject(args);
-  if (!argsEmpty) {
-    return false;
-  }
-  if (!selection) {
-    return false;
-  }
-  return canSimplifySelectionToTrue(selection);
-}
-function shapeRelation(relation) {
-  if (relation === true) {
-    return true;
-  }
-  if (typeof relation !== "object" || relation === null) {
-    return relation;
-  }
-  const relationObj = relation;
-  if (isNestedQuery(relationObj)) {
-    const args = relationObj.arguments;
-    const selection = relationObj.selection;
-    if (canSimplifyNestedQueryToTrue(args, selection)) {
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isEmpty(obj) {
+  return !obj || Object.keys(obj).length === 0;
+}
+function isSimpleSelection(selection) {
+  if (!selection || selection.$scalars !== true) return false;
+  return Object.keys(selection).every((k) => k === "$scalars" || k === "$composites");
+}
+function shapeValue(value) {
+  if (value === true || !isObject(value)) return value;
+  if ("arguments" in value || "selection" in value) {
+    const args = value.arguments;
+    const selection = value.selection;
+    if (isEmpty(args) && isSimpleSelection(selection)) {
       return true;
     }
-    return shapeQuery(relationObj);
-  } else {
-    if (canSimplifySelectionToTrue(relationObj)) {
-      return true;
-    }
-    const shaped = shapeSelectionObject(relationObj);
-    return shaped || true;
+    return shapeQuery(value);
   }
+  return isSimpleSelection(value) ? true : shapeQuery({ selection: value });
 }
-function shapeSelectionObject(selection) {
+function shapeQuery(query) {
+  if (!isObject(query)) return query;
+  const args = query.arguments;
+  const selection = query.selection;
+  const result = args ? { ...args } : {};
+  if (!selection) return result;
   const hasScalars = selection.$scalars === true;
-  const booleanFields = {};
-  const objectFields = {};
+  const fields = {};
   for (const [key, value] of Object.entries(selection)) {
-    if (key === "$scalars" || key === "$composites") {
-      continue;
-    }
-    if (typeof value === "boolean") {
-      booleanFields[key] = value;
-    } else if (typeof value === "object" && value !== null) {
-      objectFields[key] = value;
-    }
+    if (key === "$scalars" || key === "$composites") continue;
+    if (hasScalars && typeof value === "boolean") continue;
+    fields[key] = typeof value === "boolean" ? value : shapeValue(value);
   }
-  const hasBooleanFields = Object.keys(booleanFields).length > 0;
-  const hasObjectFields = Object.keys(objectFields).length > 0;
-  if (!hasBooleanFields && !hasObjectFields) {
-    return null;
-  }
-  const shapedObjects = {};
-  for (const [key, value] of Object.entries(objectFields)) {
-    shapedObjects[key] = shapeRelation(value);
-  }
-  if (hasScalars) {
-    if (!hasObjectFields) {
-      return null;
-    }
-    return { include: shapedObjects };
-  } else {
-    return { select: { ...booleanFields, ...shapedObjects } };
-  }
-}
-function shapeQuery(query) {
-  if (typeof query !== "object" || query === null) {
-    return query;
-  }
-  const queryObj = query;
-  const args = queryObj.arguments;
-  const selection = queryObj.selection;
-  const result = args ? { ...args } : {};
-  if (selection) {
-    const shaped = shapeSelectionObject(selection);
-    if (shaped) {
-      Object.assign(result, shaped);
-    }
+  if (Object.keys(fields).length > 0) {
+    result[hasScalars ? "include" : "select"] = fields;
   }
   return result;
 }
 
-// src/format.ts
+// src/format/format.ts
 function toBase64Url(data) {
   return Buffer.from(data, "utf-8").toString("base64url");
 }
 function formatQueryInsight(queryInfo) {
-  if (queryInfo.type === "single") {
-    const { modelName: modelName2, action: action2, query } = queryInfo;
-    if (!modelName2) {
-      return action2;
+  switch (queryInfo.type) {
+    case "single": {
+      const { modelName, action, query } = queryInfo;
+      if (!modelName) {
+        return action;
+      }
+      const parameterizedQuery = parameterizeQuery(query);
+      const shapedQuery = shapeQuery(parameterizedQuery);
+      const encoded = toBase64Url(JSON.stringify(shapedQuery));
+      return `${modelName}.${action}:${encoded}`;
+    }
+    case "compacted": {
+      const { modelName, action, queries } = queryInfo;
+      const shapedQueries = queries.map((q) => shapeQuery(parameterizeQuery(q)));
+      const encoded = toBase64Url(JSON.stringify(shapedQueries));
+      return `${modelName}.${action}:${encoded}`;
     }
-    const parameterizedQuery = parameterizeQuery(query);
-    const shapedQuery = shapeQuery(parameterizedQuery);
-    const encoded2 = toBase64Url(JSON.stringify(shapedQuery));
-    return `${modelName2}.${action2}:${encoded2}`;
+    default:
+      throw new Error(`invalid queryInfo.type=${queryInfo.type}`);
   }
-  const { modelName, action, queries } = queryInfo;
-  const shapedQueries = queries.map((q) => shapeQuery(parameterizeQuery(q)));
-  const encoded = toBase64Url(JSON.stringify(shapedQueries));
-  return `${modelName}.${action}:${encoded}`;
 }
 
 // src/index.ts

package/dist/parameterize/parameterize.d.ts

@@ -3,16 +3,17 @@
  *
  * This module handles the conversion of Prisma queries into parameterized shapes
  * where user data values are replaced with placeholder markers.
+ *
+ * Design principle: when in doubt, parameterize. We're building query shapes
+ * for observability, not actual query parameterization for the query compiler.
  */
 /**
  * Placeholder object used to replace parameterized values in query shapes.
- * In the future, this may include additional fields like `value` containing
- * param name and/or param type when queries are parameterized by the query compiler.
  */
 export declare const PARAM_PLACEHOLDER: {
     $type: string;
 };
 /**
- * Parameterizes a query object, replacing all user data values with placeholders
+ * Parameterizes a query object, replacing all user data values with placeholders.
  */
 export declare function parameterizeQuery(query: unknown): unknown;

package/dist/shape/shape.d.ts

@@ -1,11 +1,7 @@
 /**
  * Query shaping logic for Prisma query insights.
  *
- * This module transforms JSON protocol query representations into a format
- * that more closely resembles the original Prisma query API, making the
- * encoded query shapes more intuitive to read and understand.
- *
- * Key transformations:
+ * Transforms JSON protocol query representations into Prisma-like format:
  * - Move `arguments` contents one level up
  * - Convert `selection` to `select`/`include`:
  *   - If `$scalars: true`, use `include` for relations
@@ -14,11 +10,5 @@
  */
 /**
  * Shapes a query object from JSON protocol format to Prisma-like format.
- *
- * Transforms:
- * - `{ arguments: {...}, selection: {...} }` → `{ ..., select/include: {...} }`
- *
- * @param query - The query object in JSON protocol format
- * @returns The shaped query in Prisma-like format
  */
 export declare function shapeQuery(query: unknown): unknown;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/sqlcommenter-query-insights",
-  "version": "0.0.1",
+  "version": "7.2.0-dev.7",
   "description": "Query insights plugin for Prisma SQL commenter",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -25,18 +25,17 @@
     "directory": "packages/sqlcommenter-query-insights"
   },
   "bugs": "https://github.com/prisma/prisma/issues",
-  "scripts": {
-    "dev": "DEV=true tsx helpers/build.ts",
-    "build": "tsx helpers/build.ts",
-    "prepublishOnly": "pnpm run build",
-    "test": "vitest run"
-  },
   "files": [
     "dist"
   ],
   "sideEffects": false,
   "devDependencies": {
-    "@prisma/sqlcommenter": "workspace:*",
-    "fast-check": "4.3.0"
+    "fast-check": "4.3.0",
+    "@prisma/sqlcommenter": "7.2.0-dev.7"
+  },
+  "scripts": {
+    "dev": "DEV=true tsx helpers/build.ts",
+    "build": "tsx helpers/build.ts",
+    "test": "vitest run"
   }
-}
+}

package/dist/parameterize.d.ts

@@ -1,18 +0,0 @@
-/**
- * Query parameterization logic for Prisma query insights.
- *
- * This module handles the conversion of Prisma queries into parameterized shapes
- * where user data values are replaced with placeholder markers.
- */
-/**
- * Placeholder object used to replace parameterized values in query shapes.
- * In the future, this may include additional fields like `value` containing
- * param name and/or param type when queries are parameterized by the query compiler.
- */
-export declare const PARAM_PLACEHOLDER: {
-    $type: string;
-};
-/**
- * Parameterizes a query object, replacing all user data values with placeholders
- */
-export declare function parameterizeQuery(query: unknown): unknown;