Skip to content

fixed graphql-codegen-esm Cannot use import statement outside a module #725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions codegen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ generates:
ID: string
example/yup/schemas.ts:
plugins:
- ./dist/main/index.js:
- ./dist/cjs/index.js:
schema: yup
importFrom: ../types
withObjectType: true
Expand Down Expand Up @@ -45,7 +45,7 @@ generates:
ID: string
example/zod/schemas.ts:
plugins:
- ./dist/main/index.js:
- ./dist/cjs/index.js:
schema: zod
importFrom: ../types
withObjectType: true
Expand All @@ -68,7 +68,7 @@ generates:
ID: string
example/myzod/schemas.ts:
plugins:
- ./dist/main/index.js:
- ./dist/cjs/index.js:
schema: myzod
importFrom: ../types
withObjectType: true
Expand All @@ -83,7 +83,7 @@ generates:
ID: string
example/valibot/schemas.ts:
plugins:
- ./dist/main/index.js:
- ./dist/cjs/index.js:
schema: valibot
importFrom: ../types
withObjectType: true
Expand Down
31 changes: 23 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "graphql-codegen-typescript-validation-schema",
"type": "module",
"version": "0.15.0",
"packageManager": "[email protected]",
"description": "GraphQL Code Generator plugin to generate form validation schema from your GraphQL schema",
Expand Down Expand Up @@ -28,14 +29,27 @@
],
"exports": {
".": {
"types": "./dist/types/index.d.ts",
"import": "./dist/module/index.js",
"require": "./dist/main/index.js"
}
"import": {
"types": "./dist/types/index.d.ts",
"default": "./dist/esm/index.js"
},
"require": {
"types": "./dist/types/index.d.ts",
"default": "./dist/cjs/index.js"
},
"default": {
"types": "./dist/types/index.d.ts",
"default": "./dist/esm/index.js"
}
},
"./package.json": "./package.json"
},
"main": "dist/main/index.js",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
"typings": "dist/types/index.d.ts",
"module": "dist/module/index.js",
"typescript": {
"definition": "dist/types/index.d.ts"
},
"files": [
"!dist/**/*.tsbuildinfo",
"LICENSE",
Expand All @@ -50,12 +64,13 @@
"type-check:valibot": "tsc --strict --skipLibCheck --noEmit example/valibot/schemas.ts",
"test": "vitest run",
"build": "run-p build:*",
"build:main": "tsc -p tsconfig.main.json",
"build:module": "tsc -p tsconfig.module.json",
"build:cjs": "tsc -p tsconfig.cjs.json && echo '{\"type\":\"commonjs\"}' > dist/cjs/package.json",
"build:esm": "tsc -p tsconfig.esm.json && echo '{\"type\":\"module\"}' > dist/esm/package.json",
"build:types": "tsc -p tsconfig.types.json",
"lint": "eslint .",
"lint-fix": "eslint . --fix",
"generate": "run-p build:* && graphql-codegen",
"generate:esm": "run-p build:* && graphql-codegen-esm",
"prepublish": "run-p build:*"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions src/directive.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ConstArgumentNode, ConstDirectiveNode, ConstValueNode } from 'graphql';
import { Kind, valueFromASTUntyped } from 'graphql';

import type { DirectiveConfig, DirectiveObjectArguments } from './config';
import { isConvertableRegexp } from './regexp';
import type { DirectiveConfig, DirectiveObjectArguments } from './config.js';
import { isConvertableRegexp } from './regexp.js';

export interface FormattedDirectiveConfig {
[directive: string]: FormattedDirectiveArguments
Expand Down
16 changes: 9 additions & 7 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { transformSchemaAST } from '@graphql-codegen/schema-ast';
import type { GraphQLSchema } from 'graphql';
import { buildSchema, printSchema, visit } from 'graphql';

import type { ValidationSchemaPluginConfig } from './config';
import { isGeneratedByIntrospection, topologicalSortAST } from './graphql';
import { MyZodSchemaVisitor } from './myzod/index';
import type { SchemaVisitor } from './types';
import { YupSchemaVisitor } from './yup/index';
import { ZodSchemaVisitor } from './zod/index';
import { ValibotSchemaVisitor } from './valibot';
import type { ValidationSchemaPluginConfig } from './config.js';
import { isGeneratedByIntrospection, topologicalSortAST } from './graphql.js';
import { MyZodSchemaVisitor } from './myzod/index.js';
import type { SchemaVisitor } from './types.js';
import { YupSchemaVisitor } from './yup/index.js';
import { ZodSchemaVisitor } from './zod/index.js';
import { ValibotSchemaVisitor } from './valibot/index.js';

export const plugin: PluginFunction<ValidationSchemaPluginConfig, Types.ComplexPluginOutput> = (
schema: GraphQLSchema,
Expand Down Expand Up @@ -59,3 +59,5 @@ function _transformSchemaAST(schema: GraphQLSchema, config: ValidationSchemaPlug
ast,
};
}

export type { ValidationSchemaPluginConfig }
8 changes: 4 additions & 4 deletions src/myzod/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import {
} from 'graphql';

import { resolveExternalModuleAndFn } from '@graphql-codegen/plugin-helpers';
import type { ValidationSchemaPluginConfig } from '../config';
import { buildApi, formatDirectiveConfig } from '../directive';
import { BaseSchemaVisitor } from '../schema_visitor';
import type { Visitor } from '../visitor';
import type { ValidationSchemaPluginConfig } from '../config.js';
import { buildApi, formatDirectiveConfig } from '../directive.js';
import { BaseSchemaVisitor } from '../schema_visitor.js';
import type { Visitor } from '../visitor.js';
import {
InterfaceTypeDefinitionBuilder,
ObjectTypeDefinitionBuilder,
Expand Down
6 changes: 3 additions & 3 deletions src/schema_visitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import type {
ObjectTypeDefinitionNode,
} from 'graphql';

import type { ValidationSchemaPluginConfig } from './config';
import type { SchemaVisitor } from './types';
import { Visitor } from './visitor';
import type { ValidationSchemaPluginConfig } from './config.js';
import type { SchemaVisitor } from './types.js';
import { Visitor } from './visitor.js';

export abstract class BaseSchemaVisitor implements SchemaVisitor {
protected importTypes: string[] = [];
Expand Down
8 changes: 4 additions & 4 deletions src/valibot/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import type {
UnionTypeDefinitionNode,
} from 'graphql';

import type { ValidationSchemaPluginConfig } from '../config';
import { BaseSchemaVisitor } from '../schema_visitor';
import type { Visitor } from '../visitor';
import { buildApiForValibot, formatDirectiveConfig } from '../directive';
import type { ValidationSchemaPluginConfig } from '../config.js';
import { BaseSchemaVisitor } from '../schema_visitor.js';
import type { Visitor } from '../visitor.js';
import { buildApiForValibot, formatDirectiveConfig } from '../directive.js';
import {
InterfaceTypeDefinitionBuilder,
ObjectTypeDefinitionBuilder,
Expand Down
2 changes: 1 addition & 1 deletion src/visitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
specifiedScalarTypes,
} from 'graphql';

import type { ValidationSchemaPluginConfig } from './config';
import type { ValidationSchemaPluginConfig } from './config.js';

export class Visitor extends TsVisitor {
constructor(
Expand Down
8 changes: 4 additions & 4 deletions src/yup/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import {
} from 'graphql';

import { resolveExternalModuleAndFn } from '@graphql-codegen/plugin-helpers';
import type { ValidationSchemaPluginConfig } from '../config';
import { buildApi, formatDirectiveConfig } from '../directive';
import { BaseSchemaVisitor } from '../schema_visitor';
import type { Visitor } from '../visitor';
import type { ValidationSchemaPluginConfig } from '../config.js';
import { buildApi, formatDirectiveConfig } from '../directive.js';
import { BaseSchemaVisitor } from '../schema_visitor.js';
import type { Visitor } from '../visitor.js';
import {
InterfaceTypeDefinitionBuilder,
ObjectTypeDefinitionBuilder,
Expand Down
8 changes: 4 additions & 4 deletions src/zod/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import {
} from 'graphql';

import { resolveExternalModuleAndFn } from '@graphql-codegen/plugin-helpers';
import type { ValidationSchemaPluginConfig } from '../config';
import { buildApi, formatDirectiveConfig } from '../directive';
import { BaseSchemaVisitor } from '../schema_visitor';
import type { Visitor } from '../visitor';
import type { ValidationSchemaPluginConfig } from '../config.js';
import { buildApi, formatDirectiveConfig } from '../directive.js';
import { BaseSchemaVisitor } from '../schema_visitor.js';
import type { Visitor } from '../visitor.js';
import {
InterfaceTypeDefinitionBuilder,
ObjectTypeDefinitionBuilder,
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.main.json → tsconfig.cjs.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"rootDir": "src",
"types": ["node"],
"declaration": false,
"outDir": "dist/main"
"outDir": "dist/cjs"
},
"exclude": [
"example",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.module.json → tsconfig.esm.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"resolveJsonModule": true,
"types": ["node"],
"declaration": false,
"outDir": "dist/module"
"outDir": "dist/esm"
},
"exclude": [
"node_modules/**",
Expand Down
Loading