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

Refactored html-tools and htmljs to move ES6 version #385

Open
wants to merge 21 commits into
base: release-3.0
Choose a base branch
from
+3,623 −3,641
Open

Refactored html-tools and htmljs to move ES6 version #385

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d9c3ada
to ES6 v1
guncebektas Jul 25, 2022
48b6c77
htmljs to ES6 v1 (readme.md)
guncebektas Jul 25, 2022
895c109
html-tools to ES6 v1
guncebektas Jul 25, 2022
e65274b
Merge branch 'meteor:master' into master
guncebektas Jul 25, 2022
24ed805
automatic eslint fixes
guncebektas Jul 25, 2022
a8cee70
Merge branch 'meteor:master' into master
guncebektas Jul 25, 2022
836c76e
manual eslint fixes
guncebektas Jul 25, 2022
366d397
Merge remote-tracking branch 'origin/master'
guncebektas Jul 25, 2022
e18db10
add: /* eslint-env meteor */ to the 1st line
guncebektas Jul 26, 2022
b6d8d77
linting v2
guncebektas Jul 26, 2022
e2bed38
fix: step back on visit methods
guncebektas Jul 26, 2022
8bde88f
add: eslint disable for rule "array destructuring"
guncebektas Jul 29, 2022
8e47093
eslint:
guncebektas Aug 2, 2022
7ebe904
fix: readability
guncebektas Aug 2, 2022
b077fc7
fix: scoped functions moved to outside for performance
guncebektas Aug 2, 2022
cc378df
Merge branch 'meteor:master' into master
guncebektas Aug 2, 2022
3bd7704
fix: version increased
guncebektas Aug 3, 2022
bc17f49
Merge branch 'release-3.0' into master
guncebektas Sep 4, 2022
b388410
Merge branch 'release-3.0' into master
StorytellerCZ Nov 17, 2022
b6a0019
Merge branch 'release-3.0' into master
StorytellerCZ Nov 15, 2023
51c5592
Merge branch 'release-3.0' into master
jankapunkt Dec 4, 2023
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
4,691 changes: 2,358 additions & 2,333 deletions packages/html-tools/charref.js
View file
Open in desktop

Large diffs are not rendered by default.

50 changes: 24 additions & 26 deletions packages/html-tools/charref_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,55 @@
/* eslint-env meteor */
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question @jankapunkt @guncebektas : Does this have to be included in different files? Isn't there a default .eslintrc or something for blaze which should contain this?

import { HTMLTools } from 'meteor/html-tools';

var Scanner = HTMLTools.Scanner;
var getCharacterReference = HTMLTools.Parse.getCharacterReference;
const { Scanner } = HTMLTools;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I think the old way was more straightforward to read - const is fine but in general? Do we need this everywhere?

const { getCharacterReference } = HTMLTools.Parse;

Tinytest.add("html-tools - entities", function (test) {
var succeed = function (input, match, codepoints) {
if (typeof input === 'string')
input = {input: input};
Tinytest.add('html-tools - entities', function (test) {
const succeed = function (input, match, codepoints) {
if (typeof input === 'string') input = { input };

// match arg is optional; codepoints is never a string
if (typeof match !== 'string') {
codepoints = match;
match = input.input;
}

var scanner = new Scanner(input.input);
var result = getCharacterReference(scanner, input.inAttribute, input.allowedChar);
const scanner = new Scanner(input.input);
const result = getCharacterReference(scanner, input.inAttribute, input.allowedChar);
test.isTrue(result);
test.equal(scanner.pos, match.length);
test.equal(result, {
t: 'CharRef',
v: match,
cp: codepoints.map(
function (x) { return (typeof x === 'string' ?
x.charCodeAt(0) : x); })
function (x) {
return (typeof x === 'string' ?
x.charCodeAt(0) : x);
}),
});
};

var ignore = function (input) {
if (typeof input === 'string')
input = {input: input};
const ignore = function (input) {
if (typeof input === 'string') input = { input };

var scanner = new Scanner(input.input);
var result = getCharacterReference(scanner, input.inAttribute, input.allowedChar);
const scanner = new Scanner(input.input);
const result = getCharacterReference(scanner, input.inAttribute, input.allowedChar);
test.isFalse(result);
test.equal(scanner.pos, 0);
};

var fatal = function (input, messageContains) {
if (typeof input === 'string')
input = {input: input};
const fatal = function (input, messageContains) {
if (typeof input === 'string') input = { input };

var scanner = new Scanner(input.input);
var error;
const scanner = new Scanner(input.input);
let error;
try {
getCharacterReference(scanner, input.inAttribute, input.allowedChar);
} catch (e) {
error = e;
}
test.isTrue(error);
if (error)
test.isTrue(messageContains && error.message.indexOf(messageContains) >= 0, error.message);
if (error) test.isTrue(messageContains && error.message.indexOf(messageContains) >= 0, error.message);
};

ignore('a');
Expand All @@ -61,15 +60,15 @@ Tinytest.add("html-tools - entities", function (test) {
fatal('&#', 'Invalid numerical character reference starting with &#');
ignore('&a');
fatal('&a;', 'Invalid character reference: &a;');
ignore({input: '&"', allowedChar: '"'});
ignore({ input: '&"', allowedChar: '"' });
ignore('&"');

succeed('>', ['>']);
fatal('&gt', 'Character reference requires semicolon');
ignore('&aaa');
fatal('&gta', 'Character reference requires semicolon');
ignore({input: '&gta', inAttribute: true});
fatal({input: '&gt=', inAttribute: true}, 'Character reference requires semicolon: &gt');
ignore({ input: '&gta', inAttribute: true });
fatal({ input: '&gt=', inAttribute: true }, 'Character reference requires semicolon: &gt');

succeed('>;', '>', ['>']);

Expand Down Expand Up @@ -112,5 +111,4 @@ Tinytest.add("html-tools - entities", function (test) {
fatal('', 'Illegal codepoint in numerical character reference');
fatal('', 'Illegal codepoint in numerical character reference');
succeed('􏿽', [0x10fffd]);

});
11 changes: 4 additions & 7 deletions packages/html-tools/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

import { getCharacterReference } from './charref';
import { asciiLowerCase, properCaseTagName, properCaseAttributeName} from "./utils";
import { TemplateTag } from './templatetag'
import { asciiLowerCase, properCaseTagName, properCaseAttributeName } from './utils';
import { TemplateTag } from './templatetag';
import { Scanner } from './scanner';
import { parseFragment, codePointToString, getContent, getRCData } from './parse';
import { getComment, getDoctype, getHTMLToken, getTagToken, TEMPLATE_TAG_POSITION } from './tokenize';

HTMLTools = {
export const HTMLTools = {
asciiLowerCase,
properCaseTagName,
properCaseAttributeName,
Expand All @@ -23,7 +22,5 @@ HTMLTools = {
getDoctype,
getHTMLToken,
getTagToken,
}
},
};

export { HTMLTools };
9 changes: 5 additions & 4 deletions packages/html-tools/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* eslint-env meteor */
Package.describe({
name: 'html-tools',
summary: "Standards-compliant HTML tools",
version: '1.1.3',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@StorytellerCZ @denihs should PRs to 3.0 include version bumps? I'd rather keep them and at release bump them to whatever is suitable but that's not my call.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping @Grubba27

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I think PRs probably shouldn't include individual version bumps, it feels like this way lie merge conflicts & conflicting version number schemes for sure :D

git: 'https://github.com/meteor/blaze.git'
summary: 'Standards-compliant HTML tools',
version: '1.1.4',
StorytellerCZ marked this conversation as resolved.
Show resolved Hide resolved
git: 'https://github.com/meteor/blaze.git',
});

Package.onUse(function (api) {
Expand All @@ -25,6 +26,6 @@ Package.onTest(function (api) {
api.addFiles([
'charref_tests.js',
'tokenize_tests.js',
'parse_tests.js'
'parse_tests.js',
]);
});
Loading