@farming-labs/orm 0.0.10 → 0.0.12

package/dist/index.cjs

@@ -28,9 +28,13 @@ __export(index_exports, {
   createOrm: () => createOrm,
   datetime: () => datetime,
   defineSchema: () => defineSchema,
+  equalValues: () => equalValues,
   hasMany: () => hasMany,
   hasOne: () => hasOne,
   id: () => id,
+  integer: () => integer,
+  isOperatorFilterObject: () => isOperatorFilterObject,
+  json: () => json,
   manyToMany: () => manyToMany,
   mergeUniqueLookupCreateData: () => mergeUniqueLookupCreateData,
   model: () => model,
@@ -118,6 +122,9 @@ var FieldBuilder = class {
     this.config = config;
   }
   _tag = "field";
+  __kind;
+  __nullable;
+  __value;
   unique() {
     return cloneField({
       ...this.config,
@@ -190,19 +197,39 @@ function datetime() {
     unique: false
   });
 }
+function integer() {
+  return new FieldBuilder({
+    kind: "integer",
+    nullable: false,
+    unique: false
+  });
+}
+function json() {
+  return new FieldBuilder({
+    kind: "json",
+    nullable: false,
+    unique: false
+  });
+}
 
 // src/manifest.ts
-function equalLookupValues(left, right) {
-  if (left instanceof Date && right instanceof Date) {
-    return left.getTime() === right.getTime();
-  }
-  return Object.is(left, right);
-}
+var import_node_util = require("util");
+var filterOperatorKeys = /* @__PURE__ */ new Set(["eq", "contains", "in", "not", "gt", "gte", "lt", "lte"]);
 function isFilterObject(value) {
   return !!value && typeof value === "object" && !(value instanceof Date) && !Array.isArray(value);
 }
+function isOperatorFilterObject(value) {
+  if (!isFilterObject(value)) {
+    return false;
+  }
+  const keys = Object.keys(value);
+  return keys.length > 0 && keys.every((key) => filterOperatorKeys.has(key));
+}
+function equalValues(left, right) {
+  return (0, import_node_util.isDeepStrictEqual)(left, right);
+}
 function extractEqualityValue(filter) {
-  if (!isFilterObject(filter)) {
+  if (!isOperatorFilterObject(filter)) {
     return {
       supported: true,
       value: filter
@@ -334,7 +361,7 @@ function mergeUniqueLookupCreateData(model2, createData, lookup, operation) {
   for (const field of lookup.fields) {
     const currentValue = output[field.name];
     const expectedValue = lookup.values[field.name];
-    if (currentValue !== void 0 && !equalLookupValues(currentValue, expectedValue)) {
+    if (currentValue !== void 0 && !equalValues(currentValue, expectedValue)) {
       throw new Error(
         `${operation} on model "${model2.name}" requires create.${field.name} to match where.${field.name}.`
       );
@@ -346,7 +373,7 @@ function mergeUniqueLookupCreateData(model2, createData, lookup, operation) {
 function validateUniqueLookupUpdateData(model2, updateData, lookup, operation) {
   for (const field of lookup.fields) {
     const nextValue = updateData[field.name];
-    if (nextValue !== void 0 && !equalLookupValues(nextValue, lookup.values[field.name])) {
+    if (nextValue !== void 0 && !equalValues(nextValue, lookup.values[field.name])) {
       throw new Error(
         `${operation} on model "${model2.name}" cannot change the conflict field "${field.name}".`
       );
@@ -463,6 +490,10 @@ function prismaType(field) {
       return "Boolean";
     case "datetime":
       return "DateTime";
+    case "integer":
+      return "Int";
+    case "json":
+      return "Json";
   }
 }
 function drizzleConstraintProperty(constraint) {
@@ -483,6 +514,12 @@ function drizzleImports(dialect, manifest) {
   const needsDate = models.some(
     (model2) => Object.values(model2.fields).some((field) => field.kind === "datetime")
   );
+  const needsInteger = models.some(
+    (model2) => Object.values(model2.fields).some((field) => field.kind === "integer")
+  );
+  const needsJson = models.some(
+    (model2) => Object.values(model2.fields).some((field) => field.kind === "json")
+  );
   const needsIndexes = models.some(
     (model2) => model2.constraints.indexes.length || model2.constraints.unique.length
   );
@@ -491,7 +528,9 @@ function drizzleImports(dialect, manifest) {
       "pgTable",
       "text",
       needsBoolean ? "boolean" : null,
+      needsInteger ? "integer" : null,
       needsDate ? "timestamp" : null,
+      needsJson ? "jsonb" : null,
       needsIndexes ? "index" : null,
       needsIndexes ? "uniqueIndex" : null
     ].filter(Boolean);
@@ -502,7 +541,9 @@ function drizzleImports(dialect, manifest) {
       "varchar",
       "text",
       needsBoolean ? "boolean" : null,
+      needsInteger ? "int" : null,
       needsDate ? "datetime" : null,
+      needsJson ? "json" : null,
       needsIndexes ? "index" : null,
       needsIndexes ? "uniqueIndex" : null
     ].filter(Boolean);
@@ -516,6 +557,10 @@ function drizzleImports(dialect, manifest) {
   ].filter(Boolean);
 }
 function drizzleColumn(field, dialect, options = {}) {
+  const renderDefault = () => {
+    if (field.defaultValue === void 0 || field.kind === "json") return "";
+    return `.default(${JSON.stringify(field.defaultValue)})`;
+  };
   if (field.kind === "id") {
     if (dialect === "mysql") {
       return `varchar("${field.column}", { length: 191 }).primaryKey()`;
@@ -525,15 +570,30 @@ function drizzleColumn(field, dialect, options = {}) {
   if (field.kind === "string") {
     if (dialect === "mysql") {
       const base = field.unique || field.references || options.indexed ? `varchar("${field.column}", { length: 191 })` : `text("${field.column}")`;
-      return `${base}${field.nullable ? "" : ".notNull()"}${field.unique ? ".unique()" : ""}${field.defaultValue !== void 0 ? `.default(${JSON.stringify(field.defaultValue)})` : ""}`;
+      return `${base}${field.nullable ? "" : ".notNull()"}${field.unique ? ".unique()" : ""}${renderDefault()}`;
     }
-    return `text("${field.column}")${field.nullable ? "" : ".notNull()"}${field.unique ? ".unique()" : ""}${field.defaultValue !== void 0 ? `.default(${JSON.stringify(field.defaultValue)})` : ""}`;
+    return `text("${field.column}")${field.nullable ? "" : ".notNull()"}${field.unique ? ".unique()" : ""}${renderDefault()}`;
   }
   if (field.kind === "boolean") {
     if (dialect === "sqlite") {
-      return `integer("${field.column}", { mode: "boolean" })${field.nullable ? "" : ".notNull()"}${field.defaultValue !== void 0 ? `.default(${String(field.defaultValue)})` : ""}`;
+      return `integer("${field.column}", { mode: "boolean" })${field.nullable ? "" : ".notNull()"}${renderDefault()}`;
+    }
+    return `boolean("${field.column}")${field.nullable ? "" : ".notNull()"}${renderDefault()}`;
+  }
+  if (field.kind === "integer") {
+    if (dialect === "mysql") {
+      return `int("${field.column}")${field.nullable ? "" : ".notNull()"}${renderDefault()}`;
     }
-    return `boolean("${field.column}")${field.nullable ? "" : ".notNull()"}${field.defaultValue !== void 0 ? `.default(${String(field.defaultValue)})` : ""}`;
+    return `integer("${field.column}")${field.nullable ? "" : ".notNull()"}${renderDefault()}`;
+  }
+  if (field.kind === "json") {
+    if (dialect === "pg") {
+      return `jsonb("${field.column}")${field.nullable ? "" : ".notNull()"}`;
+    }
+    if (dialect === "mysql") {
+      return `json("${field.column}")${field.nullable ? "" : ".notNull()"}`;
+    }
+    return `text("${field.column}", { mode: "json" })${field.nullable ? "" : ".notNull()"}`;
   }
   if (dialect === "mysql") {
     return `datetime("${field.column}", { mode: "date" })${field.nullable ? "" : ".notNull()"}`;
@@ -553,6 +613,14 @@ function sqlType(field, dialect, options = {}) {
   if (field.kind === "boolean") {
     return dialect === "sqlite" ? "integer" : "boolean";
   }
+  if (field.kind === "integer") {
+    return "integer";
+  }
+  if (field.kind === "json") {
+    if (dialect === "postgres") return "jsonb";
+    if (dialect === "mysql") return "json";
+    return "text";
+  }
   if (dialect === "mysql") {
     return "datetime";
   }
@@ -606,7 +674,7 @@ function renderPrismaSchema(schema, options = {}) {
       if (field.kind === "id") modifiers.push("@id");
       if (field.generated === "id") modifiers.push("@default(cuid())");
       if (field.generated === "now") modifiers.push("@default(now())");
-      if (field.defaultValue !== void 0 && field.generated === void 0) {
+      if (field.defaultValue !== void 0 && field.generated === void 0 && field.kind !== "json") {
         modifiers.push(
           typeof field.defaultValue === "string" ? `@default("${field.defaultValue}")` : `@default(${String(field.defaultValue)})`
         );
@@ -764,7 +832,7 @@ function renderSafeSql(schema, options) {
       if (field.kind === "id") parts.push("primary key");
       if (!field.nullable) parts.push("not null");
       if (field.unique && field.kind !== "id") parts.push("unique");
-      if (field.defaultValue !== void 0) {
+      if (field.defaultValue !== void 0 && field.kind !== "json") {
         parts.push(
           `default ${typeof field.defaultValue === "string" ? `'${field.defaultValue}'` : String(field.defaultValue)}`
         );
@@ -815,7 +883,6 @@ ${block}
 
 // src/memory.ts
 var import_node_crypto = require("crypto");
-var isDate = (value) => value instanceof Date;
 var manifestCache = /* @__PURE__ */ new WeakMap();
 function getManifest(schema) {
   const cached = manifestCache.get(schema);
@@ -825,15 +892,15 @@ function getManifest(schema) {
   return next;
 }
 function evaluateFilter(value, filter) {
-  if (filter === void 0 || filter === null || typeof filter !== "object" || isDate(filter) || Array.isArray(filter)) {
-    return value === filter;
+  if (!isOperatorFilterObject(filter)) {
+    return equalValues(value, filter);
   }
   const record = filter;
-  if ("eq" in record && value !== record.eq) return false;
-  if ("not" in record && value === record.not) return false;
+  if ("eq" in record && !equalValues(value, record.eq)) return false;
+  if ("not" in record && equalValues(value, record.not)) return false;
   if ("in" in record) {
     const values = Array.isArray(record.in) ? record.in : [];
-    if (!values.includes(value)) return false;
+    if (!values.some((candidate) => equalValues(candidate, value))) return false;
   }
   if ("contains" in record) {
     if (typeof value !== "string" || typeof record.contains !== "string") return false;
@@ -1169,9 +1236,13 @@ function defineSchema(models) {
   createOrm,
   datetime,
   defineSchema,
+  equalValues,
   hasMany,
   hasOne,
   id,
+  integer,
+  isOperatorFilterObject,
+  json,
   manyToMany,
   mergeUniqueLookupCreateData,
   model,