@payloadcms/drizzle 3.0.0-canary.2c2c95f

package/dist/migrateReset.js

@@ -0,0 +1,82 @@
+/* eslint-disable no-restricted-syntax, no-await-in-loop */ import { commitTransaction, getMigrations, initTransaction, killTransaction, readMigrationFiles } from 'payload';
+import { migrationTableExists } from './utilities/migrationTableExists.js';
+/**
+ * Run all migrate down functions
+ */ export async function migrateReset() {
+    const { payload } = this;
+    const migrationFiles = await readMigrationFiles({
+        payload
+    });
+    const { existingMigrations } = await getMigrations({
+        payload
+    });
+    if (!existingMigrations?.length) {
+        payload.logger.info({
+            msg: 'No migrations to reset.'
+        });
+        return;
+    }
+    const req = {
+        payload
+    };
+    // Rollback all migrations in order
+    for (const migration of existingMigrations){
+        const migrationFile = migrationFiles.find((m)=>m.name === migration.name);
+        try {
+            if (!migrationFile) {
+                throw new Error(`Migration ${migration.name} not found locally.`);
+            }
+            const start = Date.now();
+            payload.logger.info({
+                msg: `Migrating down: ${migrationFile.name}`
+            });
+            await initTransaction(req);
+            await migrationFile.down({
+                payload,
+                req
+            });
+            payload.logger.info({
+                msg: `Migrated down:  ${migrationFile.name} (${Date.now() - start}ms)`
+            });
+            const tableExists = await migrationTableExists(this);
+            if (tableExists) {
+                await payload.delete({
+                    id: migration.id,
+                    collection: 'payload-migrations',
+                    req
+                });
+            }
+            await commitTransaction(req);
+        } catch (err) {
+            let msg = `Error running migration ${migrationFile.name}.`;
+            if (err instanceof Error) msg += ` ${err.message}`;
+            await killTransaction(req);
+            payload.logger.error({
+                err,
+                msg
+            });
+            process.exit(1);
+        }
+    }
+    // Delete dev migration
+    const tableExists = await migrationTableExists(this);
+    if (tableExists) {
+        try {
+            await payload.delete({
+                collection: 'payload-migrations',
+                where: {
+                    batch: {
+                        equals: -1
+                    }
+                }
+            });
+        } catch (err) {
+            payload.logger.error({
+                error: err,
+                msg: 'Error deleting dev migration'
+            });
+        }
+    }
+}
+
+//# sourceMappingURL=migrateReset.js.map

package/dist/migrateReset.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/migrateReset.ts"],"sourcesContent":["/* eslint-disable no-restricted-syntax, no-await-in-loop */\nimport type { PayloadRequest } from 'payload'\n\nimport {\n  commitTransaction,\n  getMigrations,\n  initTransaction,\n  killTransaction,\n  readMigrationFiles,\n} from 'payload'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { migrationTableExists } from './utilities/migrationTableExists.js'\n\n/**\n * Run all migrate down functions\n */\nexport async function migrateReset(this: DrizzleAdapter): Promise<void> {\n  const { payload } = this\n  const migrationFiles = await readMigrationFiles({ payload })\n\n  const { existingMigrations } = await getMigrations({ payload })\n\n  if (!existingMigrations?.length) {\n    payload.logger.info({ msg: 'No migrations to reset.' })\n    return\n  }\n\n  const req = { payload } as PayloadRequest\n\n  // Rollback all migrations in order\n  for (const migration of existingMigrations) {\n    const migrationFile = migrationFiles.find((m) => m.name === migration.name)\n    try {\n      if (!migrationFile) {\n        throw new Error(`Migration ${migration.name} not found locally.`)\n      }\n\n      const start = Date.now()\n      payload.logger.info({ msg: `Migrating down: ${migrationFile.name}` })\n      await initTransaction(req)\n      await migrationFile.down({ payload, req })\n      payload.logger.info({\n        msg: `Migrated down:  ${migrationFile.name} (${Date.now() - start}ms)`,\n      })\n\n      const tableExists = await migrationTableExists(this)\n      if (tableExists) {\n        await payload.delete({\n          id: migration.id,\n          collection: 'payload-migrations',\n          req,\n        })\n      }\n\n      await commitTransaction(req)\n    } catch (err: unknown) {\n      let msg = `Error running migration ${migrationFile.name}.`\n\n      if (err instanceof Error) msg += ` ${err.message}`\n\n      await killTransaction(req)\n      payload.logger.error({\n        err,\n        msg,\n      })\n      process.exit(1)\n    }\n  }\n\n  // Delete dev migration\n\n  const tableExists = await migrationTableExists(this)\n  if (tableExists) {\n    try {\n      await payload.delete({\n        collection: 'payload-migrations',\n        where: {\n          batch: {\n            equals: -1,\n          },\n        },\n      })\n    } catch (err: unknown) {\n      payload.logger.error({ error: err, msg: 'Error deleting dev migration' })\n    }\n  }\n}\n"],"names":["commitTransaction","getMigrations","initTransaction","killTransaction","readMigrationFiles","migrationTableExists","migrateReset","payload","migrationFiles","existingMigrations","length","logger","info","msg","req","migration","migrationFile","find","m","name","Error","start","Date","now","down","tableExists","delete","id","collection","err","message","error","process","exit","where","batch","equals"],"mappings":"AAAA,yDAAyD,GAGzD,SACEA,iBAAiB,EACjBC,aAAa,EACbC,eAAe,EACfC,eAAe,EACfC,kBAAkB,QACb,UAAS;AAIhB,SAASC,oBAAoB,QAAQ,sCAAqC;AAE1E;;CAEC,GACD,OAAO,eAAeC;IACpB,MAAM,EAAEC,OAAO,EAAE,GAAG,IAAI;IACxB,MAAMC,iBAAiB,MAAMJ,mBAAmB;QAAEG;IAAQ;IAE1D,MAAM,EAAEE,kBAAkB,EAAE,GAAG,MAAMR,cAAc;QAAEM;IAAQ;IAE7D,IAAI,CAACE,oBAAoBC,QAAQ;QAC/BH,QAAQI,MAAM,CAACC,IAAI,CAAC;YAAEC,KAAK;QAA0B;QACrD;IACF;IAEA,MAAMC,MAAM;QAAEP;IAAQ;IAEtB,mCAAmC;IACnC,KAAK,MAAMQ,aAAaN,mBAAoB;QAC1C,MAAMO,gBAAgBR,eAAeS,IAAI,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ,UAAUI,IAAI;QAC1E,IAAI;YACF,IAAI,CAACH,eAAe;gBAClB,MAAM,IAAII,MAAM,CAAC,UAAU,EAAEL,UAAUI,IAAI,CAAC,mBAAmB,CAAC;YAClE;YAEA,MAAME,QAAQC,KAAKC,GAAG;YACtBhB,QAAQI,MAAM,CAACC,IAAI,CAAC;gBAAEC,KAAK,CAAC,gBAAgB,EAAEG,cAAcG,IAAI,CAAC,CAAC;YAAC;YACnE,MAAMjB,gBAAgBY;YACtB,MAAME,cAAcQ,IAAI,CAAC;gBAAEjB;gBAASO;YAAI;YACxCP,QAAQI,MAAM,CAACC,IAAI,CAAC;gBAClBC,KAAK,CAAC,gBAAgB,EAAEG,cAAcG,IAAI,CAAC,EAAE,EAAEG,KAAKC,GAAG,KAAKF,MAAM,GAAG,CAAC;YACxE;YAEA,MAAMI,cAAc,MAAMpB,qBAAqB,IAAI;YACnD,IAAIoB,aAAa;gBACf,MAAMlB,QAAQmB,MAAM,CAAC;oBACnBC,IAAIZ,UAAUY,EAAE;oBAChBC,YAAY;oBACZd;gBACF;YACF;YAEA,MAAMd,kBAAkBc;QAC1B,EAAE,OAAOe,KAAc;YACrB,IAAIhB,MAAM,CAAC,wBAAwB,EAAEG,cAAcG,IAAI,CAAC,CAAC,CAAC;YAE1D,IAAIU,eAAeT,OAAOP,OAAO,CAAC,CAAC,EAAEgB,IAAIC,OAAO,CAAC,CAAC;YAElD,MAAM3B,gBAAgBW;YACtBP,QAAQI,MAAM,CAACoB,KAAK,CAAC;gBACnBF;gBACAhB;YACF;YACAmB,QAAQC,IAAI,CAAC;QACf;IACF;IAEA,uBAAuB;IAEvB,MAAMR,cAAc,MAAMpB,qBAAqB,IAAI;IACnD,IAAIoB,aAAa;QACf,IAAI;YACF,MAAMlB,QAAQmB,MAAM,CAAC;gBACnBE,YAAY;gBACZM,OAAO;oBACLC,OAAO;wBACLC,QAAQ,CAAC;oBACX;gBACF;YACF;QACF,EAAE,OAAOP,KAAc;YACrBtB,QAAQI,MAAM,CAACoB,KAAK,CAAC;gBAAEA,OAAOF;gBAAKhB,KAAK;YAA+B;QACzE;IACF;AACF"}

package/dist/migrateStatus.d.ts

@@ -0,0 +1,3 @@
+import type { DrizzleAdapter } from './types.js';
+export declare function migrateStatus(this: DrizzleAdapter): Promise<void>;
+//# sourceMappingURL=migrateStatus.d.ts.map

package/dist/migrateStatus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateStatus.d.ts","sourceRoot":"","sources":["../src/migrateStatus.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAIhD,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAuCvE"}

package/dist/migrateStatus.js

@@ -0,0 +1,44 @@
+import { Table } from 'console-table-printer';
+import { getMigrations, readMigrationFiles } from 'payload';
+import { migrationTableExists } from './utilities/migrationTableExists.js';
+export async function migrateStatus() {
+    const { payload } = this;
+    const migrationFiles = await readMigrationFiles({
+        payload
+    });
+    payload.logger.debug({
+        msg: `Found ${migrationFiles.length} migration files.`
+    });
+    let existingMigrations = [];
+    const hasMigrationTable = await migrationTableExists(this);
+    if (hasMigrationTable) {
+        ({ existingMigrations } = await getMigrations({
+            payload
+        }));
+    }
+    if (!migrationFiles.length) {
+        payload.logger.info({
+            msg: 'No migrations found.'
+        });
+        return;
+    }
+    // Compare migration files to existing migrations
+    const statuses = migrationFiles.map((migration)=>{
+        const existingMigration = existingMigrations.find((m)=>m.name === migration.name);
+        return {
+            Name: migration.name,
+            // eslint-disable-next-line perfectionist/sort-objects
+            Batch: existingMigration?.batch,
+            Ran: existingMigration ? 'Yes' : 'No'
+        };
+    });
+    const p = new Table();
+    statuses.forEach((s)=>{
+        p.addRow(s, {
+            color: s.Ran === 'Yes' ? 'green' : 'red'
+        });
+    });
+    p.printTable();
+}
+
+//# sourceMappingURL=migrateStatus.js.map

package/dist/migrateStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/migrateStatus.ts"],"sourcesContent":["import { Table } from 'console-table-printer'\nimport { getMigrations, readMigrationFiles } from 'payload'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { migrationTableExists } from './utilities/migrationTableExists.js'\n\nexport async function migrateStatus(this: DrizzleAdapter): Promise<void> {\n  const { payload } = this\n  const migrationFiles = await readMigrationFiles({ payload })\n\n  payload.logger.debug({\n    msg: `Found ${migrationFiles.length} migration files.`,\n  })\n\n  let existingMigrations = []\n  const hasMigrationTable = await migrationTableExists(this)\n\n  if (hasMigrationTable) {\n    ;({ existingMigrations } = await getMigrations({ payload }))\n  }\n\n  if (!migrationFiles.length) {\n    payload.logger.info({ msg: 'No migrations found.' })\n    return\n  }\n\n  // Compare migration files to existing migrations\n  const statuses = migrationFiles.map((migration) => {\n    const existingMigration = existingMigrations.find((m) => m.name === migration.name)\n    return {\n      Name: migration.name,\n      // eslint-disable-next-line perfectionist/sort-objects\n      Batch: existingMigration?.batch,\n      Ran: existingMigration ? 'Yes' : 'No',\n    }\n  })\n\n  const p = new Table()\n\n  statuses.forEach((s) => {\n    p.addRow(s, {\n      color: s.Ran === 'Yes' ? 'green' : 'red',\n    })\n  })\n  p.printTable()\n}\n"],"names":["Table","getMigrations","readMigrationFiles","migrationTableExists","migrateStatus","payload","migrationFiles","logger","debug","msg","length","existingMigrations","hasMigrationTable","info","statuses","map","migration","existingMigration","find","m","name","Name","Batch","batch","Ran","p","forEach","s","addRow","color","printTable"],"mappings":"AAAA,SAASA,KAAK,QAAQ,wBAAuB;AAC7C,SAASC,aAAa,EAAEC,kBAAkB,QAAQ,UAAS;AAI3D,SAASC,oBAAoB,QAAQ,sCAAqC;AAE1E,OAAO,eAAeC;IACpB,MAAM,EAAEC,OAAO,EAAE,GAAG,IAAI;IACxB,MAAMC,iBAAiB,MAAMJ,mBAAmB;QAAEG;IAAQ;IAE1DA,QAAQE,MAAM,CAACC,KAAK,CAAC;QACnBC,KAAK,CAAC,MAAM,EAAEH,eAAeI,MAAM,CAAC,iBAAiB,CAAC;IACxD;IAEA,IAAIC,qBAAqB,EAAE;IAC3B,MAAMC,oBAAoB,MAAMT,qBAAqB,IAAI;IAEzD,IAAIS,mBAAmB;QACnB,CAAA,EAAED,kBAAkB,EAAE,GAAG,MAAMV,cAAc;YAAEI;QAAQ,EAAC;IAC5D;IAEA,IAAI,CAACC,eAAeI,MAAM,EAAE;QAC1BL,QAAQE,MAAM,CAACM,IAAI,CAAC;YAAEJ,KAAK;QAAuB;QAClD;IACF;IAEA,iDAAiD;IACjD,MAAMK,WAAWR,eAAeS,GAAG,CAAC,CAACC;QACnC,MAAMC,oBAAoBN,mBAAmBO,IAAI,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ,UAAUI,IAAI;QAClF,OAAO;YACLC,MAAML,UAAUI,IAAI;YACpB,sDAAsD;YACtDE,OAAOL,mBAAmBM;YAC1BC,KAAKP,oBAAoB,QAAQ;QACnC;IACF;IAEA,MAAMQ,IAAI,IAAIzB;IAEdc,SAASY,OAAO,CAAC,CAACC;QAChBF,EAAEG,MAAM,CAACD,GAAG;YACVE,OAAOF,EAAEH,GAAG,KAAK,QAAQ,UAAU;QACrC;IACF;IACAC,EAAEK,UAAU;AACd"}

package/dist/queries/buildAndOrConditions.d.ts

@@ -0,0 +1,16 @@
+import type { SQL } from 'drizzle-orm';
+import type { Field, Where } from 'payload';
+import type { DrizzleAdapter, GenericColumn } from '../types.js';
+import type { BuildQueryJoinAliases } from './buildQuery.js';
+export declare function buildAndOrConditions({ adapter, fields, joins, locale, selectFields, tableName, where, }: {
+    adapter: DrizzleAdapter;
+    collectionSlug?: string;
+    fields: Field[];
+    globalSlug?: string;
+    joins: BuildQueryJoinAliases;
+    locale?: string;
+    selectFields: Record<string, GenericColumn>;
+    tableName: string;
+    where: Where[];
+}): Promise<SQL[]>;
+//# sourceMappingURL=buildAndOrConditions.d.ts.map

package/dist/queries/buildAndOrConditions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildAndOrConditions.d.ts","sourceRoot":"","sources":["../../src/queries/buildAndOrConditions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAI5D,wBAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,MAAM,EACN,KAAK,EACL,MAAM,EACN,YAAY,EACZ,SAAS,EACT,KAAK,GACN,EAAE;IACD,OAAO,EAAE,cAAc,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,EAAE,CAAA;CACf,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAwBjB"}

package/dist/queries/buildAndOrConditions.js

@@ -0,0 +1,28 @@
+import { parseParams } from './parseParams.js';
+export async function buildAndOrConditions({ adapter, fields, joins, locale, selectFields, tableName, where }) {
+    const completedConditions = [];
+    // Loop over all AND / OR operations and add them to the AND / OR query param
+    // Operations should come through as an array
+    // eslint-disable-next-line no-restricted-syntax
+    for (const condition of where){
+        // If the operation is properly formatted as an object
+        if (typeof condition === 'object') {
+            // eslint-disable-next-line no-await-in-loop
+            const result = await parseParams({
+                adapter,
+                fields,
+                joins,
+                locale,
+                selectFields,
+                tableName,
+                where: condition
+            });
+            if (result && Object.keys(result).length > 0) {
+                completedConditions.push(result);
+            }
+        }
+    }
+    return completedConditions;
+}
+
+//# sourceMappingURL=buildAndOrConditions.js.map

package/dist/queries/buildAndOrConditions.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/queries/buildAndOrConditions.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { Field, Where } from 'payload'\n\nimport type { DrizzleAdapter, GenericColumn } from '../types.js'\nimport type { BuildQueryJoinAliases } from './buildQuery.js'\n\nimport { parseParams } from './parseParams.js'\n\nexport async function buildAndOrConditions({\n  adapter,\n  fields,\n  joins,\n  locale,\n  selectFields,\n  tableName,\n  where,\n}: {\n  adapter: DrizzleAdapter\n  collectionSlug?: string\n  fields: Field[]\n  globalSlug?: string\n  joins: BuildQueryJoinAliases\n  locale?: string\n  selectFields: Record<string, GenericColumn>\n  tableName: string\n  where: Where[]\n}): Promise<SQL[]> {\n  const completedConditions = []\n  // Loop over all AND / OR operations and add them to the AND / OR query param\n  // Operations should come through as an array\n  // eslint-disable-next-line no-restricted-syntax\n  for (const condition of where) {\n    // If the operation is properly formatted as an object\n    if (typeof condition === 'object') {\n      // eslint-disable-next-line no-await-in-loop\n      const result = await parseParams({\n        adapter,\n        fields,\n        joins,\n        locale,\n        selectFields,\n        tableName,\n        where: condition,\n      })\n      if (result && Object.keys(result).length > 0) {\n        completedConditions.push(result)\n      }\n    }\n  }\n  return completedConditions\n}\n"],"names":["parseParams","buildAndOrConditions","adapter","fields","joins","locale","selectFields","tableName","where","completedConditions","condition","result","Object","keys","length","push"],"mappings":"AAMA,SAASA,WAAW,QAAQ,mBAAkB;AAE9C,OAAO,eAAeC,qBAAqB,EACzCC,OAAO,EACPC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,YAAY,EACZC,SAAS,EACTC,KAAK,EAWN;IACC,MAAMC,sBAAsB,EAAE;IAC9B,6EAA6E;IAC7E,6CAA6C;IAC7C,gDAAgD;IAChD,KAAK,MAAMC,aAAaF,MAAO;QAC7B,sDAAsD;QACtD,IAAI,OAAOE,cAAc,UAAU;YACjC,4CAA4C;YAC5C,MAAMC,SAAS,MAAMX,YAAY;gBAC/BE;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC,OAAOE;YACT;YACA,IAAIC,UAAUC,OAAOC,IAAI,CAACF,QAAQG,MAAM,GAAG,GAAG;gBAC5CL,oBAAoBM,IAAI,CAACJ;YAC3B;QACF;IACF;IACA,OAAOF;AACT"}

package/dist/queries/buildQuery.d.ts

@@ -0,0 +1,29 @@
+import type { SQL } from 'drizzle-orm';
+import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
+import type { Field, Where } from 'payload';
+import { asc, desc } from 'drizzle-orm';
+import type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js';
+export type BuildQueryJoinAliases = {
+    condition: SQL;
+    table: GenericTable | PgTableWithColumns<any>;
+}[];
+type BuildQueryArgs = {
+    adapter: DrizzleAdapter;
+    fields: Field[];
+    locale?: string;
+    sort?: string;
+    tableName: string;
+    where: Where;
+};
+type Result = {
+    joins: BuildQueryJoinAliases;
+    orderBy: {
+        column: GenericColumn;
+        order: typeof asc | typeof desc;
+    };
+    selectFields: Record<string, GenericColumn>;
+    where: SQL;
+};
+declare const buildQuery: ({ adapter, fields, locale, sort, tableName, where: incomingWhere, }: BuildQueryArgs) => Promise<Result>;
+export default buildQuery;
+//# sourceMappingURL=buildQuery.d.ts.map

package/dist/queries/buildQuery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE3C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAK9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,GAAG,CAAA;IACd,KAAK,EAAE,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;CAC9C,EAAE,CAAA;AAEH,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,KAAK,MAAM,GAAG;IACZ,KAAK,EAAE,qBAAqB,CAAA;IAC5B,OAAO,EAAE;QACP,MAAM,EAAE,aAAa,CAAA;QACrB,KAAK,EAAE,OAAO,GAAG,GAAG,OAAO,IAAI,CAAA;KAChC,CAAA;IACD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,KAAK,EAAE,GAAG,CAAA;CACX,CAAA;AACD,QAAA,MAAM,UAAU,wEAOb,cAAc,KAAG,OAAO,CAAC,MAAM,CA2EjC,CAAA;AAED,eAAe,UAAU,CAAA"}

package/dist/queries/buildQuery.js

@@ -0,0 +1,72 @@
+import { asc, desc } from 'drizzle-orm';
+import { getTableColumnFromPath } from './getTableColumnFromPath.js';
+import { parseParams } from './parseParams.js';
+const buildQuery = async function buildQuery({ adapter, fields, locale, sort, tableName, where: incomingWhere }) {
+    const selectFields = {
+        id: adapter.tables[tableName].id
+    };
+    const joins = [];
+    const orderBy = {
+        column: null,
+        order: null
+    };
+    if (sort) {
+        let sortPath;
+        if (sort[0] === '-') {
+            sortPath = sort.substring(1);
+            orderBy.order = desc;
+        } else {
+            sortPath = sort;
+            orderBy.order = asc;
+        }
+        try {
+            const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({
+                adapter,
+                collectionPath: sortPath,
+                fields,
+                joins,
+                locale,
+                pathSegments: sortPath.replace(/__/g, '.').split('.'),
+                selectFields,
+                tableName,
+                value: sortPath
+            });
+            orderBy.column = sortTable?.[sortTableColumnName];
+        } catch (err) {
+        // continue
+        }
+    }
+    if (!orderBy?.column) {
+        orderBy.order = desc;
+        const createdAt = adapter.tables[tableName]?.createdAt;
+        if (createdAt) {
+            orderBy.column = createdAt;
+        } else {
+            orderBy.column = adapter.tables[tableName].id;
+        }
+    }
+    if (orderBy.column) {
+        selectFields.sort = orderBy.column;
+    }
+    let where;
+    if (incomingWhere && Object.keys(incomingWhere).length > 0) {
+        where = await parseParams({
+            adapter,
+            fields,
+            joins,
+            locale,
+            selectFields,
+            tableName,
+            where: incomingWhere
+        });
+    }
+    return {
+        joins,
+        orderBy,
+        selectFields,
+        where
+    };
+};
+export default buildQuery;
+
+//# sourceMappingURL=buildQuery.js.map

package/dist/queries/buildQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { Field, Where } from 'payload'\n\nimport { asc, desc } from 'drizzle-orm'\n\nimport type { DrizzleAdapter, GenericColumn, GenericTable } from '../types.js'\n\nimport { getTableColumnFromPath } from './getTableColumnFromPath.js'\nimport { parseParams } from './parseParams.js'\n\nexport type BuildQueryJoinAliases = {\n  condition: SQL\n  table: GenericTable | PgTableWithColumns<any>\n}[]\n\ntype BuildQueryArgs = {\n  adapter: DrizzleAdapter\n  fields: Field[]\n  locale?: string\n  sort?: string\n  tableName: string\n  where: Where\n}\n\ntype Result = {\n  joins: BuildQueryJoinAliases\n  orderBy: {\n    column: GenericColumn\n    order: typeof asc | typeof desc\n  }\n  selectFields: Record<string, GenericColumn>\n  where: SQL\n}\nconst buildQuery = async function buildQuery({\n  adapter,\n  fields,\n  locale,\n  sort,\n  tableName,\n  where: incomingWhere,\n}: BuildQueryArgs): Promise<Result> {\n  const selectFields: Record<string, GenericColumn> = {\n    id: adapter.tables[tableName].id,\n  }\n  const joins: BuildQueryJoinAliases = []\n\n  const orderBy: Result['orderBy'] = {\n    column: null,\n    order: null,\n  }\n\n  if (sort) {\n    let sortPath\n\n    if (sort[0] === '-') {\n      sortPath = sort.substring(1)\n      orderBy.order = desc\n    } else {\n      sortPath = sort\n      orderBy.order = asc\n    }\n\n    try {\n      const { columnName: sortTableColumnName, table: sortTable } = getTableColumnFromPath({\n        adapter,\n        collectionPath: sortPath,\n        fields,\n        joins,\n        locale,\n        pathSegments: sortPath.replace(/__/g, '.').split('.'),\n        selectFields,\n        tableName,\n        value: sortPath,\n      })\n      orderBy.column = sortTable?.[sortTableColumnName]\n    } catch (err) {\n      // continue\n    }\n  }\n\n  if (!orderBy?.column) {\n    orderBy.order = desc\n    const createdAt = adapter.tables[tableName]?.createdAt\n\n    if (createdAt) {\n      orderBy.column = createdAt\n    } else {\n      orderBy.column = adapter.tables[tableName].id\n    }\n  }\n\n  if (orderBy.column) {\n    selectFields.sort = orderBy.column\n  }\n\n  let where: SQL\n\n  if (incomingWhere && Object.keys(incomingWhere).length > 0) {\n    where = await parseParams({\n      adapter,\n      fields,\n      joins,\n      locale,\n      selectFields,\n      tableName,\n      where: incomingWhere,\n    })\n  }\n\n  return {\n    joins,\n    orderBy,\n    selectFields,\n    where,\n  }\n}\n\nexport default buildQuery\n"],"names":["asc","desc","getTableColumnFromPath","parseParams","buildQuery","adapter","fields","locale","sort","tableName","where","incomingWhere","selectFields","id","tables","joins","orderBy","column","order","sortPath","substring","columnName","sortTableColumnName","table","sortTable","collectionPath","pathSegments","replace","split","value","err","createdAt","Object","keys","length"],"mappings":"AAIA,SAASA,GAAG,EAAEC,IAAI,QAAQ,cAAa;AAIvC,SAASC,sBAAsB,QAAQ,8BAA6B;AACpE,SAASC,WAAW,QAAQ,mBAAkB;AAyB9C,MAAMC,aAAa,eAAeA,WAAW,EAC3CC,OAAO,EACPC,MAAM,EACNC,MAAM,EACNC,IAAI,EACJC,SAAS,EACTC,OAAOC,aAAa,EACL;IACf,MAAMC,eAA8C;QAClDC,IAAIR,QAAQS,MAAM,CAACL,UAAU,CAACI,EAAE;IAClC;IACA,MAAME,QAA+B,EAAE;IAEvC,MAAMC,UAA6B;QACjCC,QAAQ;QACRC,OAAO;IACT;IAEA,IAAIV,MAAM;QACR,IAAIW;QAEJ,IAAIX,IAAI,CAAC,EAAE,KAAK,KAAK;YACnBW,WAAWX,KAAKY,SAAS,CAAC;YAC1BJ,QAAQE,KAAK,GAAGjB;QAClB,OAAO;YACLkB,WAAWX;YACXQ,QAAQE,KAAK,GAAGlB;QAClB;QAEA,IAAI;YACF,MAAM,EAAEqB,YAAYC,mBAAmB,EAAEC,OAAOC,SAAS,EAAE,GAAGtB,uBAAuB;gBACnFG;gBACAoB,gBAAgBN;gBAChBb;gBACAS;gBACAR;gBACAmB,cAAcP,SAASQ,OAAO,CAAC,OAAO,KAAKC,KAAK,CAAC;gBACjDhB;gBACAH;gBACAoB,OAAOV;YACT;YACAH,QAAQC,MAAM,GAAGO,WAAW,CAACF,oBAAoB;QACnD,EAAE,OAAOQ,KAAK;QACZ,WAAW;QACb;IACF;IAEA,IAAI,CAACd,SAASC,QAAQ;QACpBD,QAAQE,KAAK,GAAGjB;QAChB,MAAM8B,YAAY1B,QAAQS,MAAM,CAACL,UAAU,EAAEsB;QAE7C,IAAIA,WAAW;YACbf,QAAQC,MAAM,GAAGc;QACnB,OAAO;YACLf,QAAQC,MAAM,GAAGZ,QAAQS,MAAM,CAACL,UAAU,CAACI,EAAE;QAC/C;IACF;IAEA,IAAIG,QAAQC,MAAM,EAAE;QAClBL,aAAaJ,IAAI,GAAGQ,QAAQC,MAAM;IACpC;IAEA,IAAIP;IAEJ,IAAIC,iBAAiBqB,OAAOC,IAAI,CAACtB,eAAeuB,MAAM,GAAG,GAAG;QAC1DxB,QAAQ,MAAMP,YAAY;YACxBE;YACAC;YACAS;YACAR;YACAK;YACAH;YACAC,OAAOC;QACT;IACF;IAEA,OAAO;QACLI;QACAC;QACAJ;QACAF;IACF;AACF;AAEA,eAAeN,WAAU"}

package/dist/queries/getTableAlias.d.ts

@@ -0,0 +1,13 @@
+import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
+import type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
+import type { DrizzleAdapter } from '../types.js';
+type Table = PgTableWithColumns<any> | SQLiteTableWithColumns<any>;
+export declare const getTableAlias: ({ adapter, tableName, }: {
+    adapter: DrizzleAdapter;
+    tableName: string;
+}) => {
+    newAliasTable: Table;
+    newAliasTableName: string;
+};
+export {};
+//# sourceMappingURL=getTableAlias.d.ts.map

package/dist/queries/getTableAlias.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTableAlias.d.ts","sourceRoot":"","sources":["../../src/queries/getTableAlias.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAOrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,KAAK,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;AAClE,eAAO,MAAM,aAAa,4BAGvB;IACD,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;CAClB,KAAG;IACF,aAAa,EAAE,KAAK,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;CAa1B,CAAA"}

package/dist/queries/getTableAlias.js

@@ -0,0 +1,20 @@
+import { alias } from 'drizzle-orm/pg-core';
+import { alias as aliasSQLite } from 'drizzle-orm/sqlite-core/alias';
+import toSnakeCase from 'to-snake-case';
+import { v4 as uuid } from 'uuid';
+export const getTableAlias = ({ adapter, tableName })=>{
+    const newAliasTableName = toSnakeCase(uuid());
+    let newAliasTable;
+    if (adapter.name === 'postgres') {
+        newAliasTable = alias(adapter.tables[tableName], newAliasTableName);
+    }
+    if (adapter.name === 'sqlite') {
+        newAliasTable = aliasSQLite(adapter.tables[tableName], newAliasTableName);
+    }
+    return {
+        newAliasTable,
+        newAliasTableName
+    };
+};
+
+//# sourceMappingURL=getTableAlias.js.map

package/dist/queries/getTableAlias.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/queries/getTableAlias.ts"],"sourcesContent":["import type { PgTableWithColumns } from 'drizzle-orm/pg-core'\nimport type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core'\n\nimport { alias } from 'drizzle-orm/pg-core'\nimport { alias as aliasSQLite } from 'drizzle-orm/sqlite-core/alias'\nimport toSnakeCase from 'to-snake-case'\nimport { v4 as uuid } from 'uuid'\n\nimport type { DrizzleAdapter } from '../types.js'\n\ntype Table = PgTableWithColumns<any> | SQLiteTableWithColumns<any>\nexport const getTableAlias = ({\n  adapter,\n  tableName,\n}: {\n  adapter: DrizzleAdapter\n  tableName: string\n}): {\n  newAliasTable: Table\n  newAliasTableName: string\n} => {\n  const newAliasTableName = toSnakeCase(uuid())\n  let newAliasTable\n\n  if (adapter.name === 'postgres') {\n    newAliasTable = alias(adapter.tables[tableName], newAliasTableName)\n  }\n  if (adapter.name === 'sqlite') {\n    newAliasTable = aliasSQLite(adapter.tables[tableName], newAliasTableName)\n  }\n\n  return { newAliasTable, newAliasTableName }\n}\n"],"names":["alias","aliasSQLite","toSnakeCase","v4","uuid","getTableAlias","adapter","tableName","newAliasTableName","newAliasTable","name","tables"],"mappings":"AAGA,SAASA,KAAK,QAAQ,sBAAqB;AAC3C,SAASA,SAASC,WAAW,QAAQ,gCAA+B;AACpE,OAAOC,iBAAiB,gBAAe;AACvC,SAASC,MAAMC,IAAI,QAAQ,OAAM;AAKjC,OAAO,MAAMC,gBAAgB,CAAC,EAC5BC,OAAO,EACPC,SAAS,EAIV;IAIC,MAAMC,oBAAoBN,YAAYE;IACtC,IAAIK;IAEJ,IAAIH,QAAQI,IAAI,KAAK,YAAY;QAC/BD,gBAAgBT,MAAMM,QAAQK,MAAM,CAACJ,UAAU,EAAEC;IACnD;IACA,IAAIF,QAAQI,IAAI,KAAK,UAAU;QAC7BD,gBAAgBR,YAAYK,QAAQK,MAAM,CAACJ,UAAU,EAAEC;IACzD;IAEA,OAAO;QAAEC;QAAeD;IAAkB;AAC5C,EAAC"}

package/dist/queries/getTableColumnFromPath.d.ts

@@ -0,0 +1,51 @@
+import type { SQL } from 'drizzle-orm';
+import type { PgTableWithColumns } from 'drizzle-orm/pg-core';
+import type { SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
+import type { Field, FieldAffectingData, TabAsField } from 'payload';
+import type { DrizzleAdapter, GenericColumn } from '../types.js';
+import type { BuildQueryJoinAliases } from './buildQuery.js';
+type Constraint = {
+    columnName: string;
+    table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>;
+    value: unknown;
+};
+type TableColumn = {
+    columnName?: string;
+    constraints: Constraint[];
+    field: FieldAffectingData;
+    getNotNullColumnByValue?: (val: unknown) => string;
+    pathSegments?: string[];
+    rawColumn?: SQL;
+    table: PgTableWithColumns<any> | SQLiteTableWithColumns<any>;
+};
+type Args = {
+    adapter: DrizzleAdapter;
+    aliasTable?: PgTableWithColumns<any> | SQLiteTableWithColumns<any>;
+    collectionPath: string;
+    columnPrefix?: string;
+    constraintPath?: string;
+    constraints?: Constraint[];
+    fields: (Field | TabAsField)[];
+    joins: BuildQueryJoinAliases;
+    locale?: string;
+    pathSegments: string[];
+    rootTableName?: string;
+    selectFields: Record<string, GenericColumn>;
+    tableName: string;
+    /**
+     * If creating a new table name for arrays and blocks, this suffix should be appended to the table name
+     */
+    tableNameSuffix?: string;
+    /**
+     * The raw value of the query before sanitization
+     */
+    value: unknown;
+};
+/**
+ * Transforms path to table and column name
+ * Adds tables to `join`
+ * @returns TableColumn
+ */
+export declare const getTableColumnFromPath: ({ adapter, aliasTable, collectionPath, columnPrefix, constraintPath: incomingConstraintPath, constraints, fields, joins, locale: incomingLocale, pathSegments: incomingSegments, rootTableName: incomingRootTableName, selectFields, tableName, tableNameSuffix, value, }: Args) => TableColumn;
+export {};
+//# sourceMappingURL=getTableColumnFromPath.d.ts.map

package/dist/queries/getTableColumnFromPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTableColumnFromPath.d.ts","sourceRoot":"","sources":["../../src/queries/getTableColumnFromPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAe,UAAU,EAAa,MAAM,SAAS,CAAA;AAO5F,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAA;AAI5D,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAC5D,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,KAAK,EAAE,kBAAkB,CAAA;IACzB,uBAAuB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAA;IAClD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,SAAS,CAAC,EAAE,GAAG,CAAA;IACf,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;CAC7D,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;IAClE,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AACD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,8QAgBhC,IAAI,KAAG,WA8kBT,CAAA"}