This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit 6aaeedf

author

Alexander Vakrilov

authored

refactor: emit warning for invalid & in XML (#1059)

1 parent 488730d commit 6aaeedfCopy full SHA for 6aaeedf

File tree

2 files changed

+47

-3

lines changed

xml-namespace-loader.spec.ts
xml-namespace-loader.ts

2 files changed

+47

-3

lines changed

`‎xml-namespace-loader.spec.ts‎`

Lines changed: 37 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,15 @@ interface TestSetup {`
`20`	`20`	`expectedRegs: { name: string, path: string }[],`
`21`	`21`	`ignore?: RegExp,`
`22`	`22`	`assureNoDeps?: boolean,`
`23`		`- expectError?: boolean`
	`23`	`+ expectError?: boolean,`
	`24`	`+ expectWarnings?: number`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`function getContext(`
`27`	`28`	`done: DoneFn,`
`28`		`- { resolveMap, expectedDeps, expectedRegs, assureNoDeps, ignore, expectError }: TestSetup) {`
	`29`	`+ { resolveMap, expectedDeps, expectedRegs, assureNoDeps, ignore, expectError, expectWarnings }: TestSetup) {`
`29`	`30`	`const actualDeps: string[] = [];`
	`31`	`+ const actualWarnings: Error[] =[]`
`30`	`32`	`let callbackCalled = false;`
`31`	`33`
`32`	`34`	`const loaderContext = {`
`@@ -50,6 +52,10 @@ function getContext(`
`50`	`52`	`expect(source).not.toContain("global.registerModule");`
`51`	`53`	`}`
`52`	`54`
	`55`	`+ if(expectWarnings){`
	`56`	`+ expect(actualWarnings.length).toEqual(expectWarnings);`
	`57`	`+ }`
	`58`	`+`
`53`	`59`	`if (error && !expectError) {`
`54`	`60`	`done.fail(error)`
`55`	`61`	`} else if (!error && expectError) {`
`@@ -69,6 +75,9 @@ function getContext(`
`69`	`75`	`addDependency: (dep: string) => {`
`70`	`76`	`actualDeps.push(dep);`
`71`	`77`	`},`
	`78`	`+ emitWarning: (err: Error) => {`
	`79`	`+ actualWarnings.push(err);`
	`80`	`+ },`
`72`	`81`	`query: { ignore }`
`73`	`82`	`}`
`74`	`83`
`@@ -277,4 +286,30 @@ describe("XmlNamespaceLoader", () => {`
`277`	`286`
`278`	`287`	`xmlNsLoader.call(loaderContext, testXml);`
`279`	`288`	`})`
	`289`	`+`
	`290`	`+`
	`291`	`+ it("with '&&', '\|\|', '<=' and '>=' in binding expression, emits warnings, but does not fail", (done) => {`
	`292`	`+ const resolveMap = {`
	`293`	`+ "nativescript-ui-chart": "node_module/nativescript-ui-chart/ui-chart.js",`
	`294`	`+ }`
	`295`	`+`
	`296`	`+ const expectedDeps = [];`
	`297`	`+`
	`298`	`+ const expectedRegs = [`
	`299`	`+ { name: "nativescript-ui-chart", path: "nativescript-ui-chart" },`
	`300`	`+ { name: "nativescript-ui-chart/RadCartesianChart", path: "nativescript-ui-chart" },`
	`301`	`+ ];`
	`302`	`+`
	`303`	+ const testXml = `
	`304`	`+ <Page xmlns="http://www.nativescript.org/tns.xsd">`
	`305`	`+ <StackLayout xmlns:chart="nativescript-ui-chart">`
	`306`	`+ <TextField text="{{ var1 && var2 \|\| var1 >= var2 \|\| var2 <= var1 }}" />`
	`307`	`+ <chart:RadCartesianChart></chart:RadCartesianChart>`
	`308`	`+ </StackLayout>`
	`309`	+ </Page>`;
	`310`	`+`
	`311`	`+ const loaderContext = getContext(done, { resolveMap, expectedDeps, expectedRegs, expectWarnings: 1 });`
	`312`	`+`
	`313`	`+ xmlNsLoader.call(loaderContext, testXml);`
	`314`	`+ })`
`280`	`315`	`});`

`‎xml-namespace-loader.ts‎`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,17 @@ const loader: loader.Loader = function (source: string, map) {`
`103`	`103`
`104`	`104`	`saxParser.onopentag = (node: QualifiedTag) => { handleOpenTag(node.uri, node.local); };`
`105`	`105`	`saxParser.onerror = (err) => {`
	`106`	`+ // Do only warning about invalid character "&"" for back-compatibility`
	`107`	`+ // as it is common to use it in a binding expression`
	`108`	`+ if (err &&`
	`109`	`+ err.message.indexOf("Invalid character") >= 0 &&`
	`110`	`+ err.message.indexOf("Char: &") >= 0) {`
	`111`	`+ this.emitWarning(err)`
	`112`	`+ } else {`
	`113`	`+ callbackWrapper(err);`
	`114`	`+ }`
	`115`	`+`
`106`	`116`	`saxParser.error = null;`
`107`		`- callbackWrapper(err);`
`108`	`117`	`};`
`109`	`118`	`saxParser.write(source).close();`
`110`	`119`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 6aaeedf

File tree

2 files changed

2 files changed

`‎xml-namespace-loader.spec.ts‎`

`‎xml-namespace-loader.ts‎`

0 commit comments