improve Cow type definition for moo, cowthink and cowsay functions

version are taken from package.json file and year is dynamic for the cli help messages

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Erick Rincones
+Copyright (c) 2022 Erick Rincones
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -76,8 +76,8 @@ commands, once installed, run `cowsayjs -h`, `cowthinkjs -h` or `moojs -h` to
 print the help.
 
 ```Text
-moojs, cowsayjs, cowthinkjs v1.1.3
-Copyright (c) 2021 Erick Rincones
+moojs, cowsayjs, cowthinkjs v1.1.4
+Copyright (c) 2022 Erick Rincones
 Licensed under the MIT License
 
   A nodejs clone of the classic cowsay and cowthink cli commands.
@@ -252,7 +252,7 @@ moo({
 ```Text
  __________________________
 ( I need to sleep          )
-( 2022-10-07T22:57:16.496Z )
+( 2022-10-13T19:18:51.885Z )
  --------------------------
         o   ^__^
          o  (@@)\_______
@@ -263,37 +263,41 @@ moo({
 
 ```Typescript
 // Custom cow
-cowthink({
+cowsay({
   message: `No way, I don't want the leftovers of your love.`,
+  eyes: `••`,
   cow: {
-    name: `custom`,
     template: [
-      `  \\`,
-      `   \\`,
-      `      //`,
-      `     ('>`,
-      `     /rr`,
-      `    *\))_`
+      `     \\\\`,
+      `      \\\\`,
+      `(\\__/) ||`,
+      `(oㅅo) ||`,
+      `/    づ`
     ],
     actionPos: [
-      [ 0, 2 ],
-      [ 1, 3 ]
+      [ 0, 5 ],
+      [ 0, 6 ],
+      [ 1, 6 ],
+      [ 1, 7 ]
+    ],
+    eyesPos: [
+      [ 3, 1 ],
+      [ 3, 3 ]
     ]
   }
 });
 ```
 
 ```Text
  _______________________________________
-( No way, I don't want the leftovers of )
-( your love.                            )
+/ No way, I don't want the leftovers of \
+\ your love.                            /
  ---------------------------------------
-  o
-   o
-      //
-     ('>
-     /rr
-    *))_
+     \\
+      \\
+(\__/) ||
+(•ㅅ•) ||
+/    づ
 ```
 
 

cli/index.js

@@ -1,5 +1,8 @@
 "use strict";
 
+var fs = require("fs");
+var path = require("path");
+
 var lib = require("../lib");
 var mode = require("../lib/mode");
 var cows = require("../cows");
@@ -31,6 +34,20 @@ var cows = require("../cows");
  */
 
 
+/**
+ * Parsed `package.json` file
+ *
+ * @type {Record<string, string | string[] | Record<string, string>>}
+ * @package
+ */
+var package_json = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf8"));
+
+/**
+ * Current year
+ */
+var year = new Date().getFullYear();
+
+
 /**
  * Get all available cow mode data IDs
  *
@@ -81,18 +98,15 @@ function getArg(token, j, argv, i) {
  * @package
  */
 function printHelp() {
-  // Version
-  var version = "1.1.3";
-
   // Get current script
   var script = process.argv[1].replace(/\\/g, "/");
   script = script.slice(script.lastIndexOf("/") + 1).replace(/\./, "");
 
 
   // Script info
   var info =
-    "moojs, cowsayjs, cowthinkjs v" + version + "\n" +
-    "Copyright (c) 2021 Erick Rincones\n" +
+    "moojs, cowsayjs, cowthinkjs v" + package_json.version + "\n" +
+    "Copyright (c) " + year + " Erick Rincones\n" +
     "Licensed under the MIT License\n\n";
 
   // Brief

cows/index.d.ts

@@ -16,11 +16,9 @@ export declare type CowAction = `o` | `\\`;
 
 
 /**
- * Cow
+ * Cow without name
  */
-export declare interface Cow {
-  /** Cow name */
-  name: string;
+export declare interface CowBase {
   /** Default eyes for empty string */
   defEyes?: string;
   /** Default tongue for empty string */
@@ -35,6 +33,14 @@ export declare interface Cow {
   tonguePos?: ReadonlyArray<Position>;
 }
 
+/**
+ * Cow
+ */
+export declare interface Cow extends CowBase {
+  /** Cow name */
+  name: string;
+}
+
 
 /**
  * Cows list
@@ -81,4 +87,4 @@ export declare function removeCow(name: string): Cow | undefined;
  * @param tongue Tongue
  * @returns Rendered cow
  */
-export declare function renderCow(cow: Cow, action: CowAction, eyes?: string, tongue?: string): string;
+export declare function renderCow(cow: CowBase, action: CowAction, eyes?: string, tongue?: string): string;

cows/index.js

@@ -27,18 +27,31 @@ var utils = require("../lib/utils");
  * @typedef {"o" | "\\"} CowAction
  */
 
+
 /**
- * Cow
+ * Cow name
  *
- * @typedef {Object} Cow
+ * @typedef {Object} CowName
  * @property {string} name Cow name
+ * @package
+ */
+
+/**
+ * Cow without name
+ *
+ * @typedef {Object} CowBase
  * @property {string} [defEyes] Default eyes
  * @property {string} [defTongue] Default tongue
  * @property {ReadonlyArray<string>} template Cow template
  * @property {ReadonlyArray<Position>} [actionPos] Action position indexes
  * @property {ReadonlyArray<Position>} [eyesPos] Eyes position indexes
  * @property {ReadonlyArray<Position>} [tonguePos] Tongue position indexes
- * @package
+ */
+
+/**
+ * Cow
+ *
+ * @typedef {CowBase & CowName} Cow
  */
 
 
@@ -266,7 +279,7 @@ function removeCow(name) {
 /**
  * Cow renderer function
  *
- * @param {Cow} cow Cow to render
+ * @param {CowBase} cow Cow to render
  * @param {CowAction} [action] Action
  * @param {string} [eyes] Eyes
  * @param {string} [tongue] Tongue

lib/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-
 var box = require("./box");
 var mode = require("./mode");
 var cows = require("../cows");
@@ -10,7 +9,7 @@ var cows = require("../cows");
  * Common options for cowsay and cowthink functions
  *
  * @typedef {Object} CowOptions
- * @property {string | import("../cows").Cow} [cow] Cow name
+ * @property {string | import("../cows").CowBase} [cow] Cow name
  * @property {string} [mode] Cow face mode
  * @property {string} [eyes] Custom cow eyes
  * @property {string} [tongue] Custom cow tongue
@@ -142,15 +141,14 @@ function moo(message, options) {
   }
 
   // Get cow and returns
-  /** @type {import("../cows").Cow} */
+  /** @type {import("../cows").CowBase} */
   var cow;
   var valid = true;
 
   switch (typeof opts.cow) {
     case "string": cow = cows.getCow(opts.cow); break;
     case "object":
       valid = valid && opts.cow !== null;
-      valid = valid && typeof opts.cow.name === "string";
       valid = valid && Array.isArray(opts.cow.template);
       valid = valid && opts.cow.template.every(function(line) { return typeof line === "string"; });
       valid = valid && (opts.cow.defEyes === undefined || typeof opts.cow.defEyes === "string");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cowsayjs",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "A nodejs clone of the classic cowsay and cowthink cli commands",
   "main": "lib/index.js",
   "scripts": {