diff --git a/packages/graphql-orm/CHANGELOG.md b/packages/base/CHANGELOG.md similarity index 100% rename from packages/graphql-orm/CHANGELOG.md rename to packages/base/CHANGELOG.md diff --git a/packages/graphql-orm/package.json b/packages/base/package.json similarity index 100% rename from packages/graphql-orm/package.json rename to packages/base/package.json diff --git a/packages/graphql-orm/src/filters/filters.ts b/packages/base/src/filters/filters.ts similarity index 100% rename from packages/graphql-orm/src/filters/filters.ts rename to packages/base/src/filters/filters.ts diff --git a/packages/graphql-orm/src/index.ts b/packages/base/src/index.ts similarity index 100% rename from packages/graphql-orm/src/index.ts rename to packages/base/src/index.ts diff --git a/packages/graphql-orm/src/orm/orm.ts b/packages/base/src/orm/orm.ts similarity index 100% rename from packages/graphql-orm/src/orm/orm.ts rename to packages/base/src/orm/orm.ts diff --git a/packages/graphql-orm/src/paginators/base.ts b/packages/base/src/paginators/base.ts similarity index 100% rename from packages/graphql-orm/src/paginators/base.ts rename to packages/base/src/paginators/base.ts diff --git a/packages/graphql-orm/src/paginators/cursor.ts b/packages/base/src/paginators/cursor.ts similarity index 100% rename from packages/graphql-orm/src/paginators/cursor.ts rename to packages/base/src/paginators/cursor.ts diff --git a/packages/graphql-orm/src/resolvers/field.ts b/packages/base/src/resolvers/field.ts similarity index 100% rename from packages/graphql-orm/src/resolvers/field.ts rename to packages/base/src/resolvers/field.ts diff --git a/packages/graphql-orm/src/resolvers/graph.ts b/packages/base/src/resolvers/graph.ts similarity index 100% rename from packages/graphql-orm/src/resolvers/graph.ts rename to packages/base/src/resolvers/graph.ts diff --git a/packages/graphql-orm/src/resolvers/page.ts b/packages/base/src/resolvers/page.ts similarity index 100% rename from packages/graphql-orm/src/resolvers/page.ts rename to packages/base/src/resolvers/page.ts diff --git a/packages/graphql-orm/src/resolvers/relation.ts b/packages/base/src/resolvers/relation.ts similarity index 100% rename from packages/graphql-orm/src/resolvers/relation.ts rename to packages/base/src/resolvers/relation.ts diff --git a/packages/graphql-orm/src/resolvers/table.ts b/packages/base/src/resolvers/table.ts similarity index 100% rename from packages/graphql-orm/src/resolvers/table.ts rename to packages/base/src/resolvers/table.ts diff --git a/packages/graphql-orm/src/utils/is-plain-object.ts b/packages/base/src/utils/is-plain-object.ts similarity index 100% rename from packages/graphql-orm/src/utils/is-plain-object.ts rename to packages/base/src/utils/is-plain-object.ts diff --git a/packages/graphql-orm/src/utils/run-after.ts b/packages/base/src/utils/run-after.ts similarity index 100% rename from packages/graphql-orm/src/utils/run-after.ts rename to packages/base/src/utils/run-after.ts diff --git a/packages/graphql-orm/tsconfig.json b/packages/base/tsconfig.json similarity index 100% rename from packages/graphql-orm/tsconfig.json rename to packages/base/tsconfig.json diff --git a/packages/objection-graphql-resolver/.gitignore b/packages/objection/.gitignore similarity index 100% rename from packages/objection-graphql-resolver/.gitignore rename to packages/objection/.gitignore diff --git a/packages/objection-graphql-resolver/CHANGELOG.md b/packages/objection/CHANGELOG.md similarity index 100% rename from packages/objection-graphql-resolver/CHANGELOG.md rename to packages/objection/CHANGELOG.md diff --git a/packages/objection-graphql-resolver/README.md b/packages/objection/README.md similarity index 100% rename from packages/objection-graphql-resolver/README.md rename to packages/objection/README.md diff --git a/packages/objection-graphql-resolver/docs/filters.md b/packages/objection/docs/filters.md similarity index 100% rename from packages/objection-graphql-resolver/docs/filters.md rename to packages/objection/docs/filters.md diff --git a/packages/objection-graphql-resolver/docs/pagination.md b/packages/objection/docs/pagination.md similarity index 100% rename from packages/objection-graphql-resolver/docs/pagination.md rename to packages/objection/docs/pagination.md diff --git a/packages/objection-graphql-resolver/docs/relations.md b/packages/objection/docs/relations.md similarity index 100% rename from packages/objection-graphql-resolver/docs/relations.md rename to packages/objection/docs/relations.md diff --git a/packages/objection-graphql-resolver/docs/virtual-attributes.md b/packages/objection/docs/virtual-attributes.md similarity index 100% rename from packages/objection-graphql-resolver/docs/virtual-attributes.md rename to packages/objection/docs/virtual-attributes.md diff --git a/packages/objection-graphql-resolver/package.json b/packages/objection/package.json similarity index 100% rename from packages/objection-graphql-resolver/package.json rename to packages/objection/package.json diff --git a/packages/objection-graphql-resolver/playground/readme.sample.ts b/packages/objection/playground/readme.sample.ts similarity index 100% rename from packages/objection-graphql-resolver/playground/readme.sample.ts rename to packages/objection/playground/readme.sample.ts diff --git a/packages/objection-graphql-resolver/playground/vite-env.d.ts b/packages/objection/playground/vite-env.d.ts similarity index 100% rename from packages/objection-graphql-resolver/playground/vite-env.d.ts rename to packages/objection/playground/vite-env.d.ts diff --git a/packages/objection-graphql-resolver/src/index.ts b/packages/objection/src/index.ts similarity index 100% rename from packages/objection-graphql-resolver/src/index.ts rename to packages/objection/src/index.ts diff --git a/packages/objection-graphql-resolver/src/orm/orm.ts b/packages/objection/src/orm/orm.ts similarity index 100% rename from packages/objection-graphql-resolver/src/orm/orm.ts rename to packages/objection/src/orm/orm.ts diff --git a/packages/objection-graphql-resolver/src/resolvers/graph.ts b/packages/objection/src/resolvers/graph.ts similarity index 100% rename from packages/objection-graphql-resolver/src/resolvers/graph.ts rename to packages/objection/src/resolvers/graph.ts diff --git a/packages/objection-graphql-resolver/src/resolvers/model.ts b/packages/objection/src/resolvers/model.ts similarity index 100% rename from packages/objection-graphql-resolver/src/resolvers/model.ts rename to packages/objection/src/resolvers/model.ts diff --git a/packages/objection-graphql-resolver/tests/main/async-modifier.test.ts b/packages/objection/tests/main/async-modifier.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/async-modifier.test.ts rename to packages/objection/tests/main/async-modifier.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/auto-select-pagination-keys.test.ts b/packages/objection/tests/main/auto-select-pagination-keys.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/auto-select-pagination-keys.test.ts rename to packages/objection/tests/main/auto-select-pagination-keys.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/field-transform.test.ts b/packages/objection/tests/main/field-transform.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/field-transform.test.ts rename to packages/objection/tests/main/field-transform.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/fields.test.ts b/packages/objection/tests/main/fields.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/fields.test.ts rename to packages/objection/tests/main/fields.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/filters.test.ts b/packages/objection/tests/main/filters.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/filters.test.ts rename to packages/objection/tests/main/filters.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/m2m.test.ts b/packages/objection/tests/main/m2m.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/m2m.test.ts rename to packages/objection/tests/main/m2m.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/nested-args.test.ts b/packages/objection/tests/main/nested-args.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/nested-args.test.ts rename to packages/objection/tests/main/nested-args.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/nested-pagination.test.ts b/packages/objection/tests/main/nested-pagination.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/nested-pagination.test.ts rename to packages/objection/tests/main/nested-pagination.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/query.test.ts b/packages/objection/tests/main/query.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/query.test.ts rename to packages/objection/tests/main/query.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/raw-sql.test.ts b/packages/objection/tests/main/raw-sql.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/raw-sql.test.ts rename to packages/objection/tests/main/raw-sql.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/readme-sample.test.ts b/packages/objection/tests/main/readme-sample.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/readme-sample.test.ts rename to packages/objection/tests/main/readme-sample.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/relations.test.ts b/packages/objection/tests/main/relations.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/relations.test.ts rename to packages/objection/tests/main/relations.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/root-pagination.test.ts b/packages/objection/tests/main/root-pagination.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/root-pagination.test.ts rename to packages/objection/tests/main/root-pagination.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/root-subfield.test.ts b/packages/objection/tests/main/root-subfield.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/root-subfield.test.ts rename to packages/objection/tests/main/root-subfield.test.ts diff --git a/packages/objection-graphql-resolver/tests/main/virtual-fields.test.ts b/packages/objection/tests/main/virtual-fields.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/main/virtual-fields.test.ts rename to packages/objection/tests/main/virtual-fields.test.ts diff --git a/packages/objection-graphql-resolver/tests/regressions/issue-1-no-relation-mappings.test.ts b/packages/objection/tests/regressions/issue-1-no-relation-mappings.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/regressions/issue-1-no-relation-mappings.test.ts rename to packages/objection/tests/regressions/issue-1-no-relation-mappings.test.ts diff --git a/packages/objection-graphql-resolver/tests/regressions/issue-33-relation-alias.test.ts b/packages/objection/tests/regressions/issue-33-relation-alias.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/regressions/issue-33-relation-alias.test.ts rename to packages/objection/tests/regressions/issue-33-relation-alias.test.ts diff --git a/packages/objection-graphql-resolver/tests/regressions/issue-7-ambiguous-column-name.test.ts b/packages/objection/tests/regressions/issue-7-ambiguous-column-name.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/regressions/issue-7-ambiguous-column-name.test.ts rename to packages/objection/tests/regressions/issue-7-ambiguous-column-name.test.ts diff --git a/packages/objection-graphql-resolver/tests/regressions/issue-9-deep-nested-filter.test.ts b/packages/objection/tests/regressions/issue-9-deep-nested-filter.test.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/regressions/issue-9-deep-nested-filter.test.ts rename to packages/objection/tests/regressions/issue-9-deep-nested-filter.test.ts diff --git a/packages/objection-graphql-resolver/tests/setup/apollo.ts b/packages/objection/tests/setup/apollo.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/setup/apollo.ts rename to packages/objection/tests/setup/apollo.ts diff --git a/packages/objection-graphql-resolver/tests/setup/client.ts b/packages/objection/tests/setup/client.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/setup/client.ts rename to packages/objection/tests/setup/client.ts diff --git a/packages/objection-graphql-resolver/tests/setup/db.ts b/packages/objection/tests/setup/db.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/setup/db.ts rename to packages/objection/tests/setup/db.ts diff --git a/packages/objection-graphql-resolver/tests/setup/index.ts b/packages/objection/tests/setup/index.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/setup/index.ts rename to packages/objection/tests/setup/index.ts diff --git a/packages/objection-graphql-resolver/tests/setup/setup.ts b/packages/objection/tests/setup/setup.ts similarity index 100% rename from packages/objection-graphql-resolver/tests/setup/setup.ts rename to packages/objection/tests/setup/setup.ts diff --git a/packages/objection-graphql-resolver/tsconfig.json b/packages/objection/tsconfig.json similarity index 76% rename from packages/objection-graphql-resolver/tsconfig.json rename to packages/objection/tsconfig.json index 6a83fc2..078b74b 100644 --- a/packages/objection-graphql-resolver/tsconfig.json +++ b/packages/objection/tsconfig.json @@ -5,8 +5,8 @@ // tests/main/m2m.test.ts: SQLITE_CONSTRAINT: NOT NULL constraint failed "target": "ES2021", "paths": { - "graphql-orm": ["../graphql-orm/src"], - "objection-graphql-resolver": ["./src"] + "objection-graphql-resolver": ["./src"], + "graphql-orm": ["../base/src"] } } } diff --git a/packages/objection-graphql-resolver/tsup.config.ts b/packages/objection/tsup.config.ts similarity index 100% rename from packages/objection-graphql-resolver/tsup.config.ts rename to packages/objection/tsup.config.ts diff --git a/packages/objection-graphql-resolver/vite.config.ts b/packages/objection/vite.config.ts similarity index 100% rename from packages/objection-graphql-resolver/vite.config.ts rename to packages/objection/vite.config.ts diff --git a/packages/orchid-graphql/.gitignore b/packages/orchid/.gitignore similarity index 100% rename from packages/orchid-graphql/.gitignore rename to packages/orchid/.gitignore diff --git a/packages/orchid-graphql/CHANGELOG.md b/packages/orchid/CHANGELOG.md similarity index 100% rename from packages/orchid-graphql/CHANGELOG.md rename to packages/orchid/CHANGELOG.md diff --git a/packages/orchid-graphql/README.md b/packages/orchid/README.md similarity index 100% rename from packages/orchid-graphql/README.md rename to packages/orchid/README.md diff --git a/packages/orchid-graphql/docs/filters.md b/packages/orchid/docs/filters.md similarity index 100% rename from packages/orchid-graphql/docs/filters.md rename to packages/orchid/docs/filters.md diff --git a/packages/orchid-graphql/docs/pagination.md b/packages/orchid/docs/pagination.md similarity index 100% rename from packages/orchid-graphql/docs/pagination.md rename to packages/orchid/docs/pagination.md diff --git a/packages/orchid-graphql/docs/relations.md b/packages/orchid/docs/relations.md similarity index 100% rename from packages/orchid-graphql/docs/relations.md rename to packages/orchid/docs/relations.md diff --git a/packages/orchid-graphql/package.json b/packages/orchid/package.json similarity index 100% rename from packages/orchid-graphql/package.json rename to packages/orchid/package.json diff --git a/packages/orchid-graphql/playground/readme.sample.ts b/packages/orchid/playground/readme.sample.ts similarity index 100% rename from packages/orchid-graphql/playground/readme.sample.ts rename to packages/orchid/playground/readme.sample.ts diff --git a/packages/orchid-graphql/playground/vite-env.d.ts b/packages/orchid/playground/vite-env.d.ts similarity index 100% rename from packages/orchid-graphql/playground/vite-env.d.ts rename to packages/orchid/playground/vite-env.d.ts diff --git a/packages/orchid-graphql/src/index.ts b/packages/orchid/src/index.ts similarity index 100% rename from packages/orchid-graphql/src/index.ts rename to packages/orchid/src/index.ts diff --git a/packages/orchid-graphql/src/orm/orm.ts b/packages/orchid/src/orm/orm.ts similarity index 100% rename from packages/orchid-graphql/src/orm/orm.ts rename to packages/orchid/src/orm/orm.ts diff --git a/packages/orchid-graphql/src/resolvers/graph.ts b/packages/orchid/src/resolvers/graph.ts similarity index 100% rename from packages/orchid-graphql/src/resolvers/graph.ts rename to packages/orchid/src/resolvers/graph.ts diff --git a/packages/orchid-graphql/src/resolvers/table.ts b/packages/orchid/src/resolvers/table.ts similarity index 100% rename from packages/orchid-graphql/src/resolvers/table.ts rename to packages/orchid/src/resolvers/table.ts diff --git a/packages/orchid-graphql/tests/main/async-field-modifier.test.ts b/packages/orchid/tests/main/async-field-modifier.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/async-field-modifier.test.ts rename to packages/orchid/tests/main/async-field-modifier.test.ts diff --git a/packages/orchid-graphql/tests/main/field-transform.test.ts b/packages/orchid/tests/main/field-transform.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/field-transform.test.ts rename to packages/orchid/tests/main/field-transform.test.ts diff --git a/packages/orchid-graphql/tests/main/fields.test.ts b/packages/orchid/tests/main/fields.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/fields.test.ts rename to packages/orchid/tests/main/fields.test.ts diff --git a/packages/orchid-graphql/tests/main/filters.test.ts b/packages/orchid/tests/main/filters.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/filters.test.ts rename to packages/orchid/tests/main/filters.test.ts diff --git a/packages/orchid-graphql/tests/main/m2m.test.ts b/packages/orchid/tests/main/m2m.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/m2m.test.ts rename to packages/orchid/tests/main/m2m.test.ts diff --git a/packages/orchid-graphql/tests/main/nested-args.test.ts b/packages/orchid/tests/main/nested-args.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/nested-args.test.ts rename to packages/orchid/tests/main/nested-args.test.ts diff --git a/packages/orchid-graphql/tests/main/query.test.ts b/packages/orchid/tests/main/query.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/query.test.ts rename to packages/orchid/tests/main/query.test.ts diff --git a/packages/orchid-graphql/tests/main/raw-sql.test.ts b/packages/orchid/tests/main/raw-sql.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/raw-sql.test.ts rename to packages/orchid/tests/main/raw-sql.test.ts diff --git a/packages/orchid-graphql/tests/main/readme-sample.test.ts b/packages/orchid/tests/main/readme-sample.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/readme-sample.test.ts rename to packages/orchid/tests/main/readme-sample.test.ts diff --git a/packages/orchid-graphql/tests/main/relation-pagination.test.ts b/packages/orchid/tests/main/relation-pagination.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/relation-pagination.test.ts rename to packages/orchid/tests/main/relation-pagination.test.ts diff --git a/packages/orchid-graphql/tests/main/relations.test.ts b/packages/orchid/tests/main/relations.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/relations.test.ts rename to packages/orchid/tests/main/relations.test.ts diff --git a/packages/orchid-graphql/tests/main/root-pagination.test.ts b/packages/orchid/tests/main/root-pagination.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/root-pagination.test.ts rename to packages/orchid/tests/main/root-pagination.test.ts diff --git a/packages/orchid-graphql/tests/main/root-subfield.test.ts b/packages/orchid/tests/main/root-subfield.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/root-subfield.test.ts rename to packages/orchid/tests/main/root-subfield.test.ts diff --git a/packages/orchid-graphql/tests/main/table-modify.test.ts b/packages/orchid/tests/main/table-modify.test.ts similarity index 100% rename from packages/orchid-graphql/tests/main/table-modify.test.ts rename to packages/orchid/tests/main/table-modify.test.ts diff --git a/packages/orchid-graphql/tests/setup/apollo.ts b/packages/orchid/tests/setup/apollo.ts similarity index 100% rename from packages/orchid-graphql/tests/setup/apollo.ts rename to packages/orchid/tests/setup/apollo.ts diff --git a/packages/orchid-graphql/tests/setup/client.ts b/packages/orchid/tests/setup/client.ts similarity index 100% rename from packages/orchid-graphql/tests/setup/client.ts rename to packages/orchid/tests/setup/client.ts diff --git a/packages/orchid-graphql/tests/setup/db.ts b/packages/orchid/tests/setup/db.ts similarity index 100% rename from packages/orchid-graphql/tests/setup/db.ts rename to packages/orchid/tests/setup/db.ts diff --git a/packages/orchid-graphql/tests/setup/index.ts b/packages/orchid/tests/setup/index.ts similarity index 100% rename from packages/orchid-graphql/tests/setup/index.ts rename to packages/orchid/tests/setup/index.ts diff --git a/packages/orchid-graphql/tsconfig.json b/packages/orchid/tsconfig.json similarity index 75% rename from packages/orchid-graphql/tsconfig.json rename to packages/orchid/tsconfig.json index 7a67f5b..490c781 100644 --- a/packages/orchid-graphql/tsconfig.json +++ b/packages/orchid/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "paths": { "orchid-graphql": ["./src"], - "graphql-orm": ["../graphql-orm/src"] + "graphql-orm": ["../base/src"] } } } diff --git a/packages/orchid-graphql/tsup.config.ts b/packages/orchid/tsup.config.ts similarity index 100% rename from packages/orchid-graphql/tsup.config.ts rename to packages/orchid/tsup.config.ts diff --git a/packages/orchid-graphql/vite.config.ts b/packages/orchid/vite.config.ts similarity index 100% rename from packages/orchid-graphql/vite.config.ts rename to packages/orchid/vite.config.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c371b8..76f8f78 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,7 +39,7 @@ importers: specifier: ^8.0.0-alpha.10 version: 8.0.0-alpha.30(eslint@9.5.0)(typescript@5.4.5) - packages/graphql-orm: + packages/base: dependencies: graphql: specifier: ^16 @@ -52,7 +52,7 @@ importers: specifier: ^1.1.2 version: 1.1.2 - packages/objection-graphql-resolver: + packages/objection: dependencies: graphql-parse-resolve-info: specifier: ^4.13.0 @@ -101,7 +101,7 @@ importers: specifier: ^1.6.0 version: 1.6.0 - packages/orchid-graphql: + packages/orchid: dependencies: graphql-parse-resolve-info: specifier: ^4.13.0 @@ -115,7 +115,7 @@ importers: version: 16.6.0 graphql-orm: specifier: workspace:* - version: link:../graphql-orm + version: link:../base graphql-request: specifier: ^6.0.0 version: 6.0.0(graphql@16.6.0)