@smartive/graphql-magic 19.1.0 → 19.1.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
-# [19.1.0](https://github.com/smartive/graphql-magic/compare/v19.0.0...v19.1.0) (2025-06-04)
+## [19.1.1](https://github.com/smartive/graphql-magic/compare/v19.1.0...v19.1.1) (2025-06-04)
 
 
-### Features
+### Bug Fixes
 
-* Permissions Typing ([#303](https://github.com/smartive/graphql-magic/issues/303)) ([2be1899](https://github.com/smartive/graphql-magic/commit/2be189913e0fa91cadf805fd715e25c9351e13dd))
+* Move permission generation to bin ([#304](https://github.com/smartive/graphql-magic/issues/304)) ([e7368ec](https://github.com/smartive/graphql-magic/commit/e7368eca9a61a8b0000c37ef3e7563c83e65aba5))

package/dist/bin/gqm.cjs

@@ -1253,76 +1253,9 @@ var import_graphql3 = require("graphql");
 var import_isEqual = __toESM(require("lodash/isEqual"), 1);
 var getColumnName = (field) => field.kind === "relation" ? field.foreignKey || `${field.name}Id` : field.name;
 
-// src/permissions/generate-types.ts
-var import_ts_morph = require("ts-morph");
-
 // src/permissions/generate.ts
 var ACTIONS = ["READ", "CREATE", "UPDATE", "DELETE", "RESTORE", "LINK"];
 
-// src/permissions/generate-types.ts
-var generatePermissionTypes = (models) => {
-  const project = new import_ts_morph.Project({
-    manipulationSettings: {
-      indentationText: import_ts_morph.IndentationText.TwoSpaces
-    }
-  });
-  const sourceFile = project.createSourceFile("permissions.ts", "", {
-    overwrite: true
-  });
-  sourceFile.addStatements(`export type PermissionsConfig = Record<Role, PermissionsBlock>;`);
-  sourceFile.addStatements(
-    (writer) => writer.write(`export type PermissionsBlock = true | `).inlineBlock(() => {
-      writer.writeLine(`me?: UserPermissions,`);
-      for (const model of models.entities) {
-        writer.writeLine(`${model.name}?: ${model.name}Permissions,`);
-      }
-    })
-  );
-  const usedEnums = /* @__PURE__ */ new Set(["Role"]);
-  for (const model of models.entities) {
-    sourceFile.addStatements(
-      (writer) => writer.write(`export type ${model.name}Where = `).inlineBlock(() => {
-        for (const field of model.fields.filter((field2) => field2.filterable)) {
-          if (field.kind === "relation") {
-            writer.writeLine(`${field.name}?: ${field.type}Where,`);
-          } else if (!field.kind || field.kind === "primitive") {
-            writer.writeLine(`${field.name}?: ${PRIMITIVE_TYPES[field.type]} | ${PRIMITIVE_TYPES[field.type]}[],`);
-          } else {
-            if (field.kind === "enum") {
-              usedEnums.add(field.type);
-            }
-            writer.writeLine(`${field.name}?: ${field.type} | ${field.type}[],`);
-          }
-        }
-      })
-    );
-    sourceFile.addStatements(
-      (writer) => writer.write(`export type ${model.name}Permissions = `).inlineBlock(() => {
-        for (const action of ACTIONS) {
-          writer.writeLine(`${action}?: true,`);
-        }
-        writer.writeLine(`WHERE?: ${model.name}Where,`);
-        const relations = [...model.relations, ...model.reverseRelations];
-        if (relations.length > 0) {
-          writer.write(`RELATIONS?: `).inlineBlock(() => {
-            for (const relation of relations) {
-              writer.writeLine(`${relation.name}?: ${relation.targetModel.name}Permissions,`);
-            }
-          });
-        }
-      })
-    );
-  }
-  for (const name2 of usedEnums) {
-    sourceFile.addStatements(
-      (writer) => writer.write(
-        `type ${name2} = ${models.getModel(name2, "enum").values.map((v) => `'${v}'`).join(" | ")};`
-      )
-    );
-  }
-  return sourceFile.getFullText();
-};
-
 // src/resolvers/arguments.ts
 var import_graphql4 = require("graphql");
 
@@ -2070,14 +2003,14 @@ var generateGraphqlClientTypes = async () => {
 };
 
 // src/bin/gqm/parse-knexfile.ts
-var import_ts_morph5 = require("ts-morph");
+var import_ts_morph4 = require("ts-morph");
 
 // src/bin/gqm/static-eval.ts
 var import_lodash = require("lodash");
-var import_ts_morph3 = require("ts-morph");
+var import_ts_morph2 = require("ts-morph");
 
 // src/bin/gqm/visitor.ts
-var import_ts_morph2 = require("ts-morph");
+var import_ts_morph = require("ts-morph");
 var visit = (node, context, visitor) => {
   if (!node) {
     if (visitor.undefined) {
@@ -2097,7 +2030,7 @@ var visit = (node, context, visitor) => {
   console.error(node.getText());
   throw new Error(
     `Cannot handle kind ${get(
-      Object.entries(import_ts_morph2.SyntaxKind).find(([, val]) => val === kind),
+      Object.entries(import_ts_morph.SyntaxKind).find(([, val]) => val === kind),
       0
     )}`
   );
@@ -2133,11 +2066,11 @@ var KNOWN_IDENTIFIERS = {
 var staticEval = (node, context) => visit(node, context, VISITOR);
 var VISITOR = {
   undefined: () => void 0,
-  [import_ts_morph3.SyntaxKind.VariableDeclaration]: (node, context) => staticEval(node.getInitializer(), context),
-  [import_ts_morph3.SyntaxKind.ArrayLiteralExpression]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.VariableDeclaration]: (node, context) => staticEval(node.getInitializer(), context),
+  [import_ts_morph2.SyntaxKind.ArrayLiteralExpression]: (node, context) => {
     const values = [];
     for (const value2 of node.getElements()) {
-      if (value2.isKind(import_ts_morph3.SyntaxKind.SpreadElement)) {
+      if (value2.isKind(import_ts_morph2.SyntaxKind.SpreadElement)) {
         values.push(...staticEval(value2, context));
       } else {
         values.push(staticEval(value2, context));
@@ -2145,23 +2078,23 @@ var VISITOR = {
     }
     return values;
   },
-  [import_ts_morph3.SyntaxKind.ObjectLiteralExpression]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.ObjectLiteralExpression]: (node, context) => {
     const result = {};
     for (const property of node.getProperties()) {
       Object.assign(result, staticEval(property, context));
     }
     return result;
   },
-  [import_ts_morph3.SyntaxKind.StringLiteral]: (node) => node.getLiteralValue(),
-  [import_ts_morph3.SyntaxKind.PropertyAssignment]: (node, context) => ({
+  [import_ts_morph2.SyntaxKind.StringLiteral]: (node) => node.getLiteralValue(),
+  [import_ts_morph2.SyntaxKind.PropertyAssignment]: (node, context) => ({
     [node.getName()]: staticEval(node.getInitializer(), context)
   }),
-  [import_ts_morph3.SyntaxKind.ShorthandPropertyAssignment]: (node, context) => ({
+  [import_ts_morph2.SyntaxKind.ShorthandPropertyAssignment]: (node, context) => ({
     [node.getName()]: staticEval(node.getNameNode(), context)
   }),
-  [import_ts_morph3.SyntaxKind.SpreadElement]: (node, context) => staticEval(node.getExpression(), context),
-  [import_ts_morph3.SyntaxKind.SpreadAssignment]: (node, context) => staticEval(node.getExpression(), context),
-  [import_ts_morph3.SyntaxKind.Identifier]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.SpreadElement]: (node, context) => staticEval(node.getExpression(), context),
+  [import_ts_morph2.SyntaxKind.SpreadAssignment]: (node, context) => staticEval(node.getExpression(), context),
+  [import_ts_morph2.SyntaxKind.Identifier]: (node, context) => {
     const identifierName = node.getText();
     if (identifierName in KNOWN_IDENTIFIERS) {
       return KNOWN_IDENTIFIERS[identifierName];
@@ -2172,19 +2105,19 @@ var VISITOR = {
     }
     return staticEval(definitionNodes[0], context);
   },
-  [import_ts_morph3.SyntaxKind.ParenthesizedExpression]: (node, context) => staticEval(node.getExpression(), context),
-  [import_ts_morph3.SyntaxKind.AsExpression]: (node, context) => staticEval(node.getExpression(), context),
-  [import_ts_morph3.SyntaxKind.ConditionalExpression]: (node, context) => staticEval(node.getCondition(), context) ? staticEval(node.getWhenTrue(), context) : staticEval(node.getWhenFalse(), context),
-  [import_ts_morph3.SyntaxKind.TrueKeyword]: () => true,
-  [import_ts_morph3.SyntaxKind.FalseKeyword]: () => false,
-  [import_ts_morph3.SyntaxKind.NumericLiteral]: (node) => node.getLiteralValue(),
-  [import_ts_morph3.SyntaxKind.BigIntLiteral]: (node) => node.getLiteralValue(),
-  [import_ts_morph3.SyntaxKind.CallExpression]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.ParenthesizedExpression]: (node, context) => staticEval(node.getExpression(), context),
+  [import_ts_morph2.SyntaxKind.AsExpression]: (node, context) => staticEval(node.getExpression(), context),
+  [import_ts_morph2.SyntaxKind.ConditionalExpression]: (node, context) => staticEval(node.getCondition(), context) ? staticEval(node.getWhenTrue(), context) : staticEval(node.getWhenFalse(), context),
+  [import_ts_morph2.SyntaxKind.TrueKeyword]: () => true,
+  [import_ts_morph2.SyntaxKind.FalseKeyword]: () => false,
+  [import_ts_morph2.SyntaxKind.NumericLiteral]: (node) => node.getLiteralValue(),
+  [import_ts_morph2.SyntaxKind.BigIntLiteral]: (node) => node.getLiteralValue(),
+  [import_ts_morph2.SyntaxKind.CallExpression]: (node, context) => {
     const method = staticEval(node.getExpression(), context);
     const args2 = node.getArguments().map((arg) => staticEval(arg, context));
     return method(...args2);
   },
-  [import_ts_morph3.SyntaxKind.PropertyAccessExpression]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.PropertyAccessExpression]: (node, context) => {
     const target = staticEval(node.getExpression(), context);
     const property = target[node.getName()];
     if (typeof property === "function") {
@@ -2223,7 +2156,7 @@ var VISITOR = {
     }
     return property;
   },
-  [import_ts_morph3.SyntaxKind.ArrowFunction]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.ArrowFunction]: (node, context) => {
     return (...args2) => {
       const parameters = {};
       let i = 0;
@@ -2234,12 +2167,12 @@ var VISITOR = {
       return staticEval(node.getBody(), { ...context, ...parameters });
     };
   },
-  [import_ts_morph3.SyntaxKind.Block]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.Block]: (node, context) => {
     for (const statement of node.getStatements()) {
       return staticEval(statement, context);
     }
   },
-  [import_ts_morph3.SyntaxKind.CaseClause]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.CaseClause]: (node, context) => {
     const statements = node.getStatements();
     if (statements.length !== 1) {
       console.error(node.getText());
@@ -2247,7 +2180,7 @@ var VISITOR = {
     }
     return staticEval(statements[0], context);
   },
-  [import_ts_morph3.SyntaxKind.DefaultClause]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.DefaultClause]: (node, context) => {
     const statements = node.getStatements();
     if (statements.length !== 1) {
       console.error(node.getText());
@@ -2255,18 +2188,18 @@ var VISITOR = {
     }
     return staticEval(statements[0], context);
   },
-  [import_ts_morph3.SyntaxKind.ReturnStatement]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.ReturnStatement]: (node, context) => {
     return staticEval(node.getExpression(), context);
   },
-  [import_ts_morph3.SyntaxKind.SwitchStatement]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.SwitchStatement]: (node, context) => {
     const value2 = staticEval(node.getExpression(), context);
     let active = false;
     for (const clause of node.getCaseBlock().getClauses()) {
       switch (clause.getKind()) {
-        case import_ts_morph3.SyntaxKind.DefaultClause:
+        case import_ts_morph2.SyntaxKind.DefaultClause:
           return staticEval(clause, context);
-        case import_ts_morph3.SyntaxKind.CaseClause: {
-          const caseClause = clause.asKindOrThrow(import_ts_morph3.SyntaxKind.CaseClause);
+        case import_ts_morph2.SyntaxKind.CaseClause: {
+          const caseClause = clause.asKindOrThrow(import_ts_morph2.SyntaxKind.CaseClause);
           if (caseClause.getStatements().length && active) {
             return staticEval(clause, context);
           }
@@ -2281,15 +2214,15 @@ var VISITOR = {
       }
     }
   },
-  [import_ts_morph3.SyntaxKind.Parameter]: (node, context) => context[node.getName()],
-  [import_ts_morph3.SyntaxKind.BinaryExpression]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.Parameter]: (node, context) => context[node.getName()],
+  [import_ts_morph2.SyntaxKind.BinaryExpression]: (node, context) => {
     const mapping = {
-      [import_ts_morph3.SyntaxKind.EqualsEqualsEqualsToken]: (left, right) => left === right(),
-      [import_ts_morph3.SyntaxKind.ExclamationEqualsEqualsToken]: (left, right) => left !== right(),
-      [import_ts_morph3.SyntaxKind.BarBarToken]: (left, right) => left || right(),
-      [import_ts_morph3.SyntaxKind.AmpersandAmpersandToken]: (left, right) => left && right(),
-      [import_ts_morph3.SyntaxKind.EqualsEqualsToken]: (left, right) => left == right(),
-      [import_ts_morph3.SyntaxKind.ExclamationEqualsToken]: (left, right) => left != right()
+      [import_ts_morph2.SyntaxKind.EqualsEqualsEqualsToken]: (left, right) => left === right(),
+      [import_ts_morph2.SyntaxKind.ExclamationEqualsEqualsToken]: (left, right) => left !== right(),
+      [import_ts_morph2.SyntaxKind.BarBarToken]: (left, right) => left || right(),
+      [import_ts_morph2.SyntaxKind.AmpersandAmpersandToken]: (left, right) => left && right(),
+      [import_ts_morph2.SyntaxKind.EqualsEqualsToken]: (left, right) => left == right(),
+      [import_ts_morph2.SyntaxKind.ExclamationEqualsToken]: (left, right) => left != right()
     };
     if (node.getOperatorToken().getKind() in mapping) {
       return mapping[node.getOperatorToken().getKind()](
@@ -2299,40 +2232,40 @@ var VISITOR = {
     }
     throw new Error(`Cannot handle operator of kind ${node.getOperatorToken().getKindName()}`);
   },
-  [import_ts_morph3.SyntaxKind.SatisfiesExpression]: (node, context) => staticEval(node.getExpression(), context),
-  [import_ts_morph3.SyntaxKind.TemplateExpression]: (node, context) => node.getHead().getLiteralText() + node.getTemplateSpans().map((span) => staticEval(span.getExpression(), context) + staticEval(span.getLiteral(), context)).join(""),
-  [import_ts_morph3.SyntaxKind.TemplateTail]: (node) => node.getLiteralText(),
-  [import_ts_morph3.SyntaxKind.TemplateMiddle]: (node) => node.getLiteralText(),
-  [import_ts_morph3.SyntaxKind.PrefixUnaryExpression]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.SatisfiesExpression]: (node, context) => staticEval(node.getExpression(), context),
+  [import_ts_morph2.SyntaxKind.TemplateExpression]: (node, context) => node.getHead().getLiteralText() + node.getTemplateSpans().map((span) => staticEval(span.getExpression(), context) + staticEval(span.getLiteral(), context)).join(""),
+  [import_ts_morph2.SyntaxKind.TemplateTail]: (node) => node.getLiteralText(),
+  [import_ts_morph2.SyntaxKind.TemplateMiddle]: (node) => node.getLiteralText(),
+  [import_ts_morph2.SyntaxKind.PrefixUnaryExpression]: (node, context) => {
     switch (node.getOperatorToken()) {
-      case import_ts_morph3.SyntaxKind.PlusToken:
+      case import_ts_morph2.SyntaxKind.PlusToken:
         return +staticEval(node.getOperand(), context);
-      case import_ts_morph3.SyntaxKind.MinusToken:
+      case import_ts_morph2.SyntaxKind.MinusToken:
         return -staticEval(node.getOperand(), context);
-      case import_ts_morph3.SyntaxKind.TildeToken:
+      case import_ts_morph2.SyntaxKind.TildeToken:
         return ~staticEval(node.getOperand(), context);
-      case import_ts_morph3.SyntaxKind.ExclamationToken:
+      case import_ts_morph2.SyntaxKind.ExclamationToken:
         return !staticEval(node.getOperand(), context);
-      case import_ts_morph3.SyntaxKind.PlusPlusToken:
-      case import_ts_morph3.SyntaxKind.MinusMinusToken:
+      case import_ts_morph2.SyntaxKind.PlusPlusToken:
+      case import_ts_morph2.SyntaxKind.MinusMinusToken:
         throw new Error(`Cannot handle assignments.`);
     }
   },
-  [import_ts_morph3.SyntaxKind.ElementAccessExpression]: (node, context) => {
+  [import_ts_morph2.SyntaxKind.ElementAccessExpression]: (node, context) => {
     const target = staticEval(node.getExpression(), context);
     const argument = staticEval(node.getArgumentExpression(), context);
     return target[argument];
   },
-  [import_ts_morph3.SyntaxKind.NoSubstitutionTemplateLiteral]: (node) => node.getLiteralValue(),
-  [import_ts_morph3.SyntaxKind.NullKeyword]: () => null,
-  [import_ts_morph3.SyntaxKind.NewExpression]: (node, context) => new (staticEval(node.getExpression(), context))(...node.getArguments().map((arg) => staticEval(arg, context))),
-  [import_ts_morph3.SyntaxKind.TypeOfExpression]: (node, context) => typeof staticEval(node.getExpression(), context)
+  [import_ts_morph2.SyntaxKind.NoSubstitutionTemplateLiteral]: (node) => node.getLiteralValue(),
+  [import_ts_morph2.SyntaxKind.NullKeyword]: () => null,
+  [import_ts_morph2.SyntaxKind.NewExpression]: (node, context) => new (staticEval(node.getExpression(), context))(...node.getArguments().map((arg) => staticEval(arg, context))),
+  [import_ts_morph2.SyntaxKind.TypeOfExpression]: (node, context) => typeof staticEval(node.getExpression(), context)
 };
 
 // src/bin/gqm/utils.ts
-var import_ts_morph4 = require("ts-morph");
+var import_ts_morph3 = require("ts-morph");
 var findDeclarationInFile = (sourceFile, name2) => {
-  const syntaxList = sourceFile.getChildrenOfKind(import_ts_morph4.SyntaxKind.SyntaxList)[0];
+  const syntaxList = sourceFile.getChildrenOfKind(import_ts_morph3.SyntaxKind.SyntaxList)[0];
   if (!syntaxList) {
     throw new Error("No SyntaxList");
   }
@@ -2343,7 +2276,7 @@ var findDeclarationInFile = (sourceFile, name2) => {
   return declaration;
 };
 var findDeclaration = (syntaxList, name2) => {
-  for (const variableStatement of syntaxList.getChildrenOfKind(import_ts_morph4.SyntaxKind.VariableStatement)) {
+  for (const variableStatement of syntaxList.getChildrenOfKind(import_ts_morph3.SyntaxKind.VariableStatement)) {
     for (const declaration of variableStatement.getDeclarationList().getDeclarations()) {
       if (declaration.getName() === name2) {
         return declaration;
@@ -2354,9 +2287,9 @@ var findDeclaration = (syntaxList, name2) => {
 
 // src/bin/gqm/parse-knexfile.ts
 var parseKnexfile = async () => {
-  const project = new import_ts_morph5.Project({
+  const project = new import_ts_morph4.Project({
     manipulationSettings: {
-      indentationText: import_ts_morph5.IndentationText.TwoSpaces
+      indentationText: import_ts_morph4.IndentationText.TwoSpaces
     }
   });
   const knexfilePath = await getSetting("knexfilePath");
@@ -2368,11 +2301,11 @@ var parseKnexfile = async () => {
 };
 
 // src/bin/gqm/parse-models.ts
-var import_ts_morph6 = require("ts-morph");
+var import_ts_morph5 = require("ts-morph");
 var parseModels = async () => {
-  const project = new import_ts_morph6.Project({
+  const project = new import_ts_morph5.Project({
     manipulationSettings: {
-      indentationText: import_ts_morph6.IndentationText.TwoSpaces
+      indentationText: import_ts_morph5.IndentationText.TwoSpaces
     }
   });
   const modelsPath = await getSetting("modelsPath");
@@ -2384,6 +2317,71 @@ var parseModels = async () => {
   return models;
 };
 
+// src/bin/gqm/permissions.ts
+var import_ts_morph6 = require("ts-morph");
+var generatePermissionTypes = (models) => {
+  const project = new import_ts_morph6.Project({
+    manipulationSettings: {
+      indentationText: import_ts_morph6.IndentationText.TwoSpaces
+    }
+  });
+  const sourceFile = project.createSourceFile("permissions.ts", "", {
+    overwrite: true
+  });
+  sourceFile.addStatements(`export type PermissionsConfig = Record<Role, PermissionsBlock>;`);
+  sourceFile.addStatements(
+    (writer) => writer.write(`export type PermissionsBlock = true | `).inlineBlock(() => {
+      writer.writeLine(`me?: UserPermissions,`);
+      for (const model of models.entities) {
+        writer.writeLine(`${model.name}?: ${model.name}Permissions,`);
+      }
+    })
+  );
+  const usedEnums = /* @__PURE__ */ new Set(["Role"]);
+  for (const model of models.entities) {
+    sourceFile.addStatements(
+      (writer) => writer.write(`export type ${model.name}Where = `).inlineBlock(() => {
+        for (const field of model.fields.filter((field2) => field2.filterable)) {
+          if (field.kind === "relation") {
+            writer.writeLine(`${field.name}?: ${field.type}Where,`);
+          } else if (!field.kind || field.kind === "primitive") {
+            writer.writeLine(`${field.name}?: ${PRIMITIVE_TYPES[field.type]} | ${PRIMITIVE_TYPES[field.type]}[],`);
+          } else {
+            if (field.kind === "enum") {
+              usedEnums.add(field.type);
+            }
+            writer.writeLine(`${field.name}?: ${field.type} | ${field.type}[],`);
+          }
+        }
+      })
+    );
+    sourceFile.addStatements(
+      (writer) => writer.write(`export type ${model.name}Permissions = `).inlineBlock(() => {
+        for (const action of ACTIONS) {
+          writer.writeLine(`${action}?: true,`);
+        }
+        writer.writeLine(`WHERE?: ${model.name}Where,`);
+        const relations = [...model.relations, ...model.reverseRelations];
+        if (relations.length > 0) {
+          writer.write(`RELATIONS?: `).inlineBlock(() => {
+            for (const relation of relations) {
+              writer.writeLine(`${relation.name}?: ${relation.targetModel.name}Permissions,`);
+            }
+          });
+        }
+      })
+    );
+  }
+  for (const name2 of usedEnums) {
+    sourceFile.addStatements(
+      (writer) => writer.write(
+        `type ${name2} = ${models.getModel(name2, "enum").values.map((v) => `'${v}'`).join(" | ")};`
+      )
+    );
+  }
+  return sourceFile.getFullText();
+};
+
 // src/bin/gqm/gqm.ts
 (0, import_dotenv.config)({
   path: ".env"

package/dist/cjs/index.cjs

@@ -84,7 +84,6 @@ __export(index_exports, {
   generateDefinitions: () => generateDefinitions,
   generateKnexTables: () => generateKnexTables,
   generateMutations: () => generateMutations,
-  generatePermissionTypes: () => generatePermissionTypes,
   generatePermissions: () => generatePermissions,
   get: () => get,
   getActionableRelations: () => getActionableRelations,
@@ -1989,9 +1988,6 @@ var applyWhere = (model, query, alias, where, aliases) => {
   }
 };
 
-// src/permissions/generate-types.ts
-var import_ts_morph = require("ts-morph");
-
 // src/permissions/generate.ts
 var ACTIONS = ["READ", "CREATE", "UPDATE", "DELETE", "RESTORE", "LINK"];
 var generatePermissions = (models, config) => {
@@ -2073,70 +2069,6 @@ var addPermissions = (models, permissions, links, block) => {
   }
 };
 
-// src/permissions/generate-types.ts
-var generatePermissionTypes = (models) => {
-  const project = new import_ts_morph.Project({
-    manipulationSettings: {
-      indentationText: import_ts_morph.IndentationText.TwoSpaces
-    }
-  });
-  const sourceFile = project.createSourceFile("permissions.ts", "", {
-    overwrite: true
-  });
-  sourceFile.addStatements(`export type PermissionsConfig = Record<Role, PermissionsBlock>;`);
-  sourceFile.addStatements(
-    (writer) => writer.write(`export type PermissionsBlock = true | `).inlineBlock(() => {
-      writer.writeLine(`me?: UserPermissions,`);
-      for (const model of models.entities) {
-        writer.writeLine(`${model.name}?: ${model.name}Permissions,`);
-      }
-    })
-  );
-  const usedEnums = /* @__PURE__ */ new Set(["Role"]);
-  for (const model of models.entities) {
-    sourceFile.addStatements(
-      (writer) => writer.write(`export type ${model.name}Where = `).inlineBlock(() => {
-        for (const field of model.fields.filter((field2) => field2.filterable)) {
-          if (field.kind === "relation") {
-            writer.writeLine(`${field.name}?: ${field.type}Where,`);
-          } else if (!field.kind || field.kind === "primitive") {
-            writer.writeLine(`${field.name}?: ${PRIMITIVE_TYPES[field.type]} | ${PRIMITIVE_TYPES[field.type]}[],`);
-          } else {
-            if (field.kind === "enum") {
-              usedEnums.add(field.type);
-            }
-            writer.writeLine(`${field.name}?: ${field.type} | ${field.type}[],`);
-          }
-        }
-      })
-    );
-    sourceFile.addStatements(
-      (writer) => writer.write(`export type ${model.name}Permissions = `).inlineBlock(() => {
-        for (const action of ACTIONS) {
-          writer.writeLine(`${action}?: true,`);
-        }
-        writer.writeLine(`WHERE?: ${model.name}Where,`);
-        const relations = [...model.relations, ...model.reverseRelations];
-        if (relations.length > 0) {
-          writer.write(`RELATIONS?: `).inlineBlock(() => {
-            for (const relation of relations) {
-              writer.writeLine(`${relation.name}?: ${relation.targetModel.name}Permissions,`);
-            }
-          });
-        }
-      })
-    );
-  }
-  for (const name2 of usedEnums) {
-    sourceFile.addStatements(
-      (writer) => writer.write(
-        `type ${name2} = ${models.getModel(name2, "enum").values.map((v) => `'${v}'`).join(" | ")};`
-      )
-    );
-  }
-  return sourceFile.getFullText();
-};
-
 // src/resolvers/arguments.ts
 var import_graphql4 = require("graphql");
 function getRawValue(value2, values) {
@@ -3627,7 +3559,6 @@ var printSchemaFromModels = (models) => printSchema((0, import_graphql6.buildAST
   generateDefinitions,
   generateKnexTables,
   generateMutations,
-  generatePermissionTypes,
   generatePermissions,
   get,
   getActionableRelations,

package/dist/esm/permissions/index.d.ts

@@ -1,3 +1,2 @@
 export * from './check';
-export * from './generate-types';
 export * from './generate';

package/dist/esm/permissions/index.js

@@ -1,5 +1,4 @@
 // created from 'create-ts-index'
 export * from './check';
-export * from './generate-types';
 export * from './generate';
 //# sourceMappingURL=index.js.map

package/dist/esm/permissions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/permissions/index.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/permissions/index.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartive/graphql-magic",
-  "version": "19.1.0",
+  "version": "19.1.1",
   "description": "",
   "source": "src/index.ts",
   "type": "module",

package/src/bin/gqm/gqm.ts

@@ -12,11 +12,11 @@ import {
   getMigrationDate,
   printSchemaFromModels,
 } from '../..';
-import { generatePermissionTypes } from '../../permissions/generate-types';
 import { DateLibrary } from '../../utils/dates';
 import { generateGraphqlApiTypes, generateGraphqlClientTypes } from './codegen';
 import { parseKnexfile } from './parse-knexfile';
 import { parseModels } from './parse-models';
+import { generatePermissionTypes } from './permissions';
 import { readLine } from './readline';
 import { getSetting, writeToFile } from './settings';
 

package/src/{permissions/generate-types.ts → bin/gqm/permissions.ts}

@@ -1,7 +1,7 @@
 import { IndentationText, Project } from 'ts-morph';
-import { PRIMITIVE_TYPES } from '../db/generate';
-import { Models } from '../models';
-import { ACTIONS } from './generate';
+import { PRIMITIVE_TYPES } from '../../db/generate';
+import { Models } from '../../models';
+import { ACTIONS } from '../../permissions';
 
 export const generatePermissionTypes = (models: Models) => {
   const project = new Project({

package/src/permissions/index.ts

@@ -1,5 +1,4 @@
 // created from 'create-ts-index'
 
 export * from './check';
-export * from './generate-types';
 export * from './generate';

package/dist/esm/permissions/generate-types.d.ts

@@ -1,2 +0,0 @@
-import { Models } from '../models';
-export declare const generatePermissionTypes: (models: Models) => string;

package/dist/esm/permissions/generate-types.js

@@ -1,61 +0,0 @@
-import { IndentationText, Project } from 'ts-morph';
-import { PRIMITIVE_TYPES } from '../db/generate';
-import { ACTIONS } from './generate';
-export const generatePermissionTypes = (models) => {
-    const project = new Project({
-        manipulationSettings: {
-            indentationText: IndentationText.TwoSpaces,
-        },
-    });
-    const sourceFile = project.createSourceFile('permissions.ts', '', {
-        overwrite: true,
-    });
-    sourceFile.addStatements(`export type PermissionsConfig = Record<Role, PermissionsBlock>;`);
-    sourceFile.addStatements((writer) => writer.write(`export type PermissionsBlock = true | `).inlineBlock(() => {
-        writer.writeLine(`me?: UserPermissions,`);
-        for (const model of models.entities) {
-            writer.writeLine(`${model.name}?: ${model.name}Permissions,`);
-        }
-    }));
-    const usedEnums = new Set(['Role']);
-    for (const model of models.entities) {
-        sourceFile.addStatements((writer) => writer.write(`export type ${model.name}Where = `).inlineBlock(() => {
-            for (const field of model.fields.filter((field) => field.filterable)) {
-                if (field.kind === 'relation') {
-                    writer.writeLine(`${field.name}?: ${field.type}Where,`);
-                }
-                else if (!field.kind || field.kind === 'primitive') {
-                    writer.writeLine(`${field.name}?: ${PRIMITIVE_TYPES[field.type]} | ${PRIMITIVE_TYPES[field.type]}[],`);
-                }
-                else {
-                    if (field.kind === 'enum') {
-                        usedEnums.add(field.type);
-                    }
-                    writer.writeLine(`${field.name}?: ${field.type} | ${field.type}[],`);
-                }
-            }
-        }));
-        sourceFile.addStatements((writer) => writer.write(`export type ${model.name}Permissions = `).inlineBlock(() => {
-            for (const action of ACTIONS) {
-                writer.writeLine(`${action}?: true,`);
-            }
-            writer.writeLine(`WHERE?: ${model.name}Where,`);
-            const relations = [...model.relations, ...model.reverseRelations];
-            if (relations.length > 0) {
-                writer.write(`RELATIONS?: `).inlineBlock(() => {
-                    for (const relation of relations) {
-                        writer.writeLine(`${relation.name}?: ${relation.targetModel.name}Permissions,`);
-                    }
-                });
-            }
-        }));
-    }
-    for (const name of usedEnums) {
-        sourceFile.addStatements((writer) => writer.write(`type ${name} = ${models
-            .getModel(name, 'enum')
-            .values.map((v) => `'${v}'`)
-            .join(' | ')};`));
-    }
-    return sourceFile.getFullText();
-};
-//# sourceMappingURL=generate-types.js.map

package/dist/esm/permissions/generate-types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generate-types.js","sourceRoot":"","sources":["../../../src/permissions/generate-types.ts"],"names":[],"mappings":"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"}