bun-query-builder 0.1.39 → 0.1.41

package/dist/bin/cli.js

@@ -24517,6 +24517,25 @@ function collectBelongsToManyKeys(definition) {
   btmKeysCache.set(definition, keys);
   return keys;
 }
+function normalizeAttributeKeys(data) {
+  const result = {};
+  for (const [key, value] of Object.entries(data)) {
+    result[toSnakeCase(key)] = value;
+  }
+  return result;
+}
+function findAttributeDef(attrs, key) {
+  if (attrs[key])
+    return attrs[key];
+  const snake = toSnakeCase(key);
+  if (attrs[snake])
+    return attrs[snake];
+  for (const k2 of Object.keys(attrs)) {
+    if (toSnakeCase(k2) === snake)
+      return attrs[k2];
+  }
+  return;
+}
 
 class ModelInstance {
   _attributes;
@@ -24526,7 +24545,7 @@ class ModelInstance {
   _relations = {};
   constructor(definition, attributes = {}) {
     this._definition = definition;
-    this._attributes = { ...attributes };
+    this._attributes = normalizeAttributeKeys({ ...attributes });
     this._original = null;
     const btmKeys = collectBelongsToManyKeys(definition);
     if (btmKeys.size === 0)
@@ -24566,10 +24585,10 @@ class ModelInstance {
           return v2;
       } catch {}
     }
-    return this._attributes[key];
+    return this._attributes[toSnakeCase(key)];
   }
   getAttribute(key) {
-    return this._attributes[key];
+    return this._attributes[toSnakeCase(key)];
   }
   getAttributes() {
     return { ...this._attributes };
@@ -24577,7 +24596,7 @@ class ModelInstance {
   set(key, value) {
     if (this._original === null)
       this._original = { ...this._attributes };
-    this._attributes[key] = value;
+    this._attributes[toSnakeCase(key)] = value;
   }
   only(keys) {
     const out = {};
@@ -24640,11 +24659,12 @@ class ModelInstance {
   fill(data) {
     const attrs = this._definition.attributes;
     for (const [key, value] of Object.entries(data)) {
-      const attr = attrs[key];
-      if (attr?.fillable && !attr?.guarded) {
+      const attr = findAttributeDef(attrs, key);
+      const isImplicitForeignKey = !attr && toSnakeCase(key).endsWith("_id");
+      if (attr?.fillable && !attr?.guarded || isImplicitForeignKey) {
         if (this._original === null)
           this._original = { ...this._attributes };
-        this._attributes[key] = value;
+        this._attributes[toSnakeCase(key)] = value;
       }
     }
     return this;
@@ -24652,7 +24672,7 @@ class ModelInstance {
   forceFill(data) {
     if (this._original === null)
       this._original = { ...this._attributes };
-    Object.assign(this._attributes, data);
+    Object.assign(this._attributes, normalizeAttributeKeys(data));
     return this;
   }
   async save() {
@@ -24686,7 +24706,13 @@ class ModelInstance {
       for (const [key, attr] of Object.entries(attrs)) {
         if (attr.guarded)
           continue;
-        if (this._attributes[key] !== undefined) {
+        const col = toSnakeCase(key);
+        if (this._attributes[col] !== undefined) {
+          data[col] = this._attributes[col];
+        }
+      }
+      for (const key of Object.keys(this._attributes)) {
+        if (key.endsWith("_id") && key !== pk && !(key in data)) {
           data[key] = this._attributes[key];
         }
       }
@@ -30748,7 +30774,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.1.39";
+var version2 = "0.1.41";
 
 // bin/cli.ts
 init_actions();

package/dist/src/index.js

@@ -24517,6 +24517,25 @@ function collectBelongsToManyKeys(definition) {
   btmKeysCache.set(definition, keys);
   return keys;
 }
+function normalizeAttributeKeys(data) {
+  const result = {};
+  for (const [key, value] of Object.entries(data)) {
+    result[toSnakeCase(key)] = value;
+  }
+  return result;
+}
+function findAttributeDef(attrs, key) {
+  if (attrs[key])
+    return attrs[key];
+  const snake = toSnakeCase(key);
+  if (attrs[snake])
+    return attrs[snake];
+  for (const k2 of Object.keys(attrs)) {
+    if (toSnakeCase(k2) === snake)
+      return attrs[k2];
+  }
+  return;
+}
 
 class ModelInstance {
   _attributes;
@@ -24526,7 +24545,7 @@ class ModelInstance {
   _relations = {};
   constructor(definition, attributes = {}) {
     this._definition = definition;
-    this._attributes = { ...attributes };
+    this._attributes = normalizeAttributeKeys({ ...attributes });
     this._original = null;
     const btmKeys = collectBelongsToManyKeys(definition);
     if (btmKeys.size === 0)
@@ -24566,10 +24585,10 @@ class ModelInstance {
           return v2;
       } catch {}
     }
-    return this._attributes[key];
+    return this._attributes[toSnakeCase(key)];
   }
   getAttribute(key) {
-    return this._attributes[key];
+    return this._attributes[toSnakeCase(key)];
   }
   getAttributes() {
     return { ...this._attributes };
@@ -24577,7 +24596,7 @@ class ModelInstance {
   set(key, value) {
     if (this._original === null)
       this._original = { ...this._attributes };
-    this._attributes[key] = value;
+    this._attributes[toSnakeCase(key)] = value;
   }
   only(keys) {
     const out = {};
@@ -24640,11 +24659,12 @@ class ModelInstance {
   fill(data) {
     const attrs = this._definition.attributes;
     for (const [key, value] of Object.entries(data)) {
-      const attr = attrs[key];
-      if (attr?.fillable && !attr?.guarded) {
+      const attr = findAttributeDef(attrs, key);
+      const isImplicitForeignKey = !attr && toSnakeCase(key).endsWith("_id");
+      if (attr?.fillable && !attr?.guarded || isImplicitForeignKey) {
         if (this._original === null)
           this._original = { ...this._attributes };
-        this._attributes[key] = value;
+        this._attributes[toSnakeCase(key)] = value;
       }
     }
     return this;
@@ -24652,7 +24672,7 @@ class ModelInstance {
   forceFill(data) {
     if (this._original === null)
       this._original = { ...this._attributes };
-    Object.assign(this._attributes, data);
+    Object.assign(this._attributes, normalizeAttributeKeys(data));
     return this;
   }
   async save() {
@@ -24686,7 +24706,13 @@ class ModelInstance {
       for (const [key, attr] of Object.entries(attrs)) {
         if (attr.guarded)
           continue;
-        if (this._attributes[key] !== undefined) {
+        const col = toSnakeCase(key);
+        if (this._attributes[col] !== undefined) {
+          data[col] = this._attributes[col];
+        }
+      }
+      for (const key of Object.keys(this._attributes)) {
+        if (key.endsWith("_id") && key !== pk && !(key in data)) {
           data[key] = this._attributes[key];
         }
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",