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.

Sign up for GitHub

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

Jump to bottom

fix(gen): consider named functions (#1616) #1617

Merged
merged 3 commits into from
Nov 13, 2022
Merged

fix(gen): consider named functions (#1616) #1617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3cf85f
fix(gen): consider named functions (#1616)
ineshbose Nov 6, 2022
da57f36
fix(gen): added tests for function to code
ineshbose Nov 13, 2022
c31be0f
fix: linted the new tests for gen
ineshbose Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export function generateLoaderOptions(
codes += `}\n`
return codes
} else if (rootKey === 'additionalMessages') {
return `export const ${rootKey} = ${generaeteAdditionalMessages(rootValue, dev)}\n`
return `export const ${rootKey} = ${generateAdditionalMessages(rootValue, dev)}\n`
} else {
return `export const ${rootKey} = ${toCode(rootValue)}\n`
}
Expand Down Expand Up @@ -150,7 +150,7 @@ function generateVueI18nOptions(options: Record<string, any>, dev: boolean): str
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
function generaeteAdditionalMessages(value: Record<string, any>, dev: boolean): string {
function generateAdditionalMessages(value: Record<string, any>, dev: boolean): string {
let genCode = 'Object({'
for (const [locale, messages] of Object.entries(value)) {
genCode += `${JSON.stringify(locale)}:[`
Expand Down Expand Up @@ -191,7 +191,7 @@ export function toCode(code: any): string {
}

if (isFunction(code) && code.toString) {
return `(${code.toString()})`
return `(${code.toString().replace(new RegExp(`^${code.name}`), 'function ')})`
ineshbose marked this conversation as resolved.
Show resolved Hide resolved
}

if (isArray(code)) {
Expand Down
54 changes: 54 additions & 0 deletions test/__snapshots__/gen.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,60 @@ export const NUXT_I18N_MODULE_ID = \\"@nuxtjs/i18n\\"
"
`;

exports[`toCode: function (arrow) 1`] = `
"export const localeCodes = [\\"en\\",\\"ja\\",\\"fr\\"]

export const additionalMessages = Object({})

export const resolveNuxtI18nOptions = async (context) => {
const nuxtI18nOptions = Object({})
nuxtI18nOptions.defaultLocale = \\"en\\"
const vueI18nOptionsLoader = async (context) => Object({\\"locale\\":\\"en\\",\\"fallbackLocale\\":\\"en\\",\\"messages\\": Object({\\"en\\":{
\\"hello\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"Hello!\\"])};fn.source=\\"Hello!\\";return fn;})()
},}),})
nuxtI18nOptions.vueI18n = await vueI18nOptionsLoader(context)
nuxtI18nOptions.locales = [Object({\\"code\\":\\"en\\",\\"file\\":\\"en.json\\",\\"path\\":\\"/path/to/en.json\\",\\"testFunc\\":((prop) => {
return \`Hello \${prop}\`;
})}),Object({\\"code\\":\\"ja\\",\\"file\\":\\"ja.json\\",\\"path\\":\\"/path/to/ja.json\\",\\"testFunc\\":((prop) => {
return \`Hello \${prop}\`;
})})]
return nuxtI18nOptions
}

export const nuxtI18nOptionsDefault = Object({vueI18n: undefined,locales: [],defaultLocale: \\"\\",defaultDirection: \\"ltr\\",routesNameSeparator: \\"___\\",trailingSlash: false,defaultLocaleRouteNameSuffix: \\"default\\",strategy: \\"prefix_except_default\\",lazy: false,langDir: null,rootRedirect: null,detectBrowserLanguage: Object({\\"alwaysRedirect\\":false,\\"cookieCrossOrigin\\":false,\\"cookieDomain\\":null,\\"cookieKey\\":\\"i18n_redirected\\",\\"cookieSecure\\":false,\\"fallbackLocale\\":\\"\\",\\"redirectOn\\":\\"root\\",\\"useCookie\\":true}),differentDomains: false,baseUrl: \\"\\",dynamicRouteParams: false,parsePages: true,pages: Object({}),skipSettingLocaleOnNavigate: false,onBeforeLanguageSwitch: (() => \\"\\"),onLanguageSwitched: (() => null),types: undefined,debug: false})

export const nuxtI18nInternalOptions = Object({__normalizedLocales: [Object({\\"code\\":\\"en\\"})]})
export const NUXT_I18N_MODULE_ID = \\"@nuxtjs/i18n\\"
"
`;

exports[`toCode: function (named) 1`] = `
"export const localeCodes = [\\"en\\",\\"ja\\",\\"fr\\"]

export const additionalMessages = Object({})

export const resolveNuxtI18nOptions = async (context) => {
const nuxtI18nOptions = Object({})
nuxtI18nOptions.defaultLocale = \\"en\\"
const vueI18nOptionsLoader = async (context) => Object({\\"locale\\":\\"en\\",\\"fallbackLocale\\":\\"en\\",\\"messages\\": Object({\\"en\\":{
\\"hello\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"Hello!\\"])};fn.source=\\"Hello!\\";return fn;})()
},}),})
nuxtI18nOptions.vueI18n = await vueI18nOptionsLoader(context)
nuxtI18nOptions.locales = [Object({\\"code\\":\\"en\\",\\"file\\":\\"en.json\\",\\"path\\":\\"/path/to/en.json\\",\\"testFunc\\":(function (prop) {
return \`Hello \${prop}\`;
})}),Object({\\"code\\":\\"ja\\",\\"file\\":\\"ja.json\\",\\"path\\":\\"/path/to/ja.json\\",\\"testFunc\\":(function (prop) {
return \`Hello \${prop}\`;
})})]
return nuxtI18nOptions
}

export const nuxtI18nOptionsDefault = Object({vueI18n: undefined,locales: [],defaultLocale: \\"\\",defaultDirection: \\"ltr\\",routesNameSeparator: \\"___\\",trailingSlash: false,defaultLocaleRouteNameSuffix: \\"default\\",strategy: \\"prefix_except_default\\",lazy: false,langDir: null,rootRedirect: null,detectBrowserLanguage: Object({\\"alwaysRedirect\\":false,\\"cookieCrossOrigin\\":false,\\"cookieDomain\\":null,\\"cookieKey\\":\\"i18n_redirected\\",\\"cookieSecure\\":false,\\"fallbackLocale\\":\\"\\",\\"redirectOn\\":\\"root\\",\\"useCookie\\":true}),differentDomains: false,baseUrl: \\"\\",dynamicRouteParams: false,parsePages: true,pages: Object({}),skipSettingLocaleOnNavigate: false,onBeforeLanguageSwitch: (() => \\"\\"),onLanguageSwitched: (() => null),types: undefined,debug: false})

export const nuxtI18nInternalOptions = Object({__normalizedLocales: [Object({\\"code\\":\\"en\\"})]})
export const NUXT_I18N_MODULE_ID = \\"@nuxtjs/i18n\\"
"
`;

exports[`vueI18n: path 1`] = `
"import locale_en from \\"../locales/en.json\\";
import locale_ja from \\"../locales/ja.json\\";
Expand Down
40 changes: 40 additions & 0 deletions test/gen.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,43 @@ it('vueI18n: path', () => {
expect(validateSyntax(code)).toBe(true)
expect(code).toMatchSnapshot()
})

it('toCode: function (arrow)', () => {
const code = generateLoaderOptions(false, 'locales', '..', {
localeCodes: LOCALE_CODES,
additionalMessages: {},
nuxtI18nOptions: {
...NUXT_I18N_OPTIONS,
locales: LOCALE_INFO.map(locale => ({
...locale,
testFunc: (prop: unknown) => {
return `Hello ${prop}`
}
}))
},
nuxtI18nOptionsDefault: DEFAULT_OPTIONS,
nuxtI18nInternalOptions: NUXT_I18N_INTERNAL_OPTIONS
})
expect(validateSyntax(code)).toBe(true)
expect(code).toMatchSnapshot()
})

it('toCode: function (named)', () => {
const code = generateLoaderOptions(false, 'locales', '..', {
localeCodes: LOCALE_CODES,
additionalMessages: {},
nuxtI18nOptions: {
...NUXT_I18N_OPTIONS,
locales: LOCALE_INFO.map(locale => ({
...locale,
testFunc(prop: unknown) {
return `Hello ${prop}`
}
}))
},
nuxtI18nOptionsDefault: DEFAULT_OPTIONS,
nuxtI18nInternalOptions: NUXT_I18N_INTERNAL_OPTIONS
})
expect(validateSyntax(code)).toBe(true)
expect(code).toMatchSnapshot()
})