@bitblit/ratchet-graphql 4.0.99-alpha → 4.0.103-alpha

package/{dist/types → lib}/build/ratchet-graphql-info.d.ts

@@ -1,4 +1,4 @@
-import { BuildInformation } from '@bitblit/ratchet-common';
+import { BuildInformation } from '@bitblit/ratchet-common/lib/build/build-information.js';
 export declare class RatchetGraphqlInfo {
     private constructor();
     static buildInformation(): BuildInformation;

package/{dist/types → lib}/graphql/graphql-ratchet.d.ts

@@ -1,13 +1,7 @@
-import { GraphqlRatchetEndpointProvider } from './provider/graphql-ratchet-endpoint-provider';
-import { GraphqlRatchetJwtTokenProvider } from './provider/graphql-ratchet-jwt-token-provider';
-import { GraphqlRatchetQueryProvider } from './provider/graphql-ratchet-query-provider';
-import { GraphqlRatchetErrorHandler } from './provider/graphql-ratchet-error-handler';
-/**
- * CAW: 2023-02-16 : I'm well aware that this ratchet currently blows away any useful caching done by
- * ApolloClient, and that it is a terrible idea.  It's mainly because the kinds of things I use this
- * for get very little useful behavior out of caching, so I've never tuned it.  At some point in the
- * future I'll have to build that out more (likely with some interfaces)
- */
+import { GraphqlRatchetEndpointProvider } from './provider/graphql-ratchet-endpoint-provider.js';
+import { GraphqlRatchetJwtTokenProvider } from './provider/graphql-ratchet-jwt-token-provider.js';
+import { GraphqlRatchetQueryProvider } from './provider/graphql-ratchet-query-provider.js';
+import { GraphqlRatchetErrorHandler } from './provider/graphql-ratchet-error-handler.js';
 export declare class GraphqlRatchet {
     private queryProvider;
     private endpointProvider;

package/{dist/es → lib}/graphql/graphql-ratchet.js

@@ -1,13 +1,24 @@
-import { ApolloClient, ApolloLink, gql, HttpLink, InMemoryCache } from '@apollo/client/core';
-import { DefaultGraphqlRatchetErrorHandler } from './provider/default-graphql-ratchet-error-handler';
-import { RequireRatchet, Logger, StringRatchet, ErrorRatchet } from '@bitblit/ratchet-common';
+import { ApolloClient, gql, InMemoryCache } from '@apollo/client/core';
+import { HttpLink } from '@apollo/client/link/http/HttpLink.js';
+import { ApolloLink } from '@apollo/client/link/core/ApolloLink.js';
+import { DefaultGraphqlRatchetErrorHandler } from './provider/default-graphql-ratchet-error-handler.js';
+import { ErrorRatchet } from '@bitblit/ratchet-common/lib/lang/error-ratchet.js';
+import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
+import { RequireRatchet } from '@bitblit/ratchet-common/lib/lang/require-ratchet.js';
+import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
 export class GraphqlRatchet {
+    queryProvider;
+    endpointProvider;
+    jwtTokenProvider;
+    errorHandler;
+    apolloCache = new Map();
+    noAuthApollo;
+    cachedEndpoint;
     constructor(queryProvider, endpointProvider, jwtTokenProvider, errorHandler = new DefaultGraphqlRatchetErrorHandler()) {
         this.queryProvider = queryProvider;
         this.endpointProvider = endpointProvider;
         this.jwtTokenProvider = jwtTokenProvider;
         this.errorHandler = errorHandler;
-        this.apolloCache = new Map();
         RequireRatchet.notNullOrUndefined(queryProvider, 'queryProvider');
         RequireRatchet.notNullOrUndefined(endpointProvider, 'endpointProvider');
         RequireRatchet.notNullOrUndefined(jwtTokenProvider, 'jwtTokenProvider');

package/{dist/types → lib}/graphql/provider/default-graphql-ratchet-error-handler.d.ts

@@ -1,5 +1,5 @@
-import { GraphqlRatchetErrorHandler } from './graphql-ratchet-error-handler';
-import { LoggerLevelName } from '@bitblit/ratchet-common';
+import { GraphqlRatchetErrorHandler } from './graphql-ratchet-error-handler.js';
+import { LoggerLevelName } from '@bitblit/ratchet-common/lib/logger/logger-level-name.js';
 export declare class DefaultGraphqlRatchetErrorHandler implements GraphqlRatchetErrorHandler {
     private logLevel;
     private rethrow;

package/{dist/es → lib}/graphql/provider/default-graphql-ratchet-error-handler.js

@@ -1,5 +1,8 @@
-import { LoggerLevelName, Logger } from '@bitblit/ratchet-common';
+import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
+import { LoggerLevelName } from '@bitblit/ratchet-common/lib/logger/logger-level-name.js';
 export class DefaultGraphqlRatchetErrorHandler {
+    logLevel;
+    rethrow;
     constructor(logLevel = LoggerLevelName.warn, rethrow = false) {
         this.logLevel = logLevel;
         this.rethrow = rethrow;

package/{dist/types → lib}/graphql/provider/local-fetch-query-provider.d.ts

@@ -1,4 +1,4 @@
-import { GraphqlRatchetQueryProvider } from './graphql-ratchet-query-provider';
+import { GraphqlRatchetQueryProvider } from './graphql-ratchet-query-provider.js';
 export declare class LocalFetchQueryProvider implements GraphqlRatchetQueryProvider {
     private pathTemplate;
     private forcePathToLowerCase;

package/{dist/es → lib}/graphql/provider/local-fetch-query-provider.js

@@ -1,10 +1,13 @@
-import { StringRatchet, Logger } from '@bitblit/ratchet-common';
+import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
+import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
 import fetch from 'cross-fetch';
 export class LocalFetchQueryProvider {
+    pathTemplate;
+    forcePathToLowerCase;
+    cacheMap = new Map();
     constructor(pathTemplate = 'assets/gql/{{QUERY_NAME}}.gql', forcePathToLowerCase = false) {
         this.pathTemplate = pathTemplate;
         this.forcePathToLowerCase = forcePathToLowerCase;
-        this.cacheMap = new Map();
     }
     async fetchQueryText(qry) {
         let rval = this.cacheMap.get(qry.toLowerCase());

package/lib/index.d.ts

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

package/lib/index.js

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

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@bitblit/ratchet-graphql",
-  "version": "4.0.99-alpha",
+  "version": "4.0.103-alpha",
   "description": "Ratchet tools to simplify use of graphql",
   "sideEffects": false,
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
+  "type": "module",
+  "module": "index.js",
   "files": [
-    "dist/*"
+    "lib/*",
+    "bin/*"
   ],
   "contributors": [
     "Christopher Weiss <bitblit@gmail.com>",
@@ -30,16 +30,14 @@
   "config": {},
   "scripts": {
     "watch": "tsc-watch",
-    "clean": "shx rm -Rf dist",
-    "test": "jest",
+    "clean": "shx rm -Rf lib",
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest",
     "docs": "typedoc",
     "lint": "eslint src/**/*.ts",
     "lint-fix": "eslint --fix src/**/*.ts",
-    "generate-barrels": "barrelsby -q --delete -d src -e .*\\.spec\\.ts",
-    "build": "yarn run generate-barrels && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
-    "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:es": "tsc -p tsconfig.es.json",
-    "build:types": "tsc -p tsconfig.types.json"
+    "__generate-barrels": "barrelsby -q --delete -d src -e .*\\.spec\\.ts",
+    "__build": "yarn run generate-barrels && tsc",
+    "build": "tsc"
   },
   "repository": {
     "type": "git",

package/dist/cjs/build/ratchet-graphql-info.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RatchetGraphqlInfo = void 0;
-class RatchetGraphqlInfo {
-    constructor() { }
-    static buildInformation() {
-        const val = {
-            version: 'LOCAL-SNAPSHOT',
-            hash: 'LOCAL-HASH',
-            branch: 'LOCAL-BRANCH',
-            tag: 'LOCAL-TAG',
-            timeBuiltISO: 'LOCAL-TIME-ISO',
-            notes: 'LOCAL-NOTES',
-        };
-        return val;
-    }
-}
-exports.RatchetGraphqlInfo = RatchetGraphqlInfo;

package/dist/cjs/graphql/graphql-ratchet.js

@@ -1,170 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphqlRatchet = void 0;
-const core_1 = require("@apollo/client/core");
-const default_graphql_ratchet_error_handler_1 = require("./provider/default-graphql-ratchet-error-handler");
-const ratchet_common_1 = require("@bitblit/ratchet-common");
-class GraphqlRatchet {
-    constructor(queryProvider, endpointProvider, jwtTokenProvider, errorHandler = new default_graphql_ratchet_error_handler_1.DefaultGraphqlRatchetErrorHandler()) {
-        this.queryProvider = queryProvider;
-        this.endpointProvider = endpointProvider;
-        this.jwtTokenProvider = jwtTokenProvider;
-        this.errorHandler = errorHandler;
-        this.apolloCache = new Map();
-        ratchet_common_1.RequireRatchet.notNullOrUndefined(queryProvider, 'queryProvider');
-        ratchet_common_1.RequireRatchet.notNullOrUndefined(endpointProvider, 'endpointProvider');
-        ratchet_common_1.RequireRatchet.notNullOrUndefined(jwtTokenProvider, 'jwtTokenProvider');
-        ratchet_common_1.RequireRatchet.notNullOrUndefined(errorHandler, 'errorHandler');
-        this.cachedEndpoint = this.endpointProvider.fetchGraphqlEndpoint();
-    }
-    async fetchQueryAsGql(qry) {
-        let rval = null;
-        const text = await this.queryProvider.fetchQueryText(qry);
-        if (text) {
-            rval = (0, core_1.gql)(text);
-        }
-        else {
-            ratchet_common_1.Logger.warn('Could not find requested query : %s', qry);
-        }
-        return rval;
-    }
-    createAnonymousApi() {
-        ratchet_common_1.Logger.info('Creating anonymous apollo client');
-        const httpLink = new core_1.HttpLink({ uri: this.cachedEndpoint });
-        const opts = {
-            link: httpLink,
-            cache: new core_1.InMemoryCache(),
-        };
-        const rval = new core_1.ApolloClient(opts);
-        return rval;
-    }
-    fetchApi(runAnonymous) {
-        let rval = null;
-        const jwtToken = this.jwtTokenProvider.fetchJwtToken();
-        this.checkIfEndpointChanged();
-        ratchet_common_1.Logger.info('Fetch auth apollo client %s', ratchet_common_1.StringRatchet.obscure(ratchet_common_1.StringRatchet.trimToEmpty(jwtToken), 2, 2));
-        if (ratchet_common_1.StringRatchet.trimToNull(jwtToken)) {
-            ratchet_common_1.Logger.debug('Fetching authd api');
-            if (!this.apolloCache.has(jwtToken)) {
-                const newValue = this.createAuthApi(jwtToken);
-                ratchet_common_1.Logger.debug('Setting apollo cache for this token to %s', newValue);
-                this.apolloCache.set(jwtToken, newValue);
-            }
-            else {
-                ratchet_common_1.Logger.debug('Fetching apollo client from cache');
-            }
-            rval = this.apolloCache.get(jwtToken);
-        }
-        else {
-            ratchet_common_1.Logger.debug('Fetching unauthd ap');
-            if (runAnonymous) {
-                if (!this.noAuthApollo) {
-                    this.noAuthApollo = this.createAnonymousApi();
-                }
-                else {
-                    ratchet_common_1.Logger.debug('Fetching anonymous client from cache');
-                }
-                rval = this.noAuthApollo;
-            }
-            else {
-                ratchet_common_1.ErrorRatchet.throwFormattedErr('Cannot fetch api - no token and runAnonymous is set to %s : -%s-', runAnonymous, jwtToken);
-            }
-        }
-        ratchet_common_1.Logger.debug('FetchApi returning %s', rval);
-        return rval;
-    }
-    createAuthApi(jwtToken) {
-        ratchet_common_1.Logger.info('Creating a new authenticated api for %s : %s', this.cachedEndpoint, ratchet_common_1.StringRatchet.obscure(jwtToken, 2, 2));
-        let rval = null;
-        ratchet_common_1.RequireRatchet.notNullUndefinedOrOnlyWhitespaceString(jwtToken, 'jwtToken');
-        ratchet_common_1.Logger.info('Creating auth apollo client %s', ratchet_common_1.StringRatchet.obscure(jwtToken, 2, 2));
-        const httpLink = new core_1.HttpLink({ uri: this.cachedEndpoint });
-        const authLink = new core_1.ApolloLink((operation, forward) => {
-            operation.setContext({
-                headers: {
-                    authorization: `Bearer ${jwtToken}`,
-                },
-            });
-            return forward(operation);
-        });
-        const opts = {
-            link: authLink.concat(httpLink),
-            cache: new core_1.InMemoryCache(),
-        };
-        rval = new core_1.ApolloClient(opts);
-        return rval;
-    }
-    checkIfEndpointChanged() {
-        const check = this.endpointProvider.fetchGraphqlEndpoint();
-        if (check !== this.cachedEndpoint) {
-            ratchet_common_1.Logger.info('Endpoint changed from %s to %s - clearing apollo caches');
-            this.apolloCache = new Map();
-            this.noAuthApollo = null;
-            this.cachedEndpoint = check;
-        }
-    }
-    clearCaches() {
-        ratchet_common_1.Logger.info('Clearing cached apollo');
-        this.apolloCache = new Map();
-        this.noAuthApollo = null;
-        this.cachedEndpoint = null;
-    }
-    async executeQuery(queryName, variables, runAnonymous = false) {
-        let rval = null;
-        try {
-            const api = this.fetchApi(runAnonymous);
-            if (api) {
-                ratchet_common_1.Logger.debug('API fetched for %s, fetching gql', queryName);
-                const GQL = await this.fetchQueryAsGql(queryName);
-                ratchet_common_1.Logger.debug('API and GQL fetched for %s - running %s %s', queryName, GQL, api);
-                const newValues = await api.query({
-                    query: GQL,
-                    variables: variables,
-                    fetchPolicy: 'no-cache',
-                });
-                ratchet_common_1.Logger.silly('Query returned: %j', newValues);
-                const keys = Object.keys(newValues.data);
-                if (keys.length !== 1) {
-                    ratchet_common_1.ErrorRatchet.throwFormattedErr('Unexpected number of keys : %s : %j', keys.length, keys);
-                }
-                rval = newValues.data[keys[0]];
-            }
-            else {
-                ratchet_common_1.ErrorRatchet.throwFormattedErr('Cannot run - no api fetched');
-            }
-        }
-        catch (err) {
-            ratchet_common_1.Logger.silly('Exception caught in executeQuery : %s %s %j %s', err, queryName, variables, runAnonymous, err);
-            this.errorHandler.handleError(err, queryName, variables, runAnonymous);
-        }
-        return rval;
-    }
-    async executeMutate(queryName, variables, runAnonymous = false) {
-        ratchet_common_1.Logger.info('Mutate : %s : %j', queryName, variables);
-        let rval = null;
-        const api = this.fetchApi(runAnonymous);
-        try {
-            if (api) {
-                const GQL = await this.fetchQueryAsGql(queryName);
-                const newValues = await api.mutate({
-                    mutation: GQL,
-                    variables: variables,
-                    fetchPolicy: 'no-cache',
-                });
-                const keys = Object.keys(newValues.data);
-                if (keys.length !== 1) {
-                    ratchet_common_1.ErrorRatchet.throwFormattedErr('Unexpected number of keys : %s : %j', keys.length, keys);
-                }
-                rval = newValues.data[keys[0]];
-            }
-            else {
-                ratchet_common_1.ErrorRatchet.throwFormattedErr('Cannot run - no api fetched');
-            }
-        }
-        catch (err) {
-            this.errorHandler.handleError(err, queryName, variables, runAnonymous);
-        }
-        return rval;
-    }
-}
-exports.GraphqlRatchet = GraphqlRatchet;

package/dist/cjs/graphql/provider/default-graphql-ratchet-error-handler.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultGraphqlRatchetErrorHandler = void 0;
-const ratchet_common_1 = require("@bitblit/ratchet-common");
-class DefaultGraphqlRatchetErrorHandler {
-    constructor(logLevel = ratchet_common_1.LoggerLevelName.warn, rethrow = false) {
-        this.logLevel = logLevel;
-        this.rethrow = rethrow;
-    }
-    handleError(error, queryName, variables, anonymous) {
-        ratchet_common_1.Logger.logByLevel(this.logLevel, 'Graphql failed : %s : %s : Anon-%s : %j', error, queryName, anonymous, variables);
-        if (this.rethrow) {
-            throw error;
-        }
-    }
-}
-exports.DefaultGraphqlRatchetErrorHandler = DefaultGraphqlRatchetErrorHandler;

package/dist/cjs/graphql/provider/graphql-ratchet-endpoint-provider.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/graphql/provider/graphql-ratchet-error-handler.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/graphql/provider/graphql-ratchet-jwt-token-provider.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/graphql/provider/graphql-ratchet-query-provider.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/graphql/provider/local-fetch-query-provider.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalFetchQueryProvider = void 0;
-const tslib_1 = require("tslib");
-const ratchet_common_1 = require("@bitblit/ratchet-common");
-const cross_fetch_1 = tslib_1.__importDefault(require("cross-fetch"));
-class LocalFetchQueryProvider {
-    constructor(pathTemplate = 'assets/gql/{{QUERY_NAME}}.gql', forcePathToLowerCase = false) {
-        this.pathTemplate = pathTemplate;
-        this.forcePathToLowerCase = forcePathToLowerCase;
-        this.cacheMap = new Map();
-    }
-    async fetchQueryText(qry) {
-        let rval = this.cacheMap.get(qry.toLowerCase());
-        if (!rval) {
-            const tgt = this.forcePathToLowerCase ? qry.toLowerCase() : qry;
-            const pathInput = this.pathTemplate.split('{{QUERY_NAME}}').join(tgt);
-            ratchet_common_1.Logger.info('Cache miss, loading %s from %s', qry, pathInput);
-            const qryResp = await (0, cross_fetch_1.default)(pathInput);
-            rval = ratchet_common_1.StringRatchet.trimToNull(await qryResp.text());
-            if (rval) {
-                this.cacheMap.set(qry.toLowerCase(), rval);
-            }
-        }
-        return rval;
-    }
-}
-exports.LocalFetchQueryProvider = LocalFetchQueryProvider;

package/dist/cjs/index.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./build/ratchet-graphql-info"), exports);
-tslib_1.__exportStar(require("./graphql/graphql-ratchet"), exports);
-tslib_1.__exportStar(require("./graphql/provider/default-graphql-ratchet-error-handler"), exports);
-tslib_1.__exportStar(require("./graphql/provider/graphql-ratchet-endpoint-provider"), exports);
-tslib_1.__exportStar(require("./graphql/provider/graphql-ratchet-error-handler"), exports);
-tslib_1.__exportStar(require("./graphql/provider/graphql-ratchet-jwt-token-provider"), exports);
-tslib_1.__exportStar(require("./graphql/provider/graphql-ratchet-query-provider"), exports);
-tslib_1.__exportStar(require("./graphql/provider/local-fetch-query-provider"), exports);

package/dist/es/index.js

@@ -1,8 +0,0 @@
-export * from './build/ratchet-graphql-info';
-export * from './graphql/graphql-ratchet';
-export * from './graphql/provider/default-graphql-ratchet-error-handler';
-export * from './graphql/provider/graphql-ratchet-endpoint-provider';
-export * from './graphql/provider/graphql-ratchet-error-handler';
-export * from './graphql/provider/graphql-ratchet-jwt-token-provider';
-export * from './graphql/provider/graphql-ratchet-query-provider';
-export * from './graphql/provider/local-fetch-query-provider';