gs2 1.0.2 → 1.0.3

package/src/project/result/DeleteBillingMethodResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class DeleteBillingMethodResult implements IResult {
+export default class DeleteBillingMethodResult implements IResult {
     private item: Gs2Project.BillingMethod|null = null;
 
     public getItem(): Gs2Project.BillingMethod|null {

package/src/project/result/DeleteProjectResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class DeleteProjectResult implements IResult {
+export default class DeleteProjectResult implements IResult {
     private item: Gs2Project.Project|null = null;
 
     public getItem(): Gs2Project.Project|null {

package/src/project/result/DescribeBillingMethodsResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class DescribeBillingMethodsResult implements IResult {
+export default class DescribeBillingMethodsResult implements IResult {
     private items: Gs2Project.BillingMethod[]|null = null;
     private nextPageToken: string|null = null;
 

package/src/project/result/DescribeBillingsResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class DescribeBillingsResult implements IResult {
+export default class DescribeBillingsResult implements IResult {
     private items: Gs2Project.Billing[]|null = null;
 
     public getItems(): Gs2Project.Billing[]|null {

package/src/project/result/DescribeProjectsResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class DescribeProjectsResult implements IResult {
+export default class DescribeProjectsResult implements IResult {
     private items: Gs2Project.Project[]|null = null;
     private nextPageToken: string|null = null;
 

package/src/project/result/DescribeReceiptsResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class DescribeReceiptsResult implements IResult {
+export default class DescribeReceiptsResult implements IResult {
     private items: Gs2Project.Receipt[]|null = null;
     private nextPageToken: string|null = null;
 

package/src/project/result/ForgetResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class ForgetResult implements IResult {
+export default class ForgetResult implements IResult {
     private issuePasswordToken: string|null = null;
 
     public getIssuePasswordToken(): string|null {

package/src/project/result/GetBillingMethodResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class GetBillingMethodResult implements IResult {
+export default class GetBillingMethodResult implements IResult {
     private item: Gs2Project.BillingMethod|null = null;
 
     public getItem(): Gs2Project.BillingMethod|null {

package/src/project/result/GetProjectResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class GetProjectResult implements IResult {
+export default class GetProjectResult implements IResult {
     private item: Gs2Project.Project|null = null;
 
     public getItem(): Gs2Project.Project|null {

package/src/project/result/GetProjectTokenByIdentifierResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class GetProjectTokenByIdentifierResult implements IResult {
+export default class GetProjectTokenByIdentifierResult implements IResult {
     private item: Gs2Project.Project|null = null;
     private ownerId: string|null = null;
     private projectToken: string|null = null;

package/src/project/result/GetProjectTokenResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class GetProjectTokenResult implements IResult {
+export default class GetProjectTokenResult implements IResult {
     private item: Gs2Project.Project|null = null;
     private ownerId: string|null = null;
     private projectToken: string|null = null;

package/src/project/result/IssueAccountTokenResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class IssueAccountTokenResult implements IResult {
+export default class IssueAccountTokenResult implements IResult {
     private accountToken: string|null = null;
 
     public getAccountToken(): string|null {

package/src/project/result/IssuePasswordResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class IssuePasswordResult implements IResult {
+export default class IssuePasswordResult implements IResult {
     private newPassword: string|null = null;
 
     public getNewPassword(): string|null {

package/src/project/result/SignInResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class SignInResult implements IResult {
+export default class SignInResult implements IResult {
     private item: Gs2Project.Account|null = null;
     private accountToken: string|null = null;
 

package/src/project/result/UpdateAccountResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class UpdateAccountResult implements IResult {
+export default class UpdateAccountResult implements IResult {
     private item: Gs2Project.Account|null = null;
 
     public getItem(): Gs2Project.Account|null {

package/src/project/result/UpdateBillingMethodResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class UpdateBillingMethodResult implements IResult {
+export default class UpdateBillingMethodResult implements IResult {
     private item: Gs2Project.BillingMethod|null = null;
 
     public getItem(): Gs2Project.BillingMethod|null {

package/src/project/result/UpdateProjectResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class UpdateProjectResult implements IResult {
+export default class UpdateProjectResult implements IResult {
     private item: Gs2Project.Project|null = null;
 
     public getItem(): Gs2Project.Project|null {

package/src/project/result/VerifyResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Project from '../model'
 
-export class VerifyResult implements IResult {
+export default class VerifyResult implements IResult {
     private item: Gs2Project.Account|null = null;
 
     public getItem(): Gs2Project.Account|null {

package/src/project/result/index.ts

@@ -13,25 +13,50 @@ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
-export { CreateAccountResult } from "./CreateAccountResult"
-export { VerifyResult } from "./VerifyResult"
-export { SignInResult } from "./SignInResult"
-export { IssueAccountTokenResult } from "./IssueAccountTokenResult"
-export { ForgetResult } from "./ForgetResult"
-export { IssuePasswordResult } from "./IssuePasswordResult"
-export { UpdateAccountResult } from "./UpdateAccountResult"
-export { DeleteAccountResult } from "./DeleteAccountResult"
-export { DescribeProjectsResult } from "./DescribeProjectsResult"
-export { CreateProjectResult } from "./CreateProjectResult"
-export { GetProjectResult } from "./GetProjectResult"
-export { GetProjectTokenResult } from "./GetProjectTokenResult"
-export { GetProjectTokenByIdentifierResult } from "./GetProjectTokenByIdentifierResult"
-export { UpdateProjectResult } from "./UpdateProjectResult"
-export { DeleteProjectResult } from "./DeleteProjectResult"
-export { DescribeBillingMethodsResult } from "./DescribeBillingMethodsResult"
-export { CreateBillingMethodResult } from "./CreateBillingMethodResult"
-export { GetBillingMethodResult } from "./GetBillingMethodResult"
-export { UpdateBillingMethodResult } from "./UpdateBillingMethodResult"
-export { DeleteBillingMethodResult } from "./DeleteBillingMethodResult"
-export { DescribeReceiptsResult } from "./DescribeReceiptsResult"
-export { DescribeBillingsResult } from "./DescribeBillingsResult"
+import CreateAccountResult from "./CreateAccountResult"
+import VerifyResult from "./VerifyResult"
+import SignInResult from "./SignInResult"
+import IssueAccountTokenResult from "./IssueAccountTokenResult"
+import ForgetResult from "./ForgetResult"
+import IssuePasswordResult from "./IssuePasswordResult"
+import UpdateAccountResult from "./UpdateAccountResult"
+import DeleteAccountResult from "./DeleteAccountResult"
+import DescribeProjectsResult from "./DescribeProjectsResult"
+import CreateProjectResult from "./CreateProjectResult"
+import GetProjectResult from "./GetProjectResult"
+import GetProjectTokenResult from "./GetProjectTokenResult"
+import GetProjectTokenByIdentifierResult from "./GetProjectTokenByIdentifierResult"
+import UpdateProjectResult from "./UpdateProjectResult"
+import DeleteProjectResult from "./DeleteProjectResult"
+import DescribeBillingMethodsResult from "./DescribeBillingMethodsResult"
+import CreateBillingMethodResult from "./CreateBillingMethodResult"
+import GetBillingMethodResult from "./GetBillingMethodResult"
+import UpdateBillingMethodResult from "./UpdateBillingMethodResult"
+import DeleteBillingMethodResult from "./DeleteBillingMethodResult"
+import DescribeReceiptsResult from "./DescribeReceiptsResult"
+import DescribeBillingsResult from "./DescribeBillingsResult"
+
+export {
+    CreateAccountResult,
+    VerifyResult,
+    SignInResult,
+    IssueAccountTokenResult,
+    ForgetResult,
+    IssuePasswordResult,
+    UpdateAccountResult,
+    DeleteAccountResult,
+    DescribeProjectsResult,
+    CreateProjectResult,
+    GetProjectResult,
+    GetProjectTokenResult,
+    GetProjectTokenByIdentifierResult,
+    UpdateProjectResult,
+    DeleteProjectResult,
+    DescribeBillingMethodsResult,
+    CreateBillingMethodResult,
+    GetBillingMethodResult,
+    UpdateBillingMethodResult,
+    DeleteBillingMethodResult,
+    DescribeReceiptsResult,
+    DescribeBillingsResult,
+};

package/src/watch/index.ts

@@ -14,7 +14,14 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-export * as Model from './model';
-export * as Request from './request';
-export * as Result from './result';
-export { Gs2WatchRestClient } from './rest';
+import * as model from './model';
+import * as request from './request';
+import * as result from './result';
+import Gs2WatchRestClient from './rest';
+
+export {
+    model,
+    request,
+    result,
+    Gs2WatchRestClient,
+}

package/src/watch/model/BillingActivity.ts

@@ -14,9 +14,9 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IModel from '@/gs2/core/interface/IModel';
+import IModel from '../../core/interface/IModel';
 
-export class BillingActivity implements IModel {
+export default class BillingActivity implements IModel {
     private billingActivityId: string|null = null;
     private year: number|null = null;
     private month: number|null = null;

package/src/watch/model/Chart.ts

@@ -14,9 +14,9 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IModel from '@/gs2/core/interface/IModel';
+import IModel from '../../core/interface/IModel';
 
-export class Chart implements IModel {
+export default class Chart implements IModel {
     private chartId: string|null = null;
     private embedId: string|null = null;
     private html: string|null = null;

package/src/watch/model/Cumulative.ts

@@ -14,9 +14,9 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IModel from '@/gs2/core/interface/IModel';
+import IModel from '../../core/interface/IModel';
 
-export class Cumulative implements IModel {
+export default class Cumulative implements IModel {
     private cumulativeId: string|null = null;
     private resourceGrn: string|null = null;
     private name: string|null = null;

package/src/watch/model/index.ts

@@ -13,6 +13,12 @@ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
-export { Chart } from "./Chart"
-export { Cumulative } from "./Cumulative"
-export { BillingActivity } from "./BillingActivity"
+import Chart from "./Chart"
+import Cumulative from "./Cumulative"
+import BillingActivity from "./BillingActivity"
+
+export {
+    Chart,
+    Cumulative,
+    BillingActivity,
+};

package/src/watch/request/DescribeBillingActivitiesRequest.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IRequest from '@/gs2/core/interface/IRequest';
+import IRequest from '../../core/interface/IRequest';
 
 import * as Gs2Watch from '../model'
 
-export class DescribeBillingActivitiesRequest implements IRequest {
+export default class DescribeBillingActivitiesRequest implements IRequest {
 
     private requestId: string|null = null;
     private contextStack: string|null = null;

package/src/watch/request/GetBillingActivityRequest.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IRequest from '@/gs2/core/interface/IRequest';
+import IRequest from '../../core/interface/IRequest';
 
 import * as Gs2Watch from '../model'
 
-export class GetBillingActivityRequest implements IRequest {
+export default class GetBillingActivityRequest implements IRequest {
 
     private requestId: string|null = null;
     private contextStack: string|null = null;

package/src/watch/request/GetChartRequest.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IRequest from '@/gs2/core/interface/IRequest';
+import IRequest from '../../core/interface/IRequest';
 
 import * as Gs2Watch from '../model'
 
-export class GetChartRequest implements IRequest {
+export default class GetChartRequest implements IRequest {
 
     private requestId: string|null = null;
     private contextStack: string|null = null;

package/src/watch/request/GetCumulativeRequest.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IRequest from '@/gs2/core/interface/IRequest';
+import IRequest from '../../core/interface/IRequest';
 
 import * as Gs2Watch from '../model'
 
-export class GetCumulativeRequest implements IRequest {
+export default class GetCumulativeRequest implements IRequest {
 
     private requestId: string|null = null;
     private contextStack: string|null = null;

package/src/watch/request/index.ts

@@ -13,7 +13,14 @@ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
-export { GetChartRequest } from "./GetChartRequest"
-export { GetCumulativeRequest } from "./GetCumulativeRequest"
-export { DescribeBillingActivitiesRequest } from "./DescribeBillingActivitiesRequest"
-export { GetBillingActivityRequest } from "./GetBillingActivityRequest"
+import GetChartRequest from "./GetChartRequest"
+import GetCumulativeRequest from "./GetCumulativeRequest"
+import DescribeBillingActivitiesRequest from "./DescribeBillingActivitiesRequest"
+import GetBillingActivityRequest from "./GetBillingActivityRequest"
+
+export {
+    GetChartRequest,
+    GetCumulativeRequest,
+    DescribeBillingActivitiesRequest,
+    GetBillingActivityRequest,
+};

package/src/watch/rest.ts

@@ -21,7 +21,7 @@ import * as Result from './result';
 
 import axios from 'axios';
 
-export class Gs2WatchRestClient extends AbstractGs2RestClient {
+export default class Gs2WatchRestClient extends AbstractGs2RestClient {
 
     constructor(session: Gs2RestSession) {
         super(session);
@@ -31,7 +31,7 @@ export class Gs2WatchRestClient extends AbstractGs2RestClient {
         const url = (Gs2Constant.ENDPOINT_HOST + '/chart/{metrics}')
             .replace('{service}', 'watch')
             .replace('{region}', this.session.region)
-            .replace('{metrics}', String(request.getMetrics() ?? 'null'));
+            .replace('{metrics}', String(request.getMetrics() ?? 'null') === "" ? "null" : String(request.getMetrics() ?? 'null'));
     
         const headers = this.createAuthorizedHeaders();
         if (request.getRequestId()) {
@@ -70,7 +70,7 @@ export class Gs2WatchRestClient extends AbstractGs2RestClient {
         const url = (Gs2Constant.ENDPOINT_HOST + '/cumulative/{name}')
             .replace('{service}', 'watch')
             .replace('{region}', this.session.region)
-            .replace('{name}', String(request.getName() ?? 'null'));
+            .replace('{name}', String(request.getName() ?? 'null') === "" ? "null" : String(request.getName() ?? 'null'));
     
         const headers = this.createAuthorizedHeaders();
         if (request.getRequestId()) {
@@ -101,8 +101,8 @@ export class Gs2WatchRestClient extends AbstractGs2RestClient {
         const url = (Gs2Constant.ENDPOINT_HOST + '/billingActivity/{year}/{month}')
             .replace('{service}', 'watch')
             .replace('{region}', this.session.region)
-            .replace('{year}', String(request.getYear() ?? 'null'))
-            .replace('{month}', String(request.getMonth() ?? 'null'));
+            .replace('{year}', String(request.getYear() ?? 'null') === "" ? "null" : String(request.getYear() ?? 'null'))
+            .replace('{month}', String(request.getMonth() ?? 'null') === "" ? "null" : String(request.getMonth() ?? 'null'));
     
         const headers = this.createAuthorizedHeaders();
         if (request.getRequestId()) {
@@ -131,10 +131,10 @@ export class Gs2WatchRestClient extends AbstractGs2RestClient {
         const url = (Gs2Constant.ENDPOINT_HOST + '/billingActivity/{year}/{month}/{service}/{activityType}')
             .replace('{service}', 'watch')
             .replace('{region}', this.session.region)
-            .replace('{year}', String(request.getYear() ?? 'null'))
-            .replace('{month}', String(request.getMonth() ?? 'null'))
-            .replace('{service}', String(request.getService() ?? 'null'))
-            .replace('{activityType}', String(request.getActivityType() ?? 'null'));
+            .replace('{year}', String(request.getYear() ?? 'null') === "" ? "null" : String(request.getYear() ?? 'null'))
+            .replace('{month}', String(request.getMonth() ?? 'null') === "" ? "null" : String(request.getMonth() ?? 'null'))
+            .replace('{service}', String(request.getService() ?? 'null') === "" ? "null" : String(request.getService() ?? 'null'))
+            .replace('{activityType}', String(request.getActivityType() ?? 'null') === "" ? "null" : String(request.getActivityType() ?? 'null'));
     
         const headers = this.createAuthorizedHeaders();
         if (request.getRequestId()) {

package/src/watch/result/DescribeBillingActivitiesResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Watch from '../model'
 
-export class DescribeBillingActivitiesResult implements IResult {
+export default class DescribeBillingActivitiesResult implements IResult {
     private items: Gs2Watch.BillingActivity[]|null = null;
     private nextPageToken: string|null = null;
 

package/src/watch/result/GetBillingActivityResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Watch from '../model'
 
-export class GetBillingActivityResult implements IResult {
+export default class GetBillingActivityResult implements IResult {
     private item: Gs2Watch.BillingActivity|null = null;
 
     public getItem(): Gs2Watch.BillingActivity|null {

package/src/watch/result/GetChartResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Watch from '../model'
 
-export class GetChartResult implements IResult {
+export default class GetChartResult implements IResult {
     private item: Gs2Watch.Chart|null = null;
 
     public getItem(): Gs2Watch.Chart|null {

package/src/watch/result/GetCumulativeResult.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IResult from '@/gs2/core/interface/IResult';
+import IResult from '../../core/interface/IResult';
 
 import * as Gs2Watch from '../model'
 
-export class GetCumulativeResult implements IResult {
+export default class GetCumulativeResult implements IResult {
     private item: Gs2Watch.Cumulative|null = null;
 
     public getItem(): Gs2Watch.Cumulative|null {