@graphql-codegen/cli 2.7.0 → 2.7.1-alpha-223b75f49.0

package/esm/utils/watcher.js

@@ -0,0 +1,135 @@
+import { executeCodegen } from '../codegen.js';
+import { normalizeInstanceOrArray, normalizeOutputParam } from '@graphql-codegen/plugin-helpers';
+import isGlob from 'is-glob';
+import debounce from 'debounce';
+import logSymbols from 'log-symbols';
+import { debugLog } from './debugging.js';
+import { getLogger } from './logger.js';
+import { join } from 'path';
+import { lifecycleHooks } from '../hooks.js';
+import { loadContext } from '../config.js';
+import { isValidPath } from '@graphql-tools/utils';
+function log(msg) {
+    // double spaces to inline the message with Listr
+    getLogger().info(`  ${msg}`);
+}
+function emitWatching() {
+    log(`${logSymbols.info} Watching for changes...`);
+}
+export const createWatcher = (initalContext, onNext) => {
+    debugLog(`[Watcher] Starting watcher...`);
+    let config = initalContext.getConfig();
+    const files = [initalContext.filepath].filter(a => a);
+    const documents = normalizeInstanceOrArray(config.documents);
+    const schemas = normalizeInstanceOrArray(config.schema);
+    // Add schemas and documents from "generates"
+    Object.keys(config.generates)
+        .map(filename => normalizeOutputParam(config.generates[filename]))
+        .forEach(conf => {
+        schemas.push(...normalizeInstanceOrArray(conf.schema));
+        documents.push(...normalizeInstanceOrArray(conf.documents));
+    });
+    if (documents) {
+        documents.forEach(doc => {
+            if (typeof doc === 'string') {
+                files.push(doc);
+            }
+            else {
+                files.push(...Object.keys(doc));
+            }
+        });
+    }
+    schemas.forEach((schema) => {
+        if (isGlob(schema) || isValidPath(schema)) {
+            files.push(schema);
+        }
+    });
+    if (typeof config.watch !== 'boolean') {
+        files.push(...normalizeInstanceOrArray(config.watch));
+    }
+    let watcher;
+    const runWatcher = async () => {
+        var _a, _b;
+        const chokidar = await import('chokidar');
+        let isShutdown = false;
+        const debouncedExec = debounce(() => {
+            if (!isShutdown) {
+                executeCodegen(initalContext)
+                    .then(onNext, () => Promise.resolve())
+                    .then(() => emitWatching());
+            }
+        }, 100);
+        emitWatching();
+        const ignored = [];
+        Object.keys(config.generates)
+            .map(filename => ({ filename, config: normalizeOutputParam(config.generates[filename]) }))
+            .forEach(entry => {
+            if (entry.config.preset) {
+                const extension = entry.config.presetConfig && entry.config.presetConfig.extension;
+                if (extension) {
+                    ignored.push(join(entry.filename, '**', '*' + extension));
+                }
+            }
+            else {
+                ignored.push(entry.filename);
+            }
+        });
+        watcher = chokidar.watch(files, {
+            persistent: true,
+            ignoreInitial: true,
+            followSymlinks: true,
+            cwd: process.cwd(),
+            disableGlobbing: false,
+            usePolling: (_a = config.watchConfig) === null || _a === void 0 ? void 0 : _a.usePolling,
+            interval: (_b = config.watchConfig) === null || _b === void 0 ? void 0 : _b.interval,
+            depth: 99,
+            awaitWriteFinish: true,
+            ignorePermissionErrors: false,
+            atomic: true,
+            ignored,
+        });
+        debugLog(`[Watcher] Started`);
+        const shutdown = () => {
+            isShutdown = true;
+            debugLog(`[Watcher] Shutting down`);
+            log(`Shutting down watch...`);
+            watcher.close();
+            lifecycleHooks(config.hooks).beforeDone();
+        };
+        // it doesn't matter what has changed, need to run whole process anyway
+        watcher.on('all', async (eventName, path) => {
+            lifecycleHooks(config.hooks).onWatchTriggered(eventName, path);
+            debugLog(`[Watcher] triggered due to a file ${eventName} event: ${path}`);
+            const fullPath = join(process.cwd(), path);
+            // In ESM require is not defined
+            try {
+                delete require.cache[fullPath];
+            }
+            catch (err) { }
+            if (eventName === 'change' && config.configFilePath && fullPath === config.configFilePath) {
+                log(`${logSymbols.info} Config file has changed, reloading...`);
+                const context = await loadContext(config.configFilePath);
+                const newParsedConfig = context.getConfig();
+                newParsedConfig.watch = config.watch;
+                newParsedConfig.silent = config.silent;
+                newParsedConfig.overwrite = config.overwrite;
+                newParsedConfig.configFilePath = config.configFilePath;
+                config = newParsedConfig;
+                initalContext.updateConfig(config);
+            }
+            debouncedExec();
+        });
+        process.once('SIGINT', shutdown);
+        process.once('SIGTERM', shutdown);
+    };
+    // the promise never resolves to keep process running
+    return new Promise((resolve, reject) => {
+        executeCodegen(initalContext)
+            .then(onNext, () => Promise.resolve())
+            .then(runWatcher)
+            .catch(err => {
+            watcher.close();
+            reject(err);
+        });
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "2.7.0",
+  "version": "2.7.1-alpha-223b75f49.0",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
@@ -8,35 +8,31 @@
     "@graphql-codegen/core": "2.5.1",
     "@graphql-codegen/plugin-helpers": "^2.4.1",
     "@graphql-tools/apollo-engine-loader": "^7.3.1",
-    "@graphql-tools/code-file-loader": "^7.0.6",
-    "@graphql-tools/git-loader": "^7.0.5",
-    "@graphql-tools/github-loader": "^7.0.5",
-    "@graphql-tools/graphql-file-loader": "^7.0.5",
-    "@graphql-tools/json-file-loader": "^7.1.2",
-    "@graphql-tools/load": "^7.3.0",
+    "@graphql-tools/code-file-loader": "^7.3.0",
+    "@graphql-tools/git-loader": "^7.2.0",
+    "@graphql-tools/github-loader": "^7.3.1",
+    "@graphql-tools/graphql-file-loader": "^7.4.0",
+    "@graphql-tools/json-file-loader": "^7.4.0",
+    "@graphql-tools/load": "^7.7.0",
     "@graphql-tools/prisma-loader": "^7.2.2",
     "@graphql-tools/url-loader": "^7.12.1",
-    "@graphql-tools/utils": "^8.1.1",
+    "@graphql-tools/utils": "^8.8.0",
     "ansi-escapes": "^4.3.1",
     "chalk": "^4.1.0",
-    "change-case-all": "1.0.14",
     "chokidar": "^3.5.2",
-    "common-tags": "^1.8.0",
     "cosmiconfig": "^7.0.0",
     "debounce": "^1.2.0",
     "detect-indent": "^6.0.0",
-    "graphql-config": "^4.1.0",
+    "graphql-config": "^4.3.1",
     "inquirer": "^8.0.0",
     "is-glob": "^4.0.1",
     "json-to-pretty-yaml": "^1.2.2",
     "latest-version": "5.1.0",
-    "listr": "^0.14.3",
-    "listr-update-renderer": "^0.5.0",
+    "listr2": "^4.0.5",
     "log-symbols": "^4.0.0",
     "mkdirp": "^1.0.4",
     "string-env-interpolation": "^1.0.1",
     "ts-log": "^2.2.3",
-    "wrap-ansi": "^7.0.0",
     "yaml": "^1.10.0",
     "yargs": "^17.0.0"
   },
@@ -65,26 +61,34 @@
   ],
   "author": "Dotan Simha <dotansimha@gmail.com>",
   "license": "MIT",
-  "main": "index.js",
-  "module": "index.mjs",
-  "typings": "index.d.ts",
+  "main": "cjs/index.js",
+  "module": "esm/index.js",
+  "typings": "typings/index.d.ts",
   "typescript": {
-    "definition": "index.d.ts"
+    "definition": "typings/index.d.ts"
   },
+  "type": "module",
   "exports": {
-    "./package.json": "./package.json",
     ".": {
-      "require": "./index.js",
-      "import": "./index.mjs"
+      "require": {
+        "types": "./typings/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "import": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "default": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      }
     },
-    "./*": {
-      "require": "./*.js",
-      "import": "./*.mjs"
-    }
+    "./package.json": "./package.json"
   },
   "bin": {
-    "gql-gen": "bin.js",
-    "graphql-codegen": "bin.js",
-    "graphql-code-generator": "bin.js"
+    "gql-gen": "cjs/bin.js",
+    "graphql-codegen": "cjs/bin.js",
+    "graphql-code-generator": "cjs/bin.js",
+    "graphql-codegen-esm": "esm/bin.js"
   }
-}
+}

package/typings/bin.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/{codegen.d.ts → typings/codegen.d.ts}

@@ -1,3 +1,3 @@
 import { Types } from '@graphql-codegen/plugin-helpers';
-import { CodegenContext } from './config';
+import { CodegenContext } from './config.js';
 export declare function executeCodegen(input: CodegenContext | Types.Config): Promise<Types.FileOutput[]>;

package/{generate-and-save.d.ts → typings/generate-and-save.d.ts}

@@ -1,5 +1,5 @@
 import { Types } from '@graphql-codegen/plugin-helpers';
-import { CodegenContext } from './config';
+import { CodegenContext } from './config.js';
 export declare function generate(input: CodegenContext | (Types.Config & {
     cwd?: string;
 }), saveToFile?: boolean): Promise<Types.FileOutput[] | any>;

package/typings/index.d.ts

@@ -0,0 +1,7 @@
+export { executeCodegen } from './codegen.js';
+export { generate } from './generate-and-save.js';
+export * from './config.js';
+export * from './init/index.js';
+export * from './utils/cli-error.js';
+export * from './cli.js';
+export * from './graphql-config.js';

package/{init → typings/init}/helpers.d.ts

@@ -1,5 +1,5 @@
 import { Types } from '@graphql-codegen/plugin-helpers';
-import { Answers } from './types';
+import { Answers } from './types.js';
 export declare function writeConfig(answers: Answers, config: Types.Config): Promise<{
     relativePath: string;
     fullPath: string;

package/{init → typings/init}/plugins.d.ts

@@ -1,2 +1,2 @@
-import { PluginOption } from './types';
+import { PluginOption } from './types.js';
 export declare const plugins: Array<PluginOption>;

package/{init → typings/init}/questions.d.ts

@@ -1,5 +1,5 @@
 import inquirer from 'inquirer';
-import { Tags, Answers } from './types';
+import { Tags, Answers } from './types.js';
 export declare function getQuestions(possibleTargets: Record<Tags, boolean>): inquirer.QuestionCollection;
 export declare function getApplicationTypeChoices(possibleTargets: Record<Tags, boolean>): {
     name: string;

package/{init → typings/init}/targets.d.ts

@@ -1,2 +1,2 @@
-import { Tags } from './types';
+import { Tags } from './types.js';
 export declare function guessTargets(): Promise<Record<Tags, boolean>>;

package/{utils → typings/utils}/watcher.d.ts

@@ -1,3 +1,3 @@
 import { Types } from '@graphql-codegen/plugin-helpers';
-import { CodegenContext } from '../config';
+import { CodegenContext } from '../config.js';
 export declare const createWatcher: (initalContext: CodegenContext, onNext: (result: Types.FileOutput[]) => Promise<Types.FileOutput[]>) => Promise<void>;

package/bin.d.ts

@@ -1 +0,0 @@
-export {};