@xata.io/client 0.18.1 → 0.18.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @xata.io/client
 
+## 0.18.3
+
+### Patch Changes
+
+- [#639](https://github.com/xataio/client-ts/pull/639) [`50fb3c0`](https://github.com/xataio/client-ts/commit/50fb3c0a1cffd03a16cc8b1b21454ea816f2edbb) Thanks [@SferaDev](https://github.com/SferaDev)! - Do not return null for columns not selected
+
+## 0.18.2
+
+### Patch Changes
+
+- [#635](https://github.com/xataio/client-ts/pull/635) [`713f9b2`](https://github.com/xataio/client-ts/commit/713f9b2773be99c17d3fcb663e24fe096fa3da48) Thanks [@SferaDev](https://github.com/SferaDev)! - [Search] Add target columns
+
 ## 0.18.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -172,7 +172,7 @@ function getFetchImplementation(userFetch) {
   return fetchImpl;
 }
 
-const VERSION = "0.18.1";
+const VERSION = "0.18.3";
 
 class ErrorWithCause extends Error {
   constructor(message, options) {
@@ -1712,7 +1712,7 @@ class RestRepository extends Query {
             ...fetchProps
           });
           const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
-          return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response);
+          return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
         } catch (e) {
           if (isObject(e) && e.status === 404) {
             return null;
@@ -1858,7 +1858,7 @@ class RestRepository extends Query {
         ...fetchProps
       });
       const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
-      return records.map((item) => initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), item));
+      return records.map((item) => initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), item, ["*"]));
     });
   }
   async query(query) {
@@ -1880,7 +1880,9 @@ class RestRepository extends Query {
         ...fetchProps
       });
       const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
-      const records = objects.map((record) => initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), record));
+      const records = objects.map(
+        (record) => initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), record, data.columns ?? ["*"])
+      );
       await __privateMethod$2(this, _setCacheQuery, setCacheQuery_fn).call(this, query, meta, records);
       return new Page(query, meta, records);
     });
@@ -1907,7 +1909,7 @@ insertRecordWithoutId_fn = async function(object, columns = ["*"]) {
     ...fetchProps
   });
   const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
-  return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response);
+  return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
 };
 _insertRecordWithId = new WeakSet();
 insertRecordWithId_fn = async function(recordId, object, columns = ["*"]) {
@@ -1925,7 +1927,7 @@ insertRecordWithId_fn = async function(recordId, object, columns = ["*"]) {
     ...fetchProps
   });
   const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
-  return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response);
+  return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
 };
 _bulkInsertTableRecords = new WeakSet();
 bulkInsertTableRecords_fn = async function(objects, columns = ["*"]) {
@@ -1941,7 +1943,7 @@ bulkInsertTableRecords_fn = async function(objects, columns = ["*"]) {
     throw new Error("Request included columns but server didn't include them");
   }
   const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
-  return response.records?.map((item) => initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), item));
+  return response.records?.map((item) => initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), item, columns));
 };
 _updateRecordWithID = new WeakSet();
 updateRecordWithID_fn = async function(recordId, object, columns = ["*"]) {
@@ -1955,7 +1957,7 @@ updateRecordWithID_fn = async function(recordId, object, columns = ["*"]) {
       ...fetchProps
     });
     const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
-    return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response);
+    return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
   } catch (e) {
     if (isObject(e) && e.status === 404) {
       return null;
@@ -1973,7 +1975,7 @@ upsertRecordWithID_fn = async function(recordId, object, columns = ["*"]) {
     ...fetchProps
   });
   const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
-  return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response);
+  return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
 };
 _deleteRecord = new WeakSet();
 deleteRecord_fn = async function(recordId, columns = ["*"]) {
@@ -1985,7 +1987,7 @@ deleteRecord_fn = async function(recordId, columns = ["*"]) {
       ...fetchProps
     });
     const schemaTables = await __privateMethod$2(this, _getSchemaTables$1, getSchemaTables_fn$1).call(this);
-    return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response);
+    return initObject(__privateGet$4(this, _db), schemaTables, __privateGet$4(this, _table), response, columns);
   } catch (e) {
     if (isObject(e) && e.status === 404) {
       return null;
@@ -2028,7 +2030,7 @@ const transformObjectLinks = (object) => {
     return { ...acc, [key]: isIdentifiable(value) ? value.id : value };
   }, {});
 };
-const initObject = (db, schemaTables, table, object) => {
+const initObject = (db, schemaTables, table, object, selectedColumns) => {
   const result = {};
   const { xata, ...rest } = object ?? {};
   Object.assign(result, rest);
@@ -2036,6 +2038,8 @@ const initObject = (db, schemaTables, table, object) => {
   if (!columns)
     console.error(`Table ${table} not found in schema`);
   for (const column of columns ?? []) {
+    if (!isValidColumn(selectedColumns, column))
+      continue;
     const value = result[column.name];
     switch (column.type) {
       case "datetime": {
@@ -2052,7 +2056,17 @@ const initObject = (db, schemaTables, table, object) => {
         if (!linkTable) {
           console.error(`Failed to parse link for field ${column.name}`);
         } else if (isObject(value)) {
-          result[column.name] = initObject(db, schemaTables, linkTable, value);
+          const selectedLinkColumns = selectedColumns.reduce((acc, item) => {
+            if (item === column.name) {
+              return [...acc, "*"];
+            }
+            if (item.startsWith(`${column.name}.`)) {
+              const [, ...path] = item.split(".");
+              return [...acc, path.join(".")];
+            }
+            return acc;
+          }, []);
+          result[column.name] = initObject(db, schemaTables, linkTable, value, selectedLinkColumns);
         } else {
           result[column.name] = null;
         }
@@ -2100,6 +2114,15 @@ function cleanFilter(filter) {
   const values = Object.values(filter).filter(Boolean).filter((value) => Array.isArray(value) ? value.length > 0 : true);
   return values.length > 0 ? filter : void 0;
 }
+function isValidColumn(columns, column) {
+  if (columns.includes("*"))
+    return true;
+  if (column.type === "link") {
+    const linkColumns = columns.filter((item) => item.startsWith(column.name));
+    return linkColumns.length > 0;
+  }
+  return columns.includes(column.name);
+}
 
 var __accessCheck$3 = (obj, member, msg) => {
   if (!member.has(obj))
@@ -2265,7 +2288,7 @@ class SearchPlugin extends XataPlugin {
         const schemaTables = await __privateMethod$1(this, _getSchemaTables, getSchemaTables_fn).call(this, getFetchProps);
         return records.map((record) => {
           const { table = "orphan" } = record.xata;
-          return { table, record: initObject(this.db, schemaTables, table, record) };
+          return { table, record: initObject(this.db, schemaTables, table, record, ["*"]) };
         });
       },
       byTable: async (query, options = {}) => {
@@ -2274,7 +2297,7 @@ class SearchPlugin extends XataPlugin {
         return records.reduce((acc, record) => {
           const { table = "orphan" } = record.xata;
           const items = acc[table] ?? [];
-          const item = initObject(this.db, schemaTables, table, record);
+          const item = initObject(this.db, schemaTables, table, record, ["*"]);
           return { ...acc, [table]: [...items, item] };
         }, {});
       }