@konoui/mjimage 0.0.16 → 0.0.18

package/dist/mjs/lib/mjimage.js

@@ -13,6 +13,7 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mjimage = void 0;
 var core_1 = require("./core");
+var image_1 = require("./image");
 var measure_text_1 = require("./measure-text");
 var table_1 = require("./table");
 var svg_js_1 = require("@svgdotjs/svg.js");
@@ -65,7 +66,7 @@ var mjimage = (function () {
                     else {
                         var scale = calculateScale(handScale, textHeight);
                         var blocks = new core_1.Parser(input).parse();
-                        (0, core_1.drawBlocks)(svg, blocks, __assign(__assign({}, props), { svgSprite: svgSprite, scale: scale }), { responsive: responsive });
+                        (0, image_1.drawBlocks)(svg, blocks, __assign(__assign({}, props), { svgSprite: svgSprite, scale: scale }), { responsive: responsive });
                     }
                     svg.addTo(target);
                 }

package/dist/mjs/lib/table/table-parser.d.ts

@@ -1,152 +1,57 @@
-import { z } from "zod";
+import { InferOutput } from "valibot";
 import { Tile, Block } from "../core/parser";
 import { WIND_MAP, ROUND_MAP } from "../core/constants";
-declare const tableInputSchema: z.ZodObject<{
-    "1w": z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        discard: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        hand: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        score: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    }, "strict", z.ZodTypeAny, {
-        discard: string;
-        hand: string;
-        score: number;
-    }, {
-        discard?: string | undefined;
-        hand?: string | undefined;
-        score?: number | undefined;
-    }>>>;
-    "2w": z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        discard: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        hand: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        score: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    }, "strict", z.ZodTypeAny, {
-        discard: string;
-        hand: string;
-        score: number;
-    }, {
-        discard?: string | undefined;
-        hand?: string | undefined;
-        score?: number | undefined;
-    }>>>;
-    "3w": z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        discard: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        hand: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        score: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    }, "strict", z.ZodTypeAny, {
-        discard: string;
-        hand: string;
-        score: number;
-    }, {
-        discard?: string | undefined;
-        hand?: string | undefined;
-        score?: number | undefined;
-    }>>>;
-    "4w": z.ZodDefault<z.ZodOptional<z.ZodObject<{
-        discard: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        hand: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        score: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    }, "strict", z.ZodTypeAny, {
-        discard: string;
-        hand: string;
-        score: number;
-    }, {
-        discard?: string | undefined;
-        hand?: string | undefined;
-        score?: number | undefined;
-    }>>>;
-    board: z.ZodObject<{
-        round: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4">, z.ZodLiteral<"1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4">, ...z.ZodLiteral<"1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4">[]]>>>;
-        sticks: z.ZodDefault<z.ZodOptional<z.ZodObject<{
-            reach: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-            dead: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-        }, "strip", z.ZodTypeAny, {
-            reach: number;
-            dead: number;
-        }, {
-            reach?: number | undefined;
-            dead?: number | undefined;
-        }>>>;
-        doras: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
-        front: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"1w" | "2w" | "3w" | "4w">, z.ZodLiteral<"1w" | "2w" | "3w" | "4w">, ...z.ZodLiteral<"1w" | "2w" | "3w" | "4w">[]]>>>;
-    }, "strict", z.ZodTypeAny, {
-        round: "1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4";
-        front: "1w" | "2w" | "3w" | "4w";
-        sticks: {
-            reach: number;
-            dead: number;
-        };
-        doras: string[];
-    }, {
-        round?: "1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4" | undefined;
-        sticks?: {
-            reach?: number | undefined;
-            dead?: number | undefined;
-        } | undefined;
-        doras?: string[] | undefined;
-        front?: "1w" | "2w" | "3w" | "4w" | undefined;
+declare const tableInputSchema: import("valibot").StrictObjectSchema<{
+    readonly board: import("valibot").StrictObjectSchema<{
+        readonly round: import("valibot").OptionalSchema<import("valibot").PicklistSchema<("1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4")[], undefined>, "1w1">;
+        readonly sticks: import("valibot").OptionalSchema<import("valibot").StrictObjectSchema<{
+            readonly reach: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").NumberSchema<undefined>, import("valibot").MinValueAction<number, 0, "">, import("valibot").MaxValueAction<number, 9, "">]>, 0>;
+            readonly dead: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").NumberSchema<undefined>, import("valibot").MinValueAction<number, 0, "">, import("valibot").MaxValueAction<number, 9, "">]>, 0>;
+        }, undefined>, {
+            readonly reach: 0;
+            readonly dead: 0;
+        }>;
+        readonly doras: import("valibot").OptionalSchema<import("valibot").ArraySchema<import("valibot").StringSchema<undefined>, undefined>, readonly ["3w"]>;
+        readonly front: import("valibot").OptionalSchema<import("valibot").PicklistSchema<("1w" | "2w" | "3w" | "4w")[], undefined>, "1w">;
+    }, undefined>;
+    readonly "1w": import("valibot").OptionalSchema<import("valibot").StrictObjectSchema<{
+        readonly discard: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
+        readonly hand: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
+        readonly score: import("valibot").OptionalSchema<import("valibot").NumberSchema<undefined>, 25000>;
+    }, undefined>, {
+        readonly discard: "";
+        readonly hand: "";
+        readonly score: 25000;
     }>;
-}, "strict", z.ZodTypeAny, {
-    "1w": {
-        discard: string;
-        hand: string;
-        score: number;
-    };
-    "2w": {
-        discard: string;
-        hand: string;
-        score: number;
-    };
-    "3w": {
-        discard: string;
-        hand: string;
-        score: number;
-    };
-    "4w": {
-        discard: string;
-        hand: string;
-        score: number;
-    };
-    board: {
-        round: "1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4";
-        front: "1w" | "2w" | "3w" | "4w";
-        sticks: {
-            reach: number;
-            dead: number;
-        };
-        doras: string[];
-    };
-}, {
-    board: {
-        round?: "1w1" | "1w2" | "1w3" | "1w4" | "2w1" | "2w2" | "2w3" | "2w4" | "3w1" | "3w2" | "3w3" | "3w4" | "4w1" | "4w2" | "4w3" | "4w4" | undefined;
-        sticks?: {
-            reach?: number | undefined;
-            dead?: number | undefined;
-        } | undefined;
-        doras?: string[] | undefined;
-        front?: "1w" | "2w" | "3w" | "4w" | undefined;
-    };
-    "1w"?: {
-        discard?: string | undefined;
-        hand?: string | undefined;
-        score?: number | undefined;
-    } | undefined;
-    "2w"?: {
-        discard?: string | undefined;
-        hand?: string | undefined;
-        score?: number | undefined;
-    } | undefined;
-    "3w"?: {
-        discard?: string | undefined;
-        hand?: string | undefined;
-        score?: number | undefined;
-    } | undefined;
-    "4w"?: {
-        discard?: string | undefined;
-        hand?: string | undefined;
-        score?: number | undefined;
-    } | undefined;
-}>;
-export type TableInput = z.infer<typeof tableInputSchema>;
+    readonly "2w": import("valibot").OptionalSchema<import("valibot").StrictObjectSchema<{
+        readonly discard: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
+        readonly hand: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
+        readonly score: import("valibot").OptionalSchema<import("valibot").NumberSchema<undefined>, 25000>;
+    }, undefined>, {
+        readonly discard: "";
+        readonly hand: "";
+        readonly score: 25000;
+    }>;
+    readonly "3w": import("valibot").OptionalSchema<import("valibot").StrictObjectSchema<{
+        readonly discard: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
+        readonly hand: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
+        readonly score: import("valibot").OptionalSchema<import("valibot").NumberSchema<undefined>, 25000>;
+    }, undefined>, {
+        readonly discard: "";
+        readonly hand: "";
+        readonly score: 25000;
+    }>;
+    readonly "4w": import("valibot").OptionalSchema<import("valibot").StrictObjectSchema<{
+        readonly discard: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
+        readonly hand: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
+        readonly score: import("valibot").OptionalSchema<import("valibot").NumberSchema<undefined>, 25000>;
+    }, undefined>, {
+        readonly discard: "";
+        readonly hand: "";
+        readonly score: 25000;
+    }>;
+}, undefined>;
+export type TableInput = InferOutput<typeof tableInputSchema>;
 export interface DiscardsInput {
     front: Tile[];
     right: Tile[];

package/dist/mjs/lib/table/table-parser.js

@@ -1,53 +1,43 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertInput = exports.parseTableInput = exports.parse = void 0;
 var js_yaml_1 = require("js-yaml");
-var zod_1 = require("zod");
+var valibot_1 = require("valibot");
 var parser_1 = require("../core/parser");
 var constants_1 = require("../core/constants");
-var windInputSchema = zod_1.z
-    .object({
-    discard: zod_1.z.string().max(50).optional().default(""),
-    hand: zod_1.z.string().max(25).optional().default(""),
-    score: zod_1.z.number().optional().default(25000),
-})
-    .strict()
-    .optional()
-    .default({ discard: "", hand: "", score: 25000 });
-var windInputsSchema = zod_1.z
-    .object((_a = {},
+var windInputSchema = (0, valibot_1.optional)((0, valibot_1.strictObject)({
+    discard: (0, valibot_1.optional)((0, valibot_1.string)(), ""),
+    hand: (0, valibot_1.optional)((0, valibot_1.string)(), ""),
+    score: (0, valibot_1.optional)((0, valibot_1.number)(), 25000),
+}), { discard: "", hand: "", score: 25000 });
+var windInputsSchema = (0, valibot_1.strictObject)((_a = {},
     _a[constants_1.WIND.EAST] = windInputSchema,
     _a[constants_1.WIND.SOUTH] = windInputSchema,
     _a[constants_1.WIND.WEST] = windInputSchema,
     _a[constants_1.WIND.NORTH] = windInputSchema,
-    _a))
-    .strict();
-function unionOfLiterals(constants) {
-    var literals = constants.map(function (x) { return zod_1.z.literal(x); });
-    return zod_1.z.union(literals);
-}
-var boardInputSchema = zod_1.z
-    .object({
-    round: unionOfLiterals(Object.keys(constants_1.ROUND_MAP))
-        .optional()
-        .default("1w1"),
-    sticks: zod_1.z
-        .object({
-        reach: zod_1.z.number().max(9).gte(0).optional().default(0),
-        dead: zod_1.z.number().max(9).gte(0).optional().default(0),
-    })
-        .optional()
-        .default({ reach: 0, dead: 0 }),
-    doras: zod_1.z.array(zod_1.z.string()).max(4).optional().default(["3w"]),
-    front: unionOfLiterals(Object.keys(constants_1.WIND_MAP))
-        .optional()
-        .default("1w"),
-})
-    .strict();
-var tableInputSchema = windInputsSchema.extend({
-    board: boardInputSchema,
+    _a));
+var boardInputSchema = (0, valibot_1.strictObject)({
+    round: (0, valibot_1.optional)((0, valibot_1.picklist)(Object.keys(constants_1.ROUND_MAP)), "1w1"),
+    sticks: (0, valibot_1.optional)((0, valibot_1.strictObject)({
+        reach: (0, valibot_1.optional)((0, valibot_1.pipe)((0, valibot_1.number)(), (0, valibot_1.minValue)(0, ""), (0, valibot_1.maxValue)(9, "")), 0),
+        dead: (0, valibot_1.optional)((0, valibot_1.pipe)((0, valibot_1.number)(), (0, valibot_1.minValue)(0, ""), (0, valibot_1.maxValue)(9, "")), 0),
+    }), { reach: 0, dead: 0 }),
+    doras: (0, valibot_1.optional)((0, valibot_1.array)((0, valibot_1.string)()), ["3w"]),
+    front: (0, valibot_1.optional)((0, valibot_1.picklist)(Object.keys(constants_1.WIND_MAP)), "1w"),
 });
+var tableInputSchema = (0, valibot_1.strictObject)(__assign(__assign({}, windInputsSchema.entries), { board: boardInputSchema }));
 var parse = function (s) {
     var d = (0, exports.parseTableInput)(s);
     return (0, exports.convertInput)(d);
@@ -55,11 +45,11 @@ var parse = function (s) {
 exports.parse = parse;
 var parseTableInput = function (s) {
     var rawInput = (0, js_yaml_1.load)(s);
-    var ret = tableInputSchema.safeParse(rawInput.table);
+    var ret = (0, valibot_1.safeParse)(tableInputSchema, rawInput.table);
     if (!ret.success) {
-        throw ret.error;
+        throw ret.issues;
     }
-    return ret.data;
+    return ret.output;
 };
 exports.parseTableInput = parseTableInput;
 var convertInput = function (i) {

package/dist/mjs/lib/table/table.d.ts

@@ -1,7 +1,7 @@
-import { ImageHelper, ImageHelperConfig } from "../core/image";
+import { ImageHelper, ImageHelperConfig } from "../image/image";
 import { Svg, G } from "@svgdotjs/svg.js";
 import { FontContext } from "../measure-text/";
-import { ScoreBoardInput, DiscardsInput, HandsInput } from "./table-parser";
+import { ScoreBoardInput, DiscardsInput, HandsInput } from "./";
 export declare const createTable: (helper: ImageHelper, fontCtx: FontContext, handsProps: HandsInput, discardsProps: DiscardsInput, scoreBoardProps: ScoreBoardInput) => {
     e: G;
     width: number;

package/dist/mjs/lib/table/table.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drawTable = exports.createTable = void 0;
-var parser_1 = require("../core/parser");
-var image_1 = require("../core/image");
+var core_1 = require("../core/");
+var image_1 = require("../image/image");
 var svg_js_1 = require("@svgdotjs/svg.js");
-var table_parser_1 = require("./table-parser");
-var constants_1 = require("../core/constants");
+var _1 = require("./");
 var splitTiles = function (input) {
     var chunkSize = 6;
     var result = [];
@@ -46,7 +45,7 @@ var handleDiscard = function (tiles, helper) {
         var tiles_1 = chunks[i];
         var posY = i * helper.tileHeight;
         var e = helper
-            .createBlockHandDiscard(new parser_1.Block(tiles_1, constants_1.BLOCK.DISCARD))
+            .createBlockHandDiscard(new core_1.Block(tiles_1, core_1.BLOCK.DISCARD))
             .translate(0, posY);
         g.add(e);
     }
@@ -239,7 +238,7 @@ var drawTable = function (svg, tableInput, config, fontCtx, params) {
     if (params === void 0) { params = { responsive: false }; }
     var helper = new image_1.ImageHelper(config);
     var ctx = fontCtx;
-    var _a = (0, table_parser_1.parse)(tableInput), discards = _a.discards, hands = _a.hands, scoreBoard = _a.scoreBoard;
+    var _a = (0, _1.parse)(tableInput), discards = _a.discards, hands = _a.hands, scoreBoard = _a.scoreBoard;
     var table = (0, exports.createTable)(helper, ctx, hands, discards, scoreBoard);
     if (!params.responsive)
         svg.size(table.width, table.height);

package/package.json

@@ -1,10 +1,11 @@
 {
     "name": "@konoui/mjimage",
-    "version": "0.0.16",
+    "version": "0.0.18",
     "description": "Generates Mahjong tiles in SVG format.",
     "author": "konoui",
     "license": "MIT",
     "repository": "github.com/konoui/mjimage",
+    "sideEffects": false,
     "keywords": [
         "mahjong"
     ],
@@ -54,6 +55,7 @@
         "staticOutPath": "svg"
     },
     "devDependencies": {
+        "@parcel/reporter-bundle-analyzer": "^2.12.0",
         "@parcel/transformer-inline-string": "^2.9.3",
         "@parcel/transformer-typescript-tsc": "^2.9.3",
         "@parcel/validator-typescript": "^2.9.3",
@@ -63,20 +65,20 @@
         "assert": "^2.1.0",
         "buffer": "^6.0.3",
         "jest": "^29.7.0",
-        "parcel": "^2.9.3",
+        "parcel": "^2.12.0",
         "parcel-reporter-static-files-copy": "^1.5.2",
         "process": "^0.11.10",
         "svg-sprite": "^2.0.2",
         "svgdom": "0.1.14",
         "svgo": "^3.0.2",
         "ts-jest": "^29.1.1",
-        "typescript": "^5.2.2"
+        "typescript": "^5.5.4"
     },
     "dependencies": {
         "@svgdotjs/svg.js": "^3.2.4",
         "eventmit": "^2.0.4",
         "js-yaml": "^4.1.0",
-        "xstate": "^5.7.0",
-        "zod": "^3.22.4"
+        "valibot": "^0.40.0",
+        "xstate": "^5.7.0"
     }
 }