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

package/.gqmrc.json

@@ -4,5 +4,6 @@
   "graphqlQueriesPath": "tests",
   "gqmModule": "../../../src",
   "knexfilePath": "knexfile.ts",
-  "dateLibrary": "luxon"
+  "dateLibrary": "luxon",
+  "functionsPath": "tests/functions.ts"
 }

package/CHANGELOG.md

@@ -1,5 +1,5 @@
-## [23.6.1-next.1](https://github.com/smartive/graphql-magic/compare/v23.6.0...v23.6.1-next.1) (2026-02-24)
+## [23.6.1](https://github.com/smartive/graphql-magic/compare/v23.6.0...v23.6.1) (2026-02-24)
 
 ### Bug Fixes
 
-* exclude expression from DB types and all generateAs from upserts ([adfa7fc](https://github.com/smartive/graphql-magic/commit/adfa7fc10b2fd84ae951840d1dc553d50f78bc3e))
+* correctly generate types for fields that are dynamic e.g. generateAs expression ([8a63cf1](https://github.com/smartive/graphql-magic/commit/8a63cf18a742b5b6530f582c20e8f802ef2cb354))

package/dist/bin/gqm.cjs

@@ -558,8 +558,8 @@ var getLabel = (s) => (0, import_startCase.default)((0, import_camelCase.default
 var and = (...predicates) => (field) => predicates.every((predicate) => predicate(field));
 var not = (predicate) => (field) => !predicate(field);
 var isRootModel = (model) => !!model.root;
-var isCreatableModel = (model) => model.creatable && model.fields.some(isCreatableField);
-var isUpdatableModel = (model) => model.updatable && model.fields.some(isUpdatableField);
+var isCreatableModel = (model) => !!model.creatable && model.fields.some(isCreatableField);
+var isUpdatableModel = (model) => !!model.updatable && model.fields.some(isUpdatableField);
 var isCreatableField = (field) => !field.inherited && !!field.creatable;
 var isUpdatableField = (field) => !field.inherited && !!field.updatable;
 var modelNeedsTable = (model) => model.fields.some((field) => !field.inherited);
@@ -568,9 +568,11 @@ var isInherited = (field) => !!field.inherited;
 var isInTable = (field) => field.name === "id" || !field.inherited;
 var isQueriableField = ({ queriable }) => queriable !== false;
 var isCustomField = (field) => field.kind === "custom";
-var isGenerateAsField = (field) => !!field.generateAs;
-var isStoredInDatabase = (field) => field.generateAs?.type !== "expression";
+var isDynamicField = (field) => !!field.generateAs || isCustomField(field);
+var isStoredInDatabase = (field) => !isCustomField(field) && field.generateAs?.type !== "expression";
 var isSimpleField = and(not(isRelation), not(isCustomField));
+var isUpdatable = ({ updatable }) => !!updatable;
+var isCreatable = ({ creatable }) => !!creatable;
 var summonByName = (array, value2) => summonByKey(array, "name", value2);
 var summonByKey = (array, key, value2) => summon(array, (element) => (0, import_get.default)(element, key) === value2, `No element found with ${key} ${value2}`);
 var summon = (array, cb, errorMessage) => {
@@ -696,12 +698,12 @@ var generateDBModels = (models, dateLibrary) => {
   for (const model of models.entities) {
     const fields2 = model.relations.some((relation) => relation.field.foreignKey === "id") ? model.fields.filter((field) => field.name !== "id") : model.fields;
     writer.write(`export type ${model.name} = `).inlineBlock(() => {
-      for (const field of fields2.filter(not(isCustomField)).filter(isStoredInDatabase)) {
+      for (const field of fields2.filter(isStoredInDatabase)) {
         writer.write(`'${getColumnName(field)}': ${getFieldType(field, dateLibrary)}${field.nonNull ? "" : " | null"};`).newLine();
       }
     }).blankLine();
     writer.write(`export type ${model.name}Initializer = `).inlineBlock(() => {
-      for (const field of fields2.filter(not(isCustomField)).filter(isInTable).filter(not(isGenerateAsField))) {
+      for (const field of fields2.filter(and(isInTable, not(isDynamicField)))) {
         writer.write(
           `'${getColumnName(field)}'${field.nonNull && field.defaultValue === void 0 ? "" : "?"}: ${getFieldType(
             field,
@@ -712,7 +714,7 @@ var generateDBModels = (models, dateLibrary) => {
       }
     }).blankLine();
     writer.write(`export type ${model.name}Mutator = `).inlineBlock(() => {
-      for (const field of fields2.filter(not(isCustomField)).filter(isInTable).filter(not(isGenerateAsField))) {
+      for (const field of fields2.filter(and(isInTable, not(isDynamicField)))) {
         writer.write(
           `'${getColumnName(field)}'?: ${getFieldType(field, dateLibrary, true)}${field.list ? " | string" : ""}${field.nonNull ? "" : " | null"};`
         ).newLine();
@@ -720,7 +722,7 @@ var generateDBModels = (models, dateLibrary) => {
     }).blankLine();
     if (!isRootModel(model)) {
       writer.write(`export type ${model.name}Seed = `).inlineBlock(() => {
-        for (const field of fields2.filter(not(isCustomField)).filter(not(isGenerateAsField))) {
+        for (const field of fields2.filter(not(isDynamicField))) {
           if (model.parent && field.name === "type") {
             continue;
           }
@@ -781,6 +783,75 @@ var generateKnexTables = (models) => {
   return writer.toString();
 };
 
+// src/migrations/generate-functions.ts
+var generateFunctionsFromDatabase = async (knex2) => {
+  const regularFunctions = await knex2.raw(`
+    SELECT 
+      pg_get_functiondef(p.oid) as definition
+    FROM pg_proc p
+    JOIN pg_namespace n ON p.pronamespace = n.oid
+    WHERE n.nspname = 'public'
+    AND NOT EXISTS (SELECT 1 FROM pg_aggregate a WHERE a.aggfnoid = p.oid)
+    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
+  `);
+  const aggregateFunctions = await knex2.raw(`
+    SELECT 
+      p.proname as name,
+      pg_get_function_identity_arguments(p.oid) as arguments,
+      a.aggtransfn::regproc::text as trans_func,
+      a.aggfinalfn::regproc::text as final_func,
+      a.agginitval as init_val,
+      pg_catalog.format_type(a.aggtranstype, NULL) as state_type
+    FROM pg_proc p
+    JOIN pg_aggregate a ON p.oid = a.aggfnoid
+    JOIN pg_namespace n ON p.pronamespace = n.oid
+    WHERE n.nspname = 'public'
+    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
+  `);
+  const functions = [];
+  for (const row of regularFunctions.rows || []) {
+    if (row.definition) {
+      functions.push(row.definition.trim());
+    }
+  }
+  for (const row of aggregateFunctions.rows || []) {
+    const name2 = row.name || "";
+    const argumentsStr = row.arguments || "";
+    const transFunc = row.trans_func || "";
+    const finalFunc = row.final_func || "";
+    const initVal = row.init_val;
+    const stateType = row.state_type || "";
+    if (!name2 || !transFunc || !stateType) {
+      continue;
+    }
+    let aggregateDef = `CREATE AGGREGATE ${name2}(${argumentsStr}) (
+`;
+    aggregateDef += `  SFUNC = ${transFunc},
+`;
+    aggregateDef += `  STYPE = ${stateType}`;
+    if (finalFunc) {
+      aggregateDef += `,
+  FINALFUNC = ${finalFunc}`;
+    }
+    if (initVal !== null && initVal !== void 0) {
+      const initValStr = typeof initVal === "string" ? `'${initVal}'` : String(initVal);
+      aggregateDef += `,
+  INITCOND = ${initValStr}`;
+    }
+    aggregateDef += "\n);";
+    functions.push(aggregateDef);
+  }
+  if (functions.length === 0) {
+    return `export const functions: string[] = [];
+`;
+  }
+  const functionsArrayString = functions.map((func) => `  ${JSON.stringify(func)}`).join(",\n");
+  return `export const functions: string[] = [
+${functionsArrayString},
+];
+`;
+};
+
 // src/migrations/generate.ts
 var import_code_block_writer2 = __toESM(require("code-block-writer"), 1);
 var import_knex_schema_inspector = require("knex-schema-inspector");
@@ -1215,7 +1286,7 @@ var MigrationGenerator = class {
                         writer.writeLine(`deleteRootType: row.deleteRootType,`);
                         writer.writeLine(`deleteRootId: row.deleteRootId,`);
                       }
-                      for (const { name: name2, kind } of model.fields.filter(isUpdatableField).filter(not(isGenerateAsField))) {
+                      for (const { name: name2, kind } of model.fields.filter(and(isUpdatableField, isStoredInDatabase))) {
                         const col = kind === "relation" ? `${name2}Id` : name2;
                         writer.writeLine(`${col}: row.${col},`);
                       }
@@ -1235,8 +1306,8 @@ var MigrationGenerator = class {
               up,
               down
             );
-            const missingRevisionFields = model.fields.filter(isUpdatableField).filter(not(isGenerateAsField)).filter(
-              ({ name: name2, ...field }) => field.kind !== "custom" && !this.getColumn(revisionTable, field.kind === "relation" ? field.foreignKey || `${name2}Id` : name2)
+            const missingRevisionFields = model.fields.filter(and(isUpdatableField, isStoredInDatabase)).filter(
+              ({ name: name2, ...field }) => !this.getColumn(revisionTable, field.kind === "relation" ? field.foreignKey || `${name2}Id` : name2)
             );
             this.createRevisionFields(model, missingRevisionFields, up, down);
             const revisionFieldsToRemove = model.fields.filter(
@@ -1394,7 +1465,7 @@ var MigrationGenerator = class {
       });
     });
     if (isUpdatableModel(model)) {
-      const updatableFields = fields2.filter(isUpdatableField).filter(not(isGenerateAsField));
+      const updatableFields = fields2.filter(and(isUpdatableField, isStoredInDatabase));
       if (!updatableFields.length) {
         return;
       }
@@ -1442,7 +1513,7 @@ var MigrationGenerator = class {
       });
     });
     if (isUpdatableModel(model)) {
-      const updatableFields = fields2.filter(isUpdatableField).filter(not(isGenerateAsField));
+      const updatableFields = fields2.filter(and(isUpdatableField, isStoredInDatabase));
       if (!updatableFields.length) {
         return;
       }
@@ -1480,7 +1551,7 @@ var MigrationGenerator = class {
           writer.writeLine(`table.uuid('deleteRootId');`);
         }
       }
-      for (const field of model.fields.filter(and(isUpdatableField, not(isInherited))).filter(not(isGenerateAsField))) {
+      for (const field of model.fields.filter(and(isUpdatableField, not(isInherited), isStoredInDatabase))) {
         this.column(field, { setUnique: false, setDefault: false });
       }
     });
@@ -1922,75 +1993,6 @@ var getMigrationDate = () => {
   return `${year}${month}${day}${hours}${minutes}${seconds}`;
 };
 
-// src/migrations/generate-functions.ts
-var generateFunctionsFromDatabase = async (knex2) => {
-  const regularFunctions = await knex2.raw(`
-    SELECT 
-      pg_get_functiondef(p.oid) as definition
-    FROM pg_proc p
-    JOIN pg_namespace n ON p.pronamespace = n.oid
-    WHERE n.nspname = 'public'
-    AND NOT EXISTS (SELECT 1 FROM pg_aggregate a WHERE a.aggfnoid = p.oid)
-    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
-  `);
-  const aggregateFunctions = await knex2.raw(`
-    SELECT 
-      p.proname as name,
-      pg_get_function_identity_arguments(p.oid) as arguments,
-      a.aggtransfn::regproc::text as trans_func,
-      a.aggfinalfn::regproc::text as final_func,
-      a.agginitval as init_val,
-      pg_catalog.format_type(a.aggtranstype, NULL) as state_type
-    FROM pg_proc p
-    JOIN pg_aggregate a ON p.oid = a.aggfnoid
-    JOIN pg_namespace n ON p.pronamespace = n.oid
-    WHERE n.nspname = 'public'
-    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
-  `);
-  const functions = [];
-  for (const row of regularFunctions.rows || []) {
-    if (row.definition) {
-      functions.push(row.definition.trim());
-    }
-  }
-  for (const row of aggregateFunctions.rows || []) {
-    const name2 = row.name || "";
-    const argumentsStr = row.arguments || "";
-    const transFunc = row.trans_func || "";
-    const finalFunc = row.final_func || "";
-    const initVal = row.init_val;
-    const stateType = row.state_type || "";
-    if (!name2 || !transFunc || !stateType) {
-      continue;
-    }
-    let aggregateDef = `CREATE AGGREGATE ${name2}(${argumentsStr}) (
-`;
-    aggregateDef += `  SFUNC = ${transFunc},
-`;
-    aggregateDef += `  STYPE = ${stateType}`;
-    if (finalFunc) {
-      aggregateDef += `,
-  FINALFUNC = ${finalFunc}`;
-    }
-    if (initVal !== null && initVal !== void 0) {
-      const initValStr = typeof initVal === "string" ? `'${initVal}'` : String(initVal);
-      aggregateDef += `,
-  INITCOND = ${initValStr}`;
-    }
-    aggregateDef += "\n);";
-    functions.push(aggregateDef);
-  }
-  if (functions.length === 0) {
-    return `export const functions: string[] = [];
-`;
-  }
-  const functionsArrayString = functions.map((func) => `  ${JSON.stringify(func)}`).join(",\n");
-  return `export const functions: string[] = [
-${functionsArrayString},
-];
-`;
-};
-
 // src/permissions/generate.ts
 var ACTIONS = ["READ", "CREATE", "UPDATE", "DELETE", "RESTORE", "LINK"];
 
@@ -2255,7 +2257,7 @@ var generateDefinitions = ({
           types.push(
             input(
               `Create${model.name}`,
-              model.fields.filter(({ creatable }) => creatable).filter(not(isGenerateAsField)).map(
+              model.fields.filter(and(isCreatable, isStoredInDatabase)).map(
                 (field) => field.kind === "relation" ? { name: `${field.name}Id`, type: "ID", nonNull: field.nonNull } : {
                   name: field.name,
                   type: field.kind === "json" ? `Create${field.type}` : field.type,
@@ -2270,7 +2272,7 @@ var generateDefinitions = ({
           types.push(
             input(
               `Update${model.name}`,
-              model.fields.filter(({ updatable }) => updatable).filter(not(isGenerateAsField)).map(
+              model.fields.filter(and(isUpdatable, isStoredInDatabase)).map(
                 (field) => field.kind === "relation" ? { name: `${field.name}Id`, type: "ID" } : {
                   name: field.name,
                   type: field.kind === "json" ? `Update${field.type}` : field.type,

package/dist/cjs/index.cjs

@@ -133,12 +133,12 @@ __export(index_exports, {
   isCreatableField: () => isCreatableField,
   isCreatableModel: () => isCreatableModel,
   isCustomField: () => isCustomField,
+  isDynamicField: () => isDynamicField,
   isEntityModel: () => isEntityModel,
   isEnum: () => isEnum,
   isEnumModel: () => isEnumModel,
   isFieldNode: () => isFieldNode,
   isFragmentSpreadNode: () => isFragmentSpreadNode,
-  isGenerateAsField: () => isGenerateAsField,
   isInTable: () => isInTable,
   isInherited: () => isInherited,
   isInlineFragmentNode: () => isInlineFragmentNode,
@@ -833,8 +833,8 @@ var isScalarModel = (model) => model instanceof ScalarModel;
 var isObjectModel = (model) => model instanceof ObjectModel;
 var isInputModel = (model) => model instanceof InputModel;
 var isInterfaceModel = (model) => model instanceof InterfaceModel;
-var isCreatableModel = (model) => model.creatable && model.fields.some(isCreatableField);
-var isUpdatableModel = (model) => model.updatable && model.fields.some(isUpdatableField);
+var isCreatableModel = (model) => !!model.creatable && model.fields.some(isCreatableField);
+var isUpdatableModel = (model) => !!model.updatable && model.fields.some(isUpdatableField);
 var isCreatableField = (field) => !field.inherited && !!field.creatable;
 var isUpdatableField = (field) => !field.inherited && !!field.updatable;
 var modelNeedsTable = (model) => model.fields.some((field) => !field.inherited);
@@ -847,8 +847,8 @@ var isInTable = (field) => field.name === "id" || !field.inherited;
 var isToOneRelation = (field) => isRelation(field) && !!field.toOne;
 var isQueriableField = ({ queriable }) => queriable !== false;
 var isCustomField = (field) => field.kind === "custom";
-var isGenerateAsField = (field) => !!field.generateAs;
-var isStoredInDatabase = (field) => field.generateAs?.type !== "expression";
+var isDynamicField = (field) => !!field.generateAs || isCustomField(field);
+var isStoredInDatabase = (field) => !isCustomField(field) && field.generateAs?.type !== "expression";
 var isVisible = ({ hidden }) => hidden !== true;
 var isSimpleField = and(not(isRelation), not(isCustomField));
 var isUpdatable = ({ updatable }) => !!updatable;
@@ -1072,12 +1072,12 @@ var generateDBModels = (models, dateLibrary) => {
   for (const model of models.entities) {
     const fields2 = model.relations.some((relation) => relation.field.foreignKey === "id") ? model.fields.filter((field) => field.name !== "id") : model.fields;
     writer.write(`export type ${model.name} = `).inlineBlock(() => {
-      for (const field of fields2.filter(not(isCustomField)).filter(isStoredInDatabase)) {
+      for (const field of fields2.filter(isStoredInDatabase)) {
         writer.write(`'${getColumnName(field)}': ${getFieldType(field, dateLibrary)}${field.nonNull ? "" : " | null"};`).newLine();
       }
     }).blankLine();
     writer.write(`export type ${model.name}Initializer = `).inlineBlock(() => {
-      for (const field of fields2.filter(not(isCustomField)).filter(isInTable).filter(not(isGenerateAsField))) {
+      for (const field of fields2.filter(and(isInTable, not(isDynamicField)))) {
         writer.write(
           `'${getColumnName(field)}'${field.nonNull && field.defaultValue === void 0 ? "" : "?"}: ${getFieldType(
             field,
@@ -1088,7 +1088,7 @@ var generateDBModels = (models, dateLibrary) => {
       }
     }).blankLine();
     writer.write(`export type ${model.name}Mutator = `).inlineBlock(() => {
-      for (const field of fields2.filter(not(isCustomField)).filter(isInTable).filter(not(isGenerateAsField))) {
+      for (const field of fields2.filter(and(isInTable, not(isDynamicField)))) {
         writer.write(
           `'${getColumnName(field)}'?: ${getFieldType(field, dateLibrary, true)}${field.list ? " | string" : ""}${field.nonNull ? "" : " | null"};`
         ).newLine();
@@ -1096,7 +1096,7 @@ var generateDBModels = (models, dateLibrary) => {
     }).blankLine();
     if (!isRootModel(model)) {
       writer.write(`export type ${model.name}Seed = `).inlineBlock(() => {
-        for (const field of fields2.filter(not(isCustomField)).filter(not(isGenerateAsField))) {
+        for (const field of fields2.filter(not(isDynamicField))) {
           if (model.parent && field.name === "type") {
             continue;
           }
@@ -1157,6 +1157,75 @@ var generateKnexTables = (models) => {
   return writer.toString();
 };
 
+// src/migrations/generate-functions.ts
+var generateFunctionsFromDatabase = async (knex) => {
+  const regularFunctions = await knex.raw(`
+    SELECT 
+      pg_get_functiondef(p.oid) as definition
+    FROM pg_proc p
+    JOIN pg_namespace n ON p.pronamespace = n.oid
+    WHERE n.nspname = 'public'
+    AND NOT EXISTS (SELECT 1 FROM pg_aggregate a WHERE a.aggfnoid = p.oid)
+    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
+  `);
+  const aggregateFunctions = await knex.raw(`
+    SELECT 
+      p.proname as name,
+      pg_get_function_identity_arguments(p.oid) as arguments,
+      a.aggtransfn::regproc::text as trans_func,
+      a.aggfinalfn::regproc::text as final_func,
+      a.agginitval as init_val,
+      pg_catalog.format_type(a.aggtranstype, NULL) as state_type
+    FROM pg_proc p
+    JOIN pg_aggregate a ON p.oid = a.aggfnoid
+    JOIN pg_namespace n ON p.pronamespace = n.oid
+    WHERE n.nspname = 'public'
+    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
+  `);
+  const functions = [];
+  for (const row of regularFunctions.rows || []) {
+    if (row.definition) {
+      functions.push(row.definition.trim());
+    }
+  }
+  for (const row of aggregateFunctions.rows || []) {
+    const name2 = row.name || "";
+    const argumentsStr = row.arguments || "";
+    const transFunc = row.trans_func || "";
+    const finalFunc = row.final_func || "";
+    const initVal = row.init_val;
+    const stateType = row.state_type || "";
+    if (!name2 || !transFunc || !stateType) {
+      continue;
+    }
+    let aggregateDef = `CREATE AGGREGATE ${name2}(${argumentsStr}) (
+`;
+    aggregateDef += `  SFUNC = ${transFunc},
+`;
+    aggregateDef += `  STYPE = ${stateType}`;
+    if (finalFunc) {
+      aggregateDef += `,
+  FINALFUNC = ${finalFunc}`;
+    }
+    if (initVal !== null && initVal !== void 0) {
+      const initValStr = typeof initVal === "string" ? `'${initVal}'` : String(initVal);
+      aggregateDef += `,
+  INITCOND = ${initValStr}`;
+    }
+    aggregateDef += "\n);";
+    functions.push(aggregateDef);
+  }
+  if (functions.length === 0) {
+    return `export const functions: string[] = [];
+`;
+  }
+  const functionsArrayString = functions.map((func) => `  ${JSON.stringify(func)}`).join(",\n");
+  return `export const functions: string[] = [
+${functionsArrayString},
+];
+`;
+};
+
 // src/migrations/generate.ts
 var import_code_block_writer2 = __toESM(require("code-block-writer"), 1);
 var import_knex_schema_inspector = require("knex-schema-inspector");
@@ -1790,7 +1859,7 @@ var checkCanWrite = async (ctx, model, data, action) => {
   }
   const query = ctx.knex.first();
   let linked = false;
-  for (const field of model.fields.filter(not(isGenerateAsField)).filter((field2) => field2.generated || (action === "CREATE" ? field2.creatable : field2.updatable))) {
+  for (const field of model.fields.filter(isStoredInDatabase).filter((field2) => field2.generated || (action === "CREATE" ? field2.creatable : field2.updatable))) {
     const fieldPermissions = field[action === "CREATE" ? "creatable" : "updatable"];
     const role2 = getRole(ctx);
     if (getColumnName(field) in data && fieldPermissions && typeof fieldPermissions === "object" && !fieldPermissions.roles?.includes(role2)) {
@@ -2302,7 +2371,7 @@ var createEntity = async (modelName, input2, ctx, trigger = "direct-call") => wi
   if (model.parent) {
     const rootInput = {};
     const childInput = { id };
-    for (const field of model.fields.filter(not(isGenerateAsField))) {
+    for (const field of model.fields.filter(not(isDynamicField))) {
       const columnName = field.kind === "relation" ? `${field.name}Id` : field.name;
       if (columnName in normalizedInput) {
         if (field.inherited) {
@@ -2316,7 +2385,7 @@ var createEntity = async (modelName, input2, ctx, trigger = "direct-call") => wi
     await ctx2.knex(model.name).insert(childInput);
   } else {
     const insertData = { ...normalizedInput };
-    for (const field of model.fields.filter(isGenerateAsField)) {
+    for (const field of model.fields.filter(isDynamicField)) {
       const columnName = field.kind === "relation" ? `${field.name}Id` : field.name;
       delete insertData[columnName];
     }
@@ -2682,7 +2751,7 @@ var createRevision = async (model, data, ctx) => {
       rootRevisionData.deleted = data.deleted || false;
     }
     const childRevisionData = { id: revisionId };
-    for (const field of model.fields.filter(({ updatable }) => updatable).filter(not(isGenerateAsField))) {
+    for (const field of model.fields.filter(and(isUpdatableField, not(isDynamicField)))) {
       const col = field.kind === "relation" ? `${field.name}Id` : field.name;
       let value2;
       if (field.nonNull && (!(col in data) || col === void 0 || col === null)) {
@@ -2746,7 +2815,7 @@ var doUpdate = async (model, currentEntity, update, ctx) => {
   if (model.parent) {
     const rootInput = {};
     const childInput = {};
-    for (const field of model.fields.filter(not(isGenerateAsField))) {
+    for (const field of model.fields.filter(not(isDynamicField))) {
       const columnName = field.kind === "relation" ? `${field.name}Id` : field.name;
       if (columnName in update) {
         if (field.inherited) {
@@ -2764,7 +2833,7 @@ var doUpdate = async (model, currentEntity, update, ctx) => {
     }
   } else {
     const updateData = { ...update };
-    for (const field of model.fields.filter(isGenerateAsField)) {
+    for (const field of model.fields.filter(isDynamicField)) {
       const columnName = field.kind === "relation" ? `${field.name}Id` : field.name;
       delete updateData[columnName];
     }
@@ -2792,10 +2861,10 @@ var getResolvers = (models) => {
     ])
   };
   const mutations = [
-    ...models.entities.filter(not(isRootModel)).filter(({ creatable }) => creatable).map((model) => ({
+    ...models.entities.filter(and(not(isRootModel), isCreatable)).map((model) => ({
       [`create${model.name}`]: mutationResolver
     })),
-    ...models.entities.filter(not(isRootModel)).filter(({ updatable }) => updatable).map((model) => ({
+    ...models.entities.filter(and(not(isRootModel), isUpdatable)).map((model) => ({
       [`update${model.name}`]: mutationResolver
     })),
     ...models.entities.filter(not(isRootModel)).filter(({ deletable }) => deletable).map((model) => ({
@@ -3231,7 +3300,7 @@ var MigrationGenerator = class {
                         writer.writeLine(`deleteRootType: row.deleteRootType,`);
                         writer.writeLine(`deleteRootId: row.deleteRootId,`);
                       }
-                      for (const { name: name2, kind } of model.fields.filter(isUpdatableField).filter(not(isGenerateAsField))) {
+                      for (const { name: name2, kind } of model.fields.filter(and(isUpdatableField, isStoredInDatabase))) {
                         const col = kind === "relation" ? `${name2}Id` : name2;
                         writer.writeLine(`${col}: row.${col},`);
                       }
@@ -3251,8 +3320,8 @@ var MigrationGenerator = class {
               up,
               down
             );
-            const missingRevisionFields = model.fields.filter(isUpdatableField).filter(not(isGenerateAsField)).filter(
-              ({ name: name2, ...field }) => field.kind !== "custom" && !this.getColumn(revisionTable, field.kind === "relation" ? field.foreignKey || `${name2}Id` : name2)
+            const missingRevisionFields = model.fields.filter(and(isUpdatableField, isStoredInDatabase)).filter(
+              ({ name: name2, ...field }) => !this.getColumn(revisionTable, field.kind === "relation" ? field.foreignKey || `${name2}Id` : name2)
             );
             this.createRevisionFields(model, missingRevisionFields, up, down);
             const revisionFieldsToRemove = model.fields.filter(
@@ -3410,7 +3479,7 @@ var MigrationGenerator = class {
       });
     });
     if (isUpdatableModel(model)) {
-      const updatableFields = fields2.filter(isUpdatableField).filter(not(isGenerateAsField));
+      const updatableFields = fields2.filter(and(isUpdatableField, isStoredInDatabase));
       if (!updatableFields.length) {
         return;
       }
@@ -3458,7 +3527,7 @@ var MigrationGenerator = class {
       });
     });
     if (isUpdatableModel(model)) {
-      const updatableFields = fields2.filter(isUpdatableField).filter(not(isGenerateAsField));
+      const updatableFields = fields2.filter(and(isUpdatableField, isStoredInDatabase));
       if (!updatableFields.length) {
         return;
       }
@@ -3496,7 +3565,7 @@ var MigrationGenerator = class {
           writer.writeLine(`table.uuid('deleteRootId');`);
         }
       }
-      for (const field of model.fields.filter(and(isUpdatableField, not(isInherited))).filter(not(isGenerateAsField))) {
+      for (const field of model.fields.filter(and(isUpdatableField, not(isInherited), isStoredInDatabase))) {
         this.column(field, { setUnique: false, setDefault: false });
       }
     });
@@ -3938,75 +4007,6 @@ var getMigrationDate = () => {
   return `${year}${month}${day}${hours}${minutes}${seconds}`;
 };
 
-// src/migrations/generate-functions.ts
-var generateFunctionsFromDatabase = async (knex) => {
-  const regularFunctions = await knex.raw(`
-    SELECT 
-      pg_get_functiondef(p.oid) as definition
-    FROM pg_proc p
-    JOIN pg_namespace n ON p.pronamespace = n.oid
-    WHERE n.nspname = 'public'
-    AND NOT EXISTS (SELECT 1 FROM pg_aggregate a WHERE a.aggfnoid = p.oid)
-    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
-  `);
-  const aggregateFunctions = await knex.raw(`
-    SELECT 
-      p.proname as name,
-      pg_get_function_identity_arguments(p.oid) as arguments,
-      a.aggtransfn::regproc::text as trans_func,
-      a.aggfinalfn::regproc::text as final_func,
-      a.agginitval as init_val,
-      pg_catalog.format_type(a.aggtranstype, NULL) as state_type
-    FROM pg_proc p
-    JOIN pg_aggregate a ON p.oid = a.aggfnoid
-    JOIN pg_namespace n ON p.pronamespace = n.oid
-    WHERE n.nspname = 'public'
-    ORDER BY p.proname, pg_get_function_identity_arguments(p.oid)
-  `);
-  const functions = [];
-  for (const row of regularFunctions.rows || []) {
-    if (row.definition) {
-      functions.push(row.definition.trim());
-    }
-  }
-  for (const row of aggregateFunctions.rows || []) {
-    const name2 = row.name || "";
-    const argumentsStr = row.arguments || "";
-    const transFunc = row.trans_func || "";
-    const finalFunc = row.final_func || "";
-    const initVal = row.init_val;
-    const stateType = row.state_type || "";
-    if (!name2 || !transFunc || !stateType) {
-      continue;
-    }
-    let aggregateDef = `CREATE AGGREGATE ${name2}(${argumentsStr}) (
-`;
-    aggregateDef += `  SFUNC = ${transFunc},
-`;
-    aggregateDef += `  STYPE = ${stateType}`;
-    if (finalFunc) {
-      aggregateDef += `,
-  FINALFUNC = ${finalFunc}`;
-    }
-    if (initVal !== null && initVal !== void 0) {
-      const initValStr = typeof initVal === "string" ? `'${initVal}'` : String(initVal);
-      aggregateDef += `,
-  INITCOND = ${initValStr}`;
-    }
-    aggregateDef += "\n);";
-    functions.push(aggregateDef);
-  }
-  if (functions.length === 0) {
-    return `export const functions: string[] = [];
-`;
-  }
-  const functionsArrayString = functions.map((func) => `  ${JSON.stringify(func)}`).join(",\n");
-  return `export const functions: string[] = [
-${functionsArrayString},
-];
-`;
-};
-
 // src/permissions/generate.ts
 var ACTIONS = ["READ", "CREATE", "UPDATE", "DELETE", "RESTORE", "LINK"];
 var generatePermissions = (models, config) => {
@@ -4364,7 +4364,7 @@ var generateDefinitions = ({
           types.push(
             input(
               `Create${model.name}`,
-              model.fields.filter(({ creatable }) => creatable).filter(not(isGenerateAsField)).map(
+              model.fields.filter(and(isCreatable, isStoredInDatabase)).map(
                 (field) => field.kind === "relation" ? { name: `${field.name}Id`, type: "ID", nonNull: field.nonNull } : {
                   name: field.name,
                   type: field.kind === "json" ? `Create${field.type}` : field.type,
@@ -4379,7 +4379,7 @@ var generateDefinitions = ({
           types.push(
             input(
               `Update${model.name}`,
-              model.fields.filter(({ updatable }) => updatable).filter(not(isGenerateAsField)).map(
+              model.fields.filter(and(isUpdatable, isStoredInDatabase)).map(
                 (field) => field.kind === "relation" ? { name: `${field.name}Id`, type: "ID" } : {
                   name: field.name,
                   type: field.kind === "json" ? `Update${field.type}` : field.type,
@@ -4631,12 +4631,12 @@ var printSchemaFromModels = (models) => printSchema((0, import_graphql6.buildAST
   isCreatableField,
   isCreatableModel,
   isCustomField,
+  isDynamicField,
   isEntityModel,
   isEnum,
   isEnumModel,
   isFieldNode,
   isFragmentSpreadNode,
-  isGenerateAsField,
   isInTable,
   isInherited,
   isInlineFragmentNode,