eslint-plugin-slonik 1.8.0 → 1.10.0

package/README.md

@@ -74,15 +74,15 @@ export default [
 | `sql.unnest([[...]], ['int4','text'])` | ✅ Full | Extracts types → `unnest($1::int4[], $2::text[])` |
 | `sql.identifier(['schema','table'])` | ✅ Full | Embeds → `"schema"."table"` |
 | `` sql.fragment`...` `` | ✅ Full | Embeds SQL content directly |
+| `sql.date(date)` | ✅ Full | Extracts type → `$1::date` |
+| `sql.timestamp(date)` | ✅ Full | Extracts type → `$1::timestamptz` |
+| `sql.interval({...})` | ✅ Full | Extracts type → `$1::interval` |
+| `sql.json(value)` | ✅ Full | Extracts type → `$1::json` |
+| `sql.jsonb(value)` | ✅ Full | Extracts type → `$1::jsonb` |
+| `sql.literalValue(value)` | ✅ Full | Extracts type → `$1` |
+| `sql.uuid(str)` | ✅ Full | Extracts type → `$1::uuid` |
+| `sql.binary(buffer)` | ✅ Full | Extracts type → `$1::bytea` |
 | `sql.join([...], glue)` | ✅ Skip | Skipped (runtime content) |
-| `sql.binary(buffer)` | ✅ Skip | Skipped |
-| `sql.date(date)` | ✅ Skip | Skipped |
-| `sql.timestamp(date)` | ✅ Skip | Skipped |
-| `sql.interval({...})` | ✅ Skip | Skipped |
-| `sql.json(value)` | ✅ Skip | Skipped |
-| `sql.jsonb(value)` | ✅ Skip | Skipped |
-| `sql.uuid(str)` | ✅ Skip | Skipped |
-| `sql.literalValue(str)` | ✅ Skip | Skipped |
 
 ### How It Works
 
@@ -107,6 +107,48 @@ sql.type(z.object({ id: z.number() }))`
   SELECT id FROM users ${whereClause}
 `;
 // → Validates: SELECT id FROM users WHERE active = true
+
+// sql.date for date values
+sql.type(z.object({ id: z.number() }))`
+  SELECT id FROM events WHERE event_date = ${sql.date(myDate)}
+`;
+// → Validates: SELECT id FROM events WHERE event_date = $1::date
+
+// sql.timestamp for timestamp values
+sql.type(z.object({ id: z.number() }))`
+  SELECT id FROM events WHERE created_at = ${sql.timestamp(myTimestamp)}
+`;
+// → Validates: SELECT id FROM events WHERE created_at = $1::timestamptz
+
+// sql.interval for interval values
+sql.type(z.object({ id: z.number() }))`
+  SELECT id FROM events WHERE created_at > NOW() - ${sql.interval({ days: 7 })}
+`;
+// → Validates: SELECT id FROM events WHERE created_at > NOW() - $1::interval
+
+// sql.json and sql.jsonb for JSON values
+sql.type(z.object({ id: z.number() }))`
+  INSERT INTO settings (config) VALUES (${sql.jsonb({ theme: 'dark' })})
+`;
+// → Validates: INSERT INTO settings (config) VALUES ($1::jsonb)
+
+// sql.literalValue for literal SQL values
+sql.type(z.object({ result: z.string() }))`
+  SELECT ${sql.literalValue('hello')} AS result
+`;
+// → Validates: SELECT $1 AS result
+
+// sql.uuid for UUID values
+sql.type(z.object({ id: z.number() }))`
+  SELECT id FROM users WHERE external_id = ${sql.uuid(externalId)}
+`;
+// → Validates: SELECT id FROM users WHERE external_id = $1::uuid
+
+// sql.binary for binary data
+sql.type(z.object({ id: z.number() }))`
+  UPDATE files SET content = ${sql.binary(buffer)} WHERE id = ${id}
+`;
+// → Validates: UPDATE files SET content = $1::bytea WHERE id = $2
 ```
 
 **Graceful Skip** means the plugin recognizes Slonik tokens and skips validation for those expressions, preventing false positives:

package/dist/index.cjs

@@ -379,6 +379,118 @@ function isSlonikJoinCall(expression) {
   const objectName = getMemberExpressionObjectName(callee.object);
   return objectName === "sql";
 }
+function isSlonikDateCall(expression) {
+  if (expression.type !== "CallExpression") {
+    return false;
+  }
+  const callee = expression.callee;
+  if (callee.type !== "MemberExpression") {
+    return false;
+  }
+  if (callee.property.type !== "Identifier" || callee.property.name !== "date") {
+    return false;
+  }
+  const objectName = getMemberExpressionObjectName(callee.object);
+  return objectName === "sql";
+}
+function isSlonikTimestampCall(expression) {
+  if (expression.type !== "CallExpression") {
+    return false;
+  }
+  const callee = expression.callee;
+  if (callee.type !== "MemberExpression") {
+    return false;
+  }
+  if (callee.property.type !== "Identifier" || callee.property.name !== "timestamp") {
+    return false;
+  }
+  const objectName = getMemberExpressionObjectName(callee.object);
+  return objectName === "sql";
+}
+function isSlonikIntervalCall(expression) {
+  if (expression.type !== "CallExpression") {
+    return false;
+  }
+  const callee = expression.callee;
+  if (callee.type !== "MemberExpression") {
+    return false;
+  }
+  if (callee.property.type !== "Identifier" || callee.property.name !== "interval") {
+    return false;
+  }
+  const objectName = getMemberExpressionObjectName(callee.object);
+  return objectName === "sql";
+}
+function isSlonikJsonCall(expression) {
+  if (expression.type !== "CallExpression") {
+    return false;
+  }
+  const callee = expression.callee;
+  if (callee.type !== "MemberExpression") {
+    return false;
+  }
+  if (callee.property.type !== "Identifier" || callee.property.name !== "json") {
+    return false;
+  }
+  const objectName = getMemberExpressionObjectName(callee.object);
+  return objectName === "sql";
+}
+function isSlonikJsonbCall(expression) {
+  if (expression.type !== "CallExpression") {
+    return false;
+  }
+  const callee = expression.callee;
+  if (callee.type !== "MemberExpression") {
+    return false;
+  }
+  if (callee.property.type !== "Identifier" || callee.property.name !== "jsonb") {
+    return false;
+  }
+  const objectName = getMemberExpressionObjectName(callee.object);
+  return objectName === "sql";
+}
+function isSlonikLiteralValueCall(expression) {
+  if (expression.type !== "CallExpression") {
+    return false;
+  }
+  const callee = expression.callee;
+  if (callee.type !== "MemberExpression") {
+    return false;
+  }
+  if (callee.property.type !== "Identifier" || callee.property.name !== "literalValue") {
+    return false;
+  }
+  const objectName = getMemberExpressionObjectName(callee.object);
+  return objectName === "sql";
+}
+function isSlonikUuidCall(expression) {
+  if (expression.type !== "CallExpression") {
+    return false;
+  }
+  const callee = expression.callee;
+  if (callee.type !== "MemberExpression") {
+    return false;
+  }
+  if (callee.property.type !== "Identifier" || callee.property.name !== "uuid") {
+    return false;
+  }
+  const objectName = getMemberExpressionObjectName(callee.object);
+  return objectName === "sql";
+}
+function isSlonikBinaryCall(expression) {
+  if (expression.type !== "CallExpression") {
+    return false;
+  }
+  const callee = expression.callee;
+  if (callee.type !== "MemberExpression") {
+    return false;
+  }
+  if (callee.property.type !== "Identifier" || callee.property.name !== "binary") {
+    return false;
+  }
+  const objectName = getMemberExpressionObjectName(callee.object);
+  return objectName === "sql";
+}
 function extractSlonikFragment(expression) {
   if (expression.type !== "TaggedTemplateExpression") {
     return null;
@@ -500,6 +612,150 @@ function mapTemplateLiteralToQueryText(quasi, parser, checker, options, sourceCo
     if (isSlonikJoinCall(expression)) {
       return E__namespace.right(null);
     }
+    if (isSlonikDateCall(expression)) {
+      const placeholder2 = `$${++$idx}::date`;
+      $queryText += placeholder2;
+      sourcemaps.push({
+        original: {
+          start: expression.range[0] - quasi.range[0] - 2,
+          end: expression.range[1] - quasi.range[0],
+          text: sourceCode.text.slice(expression.range[0] - 2, expression.range[1] + 1)
+        },
+        generated: {
+          start: position,
+          end: position + placeholder2.length,
+          text: placeholder2
+        },
+        offset: 0
+      });
+      continue;
+    }
+    if (isSlonikTimestampCall(expression)) {
+      const placeholder2 = `$${++$idx}::timestamptz`;
+      $queryText += placeholder2;
+      sourcemaps.push({
+        original: {
+          start: expression.range[0] - quasi.range[0] - 2,
+          end: expression.range[1] - quasi.range[0],
+          text: sourceCode.text.slice(expression.range[0] - 2, expression.range[1] + 1)
+        },
+        generated: {
+          start: position,
+          end: position + placeholder2.length,
+          text: placeholder2
+        },
+        offset: 0
+      });
+      continue;
+    }
+    if (isSlonikIntervalCall(expression)) {
+      const placeholder2 = `$${++$idx}::interval`;
+      $queryText += placeholder2;
+      sourcemaps.push({
+        original: {
+          start: expression.range[0] - quasi.range[0] - 2,
+          end: expression.range[1] - quasi.range[0],
+          text: sourceCode.text.slice(expression.range[0] - 2, expression.range[1] + 1)
+        },
+        generated: {
+          start: position,
+          end: position + placeholder2.length,
+          text: placeholder2
+        },
+        offset: 0
+      });
+      continue;
+    }
+    if (isSlonikJsonCall(expression)) {
+      const placeholder2 = `$${++$idx}::json`;
+      $queryText += placeholder2;
+      sourcemaps.push({
+        original: {
+          start: expression.range[0] - quasi.range[0] - 2,
+          end: expression.range[1] - quasi.range[0],
+          text: sourceCode.text.slice(expression.range[0] - 2, expression.range[1] + 1)
+        },
+        generated: {
+          start: position,
+          end: position + placeholder2.length,
+          text: placeholder2
+        },
+        offset: 0
+      });
+      continue;
+    }
+    if (isSlonikJsonbCall(expression)) {
+      const placeholder2 = `$${++$idx}::jsonb`;
+      $queryText += placeholder2;
+      sourcemaps.push({
+        original: {
+          start: expression.range[0] - quasi.range[0] - 2,
+          end: expression.range[1] - quasi.range[0],
+          text: sourceCode.text.slice(expression.range[0] - 2, expression.range[1] + 1)
+        },
+        generated: {
+          start: position,
+          end: position + placeholder2.length,
+          text: placeholder2
+        },
+        offset: 0
+      });
+      continue;
+    }
+    if (isSlonikLiteralValueCall(expression)) {
+      const placeholder2 = `$${++$idx}`;
+      $queryText += placeholder2;
+      sourcemaps.push({
+        original: {
+          start: expression.range[0] - quasi.range[0] - 2,
+          end: expression.range[1] - quasi.range[0],
+          text: sourceCode.text.slice(expression.range[0] - 2, expression.range[1] + 1)
+        },
+        generated: {
+          start: position,
+          end: position + placeholder2.length,
+          text: placeholder2
+        },
+        offset: 0
+      });
+      continue;
+    }
+    if (isSlonikUuidCall(expression)) {
+      const placeholder2 = `$${++$idx}::uuid`;
+      $queryText += placeholder2;
+      sourcemaps.push({
+        original: {
+          start: expression.range[0] - quasi.range[0] - 2,
+          end: expression.range[1] - quasi.range[0],
+          text: sourceCode.text.slice(expression.range[0] - 2, expression.range[1] + 1)
+        },
+        generated: {
+          start: position,
+          end: position + placeholder2.length,
+          text: placeholder2
+        },
+        offset: 0
+      });
+      continue;
+    }
+    if (isSlonikBinaryCall(expression)) {
+      const placeholder2 = `$${++$idx}::bytea`;
+      $queryText += placeholder2;
+      sourcemaps.push({
+        original: {
+          start: expression.range[0] - quasi.range[0] - 2,
+          end: expression.range[1] - quasi.range[0],
+          text: sourceCode.text.slice(expression.range[0] - 2, expression.range[1] + 1)
+        },
+        generated: {
+          start: position,
+          end: position + placeholder2.length,
+          text: placeholder2
+        },
+        offset: 0
+      });
+      continue;
+    }
     const slonikUnnestTypes = extractSlonikUnnestTypes(expression);
     if (slonikUnnestTypes !== null) {
       const placeholders = slonikUnnestTypes.map((type) => `$${++$idx}::${type}`);