v19 is for Dime

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, v15, v16, v17 ]
+    branches: [ master, v16, v17, v18, make-v19 ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master, v15, v16, v17 ]
+    branches: [ master, v16, v17, v18, make-v19 ]
   schedule:
     - cron: '26 8 * * 1'
 

.github/workflows/node.js.yml

@@ -5,17 +5,17 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master, v15, v16, v17 ]
+    branches: [ master, v16, v17, v18, make-v19 ]
   pull_request:
-    branches: [ master, v15, v16, v17 ]
+    branches: [ master, v16, v17, v18, make-v19 ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.0.0, 18.x, 20.0.0, 20.x, 22.0.0, 22.x]
+        node-version: [18.18.0, 18.x, 20.9.0, 20.x, 22.0.0, 22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
     - name: Get yarn cache dir
@@ -41,13 +41,7 @@ jobs:
         timeout_seconds: 15
         max_attempts: 3
         on_retry_command: yarn config set registry https://registry.npmjs.org
-        # todo use regular "yarn install" when min Node version increased to 18.18
-        # @typescript/eslint group compatibility issue fixed by ignoring engines for dev dependencies only:
-        command: |
-          npm pkg delete devDependencies
-          yarn install
-          git checkout -- .
-          yarn install --ignore-engines
+        command: yarn install
     - name: Lint
       run: yarn lint
     - name: Test
@@ -75,15 +69,7 @@ jobs:
         max_attempts: 3
         on_retry_command: yarn config set registry https://registry.npmjs.org
         command: yarn test:esm
-    - name: Check Jest 30 compatibility
-      uses: madhead/semver-utils@v4
-      id: jest30compat
-      with:
-        version: ${{ steps.setup-node.outputs.node-version }}
-        satisfies: '>=18.12.0'
-        lenient: false # require to parse or fail
     - name: Compatibility test
-      if: steps.jest30compat.outputs.satisfies == 'true'
       uses: nick-fields/retry@v3
       with:
         timeout_seconds: 15

.github/workflows/swagger.yml

@@ -2,9 +2,9 @@ name: OpenAPI Validation
 
 on:
   push:
-    branches: [ master, v15, v16, v17 ]
+    branches: [ master, v16, v17, v18, make-v19 ]
   pull_request:
-    branches: [ master, v15, v16, v17 ]
+    branches: [ master, v16, v17, v18, make-v19 ]
 
 
 jobs:

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 19
+
+### v19.0.0
+
+- Minimum supported versions:
+  - Node: 18.18.0 or 20.9.0,
+  - `zod`: 3.23.0.
+
 ## Version 18
 
 ### v18.3.0

package.json

@@ -62,7 +62,7 @@
     "*.md"
   ],
   "engines": {
-    "node": "^18.0.0 || ^20.0.0 || ^22.0.0"
+    "node": "^18.18.0 || ^20.9.0 || ^22.0.0"
   },
   "dependencies": {
     "ansis": "^3.1.0",
@@ -84,7 +84,7 @@
     "prettier": "^3.1.0",
     "typescript": "^5.1.3",
     "vitest": "^1.0.4",
-    "zod": "^3.22.3"
+    "zod": "^3.23.0"
   },
   "peerDependenciesMeta": {
     "@types/compression": {

src/date-in-schema.ts

@@ -1,15 +1,15 @@
 import { z } from "zod";
 import { proprietary } from "./metadata";
-import { isValidDate, isoDateRegex } from "./schema-helpers";
+import { isValidDate } from "./schema-helpers";
 
 export const ezDateInKind = "DateIn";
 
 export const dateIn = () => {
-  const base = z.string();
-  const hasDateMethod = base.date?.() instanceof z.ZodString;
-  const schema = hasDateMethod
-    ? z.union([base.date(), base.datetime(), base.datetime({ local: true })])
-    : base.regex(isoDateRegex); // @todo remove after min zod v3.23 (v19)
+  const schema = z.union([
+    z.string().date(),
+    z.string().datetime(),
+    z.string().datetime({ local: true }),
+  ]);
 
   return proprietary(
     ezDateInKind,

src/documentation-helpers.ts

@@ -64,7 +64,6 @@ import {
 } from "./logical-container";
 import { Method } from "./method";
 import { RawSchema, ezRawKind } from "./raw-schema";
-import { isoDateRegex } from "./schema-helpers";
 import {
   HandlingRules,
   HandlingVariant,
@@ -163,10 +162,7 @@ export const depictFile: Depicter<z.ZodType> = ({ schema }) => ({
   type: "string",
   format:
     schema instanceof z.ZodString
-      ? schema._def.checks.find(
-          /** @todo remove regex check when min zod v3.23 (v19) */
-          (check) => check.kind === "regex" || check.kind === "base64",
-        )
+      ? schema._def.checks.find((check) => check.kind === "base64")
         ? "byte"
         : "file"
       : "binary",
@@ -331,7 +327,7 @@ export const depictDateIn: Depicter<z.ZodType> = (ctx) => {
     description: "YYYY-MM-DDTHH:mm:ss.sssZ",
     type: "string",
     format: "date-time",
-    pattern: isoDateRegex.source,
+    pattern: /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}(\.\d+)?)?Z?$/.source,
     externalDocs: {
       url: isoDateDocumentationUrl,
     },

src/file-schema.ts

@@ -7,24 +7,11 @@ const bufferSchema = z.custom<Buffer>((subject) => Buffer.isBuffer(subject), {
   message: "Expected Buffer",
 });
 
-/** @todo remove after min zod v3.23 (v19) */
-const base64Regex =
-  /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
-
 const variants = {
   buffer: () => proprietary(ezFileKind, bufferSchema),
   string: () => proprietary(ezFileKind, z.string()),
   binary: () => proprietary(ezFileKind, bufferSchema.or(z.string())),
-  base64: () => {
-    const base = z.string();
-    const hasBase64Method = base.base64?.() instanceof z.ZodString;
-    return proprietary(
-      ezFileKind,
-      hasBase64Method
-        ? base.base64()
-        : base.regex(base64Regex, "Does not match base64 encoding"), // @todo remove after min zod v3.23 (v19)
-    );
-  },
+  base64: () => proprietary(ezFileKind, z.string().base64()),
 };
 
 type Variants = typeof variants;

src/schema-helpers.ts

@@ -1,12 +1 @@
 export const isValidDate = (date: Date): boolean => !isNaN(date.getTime());
-
-/**
- * @example 2021-01-01T00:00:00.000Z
- * @example 2021-01-01T00:00:00.0Z
- * @example 2021-01-01T00:00:00Z
- * @example 2021-01-01T00:00:00
- * @example 2021-01-01
- * @todo remove after min zod v3.23 (v19)
- */
-export const isoDateRegex =
-  /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}(\.\d+)?)?Z?$/;

src/startup-logo.ts

@@ -10,7 +10,7 @@ export const getStartupLogo = () => {
   const thanks = italic(
     "Thank you for choosing Express Zod API for your project.".padStart(132),
   );
-  const dedicationMessage = italic("for Victoria".padEnd(20));
+  const dedicationMessage = italic("for Dime".padEnd(20));
 
   const pink = hex("#F5A9B8");
   const blue = hex("#5BCEFA");

tests/compat/package.json

@@ -11,7 +11,7 @@
   "devDependencies": {
     "jest": "^30.0.0-alpha.3",
     "@types/jest": "^29.5.12",
-    "@swc/core": "^1.3.100",
+    "@swc/core": "^1.5.0",
     "@swc/jest": "^0.2.29"
   }
 }

tests/system/example.spec.ts

@@ -196,7 +196,7 @@ describe("Example", async () => {
       const data = new FormData();
       data.append(
         "avatar",
-        new Blob([logo], { type: "image/svg+xml" }), // FormData mime is buggy in Node 18.0.0
+        new Blob([logo], { type: "image/svg+xml" }),
         filename,
       );
       data.append("str", "test string value");
@@ -212,10 +212,7 @@ describe("Example", async () => {
       expect(json).toEqual({
         data: {
           hash: "f39beeff92379dc935586d726211c2620be6f879",
-          mime:
-            process.versions.node === "18.0.0"
-              ? "application/octet-stream" // Node 18.0.0 FormData bug // @todo remove it when dropped
-              : "image/svg+xml",
+          mime: "image/svg+xml",
           name: "logo.svg",
           otherInputs: {
             arr: ["456", "789"],

tests/unit/__snapshots__/date-in-schema.spec.ts.snap

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`ez.dateIn() current mode > parsing > should handle invalid date 1`] = `
+exports[`ez.dateIn() > parsing > should handle invalid date 1`] = `
 [
   {
     "code": "invalid_string",
@@ -11,7 +11,7 @@ exports[`ez.dateIn() current mode > parsing > should handle invalid date 1`] = `
 ]
 `;
 
-exports[`ez.dateIn() current mode > parsing > should handle invalid format 1`] = `
+exports[`ez.dateIn() > parsing > should handle invalid format 1`] = `
 [
   {
     "code": "invalid_string",
@@ -22,7 +22,7 @@ exports[`ez.dateIn() current mode > parsing > should handle invalid format 1`] =
 ]
 `;
 
-exports[`ez.dateIn() current mode > parsing > should handle wrong parsed type 1`] = `
+exports[`ez.dateIn() > parsing > should handle wrong parsed type 1`] = `
 [
   {
     "code": "invalid_union",
@@ -60,36 +60,3 @@ exports[`ez.dateIn() current mode > parsing > should handle wrong parsed type 1`
   },
 ]
 `;
-
-exports[`ez.dateIn() legacy mode > parsing > should handle invalid date 1`] = `
-[
-  {
-    "code": "invalid_date",
-    "message": "Invalid date",
-    "path": [],
-  },
-]
-`;
-
-exports[`ez.dateIn() legacy mode > parsing > should handle invalid format 1`] = `
-[
-  {
-    "code": "invalid_string",
-    "message": "Invalid",
-    "path": [],
-    "validation": "regex",
-  },
-]
-`;
-
-exports[`ez.dateIn() legacy mode > parsing > should handle wrong parsed type 1`] = `
-[
-  {
-    "code": "invalid_type",
-    "expected": "string",
-    "message": "Expected string, received number",
-    "path": [],
-    "received": "number",
-  },
-]
-`;

tests/unit/__snapshots__/file-schema.spec.ts.snap

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`ez.file() current mode > parsing > should perform additional check for base64 file 1`] = `
+exports[`ez.file() > parsing > should perform additional check for base64 file 1`] = `
 [
   {
     "code": "invalid_string",
@@ -10,14 +10,3 @@ exports[`ez.file() current mode > parsing > should perform additional check for
   },
 ]
 `;
-
-exports[`ez.file() legacy mode > parsing > should perform additional check for base64 file 1`] = `
-[
-  {
-    "code": "invalid_string",
-    "message": "Does not match base64 encoding",
-    "path": [],
-    "validation": "regex",
-  },
-]
-`;

tests/unit/date-in-schema.spec.ts

@@ -1,18 +1,9 @@
 import { z } from "zod";
 import { getMeta } from "../../src/metadata";
 import { ez } from "../../src";
-import { beforeAll, describe, expect, test, vi } from "vitest";
-
-describe.each(["current", "legacy"])("ez.dateIn() %s mode", (mode) => {
-  // @todo remove after min zod v3.23 (v19)
-  beforeAll(() => {
-    if (mode === "legacy") {
-      vi.spyOn(z.ZodString.prototype, "date").mockImplementation(
-        () => null as unknown as z.ZodString,
-      );
-    }
-  });
+import { describe, expect, test } from "vitest";
 
+describe("ez.dateIn()", () => {
   describe("creation", () => {
     test("should create an instance", () => {
       const schema = ez.dateIn();

tests/unit/file-schema.spec.ts

@@ -3,18 +3,9 @@ import { z } from "zod";
 import { getMeta } from "../../src/metadata";
 import { ez } from "../../src";
 import { readFile } from "node:fs/promises";
-import { beforeAll, describe, expect, test, vi } from "vitest";
-
-describe.each(["current", "legacy"])("ez.file() %s mode", (mode) => {
-  // @todo remove after min zod v3.23 (v19)
-  beforeAll(() => {
-    if (mode === "legacy") {
-      vi.spyOn(z.ZodString.prototype, "base64").mockImplementation(
-        () => null as unknown as z.ZodString,
-      );
-    }
-  });
+import { describe, expect, test } from "vitest";
 
+describe("ez.file()", () => {
   describe("creation", () => {
     test("should create an instance being string by default", () => {
       const schema = ez.file();