mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add generics to hooked service listeners

Browse source
This commit is contained in:
Tobe O 2018-09-11 16:34:29 -04:00
parent 7e2afed853
commit f3481cc227
5 changed files with 211 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

249
.idea/workspace.xml
View file

@ -2,12 +2,11 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment=""> <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" /> <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterDir="false" /> <change beforePath="$PROJECT_DIR$/lib/src/core/core.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/core.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" /> <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" /> <change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
@ -30,46 +29,13 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="README.md" pinned="false" current-in-tab="false"> <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md"> <entry file="file://$PROJECT_DIR$/test/services_test.dart">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="124">
<caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181"> <state relative-caret-position="125">
<caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" /> <caret line="23" column="29" lean-forward="true" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="79" column="33" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" />
<folding> <folding>
<element signature="e#39#59#0" expanded="true" /> <element signature="e#0#46#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="29" column="28" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
<folding>
<element signature="e#47#67#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -79,14 +45,47 @@
<entry file="file://$PROJECT_DIR$/CHANGELOG.md"> <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT"> <state split_layout="SPLIT">
<first_editor relative-caret-position="32"> <first_editor relative-caret-position="64">
<caret line="2" column="95" selection-start-line="2" selection-start-column="95" selection-end-line="2" selection-end-column="95" /> <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
</first_editor> </first_editor>
<second_editor /> <second_editor />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="384">
<caret line="24" column="2" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
<folding>
<element signature="e#0#20#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1386">
<caret line="459" column="46" selection-start-line="459" selection-start-column="46" selection-end-line="459" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="core.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
@ -99,7 +98,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>sopw</find>
<find>stopw</find> <find>stopw</find>
<find>release</find> <find>release</find>
<find>handleRe</find> <find>handleRe</find>
@ -129,6 +127,7 @@
<find>/meta</find> <find>/meta</find>
<find>complet</find> <find>complet</find>
<find>parseI</find> <find>parseI</find>
<find>read(</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>FutureOr</replace> <replace>FutureOr</replace>
@ -192,10 +191,8 @@
<option value="$PROJECT_DIR$/lib/hooks.dart" /> <option value="$PROJECT_DIR$/lib/hooks.dart" />
<option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" /> <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
<option value="$PROJECT_DIR$/test/typed_service_test.dart" /> <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
<option value="$PROJECT_DIR$/test/services_test.dart" />
<option value="$PROJECT_DIR$/test/all.dart" /> <option value="$PROJECT_DIR$/test/all.dart" />
<option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" /> <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
<option value="$PROJECT_DIR$/lib/src/core/core.dart" />
<option value="$PROJECT_DIR$/test/general_test.dart" /> <option value="$PROJECT_DIR$/test/general_test.dart" />
<option value="$PROJECT_DIR$/lib/src/core/metadata.dart" /> <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
<option value="$PROJECT_DIR$/example/view.dart" /> <option value="$PROJECT_DIR$/example/view.dart" />
@ -217,9 +214,7 @@
<option value="$PROJECT_DIR$/test/server_test.dart" /> <option value="$PROJECT_DIR$/test/server_test.dart" />
<option value="$PROJECT_DIR$/test/parameter_meta_test.dart" /> <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
<option value="$PROJECT_DIR$/test/serialize_test.dart" /> <option value="$PROJECT_DIR$/test/serialize_test.dart" />
<option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
<option value="$PROJECT_DIR$/test/precontained_test.dart" /> <option value="$PROJECT_DIR$/test/precontained_test.dart" />
<option value="$PROJECT_DIR$/lib/src/core/server.dart" />
<option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" /> <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
<option value="$PROJECT_DIR$/lib/src/util.dart" /> <option value="$PROJECT_DIR$/lib/src/util.dart" />
<option value="$PROJECT_DIR$/test/routing_test.dart" /> <option value="$PROJECT_DIR$/test/routing_test.dart" />
@ -231,9 +226,13 @@
<option value="$PROJECT_DIR$/pubspec.yaml" /> <option value="$PROJECT_DIR$/pubspec.yaml" />
<option value="$PROJECT_DIR$/lib/src/core/request_context.dart" /> <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
<option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" /> <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
<option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
<option value="$PROJECT_DIR$/lib/src/core/service.dart" /> <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
<option value="$PROJECT_DIR$/lib/src/core/map_service.dart" /> <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
<option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
<option value="$PROJECT_DIR$/lib/src/core/server.dart" />
<option value="$PROJECT_DIR$/test/services_test.dart" />
<option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
<option value="$PROJECT_DIR$/lib/src/core/core.dart" />
<option value="$PROJECT_DIR$/CHANGELOG.md" /> <option value="$PROJECT_DIR$/CHANGELOG.md" />
</list> </list>
</option> </option>
@ -662,14 +661,7 @@
<workItem from="1534793956753" duration="15012000" /> <workItem from="1534793956753" duration="15012000" />
<workItem from="1534863259966" duration="198000" /> <workItem from="1534863259966" duration="198000" />
<workItem from="1534873119036" duration="4624000" /> <workItem from="1534873119036" duration="4624000" />
<workItem from="1536696642254" duration="760000" /> <workItem from="1536696642254" duration="1416000" />
</task>
<task id="LOCAL-00115" summary="Remove lib/hooks.dart">
<created>1534732365272</created>
<option name="number" value="00115" />
<option name="presentableId" value="LOCAL-00115" />
<option name="project" value="LOCAL" />
<updated>1534732365272</updated>
</task> </task>
<task id="LOCAL-00116" summary="Remove lib/common.dart"> <task id="LOCAL-00116" summary="Remove lib/common.dart">
<created>1534732527424</created> <created>1534732527424</created>
@ -1007,7 +999,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1536696871864</updated> <updated>1536696871864</updated>
</task> </task>
<option name="localTasksCounter" value="164" /> <task id="LOCAL-00164" summary="Added generic to Routable.use">
<created>1536697507787</created>
<option name="number" value="00164" />
<option name="presentableId" value="LOCAL-00164" />
<option name="project" value="LOCAL" />
<updated>1536697507787</updated>
</task>
<option name="localTasksCounter" value="165" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
@ -1043,7 +1042,7 @@
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="192801000" /> <option name="totallyTimeSpent" value="193457000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -1063,7 +1062,7 @@
<window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" /> <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
<window_info anchor="right" id="Maven Projects" order="3" /> <window_info anchor="right" id="Maven Projects" order="3" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" /> <window_info anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
<window_info anchor="right" id="Flutter Outline" order="4" /> <window_info anchor="right" id="Flutter Outline" order="4" />
<window_info id="Capture Tool" order="2" /> <window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" /> <window_info id="Designer" order="2" />
@ -1106,7 +1105,6 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<MESSAGE value="Update CHANGELOG" />
<MESSAGE value="Remove req.injections" /> <MESSAGE value="Remove req.injections" />
<MESSAGE value="Remove Angel.inject" /> <MESSAGE value="Remove Angel.inject" />
<MESSAGE value="Remove dep on package:pool" /> <MESSAGE value="Remove dep on package:pool" />
@ -1131,7 +1129,8 @@
<MESSAGE value="All tests pass" /> <MESSAGE value="All tests pass" />
<MESSAGE value="CHANGELOG + bump to 2.0.0-alpha.1" /> <MESSAGE value="CHANGELOG + bump to 2.0.0-alpha.1" />
<MESSAGE value="Add &lt;Id, Data&gt;" /> <MESSAGE value="Add &lt;Id, Data&gt;" />
<option name="LAST_COMMIT_MESSAGE" value="Add &lt;Id, Data&gt;" /> <MESSAGE value="Added generic to Routable.use" />
<option name="LAST_COMMIT_MESSAGE" value="Added generic to Routable.use" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1139,28 +1138,6 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="-663" />
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="46" lean-forward="true" selection-start-line="5" selection-start-column="46" selection-end-line="5" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/example/json.dart"> <entry file="file://$PROJECT_DIR$/example/json.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-282"> <state relative-caret-position="-282">
@ -1309,16 +1286,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="86" column="66" lean-forward="true" selection-start-line="86" selection-start-column="66" selection-end-line="86" selection-end-column="66" />
<folding>
<element signature="e#40#60#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/serialize_test.dart"> <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="134"> <state relative-caret-position="134">
@ -1389,13 +1356,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="249" column="26" selection-start-line="249" selection-start-column="26" selection-end-line="249" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pubspec.yaml"> <entry file="file://$PROJECT_DIR$/pubspec.yaml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="128">
@ -1445,16 +1405,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="124">
<caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart"> <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112"> <state relative-caret-position="112">
@ -1462,6 +1412,19 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="292" column="11" selection-start-line="292" selection-start-column="11" selection-end-line="292" selection-end-column="11" />
<folding>
<element signature="e#39#59#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart"> <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149"> <state relative-caret-position="149">
@ -1472,29 +1435,69 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart"> <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181"> <state relative-caret-position="38">
<caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" /> <caret line="328" column="3" lean-forward="true" selection-start-line="328" selection-start-column="3" selection-end-line="328" selection-end-column="3" />
<folding>
<element signature="e#38#58#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="70">
<caret line="86" column="17" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
<folding>
<element signature="e#40#60#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="124">
<caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/services_test.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="23" column="29" lean-forward="true" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
<folding>
<element signature="e#0#46#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart"> <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64"> <state relative-caret-position="384">
<caret line="4" column="22" lean-forward="true" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" /> <caret line="24" column="2" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
<folding> <folding>
<element signature="e#0#20#0" expanded="true" /> <element signature="e#0#20#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/service.dart"> <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85"> <state relative-caret-position="-1386">
<caret line="79" column="33" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" /> <caret line="459" column="46" selection-start-line="459" selection-start-column="46" selection-end-line="459" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
<folding> <folding>
<element signature="e#39#59#0" expanded="true" /> <element signature="e#0#32#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1502,8 +1505,8 @@
<entry file="file://$PROJECT_DIR$/CHANGELOG.md"> <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT"> <state split_layout="SPLIT">
<first_editor relative-caret-position="32"> <first_editor relative-caret-position="64">
<caret line="2" column="95" selection-start-line="2" selection-start-column="95" selection-end-line="2" selection-end-column="95" /> <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
</first_editor> </first_editor>
<second_editor /> <second_editor />
</state> </state>

2
CHANGELOG.md
View file

@ -1,6 +1,8 @@
# 2.0.0-alpha.3 # 2.0.0-alpha.3
* Added `<Id, Data>` type parameters to `Service`. * Added `<Id, Data>` type parameters to `Service`.
* `HookedService` now follows suit, and takes a third parameter, pointing to the inner service. * `HookedService` now follows suit, and takes a third parameter, pointing to the inner service.
* `Routable.use` now uses the generic parameters added to `Service`.
* Added generic usage to `HookedServiceListener`, etc.
# 2.0.0-alpha.2 # 2.0.0-alpha.2
* Added `ResponseContext.detach`. * Added `ResponseContext.detach`.

1
lib/src/core/core.dart
View file

@ -7,4 +7,3 @@ export 'response_context.dart';
export 'routable.dart'; export 'routable.dart';
export 'server.dart'; export 'server.dart';
export 'service.dart'; export 'service.dart';
export 'typed_service.dart';

157
lib/src/core/hooked_service.dart
View file

@ -1,11 +1,12 @@
library angel_framework.core.hooked_service; library angel_framework.core.hooked_service;
import 'dart:async'; import 'dart:async';
import '../util.dart'; import '../util.dart';
import 'metadata.dart';
import 'request_context.dart'; import 'request_context.dart';
import 'response_context.dart'; import 'response_context.dart';
import 'routable.dart'; import 'routable.dart';
import 'metadata.dart';
import 'server.dart'; import 'server.dart';
import 'service.dart'; import 'service.dart';
@ -17,30 +18,30 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
/// Tbe service that is proxied by this hooked one. /// Tbe service that is proxied by this hooked one.
final T inner; final T inner;
final HookedServiceEventDispatcher beforeIndexed = final HookedServiceEventDispatcher<Id, Data, T> beforeIndexed =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher beforeRead = final HookedServiceEventDispatcher<Id, Data, T> beforeRead =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher beforeCreated = final HookedServiceEventDispatcher<Id, Data, T> beforeCreated =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher beforeModified = final HookedServiceEventDispatcher<Id, Data, T> beforeModified =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher beforeUpdated = final HookedServiceEventDispatcher<Id, Data, T> beforeUpdated =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher beforeRemoved = final HookedServiceEventDispatcher<Id, Data, T> beforeRemoved =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher afterIndexed = final HookedServiceEventDispatcher<Id, Data, T> afterIndexed =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher afterRead = final HookedServiceEventDispatcher<Id, Data, T> afterRead =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher afterCreated = final HookedServiceEventDispatcher<Id, Data, T> afterCreated =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher afterModified = final HookedServiceEventDispatcher<Id, Data, T> afterModified =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher afterUpdated = final HookedServiceEventDispatcher<Id, Data, T> afterUpdated =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
final HookedServiceEventDispatcher afterRemoved = final HookedServiceEventDispatcher<Id, Data, T> afterRemoved =
new HookedServiceEventDispatcher(); new HookedServiceEventDispatcher<Id, Data, T>();
HookedService(this.inner) { HookedService(this.inner) {
// Clone app instance // Clone app instance
@ -90,17 +91,18 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
/// Adds hooks to this instance. /// Adds hooks to this instance.
void addHooks(Angel app) { void addHooks(Angel app) {
Hooks hooks = getAnnotation(inner, Hooks, app.container.reflector); Hooks hooks = getAnnotation(inner, Hooks, app.container.reflector);
List<HookedServiceEventListener> before = [], after = []; List<HookedServiceEventListener<Id, Data, T>> before = [], after = [];
if (hooks != null) { if (hooks != null) {
before.addAll(hooks.before); before.addAll(hooks.before);
after.addAll(hooks.after); after.addAll(hooks.after);
} }
void applyListeners(Function fn, HookedServiceEventDispatcher dispatcher, void applyListeners(
Function fn, HookedServiceEventDispatcher<Id, Data, T> dispatcher,
[bool isAfter]) { [bool isAfter]) {
Hooks hooks = getAnnotation(fn, Hooks, app.container.reflector); Hooks hooks = getAnnotation(fn, Hooks, app.container.reflector);
final listeners = <HookedServiceEventListener>[] final listeners = <HookedServiceEventListener<Id, Data, T>>[]
..addAll(isAfter == true ? after : before); ..addAll(isAfter == true ? after : before);
if (hooks != null) if (hooks != null)
@ -137,8 +139,8 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
} }
/// Runs the [listener] before every service method specified. /// Runs the [listener] before every service method specified.
void before( void before(Iterable<String> eventNames,
Iterable<String> eventNames, HookedServiceEventListener listener) { HookedServiceEventListener<Id, Data, T> listener) {
eventNames.map((name) { eventNames.map((name) {
switch (name) { switch (name) {
case HookedServiceEvent.indexed: case HookedServiceEvent.indexed:
@ -156,12 +158,13 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
default: default:
throw new ArgumentError('Invalid service method: ${name}'); throw new ArgumentError('Invalid service method: ${name}');
} }
}).forEach((HookedServiceEventDispatcher dispatcher) => }).forEach((HookedServiceEventDispatcher<Id, Data, T> dispatcher) =>
dispatcher.listen(listener)); dispatcher.listen(listener));
} }
/// Runs the [listener] after every service method specified. /// Runs the [listener] after every service method specified.
void after(Iterable<String> eventNames, HookedServiceEventListener listener) { void after(Iterable<String> eventNames,
HookedServiceEventListener<Id, Data, T> listener) {
eventNames.map((name) { eventNames.map((name) {
switch (name) { switch (name) {
case HookedServiceEvent.indexed: case HookedServiceEvent.indexed:
@ -179,12 +182,12 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
default: default:
throw new ArgumentError('Invalid service method: ${name}'); throw new ArgumentError('Invalid service method: ${name}');
} }
}).forEach((HookedServiceEventDispatcher dispatcher) => }).forEach((HookedServiceEventDispatcher<Id, Data, T> dispatcher) =>
dispatcher.listen(listener)); dispatcher.listen(listener));
} }
/// Runs the [listener] before every service method. /// Runs the [listener] before every service method.
void beforeAll(HookedServiceEventListener listener) { void beforeAll(HookedServiceEventListener<Id, Data, T> listener) {
beforeIndexed.listen(listener); beforeIndexed.listen(listener);
beforeRead.listen(listener); beforeRead.listen(listener);
beforeCreated.listen(listener); beforeCreated.listen(listener);
@ -194,7 +197,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
} }
/// Runs the [listener] after every service method. /// Runs the [listener] after every service method.
void afterAll(HookedServiceEventListener listener) { void afterAll(HookedServiceEventListener<Id, Data, T> listener) {
afterIndexed.listen(listener); afterIndexed.listen(listener);
afterRead.listen(listener); afterRead.listen(listener);
afterCreated.listen(listener); afterCreated.listen(listener);
@ -208,8 +211,8 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
/// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
/// that events coming out of this [Stream] will see changes you make within the [Stream] /// that events coming out of this [Stream] will see changes you make within the [Stream]
/// callback. /// callback.
Stream<HookedServiceEvent> beforeAllStream() { Stream<HookedServiceEvent<Id, Data, T>> beforeAllStream() {
var ctrl = new StreamController<HookedServiceEvent>(); var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
_ctrl.add(ctrl); _ctrl.add(ctrl);
before(HookedServiceEvent.all, ctrl.add); before(HookedServiceEvent.all, ctrl.add);
return ctrl.stream; return ctrl.stream;
@ -220,8 +223,8 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
/// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
/// that events coming out of this [Stream] will see changes you make within the [Stream] /// that events coming out of this [Stream] will see changes you make within the [Stream]
/// callback. /// callback.
Stream<HookedServiceEvent> afterAllStream() { Stream<HookedServiceEvent<Id, Data, T>> afterAllStream() {
var ctrl = new StreamController<HookedServiceEvent>(); var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
_ctrl.add(ctrl); _ctrl.add(ctrl);
before(HookedServiceEvent.all, ctrl.add); before(HookedServiceEvent.all, ctrl.add);
return ctrl.stream; return ctrl.stream;
@ -232,8 +235,9 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
/// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
/// that events coming out of this [Stream] will see changes you make within the [Stream] /// that events coming out of this [Stream] will see changes you make within the [Stream]
/// callback. /// callback.
Stream<HookedServiceEvent> beforeStream(Iterable<String> eventNames) { Stream<HookedServiceEvent<Id, Data, T>> beforeStream(
var ctrl = new StreamController<HookedServiceEvent>(); Iterable<String> eventNames) {
var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
_ctrl.add(ctrl); _ctrl.add(ctrl);
before(eventNames, ctrl.add); before(eventNames, ctrl.add);
return ctrl.stream; return ctrl.stream;
@ -244,15 +248,16 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
/// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
/// that events coming out of this [Stream] will see changes you make within the [Stream] /// that events coming out of this [Stream] will see changes you make within the [Stream]
/// callback. /// callback.
Stream<HookedServiceEvent> afterStream(Iterable<String> eventNames) { Stream<HookedServiceEvent<Id, Data, T>> afterStream(
var ctrl = new StreamController<HookedServiceEvent>(); Iterable<String> eventNames) {
var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
_ctrl.add(ctrl); _ctrl.add(ctrl);
after(eventNames, ctrl.add); after(eventNames, ctrl.add);
return ctrl.stream; return ctrl.stream;
} }
/// Runs the [listener] before [create], [modify] and [update]. /// Runs the [listener] before [create], [modify] and [update].
void beforeModify(HookedServiceEventListener listener) { void beforeModify(HookedServiceEventListener<Id, Data, T> listener) {
beforeCreated.listen(listener); beforeCreated.listen(listener);
beforeModified.listen(listener); beforeModified.listen(listener);
beforeUpdated.listen(listener); beforeUpdated.listen(listener);
@ -285,7 +290,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
} }
@override @override
Future read(id, [Map<String, dynamic> _params]) { Future read(Id id, [Map<String, dynamic> _params]) {
var params = _stripReq(_params); var params = _stripReq(_params);
return beforeRead return beforeRead
._emit(new HookedServiceEvent(false, _getRequest(_params), ._emit(new HookedServiceEvent(false, _getRequest(_params),
@ -311,7 +316,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
} }
@override @override
Future create(data, [Map<String, dynamic> _params]) { Future create(Data data, [Map<String, dynamic> _params]) {
var params = _stripReq(_params); var params = _stripReq(_params);
return beforeCreated return beforeCreated
._emit(new HookedServiceEvent(false, _getRequest(_params), ._emit(new HookedServiceEvent(false, _getRequest(_params),
@ -337,7 +342,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
} }
@override @override
Future modify(id, data, [Map<String, dynamic> _params]) { Future modify(Id id, Data data, [Map<String, dynamic> _params]) {
var params = _stripReq(_params); var params = _stripReq(_params);
return beforeModified return beforeModified
._emit(new HookedServiceEvent(false, _getRequest(_params), ._emit(new HookedServiceEvent(false, _getRequest(_params),
@ -363,7 +368,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
} }
@override @override
Future update(id, data, [Map<String, dynamic> _params]) { Future update(Id id, Data data, [Map<String, dynamic> _params]) {
var params = _stripReq(_params); var params = _stripReq(_params);
return beforeUpdated return beforeUpdated
._emit(new HookedServiceEvent(false, _getRequest(_params), ._emit(new HookedServiceEvent(false, _getRequest(_params),
@ -389,7 +394,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
} }
@override @override
Future remove(id, [Map<String, dynamic> _params]) { Future remove(Id id, [Map<String, dynamic> _params]) {
var params = _stripReq(_params); var params = _stripReq(_params);
return beforeRemoved return beforeRemoved
._emit(new HookedServiceEvent(false, _getRequest(_params), ._emit(new HookedServiceEvent(false, _getRequest(_params),
@ -416,9 +421,9 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
/// Fires an `after` event. This will not be propagated to clients, /// Fires an `after` event. This will not be propagated to clients,
/// but will be broadcasted to WebSockets, etc. /// but will be broadcasted to WebSockets, etc.
Future<HookedServiceEvent> fire(String eventName, result, Future<HookedServiceEvent<Id, Data, T>> fire(String eventName, result,
[HookedServiceEventListener callback]) { [HookedServiceEventListener<Id, Data, T> callback]) {
HookedServiceEventDispatcher dispatcher; HookedServiceEventDispatcher<Id, Data, T> dispatcher;
switch (eventName) { switch (eventName) {
case HookedServiceEvent.indexed: case HookedServiceEvent.indexed:
@ -443,14 +448,16 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
throw new ArgumentError("Invalid service event name: '$eventName'"); throw new ArgumentError("Invalid service event name: '$eventName'");
} }
var ev = new HookedServiceEvent(true, null, null, this, eventName); var ev =
new HookedServiceEvent<Id, Data, T>(true, null, null, inner, eventName);
return fireEvent(dispatcher, ev, callback); return fireEvent(dispatcher, ev, callback);
} }
/// Sends an arbitrary event down the hook chain. /// Sends an arbitrary event down the hook chain.
Future<HookedServiceEvent> fireEvent( Future<HookedServiceEvent<Id, Data, T>> fireEvent(
HookedServiceEventDispatcher dispatcher, HookedServiceEvent event, HookedServiceEventDispatcher<Id, Data, T> dispatcher,
[HookedServiceEventListener callback]) { HookedServiceEvent<Id, Data, T> event,
[HookedServiceEventListener<Id, Data, T> callback]) {
Future f; Future f;
if (callback != null && event?._canceled != true) if (callback != null && event?._canceled != true)
f = new Future.sync(() => callback(event)); f = new Future.sync(() => callback(event));
@ -460,7 +467,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
} }
/// Fired when a hooked service is invoked. /// Fired when a hooked service is invoked.
class HookedServiceEvent { class HookedServiceEvent<Id, Data, T extends Service<Id, Data>> {
static const String indexed = 'indexed'; static const String indexed = 'indexed';
static const String read = 'read'; static const String read = 'read';
static const String created = 'created'; static const String created = 'created';
@ -490,17 +497,17 @@ class HookedServiceEvent {
bool _canceled = false; bool _canceled = false;
String _eventName; String _eventName;
var _id; Id _id;
bool _isAfter; bool _isAfter;
var data; Data data;
Map _params; Map<String, dynamic> _params;
RequestContext _request; RequestContext _request;
ResponseContext _response; ResponseContext _response;
var result; var result;
String get eventName => _eventName; String get eventName => _eventName;
get id => _id; Id get id => _id;
bool get isAfter => _isAfter == true; bool get isAfter => _isAfter == true;
@ -513,23 +520,24 @@ class HookedServiceEvent {
ResponseContext get response => _response; ResponseContext get response => _response;
/// The inner service whose method was hooked. /// The inner service whose method was hooked.
Service service; T service;
HookedServiceEvent(this._isAfter, this._request, this._response, HookedServiceEvent(this._isAfter, this._request, this._response, this.service,
Service this.service, String this._eventName, String this._eventName,
{id, this.data, Map params, this.result}) { {Id id, this.data, Map<String, dynamic> params, this.result}) {
_id = id; _id = id;
_params = params ?? {}; _params = params ?? {};
} }
} }
/// Triggered on a hooked service event. /// Triggered on a hooked service event.
typedef HookedServiceEventListener(HookedServiceEvent event); typedef FutureOr HookedServiceEventListener<Id, Data,
T extends Service<Id, Data>>(HookedServiceEvent<Id, Data, T> event);
/// Can be listened to, but events may be canceled. /// Can be listened to, but events may be canceled.
class HookedServiceEventDispatcher { class HookedServiceEventDispatcher<Id, Data, T extends Service<Id, Data>> {
final List<StreamController<HookedServiceEvent>> _ctrl = []; final List<StreamController<HookedServiceEvent<Id, Data, T>>> _ctrl = [];
final List<HookedServiceEventListener> listeners = []; final List<HookedServiceEventListener<Id, Data, T>> listeners = [];
void _close() { void _close() {
_ctrl.forEach((c) => c.close()); _ctrl.forEach((c) => c.close());
@ -537,11 +545,12 @@ class HookedServiceEventDispatcher {
} }
/// Fires an event, and returns it once it is either canceled, or all listeners have run. /// Fires an event, and returns it once it is either canceled, or all listeners have run.
Future<HookedServiceEvent> _emit(HookedServiceEvent event) { Future<HookedServiceEvent<Id, Data, T>> _emit(
HookedServiceEvent<Id, Data, T> event) {
if (event?._canceled == true || event == null || listeners.isEmpty) if (event?._canceled == true || event == null || listeners.isEmpty)
return new Future.value(event); return new Future.value(event);
var f = new Future<HookedServiceEvent>.value(event); var f = new Future<HookedServiceEvent<Id, Data, T>>.value(event);
for (var listener in listeners) { for (var listener in listeners) {
f = f.then((event) { f = f.then((event) {
@ -557,16 +566,16 @@ class HookedServiceEventDispatcher {
/// ///
/// *NOTE*: Callbacks on the returned [Stream] cannot be guaranteed to run before other [listeners]. /// *NOTE*: Callbacks on the returned [Stream] cannot be guaranteed to run before other [listeners].
/// Use this only if you need a read-only stream of events. /// Use this only if you need a read-only stream of events.
Stream<HookedServiceEvent> asStream() { Stream<HookedServiceEvent<Id, Data, T>> asStream() {
// TODO: Close StreamController // TODO: Close StreamController
var ctrl = new StreamController<HookedServiceEvent>(); var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
_ctrl.add(ctrl); _ctrl.add(ctrl);
listen(ctrl.add); listen(ctrl.add);
return ctrl.stream; return ctrl.stream;
} }
/// Registers the listener to be called whenever an event is triggered. /// Registers the listener to be called whenever an event is triggered.
void listen(HookedServiceEventListener listener) { void listen(HookedServiceEventListener<Id, Data, T> listener) {
listeners.add(listener); listeners.add(listener);
} }
} }

1
lib/src/core/typed_service.dart
View file

@ -1 +0,0 @@