Skip to content

Commit

Permalink
Dependency upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
gilgardosh committed Feb 15, 2024
1 parent 3e2f819 commit aa5a5a9
Show file tree
Hide file tree
Showing 13 changed files with 729 additions and 552 deletions.
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,22 @@
"devDependencies": {
"@changesets/changelog-github": "0.5.0",
"@changesets/cli": "2.27.1",
"@theguild/eslint-config": "0.11.2",
"@theguild/prettier-config": "2.0.3",
"@types/node": "20.8.7",
"@theguild/eslint-config": "0.11.3",
"@theguild/prettier-config": "2.0.5",
"@types/node": "20.11.18",
"bob-the-bundler": "7.0.1",
"concurrently": "8.2.2",
"eslint": "8.56.0",
"glob": "10.3.10",
"husky": "8.0.3",
"lint-staged": "15.2.0",
"prettier": "3.1.1",
"husky": "9.0.11",
"lint-staged": "15.2.2",
"prettier": "3.2.5",
"prettier-plugin-sql": "0.18.0",
"typescript": "5.3.3"
},
"resolutions": {
"@changesets/**/prettier": "2.8.8"
},
"publishConfig": {
"directory": "dist",
"access": "public"
Expand Down
20 changes: 10 additions & 10 deletions packages/green-invoice-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@
"test": "ts-node ./dist/esm/dev-tests/e2e.js"
},
"dependencies": {
"@graphql-mesh/config": "0.97.4",
"@graphql-mesh/cross-helpers": "0.4.0",
"@graphql-mesh/http": "0.96.3",
"@graphql-mesh/json-schema": "0.95.3",
"@graphql-mesh/runtime": "0.96.2",
"@graphql-mesh/store": "0.95.2",
"@graphql-mesh/types": "0.95.2",
"@graphql-mesh/utils": "0.95.2",
"@graphql-mesh/config": "0.98.6",
"@graphql-mesh/cross-helpers": "0.4.1",
"@graphql-mesh/http": "0.97.6",
"@graphql-mesh/json-schema": "0.98.1",
"@graphql-mesh/runtime": "0.97.6",
"@graphql-mesh/store": "0.96.5",
"@graphql-mesh/types": "0.96.5",
"@graphql-mesh/utils": "0.96.5",
"graphql": "16.8.1",
"path": "0.12.7"
},
"devDependencies": {
"@graphql-mesh/cli": "0.87.3",
"@graphql-mesh/cli": "0.88.7",
"@types/mime-types": "^2.1.1",
"dotenv": "16.3.1",
"dotenv": "16.4.4",
"mime-types": "2.1.35",
"ts-node": "10.9.2"
},
Expand Down
File renamed without changes.
22 changes: 11 additions & 11 deletions packages/hashavshevet-mesh/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@
"test": "ts-node ./dist/esm/dev-tests/e2e.js"
},
"dependencies": {
"@graphql-mesh/config": "0.97.4",
"@graphql-mesh/cross-helpers": "0.4.0",
"@graphql-mesh/http": "0.96.3",
"@graphql-mesh/json-schema": "0.95.3",
"@graphql-mesh/runtime": "0.96.2",
"@graphql-mesh/store": "0.95.2",
"@graphql-mesh/transform-resolvers-composition": "0.95.2",
"@graphql-mesh/types": "0.95.2",
"@graphql-mesh/utils": "0.95.2",
"@graphql-mesh/config": "0.98.6",
"@graphql-mesh/cross-helpers": "0.4.1",
"@graphql-mesh/http": "0.97.6",
"@graphql-mesh/json-schema": "0.98.1",
"@graphql-mesh/runtime": "0.97.6",
"@graphql-mesh/store": "0.96.5",
"@graphql-mesh/transform-resolvers-composition": "0.96.5",
"@graphql-mesh/types": "0.96.5",
"@graphql-mesh/utils": "0.96.5",
"graphql": "16.8.1"
},
"devDependencies": {
"@graphql-mesh/cli": "0.87.3",
"dotenv": "16.3.1",
"@graphql-mesh/cli": "0.88.7",
"dotenv": "16.4.4",
"ts-node": "10.9.2"
},
"publishConfig": {
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions packages/israeli-vat-scraper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
},
"dependencies": {
"ajv": "8.12.0",
"dotenv": "16.3.1",
"puppeteer": "21.6.1"
},
"devDependencies": {
"@types/puppeteer": "7.0.4",
"nodemon": "3.0.2",
"pino-pretty": "10.3.0"
"dotenv": "16.4.4",
"nodemon": "3.0.3",
"pino-pretty": "10.3.1"
},
"publishConfig": {
"directory": "dist",
Expand Down
27 changes: 13 additions & 14 deletions packages/payper-mesh/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,28 @@
"scripts": {
"build": "tsc",
"dev": "ts-node ./index.ts",
"mesh:generate": "rimraf .mesh src/.mesh src/mesh-artifacts && NODE_OPTIONS=\"--loader ts-node/esm\" mesh build && mv .mesh src/.mesh",
"mesh:generate": "rimraf .mesh src/.mesh src/mesh-artifacts && NODE_OPTIONS=\"--loader ts-node/esm\" mesh build --dir ./src",
"prebuild": "yarn mesh:generate",
"prepublish": "yarn build",
"pretest": "yarn build",
"start": "node ./dist",
"test": "DEBUG=1 ts-node ./dev-tests/e2e.ts"
"test": "DEBUG=1 ts-node ./dist/esm/dev-tests/e2e.js"
},
"dependencies": {
"@graphql-mesh/config": "0.97.4",
"@graphql-mesh/cross-helpers": "0.4.0",
"@graphql-mesh/http": "0.96.3",
"@graphql-mesh/json-schema": "0.95.3",
"@graphql-mesh/runtime": "0.96.2",
"@graphql-mesh/store": "0.95.2",
"@graphql-mesh/transform-resolvers-composition": "0.95.2",
"@graphql-mesh/types": "0.95.2",
"@graphql-mesh/utils": "0.95.2",
"@graphql-mesh/config": "0.98.6",
"@graphql-mesh/cross-helpers": "0.4.1",
"@graphql-mesh/http": "0.97.6",
"@graphql-mesh/json-schema": "0.98.1",
"@graphql-mesh/runtime": "0.97.6",
"@graphql-mesh/store": "0.96.5",
"@graphql-mesh/transform-rename": "0.96.6",
"@graphql-mesh/types": "0.96.5",
"@graphql-mesh/utils": "0.96.5",
"graphql": "16.8.1",
"path": "0.12.7"
},
"devDependencies": {
"@graphql-mesh/cli": "0.87.3",
"dotenv": "16.3.1",
"@graphql-mesh/cli": "0.88.7",
"dotenv": "16.4.4",
"ts-node": "10.9.2"
},
"publishConfig": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ sources:
Accept: application/json
operations:
- type: Query
field: getExpenses
field: getExpensesRaw
path: /pull_expenses
method: POST
requestSchema: ./src/json-schemas/payperSchema.json#/definitions/getExpensesRequest
responseSchema: ./src/json-schemas/payperSchema.json#/definitions/getExpensesResponse
requestSchema: ./json-schemas/payperSchema.json#/definitions/getExpensesRequest
responseSchema: ./json-schemas/payperSchema.json#/definitions/getExpensesResponse

# getCustomerGeneralLedger
# getListOfInventory
# getQuantityForItem

transforms:
- resolversComposition:
mode: bare
compositions:
- resolver: Query.getExpenses
composer: src/resolvers/get-expenses-resolver
serve:
browser: false

sdk:
generateOperations:
selectionSetDepth: 2

additionalTypeDefs:
- ./additional-type-defs.graphql

additionalResolvers:
- ./resolvers/get-expenses-resolver.js
3 changes: 3 additions & 0 deletions packages/payper-mesh/src/additional-type-defs.graphql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
extend type Query {
getExpenses(input: getExpensesRequest_Input): getExpensesResponse
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { config } from 'dotenv';
import { init } from '../src/index.js';
import { init } from '../index.js';

config();
config({ path: '../../.env' });

const testRun = async () => {
const authToken = process.env['PAYPER_MESH_AUTH_TOKEN'] as string;
Expand Down
64 changes: 27 additions & 37 deletions packages/payper-mesh/src/resolvers/get-expenses-resolver.ts
Original file line number Diff line number Diff line change
@@ -1,42 +1,32 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
import type {
getExpensesResponse,
MeshContext,
QuerygetExpensesArgs,
QueryResolvers,
ResolverFn,
ResolversParentTypes, // @ts-ignore
} from '../mesh-artifacts/index.js';
import type { Resolvers } from '../mesh-artifacts/index.js';

const resolver = (
next: ResolverFn<
Promise<getExpensesResponse>,
ResolversParentTypes['Query'],
MeshContext,
Partial<QuerygetExpensesArgs>
>,
) => {
// @ts-ignore
const resolver: QueryResolvers['getExpenses'] = (root, args, context, info) => {
args.input ||= {};
if ('userName' in context && !args.input.api_user) {
args.input.api_user = context['userName'] as string;
}
// @ts-ignore
return next(root, args, context, info).then(async res => {
// fix for Payper returning Null in cases currency is "ILS"
const adjustedRes = await res;
// @ts-ignore
adjustedRes.expenses?.map(expense => {
if (expense) {
expense.currency_symbol ??= 'ILS';
}
const resolvers: Resolvers = {
Query: {
getExpenses: (root, args, context, info) => {
args.input ||= {};
if ('userName' in context && !args.input.api_user) {
args.input.api_user = context['userName'] as string;
}
return context.Payper.Query.getExpenses({
root,
args,
context,
info,
}).then(async res => {
// fix for Payper returning Null in cases currency is "ILS"
const adjustedRes = await res;
adjustedRes?.expenses?.map(expense => {
if (expense) {
expense.currency_symbol ??= 'ILS';
}
});
return res ?? null;
});
return res;
});
};
return resolver;
},
},
};

// eslint-disable-next-line import/no-default-export
export default resolver;
export default resolvers;

export { resolvers };
2 changes: 1 addition & 1 deletion tsconfig.tsbuildinfo

Large diffs are not rendered by default.

Loading

0 comments on commit aa5a5a9

Please sign in to comment.