From 994356d03db83d386c1f41c7d7d68cb287d2185c Mon Sep 17 00:00:00 2001 From: Tetsuya Mori Date: Fri, 24 Aug 2018 21:37:17 +0900 Subject: [PATCH 1/8] :tada: Add interfaces for v3 * Move original scripts into `v2/` directory --- Assets/v2.meta | 8 + Assets/{ => v2}/Scripts.meta | 0 Assets/{ => v2}/Scripts/Data.meta | 0 Assets/{ => v2}/Scripts/Data/DataStore.meta | 0 .../Scripts/Data/DataStore/DataStore.cs | 0 .../Scripts/Data/DataStore/DataStore.cs.meta | 0 Assets/{ => v2}/Scripts/Data/Entity.meta | 0 Assets/{ => v2}/Scripts/Data/Entity/Entity.cs | 0 .../Scripts/Data/Entity/Entity.cs.meta | 0 Assets/{ => v2}/Scripts/Domain.meta | 0 Assets/{ => v2}/Scripts/Domain/Model.meta | 0 Assets/{ => v2}/Scripts/Domain/Model/Model.cs | 0 .../Scripts/Domain/Model/Model.cs.meta | 0 .../{ => v2}/Scripts/Domain/Repository.meta | 0 .../Scripts/Domain/Repository/Repository.cs | 0 .../Domain/Repository/Repository.cs.meta | 0 .../{ => v2}/Scripts/Domain/Translator.meta | 0 .../Scripts/Domain/Translator/Translator.cs | 2 +- .../Domain/Translator/Translator.cs.meta | 0 Assets/{ => v2}/Scripts/Domain/UseCase.meta | 0 .../Scripts/Domain/UseCase/UseCase.cs | 0 .../Scripts/Domain/UseCase/UseCase.cs.meta | 0 Assets/{ => v2}/Scripts/Presentation.meta | 0 .../Scripts/Presentation/Presenter.meta | 0 .../Presentation/Presenter/Presenter.cs | 0 .../Presentation/Presenter/Presenter.cs.meta | 0 .../{ => v2}/Scripts/Presentation/View.meta | 0 .../Scripts/Presentation/View/Controller.cs | 0 .../Presentation/View/Controller.cs.meta | 0 .../Scripts/Presentation/View/View.cs | 0 .../Scripts/Presentation/View/View.cs.meta | 0 Assets/{ => v2}/Scripts/Utility.meta | 0 Assets/{ => v2}/Scripts/Utility/Factory.cs | 0 .../{ => v2}/Scripts/Utility/Factory.cs.meta | 0 Assets/{ => v2}/umm@cafu_core.asmdef | 0 Assets/{ => v2}/umm@cafu_core.asmdef.meta | 0 Assets/v3.meta | 8 + Assets/v3/Scripts.meta | 8 + Assets/v3/Scripts/IDataStore.cs | 6 + Assets/v3/Scripts/IDataStore.cs.meta | 3 + Assets/v3/Scripts/IEntity.cs | 6 + Assets/v3/Scripts/IEntity.cs.meta | 11 + Assets/v3/Scripts/IPresenter.cs | 6 + Assets/v3/Scripts/IPresenter.cs.meta | 3 + Assets/v3/Scripts/IRepository.cs | 6 + Assets/v3/Scripts/IRepository.cs.meta | 3 + Assets/v3/Scripts/ITranslator.cs | 250 ++++++++++++++++++ Assets/v3/Scripts/ITranslator.cs.meta | 3 + Assets/v3/Scripts/IUseCase.cs | 6 + Assets/v3/Scripts/IUseCase.cs.meta | 3 + Assets/v3/Scripts/IView.cs | 6 + Assets/v3/Scripts/IView.cs.meta | 3 + Assets/v3/umm@cafu_core@v3.asmdef | 11 + Assets/v3/umm@cafu_core@v3.asmdef.meta | 7 + package.json | 3 +- 55 files changed, 360 insertions(+), 2 deletions(-) create mode 100644 Assets/v2.meta rename Assets/{ => v2}/Scripts.meta (100%) rename Assets/{ => v2}/Scripts/Data.meta (100%) rename Assets/{ => v2}/Scripts/Data/DataStore.meta (100%) rename Assets/{ => v2}/Scripts/Data/DataStore/DataStore.cs (100%) rename Assets/{ => v2}/Scripts/Data/DataStore/DataStore.cs.meta (100%) rename Assets/{ => v2}/Scripts/Data/Entity.meta (100%) rename Assets/{ => v2}/Scripts/Data/Entity/Entity.cs (100%) rename Assets/{ => v2}/Scripts/Data/Entity/Entity.cs.meta (100%) rename Assets/{ => v2}/Scripts/Domain.meta (100%) rename Assets/{ => v2}/Scripts/Domain/Model.meta (100%) rename Assets/{ => v2}/Scripts/Domain/Model/Model.cs (100%) rename Assets/{ => v2}/Scripts/Domain/Model/Model.cs.meta (100%) rename Assets/{ => v2}/Scripts/Domain/Repository.meta (100%) rename Assets/{ => v2}/Scripts/Domain/Repository/Repository.cs (100%) rename Assets/{ => v2}/Scripts/Domain/Repository/Repository.cs.meta (100%) rename Assets/{ => v2}/Scripts/Domain/Translator.meta (100%) rename Assets/{ => v2}/Scripts/Domain/Translator/Translator.cs (99%) rename Assets/{ => v2}/Scripts/Domain/Translator/Translator.cs.meta (100%) rename Assets/{ => v2}/Scripts/Domain/UseCase.meta (100%) rename Assets/{ => v2}/Scripts/Domain/UseCase/UseCase.cs (100%) rename Assets/{ => v2}/Scripts/Domain/UseCase/UseCase.cs.meta (100%) rename Assets/{ => v2}/Scripts/Presentation.meta (100%) rename Assets/{ => v2}/Scripts/Presentation/Presenter.meta (100%) rename Assets/{ => v2}/Scripts/Presentation/Presenter/Presenter.cs (100%) rename Assets/{ => v2}/Scripts/Presentation/Presenter/Presenter.cs.meta (100%) rename Assets/{ => v2}/Scripts/Presentation/View.meta (100%) rename Assets/{ => v2}/Scripts/Presentation/View/Controller.cs (100%) rename Assets/{ => v2}/Scripts/Presentation/View/Controller.cs.meta (100%) rename Assets/{ => v2}/Scripts/Presentation/View/View.cs (100%) rename Assets/{ => v2}/Scripts/Presentation/View/View.cs.meta (100%) rename Assets/{ => v2}/Scripts/Utility.meta (100%) rename Assets/{ => v2}/Scripts/Utility/Factory.cs (100%) rename Assets/{ => v2}/Scripts/Utility/Factory.cs.meta (100%) rename Assets/{ => v2}/umm@cafu_core.asmdef (100%) rename Assets/{ => v2}/umm@cafu_core.asmdef.meta (100%) create mode 100644 Assets/v3.meta create mode 100644 Assets/v3/Scripts.meta create mode 100644 Assets/v3/Scripts/IDataStore.cs create mode 100644 Assets/v3/Scripts/IDataStore.cs.meta create mode 100644 Assets/v3/Scripts/IEntity.cs create mode 100644 Assets/v3/Scripts/IEntity.cs.meta create mode 100644 Assets/v3/Scripts/IPresenter.cs create mode 100644 Assets/v3/Scripts/IPresenter.cs.meta create mode 100644 Assets/v3/Scripts/IRepository.cs create mode 100644 Assets/v3/Scripts/IRepository.cs.meta create mode 100644 Assets/v3/Scripts/ITranslator.cs create mode 100644 Assets/v3/Scripts/ITranslator.cs.meta create mode 100644 Assets/v3/Scripts/IUseCase.cs create mode 100644 Assets/v3/Scripts/IUseCase.cs.meta create mode 100644 Assets/v3/Scripts/IView.cs create mode 100644 Assets/v3/Scripts/IView.cs.meta create mode 100644 Assets/v3/umm@cafu_core@v3.asmdef create mode 100644 Assets/v3/umm@cafu_core@v3.asmdef.meta diff --git a/Assets/v2.meta b/Assets/v2.meta new file mode 100644 index 0000000..8ed9cc2 --- /dev/null +++ b/Assets/v2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e2088660473f43ddbb12a3666d5aad5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts.meta b/Assets/v2/Scripts.meta similarity index 100% rename from Assets/Scripts.meta rename to Assets/v2/Scripts.meta diff --git a/Assets/Scripts/Data.meta b/Assets/v2/Scripts/Data.meta similarity index 100% rename from Assets/Scripts/Data.meta rename to Assets/v2/Scripts/Data.meta diff --git a/Assets/Scripts/Data/DataStore.meta b/Assets/v2/Scripts/Data/DataStore.meta similarity index 100% rename from Assets/Scripts/Data/DataStore.meta rename to Assets/v2/Scripts/Data/DataStore.meta diff --git a/Assets/Scripts/Data/DataStore/DataStore.cs b/Assets/v2/Scripts/Data/DataStore/DataStore.cs similarity index 100% rename from Assets/Scripts/Data/DataStore/DataStore.cs rename to Assets/v2/Scripts/Data/DataStore/DataStore.cs diff --git a/Assets/Scripts/Data/DataStore/DataStore.cs.meta b/Assets/v2/Scripts/Data/DataStore/DataStore.cs.meta similarity index 100% rename from Assets/Scripts/Data/DataStore/DataStore.cs.meta rename to Assets/v2/Scripts/Data/DataStore/DataStore.cs.meta diff --git a/Assets/Scripts/Data/Entity.meta b/Assets/v2/Scripts/Data/Entity.meta similarity index 100% rename from Assets/Scripts/Data/Entity.meta rename to Assets/v2/Scripts/Data/Entity.meta diff --git a/Assets/Scripts/Data/Entity/Entity.cs b/Assets/v2/Scripts/Data/Entity/Entity.cs similarity index 100% rename from Assets/Scripts/Data/Entity/Entity.cs rename to Assets/v2/Scripts/Data/Entity/Entity.cs diff --git a/Assets/Scripts/Data/Entity/Entity.cs.meta b/Assets/v2/Scripts/Data/Entity/Entity.cs.meta similarity index 100% rename from Assets/Scripts/Data/Entity/Entity.cs.meta rename to Assets/v2/Scripts/Data/Entity/Entity.cs.meta diff --git a/Assets/Scripts/Domain.meta b/Assets/v2/Scripts/Domain.meta similarity index 100% rename from Assets/Scripts/Domain.meta rename to Assets/v2/Scripts/Domain.meta diff --git a/Assets/Scripts/Domain/Model.meta b/Assets/v2/Scripts/Domain/Model.meta similarity index 100% rename from Assets/Scripts/Domain/Model.meta rename to Assets/v2/Scripts/Domain/Model.meta diff --git a/Assets/Scripts/Domain/Model/Model.cs b/Assets/v2/Scripts/Domain/Model/Model.cs similarity index 100% rename from Assets/Scripts/Domain/Model/Model.cs rename to Assets/v2/Scripts/Domain/Model/Model.cs diff --git a/Assets/Scripts/Domain/Model/Model.cs.meta b/Assets/v2/Scripts/Domain/Model/Model.cs.meta similarity index 100% rename from Assets/Scripts/Domain/Model/Model.cs.meta rename to Assets/v2/Scripts/Domain/Model/Model.cs.meta diff --git a/Assets/Scripts/Domain/Repository.meta b/Assets/v2/Scripts/Domain/Repository.meta similarity index 100% rename from Assets/Scripts/Domain/Repository.meta rename to Assets/v2/Scripts/Domain/Repository.meta diff --git a/Assets/Scripts/Domain/Repository/Repository.cs b/Assets/v2/Scripts/Domain/Repository/Repository.cs similarity index 100% rename from Assets/Scripts/Domain/Repository/Repository.cs rename to Assets/v2/Scripts/Domain/Repository/Repository.cs diff --git a/Assets/Scripts/Domain/Repository/Repository.cs.meta b/Assets/v2/Scripts/Domain/Repository/Repository.cs.meta similarity index 100% rename from Assets/Scripts/Domain/Repository/Repository.cs.meta rename to Assets/v2/Scripts/Domain/Repository/Repository.cs.meta diff --git a/Assets/Scripts/Domain/Translator.meta b/Assets/v2/Scripts/Domain/Translator.meta similarity index 100% rename from Assets/Scripts/Domain/Translator.meta rename to Assets/v2/Scripts/Domain/Translator.meta diff --git a/Assets/Scripts/Domain/Translator/Translator.cs b/Assets/v2/Scripts/Domain/Translator/Translator.cs similarity index 99% rename from Assets/Scripts/Domain/Translator/Translator.cs rename to Assets/v2/Scripts/Domain/Translator/Translator.cs index 09e6894..2d6b6a1 100644 --- a/Assets/Scripts/Domain/Translator/Translator.cs +++ b/Assets/v2/Scripts/Domain/Translator/Translator.cs @@ -131,7 +131,7 @@ public interface IModelTranslator : IEntityTranslator where TEntity : IEntity { - TEntity Translate(TModel1 model); + TEntity Translate(TModel1 webCamTexture); } [PublicAPI] diff --git a/Assets/Scripts/Domain/Translator/Translator.cs.meta b/Assets/v2/Scripts/Domain/Translator/Translator.cs.meta similarity index 100% rename from Assets/Scripts/Domain/Translator/Translator.cs.meta rename to Assets/v2/Scripts/Domain/Translator/Translator.cs.meta diff --git a/Assets/Scripts/Domain/UseCase.meta b/Assets/v2/Scripts/Domain/UseCase.meta similarity index 100% rename from Assets/Scripts/Domain/UseCase.meta rename to Assets/v2/Scripts/Domain/UseCase.meta diff --git a/Assets/Scripts/Domain/UseCase/UseCase.cs b/Assets/v2/Scripts/Domain/UseCase/UseCase.cs similarity index 100% rename from Assets/Scripts/Domain/UseCase/UseCase.cs rename to Assets/v2/Scripts/Domain/UseCase/UseCase.cs diff --git a/Assets/Scripts/Domain/UseCase/UseCase.cs.meta b/Assets/v2/Scripts/Domain/UseCase/UseCase.cs.meta similarity index 100% rename from Assets/Scripts/Domain/UseCase/UseCase.cs.meta rename to Assets/v2/Scripts/Domain/UseCase/UseCase.cs.meta diff --git a/Assets/Scripts/Presentation.meta b/Assets/v2/Scripts/Presentation.meta similarity index 100% rename from Assets/Scripts/Presentation.meta rename to Assets/v2/Scripts/Presentation.meta diff --git a/Assets/Scripts/Presentation/Presenter.meta b/Assets/v2/Scripts/Presentation/Presenter.meta similarity index 100% rename from Assets/Scripts/Presentation/Presenter.meta rename to Assets/v2/Scripts/Presentation/Presenter.meta diff --git a/Assets/Scripts/Presentation/Presenter/Presenter.cs b/Assets/v2/Scripts/Presentation/Presenter/Presenter.cs similarity index 100% rename from Assets/Scripts/Presentation/Presenter/Presenter.cs rename to Assets/v2/Scripts/Presentation/Presenter/Presenter.cs diff --git a/Assets/Scripts/Presentation/Presenter/Presenter.cs.meta b/Assets/v2/Scripts/Presentation/Presenter/Presenter.cs.meta similarity index 100% rename from Assets/Scripts/Presentation/Presenter/Presenter.cs.meta rename to Assets/v2/Scripts/Presentation/Presenter/Presenter.cs.meta diff --git a/Assets/Scripts/Presentation/View.meta b/Assets/v2/Scripts/Presentation/View.meta similarity index 100% rename from Assets/Scripts/Presentation/View.meta rename to Assets/v2/Scripts/Presentation/View.meta diff --git a/Assets/Scripts/Presentation/View/Controller.cs b/Assets/v2/Scripts/Presentation/View/Controller.cs similarity index 100% rename from Assets/Scripts/Presentation/View/Controller.cs rename to Assets/v2/Scripts/Presentation/View/Controller.cs diff --git a/Assets/Scripts/Presentation/View/Controller.cs.meta b/Assets/v2/Scripts/Presentation/View/Controller.cs.meta similarity index 100% rename from Assets/Scripts/Presentation/View/Controller.cs.meta rename to Assets/v2/Scripts/Presentation/View/Controller.cs.meta diff --git a/Assets/Scripts/Presentation/View/View.cs b/Assets/v2/Scripts/Presentation/View/View.cs similarity index 100% rename from Assets/Scripts/Presentation/View/View.cs rename to Assets/v2/Scripts/Presentation/View/View.cs diff --git a/Assets/Scripts/Presentation/View/View.cs.meta b/Assets/v2/Scripts/Presentation/View/View.cs.meta similarity index 100% rename from Assets/Scripts/Presentation/View/View.cs.meta rename to Assets/v2/Scripts/Presentation/View/View.cs.meta diff --git a/Assets/Scripts/Utility.meta b/Assets/v2/Scripts/Utility.meta similarity index 100% rename from Assets/Scripts/Utility.meta rename to Assets/v2/Scripts/Utility.meta diff --git a/Assets/Scripts/Utility/Factory.cs b/Assets/v2/Scripts/Utility/Factory.cs similarity index 100% rename from Assets/Scripts/Utility/Factory.cs rename to Assets/v2/Scripts/Utility/Factory.cs diff --git a/Assets/Scripts/Utility/Factory.cs.meta b/Assets/v2/Scripts/Utility/Factory.cs.meta similarity index 100% rename from Assets/Scripts/Utility/Factory.cs.meta rename to Assets/v2/Scripts/Utility/Factory.cs.meta diff --git a/Assets/umm@cafu_core.asmdef b/Assets/v2/umm@cafu_core.asmdef similarity index 100% rename from Assets/umm@cafu_core.asmdef rename to Assets/v2/umm@cafu_core.asmdef diff --git a/Assets/umm@cafu_core.asmdef.meta b/Assets/v2/umm@cafu_core.asmdef.meta similarity index 100% rename from Assets/umm@cafu_core.asmdef.meta rename to Assets/v2/umm@cafu_core.asmdef.meta diff --git a/Assets/v3.meta b/Assets/v3.meta new file mode 100644 index 0000000..e5bbf70 --- /dev/null +++ b/Assets/v3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea954103d0f754206b3683b251a7b622 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/v3/Scripts.meta b/Assets/v3/Scripts.meta new file mode 100644 index 0000000..1dc11ac --- /dev/null +++ b/Assets/v3/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 737cc240487ed4583a1c6eb966c6d9e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/v3/Scripts/IDataStore.cs b/Assets/v3/Scripts/IDataStore.cs new file mode 100644 index 0000000..122a543 --- /dev/null +++ b/Assets/v3/Scripts/IDataStore.cs @@ -0,0 +1,6 @@ +namespace CAFU.Core +{ + public interface IDataStore + { + } +} \ No newline at end of file diff --git a/Assets/v3/Scripts/IDataStore.cs.meta b/Assets/v3/Scripts/IDataStore.cs.meta new file mode 100644 index 0000000..59f21cf --- /dev/null +++ b/Assets/v3/Scripts/IDataStore.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 368b98d20a8747babe70e09206dc0d2e +timeCreated: 1534943335 \ No newline at end of file diff --git a/Assets/v3/Scripts/IEntity.cs b/Assets/v3/Scripts/IEntity.cs new file mode 100644 index 0000000..dd9942f --- /dev/null +++ b/Assets/v3/Scripts/IEntity.cs @@ -0,0 +1,6 @@ +namespace CAFU.Core +{ + public interface IEntity + { + } +} \ No newline at end of file diff --git a/Assets/v3/Scripts/IEntity.cs.meta b/Assets/v3/Scripts/IEntity.cs.meta new file mode 100644 index 0000000..3c410ea --- /dev/null +++ b/Assets/v3/Scripts/IEntity.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 02b09a515e7e945ddaa8b2fb98be080e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/v3/Scripts/IPresenter.cs b/Assets/v3/Scripts/IPresenter.cs new file mode 100644 index 0000000..0b064d3 --- /dev/null +++ b/Assets/v3/Scripts/IPresenter.cs @@ -0,0 +1,6 @@ +namespace CAFU.Core +{ + public interface IPresenter + { + } +} \ No newline at end of file diff --git a/Assets/v3/Scripts/IPresenter.cs.meta b/Assets/v3/Scripts/IPresenter.cs.meta new file mode 100644 index 0000000..c3516f6 --- /dev/null +++ b/Assets/v3/Scripts/IPresenter.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3dca312eb1654779a95096adcc98d02e +timeCreated: 1534943363 \ No newline at end of file diff --git a/Assets/v3/Scripts/IRepository.cs b/Assets/v3/Scripts/IRepository.cs new file mode 100644 index 0000000..ca29358 --- /dev/null +++ b/Assets/v3/Scripts/IRepository.cs @@ -0,0 +1,6 @@ +namespace CAFU.Core +{ + public interface IRepository + { + } +} \ No newline at end of file diff --git a/Assets/v3/Scripts/IRepository.cs.meta b/Assets/v3/Scripts/IRepository.cs.meta new file mode 100644 index 0000000..d815bc4 --- /dev/null +++ b/Assets/v3/Scripts/IRepository.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ecc7397281b2406195b00913295c1c85 +timeCreated: 1534943347 \ No newline at end of file diff --git a/Assets/v3/Scripts/ITranslator.cs b/Assets/v3/Scripts/ITranslator.cs new file mode 100644 index 0000000..6f8cdf6 --- /dev/null +++ b/Assets/v3/Scripts/ITranslator.cs @@ -0,0 +1,250 @@ +using System; +using System.Threading.Tasks; +using JetBrains.Annotations; +using Zenject; + +namespace CAFU.Core +{ + public interface ITranslator : IFactory + { + } + + public interface IObservableTranslator : ITranslator + { + } + + public interface IAsyncTranslator : ITranslator + { + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam param); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam1 param1, TParam2 param2); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + } + + [PublicAPI] + public interface ITranslator : ITranslator + where TEntity : IEntity + { + TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam param); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + } + + [PublicAPI] + public interface IObservableTranslator : IObservableTranslator + where TEntity : IEntity + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam param); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam1 param1, TParam2 param2); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + } + + [PublicAPI] + public interface IAsyncTranslator : IAsyncTranslator + where TEntity : IEntity + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + } +} \ No newline at end of file diff --git a/Assets/v3/Scripts/ITranslator.cs.meta b/Assets/v3/Scripts/ITranslator.cs.meta new file mode 100644 index 0000000..606b512 --- /dev/null +++ b/Assets/v3/Scripts/ITranslator.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ca9fbf0c6fa2440a9c19b140eb61daf4 +timeCreated: 1534943398 \ No newline at end of file diff --git a/Assets/v3/Scripts/IUseCase.cs b/Assets/v3/Scripts/IUseCase.cs new file mode 100644 index 0000000..57d582b --- /dev/null +++ b/Assets/v3/Scripts/IUseCase.cs @@ -0,0 +1,6 @@ +namespace CAFU.Core +{ + public interface IUseCase + { + } +} \ No newline at end of file diff --git a/Assets/v3/Scripts/IUseCase.cs.meta b/Assets/v3/Scripts/IUseCase.cs.meta new file mode 100644 index 0000000..cb5089b --- /dev/null +++ b/Assets/v3/Scripts/IUseCase.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 96a1c766b36f4cf7b8e6cb829b54d97e +timeCreated: 1534943355 \ No newline at end of file diff --git a/Assets/v3/Scripts/IView.cs b/Assets/v3/Scripts/IView.cs new file mode 100644 index 0000000..1c1c33c --- /dev/null +++ b/Assets/v3/Scripts/IView.cs @@ -0,0 +1,6 @@ +namespace CAFU.Core +{ + public interface IView + { + } +} \ No newline at end of file diff --git a/Assets/v3/Scripts/IView.cs.meta b/Assets/v3/Scripts/IView.cs.meta new file mode 100644 index 0000000..1509d0d --- /dev/null +++ b/Assets/v3/Scripts/IView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b690e720819649b2a78f97644ed51c44 +timeCreated: 1534943370 \ No newline at end of file diff --git a/Assets/v3/umm@cafu_core@v3.asmdef b/Assets/v3/umm@cafu_core@v3.asmdef new file mode 100644 index 0000000..54b8baf --- /dev/null +++ b/Assets/v3/umm@cafu_core@v3.asmdef @@ -0,0 +1,11 @@ +{ + "name": "umm@cafu_core@v3", + "references": [ + "umm@unirx", + "Zenject" + ], + "optionalUnityReferences": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false +} \ No newline at end of file diff --git a/Assets/v3/umm@cafu_core@v3.asmdef.meta b/Assets/v3/umm@cafu_core@v3.asmdef.meta new file mode 100644 index 0000000..9b6ec82 --- /dev/null +++ b/Assets/v3/umm@cafu_core@v3.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d2ab70376500949fcae5c69bc4471c99 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/package.json b/package.json index a5793e8..b00bb20 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,8 @@ "dependencies": { "@umm/scripts": "umm/scripts#^1.0.0", "@umm/unirx": "umm/unirx#^2.0.0", - "@umm/unirx_observablelifecyclemonobehaviour": "umm/unirx_observablelifecyclemonobehaviour#^1.0.0" + "@umm/unirx_observablelifecyclemonobehaviour": "umm/unirx_observablelifecyclemonobehaviour#^1.0.0", + "@umm/zenject": "umm/zenject#^2.0.0" }, "devDependencies": {} } From 0fc644f635f755116e2b9580e721c37acb949669 Mon Sep 17 00:00:00 2001 From: Tetsuya Mori Date: Fri, 24 Aug 2018 21:43:46 +0900 Subject: [PATCH 2/8] :clipboard: Open with Unity 2018.2 --- Packages/manifest.json | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 526aca6..1342d0a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,4 +1,39 @@ { - "dependencies": { - } + "dependencies": { + "com.unity.ads": "2.0.8", + "com.unity.analytics": "2.0.16", + "com.unity.package-manager-ui": "1.9.11", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.2.4", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } } From 876ed5f36cfa0f4e1c4679e3e762a7785bf90586 Mon Sep 17 00:00:00 2001 From: Tetsuya Mori Date: Mon, 27 Aug 2018 11:53:45 +0900 Subject: [PATCH 3/8] :memo: Upgrade to v3.0.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1211026..eb00ee7 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ # Install ```shell -yarn add "umm/cafu_core#^2.0.0" +yarn add "umm/cafu_core#^3.0.0" ``` # Usage From 047b87fdb179ef4c4103627ea18ff9f5e054b735 Mon Sep 17 00:00:00 2001 From: Tetsuya Mori Date: Wed, 5 Sep 2018 20:35:06 +0900 Subject: [PATCH 4/8] :sparkles: Add interfaces for Translator to Translate Structure --- Assets/v3/Scripts/ITranslator.cs | 332 ++++++++++++++++++++++++------- 1 file changed, 260 insertions(+), 72 deletions(-) diff --git a/Assets/v3/Scripts/ITranslator.cs b/Assets/v3/Scripts/ITranslator.cs index 6f8cdf6..4afa4db 100644 --- a/Assets/v3/Scripts/ITranslator.cs +++ b/Assets/v3/Scripts/ITranslator.cs @@ -1,11 +1,10 @@ using System; using System.Threading.Tasks; -using JetBrains.Annotations; -using Zenject; +// ReSharper disable UnusedMember.Global namespace CAFU.Core { - public interface ITranslator : IFactory + public interface ITranslator { } @@ -17,234 +16,423 @@ public interface IAsyncTranslator : ITranslator { } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : ITranslator + { + } + + public interface IStructureTranslator : ITranslator + { + } + + public interface IObservableEntityTranslator : IEntityTranslator, IObservableTranslator + { + } + + public interface IObservableStructureTranslator : IStructureTranslator, IObservableTranslator + { + } + + public interface IAsyncEntityTranslator : IEntityTranslator, IAsyncTranslator + { + } + + public interface IAsyncStructureTranslator : IStructureTranslator, IAsyncTranslator + { + } + + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { - TEntity Translate(TParam param); + TEntity Translate(TParam1 param1); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(TParam1 param1, TParam2 param2); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); } - [PublicAPI] - public interface ITranslator : ITranslator + public interface IEntityTranslator : IEntityTranslator where TEntity : IEntity { TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { - IObservable TranslateAsObservable(TParam param); + IObservable TranslateAsObservable(TParam1 param1); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(TParam1 param1, TParam2 param2); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); } - [PublicAPI] - public interface IObservableTranslator : IObservableTranslator + public interface IObservableEntityTranslator : IObservableEntityTranslator where TEntity : IEntity { IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { - Task TranslateAsync(TParam param); + Task TranslateAsync(TParam1 param1); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(TParam1 param1, TParam2 param2); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); } - [PublicAPI] - public interface IAsyncTranslator : IAsyncTranslator + public interface IAsyncEntityTranslator : IAsyncEntityTranslator where TEntity : IEntity { Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1, TParam2 param2); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + } + + public interface IStructureTranslator : IStructureTranslator + where TStructure : IStructure + { + TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + } + + public interface IObservableStructureTranslator : IObservableStructureTranslator + where TStructure : IStructure + { + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1, TParam2 param2); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + } + + public interface IAsyncStructureTranslator : IAsyncStructureTranslator + where TStructure : IStructure + { + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + } } \ No newline at end of file From 5060d38e77b947aea7655b3c916788e5438ed71e Mon Sep 17 00:00:00 2001 From: Tetsuya Mori Date: Wed, 5 Sep 2018 20:35:54 +0900 Subject: [PATCH 5/8] :sparkles: Add IStructure --- Assets/v3/Scripts/IStructure.cs | 6 ++++++ Assets/v3/Scripts/IStructure.cs.meta | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 Assets/v3/Scripts/IStructure.cs create mode 100644 Assets/v3/Scripts/IStructure.cs.meta diff --git a/Assets/v3/Scripts/IStructure.cs b/Assets/v3/Scripts/IStructure.cs new file mode 100644 index 0000000..ebbb8e1 --- /dev/null +++ b/Assets/v3/Scripts/IStructure.cs @@ -0,0 +1,6 @@ +namespace CAFU.Core +{ + public interface IStructure + { + } +} \ No newline at end of file diff --git a/Assets/v3/Scripts/IStructure.cs.meta b/Assets/v3/Scripts/IStructure.cs.meta new file mode 100644 index 0000000..634bd82 --- /dev/null +++ b/Assets/v3/Scripts/IStructure.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: eb5bb6639f584f44ba16c559bf4d52f3 +timeCreated: 1536051625 \ No newline at end of file From d7b2de17c3cadc59adf3327679fca24568150bd4 Mon Sep 17 00:00:00 2001 From: Tetsuya Mori Date: Wed, 5 Sep 2018 22:22:33 +0900 Subject: [PATCH 6/8] :fire: Remove Zenject from dependencies --- Assets/v3/umm@cafu_core@v3.asmdef | 5 ++--- package.json | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Assets/v3/umm@cafu_core@v3.asmdef b/Assets/v3/umm@cafu_core@v3.asmdef index 54b8baf..fae564a 100644 --- a/Assets/v3/umm@cafu_core@v3.asmdef +++ b/Assets/v3/umm@cafu_core@v3.asmdef @@ -1,11 +1,10 @@ { "name": "umm@cafu_core@v3", "references": [ - "umm@unirx", - "Zenject" + "umm@unirx" ], "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false -} \ No newline at end of file +} diff --git a/package.json b/package.json index b00bb20..a5793e8 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,7 @@ "dependencies": { "@umm/scripts": "umm/scripts#^1.0.0", "@umm/unirx": "umm/unirx#^2.0.0", - "@umm/unirx_observablelifecyclemonobehaviour": "umm/unirx_observablelifecyclemonobehaviour#^1.0.0", - "@umm/zenject": "umm/zenject#^2.0.0" + "@umm/unirx_observablelifecyclemonobehaviour": "umm/unirx_observablelifecyclemonobehaviour#^1.0.0" }, "devDependencies": {} } From 6cb305cb04fae21d3e37bc84bebedbeca6834736 Mon Sep 17 00:00:00 2001 From: Tetsuya Mori Date: Fri, 7 Sep 2018 20:55:32 +0900 Subject: [PATCH 7/8] :sparkles: Add IResolver * Resolve class in runtime --- Assets/v3/Scripts/IResolver.cs | 184 ++++++++++++++++++++++++++++ Assets/v3/Scripts/IResolver.cs.meta | 3 + 2 files changed, 187 insertions(+) create mode 100644 Assets/v3/Scripts/IResolver.cs create mode 100644 Assets/v3/Scripts/IResolver.cs.meta diff --git a/Assets/v3/Scripts/IResolver.cs b/Assets/v3/Scripts/IResolver.cs new file mode 100644 index 0000000..ddee79c --- /dev/null +++ b/Assets/v3/Scripts/IResolver.cs @@ -0,0 +1,184 @@ + +using System; +using System.Threading.Tasks; +// ReSharper disable UnusedMember.Global + +namespace CAFU.Core +{ + public interface IResolver + { + } + + public interface IObservableResolver : IResolver + { + } + + public interface IAsyncResolver : IResolver + { + } + + public interface IResolver : IResolver + { + TResult Resolve(); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1, TParam2 param2); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1, TParam2 param2, TParam3 param3); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + } + + public interface IResolver : IResolver + { + TResult Resolve(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1, TParam2 param2); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1, TParam2 param2, TParam3 param3); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + } + + public interface IObservableResolver : IObservableResolver + { + IObservable ResolveAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1, TParam2 param2); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1, TParam2 param2, TParam3 param3); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + } + + public interface IAsyncResolver : IAsyncResolver + { + Task ResolveAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + } +} \ No newline at end of file diff --git a/Assets/v3/Scripts/IResolver.cs.meta b/Assets/v3/Scripts/IResolver.cs.meta new file mode 100644 index 0000000..c4c557d --- /dev/null +++ b/Assets/v3/Scripts/IResolver.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6c284939429f421a96df13af24cf7c1d +timeCreated: 1536291783 \ No newline at end of file From 55998334865ec7db8e10375e8d789a80592e32b5 Mon Sep 17 00:00:00 2001 From: Tetsuya Mori Date: Tue, 11 Sep 2018 17:36:22 +0900 Subject: [PATCH 8/8] :sparkles: Simplify Translator --- Assets/v3/Scripts/IEntity.cs | 2 +- Assets/v3/Scripts/IStructure.cs | 2 +- Assets/v3/Scripts/ITranslator.cs | 422 ++++++++----------------------- 3 files changed, 104 insertions(+), 322 deletions(-) diff --git a/Assets/v3/Scripts/IEntity.cs b/Assets/v3/Scripts/IEntity.cs index dd9942f..ca931db 100644 --- a/Assets/v3/Scripts/IEntity.cs +++ b/Assets/v3/Scripts/IEntity.cs @@ -1,6 +1,6 @@ namespace CAFU.Core { - public interface IEntity + public interface IEntity : ITranslatable { } } \ No newline at end of file diff --git a/Assets/v3/Scripts/IStructure.cs b/Assets/v3/Scripts/IStructure.cs index ebbb8e1..15c6a2f 100644 --- a/Assets/v3/Scripts/IStructure.cs +++ b/Assets/v3/Scripts/IStructure.cs @@ -1,6 +1,6 @@ namespace CAFU.Core { - public interface IStructure + public interface IStructure : ITranslatable { } } \ No newline at end of file diff --git a/Assets/v3/Scripts/ITranslator.cs b/Assets/v3/Scripts/ITranslator.cs index 4afa4db..c0e4af7 100644 --- a/Assets/v3/Scripts/ITranslator.cs +++ b/Assets/v3/Scripts/ITranslator.cs @@ -8,431 +8,213 @@ public interface ITranslator { } - public interface IObservableTranslator : ITranslator - { - } - - public interface IAsyncTranslator : ITranslator - { - } - - public interface IEntityTranslator : ITranslator - { - } - - public interface IStructureTranslator : ITranslator - { - } - - public interface IObservableEntityTranslator : IEntityTranslator, IObservableTranslator - { - } - - public interface IObservableStructureTranslator : IStructureTranslator, IObservableTranslator - { - } - - public interface IAsyncEntityTranslator : IEntityTranslator, IAsyncTranslator - { - } - - public interface IAsyncStructureTranslator : IStructureTranslator, IAsyncTranslator - { - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1, TParam2 param2); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); - } - - public interface IEntityTranslator : IEntityTranslator - where TEntity : IEntity - { - TEntity Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity + public interface ITranslatable { - IObservable TranslateAsObservable(); } - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); - } - - public interface IObservableEntityTranslator : IObservableEntityTranslator - where TEntity : IEntity - { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity - { - Task TranslateAsync(); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity - { - Task TranslateAsync(TParam1 param1); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity - { - Task TranslateAsync(TParam1 param1, TParam2 param2); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity - { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity - { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity - { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity - { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity - { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity - { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); - } - - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity + public interface IObservableTranslator : ITranslator { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); } - public interface IAsyncEntityTranslator : IAsyncEntityTranslator - where TEntity : IEntity + public interface IAsyncTranslator : ITranslator { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(); + TTranslatable Translate(); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1); + TTranslatable Translate(TParam1 param1); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1, TParam2 param2); + TTranslatable Translate(TParam1 param1, TParam2 param2); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3); + TTranslatable Translate(TParam1 param1, TParam2 param2, TParam3 param3); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + TTranslatable Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + TTranslatable Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + TTranslatable Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + TTranslatable Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + TTranslatable Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + TTranslatable Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); } - public interface IStructureTranslator : IStructureTranslator - where TStructure : IStructure + public interface ITranslator : ITranslator + where TTranslatable : ITranslatable { - TStructure Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + TTranslatable Translate(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(); + IObservable TranslateAsObservable(); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1); + IObservable TranslateAsObservable(TParam1 param1); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2); + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3); + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); } - public interface IObservableStructureTranslator : IObservableStructureTranslator - where TStructure : IStructure + public interface IObservableTranslator : IObservableTranslator + where TTranslatable : ITranslatable { - IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + IObservable TranslateAsObservable(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(); + Task TranslateAsync(); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1); + Task TranslateAsync(TParam1 param1); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1, TParam2 param2); + Task TranslateAsync(TParam1 param1, TParam2 param2); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3); + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9); } - public interface IAsyncStructureTranslator : IAsyncStructureTranslator - where TStructure : IStructure + public interface IAsyncTranslator : IAsyncTranslator + where TTranslatable : ITranslatable { - Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); + Task TranslateAsync(TParam1 param1, TParam2 param2, TParam3 param3, TParam4 param4, TParam5 param5, TParam6 param6, TParam7 param7, TParam8 param8, TParam9 param9, TParam10 param10); } } \ No newline at end of file