@smartive/graphql-magic 22.3.0-next.1 → 22.3.0

package/.github/workflows/docs.yml

@@ -8,14 +8,14 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '24'
       - name: Install and Build
         run: |
           cd docs

package/.github/workflows/release.yml

@@ -10,12 +10,12 @@ jobs:
     name: build and release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: true
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 24
       - run: npm ci
       - run: npm run build
       - name: semantic release

package/.github/workflows/testing.yml

@@ -15,9 +15,13 @@ jobs:
       matrix:
         node:
           - version: 22
+          - version: 24
         postgres:
-          - version: 13
           - version: 14
+          - version: 15
+          - version: 16
+          - version: 17
+          - version: 18
     name: test and build package (node ${{ matrix.node.version }}, postgres ${{ matrix.postgres.version }})
     runs-on: ubuntu-latest
     container: node:${{ matrix.node.version }}-alpine
@@ -40,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Install dependencies
         run: npm ci
       - name: Lint

package/.nvmrc

@@ -1 +1 @@
-22
+24

package/CHANGELOG.md

@@ -1,3 +1,4 @@
-## 22.3.0-next.1 (2025-12-02)
+## 22.3.0 (2025-12-03)
 
-* feat: Generated fields ([4e53f60](https://github.com/smartive/graphql-magic/commit/4e53f60))
+* feat: Add query debugging (#384) ([5288cb6](https://github.com/smartive/graphql-magic/commit/5288cb6)), closes [#384](https://github.com/smartive/graphql-magic/issues/384)
+* chore(deps): update dependency del-cli to v7 (#354) ([3f466b5](https://github.com/smartive/graphql-magic/commit/3f466b5)), closes [#354](https://github.com/smartive/graphql-magic/issues/354)

package/dist/bin/gqm.cjs

@@ -849,23 +849,32 @@ var MigrationGenerator = class {
             up,
             down
           );
-          const rawExistingFields = model.fields.filter((field) => {
-            if (!field.generateAs) {
-              return false;
-            }
+          const existingFields = model.fields.filter((field) => {
             const col = this.getColumn(model.name, field.kind === "relation" ? `${field.name}Id` : field.name);
             if (!col) {
               return false;
             }
-            if (col.generation_expression !== field.generateAs) {
+            if (!field.nonNull && !col.is_nullable || field.nonNull && col.is_nullable) {
               return true;
             }
-            return this.hasChanged(model, field);
+            if (!field.kind || field.kind === "primitive") {
+              if (field.type === "Int") {
+                if (col.data_type !== "integer") {
+                  return true;
+                }
+              }
+              if (field.type === "Float") {
+                if (field.double) {
+                  if (col.data_type !== "double precision") {
+                    return true;
+                  }
+                } else if (col.data_type !== "numeric") {
+                  return true;
+                }
+              }
+            }
+            return false;
           });
-          if (rawExistingFields.length) {
-            this.updateFieldsRaw(model, rawExistingFields, up, down);
-          }
-          const existingFields = model.fields.filter((field) => !field.generateAs && this.hasChanged(model, field));
           this.updateFields(model, existingFields, up, down);
         }
         if (isUpdatableModel(model)) {
@@ -1008,9 +1017,6 @@ var MigrationGenerator = class {
       const postAlter = [];
       for (const field of fields2) {
         alter.push(() => this.column(field, { setNonNull: field.defaultValue !== void 0 }));
-        if (field.generateAs) {
-          continue;
-        }
         if (field.nonNull && field.defaultValue === void 0) {
           updates.push(() => this.writer.write(`${field.name}: 'TODO',`).newLine());
           postAlter.push(() => this.column(field, { alter: true, foreign: false }));
@@ -1034,56 +1040,12 @@ var MigrationGenerator = class {
     });
     down.push(() => {
       this.alterTable(model.name, () => {
-        for (const { kind, name: name2 } of fields2.toReversed()) {
+        for (const { kind, name: name2 } of fields2) {
           this.dropColumn(kind === "relation" ? `${name2}Id` : name2);
         }
       });
     });
   }
-  updateFieldsRaw(model, fields2, up, down) {
-    if (!fields2.length) {
-      return;
-    }
-    up.push(() => {
-      this.alterTableRaw(model.name, () => {
-        for (const [index, field] of fields2.entries()) {
-          this.columnRaw(field, { alter: true }, index);
-        }
-      });
-    });
-    down.push(() => {
-      this.alterTableRaw(model.name, () => {
-        for (const [index, field] of fields2.entries()) {
-          this.columnRaw(field, { alter: true }, index);
-        }
-      });
-    });
-    if (isUpdatableModel(model)) {
-      const updatableFields = fields2.filter(isUpdatableField);
-      if (!updatableFields.length) {
-        return;
-      }
-      up.push(() => {
-        this.alterTable(`${model.name}Revision`, () => {
-          for (const [index, field] of updatableFields.entries()) {
-            this.columnRaw(field, { alter: true }, index);
-          }
-        });
-      });
-      down.push(() => {
-        this.alterTable(`${model.name}Revision`, () => {
-          for (const [index, field] of updatableFields.entries()) {
-            this.columnRaw(
-              field,
-              { alter: true },
-              index,
-              summonByName(this.columns[model.name], field.kind === "relation" ? `${field.name}Id` : field.name)
-            );
-          }
-        });
-      });
-    }
-  }
   updateFields(model, fields2, up, down) {
     if (!fields2.length) {
       return;
@@ -1204,11 +1166,6 @@ var MigrationGenerator = class {
   createTable(table, block) {
     return this.writer.write(`await knex.schema.createTable('${table}', (table) => `).inlineBlock(block).write(");").newLine().blankLine();
   }
-  alterTableRaw(table, block) {
-    this.writer.write(`await knex.raw('ALTER TABLE "${table}"`);
-    block();
-    this.writer.write(`');`).newLine().blankLine();
-  }
   alterTable(table, block) {
     return this.writer.write(`await knex.schema.alterTable('${table}', (table) => `).inlineBlock(block).write(");").newLine().blankLine();
   }
@@ -1230,107 +1187,25 @@ var MigrationGenerator = class {
     }
     return value2;
   }
-  columnRaw({ name: name2, ...field }, { setNonNull = true, alter = false } = {}, index, toColumn) {
-    const nonNull2 = () => {
+  column({ name: name2, primary, list: list2, ...field }, { setUnique = true, setNonNull = true, alter = false, foreign = true, setDefault = true } = {}, toColumn) {
+    const col = (what) => {
+      if (what) {
+        this.writer.write(what);
+      }
       if (setNonNull) {
         if (toColumn) {
           if (toColumn.is_nullable) {
-            return false;
-          }
-          return true;
-        }
-        if (field.nonNull) {
-          return true;
-        }
-        return false;
-      }
-    };
-    const kind = field.kind;
-    if (field.generateAs) {
-      let type = "";
-      switch (kind) {
-        case void 0:
-        case "primitive":
-          switch (field.type) {
-            case "Float":
-              type = `decimal(${field.precision ?? "undefined"}, ${field.scale ?? "undefined"})`;
-              break;
-            default:
-              throw new Error(`Generated columns of kind ${kind} and type ${field.type} are not supported yet.`);
-          }
-          break;
-        default:
-          throw new Error(`Generated columns of kind ${kind} are not supported yet.`);
-      }
-      if (index) {
-        this.writer.write(`,`);
-      }
-      if (alter) {
-        this.writer.write(` ALTER COLUMN "${name2}" TYPE ${type}`);
-        if (setNonNull) {
-          if (nonNull2()) {
-            this.writer.write(`, ALTER COLUMN "${name2}" SET NOT NULL`);
+            this.writer.write(`.nullable()`);
           } else {
-            this.writer.write(`, ALTER COLUMN "${name2}" DROP NOT NULL`);
+            this.writer.write(".notNullable()");
           }
-        }
-        this.writer.write(`, ALTER COLUMN "${name2}" SET EXPRESSION AS (${field.generateAs})`);
-      } else {
-        this.writer.write(
-          `${alter ? "ALTER" : "ADD"} COLUMN "${name2}" ${type}${nonNull2() ? " not null" : ""} GENERATED ALWAYS AS (${field.generateAs}) STORED`
-        );
-      }
-      return;
-    }
-    throw new Error(`Only generated columns can be created with columnRaw`);
-  }
-  column({ name: name2, primary, list: list2, ...field }, { setUnique = true, setNonNull = true, alter = false, foreign = true, setDefault = true } = {}, toColumn) {
-    const nonNull2 = () => {
-      if (setNonNull) {
-        if (toColumn) {
-          if (toColumn.is_nullable) {
-            return false;
+        } else {
+          if (field.nonNull) {
+            this.writer.write(`.notNullable()`);
+          } else {
+            this.writer.write(".nullable()");
           }
-          return true;
         }
-        if (field.nonNull) {
-          return true;
-        }
-        return false;
-      }
-    };
-    const kind = field.kind;
-    if (field.generateAs) {
-      let type = "";
-      switch (kind) {
-        case void 0:
-        case "primitive":
-          switch (field.type) {
-            case "Float":
-              type = `decimal(${field.precision ?? "undefined"}, ${field.scale ?? "undefined"})`;
-              break;
-            default:
-              throw new Error(`Generated columns of kind ${kind} and type ${field.type} are not supported yet.`);
-          }
-          break;
-        default:
-          throw new Error(`Generated columns of kind ${kind} are not supported yet.`);
-      }
-      this.writer.write(
-        `table.specificType('${name2}', '${type}${nonNull2() ? " not null" : ""} GENERATED ALWAYS AS (${field.generateAs}) STORED')`
-      );
-      if (alter) {
-        this.writer.write(".alter()");
-      }
-      this.writer.write(";").newLine();
-      return;
-    }
-    const col = (what) => {
-      if (what) {
-        this.writer.write(what);
-      }
-      if (setNonNull) {
-        this.writer.write(nonNull2() ? ".notNullable()" : ".nullable()");
       }
       if (setDefault && field.defaultValue !== void 0) {
         this.writer.write(`.defaultTo(${this.value(field.defaultValue)})`);
@@ -1345,6 +1220,7 @@ var MigrationGenerator = class {
       }
       this.writer.write(";").newLine();
     };
+    const kind = field.kind;
     switch (kind) {
       case void 0:
       case "primitive":
@@ -1414,39 +1290,6 @@ var MigrationGenerator = class {
   getColumn(tableName, columnName) {
     return this.columns[tableName].find((col) => col.name === columnName);
   }
-  hasChanged(model, field) {
-    const col = this.getColumn(model.name, field.kind === "relation" ? `${field.name}Id` : field.name);
-    if (!col) {
-      return false;
-    }
-    if (field.generateAs) {
-      if (col.generation_expression !== field.generateAs) {
-        throw new Error(
-          `Column ${col.name} has specific type ${col.generation_expression} but expected ${field.generateAs}`
-        );
-      }
-    }
-    if (!field.nonNull && !col.is_nullable || field.nonNull && col.is_nullable) {
-      return true;
-    }
-    if (!field.kind || field.kind === "primitive") {
-      if (field.type === "Int") {
-        if (col.data_type !== "integer") {
-          return true;
-        }
-      }
-      if (field.type === "Float") {
-        if (field.double) {
-          if (col.data_type !== "double precision") {
-            return true;
-          }
-        } else if (col.data_type !== "numeric") {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
 };
 var getMigrationDate = () => {
   const date = /* @__PURE__ */ new Date();

package/dist/cjs/index.cjs

@@ -1213,23 +1213,32 @@ var MigrationGenerator = class {
             up,
             down
           );
-          const rawExistingFields = model.fields.filter((field) => {
-            if (!field.generateAs) {
-              return false;
-            }
+          const existingFields = model.fields.filter((field) => {
             const col = this.getColumn(model.name, field.kind === "relation" ? `${field.name}Id` : field.name);
             if (!col) {
               return false;
             }
-            if (col.generation_expression !== field.generateAs) {
+            if (!field.nonNull && !col.is_nullable || field.nonNull && col.is_nullable) {
               return true;
             }
-            return this.hasChanged(model, field);
+            if (!field.kind || field.kind === "primitive") {
+              if (field.type === "Int") {
+                if (col.data_type !== "integer") {
+                  return true;
+                }
+              }
+              if (field.type === "Float") {
+                if (field.double) {
+                  if (col.data_type !== "double precision") {
+                    return true;
+                  }
+                } else if (col.data_type !== "numeric") {
+                  return true;
+                }
+              }
+            }
+            return false;
           });
-          if (rawExistingFields.length) {
-            this.updateFieldsRaw(model, rawExistingFields, up, down);
-          }
-          const existingFields = model.fields.filter((field) => !field.generateAs && this.hasChanged(model, field));
           this.updateFields(model, existingFields, up, down);
         }
         if (isUpdatableModel(model)) {
@@ -1372,9 +1381,6 @@ var MigrationGenerator = class {
       const postAlter = [];
       for (const field of fields2) {
         alter.push(() => this.column(field, { setNonNull: field.defaultValue !== void 0 }));
-        if (field.generateAs) {
-          continue;
-        }
         if (field.nonNull && field.defaultValue === void 0) {
           updates.push(() => this.writer.write(`${field.name}: 'TODO',`).newLine());
           postAlter.push(() => this.column(field, { alter: true, foreign: false }));
@@ -1398,56 +1404,12 @@ var MigrationGenerator = class {
     });
     down.push(() => {
       this.alterTable(model.name, () => {
-        for (const { kind, name: name2 } of fields2.toReversed()) {
+        for (const { kind, name: name2 } of fields2) {
           this.dropColumn(kind === "relation" ? `${name2}Id` : name2);
         }
       });
     });
   }
-  updateFieldsRaw(model, fields2, up, down) {
-    if (!fields2.length) {
-      return;
-    }
-    up.push(() => {
-      this.alterTableRaw(model.name, () => {
-        for (const [index, field] of fields2.entries()) {
-          this.columnRaw(field, { alter: true }, index);
-        }
-      });
-    });
-    down.push(() => {
-      this.alterTableRaw(model.name, () => {
-        for (const [index, field] of fields2.entries()) {
-          this.columnRaw(field, { alter: true }, index);
-        }
-      });
-    });
-    if (isUpdatableModel(model)) {
-      const updatableFields = fields2.filter(isUpdatableField);
-      if (!updatableFields.length) {
-        return;
-      }
-      up.push(() => {
-        this.alterTable(`${model.name}Revision`, () => {
-          for (const [index, field] of updatableFields.entries()) {
-            this.columnRaw(field, { alter: true }, index);
-          }
-        });
-      });
-      down.push(() => {
-        this.alterTable(`${model.name}Revision`, () => {
-          for (const [index, field] of updatableFields.entries()) {
-            this.columnRaw(
-              field,
-              { alter: true },
-              index,
-              summonByName(this.columns[model.name], field.kind === "relation" ? `${field.name}Id` : field.name)
-            );
-          }
-        });
-      });
-    }
-  }
   updateFields(model, fields2, up, down) {
     if (!fields2.length) {
       return;
@@ -1568,11 +1530,6 @@ var MigrationGenerator = class {
   createTable(table, block) {
     return this.writer.write(`await knex.schema.createTable('${table}', (table) => `).inlineBlock(block).write(");").newLine().blankLine();
   }
-  alterTableRaw(table, block) {
-    this.writer.write(`await knex.raw('ALTER TABLE "${table}"`);
-    block();
-    this.writer.write(`');`).newLine().blankLine();
-  }
   alterTable(table, block) {
     return this.writer.write(`await knex.schema.alterTable('${table}', (table) => `).inlineBlock(block).write(");").newLine().blankLine();
   }
@@ -1594,107 +1551,25 @@ var MigrationGenerator = class {
     }
     return value2;
   }
-  columnRaw({ name: name2, ...field }, { setNonNull = true, alter = false } = {}, index, toColumn) {
-    const nonNull2 = () => {
+  column({ name: name2, primary, list: list2, ...field }, { setUnique = true, setNonNull = true, alter = false, foreign = true, setDefault = true } = {}, toColumn) {
+    const col = (what) => {
+      if (what) {
+        this.writer.write(what);
+      }
       if (setNonNull) {
         if (toColumn) {
           if (toColumn.is_nullable) {
-            return false;
-          }
-          return true;
-        }
-        if (field.nonNull) {
-          return true;
-        }
-        return false;
-      }
-    };
-    const kind = field.kind;
-    if (field.generateAs) {
-      let type = "";
-      switch (kind) {
-        case void 0:
-        case "primitive":
-          switch (field.type) {
-            case "Float":
-              type = `decimal(${field.precision ?? "undefined"}, ${field.scale ?? "undefined"})`;
-              break;
-            default:
-              throw new Error(`Generated columns of kind ${kind} and type ${field.type} are not supported yet.`);
-          }
-          break;
-        default:
-          throw new Error(`Generated columns of kind ${kind} are not supported yet.`);
-      }
-      if (index) {
-        this.writer.write(`,`);
-      }
-      if (alter) {
-        this.writer.write(` ALTER COLUMN "${name2}" TYPE ${type}`);
-        if (setNonNull) {
-          if (nonNull2()) {
-            this.writer.write(`, ALTER COLUMN "${name2}" SET NOT NULL`);
+            this.writer.write(`.nullable()`);
           } else {
-            this.writer.write(`, ALTER COLUMN "${name2}" DROP NOT NULL`);
+            this.writer.write(".notNullable()");
           }
-        }
-        this.writer.write(`, ALTER COLUMN "${name2}" SET EXPRESSION AS (${field.generateAs})`);
-      } else {
-        this.writer.write(
-          `${alter ? "ALTER" : "ADD"} COLUMN "${name2}" ${type}${nonNull2() ? " not null" : ""} GENERATED ALWAYS AS (${field.generateAs}) STORED`
-        );
-      }
-      return;
-    }
-    throw new Error(`Only generated columns can be created with columnRaw`);
-  }
-  column({ name: name2, primary, list: list2, ...field }, { setUnique = true, setNonNull = true, alter = false, foreign = true, setDefault = true } = {}, toColumn) {
-    const nonNull2 = () => {
-      if (setNonNull) {
-        if (toColumn) {
-          if (toColumn.is_nullable) {
-            return false;
+        } else {
+          if (field.nonNull) {
+            this.writer.write(`.notNullable()`);
+          } else {
+            this.writer.write(".nullable()");
           }
-          return true;
-        }
-        if (field.nonNull) {
-          return true;
         }
-        return false;
-      }
-    };
-    const kind = field.kind;
-    if (field.generateAs) {
-      let type = "";
-      switch (kind) {
-        case void 0:
-        case "primitive":
-          switch (field.type) {
-            case "Float":
-              type = `decimal(${field.precision ?? "undefined"}, ${field.scale ?? "undefined"})`;
-              break;
-            default:
-              throw new Error(`Generated columns of kind ${kind} and type ${field.type} are not supported yet.`);
-          }
-          break;
-        default:
-          throw new Error(`Generated columns of kind ${kind} are not supported yet.`);
-      }
-      this.writer.write(
-        `table.specificType('${name2}', '${type}${nonNull2() ? " not null" : ""} GENERATED ALWAYS AS (${field.generateAs}) STORED')`
-      );
-      if (alter) {
-        this.writer.write(".alter()");
-      }
-      this.writer.write(";").newLine();
-      return;
-    }
-    const col = (what) => {
-      if (what) {
-        this.writer.write(what);
-      }
-      if (setNonNull) {
-        this.writer.write(nonNull2() ? ".notNullable()" : ".nullable()");
       }
       if (setDefault && field.defaultValue !== void 0) {
         this.writer.write(`.defaultTo(${this.value(field.defaultValue)})`);
@@ -1709,6 +1584,7 @@ var MigrationGenerator = class {
       }
       this.writer.write(";").newLine();
     };
+    const kind = field.kind;
     switch (kind) {
       case void 0:
       case "primitive":
@@ -1778,39 +1654,6 @@ var MigrationGenerator = class {
   getColumn(tableName, columnName) {
     return this.columns[tableName].find((col) => col.name === columnName);
   }
-  hasChanged(model, field) {
-    const col = this.getColumn(model.name, field.kind === "relation" ? `${field.name}Id` : field.name);
-    if (!col) {
-      return false;
-    }
-    if (field.generateAs) {
-      if (col.generation_expression !== field.generateAs) {
-        throw new Error(
-          `Column ${col.name} has specific type ${col.generation_expression} but expected ${field.generateAs}`
-        );
-      }
-    }
-    if (!field.nonNull && !col.is_nullable || field.nonNull && col.is_nullable) {
-      return true;
-    }
-    if (!field.kind || field.kind === "primitive") {
-      if (field.type === "Int") {
-        if (col.data_type !== "integer") {
-          return true;
-        }
-      }
-      if (field.type === "Float") {
-        if (field.double) {
-          if (col.data_type !== "double precision") {
-            return true;
-          }
-        } else if (col.data_type !== "numeric") {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
 };
 var getMigrationDate = () => {
   const date = /* @__PURE__ */ new Date();
@@ -2096,6 +1939,9 @@ var checkCanWrite = async (ctx, model, data, action) => {
   }
   const role = getRole(ctx);
   if (linked) {
+    if (process.env.DEBUG_GRAPHQL_MAGIC === "true") {
+      console.debug("QUERY", query.toString());
+    }
     const canMutate = await query;
     if (!canMutate) {
       throw new PermissionError(role, action, `this ${model.name}`, "no linkable entities");
@@ -2766,6 +2612,9 @@ var resolve = async (ctx, id) => {
   if (!node.isList) {
     void query.limit(1);
   }
+  if (process.env.DEBUG_GRAPHQL_MAGIC === "true") {
+    console.debug("QUERY", query.toString());
+  }
   const raw = await query;
   const res = hydrate(node, raw);
   await applySubQueries(node, res, verifiedPermissionStacks);

package/dist/esm/migrations/generate.d.ts

@@ -12,23 +12,19 @@ export declare class MigrationGenerator {
     generate(): Promise<string>;
     private renameFields;
     private createFields;
-    private updateFieldsRaw;
     private updateFields;
     private createRevisionTable;
     private createRevisionFields;
     private createEnums;
     private migration;
     private createTable;
-    private alterTableRaw;
     private alterTable;
     private dropColumn;
     private dropTable;
     private renameTable;
     private renameColumn;
     private value;
-    private columnRaw;
     private column;
     private getColumn;
-    private hasChanged;
 }
 export declare const getMigrationDate: () => string;