adaptform 2.0.2 → 2.0.3

package/dist/luxon.mjs

@@ -0,0 +1,120 @@
+import { DateTime } from 'luxon';
+
+// src/core/types/DateLuxonType.ts
+
+// src/core/types/FieldType.ts
+var FieldType = class {
+  constructor(options) {
+    this.options = {
+      isRequired: true,
+      messages: {},
+      ...options
+    };
+  }
+};
+
+// src/core/types/DateLuxonType.ts
+var DateLuxonType = class extends FieldType {
+  cast(rawValue) {
+    if (rawValue === null || rawValue === void 0) return null;
+    if (rawValue instanceof DateTime) {
+      return rawValue.isValid ? this.normalize(rawValue) : null;
+    }
+    if (rawValue instanceof Date) {
+      if (isNaN(rawValue.getTime())) return null;
+      return DateTime.fromJSDate(rawValue);
+    }
+    if (typeof rawValue === "number") {
+      const dt = DateTime.fromMillis(rawValue);
+      return dt.isValid ? this.normalize(dt) : null;
+    }
+    if (typeof rawValue === "string") {
+      return this.parseString(rawValue);
+    }
+    return null;
+  }
+  parseString(dateString) {
+    if (!dateString || !dateString.trim()) return null;
+    const trimmed = dateString.trim();
+    if (this.options.inputFormat) {
+      const dt = DateTime.fromFormat(trimmed, this.options.inputFormat);
+      return dt.isValid ? this.normalize(dt) : null;
+    }
+    const isoDt = DateTime.fromISO(trimmed);
+    if (isoDt.isValid) return this.normalize(isoDt);
+    const httpDt = DateTime.fromHTTP(trimmed);
+    if (httpDt.isValid) return this.normalize(httpDt);
+    const rfcDt = DateTime.fromRFC2822(trimmed);
+    if (rfcDt.isValid) return this.normalize(rfcDt);
+    return null;
+  }
+  normalize(date) {
+    let normalize_dt = date;
+    if (!this.options.isDatetime) {
+      normalize_dt = DateTime.fromObject({
+        day: date.day,
+        month: date.month,
+        year: date.year,
+        hour: 0,
+        minute: 0,
+        second: 0,
+        millisecond: 0
+      });
+    }
+    return normalize_dt;
+  }
+  validate(value) {
+    const errors = [];
+    if (!value.isValid) {
+      errors.push(
+        this.options.messages?.invalid ?? `\u041D\u0435\u0432\u0435\u0440\u043D\u0430\u044F \u0434\u0430\u0442\u0430: ${value.invalidExplanation}`
+      );
+      return errors;
+    }
+    if (this.options.minDate) {
+      const minDate = this.normalizeForComparison(this.options.minDate);
+      const compareValue = this.normalizeForComparison(value);
+      if (compareValue < minDate) {
+        errors.push(
+          this.options.messages?.minDate ?? `\u0414\u0430\u0442\u0430 \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u043D\u0435 \u0440\u0430\u043D\u0435\u0435 ${this.formatDateTime(this.options.minDate)}`
+        );
+      }
+    }
+    if (this.options.maxDate) {
+      const maxDate = this.normalizeForComparison(this.options.maxDate);
+      const compareValue = this.normalizeForComparison(value);
+      if (compareValue > maxDate) {
+        errors.push(
+          this.options.messages?.maxDate ?? `\u0414\u0430\u0442\u0430 \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u043D\u0435 \u043F\u043E\u0437\u0434\u043D\u0435\u0435 ${this.formatDateTime(this.options.maxDate)}`
+        );
+      }
+    }
+    const year = value.year;
+    if (year < 1900 || year > 2100) {
+      errors.push(this.options.messages?.invalid ?? "\u041D\u0435\u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u044B\u0439 \u0433\u043E\u0434");
+    }
+    return errors;
+  }
+  getTypeName() {
+    return this.options.isDatetime ? "\u0434\u0430\u0442\u0430 \u0438 \u0432\u0440\u0435\u043C\u044F" : "\u0434\u0430\u0442\u0430";
+  }
+  normalizeForComparison(dt) {
+    if (this.options.isDatetime) {
+      return dt;
+    }
+    return dt.startOf("day");
+  }
+  formatDateTime(dt) {
+    if (this.options.outputFormat) {
+      return dt.toFormat(this.options.outputFormat);
+    }
+    if (this.options.isDatetime) {
+      return dt.toFormat("dd.MM.yyyy HH:mm");
+    }
+    return dt.toFormat("dd.MM.yyyy");
+  }
+};
+
+export { DateLuxonType };
+//# sourceMappingURL=luxon.mjs.map
+//# sourceMappingURL=luxon.mjs.map

package/dist/luxon.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/core/types/FieldType.ts","../src/core/types/DateLuxonType.ts"],"names":[],"mappings":"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","file":"luxon.mjs","sourcesContent":["import {FieldOptions} from \"@core/options\";\nimport {Form} from \"@core/Form\";\n\nexport abstract class FieldType<T, O extends FieldOptions = FieldOptions> {\n  options: O\n\n  constructor(options: O) {\n    this.options = {\n      isRequired: true,\n      messages: {},\n      ...options\n    } as O\n  }\n\n  abstract cast(rawValue: any): T | null\n\n  abstract validate(value: T, form?: Form): string[]\n\n  abstract getTypeName(): string\n}","import {DateTime} from \"luxon\";\nimport {FieldType} from \"@core/types/FieldType\";\nimport {FieldOptions, messagesOptions} from \"@core/options\";\n\nexport interface messagesDateLuxonOptions extends messagesOptions {\n  minDate?: string\n  maxDate?: string\n}\n\nexport interface DateLuxonOptions extends FieldOptions {\n  minDate?: DateTime\n  maxDate?: DateTime\n  inputFormat?: string\n  outputFormat?: string\n  isDatetime?: boolean\n  messages?: messagesDateLuxonOptions\n}\n\nexport class DateLuxonType extends FieldType<DateTime, DateLuxonOptions> {\n  cast(rawValue: any): DateTime | null {\n    if (rawValue === null || rawValue === undefined) return null\n\n    if (rawValue instanceof DateTime) {\n      return rawValue.isValid ? this.normalize(rawValue) : null\n    }\n\n    if (rawValue instanceof Date) {\n      if (isNaN(rawValue.getTime())) return null\n      return DateTime.fromJSDate(rawValue)\n    }\n\n    if (typeof rawValue === 'number') {\n      const dt = DateTime.fromMillis(rawValue)\n      return dt.isValid ? this.normalize(dt) : null\n    }\n\n    if (typeof rawValue === 'string') {\n      return this.parseString(rawValue)\n    }\n\n    return null\n  }\n\n  private parseString(dateString: string): DateTime | null {\n    if (!dateString || !dateString.trim()) return null\n\n    const trimmed = dateString.trim()\n\n    if (this.options.inputFormat) {\n      const dt = DateTime.fromFormat(trimmed, this.options.inputFormat)\n      return dt.isValid ? this.normalize(dt) : null\n    }\n\n    const isoDt = DateTime.fromISO(trimmed)\n    if (isoDt.isValid) return this.normalize(isoDt)\n\n    const httpDt = DateTime.fromHTTP(trimmed)\n    if (httpDt.isValid) return this.normalize(httpDt)\n\n    const rfcDt = DateTime.fromRFC2822(trimmed)\n    if (rfcDt.isValid) return this.normalize(rfcDt)\n\n    return null\n  }\n\n  private normalize(date: DateTime): DateTime {\n    let normalize_dt = date\n    if (!this.options.isDatetime) {\n      normalize_dt = DateTime.fromObject({\n        day: date.day,\n        month: date.month,\n        year: date.year,\n        hour: 0,\n        minute: 0,\n        second: 0,\n        millisecond: 0\n      })\n    }\n\n    return normalize_dt\n  }\n\n  validate(value: DateTime): string[] {\n    const errors: string[] = []\n\n    if (!value.isValid) {\n      errors.push(\n        this.options.messages?.invalid ??\n        `Неверная дата: ${value.invalidExplanation}`\n      )\n      return errors\n    }\n\n    if (this.options.minDate) {\n      const minDate = this.normalizeForComparison(this.options.minDate)\n      const compareValue = this.normalizeForComparison(value)\n\n      if (compareValue < minDate) {\n        errors.push(\n          this.options.messages?.minDate ??\n          `Дата должна быть не ранее ${this.formatDateTime(this.options.minDate)}`\n        )\n      }\n    }\n\n    if (this.options.maxDate) {\n      const maxDate = this.normalizeForComparison(this.options.maxDate)\n      const compareValue = this.normalizeForComparison(value)\n\n      if (compareValue > maxDate) {\n        errors.push(\n          this.options.messages?.maxDate ??\n          `Дата должна быть не позднее ${this.formatDateTime(this.options.maxDate)}`\n        )\n      }\n    }\n\n    const year = value.year\n    if (year < 1900 || year > 2100) {\n      errors.push(this.options.messages?.invalid ?? 'Некорректный год')\n    }\n\n    return errors\n  }\n\n  getTypeName(): string {\n    return this.options.isDatetime ? 'дата и время' : 'дата'\n  }\n\n  private normalizeForComparison(dt: DateTime): DateTime {\n    if (this.options.isDatetime) {\n      return dt\n    }\n    return dt.startOf('day')\n  }\n\n  private formatDateTime(dt: DateTime): string {\n    if (this.options.outputFormat) {\n      return dt.toFormat(this.options.outputFormat)\n    }\n\n    if (this.options.isDatetime) {\n      return dt.toFormat('dd.MM.yyyy HH:mm')\n    }\n\n    return dt.toFormat('dd.MM.yyyy')\n  }\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adaptform",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Library of adaptive forms of validation",
   "keywords": [
     "form",
@@ -22,11 +22,24 @@
   "exports": {
     ".": {
       "types": {
-        "import": "./dist/index.d.ts",
-        "require": "./dist/index.d.cts"
-      },
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+        "types": "./dist/index.d.ts",
+        "import": "./dist/index.mjs",
+        "require": "./dist/index.cjs"
+      }
+    },
+    "./luxon": {
+      "types": {
+        "types": "./dist/luxon.d.ts",
+        "import": "./dist/luxon.mjs",
+        "require": "./dist/luxon.cjs"
+      }
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "luxon": [
+        "./dist/luxon.d.ts"
+      ]
     }
   },
   "files": [