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

Result promise of RequestInstantiateAll will be fulfilled with the re… #66

Merged
merged 1 commit into from
Aug 21, 2015
Merged

Result promise of RequestInstantiateAll will be fulfilled with the re… #66

merged 1 commit into from
Aug 21, 2015

Conversation

Constellation
Copy link
Member

Here, we assume that the result promise of the RequestInstantiateAll will be fulfilled
with the module record instance. But actually it will be fulfilled with the registry entry.
Since the result of the RequestInstantiate is also fulfilled with the registry entry,
we align the RequestInstantiateAll to the RequestInstantiate.

@Constellation
Result promise of RequestInstantiateAll will be fulfilled with the re…
b7eae33 
…gistry entry

Here, we assume that the result promise of the RequestInstantiateAll will be fulfilled
with the module record instance. But actually it will be fulfilled with the registry entry.
Since the result of the RequestInstantiate is also fulfilled with the registry entry,
we align the RequestInstantiateAll to the RequestInstantiate.
@Constellation
Copy link
Member Author

Or is it better fulfilling [[instantiate]] and the result of RequestInstantiateAll with the module instance value?

@Constellation
Copy link
Member Author

In the meantime, since RequestLink also assumes that the result of RequestInstantiateAll will be fulfilled with the entry, I aligned to that.

@caridy
Copy link
Contributor

caridy commented Aug 15, 2015

In general, we have a problem with fulfilling with registry entry, [[Module]] or [[Namespace]], we need to revisit all of them to make sure we are doing the right thing. I will be taking care of it on PR #65.

hubot pushed a commit to WebKit/WebKit-http that referenced this pull request Aug 21, 2015
[ES6] prototyping module loader in JSC shell
c42ad7b 
https://bugs.webkit.org/show_bug.cgi?id=147876

Reviewed by Saam Barati.

Source/JavaScriptCore:

This patch implements ES6 Module Loader part. The implementation is based on
the latest draft[1, 2]. The naive implementation poses several problems.
This patch attempts to solve the spec issues and proposes the fix[3, 4, 5].

We construct the JSC internal module loader based on the ES6 Promises.
The chain of the promises represents the dependency graph of the modules and
it automatically enables asynchronous module fetching.
To leverage the Promises internally, we use the InternalPromise landed in r188681.

The loader has several platform-dependent hooks. The platform can implement
these hooks to provide the functionality missing in the module loaders, like
"how to fetch the resources". The method table of the JSGlobalObject is extended
to accept these hooks from the platform.

This patch focus on the loading part. So we don't create the module environment
and don't link the modules yet.

To test the current module progress easily, we add the `-m` option to the JSC shell.
When this option is specified, we load the given script as the module. And to use
the module loading inside the JSC shell, we added the simple loader hook for fetching.
It fetches the module content from the file system.

And to use the ES6 Map in the Loader implementation, we added @get and @set methods to the Map.
But it conflicts with the existing `getPrivateName` method. Rename it to `lookUpPrivateName`.

[1]: https://whatwg.github.io/loader/
[2]: whatwg/loader@214c7a6
[3]: whatwg/loader#66
[4]: whatwg/loader#67
[5]: whatwg/loader#68
[6]: https://bugs.webkit.org/show_bug.cgi?id=148136

* CMakeLists.txt:
* DerivedSources.make:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* builtins/BuiltinNames.h:
(JSC::BuiltinNames::lookUpPrivateName):
(JSC::BuiltinNames::lookUpPublicName):
(JSC::BuiltinNames::getPrivateName): Deleted.
(JSC::BuiltinNames::getPublicName): Deleted.
* builtins/ModuleLoaderObject.js: Added.
(setStateToMax):
(newRegistryEntry):
(forceFulfillPromise):
(fulfillFetch):
(fulfillTranslate):
(fulfillInstantiate):
(instantiation):
(requestFetch):
(requestTranslate):
(requestInstantiate):
(requestResolveDependencies.resolveDependenciesPromise.this.requestInstantiate.then.):
(requestResolveDependencies.resolveDependenciesPromise.this.requestInstantiate.then):
(requestResolveDependencies):
(requestInstantiateAll):
(provide):
* jsc.cpp:
(stringFromUTF):
(jscSource):
(GlobalObject::moduleLoaderFetch):
(functionCheckModuleSyntax):
(dumpException):
(runWithScripts):
(printUsageStatement):
(CommandLine::parseArguments):
(jscmain):
(CommandLine::CommandLine): Deleted.
* parser/Lexer.cpp:
(JSC::Lexer<LChar>::parseIdentifier):
(JSC::Lexer<UChar>::parseIdentifier):
* parser/ModuleAnalyzer.cpp:
(JSC::ModuleAnalyzer::ModuleAnalyzer):
(JSC::ModuleAnalyzer::exportVariable):
(JSC::ModuleAnalyzer::analyze):
* parser/ModuleAnalyzer.h:
(JSC::ModuleAnalyzer::moduleRecord):
* parser/ModuleRecord.cpp:
(JSC::printableName): Deleted.
(JSC::ModuleRecord::dump): Deleted.
* parser/ModuleRecord.h:
(JSC::ModuleRecord::ImportEntry::isNamespace): Deleted.
(JSC::ModuleRecord::create): Deleted.
(JSC::ModuleRecord::appendRequestedModule): Deleted.
(JSC::ModuleRecord::addImportEntry): Deleted.
(JSC::ModuleRecord::addExportEntry): Deleted.
(JSC::ModuleRecord::addStarExportEntry): Deleted.
* parser/Nodes.h:
* parser/NodesAnalyzeModule.cpp:
(JSC::ImportDeclarationNode::analyzeModule):
(JSC::ExportAllDeclarationNode::analyzeModule):
(JSC::ExportNamedDeclarationNode::analyzeModule):
* runtime/CommonIdentifiers.cpp:
(JSC::CommonIdentifiers::lookUpPrivateName):
(JSC::CommonIdentifiers::lookUpPublicName):
(JSC::CommonIdentifiers::getPrivateName): Deleted.
(JSC::CommonIdentifiers::getPublicName): Deleted.
* runtime/CommonIdentifiers.h:
* runtime/Completion.cpp:
(JSC::checkModuleSyntax):
(JSC::evaluateModule):
* runtime/Completion.h:
* runtime/ExceptionHelpers.cpp:
(JSC::createUndefinedVariableError):
* runtime/Identifier.h:
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::visitChildren):
* runtime/JSGlobalObject.h:
(JSC::JSGlobalObject::moduleLoader):
(JSC::JSGlobalObject::moduleRecordStructure):
* runtime/JSModuleRecord.cpp: Renamed from Source/JavaScriptCore/parser/ModuleRecord.cpp.
(JSC::JSModuleRecord::destroy):
(JSC::JSModuleRecord::finishCreation):
(JSC::printableName):
(JSC::JSModuleRecord::dump):
* runtime/JSModuleRecord.h: Renamed from Source/JavaScriptCore/parser/ModuleRecord.h.
(JSC::JSModuleRecord::ImportEntry::isNamespace):
(JSC::JSModuleRecord::createStructure):
(JSC::JSModuleRecord::create):
(JSC::JSModuleRecord::requestedModules):
(JSC::JSModuleRecord::JSModuleRecord):
(JSC::JSModuleRecord::appendRequestedModule):
(JSC::JSModuleRecord::addImportEntry):
(JSC::JSModuleRecord::addExportEntry):
(JSC::JSModuleRecord::addStarExportEntry):
* runtime/MapPrototype.cpp:
(JSC::MapPrototype::finishCreation):
* runtime/ModuleLoaderObject.cpp: Added.
(JSC::ModuleLoaderObject::ModuleLoaderObject):
(JSC::ModuleLoaderObject::finishCreation):
(JSC::ModuleLoaderObject::getOwnPropertySlot):
(JSC::printableModuleKey):
(JSC::ModuleLoaderObject::provide):
(JSC::ModuleLoaderObject::requestInstantiateAll):
(JSC::ModuleLoaderObject::resolve):
(JSC::ModuleLoaderObject::fetch):
(JSC::ModuleLoaderObject::translate):
(JSC::ModuleLoaderObject::instantiate):
(JSC::moduleLoaderObjectParseModule):
(JSC::moduleLoaderObjectRequestedModules):
(JSC::moduleLoaderObjectResolve):
(JSC::moduleLoaderObjectFetch):
(JSC::moduleLoaderObjectTranslate):
(JSC::moduleLoaderObjectInstantiate):
* runtime/ModuleLoaderObject.h: Added.
(JSC::ModuleLoaderObject::create):
(JSC::ModuleLoaderObject::createStructure):
* runtime/Options.h:

Source/WebCore:

Just fill Loader hooks with nullptr.

* bindings/js/JSDOMWindowBase.cpp:
* bindings/js/JSWorkerGlobalScopeBase.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@188752 268f45cc-cd09-0410-ab3c-d52691b4dbfc
caridy added a commit that referenced this pull request Aug 21, 2015
@caridy
Merge pull request #66 from Constellation/request
2b0527e 
PR #66: Result promise of RequestInstantiateAll will be fulfilled with the registry entry.
@caridy caridy merged commit 2b0527e into whatwg:master Aug 21, 2015
caridy added a commit that referenced this pull request Aug 21, 2015
@caridy
PR #66 bugfix
951d58e
@caridy
Copy link
Contributor

caridy commented Aug 21, 2015

@Constellation html version was updated to reflect this fix.

@Constellation
Copy link
Member Author

Thank you!

@Constellation Constellation deleted the request branch August 21, 2015 21:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Constellation @caridy