Skip to content
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

only use matterWrapper #834

Merged
merged 3 commits into from
Sep 28, 2023
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
24 changes: 24 additions & 0 deletions lib/matter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import matter from 'gray-matter';

interface MatterResult {
data: any;
content: string;
}

export function matterWrapper(document: string): MatterResult {
const { data, content } = matter(document || '', {
engines: {
javascript: {
parse: function () {
console.log('Parsing JavaScript is not allowed');
return {};
},
stringify: function () {
console.log('Stringifying JavaScript is not allowed');
return '';
}
}
}
});
return { data, content };
}
4 changes: 2 additions & 2 deletions modules/avcs/api/fetchAvcs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { allGithubAvcs } from 'modules/gql/queries/allGithubAvcs';
import logger from 'lib/logger';
import { GraphQlQueryResponseData } from '@octokit/graphql';
import { RepositoryInfo } from 'modules/delegates/api/getDelegatesRepositoryInfo';
import matter from 'gray-matter';
import { matterWrapper } from 'lib/matter';
import { markdownToHtml } from 'lib/markdown';
import { AvcOrderByEnum } from '../avcs.constants';
import { fetchDelegatesPaginated } from 'modules/delegates/api/fetchDelegates';
Expand Down Expand Up @@ -50,7 +50,7 @@ async function extractGithubInformationGraphQL(
const {
content,
data: { external_profile_url, avc_name }
} = matter(profileMdDoc);
} = matterWrapper(profileMdDoc);
const html = await markdownToHtml(content);
const avcDescription = html.split('<h1>$delegate_name</h1>')[0];

Expand Down
10 changes: 5 additions & 5 deletions modules/delegates/api/fetchGithubDelegates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later

*/

import matter from 'gray-matter';
import { matterWrapper } from 'lib/matter';
import { GraphQlQueryResponseData } from '@octokit/graphql';
import { SupportedNetworks } from 'modules/web3/constants/networks';
import { cacheGet, cacheSet } from 'modules/cache/cache';
Expand Down Expand Up @@ -45,13 +45,13 @@ async function extractGithubInformation(
const {
content,
data: { name, external_profile_url, tags, avc_name }
} = matter(profileMdDoc);
} = matterWrapper(profileMdDoc);

let metricsMdDoc;
let metricsData;
if (metricsMd) {
metricsMdDoc = await (await fetch(metricsMd?.download_url)).text();
const { data } = matter(metricsMdDoc);
const { data } = matterWrapper(metricsMdDoc);
metricsData = data;
}

Expand Down Expand Up @@ -110,10 +110,10 @@ async function extractGithubInformationGraphQL(
const {
content,
data: { name, external_profile_url, tags, avc_name }
} = matter(profileMdDoc);
} = matterWrapper(profileMdDoc);

const metricsMdDoc = metricsMd?.object?.text;
const { data } = matter(metricsMdDoc);
const { data } = matterWrapper(metricsMdDoc);
const metricsData = data;

let cuMember = false;
Expand Down
4 changes: 2 additions & 2 deletions modules/executive/api/parseExecutive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later

*/

import matter from 'gray-matter';
import { matterWrapper } from 'lib/matter';
import { CMSProposal } from 'modules/executive/types';
import { ethers } from 'ethers';
import { slugify } from 'lib/utils';
Expand All @@ -22,7 +22,7 @@ export function parseExecutive(
const {
content,
data: { title, summary, address, date }
} = matter(proposalDoc);
} = matterWrapper(proposalDoc);
// Remove empty docs
if (!(content && title && summary && address && date)) {
logger.warn(
Expand Down
4 changes: 2 additions & 2 deletions modules/polling/api/fetchPollMetadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
import { Poll, PartialPoll } from '../types/poll';

import { backoffRetry, timeoutPromise } from 'lib/utils';
import matter from 'gray-matter';
import { matterWrapper } from 'lib/matter';
import { parsePollMetadata } from '../helpers/parsePollMetadata';
import logger from 'lib/logger';

Expand All @@ -22,7 +22,7 @@ async function fetchPollGithubDocument(url: string): Promise<string> {
return resp?.text();
});

if (!(document.length > 0 && Object.keys(matter(document).data?.options)?.length > 0)) {
if (!(document.length > 0 && Object.keys(matterWrapper(document).data?.options)?.length > 0)) {
throw new Error('Invalid poll document');
}

Expand Down
6 changes: 3 additions & 3 deletions modules/polling/helpers/__tests__/parsePollMetadata.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { parsePollMetadata, spockPollToPartialPoll } from '../parsePollMetadata'
import pollJson327 from './__helpers__/poll-327.js';
import pollJson431 from './__helpers__/poll-431.js';
import fs from 'fs';
import matter from 'gray-matter';
import { matterWrapper } from 'lib/matter';
import { PollSpock } from '../../types/pollSpock';
import { getPollTags, getPollTagsMapping } from 'modules/polling/api/getPollTags';
import { PollInputFormat, PollResultDisplay, PollVictoryConditions } from 'modules/polling/polling.constants';
Expand Down Expand Up @@ -76,7 +76,7 @@ describe('Parse poll metadata', () => {
})
);

expect(actual.content).toEqual(matter(pollMetadata431).content);
expect(actual.content).toEqual(matterWrapper(pollMetadata431).content);
});

test('return the expected values for an old uncategorized poll', async () => {
Expand Down Expand Up @@ -111,6 +111,6 @@ describe('Parse poll metadata', () => {
})
);

expect(actual.content).toEqual(matter(pollMetadata327).content);
expect(actual.content).toEqual(matterWrapper(pollMetadata327).content);
});
});
52 changes: 26 additions & 26 deletions modules/polling/helpers/__tests__/validatePollParameters.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later

*/

import matter from 'gray-matter';
import { matterWrapper } from 'lib/matter';
import { POLL_VOTE_TYPE } from 'modules/polling/polling.constants';
import {
ERRORS_VALIDATE_POLL_PARAMETERS,
Expand All @@ -22,7 +22,7 @@ parameters:
---
`;

const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -39,7 +39,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -57,7 +57,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -76,7 +76,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -97,7 +97,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -120,7 +120,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -142,7 +142,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -162,7 +162,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -182,7 +182,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -202,7 +202,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -222,7 +222,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual({
Expand All @@ -248,7 +248,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -268,7 +268,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual({
Expand All @@ -293,7 +293,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -313,7 +313,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);

const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -333,7 +333,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toBe(null);
Expand All @@ -355,7 +355,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual({
Expand Down Expand Up @@ -384,7 +384,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual({
Expand Down Expand Up @@ -413,7 +413,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual(null);
Expand All @@ -434,7 +434,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual(null);
Expand All @@ -455,7 +455,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual(null);
Expand All @@ -478,7 +478,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual(null);
Expand All @@ -503,7 +503,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual(null);
Expand All @@ -525,7 +525,7 @@ parameters:
# hello

`;
const parametersMarkdown = matter(parameters);
const parametersMarkdown = matterWrapper(parameters);
// Returns correct if is correct
const [parsed, errors] = validatePollParameters(parametersMarkdown.data.parameters);
expect(parsed).toEqual(null);
Expand All @@ -543,7 +543,7 @@ parameters:
// - { type : default, options : [2] }
// result_display: single-vote-breakdown
// `;
// const parametersMarkdown = matter(parameters);
// const parametersMarkdown = matterWrapper(parameters);
// // Returns correct if is correct
// const [parsed, errors] = validatePollParameters(parametersMarkdown.data);
// });
Expand Down
1 change: 0 additions & 1 deletion modules/polling/helpers/__tests__/validator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ test('reject a blank document', () => {
test('reject null', () => {
const result = validatePollMarkdown(null);
expect(result.valid).toBeFalsy();
expect(result.errors).toContain('expected input to be a string or buffer');
});

test('reject a document with no options', () => {
Expand Down
Loading