Commit f074859

committed

add test for validate no unnecessary keys

1 parent 3444b9c commit f074859Copy full SHA for f074859

File tree

+33

-4

lines changed

+33

-4

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,24 @@ import { describe, it, expect } from 'vitest'`
`2`	`2`	`import { resolve } from 'node:path'`
`3`	`3`	`import { readdirSync } from 'node:fs'`
`4`	`4`	`import { Language } from '../utils/getLanguage'`
`5`		`-import { isValid } from './utils'`
	`5`	`+import { includeAllKeys,excludeKeys } from './utils'`
`6`	`6`
`7`	`7`	`const locales = readdirSync(resolve(__dirname, '../locales'))`
`8`	`8`
`9`	`9`	`describe('should include full keys', () => {`
`10`	`10`	`const structure: Language = require('../schema/locale.json')`
`11`	`11`	`locales.forEach((locale) => {`
`12`	`12`	it(`for ${locale}`, () => {
`13`		- expect(isValid(require(`../locales/${locale}`), structure)).toBeTruthy()
	`13`	+ expect(includeAllKeys(require(`../locales/${locale}`), structure)).toBeTruthy()
	`14`	`+ })`
	`15`	`+ })`
	`16`	`+})`
	`17`	`+`
	`18`	`+describe("shouldn't include unnecessary keys", () => {`
	`19`	`+ const structure: Language = require('../schema/locale.json')`
	`20`	`+ locales.forEach((locale) => {`
	`21`	+ it(`for ${locale}`, () => {
	`22`	+ expect(excludeKeys(require(`../locales/${locale}`), structure)).toBeTruthy()
`14`	`23`	`})`
`15`	`24`	`})`
`16`	`25`	`})`

Lines changed: 22 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* @param schema template for validation`
`5`	`5`	`* @returns whether missed some keys`
`6`	`6`	`*/`
`7`		`-export function isValid(obj: Object, schema: Object) {`
	`7`	`+export function includeAllKeys(obj: Object, schema: Object) {`
`8`	`8`	`for (let key in schema) {`
`9`	`9`	`if (!obj.hasOwnProperty(key)) {`
`10`	`10`	`return false`
`@@ -15,11 +15,31 @@ export function isValid(obj: Object, schema: Object) {`
`15`	`15`	`return false`
`16`	`16`	`}`
`17`	`17`	`} else if (typeof schema[key] === 'object') {`
`18`		`- if (!isValid(obj[key], schema[key])) {`
	`18`	`+ if (!includeAllKeys(obj[key], schema[key])) {`
`19`	`19`	`return false`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`return true`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+/**`
	`28`	`+ *`
	`29`	`+ * @param obj object that needs to be validated`
	`30`	`+ * @param schema template for validation`
	`31`	`+ * @returns whether include unnecessary keys`
	`32`	`+ */`
	`33`	`+export function excludeKeys(obj: Object, schema: Object) {`
	`34`	`+ for (let key in obj) {`
	`35`	`+ if (!schema.hasOwnProperty(key)) {`
	`36`	`+ return false`
	`37`	`+ }`
	`38`	`+ if (schema[key] !== null && typeof schema[key] === 'object') {`
	`39`	`+ if (!excludeKeys(obj[key], schema[key])) {`
	`40`	`+ return false`
	`41`	`+ }`
	`42`	`+ }`
	`43`	`+ }`
	`44`	`+ return true`
	`45`	`+}`

Comments

(0)