prisma-sql 1.5.0 → 1.6.0

package/dist/generator.js

@@ -1,10 +1,6 @@
 #!/usr/bin/env node
-import { generatorHandler } from '@prisma/generator-helper';
-import { convertDMMFToModels, processAllDirectives, isDynamicParameter, extractDynamicName } from '@dee-wan/schema-parser';
-import { mkdir, writeFile } from 'fs/promises';
-import { join } from 'path';
-import { logger } from '@prisma/internals';
-
+#!/usr/bin/env node
+"use strict";
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
@@ -51,10 +47,10 @@ var __async = (__this, __arguments, generator) => {
 
 // package.json
 var require_package = __commonJS({
-  "package.json"(exports$1, module) {
-    module.exports = {
+  "package.json"(exports2, module2) {
+    module2.exports = {
       name: "prisma-sql",
-      version: "1.5.0",
+      version: "1.6.0",
       description: "Convert Prisma queries to optimized SQL with type safety. 2-7x faster than Prisma Client.",
       main: "dist/index.cjs",
       module: "dist/index.js",
@@ -149,6 +145,14 @@ var require_package = __commonJS({
   }
 });
 
+// src/generator.ts
+var import_generator_helper = require("@prisma/generator-helper");
+
+// src/code-emitter.ts
+var import_schema_parser11 = require("@dee-wan/schema-parser");
+var import_promises = require("fs/promises");
+var import_path = require("path");
+
 // src/sql-builder-dialect.ts
 var globalDialect = "postgres";
 function setGlobalDialect(dialect) {
@@ -464,6 +468,7 @@ var Wildcards = Object.freeze({
   [Ops.ENDS_WITH]: (v) => `%${v}`
 });
 var REGEX_CACHE = {
+  PARAM_PLACEHOLDER: /\$(\d+)/g,
   VALID_IDENTIFIER: /^[a-z_][a-z0-9_]*$/
 };
 var LIMITS = Object.freeze({
@@ -768,7 +773,7 @@ function validateMappingsAgainstPlaceholders(mappings, placeholders, max, dialec
   const mappingIndices = /* @__PURE__ */ new Set();
   for (const mapping of mappings) {
     validateMappingIndex(mapping, max);
-    ensureUniqueMappingIndex(mappingIndices, mapping.index);
+    ensureUniqueMappingIndex(mappingIndices, mapping.index, dialect);
     ensureMappingIndexExistsInSql(placeholders, mapping.index);
     validateMappingValueShape(mapping);
   }
@@ -958,6 +963,9 @@ function joinCondition(field, parentAlias, childAlias) {
 function getModelByName(schemas, name) {
   return schemas.find((m) => m.name === name);
 }
+
+// src/builder/where/operators-scalar.ts
+var import_schema_parser = require("@dee-wan/schema-parser");
 function buildNotComposite(expr, val, params, dialect, buildOp, separator) {
   const entries = Object.entries(val).filter(
     ([k, v]) => k !== "mode" && v !== void 0
@@ -986,7 +994,7 @@ function buildScalarOperator(expr, op, val, params, mode, fieldType, dialect) {
   }
   if (op === Ops.EQUALS && mode === Modes.INSENSITIVE && isNotNullish(dialect)) {
     const placeholder = params.addAuto(val);
-    return caseInsensitiveEquals(expr, placeholder);
+    return caseInsensitiveEquals(expr, placeholder, dialect);
   }
   const STRING_LIKE_OPS = /* @__PURE__ */ new Set([
     Ops.CONTAINS,
@@ -1057,7 +1065,7 @@ function buildDynamicLikePattern(op, placeholder, dialect) {
 }
 function handleLikeOperator(expr, op, val, params, mode, dialect) {
   if (val === void 0) return "";
-  if (isDynamicParameter(val)) {
+  if ((0, import_schema_parser.isDynamicParameter)(val)) {
     const placeholder2 = params.addAuto(val);
     const patternExpr = buildDynamicLikePattern(op, placeholder2, dialect);
     if (mode === Modes.INSENSITIVE) {
@@ -1073,7 +1081,7 @@ function handleLikeOperator(expr, op, val, params, mode, dialect) {
 }
 function handleInOperator(expr, op, val, params, dialect) {
   if (val === void 0) return "";
-  if (isDynamicParameter(val)) {
+  if ((0, import_schema_parser.isDynamicParameter)(val)) {
     const placeholder2 = params.addAuto(val);
     return op === Ops.IN ? inArray(expr, placeholder2, dialect) : notInArray(expr, placeholder2, dialect);
   }
@@ -1106,8 +1114,11 @@ function handleComparisonOperator(expr, op, val, params) {
   const placeholder = params.addAuto(val);
   return `${expr} ${sqlOp} ${placeholder}`;
 }
+
+// src/builder/where/operators-array.ts
+var import_schema_parser2 = require("@dee-wan/schema-parser");
 function buildArrayParam(val, params, dialect) {
-  if (isDynamicParameter(val)) {
+  if ((0, import_schema_parser2.isDynamicParameter)(val)) {
     return params.addAuto(val);
   }
   if (!Array.isArray(val)) {
@@ -1181,7 +1192,7 @@ function handleArrayHas(expr, val, params, cast, dialect) {
       value: val
     });
   }
-  if (!isDynamicParameter(val) && Array.isArray(val)) {
+  if (!(0, import_schema_parser2.isDynamicParameter)(val) && Array.isArray(val)) {
     throw createError(`has requires scalar value (single element), not array`, {
       operator: Ops.HAS,
       value: val
@@ -1198,7 +1209,7 @@ function handleArrayHas(expr, val, params, cast, dialect) {
 }
 function handleArrayHasSome(expr, val, params, cast, dialect) {
   if (val === void 0) return "";
-  if (isDynamicParameter(val)) {
+  if ((0, import_schema_parser2.isDynamicParameter)(val)) {
     const placeholder2 = params.addAuto(val);
     return arrayOverlaps(expr, placeholder2, cast, dialect);
   }
@@ -1870,6 +1881,9 @@ function createAliasGenerator(maxAliases = 1e4) {
     }
   };
 }
+
+// src/builder/shared/param-store.ts
+var import_schema_parser3 = require("@dee-wan/schema-parser");
 var MAX_PARAM_INDEX = Number.MAX_SAFE_INTEGER - 1e3;
 function assertSameLength(params, mappings) {
   if (params.length !== mappings.length) {
@@ -2000,8 +2014,8 @@ function createStoreInternal(startIndex, initialParams = [], initialMappings = [
     return dynamicName === void 0 ? addStatic(value) : addDynamic(dynamicName);
   }
   function addAuto(value) {
-    if (isDynamicParameter(value)) {
-      const dynamicName = extractDynamicName(value);
+    if ((0, import_schema_parser3.isDynamicParameter)(value)) {
+      const dynamicName = (0, import_schema_parser3.extractDynamicName)(value);
       return add(void 0, dynamicName);
     }
     return add(value);
@@ -2090,10 +2104,13 @@ function buildWhereClause(where, options) {
   }
   return publicResult;
 }
+
+// src/builder/shared/int-like.ts
+var import_schema_parser4 = require("@dee-wan/schema-parser");
 function normalizeIntLike(name, v, opts = {}) {
   var _a, _b;
   if (!isNotNullish(v)) return void 0;
-  if (isDynamicParameter(v)) return v;
+  if ((0, import_schema_parser4.isDynamicParameter)(v)) return v;
   if (typeof v !== "number" || !Number.isFinite(v) || !Number.isInteger(v)) {
     throw new Error(`${name} must be an integer`);
   }
@@ -2110,6 +2127,9 @@ function normalizeIntLike(name, v, opts = {}) {
   }
   return v;
 }
+
+// src/builder/shared/dynamic-params.ts
+var import_schema_parser5 = require("@dee-wan/schema-parser");
 function scopeName(scope, dynamicName) {
   const s = String(scope).trim();
   const dn = String(dynamicName).trim();
@@ -2117,13 +2137,16 @@ function scopeName(scope, dynamicName) {
   return `${s}:${dn}`;
 }
 function addAutoScoped(params, value, scope) {
-  if (isDynamicParameter(value)) {
-    const dn = extractDynamicName(value);
+  if ((0, import_schema_parser5.isDynamicParameter)(value)) {
+    const dn = (0, import_schema_parser5.extractDynamicName)(value);
     return params.add(void 0, scopeName(scope, dn));
   }
   return params.add(value);
 }
 
+// src/builder/pagination.ts
+var import_schema_parser6 = require("@dee-wan/schema-parser");
+
 // src/builder/shared/order-by-utils.ts
 var flipNulls = (v) => {
   const s = String(v).toLowerCase();
@@ -2259,7 +2282,7 @@ function normalizeFiniteInteger(name, v) {
   return v;
 }
 function normalizeNonNegativeInt(name, v) {
-  if (isDynamicParameter(v)) return v;
+  if ((0, import_schema_parser6.isDynamicParameter)(v)) return v;
   const n = normalizeFiniteInteger(name, v);
   if (n < 0) {
     throw new Error(`${name} must be >= 0`);
@@ -2273,7 +2296,7 @@ function hasNonNullishProp(v, key) {
   return isPlainObject(v) && key in v && isNotNullish(v[key]);
 }
 function normalizeIntegerOrDynamic(name, v) {
-  if (isDynamicParameter(v)) return v;
+  if ((0, import_schema_parser6.isDynamicParameter)(v)) return v;
   return normalizeFiniteInteger(name, v);
 }
 function readSkipTake(relArgs) {
@@ -2506,6 +2529,9 @@ function getPaginationParams(method, args) {
   return {};
 }
 
+// src/builder/select/assembly.ts
+var import_schema_parser7 = require("@dee-wan/schema-parser");
+
 // src/builder/select/fields.ts
 function toSelectEntries(select) {
   const out = [];
@@ -3341,7 +3367,7 @@ function appendPagination(sql, spec) {
   const isFindUniqueOrFirst = method === "findUnique" || method === "findFirst";
   if (isFindUniqueOrFirst) {
     const parts2 = [sql, SQL_TEMPLATES.LIMIT, "1"];
-    const hasSkip = isNotNullish(pagination.skip) && (isDynamicParameter(pagination.skip) || typeof pagination.skip === "number" && pagination.skip > 0) && method === "findFirst";
+    const hasSkip = isNotNullish(pagination.skip) && ((0, import_schema_parser7.isDynamicParameter)(pagination.skip) || typeof pagination.skip === "number" && pagination.skip > 0) && method === "findFirst";
     if (hasSkip) {
       const placeholder = addAutoScoped(
         params,
@@ -3574,7 +3600,7 @@ function normalizeArgsForNegativeTake(method, args) {
 }
 function normalizeArgsForDialect(dialect, args, model) {
   if (dialect !== "postgres") return args;
-  return applyPostgresDistinctOrderBy(args);
+  return applyPostgresDistinctOrderBy(args, model);
 }
 function buildCursorClauseIfAny(input) {
   const { cursor, orderBy, tableName, alias, params, dialect } = input;
@@ -3653,7 +3679,9 @@ function buildSelectSql(input) {
   const argsForSql = normalizeArgsForNegativeTake(method, args);
   const normalizedArgs = normalizeArgsForDialect(
     dialectToUse,
-    argsForSql);
+    argsForSql,
+    model
+  );
   validateDistinct(model, normalizedArgs.distinct);
   validateOrderBy(model, normalizedArgs.orderBy);
   validateCursor(model, normalizedArgs.cursor);
@@ -3669,6 +3697,9 @@ function buildSelectSql(input) {
   });
   return constructFinalSql(spec);
 }
+
+// src/builder/aggregates.ts
+var import_schema_parser8 = require("@dee-wan/schema-parser");
 var MODEL_FIELD_CACHE = /* @__PURE__ */ new WeakMap();
 var NUMERIC_TYPES = /* @__PURE__ */ new Set(["Int", "Float", "Decimal", "BigInt"]);
 var AGGREGATES = [
@@ -3763,7 +3794,7 @@ function buildNullComparison(expr, op) {
   throw new Error(`Operator '${op}' doesn't support null in HAVING`);
 }
 function buildInComparison(expr, op, val, params, dialect) {
-  if (isDynamicParameter(val)) {
+  if ((0, import_schema_parser8.isDynamicParameter)(val)) {
     const placeholder2 = addHavingParam(params, op, val);
     return op === Ops.IN ? inArray(expr, placeholder2, dialect) : notInArray(expr, placeholder2, dialect);
   }
@@ -4088,7 +4119,7 @@ function buildGroupBySql(args, whereResult, tableName, alias, model, dialect) {
   assertSafeAlias(alias);
   assertSafeTableRef(tableName);
   const byFields = assertGroupByBy(args, model);
-  const d = getGlobalDialect();
+  const d = dialect != null ? dialect : getGlobalDialect();
   const params = createParamStore(whereResult.nextParamIndex);
   const { groupFields, selectFields } = buildGroupBySelectParts(
     args,
@@ -4124,7 +4155,7 @@ function buildGroupBySql(args, whereResult, tableName, alias, model, dialect) {
 function buildCountSql(whereResult, tableName, alias, skip, dialect) {
   assertSafeAlias(alias);
   assertSafeTableRef(tableName);
-  const d = getGlobalDialect();
+  const d = dialect != null ? dialect : getGlobalDialect();
   const whereClause = isValidWhereClause(whereResult.clause) ? `${SQL_TEMPLATES.WHERE} ${whereResult.clause}` : "";
   const params = createParamStore(whereResult.nextParamIndex);
   const baseSubSelect = [
@@ -4161,7 +4192,7 @@ function buildCountSql(whereResult, tableName, alias, skip, dialect) {
   });
 }
 function applyCountSkip(subSelect, normalizedSkip, params, dialect) {
-  const shouldApply = isDynamicParameter(normalizedSkip) || typeof normalizedSkip === "number" && normalizedSkip > 0;
+  const shouldApply = (0, import_schema_parser8.isDynamicParameter)(normalizedSkip) || typeof normalizedSkip === "number" && normalizedSkip > 0;
   if (!shouldApply) return subSelect;
   const placeholder = addAutoScoped(params, normalizedSkip, "count.skip");
   if (dialect === "sqlite") {
@@ -4169,6 +4200,9 @@ function applyCountSkip(subSelect, normalizedSkip, params, dialect) {
   }
   return `${subSelect} ${SQL_TEMPLATES.OFFSET} ${placeholder}`;
 }
+
+// src/sql-generator.ts
+var import_schema_parser9 = require("@dee-wan/schema-parser");
 function safeAlias(input) {
   const raw = String(input).toLowerCase();
   const cleaned = raw.replace(/[^a-z0-9_]/g, "_");
@@ -4270,7 +4304,7 @@ function buildParamsFromMappings(mappings) {
 }
 function resolveModelContext(directive) {
   const { model, datamodel } = directive.context;
-  const schemaModels = convertDMMFToModels(datamodel);
+  const schemaModels = (0, import_schema_parser9.convertDMMFToModels)(datamodel);
   const modelDef = getModelByName(schemaModels, model.name);
   if (!modelDef) throw new Error(`Model ${model.name} not found in schema`);
   return { schemaModels, modelDef };
@@ -4365,6 +4399,9 @@ function generateSQL(directive) {
     normalizedMappings: normalized.paramMappings
   });
 }
+
+// src/index.ts
+var import_schema_parser10 = require("@dee-wan/schema-parser");
 function generateSQL2(directive) {
   return generateSQL(directive);
 }
@@ -4374,8 +4411,8 @@ function generateClient(options) {
   return __async(this, null, function* () {
     const { datamodel, outputDir, config } = options;
     setGlobalDialect(config.dialect);
-    const models = convertDMMFToModels(datamodel);
-    const directiveResults = processAllDirectives(
+    const models = (0, import_schema_parser11.convertDMMFToModels)(datamodel);
+    const directiveResults = (0, import_schema_parser11.processAllDirectives)(
       datamodel.models,
       datamodel,
       {
@@ -4407,9 +4444,9 @@ function generateClient(options) {
         queries.set(modelName, modelQueries);
       }
     }
-    yield mkdir(outputDir, { recursive: true });
+    yield (0, import_promises.mkdir)(outputDir, { recursive: true });
     const code = generateCode(models, queries, config.dialect);
-    yield writeFile(join(outputDir, "index.ts"), code);
+    yield (0, import_promises.writeFile)((0, import_path.join)(outputDir, "index.ts"), code);
     const totalQueries = Array.from(queries.values()).reduce(
       (sum, m) => sum + m.size,
       0
@@ -4600,6 +4637,9 @@ ${queryEntries.join(",\n")}
 ${entries.join(",\n")}
 }`;
 }
+
+// src/generator.ts
+var import_internals = require("@prisma/internals");
 var { version } = require_package();
 function getDialectFromProvider(provider) {
   const normalized = provider.toLowerCase();
@@ -4610,7 +4650,7 @@ function getDialectFromProvider(provider) {
     `Unsupported database provider: ${provider}. Supported: postgresql, postgres, sqlite`
   );
 }
-generatorHandler({
+(0, import_generator_helper.generatorHandler)({
   onManifest() {
     return {
       version,
@@ -4630,7 +4670,7 @@ generatorHandler({
       const configDialect = generator.config.dialect;
       const dialect = configDialect || autoDialect;
       if (configDialect && configDialect !== autoDialect) {
-        logger.warn(
+        import_internals.logger.warn(
           `Generator dialect (${configDialect}) differs from datasource provider (${datasources[0].provider}). Using generator config: ${configDialect}`
         );
       }
@@ -4639,18 +4679,16 @@ generatorHandler({
         skipInvalid: generator.config.skipInvalid === "true"
       };
       const outputDir = ((_a = generator.output) == null ? void 0 : _a.value) || "../node_modules/.prisma/client/sql";
-      logger.info(`Generating SQL client to ${outputDir}`);
-      logger.info(`Datasource: ${datasources[0].provider}`);
-      logger.info(`Dialect: ${config.dialect}`);
-      logger.info(`Skip invalid: ${config.skipInvalid}`);
+      import_internals.logger.info(`Generating SQL client to ${outputDir}`);
+      import_internals.logger.info(`Datasource: ${datasources[0].provider}`);
+      import_internals.logger.info(`Dialect: ${config.dialect}`);
+      import_internals.logger.info(`Skip invalid: ${config.skipInvalid}`);
       yield generateClient({
         datamodel: dmmf.datamodel,
         outputDir,
         config
       });
-      logger.info("\u2713 Generated SQL client successfully");
+      import_internals.logger.info("\u2713 Generated SQL client successfully");
     });
   }
 });
-//# sourceMappingURL=generator.js.map
-//# sourceMappingURL=generator.js.map