enhance: improve cross-platform support (#3733)

ardatan · Mar 21, 2022 · 67fb117 · 67fb117 · vercel · Mar 21, 2022
1 parent 3a1d3bb
commit 67fb117
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 19 deletions.
diff --git a/.changeset/stale-lamps-rhyme.md b/.changeset/stale-lamps-rhyme.md
@@ -0,0 +1,12 @@
+---
+'@graphql-mesh/cache-file': minor
+'@graphql-mesh/cli': minor
+'@graphql-mesh/config': minor
+'@graphql-mesh/grpc': minor
+'json-machete': minor
+'@graphql-mesh/store': minor
+'@graphql-mesh/transform-extend': minor
+'@graphql-mesh/utils': minor
+---
+
+enhance: improve cross-platform support
diff --git a/packages/cache/file/package.json b/packages/cache/file/package.json
@@ -25,6 +25,7 @@
   "dependencies": {
     "@graphql-mesh/types": "0.68.1",
     "@graphql-mesh/utils": "0.31.0",
+    "@graphql-mesh/cross-helpers": "0.1.0",
     "dataloader": "2.0.0",
     "lodash": "4.17.21",
     "tslib": "^2.3.1"

diff --git a/packages/cache/file/src/index.ts b/packages/cache/file/src/index.ts
@@ -1,5 +1,5 @@
 import { ImportFn, KeyValueCache } from '@graphql-mesh/types';
-import pathModule from 'path';
+import { path as pathModule } from '@graphql-mesh/cross-helpers';
 import _ from 'lodash';
 import DataLoader from 'dataloader';
 import { writeJSON } from '@graphql-mesh/utils';

diff --git a/packages/cli/src/commands/ts-artifacts.ts b/packages/cli/src/commands/ts-artifacts.ts
@@ -8,10 +8,9 @@ import { printSchemaWithDirectives, Source } from '@graphql-tools/utils';
 import * as tsOperationsPlugin from '@graphql-codegen/typescript-operations';
 import * as typescriptGenericSdk from '@graphql-codegen/typescript-generic-sdk';
 import * as typedDocumentNodePlugin from '@graphql-codegen/typed-document-node';
-import pathModule from 'path';
+import { fs, path as pathModule } from '@graphql-mesh/cross-helpers';
 import ts from 'typescript';
 import { pathExists, writeFile, writeJSON } from '@graphql-mesh/utils';
-import { fs } from '@graphql-mesh/cross-helpers';
 import { generateOperations } from './generate-operations';
 import { GraphQLMeshCLIParams } from '..';
 import { stripJSONComments } from '../utils';
@@ -239,7 +238,7 @@ export async function generateTsArtifacts(
               const importCodes = [
                 `import { getMesh } from '@graphql-mesh/runtime';`,
                 `import { MeshStore, FsStoreStorageAdapter } from '@graphql-mesh/store';`,
-                `import pathModule from 'path';`,
+                `import { path as pathModule } from '@graphql-mesh/cross-helpers';`,
                 `import { fileURLToPath } from '@graphql-mesh/utils';`,
               ];
               const importedModulesCodes: string[] = [...importedModulesSet].map((importedModuleName, i) => {

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -2,8 +2,7 @@ import { findAndParseConfig } from './config';
 import { getMesh, GetMeshOptions, ServeMeshOptions } from '@graphql-mesh/runtime';
 import { generateTsArtifacts } from './commands/ts-artifacts';
 import { serveMesh } from './commands/serve/serve';
-import pathModule from 'path';
-import { fs } from '@graphql-mesh/cross-helpers';
+import { fs, path as pathModule } from '@graphql-mesh/cross-helpers';
 import { FsStoreStorageAdapter, MeshStore } from '@graphql-mesh/store';
 import {
   writeFile,

diff --git a/packages/config/src/process.ts b/packages/config/src/process.ts
@@ -1,4 +1,4 @@
-import pathModule from 'path';
+import { path as pathModule } from '@graphql-mesh/cross-helpers';
 import { MeshResolvedSource } from '@graphql-mesh/runtime';
 import {
   ImportFn,

diff --git a/packages/handlers/grpc/src/utils.ts b/packages/handlers/grpc/src/utils.ts
@@ -1,9 +1,8 @@
 import { jsonFlatStringify } from '@graphql-mesh/utils';
 import { ClientReadableStream, ClientUnaryCall, Metadata, MetadataValue } from '@grpc/grpc-js';
-import { fs } from '@graphql-mesh/cross-helpers';
+import { fs, path as pathModule } from '@graphql-mesh/cross-helpers';
 import { SchemaComposer } from 'graphql-compose';
 import _ from 'lodash';
-import pathModule from 'path';
 import { Root } from 'protobufjs';
 
 import { getGraphQLScalar, isScalarType } from './scalars';

diff --git a/packages/json-machete/package.json b/packages/json-machete/package.json
@@ -24,6 +24,8 @@
     "cross-undici-fetch": "0.1.27",
     "json-ptr": "3.1.0",
     "@graphql-mesh/utils": "0.31.0",
+    "@graphql-mesh/cross-helpers": "0.1.0",
+    "@graphql-tools/utils": "8.6.3",
     "url-join": "4.0.1",
     "to-json-schema": "0.2.5",
     "tslib": "^2.3.1"

diff --git a/packages/json-machete/src/dereferenceObject.ts b/packages/json-machete/src/dereferenceObject.ts
@@ -1,5 +1,5 @@
 import { JsonPointer } from 'json-ptr';
-import pathModule from 'path';
+import { path as pathModule } from '@graphql-mesh/cross-helpers';
 import urlJoin from 'url-join';
 import { fetch as crossUndiciFetch } from 'cross-undici-fetch';
 import { readFileOrUrl } from '@graphql-mesh/utils';

diff --git a/packages/json-machete/src/healJSONSchema.ts b/packages/json-machete/src/healJSONSchema.ts
@@ -1,4 +1,4 @@
-import { inspect } from 'util';
+import { inspect } from '@graphql-tools/utils';
 import { JSONSchema } from './types';
 import { OnCircularReference, visitJSONSchema } from './visitJSONSchema';
 import toJsonSchema from 'to-json-schema';
@@ -30,7 +30,7 @@ function deduplicateJSONSchema(schema: JSONSchema, seenMap = new Map()) {
       if (titleReserved) {
         schema.title = undefined;
       }
-      const stringified = inspect(schema, undefined, 3);
+      const stringified = inspect(schema);
       if (titleReserved) {
         schema.title = titleReserved;
       }

diff --git a/packages/store/src/index.ts b/packages/store/src/index.ts
@@ -1,5 +1,4 @@
-import { fs } from '@graphql-mesh/cross-helpers';
-import pathModule from 'path';
+import { fs, path as pathModule } from '@graphql-mesh/cross-helpers';
 import { flatString, writeFile, AggregateError } from '@graphql-mesh/utils';
 import { CriticalityLevel, diff } from '@graphql-inspector/core';
 import { printSchemaWithDirectives } from '@graphql-tools/utils';

diff --git a/packages/transforms/extend/package.json b/packages/transforms/extend/package.json
@@ -30,6 +30,7 @@
     "@graphql-tools/graphql-file-loader": "7.3.5",
     "@graphql-tools/schema": "8.3.3",
     "@graphql-tools/utils": "8.6.3",
+    "@graphql-mesh/cross-helpers": "0.1.0",
     "tslib": "^2.3.1"
   },
   "publishConfig": {

diff --git a/packages/transforms/extend/src/index.ts b/packages/transforms/extend/src/index.ts
@@ -1,4 +1,4 @@
-import pathModule from 'path';
+import { path as pathModule } from '@graphql-mesh/cross-helpers';
 import { ImportFn, MeshTransform, MeshTransformOptions, YamlConfig } from '@graphql-mesh/types';
 import { loadFromModuleExportExpression } from '@graphql-mesh/utils';
 import { CodeFileLoader } from '@graphql-tools/code-file-loader';

diff --git a/packages/utils/src/fs-operations.ts b/packages/utils/src/fs-operations.ts
@@ -1,5 +1,4 @@
-import { fs } from '@graphql-mesh/cross-helpers';
-import pathModule from 'path';
+import { fs, path as pathModule } from '@graphql-mesh/cross-helpers';
 import { jsonFlatStringify } from './flat-string';
 
 export async function pathExists(path: string) {

diff --git a/packages/utils/src/read-file-or-url.ts b/packages/utils/src/read-file-or-url.ts
@@ -2,8 +2,7 @@ import { fetchFactory, KeyValueCache } from 'fetchache';
 import { fetch as crossFetch, Request, Response } from 'cross-undici-fetch';
 import isUrl from 'is-url';
 import { DEFAULT_SCHEMA, load as loadYamlFromJsYaml, Schema, Type } from 'js-yaml';
-import pathModule from 'path';
-import { fs } from '@graphql-mesh/cross-helpers';
+import { fs, path as pathModule } from '@graphql-mesh/cross-helpers';
 import { ImportFn, Logger } from '@graphql-mesh/types';
 import { defaultImportFn } from './defaultImportFn';
 import { memoize1 } from '@graphql-tools/utils';