@chevre/factory 4.396.0-alpha.5 → 4.396.0-alpha.7

package/lib/action/authorize/offer/product.d.ts

@@ -6,7 +6,7 @@ import { IOffer } from '../../../offer';
 import * as OrderFactory from '../../../order';
 import { IIssuedThroughAsProduct, IPermit } from '../../../permit';
 import { PriceCurrency } from '../../../priceCurrency';
-import { IProduct, IServiceOutput as IProductServiceOutput, ITicketPriceSpecification } from '../../../product';
+import { IMembershipProduct, IPaymentCardProduct, IServiceOutput as IProductServiceOutput, ITicketPriceSpecification } from '../../../product';
 import { ISeller } from '../../../seller';
 import { TransactionType } from '../../../transactionType';
 import * as AuthorizeActionFactory from '../../authorize';
@@ -16,7 +16,7 @@ export type IRecipient = ActionFactory.IParticipantAsWebApplication | ActionFact
 export type IPermitIssuedByProduct = Omit<IPermit, 'issuedThrough'> & {
     issuedThrough?: IIssuedThroughAsProduct;
 };
-export type IItemOffered = Pick<IProduct, 'typeOf' | 'id' | 'name'> & {
+export type IItemOffered = Pick<IMembershipProduct | IPaymentCardProduct, 'typeOf' | 'id' | 'name'> & {
     serviceOutput: IProductServiceOutput & IPermitIssuedByProduct;
     pointAward?: IPointAward;
 };

package/lib/assetTransaction/registerService.d.ts

@@ -5,7 +5,7 @@ import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
 import { OfferType } from '../offerType';
 import { IIssuedThroughAsProduct, IPermit } from '../permit';
-import { IProduct } from '../product';
+import { IMembershipProduct, IPaymentCardProduct } from '../product';
 export import IAgent = AssetTransactionFactory.IAgent;
 export type IStartParamsWithoutDetail = AssetTransactionFactory.IStartParams<AssetTransactionType.RegisterService, IAgent, undefined, IObjectWithoutDetail>;
 /**
@@ -66,7 +66,7 @@ export interface IAcceptedOfferWithoutDetail {
     id: string;
     itemOffered: IAcceptedItemOffered;
 }
-export interface IItemOffered extends Pick<IProduct, 'id' | 'serviceOutput' | 'typeOf'> {
+export interface IItemOffered extends Pick<IMembershipProduct | IPaymentCardProduct, 'id' | 'typeOf'> {
     serviceOutput: IServiceOutput;
     pointAward?: IPointAward;
 }

package/lib/authorization.d.ts

@@ -3,14 +3,14 @@ import { IMember, IMemberOfRole } from './iam';
 import { IInvoice } from './invoice';
 import { IOrder } from './order';
 import { OrganizationType } from './organizationType';
-import { IOwnershipInfo, IPermitAsGood, IPermitIssuedThroughAsFaceToFace, IPermitIssuedThroughAsProduct } from './ownershipInfo';
+import { IOwnershipInfo, IPermitAsGood, IPermitIssuedThroughAsCreditCard, IPermitIssuedThroughAsFaceToFace, IPermitIssuedThroughAsProduct } from './ownershipInfo';
 import { PersonType } from './personType';
 import { IProject } from './project';
 import { PaymentServiceType } from './service/paymentService';
 import { SortType } from './sortType';
 import { TransactionType } from './transactionType';
 export type IOrderAsObject = Pick<IOrder, 'orderNumber' | 'typeOf'>;
-export type IPermitIssuedThroughOfObjectTypeOfGood = Pick<IPermitIssuedThroughAsFaceToFace, 'typeOf'> | Pick<IPermitIssuedThroughAsProduct, 'id' | 'typeOf'>;
+export type IPermitIssuedThroughOfObjectTypeOfGood = Pick<IPermitIssuedThroughAsFaceToFace, 'typeOf'> | Pick<IPermitIssuedThroughAsCreditCard, 'id' | 'typeOf'> | Pick<IPermitIssuedThroughAsProduct, 'id' | 'typeOf'>;
 export type IPermitAsObjectTypeOfGood = Pick<IPermitAsGood, 'identifier' | 'typeOf'> & {
     issuedThrough?: IPermitIssuedThroughOfObjectTypeOfGood;
 };

package/lib/offer.d.ts

@@ -7,7 +7,7 @@ import { OrganizationType } from './organizationType';
 import { PriceCurrency } from './priceCurrency';
 import { IPriceSpecification } from './priceSpecification';
 import { PriceSpecificationType } from './priceSpecificationType';
-import { IProduct } from './product';
+import { IAddOnProduct } from './product';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
 import { IQuantitativeValue } from './quantitativeValue';
@@ -64,7 +64,7 @@ export interface IAvailableAtOrFrom {
      */
     id: string;
 }
-export type IItemOffered4addOn = Pick<IProduct, 'description' | 'id' | 'name' | 'productID' | 'typeOf'>;
+export type IItemOffered4addOn = Pick<IAddOnProduct, 'description' | 'id' | 'name' | 'productID' | 'typeOf'>;
 /**
  * アドオン
  */

package/lib/order.d.ts

@@ -17,7 +17,7 @@ import { PersonType } from './personType';
 import { PlaceType } from './placeType';
 import { PriceCurrency } from './priceCurrency';
 import { IPriceSpecification as ICompoundPriceSpecification } from './priceSpecification/compoundPriceSpecification';
-import { IProduct, ProductType } from './product';
+import { IMembershipProduct, IPaymentCardProduct, ProductType } from './product';
 import { IPropertyValue } from './propertyValue';
 import { IProgramMembershipUsedSearchConditions, ITicket, ITicketType } from './reservation';
 import * as BusReservationFactory from './reservation/busReservation';
@@ -241,7 +241,7 @@ export interface ITransportationAsOrderedItem {
     serviceType?: EventReservationFactory.IServiceTypeOfIssuedThrough;
     id: string;
 }
-export type IProductAsOrderedItem = Pick<IProduct, 'serviceType' | 'typeOf'> & {
+export type IProductAsOrderedItem = Pick<IMembershipProduct | IPaymentCardProduct, 'serviceType' | 'typeOf'> & {
     id: string;
 };
 /**

package/lib/ownershipInfo.d.ts

@@ -50,8 +50,9 @@ export interface IEventReservationAsGood {
  */
 export type IReservation = IBusReservationAsGood | IEventReservationAsGood;
 export type IPermitIssuedThroughAsFaceToFace = Pick<PermitFactory.IIssuedThroughAsFaceToFace, 'typeOf'>;
-export type IPermitIssuedThroughAsProduct = Pick<PermitFactory.IIssuedThroughAsProduct, 'id' | 'typeOf' | 'serviceType'> | Pick<PermitFactory.IIssuedThroughAsCreditCard, 'id' | 'typeOf' | 'serviceType'>;
-export type IPermitIssuedThrough = IPermitIssuedThroughAsFaceToFace | IPermitIssuedThroughAsProduct;
+export type IPermitIssuedThroughAsCreditCard = Pick<PermitFactory.IIssuedThroughAsCreditCard, 'id' | 'typeOf'>;
+export type IPermitIssuedThroughAsProduct = Pick<PermitFactory.IIssuedThroughAsProduct, 'id' | 'typeOf' | 'serviceType'>;
+export type IPermitIssuedThrough = IPermitIssuedThroughAsFaceToFace | IPermitIssuedThroughAsCreditCard | IPermitIssuedThroughAsProduct;
 export type IPermitAsGood = Pick<PermitFactory.IPermit, 'identifier' | 'typeOf' | 'name' | 'validFor'> & {
     identifier: string;
     issuedThrough?: IPermitIssuedThrough;

package/lib/permit.d.ts

@@ -1,26 +1,37 @@
 import { IAccount } from './account';
 import { IMonetaryAmount } from './monetaryAmount';
 import { IOrganization } from './organization';
-import { IProduct, ProductType } from './product';
+import { IMembershipProduct, IPaymentCardProduct } from './product';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
-import { PaymentServiceType } from './service/paymentService';
+import { IService as IPaymentService, PaymentServiceType } from './service/paymentService';
 export declare enum PermitType {
     Permit = "Permit"
 }
+/**
+ * メンバーシップ出力決済サービス(対面決済IF)
+ */
 export interface IIssuedThroughAsFaceToFace {
     typeOf: PaymentServiceType.FaceToFace;
 }
-export type IIssuedThroughAsCreditCard = Pick<IProduct, 'id' | 'serviceType'> & {
+/**
+ * メンバーシップ出力決済サービス(クレジットカードIF)
+ */
+export type IIssuedThroughAsCreditCard = Pick<IPaymentService, 'id'> & {
     /**
      * 決済サービスID
      */
     id: string;
+    serviceType?: never;
     typeOf: PaymentServiceType.CreditCard;
 };
-export type IIssuedThroughAsProduct = Pick<IProduct, 'id' | 'serviceType' | 'typeOf'> & {
+/**
+ * メンバーシップあるいはペイメントカード出力プロダクト
+ */
+export type IIssuedThroughAsProduct = Pick<IMembershipProduct, 'id' | 'serviceType' | 'typeOf'> & {
+    id: string;
+} | Pick<IPaymentCardProduct, 'id' | 'serviceType' | 'typeOf'> & {
     id: string;
-    typeOf: ProductType.MembershipService | ProductType.PaymentCard;
 };
 export type IIssuedThrough = IIssuedThroughAsFaceToFace | IIssuedThroughAsCreditCard | IIssuedThroughAsProduct;
 export type IPaymentAccount = Pick<IAccount, 'accountNumber' | 'typeOf'>;

package/lib/priceSpecification/unitPriceSpecification.d.ts

@@ -1,7 +1,7 @@
 import { OfferType } from '../offerType';
 import { IPriceSpecification as BaseSpecification } from '../priceSpecification';
 import { PriceSpecificationType } from '../priceSpecificationType';
-import { IProduct } from '../product';
+import { IAddOnProduct } from '../product';
 import { IQuantitativeValue } from '../quantitativeValue';
 import { UnitCode } from '../unitCode';
 import { IAppliesToMovieTicket as IMovieTicketTypeChargeSpecAppliesToMovieTicket } from './movieTicketTypeChargeSpecification';
@@ -12,7 +12,7 @@ export type IAppliesToMovieTicket = Pick<IMovieTicketTypeChargeSpecAppliesToMovi
     identifier?: string;
 };
 export type IReferenceQuantity = Pick<IQuantitativeValue<UnitCode>, 'typeOf' | 'value' | 'unitCode' | 'minValue'>;
-export type IAppliesToAddOnItemOffered = Pick<IProduct, 'id' | 'name' | 'productID' | 'typeOf'>;
+export type IAppliesToAddOnItemOffered = Pick<IAddOnProduct, 'id' | 'name' | 'productID' | 'typeOf'>;
 export interface IAppliesToAddOn {
     typeOf: OfferType.Offer;
     id?: string;

package/lib/product.d.ts

@@ -59,33 +59,37 @@ export type IServiceOutput = Pick<IPermit, 'typeOf'> & {
 };
 /**
  * 外部サービス認証情報
- * typeOf: PaymentCardの場合のみ
  */
 export interface ICredentials {
     authorizeServerDomain?: string;
     clientId?: string;
     clientSecret?: string;
 }
+export interface INoCredentials {
+    authorizeServerDomain?: never;
+    clientId?: never;
+    clientSecret?: never;
+}
 export interface IAvailableChannel {
     typeOf: 'ServiceChannel';
     serviceUrl?: string;
     credentials?: ICredentials;
 }
+export interface INoAvailableChannel {
+    typeOf: 'ServiceChannel';
+    serviceUrl?: never;
+    credentials?: INoCredentials;
+}
 export type IServiceType = Pick<ICategoryCode, 'codeValue' | 'inCodeSet' | 'typeOf'>;
 export type IOffer = Pick<IBaseOffer, 'typeOf' | 'priceCurrency' | 'availabilityEnds' | 'availabilityStarts' | 'validFrom' | 'validThrough'> & {
     seller?: {
         id?: string;
     };
 };
-/**
- * product
- * {@link https://schema.org/Product}
- */
-export interface IProduct extends Pick<IThing, 'name' | 'description'> {
+export interface ICommonAttributes extends Pick<IThing, 'name' | 'description'> {
     project: Pick<IProject, 'id' | 'typeOf'>;
     typeOf: ProductType;
     id?: string;
-    availableChannel?: IAvailableChannel;
     /**
      * 説明
      */
@@ -103,18 +107,68 @@ export interface IProduct extends Pick<IThing, 'name' | 'description'> {
      * プロジェクト内でユニークなプロダクトコード
      */
     productID: string;
+    additionalProperty?: IPropertyValue<string>[];
+    potentialAction?: never;
+}
+/**
+ * 興行などのプロダクト
+ */
+export interface IEventServiceProduct extends ICommonAttributes {
+    typeOf: ProductType.EventService | ProductType.Transportation;
+    availableChannel?: INoAvailableChannel;
+    serviceOutput?: never;
+    /**
+     * The type of service being offered, e.g. veterans' benefits, emergency relief, etc.
+     * 興行区分
+     */
+    serviceType?: IServiceType;
+}
+/**
+ * アドオンプロダクト
+ */
+export interface IAddOnProduct extends ICommonAttributes {
+    typeOf: ProductType.Product;
+    availableChannel?: INoAvailableChannel;
+    serviceOutput?: never;
+    serviceType?: never;
+}
+/**
+ * メンバーシッププロダクト
+ */
+export interface IMembershipProduct extends ICommonAttributes {
+    typeOf: ProductType.MembershipService;
+    availableChannel?: IAvailableChannel;
     /**
      * The tangible thing generated by the service, e.g. a passport, permit, etc.
      */
     serviceOutput?: IServiceOutput;
     /**
      * The type of service being offered, e.g. veterans' benefits, emergency relief, etc.
-     * サービスタイプ(興行区分、メンバーシップ区分、決済方法区分)
+     * メンバーシップ区分
      */
     serviceType?: IServiceType;
-    additionalProperty?: IPropertyValue<string>[];
-    potentialAction?: never;
 }
+/**
+ * ペイメントカードプロダクト
+ */
+export interface IPaymentCardProduct extends ICommonAttributes {
+    typeOf: ProductType.PaymentCard;
+    availableChannel?: IAvailableChannel;
+    /**
+     * The tangible thing generated by the service, e.g. a passport, permit, etc.
+     */
+    serviceOutput?: IServiceOutput;
+    /**
+     * The type of service being offered, e.g. veterans' benefits, emergency relief, etc.
+     * 決済方法区分
+     */
+    serviceType?: IServiceType;
+}
+/**
+ * プロダクト
+ * {@link https://schema.org/Product}
+ */
+export type IProduct = IEventServiceProduct | IAddOnProduct | IMembershipProduct | IPaymentCardProduct;
 export interface IHasOfferCatalogOnCreate {
     /**
      * IDを指定する場合
@@ -213,6 +267,12 @@ export interface ISearchConditions {
             $eq?: string;
         };
     };
+    additionalPropertyMatch?: {
+        /**
+         * 一致する名称の追加特性がひとつでも存在する
+         */
+        nameEq?: string;
+    };
 }
 /**
  * サービスアウトプット検索条件

package/lib/unitPriceOffer.d.ts

@@ -6,7 +6,7 @@ import { OfferType } from './offerType';
 import { IAmount as IPermitAmount, IDepositAmount, IPaymentAmount } from './permit';
 import { IAccounting } from './priceSpecification';
 import { IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
-import { IProduct, ProductType } from './product';
+import { IAddOnProduct, ProductType } from './product';
 import { SortType } from './sortType';
 import { IOfferMerchantReturnPolicy, IOfferMerchantReturnPolicySearchConditions, IOfferMerchantReturnPolicySortOrder } from './unitPriceOffer/merchantReturnPolicy';
 export type IHasMerchantReturnPolicy = (Pick<IOfferMerchantReturnPolicy, 'typeOf' | 'id' | 'identifier' | 'name'> & {
@@ -42,7 +42,7 @@ export interface IItemOffered {
  * 単価オファーの価格仕様
  */
 export type IUnitPriceOfferPriceSpecification = Pick<IUnitPriceSpecification, 'accounting' | 'appliesToMovieTicket' | 'eligibleQuantity' | 'eligibleTransactionVolume' | 'name' | 'price' | 'priceCurrency' | 'referenceQuantity' | 'typeOf' | 'valueAddedTaxIncluded'>;
-export type IAddOnItemOffered = Pick<IProduct, 'typeOf' | 'id' | 'name'>;
+export type IAddOnItemOffered = Pick<IAddOnProduct, 'typeOf' | 'id' | 'name'>;
 export interface IAddOn4unitPriceOffer extends Pick<IAddOn, 'typeOf' | 'priceCurrency'> {
     itemOffered: IAddOnItemOffered;
 }

package/package.json

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