@easy-cms/db-postgres 0.7.0 → 0.9.0

package/dist/index.js

@@ -20,6 +20,11 @@ import postgresJs from "postgres";
 import { DEFAULT_MIGRATION_DIR, DEFAULT_TABLE_PREFIX } from "@easy-cms/drizzle";
 var kit = () => import("drizzle-kit/api");
 var PG_TYPES = { number: "double precision", integer: "integer", boolean: "boolean" };
+var aliases = 0;
+var alias = () => sql.raw(`_el${++aliases % 1e6}`);
+var jsonPath = (path) => sql.raw(`'{${path.join(",")}}'`);
+var cast = (text2, type) => type === "text" ? text2 : sql`${text2}::${sql.raw(PG_TYPES[type])}`;
+var onlyArray = (array) => sql`case when jsonb_typeof(${array}) = 'array' then ${array} end`;
 var postgresDialect = {
   name: "postgres",
   table: (name, columns, indexes) => pgTable(name, columns, indexes),
@@ -32,12 +37,33 @@ var postgresDialect = {
   boolean: (name) => boolean(name),
   json: (name) => jsonb(name),
   like: (column, pattern) => sql`${column} ILIKE ${pattern} ESCAPE '\\'`,
-  someElement: (column, condition) => {
-    const where = condition((path, type) => {
-      const text2 = sql`(_el.value #>> ${sql.raw(`'{${path.join(",")}}'`)})`;
-      return type === "text" ? text2 : sql`${text2}::${sql.raw(PG_TYPES[type])}`;
+  someElement: (array, condition) => {
+    const el = alias();
+    const where = condition({
+      get: (path, type) => cast(sql`(${el}.value #>> ${jsonPath(path)})`, type),
+      list: (path) => sql`(${el}.value #> ${jsonPath(path)})`
     });
-    return sql`exists (select 1 from jsonb_array_elements(case when jsonb_typeof(${column}) = 'array' then ${column} end) as _el(value)${where ? sql` where ${where}` : sql``})`;
+    return sql`exists (select 1 from jsonb_array_elements(${onlyArray(array)}) as ${el}(value)${where ? sql` where ${where}` : sql``})`;
+  },
+  firstElementValue: (array, lists, path, type) => {
+    const els = [alias()];
+    const from = [
+      sql`jsonb_array_elements(${onlyArray(array)}) with ordinality as ${els[0]}(value, idx)`
+    ];
+    for (const list of lists) {
+      const outer = els.at(-1);
+      const el = alias();
+      els.push(el);
+      from.push(
+        sql`jsonb_array_elements(${onlyArray(sql`(${outer}.value #> ${jsonPath(list)})`)}) with ordinality as ${el}(value, idx)`
+      );
+    }
+    const text2 = sql`(${els.at(-1)}.value #>> ${jsonPath(path)})`;
+    const order = sql.join(
+      els.map((el) => sql`${el}.idx`),
+      sql`, `
+    );
+    return sql`(select ${cast(text2, type)} from ${sql.join(from, sql`, `)} where ${text2} is not null order by ${order} limit 1)`;
   },
   param: (n) => `$${n}`,
   migrationsTableSQL: (name) => `CREATE TABLE IF NOT EXISTS "${name}" (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/db-postgres",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "PostgreSQL database adapter for Easy CMS",
   "license": "MIT",
   "type": "module",
@@ -22,11 +22,11 @@
     "drizzle-kit": "0.31.11",
     "drizzle-orm": "0.45.3",
     "postgres": "^3.4.9",
-    "@easy-cms/drizzle": "^0.7.0"
+    "@easy-cms/drizzle": "^0.9.0"
   },
   "peerDependencies": {
     "@electric-sql/pglite": ">=0.3.0",
-    "@easy-cms/core": "^0.7.0"
+    "@easy-cms/core": "^0.9.0"
   },
   "peerDependenciesMeta": {
     "@electric-sql/pglite": {
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.5.8",
-    "@easy-cms/core": "^0.7.0"
+    "@easy-cms/core": "^0.9.0"
   },
   "publishConfig": {
     "access": "public"