@web-atoms/core 2.6.10 → 2.6.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/AtomLoader.js +1 -14
- package/dist/core/AtomLoader.js.map +1 -1
- package/dist/core/types.d.ts +0 -1
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js +1 -2
- package/dist/core/types.js.map +1 -1
- package/dist/di/Register.d.ts.map +1 -1
- package/dist/di/Register.js +4 -10
- package/dist/di/Register.js.map +1 -1
- package/dist/di/ServiceProvider.d.ts.map +1 -1
- package/dist/di/ServiceProvider.js +2 -12
- package/dist/di/ServiceProvider.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist-esm/App.js +8 -18
- package/dist-esm/App.js.map +1 -1
- package/dist-esm/Atom.js +1 -1
- package/dist-esm/Atom.js.map +1 -1
- package/dist-esm/MockApp.js +0 -1
- package/dist-esm/MockApp.js.map +1 -1
- package/dist-esm/core/AtomComponent.js +8 -27
- package/dist-esm/core/AtomComponent.js.map +1 -1
- package/dist-esm/core/AtomDispatcher.js +4 -3
- package/dist-esm/core/AtomDispatcher.js.map +1 -1
- package/dist-esm/core/AtomDisposableList.js +3 -1
- package/dist-esm/core/AtomDisposableList.js.map +1 -1
- package/dist-esm/core/AtomEnumerator.js +1 -2
- package/dist-esm/core/AtomEnumerator.js.map +1 -1
- package/dist-esm/core/AtomList.js +3 -5
- package/dist-esm/core/AtomList.js.map +1 -1
- package/dist-esm/core/AtomLoader.js +6 -16
- package/dist-esm/core/AtomLoader.js.map +1 -1
- package/dist-esm/core/AtomOnce.js +0 -1
- package/dist-esm/core/AtomOnce.js.map +1 -1
- package/dist-esm/core/AtomSelectableList.js +2 -8
- package/dist-esm/core/AtomSelectableList.js.map +1 -1
- package/dist-esm/core/AtomUri.js +0 -6
- package/dist-esm/core/AtomUri.js.map +1 -1
- package/dist-esm/core/AtomWatcher.js +1 -11
- package/dist-esm/core/AtomWatcher.js.map +1 -1
- package/dist-esm/core/Bind.js +0 -7
- package/dist-esm/core/Bind.js.map +1 -1
- package/dist-esm/core/CancelTokenFactory.js +4 -1
- package/dist-esm/core/CancelTokenFactory.js.map +1 -1
- package/dist-esm/core/Colors.js +151 -156
- package/dist-esm/core/Colors.js.map +1 -1
- package/dist-esm/core/Command.js +14 -23
- package/dist-esm/core/Command.js.map +1 -1
- package/dist-esm/core/EventScope.js +0 -2
- package/dist-esm/core/EventScope.js.map +1 -1
- package/dist-esm/core/FormattedError.js +0 -4
- package/dist-esm/core/FormattedError.js.map +1 -1
- package/dist-esm/core/FormattedString.js +0 -1
- package/dist-esm/core/FormattedString.js.map +1 -1
- package/dist-esm/core/InheritedProperty.js +1 -1
- package/dist-esm/core/InheritedProperty.js.map +1 -1
- package/dist-esm/core/PropertyMap.js +1 -3
- package/dist-esm/core/PropertyMap.js.map +1 -1
- package/dist-esm/core/Route.js +7 -16
- package/dist-esm/core/Route.js.map +1 -1
- package/dist-esm/core/SingleInvoker.js +5 -2
- package/dist-esm/core/SingleInvoker.js.map +1 -1
- package/dist-esm/core/WebImage.js +0 -1
- package/dist-esm/core/WebImage.js.map +1 -1
- package/dist-esm/core/XNode.js +12 -17
- package/dist-esm/core/XNode.js.map +1 -1
- package/dist-esm/core/types.d.ts +0 -1
- package/dist-esm/core/types.d.ts.map +1 -1
- package/dist-esm/core/types.js +5 -6
- package/dist-esm/core/types.js.map +1 -1
- package/dist-esm/di/Inject.js +2 -2
- package/dist-esm/di/Inject.js.map +1 -1
- package/dist-esm/di/Register.d.ts.map +1 -1
- package/dist-esm/di/Register.js +1 -8
- package/dist-esm/di/Register.js.map +1 -1
- package/dist-esm/di/ServiceCollection.js +5 -7
- package/dist-esm/di/ServiceCollection.js.map +1 -1
- package/dist-esm/di/ServiceProvider.d.ts.map +1 -1
- package/dist-esm/di/ServiceProvider.js +2 -12
- package/dist-esm/di/ServiceProvider.js.map +1 -1
- package/dist-esm/di/TypeKey.js +1 -1
- package/dist-esm/di/TypeKey.js.map +1 -1
- package/dist-esm/services/CacheService.js +1 -2
- package/dist-esm/services/CacheService.js.map +1 -1
- package/dist-esm/services/FetchBuilder.js +0 -3
- package/dist-esm/services/FetchBuilder.js.map +1 -1
- package/dist-esm/services/JsonService.js +29 -27
- package/dist-esm/services/JsonService.js.map +1 -1
- package/dist-esm/services/MockNavigationService.js +3 -5
- package/dist-esm/services/MockNavigationService.js.map +1 -1
- package/dist-esm/services/NavigationService.js +2 -4
- package/dist-esm/services/NavigationService.js.map +1 -1
- package/dist-esm/services/ReferenceService.js +4 -6
- package/dist-esm/services/ReferenceService.js.map +1 -1
- package/dist-esm/services/http/AjaxOptions.js +0 -13
- package/dist-esm/services/http/AjaxOptions.js.map +1 -1
- package/dist-esm/services/http/JsonError.js +0 -1
- package/dist-esm/services/http/JsonError.js.map +1 -1
- package/dist-esm/services/http/RestService.js +9 -16
- package/dist-esm/services/http/RestService.js.map +1 -1
- package/dist-esm/style/StyleRule.js +37 -24
- package/dist-esm/style/StyleRule.js.map +1 -1
- package/dist-esm/style/styled.js +2 -6
- package/dist-esm/style/styled.js.map +1 -1
- package/dist-esm/tsconfig.esm.tsbuildinfo +1 -1
- package/dist-esm/unit/AtomTest.js +0 -1
- package/dist-esm/unit/AtomTest.js.map +1 -1
- package/dist-esm/view-model/Action.js +44 -45
- package/dist-esm/view-model/Action.js.map +1 -1
- package/dist-esm/view-model/AtomViewModel.js +4 -8
- package/dist-esm/view-model/AtomViewModel.js.map +1 -1
- package/dist-esm/view-model/AtomWindowViewModel.js +0 -3
- package/dist-esm/view-model/AtomWindowViewModel.js.map +1 -1
- package/dist-esm/view-model/Load.js +1 -1
- package/dist-esm/view-model/Load.js.map +1 -1
- package/dist-esm/web/WebApp.js +2 -6
- package/dist-esm/web/WebApp.js.map +1 -1
- package/dist-esm/web/controls/AtomAlertWindow.js +0 -3
- package/dist-esm/web/controls/AtomAlertWindow.js.map +1 -1
- package/dist-esm/web/controls/AtomComboBox.js +0 -1
- package/dist-esm/web/controls/AtomComboBox.js.map +1 -1
- package/dist-esm/web/controls/AtomContentControl.js +0 -1
- package/dist-esm/web/controls/AtomContentControl.js.map +1 -1
- package/dist-esm/web/controls/AtomControl.js +1 -6
- package/dist-esm/web/controls/AtomControl.js.map +1 -1
- package/dist-esm/web/controls/AtomFrame.js +0 -10
- package/dist-esm/web/controls/AtomFrame.js.map +1 -1
- package/dist-esm/web/controls/AtomGridSplitter.js +4 -2
- package/dist-esm/web/controls/AtomGridSplitter.js.map +1 -1
- package/dist-esm/web/controls/AtomGridView.js +7 -9
- package/dist-esm/web/controls/AtomGridView.js.map +1 -1
- package/dist-esm/web/controls/AtomItemsControl.js +12 -40
- package/dist-esm/web/controls/AtomItemsControl.js.map +1 -1
- package/dist-esm/web/controls/AtomListBox.js +0 -1
- package/dist-esm/web/controls/AtomListBox.js.map +1 -1
- package/dist-esm/web/controls/AtomNotification.js +5 -2
- package/dist-esm/web/controls/AtomNotification.js.map +1 -1
- package/dist-esm/web/controls/AtomPage.js +0 -2
- package/dist-esm/web/controls/AtomPage.js.map +1 -1
- package/dist-esm/web/controls/AtomPageLink.js +1 -11
- package/dist-esm/web/controls/AtomPageLink.js.map +1 -1
- package/dist-esm/web/controls/AtomTabbedPage.js +4 -17
- package/dist-esm/web/controls/AtomTabbedPage.js.map +1 -1
- package/dist-esm/web/controls/AtomTemplate.js +0 -1
- package/dist-esm/web/controls/AtomTemplate.js.map +1 -1
- package/dist-esm/web/controls/AtomTemplateControl.js +0 -2
- package/dist-esm/web/controls/AtomTemplateControl.js.map +1 -1
- package/dist-esm/web/controls/AtomViewStack.js +0 -3
- package/dist-esm/web/controls/AtomViewStack.js.map +1 -1
- package/dist-esm/web/controls/AtomWindow.js +15 -16
- package/dist-esm/web/controls/AtomWindow.js.map +1 -1
- package/dist-esm/web/core/AtomUI.js +1 -3
- package/dist-esm/web/core/AtomUI.js.map +1 -1
- package/dist-esm/web/core/HtmlNode.js +3 -2
- package/dist-esm/web/core/HtmlNode.js.map +1 -1
- package/dist-esm/web/samples/demo/views/MovieListViewModel.js +8 -10
- package/dist-esm/web/samples/demo/views/MovieListViewModel.js.map +1 -1
- package/dist-esm/web/samples/tabs/views/Page1.js +0 -3
- package/dist-esm/web/samples/tabs/views/Page1.js.map +1 -1
- package/dist-esm/web/samples/tabs/views/TabHost.js +0 -1
- package/dist-esm/web/samples/tabs/views/TabHost.js.map +1 -1
- package/dist-esm/web/services/MarkdownService.js +2 -3
- package/dist-esm/web/services/MarkdownService.js.map +1 -1
- package/dist-esm/web/services/PopupService.js +9 -9
- package/dist-esm/web/services/PopupService.js.map +1 -1
- package/dist-esm/web/services/PopupWindow.js +11 -25
- package/dist-esm/web/services/PopupWindow.js.map +1 -1
- package/dist-esm/web/services/WebBusyIndicatorService.js +5 -4
- package/dist-esm/web/services/WebBusyIndicatorService.js.map +1 -1
- package/dist-esm/web/services/WindowService.js +4 -6
- package/dist-esm/web/services/WindowService.js.map +1 -1
- package/dist-esm/web/styles/AtomListBoxStyle.js +0 -1
- package/dist-esm/web/styles/AtomListBoxStyle.js.map +1 -1
- package/dist-esm/web/styles/AtomStyle.js +1 -3
- package/dist-esm/web/styles/AtomStyle.js.map +1 -1
- package/dist-esm/web/styles/AtomStyleSheet.js +3 -6
- package/dist-esm/web/styles/AtomStyleSheet.js.map +1 -1
- package/dist-esm/web/styles/AtomTabbedPageStyle.js +0 -1
- package/dist-esm/web/styles/AtomTabbedPageStyle.js.map +1 -1
- package/dist-esm/web/styles/AtomTheme.js +7 -8
- package/dist-esm/web/styles/AtomTheme.js.map +1 -1
- package/dist-esm/web/styles/AtomToggleButtonBarStyle.js +4 -1
- package/dist-esm/web/styles/AtomToggleButtonBarStyle.js.map +1 -1
- package/dist-esm/web/styles/StyleBuilder.js +0 -1
- package/dist-esm/web/styles/StyleBuilder.js.map +1 -1
- package/package.json +1 -1
- package/src/core/AtomLoader.ts +13 -13
- package/src/core/types.ts +1 -1
- package/src/di/Register.ts +1 -6
- package/src/di/ServiceProvider.ts +9 -9
- package/tsconfig.esm.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AtomToggleButtonBarStyle.js","sourceRoot":"","sources":["../../../src/web/styles/AtomToggleButtonBarStyle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAKzD,MAAM,OAAO,wBAAyB,SAAQ,gBAAgB;
|
|
1
|
+
{"version":3,"file":"AtomToggleButtonBarStyle.js","sourceRoot":"","sources":["../../../src/web/styles/AtomToggleButtonBarStyle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAKzD,MAAM,OAAO,wBAAyB,SAAQ,gBAAgB;IAA9D;;QAEW,gBAAW,GAAW,MAAM,CAAC;IAmExC,CAAC;IAjEG,IAAW,IAAI;QACX,OAAO;YAEH,GAAI,IAAI,CAAC,eAAe,CAAC,wBAAwB,EAAG,MAAM,CAAC;YAC3D,OAAO,EAAE,cAAc;YACvB,kBAAkB,EAAE,CAAC;YACrB,MAAM,EAAE,CAAC;SACZ,CAAC;IACN,CAAC;IAED,IAAW,IAAI;QACX,OAAO;YAEH,GAAI,IAAI,CAAC,eAAe,CAAC,wBAAwB,EAAG,MAAM,CAAC;YAC3D,YAAY,EAAE,CAAC;YACf,OAAO,EAAE,cAAc;YACvB,MAAM,EAAE,WAAW;YACnB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,IAAI,CAAC,WAAW;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE;gBACR,cAAc,EAAE;oBACZ,mBAAmB,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI;oBAC9D,sBAAsB,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI;oBACjE,oBAAoB,EAAE,CAAC;oBACvB,uBAAuB,EAAE,CAAC;oBAC1B,UAAU,EAAE,WAAW;iBAC1B;gBACD,aAAa,EAAE;oBACX,mBAAmB,EAAE,CAAC;oBACtB,sBAAsB,EAAE,CAAC;oBACzB,oBAAoB,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI;oBAC/D,uBAAuB,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI;iBACrE;aACJ;SACJ,CAAC;IACN,CAAC;IAED,IAAW,YAAY;QACnB,OAAO;YACH,GAAI,IAAI,CAAC,eAAe,CAAC,wBAAwB,EAAE,cAAc,CAAC;YAClE,YAAY,EAAE,CAAC;YACf,OAAO,EAAE,cAAc;YACvB,MAAM,EAAE,WAAW;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE;gBACR,cAAc,EAAE;oBACZ,mBAAmB,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI;oBAC9D,sBAAsB,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI;oBACjE,oBAAoB,EAAE,CAAC;oBACvB,uBAAuB,EAAE,CAAC;iBAC7B;gBACD,aAAa,EAAE;oBACX,mBAAmB,EAAE,CAAC;oBACtB,sBAAsB,EAAE,CAAC;oBACzB,oBAAoB,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI;oBAC/D,uBAAuB,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI;iBACrE;aACJ;SACJ,CAAC;IACN,CAAC;CAEJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StyleBuilder.js","sourceRoot":"","sources":["../../../src/web/styles/StyleBuilder.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,iBAAiB,CAAC,CAAY,EAAE,OAAe,IAAI;IAC/D,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC;QAED,OAAO,CAAC,GAAG,IAAI,CAAC;IACpB,CAAC;IACD,OAAO,CAAC,CAAC;AAEb,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;
|
|
1
|
+
{"version":3,"file":"StyleBuilder.js","sourceRoot":"","sources":["../../../src/web/styles/StyleBuilder.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,iBAAiB,CAAC,CAAY,EAAE,OAAe,IAAI;IAC/D,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC;QAED,OAAO,CAAC,GAAG,IAAI,CAAC;IACpB,CAAC;IACD,OAAO,CAAC,CAAC;AAEb,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAEtB,MAAM,KAAK,QAAQ;QACtB,OAAO,IAAI,YAAY,EAAE,CAAC;IAC9B,CAAC;IAED,YAA4B,KAAyB;QAAzB,UAAK,GAAL,KAAK,CAAoB;QACjD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;IAClC,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAEM,IAAI,CACP,KAAgB,EAChB,MAAiB;QAEjB,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC,KAAK,CAAC;YACd,KAAK;YACL,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IAEM,WAAW,CAAC,MAAiB;QAChC,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC,KAAK,CAAC;YACd,YAAY,EAAE,MAAM;YACpB,OAAO,EAAE,MAAM;SAClB,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CACT,WAAsB,EACtB,WAAkB,EAClB,cAA+B,OAAO;QAClC,WAAW,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC,KAAK,CAAC;YACd,WAAW;YACX,WAAW;YACX,WAAW;SACd,CAAC,CAAC;IACP,CAAC;IAEE,MAAM,CAAC,KAAgB,EAAE,MAAiB;QAC7C,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC,KAAK,CAAC;YACd,QAAQ,EAAE,UAAU;YACpB,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,CAAC;YACR,GAAG,EAAE,CAAC;YACN,MAAM,EAAE,CAAC;YACT,KAAK;YACL,MAAM;YACN,MAAM,EAAE,MAAM;SACjB,CAAC,CAAC;IACP,CAAC;IAEM,QAAQ,CACX,IAAe,EACf,GAAc,EACd,KAAiB,EACjB,MAAkB;QAClB,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC/B,GAAG,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,KAAK,CAAE;gBACf,QAAQ,EAAE,UAAU;gBACpB,IAAI;gBACJ,GAAG;gBACH,KAAK;gBACL,MAAM;aACT,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;YACd,QAAQ,EAAE,UAAU;YACpB,IAAI;YACJ,GAAG;SACN,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,KAAwB;QAClC,OAAO,IAAI,YAAY,CAAC;YACpB,GAAI,IAAI,CAAC,KAAK;YACd,GAAI,KAAK;SACZ,CAAC,CAAC;IACP,CAAC;CAEJ"}
|
package/package.json
CHANGED
package/src/core/AtomLoader.ts
CHANGED
|
@@ -7,7 +7,7 @@ import type { AtomDisposableList } from "./AtomDisposableList.js";
|
|
|
7
7
|
import { AtomUri } from "./AtomUri.js";
|
|
8
8
|
import { displayRouteSymbol } from "./Command.js";
|
|
9
9
|
import { getOwnInheritedProperty } from "./InheritedProperty.js";
|
|
10
|
-
import { CancelToken,
|
|
10
|
+
import { CancelToken, IClassOf, IDisposable } from "./types.js";
|
|
11
11
|
|
|
12
12
|
export class AtomLoader {
|
|
13
13
|
|
|
@@ -15,13 +15,13 @@ export class AtomLoader {
|
|
|
15
15
|
|
|
16
16
|
public static async load<T>(url: string | AtomUri | any, app: App): Promise<T> {
|
|
17
17
|
|
|
18
|
-
if (typeof url === "string") {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
18
|
+
// if (typeof url === "string") {
|
|
19
|
+
// const type = await DI.resolveViewClassAsync(url);
|
|
20
|
+
// if (!type) {
|
|
21
|
+
// throw new Error(`Type not found for ${url}`);
|
|
22
|
+
// }
|
|
23
|
+
// url = type;
|
|
24
|
+
// }
|
|
25
25
|
|
|
26
26
|
if (url instanceof AtomUri) {
|
|
27
27
|
if (url.host === "reference") {
|
|
@@ -40,11 +40,11 @@ export class AtomLoader {
|
|
|
40
40
|
}
|
|
41
41
|
url = url.path;
|
|
42
42
|
|
|
43
|
-
const type = await DI.resolveViewClassAsync(url);
|
|
44
|
-
if (!type) {
|
|
45
|
-
|
|
46
|
-
}
|
|
47
|
-
url = type;
|
|
43
|
+
// const type = await DI.resolveViewClassAsync(url);
|
|
44
|
+
// if (!type) {
|
|
45
|
+
// throw new Error(`Type not found for ${url}`);
|
|
46
|
+
// }
|
|
47
|
+
// url = type;
|
|
48
48
|
|
|
49
49
|
}
|
|
50
50
|
const obj = app.resolve(url, true);
|
package/src/core/types.ts
CHANGED
|
@@ -250,5 +250,5 @@ declare var global: any;
|
|
|
250
250
|
|
|
251
251
|
const globalNS = (typeof window !== "undefined" ? window : (global as any)) as any;
|
|
252
252
|
|
|
253
|
-
export const DI = (globalNS).UMD as IUMDClass;
|
|
253
|
+
// export const DI = (globalNS).UMD as IUMDClass;
|
|
254
254
|
export const UMD = (globalNS).UMD as IUMDClass;
|
package/src/di/Register.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { DI } from "../core/types.js";
|
|
2
1
|
import { IMockOrInject } from "./IMockOrInject.js";
|
|
3
2
|
import { Scope, ServiceCollection } from "./ServiceCollection.js";
|
|
4
3
|
|
|
@@ -40,11 +39,7 @@ export function Register(id: string | IServiceDef, scope?: Scope): ((t: any) =>
|
|
|
40
39
|
id.scope || Scope.Transient, id.id);
|
|
41
40
|
|
|
42
41
|
if (id.mockOrInject) {
|
|
43
|
-
if (id.mockOrInject.
|
|
44
|
-
DI.inject(target, id.mockOrInject.inject);
|
|
45
|
-
} else if (id.mockOrInject.mock) {
|
|
46
|
-
DI.mockType(target, id.mockOrInject.mock);
|
|
47
|
-
} else if (id.mockOrInject.globalVar) {
|
|
42
|
+
if (id.mockOrInject.globalVar) {
|
|
48
43
|
ServiceCollection.instance.register(
|
|
49
44
|
id.for || target, (sp) => evalGlobal(id.mockOrInject.globalVar),
|
|
50
45
|
id.scope || Scope.Global, id.id);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import TransientDisposable from "../core/TransientDisposable.js";
|
|
2
|
-
import {
|
|
2
|
+
import { IAnyInstanceType, IClassOf, IDisposable } from "../core/types.js";
|
|
3
3
|
import { InjectedTypes } from "./Inject.js";
|
|
4
4
|
import { Scope, ServiceCollection, ServiceDescription } from "./ServiceCollection.js";
|
|
5
5
|
import { TypeKey } from "./TypeKey.js";
|
|
@@ -98,15 +98,15 @@ export class ServiceProvider implements IDisposable {
|
|
|
98
98
|
const originalKey = key;
|
|
99
99
|
const originalTypeKey = TypeKey.get(originalKey);
|
|
100
100
|
|
|
101
|
-
if (DI.resolveType) {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
101
|
+
// if (DI.resolveType) {
|
|
102
|
+
// let mappedType = ServiceProvider.mappedTypes.get(originalTypeKey);
|
|
103
|
+
// if (mappedType === void 0) {
|
|
104
|
+
// mappedType = DI.resolveType(originalKey);
|
|
105
|
+
// ServiceProvider.mappedTypes.set(originalKey, mappedType);
|
|
106
|
+
// }
|
|
107
107
|
|
|
108
|
-
|
|
109
|
-
}
|
|
108
|
+
// key = mappedType;
|
|
109
|
+
// }
|
|
110
110
|
const typeKey1 = TypeKey.get(key);
|
|
111
111
|
|
|
112
112
|
const plist = InjectedTypes.getParamList(key, typeKey1);
|