lastfm-nodejs-client 1.4.2 → 1.4.3

package/@types/index.d.ts

@@ -8,7 +8,7 @@ export interface LovedTracksResponse {
 
 export interface LovedTracks {
   track: Track[];
-  '@attr': Attr;
+  '@attr': AttrNowPlaying;
 }
 export interface TopAlbumsResponse {
   topalbums: TopAlbums;
@@ -20,7 +20,7 @@ export interface TopTrackResponse {
 
 export interface TopTracks {
   track: Track[];
-  '@attr': Attr2;
+  '@attr': AttrLimit;
 }
 
 export interface UserResponse {
@@ -33,7 +33,7 @@ export interface RecentTracksResponse {
 
 export interface RecentTracks {
   track: Track[];
-  '@attr': Attr2;
+  '@attr': AttrLimit;
 }
 
 export interface LoveTracksResponse {
@@ -42,14 +42,14 @@ export interface LoveTracksResponse {
 
 export interface LovedTracks {
   track: Track[];
-  '@attr': Attr;
+  '@attr': AttrNowPlaying;
 }
 export interface FriendsResponse {
   friends: Friends;
 }
 
 export interface Friends {
-  '@attr': Attr;
+  '@attr': AttrNowPlaying;
   user: User[];
 }
 
@@ -59,7 +59,7 @@ export interface TopArtistsResponse {
 
 export interface TopArtists {
   artist: Artist[];
-  '@attr': Attr2;
+  '@attr': AttrLimit;
 }
 
 export interface WeeklyArtistChartResponse {
@@ -68,7 +68,7 @@ export interface WeeklyArtistChartResponse {
 
 export interface WeeklyArtistChart {
   artist: Artist[];
-  '@attr': Attr2;
+  '@attr': AttrLimit;
 }
 
 export interface WeeklyAlbumChartResponse {
@@ -80,7 +80,7 @@ export interface WeeklyAlbumChart {
   '@attr': WeeklyalbumChartAttr;
 }
 
-export type WeeklyAlbum = {
+export interface WeeklyAlbum {
   artist: {
     mbid: string;
     '#text': string;
@@ -132,12 +132,14 @@ export interface ArtistImage {
   playcount: number;
 }
 
-export interface Album {
-  mbid: string;
-  '#text': string;
-}
+export interface Album extends Track {
+  album: Album;
+  artist: Artist;
+  name: string;
+  url: string
+};
 
-export interface Attr {
+export interface AttrNowPlaying {
   nowplaying: string;
 }
 
@@ -147,18 +149,20 @@ export interface Date {
 }
 
 export interface Track {
-  artist: Artist;
-  streamable: string;
-  image: Image[];
-  mbid: string;
+  '@attr'?: AttrRank;
   album: Album;
+  artist: Artist;  
+  date?: Date;
+  duration?: string;
+  image?: Image[];
+  mbid: string;
   name: string;
-  '@attr': Attr;
+  playcount?: string;
+  streamable?: string;
   url: string;
-  date: Date;
 }
 
-export interface Attr2 {
+export interface AttrLimit {
   user: string;
   totalPages: string;
   page: string;
@@ -168,7 +172,7 @@ export interface Attr2 {
 
 export interface RecentTracks {
   track: Track[];
-  '@attr': Attr2;
+  '@attr': AttrLimit;
 }
 
 export interface Image {
@@ -202,7 +206,7 @@ export interface User {
 
 export interface TopAlbums {
   album: Album[];
-  '@attr': Attr2;
+  '@attr': AttrLimit;
 }
 
 export interface WeeklyArtistChartResponse {
@@ -211,14 +215,14 @@ export interface WeeklyArtistChartResponse {
 
 export interface WeeklyArtistChart {
   artist: Artist[];
-  '@attr': Attr2;
+  '@attr': AttrLimit;
 }
 
-export interface Attr1 {
-  rank: string;
+export interface AttrRank {
+  rank?: string;
 }
 
-export interface Attr2 {
+export interface AttrLimit {
   from: string;
   user: string;
   to: string;
@@ -249,7 +253,7 @@ export interface WeeklyTrackChartResponse {
 
 export interface WeeklyTrackChart {
   track: Track[];
-  '@attr': WeeklyTrackChartAttr2;
+  '@attr': AttrLimit;
 }
 
 export interface WeeklyTrackChartTrack {
@@ -258,7 +262,7 @@ export interface WeeklyTrackChartTrack {
   mbid: string;
   url: string;
   name: string;
-  '@attr': Attr;
+  '@attr': AttrNowPlaying;
   playcount: string;
 }
 
@@ -267,113 +271,6 @@ export interface WeeklyTrackChartArtist {
   '#text': string;
 }
 
-export interface WeeklyTrackChartAttr {
-  rank: string;
-}
-
-export interface WeeklyTrackChartAttr2 {
-  from: string;
-  user: string;
-  to: string;
-}
-
-export const LastFmApi: () => {
-  auth: (method: string, user: string) => Promise<AuthResponse>;
-  config: {
-    api_key: string;
-    app_name: string;
-    base_url: string;
-    format: {
-      json: string;
-      xml: string;
-    };
-    share_secret: string;
-    username: string;
-  };
-  getInfo: (method: string, user: string) => Promise<UserResponse>;
-  getLovedTracks: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<LovedTracksResponse>;
-  getRecentTracks: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<RecentTracksResponse>;
-  getTopAlbums: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<TopAlbumsResponse>;
-  getTopArtists: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<TopArtistsResponse>;
-  getTopTracks: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<TopTrackResponse>;
-  getWeeklyAlbumChart: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<WeeklyAlbumChartResponse>;
-  getWeeklyArtistChart: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<WeeklyArtistChartResponse>;
-  getWeeklyChartList: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<WeeklyChartListResponse>;
-  getWeeklyTrackChart: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<WeeklyTrackChartResponse>;
-};
-export interface config {
-  api_key: string;
-  app_name: string;
-  base_url: string;
-  format: {
-    json: string;
-    xml: string;
-  };
-  share_secret: string;
-  username: string;
-}
-
-export interface method {
-  auth: string;
-  user: {
-    getInfo: string;
-    loved_tracks: string;
-    recent_tracks: string;
-    top_albums: string;
-    top_artists: string;
-    top_tracks: string;
-    weekly_album_chart: string;
-    weekly_artist_chart: string;
-    weekly_chart_list: string;
-    weekly_track_chart: string;
-  };
-}
-
 export enum ErrorResponse {
     InvalidService = 2,
     InvalidMethod = 3,

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.4.3
+
+- fix missmatched types for Album and Track, added some optionals pity, but it works, that just how they give us the data.
+
 ## 1.4.2
 
 - bug, release dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lastfm-nodejs-client",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "A NodeJS wrapper client for LastFm API. Fetching public data by username using the LastFm public API",
   "main": "./dist",
   "keywords": [

package/tsconfig.json

@@ -12,8 +12,8 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "ES6"                                       /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
-    "lib": ["DOM", "ESNext"],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    "target": "ES6"                                      /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "lib": ["DOM", "ESNext"],                            /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
     // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
@@ -26,9 +26,9 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "NodeNext"                                  /* Specify what module code is generated. */,
-    "rootDir": "./src"                                    /* Specify the root folder within your source files. */,
-    "moduleResolution": "NodeNext"                        /* Specify how TypeScript looks up a file from a given module specifier. */,
+    "module": "NodeNext"                                 /* Specify what module code is generated. */,
+    "rootDir": "./src"                                   /* Specify the root folder within your source files. */,
+    "moduleResolution": "NodeNext"                       /* Specify how TypeScript looks up a file from a given module specifier. */,
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
@@ -46,7 +46,7 @@
 
     /* Emit */
     "declaration": true                                  /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
-    "declarationMap": true,                             /* Create sourcemaps for d.ts files. */
+    "declarationMap": true,                              /* Create sourcemaps for d.ts files. */
     // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
@@ -77,16 +77,16 @@
     "forceConsistentCasingInFileNames": true             /* Ensure that casing is correct in imports. */,
 
     /* Type Checking */
-    "strict": true /* Enable all strict type-checking options. */,
-    "noImplicitAny": true /* Enable error reporting for expressions and declarations with an implied 'any' type. */,
-    "strictNullChecks": true /* When type checking, take into account 'null' and 'undefined'. */,
+    "strict": true                                       /* Enable all strict type-checking options. */,
+    "noImplicitAny": true                                /* Enable error reporting for expressions and declarations with an implied 'any' type. */,
+    "strictNullChecks": true                             /* When type checking, take into account 'null' and 'undefined'. */,
     // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
     // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
     // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
     // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
-    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
-    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+    "useUnknownInCatchVariables": true,                  /* Default catch clause variables as 'unknown' instead of 'any'. */
+    "alwaysStrict": true,                                /* Ensure 'use strict' is always emitted. */
+    "noUnusedLocals": true,                              /* Enable error reporting when local variables aren't read. */
     // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
     // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
     // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
@@ -98,7 +98,7 @@
     // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
 
     /* Completeness */
-    "skipDefaultLibCheck": true /* Skip type checking .d.ts files that are included with TypeScript. */,
-    "skipLibCheck": true /* Skip type checking all .d.ts files. */
+    "skipDefaultLibCheck": true                          /* Skip type checking .d.ts files that are included with TypeScript. */,
+    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
   }
 }

package/dist/@types/index.d.ts

@@ -1,392 +0,0 @@
-export interface AuthResponse {
-  token: string;
-}
-
-export interface LovedTracksResponse {
-  lovedtracks: LovedTracks;
-}
-
-export interface LovedTracks {
-  track: Track[];
-  '@attr': Attr;
-}
-export interface TopAlbumsResponse {
-  topalbums: TopAlbums;
-}
-
-export interface TopTrackResponse {
-  toptracks: TopTracks;
-}
-
-export interface TopTracks {
-  track: Track[];
-  '@attr': Attr2;
-}
-
-export interface UserResponse {
-  user: User;
-}
-
-export interface RecentTracksResponse {
-  recenttracks: RecentTracks;
-}
-
-export interface RecentTracks {
-  track: Track[];
-  '@attr': Attr2;
-}
-
-export interface LoveTracksResponse {
-  lovedtracks: LovedTracks;
-}
-
-export interface LovedTracks {
-  track: Track[];
-  '@attr': Attr;
-}
-export interface FriendsResponse {
-  friends: Friends;
-}
-
-export interface Friends {
-  '@attr': Attr;
-  user: User[];
-}
-
-export interface TopArtistsResponse {
-  topartists: TopArtists;
-}
-
-export interface TopArtists {
-  artist: Artist[];
-  '@attr': Attr2;
-}
-
-export interface WeeklyArtistChartResponse {
-  weeklyartistchart: WeeklyArtistChart;
-}
-
-export interface WeeklyArtistChart {
-  artist: Artist[];
-  '@attr': Attr2;
-}
-
-export interface WeeklyAlbumChartResponse {
-  weeklyalbumchart: WeeklyAlbumChart;
-}
-
-export interface WeeklyAlbumChart {
-  album: WeeklyAlbum[];
-  '@attr': WeeklyalbumChartAttr;
-}
-
-export type WeeklyAlbum = {
-  artist: {
-    mbid: string;
-    '#text': string;
-  };
-  mbid: string;
-  url: string;
-  name: string;
-  '@attr': { rank: string };
-  playcount: string;
-  image?: string;
-};
-
-export interface WeeklyalbumChartAttr {
-  from: string;
-  to: string;
-  user: string;
-}
-
-export interface AlbumAttr {
-  rank: string;
-}
-
-export type Artist = {
-  '@attr': {
-    rank: number;
-  };
-  cover: ArtistImage;
-  image?: Image[];
-  mbid: string;
-  name: string;
-  playcount: number;
-  streamable: number;
-  url: string;
-  '#text': string;
-};
-
-export interface Attribs {
-  page: number;
-  perPage: number;
-  user: string;
-  total: number;
-  totalPages: number;
-}
-
-export interface ArtistImage {
-  name: string;
-  photo: string;
-  attribution: string;
-  playcount: number;
-}
-
-export interface Album {
-  mbid: string;
-  '#text': string;
-}
-
-export interface Attr {
-  nowplaying: string;
-}
-
-export interface Date {
-  uts: string;
-  '#text': string;
-}
-
-export interface Track {
-  artist: Artist;
-  streamable: string;
-  image: Image[];
-  mbid: string;
-  album: Album;
-  name: string;
-  '@attr': Attr;
-  url: string;
-  date: Date;
-}
-
-export interface Attr2 {
-  user: string;
-  totalPages: string;
-  page: string;
-  perPage: string;
-  total: string;
-}
-
-export interface RecentTracks {
-  track: Track[];
-  '@attr': Attr2;
-}
-
-export interface Image {
-  size: string;
-  '#text': string;
-}
-
-export interface Registered {
-  unixtime: string;
-  '#text': number;
-}
-
-export interface User {
-  name: string;
-  age: string;
-  subscriber: string;
-  realname: string;
-  bootstrap: string;
-  playcount: string;
-  artist_count: string;
-  playlists: string;
-  track_count: string;
-  album_count: string;
-  image: Image[];
-  registered: Registered;
-  country: string;
-  gender: string;
-  url: string;
-  type: string;
-}
-
-export interface TopAlbums {
-  album: Album[];
-  '@attr': Attr2;
-}
-
-export interface WeeklyArtistChartResponse {
-  weeklyartistchart: WeeklyArtistChart;
-}
-
-export interface WeeklyArtistChart {
-  artist: Artist[];
-  '@attr': Attr2;
-}
-
-export interface Attr1 {
-  rank: string;
-}
-
-export interface Attr2 {
-  from: string;
-  user: string;
-  to: string;
-}
-
-export interface WeeklyChartListResponse {
-  weeklychartlist: WeeklyChartList;
-}
-
-export interface WeeklyChartList {
-  chart: WeeklyChartListChart[];
-  '@attr': WeeklyChartListAttr;
-}
-
-export interface WeeklyChartListChart {
-  '#text': string;
-  from: string;
-  to: string;
-}
-
-export interface WeeklyChartListAttr {
-  user: string;
-}
-
-export interface WeeklyTrackChartResponse {
-  weeklytrackchart: WeeklyTrackChart;
-}
-
-export interface WeeklyTrackChart {
-  track: Track[];
-  '@attr': WeeklyTrackChartAttr2;
-}
-
-export interface WeeklyTrackChartTrack {
-  artist: WeeklyTrackChartArtist;
-  image: Image[];
-  mbid: string;
-  url: string;
-  name: string;
-  '@attr': Attr;
-  playcount: string;
-}
-
-export interface WeeklyTrackChartArtist {
-  mbid: string;
-  '#text': string;
-}
-
-export interface WeeklyTrackChartAttr {
-  rank: string;
-}
-
-export interface WeeklyTrackChartAttr2 {
-  from: string;
-  user: string;
-  to: string;
-}
-
-export const LastFmApi: () => {
-  auth: (method: string, user: string) => Promise<AuthResponse>;
-  config: {
-    api_key: string;
-    app_name: string;
-    base_url: string;
-    format: {
-      json: string;
-      xml: string;
-    };
-    share_secret: string;
-    username: string;
-  };
-  getInfo: (method: string, user: string) => Promise<UserResponse>;
-  getLovedTracks: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<LovedTracksResponse>;
-  getRecentTracks: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<RecentTracksResponse>;
-  getTopAlbums: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<TopAlbumsResponse>;
-  getTopArtists: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<TopArtistsResponse>;
-  getTopTracks: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<TopTrackResponse>;
-  getWeeklyAlbumChart: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<WeeklyAlbumChartResponse>;
-  getWeeklyArtistChart: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<WeeklyArtistChartResponse>;
-  getWeeklyChartList: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<WeeklyChartListResponse>;
-  getWeeklyTrackChart: (
-    method: string,
-    user: string,
-    period: string,
-    limit: number,
-  ) => Promise<WeeklyTrackChartResponse>;
-};
-export interface config {
-  api_key: string;
-  app_name: string;
-  base_url: string;
-  format: {
-    json: string;
-    xml: string;
-  };
-  share_secret: string;
-  username: string;
-}
-
-export interface method {
-  auth: string;
-  user: {
-    getInfo: string;
-    loved_tracks: string;
-    recent_tracks: string;
-    top_albums: string;
-    top_artists: string;
-    top_tracks: string;
-    weekly_album_chart: string;
-    weekly_artist_chart: string;
-    weekly_chart_list: string;
-    weekly_track_chart: string;
-  };
-}
-
-export enum ErrorResponse {
-    InvalidService = 2,
-    InvalidMethod = 3,
-    AuthenticationFailed = 4,
-    InvalidFormat = 5,
-    InvalidParameters = 6,
-    InvalidResource = 7,
-    OperationFailed = 8,
-    InvalidSessionKey = 9,
-    InvalidAPIKey = 10,
-    ServiceOffline = 11,
-    InvalidMethodSignature = 13,
-    TemporaryError = 16,
-    SuspendedAPIKey = 26,
-    RateLimitExceeded = 29
-}