mirror of
https://github.com/google/blockly.git
synced 2026-05-15 16:40:11 +02:00
9eeb4fea0b
* fix: formatting of enum KeyCodes
* fix: Use merged namespace for ContextMenuRegistry static types
- Create a namespace to be merged with the ContextMenuRegistry
class containing the types that were formerly declared as static
properties on that class.
- Use type aliases to export them individually as well, for
compatibility with the changes made by MigranTS (and/or
@gonfunko) to how other modules in core/ now import these
types.
- Update renamings.json5 to reflect the availability of the
direct exports for modules that import this module directly
(though they are not available to, and will not be used by,
code that imports only via blockly.js/blockly.ts.)
* fix: Use merged namespace for Input.Align
- Create a merged namespace for the Input.Align enum.
- Use type/const aliases to export it as Input too.
- Update renamings.json5 to reflect the availability of the
direct export.
* fix: Use merged namespace for Names.NameType
- Create a merged namespace for the Names.NameType enum.
- Use type/const aliases to export it as NameType too.
- Update renamings.json5 to reflect the availability of the
direct export. (This ought to have happened in an earlier
version as it was already available by both routes.)
* chore: Fix minor issues for PR #6246
- Use `Align` instead of `Input.Align` where possible.
* fix(build): Suppress irrelevant JSC_UNUSED_LOCAL_ASSIGNMENT errors
tsc generates code for merged namespaces that looks like:
(function (ClassName) {
let EnumName;
(function (EnumName) {
EnumName[EnumNameAlign["v1"] = 0] = "v1";
// etc.
})(EnumName = ClassName.EnumName || (ClassName.EnumName = {}));
})(ClassName || (ClassName = {}));
and Closure Compiler complains about the fact that the EnumName let
binding is initialised but never used. (It exists so that any other
code that was in the namespace could see the enum.)
Suppress this message, since it is not actionable and lint and/or tsc
should tell us if we have actual unused variables in our .ts files.
282 lines
9.3 KiB
TypeScript
282 lines
9.3 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2012 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Utility functions for handling variable and procedure names.
|
|
*/
|
|
|
|
/**
|
|
* Utility functions for handling variable and procedure names.
|
|
* @class
|
|
*/
|
|
import * as goog from '../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.Names');
|
|
|
|
// Unused import preserved for side-effects. Remove if unneeded.
|
|
import './procedures.js';
|
|
|
|
import {Msg} from './msg.js';
|
|
import * as Procedures from './procedures.js';
|
|
/* eslint-disable-next-line no-unused-vars */
|
|
import {VariableMap} from './variable_map.js';
|
|
import * as Variables from './variables.js';
|
|
/* eslint-disable-next-line no-unused-vars */
|
|
import {Workspace} from './workspace.js';
|
|
|
|
|
|
/**
|
|
* Class for a database of entity names (variables, procedures, etc).
|
|
* @alias Blockly.Names
|
|
*/
|
|
export class Names {
|
|
static DEVELOPER_VARIABLE_TYPE: NameType;
|
|
private readonly variablePrefix_: string;
|
|
private readonly reservedDict_: AnyDuringMigration;
|
|
private db_: {[key: string]: {[key: string]: string}};
|
|
private dbReverse_: {[key: string]: boolean};
|
|
|
|
/**
|
|
* The variable map from the workspace, containing Blockly variable models.
|
|
*/
|
|
private variableMap_: VariableMap|null = null;
|
|
|
|
/**
|
|
* @param reservedWords A comma-separated string of words that are illegal for
|
|
* use as names in a language (e.g. 'new,if,this,...').
|
|
* @param opt_variablePrefix Some languages need a '$' or a namespace before
|
|
* all variable names (but not procedure names).
|
|
*/
|
|
constructor(reservedWords: string, opt_variablePrefix?: string) {
|
|
/** The prefix to attach to variable names in generated code. */
|
|
this.variablePrefix_ = opt_variablePrefix || '';
|
|
|
|
/** A dictionary of reserved words. */
|
|
this.reservedDict_ = Object.create(null);
|
|
|
|
/**
|
|
* A map from type (e.g. name, procedure) to maps from names to generated
|
|
* names.
|
|
*/
|
|
this.db_ = Object.create(null);
|
|
|
|
/** A map from used names to booleans to avoid collisions. */
|
|
this.dbReverse_ = Object.create(null);
|
|
|
|
if (reservedWords) {
|
|
const splitWords = reservedWords.split(',');
|
|
for (let i = 0; i < splitWords.length; i++) {
|
|
this.reservedDict_[splitWords[i]] = true;
|
|
}
|
|
}
|
|
this.reset();
|
|
}
|
|
|
|
/**
|
|
* Empty the database and start from scratch. The reserved words are kept.
|
|
*/
|
|
reset() {
|
|
this.db_ = Object.create(null);
|
|
this.dbReverse_ = Object.create(null);
|
|
this.variableMap_ = null;
|
|
}
|
|
|
|
/**
|
|
* Set the variable map that maps from variable name to variable object.
|
|
* @param map The map to track.
|
|
*/
|
|
setVariableMap(map: VariableMap) {
|
|
this.variableMap_ = map;
|
|
}
|
|
|
|
/**
|
|
* Get the name for a user-defined variable, based on its ID.
|
|
* This should only be used for variables of NameType VARIABLE.
|
|
* @param id The ID to look up in the variable map.
|
|
* @return The name of the referenced variable, or null if there was no
|
|
* variable map or the variable was not found in the map.
|
|
*/
|
|
private getNameForUserVariable_(id: string): string|null {
|
|
if (!this.variableMap_) {
|
|
console.warn(
|
|
'Deprecated call to Names.prototype.getName without ' +
|
|
'defining a variable map. To fix, add the following code in your ' +
|
|
'generator\'s init() function:\n' +
|
|
'Blockly.YourGeneratorName.nameDB_.setVariableMap(' +
|
|
'workspace.getVariableMap());');
|
|
return null;
|
|
}
|
|
const variable = this.variableMap_.getVariableById(id);
|
|
if (variable) {
|
|
return variable.name;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Generate names for user variables, but only ones that are being used.
|
|
* @param workspace Workspace to generate variables from.
|
|
*/
|
|
populateVariables(workspace: Workspace) {
|
|
const variables = Variables.allUsedVarModels(workspace);
|
|
for (let i = 0; i < variables.length; i++) {
|
|
this.getName(variables[i].getId(), NameType.VARIABLE);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Generate names for procedures.
|
|
* @param workspace Workspace to generate procedures from.
|
|
*/
|
|
populateProcedures(workspace: Workspace) {
|
|
let procedures = Procedures.allProcedures(workspace);
|
|
// Flatten the return vs no-return procedure lists.
|
|
let flattenedProcedures: AnyDuringMigration[][] =
|
|
procedures[0].concat(procedures[1]);
|
|
for (let i = 0; i < flattenedProcedures.length; i++) {
|
|
this.getName(flattenedProcedures[i][0], NameType.PROCEDURE);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Convert a Blockly entity name to a legal exportable entity name.
|
|
* @param nameOrId The Blockly entity name (no constraints) or variable ID.
|
|
* @param type The type of the name in Blockly ('VARIABLE', 'PROCEDURE',
|
|
* 'DEVELOPER_VARIABLE', etc...).
|
|
* @return An entity name that is legal in the exported language.
|
|
*/
|
|
getName(nameOrId: string, type: NameType|string): string {
|
|
let name = nameOrId;
|
|
if (type === NameType.VARIABLE) {
|
|
const varName = this.getNameForUserVariable_(nameOrId);
|
|
if (varName) {
|
|
// Successful ID lookup.
|
|
name = varName;
|
|
}
|
|
}
|
|
const normalizedName = name.toLowerCase();
|
|
|
|
const isVar =
|
|
type === NameType.VARIABLE || type === NameType.DEVELOPER_VARIABLE;
|
|
|
|
const prefix = isVar ? this.variablePrefix_ : '';
|
|
if (!(type in this.db_)) {
|
|
this.db_[type] = Object.create(null);
|
|
}
|
|
const typeDb = this.db_[type];
|
|
if (normalizedName in typeDb) {
|
|
return prefix + typeDb[normalizedName];
|
|
}
|
|
const safeName = this.getDistinctName(name, type);
|
|
typeDb[normalizedName] = safeName.substr(prefix.length);
|
|
return safeName;
|
|
}
|
|
|
|
/**
|
|
* Return a list of all known user-created names of a specified name type.
|
|
* @param type The type of entity in Blockly ('VARIABLE', 'PROCEDURE',
|
|
* 'DEVELOPER_VARIABLE', etc...).
|
|
* @return A list of Blockly entity names (no constraints).
|
|
*/
|
|
getUserNames(type: NameType|string): string[] {
|
|
const typeDb = this.db_[type] || {};
|
|
return Object.keys(typeDb);
|
|
}
|
|
|
|
/**
|
|
* Convert a Blockly entity name to a legal exportable entity name.
|
|
* Ensure that this is a new name not overlapping any previously defined name.
|
|
* Also check against list of reserved words for the current language and
|
|
* ensure name doesn't collide.
|
|
* @param name The Blockly entity name (no constraints).
|
|
* @param type The type of entity in Blockly ('VARIABLE', 'PROCEDURE',
|
|
* 'DEVELOPER_VARIABLE', etc...).
|
|
* @return An entity name that is legal in the exported language.
|
|
*/
|
|
getDistinctName(name: string, type: NameType|string): string {
|
|
let safeName = this.safeName_(name);
|
|
let i = '';
|
|
while (this.dbReverse_[safeName + i] ||
|
|
safeName + i in this.reservedDict_) {
|
|
// Collision with existing name. Create a unique name.
|
|
// AnyDuringMigration because: Type 'string | 2' is not assignable to
|
|
// type 'string'.
|
|
i = (i ? i + 1 : 2) as AnyDuringMigration;
|
|
}
|
|
safeName += i;
|
|
this.dbReverse_[safeName] = true;
|
|
const isVar =
|
|
type === NameType.VARIABLE || type === NameType.DEVELOPER_VARIABLE;
|
|
const prefix = isVar ? this.variablePrefix_ : '';
|
|
return prefix + safeName;
|
|
}
|
|
|
|
/**
|
|
* Given a proposed entity name, generate a name that conforms to the
|
|
* [_A-Za-z][_A-Za-z0-9]* format that most languages consider legal for
|
|
* variable and function names.
|
|
* @param name Potentially illegal entity name.
|
|
* @return Safe entity name.
|
|
*/
|
|
private safeName_(name: string): string {
|
|
if (!name) {
|
|
name = Msg['UNNAMED_KEY'] || 'unnamed';
|
|
} else {
|
|
// Unfortunately names in non-latin characters will look like
|
|
// _E9_9F_B3_E4_B9_90 which is pretty meaningless.
|
|
// https://github.com/google/blockly/issues/1654
|
|
name = encodeURI(name.replace(/ /g, '_')).replace(/[^\w]/g, '_');
|
|
// Most languages don't allow names with leading numbers.
|
|
if ('0123456789'.indexOf(name[0]) !== -1) {
|
|
name = 'my_' + name;
|
|
}
|
|
}
|
|
return name;
|
|
}
|
|
|
|
/**
|
|
* Do the given two entity names refer to the same entity?
|
|
* Blockly names are case-insensitive.
|
|
* @param name1 First name.
|
|
* @param name2 Second name.
|
|
* @return True if names are the same.
|
|
*/
|
|
static equals(name1: string, name2: string): boolean {
|
|
// name1.localeCompare(name2) is slower.
|
|
return name1.toLowerCase() === name2.toLowerCase();
|
|
}
|
|
}
|
|
|
|
export namespace Names {
|
|
/**
|
|
* Enum for the type of a name. Different name types may have different rules
|
|
* about collisions.
|
|
* When JavaScript (or most other languages) is generated, variable 'foo' and
|
|
* procedure 'foo' would collide. However, Blockly has no such problems since
|
|
* variable get 'foo' and procedure call 'foo' are unambiguous.
|
|
* Therefore, Blockly keeps a separate name type to disambiguate.
|
|
* getName('foo', 'VARIABLE') -> 'foo'
|
|
* getName('foo', 'PROCEDURE') -> 'foo2'
|
|
* @alias Blockly.Names.NameType
|
|
*/
|
|
export enum NameType {
|
|
DEVELOPER_VARIABLE = 'DEVELOPER_VARIABLE',
|
|
VARIABLE = 'VARIABLE',
|
|
PROCEDURE = 'PROCEDURE',
|
|
}
|
|
}
|
|
|
|
export type NameType = Names.NameType;
|
|
export const NameType = Names.NameType;
|
|
|
|
/**
|
|
* Constant to separate developer variable names from user-defined variable
|
|
* names when running generators.
|
|
* A developer variable will be declared as a global in the generated code, but
|
|
* will never be shown to the user in the workspace or stored in the variable
|
|
* map.
|
|
*/
|
|
Names.DEVELOPER_VARIABLE_TYPE = NameType.DEVELOPER_VARIABLE;
|