mirror of
https://github.com/google/blockly.git
synced 2026-01-09 01:50:11 +01:00
6f20ac290d
* fix(build): Have buildShims clean up up after itself
We need to create a build/package.json file to allow node.js to
load build/src/core/blockly.js and the other chunk entry points
as ES modules (it forcibly assumes .js means CJS even if one is
trying to import, unless package.json says {"type": "module"}),
but this interferes with scripts/migration/js2ts doing a
require('build/deps.js'), which is _not_ an ES module.
Specific error message was:
/Users/cpcallen/src/blockly/scripts/migration/js2ts:56
require(path.resolve(__dirname, '../../build/deps.js'));
^
Error [ERR_REQUIRE_ESM]: require() of ES Module
/Users/cpcallen/src/blockly/build/deps.js from /Users/cpcallen/src/blockly/scripts/migration/js2ts
not supported.
deps.js is treated as an ES module file as it is a .js file whose
nearest parent package.json contains "type": "module" which
declares all .js files in that package scope as ES modules.
Instead rename deps.js to end in .cjs, change the requiring code
to use dynamic import() which is available in all CommonJS
modules, or change "type": "module" to "type": "commonjs" in
/Users/cpcallen/src/blockly/build/package.json to treat all .js
files as CommonJS (using .mjs for all ES modules instead).
at Object.<anonymous> (/Users/cpcallen/src/blockly/scripts/migration/js2ts:56:1) {
code: 'ERR_REQUIRE_ESM'
}
* chore(tests): Reorder to put interesting script nearer top of file
* chore(tests): Add missing imports of closure/goog/goog.js
These modules were depending on being loaded via the
debug module loader, which cannot be used without first loading
base.js as a script, and thereby defining goog.declareModuleId
as a side effect—but if they are to be loaded via direct import
statements then they need to actually import their own
dependencies.
This is a temporary measure as soon the goog.declareMouleId
calls can themselves be deleted.
* refactor(tests): Use import instead of bootstrap to load Blockly
* chores(build): Stop generating deps.mocha.js
This file was only needed by tests/mocha/index.html's use of
the debug module loader (via bootstrap.js), which has now been
removed.
* chore(tests): Remove unneeded goog.declareModuleId calls
These were only needed because these modules were previously
being loaded by goog.require and/or goog.bootstrap.
* chores(tests): Remove dead code
We are fully committed to proper modules now.
117 lines
3.0 KiB
JavaScript
117 lines
3.0 KiB
JavaScript
/* eslint-disable valid-jsdoc */
|
|
/**
|
|
* @license
|
|
* Copyright 2020 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import {runTestSuites} from './common.js';
|
|
|
|
/**
|
|
* Code generation test case configuration.
|
|
* @implements {TestCase}
|
|
* @record
|
|
*/
|
|
export class CodeGenerationTestCase {
|
|
/**
|
|
* Class for a code generation test case.
|
|
*/
|
|
constructor() {
|
|
/**
|
|
* @type {string} The expected code.
|
|
*/
|
|
this.expectedCode;
|
|
/**
|
|
* @type {boolean|undefined} Whether to use workspaceToCode instead of
|
|
* blockToCode for test.
|
|
*/
|
|
this.useWorkspaceToCode;
|
|
/**
|
|
* @type {number|undefined} The expected inner order.
|
|
*/
|
|
this.expectedInnerOrder;
|
|
}
|
|
|
|
/**
|
|
* Creates the block to use for this test case.
|
|
* @param {!Blockly.Workspace} workspace The workspace context for this
|
|
* test.
|
|
* @return {!Blockly.Block} The block to use for the test case.
|
|
*/
|
|
createBlock(workspace) {}
|
|
}
|
|
|
|
/**
|
|
* Code generation test suite.
|
|
* @extends {TestSuite<CodeGenerationTestCase, CodeGenerationTestSuite>}
|
|
* @record
|
|
*/
|
|
export class CodeGenerationTestSuite {
|
|
/**
|
|
* Class for a code generation test suite.
|
|
*/
|
|
constructor() {
|
|
/**
|
|
* @type {!Blockly.CodeGenerator} The generator to use for running test cases.
|
|
*/
|
|
this.generator;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns mocha test callback for code generation based on provided
|
|
* generator.
|
|
* @param {!Blockly.CodeGenerator} generator The generator to use in test.
|
|
* @return {function(!CodeGenerationTestCase):!Function} Function that
|
|
* returns mocha test callback based on test case.
|
|
* @private
|
|
*/
|
|
const createCodeGenerationTestFn_ = (generator) => {
|
|
return (testCase) => {
|
|
return function () {
|
|
const block = testCase.createBlock(this.workspace);
|
|
let code;
|
|
let innerOrder;
|
|
if (testCase.useWorkspaceToCode) {
|
|
code = generator.workspaceToCode(this.workspace);
|
|
} else {
|
|
generator.init(this.workspace);
|
|
code = generator.blockToCode(block);
|
|
if (Array.isArray(code)) {
|
|
innerOrder = code[1];
|
|
code = code[0];
|
|
}
|
|
}
|
|
const assertFunc =
|
|
typeof testCase.expectedCode === 'string'
|
|
? chai.assert.equal
|
|
: chai.assert.match;
|
|
assertFunc(code, testCase.expectedCode);
|
|
if (
|
|
!testCase.useWorkspaceToCode &&
|
|
testCase.expectedInnerOrder !== undefined
|
|
) {
|
|
chai.assert.equal(innerOrder, testCase.expectedInnerOrder);
|
|
}
|
|
};
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Runs blockToCode test suites.
|
|
* @param {!Array<!CodeGenerationTestSuite>} testSuites The test suites to run.
|
|
*/
|
|
export const runCodeGenerationTestSuites = (testSuites) => {
|
|
/**
|
|
* Creates function used to generate mocha test callback.
|
|
* @param {!CodeGenerationTestSuite} suiteInfo The test suite information.
|
|
* @return {function(!CodeGenerationTestCase):!Function} Function that
|
|
* creates mocha test callback.
|
|
*/
|
|
const createTestFn = (suiteInfo) => {
|
|
return createCodeGenerationTestFn_(suiteInfo.generator);
|
|
};
|
|
|
|
runTestSuites(testSuites, createTestFn);
|
|
};
|