-
Notifications
You must be signed in to change notification settings - Fork 19
feat: json, json-all generators #287
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,34 @@ | ||||||
| #!/usr/bin/env node | ||||||
|
|
||||||
| /** | ||||||
| * Generates the typedefs for the JSON generator from the JSON schema | ||||||
| */ | ||||||
|
|
||||||
| import { readFile, writeFile } from 'node:fs/promises'; | ||||||
| import { join } from 'node:path'; | ||||||
|
|
||||||
| import { compile } from 'json-schema-to-typescript'; | ||||||
| import { parse } from 'jsonc-parser'; | ||||||
|
|
||||||
| const GENERATOR_DIR = join( | ||||||
| import.meta.dirname, | ||||||
| '..', | ||||||
| 'src', | ||||||
| 'generators', | ||||||
| 'json' | ||||||
| ); | ||||||
|
|
||||||
| const SCHEMA_PATH = join(GENERATOR_DIR, 'schema.jsonc'); | ||||||
| const TYPES_PATH = join(GENERATOR_DIR, 'generated.d.ts'); | ||||||
|
|
||||||
| // Read the contents of the JSON schema | ||||||
| const schemaString = await readFile(SCHEMA_PATH, 'utf8'); | ||||||
|
|
||||||
| // Parse the JSON schema into an object | ||||||
| const schema = await parse(schemaString); | ||||||
|
|
||||||
| // Compile the the JSON schema into TypeScript typedefs | ||||||
|
||||||
| // Compile the the JSON schema into TypeScript typedefs | |
| // Compile the JSON schema into TypeScript typedefs |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| import assert from 'node:assert'; | ||
| import { join } from 'node:path'; | ||
| import { test } from 'node:test'; | ||
|
|
||
| import { Validator } from 'jsonschema'; | ||
| import { SemVer } from 'semver'; | ||
|
|
||
| import { BASE_URL } from '../../../constants.mjs'; | ||
| import createGenerator from '../../../generators.mjs'; | ||
| import createMarkdownLoader from '../../../loaders/markdown.mjs'; | ||
| import createMarkdownParser from '../../../parsers/markdown.mjs'; | ||
| import { SCHEMA_FILENAME } from '../constants.mjs'; | ||
| import jsonAll from '../index.mjs'; | ||
| import { generateJsonSchema } from '../util/generateJsonSchema.mjs'; | ||
|
|
||
| const FIXTURES_DIR = join( | ||
| import.meta.dirname, | ||
| '..', | ||
| 'json', | ||
| '__tests__', | ||
| 'fixtures' | ||
| ); | ||
|
|
||
| const loader = createMarkdownLoader(); | ||
| const parser = createMarkdownParser(); | ||
|
|
||
| test('generator output complies with json schema', async () => { | ||
| const validator = new Validator(); | ||
|
|
||
| const version = 'v1.2.3'; | ||
|
|
||
| /** | ||
| * @type {object} | ||
| */ | ||
| const schema = generateJsonSchema(version); | ||
|
|
||
| const input = [ | ||
| join(FIXTURES_DIR, 'text-doc.md'), | ||
| join(FIXTURES_DIR, 'module.md'), | ||
| ]; | ||
| const files = await loader.loadFiles(input); | ||
| const docs = await parser.parseApiDocs(files); | ||
|
|
||
| const { runGenerators } = createGenerator(docs); | ||
|
|
||
| const result = await runGenerators({ | ||
| generators: ['json-all'], | ||
| input, | ||
| output: undefined, | ||
| version: new SemVer('v1.2.3'), | ||
| releases: [], | ||
| gitRef: 'a'.repeat(40), | ||
| threads: 1, | ||
| typeMap: {}, | ||
| }); | ||
|
|
||
| assert.ok(validator.validate(result, schema).valid); | ||
| }); | ||
|
|
||
| test('combines json correctly', async () => { | ||
| const version = 'v1.2.3'; | ||
|
|
||
| /** | ||
| * @type {Array<import('../../json/generated.d.ts').NodeJsAPIDocumentationSchema>} | ||
| */ | ||
| const jsonOutput = [ | ||
| { | ||
| $schema: `https://nodejs.org/docs/${version}/api/node-doc-schema.json`, | ||
| source: 'doc/api/some-module.md', | ||
| type: 'module', | ||
| '@name': 'Some Module', | ||
| '@module': 'node:module', | ||
| classes: [], | ||
| }, | ||
| { | ||
| $schema: `https://nodejs.org/docs/${version}/api/node-doc-schema.json`, | ||
| source: 'doc/api/some-module.md', | ||
| type: 'text', | ||
| '@name': 'Some Module', | ||
| description: 'asdf', | ||
| text: [ | ||
| { | ||
| type: 'text', | ||
| '@name': 'asdf', | ||
| description: 'bla bla bla', | ||
| }, | ||
| ], | ||
| }, | ||
| ]; | ||
|
|
||
| const result = await jsonAll.generate(jsonOutput, { | ||
| version: new SemVer(version), | ||
| }); | ||
|
|
||
| assert.deepStrictEqual(result, { | ||
| $schema: `${BASE_URL}docs/${version}/api/${SCHEMA_FILENAME}`, | ||
| modules: [ | ||
| { | ||
| type: 'module', | ||
| '@name': 'Some Module', | ||
| '@module': 'node:module', | ||
| classes: [], | ||
| }, | ||
| ], | ||
| text: [ | ||
| { | ||
| type: 'text', | ||
| '@name': 'Some Module', | ||
| description: 'asdf', | ||
| text: [ | ||
| { | ||
| type: 'text', | ||
| '@name': 'asdf', | ||
| description: 'bla bla bla', | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }); | ||
| }); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export const SCHEMA_FILENAME = 'node-doc-all-schema.json'; |
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,78 @@ | ||||||||||||||||||||||||
| 'use strict'; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| import { writeFile } from 'node:fs/promises'; | ||||||||||||||||||||||||
| import { join } from 'node:path'; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| import { SCHEMA_FILENAME } from './constants.mjs'; | ||||||||||||||||||||||||
| import { BASE_URL } from '../../constants.mjs'; | ||||||||||||||||||||||||
| import { generateJsonSchema } from './util/generateJsonSchema.mjs'; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| /** | ||||||||||||||||||||||||
| * This generator is responsible for collecting the JSON output generated by | ||||||||||||||||||||||||
| * the `json` generator into a single JSON file. | ||||||||||||||||||||||||
| * | ||||||||||||||||||||||||
| * @typedef {Array<ApiDocMetadataEntry>} Input | ||||||||||||||||||||||||
| * | ||||||||||||||||||||||||
| * @type {GeneratorMetadata<Input, object>} | ||||||||||||||||||||||||
| */ | ||||||||||||||||||||||||
| export default { | ||||||||||||||||||||||||
| name: 'json-all', | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| // This should be kept in sync with the JSON schema version for this | ||||||||||||||||||||||||
| // generator AND the `json` generator | ||||||||||||||||||||||||
| version: '2.0.0', | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| description: | ||||||||||||||||||||||||
| 'This generator is responsible for collecting the JSON output generated by the `json` generator into a single JSON file.', | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| dependsOn: 'json', | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| /** | ||||||||||||||||||||||||
| * Generates a JSON file. | ||||||||||||||||||||||||
| * | ||||||||||||||||||||||||
| * @param {Input} input | ||||||||||||||||||||||||
| * @param {Partial<GeneratorOptions>} param1 | ||||||||||||||||||||||||
| * @returns {Promise<object>} | ||||||||||||||||||||||||
| */ | ||||||||||||||||||||||||
| async generate(input, { version, output }) { | ||||||||||||||||||||||||
| const versionString = `v${version.toString()}`; | ||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit
Suggested change
|
||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| const generatedValue = { | ||||||||||||||||||||||||
| $schema: `${BASE_URL}docs/${versionString}/api/${SCHEMA_FILENAME}`, | ||||||||||||||||||||||||
| modules: [], | ||||||||||||||||||||||||
| text: [], | ||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| const propertiesToIgnore = ['$schema', 'source']; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| input.forEach(section => { | ||||||||||||||||||||||||
| const copiedSection = {}; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| Object.keys(section).forEach(key => { | ||||||||||||||||||||||||
| if (!propertiesToIgnore.includes(key)) { | ||||||||||||||||||||||||
| copiedSection[key] = section[key]; | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
| }); | ||||||||||||||||||||||||
|
Comment on lines
+48
to
+55
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
WDYT? |
||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| switch (section.type) { | ||||||||||||||||||||||||
| case 'module': | ||||||||||||||||||||||||
| generatedValue.modules.push(copiedSection); | ||||||||||||||||||||||||
| break; | ||||||||||||||||||||||||
| case 'text': | ||||||||||||||||||||||||
| generatedValue.text.push(copiedSection); | ||||||||||||||||||||||||
| break; | ||||||||||||||||||||||||
| default: | ||||||||||||||||||||||||
| throw new TypeError(`unsupported root section type ${section.type}`); | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
Comment on lines
+57
to
+66
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
nit |
||||||||||||||||||||||||
| }); | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| if (output) { | ||||||||||||||||||||||||
| const schema = generateJsonSchema(versionString); | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| // Write the parsed JSON schema to the output directory | ||||||||||||||||||||||||
| await writeFile(join(output, SCHEMA_FILENAME), JSON.stringify(schema)); | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| return generatedValue; | ||||||||||||||||||||||||
| }, | ||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| 'use strict'; | ||
|
|
||
| import { BASE_URL } from '../../../constants.mjs'; | ||
| import { SCHEMA_FILENAME } from '../constants.mjs'; | ||
| import jsonAll from '../index.mjs'; | ||
|
|
||
| /** | ||
| * @param {string} version | ||
| */ | ||
| export function generateJsonSchema(version) { | ||
| const jsonSchemaUrl = `${BASE_URL}/docs/${version}/api/${SCHEMA_FILENAME}`; | ||
|
|
||
| return { | ||
| $schema: 'http://json-schema.org/draft-07/schema#', | ||
| $id: `nodejs-api-doc-all@v${jsonAll.version}`, | ||
| title: 'Node.js API Documentation Schema (All)', | ||
| readOnly: true, | ||
|
|
||
| properties: { | ||
| modules: { | ||
| type: 'array', | ||
| items: { $ref: `${jsonSchemaUrl}/#/definitions/Module` }, | ||
| }, | ||
| text: { | ||
| type: 'array', | ||
| items: { $ref: `${jsonSchemaUrl}/#/definitions/Text` }, | ||
| }, | ||
| }, | ||
| }; | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| # Module | ||
|
|
||
| <!-- introduced_in=v20.0.0 --> | ||
| <!-- source_link=lib/module.js --> | ||
|
|
||
| > Stability: 2 - Stable | ||
|
|
||
| Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla aliquet est sit amet nisi iaculis ornare. Donec eu orci condimentum, semper quam ut, luctus nisl. Aliquam vel erat efficitur, egestas justo a, accumsan mauris. Quisque scelerisque enim rhoncus ornare iaculis. Sed commodo, sem ac accumsan posuere, sapien magna eleifend massa, sit amet rhoncus sem diam quis nulla. Donec feugiat elit a tellus hendrerit congue quis bibendum urna. Pellentesque mollis tincidunt tortor, in lobortis ex fringilla a. | ||
|
|
||
| Nulla sagittis pulvinar lacus et venenatis. Morbi eget varius sem, a rutrum velit. Vestibulum placerat vehicula felis. Proin et porttitor augue. Sed feugiat urna sit amet euismod posuere. Phasellus quis pretium velit. Integer porta ut velit ac consectetur. Pellentesque venenatis leo et volutpat dapibus. Nam consectetur quam venenatis feugiat tempus. Curabitur semper fringilla felis. | ||
|
|
||
| Donec sed est at nulla lacinia suscipit id id neque. Cras quis risus a risus mattis consectetur ut ut ex. Cras non metus a orci facilisis laoreet. Sed eu nisi sit amet mauris iaculis placerat. Nullam interdum, lectus sed convallis tristique, nibh nibh ullamcorper leo, non vehicula metus elit a nisl. Donec eros felis, ornare eget tempor nec, egestas mattis elit. Integer semper purus at risus pretium, in tristique ipsum tristique. | ||
|
|
||
| ```mjs | ||
| import { something } from 'node:something'; | ||
| ``` | ||
|
|
||
| ## text section | ||
|
|
||
| <!-- YAML | ||
| changes: | ||
| - version: v3.0.0 | ||
| pr-url: https://github.com/nodejs/node/pull/1234 | ||
| description: asdf | ||
| --> | ||
|
|
||
| Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla aliquet est sit amet nisi iaculis ornare. Donec eu orci condimentum, semper quam ut, luctus nisl. Aliquam vel erat efficitur, egestas justo a, accumsan mauris. Quisque scelerisque enim rhoncus ornare iaculis. Sed commodo, sem ac accumsan posuere, sapien magna eleifend massa, sit amet rhoncus sem diam quis nulla. Donec feugiat elit a tellus hendrerit congue quis bibendum urna. Pellentesque mollis tincidunt tortor, in lobortis ex fringilla a. | ||
|
|
||
| Nulla sagittis pulvinar lacus et venenatis. Morbi eget varius sem, a rutrum velit. Vestibulum placerat vehicula felis. Proin et porttitor augue. Sed feugiat urna sit amet euismod posuere. Phasellus quis pretium velit. Integer porta ut velit ac consectetur. Pellentesque venenatis leo et volutpat dapibus. Nam consectetur quam venenatis feugiat tempus. Curabitur semper fringilla felis. | ||
|
|
||
| Donec sed est at nulla lacinia suscipit id id neque. Cras quis risus a risus mattis consectetur ut ut ex. Cras non metus a orci facilisis laoreet. Sed eu nisi sit amet mauris iaculis placerat. Nullam interdum, lectus sed convallis tristique, nibh nibh ullamcorper leo, non vehicula metus elit a nisl. Donec eros felis, ornare eget tempor nec, egestas mattis elit. Integer semper purus at risus pretium, in tristique ipsum tristique. | ||
|
|
||
| ## Class: `Something` | ||
|
|
||
| <!-- YAML | ||
| added: | ||
| - v15.7.0 | ||
| - v14.18.0 | ||
| changes: | ||
| - version: | ||
| - v18.0.0 | ||
| - v16.17.0 | ||
| pr-url: https://github.com/nodejs/node/pull/1234 | ||
| description: No longer experimental. | ||
| --> | ||
|
|
||
| Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla aliquet est sit amet nisi iaculis ornare. Donec eu orci condimentum, semper quam ut, luctus nisl. Aliquam vel erat efficitur, egestas justo a, accumsan mauris. Quisque scelerisque enim rhoncus ornare iaculis. Sed commodo, sem ac accumsan posuere, sapien magna eleifend massa, sit amet rhoncus sem diam quis nulla. Donec feugiat elit a tellus hendrerit congue quis bibendum urna. Pellentesque mollis tincidunt tortor, in lobortis ex fringilla a. | ||
|
|
||
| ### `new something.Something([sources[, options]])` | ||
|
|
||
| - `sources` {string\[]|object} something something bla bla bla | ||
| - `options` {object} something something bla bla bla | ||
| - `optionA` {boolean} asdf | ||
| - `bla` qwerty | ||
|
|
||
| ### `something.doThing()` | ||
|
|
||
| - Returns: {Promise} | ||
|
|
||
| Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla aliquet est sit amet nisi iaculis ornare. Donec eu orci condimentum, semper quam ut, luctus nisl. Aliquam vel erat efficitur, egestas justo a, accumsan mauris. Quisque scelerisque enim rhoncus ornare iaculis. Sed commodo, sem ac accumsan posuere, sapien magna eleifend massa, sit amet rhoncus sem diam quis nulla. Donec feugiat elit a tellus hendrerit congue quis bibendum urna. Pellentesque mollis tincidunt tortor, in lobortis ex fringilla a. | ||
|
|
||
| ### Static method: `something.doStaticThing()` | ||
|
|
||
| - Returns: {Promise} | ||
|
|
||
| Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla aliquet est sit amet nisi iaculis ornare. Donec eu orci condimentum, semper quam ut, luctus nisl. Aliquam vel erat efficitur, egestas justo a, accumsan mauris. Quisque scelerisque enim rhoncus ornare iaculis. Sed commodo, sem ac accumsan posuere, sapien magna eleifend massa, sit amet rhoncus sem diam quis nulla. Donec feugiat elit a tellus hendrerit congue quis bibendum urna. Pellentesque mollis tincidunt tortor, in lobortis ex fringilla a. | ||
|
|
||
| ### Event: `somethingHappened` | ||
|
|
||
| - `thing` {string} thing that happened | ||
| - `how` {string|object} bla | ||
|
|
||
| Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla aliquet est sit amet nisi iaculis ornare. Donec eu orci condimentum, semper quam ut, luctus nisl. Aliquam vel erat efficitur, egestas justo a, accumsan mauris. Quisque scelerisque enim rhoncus ornare iaculis. Sed commodo, sem ac accumsan posuere, sapien magna eleifend massa, sit amet rhoncus sem diam quis nulla. Donec feugiat elit a tellus hendrerit congue quis bibendum urna. Pellentesque mollis tincidunt tortor, in lobortis ex fringilla a. |
Uh oh!
There was an error while loading. Please reload this page.