scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 15:02:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Code cleanup and actually throw errors when project fails to load. Depends on scratch-gui loading sb3 version of default project.

Browse source
This commit is contained in:
Karishma Chadha 2018-02-28 10:02:02 -05:00
parent 79169c81b3
commit 59d1c2a0b3
1 changed files with 8 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/virtual-machine.js
View file

@ -228,8 +228,9 @@ class VirtualMachine extends EventEmitter {
// Validate & parse // Validate & parse
if (typeof json !== 'string' && typeof json !== 'object') { if (typeof json !== 'string' && typeof json !== 'object') {
log.error('Failed to parse project. Invalid type supplied to fromJSON.'); const invalidTypeError = 'Failed to parse project. Invalid type supplied to fromJSON.';
return; log.error(invalidTypeError);
throw new Error(invalidTypeError);
} }
// Establish version, deserialize, and load into runtime // Establish version, deserialize, and load into runtime
@ -244,19 +245,17 @@ class VirtualMachine extends EventEmitter {
deserializer = sb3; deserializer = sb3;
validatedProject = possibleSb3; validatedProject = possibleSb3;
} else { } else {
// @todo need to handle default project
validate(json, (err, project) => { validate(json, (err, project) => {
if (err) { if (err) {
// @todo Making this a warning for now. Should be updated with error handling const errorMessage =
log.warn( `The given project could not be validated, parsing failed with error: ${JSON.stringify(err)}`;
`There was an error in validating the project: ${JSON.stringify(err)}`); log.error(errorMessage);
deserializer = sb2; throw new Error(errorMessage);
validatedProject = possibleSb3;
} else { } else {
deserializer = sb2; deserializer = sb2;
validatedProject = project; validatedProject = project;
} }
// handle the error
}); });
} }
@ -265,42 +264,6 @@ class VirtualMachine extends EventEmitter {
this.installTargets(targets, extensions, true)); this.installTargets(targets, extensions, true));
} }
// /**
// * Load a project from a Scratch JSON representation.
// * @param {string} json JSON string representing a project.
// * @returns {Promise} Promise that resolves after the project has loaded
// */
// fromJSON (json) {
// // Clear the current runtime
// this.clear();
//
// // Validate & parse
// if (typeof json !== 'string' && typeof json !== 'object') {
// log.error('Failed to parse project. Invalid type supplied to fromJSON.');
// return;
// }
//
// // Attempt to parse JSON if string is supplied
// if (typeof json === 'string') json = JSON.parse(json);
//
// // Establish version, deserialize, and load into runtime
// // @todo Support Scratch 1.4
// // @todo This is an extremely naïve / dangerous way of determining version.
// // See `scratch-parser` for a more sophisticated validation
// // methodology that should be adapted for use here
// let deserializer;
// if ((typeof json.meta !== 'undefined') && (typeof json.meta.semver !== 'undefined')) {
// deserializer = sb3;
// } else {
// deserializer = sb2;
// }
//
// return deserializer.deserialize(json, this.runtime)
// .then(({targets, extensions}) =>
// this.installTargets(targets, extensions, true));
// }
/** /**
* Install `deserialize` results: zero or more targets after the extensions (if any) used by those targets. * Install `deserialize` results: zero or more targets after the extensions (if any) used by those targets.
* @param {Array.<Target>} targets - the targets to be installed * @param {Array.<Target>} targets - the targets to be installed