@chevre/factory 4.289.0-alpha.1 → 4.289.0-alpha.11

package/lib/account/action/moneyTransfer.d.ts

@@ -2,22 +2,18 @@ import { AccountType } from '../../accountType';
 import * as ActionFactory from '../../action';
 import { ActionType } from '../../actionType';
 import { IMonetaryAmount } from '../../monetaryAmount';
-import { IThing } from '../../thing';
 import { AccountTransactionType } from '../transactionType';
-export declare type IAgent = ActionFactory.IParticipant;
-export declare type IRecipient = ActionFactory.IParticipant;
+export declare type IAgent = Pick<ActionFactory.IParticipant, 'name' | 'typeOf'>;
+export declare type IRecipient = Pick<ActionFactory.IParticipant, 'name' | 'typeOf'>;
 /**
  * 口座以外の匿名ロケーション
  */
-export interface IAnonymousLocation extends Pick<IThing, 'identifier' | 'name'> {
+export interface IAnonymousLocation {
+    name?: string;
     /**
      * ロケーションタイプ
      */
     typeOf: string;
-    /**
-     * ロケーションID
-     */
-    id?: string;
 }
 /**
  * 口座
@@ -26,8 +22,8 @@ export interface IAccount {
     typeOf: AccountType.Account;
     /**
      * 通貨
+     * 不要なので廃止(2023-02-16~)
      */
-    accountType: string;
     /**
      * 口座番号
      */
@@ -41,9 +37,6 @@ export interface IAccount {
  * 転送元あるいは転送先
  */
 export declare type ILocation = IAnonymousLocation | IAccount;
-export declare type IObject = any;
-export declare type IResult = any;
-export declare type IPotentialActions = any;
 /**
  * アクションの目的
  * ここでは、取引が目的となる
@@ -61,14 +54,11 @@ export interface IPurpose {
      * 取引番号
      */
     transactionNumber: string;
-    /**
-     * 取引識別子
-     */
-    identifier?: string;
 }
-export declare type IAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
-export interface IAttributes extends ActionFactory.IAttributes<ActionType.MoneyTransfer, IObject, IResult> {
-    identifier?: string;
+export declare type IAmount = Pick<IMonetaryAmount, 'typeOf' | 'value'>;
+export interface IAttributes extends Pick<ActionFactory.IAttributes<ActionType.MoneyTransfer, never, never>, 'project' | 'description'> {
+    agent: IAgent;
+    recipient?: IRecipient;
     typeOf: ActionType.MoneyTransfer;
     /**
      * どんな取引によって発生した転送アクションか
@@ -87,4 +77,10 @@ export interface IAttributes extends ActionFactory.IAttributes<ActionType.MoneyT
      */
     toLocation: ILocation;
 }
-export declare type IAction = ActionFactory.IAction<IAttributes>;
+export declare type IAction = Pick<ActionFactory.IAction<Omit<IAttributes, 'agent' | 'recipient'> & {
+    agent: ActionFactory.IParticipant;
+    object: never;
+}>, 'actionStatus' | 'amount' | 'description' | 'endDate' | 'fromLocation' | 'project' | 'purpose' | 'startDate' | 'toLocation' | 'typeOf' | 'id'> & {
+    agent: IAgent;
+    recipient?: IRecipient;
+};

package/lib/account/transaction/deposit.d.ts

@@ -1,5 +1,5 @@
 import { IExtendId } from '../../autoGenerated';
-import { IAccount, IAnonymousLocation } from '../action/moneyTransfer';
+import { IAccount } from '../action/moneyTransfer';
 import * as TransactionFactory from '../transaction';
 import { AccountTransactionType } from '../transactionType';
 export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AccountTransactionType.Deposit, IObjectWithoutDetail>;
@@ -8,21 +8,16 @@ export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<
  */
 export declare type IStartParams = TransactionFactory.IStartParams<AccountTransactionType.Deposit, IObject>;
 export interface IObjectWithoutDetail extends TransactionFactory.IObjectWithoutDetail {
-    fromLocation?: IAnonymousLocation;
     toLocation: TransactionFactory.ISimpleAccount;
 }
 /**
  * 取引対象物
  */
 export interface IObject extends TransactionFactory.IObject {
-    /**
-     * 入金元
-     */
-    fromLocation?: IAnonymousLocation;
     /**
      * 入金先
      */
-    toLocation: IAccount;
+    toLocation: Pick<IAccount, 'accountNumber' | 'name' | 'typeOf'>;
 }
 /**
  * 入金取引属性

package/lib/account/transaction/transfer.d.ts

@@ -18,11 +18,11 @@ export interface IObject extends TransactionFactory.IObject {
     /**
      * 転送元
      */
-    fromLocation: IAccount;
+    fromLocation: Pick<IAccount, 'accountNumber' | 'name' | 'typeOf'>;
     /**
      * 転送先
      */
-    toLocation: IAccount;
+    toLocation: Pick<IAccount, 'accountNumber' | 'name' | 'typeOf'>;
 }
 /**
  * 転送取引

package/lib/account/transaction/withdraw.d.ts

@@ -1,5 +1,5 @@
 import { IExtendId } from '../../autoGenerated';
-import { IAccount, IAnonymousLocation } from '../action/moneyTransfer';
+import { IAccount } from '../action/moneyTransfer';
 import * as TransactionFactory from '../transaction';
 import { AccountTransactionType } from '../transactionType';
 export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<AccountTransactionType.Withdraw, IObjectWithoutDetail>;
@@ -9,7 +9,6 @@ export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<
 export declare type IStartParams = TransactionFactory.IStartParams<AccountTransactionType.Withdraw, IObject>;
 export interface IObjectWithoutDetail extends TransactionFactory.IObjectWithoutDetail {
     fromLocation: TransactionFactory.ISimpleAccount;
-    toLocation?: IAnonymousLocation;
     /**
      * 利用可能金額確認をしない場合、force: true
      */
@@ -22,13 +21,8 @@ export interface IObject extends TransactionFactory.IObject {
     /**
      * 出金元
      */
-    fromLocation: IAccount;
-    /**
-     * 出金先
-     */
-    toLocation?: IAnonymousLocation;
+    fromLocation: Pick<IAccount, 'accountNumber' | 'name' | 'typeOf'>;
 }
-export import IPotentialActions = TransactionFactory.IPotentialActions;
 /**
  * 出金取引
  */

package/lib/account/transaction.d.ts

@@ -2,7 +2,6 @@ import { IExtendId } from '../autoGenerated';
 import { OrganizationType } from '../organizationType';
 import { SortType } from '../sortType';
 import { TransactionStatusType } from '../transactionStatusType';
-import { TransactionTasksExportationStatus } from '../transactionTasksExportationStatus';
 import * as MoneyTransferActionFactory from './action/moneyTransfer';
 import { AccountTransactionType } from './transactionType';
 export import IAgent = MoneyTransferActionFactory.IAgent;
@@ -72,9 +71,6 @@ export interface IPotentialActions {
 /**
  * エラー
  */
-export declare type IError = any;
-export interface IResult {
-}
 /**
  * 口座取引属性
  */
@@ -86,11 +82,9 @@ export declare type IAttributes<TStartParams> = TStartParams & {
     /**
      * 取引結果
      */
-    result?: IResult;
     /**
      * 取引エラー
      */
-    error?: IError;
     /**
      * 取引開始日時
      */
@@ -102,11 +96,9 @@ export declare type IAttributes<TStartParams> = TStartParams & {
     /**
      * タスクエクスポート日時
      */
-    tasksExportedAt?: Date;
     /**
      * タスクエクスポート状態
      */
-    tasksExportationStatus: TransactionTasksExportationStatus;
     /**
      * 事後に発生するアクション
      */

package/lib/account.d.ts

@@ -10,16 +10,6 @@ import * as WithdrawTransactionFactory from './account/transaction/withdraw';
 /**
  * 口座ステータスタイプ
  */
-export declare enum AccountStatusType {
-    /**
-     * 開設済
-     */
-    Opened = "Opened",
-    /**
-     * 解約済
-     */
-    Closed = "Closed"
-}
 export declare namespace action {
     export import moneyTransfer = MoneyTransferActionFactory;
 }
@@ -27,7 +17,6 @@ export declare namespace transaction {
     export import IAgent = TransactionFactory.IAgent;
     export import IRecipient = TransactionFactory.IRecipient;
     export import IPotentialActions = TransactionFactory.IPotentialActions;
-    export import IResult = TransactionFactory.IResult;
     type ISearchConditions = TransactionFactory.ISearchConditions;
     type IStartParamsWithoutDetail<T extends AccountTransactionType> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.IStartParamsWithoutDetail : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.IStartParamsWithoutDetail : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.IStartParamsWithoutDetail : never;
     type IStartParams<T extends AccountTransactionType> = T extends AccountTransactionType.Deposit ? DepositTransactionFactory.IStartParams : T extends AccountTransactionType.Withdraw ? WithdrawTransactionFactory.IStartParams : T extends AccountTransactionType.Transfer ? TransferTransactionFactory.IStartParams : never;
@@ -93,10 +82,6 @@ export interface IAccount {
      * 口座閉鎖日時
      */
     closeDate?: Date;
-    /**
-     * 口座ステータス
-     */
-    status: AccountStatusType;
 }
 /**
  * ソート条件
@@ -135,7 +120,6 @@ export interface ISearchConditions {
         $lte?: Date;
     };
     project?: IProjectSearchConditions;
-    statuses?: AccountStatusType[];
     typeOf?: {
         $eq?: string;
         $in?: string[];

package/lib/account.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transactionType = exports.transaction = exports.action = exports.AccountStatusType = void 0;
+exports.transactionType = exports.transaction = exports.action = void 0;
 var transactionType_1 = require("./account/transactionType");
 var MoneyTransferActionFactory = require("./account/action/moneyTransfer");
 var DepositTransactionFactory = require("./account/transaction/deposit");
@@ -9,17 +9,16 @@ var WithdrawTransactionFactory = require("./account/transaction/withdraw");
 /**
  * 口座ステータスタイプ
  */
-var AccountStatusType;
-(function (AccountStatusType) {
-    /**
-     * 開設済
-     */
-    AccountStatusType["Opened"] = "Opened";
-    /**
-     * 解約済
-     */
-    AccountStatusType["Closed"] = "Closed";
-})(AccountStatusType = exports.AccountStatusType || (exports.AccountStatusType = {}));
+// export enum AccountStatusType {
+//     /**
+//      * 開設済
+//      */
+//     Opened = 'Opened',
+//     /**
+//      * 解約済
+//      */
+//     Closed = 'Closed'
+// }
 var action;
 (function (action) {
     action.moneyTransfer = MoneyTransferActionFactory;

package/lib/action/transfer/moneyTransfer.d.ts

@@ -9,7 +9,6 @@ import { IMonetaryAmount } from '../../monetaryAmount';
  */
 export interface IPendingTransaction {
     typeOf: AccountFactory.transactionType;
-    id: string;
     identifier?: string;
     transactionNumber: string;
 }
@@ -18,7 +17,12 @@ export declare type IRecipient = ActionFactory.IParticipant;
 /**
  * 匿名ロケーション
  */
-export import IAnonymousLocation = AccountFactory.action.moneyTransfer.IAnonymousLocation;
+export interface IAnonymousLocation {
+    id?: string;
+    identifier?: string;
+    name?: string;
+    typeOf: string;
+}
 /**
  * ペイメントカード
  */

package/lib/additionalProperty.d.ts

@@ -1,11 +1,12 @@
 import { EventType } from './eventType';
 import { IMultilingualString } from './multilingualString';
 import { OfferType } from './offerType';
+import { OrderType } from './order';
 import { IProject } from './project';
 import { PropertyValueType } from './propertyValue';
 import { SortType } from './sortType';
 import { IThing } from './thing';
-export declare type CategorySetIdentifier = EventType.ScreeningEvent | EventType.ScreeningEventSeries | PropertyValueType.LocationFeatureSpecification | 'OfferCatalog' | OfferType.Offer;
+export declare type CategorySetIdentifier = EventType.ScreeningEvent | EventType.ScreeningEventSeries | PropertyValueType.LocationFeatureSpecification | 'OfferCatalog' | OfferType.Offer | OrderType.Order;
 /**
  * {@link https://schema.org/CategoryCodeSet}
  */

package/lib/assetTransaction/moneyTransfer.d.ts

@@ -59,7 +59,7 @@ export interface IObject {
      * 取引説明
      */
     description?: string;
-    pendingTransaction?: IPendingTransaction;
+    pendingTransaction: IPendingTransaction;
     /**
      * 負の残高でも強制的に出金するかどうか
      */

package/lib/event/screeningEvent.d.ts

@@ -167,12 +167,12 @@ export declare type ISuperEvent = Omit<ScreeningEventSeriesFactory.IEvent, 'even
 export import IName = AnyEventFactory.IName;
 /**
  * イベント属性
+ * workPerformed->superEvent.workPerformed完全移行(2023-02-20~)
  */
-export interface IAttributes extends Omit<AnyEventFactory.IAttributes, 'offers' | 'typeOf'> {
+export interface IAttributes extends Omit<AnyEventFactory.IAttributes, 'offers' | 'typeOf' | 'workPerformed'> {
     /**
      * コンテンツ
      */
-    workPerformed?: IWorkPerformed;
     /**
      * 親イベント
      * 施設コンテンツに相当

package/lib/order.d.ts

@@ -277,6 +277,7 @@ export interface IOrder extends ISimpleOrder {
      * The offers included in the order.Also accepts an array of objects.
      */
     acceptedOffers?: IAcceptedOffer<IItemOffered>[];
+    additionalProperty?: IPropertyValue<string>[];
     /**
      * An entity that arranges for an exchange between a buyer and a seller.
      * In most cases a broker never acquires or releases ownership of a product or service involved in an exchange.
@@ -513,6 +514,19 @@ export interface ISearchConditions {
             $eq?: string;
         };
     };
+    additionalProperty?: {
+        $all?: IPropertyValue<string>[];
+        $in?: IPropertyValue<string>[];
+        $nin?: IPropertyValue<string>[];
+        $elemMatch?: {
+            name?: {
+                /**
+                 * 一致する名称の追加特性がひとつでも存在する
+                 */
+                $eq?: string;
+            };
+        };
+    };
     broker?: {
         id?: {
             $eq?: string;

package/lib/permit.d.ts

@@ -4,21 +4,21 @@ import { IOrganization } from './organization';
 import { IProduct } from './product';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
-import { IThing } from './thing';
 export declare enum PermitType {
     Permit = "Permit"
 }
-export declare type IIssuedThrough = Pick<IProduct, 'id' | 'project' | 'serviceType' | 'typeOf'>;
-export declare type IPaymentAccount = Pick<IAccount, 'project' | 'typeOf' | 'accountNumber' | 'accountType'>;
+export declare type IIssuedThrough = Pick<IProduct, 'id' | 'serviceType' | 'typeOf'>;
+export declare type IPaymentAccount = Pick<IAccount, 'accountNumber' | 'typeOf'>;
+export declare type IPaymentAccountWithDetail = Pick<IAccount, 'accountNumber' | 'availableBalance' | 'balance' | 'typeOf'>;
 export declare type IAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
-export declare type IDepositAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'maxValue' | 'minValue'>;
-export declare type IPaymentAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'maxValue' | 'minValue'>;
+export declare type IDepositAmount = Pick<IMonetaryAmount, 'typeOf' | 'maxValue' | 'minValue'>;
+export declare type IPaymentAmount = Pick<IMonetaryAmount, 'typeOf' | 'maxValue' | 'minValue'>;
 export declare type IIssuedBy = Pick<IOrganization, 'typeOf' | 'id' | 'name'>;
 /**
  * A permit issued by an organization, e.g. a parking pass.
  * {@link https://schema.org/Permit}
  */
-export interface IPermit extends Pick<IThing, 'name'> {
+export interface IPermit {
     name?: string;
     project: Pick<IProject, 'id' | 'typeOf'>;
     typeOf: PermitType;

package/lib/unitPriceOffer.d.ts

@@ -92,6 +92,10 @@ export interface IPriceSpecificationSearchConditions {
          * 適用決済カード区分
          */
         serviceType?: {
+            /**
+             * 適用決済カード区分が存在するかどうか
+             */
+            $exists?: boolean;
             $eq?: string;
         };
         serviceOutput?: {
@@ -100,6 +104,7 @@ export interface IPriceSpecificationSearchConditions {
              */
             typeOf?: {
                 $eq?: string;
+                $nin?: string[];
             };
         };
     };

package/package.json

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