@travetto/model-sql 3.1.6 → 3.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-sql",
-  "version": "3.1.6",
+  "version": "3.1.8",
   "description": "SQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -30,7 +30,7 @@
     "@travetto/config": "^3.1.2",
     "@travetto/context": "^3.1.1",
     "@travetto/model": "^3.1.8",
-    "@travetto/model-query": "^3.1.6"
+    "@travetto/model-query": "^3.1.8"
   },
   "peerDependencies": {
     "@travetto/command": "^3.1.2",

package/src/dialect/base.ts

@@ -478,6 +478,19 @@ export abstract class SQLDialect implements DialectState {
               }
               break;
             }
+            case '$empty': {
+              const valueTable = this.parentTable(sStack);
+              const alias = `_all_${sStack.length}`;
+              const pPath = this.ident(this.parentPathField.name);
+              const rpPath = this.resolveName([...sStack, field, this.parentPathField]);
+
+              items.push(`0 ${v ? '=' : '<>'} (
+                SELECT COUNT(${alias}.${this.ident(field.name)})
+                FROM ${valueTable} ${alias} 
+                WHERE ${alias}.${pPath} = ${rpPath}
+              )`);
+              break;
+            }
             case '$exists': items.push(`${sPath} ${v ? SQL_OPS.$isNot : SQL_OPS.$is} NULL`); break;
             case '$ne': case '$eq': {
               if (v === null || v === undefined) {
@@ -648,17 +661,19 @@ ${this.getLimitSQL(cls, query)}`;
       }
     }
 
+    const fieldSql = fields
+      .map(f => {
+        const def = this.getColumnDefinition(f) || '';
+        return f.name === this.idField.name && !parent ?
+          def.replace('DEFAULT NULL', 'NOT NULL') : def;
+      })
+      .filter(x => !!x.trim())
+      .join(',\n  ');
+
     /* eslint-disable @typescript-eslint/indent */
     const out = `
 CREATE TABLE IF NOT EXISTS ${this.table(stack)} (
-  ${fields
-        .map(f => {
-          const def = this.getColumnDefinition(f) || '';
-          return f.name === this.idField.name && !parent ?
-            def.replace('DEFAULT NULL', 'NOT NULL') : def;
-        })
-        .filter(x => !!x.trim())
-        .join(',\n  ')},
+  ${fieldSql}${fieldSql.length ? ',' : ''}
   ${this.getColumnDefinition(this.pathField)} UNIQUE,
   ${!parent ?
         `PRIMARY KEY (${this.ident(this.idField)})` :

package/src/internal/util.ts

@@ -198,12 +198,17 @@ export class SQLUtil {
               pathObj.push(val);
               config.path[config.path.length - 1] = { ...top, index: i++ };
               handler.onSub({ ...config, value: val });
+              if (!field.array) {
+                config.descend();
+              }
             } finally {
               pathObj.pop();
             }
             i += 1;
           }
-          return config.descend();
+          if (field.array) {
+            config.descend();
+          }
         }
       },
       onSimple: (config) => {