@payloadcms/drizzle 3.0.0-canary.2c2c95f → 3.0.0-canary.2d0dd26

package/dist/transform/read/relationship.js

@@ -1,17 +1,22 @@
-/* eslint-disable no-param-reassign */ export const transformRelationship = ({ field, locale, ref, relations })=>{
+export const transformRelationship = ({ field, locale, ref, relations, withinArrayOrBlockLocale })=>{
     let result;
     if (!('hasMany' in field) || field.hasMany === false) {
-        const relation = relations[0];
+        let relation = relations[0];
+        if (withinArrayOrBlockLocale) {
+            relation = relations.find((rel)=>rel.locale === withinArrayOrBlockLocale);
+        }
         if (relation) {
             // Handle hasOne Poly
             if (Array.isArray(field.relationTo)) {
-                const matchedRelation = Object.entries(relation).find(([key, val])=>val !== null && ![
+                const matchedRelation = Object.entries(relation).find(([key, val])=>{
+                    return val !== null && ![
                         'id',
                         'locale',
                         'order',
                         'parent',
                         'path'
-                    ].includes(key));
+                    ].includes(key);
+                });
                 if (matchedRelation) {
                     const relationTo = matchedRelation[0].replace('ID', '');
                     result = {
@@ -24,10 +29,14 @@
     } else {
         const transformedRelations = [];
         relations.forEach((relation)=>{
+            let matchedLocale = true;
+            if (withinArrayOrBlockLocale) {
+                matchedLocale = relation.locale === withinArrayOrBlockLocale;
+            }
             // Handle hasMany
             if (!Array.isArray(field.relationTo)) {
                 const relatedData = relation[`${field.relationTo}ID`];
-                if (relatedData) {
+                if (relatedData && matchedLocale) {
                     transformedRelations.push(relatedData);
                 }
             } else {
@@ -38,7 +47,7 @@
                         'order',
                         'parent',
                         'path'
-                    ].includes(key));
+                    ].includes(key) && matchedLocale);
                 if (matchedRelation) {
                     const relationTo = matchedRelation[0].replace('ID', '');
                     transformedRelations.push({

package/dist/transform/read/relationship.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/transform/read/relationship.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport type { RelationshipField, UploadField } from 'payload'\n\ntype Args = {\n  field: RelationshipField | UploadField\n  locale?: string\n  ref: Record<string, unknown>\n  relations: Record<string, unknown>[]\n}\n\nexport const transformRelationship = ({ field, locale, ref, relations }: Args) => {\n  let result: unknown\n\n  if (!('hasMany' in field) || field.hasMany === false) {\n    const relation = relations[0]\n\n    if (relation) {\n      // Handle hasOne Poly\n      if (Array.isArray(field.relationTo)) {\n        const matchedRelation = Object.entries(relation).find(\n          ([key, val]) =>\n            val !== null && !['id', 'locale', 'order', 'parent', 'path'].includes(key),\n        )\n\n        if (matchedRelation) {\n          const relationTo = matchedRelation[0].replace('ID', '')\n\n          result = {\n            relationTo,\n            value: matchedRelation[1],\n          }\n        }\n      }\n    }\n  } else {\n    const transformedRelations = []\n\n    relations.forEach((relation) => {\n      // Handle hasMany\n      if (!Array.isArray(field.relationTo)) {\n        const relatedData = relation[`${field.relationTo}ID`]\n\n        if (relatedData) {\n          transformedRelations.push(relatedData)\n        }\n      } else {\n        // Handle hasMany Poly\n        const matchedRelation = Object.entries(relation).find(\n          ([key, val]) =>\n            val !== null && !['id', 'locale', 'order', 'parent', 'path'].includes(key),\n        )\n\n        if (matchedRelation) {\n          const relationTo = matchedRelation[0].replace('ID', '')\n\n          transformedRelations.push({\n            relationTo,\n            value: matchedRelation[1],\n          })\n        }\n      }\n    })\n\n    result = transformedRelations\n  }\n\n  if (locale) {\n    ref[field.name][locale] = result\n  } else {\n    ref[field.name] = result\n  }\n}\n"],"names":["transformRelationship","field","locale","ref","relations","result","hasMany","relation","Array","isArray","relationTo","matchedRelation","Object","entries","find","key","val","includes","replace","value","transformedRelations","forEach","relatedData","push","name"],"mappings":"AAAA,oCAAoC,GAUpC,OAAO,MAAMA,wBAAwB,CAAC,EAAEC,KAAK,EAAEC,MAAM,EAAEC,GAAG,EAAEC,SAAS,EAAQ;IAC3E,IAAIC;IAEJ,IAAI,CAAE,CAAA,aAAaJ,KAAI,KAAMA,MAAMK,OAAO,KAAK,OAAO;QACpD,MAAMC,WAAWH,SAAS,CAAC,EAAE;QAE7B,IAAIG,UAAU;YACZ,qBAAqB;YACrB,IAAIC,MAAMC,OAAO,CAACR,MAAMS,UAAU,GAAG;gBACnC,MAAMC,kBAAkBC,OAAOC,OAAO,CAACN,UAAUO,IAAI,CACnD,CAAC,CAACC,KAAKC,IAAI,GACTA,QAAQ,QAAQ,CAAC;wBAAC;wBAAM;wBAAU;wBAAS;wBAAU;qBAAO,CAACC,QAAQ,CAACF;gBAG1E,IAAIJ,iBAAiB;oBACnB,MAAMD,aAAaC,eAAe,CAAC,EAAE,CAACO,OAAO,CAAC,MAAM;oBAEpDb,SAAS;wBACPK;wBACAS,OAAOR,eAAe,CAAC,EAAE;oBAC3B;gBACF;YACF;QACF;IACF,OAAO;QACL,MAAMS,uBAAuB,EAAE;QAE/BhB,UAAUiB,OAAO,CAAC,CAACd;YACjB,iBAAiB;YACjB,IAAI,CAACC,MAAMC,OAAO,CAACR,MAAMS,UAAU,GAAG;gBACpC,MAAMY,cAAcf,QAAQ,CAAC,CAAC,EAAEN,MAAMS,UAAU,CAAC,EAAE,CAAC,CAAC;gBAErD,IAAIY,aAAa;oBACfF,qBAAqBG,IAAI,CAACD;gBAC5B;YACF,OAAO;gBACL,sBAAsB;gBACtB,MAAMX,kBAAkBC,OAAOC,OAAO,CAACN,UAAUO,IAAI,CACnD,CAAC,CAACC,KAAKC,IAAI,GACTA,QAAQ,QAAQ,CAAC;wBAAC;wBAAM;wBAAU;wBAAS;wBAAU;qBAAO,CAACC,QAAQ,CAACF;gBAG1E,IAAIJ,iBAAiB;oBACnB,MAAMD,aAAaC,eAAe,CAAC,EAAE,CAACO,OAAO,CAAC,MAAM;oBAEpDE,qBAAqBG,IAAI,CAAC;wBACxBb;wBACAS,OAAOR,eAAe,CAAC,EAAE;oBAC3B;gBACF;YACF;QACF;QAEAN,SAASe;IACX;IAEA,IAAIlB,QAAQ;QACVC,GAAG,CAACF,MAAMuB,IAAI,CAAC,CAACtB,OAAO,GAAGG;IAC5B,OAAO;QACLF,GAAG,CAACF,MAAMuB,IAAI,CAAC,GAAGnB;IACpB;AACF,EAAC"}
+{"version":3,"sources":["../../../src/transform/read/relationship.ts"],"sourcesContent":["import type { RelationshipField, UploadField } from 'payload'\n\ntype Args = {\n  field: RelationshipField | UploadField\n  locale?: string\n  ref: Record<string, unknown>\n  relations: Record<string, unknown>[]\n  withinArrayOrBlockLocale?: string\n}\n\nexport const transformRelationship = ({\n  field,\n  locale,\n  ref,\n  relations,\n  withinArrayOrBlockLocale,\n}: Args) => {\n  let result: unknown\n\n  if (!('hasMany' in field) || field.hasMany === false) {\n    let relation = relations[0]\n\n    if (withinArrayOrBlockLocale) {\n      relation = relations.find((rel) => rel.locale === withinArrayOrBlockLocale)\n    }\n\n    if (relation) {\n      // Handle hasOne Poly\n      if (Array.isArray(field.relationTo)) {\n        const matchedRelation = Object.entries(relation).find(([key, val]) => {\n          return val !== null && !['id', 'locale', 'order', 'parent', 'path'].includes(key)\n        })\n\n        if (matchedRelation) {\n          const relationTo = matchedRelation[0].replace('ID', '')\n\n          result = {\n            relationTo,\n            value: matchedRelation[1],\n          }\n        }\n      }\n    }\n  } else {\n    const transformedRelations = []\n\n    relations.forEach((relation) => {\n      let matchedLocale = true\n\n      if (withinArrayOrBlockLocale) {\n        matchedLocale = relation.locale === withinArrayOrBlockLocale\n      }\n\n      // Handle hasMany\n      if (!Array.isArray(field.relationTo)) {\n        const relatedData = relation[`${field.relationTo}ID`]\n\n        if (relatedData && matchedLocale) {\n          transformedRelations.push(relatedData)\n        }\n      } else {\n        // Handle hasMany Poly\n        const matchedRelation = Object.entries(relation).find(\n          ([key, val]) =>\n            val !== null &&\n            !['id', 'locale', 'order', 'parent', 'path'].includes(key) &&\n            matchedLocale,\n        )\n\n        if (matchedRelation) {\n          const relationTo = matchedRelation[0].replace('ID', '')\n\n          transformedRelations.push({\n            relationTo,\n            value: matchedRelation[1],\n          })\n        }\n      }\n    })\n\n    result = transformedRelations\n  }\n\n  if (locale) {\n    ref[field.name][locale] = result\n  } else {\n    ref[field.name] = result\n  }\n}\n"],"names":["transformRelationship","field","locale","ref","relations","withinArrayOrBlockLocale","result","hasMany","relation","find","rel","Array","isArray","relationTo","matchedRelation","Object","entries","key","val","includes","replace","value","transformedRelations","forEach","matchedLocale","relatedData","push","name"],"mappings":"AAUA,OAAO,MAAMA,wBAAwB,CAAC,EACpCC,KAAK,EACLC,MAAM,EACNC,GAAG,EACHC,SAAS,EACTC,wBAAwB,EACnB;IACL,IAAIC;IAEJ,IAAI,CAAE,CAAA,aAAaL,KAAI,KAAMA,MAAMM,OAAO,KAAK,OAAO;QACpD,IAAIC,WAAWJ,SAAS,CAAC,EAAE;QAE3B,IAAIC,0BAA0B;YAC5BG,WAAWJ,UAAUK,IAAI,CAAC,CAACC,MAAQA,IAAIR,MAAM,KAAKG;QACpD;QAEA,IAAIG,UAAU;YACZ,qBAAqB;YACrB,IAAIG,MAAMC,OAAO,CAACX,MAAMY,UAAU,GAAG;gBACnC,MAAMC,kBAAkBC,OAAOC,OAAO,CAACR,UAAUC,IAAI,CAAC,CAAC,CAACQ,KAAKC,IAAI;oBAC/D,OAAOA,QAAQ,QAAQ,CAAC;wBAAC;wBAAM;wBAAU;wBAAS;wBAAU;qBAAO,CAACC,QAAQ,CAACF;gBAC/E;gBAEA,IAAIH,iBAAiB;oBACnB,MAAMD,aAAaC,eAAe,CAAC,EAAE,CAACM,OAAO,CAAC,MAAM;oBAEpDd,SAAS;wBACPO;wBACAQ,OAAOP,eAAe,CAAC,EAAE;oBAC3B;gBACF;YACF;QACF;IACF,OAAO;QACL,MAAMQ,uBAAuB,EAAE;QAE/BlB,UAAUmB,OAAO,CAAC,CAACf;YACjB,IAAIgB,gBAAgB;YAEpB,IAAInB,0BAA0B;gBAC5BmB,gBAAgBhB,SAASN,MAAM,KAAKG;YACtC;YAEA,iBAAiB;YACjB,IAAI,CAACM,MAAMC,OAAO,CAACX,MAAMY,UAAU,GAAG;gBACpC,MAAMY,cAAcjB,QAAQ,CAAC,CAAC,EAAEP,MAAMY,UAAU,CAAC,EAAE,CAAC,CAAC;gBAErD,IAAIY,eAAeD,eAAe;oBAChCF,qBAAqBI,IAAI,CAACD;gBAC5B;YACF,OAAO;gBACL,sBAAsB;gBACtB,MAAMX,kBAAkBC,OAAOC,OAAO,CAACR,UAAUC,IAAI,CACnD,CAAC,CAACQ,KAAKC,IAAI,GACTA,QAAQ,QACR,CAAC;wBAAC;wBAAM;wBAAU;wBAAS;wBAAU;qBAAO,CAACC,QAAQ,CAACF,QACtDO;gBAGJ,IAAIV,iBAAiB;oBACnB,MAAMD,aAAaC,eAAe,CAAC,EAAE,CAACM,OAAO,CAAC,MAAM;oBAEpDE,qBAAqBI,IAAI,CAAC;wBACxBb;wBACAQ,OAAOP,eAAe,CAAC,EAAE;oBAC3B;gBACF;YACF;QACF;QAEAR,SAASgB;IACX;IAEA,IAAIpB,QAAQ;QACVC,GAAG,CAACF,MAAM0B,IAAI,CAAC,CAACzB,OAAO,GAAGI;IAC5B,OAAO;QACLH,GAAG,CAACF,MAAM0B,IAAI,CAAC,GAAGrB;IACpB;AACF,EAAC"}

package/dist/transform/read/traverseFields.d.ts

@@ -1,5 +1,4 @@
-import type { Field, TabAsField } from 'payload';
-import type { SanitizedConfig } from 'payload';
+import type { Field, JoinQuery, SanitizedConfig, TabAsField } from 'payload';
 import type { DrizzleAdapter } from '../../types.js';
 import type { BlocksMap } from '../../utilities/createBlocksMap.js';
 type TraverseFieldsArgs = {
@@ -31,6 +30,10 @@ type TraverseFieldsArgs = {
      * An array of Payload fields to traverse
      */
     fields: (Field | TabAsField)[];
+    /**
+     *
+     */
+    joinQuery?: JoinQuery;
     /**
      * All hasMany number fields, as returned by Drizzle, keyed on an object by field path
      */
@@ -51,7 +54,11 @@ type TraverseFieldsArgs = {
      * All hasMany text fields, as returned by Drizzle, keyed on an object by field path
      */
     texts: Record<string, Record<string, unknown>[]>;
+    /**
+     * Set to a locale if this group of fields is within a localized array or block.
+     */
+    withinArrayOrBlockLocale?: string;
 };
-export declare const traverseFields: <T extends Record<string, unknown>>({ adapter, blocks, config, dataRef, deletions, fieldPrefix, fields, numbers, path, relationships, table, texts, }: TraverseFieldsArgs) => T;
+export declare const traverseFields: <T extends Record<string, unknown>>({ adapter, blocks, config, dataRef, deletions, fieldPrefix, fields, joinQuery, numbers, path, relationships, table, texts, withinArrayOrBlockLocale, }: TraverseFieldsArgs) => T;
 export {};
 //# sourceMappingURL=traverseFields.d.ts.map

package/dist/transform/read/traverseFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../../src/transform/read/traverseFields.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAA;AAMnE,KAAK,kBAAkB,GAAG;IACxB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAA;IACvB;;OAEG;IACH,MAAM,EAAE,SAAS,CAAA;IACjB;;OAEG;IACH,MAAM,EAAE,eAAe,CAAA;IACvB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAA;IACzB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;IAClD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;IACxD;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;CACjD,CAAA;AAID,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,qHAa7D,kBAAkB,KAAG,CAkevB,CAAA"}
+{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../../src/transform/read/traverseFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAI5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAA;AAMnE,KAAK,kBAAkB,GAAG;IACxB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAA;IACvB;;OAEG;IACH,MAAM,EAAE,SAAS,CAAA;IACjB;;OAEG;IACH,MAAM,EAAE,eAAe,CAAA;IACvB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC;;OAEG;IACH,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAA;IACzB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B;;OAEG;IACH,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;IAClD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;IACxD;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;IAChD;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;CAClC,CAAA;AAID,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,0JAe7D,kBAAkB,KAAG,CA4lBvB,CAAA"}

package/dist/transform/read/traverseFields.js

@@ -1,10 +1,10 @@
-/* eslint-disable no-param-reassign */ import { fieldAffectsData } from 'payload/shared';
+import { fieldAffectsData, fieldIsVirtual } from 'payload/shared';
 import { transformHasManyNumber } from './hasManyNumber.js';
 import { transformHasManyText } from './hasManyText.js';
 import { transformRelationship } from './relationship.js';
 // Traverse fields recursively, transforming data
 // for each field type into required Payload shape
-export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fieldPrefix, fields, numbers, path, relationships, table, texts })=>{
+export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fieldPrefix, fields, joinQuery, numbers, path, relationships, table, texts, withinArrayOrBlockLocale })=>{
     const sanitizedPath = path ? `${path}.` : path;
     const formatted = fields.reduce((result, field)=>{
         if (field.type === 'tabs') {
@@ -19,11 +19,13 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                         ...tab,
                         type: 'tab'
                     })),
+                joinQuery,
                 numbers,
                 path,
                 relationships,
                 table,
-                texts
+                texts,
+                withinArrayOrBlockLocale
             });
         }
         if (field.type === 'collapsible' || field.type === 'row' || field.type === 'tab' && !('name' in field)) {
@@ -35,16 +37,21 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                 deletions,
                 fieldPrefix,
                 fields: field.fields,
+                joinQuery,
                 numbers,
                 path,
                 relationships,
                 table,
-                texts
+                texts,
+                withinArrayOrBlockLocale
             });
         }
         if (fieldAffectsData(field)) {
+            if (fieldIsVirtual(field)) {
+                return result;
+            }
             const fieldName = `${fieldPrefix || ''}${field.name}`;
-            const fieldData = table[fieldName];
+            let fieldData = table[fieldName];
             const localizedFieldData = {};
             const valuesToTransform = [];
             if (fieldPrefix) {
@@ -55,7 +62,9 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                     if (field.localized) {
                         result[field.name] = fieldData.reduce((arrayResult, row)=>{
                             if (typeof row._locale === 'string') {
-                                if (!arrayResult[row._locale]) arrayResult[row._locale] = [];
+                                if (!arrayResult[row._locale]) {
+                                    arrayResult[row._locale] = [];
+                                }
                                 const locale = row._locale;
                                 const data = {};
                                 delete row._locale;
@@ -75,7 +84,8 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                                     path: `${sanitizedPath}${field.name}.${row._order - 1}`,
                                     relationships,
                                     table: row,
-                                    texts
+                                    texts,
+                                    withinArrayOrBlockLocale: locale
                                 });
                                 if ('_order' in rowResult) {
                                     delete rowResult._order;
@@ -85,7 +95,7 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                             return arrayResult;
                         }, {});
                     } else {
-                        result[field.name] = fieldData.map((row, i)=>{
+                        result[field.name] = fieldData.reduce((acc, row, i)=>{
                             if (row._uuid) {
                                 row.id = row._uuid;
                                 delete row._uuid;
@@ -93,37 +103,47 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                             if ('_order' in row) {
                                 delete row._order;
                             }
-                            return traverseFields({
-                                adapter,
-                                blocks,
-                                config,
-                                dataRef: row,
-                                deletions,
-                                fieldPrefix: '',
-                                fields: field.fields,
-                                numbers,
-                                path: `${sanitizedPath}${field.name}.${i}`,
-                                relationships,
-                                table: row,
-                                texts
-                            });
-                        });
+                            if (!withinArrayOrBlockLocale || withinArrayOrBlockLocale && withinArrayOrBlockLocale === row._locale) {
+                                if (row._locale) {
+                                    delete row._locale;
+                                }
+                                acc.push(traverseFields({
+                                    adapter,
+                                    blocks,
+                                    config,
+                                    dataRef: row,
+                                    deletions,
+                                    fieldPrefix: '',
+                                    fields: field.fields,
+                                    numbers,
+                                    path: `${sanitizedPath}${field.name}.${i}`,
+                                    relationships,
+                                    table: row,
+                                    texts,
+                                    withinArrayOrBlockLocale
+                                }));
+                            }
+                            return acc;
+                        }, []);
                     }
                 }
                 return result;
             }
             if (field.type === 'blocks') {
                 const blockFieldPath = `${sanitizedPath}${field.name}`;
-                if (Array.isArray(blocks[blockFieldPath])) {
+                const blocksByPath = blocks[blockFieldPath];
+                if (Array.isArray(blocksByPath)) {
                     if (field.localized) {
                         result[field.name] = {};
-                        blocks[blockFieldPath].forEach((row)=>{
+                        blocksByPath.forEach((row)=>{
                             if (row._uuid) {
                                 row.id = row._uuid;
                                 delete row._uuid;
                             }
                             if (typeof row._locale === 'string') {
-                                if (!result[field.name][row._locale]) result[field.name][row._locale] = [];
+                                if (!result[field.name][row._locale]) {
+                                    result[field.name][row._locale] = [];
+                                }
                                 result[field.name][row._locale].push(row);
                                 delete row._locale;
                             }
@@ -144,7 +164,8 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                                         path: `${blockFieldPath}.${row._order - 1}`,
                                         relationships,
                                         table: row,
-                                        texts
+                                        texts,
+                                        withinArrayOrBlockLocale: locale
                                     });
                                     delete blockResult._order;
                                     return blockResult;
@@ -153,7 +174,21 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                             });
                         });
                     } else {
-                        result[field.name] = blocks[blockFieldPath].map((row, i)=>{
+                        // Add locale-specific index to have a proper blockFieldPath for current locale
+                        // because blocks can be in the same array for different locales!
+                        if (withinArrayOrBlockLocale && config.localization) {
+                            for (const locale of config.localization.localeCodes){
+                                let localeIndex = 0;
+                                for(let i = 0; i < blocksByPath.length; i++){
+                                    const row = blocksByPath[i];
+                                    if (row._locale === locale) {
+                                        row._index = localeIndex;
+                                        localeIndex++;
+                                    }
+                                }
+                            }
+                        }
+                        result[field.name] = blocksByPath.reduce((acc, row, i)=>{
                             delete row._order;
                             if (row._uuid) {
                                 row.id = row._uuid;
@@ -161,23 +196,36 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                             }
                             const block = field.blocks.find(({ slug })=>slug === row.blockType);
                             if (block) {
-                                return traverseFields({
-                                    adapter,
-                                    blocks,
-                                    config,
-                                    dataRef: row,
-                                    deletions,
-                                    fieldPrefix: '',
-                                    fields: block.fields,
-                                    numbers,
-                                    path: `${blockFieldPath}.${i}`,
-                                    relationships,
-                                    table: row,
-                                    texts
-                                });
+                                if (!withinArrayOrBlockLocale || withinArrayOrBlockLocale && withinArrayOrBlockLocale === row._locale) {
+                                    if (row._locale) {
+                                        delete row._locale;
+                                    }
+                                    if (typeof row._index === 'number') {
+                                        i = row._index;
+                                        delete row._index;
+                                    }
+                                    acc.push(traverseFields({
+                                        adapter,
+                                        blocks,
+                                        config,
+                                        dataRef: row,
+                                        deletions,
+                                        fieldPrefix: '',
+                                        fields: block.fields,
+                                        numbers,
+                                        path: `${blockFieldPath}.${i}`,
+                                        relationships,
+                                        table: row,
+                                        texts,
+                                        withinArrayOrBlockLocale
+                                    }));
+                                    return acc;
+                                }
+                            } else {
+                                acc.push({});
                             }
-                            return {};
-                        });
+                            return acc;
+                        }, []);
                     }
                 }
                 return result;
@@ -215,7 +263,9 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                         const relationsByLocale = {};
                         relationPathMatch.forEach((row)=>{
                             if (typeof row.locale === 'string') {
-                                if (!relationsByLocale[row.locale]) relationsByLocale[row.locale] = [];
+                                if (!relationsByLocale[row.locale]) {
+                                    relationsByLocale[row.locale] = [];
+                                }
                                 relationsByLocale[row.locale].push(row);
                             }
                         });
@@ -231,21 +281,64 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                         transformRelationship({
                             field,
                             ref: result,
-                            relations: relationPathMatch
+                            relations: relationPathMatch,
+                            withinArrayOrBlockLocale
                         });
                     }
                     return result;
                 }
             }
+            if (field.type === 'join') {
+                const { limit = field.defaultLimit ?? 10 } = joinQuery?.[`${fieldPrefix.replaceAll('_', '.')}${field.name}`] || {};
+                // raw hasMany results from SQLite
+                if (typeof fieldData === 'string') {
+                    fieldData = JSON.parse(fieldData);
+                }
+                let fieldResult;
+                if (Array.isArray(fieldData)) {
+                    if (field.localized) {
+                        fieldResult = fieldData.reduce((joinResult, row)=>{
+                            if (typeof row._locale === 'string') {
+                                if (!joinResult[row._locale]) {
+                                    joinResult[row._locale] = {
+                                        docs: [],
+                                        hasNextPage: false
+                                    };
+                                }
+                                joinResult[row._locale].docs.push(row._parentID);
+                            }
+                            return joinResult;
+                        }, {});
+                        Object.keys(fieldResult).forEach((locale)=>{
+                            fieldResult[locale].hasNextPage = fieldResult[locale].docs.length > limit;
+                            fieldResult[locale].docs = fieldResult[locale].docs.slice(0, limit);
+                        });
+                    } else {
+                        const hasNextPage = limit !== 0 && fieldData.length > limit;
+                        fieldResult = {
+                            docs: (hasNextPage ? fieldData.slice(0, limit) : fieldData).map(({ id })=>({
+                                    id
+                                })),
+                            hasNextPage
+                        };
+                    }
+                }
+                result[field.name] = fieldResult;
+                return result;
+            }
             if (field.type === 'text' && field?.hasMany) {
                 const textPathMatch = texts[`${sanitizedPath}${field.name}`];
-                if (!textPathMatch) return result;
+                if (!textPathMatch) {
+                    return result;
+                }
                 if (field.localized) {
                     result[field.name] = {};
                     const textsByLocale = {};
                     textPathMatch.forEach((row)=>{
                         if (typeof row.locale === 'string') {
-                            if (!textsByLocale[row.locale]) textsByLocale[row.locale] = [];
+                            if (!textsByLocale[row.locale]) {
+                                textsByLocale[row.locale] = [];
+                            }
                             textsByLocale[row.locale].push(row);
                         }
                     });
@@ -261,20 +354,25 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                     transformHasManyText({
                         field,
                         ref: result,
-                        textRows: textPathMatch
+                        textRows: textPathMatch,
+                        withinArrayOrBlockLocale
                     });
                 }
                 return result;
             }
             if (field.type === 'number' && field.hasMany) {
                 const numberPathMatch = numbers[`${sanitizedPath}${field.name}`];
-                if (!numberPathMatch) return result;
+                if (!numberPathMatch) {
+                    return result;
+                }
                 if (field.localized) {
                     result[field.name] = {};
                     const numbersByLocale = {};
                     numberPathMatch.forEach((row)=>{
                         if (typeof row.locale === 'string') {
-                            if (!numbersByLocale[row.locale]) numbersByLocale[row.locale] = [];
+                            if (!numbersByLocale[row.locale]) {
+                                numbersByLocale[row.locale] = [];
+                            }
                             numbersByLocale[row.locale].push(row);
                         }
                     });
@@ -290,7 +388,8 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                     transformHasManyNumber({
                         field,
                         numberRows: numberPathMatch,
-                        ref: result
+                        ref: result,
+                        withinArrayOrBlockLocale
                     });
                 }
                 return result;
@@ -300,22 +399,36 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                     if (field.localized) {
                         result[field.name] = fieldData.reduce((selectResult, row)=>{
                             if (typeof row.locale === 'string') {
-                                if (!selectResult[row.locale]) selectResult[row.locale] = [];
+                                if (!selectResult[row.locale]) {
+                                    selectResult[row.locale] = [];
+                                }
                                 selectResult[row.locale].push(row.value);
                             }
                             return selectResult;
                         }, {});
                     } else {
-                        result[field.name] = fieldData.map(({ value })=>value);
+                        let selectData = fieldData;
+                        if (withinArrayOrBlockLocale) {
+                            selectData = selectData.filter(({ locale })=>locale === withinArrayOrBlockLocale);
+                        }
+                        result[field.name] = selectData.map(({ value })=>value);
                     }
                 }
                 return result;
             }
             if (field.localized && Array.isArray(table._locales)) {
+                if (!table._locales.length && adapter.payload.config.localization) {
+                    adapter.payload.config.localization.localeCodes.forEach((_locale)=>table._locales.push({
+                            _locale
+                        }));
+                }
                 table._locales.forEach((localeRow)=>{
                     valuesToTransform.push({
                         ref: localizedFieldData,
-                        table: localeRow
+                        table: {
+                            ...table,
+                            ...localeRow
+                        }
                     });
                 });
             } else {
@@ -329,74 +442,47 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                 const locale = table?._locale;
                 let val = fieldData;
                 switch(field.type){
-                    case 'tab':
-                    case 'group':
-                        {
-                            const groupFieldPrefix = `${fieldPrefix || ''}${field.name}_`;
-                            if (field.localized) {
-                                if (typeof locale === 'string' && !ref[locale]) {
-                                    ref[locale] = {};
-                                    delete table._locale;
-                                }
-                                Object.entries(ref).forEach(([groupLocale, groupLocaleData])=>{
-                                    ref[groupLocale] = traverseFields({
-                                        adapter,
-                                        blocks,
-                                        config,
-                                        dataRef: groupLocaleData,
-                                        deletions,
-                                        fieldPrefix: groupFieldPrefix,
-                                        fields: field.fields,
-                                        numbers,
-                                        path: `${sanitizedPath}${field.name}`,
-                                        relationships,
-                                        table,
-                                        texts
-                                    });
-                                });
-                                if ('_order' in ref) {
-                                    delete ref._order;
-                                }
-                            } else {
-                                const groupData = {};
-                                ref[field.name] = traverseFields({
-                                    adapter,
-                                    blocks,
-                                    config,
-                                    dataRef: groupData,
-                                    deletions,
-                                    fieldPrefix: groupFieldPrefix,
-                                    fields: field.fields,
-                                    numbers,
-                                    path: `${sanitizedPath}${field.name}`,
-                                    relationships,
-                                    table,
-                                    texts
-                                });
-                                if ('_order' in ref) {
-                                    delete ref._order;
-                                }
-                            }
-                            return;
-                        }
-                    case 'text':
+                    case 'date':
                         {
                             if (typeof fieldData === 'string') {
-                                val = String(fieldData);
+                                val = new Date(fieldData).toISOString();
                             }
                             break;
                         }
-                    case 'number':
+                    case 'group':
+                    case 'tab':
                         {
-                            if (typeof fieldData === 'string') {
-                                val = Number.parseFloat(fieldData);
+                            const groupFieldPrefix = `${fieldPrefix || ''}${field.name}_`;
+                            const groupData = {};
+                            const locale = table._locale;
+                            const refKey = field.localized && locale ? locale : field.name;
+                            if (field.localized && locale) {
+                                delete table._locale;
                             }
-                            break;
+                            ref[refKey] = traverseFields({
+                                adapter,
+                                blocks,
+                                config,
+                                dataRef: groupData,
+                                deletions,
+                                fieldPrefix: groupFieldPrefix,
+                                fields: field.fields,
+                                numbers,
+                                path: `${sanitizedPath}${field.name}`,
+                                relationships,
+                                table,
+                                texts,
+                                withinArrayOrBlockLocale: locale || withinArrayOrBlockLocale
+                            });
+                            if ('_order' in ref) {
+                                delete ref._order;
+                            }
+                            return;
                         }
-                    case 'date':
+                    case 'number':
                         {
                             if (typeof fieldData === 'string') {
-                                val = new Date(fieldData).toISOString();
+                                val = Number.parseFloat(fieldData);
                             }
                             break;
                         }
@@ -408,6 +494,13 @@ export const traverseFields = ({ adapter, blocks, config, dataRef, deletions, fi
                             }
                             break;
                         }
+                    case 'text':
+                        {
+                            if (typeof fieldData === 'string') {
+                                val = String(fieldData);
+                            }
+                            break;
+                        }
                     default:
                         {
                             break;