@travetto/model-postgres 8.0.0-alpha.27 → 8.0.0-alpha.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-postgres",
-  "version": "8.0.0-alpha.27",
+  "version": "8.0.0-alpha.29",
   "type": "module",
   "description": "PostgreSQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
@@ -28,16 +28,16 @@
     "directory": "module/model-postgres"
   },
   "dependencies": {
-    "@travetto/config": "^8.0.0-alpha.23",
-    "@travetto/context": "^8.0.0-alpha.21",
-    "@travetto/model": "^8.0.0-alpha.24",
-    "@travetto/model-query": "^8.0.0-alpha.25",
-    "@travetto/model-sql": "^8.0.0-alpha.27",
+    "@travetto/config": "^8.0.0-alpha.24",
+    "@travetto/context": "^8.0.0-alpha.22",
+    "@travetto/model": "^8.0.0-alpha.25",
+    "@travetto/model-query": "^8.0.0-alpha.27",
+    "@travetto/model-sql": "^8.0.0-alpha.29",
     "@types/pg": "^8.20.0",
     "pg": "^8.22.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.29"
+    "@travetto/cli": "^8.0.0-alpha.30"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/dialect.ts

@@ -74,26 +74,48 @@ export class PostgresDialect extends AbstractANSI99Dialect {
     return `$${index}`;
   }
 
-  #buildContainmentPayload(value: unknown, context?: ResolvedPathContext): unknown {
-    if (!context?.subPath || context.subPath.length === 0) {
+  #buildContainmentPayload(value: unknown, context: ResolvedPathContext): unknown {
+    if (!context.subPath || context.subPath.length === 0) {
       return Array.isArray(value) ? value : [value];
     }
 
+    const isArraySegment = new Array<boolean>(context.subPath.length).fill(false);
+    let currentClass: Class | undefined = context.arrayField?.type;
+    for (let index = 0; index < context.subPath.length; index++) {
+      if (!currentClass) {
+        break;
+      }
+      const segment = context.subPath[index];
+      const classConfig = SchemaRegistryIndex.getOptional(currentClass)?.get();
+      const fieldConfig = classConfig?.fields[segment];
+      if (fieldConfig) {
+        if (fieldConfig.array) {
+          isArraySegment[index] = true;
+        }
+        currentClass = fieldConfig.type;
+      } else {
+        break;
+      }
+    }
+
+    const buildPayloadForValue = (item: unknown): unknown => {
+      let itemPayload: unknown = item;
+      for (let index = context.subPath!.length - 1; index >= 0; index--) {
+        const segment = context.subPath![index];
+        if (isArraySegment[index]) {
+          itemPayload = { [segment]: Array.isArray(itemPayload) ? itemPayload : [itemPayload] };
+        } else {
+          itemPayload = { [segment]: itemPayload };
+        }
+      }
+      return itemPayload;
+    };
+
     let currentPayload: unknown;
     if (Array.isArray(value)) {
-      currentPayload = value.map(item => {
-        let itemPayload: unknown = item;
-        for (let index = context.subPath!.length - 1; index >= 0; index--) {
-          itemPayload = { [context.subPath![index]]: itemPayload };
-        }
-        return itemPayload;
-      });
+      currentPayload = value.map(item => buildPayloadForValue(item));
     } else {
-      currentPayload = value;
-      for (let index = context.subPath.length - 1; index >= 0; index--) {
-        currentPayload = { [context.subPath[index]]: currentPayload };
-      }
-      currentPayload = [currentPayload];
+      currentPayload = [buildPayloadForValue(value)];
     }
 
     if (context.arrayPath && context.arrayPath.length > 1) {
@@ -163,6 +185,31 @@ export class PostgresDialect extends AbstractANSI99Dialect {
     return { sql: `(${target.jsonbPath} IS NOT NULL AND ${target.jsonbPath} <> '[]'::jsonb)` };
   }
 
+  compileArrayRegex(context: ResolvedPathContext, identifier: string, value: RegExp | string): { sql: string; formatted: unknown } {
+    const target = this.#getPostgresArrayTarget(context);
+    const regex = value instanceof RegExp ? value : new RegExp(String(value));
+    const caseInsensitive = regex.flags.includes('i');
+    const regexOp = this.getRegexOperator(caseInsensitive);
+    const regexSource = this.formatRegex(regex.source, caseInsensitive);
+
+    if (target.isNative) {
+      return {
+        sql: `EXISTS (SELECT 1 FROM unnest(${target.sqlPath}) AS elem WHERE elem ${regexOp} ${identifier})`,
+        formatted: regexSource
+      };
+    }
+
+    const subAccessor =
+      context.subPath && context.subPath.length > 0
+        ? `->${context.subPath.map(segment => `'${this.escapeLiteral(segment)}'`).join('->')}`
+        : '';
+
+    return {
+      sql: `EXISTS (SELECT 1 FROM jsonb_array_elements_text((${target.jsonbPath})${subAccessor}) AS elem WHERE elem ${regexOp} ${identifier})`,
+      formatted: regexSource
+    };
+  }
+
   getRegexOperator(caseInsensitive: boolean): string {
     return caseInsensitive ? '~*' : '~';
   }