mirror of
https://github.com/google/blockly.git
synced 2026-01-06 16:40:07 +01:00
* fix(build): Restore erroneously-deleted filter function This was deleted in PR #7406 as it was mainly being used to filter core/ vs. test/mocha/ deps into separate deps files - but it turns out also to be used for filtering error messages too. Oops. * refactor(tests): Migrate advanced compilation test to ES Modules * refactor(build): Migrate main.js to TypeScript This turns out to be pretty straight forward, even if it would cause crashing if one actually tried to import this module instead of just feeding it to Closure Compiler. * chore(build): Remove goog.declareModuleId calls Replace goog.declareModuleId calls with a comment recording the former module ID for posterity (or at least until we decide how to reformat the renamings file. * chore(tests): Delete closure/goog/* For the moment we still need something to serve as base.js for the benefit of closure-make-deps, so we keep a vestigial base.js around, containing only the @provideGoog declaration. * refactor(build): Remove vestigial base.js By changing slightly the command line arguments to closure-make-deps and closure-calculate-chunks the need to have any base.js is eliminated. * chore: Typo fix for PR #7415
288 lines
8.8 KiB
TypeScript
288 lines
8.8 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2021 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
// Former goog.module ID: Blockly.utils.parsing
|
|
|
|
import {Msg} from '../msg.js';
|
|
|
|
import * as colourUtils from './colour.js';
|
|
|
|
/**
|
|
* Internal implementation of the message reference and interpolation token
|
|
* parsing used by tokenizeInterpolation() and replaceMessageReferences().
|
|
*
|
|
* @param message Text which might contain string table references and
|
|
* interpolation tokens.
|
|
* @param parseInterpolationTokens Option to parse numeric interpolation
|
|
* tokens (%1, %2, ...) when true.
|
|
* @param tokenizeNewlines Split individual newline characters into separate
|
|
* tokens when true.
|
|
* @returns Array of strings and numbers.
|
|
*/
|
|
function tokenizeInterpolationInternal(
|
|
message: string,
|
|
parseInterpolationTokens: boolean,
|
|
tokenizeNewlines: boolean,
|
|
): (string | number)[] {
|
|
const tokens = [];
|
|
const chars = message.split('');
|
|
chars.push(''); // End marker.
|
|
// Parse the message with a finite state machine.
|
|
// 0 - Base case.
|
|
// 1 - % found.
|
|
// 2 - Digit found.
|
|
// 3 - Message ref found.
|
|
let state = 0;
|
|
const buffer = new Array<string>();
|
|
let number = null;
|
|
for (let i = 0; i < chars.length; i++) {
|
|
const c = chars[i];
|
|
if (state === 0) {
|
|
// Start escape.
|
|
if (c === '%') {
|
|
const text = buffer.join('');
|
|
if (text) {
|
|
tokens.push(text);
|
|
}
|
|
buffer.length = 0;
|
|
state = 1;
|
|
} else if (tokenizeNewlines && c === '\n') {
|
|
// Output newline characters as single-character tokens, to be replaced
|
|
// with endOfRow dummies during interpolation.
|
|
const text = buffer.join('');
|
|
if (text) {
|
|
tokens.push(text);
|
|
}
|
|
buffer.length = 0;
|
|
tokens.push(c);
|
|
} else {
|
|
buffer.push(c); // Regular char.
|
|
}
|
|
} else if (state === 1) {
|
|
if (c === '%') {
|
|
buffer.push(c); // Escaped %: %%
|
|
state = 0;
|
|
} else if (parseInterpolationTokens && '0' <= c && c <= '9') {
|
|
state = 2;
|
|
number = c;
|
|
const text = buffer.join('');
|
|
if (text) {
|
|
tokens.push(text);
|
|
}
|
|
buffer.length = 0;
|
|
} else if (c === '{') {
|
|
state = 3;
|
|
} else {
|
|
buffer.push('%', c); // Not recognized. Return as literal.
|
|
state = 0;
|
|
}
|
|
} else if (state === 2) {
|
|
if ('0' <= c && c <= '9') {
|
|
number += c; // Multi-digit number.
|
|
} else {
|
|
tokens.push(parseInt(number ?? '', 10));
|
|
i--; // Parse this char again.
|
|
state = 0;
|
|
}
|
|
} else if (state === 3) {
|
|
// String table reference
|
|
if (c === '') {
|
|
// Premature end before closing '}'
|
|
buffer.splice(0, 0, '%{'); // Re-insert leading delimiter
|
|
i--; // Parse this char again.
|
|
state = 0; // and parse as string literal.
|
|
} else if (c !== '}') {
|
|
buffer.push(c);
|
|
} else {
|
|
const rawKey = buffer.join('');
|
|
if (/[A-Z]\w*/i.test(rawKey)) {
|
|
// Strict matching
|
|
// Found a valid string key. Attempt case insensitive match.
|
|
const keyUpper = rawKey.toUpperCase();
|
|
|
|
// BKY_ is the prefix used to namespace the strings used in
|
|
// Blockly core files and the predefined blocks in ../blocks/.
|
|
// These strings are defined in ../msgs/ files.
|
|
const bklyKey = keyUpper.startsWith('BKY_')
|
|
? keyUpper.substring(4)
|
|
: null;
|
|
if (bklyKey && bklyKey in Msg) {
|
|
const rawValue = Msg[bklyKey];
|
|
if (typeof rawValue === 'string') {
|
|
// Attempt to dereference substrings, too, appending to the
|
|
// end.
|
|
Array.prototype.push.apply(
|
|
tokens,
|
|
tokenizeInterpolationInternal(
|
|
rawValue,
|
|
parseInterpolationTokens,
|
|
tokenizeNewlines,
|
|
),
|
|
);
|
|
} else if (parseInterpolationTokens) {
|
|
// When parsing interpolation tokens, numbers are special
|
|
// placeholders (%1, %2, etc). Make sure all other values are
|
|
// strings.
|
|
tokens.push(`${rawValue}`);
|
|
} else {
|
|
tokens.push(rawValue);
|
|
}
|
|
} else {
|
|
// No entry found in the string table. Pass reference as string.
|
|
tokens.push('%{' + rawKey + '}');
|
|
}
|
|
buffer.length = 0; // Clear the array
|
|
state = 0;
|
|
} else {
|
|
tokens.push('%{' + rawKey + '}');
|
|
buffer.length = 0;
|
|
state = 0; // and parse as string literal.
|
|
}
|
|
}
|
|
}
|
|
}
|
|
let text = buffer.join('');
|
|
if (text) {
|
|
tokens.push(text);
|
|
}
|
|
|
|
// Merge adjacent text tokens into a single string (but if newlines should be
|
|
// tokenized, don't merge those with adjacent text).
|
|
const mergedTokens = [];
|
|
buffer.length = 0;
|
|
for (let i = 0; i < tokens.length; i++) {
|
|
if (
|
|
typeof tokens[i] === 'string' &&
|
|
!(tokenizeNewlines && tokens[i] === '\n')
|
|
) {
|
|
buffer.push(tokens[i] as string);
|
|
} else {
|
|
text = buffer.join('');
|
|
if (text) {
|
|
mergedTokens.push(text);
|
|
}
|
|
buffer.length = 0;
|
|
mergedTokens.push(tokens[i]);
|
|
}
|
|
}
|
|
text = buffer.join('');
|
|
if (text) {
|
|
mergedTokens.push(text);
|
|
}
|
|
buffer.length = 0;
|
|
|
|
return mergedTokens;
|
|
}
|
|
|
|
/**
|
|
* Parse a string with any number of interpolation tokens (%1, %2, ...).
|
|
* It will also replace string table references (e.g., %{bky_my_msg} and
|
|
* %{BKY_MY_MSG} will both be replaced with the value in
|
|
* Msg['MY_MSG']). Percentage sign characters '%' may be self-escaped
|
|
* (e.g., '%%'). Newline characters will also be output as string tokens
|
|
* containing a single newline character.
|
|
*
|
|
* @param message Text which might contain string table references and
|
|
* interpolation tokens.
|
|
* @returns Array of strings and numbers.
|
|
*/
|
|
export function tokenizeInterpolation(message: string): (string | number)[] {
|
|
return tokenizeInterpolationInternal(message, true, true);
|
|
}
|
|
|
|
/**
|
|
* Replaces string table references in a message, if the message is a string.
|
|
* For example, "%{bky_my_msg}" and "%{BKY_MY_MSG}" will both be replaced with
|
|
* the value in Msg['MY_MSG'].
|
|
*
|
|
* @param message Message, which may be a string that contains
|
|
* string table references.
|
|
* @returns String with message references replaced.
|
|
*/
|
|
export function replaceMessageReferences(message: string | any): string {
|
|
if (typeof message !== 'string') {
|
|
return message;
|
|
}
|
|
const interpolatedResult = tokenizeInterpolationInternal(
|
|
message,
|
|
false,
|
|
false,
|
|
);
|
|
// When parseInterpolationTokens and tokenizeNewlines are false,
|
|
// interpolatedResult should be at most length 1.
|
|
return interpolatedResult.length ? String(interpolatedResult[0]) : '';
|
|
}
|
|
|
|
/**
|
|
* Validates that any %{MSG_KEY} references in the message refer to keys of
|
|
* the Msg string table.
|
|
*
|
|
* @param message Text which might contain string table references.
|
|
* @returns True if all message references have matching values.
|
|
* Otherwise, false.
|
|
*/
|
|
export function checkMessageReferences(message: string): boolean {
|
|
let validSoFar = true;
|
|
|
|
const msgTable = Msg;
|
|
// TODO (#1169): Implement support for other string tables,
|
|
// prefixes other than BKY_.
|
|
const m = message.match(/%{BKY_[A-Z]\w*}/gi);
|
|
if (m) {
|
|
for (let i = 0; i < m.length; i++) {
|
|
const msgKey = m[i].toUpperCase();
|
|
if (msgTable[msgKey.slice(6, -1)] === undefined) {
|
|
console.warn('No message string for ' + m[i] + ' in ' + message);
|
|
validSoFar = false; // Continue to report other errors.
|
|
}
|
|
}
|
|
}
|
|
|
|
return validSoFar;
|
|
}
|
|
|
|
/**
|
|
* Parse a block colour from a number or string, as provided in a block
|
|
* definition.
|
|
*
|
|
* @param colour HSV hue value (0 to 360), #RRGGBB string,
|
|
* or a message reference string pointing to one of those two values.
|
|
* @returns An object containing the colour as
|
|
* a #RRGGBB string, and the hue if the input was an HSV hue value.
|
|
* @throws {Error} If the colour cannot be parsed.
|
|
*/
|
|
export function parseBlockColour(colour: number | string): {
|
|
hue: number | null;
|
|
hex: string;
|
|
} {
|
|
const dereferenced =
|
|
typeof colour === 'string' ? replaceMessageReferences(colour) : colour;
|
|
|
|
const hue = Number(dereferenced);
|
|
if (!isNaN(hue) && 0 <= hue && hue <= 360) {
|
|
return {
|
|
hue: hue,
|
|
hex: colourUtils.hsvToHex(
|
|
hue,
|
|
colourUtils.getHsvSaturation(),
|
|
colourUtils.getHsvValue() * 255,
|
|
),
|
|
};
|
|
} else {
|
|
const hex = colourUtils.parse(dereferenced);
|
|
if (hex) {
|
|
// Only store hue if colour is set as a hue.
|
|
return {hue: null, hex: hex};
|
|
} else {
|
|
let errorMsg = 'Invalid colour: "' + dereferenced + '"';
|
|
if (colour !== dereferenced) {
|
|
errorMsg += ' (from "' + colour + '")';
|
|
}
|
|
throw Error(errorMsg);
|
|
}
|
|
}
|
|
}
|