@chevre/factory 4.230.0 → 4.233.0

package/lib/chevre.d.ts

@@ -441,7 +441,8 @@ export declare namespace assetTransaction {
     export import reserve = ReserveAssetTransactionFactory;
 }
 export declare namespace transaction {
-    export import IAgentProfile = TransactionFactory.IAgentProfile;
+    export import IAgentAsPerson = TransactionFactory.IAgentAsPerson;
+    export import IAgentAsWebApplication = TransactionFactory.IAgentAsWebApplication;
     export import IAgent = TransactionFactory.IAgent;
     export import IPassportBeforeStart = TransactionFactory.IPassportBeforeStart;
     export import ISendEmailMessageParams = TransactionFactory.ISendEmailMessageParams;

package/lib/factory/action.d.ts

@@ -2,12 +2,10 @@ import { ActionStatusType } from './actionStatusType';
 import { ActionType } from './actionType';
 import { IExtendId } from './autoGenerated';
 import { CreativeWorkType } from './creativeWorkType';
-import { ICustomer } from './customer';
 import { OrganizationType } from './organizationType';
 import { IPersonAttributes } from './person';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
-import { ISeller } from './seller';
 import { SortType } from './sortType';
 export interface IParticipantAsWebApplication {
     typeOf: CreativeWorkType.WebApplication;
@@ -15,22 +13,28 @@ export interface IParticipantAsWebApplication {
     name?: string;
     url?: string;
 }
-export declare type IParticipantAsPerson = IPersonAttributes & {
+export declare type IParticipantAsPerson = Omit<IPersonAttributes, 'identifier' | 'memberOf'> & {
     name?: string;
     url?: string;
 };
-export declare type IParticipantAsSeller = Omit<ISeller, 'branchCode' | 'name' | 'paymentAccepted' | 'project' | 'additionalProperty' | 'hasMerchantReturnPolicy' | 'email' | 'telephone' | 'location'> & {
+export interface IParticipantAsSeller {
+    typeOf: OrganizationType.Corporation;
+    id: string;
     name?: string;
-};
+    url?: string;
+}
 export interface IParticipantAsProject {
     typeOf: OrganizationType.Project;
     id: string;
     name?: string;
     url?: string;
 }
-export declare type IParticipantAsCustomer = Omit<ICustomer, 'name' | 'branchCode' | 'contactPoint' | 'project' | 'additionalProperty'> & {
+export interface IParticipantAsCustomer {
+    typeOf: OrganizationType.Organization;
+    id: string;
     name?: string;
-};
+    url?: string;
+}
 /**
  * アクションへの関係者
  */

package/lib/factory/assetTransaction/pay.d.ts

@@ -11,30 +11,6 @@ import { IPropertyValue } from '../propertyValue';
 import { PaymentServiceType } from '../service/paymentService';
 export import IAgent = AssetTransactionFactory.IAgent;
 export declare type IRecipient = IPayRecipient;
-export declare type IObjectWithoutDetail = IObject;
-export declare type IStartParamsWithoutDetail = AssetTransactionFactory.IStartParams<AssetTransactionType.Pay, IAgent, IRecipient, IObject> & {
-    recipient: IRecipient;
-    purpose?: IPayPurpose;
-};
-export interface IStartParams extends AssetTransactionFactory.IStartParams<AssetTransactionType.Pay, IAgent, IRecipient, IObject> {
-    recipient: IRecipient;
-}
-export interface IPotentialActionsParams {
-    pay: {
-        purpose: IOrderAsPayPurpose;
-    };
-}
-/**
- * 確定パラメータ
- */
-export interface IConfirmParams {
-    id?: string;
-    transactionNumber?: string;
-    endDate?: Date;
-    potentialActions: IPotentialActionsParams;
-}
-export declare type IResult = any;
-export declare type IError = any;
 /**
  * ペイメントカードトークン
  */
@@ -103,6 +79,8 @@ export interface IPaymentMethod {
  * 取引対象物
  */
 export interface IObject {
+    accountId: string;
+    paymentMethodId: string;
     typeOf: PaymentServiceType;
     /**
      * 発行決済サービスID
@@ -117,14 +95,43 @@ export interface IObject {
     payAction?: any;
     onPaymentStatusChanged?: IOnPaymentStatusChanged;
 }
+export declare type IObjectWithoutDetail = Omit<IObject, 'accountId' | 'paymentMethodId'>;
+export declare type IStartParamsWithoutDetail = AssetTransactionFactory.IStartParams<AssetTransactionType.Pay, IAgent, IRecipient, IObjectWithoutDetail> & {
+    recipient: IRecipient;
+    purpose?: IPayPurpose;
+};
+export interface IStartParams extends AssetTransactionFactory.IStartParams<AssetTransactionType.Pay, IAgent, IRecipient, IObject> {
+    recipient: IRecipient;
+}
 export interface IPotentialActions {
     /**
      * 決済アクション
      */
     pay: IPayActionAttributes[];
 }
+export interface IPotentialActionsParams {
+    pay: {
+        purpose: IOrderAsPayPurpose;
+    };
+}
+/**
+ * 確定パラメータ
+ */
+export interface IConfirmParams {
+    id?: string;
+    transactionNumber?: string;
+    endDate?: Date;
+    potentialActions: IPotentialActionsParams;
+}
+export declare type IResult = any;
+export declare type IError = any;
 export interface IAttributes extends AssetTransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
 }
 export declare type ITransaction = IExtendId<IAttributes>;
 export interface ISearchConditions extends AssetTransactionFactory.ISearchConditions<AssetTransactionType.Pay> {
+    object?: {
+        accountId?: {
+            $eq?: string;
+        };
+    };
 }

package/lib/factory/assetTransaction/refund.d.ts

@@ -7,15 +7,23 @@ import { IOnPaymentStatusChanged } from '../project';
 import { PaymentServiceType } from '../service/paymentService';
 export import IAgent = AssetTransactionFactory.IAgent;
 export declare type IRecipient = IRefundRecipient;
-export interface IObjectWithoutDetail {
+export declare type IAnyPaymentMethod = AvailablePaymentMethodType;
+/**
+ * 取引対象物
+ */
+export interface IObject {
+    accountId: string;
+    paymentMethodId: string;
     typeOf: PaymentServiceType;
     /**
      * 発行決済サービスID
      */
     id: string;
+    onPaymentStatusChanged?: IOnPaymentStatusChanged;
     paymentMethod: IPaymentMethod;
     refundFee?: number;
 }
+export declare type IObjectWithoutDetail = Omit<IObject, 'accountId' | 'paymentMethodId' | 'onPaymentStatusChanged'>;
 export declare type IStartParamsWithoutDetail = AssetTransactionFactory.IStartParams<AssetTransactionType.Refund, IAgent, IRecipient, IObjectWithoutDetail>;
 export interface IStartParams extends AssetTransactionFactory.IStartParams<AssetTransactionType.Refund, IAgent, IRecipient, IObject> {
 }
@@ -35,20 +43,6 @@ export interface IConfirmParams {
 }
 export declare type IResult = any;
 export declare type IError = any;
-export declare type IAnyPaymentMethod = AvailablePaymentMethodType;
-/**
- * 取引対象物
- */
-export interface IObject {
-    typeOf: PaymentServiceType;
-    /**
-     * 発行決済サービスID
-     */
-    id: string;
-    onPaymentStatusChanged?: IOnPaymentStatusChanged;
-    paymentMethod: IPaymentMethod;
-    refundFee?: number;
-}
 export interface IPotentialActions {
     /**
      * 返金アクション
@@ -62,4 +56,9 @@ export declare type ITransaction = IExtendId<IAttributes>;
 export interface IAttributes extends AssetTransactionFactory.IAttributes<IStartParams, IResult, IError, IPotentialActions> {
 }
 export interface ISearchConditions extends AssetTransactionFactory.ISearchConditions<AssetTransactionType.Refund> {
+    object?: {
+        accountId?: {
+            $eq?: string;
+        };
+    };
 }

package/lib/factory/creativeWork/softwareApplication/webApplication.d.ts

@@ -1,9 +1,15 @@
 import * as CreativeWorkFactory from '../../creativeWork';
 import { CreativeWorkType } from '../../creativeWorkType';
-/**
- * ウェブアプリケーション
- */
-export interface ICreativeWork extends CreativeWorkFactory.ICreativeWork {
+import { IIdentifier } from '../../thing';
+export interface IWebApplicationAttributes {
     typeOf: CreativeWorkType.WebApplication;
+    /**
+     * アプリケーションクライアントID
+     */
     id: string;
+    identifier?: IIdentifier;
 }
+/**
+ * ウェブアプリケーション
+ */
+export declare type ICreativeWork = CreativeWorkFactory.ICreativeWork & IWebApplicationAttributes;

package/lib/factory/organizationType.d.ts

@@ -2,8 +2,16 @@
  * 組織タイプ
  */
 export declare enum OrganizationType {
+    /**
+     * 販売組織
+     */
     Corporation = "Corporation",
-    MovieTheater = "MovieTheater",
+    /**
+     * 顧客組織
+     */
     Organization = "Organization",
+    /**
+     * プロジェクト
+     */
     Project = "Project"
 }

package/lib/factory/organizationType.js

@@ -6,8 +6,18 @@ exports.OrganizationType = void 0;
  */
 var OrganizationType;
 (function (OrganizationType) {
+    /**
+     * 販売組織
+     */
     OrganizationType["Corporation"] = "Corporation";
-    OrganizationType["MovieTheater"] = "MovieTheater";
+    // 不要なので廃止(2022-05-30~)
+    // MovieTheater = 'MovieTheater',
+    /**
+     * 顧客組織
+     */
     OrganizationType["Organization"] = "Organization";
+    /**
+     * プロジェクト
+     */
     OrganizationType["Project"] = "Project";
 })(OrganizationType = exports.OrganizationType || (exports.OrganizationType = {}));

package/lib/factory/person.d.ts

@@ -3,7 +3,7 @@ import { IProgramMembership } from './programMembership';
 import { IPropertyValue } from './propertyValue';
 import * as ThingFactory from './thing';
 /**
- * 追加属性インターフェース
+ * 追加特性
  */
 export declare type IAdditionalProperty = IPropertyValue<string>[];
 export import IIdentifier = ThingFactory.IIdentifier;
@@ -12,10 +12,6 @@ export declare type IMemberOf = IProgramMembership;
  * プロフィール
  */
 export interface IProfile extends ThingFactory.IThing {
-    /**
-     * 追加属性
-     * プロジェクト固有の属性等
-     */
     additionalProperty?: IAdditionalProperty;
     /**
      * Physical address of the item.
@@ -46,9 +42,10 @@ export interface IProfile extends ThingFactory.IThing {
 }
 export interface IPersonAttributes {
     /**
-     * Person ID (Amazon Cognito User Identifier)
+     * Person ID(User sub)
      */
     id: string;
+    identifier?: IIdentifier;
     /**
      * An Organization (or ProgramMembership) to which this Person or Organization belongs.
      */

package/lib/factory/programMembership.d.ts

@@ -9,9 +9,6 @@ export declare enum ProgramMembershipType {
  */
 export interface IProgramMembership extends IThing {
     typeOf: ProgramMembershipType;
-    /**
-     * The service through with the permit was granted.
-     */
     /**
      * A unique identifier for the membership.
      */

package/lib/factory/transaction/moneyTransfer.d.ts

@@ -5,12 +5,29 @@ import * as MoneyTransferAssetTransactionFactory from '../assetTransaction/money
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
 import { IMonetaryAmount } from '../monetaryAmount';
-import { IPerson } from '../person';
+import { OrganizationType } from '../organizationType';
+import { PersonType } from '../personType';
 import { IProject } from '../project';
 import * as TransactionFactory from '../transaction';
 import { TransactionType } from '../transactionType';
 export declare type IAgent = TransactionFactory.IAgent;
-export declare type IRecipient = IPerson | TransactionFactory.ISeller;
+export interface IRecipientAsPerson {
+    typeOf: PersonType.Person;
+    id: string;
+    /**
+     * 受取人名称
+     */
+    name?: string;
+}
+export interface IRecipientAsSeller {
+    typeOf: OrganizationType.Corporation;
+    id: string;
+    /**
+     * 受取人名称
+     */
+    name?: string;
+}
+export declare type IRecipient = IRecipientAsPerson | IRecipientAsSeller;
 export import ISeller = TransactionFactory.ISeller;
 export import IPaymentCard = MoneyTransferAssetTransactionFactory.IPaymentCard;
 export import ITokenizedPaymentCard = MoneyTransferAssetTransactionFactory.ITokenizedPaymentCard;

package/lib/factory/transaction.d.ts

@@ -1,21 +1,23 @@
 import * as waiter from '@waiter/factory';
 import { IExtendId } from './autoGenerated';
 import * as EmailFactory from './creativeWork/message/email';
-import { ICreativeWork as IWebApplication } from './creativeWork/softwareApplication/webApplication';
+import { IWebApplicationAttributes } from './creativeWork/softwareApplication/webApplication';
 import { IMultilingualString } from './multilingualString';
 import { OrganizationType } from './organizationType';
-import * as PersonFactory from './person';
+import { IIdentifier, IPersonAttributes } from './person';
 import { PersonType } from './personType';
 import { IProject } from './project';
 import { SortType } from './sortType';
 import { TransactionStatusType } from './transactionStatusType';
 import { TransactionTasksExportationStatus } from './transactionTasksExportationStatus';
 import { TransactionType } from './transactionType';
-export declare type IOmittedProfileAttributes = 'email' | 'telephone' | 'familyName' | 'givenName' | 'age' | 'address' | 'gender' | 'additionalProperty' | 'url';
-export declare type IAgentProfile = Omit<PersonFactory.IProfile, IOmittedProfileAttributes>;
-export declare type IWebApplicationAgent = IWebApplication & IAgentProfile;
-export declare type IPersonAgent = PersonFactory.IPerson;
-export declare type IAgent = Omit<IWebApplicationAgent | PersonFactory.IPerson, IOmittedProfileAttributes>;
+export interface IAgentAsWebApplication extends IWebApplicationAttributes {
+    name?: string;
+}
+export interface IAgentAsPerson extends IPersonAttributes {
+    name?: string;
+}
+export declare type IAgent = IAgentAsWebApplication | IAgentAsPerson;
 /**
  * 販売者
  */
@@ -161,7 +163,7 @@ export interface ISearchConditions<T extends TransactionType> {
     agent?: {
         typeOf?: PersonType;
         ids?: string[];
-        identifiers?: PersonFactory.IIdentifier;
+        identifiers?: IIdentifier;
         givenName?: string;
         familyName?: string;
         telephone?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "4.230.0",
+  "version": "4.233.0",
   "description": "Chevre Factory Library for Javascript",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",