@graphql-mesh/string-interpolation 0.1.1-alpha-112a2a51f.0 → 0.3.0

package/CHANGELOG.md

@@ -1,10 +1,21 @@
 # @graphql-mesh/string-interpolation
 
-## 0.1.1-alpha-112a2a51f.0
+## 0.3.0
+
+### Minor Changes
+
+- 13b9b30f7: Add interpolation strings to the generated MeshContext type
+
+## 0.2.0
+
+### Minor Changes
+
+- 974e703e2: No longer import entire lodash library but instead individual smaller packages
 
 ### Patch Changes
 
-- 7ceb64fab: Cleanup dependencies
+- 974e703e2: Cleanup dependencies
+- 974e703e2: Use deeper lodash imports to have better treeshaking and avoid using eval
 
 ## 0.1.0
 

package/dist/index.js

@@ -4,10 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
-const _ = _interopDefault(require('lodash'));
+const lodashGet = _interopDefault(require('lodash.get'));
 const JsonPointer = _interopDefault(require('json-pointer'));
 const dayjs = _interopDefault(require('dayjs'));
-const objectHash = _interopDefault(require('object-hash'));
 
 const defaultOptions = {
     delimiter: ['{', '}'],
@@ -142,7 +141,7 @@ class Interpolator {
     }
     applyData(key, data) {
         const [prop, ptr] = key.split('#');
-        const propData = _.get(data, prop);
+        const propData = lodashGet(data, prop);
         if (ptr) {
             try {
                 return JsonPointer.get(propData, ptr);
@@ -190,18 +189,21 @@ function getInterpolationKeys(...interpolationStrings) {
 function parseInterpolationStrings(interpolationStrings, argTypeMap) {
     const interpolationKeys = getInterpolationKeys(...interpolationStrings);
     const args = {};
-    const contextVariables = [];
+    const contextVariables = {};
     for (const interpolationKey of interpolationKeys) {
         const interpolationKeyParts = interpolationKey.split('.');
         const varName = interpolationKeyParts[interpolationKeyParts.length - 1];
-        if (interpolationKeyParts[0] === 'args') {
-            const argType = argTypeMap && varName in argTypeMap ? argTypeMap[varName] : 'ID';
-            args[varName] = {
-                type: argType,
-            };
-        }
-        else if (interpolationKeyParts[0] === 'context') {
-            contextVariables.push(varName);
+        const initialObject = interpolationKeyParts[0];
+        const argType = argTypeMap && varName in argTypeMap ? argTypeMap[varName] : interpolationKeyParts.length > 2 ? 'JSON' : 'ID';
+        switch (initialObject) {
+            case 'args':
+                args[varName] = {
+                    type: argType,
+                };
+                break;
+            case 'context':
+                contextVariables[varName] = `Scalars['${argType}']`;
+                break;
         }
     }
     return {
@@ -225,8 +227,9 @@ function getInterpolatedHeadersFactory(nonInterpolatedHeaders = {}) {
     };
 }
 
+const hashCode = (s) => s.split('').reduce((a, b) => ((a << 5) - a + b.charCodeAt(0)) | 0, 0);
 function hashObject(value) {
-    return objectHash(value, { ignoreUnknown: true }).toString();
+    return hashCode(JSON.stringify(value)).toString();
 }
 const stringInterpolator = new Interpolator({
     delimiter: ['{', '}'],

package/dist/index.mjs

@@ -1,7 +1,6 @@
-import _ from 'lodash';
+import lodashGet from 'lodash.get';
 import JsonPointer from 'json-pointer';
 import dayjs from 'dayjs';
-import objectHash from 'object-hash';
 
 const defaultOptions = {
     delimiter: ['{', '}'],
@@ -136,7 +135,7 @@ class Interpolator {
     }
     applyData(key, data) {
         const [prop, ptr] = key.split('#');
-        const propData = _.get(data, prop);
+        const propData = lodashGet(data, prop);
         if (ptr) {
             try {
                 return JsonPointer.get(propData, ptr);
@@ -184,18 +183,21 @@ function getInterpolationKeys(...interpolationStrings) {
 function parseInterpolationStrings(interpolationStrings, argTypeMap) {
     const interpolationKeys = getInterpolationKeys(...interpolationStrings);
     const args = {};
-    const contextVariables = [];
+    const contextVariables = {};
     for (const interpolationKey of interpolationKeys) {
         const interpolationKeyParts = interpolationKey.split('.');
         const varName = interpolationKeyParts[interpolationKeyParts.length - 1];
-        if (interpolationKeyParts[0] === 'args') {
-            const argType = argTypeMap && varName in argTypeMap ? argTypeMap[varName] : 'ID';
-            args[varName] = {
-                type: argType,
-            };
-        }
-        else if (interpolationKeyParts[0] === 'context') {
-            contextVariables.push(varName);
+        const initialObject = interpolationKeyParts[0];
+        const argType = argTypeMap && varName in argTypeMap ? argTypeMap[varName] : interpolationKeyParts.length > 2 ? 'JSON' : 'ID';
+        switch (initialObject) {
+            case 'args':
+                args[varName] = {
+                    type: argType,
+                };
+                break;
+            case 'context':
+                contextVariables[varName] = `Scalars['${argType}']`;
+                break;
         }
     }
     return {
@@ -219,8 +221,9 @@ function getInterpolatedHeadersFactory(nonInterpolatedHeaders = {}) {
     };
 }
 
+const hashCode = (s) => s.split('').reduce((a, b) => ((a << 5) - a + b.charCodeAt(0)) | 0, 0);
 function hashObject(value) {
-    return objectHash(value, { ignoreUnknown: true }).toString();
+    return hashCode(JSON.stringify(value)).toString();
 }
 const stringInterpolator = new Interpolator({
     delimiter: ['{', '}'],

package/dist/package.json

@@ -1,16 +1,15 @@
 {
   "name": "@graphql-mesh/string-interpolation",
-  "version": "0.1.1-alpha-112a2a51f.0",
+  "version": "0.3.0",
   "description": "Dynamic string manipulation",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
   },
   "dependencies": {
-    "dayjs": "1.11.2",
+    "dayjs": "1.11.3",
     "json-pointer": "0.6.2",
-    "lodash": "^4.17.21",
-    "object-hash": "3.0.0"
+    "lodash.get": "4.4.2"
   },
   "repository": {
     "type": "git",

package/dist/resolver-data-factory.d.ts

@@ -9,11 +9,11 @@ export declare type ResolverData<TParent = any, TArgs = any, TContext = any, TRe
 };
 export declare type ResolverDataBasedFactory<T> = (data: ResolverData) => T;
 export declare function getInterpolationKeys(...interpolationStrings: string[]): any[];
-export declare function parseInterpolationStrings(interpolationStrings: string[], argTypeMap?: Record<string, string | GraphQLInputType>): {
+export declare function parseInterpolationStrings(interpolationStrings: Iterable<string>, argTypeMap?: Record<string, string | GraphQLInputType>): {
     args: Record<string, {
         type: string | GraphQLInputType;
     }>;
-    contextVariables: string[];
+    contextVariables: Record<string, string>;
 };
 export declare function getInterpolatedStringFactory(nonInterpolatedString: string): ResolverDataBasedFactory<string>;
 export declare function getInterpolatedHeadersFactory(nonInterpolatedHeaders?: Record<string, string>): ResolverDataBasedFactory<Record<string, string>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/string-interpolation",
-  "version": "0.1.1-alpha-112a2a51f.0",
+  "version": "0.3.0",
   "description": "Dynamic string manipulation",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -24,9 +24,8 @@
   },
   "dependencies": {
     "json-pointer": "0.6.2",
-    "dayjs": "1.11.2",
-    "object-hash": "3.0.0",
-    "lodash": "^4.17.21"
+    "dayjs": "1.11.3",
+    "lodash.get": "4.4.2"
   },
   "author": "Arda TANRIKULU <ardatanrikulu@gmail.com>",
   "repository": {

package/src/index.ts

@@ -1,9 +1,10 @@
 import { Interpolator } from './interpolator';
 import dayjs from 'dayjs';
-import objectHash from 'object-hash';
+
+const hashCode = (s: string) => s.split('').reduce((a, b) => ((a << 5) - a + b.charCodeAt(0)) | 0, 0);
 
 export function hashObject(value: any): string {
-  return objectHash(value, { ignoreUnknown: true }).toString();
+  return hashCode(JSON.stringify(value)).toString();
 }
 
 export { Interpolator };

package/src/interpolator.js

@@ -1,5 +1,5 @@
 import { defaultOptions } from './statics/DefaultOptions';
-import _ from 'lodash';
+import lodashGet from 'lodash.get';
 import { defaultModifiers } from './modifiers';
 import JsonPointer from 'json-pointer';
 
@@ -137,7 +137,7 @@ export class Interpolator {
 
   applyData(key, data) {
     const [prop, ptr] = key.split('#');
-    const propData = _.get(data, prop);
+    const propData = lodashGet(data, prop);
     if (ptr) {
       try {
         return JsonPointer.get(propData, ptr);

package/src/resolver-data-factory.ts

@@ -19,24 +19,29 @@ export function getInterpolationKeys(...interpolationStrings: string[]) {
 }
 
 export function parseInterpolationStrings(
-  interpolationStrings: string[],
+  interpolationStrings: Iterable<string>,
   argTypeMap?: Record<string, string | GraphQLInputType>
 ) {
   const interpolationKeys = getInterpolationKeys(...interpolationStrings);
 
   const args: Record<string, { type: string | GraphQLInputType }> = {};
-  const contextVariables: string[] = [];
+  const contextVariables: Record<string, string> = {};
 
   for (const interpolationKey of interpolationKeys) {
     const interpolationKeyParts = interpolationKey.split('.');
     const varName = interpolationKeyParts[interpolationKeyParts.length - 1];
-    if (interpolationKeyParts[0] === 'args') {
-      const argType = argTypeMap && varName in argTypeMap ? argTypeMap[varName] : 'ID';
-      args[varName] = {
-        type: argType,
-      };
-    } else if (interpolationKeyParts[0] === 'context') {
-      contextVariables.push(varName);
+    const initialObject = interpolationKeyParts[0];
+    const argType =
+      argTypeMap && varName in argTypeMap ? argTypeMap[varName] : interpolationKeyParts.length > 2 ? 'JSON' : 'ID';
+    switch (initialObject) {
+      case 'args':
+        args[varName] = {
+          type: argType,
+        };
+        break;
+      case 'context':
+        contextVariables[varName] = `Scalars['${argType}']`;
+        break;
     }
   }