Dependencies replace (#98)

* replace itiriri with Array.from

* replace dateformat with DateUtils

* use forof instead of Array.from

Author: subframe7536

package-lock.json

@@ -22,9 +22,7 @@
     "node": ">=12.16.1"
   },
   "dependencies": {
-    "dateformat": "^3.0.3",
     "iconv-lite": "^0.6.3",
-    "itiriri": "^2.0.1",
     "os-locale": "^4.0.0",
     "uuid": "^8.3.2"
   },
@@ -33,7 +31,6 @@
     "@testdeck/mocha": "^0.3.3",
     "@types/chai": "^4.3.0",
     "@types/chai-as-promised": "^7.1.0",
-    "@types/dateformat": "^3.0.0",
     "@types/stream-buffers": "^3.0.2",
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.15.0",

package.json

@@ -1,13 +1,11 @@
-import * as DateFormat from "dateformat";
-
 import {ApeTagFooter, ApeTagFooterFlags} from "./apeTagFooter";
 import {ApeTagItem, ApeTagItemType} from "./apeTagItem";
 import {ByteVector, StringType} from "../byteVector";
 import {CorruptFileError} from "../errors";
 import {File, FileAccessMode} from "../file";
 import {IPicture, Picture, PictureType} from "../picture";
 import {Tag, TagTypes} from "../tag";
-import {Guards, NumberUtils, StringComparison} from "../utils";
+import {DateUtils, Guards, NumberUtils, StringComparison} from "../utils";
 
 /**
  * Provides a representation of an APEv2 tag which can be read from and written to disk.
@@ -482,12 +480,7 @@ export default class ApeTag extends Tag {
      * @remarks Stored in the `DateTagged` item
      */
     set dateTagged(value: Date | undefined) {
-        let strValue: string;
-        if (value) {
-            strValue = DateFormat(value, "yyyy-mm-dd HH:MM:ss");
-            strValue = strValue.replace(" ", "T");
-        }
-        this.setStringValue("DateTagged", strValue);
+        this.setStringValue("DateTagged", DateUtils.format(value));
     }
 
     /**

src/ape/apeTag.ts

@@ -1,6 +1,3 @@
-import * as DateFormat from "dateformat";
-import itiriri from "itiriri";
-
 import AttachmentFrame from "./frames/attachmentFrame";
 import CommentsFrame from "./frames/commentsFrame";
 import FrameFactory from "./frames/frameFactory";
@@ -21,7 +18,7 @@ import {IPicture} from "../picture";
 import {Tag, TagTypes} from "../tag";
 import {TextInformationFrame, UserTextInformationFrame} from "./frames/textInformationFrame";
 import {UrlLinkFrame} from "./frames/urlLinkFrame";
-import {Guards} from "../utils";
+import {DateUtils, Guards} from "../utils";
 
 /**
  * Extends {@link Tag} to provide support for reading and writing tags stored in the ID3v2 format.
@@ -373,9 +370,17 @@ export default class Id3v2Tag extends Tag {
         }
 
         // Collapse the instrument lists and return that
-        this._performersRole = itiriri(map.values())
-            .map((e: string[]) => e.length > 0 ? e.join("; ") : undefined)
-            .toArray();
+        // this._performersRole = Array.from(map.values())
+        //     .map((e: string[]) => e.length > 0 ? e.join("; ") : undefined);
+        const performersRole = []
+        for (const roles of map.values()) {
+            if (roles.length > 0) {
+                performersRole.push(roles.join('; '))
+            } else {
+                performersRole.push(undefined)
+            }
+        }
+        this._performersRole = performersRole
         return this._performersRole;
     }
     /**
@@ -716,12 +721,7 @@ export default class Id3v2Tag extends Tag {
      * @remarks Stored in the `TDTG` frame
      */
     set dateTagged(value: Date | undefined) {
-        let strValue: string;
-        if (value) {
-            strValue = DateFormat(value, "yyyy-mm-dd HH:MM:ss");
-            strValue = strValue.replace(" ", "T");
-        }
-        this.setTextFrame(FrameIdentifiers.TDTG, strValue);
+        this.setTextFrame(FrameIdentifiers.TDTG, DateUtils.format(value));
     }
 
     /**

src/id3v2/id3v2Tag.ts

@@ -1,4 +1,3 @@
-import * as DateFormat from "dateformat";
 import AppleItemListBox from "./boxes/appleItemListBox";
 import Genres from "../genres";
 import IsoMetaBox from "./boxes/isoMetaBox";
@@ -9,7 +8,7 @@ import {AppleDataBox, AppleDataBoxFlagType} from "./boxes/appleDataBox";
 import {ByteVector, StringType} from "../byteVector";
 import {IPicture, Picture} from "../picture";
 import {Tag, TagTypes} from "../tag";
-import {ArrayUtils, Guards, NumberUtils} from "../utils";
+import {ArrayUtils, DateUtils, Guards, NumberUtils} from "../utils";
 
 export default class AppleTag extends Tag {
     /**
@@ -231,15 +230,8 @@ export default class AppleTag extends Tag {
         return undefined;
     }
     /** @inheritDoc */
-    public set dateTagged(v: Date|undefined) {
-        let strValue: string;
-
-        if (v) {
-            strValue = DateFormat(v, "yyyy-mm-dd HH:MM:ss");
-            strValue = strValue.replace(" ", "T");
-        }
-
-        this.setQuickTimeString(Mpeg4BoxType.DTAG, strValue);
+    public set dateTagged(value: Date|undefined) {
+        this.setQuickTimeString(Mpeg4BoxType.DTAG, DateUtils.format(value));
     }
 
     /** @inheritDoc */

src/mpeg4/appleTag.ts

@@ -1,4 +1,3 @@
-import itiriri from "itiriri";
 import {ByteVector} from "../byteVector";
 import {File} from "../file";
 import {OggPageHeader} from "./oggPageHeader";
@@ -92,8 +91,13 @@ export default class OggPage {
         Guards.safeUint(position, "position");
 
         // Check to see if there are any changes to be made
-        if (itiriri(shiftTable.values()).every((e) => e === 0)) {
-            return;
+        // if (Array.from(shiftTable.values()).every((e) => e === 0)) {
+        //     return;
+        // }
+        for (const value of shiftTable.values()) {
+            if (value !== 0) {
+                return
+            }
         }
 
         while (position < file.length - OggPageHeader.MINIMUM_SIZE) {

src/ogg/oggPage.ts

@@ -1,5 +1,3 @@
-import itiriri from "itiriri";
-
 import CombinedTag from "../combinedTag";
 import OggFileSettings from "./oggFileSettings";
 import XiphComment from "../xiph/xiphComment";
@@ -79,7 +77,12 @@ export default class OggTag extends CombinedTag {
     /** @inheritDoc */
     // TODO: This value is never updated after a save!!
     public get sizeOnDisk(): number {
-        return itiriri(this._comments.values()).reduce((accum, c) => accum + c.sizeOnDisk, 0);
+        // return Array.from(this._comments.values()).reduce((accum, c) => accum + c.sizeOnDisk, 0);
+        let sum = 0
+        for (const comments of this._comments.values()) {
+            sum += comments.sizeOnDisk
+        }
+        return sum
     }
 
     /**

src/ogg/oggTag.ts

@@ -1,4 +1,3 @@
-import itiriri from "itiriri";
 import AviFileSettings from "./aviFileSettings";
 import AviHeader from "./avi/aviHeader";
 import DivxTag from "./divxTag";
@@ -151,10 +150,16 @@ export default class RiffFile extends File {
             const renderedTagBytes = ByteVector.concatenate(... renderedTags);
 
             // Determine the boundaries of the tagging chunks
-            const taggingChunkIndexes = itiriri(this._taggingChunkIndexes.values())
-                .filter((i) => i >= 0)
-                .sort()
-                .toArray();
+            // Array.from(this._taggingChunkIndexes.values())
+            //     .filter((i) => i >= 0)
+            //     .sort();
+            const taggingChunkIndexes: number[] = []
+            for (const index of this._taggingChunkIndexes.values()) {
+                if (index >= 0) {
+                    taggingChunkIndexes.push(index)
+                }
+            }
+            taggingChunkIndexes.sort()
 
             let taggingChunkStartIndex: number;
             let taggingChunkStart: number;

src/riff/riffFile.ts

@@ -345,3 +345,22 @@ export class StringUtils {
         return toTrim;
     }
 }
+
+export class DateUtils {
+    public static format(date: Date | undefined): string | undefined {
+        if (!date) {
+            return undefined
+        }
+        
+        const pad = (num: number) => `${num}`.padStart(2, '0')
+
+        const year = date.getFullYear();
+        const month = pad(date.getMonth() + 1);
+        const day = pad(date.getDate());
+        const hours = pad(date.getHours());
+        const minutes = pad(date.getMinutes());
+        const seconds = pad(date.getSeconds());
+
+        return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
+    }
+}

src/utils.ts

@@ -1,10 +1,9 @@
-import * as DateFormat from "dateformat";
 import XiphPicture from "./xiphPicture";
 import XiphSettings from "./xiphSettings";
 import {ByteVector, StringType} from "../byteVector";
 import {IPicture, Picture} from "../picture";
 import {Tag, TagTypes} from "../tag";
-import {Guards} from "../utils";
+import {DateUtils, Guards} from "../utils";
 
 /**
  * Provides support for reading and writing Xiph comment-style tags.
@@ -568,13 +567,11 @@ export default class XiphComment extends Tag {
      * @inheritDoc
      * @remarks Stored in the `DATETAGGED` field
      */
-    public set dateTagged(value: Date) {
+    public set dateTagged(value: Date | undefined) {
         if (!value || Number.isNaN(value.getTime())) {
             this.removeField("DATETAGGED");
         } else {
-            let dateString = DateFormat(value, "yyyy-mm-dd HH:MM:ss");
-            dateString = dateString.replace(" ", "T");
-            this.setFieldAsStrings("DATETAGGED", dateString);
+            this.setFieldAsStrings("DATETAGGED", DateUtils.format(value));
         }
     }