diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 29134aec..e693ab3a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1,6 +1,7 @@ name: Test on: pull_request: {} + workflow_dispatch: jobs: test: diff --git a/.gitignore b/.gitignore index 8cc15005..51e8cf41 100644 --- a/.gitignore +++ b/.gitignore @@ -84,7 +84,7 @@ tmp_schema.json .parcel-cache # create-react-app test folder -tests/cra-test/cra-tmp +tests/vite-app-test/cra-tmp # IntelliJ IDEA project files .idea diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e9b459a..34755eaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 0.17.2 + +- Fix tests, upgrade minor versions of mobx, mobx-state-tree + ## 0.17.1 - Use [Pinst](https://www.npmjs.com/package/pinst) to fix `postinstall` scripts running when installing mst-gql diff --git a/examples/1-getting-started/package.json b/examples/1-getting-started/package.json index 885d873a..415f44de 100644 --- a/examples/1-getting-started/package.json +++ b/examples/1-getting-started/package.json @@ -15,14 +15,14 @@ "arg": "^5.0.2", "cors": "^2.8.5", "express": "^4.17.1", - "graphql": "^16.5.0", + "graphql": "15.8.0", "graphql-playground-middleware-express": "^1.7.21", "graphql-tag": "^2.12.6", "isomorphic-fetch": "^2.2.1", "jest": "^27.0.6", - "mobx": "^6.6.0", + "mobx": "^6.10.2", "mobx-react": "^7.5.0", - "mobx-state-tree": "^5.1.5", + "mobx-state-tree": "^5.3.0", "mst-gql": "portal:../../", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/examples/1-getting-started/src/app/models/RootStore.base.ts b/examples/1-getting-started/src/app/models/RootStore.base.ts index b78b2182..72ae9b07 100644 --- a/examples/1-getting-started/src/app/models/RootStore.base.ts +++ b/examples/1-getting-started/src/app/models/RootStore.base.ts @@ -13,7 +13,7 @@ import { todoModelPrimitives, TodoModelSelector } from "./TodoModel.base" export type CreateTodoInput = { id: string text: string - complete?: boolean + complete?: (boolean | null) } /* The TypeScript type that explicits the refs to other models in order to prevent a circular refs issue */ type Refs = { @@ -45,20 +45,20 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryTodos(variables?: { }, resultSelector: string | ((qb: TodoModelSelector) => TodoModelSelector) = todoModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ todos: TodoModelType[]}>(`query todos { todos { + return self.query<{ todos: TodoModelType[] }>(`query todos { todos { ${typeof resultSelector === "function" ? resultSelector(new TodoModelSelector()).toString() : resultSelector} } }`, variables, options) }, - queryStringFromServer(variables: { string?: string }, options: QueryOptions = {}) { + queryStringFromServer(variables: { string?: (string | null) }, options: QueryOptions = {}) { return self.query<{ stringFromServer: string }>(`query stringFromServer($string: String) { stringFromServer(string: $string) }`, variables, options) }, mutateToggleTodo(variables: { id: string }, resultSelector: string | ((qb: TodoModelSelector) => TodoModelSelector) = todoModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ toggleTodo: TodoModelType}>(`mutation toggleTodo($id: ID!) { toggleTodo(id: $id) { + return self.mutate<{ toggleTodo: TodoModelType }>(`mutation toggleTodo($id: ID!) { toggleTodo(id: $id) { ${typeof resultSelector === "function" ? resultSelector(new TodoModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, mutateCreateTodo(variables: { todo: CreateTodoInput }, resultSelector: string | ((qb: TodoModelSelector) => TodoModelSelector) = todoModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ createTodo: TodoModelType}>(`mutation createTodo($todo: CreateTodoInput!) { createTodo(todo: $todo) { + return self.mutate<{ createTodo: TodoModelType }>(`mutation createTodo($todo: CreateTodoInput!) { createTodo(todo: $todo) { ${typeof resultSelector === "function" ? resultSelector(new TodoModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, diff --git a/examples/2-scaffolding/package.json b/examples/2-scaffolding/package.json index 00c8ef0f..a7f36477 100644 --- a/examples/2-scaffolding/package.json +++ b/examples/2-scaffolding/package.json @@ -7,9 +7,10 @@ "start": "yarn scaffold && yarn build" }, "dependencies": { + "graphql": "^16.5.0", "graphql-request": "^4.3.0", - "mobx": "^6.6.0", - "mobx-state-tree": "^5.1.5", + "mobx": "^6.10.2", + "mobx-state-tree": "^5.3.0", "mst-gql": "portal:../../" }, "devDependencies": { diff --git a/examples/2-scaffolding/src/models/RootStore.base.ts b/examples/2-scaffolding/src/models/RootStore.base.ts index 841f540c..2e469ffd 100644 --- a/examples/2-scaffolding/src/models/RootStore.base.ts +++ b/examples/2-scaffolding/src/models/RootStore.base.ts @@ -46,12 +46,12 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryPokemons(variables: { first: number }, resultSelector: string | ((qb: PokemonModelSelector) => PokemonModelSelector) = pokemonModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ pokemons: PokemonModelType[]}>(`query pokemons($first: Int!) { pokemons(first: $first) { + return self.query<{ pokemons: PokemonModelType[] }>(`query pokemons($first: Int!) { pokemons(first: $first) { ${typeof resultSelector === "function" ? resultSelector(new PokemonModelSelector()).toString() : resultSelector} } }`, variables, options) }, queryPokemon(variables: { id?: (string | null), name?: (string | null) }, resultSelector: string | ((qb: PokemonModelSelector) => PokemonModelSelector) = pokemonModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ pokemon: PokemonModelType}>(`query pokemon($id: String, $name: String) { pokemon(id: $id, name: $name) { + return self.query<{ pokemon: PokemonModelType }>(`query pokemon($id: String, $name: String) { pokemon(id: $id, name: $name) { ${typeof resultSelector === "function" ? resultSelector(new PokemonModelSelector()).toString() : resultSelector} } }`, variables, options) }, diff --git a/examples/3-twitter-clone/package.json b/examples/3-twitter-clone/package.json index cf94432f..e1b92536 100644 --- a/examples/3-twitter-clone/package.json +++ b/examples/3-twitter-clone/package.json @@ -16,11 +16,13 @@ "cors": "^2.8.5", "express": "^4.17.1", "fakergem": "^1.0.3", + "graphql": "15.8.0", "graphql-playground-middleware-express": "^1.7.21", "isomorphic-fetch": "^2.2.1", - "mobx": "^6.6.0", - "mobx-react-lite": "^1.4.1", - "mobx-state-tree": "^5.1.5", + "mobx": "^6.10.2", + "mobx-react": "^7.5.0", + "mobx-react-lite": "^4.0.5", + "mobx-state-tree": "^5.3.0", "mst-gql": "portal:../../", "node-uuid": "^1.4.8", "react": "^18.2.0", diff --git a/examples/3-twitter-clone/public/index.html b/examples/3-twitter-clone/public/index.html index 071a21f3..71cc7200 100644 --- a/examples/3-twitter-clone/public/index.html +++ b/examples/3-twitter-clone/public/index.html @@ -9,6 +9,6 @@
- + diff --git a/examples/3-twitter-clone/src/app/components/Message.tsx b/examples/3-twitter-clone/src/app/components/Message.tsx index 9ae0dec3..3d6a06f6 100644 --- a/examples/3-twitter-clone/src/app/components/Message.tsx +++ b/examples/3-twitter-clone/src/app/components/Message.tsx @@ -6,7 +6,14 @@ import { MessageModelType } from "../models/" import { Replies } from "./Replies" // @ts-ignore -import images from "../avatars/*.jpg" +import chuck from "../avatars/chuck.jpg" +// @ts-ignore +import michel from "../avatars/michel.jpg" + +const images = { + michel, + chuck +} export const Message = observer( ({ message, asChild }: { message: MessageModelType; asChild?: boolean }) => { diff --git a/examples/3-twitter-clone/src/app/models/MessageModel.base.ts b/examples/3-twitter-clone/src/app/models/MessageModel.base.ts index 379f309f..bef60d36 100644 --- a/examples/3-twitter-clone/src/app/models/MessageModel.base.ts +++ b/examples/3-twitter-clone/src/app/models/MessageModel.base.ts @@ -44,9 +44,9 @@ export class MessageModelSelector extends QueryBuilder { get id() { return this.__attr(`id`) } get timestamp() { return this.__attr(`timestamp`) } get text() { return this.__attr(`text`) } - user(builder?: string | UserModelSelector | ((selector: UserModelSelector) => UserModelSelector)) { return this.__child(`user`, UserModelSelector, builder) } - likes(builder?: string | UserModelSelector | ((selector: UserModelSelector) => UserModelSelector)) { return this.__child(`likes`, UserModelSelector, builder) } - replyTo(builder?: string | MessageModelSelector | ((selector: MessageModelSelector) => MessageModelSelector)) { return this.__child(`replyTo`, MessageModelSelector, builder) } + user(builder: string | UserModelSelector | ((selector: UserModelSelector) => UserModelSelector) | undefined) { return this.__child(`user`, UserModelSelector, builder) } + likes(builder: string | UserModelSelector | ((selector: UserModelSelector) => UserModelSelector) | undefined) { return this.__child(`likes`, UserModelSelector, builder) } + replyTo(builder: string | MessageModelSelector | ((selector: MessageModelSelector) => MessageModelSelector) | undefined) { return this.__child(`replyTo`, MessageModelSelector, builder) } } export function selectFromMessage() { return new MessageModelSelector() diff --git a/examples/3-twitter-clone/src/app/models/RootStore.base.ts b/examples/3-twitter-clone/src/app/models/RootStore.base.ts index fc7eeffc..2dcdf2b7 100644 --- a/examples/3-twitter-clone/src/app/models/RootStore.base.ts +++ b/examples/3-twitter-clone/src/app/models/RootStore.base.ts @@ -47,42 +47,42 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ querySearch(variables: { searchText: string }, resultSelector: string | ((qb: SearchResultModelSelector) => SearchResultModelSelector) = searchResultModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ search: SearchResultUnion[]}>(`query search($searchText: String!) { search(searchText: $searchText) { + return self.query<{ search: SearchResultUnion[] }>(`query search($searchText: String!) { search(searchText: $searchText) { ${typeof resultSelector === "function" ? resultSelector(new SearchResultModelSelector()).toString() : resultSelector} } }`, variables, options) }, - queryMessages(variables: { offset?: string, count?: number, replyTo?: string }, resultSelector: string | ((qb: MessageModelSelector) => MessageModelSelector) = messageModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ messages: MessageModelType[]}>(`query messages($offset: ID, $count: Int, $replyTo: ID) { messages(offset: $offset, count: $count, replyTo: $replyTo) { + queryMessages(variables: { offset?: (string | null), count?: (number | null), replyTo?: (string | null) }, resultSelector: string | ((qb: MessageModelSelector) => MessageModelSelector) = messageModelPrimitives.toString(), options: QueryOptions = {}) { + return self.query<{ messages: MessageModelType[] }>(`query messages($offset: ID, $count: Int, $replyTo: ID) { messages(offset: $offset, count: $count, replyTo: $replyTo) { ${typeof resultSelector === "function" ? resultSelector(new MessageModelSelector()).toString() : resultSelector} } }`, variables, options) }, queryMessage(variables: { id: string }, resultSelector: string | ((qb: MessageModelSelector) => MessageModelSelector) = messageModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ message: MessageModelType}>(`query message($id: ID!) { message(id: $id) { + return self.query<{ message: MessageModelType }>(`query message($id: ID!) { message(id: $id) { ${typeof resultSelector === "function" ? resultSelector(new MessageModelSelector()).toString() : resultSelector} } }`, variables, options) }, queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(`query me { me { + return self.query<{ me: UserModelType }>(`query me { me { ${typeof resultSelector === "function" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }`, variables, options) }, mutateChangeName(variables: { id: string, name: string }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ changeName: UserModelType}>(`mutation changeName($id: ID!, $name: String!) { changeName(id: $id, name: $name) { + return self.mutate<{ changeName: UserModelType }>(`mutation changeName($id: ID!, $name: String!) { changeName(id: $id, name: $name) { ${typeof resultSelector === "function" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, mutateLike(variables: { msg: string, user: string }, resultSelector: string | ((qb: MessageModelSelector) => MessageModelSelector) = messageModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ like: MessageModelType}>(`mutation like($msg: ID!, $user: ID!) { like(msg: $msg, user: $user) { + return self.mutate<{ like: MessageModelType }>(`mutation like($msg: ID!, $user: ID!) { like(msg: $msg, user: $user) { ${typeof resultSelector === "function" ? resultSelector(new MessageModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, - mutatePostTweet(variables: { text: string, user: string, replyTo?: string }, resultSelector: string | ((qb: MessageModelSelector) => MessageModelSelector) = messageModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ postTweet: MessageModelType}>(`mutation postTweet($text: String!, $user: ID!, $replyTo: ID) { postTweet(text: $text, user: $user, replyTo: $replyTo) { + mutatePostTweet(variables: { text: string, user: string, replyTo?: (string | null) }, resultSelector: string | ((qb: MessageModelSelector) => MessageModelSelector) = messageModelPrimitives.toString(), optimisticUpdate?: () => void) { + return self.mutate<{ postTweet: MessageModelType }>(`mutation postTweet($text: String!, $user: ID!, $replyTo: ID) { postTweet(text: $text, user: $user, replyTo: $replyTo) { ${typeof resultSelector === "function" ? resultSelector(new MessageModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, subscribeNewMessages(variables?: { }, resultSelector: string | ((qb: MessageModelSelector) => MessageModelSelector) = messageModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { - return self.subscribe<{ newMessages: MessageModelType}>(`subscription newMessages { newMessages { + return self.subscribe<{ newMessages: MessageModelType }>(`subscription newMessages { newMessages { ${typeof resultSelector === "function" ? resultSelector(new MessageModelSelector()).toString() : resultSelector} } }`, variables, onData, onError) }, diff --git a/examples/3-twitter-clone/src/app/models/index.ts b/examples/3-twitter-clone/src/app/models/index.ts index d93ca78e..57205fa5 100644 --- a/examples/3-twitter-clone/src/app/models/index.ts +++ b/examples/3-twitter-clone/src/app/models/index.ts @@ -2,8 +2,8 @@ /* eslint-disable */ /* tslint:disable */ -export * from "./SearchResultModelSelector" export * from "./UserModel" export * from "./MessageModel" +export * from "./SearchResultModelSelector" export * from "./RootStore" export * from "./reactUtils" diff --git a/examples/3-twitter-clone/src/app/tsconfig.json b/examples/3-twitter-clone/src/app/tsconfig.json index b5eb75b3..c8e20135 100644 --- a/examples/3-twitter-clone/src/app/tsconfig.json +++ b/examples/3-twitter-clone/src/app/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { - "target": "es5", - "rootDir": "./src/app", - "baseUrl": "./src/app", + "target": "es6", + "rootDir": "./", + // "baseUrl": "./src/app", "strict": false, "lib": ["dom", "es2018", "esnext.asynciterable", "esnext.array"], "jsx": "react", diff --git a/examples/4-apollo-tutorial/client/package.json b/examples/4-apollo-tutorial/client/package.json index bd65d4b0..befe6b6f 100644 --- a/examples/4-apollo-tutorial/client/package.json +++ b/examples/4-apollo-tutorial/client/package.json @@ -19,10 +19,12 @@ "react-scripts": "^5.0.1" }, "devDependencies": { + "graphql": "^16.8.1", + "graphql-request": "^6.1.0", "jest-dom": "^3.0.0", - "mobx": "^6.6.0", + "mobx": "^6.10.2", "mobx-react": "^7.5.0", - "mobx-state-tree": "^5.1.5", + "mobx-state-tree": "^5.3.0", "react-testing-library": "^5.4.4", "wait-port": "^0.2.9" }, diff --git a/examples/4-apollo-tutorial/server/package.json b/examples/4-apollo-tutorial/server/package.json index b032e117..d18d405e 100644 --- a/examples/4-apollo-tutorial/server/package.json +++ b/examples/4-apollo-tutorial/server/package.json @@ -15,10 +15,10 @@ "apollo-server": "^2.9.4", "apollo-server-testing": "^2.9.4", "dotenv": "^6.1.0", - "graphql": "^16.5.0", + "graphql": "15.8.0", "isemail": "^3.1.3", "nodemon": "^1.19.2", - "sequelize": "^5.15.1", + "sequelize": "^6.29.0", "sqlite3": "^4.0.9" }, "devDependencies": { diff --git a/examples/4-apollo-tutorial/server/store.sqlite b/examples/4-apollo-tutorial/server/store.sqlite index 4f8e715b..c7d5b46c 100644 Binary files a/examples/4-apollo-tutorial/server/store.sqlite and b/examples/4-apollo-tutorial/server/store.sqlite differ diff --git a/examples/5-nextjs/next-env.d.ts b/examples/5-nextjs/next-env.d.ts index 7b7aa2c7..4f11a03d 100644 --- a/examples/5-nextjs/next-env.d.ts +++ b/examples/5-nextjs/next-env.d.ts @@ -1,2 +1,5 @@ /// -/// +/// + +// NOTE: This file should not be edited +// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/examples/5-nextjs/package.json b/examples/5-nextjs/package.json index 849a96fd..5d4e1724 100644 --- a/examples/5-nextjs/package.json +++ b/examples/5-nextjs/package.json @@ -10,11 +10,12 @@ "apollo-server-express": "^2.18.0", "cross-env": "^5.2.1", "express": "^4.17.1", - "mobx": "^6.6.0", + "graphql": "15.8.0", + "mobx": "^6.10.2", "mobx-react": "^7.5.0", - "mobx-state-tree": "^5.1.5", + "mobx-state-tree": "^5.3.0", "mst-gql": "portal:../../", - "next": "^12.2.2" + "next": "^13.5.0" }, "devDependencies": { "@types/react": "^18.0.15", @@ -23,8 +24,5 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "typescript": "^4.7.3" - }, - "resolutions": { - "graphql": "^16.5.0" } } diff --git a/examples/5-nextjs/tsconfig.json b/examples/5-nextjs/tsconfig.json index bdebe08f..c11254d5 100644 --- a/examples/5-nextjs/tsconfig.json +++ b/examples/5-nextjs/tsconfig.json @@ -14,7 +14,8 @@ "forceConsistentCasingInFileNames": true, "moduleResolution": "node", "resolveJsonModule": true, - "isolatedModules": true + "isolatedModules": true, + "incremental": true }, "exclude": ["node_modules"], "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"] diff --git a/examples/6-scaffolding-ts-hasura/package.json b/examples/6-scaffolding-ts-hasura/package.json index a7831280..d0859d9d 100644 --- a/examples/6-scaffolding-ts-hasura/package.json +++ b/examples/6-scaffolding-ts-hasura/package.json @@ -6,9 +6,10 @@ "start": "yarn scaffold && yarn build" }, "dependencies": { + "graphql": "^16.8.1", "graphql-request": "^4.3.0", - "mobx": "^6.6.0", - "mobx-state-tree": "^5.1.5", + "mobx": "^6.10.2", + "mobx-state-tree": "^5.3.0", "mst-gql": "portal:../../" }, "devDependencies": { diff --git a/examples/6-scaffolding-ts-hasura/src/models/PollsModel.base.ts b/examples/6-scaffolding-ts-hasura/src/models/PollsModel.base.ts index 371e2fc9..c184a5a7 100644 --- a/examples/6-scaffolding-ts-hasura/src/models/PollsModel.base.ts +++ b/examples/6-scaffolding-ts-hasura/src/models/PollsModel.base.ts @@ -56,8 +56,8 @@ export class PollsModelSelector extends QueryBuilder { get question() { return this.__attr(`question`) } get updated_at() { return this.__attr(`updated_at`) } get updated_by() { return this.__attr(`updated_by`) } - choices(builder: string | ChoicesModelSelector | ((selector: ChoicesModelSelector) => ChoicesModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }) { return this.__child(`choices`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesModelSelector, builder) } - choices_aggregate(builder: string | ChoicesAggregateModelSelector | ((selector: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }) { return this.__child(`choices_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesAggregateModelSelector, builder) } + choices(builder: string | ChoicesModelSelector | ((selector: ChoicesModelSelector) => ChoicesModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }) { return this.__child(`choices`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesModelSelector, builder) } + choices_aggregate(builder: string | ChoicesAggregateModelSelector | ((selector: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }) { return this.__child(`choices_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesAggregateModelSelector, builder) } } export function selectFromPolls() { return new PollsModelSelector() diff --git a/examples/6-scaffolding-ts-hasura/src/models/QueryRootModel.base.ts b/examples/6-scaffolding-ts-hasura/src/models/QueryRootModel.base.ts index 6e6fa7f4..01afbc9e 100644 --- a/examples/6-scaffolding-ts-hasura/src/models/QueryRootModel.base.ts +++ b/examples/6-scaffolding-ts-hasura/src/models/QueryRootModel.base.ts @@ -50,11 +50,11 @@ export const QueryRootModelBase = withTypedRefs()(ModelBase }))) export class QueryRootModelSelector extends QueryBuilder { - choices(builder: string | ChoicesModelSelector | ((selector: ChoicesModelSelector) => ChoicesModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }) { return this.__child(`choices`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesModelSelector, builder) } - choices_aggregate(builder: string | ChoicesAggregateModelSelector | ((selector: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }) { return this.__child(`choices_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesAggregateModelSelector, builder) } + choices(builder: string | ChoicesModelSelector | ((selector: ChoicesModelSelector) => ChoicesModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }) { return this.__child(`choices`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesModelSelector, builder) } + choices_aggregate(builder: string | ChoicesAggregateModelSelector | ((selector: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }) { return this.__child(`choices_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesAggregateModelSelector, builder) } choices_by_pk(builder: string | ChoicesModelSelector | ((selector: ChoicesModelSelector) => ChoicesModelSelector) | undefined, args: { id: any }) { return this.__child(`choices_by_pk`+ (args ? '('+['id'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesModelSelector, builder) } - polls(builder: string | PollsModelSelector | ((selector: PollsModelSelector) => PollsModelSelector) | undefined, args?: { distinctOn?: PollsSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[], where?: (PollsBoolExp | null) }) { return this.__child(`polls`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsModelSelector, builder) } - polls_aggregate(builder: string | PollsAggregateModelSelector | ((selector: PollsAggregateModelSelector) => PollsAggregateModelSelector) | undefined, args?: { distinctOn?: PollsSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[], where?: (PollsBoolExp | null) }) { return this.__child(`polls_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsAggregateModelSelector, builder) } + polls(builder: string | PollsModelSelector | ((selector: PollsModelSelector) => PollsModelSelector) | undefined, args?: { distinctOn?: PollsSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[] | null, where?: (PollsBoolExp | null) }) { return this.__child(`polls`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsModelSelector, builder) } + polls_aggregate(builder: string | PollsAggregateModelSelector | ((selector: PollsAggregateModelSelector) => PollsAggregateModelSelector) | undefined, args?: { distinctOn?: PollsSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[] | null, where?: (PollsBoolExp | null) }) { return this.__child(`polls_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsAggregateModelSelector, builder) } polls_by_pk(builder: string | PollsModelSelector | ((selector: PollsModelSelector) => PollsModelSelector) | undefined, args: { id: any }) { return this.__child(`polls_by_pk`+ (args ? '('+['id'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsModelSelector, builder) } } export function selectFromQueryRoot() { diff --git a/examples/6-scaffolding-ts-hasura/src/models/RootStore.base.ts b/examples/6-scaffolding-ts-hasura/src/models/RootStore.base.ts index 0f2dd80f..b9d663cd 100644 --- a/examples/6-scaffolding-ts-hasura/src/models/RootStore.base.ts +++ b/examples/6-scaffolding-ts-hasura/src/models/RootStore.base.ts @@ -82,12 +82,12 @@ export type BigintComparisonExp = { _eq?: (any | null) _gt?: (any | null) _gte?: (any | null) - _in?: any[] + _in?: any[] | null _is_null?: (boolean | null) _lt?: (any | null) _lte?: (any | null) _neq?: (any | null) - _nin?: any[] + _nin?: any[] | null } export type ChoicesAggregateOrderBy = { avg?: (ChoicesAvgOrderBy | null) @@ -111,9 +111,9 @@ export type ChoicesAvgOrderBy = { poll_id?: (OrderBy | null) } export type ChoicesBoolExp = { - _and?: (ChoicesBoolExp | null)[] + _and?: (ChoicesBoolExp | null)[] | null _not?: (ChoicesBoolExp | null) - _or?: (ChoicesBoolExp | null)[] + _or?: (ChoicesBoolExp | null)[] | null id?: (BigintComparisonExp | null) poll?: (PollsBoolExp | null) poll_id?: (BigintComparisonExp | null) @@ -209,9 +209,9 @@ export type PollsAvgOrderBy = { updated_by?: (OrderBy | null) } export type PollsBoolExp = { - _and?: (PollsBoolExp | null)[] + _and?: (PollsBoolExp | null)[] | null _not?: (PollsBoolExp | null) - _or?: (PollsBoolExp | null)[] + _or?: (PollsBoolExp | null)[] | null choices?: (ChoicesBoolExp | null) created_at?: (TimestampComparisonExp | null) created_by?: (BigintComparisonExp | null) @@ -327,14 +327,14 @@ export type StringComparisonExp = { _gt?: (string | null) _gte?: (string | null) _ilike?: (string | null) - _in?: string[] + _in?: string[] | null _is_null?: (boolean | null) _like?: (string | null) _lt?: (string | null) _lte?: (string | null) _neq?: (string | null) _nilike?: (string | null) - _nin?: string[] + _nin?: string[] | null _nlike?: (string | null) _nsimilar?: (string | null) _similar?: (string | null) @@ -343,12 +343,12 @@ export type TimestampComparisonExp = { _eq?: (any | null) _gt?: (any | null) _gte?: (any | null) - _in?: any[] + _in?: any[] | null _is_null?: (boolean | null) _lt?: (any | null) _lte?: (any | null) _neq?: (any | null) - _nin?: any[] + _nin?: any[] | null } /* The TypeScript type that explicits the refs to other models in order to prevent a circular refs issue */ type Refs = { @@ -374,93 +374,93 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore polls: types.optional(types.map(types.late((): any => PollsModel)), {}) }) .actions(self => ({ - queryChoices(variables: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }, resultSelector: string | ((qb: ChoicesModelSelector) => ChoicesModelSelector) = choicesModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ choices: ChoicesModelType[]}>(`query choices($distinctOn: [choices_select_column!], $limit: Int, $offset: Int, $orderBy: [choices_order_by!], $where: choices_bool_exp) { choices(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { + queryChoices(variables: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }, resultSelector: string | ((qb: ChoicesModelSelector) => ChoicesModelSelector) = choicesModelPrimitives.toString(), options: QueryOptions = {}) { + return self.query<{ choices: ChoicesModelType[] }>(`query choices($distinctOn: [choices_select_column!], $limit: Int, $offset: Int, $orderBy: [choices_order_by!], $where: choices_bool_exp) { choices(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new ChoicesModelSelector()).toString() : resultSelector} } }`, variables, options) }, - queryChoices_aggregate(variables: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }, resultSelector: string | ((qb: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) = choicesAggregateModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ choices_aggregate: ChoicesAggregateModelType}>(`query choices_aggregate($distinctOn: [choices_select_column!], $limit: Int, $offset: Int, $orderBy: [choices_order_by!], $where: choices_bool_exp) { choices_aggregate(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { + queryChoices_aggregate(variables: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }, resultSelector: string | ((qb: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) = choicesAggregateModelPrimitives.toString(), options: QueryOptions = {}) { + return self.query<{ choices_aggregate: ChoicesAggregateModelType }>(`query choices_aggregate($distinctOn: [choices_select_column!], $limit: Int, $offset: Int, $orderBy: [choices_order_by!], $where: choices_bool_exp) { choices_aggregate(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new ChoicesAggregateModelSelector()).toString() : resultSelector} } }`, variables, options) }, queryChoices_by_pk(variables: { id: any }, resultSelector: string | ((qb: ChoicesModelSelector) => ChoicesModelSelector) = choicesModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ choices_by_pk: ChoicesModelType}>(`query choices_by_pk($id: bigint!) { choices_by_pk(id: $id) { + return self.query<{ choices_by_pk: ChoicesModelType }>(`query choices_by_pk($id: bigint!) { choices_by_pk(id: $id) { ${typeof resultSelector === "function" ? resultSelector(new ChoicesModelSelector()).toString() : resultSelector} } }`, variables, options) }, - queryPolls(variables: { distinctOn?: PollsSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[], where?: (PollsBoolExp | null) }, resultSelector: string | ((qb: PollsModelSelector) => PollsModelSelector) = pollsModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ polls: PollsModelType[]}>(`query polls($distinctOn: [polls_select_column!], $limit: Int, $offset: Int, $orderBy: [polls_order_by!], $where: polls_bool_exp) { polls(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { + queryPolls(variables: { distinctOn?: PollsSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[] | null, where?: (PollsBoolExp | null) }, resultSelector: string | ((qb: PollsModelSelector) => PollsModelSelector) = pollsModelPrimitives.toString(), options: QueryOptions = {}) { + return self.query<{ polls: PollsModelType[] }>(`query polls($distinctOn: [polls_select_column!], $limit: Int, $offset: Int, $orderBy: [polls_order_by!], $where: polls_bool_exp) { polls(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new PollsModelSelector()).toString() : resultSelector} } }`, variables, options) }, - queryPolls_aggregate(variables: { distinctOn?: PollsSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[], where?: (PollsBoolExp | null) }, resultSelector: string | ((qb: PollsAggregateModelSelector) => PollsAggregateModelSelector) = pollsAggregateModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ polls_aggregate: PollsAggregateModelType}>(`query polls_aggregate($distinctOn: [polls_select_column!], $limit: Int, $offset: Int, $orderBy: [polls_order_by!], $where: polls_bool_exp) { polls_aggregate(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { + queryPolls_aggregate(variables: { distinctOn?: PollsSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[] | null, where?: (PollsBoolExp | null) }, resultSelector: string | ((qb: PollsAggregateModelSelector) => PollsAggregateModelSelector) = pollsAggregateModelPrimitives.toString(), options: QueryOptions = {}) { + return self.query<{ polls_aggregate: PollsAggregateModelType }>(`query polls_aggregate($distinctOn: [polls_select_column!], $limit: Int, $offset: Int, $orderBy: [polls_order_by!], $where: polls_bool_exp) { polls_aggregate(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new PollsAggregateModelSelector()).toString() : resultSelector} } }`, variables, options) }, queryPolls_by_pk(variables: { id: any }, resultSelector: string | ((qb: PollsModelSelector) => PollsModelSelector) = pollsModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ polls_by_pk: PollsModelType}>(`query polls_by_pk($id: bigint!) { polls_by_pk(id: $id) { + return self.query<{ polls_by_pk: PollsModelType }>(`query polls_by_pk($id: bigint!) { polls_by_pk(id: $id) { ${typeof resultSelector === "function" ? resultSelector(new PollsModelSelector()).toString() : resultSelector} } }`, variables, options) }, mutateDelete_choices(variables: { where: ChoicesBoolExp }, resultSelector: string | ((qb: ChoicesMutationResponseModelSelector) => ChoicesMutationResponseModelSelector) = choicesMutationResponseModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ delete_choices: ChoicesMutationResponseModelType}>(`mutation delete_choices($where: choices_bool_exp!) { delete_choices(where: $where) { + return self.mutate<{ delete_choices: ChoicesMutationResponseModelType }>(`mutation delete_choices($where: choices_bool_exp!) { delete_choices(where: $where) { ${typeof resultSelector === "function" ? resultSelector(new ChoicesMutationResponseModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, mutateDelete_polls(variables: { where: PollsBoolExp }, resultSelector: string | ((qb: PollsMutationResponseModelSelector) => PollsMutationResponseModelSelector) = pollsMutationResponseModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ delete_polls: PollsMutationResponseModelType}>(`mutation delete_polls($where: polls_bool_exp!) { delete_polls(where: $where) { + return self.mutate<{ delete_polls: PollsMutationResponseModelType }>(`mutation delete_polls($where: polls_bool_exp!) { delete_polls(where: $where) { ${typeof resultSelector === "function" ? resultSelector(new PollsMutationResponseModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, mutateInsert_choices(variables: { objects: ChoicesInsertInput[], onConflict?: (ChoicesOnConflict | null) }, resultSelector: string | ((qb: ChoicesMutationResponseModelSelector) => ChoicesMutationResponseModelSelector) = choicesMutationResponseModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ insert_choices: ChoicesMutationResponseModelType}>(`mutation insert_choices($objects: [choices_insert_input!]!, $onConflict: choices_on_conflict) { insert_choices(objects: $objects, on_conflict: $onConflict) { + return self.mutate<{ insert_choices: ChoicesMutationResponseModelType }>(`mutation insert_choices($objects: [choices_insert_input!]!, $onConflict: choices_on_conflict) { insert_choices(objects: $objects, on_conflict: $onConflict) { ${typeof resultSelector === "function" ? resultSelector(new ChoicesMutationResponseModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, mutateInsert_polls(variables: { objects: PollsInsertInput[], onConflict?: (PollsOnConflict | null) }, resultSelector: string | ((qb: PollsMutationResponseModelSelector) => PollsMutationResponseModelSelector) = pollsMutationResponseModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ insert_polls: PollsMutationResponseModelType}>(`mutation insert_polls($objects: [polls_insert_input!]!, $onConflict: polls_on_conflict) { insert_polls(objects: $objects, on_conflict: $onConflict) { + return self.mutate<{ insert_polls: PollsMutationResponseModelType }>(`mutation insert_polls($objects: [polls_insert_input!]!, $onConflict: polls_on_conflict) { insert_polls(objects: $objects, on_conflict: $onConflict) { ${typeof resultSelector === "function" ? resultSelector(new PollsMutationResponseModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, mutateUpdate_choices(variables: { inc?: (ChoicesIncInput | null), set?: (ChoicesSetInput | null), where: ChoicesBoolExp }, resultSelector: string | ((qb: ChoicesMutationResponseModelSelector) => ChoicesMutationResponseModelSelector) = choicesMutationResponseModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ update_choices: ChoicesMutationResponseModelType}>(`mutation update_choices($inc: choices_inc_input, $set: choices_set_input, $where: choices_bool_exp!) { update_choices(_inc: $inc, _set: $set, where: $where) { + return self.mutate<{ update_choices: ChoicesMutationResponseModelType }>(`mutation update_choices($inc: choices_inc_input, $set: choices_set_input, $where: choices_bool_exp!) { update_choices(_inc: $inc, _set: $set, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new ChoicesMutationResponseModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, mutateUpdate_polls(variables: { inc?: (PollsIncInput | null), set?: (PollsSetInput | null), where: PollsBoolExp }, resultSelector: string | ((qb: PollsMutationResponseModelSelector) => PollsMutationResponseModelSelector) = pollsMutationResponseModelPrimitives.toString(), optimisticUpdate?: () => void) { - return self.mutate<{ update_polls: PollsMutationResponseModelType}>(`mutation update_polls($inc: polls_inc_input, $set: polls_set_input, $where: polls_bool_exp!) { update_polls(_inc: $inc, _set: $set, where: $where) { + return self.mutate<{ update_polls: PollsMutationResponseModelType }>(`mutation update_polls($inc: polls_inc_input, $set: polls_set_input, $where: polls_bool_exp!) { update_polls(_inc: $inc, _set: $set, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new PollsMutationResponseModelSelector()).toString() : resultSelector} } }`, variables, optimisticUpdate) }, - subscribeChoices(variables: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }, resultSelector: string | ((qb: ChoicesModelSelector) => ChoicesModelSelector) = choicesModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { - return self.subscribe<{ choices: ChoicesModelType[]}>(`subscription choices($distinctOn: [choices_select_column!], $limit: Int, $offset: Int, $orderBy: [choices_order_by!], $where: choices_bool_exp) { choices(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { + subscribeChoices(variables: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }, resultSelector: string | ((qb: ChoicesModelSelector) => ChoicesModelSelector) = choicesModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { + return self.subscribe<{ choices: ChoicesModelType[] }>(`subscription choices($distinctOn: [choices_select_column!], $limit: Int, $offset: Int, $orderBy: [choices_order_by!], $where: choices_bool_exp) { choices(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new ChoicesModelSelector()).toString() : resultSelector} } }`, variables, onData, onError) }, - subscribeChoices_aggregate(variables: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }, resultSelector: string | ((qb: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) = choicesAggregateModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { - return self.subscribe<{ choices_aggregate: ChoicesAggregateModelType}>(`subscription choices_aggregate($distinctOn: [choices_select_column!], $limit: Int, $offset: Int, $orderBy: [choices_order_by!], $where: choices_bool_exp) { choices_aggregate(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { + subscribeChoices_aggregate(variables: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }, resultSelector: string | ((qb: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) = choicesAggregateModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { + return self.subscribe<{ choices_aggregate: ChoicesAggregateModelType }>(`subscription choices_aggregate($distinctOn: [choices_select_column!], $limit: Int, $offset: Int, $orderBy: [choices_order_by!], $where: choices_bool_exp) { choices_aggregate(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new ChoicesAggregateModelSelector()).toString() : resultSelector} } }`, variables, onData, onError) }, subscribeChoices_by_pk(variables: { id: any }, resultSelector: string | ((qb: ChoicesModelSelector) => ChoicesModelSelector) = choicesModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { - return self.subscribe<{ choices_by_pk: ChoicesModelType}>(`subscription choices_by_pk($id: bigint!) { choices_by_pk(id: $id) { + return self.subscribe<{ choices_by_pk: ChoicesModelType }>(`subscription choices_by_pk($id: bigint!) { choices_by_pk(id: $id) { ${typeof resultSelector === "function" ? resultSelector(new ChoicesModelSelector()).toString() : resultSelector} } }`, variables, onData, onError) }, - subscribePolls(variables: { distinctOn?: PollsSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[], where?: (PollsBoolExp | null) }, resultSelector: string | ((qb: PollsModelSelector) => PollsModelSelector) = pollsModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { - return self.subscribe<{ polls: PollsModelType[]}>(`subscription polls($distinctOn: [polls_select_column!], $limit: Int, $offset: Int, $orderBy: [polls_order_by!], $where: polls_bool_exp) { polls(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { + subscribePolls(variables: { distinctOn?: PollsSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[] | null, where?: (PollsBoolExp | null) }, resultSelector: string | ((qb: PollsModelSelector) => PollsModelSelector) = pollsModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { + return self.subscribe<{ polls: PollsModelType[] }>(`subscription polls($distinctOn: [polls_select_column!], $limit: Int, $offset: Int, $orderBy: [polls_order_by!], $where: polls_bool_exp) { polls(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new PollsModelSelector()).toString() : resultSelector} } }`, variables, onData, onError) }, - subscribePolls_aggregate(variables: { distinctOn?: PollsSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[], where?: (PollsBoolExp | null) }, resultSelector: string | ((qb: PollsAggregateModelSelector) => PollsAggregateModelSelector) = pollsAggregateModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { - return self.subscribe<{ polls_aggregate: PollsAggregateModelType}>(`subscription polls_aggregate($distinctOn: [polls_select_column!], $limit: Int, $offset: Int, $orderBy: [polls_order_by!], $where: polls_bool_exp) { polls_aggregate(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { + subscribePolls_aggregate(variables: { distinctOn?: PollsSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[] | null, where?: (PollsBoolExp | null) }, resultSelector: string | ((qb: PollsAggregateModelSelector) => PollsAggregateModelSelector) = pollsAggregateModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { + return self.subscribe<{ polls_aggregate: PollsAggregateModelType }>(`subscription polls_aggregate($distinctOn: [polls_select_column!], $limit: Int, $offset: Int, $orderBy: [polls_order_by!], $where: polls_bool_exp) { polls_aggregate(distinct_on: $distinctOn, limit: $limit, offset: $offset, order_by: $orderBy, where: $where) { ${typeof resultSelector === "function" ? resultSelector(new PollsAggregateModelSelector()).toString() : resultSelector} } }`, variables, onData, onError) }, subscribePolls_by_pk(variables: { id: any }, resultSelector: string | ((qb: PollsModelSelector) => PollsModelSelector) = pollsModelPrimitives.toString(), onData?: (item: any) => void, onError?: (error: Error) => void) { - return self.subscribe<{ polls_by_pk: PollsModelType}>(`subscription polls_by_pk($id: bigint!) { polls_by_pk(id: $id) { + return self.subscribe<{ polls_by_pk: PollsModelType }>(`subscription polls_by_pk($id: bigint!) { polls_by_pk(id: $id) { ${typeof resultSelector === "function" ? resultSelector(new PollsModelSelector()).toString() : resultSelector} } }`, variables, onData, onError) }, diff --git a/examples/6-scaffolding-ts-hasura/src/models/SubscriptionRootModel.base.ts b/examples/6-scaffolding-ts-hasura/src/models/SubscriptionRootModel.base.ts index ee05ecd7..ceb5127f 100644 --- a/examples/6-scaffolding-ts-hasura/src/models/SubscriptionRootModel.base.ts +++ b/examples/6-scaffolding-ts-hasura/src/models/SubscriptionRootModel.base.ts @@ -50,11 +50,11 @@ export const SubscriptionRootModelBase = withTypedRefs()(ModelBase }))) export class SubscriptionRootModelSelector extends QueryBuilder { - choices(builder: string | ChoicesModelSelector | ((selector: ChoicesModelSelector) => ChoicesModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }) { return this.__child(`choices`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesModelSelector, builder) } - choices_aggregate(builder: string | ChoicesAggregateModelSelector | ((selector: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[], where?: (ChoicesBoolExp | null) }) { return this.__child(`choices_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesAggregateModelSelector, builder) } + choices(builder: string | ChoicesModelSelector | ((selector: ChoicesModelSelector) => ChoicesModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }) { return this.__child(`choices`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesModelSelector, builder) } + choices_aggregate(builder: string | ChoicesAggregateModelSelector | ((selector: ChoicesAggregateModelSelector) => ChoicesAggregateModelSelector) | undefined, args?: { distinctOn?: ChoicesSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: ChoicesOrderBy[] | null, where?: (ChoicesBoolExp | null) }) { return this.__child(`choices_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesAggregateModelSelector, builder) } choices_by_pk(builder: string | ChoicesModelSelector | ((selector: ChoicesModelSelector) => ChoicesModelSelector) | undefined, args: { id: any }) { return this.__child(`choices_by_pk`+ (args ? '('+['id'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), ChoicesModelSelector, builder) } - polls(builder: string | PollsModelSelector | ((selector: PollsModelSelector) => PollsModelSelector) | undefined, args?: { distinctOn?: PollsSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[], where?: (PollsBoolExp | null) }) { return this.__child(`polls`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsModelSelector, builder) } - polls_aggregate(builder: string | PollsAggregateModelSelector | ((selector: PollsAggregateModelSelector) => PollsAggregateModelSelector) | undefined, args?: { distinctOn?: PollsSelectColumn[], limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[], where?: (PollsBoolExp | null) }) { return this.__child(`polls_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsAggregateModelSelector, builder) } + polls(builder: string | PollsModelSelector | ((selector: PollsModelSelector) => PollsModelSelector) | undefined, args?: { distinctOn?: PollsSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[] | null, where?: (PollsBoolExp | null) }) { return this.__child(`polls`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsModelSelector, builder) } + polls_aggregate(builder: string | PollsAggregateModelSelector | ((selector: PollsAggregateModelSelector) => PollsAggregateModelSelector) | undefined, args?: { distinctOn?: PollsSelectColumn[] | null, limit?: (number | null), offset?: (number | null), orderBy?: PollsOrderBy[] | null, where?: (PollsBoolExp | null) }) { return this.__child(`polls_aggregate`+ (args ? '('+['distinctOn', 'limit', 'offset', 'orderBy', 'where'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsAggregateModelSelector, builder) } polls_by_pk(builder: string | PollsModelSelector | ((selector: PollsModelSelector) => PollsModelSelector) | undefined, args: { id: any }) { return this.__child(`polls_by_pk`+ (args ? '('+['id'].map((argName) => ((args as any)[argName] ? `${argName}: ${JSON.stringify((args as any)[argName])}` : null) ).filter((v) => v!=null).join(', ') + ')': ''), PollsModelSelector, builder) } } export function selectFromSubscriptionRoot() { diff --git a/generator/generate.js b/generator/generate.js index 064b97e5..86230fd9 100644 --- a/generator/generate.js +++ b/generator/generate.js @@ -905,29 +905,29 @@ ${enumContent} let { name, origName, args, type, description } = field - const isScalar = - type.kind === "SCALAR" || - (type.ofType && type.ofType.kind === "SCALAR") - if (type.kind === "NON_NULL") type = type.ofType const returnsList = type.kind === "LIST" let returnType = returnsList ? type.ofType : type if (returnType.kind === "NON_NULL") returnType = returnType.ofType + const isScalar = + returnType.kind === "SCALAR" || + (returnType.ofType && returnType.ofType.kind === "SCALAR") + /** 4) Add the return type of the query if TS */ const tsType = format !== "ts" ? "" : `<{ ${name}: ${ isScalar - ? `${printTsPrimitiveType(type.name)} ` + ? `${printTsPrimitiveType(returnType.name)}` : `${returnType.name}${ returnType.kind === "UNION" || returnType.kind === "INTERFACE" ? "Union" : modelTypePostfix - }${returnsList ? "[]" : ""}` - }}>` + }` + }${returnsList ? "[]" : ""} }>` let formalArgs = "" let actualArgs = "" @@ -1043,7 +1043,7 @@ ${optPrefix("\n // ", sanitizeComment(description))} case "NON_NULL": return printTsType(type.ofType, name, false, fromUndefineableList) case "LIST": - return `${printTsType(type.ofType, name, true, canBeUndefined)}[]` + return `${printTsType(type.ofType, name, true, canBeUndefined)}[]${canBeUndefined ? " | null" : ""}` case "OBJECT": case "INPUT_OBJECT": case "ENUM": diff --git a/package.json b/package.json index e66ed91b..9e461fc3 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,15 @@ "name": "mst-gql", "description": "Bindings for mobx-state-tree and GraphQL", "license": "MIT", - "version": "0.17.1", + "version": "0.17.2", "author": "Michel Weststrate", + "maintainers": [ + { + "name": "Balazs E. Pataki", + "url": "https://github.com/beepsoft", + "email": "beepsoftdev@gmail.com" + } + ], "homepage": "https://github.com/mobxjs/mst-gql#readme", "bugs": "https://github.com/mobxjs/mst-gql/issues", "scripts": { @@ -13,7 +20,7 @@ "format": "pretty-quick", "list-mismatches": "syncpack list-mismatches", "test": "yarn test:mst-gql && yarn test:example-2 && yarn test:example-6 && yarn format", - "test:cra": "./tests/cra-test/test-cra.sh", + "test:vite": "tests/vite-app-test/test-vite-app.sh", "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand", "test:example-2": "cd examples/2-scaffolding && yarn start", "test:example-6": "cd examples/6-scaffolding-ts-hasura && yarn start", @@ -51,13 +58,14 @@ "@babel/plugin-proposal-decorators": "^7.18.2", "@babel/plugin-transform-modules-commonjs": "^7.18.2", "@babel/preset-env": "^7.18.2", + "@babel/preset-react": "^7.17.12", "@babel/preset-typescript": "^7.17.12", "@babel/register": "^7.17.7", "@types/jest": "^27.5.2", "@types/lodash": "^4.14.182", "@types/pluralize": "^0.0.29", - "@types/react": "^18.0.15", - "@types/react-dom": "^18.0.6", + "@types/react": "^18.2.15", + "@types/react-dom": "^18.2.7", "@types/throttle-debounce": "^5.0.0", "@types/ws": "^8.5.3", "create-react-app": "5.0.1", @@ -69,18 +77,19 @@ "husky": "^8.0.1", "jest": "^27.0.6", "microbundle": "^0.15.0", - "mobx": "^6.6.0", + "mobx": "^6.10.2", "mobx-react": "^7.5.0", - "mobx-state-tree": "^5.1.5", + "mobx-state-tree": "^5.3.0", "node-gyp": "^9.0.0", "pinst": "3.0.0", "prettier": "^2.6.2", "pretty-quick": "^3.1.3", + "process": "0.11.10", "react": "^18.2.0", "react-dom": "^18.2.0", "subscriptions-transport-ws": "^0.11.0", "syncpack": "8.2.4", - "typescript": "^4.7.3" + "typescript": "^5.2.2" }, "peerDependencies": { "graphql": "14 - 16", @@ -88,7 +97,11 @@ "mobx-state-tree": "5" }, "resolutions": { - "react-scripts@5.0.1": "patch:react-scripts@npm:5.0.1#.yarn/patches/react-scripts-npm-5.0.1-d06bd2d5ad.patch" + "react-scripts@5.0.1": "patch:react-scripts@npm:5.0.1#.yarn/patches/react-scripts-npm-5.0.1-d06bd2d5ad.patch", + "react": "18.2.0", + "react-dom": "18.2.0", + "@types/react": "18.0.15", + "@types/react-dom": "18.0.6" }, "bin": "./generator/mst-gql-scaffold.js", "files": [ diff --git a/src/MSTGQLStore.ts b/src/MSTGQLStore.ts index 8add5f32..f1662e2f 100644 --- a/src/MSTGQLStore.ts +++ b/src/MSTGQLStore.ts @@ -15,6 +15,7 @@ import { deflateHelper } from "./deflateHelper" import { mergeHelper } from "./mergeHelper" import { Query, QueryHttpClientOptions, QueryOptions } from "./Query" import { getFirstValue } from "./utils" +import { print } from "graphql/language/printer" type RequestOptions = { document: string @@ -154,7 +155,11 @@ export const MSTGQLStore = types if (self.graphqlWsClient) { cleanup = self.graphqlWsClient.subscribe( { - query: query ? query.toString() : "", + query: query + ? typeof query === "string" + ? query + : print(query) + : "", variables: variables }, { @@ -181,7 +186,11 @@ export const MSTGQLStore = types if (!self.gqlWsClient) throw new Error("No WS client available") const sub = self.gqlWsClient .request({ - query: query ? query.toString() : "", + query: query + ? typeof query === "string" + ? query + : print(query) // Here we could actually pass query as is, gqlWsClient can work with DocumentNode + : "", variables }) .subscribe({ @@ -226,7 +235,7 @@ export const MSTGQLStore = types setHttpClient, setWsClient, setGraphqlWsClient, - __pushPromise(promise: Promise<{}>, queryKey: string) { + __pushPromise(promise: Promise, queryKey: string) { self.__promises.set(queryKey, promise) const onSettled = () => self.__promises.delete(queryKey) promise.then(onSettled, onSettled) diff --git a/tests/cra-test/test-cra.sh b/tests/cra-test/test-cra.sh deleted file mode 100755 index 5cd28038..00000000 --- a/tests/cra-test/test-cra.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env bash -# -# Creates a new CRA app with the latest version of mst-gql dependencies added to it. An mst model is generated using -# the graphql schema copied from examples/6-scaffolding-ts-hasura/schema.graphql and then the app is run to -# see if it can run all right. -# -# -# Note: the generated cra-test directory should not be checked into git. -# - -# Navigate into the current directory so that nothing explodes -cd "${0%/*}" - -# Cleanup and create a fresh directory to work with -rm -rf cra-tmp -mkdir cra-tmp -cd cra-tmp - -yarn create react-app cra-app --template typescript -cd cra-app -cp ../../../../examples/6-scaffolding-ts-hasura/schema.graphql . -yarn add mobx mobx-state-tree mobx-react graphql graphql-tag graphql-request - -# Add current mst-gql version as relative dependency -yarn add mst-gql@portal:../../../../ - - -# Add some code to import the generated files -perl -0777 -pi.original -e 's|(import.*?./App.css.*?;)|\1\nimport {RootStore} from "./model/RootStore";\nconst rootStore = RootStore.create({})|sm' src/App.tsx - -# now generate models -yarn mst-gql --format ts --outDir src/model schema.graphql -# Compile it -yarn tsc --extendedDiagnostics - -# run the project and check if runs all right. Not sure how portable or exact this is, but seems to work -rm -f out -yarn start | tee ./out 2>&1 & - -echo -n "Checking if app runs all right " -for i in {1..20} -do - # Failed to compile. - failed=`egrep 'Failed to compile|ERROR in' out` - if [[ ! -z ${failed} ]]; then - echo - echo "App failed to compile" - pid=`ps -ef | grep tests/cra-test/cra-tmp/cra-app | grep -v grep | awk '{print $2}' -` - kill -9 $pid > /dev/null 2>&1 - exit - fi - - no_issues=`grep 'No issues found.' out | wc -l` - if [ "$no_issues" -eq "1" ]; then - echo - echo "App ran successfully!" - pid=`ps -ef | grep tests/cra-test/cra-tmp/cra-app | grep -v grep | awk '{print $2}' -` - kill -9 $pid > /dev/null 2>&1 - exit - fi - - echo -n "." - - sleep 3 -done - diff --git a/tests/generator/__snapshots__/generate.test.js.snap b/tests/generator/__snapshots__/generate.test.js.snap index a7fb6777..f22642de 100644 --- a/tests/generator/__snapshots__/generate.test.js.snap +++ b/tests/generator/__snapshots__/generate.test.js.snap @@ -133,7 +133,7 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(\`query me { me { + return self.query<{ me: UserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -456,7 +456,7 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: MyUserModelSelector) => MyUserModelSelector) = myUserModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: MyUserModelType}>(\`query me { me { + return self.query<{ me: MyUserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new MyUserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -632,7 +632,7 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(\`query me { me { + return self.query<{ me: UserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -871,7 +871,7 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(\`query me { me { + return self.query<{ me: UserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -1109,7 +1109,7 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(\`query me { me { + return self.query<{ me: UserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -1452,7 +1452,7 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryRepo(variables?: { }, resultSelector: string | ((qb: RepoModelSelector) => RepoModelSelector) = repoModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ repo: RepoModelType}>(\`query repo { repo { + return self.query<{ repo: RepoModelType }>(\`query repo { repo { \${typeof resultSelector === \\"function\\" ? resultSelector(new RepoModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -1628,7 +1628,7 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryGetUser(variables: { input?: (UserInput | null) }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ getUser: UserModelType}>(\`query getUser($input: UserInput) { getUser(input: $input) { + return self.query<{ getUser: UserModelType }>(\`query getUser($input: UserInput) { getUser(input: $input) { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -1936,12 +1936,12 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(\`query me { me { + return self.query<{ me: UserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, queryBook(variables?: { }, resultSelector: string | ((qb: BookModelSelector) => BookModelSelector) = bookModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ book: BookModelType}>(\`query book { book { + return self.query<{ book: BookModelType }>(\`query book { book { \${typeof resultSelector === \\"function\\" ? resultSelector(new BookModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -2181,12 +2181,12 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(\`query me { me { + return self.query<{ me: UserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, queryBook(variables?: { }, resultSelector: string | ((qb: BookModelSelector) => BookModelSelector) = bookModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ book: BookModelType}>(\`query book { book { + return self.query<{ book: BookModelType }>(\`query book { book { \${typeof resultSelector === \\"function\\" ? resultSelector(new BookModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -2494,12 +2494,12 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(\`query me { me { + return self.query<{ me: UserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, queryBook(variables?: { }, resultSelector: string | ((qb: BookModelSelector) => BookModelSelector) = bookModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ book: BookModelType}>(\`query book { book { + return self.query<{ book: BookModelType }>(\`query book { book { \${typeof resultSelector === \\"function\\" ? resultSelector(new BookModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -2808,12 +2808,12 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(\`query me { me { + return self.query<{ me: UserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, queryBook(variables?: { }, resultSelector: string | ((qb: BookModelSelector) => BookModelSelector) = bookModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ book: BookModelType}>(\`query book { book { + return self.query<{ book: BookModelType }>(\`query book { book { \${typeof resultSelector === \\"function\\" ? resultSelector(new BookModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -2987,7 +2987,7 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore return self.query<{ helloWithString: string }>(\`query helloWithString { helloWithString }\`, variables, options) }, queryHelloWithType(variables?: { }, resultSelector: string | ((qb: HelloResultModelSelector) => HelloResultModelSelector) = helloResultModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ helloWithType: HelloResultModelType}>(\`query helloWithType { helloWithType { + return self.query<{ helloWithType: HelloResultModelType }>(\`query helloWithType { helloWithType { \${typeof resultSelector === \\"function\\" ? resultSelector(new HelloResultModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -3323,7 +3323,7 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ querySearch(variables: { text: string }, resultSelector: string | ((qb: SearchResultModelSelector) => SearchResultModelSelector) = searchResultModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ search: SearchResultModelType}>(\`query search($text: String!) { search(text: $text) { + return self.query<{ search: SearchResultModelType }>(\`query search($text: String!) { search(text: $text) { \${typeof resultSelector === \\"function\\" ? resultSelector(new SearchResultModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -3502,12 +3502,12 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryUser(variables: { id: number }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ user: UserModelType}>(\`query user($id: ID!) { user(id: $id) { + return self.query<{ user: UserModelType }>(\`query user($id: ID!) { user(id: $id) { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, queryUsers(variables: { input: UsersFilter }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ users: UserModelType[]}>(\`query users($input: UsersFilter!) { users(input: $input) { + return self.query<{ users: UserModelType[] }>(\`query users($input: UsersFilter!) { users(input: $input) { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -3749,12 +3749,12 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ queryMe(variables?: { }, resultSelector: string | ((qb: UserModelSelector) => UserModelSelector) = userModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ me: UserModelType}>(\`query me { me { + return self.query<{ me: UserModelType }>(\`query me { me { \${typeof resultSelector === \\"function\\" ? resultSelector(new UserModelSelector()).toString() : resultSelector} } }\`, variables, options) }, queryBook(variables?: { }, resultSelector: string | ((qb: BookModelSelector) => BookModelSelector) = bookModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ book: BookModelType}>(\`query book { book { + return self.query<{ book: BookModelType }>(\`query book { book { \${typeof resultSelector === \\"function\\" ? resultSelector(new BookModelSelector()).toString() : resultSelector} } }\`, variables, options) }, @@ -3902,7 +3902,7 @@ import { movieModelPrimitives, MovieModelSelector } from \\"./MovieModel.base\\" export type MovieInput = { description: string[] - director?: string[] + director?: string[] | null } /* The TypeScript type that explicits the refs to other models in order to prevent a circular refs issue */ type Refs = { @@ -3928,8 +3928,8 @@ export const RootStoreBase = withTypedRefs()(MSTGQLStore }) .actions(self => ({ - querySearch(variables: { text?: MovieInput[] }, resultSelector: string | ((qb: MovieModelSelector) => MovieModelSelector) = movieModelPrimitives.toString(), options: QueryOptions = {}) { - return self.query<{ search: MovieModelType}>(\`query search($text: [MovieInput!]) { search(text: $text) { + querySearch(variables: { text?: MovieInput[] | null }, resultSelector: string | ((qb: MovieModelSelector) => MovieModelSelector) = movieModelPrimitives.toString(), options: QueryOptions = {}) { + return self.query<{ search: MovieModelType }>(\`query search($text: [MovieInput!]) { search(text: $text) { \${typeof resultSelector === \\"function\\" ? resultSelector(new MovieModelSelector()).toString() : resultSelector} } }\`, variables, options) }, diff --git a/tests/generator/generate.test.js b/tests/generator/generate.test.js index 3559e6f4..0221edc8 100644 --- a/tests/generator/generate.test.js +++ b/tests/generator/generate.test.js @@ -216,7 +216,7 @@ type Query { expect( hasFileContent( searchResultBase, - "querySearch(variables: { text?: MovieInput[] }," + "querySearch(variables: { text?: MovieInput[] | null }," ) ).toBeTruthy() diff --git a/tests/vite-app-test/test-vite-app.sh b/tests/vite-app-test/test-vite-app.sh new file mode 100755 index 00000000..6fcc015e --- /dev/null +++ b/tests/vite-app-test/test-vite-app.sh @@ -0,0 +1,86 @@ +#!/usr/bin/env bash +# +# This generates a vite project to test e2e use of mt-gql. +# +# Creates a new vite app with the latest version of mst-gql dependencies added to it. An mst model is generated using +# the graphql schema copied from examples/6-scaffolding-ts-hasura/schema.graphql and then the app is run to +# see if it can run all right. +# +# + +# Navigate into the current directory so that nothing explodes +cd "${0%/*}" + +ROOTDIR=`realpath ../../` + +# Pack the lib, so that we can use it just like as if it was downloaded form npm +cd $ROOTDIR +npm pack +LIB_TGZ=`echo $PWD/"$(npm pkg get name | tr -d '"')-$(npm pkg get version | tr -d '"').tgz"` + +cd $TMPDIR + +# Cleanup and create a fresh directory to work with +rm -rf vite-tmp +mkdir vite-tmp +cd vite-tmp +#open . + +npm create vite@latest vite-app -- --template react-ts +cd vite-app + +cp $ROOTDIR/examples/6-scaffolding-ts-hasura/schema.graphql . + +# Add dependencies +npm add mobx mobx-state-tree mobx-react graphql graphql-tag graphql-request typescript + +# Add current mst-gql version as relative dependency +echo "************ npm add mst-gql@file:$LIB_TGZ" +npm add mst-gql@file:$LIB_TGZ + +# Add some code to import the generated files +perl -0777 -pi.original -e 's|(import.*?./App.css.*?$)|\1\nimport {RootStore} from "./model/RootStore";\nconst rootStore = RootStore.create({})\nconsole.log(rootStore)\n|sm' src/App.tsx + +# Make sure unused local vars ar not reported by tsc +perl -pi -e 's/"noUnusedLocals": true/"noUnusedLocals": false/g' tsconfig.json +#perl -i -pe 's/("compilerOptions": \{)/$1\n "noImplicitAny": false,/' tsconfig.json + +# now generate models +#npx ../../../../generator/mst-gql-scaffold.js --format ts --outDir src/model schema.graphql +echo "Generate mst-gql models" +npx mst-gql --format ts --outDir src/model schema.graphql + +# Compile it +echo "Compile generated mst-gql models" +npx tsc --extendedDiagnostics + +#perl -0777 -pi.original -e 's|(import.*?./App.css.*?$)|\1\nimportX {RootStore} from "./model/RootStore";\nconst rootStore = RootStore.create({})\nconsole.log(rootStore)\n|sm' src/App.tsx + +# run the project and check if runs all right. Not sure how portable or exact this is, but seems to work +echo "Run project" +rm -f out +(npm run dev 2>&1 | tee out)& + + +echo -n "Checking if app runs all right " +for i in {1..7} +do + # Failed to compile. + failed=`egrep 'Failed|ERROR|npm ERR' out` + if [[ ! -z ${failed} ]]; then + echo + echo "App failed to compile. Sopping." + pid=$(ps -ef | grep vite-tmp/vite-app/ | grep -v grep | awk '{print $2}' | tr '\n' ' ') + kill -9 $pid > /dev/null 2>&1 + exit + fi + + echo -n "." + + sleep 1 +done + +echo "App ran successfully! Stopping." +pid=$(ps -ef | grep vite-tmp/vite-app/ | grep -v grep | awk '{print $2}' | tr '\n' ' ') +kill -9 $pid > /dev/null 2>&1 +exit diff --git a/yarn.lock b/yarn.lock index c311ebc9..2f396610 100644 --- a/yarn.lock +++ b/yarn.lock @@ -126,12 +126,12 @@ __metadata: languageName: node linkType: hard -"@apollographql/graphql-upload-8-fork@npm:^8.1.3": - version: 8.1.3 - resolution: "@apollographql/graphql-upload-8-fork@npm:8.1.3" +"@apollographql/graphql-upload-8-fork@npm:^8.1.4": + version: 8.1.4 + resolution: "@apollographql/graphql-upload-8-fork@npm:8.1.4" dependencies: "@types/express": "*" - "@types/fs-capacitor": "*" + "@types/fs-capacitor": ^2.0.0 "@types/koa": "*" busboy: ^0.3.1 fs-capacitor: ^2.0.4 @@ -139,7 +139,7 @@ __metadata: object-path: ^0.11.4 peerDependencies: graphql: 0.13.1 - 15 - checksum: cb30ef22304ce0f7d209ef0976e8d93d7ed920bb856d36585a56b2c8d99675a45989e22fab35a43d2e06ecad78fcc29ca57640cf1d8e6eed414580899876f3cc + checksum: 0d8db5afe8a26befb20b1cc6f2a43f0f6224ccd394606710bb00a45f0a45002635cbd6d2958362e9df8f1371b177fad1f2070739e79eae2c0df5d5d9039947bf languageName: node linkType: hard @@ -152,6 +152,16 @@ __metadata: languageName: node linkType: hard +"@babel/code-frame@npm:^7.22.13": + version: 7.22.13 + resolution: "@babel/code-frame@npm:7.22.13" + dependencies: + "@babel/highlight": ^7.22.13 + chalk: ^2.4.2 + checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058 + languageName: node + linkType: hard + "@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.17.10": version: 7.17.10 resolution: "@babel/compat-data@npm:7.17.10" @@ -218,6 +228,18 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/generator@npm:7.23.3" + dependencies: + "@babel/types": ^7.23.3 + "@jridgewell/gen-mapping": ^0.3.2 + "@jridgewell/trace-mapping": ^0.3.17 + jsesc: ^2.5.1 + checksum: b6e71cca852d4e1aa01a28a30b8c74ffc3b8d56ccb7ae3ee783028ee015f63ad861a2e386c3eb490a9a8634db485a503a33521680f4af510151e90346c46da17 + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-annotate-as-pure@npm:7.16.7" @@ -227,6 +249,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-annotate-as-pure@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" + dependencies: + "@babel/types": ^7.22.5 + checksum: 53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d + languageName: node + linkType: hard + "@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.16.7" @@ -305,6 +336,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-environment-visitor@npm:^7.22.20": + version: 7.22.20 + resolution: "@babel/helper-environment-visitor@npm:7.22.20" + checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69 + languageName: node + linkType: hard + "@babel/helper-explode-assignable-expression@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-explode-assignable-expression@npm:7.16.7" @@ -324,6 +362,16 @@ __metadata: languageName: node linkType: hard +"@babel/helper-function-name@npm:^7.23.0": + version: 7.23.0 + resolution: "@babel/helper-function-name@npm:7.23.0" + dependencies: + "@babel/template": ^7.22.15 + "@babel/types": ^7.23.0 + checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10 + languageName: node + linkType: hard + "@babel/helper-hoist-variables@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-hoist-variables@npm:7.16.7" @@ -333,6 +381,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-hoist-variables@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-hoist-variables@npm:7.22.5" + dependencies: + "@babel/types": ^7.22.5 + checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc + languageName: node + linkType: hard + "@babel/helper-member-expression-to-functions@npm:^7.17.7": version: 7.17.7 resolution: "@babel/helper-member-expression-to-functions@npm:7.17.7" @@ -351,6 +408,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-imports@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-module-imports@npm:7.22.15" + dependencies: + "@babel/types": ^7.22.15 + checksum: ecd7e457df0a46f889228f943ef9b4a47d485d82e030676767e6a2fdcbdaa63594d8124d4b55fd160b41c201025aec01fc27580352b1c87a37c9c6f33d116702 + languageName: node + linkType: hard + "@babel/helper-module-transforms@npm:^7.18.0": version: 7.18.0 resolution: "@babel/helper-module-transforms@npm:7.18.0" @@ -383,6 +449,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-plugin-utils@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-plugin-utils@npm:7.22.5" + checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5 + languageName: node + linkType: hard + "@babel/helper-remap-async-to-generator@npm:^7.16.8": version: 7.16.8 resolution: "@babel/helper-remap-async-to-generator@npm:7.16.8" @@ -434,6 +507,22 @@ __metadata: languageName: node linkType: hard +"@babel/helper-split-export-declaration@npm:^7.22.6": + version: 7.22.6 + resolution: "@babel/helper-split-export-declaration@npm:7.22.6" + dependencies: + "@babel/types": ^7.22.5 + checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921 + languageName: node + linkType: hard + +"@babel/helper-string-parser@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-string-parser@npm:7.22.5" + checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467 + languageName: node + linkType: hard + "@babel/helper-validator-identifier@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-validator-identifier@npm:7.16.7" @@ -441,6 +530,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.22.20": + version: 7.22.20 + resolution: "@babel/helper-validator-identifier@npm:7.22.20" + checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-validator-option@npm:7.16.7" @@ -448,6 +544,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-option@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-validator-option@npm:7.22.15" + checksum: 68da52b1e10002a543161494c4bc0f4d0398c8fdf361d5f7f4272e95c45d5b32d974896d44f6a0ea7378c9204988879d73613ca683e13bd1304e46d25ff67a8d + languageName: node + linkType: hard + "@babel/helper-wrap-function@npm:^7.16.8": version: 7.16.8 resolution: "@babel/helper-wrap-function@npm:7.16.8" @@ -482,6 +585,17 @@ __metadata: languageName: node linkType: hard +"@babel/highlight@npm:^7.22.13": + version: 7.22.20 + resolution: "@babel/highlight@npm:7.22.20" + dependencies: + "@babel/helper-validator-identifier": ^7.22.20 + chalk: ^2.4.2 + js-tokens: ^4.0.0 + checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134 + languageName: node + linkType: hard + "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.3, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.7, @babel/parser@npm:^7.18.0, @babel/parser@npm:^7.3.3": version: 7.18.4 resolution: "@babel/parser@npm:7.18.4" @@ -491,6 +605,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/parser@npm:7.23.3" + bin: + parser: ./bin/babel-parser.js + checksum: 4aa7366e401b5467192c1dbf2bef99ac0958c45ef69ed6704abbae68f98fab6409a527b417d1528fddc49d7664450670528adc7f45abb04db5fafca7ed766d57 + languageName: node + linkType: hard + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.17.12": version: 7.17.12 resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.17.12" @@ -863,6 +986,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-syntax-jsx@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/plugin-syntax-jsx@npm:7.22.5" + dependencies: + "@babel/helper-plugin-utils": ^7.22.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce + languageName: node + linkType: hard + "@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": version: 7.10.4 resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" @@ -1274,6 +1408,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-display-name@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/plugin-transform-react-display-name@npm:7.22.5" + dependencies: + "@babel/helper-plugin-utils": ^7.22.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: a12bfd1e4e93055efca3ace3c34722571bda59d9740dca364d225d9c6e3ca874f134694d21715c42cc63d79efd46db9665bd4a022998767f9245f1e29d5d204d + languageName: node + linkType: hard + "@babel/plugin-transform-react-jsx-development@npm:^7.16.7": version: 7.16.7 resolution: "@babel/plugin-transform-react-jsx-development@npm:7.16.7" @@ -1285,6 +1430,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-jsx-development@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/plugin-transform-react-jsx-development@npm:7.22.5" + dependencies: + "@babel/plugin-transform-react-jsx": ^7.22.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 36bc3ff0b96bb0ef4723070a50cfdf2e72cfd903a59eba448f9fe92fea47574d6f22efd99364413719e1f3fb3c51b6c9b2990b87af088f8486a84b2a5f9e4560 + languageName: node + linkType: hard + "@babel/plugin-transform-react-jsx@npm:^7.12.11, @babel/plugin-transform-react-jsx@npm:^7.16.7, @babel/plugin-transform-react-jsx@npm:^7.17.12": version: 7.17.12 resolution: "@babel/plugin-transform-react-jsx@npm:7.17.12" @@ -1300,6 +1456,21 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5": + version: 7.22.15 + resolution: "@babel/plugin-transform-react-jsx@npm:7.22.15" + dependencies: + "@babel/helper-annotate-as-pure": ^7.22.5 + "@babel/helper-module-imports": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-jsx": ^7.22.5 + "@babel/types": ^7.22.15 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 3899054e89550c3a0ef041af7c47ee266e2e934f498ee80fefeda778a6aa177b48aa8b4d2a8bf5848de977fec564571699ab952d9fa089c4c19b45ddb121df09 + languageName: node + linkType: hard + "@babel/plugin-transform-react-pure-annotations@npm:^7.16.7": version: 7.18.0 resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.18.0" @@ -1312,6 +1483,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-pure-annotations@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.22.5" + dependencies: + "@babel/helper-annotate-as-pure": ^7.22.5 + "@babel/helper-plugin-utils": ^7.22.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 092021c4f404e267002099ec20b3f12dd730cb90b0d83c5feed3dc00dbe43b9c42c795a18e7c6c7d7bddea20c7dd56221b146aec81b37f2e7eb5137331c61120 + languageName: node + linkType: hard + "@babel/plugin-transform-regenerator@npm:^7.12.1, @babel/plugin-transform-regenerator@npm:^7.18.0": version: 7.18.0 resolution: "@babel/plugin-transform-regenerator@npm:7.18.0" @@ -1572,6 +1755,22 @@ __metadata: languageName: node linkType: hard +"@babel/preset-react@npm:^7.17.12": + version: 7.22.15 + resolution: "@babel/preset-react@npm:7.22.15" + dependencies: + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-validator-option": ^7.22.15 + "@babel/plugin-transform-react-display-name": ^7.22.5 + "@babel/plugin-transform-react-jsx": ^7.22.15 + "@babel/plugin-transform-react-jsx-development": ^7.22.5 + "@babel/plugin-transform-react-pure-annotations": ^7.22.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: c3ef99dfa2e9f57d2e08603e883aa20f47630a826c8e413888a93ae6e0084b5016871e463829be125329d40a1ba0a89f7c43d77b6dab52083c225cb43e63d10e + languageName: node + linkType: hard + "@babel/preset-typescript@npm:^7.16.0, @babel/preset-typescript@npm:^7.17.12": version: 7.17.12 resolution: "@babel/preset-typescript@npm:7.17.12" @@ -1630,21 +1829,32 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.18.0, @babel/traverse@npm:^7.18.2, @babel/traverse@npm:^7.7.2": - version: 7.18.2 - resolution: "@babel/traverse@npm:7.18.2" +"@babel/template@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/template@npm:7.22.15" dependencies: - "@babel/code-frame": ^7.16.7 - "@babel/generator": ^7.18.2 - "@babel/helper-environment-visitor": ^7.18.2 - "@babel/helper-function-name": ^7.17.9 - "@babel/helper-hoist-variables": ^7.16.7 - "@babel/helper-split-export-declaration": ^7.16.7 - "@babel/parser": ^7.18.0 - "@babel/types": ^7.18.2 + "@babel/code-frame": ^7.22.13 + "@babel/parser": ^7.22.15 + "@babel/types": ^7.22.15 + checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd + languageName: node + linkType: hard + +"@babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.18.0, @babel/traverse@npm:^7.18.2, @babel/traverse@npm:^7.7.2": + version: 7.23.3 + resolution: "@babel/traverse@npm:7.23.3" + dependencies: + "@babel/code-frame": ^7.22.13 + "@babel/generator": ^7.23.3 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-function-name": ^7.23.0 + "@babel/helper-hoist-variables": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/parser": ^7.23.3 + "@babel/types": ^7.23.3 debug: ^4.1.0 globals: ^11.1.0 - checksum: e21c2d550bf610406cf21ef6fbec525cb1d80b9d6d71af67552478a24ee371203cb4025b23b110ae7288a62a874ad5898daad19ad23daa95dfc8ab47a47a092f + checksum: f4e0c05f2f82368b9be7e1fed38cfcc2e1074967a8b76ac837b89661adbd391e99d0b1fd8c31215ffc3a04d2d5d7ee5e627914a09082db84ec5606769409fe2b languageName: node linkType: hard @@ -1668,6 +1878,28 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5": + version: 7.23.0 + resolution: "@babel/types@npm:7.23.0" + dependencies: + "@babel/helper-string-parser": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.20 + to-fast-properties: ^2.0.0 + checksum: 215fe04bd7feef79eeb4d33374b39909ce9cad1611c4135a4f7fdf41fe3280594105af6d7094354751514625ea92d0875aba355f53e86a92600f290e77b0e604 + languageName: node + linkType: hard + +"@babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/types@npm:7.23.3" + dependencies: + "@babel/helper-string-parser": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.20 + to-fast-properties: ^2.0.0 + checksum: b96f1ec495351aeb2a5f98dd494aafa17df02a351548ae96999460f35c933261c839002a34c1e83552ff0d9f5e94d0b5b8e105d38131c7c9b0f5a6588676f35d + languageName: node + linkType: hard + "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -2009,6 +2241,15 @@ __metadata: languageName: node linkType: hard +"@graphql-typed-document-node/core@npm:^3.2.0": + version: 3.2.0 + resolution: "@graphql-typed-document-node/core@npm:3.2.0" + peerDependencies: + graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 + checksum: fa44443accd28c8cf4cb96aaaf39d144a22e8b091b13366843f4e97d19c7bfeaf609ce3c7603a4aeffe385081eaf8ea245d078633a7324c11c5ec4b2011bb76d + languageName: node + linkType: hard + "@humanwhocodes/config-array@npm:^0.9.2": version: 0.9.5 resolution: "@humanwhocodes/config-array@npm:0.9.5" @@ -2336,6 +2577,17 @@ __metadata: languageName: node linkType: hard +"@jridgewell/gen-mapping@npm:^0.3.2": + version: 0.3.3 + resolution: "@jridgewell/gen-mapping@npm:0.3.3" + dependencies: + "@jridgewell/set-array": ^1.0.1 + "@jridgewell/sourcemap-codec": ^1.4.10 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 4a74944bd31f22354fc01c3da32e83c19e519e3bbadafa114f6da4522ea77dd0c2842607e923a591d60a76699d819a2fbb6f3552e277efdb9b58b081390b60ab + languageName: node + linkType: hard + "@jridgewell/resolve-uri@npm:^3.0.3": version: 3.0.7 resolution: "@jridgewell/resolve-uri@npm:3.0.7" @@ -2343,6 +2595,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/resolve-uri@npm:^3.1.0": + version: 3.1.1 + resolution: "@jridgewell/resolve-uri@npm:3.1.1" + checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653 + languageName: node + linkType: hard + "@jridgewell/set-array@npm:^1.0.0": version: 1.1.1 resolution: "@jridgewell/set-array@npm:1.1.1" @@ -2350,6 +2609,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/set-array@npm:^1.0.1": + version: 1.1.2 + resolution: "@jridgewell/set-array@npm:1.1.2" + checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e + languageName: node + linkType: hard + "@jridgewell/source-map@npm:^0.3.2": version: 0.3.2 resolution: "@jridgewell/source-map@npm:0.3.2" @@ -2367,6 +2633,23 @@ __metadata: languageName: node linkType: hard +"@jridgewell/sourcemap-codec@npm:^1.4.14": + version: 1.4.15 + resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" + checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8 + languageName: node + linkType: hard + +"@jridgewell/trace-mapping@npm:^0.3.17": + version: 0.3.20 + resolution: "@jridgewell/trace-mapping@npm:0.3.20" + dependencies: + "@jridgewell/resolve-uri": ^3.1.0 + "@jridgewell/sourcemap-codec": ^1.4.14 + checksum: cd1a7353135f385909468ff0cf20bdd37e59f2ee49a13a966dedf921943e222082c583ade2b579ff6cd0d8faafcb5461f253e1bf2a9f48fec439211fdbe788f5 + languageName: node + linkType: hard + "@jridgewell/trace-mapping@npm:^0.3.7, @jridgewell/trace-mapping@npm:^0.3.9": version: 0.3.13 resolution: "@jridgewell/trace-mapping@npm:0.3.13" @@ -2465,14 +2748,14 @@ __metadata: arg: ^5.0.2 cors: ^2.8.5 express: ^4.17.1 - graphql: ^16.5.0 + graphql: 15.8.0 graphql-playground-middleware-express: ^1.7.21 graphql-tag: ^2.12.6 isomorphic-fetch: ^2.2.1 jest: ^27.0.6 - mobx: ^6.6.0 + mobx: ^6.10.2 mobx-react: ^7.5.0 - mobx-state-tree: ^5.1.5 + mobx-state-tree: ^5.3.0 mst-gql: "portal:../../" npm-run-all: ^4.1.5 parcel: ^2.6.0 @@ -2489,9 +2772,10 @@ __metadata: dependencies: "@types/react": ^18.0.15 "@types/react-dom": ^18.0.6 + graphql: ^16.5.0 graphql-request: ^4.3.0 - mobx: ^6.6.0 - mobx-state-tree: ^5.1.5 + mobx: ^6.10.2 + mobx-state-tree: ^5.3.0 mst-gql: "portal:../../" react: ^18.2.0 react-dom: ^18.2.0 @@ -2505,9 +2789,10 @@ __metadata: dependencies: "@types/react": ^18.0.15 "@types/react-dom": ^18.0.6 + graphql: ^16.8.1 graphql-request: ^4.3.0 - mobx: ^6.6.0 - mobx-state-tree: ^5.1.5 + mobx: ^6.10.2 + mobx-state-tree: ^5.3.0 mst-gql: "portal:../../" react: ^18.2.0 react-dom: ^18.2.0 @@ -2528,11 +2813,13 @@ __metadata: cors: ^2.8.5 express: ^4.17.1 fakergem: ^1.0.3 + graphql: 15.8.0 graphql-playground-middleware-express: ^1.7.21 isomorphic-fetch: ^2.2.1 - mobx: ^6.6.0 - mobx-react-lite: ^1.4.1 - mobx-state-tree: ^5.1.5 + mobx: ^6.10.2 + mobx-react: ^7.5.0 + mobx-react-lite: ^4.0.5 + mobx-state-tree: ^5.3.0 mst-gql: "portal:../../" node-uuid: ^1.4.8 npm-run-all: ^4.1.5 @@ -2544,100 +2831,72 @@ __metadata: languageName: unknown linkType: soft -"@next/env@npm:12.2.2": - version: 12.2.2 - resolution: "@next/env@npm:12.2.2" - checksum: ea79db56b3af5076de9b02941e0226d8d68e179101e99cf3bb1a17fb980d30de781311c176ce3a87fc72b9598e311d18e5244e71c553b03875f2dbe27dffa864 - languageName: node - linkType: hard - -"@next/swc-android-arm-eabi@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-android-arm-eabi@npm:12.2.2" - conditions: os=android & cpu=arm +"@next/env@npm:13.5.6": + version: 13.5.6 + resolution: "@next/env@npm:13.5.6" + checksum: 5e8f3f6f987a15dad3cd7b2bcac64a6382c2ec372d95d0ce6ab295eb59c9731222017eebf71ff3005932de2571f7543bce7e5c6a8c90030207fb819404138dc2 languageName: node linkType: hard -"@next/swc-android-arm64@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-android-arm64@npm:12.2.2" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - -"@next/swc-darwin-arm64@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-darwin-arm64@npm:12.2.2" +"@next/swc-darwin-arm64@npm:13.5.6": + version: 13.5.6 + resolution: "@next/swc-darwin-arm64@npm:13.5.6" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-x64@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-darwin-x64@npm:12.2.2" +"@next/swc-darwin-x64@npm:13.5.6": + version: 13.5.6 + resolution: "@next/swc-darwin-x64@npm:13.5.6" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@next/swc-freebsd-x64@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-freebsd-x64@npm:12.2.2" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - -"@next/swc-linux-arm-gnueabihf@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-linux-arm-gnueabihf@npm:12.2.2" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"@next/swc-linux-arm64-gnu@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-linux-arm64-gnu@npm:12.2.2" +"@next/swc-linux-arm64-gnu@npm:13.5.6": + version: 13.5.6 + resolution: "@next/swc-linux-arm64-gnu@npm:13.5.6" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-linux-arm64-musl@npm:12.2.2" +"@next/swc-linux-arm64-musl@npm:13.5.6": + version: 13.5.6 + resolution: "@next/swc-linux-arm64-musl@npm:13.5.6" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-linux-x64-gnu@npm:12.2.2" +"@next/swc-linux-x64-gnu@npm:13.5.6": + version: 13.5.6 + resolution: "@next/swc-linux-x64-gnu@npm:13.5.6" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-linux-x64-musl@npm:12.2.2" +"@next/swc-linux-x64-musl@npm:13.5.6": + version: 13.5.6 + resolution: "@next/swc-linux-x64-musl@npm:13.5.6" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-win32-arm64-msvc@npm:12.2.2" +"@next/swc-win32-arm64-msvc@npm:13.5.6": + version: 13.5.6 + resolution: "@next/swc-win32-arm64-msvc@npm:13.5.6" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@next/swc-win32-ia32-msvc@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-win32-ia32-msvc@npm:12.2.2" +"@next/swc-win32-ia32-msvc@npm:13.5.6": + version: 13.5.6 + resolution: "@next/swc-win32-ia32-msvc@npm:13.5.6" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:12.2.2": - version: 12.2.2 - resolution: "@next/swc-win32-x64-msvc@npm:12.2.2" +"@next/swc-win32-x64-msvc@npm:13.5.6": + version: 13.5.6 + resolution: "@next/swc-win32-x64-msvc@npm:13.5.6" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -4096,12 +4355,12 @@ __metadata: languageName: node linkType: hard -"@swc/helpers@npm:0.4.2": - version: 0.4.2 - resolution: "@swc/helpers@npm:0.4.2" +"@swc/helpers@npm:0.5.2": + version: 0.5.2 + resolution: "@swc/helpers@npm:0.5.2" dependencies: tslib: ^2.4.0 - checksum: 0b8c86ad03b17b8fe57dc4498e25dc294ea6bc42558a6b92d8fcd789351dac80199409bef38a2e3ac06aae0fedddfc0ab9c34409acbf74e55d1bbbd74f68b6b7 + checksum: 51d7e3d8bd56818c49d6bfbd715f0dbeedc13cf723af41166e45c03e37f109336bbcb57a1f2020f4015957721aeb21e1a7fff281233d797ff7d3dd1f447fa258 languageName: node linkType: hard @@ -4259,6 +4518,15 @@ __metadata: languageName: node linkType: hard +"@types/debug@npm:^4.1.7": + version: 4.1.7 + resolution: "@types/debug@npm:4.1.7" + dependencies: + "@types/ms": "*" + checksum: 0a7b89d8ed72526858f0b61c6fd81f477853e8c4415bb97f48b1b5545248d2ae389931680b94b393b993a7cfe893537a200647d93defe6d87159b96812305adc + languageName: node + linkType: hard + "@types/eslint-scope@npm:^3.7.3": version: 3.7.3 resolution: "@types/eslint-scope@npm:3.7.3" @@ -4326,7 +4594,7 @@ __metadata: languageName: node linkType: hard -"@types/fs-capacitor@npm:*": +"@types/fs-capacitor@npm:^2.0.0": version: 2.0.0 resolution: "@types/fs-capacitor@npm:2.0.0" dependencies: @@ -4502,6 +4770,13 @@ __metadata: languageName: node linkType: hard +"@types/ms@npm:*": + version: 0.7.31 + resolution: "@types/ms@npm:0.7.31" + checksum: daadd354aedde024cce6f5aa873fefe7b71b22cd0e28632a69e8b677aeb48ae8caa1c60e5919bb781df040d116b01cb4316335167a3fc0ef6a63fa3614c0f6da + languageName: node + linkType: hard + "@types/node-fetch@npm:^2.5.10": version: 2.6.1 resolution: "@types/node-fetch@npm:2.6.1" @@ -4575,7 +4850,7 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:^18.0.6": +"@types/react-dom@npm:18.0.6": version: 18.0.6 resolution: "@types/react-dom@npm:18.0.6" dependencies: @@ -4584,7 +4859,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^18.0.15": +"@types/react@npm:18.0.15": version: 18.0.15 resolution: "@types/react@npm:18.0.15" dependencies: @@ -4690,6 +4965,13 @@ __metadata: languageName: node linkType: hard +"@types/validator@npm:^13.7.1": + version: 13.7.12 + resolution: "@types/validator@npm:13.7.12" + checksum: 98fc9cb0e0af31a8cf7f3234dbd8391a937b1596cdfea16f21f4228f46d70eea2ebc1128ff6c4041ec7db2d94f093eeb441e66ce1eb9902157b6c44d01066fe2 + languageName: node + linkType: hard + "@types/ws@npm:^7.0.0": version: 7.4.7 resolution: "@types/ws@npm:7.4.7" @@ -5130,7 +5412,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.1": +"acorn@npm:^8.2.4, acorn@npm:^8.5.0, acorn@npm:^8.7.1": version: 8.7.1 resolution: "acorn@npm:8.7.1" bin: @@ -5366,13 +5648,6 @@ __metadata: languageName: node linkType: hard -"any-promise@npm:^1.3.0": - version: 1.3.0 - resolution: "any-promise@npm:1.3.0" - checksum: 0ee8a9bdbe882c90464d75d1f55cf027f5458650c4bd1f0467e65aec38ccccda07ca5844969ee77ed46d04e7dded3eaceb027e8d32f385688523fe305fa7e1de - languageName: node - linkType: hard - "anymatch@npm:^2.0.0": version: 2.0.0 resolution: "anymatch@npm:2.0.0" @@ -5393,15 +5668,15 @@ __metadata: languageName: node linkType: hard -"apollo-cache-control@npm:^0.14.0": - version: 0.14.0 - resolution: "apollo-cache-control@npm:0.14.0" +"apollo-cache-control@npm:^0.15.0": + version: 0.15.0 + resolution: "apollo-cache-control@npm:0.15.0" dependencies: - apollo-server-env: ^3.1.0 - apollo-server-plugin-base: ^0.13.0 + apollo-server-env: ^3.2.0 + apollo-server-plugin-base: ^0.14.0 peerDependencies: graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 - checksum: c596639e8ef8e414635b0477b80c82081245940310b93dac6c25f24b61980ea92e553778fc93b6106e6353a4ace9dd7405f92696810ca9b3cdd1daee77bb1a8e + checksum: 1d060f0368d66d57a1f79bd4535a39fc7fd2b135f7f25767f1d0f0b0be67536e816261e4dc741c7f43805bd64fdfeee0ab5cb9b0d9123cd5139506d3c858ff29 languageName: node linkType: hard @@ -5496,13 +5771,13 @@ __metadata: languageName: node linkType: hard -"apollo-datasource@npm:^0.9.0": - version: 0.9.0 - resolution: "apollo-datasource@npm:0.9.0" +"apollo-datasource@npm:^0.10.0": + version: 0.10.0 + resolution: "apollo-datasource@npm:0.10.0" dependencies: apollo-server-caching: ^0.7.0 - apollo-server-env: ^3.1.0 - checksum: 7b9cd7ffe52b8c465db94c790e8b4dfc136f8f6e552da7bda82382de4637266b945d0e1ec421731350a4710d37561a675353f33c951ed695cf43509b7afa954c + apollo-server-env: ^3.2.0 + checksum: c786b406d5359beae90e3150ef07abe2c42b87f7661b99f631ee9e5d9a751b783369b37e7942ff6b4c865de9aa589ced0c5a30de7509cb62c21dcdb5bf076da2 languageName: node linkType: hard @@ -5672,27 +5947,27 @@ __metadata: linkType: hard "apollo-server-core@npm:^2.25.4": - version: 2.25.4 - resolution: "apollo-server-core@npm:2.25.4" + version: 2.26.2 + resolution: "apollo-server-core@npm:2.26.2" dependencies: "@apollographql/apollo-tools": ^0.5.0 "@apollographql/graphql-playground-html": 1.6.27 - "@apollographql/graphql-upload-8-fork": ^8.1.3 + "@apollographql/graphql-upload-8-fork": ^8.1.4 "@josephg/resolvable": ^1.0.0 "@types/ws": ^7.0.0 - apollo-cache-control: ^0.14.0 - apollo-datasource: ^0.9.0 + apollo-cache-control: ^0.15.0 + apollo-datasource: ^0.10.0 apollo-graphql: ^0.9.0 apollo-reporting-protobuf: ^0.8.0 apollo-server-caching: ^0.7.0 - apollo-server-env: ^3.1.0 + apollo-server-env: ^3.2.0 apollo-server-errors: ^2.5.0 - apollo-server-plugin-base: ^0.13.0 - apollo-server-types: ^0.9.0 - apollo-tracing: ^0.15.0 + apollo-server-plugin-base: ^0.14.0 + apollo-server-types: ^0.10.0 + apollo-tracing: ^0.16.0 async-retry: ^1.2.1 fast-json-stable-stringify: ^2.0.0 - graphql-extensions: ^0.15.0 + graphql-extensions: ^0.16.0 graphql-tag: ^2.11.0 graphql-tools: ^4.0.8 loglevel: ^1.6.7 @@ -5702,7 +5977,7 @@ __metadata: uuid: ^8.0.0 peerDependencies: graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 - checksum: 673dacbca12501c660ff8491010928a77e6d504b346750acefe0f999ae767fc67a68102207c0c350880aa9b14b1152241078419cd19e90e737479458f6952e18 + checksum: 56d084235a40f7c664a7aa00e93e9339d624689c8e0035a49b5a8cfd98f166bf899c47f1b8c99ea32e4a32115abf5740419c4f4e765628eb5f03e9d2f38aa26a languageName: node linkType: hard @@ -5726,6 +6001,16 @@ __metadata: languageName: node linkType: hard +"apollo-server-env@npm:^3.2.0": + version: 3.2.0 + resolution: "apollo-server-env@npm:3.2.0" + dependencies: + node-fetch: ^2.6.1 + util.promisify: ^1.0.0 + checksum: 84d880e48371d02860ba2124d1c0f026276f5f22cd18dcdd3cacbb7a70cc8d2cf07a4bd4f294006e928c0ef95cc31cdad2198cbc968a649633521b0084416e5c + languageName: node + linkType: hard + "apollo-server-env@npm:^4.2.1": version: 4.2.1 resolution: "apollo-server-env@npm:4.2.1" @@ -5780,14 +6065,14 @@ __metadata: languageName: node linkType: hard -"apollo-server-plugin-base@npm:^0.13.0": - version: 0.13.0 - resolution: "apollo-server-plugin-base@npm:0.13.0" +"apollo-server-plugin-base@npm:^0.14.0": + version: 0.14.0 + resolution: "apollo-server-plugin-base@npm:0.14.0" dependencies: - apollo-server-types: ^0.9.0 + apollo-server-types: ^0.10.0 peerDependencies: graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 - checksum: 9db78d0a1d2d9debe32d7e0584a4e180341e095a1df22b71470f3a457bc488ef2580687e06bc59eba1483bdb2e5bcad7f050f57d05632441800ea8953c272a95 + checksum: dd076fa44b9fecd826a7035407b771cafc6d690bd9416b877a88d981830afaa02863e99cf215faa1b0ef24b30e8cad251eb0bb530e999c48067239d965b8ca60 languageName: node linkType: hard @@ -5802,6 +6087,19 @@ __metadata: languageName: node linkType: hard +"apollo-server-types@npm:^0.10.0": + version: 0.10.0 + resolution: "apollo-server-types@npm:0.10.0" + dependencies: + apollo-reporting-protobuf: ^0.8.0 + apollo-server-caching: ^0.7.0 + apollo-server-env: ^3.2.0 + peerDependencies: + graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 + checksum: 73b4783e5ecd47cafd69cdf82ffb3422cbbcc51fe56b1ea617cc61f577ca68107da0097b2b3466c3d547d93122e000aee3b2459fc6034aacefbe317e446df4da + languageName: node + linkType: hard + "apollo-server-types@npm:^0.9.0": version: 0.9.0 resolution: "apollo-server-types@npm:0.9.0" @@ -5831,15 +6129,15 @@ __metadata: languageName: node linkType: hard -"apollo-tracing@npm:^0.15.0": - version: 0.15.0 - resolution: "apollo-tracing@npm:0.15.0" +"apollo-tracing@npm:^0.16.0": + version: 0.16.0 + resolution: "apollo-tracing@npm:0.16.0" dependencies: - apollo-server-env: ^3.1.0 - apollo-server-plugin-base: ^0.13.0 + apollo-server-env: ^3.2.0 + apollo-server-plugin-base: ^0.14.0 peerDependencies: graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 - checksum: f177bf823be646b62d690dce75918cfa833a0233960ce0fe59bc25869dcbcfad78c18301038f01216f1c045af0976a9977aaad43b03ef356874f53a719c8367c + checksum: 1b6851b555f07f2314568de2e65057bb3d5e7f9f4d3088881e5575aa6366b3abcb119ce4404a1a01ac1a721cba965581dba3ebf83d8e977833d2cc097a52c089 languageName: node linkType: hard @@ -6594,7 +6892,7 @@ __metadata: languageName: node linkType: hard -"bluebird@npm:^3.5.0, bluebird@npm:^3.5.5": +"bluebird@npm:^3.5.5": version: 3.7.2 resolution: "bluebird@npm:3.7.2" checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef @@ -6785,6 +7083,15 @@ __metadata: languageName: node linkType: hard +"busboy@npm:1.6.0": + version: 1.6.0 + resolution: "busboy@npm:1.6.0" + dependencies: + streamsearch: ^1.1.0 + checksum: 32801e2c0164e12106bf236291a00795c3c4e4b709ae02132883fe8478ba2ae23743b11c5735a0aae8afe65ac4b6ca4568b91f0d9fed1fdbc32ede824a73746e + languageName: node + linkType: hard + "busboy@npm:^0.3.1": version: 0.3.1 resolution: "busboy@npm:0.3.1" @@ -6925,13 +7232,20 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001332, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001349": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001335, caniuse-lite@npm:^1.0.30001349": version: 1.0.30001367 resolution: "caniuse-lite@npm:1.0.30001367" checksum: 9912aed182b8b3a834787424b56a0e71b5ecb5d2cb7235fb022227bc3a81202e8a34bebc5dc9cc504c515b4e052f825c36c2db4b0b880c10e195fe63673edfc6 languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001406": + version: 1.0.30001561 + resolution: "caniuse-lite@npm:1.0.30001561" + checksum: 949829fe037e23346595614e01d362130245920503a12677f2506ce68e1240360113d6383febed41e8aa38cd0f5fd9c69c21b0af65a71c0246d560db489f1373 + languageName: node + linkType: hard + "capital-case@npm:^1.0.4": version: 1.0.4 resolution: "capital-case@npm:1.0.4" @@ -7272,16 +7586,25 @@ __metadata: languageName: node linkType: hard +"client-only@npm:0.0.1": + version: 0.0.1 + resolution: "client-only@npm:0.0.1" + checksum: 0c16bf660dadb90610553c1d8946a7fdfb81d624adea073b8440b7d795d5b5b08beb3c950c6a2cf16279365a3265158a236876d92bce16423c485c322d7dfaf8 + languageName: node + linkType: hard + "client@workspace:examples/4-apollo-tutorial/client": version: 0.0.0-use.local resolution: "client@workspace:examples/4-apollo-tutorial/client" dependencies: "@reach/router": ^1.2.1 emotion: ^10.0.6 + graphql: ^16.8.1 + graphql-request: ^6.1.0 jest-dom: ^3.0.0 - mobx: ^6.6.0 + mobx: ^6.10.2 mobx-react: ^7.5.0 - mobx-state-tree: ^5.1.5 + mobx-state-tree: ^5.3.0 mst-gql: "portal:../../../" polished: ^2.3.3 react: ^18.2.0 @@ -7322,16 +7645,6 @@ __metadata: languageName: node linkType: hard -"cls-bluebird@npm:^2.1.0": - version: 2.1.0 - resolution: "cls-bluebird@npm:2.1.0" - dependencies: - is-bluebird: ^1.0.2 - shimmer: ^1.1.0 - checksum: b2da9dc39dbb4d29f5610b1f50af34e2c41b72d1b50dc7ed5c2ac64fda44390e919ffcf4a8eb18f3387c18756e5e0dffa564fb2256027ed9ec8430e5ffb17ed3 - languageName: node - linkType: hard - "co@npm:^4.6.0": version: 4.6.0 resolution: "co@npm:4.6.0" @@ -8217,9 +8530,9 @@ __metadata: linkType: hard "decode-uri-component@npm:^0.2.0": - version: 0.2.0 - resolution: "decode-uri-component@npm:0.2.0" - checksum: f3749344ab9305ffcfe4bfe300e2dbb61fc6359e2b736812100a3b1b6db0a5668cba31a05e4b45d4d63dbf1a18dfa354cd3ca5bb3ededddabb8cd293f4404f94 + version: 0.2.2 + resolution: "decode-uri-component@npm:0.2.2" + checksum: 95476a7d28f267292ce745eac3524a9079058bbb35767b76e3ee87d42e34cd0275d2eb19d9d08c3e167f97556e8a2872747f5e65cbebcac8b0c98d83e285f139 languageName: node linkType: hard @@ -8487,11 +8800,11 @@ __metadata: linkType: hard "dns-packet@npm:^5.2.2": - version: 5.3.1 - resolution: "dns-packet@npm:5.3.1" + version: 5.4.0 + resolution: "dns-packet@npm:5.4.0" dependencies: "@leichtgewicht/ip-codec": ^2.0.1 - checksum: 196ff74a0669126cf5fc901a5849b72f625bd7a4cb163b3f4d41fbe19ed0b017cf7674daef5b0acbd448c094fcd795e501d7066f301be428e4acecfcf3c5f336 + checksum: a169963848e8539dfd8a19058562f9e1c15c0f82cbf76fa98942f11c46f3c74e7e7c82e3a8a5182d4c9e6ff19e21be738dbd098a876dde755d3aedd2cc730880 languageName: node linkType: hard @@ -8662,10 +8975,10 @@ __metadata: languageName: node linkType: hard -"dottie@npm:^2.0.0": - version: 2.0.2 - resolution: "dottie@npm:2.0.2" - checksum: 046a5818033725a5a12b60270473cd9a19b0e88bd007a0c9a66be36983e53626de949aee9d0290fbfe0275aa31837491adbbbb8bf74ef09f78d21598793d6268 +"dottie@npm:^2.0.2": + version: 2.0.6 + resolution: "dottie@npm:2.0.6" + checksum: 4c778df9dc631a1108a32ef390916836814999a7411d10883f4151bd49c9c6934dc329b3f50fc7692849aa75ba87dba880fd54be501a3b39a6b9c23d6f772a09 languageName: node linkType: hard @@ -8810,13 +9123,13 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.9.3": - version: 5.9.3 - resolution: "enhanced-resolve@npm:5.9.3" +"enhanced-resolve@npm:^5.10.0": + version: 5.12.0 + resolution: "enhanced-resolve@npm:5.12.0" dependencies: graceful-fs: ^4.2.4 tapable: ^2.2.0 - checksum: 64c2dbbdd608d1a4df93b6e60786c603a1faf3b2e66dfd051d62cf4cfaeeb5e800166183685587208d62e9f7afff3f78f3d5978e32cd80125ba0c83b59a79d78 + checksum: bf3f787facaf4ce3439bef59d148646344e372bef5557f0d37ea8aa02c51f50a925cd1f07b8d338f18992c29f544ec235a8c64bcdb56030196c48832a5494174 languageName: node linkType: hard @@ -10112,14 +10425,14 @@ __metadata: apollo-server: ^2.9.4 apollo-server-testing: ^2.9.4 dotenv: ^6.1.0 - graphql: ^16.5.0 + graphql: 15.8.0 isemail: ^3.1.3 jest: ^27.0.6 nock: ^10.0.2 node-fetch: ^2.2.1 nodemon: ^1.19.2 now: ^12.1.3 - sequelize: ^5.15.1 + sequelize: ^6.29.0 sqlite3: ^4.0.9 languageName: unknown linkType: soft @@ -10570,16 +10883,16 @@ __metadata: languageName: node linkType: hard -"graphql-extensions@npm:^0.15.0": - version: 0.15.0 - resolution: "graphql-extensions@npm:0.15.0" +"graphql-extensions@npm:^0.16.0": + version: 0.16.0 + resolution: "graphql-extensions@npm:0.16.0" dependencies: "@apollographql/apollo-tools": ^0.5.0 - apollo-server-env: ^3.1.0 - apollo-server-types: ^0.9.0 + apollo-server-env: ^3.2.0 + apollo-server-types: ^0.10.0 peerDependencies: graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 - checksum: 5e93ebf85c028c0d91da871ad775807720e4959e4582752f6be07cd19936131df3541b0d338669e0d86d898e58a3ba7aa7ae677eef1ca5a89a3c77862f8c5e0a + checksum: b1748c69e34ed109f3f369fa46152ec1ee6f8e5327e7f05f3dc4545cafcf50f5184c23c15437ab4b89e76762ac546e0410a8ddc1627515ab9e576c11ae2524c5 languageName: node linkType: hard @@ -10616,6 +10929,18 @@ __metadata: languageName: node linkType: hard +"graphql-request@npm:^6.1.0": + version: 6.1.0 + resolution: "graphql-request@npm:6.1.0" + dependencies: + "@graphql-typed-document-node/core": ^3.2.0 + cross-fetch: ^3.1.5 + peerDependencies: + graphql: 14 - 16 + checksum: 6d62630a0169574442320651c1f7626c0c602025c3c46b19e09417c9579bb209306ee63de9793a03be2e1701bb7f13971f8545d99bc6573e340f823af0ad35b2 + languageName: node + linkType: hard + "graphql-subscriptions@npm:^1.0.0": version: 1.2.1 resolution: "graphql-subscriptions@npm:1.2.1" @@ -10662,7 +10987,7 @@ __metadata: languageName: node linkType: hard -"graphql@npm:14.0.2 - 14.2.0 || ^14.3.1 || ^15.0.0": +"graphql@npm:14.0.2 - 14.2.0 || ^14.3.1 || ^15.0.0, graphql@npm:15.8.0": version: 15.8.0 resolution: "graphql@npm:15.8.0" checksum: 423325271db8858428641b9aca01699283d1fe5b40ef6d4ac622569ecca927019fce8196208b91dd1d8eb8114f00263fe661d241d0eb40c10e5bfd650f86ec5e @@ -10676,6 +11001,13 @@ __metadata: languageName: node linkType: hard +"graphql@npm:^16.8.1": + version: 16.8.1 + resolution: "graphql@npm:16.8.1" + checksum: 8d304b7b6f708c8c5cc164b06e92467dfe36aff6d4f2cf31dd19c4c2905a0e7b89edac4b7e225871131fd24e21460836b369de0c06532644d15b461d55b1ccc0 + languageName: node + linkType: hard + "gud@npm:^1.0.0": version: 1.0.0 resolution: "gud@npm:1.0.0" @@ -10987,9 +11319,9 @@ __metadata: linkType: hard "http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0": - version: 4.1.0 - resolution: "http-cache-semantics@npm:4.1.0" - checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42 + version: 4.1.1 + resolution: "http-cache-semantics@npm:4.1.1" + checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236 languageName: node linkType: hard @@ -11332,10 +11664,10 @@ __metadata: languageName: node linkType: hard -"inflection@npm:1.12.0": - version: 1.12.0 - resolution: "inflection@npm:1.12.0" - checksum: c640917b7c1ef2151df8eed5e7bc1ea6f6dd7b924e86f1add0bf801db55be8b581eb2d3d767a29e439153e4c06b00679a45853ac58c498ea519c4b4bdcd2a775 +"inflection@npm:^1.13.2": + version: 1.13.4 + resolution: "inflection@npm:1.13.4" + checksum: 6744feede9998ad8abd2b1db4af79f494a166e656a0aa949d90c8f4a945c1d07038a3756bf7af78c8f6fce368ba213a7ebf35da3edeffd39f1da0ff465eed6eb languageName: node linkType: hard @@ -11480,13 +11812,6 @@ __metadata: languageName: node linkType: hard -"is-bluebird@npm:^1.0.2": - version: 1.0.2 - resolution: "is-bluebird@npm:1.0.2" - checksum: 3397e7a1e008f2711d0e23d722cc5c3a64c610b01604c0779728ceecd2bf5b1a1d16b030ec63ba53d132ae0def31a47296083f104d2029a191c7289818f94e6f - languageName: node - linkType: hard - "is-boolean-object@npm:^1.1.0": version: 1.1.2 resolution: "is-boolean-object@npm:1.1.2" @@ -12806,13 +13131,13 @@ __metadata: linkType: hard "json5@npm:^1.0.1": - version: 1.0.1 - resolution: "json5@npm:1.0.1" + version: 1.0.2 + resolution: "json5@npm:1.0.2" dependencies: minimist: ^1.2.0 bin: json5: lib/cli.js - checksum: e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3 + checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7 languageName: node linkType: hard @@ -13149,13 +13474,13 @@ __metadata: linkType: hard "loader-utils@npm:^2.0.0": - version: 2.0.2 - resolution: "loader-utils@npm:2.0.2" + version: 2.0.4 + resolution: "loader-utils@npm:2.0.4" dependencies: big.js: ^5.2.2 emojis-list: ^3.0.0 json5: ^2.1.2 - checksum: 9078d1ed47cadc57f4c6ddbdb2add324ee7da544cea41de3b7f1128e8108fcd41cd3443a85b7ee8d7d8ac439148aa221922774efe4cf87506d4fb054d5889303 + checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7 languageName: node linkType: hard @@ -13281,7 +13606,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.5, lodash@npm:^4.7.0, lodash@npm:~4.17.10": +"lodash@npm:^4.17.11, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.5, lodash@npm:^4.7.0, lodash@npm:~4.17.10": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -13865,16 +14190,6 @@ __metadata: languageName: node linkType: hard -"mobx-react-lite@npm:^1.4.1": - version: 1.5.2 - resolution: "mobx-react-lite@npm:1.5.2" - peerDependencies: - mobx: ^4.0.0 || ^5.0.0 - react: ^16.8.0 - checksum: 0f42927b4dad28d3c8973d7788caac359faaf44d396e4fd435c8811b5f8bc835094751719ecc838cd527cb8895d1a83788b70288757759686c19785f51d65e4a - languageName: node - linkType: hard - "mobx-react-lite@npm:^3.4.0": version: 3.4.0 resolution: "mobx-react-lite@npm:3.4.0" @@ -13890,6 +14205,23 @@ __metadata: languageName: node linkType: hard +"mobx-react-lite@npm:^4.0.5": + version: 4.0.5 + resolution: "mobx-react-lite@npm:4.0.5" + dependencies: + use-sync-external-store: ^1.2.0 + peerDependencies: + mobx: ^6.9.0 + react: ^16.8.0 || ^17 || ^18 + peerDependenciesMeta: + react-dom: + optional: true + react-native: + optional: true + checksum: b0a3e4345c1449eee7c0a6aa2369475024a0c8227e11305cc965229527e3ddede4ca7b8337912a7fe396e24bd83986f2a88a21813c51cabdc18330fa484023b5 + languageName: node + linkType: hard + "mobx-react@npm:^7.5.0": version: 7.5.0 resolution: "mobx-react@npm:7.5.0" @@ -13907,38 +14239,45 @@ __metadata: languageName: node linkType: hard -"mobx-state-tree@npm:^5.1.5": - version: 5.1.5 - resolution: "mobx-state-tree@npm:5.1.5" +"mobx-state-tree@npm:^5.3.0": + version: 5.3.0 + resolution: "mobx-state-tree@npm:5.3.0" peerDependencies: mobx: ^6.3.0 - checksum: 7d88e6018668e0fe21908301848a724810640d8271e287bc90cbe63f87172d8353dc9f7fb922899e0ba70efba290c6cc7166b90032c76b957faec42a4dd27923 + checksum: 95d97cd2b53e90b41a18168e7b1fa6fc4c264138ef68700f9f94d93e33ca554d527da9311f586e6b4ff7903cb899715cf6d67fde071374730d50f6411961c870 languageName: node linkType: hard -"mobx@npm:^6.6.0": - version: 6.6.0 - resolution: "mobx@npm:6.6.0" - checksum: 369b8d6830ec286e9c856c80002c7a554d46bca739b7f76432cb56b3ce1fe0a7ed7e5a994b9793d30023beeff0dd16300a501e831fa97107104e4fedc7d4af8f +"mobx@npm:^6.10.2": + version: 6.10.2 + resolution: "mobx@npm:6.10.2" + checksum: 14d6f1db4e3a61c823510ea130229c96bd4958b77d81057ac1abc6a439703eaf3ea2289192ef205b4250d3adb1d83a439ad56d5e53f2b967c6e62a6bccc23d8a languageName: node linkType: hard -"moment-timezone@npm:^0.5.21": - version: 0.5.34 - resolution: "moment-timezone@npm:0.5.34" +"moment-timezone@npm:^0.5.35": + version: 0.5.40 + resolution: "moment-timezone@npm:0.5.40" dependencies: moment: ">= 2.9.0" - checksum: 12a1d3d52e4ba509cf1fa36bbda59d898a08fa80ab35f6c358747e93aec1f07e617cec647eaf2e8acf5f9132e581d4704d34a9edffa9a80c5cd04bf23b277595 + checksum: 6f6be5412b37fd937bb143efe74bf65b2c3f115fd967a6dc13b717a126ed6dd198bff6db6e179d69a089e20ac03ce7622c6b5598dd585005195554487a91b528 languageName: node linkType: hard -"moment@npm:2.29.3, moment@npm:>= 2.9.0, moment@npm:^2.24.0": +"moment@npm:2.29.3, moment@npm:>= 2.9.0": version: 2.29.3 resolution: "moment@npm:2.29.3" checksum: 2e780e36d9a1823c08a1b6313cbb08bd01ecbb2a9062095820a34f42c878991ccba53abaa6abb103fd5c01e763724f295162a8c50b7e95b4f1c992ef0772d3f0 languageName: node linkType: hard +"moment@npm:^2.29.1": + version: 2.29.4 + resolution: "moment@npm:2.29.4" + checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e + languageName: node + linkType: hard + "mri@npm:^1.1.0, mri@npm:^1.1.5": version: 1.2.0 resolution: "mri@npm:1.2.0" @@ -14149,13 +14488,14 @@ __metadata: "@babel/plugin-proposal-decorators": ^7.18.2 "@babel/plugin-transform-modules-commonjs": ^7.18.2 "@babel/preset-env": ^7.18.2 + "@babel/preset-react": ^7.17.12 "@babel/preset-typescript": ^7.17.12 "@babel/register": ^7.17.7 "@types/jest": ^27.5.2 "@types/lodash": ^4.14.182 "@types/pluralize": ^0.0.29 - "@types/react": ^18.0.15 - "@types/react-dom": ^18.0.6 + "@types/react": ^18.2.15 + "@types/react-dom": ^18.2.7 "@types/throttle-debounce": ^5.0.0 "@types/ws": ^8.5.3 ansi-colors: ^4.1.3 @@ -14173,21 +14513,22 @@ __metadata: jest: ^27.0.6 lodash: ^4.17.21 microbundle: ^0.15.0 - mobx: ^6.6.0 + mobx: ^6.10.2 mobx-react: ^7.5.0 - mobx-state-tree: ^5.1.5 + mobx-state-tree: ^5.3.0 node-fetch: ^2.2.1 node-gyp: ^9.0.0 pinst: 3.0.0 pluralize: ^8.0.0 prettier: ^2.6.2 pretty-quick: ^3.1.3 + process: 0.11.10 react: ^18.2.0 react-dom: ^18.2.0 subscriptions-transport-ws: ^0.11.0 syncpack: 8.2.4 throttle-debounce: ^5.0.0 - typescript: ^4.7.3 + typescript: ^5.2.2 peerDependencies: graphql: 14 - 16 mobx: 6 @@ -14231,7 +14572,7 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.1.30, nanoid@npm:^3.1.32, nanoid@npm:^3.3.4": +"nanoid@npm:^3.1.32, nanoid@npm:^3.3.4": version: 3.3.4 resolution: "nanoid@npm:3.3.4" bin: @@ -14240,6 +14581,15 @@ __metadata: languageName: node linkType: hard +"nanoid@npm:^3.3.6": + version: 3.3.7 + resolution: "nanoid@npm:3.3.7" + bin: + nanoid: bin/nanoid.cjs + checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2 + languageName: node + linkType: hard + "nanomatch@npm:^1.2.9": version: 1.2.13 resolution: "nanomatch@npm:1.2.13" @@ -14300,48 +14650,36 @@ __metadata: languageName: node linkType: hard -"next@npm:^12.2.2": - version: 12.2.2 - resolution: "next@npm:12.2.2" - dependencies: - "@next/env": 12.2.2 - "@next/swc-android-arm-eabi": 12.2.2 - "@next/swc-android-arm64": 12.2.2 - "@next/swc-darwin-arm64": 12.2.2 - "@next/swc-darwin-x64": 12.2.2 - "@next/swc-freebsd-x64": 12.2.2 - "@next/swc-linux-arm-gnueabihf": 12.2.2 - "@next/swc-linux-arm64-gnu": 12.2.2 - "@next/swc-linux-arm64-musl": 12.2.2 - "@next/swc-linux-x64-gnu": 12.2.2 - "@next/swc-linux-x64-musl": 12.2.2 - "@next/swc-win32-arm64-msvc": 12.2.2 - "@next/swc-win32-ia32-msvc": 12.2.2 - "@next/swc-win32-x64-msvc": 12.2.2 - "@swc/helpers": 0.4.2 - caniuse-lite: ^1.0.30001332 - postcss: 8.4.5 - styled-jsx: 5.0.2 - use-sync-external-store: 1.1.0 - peerDependencies: - fibers: ">= 3.1.0" - node-sass: ^6.0.0 || ^7.0.0 - react: ^17.0.2 || ^18.0.0-0 - react-dom: ^17.0.2 || ^18.0.0-0 +"next@npm:^13.5.0": + version: 13.5.6 + resolution: "next@npm:13.5.6" + dependencies: + "@next/env": 13.5.6 + "@next/swc-darwin-arm64": 13.5.6 + "@next/swc-darwin-x64": 13.5.6 + "@next/swc-linux-arm64-gnu": 13.5.6 + "@next/swc-linux-arm64-musl": 13.5.6 + "@next/swc-linux-x64-gnu": 13.5.6 + "@next/swc-linux-x64-musl": 13.5.6 + "@next/swc-win32-arm64-msvc": 13.5.6 + "@next/swc-win32-ia32-msvc": 13.5.6 + "@next/swc-win32-x64-msvc": 13.5.6 + "@swc/helpers": 0.5.2 + busboy: 1.6.0 + caniuse-lite: ^1.0.30001406 + postcss: 8.4.31 + styled-jsx: 5.1.1 + watchpack: 2.4.0 + peerDependencies: + "@opentelemetry/api": ^1.1.0 + react: ^18.2.0 + react-dom: ^18.2.0 sass: ^1.3.0 dependenciesMeta: - "@next/swc-android-arm-eabi": - optional: true - "@next/swc-android-arm64": - optional: true "@next/swc-darwin-arm64": optional: true "@next/swc-darwin-x64": optional: true - "@next/swc-freebsd-x64": - optional: true - "@next/swc-linux-arm-gnueabihf": - optional: true "@next/swc-linux-arm64-gnu": optional: true "@next/swc-linux-arm64-musl": @@ -14357,15 +14695,13 @@ __metadata: "@next/swc-win32-x64-msvc": optional: true peerDependenciesMeta: - fibers: - optional: true - node-sass: + "@opentelemetry/api": optional: true sass: optional: true bin: next: dist/bin/next - checksum: fb8ced6fb551c60c71a0fb8f443f0a15cd12aed0b1a21fbaba132c47863cccf7517dce8074b1572ba1f20c974d6e5329963a9c4fb89afe88fe22eb1505ba0db8 + checksum: c869b0014ae921ada3bf22301985027ec320aebcd6aa9c16e8afbded68bb8def5874cca034c680e8c351a79578f1e514971d02777f6f0a5a1d7290f25970ac0d languageName: node linkType: hard @@ -15424,6 +15760,13 @@ __metadata: languageName: node linkType: hard +"pg-connection-string@npm:^2.5.0": + version: 2.5.0 + resolution: "pg-connection-string@npm:2.5.0" + checksum: a6f3a068f7c9416a5b33a326811caf0dfaaee045c225b7c628b4c9b4e9a2b25bdd12a21e4c48940e1000ea223a4e608ca122d2ff3dd08c8b1db0fc9f5705133a + languageName: node + linkType: hard + "picocolors@npm:^0.2.1": version: 0.2.1 resolution: "picocolors@npm:0.2.1" @@ -16380,14 +16723,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.5": - version: 8.4.5 - resolution: "postcss@npm:8.4.5" +"postcss@npm:8.4.31": + version: 8.4.31 + resolution: "postcss@npm:8.4.31" dependencies: - nanoid: ^3.1.30 + nanoid: ^3.3.6 picocolors: ^1.0.0 - source-map-js: ^1.0.1 - checksum: b78abdd89c10f7b48f4bdcd376104a19d6e9c7495ab521729bdb3df315af6c211360e9f06887ad3bc0ab0f61a04b91d68ea11462997c79cced58b9ccd66fac07 + source-map-js: ^1.0.2 + checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea languageName: node linkType: hard @@ -16565,6 +16908,13 @@ __metadata: languageName: node linkType: hard +"process@npm:0.11.10": + version: 0.11.10 + resolution: "process@npm:0.11.10" + checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3 + languageName: node + linkType: hard + "promise-inflight@npm:^1.0.1": version: 1.0.1 resolution: "promise-inflight@npm:1.0.1" @@ -16718,6 +17068,13 @@ __metadata: languageName: node linkType: hard +"querystringify@npm:^2.1.1": + version: 2.2.0 + resolution: "querystringify@npm:2.2.0" + checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15 + languageName: node + linkType: hard + "queue-microtask@npm:^1.2.2": version: 1.2.3 resolution: "queue-microtask@npm:1.2.3" @@ -16829,7 +17186,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^18.2.0": +"react-dom@npm:18.2.0": version: 18.2.0 resolution: "react-dom@npm:18.2.0" dependencies: @@ -16990,7 +17347,7 @@ __metadata: languageName: node linkType: hard -"react@npm:^18.2.0": +"react@npm:18.2.0": version: 18.2.0 resolution: "react@npm:18.2.0" dependencies: @@ -17467,12 +17824,10 @@ __metadata: languageName: node linkType: hard -"retry-as-promised@npm:^3.2.0": - version: 3.2.0 - resolution: "retry-as-promised@npm:3.2.0" - dependencies: - any-promise: ^1.3.0 - checksum: 282aa6fc2896e31d4ec7253ac1d0f1d6a67bf40b699d8f5d7d4b27707c1901272866d981480cd9730ad27583341052632207371a3cde23b6324525389316855e +"retry-as-promised@npm:^7.0.3": + version: 7.0.4 + resolution: "retry-as-promised@npm:7.0.4" + checksum: 2b0dcddb06649d42b1384ec1f933c7cb4461939c28004460b0c4be0c8ae16cabaed2411aa5d46e734a320f33f4a1d480078a19b97c743c754bd32e896b3f8ea2 languageName: node linkType: hard @@ -17834,11 +18189,11 @@ __metadata: linkType: hard "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.3.0, semver@npm:^5.5.0, semver@npm:^5.6.0, semver@npm:^5.7.0, semver@npm:^5.7.1": - version: 5.7.1 - resolution: "semver@npm:5.7.1" + version: 5.7.2 + resolution: "semver@npm:5.7.2" bin: - semver: ./bin/semver - checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf + semver: bin/semver + checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686 languageName: node linkType: hard @@ -17903,33 +18258,53 @@ __metadata: languageName: node linkType: hard -"sequelize-pool@npm:^2.3.0": - version: 2.3.0 - resolution: "sequelize-pool@npm:2.3.0" - checksum: 5119bb62fd0d57cf30f001adee69f4cd6e381f5cd4fc35be607cf838b9b05415bde984c093e1cc0b3477a0e475eb3835851e9d21581fa0c9aeb4c7f98493e30a +"sequelize-pool@npm:^7.1.0": + version: 7.1.0 + resolution: "sequelize-pool@npm:7.1.0" + checksum: b11d06d02de9e8fc428ba3020b86f05fe7adad764e57f23c5901f924e31867901a5e7a090180337dc3b90de3934b64f34ae552fde37b0f3d37b09c0c8ecbddc7 languageName: node linkType: hard -"sequelize@npm:^5.15.1": - version: 5.22.5 - resolution: "sequelize@npm:5.22.5" +"sequelize@npm:^6.29.0": + version: 6.29.0 + resolution: "sequelize@npm:6.29.0" dependencies: - bluebird: ^3.5.0 - cls-bluebird: ^2.1.0 - debug: ^4.1.1 - dottie: ^2.0.0 - inflection: 1.12.0 - lodash: ^4.17.15 - moment: ^2.24.0 - moment-timezone: ^0.5.21 - retry-as-promised: ^3.2.0 - semver: ^6.3.0 - sequelize-pool: ^2.3.0 + "@types/debug": ^4.1.7 + "@types/validator": ^13.7.1 + debug: ^4.3.3 + dottie: ^2.0.2 + inflection: ^1.13.2 + lodash: ^4.17.21 + moment: ^2.29.1 + moment-timezone: ^0.5.35 + pg-connection-string: ^2.5.0 + retry-as-promised: ^7.0.3 + semver: ^7.3.5 + sequelize-pool: ^7.1.0 toposort-class: ^1.0.1 uuid: ^8.3.2 validator: ^13.7.0 - wkx: ^0.4.8 - checksum: 89a586d4316d7977530e09b66f8ec3c58d69f6ca29341a94e7c731b3e99a0341db3054f6f2eb1ef78af6ced914d725b1541e41990c10d3760d58051da42c4a7a + wkx: ^0.5.0 + peerDependenciesMeta: + ibm_db: + optional: true + mariadb: + optional: true + mysql2: + optional: true + oracledb: + optional: true + pg: + optional: true + pg-hstore: + optional: true + snowflake-sdk: + optional: true + sqlite3: + optional: true + tedious: + optional: true + checksum: 3b25ef91cdf828f987deca28d5b46a5771b225687485b2f34c7a0e85269952fb7bf26cf689d1e32c94908238d6968fbab4694350407f56820f879769339c62b6 languageName: node linkType: hard @@ -18093,13 +18468,6 @@ __metadata: languageName: node linkType: hard -"shimmer@npm:^1.1.0": - version: 1.2.1 - resolution: "shimmer@npm:1.2.1" - checksum: aa0d6252ad1c682a4fdfda69e541be987f7a265ac7b00b1208e5e48cc68dc55f293955346ea4c71a169b7324b82c70f8400b3d3d2d60b2a7519f0a3522423250 - languageName: node - linkType: hard - "side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" @@ -18446,11 +18814,12 @@ __metadata: apollo-server-express: ^2.18.0 cross-env: ^5.2.1 express: ^4.17.1 - mobx: ^6.6.0 + graphql: 15.8.0 + mobx: ^6.10.2 mobx-react: ^7.5.0 - mobx-state-tree: ^5.1.5 + mobx-state-tree: ^5.3.0 mst-gql: "portal:../../" - next: ^12.2.2 + next: ^13.5.0 nodemon: ^1.19.2 react: ^18.2.0 react-dom: ^18.2.0 @@ -18528,6 +18897,13 @@ __metadata: languageName: node linkType: hard +"streamsearch@npm:^1.1.0": + version: 1.1.0 + resolution: "streamsearch@npm:1.1.0" + checksum: 1cce16cea8405d7a233d32ca5e00a00169cc0e19fbc02aa839959985f267335d435c07f96e5e0edd0eadc6d39c98d5435fb5bbbdefc62c41834eadc5622ad942 + languageName: node + linkType: hard + "strict-uri-encode@npm:^2.0.0": version: 2.0.0 resolution: "strict-uri-encode@npm:2.0.0" @@ -18794,9 +19170,11 @@ __metadata: languageName: node linkType: hard -"styled-jsx@npm:5.0.2": - version: 5.0.2 - resolution: "styled-jsx@npm:5.0.2" +"styled-jsx@npm:5.1.1": + version: 5.1.1 + resolution: "styled-jsx@npm:5.1.1" + dependencies: + client-only: 0.0.1 peerDependencies: react: ">= 16.8.0 || 17.x.x || ^18.0.0-0" peerDependenciesMeta: @@ -18804,7 +19182,7 @@ __metadata: optional: true babel-plugin-macros: optional: true - checksum: 86d55819ebeabd283a574d2f44f7d3f8fa6b8c28fa41687ece161bf1e910e04965611618921d8f5cd33dc6dae1033b926a70421ae5ea045440a9861edc3e0d87 + checksum: 523a33b38603492547e861b98e29c873939b04e15fbe5ef16132c6f1e15958126647983c7d4675325038b428a5e91183d996e90141b18bdd1bbadf6e2c45b2fa languageName: node linkType: hard @@ -19360,13 +19738,14 @@ __metadata: linkType: hard "tough-cookie@npm:^4.0.0": - version: 4.0.0 - resolution: "tough-cookie@npm:4.0.0" + version: 4.1.3 + resolution: "tough-cookie@npm:4.1.3" dependencies: psl: ^1.1.33 punycode: ^2.1.1 - universalify: ^0.1.2 - checksum: 0891b37eb7d17faa3479d47f0dce2e3007f2583094ad272f2670d120fbcc3df3b0b0a631ba96ecad49f9e2297d93ff8995ce0d3292d08dd7eabe162f5b224d69 + universalify: ^0.2.0 + url-parse: ^1.5.3 + checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc languageName: node linkType: hard @@ -19629,6 +20008,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:^5.2.2": + version: 5.2.2 + resolution: "typescript@npm:5.2.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c + languageName: node + linkType: hard + "typescript@patch:typescript@^4.1.3#~builtin, typescript@patch:typescript@^4.7.3#~builtin": version: 4.7.3 resolution: "typescript@patch:typescript@npm%3A4.7.3#~builtin::version=4.7.3&hash=7ad353" @@ -19639,6 +20028,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@^5.2.2#~builtin": + version: 5.2.2 + resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=7ad353" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554 + languageName: node + linkType: hard + "uid-number@npm:^0.0.6": version: 0.0.6 resolution: "uid-number@npm:0.0.6" @@ -19744,13 +20143,20 @@ __metadata: languageName: node linkType: hard -"universalify@npm:^0.1.0, universalify@npm:^0.1.2": +"universalify@npm:^0.1.0": version: 0.1.2 resolution: "universalify@npm:0.1.2" checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff languageName: node linkType: hard +"universalify@npm:^0.2.0": + version: 0.2.0 + resolution: "universalify@npm:0.2.0" + checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5 + languageName: node + linkType: hard + "universalify@npm:^2.0.0": version: 2.0.0 resolution: "universalify@npm:2.0.0" @@ -19857,12 +20263,22 @@ __metadata: languageName: node linkType: hard -"use-sync-external-store@npm:1.1.0": - version: 1.1.0 - resolution: "use-sync-external-store@npm:1.1.0" +"url-parse@npm:^1.5.3": + version: 1.5.10 + resolution: "url-parse@npm:1.5.10" + dependencies: + querystringify: ^2.1.1 + requires-port: ^1.0.0 + checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf + languageName: node + linkType: hard + +"use-sync-external-store@npm:^1.2.0": + version: 1.2.0 + resolution: "use-sync-external-store@npm:1.2.0" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 8993a0b642f91d7fcdbb02b7b3ac984bd3af4769686f38291fe7fcfe73dfb73d6c64d20dfb7e5e7fbf5a6da8f5392d6f8e5b00c243a04975595946e82c02b883 + checksum: 5c639e0f8da3521d605f59ce5be9e094ca772bd44a4ce7322b055a6f58eeed8dda3c94cabd90c7a41fb6fa852210092008afe48f7038792fd47501f33299116a languageName: node linkType: hard @@ -20100,7 +20516,7 @@ __metadata: languageName: node linkType: hard -"watchpack@npm:^2.3.1": +"watchpack@npm:2.4.0, watchpack@npm:^2.4.0": version: 2.4.0 resolution: "watchpack@npm:2.4.0" dependencies: @@ -20253,19 +20669,19 @@ __metadata: linkType: hard "webpack@npm:^5.64.4": - version: 5.73.0 - resolution: "webpack@npm:5.73.0" + version: 5.76.1 + resolution: "webpack@npm:5.76.1" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^0.0.51 "@webassemblyjs/ast": 1.11.1 "@webassemblyjs/wasm-edit": 1.11.1 "@webassemblyjs/wasm-parser": 1.11.1 - acorn: ^8.4.1 + acorn: ^8.7.1 acorn-import-assertions: ^1.7.6 browserslist: ^4.14.5 chrome-trace-event: ^1.0.2 - enhanced-resolve: ^5.9.3 + enhanced-resolve: ^5.10.0 es-module-lexer: ^0.9.0 eslint-scope: 5.1.1 events: ^3.2.0 @@ -20278,14 +20694,14 @@ __metadata: schema-utils: ^3.1.0 tapable: ^2.1.1 terser-webpack-plugin: ^5.1.3 - watchpack: ^2.3.1 + watchpack: ^2.4.0 webpack-sources: ^3.2.3 peerDependenciesMeta: webpack-cli: optional: true bin: webpack: bin/webpack.js - checksum: aa434a241bad6176b68e1bf0feb1972da4dcbf27cb3d94ae24f6eb31acc37dceb9c4aae55e068edca75817bfe91f13cd20b023ac55d9b1b2f8b66a4037c9468f + checksum: b01fe0bc2dbca0e10d290ddb0bf81e807a031de48028176e2b21afd696b4d3f25ab9accdad888ef4a1f7c7f4d41f13d5bf2395b7653fdf3e5e3dafa54e56dab2 languageName: node linkType: hard @@ -20424,19 +20840,19 @@ __metadata: languageName: node linkType: hard -"wkx@npm:^0.4.8": - version: 0.4.8 - resolution: "wkx@npm:0.4.8" +"wkx@npm:^0.5.0": + version: 0.5.0 + resolution: "wkx@npm:0.5.0" dependencies: "@types/node": "*" - checksum: c11a165d3d2effe0764eb04f2cb634528a485b2215aa373ca535bded9bfe016a107f3e96fd99b6f771e579b0603a378f4746d68661b22e70929660eb6b01dd69 + checksum: 47b27387de81fbd077528c1c11be996bf5a6dbeb94858ea0e2fa6619c2af626aa2f127f6fee1b4b57057a7cbef8a810b39a67815f2eb54ed33b1790e29db86ee languageName: node linkType: hard "word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3": - version: 1.2.3 - resolution: "word-wrap@npm:1.2.3" - checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f + version: 1.2.5 + resolution: "word-wrap@npm:1.2.5" + checksum: f93ba3586fc181f94afdaff3a6fef27920b4b6d9eaefed0f428f8e07adea2a7f54a5f2830ce59406c8416f033f86902b91eb824072354645eea687dff3691ccb languageName: node linkType: hard