Skip to content
Closed
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
4 changes: 0 additions & 4 deletions packages/documentation/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ const nextConfig = {
turbopack: {
resolveAlias: {
"next-mdx-import-source-file": "./src/mdx-components.tsx",
// todo: ajv validator uses `require` in esm context, causing `node:module` to be used
// https://github.com/ajv-validator/ajv/issues/2598 should solve upstream
"@nahkies/openapi-code-generator/web":
"./node_modules/@nahkies/openapi-code-generator/dist/cjs/web.cjs",
},
},
}
Expand Down
14 changes: 1 addition & 13 deletions packages/openapi-code-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,26 @@
"bin": {
"openapi-code-generator": "./bin/cli.mjs"
},
"main": "./dist/cjs/index.cjs",
"main": "./dist/esm/index.mjs",
"module": "./dist/esm/index.mjs",
"types": "./dist/esm/index.d.mts",
"exports": {
".": {
"import": {
"types": "./dist/esm/index.d.mts",
"default": "./dist/esm/index.mjs"
},
"require": {
"types": "./dist/cjs/index.d.cts",
"default": "./dist/cjs/index.cjs"
}
},
"./cli": {
"import": {
"types": "./dist/esm/cli.d.mts",
"default": "./dist/esm/cli.mjs"
},
"require": {
"types": "./dist/cjs/cli.d.cts",
"default": "./dist/cjs/cli.cjs"
}
},
"./web": {
"import": {
"types": "./dist/esm/web.d.mts",
"default": "./dist/esm/web.mjs"
},
"require": {
"types": "./dist/cjs/web.d.cts",
"default": "./dist/cjs/web.cjs"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2013,7 +2013,7 @@ const schema33 = {
patternProperties: {"^\\$ref$": {type: "string", format: "uri-reference"}},
}
const func3 = Object.prototype.hasOwnProperty
const func0 = require("ajv/dist/runtime/equal").default
const func0 = (await import("ajv/dist/runtime/equal")).default
const pattern18 = new RegExp("^\\$ref$", "u")
const schema23 = {
type: "object",
Expand Down Expand Up @@ -2295,8 +2295,8 @@ const schema42 = {
patternProperties: {"^x-": {}},
additionalProperties: false,
}
const formats14 = require("ajv-formats/dist/formats").fullFormats.regex
const formats32 = require("ajv-formats/dist/formats").fullFormats.uri
const formats14 = (await import("ajv-formats/dist/formats")).fullFormats.regex
const formats32 = (await import("ajv-formats/dist/formats")).fullFormats.uri
const wrapper0 = {validate: validate21}
function validate21(
data,
Expand Down
5 changes: 1 addition & 4 deletions packages/openapi-code-generator/tsdown.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default defineConfig({
failOnWarn: true,
logLevel: "warn",
publint: true,
attw: {profile: "node16"},
attw: {profile: "esm-only"},

deps: {
onlyBundle: ["@nahkies/typescript-common-runtime"],
Expand All @@ -21,8 +21,5 @@ export default defineConfig({
esm: {
outDir: "./dist/esm",
},
cjs: {
outDir: "./dist/cjs",
},
},
})
29 changes: 23 additions & 6 deletions scripts/generate-ajv-validator.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,29 @@ export default function validate(){
}
}

compileOpenapi30Standalone().then((output) =>
writeOutput(
path.join(outputDir, "openapi-3.0-specification-validator.ts"),
output,
),
)
compileOpenapi30Standalone()
.then((output) => {
// todo: workaround https://github.com/ajv-validator/ajv/pull/2618
return output
.replace(
'const func0 = require("ajv/dist/runtime/equal").default',
'const func0 = (await import("ajv/dist/runtime/equal")).default',
)
.replace(
'const formats14 = require("ajv-formats/dist/formats").fullFormats.regex',
'const formats14 = (await import("ajv-formats/dist/formats")).fullFormats.regex',
)
.replace(
'const formats32 = require("ajv-formats/dist/formats").fullFormats.uri',
'const formats32 = (await import("ajv-formats/dist/formats")).fullFormats.uri',
)
})
.then((output) =>
writeOutput(
path.join(outputDir, "openapi-3.0-specification-validator.ts"),
output,
),
)

compileOpenapi31Standalone(true).then((output) =>
writeOutput(
Expand Down
Loading