nsgm-cli 2.1.3 → 2.1.5

package/generation/tsconfig.json

@@ -4,7 +4,6 @@
     "target": "ES2022",
     "module": "commonjs",
     "declaration": true,
-    "outDir": "./lib",
     "strict": true,
     "lib": [
       "dom",
@@ -33,7 +32,8 @@
     "noFallthroughCasesInSwitch": true
   },
   "include": [
-    "src"
+    "client/**/*",
+    "pages/**/*"
   ],
   "exclude": [
     "node_modules",

package/lib/generate.js

@@ -116,8 +116,6 @@ const replaceInFileAll = async (array, index = 0, callback) => {
 };
 const sourceFolder = __dirname;
 const destFolder = process.cwd();
-console.log('sourceFolder', sourceFolder);
-console.log('destFolder', destFolder);
 const isLocal = sourceFolder === resolve(`${destFolder}/lib`);
 const generationPath = '../generation';
 const clientPathSource = '../client';

package/lib/server/graphql.d.ts

@@ -1,6 +1,2 @@
-declare const _default: (command: string) => (request: import("http").IncomingMessage & {
-    url: string;
-}, response: import("http").ServerResponse<import("http").IncomingMessage> & {
-    json?: (data: unknown) => void;
-}) => Promise<void>;
-export default _default;
+declare const handler: (command: string) => import("express").Handler;
+export default handler;

package/lib/server/graphql.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const express_graphql_1 = require("express-graphql");
+const express_1 = require("graphql-http/lib/use/express");
 const graphql_1 = require("graphql");
 const fs_1 = __importDefault(require("fs"));
 const lodash_1 = __importDefault(require("lodash"));
@@ -150,33 +150,34 @@ function generateTypeDefsAndResolvers() {
 }
 const generateResult = generateTypeDefsAndResolvers();
 const { querySchemes: querySchemesV, mutationSchemes: mutationSchemesV, subscriptionSchemes: subscriptionSchemesV, typeSchemes: typeSchemesV, resolvers: resolversV, scalarStr: scalarStrV, schemaStr: generatedSchemaStr } = generateResult;
-// 使用生成的 schema 或构建新的 schema
-const schemaStr = generatedSchemaStr ||
-    `
-    ${scalarStrV}
+// 导出 handler 函数，兼容 express 用法
+const handler = (command) => {
+    const schemaStr = generatedSchemaStr ||
+        `
+      ${scalarStrV}
 
-    type Query { 
-        ${querySchemesV?.join('\n') || '_: Boolean'} 
-    }
+      type Query { 
+          ${querySchemesV?.join('\n') || '_: Boolean'} 
+      }
 
-    type Mutation { 
-        ${mutationSchemesV?.join('\n') || '_: Boolean'} 
-    }
+      type Mutation { 
+          ${mutationSchemesV?.join('\n') || '_: Boolean'} 
+      }
 
-    type Subscription { 
-        ${subscriptionSchemesV?.join('\n') || '_: Boolean'} 
-    }
+      type Subscription { 
+          ${subscriptionSchemesV?.join('\n') || '_: Boolean'} 
+      }
 
-    ${typeSchemesV?.join('\n') || ''}
-`;
-exports.default = (command) => {
+      ${typeSchemesV?.join('\n') || ''}
+    `;
     if (command === 'dev') {
         console.log('schemaStr', schemaStr);
         console.log('resolvers', resolversV);
     }
-    return (0, express_graphql_1.graphqlHTTP)({
+    // graphql-http 不再内置 graphiql，需手动集成 playground 或 altair，以下为基础 handler
+    return (0, express_1.createHandler)({
         schema: (0, graphql_1.buildSchema)(schemaStr),
-        rootValue: resolversV,
-        graphiql: true
+        rootValue: resolversV
     });
 };
+exports.default = handler;