Skip to content

Commit

Permalink
fix(prettier-plugin-jsdoc): move app into fns
Browse files Browse the repository at this point in the history
  • Loading branch information
homer0 committed Oct 29, 2020
1 parent d5c7e85 commit 86e8ba8
Show file tree
Hide file tree
Showing 32 changed files with 38 additions and 38 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/fns/constants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { provider } = require('../app');
const { provider } = require('./app');

/**
* Gets a dictionary where the keys are old tags' names, and values the current tag name for which
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatAccessTag.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { findTagIndex } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PJPAccessTagOptions} PJPAccessTagOptions
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatArrays.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { isMatch, replaceDotOnTypeGeneric } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');
/**
* @typedef {import('../types').PJPTypesOptions} PJPTypesOptions
*/
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatDescription.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const {
joinIfNotEmpty,
appendIfNotPresent,
} = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PJPDescriptionTagOptions} PJPDescriptionTagOptions
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatObjects.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { isMatch, replaceDotOnTypeGeneric } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PJPTypesOptions} PJPTypesOptions
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatStringLiterals.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const R = require('ramda');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PJPTypesOptions} PJPTypesOptions
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatTSTypes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { capitalize, ensureArray } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* Utility function generated by {@link getFormater} and that can be used to modify a type name.
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatTags.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const { replaceTagsSynonyms } = require('./replaceTagsSynonyms');
const { sortTags } = require('./sortTags');
const { trimTagsProperties } = require('./trimTagsProperties');
const { formatTagsDescription } = require('./formatTagsDescription');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatTagsDescription.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const R = require('ramda');
const { getTagsWithDescriptionAsName, getTagsWithNameAsDescription } = require('./constants');
const { isTag, hasValidProperty } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatTagsTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { formatStringLiterals } = require('./formatStringLiterals');
const { formatArrays } = require('./formatArrays');
const { formatObjects } = require('./formatObjects');
const { formatTypeAsCode } = require('./formatTypeAsCode');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PJPTypesOptions} PJPTypesOptions
Expand Down
2 changes: 1 addition & 1 deletion src/fns/formatTypeAsCode.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { format } = require('prettier');
const R = require('ramda');
const { isMatch } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PrettierOptions} PrettierOptions
Expand Down
2 changes: 1 addition & 1 deletion src/fns/getLanguages.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const jsLang = require('linguist-languages/data/JavaScript.json');
const jsxLang = require('linguist-languages/data/JSX.json');
const tsLang = require('linguist-languages/data/TypeScript.json');
const tsxLang = require('linguist-languages/data/TSX.json');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {LinguistLanguageProperties & LanguageSharedProperties} LinguistLanguage
Expand Down
2 changes: 1 addition & 1 deletion src/fns/getOptions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PrettierSupportOption} PrettierSupportOption
Expand Down
2 changes: 1 addition & 1 deletion src/fns/getParsers.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const { formatTags } = require('./formatTags');
const { formatTagsTypes } = require('./formatTagsTypes');
const { prepareTags } = require('./prepareTags');
const { render } = require('./render');
const { get, provider } = require('../app');
const { get, provider } = require('./app');
/**
* @typedef {import('../types').PrettierParser} PrettierParser
* @typedef {import('../types').PrettierParseFn} PrettierParseFn
Expand Down
2 changes: 1 addition & 1 deletion src/fns/getPlugin.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { getLanguages } = require('./getLanguages');
const { getParsers } = require('./getParsers');
const { getOptions, getDefaultOptions } = require('./getOptions');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PrettierSupportOption} PrettierSupportOption
Expand Down
2 changes: 1 addition & 1 deletion src/fns/prepareExampleTag.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { format } = require('prettier');
const R = require('ramda');
const { isTag, prefixLines, splitLinesAndClean } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PrettierOptions} PrettierOptions
Expand Down
2 changes: 1 addition & 1 deletion src/fns/prepareTagDescription.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { ensureSentence, hasValidProperty, isTag } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/fns/prepareTagName.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const R = require('ramda');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/fns/prepareTags.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const R = require('ramda');
const { prepareExampleTag } = require('./prepareExampleTag');
const { prepareTagDescription } = require('./prepareTagDescription');
const { prepareTagName } = require('./prepareTagName');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PrettierOptions} PrettierOptions
Expand Down
2 changes: 1 addition & 1 deletion src/fns/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { renderExampleTag } = require('./renderExampleTag');
const { renderTagInLine } = require('./renderTagInLine');
const { renderTagInColumns } = require('./renderTagInColumns');
const { getTagsWithNameAsDescription } = require('./constants');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').CommentBlock} CommentBlock
Expand Down
2 changes: 1 addition & 1 deletion src/fns/renderExampleTag.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { splitText } = require('./splitText');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').PrettierOptions} PrettierOptions
Expand Down
2 changes: 1 addition & 1 deletion src/fns/renderTagInColumns.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { splitText } = require('./splitText');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/fns/renderTagInLine.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { splitText } = require('./splitText');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/fns/replaceTagsSynonyms.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { getTagsSynonyms } = require('./constants');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/fns/sortTags.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { getIndexOrFallback } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/fns/splitText.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const R = require('ramda');
const { ensureArray, replaceLastItem, limitAdjacentRepetitions } = require('./utils');
const { get, provider } = require('../app');
const { get, provider } = require('./app');

/**
* This is used when splitting lines that contain linebreaks; it's used as a filter so a text won't
Expand Down
2 changes: 1 addition & 1 deletion src/fns/trimTagsProperties.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { provider } = require('../app');
const { provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/fns/utils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const R = require('ramda');
const { provider } = require('../app');
const { provider } = require('./app');

/**
* @typedef {import('../types').CommentTag} CommentTag
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const path = require('path');
const { loadProviders, get } = require('./app');
const { loadProviders, get } = require('./fns/app');
const { getPlugin } = require('./fns/getPlugin');

loadProviders(path.join(__dirname, 'fns'), [
Expand Down
14 changes: 7 additions & 7 deletions test/unit/app.test.js → test/unit/fns/app.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
jest.unmock('../../src/app');
jest.mock('../../src/fns/sortTags', () => ({
jest.unmock('../../../src/fns/app');
jest.mock('../../../src/fns/sortTags', () => ({
provider: jest.fn(),
}));
jest.mock('../../src/fns/splitText', () => ({
jest.mock('../../../src/fns/splitText', () => ({
provider: jest.fn(),
}));

Expand All @@ -15,10 +15,10 @@ const {
registerModule,
provider,
loadProviders,
} = require('../../src/app');
} = require('../../../src/fns/app');

const { provider: sortTagsProvider } = require('../../src/fns/sortTags');
const { provider: splitTextProvider } = require('../../src/fns/splitText');
const { provider: sortTagsProvider } = require('../../../src/fns/sortTags');
const { provider: splitTextProvider } = require('../../../src/fns/splitText');

describe('app', () => {
beforeEach(() => {
Expand Down Expand Up @@ -127,7 +127,7 @@ describe('app', () => {

it('should load and execute the providers of a list of modules', () => {
// Given
const directory = path.join(__dirname, '..', '..', 'src', 'fns');
const directory = path.join(__dirname, '..', '..', '..', 'src', 'fns');
const mods = ['sortTags', 'splitText'];
// When
loadProviders(directory, mods);
Expand Down
4 changes: 2 additions & 2 deletions test/unit/index.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
jest.unmock('../../src/index');
jest.mock('../../src/app');
jest.mock('../../src/fns/app');

const path = require('path');
const { loadProviders, get } = require('../../src/app');
const { loadProviders, get } = require('../../src/fns/app');
const { getPlugin } = require('../../src/fns/getPlugin');

describe('plugin', () => {
Expand Down

0 comments on commit 86e8ba8

Please sign in to comment.