@shisyamo4131/air-guard-v2-schemas 2.4.0 → 2.4.2-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shisyamo4131/air-guard-v2-schemas",
-  "version": "2.4.0",
+  "version": "2.4.2-dev.0",
   "description": "Schemas for AirGuard V2",
   "type": "module",
   "main": "index.js",

package/src/Company.js

@@ -14,6 +14,7 @@ import { defAccessor } from "./parts/accessorDefinitions.js";
 import Agreement from "./Agreement.js";
 import SiteOrder from "./SiteOrder.js";
 import RoundSetting from "./RoundSetting.js";
+import { GeocodableMixin } from "./mixins/GeocodableMixin.js";
 
 const classProps = {
   companyName: defField("name", { label: "会社名", required: true }),
@@ -121,7 +122,7 @@ const classProps = {
   maintenanceStartedBy: defField("oneLine", { default: null, hidden: true }),
 };
 
-export default class Company extends FireModel {
+export default class Company extends GeocodableMixin(FireModel) {
   static className = "会社";
   static collectionPath = "Companies";
   static usePrefix = false;

package/src/Customer.js

@@ -14,6 +14,7 @@ import {
   CONTRACT_STATUS_VALUES,
   PAYMENT_MONTH_OPTIONS,
 } from "./constants/index.js";
+import { GeocodableMixin } from "./mixins/GeocodableMixin.js";
 
 const classProps = {
   code: defField("code", { label: "取引先コード" }),
@@ -82,7 +83,7 @@ const classProps = {
  * @param {Date} baseDate - base date in UTC (JST - 9 hours)
  * @returns {Date} payment due date in UTC (JST - 9 hours)
  *****************************************************************************/
-export default class Customer extends FireModel {
+export default class Customer extends GeocodableMixin(FireModel) {
   static className = "取引先";
   static collectionPath = "Customers";
   static useAutonumber = false;

package/src/Employee.js

@@ -9,6 +9,7 @@ import { defAccessor } from "./parts/accessorDefinitions.js";
 import { VALUES as EMPLOYMENT_STATUS_VALUES } from "./constants/employment-status.js";
 import { VALUES as BLOOD_TYPE_VALUES } from "./constants/blood-type.js";
 import Certification from "./Certification.js";
+import { GeocodableMixin } from "./mixins/GeocodableMixin.js";
 
 const classProps = {
   code: defField("code", { label: "従業員コード" }),
@@ -213,7 +214,7 @@ const classProps = {
  *
  * @function toTerminated - Change the current employee instance to terminated status.
  *****************************************************************************/
-export default class Employee extends FireModel {
+export default class Employee extends GeocodableMixin(FireModel) {
   static className = "従業員";
   static collectionPath = "Employees";
   static useAutonumber = false;

package/src/Site.js

@@ -18,6 +18,7 @@ import { defAccessor } from "./parts/accessorDefinitions.js";
 import Customer from "./Customer.js";
 import Agreement from "./Agreement.js";
 import { VALUES } from "./constants/site-status.js";
+import { GeocodableMixin } from "./mixins/GeocodableMixin.js";
 
 const classProps = {
   customerId: defField("customerId", {
@@ -99,7 +100,7 @@ const classProps = {
  * @param {Agreement} agreement - Agreement instance to remove.
  * @throws {Error} If agreement not found.
  *****************************************************************************/
-export default class Site extends FireModel {
+export default class Site extends GeocodableMixin(FireModel) {
   static className = "現場";
   static collectionPath = "Sites";
   static useAutonumber = false;

package/src/parts/fieldDefinitions.js

@@ -808,6 +808,7 @@ export const defField = (key, options = {}) => {
   if (options.hasOwnProperty("length")) {
     // options.length が明示的に指定されていれば最優先
     lengthToUseForRules = options.length;
+    newConfig.length = options.length; // newConfig.length も更新
   } else if (
     newConfig.hasOwnProperty("length") &&
     newConfig.length !== undefined