@tktb-tess/my-zod-schema 0.3.1 → 0.4.0

package/dist/bundle.js

@@ -2,27 +2,27 @@ import * as t from "zod";
 const r = t.object({
   id: t.int().nonnegative(),
   form: t.string()
-}), m = t.object({
+}), g = t.object({
   title: t.string(),
   forms: t.string().array(),
   rawForms: t.string().optional()
-}), g = t.object({
+}), p = t.object({
   title: t.string(),
   text: t.string()
-}), p = t.object({
+}), d = t.object({
   title: t.string(),
   form: t.string()
-}), d = t.object({
+}), b = t.object({
   title: t.string(),
   entry: r
-}), b = {
+}), y = {
   entry: r,
-  translations: m.array(),
+  translations: g.array(),
   tags: t.string().array(),
-  contents: g.array(),
-  variations: p.array(),
-  relations: d.array()
-}, y = t.object(b), S = t.looseObject(b), h = t.object({
+  contents: p.array(),
+  variations: d.array(),
+  relations: b.array()
+}, S = t.object(y), o = t.looseObject(y), h = t.object({
   id: t.int().nonnegative(),
   sentence: t.string(),
   translation: t.string(),
@@ -43,33 +43,37 @@ const r = t.object({
   enableMarkdown: t.boolean()
 }), u = t.object({
   version: t.literal(1).optional(),
-  words: y.array()
-}), o = t.looseObject({
-  version: t.literal(2),
   words: S.array()
-}), N = t.discriminatedUnion("version", [
+}), i = t.object({
+  version: t.literal(2),
+  words: o.array()
+}), N = t.looseObject({
+  version: t.literal(2),
+  words: o.array()
+}), $ = t.discriminatedUnion("version", [
   u,
-  o
-]), $ = o.extend({
+  i
+]), A = i.extend({
   examples: h.array(),
   zpdicOnline: j,
   snoj: t.string().optional(),
   zatlin: t.string().optional()
 }), q = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  contentSchema: g,
+  contentSchema: p,
   entrySchema: r,
-  otmjsonSchema: N,
-  relationSchema: d,
-  translationSchema: m,
+  looseV2Schema: N,
+  relationSchema: b,
+  translationSchema: g,
   v1Schema: u,
-  v2Schema: o,
-  variationSchema: p,
-  wordv1Schema: y,
-  wordv2Schema: S,
+  v1orV2Schema: $,
+  v2Schema: i,
+  variationSchema: d,
+  wordV1Schema: S,
+  wordV2Schema: o,
   zpdicConfigSchema: j,
   zpdicExampleSchema: h,
-  zpdicOtmSchema: $
+  zpdicOtmSchema: A
 }, Symbol.toStringTag, { value: "Module" })), v = t.object({
   titles: t.string().array(),
   names: t.string().array(),
@@ -94,7 +98,7 @@ const r = t.object({
   titles: t.string().array(),
   number: t.int().nonnegative(),
   name: t.string()
-}), i = t.string(), z = t.object({
+}), s = t.string(), z = t.object({
   sentence: t.string(),
   supplement: t.string(),
   translation: t.string(),
@@ -103,7 +107,7 @@ const r = t.object({
     number: t.number()
   }).array(),
   offer: t.object({
-    catalog: i,
+    catalog: s,
     number: t.number()
   }).nullable()
 }), a = z.extend({
@@ -118,57 +122,57 @@ const r = t.object({
   informations: f.array(),
   variations: O.array(),
   relations: w.array()
-}), s = _.extend({
+}), c = _.extend({
   id: e,
   number: t.int().nonnegative()
-}), c = s.extend({
+}), l = c.extend({
   examples: a.array()
-}), A = t.object({
-  word: s
 }), C = t.object({
   word: c
 }), M = t.object({
-  words: c.array(),
-  total: t.int().nonnegative()
+  word: l
 }), D = t.object({
-  example: a
+  words: l.array(),
+  total: t.int().nonnegative()
 }), U = t.object({
+  example: a
+}), V = t.object({
   examples: a.array(),
   total: t.int().nonnegative()
-}), l = t.object({
+}), m = t.object({
   id: e,
-  catalog: i,
+  catalog: s,
   number: t.int().nonnegative(),
   translation: t.string(),
   supplement: t.string(),
   author: t.string()
 }), L = t.object({
-  exampleOffer: l
+  exampleOffer: m
 }), J = t.object({
-  exampleOffers: l.array(),
+  exampleOffers: m.array(),
   total: t.int().nonnegative()
 }), F = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  catalogSchema: i,
+  catalogSchema: s,
   editableExampleSchema: z,
   editableWordSchema: _,
   equivalentSchema: v,
   exOfferResponseSchema: L,
-  exResponseSchema: D,
-  exampleOfferSchema: l,
+  exResponseSchema: U,
+  exampleOfferSchema: m,
   exampleSchema: a,
   informationSchema: f,
   mExOfferResponseSchema: J,
-  mExResponseSchema: U,
-  mwweResponseSchema: M,
+  mExResponseSchema: V,
+  mwweResponseSchema: D,
   objectIDSchema: e,
   phraseSchema: x,
   relationSchema: w,
   variationSchema: O,
-  wordResponseSchema: A,
-  wordSchema: s,
-  wordWithExamplesSchema: c,
-  wweResponseSchema: C
+  wordResponseSchema: C,
+  wordSchema: c,
+  wordWithExamplesSchema: l,
+  wweResponseSchema: M
 }, Symbol.toStringTag, { value: "Module" })), P = t.object({
   lastUpdate: t.iso.datetime(),
   numberOf: t.int().nonnegative()

package/dist/otmjson.d.ts

@@ -28,7 +28,7 @@ export declare const relationSchema: z.ZodObject<{
     }, z.core.$strip>;
 }, z.core.$strip>;
 export type Relation = z.infer<typeof relationSchema>;
-export declare const wordv1Schema: z.ZodObject<{
+export declare const wordV1Schema: z.ZodObject<{
     entry: z.ZodObject<{
         id: z.ZodInt;
         form: z.ZodString;
@@ -55,7 +55,7 @@ export declare const wordv1Schema: z.ZodObject<{
         }, z.core.$strip>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
-export declare const wordv2Schema: z.ZodObject<{
+export declare const wordV2Schema: z.ZodObject<{
     entry: z.ZodObject<{
         id: z.ZodInt;
         form: z.ZodString;
@@ -82,8 +82,8 @@ export declare const wordv2Schema: z.ZodObject<{
         }, z.core.$strip>;
     }, z.core.$strip>>;
 }, z.core.$loose>;
-export type Wordv1 = z.infer<typeof wordv1Schema>;
-export type Wordv2 = z.infer<typeof wordv2Schema>;
+export type Wordv1 = z.infer<typeof wordV1Schema>;
+export type Wordv2 = z.infer<typeof wordV2Schema>;
 export declare const zpdicExampleSchema: z.ZodObject<{
     id: z.ZodInt;
     sentence: z.ZodString;
@@ -166,8 +166,38 @@ export declare const v2Schema: z.ZodObject<{
             }, z.core.$strip>;
         }, z.core.$strip>>;
     }, z.core.$loose>>;
+}, z.core.$strip>;
+export declare const looseV2Schema: z.ZodObject<{
+    version: z.ZodLiteral<2>;
+    words: z.ZodArray<z.ZodObject<{
+        entry: z.ZodObject<{
+            id: z.ZodInt;
+            form: z.ZodString;
+        }, z.core.$strip>;
+        translations: z.ZodArray<z.ZodObject<{
+            title: z.ZodString;
+            forms: z.ZodArray<z.ZodString>;
+            rawForms: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+        tags: z.ZodArray<z.ZodString>;
+        contents: z.ZodArray<z.ZodObject<{
+            title: z.ZodString;
+            text: z.ZodString;
+        }, z.core.$strip>>;
+        variations: z.ZodArray<z.ZodObject<{
+            title: z.ZodString;
+            form: z.ZodString;
+        }, z.core.$strip>>;
+        relations: z.ZodArray<z.ZodObject<{
+            title: z.ZodString;
+            entry: z.ZodObject<{
+                id: z.ZodInt;
+                form: z.ZodString;
+            }, z.core.$strip>;
+        }, z.core.$strip>>;
+    }, z.core.$loose>>;
 }, z.core.$loose>;
-export declare const otmjsonSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
+export declare const v1orV2Schema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     version: z.ZodOptional<z.ZodLiteral<1>>;
     words: z.ZodArray<z.ZodObject<{
         entry: z.ZodObject<{
@@ -225,10 +255,10 @@ export declare const otmjsonSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
             }, z.core.$strip>;
         }, z.core.$strip>>;
     }, z.core.$loose>>;
-}, z.core.$loose>], "version">;
+}, z.core.$strip>], "version">;
 export type Ver1 = z.infer<typeof v1Schema>;
 export type Ver2 = z.infer<typeof v2Schema>;
-export type Ver1or2 = Ver1 | Ver2;
+export type LooseVer2 = z.infer<typeof looseV2Schema>;
 export declare const zpdicOtmSchema: z.ZodObject<{
     version: z.ZodLiteral<2>;
     words: z.ZodArray<z.ZodObject<{
@@ -281,5 +311,5 @@ export declare const zpdicOtmSchema: z.ZodObject<{
     }, z.core.$strip>;
     snoj: z.ZodOptional<z.ZodString>;
     zatlin: z.ZodOptional<z.ZodString>;
-}, z.core.$loose>;
+}, z.core.$strip>;
 export type ZpDICOTM = z.infer<typeof zpdicOtmSchema>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tktb-tess/my-zod-schema",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "type": "module",
   "license": "CC0-1.0",
   "publishConfig": {
@@ -36,7 +36,7 @@
     "zod": "^3.0.0 || ^4.0.0"
   },
   "volta": {
-    "node": "22.19.0"
+    "node": "22.21.1"
   },
   "repository": {
     "type": "git",