pqb 0.31.0 → 0.31.1

package/dist/index.mjs

@@ -4403,12 +4403,6 @@ const mergeColumnsSql = (quotedColumns2) => {
 };
 const encodeRow = (ctx, q, QueryClass, row, runtimeDefaults, quotedAs) => {
   const arr = row.map((value) => {
-    if (typeof value === "function") {
-      value = resolveSubQueryCallback(
-        q,
-        value
-      );
-    }
     if (value && typeof value === "object") {
       if (value instanceof Expression) {
         return value.toSQL(ctx, quotedAs);
@@ -4711,6 +4705,7 @@ const toSQL = (table, options) => {
   return !(options == null ? void 0 : options.clearCache) && table.q[toSQLCacheKey] || (table.q[toSQLCacheKey] = makeSQL(table, options));
 };
 const makeSQL = (table, options) => {
+  var _a;
   const query = table.q;
   const sql = [];
   const values = (options == null ? void 0 : options.values) || [];
@@ -4724,24 +4719,21 @@ const makeSQL = (table, options) => {
     pushWithSql(ctx, query.with);
   }
   if (query.type) {
+    const tableName = (_a = table.table) != null ? _a : query.as;
+    if (!tableName)
+      throw new Error(`Table is missing for ${query.type}`);
     if (query.type === "truncate") {
-      if (!table.table)
-        throw new Error("Table is missing for truncate");
-      pushTruncateSql(ctx, table.table, query);
+      pushTruncateSql(ctx, tableName, query);
       return { text: sql.join(" "), values };
     }
     if (query.type === "columnInfo") {
-      if (!table.table)
-        throw new Error("Table is missing for truncate");
       pushColumnInfoSql(ctx, table, query);
       return { text: sql.join(" "), values };
     }
-    if (!table.table)
-      throw new Error(`Table is missing for ${query.type}`);
-    const quotedAs2 = `"${query.as || table.table}"`;
+    const quotedAs2 = `"${query.as || tableName}"`;
     if (query.type === "insert") {
       return {
-        hookSelect: pushInsertSql(ctx, table, query, `"${table.table}"`),
+        hookSelect: pushInsertSql(ctx, table, query, `"${tableName}"`),
         text: sql.join(" "),
         values
       };
@@ -6153,9 +6145,17 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
         item,
         rowIndex
       );
-    } else if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.computed || shape === anyShape)) {
-      ctx.columns.set(key, ctx.columns.size);
-      encoders[key] = (_c = shape[key]) == null ? void 0 : _c.encodeFn;
+    } else {
+      if (typeof item[key] === "function") {
+        item[key] = resolveSubQueryCallback(
+          q,
+          item[key]
+        );
+      }
+      if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.computed || shape === anyShape)) {
+        ctx.columns.set(key, ctx.columns.size);
+        encoders[key] = (_c = shape[key]) == null ? void 0 : _c.encodeFn;
+      }
     }
   }
 };
@@ -6361,6 +6361,22 @@ class Create {
    * });
    * ```
    *
+   * `create` and `insert` can be used in {@link WithMethods.with} expressions:
+   *
+   * ```ts
+   * db.$queryBuilder
+   *   // create a record in one table
+   *   .with('a', db.table.select('id').create(data))
+   *   // create a record in other table using the first table record id
+   *   .with('b', (q) =>
+   *     db.otherTable.select('id').create({
+   *       ...otherData,
+   *       aId: () => q.from('a').get('id'),
+   *     }),
+   *   )
+   *   .from('b');
+   * ```
+   *
    * @param data - data for the record, may have values, raw SQL, queries, relation operations.
    */
   create(data) {
@@ -6869,6 +6885,19 @@ class Delete {
    * // delete all users who have corresponding profile records:
    * db.table.join(Profile, 'profile.userId', 'user.id').all().delete();
    * ```
+   *
+   * `delete` can be used in {@link WithMethods.with} expressions:
+   *
+   * ```ts
+   * db.$queryBuilder
+   *   // delete a record in one table
+   *   .with('a', db.table.find(1).select('id').delete())
+   *   // delete a record in other table using the first table record id
+   *   .with('b', (q) =>
+   *     db.otherTable.select('id').whereIn('aId', q.from('a').pluck('id')).delete(),
+   *   )
+   *   .from('b');
+   * ```
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   delete(..._args) {
@@ -9531,7 +9560,24 @@ class Update {
    * })
    * ```
    *
-   * It is not supported because query inside `WITH` cannot reference the table in `UPDATE`.
+   * `update` can be used in {@link WithMethods.with} expressions:
+   *
+   * ```ts
+   * db.$queryBuilder
+   *   // update record in one table
+   *   .with('a', db.table.find(1).select('id').update(data))
+   *   // update record in other table using the first table record id
+   *   .with('b', (q) =>
+   *     db.otherTable
+   *       .find(1)
+   *       .select('id')
+   *       .update({
+   *         ...otherData,
+   *         aId: () => q.from('a').get('id'),
+   *       }),
+   *   )
+   *   .from('b');
+   * ```
    *
    * ### null, undefined, unknown columns
    *