@smartive/graphql-magic 8.1.3 → 9.1.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
-## [8.1.3](https://github.com/smartive/graphql-magic/compare/v8.1.2...v8.1.3) (2023-09-06)
+# [9.1.0](https://github.com/smartive/graphql-magic/compare/v9.0.0...v9.1.0) (2023-09-06)
 
 
-### Bug Fixes
+### Features
 
-* Merge resolvers ([#59](https://github.com/smartive/graphql-magic/issues/59)) ([6d0f0c1](https://github.com/smartive/graphql-magic/commit/6d0f0c1228eff0da992435b7aa6e7cf00d0c283f))
+* Use graphql queries path ([#61](https://github.com/smartive/graphql-magic/issues/61)) ([8c85002](https://github.com/smartive/graphql-magic/commit/8c850028673ced969a61e25b664fac9596586388))

package/dist/bin/gqm.cjs

@@ -893,15 +893,6 @@ var import_flatMap2 = __toESM(require("lodash/flatMap"), 1);
 
 // src/schema/utils.ts
 var import_luxon = require("luxon");
-
-// src/values.ts
-var Enum = class {
-  constructor(value2) {
-    this.value = value2;
-  }
-};
-
-// src/schema/utils.ts
 var document = (definitions) => ({
   kind: "Document",
   definitions
@@ -1007,9 +998,9 @@ var value = (val = null) => val === null ? {
 } : typeof val === "string" ? {
   kind: "StringValue",
   value: val
-} : val instanceof Enum ? {
+} : val instanceof Symbol ? {
   kind: "EnumValue",
-  value: val.value
+  value: val.description
 } : Array.isArray(val) ? {
   kind: "ListValue",
   values: val.map(value)
@@ -1288,41 +1279,6 @@ export const rawModels: RawModels = [
 
 export const models = getModels(rawModels);
 `;
-var GRAPHQL_CODEGEN = (path) => `
-overwrite: true
-schema: '${path}/schema.graphql'
-documents: null
-generates:
-  ${path}/api/index.ts:
-    plugins:
-      - 'typescript'
-      - 'typescript-resolvers'
-      - add:
-          content: "import { DateTime } from 'luxon'"
-config:
-  scalars:
-    DateTime: DateTime
-`;
-var CLIENT_CODEGEN = (path) => `
-schema: ${path}/schema.graphql
-documents: [ './src/**/*.ts', './src/**/*.tsx' ]
-generates:
-  ${path}/client/index.ts:
-    plugins:
-      - typescript
-      - typescript-operations
-      - typescript-compatibility
-
-config:
-  preResolveTypes: true # Simplifies the generated types
-  namingConvention: keep # Keeps naming as-is
-  nonOptionalTypename: true # Forces \`__typename\` on all selection sets
-  skipTypeNameForRoot: true # Don't generate __typename for root types
-  avoidOptionals: # Avoids optionals on the level of the field
-    field: true
-  scalars:
-    DateTime: string
-`;
 var KNEXFILE = `
 const config = {
   client: 'postgresql',
@@ -1355,8 +1311,13 @@ var DEFAULTS = {
       ensureFileExists(`${path}/db/.gitkeep`, "");
       ensureFileExists(`${path}/api/.gitkeep`, "");
       ensureFileExists(`${path}/client/.gitkeep`, "");
-      ensureFileExists(`graphql-codegen.yml`, GRAPHQL_CODEGEN(path));
-      ensureFileExists(`client-codegen.yml`, CLIENT_CODEGEN(path));
+    }
+  },
+  graphqlQueriesPath: {
+    question: "Where to look for graphql queries?",
+    defaultValue: "src/graphql/client/queries",
+    init: (path) => {
+      ensureDirectoryExists(path);
     }
   }
 };
@@ -1390,13 +1351,13 @@ var getSetting = async (name2) => {
   }
   return settings[name2];
 };
-var ensureDirectoryExists = (filePath) => {
-  const dir = (0, import_path.dirname)(filePath);
+var ensureDirectoryExists = (dir) => {
   if ((0, import_fs.existsSync)(dir)) {
     return true;
   }
   ensureDirectoryExists(dir);
   try {
+    console.info(`Creating directory ${dir}`);
     (0, import_fs.mkdirSync)(dir);
     return true;
   } catch (err) {
@@ -1409,12 +1370,12 @@ var ensureDirectoryExists = (filePath) => {
 var ensureFileExists = (filePath, content) => {
   if (!(0, import_fs.existsSync)(filePath)) {
     console.info(`Creating ${filePath}`);
-    ensureDirectoryExists(filePath);
+    ensureDirectoryExists((0, import_path.dirname)(filePath));
     (0, import_fs.writeFileSync)(filePath, content);
   }
 };
 var writeToFile = (filePath, content) => {
-  ensureDirectoryExists(filePath);
+  ensureDirectoryExists((0, import_path.dirname)(filePath));
   if ((0, import_fs.existsSync)(filePath)) {
     const currentContent = (0, import_fs.readFileSync)(filePath, "utf-8");
     if (content === currentContent) {
@@ -1434,7 +1395,7 @@ var generateGraphqlApiTypes = async () => {
   await (0, import_cli.generate)({
     overwrite: true,
     schema: `${generatedFolderPath}/schema.graphql`,
-    documents: null,
+    documents: void 0,
     generates: {
       [`${generatedFolderPath}/api/index.ts`]: {
         plugins: ["typescript", "typescript-resolvers", { add: { content: `import { DateTime } from 'luxon';` } }]
@@ -1449,9 +1410,10 @@ var generateGraphqlApiTypes = async () => {
 };
 var generateGraphqlClientTypes = async () => {
   const generatedFolderPath = await getSetting("generatedFolderPath");
+  const graphqlQueriesPath = await getSetting("graphqlQueriesPath");
   await (0, import_cli.generate)({
     schema: `${generatedFolderPath}/schema.graphql`,
-    documents: ["./src/**/*.ts", "./src/**/*.tsx"],
+    documents: [graphqlQueriesPath],
     generates: {
       [`${generatedFolderPath}/client/index.ts`]: {
         plugins: ["typescript", "typescript-operations", "typescript-compatibility"]
@@ -1485,16 +1447,23 @@ var import_ts_morph2 = require("ts-morph");
 
 // src/bin/gqm/visitor.ts
 var import_ts_morph = require("ts-morph");
-var visit = (node, context, visitor2) => {
-  const kind = node?.getKind();
-  if (kind in visitor2) {
-    return visitor2[kind](node.asKindOrThrow(kind), context);
+var visit = (node, context, visitor) => {
+  if (!node) {
+    if (visitor.undefined) {
+      return visitor.undefined();
+    }
+    console.trace();
+    throw new Error(`Cannot handle undefined node.`);
+  }
+  const kind = node.getKind();
+  const func = visitor[kind];
+  if (func) {
+    return func(node, context);
   }
-  if ("unknown" in visitor2) {
-    return visitor2.unknown(node);
+  if (visitor.unknown) {
+    return visitor.unknown(node);
   }
   console.error(node.getText());
-  console.error(node.getParent().getText());
   throw new Error(
     `Cannot handle kind ${get(
       Object.entries(import_ts_morph.SyntaxKind).find(([, val]) => val === kind),
@@ -1504,8 +1473,8 @@ var visit = (node, context, visitor2) => {
 };
 
 // src/bin/gqm/static-eval.ts
-var staticEval = (node, context) => visit(node, context, visitor);
-var visitor = {
+var staticEval = (node, context) => visit(node, context, VISITOR);
+var VISITOR = {
   undefined: () => void 0,
   [import_ts_morph2.SyntaxKind.VariableDeclaration]: (node, context) => staticEval(node.getInitializer(), context),
   [import_ts_morph2.SyntaxKind.ArrayLiteralExpression]: (node, context) => {
@@ -1541,6 +1510,8 @@ var visitor = {
         return void 0;
       case "process":
         return process;
+      case "Symbol":
+        return Symbol;
     }
     const definitionNodes = node.getDefinitionNodes();
     if (!definitionNodes.length) {
@@ -1554,6 +1525,7 @@ var visitor = {
   [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));
@@ -1679,7 +1651,8 @@ var visitor = {
     const argument = staticEval(node.getArgumentExpression(), context);
     return target[argument];
   },
-  [import_ts_morph2.SyntaxKind.NoSubstitutionTemplateLiteral]: (node) => node.getLiteralValue()
+  [import_ts_morph2.SyntaxKind.NoSubstitutionTemplateLiteral]: (node) => node.getLiteralValue(),
+  [import_ts_morph2.SyntaxKind.NullKeyword]: () => null
 };
 
 // src/bin/gqm/utils.ts

package/dist/cjs/index.cjs

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   AliasGenerator: () => AliasGenerator,
-  Enum: () => Enum,
   ForbiddenError: () => ForbiddenError,
   GraphQLError: () => GraphQLError,
   ID_ALIAS: () => ID_ALIAS,
@@ -2374,15 +2373,6 @@ var import_flatMap2 = __toESM(require("lodash/flatMap"), 1);
 
 // src/schema/utils.ts
 var import_luxon = require("luxon");
-
-// src/values.ts
-var Enum = class {
-  constructor(value2) {
-    this.value = value2;
-  }
-};
-
-// src/schema/utils.ts
 var document = (definitions) => ({
   kind: "Document",
   definitions
@@ -2509,9 +2499,9 @@ var value = (val = null) => val === null ? {
 } : typeof val === "string" ? {
   kind: "StringValue",
   value: val
-} : val instanceof Enum ? {
+} : val instanceof Symbol ? {
   kind: "EnumValue",
-  value: val.value
+  value: val.description
 } : Array.isArray(val) ? {
   kind: "ListValue",
   values: val.map(value)
@@ -2757,7 +2747,6 @@ var printSchemaFromModels = (models) => printSchema((0, import_graphql5.buildAST
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AliasGenerator,
-  Enum,
   ForbiddenError,
   GraphQLError,
   ID_ALIAS,

package/dist/esm/schema/utils.js

@@ -1,5 +1,4 @@
 import { DateTime } from 'luxon';
-import { Enum } from '../values';
 export const document = (definitions) => ({
     kind: 'Document',
     definitions,
@@ -124,10 +123,10 @@ export const value = (val = null) => val === null
                     kind: 'StringValue',
                     value: val,
                 }
-                : val instanceof Enum
+                : val instanceof Symbol
                     ? {
                         kind: 'EnumValue',
-                        value: val.value,
+                        value: val.description,
                     }
                     : Array.isArray(val)
                         ? {

package/dist/esm/schema/utils.js.map

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

package/dist/esm/values.d.ts

@@ -1,8 +1,4 @@
 import { DateTime } from 'luxon';
-export declare class Enum {
-    value: string;
-    constructor(value: string);
-}
 export type BasicValue = undefined | null | boolean | string | number | DateTime;
 export type Value = any;
 export type Values = {

package/dist/esm/values.js

@@ -1,7 +1,2 @@
-export class Enum {
-    value;
-    constructor(value) {
-        this.value = value;
-    }
-}
+export {};
 //# sourceMappingURL=values.js.map

package/dist/esm/values.js.map

@@ -1 +1 @@
-{"version":3,"file":"values.js","sourceRoot":"","sources":["../../src/values.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,IAAI;IACI;IAAnB,YAAmB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;CACrC"}
+{"version":3,"file":"values.js","sourceRoot":"","sources":["../../src/values.ts"],"names":[],"mappings":""}

package/package.json

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

package/src/bin/gqm/codegen.ts

@@ -6,7 +6,7 @@ export const generateGraphqlApiTypes = async () => {
   await generate({
     overwrite: true,
     schema: `${generatedFolderPath}/schema.graphql`,
-    documents: null,
+    documents: undefined,
     generates: {
       [`${generatedFolderPath}/api/index.ts`]: {
         plugins: ['typescript', 'typescript-resolvers', { add: { content: `import { DateTime } from 'luxon';` } }],
@@ -22,9 +22,10 @@ export const generateGraphqlApiTypes = async () => {
 
 export const generateGraphqlClientTypes = async () => {
   const generatedFolderPath = await getSetting('generatedFolderPath');
+  const graphqlQueriesPath = await getSetting('graphqlQueriesPath');
   await generate({
     schema: `${generatedFolderPath}/schema.graphql`,
-    documents: ['./src/**/*.ts', './src/**/*.tsx'],
+    documents: [graphqlQueriesPath],
     generates: {
       [`${generatedFolderPath}/client/index.ts`]: {
         plugins: ['typescript', 'typescript-operations', 'typescript-compatibility'],

package/src/bin/gqm/settings.ts

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { dirname } from 'path';
 import { readLine } from './readline';
-import { CLIENT_CODEGEN, EMPTY_MODELS, GRAPHQL_CODEGEN } from './templates';
+import { EMPTY_MODELS } from './templates';
 
 const SETTINGS_PATH = '.gqmrc.json';
 
@@ -21,15 +21,19 @@ const DEFAULTS = {
       ensureFileExists(`${path}/db/.gitkeep`, '');
       ensureFileExists(`${path}/api/.gitkeep`, '');
       ensureFileExists(`${path}/client/.gitkeep`, '');
-      ensureFileExists(`graphql-codegen.yml`, GRAPHQL_CODEGEN(path));
-      ensureFileExists(`client-codegen.yml`, CLIENT_CODEGEN(path));
+    },
+  },
+  graphqlQueriesPath: {
+    question: 'Where to look for graphql queries?',
+    defaultValue: 'src/graphql/client/queries',
+    init: (path: string) => {
+      ensureDirectoryExists(path);
     },
   },
 };
 
 type Settings = {
-  modelsPath: string;
-  generatedFolderPath: string;
+  [key in keyof typeof DEFAULTS]: string;
 };
 
 const initSetting = async (name: string) => {
@@ -67,9 +71,7 @@ export const getSetting = async (name: keyof Settings): Promise<string> => {
   return settings[name];
 };
 
-const ensureDirectoryExists = (filePath: string) => {
-  const dir = dirname(filePath);
-
+const ensureDirectoryExists = (dir: string) => {
   if (existsSync(dir)) {
     return true;
   }
@@ -77,6 +79,7 @@ const ensureDirectoryExists = (filePath: string) => {
   ensureDirectoryExists(dir);
 
   try {
+    console.info(`Creating directory ${dir}`);
     mkdirSync(dir);
     return true;
   } catch (err) {
@@ -90,13 +93,13 @@ const ensureDirectoryExists = (filePath: string) => {
 export const ensureFileExists = (filePath: string, content: string) => {
   if (!existsSync(filePath)) {
     console.info(`Creating ${filePath}`);
-    ensureDirectoryExists(filePath);
+    ensureDirectoryExists(dirname(filePath));
     writeFileSync(filePath, content);
   }
 };
 
 export const writeToFile = (filePath: string, content: string) => {
-  ensureDirectoryExists(filePath);
+  ensureDirectoryExists(dirname(filePath));
   if (existsSync(filePath)) {
     const currentContent = readFileSync(filePath, 'utf-8');
     if (content === currentContent) {

package/src/bin/gqm/static-eval.ts

@@ -13,10 +13,10 @@ import {
 } from 'ts-morph';
 import { Visitor, visit } from './visitor';
 
-export const staticEval = (node: Node, context: Dictionary<unknown>) =>
-  visit<unknown, Dictionary<unknown>>(node, context, visitor);
+export const staticEval = (node: Node | undefined, context: Dictionary<unknown>) =>
+  visit<unknown, Dictionary<unknown>>(node, context, VISITOR);
 
-const visitor: Visitor<unknown, Dictionary<unknown>> = {
+const VISITOR: Visitor<unknown, Dictionary<unknown>> = {
   undefined: () => undefined,
   [SyntaxKind.VariableDeclaration]: (node, context) => staticEval(node.getInitializer(), context),
   [SyntaxKind.ArrayLiteralExpression]: (node, context) => {
@@ -52,6 +52,8 @@ const visitor: Visitor<unknown, Dictionary<unknown>> = {
         return undefined;
       case 'process':
         return process;
+      case 'Symbol':
+        return Symbol;
     }
     const definitionNodes = node.getDefinitionNodes();
     if (!definitionNodes.length) {
@@ -68,6 +70,7 @@ const visitor: Visitor<unknown, Dictionary<unknown>> = {
   [SyntaxKind.TrueKeyword]: () => true,
   [SyntaxKind.FalseKeyword]: () => false,
   [SyntaxKind.NumericLiteral]: (node) => node.getLiteralValue(),
+  [SyntaxKind.BigIntLiteral]: (node) => node.getLiteralValue(),
   [SyntaxKind.CallExpression]: (node, context) => {
     const method = staticEval(node.getExpression(), context) as (...args: unknown[]) => unknown;
     const args = node.getArguments().map((arg) => staticEval(arg, context));
@@ -200,4 +203,5 @@ const visitor: Visitor<unknown, Dictionary<unknown>> = {
     return target[argument];
   },
   [SyntaxKind.NoSubstitutionTemplateLiteral]: (node) => node.getLiteralValue(),
+  [SyntaxKind.NullKeyword]: () => null,
 };

package/src/bin/gqm/templates.ts

@@ -12,43 +12,6 @@ export const rawModels: RawModels = [
 export const models = getModels(rawModels);
 `;
 
-export const GRAPHQL_CODEGEN = (path: string) => `
-overwrite: true
-schema: '${path}/schema.graphql'
-documents: null
-generates:
-  ${path}/api/index.ts:
-    plugins:
-      - 'typescript'
-      - 'typescript-resolvers'
-      - add:
-          content: "import { DateTime } from 'luxon'"
-config:
-  scalars:
-    DateTime: DateTime
-`;
-
-export const CLIENT_CODEGEN = (path: string) => `
-schema: ${path}/schema.graphql
-documents: [ './src/**/*.ts', './src/**/*.tsx' ]
-generates:
-  ${path}/client/index.ts:
-    plugins:
-      - typescript
-      - typescript-operations
-      - typescript-compatibility
-
-config:
-  preResolveTypes: true # Simplifies the generated types
-  namingConvention: keep # Keeps naming as-is
-  nonOptionalTypename: true # Forces \`__typename\` on all selection sets
-  skipTypeNameForRoot: true # Don't generate __typename for root types
-  avoidOptionals: # Avoids optionals on the level of the field
-    field: true
-  scalars:
-    DateTime: string
-`;
-
 export const KNEXFILE = `
 const config = {
   client: 'postgresql',

package/src/bin/gqm/visitor.ts

@@ -1,25 +1,33 @@
-import { KindToNodeMappings, Node, SyntaxKind } from 'ts-morph';
+import { ImplementedKindToNodeMappings, Node, SyntaxKind } from 'ts-morph';
 import { get } from '../..';
 
 export type Visitor<T, C> = {
   undefined?: () => T;
   unknown?: (node: Node) => T;
 } & {
-  [kind in keyof KindToNodeMappings]?: (node: KindToNodeMappings[kind], context: C) => T;
+  [kind in keyof ImplementedKindToNodeMappings]?: (node: ImplementedKindToNodeMappings[kind], context: C) => T;
 };
 
 export const visit = <T, C>(node: Node | undefined, context: C, visitor: Visitor<T, C>) => {
-  const kind: undefined | keyof KindToNodeMappings = node?.getKind();
-  if (kind in visitor) {
-    return visitor[kind](node.asKindOrThrow(kind), context);
+  if (!node) {
+    if (visitor.undefined) {
+      return visitor.undefined();
+    }
+    console.trace();
+    throw new Error(`Cannot handle undefined node.`);
   }
 
-  if ('unknown' in visitor) {
+  const kind = node.getKind();
+  const func = visitor[kind];
+  if (func) {
+    return func(node, context);
+  }
+
+  if (visitor.unknown) {
     return visitor.unknown(node);
   }
 
   console.error(node.getText());
-  console.error(node.getParent().getText());
   throw new Error(
     `Cannot handle kind ${get(
       Object.entries(SyntaxKind).find(([, val]) => val === kind),

package/src/schema/utils.ts

@@ -22,7 +22,7 @@ import {
   ValueNode,
 } from 'graphql';
 import { DateTime } from 'luxon';
-import { Directive, Enum, Value, Values } from '../values';
+import { Directive, Value, Values } from '../values';
 
 export type Field = {
   name: string;
@@ -206,10 +206,10 @@ export const value = (val: Value = null): ValueNode =>
         kind: 'StringValue',
         value: val,
       }
-    : val instanceof Enum
+    : val instanceof Symbol
     ? {
         kind: 'EnumValue',
-        value: val.value,
+        value: val.description,
       }
     : Array.isArray(val)
     ? {

package/src/values.ts

@@ -1,12 +1,8 @@
 import { DateTime } from 'luxon';
 
-export class Enum {
-  constructor(public value: string) {}
-}
-
 export type BasicValue = undefined | null | boolean | string | number | DateTime;
 
-export type Value = any; // BasicValue | Enum | Enum[] | Record<string, Value> | Value[];
+export type Value = any; // BasicValue | Symbol | Symbol[] | Record<string, Value> | Value[];
 
 export type Values = {
   name: string;