2.0.0

package.json

@@ -1,10 +1,11 @@
 {
   "name": "@pushrocks/smartsitemap",
-  "version": "1.0.12",
+  "version": "2.0.0",
   "private": false,
   "description": "a sitemap module",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
@@ -12,21 +13,20 @@
     "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.61",
-    "@gitzone/tsbundle": "^1.0.78",
+    "@gitzone/tsbundle": "^1.0.101",
-    "@gitzone/tstest": "^1.0.44",
+    "@gitzone/tstest": "^1.0.69",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/smartenv": "^5.0.0",
-    "@types/node": "^14.14.5",
+    "@pushrocks/tapbundle": "^5.0.3",
-    "tslint": "^6.1.3",
+    "@types/node": "^17.0.23"
-    "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
     "@pushrocks/smartcache": "^1.0.13",
-    "@pushrocks/smartfeed": "^1.0.5",
+    "@pushrocks/smartfeed": "^1.0.11",
     "@pushrocks/smartxml": "^1.0.6",
     "@pushrocks/smartyaml": "^2.0.5",
-    "@pushrocks/webrequest": "^2.0.13",
+    "@pushrocks/webrequest": "^3.0.3",
-    "@tsclass/tsclass": "^3.0.25"
+    "@tsclass/tsclass": "^3.0.48"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.ts

@@ -1,21 +1,21 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartsitemap from '../ts/index';
+import * as smartsitemap from '../ts/index.js';
 
 let testSmartsitemap: smartsitemap.SmartSitemap;
 
 tap.test('should create an instance of Smartsitemap', async () => {
   testSmartsitemap = new smartsitemap.SmartSitemap();
-  expect(testSmartsitemap).to.be.instanceOf(smartsitemap.SmartSitemap);
+  expect(testSmartsitemap).toBeInstanceOf(smartsitemap.SmartSitemap);
 });
 
 tap.test('should create a sitemap from feed', async () => {
-  const sitemapString = await testSmartsitemap.createSitemapNewsFromFeedUrl('https://www.theverge.com/rss/index.xml');
+  const sitemapString = await testSmartsitemap.createSitemapNewsFromFeedUrl('https://central.eu/feed');
   console.log(sitemapString);
 });
 
 tap.test('should parse a sitemap', async () => {
-  const result = await testSmartsitemap.parseSitemapUrl('https://www.theverge.com/sitemaps');
+  const result = await testSmartsitemap.parseSitemapUrl('https://central.eu/sitemap-news');
-  console.log(result.sitemapindex.sitemap);
+  console.log(result.urlset.url);
 })
 
 tap.start();

ts/index.ts

@@ -1,3 +1,3 @@
-export * from './smartsitemap.classes.smartsitemap';
+export * from './smartsitemap.classes.smartsitemap.js';
-export * from './smartsitemap.classes.sitemapnews';
+export * from './smartsitemap.classes.sitemapnews.js';
-export * from './smartsitemap.classes.sitemapwebsite';
+export * from './smartsitemap.classes.sitemapwebsite.js';

ts/interfaces/index.ts

@@ -14,4 +14,29 @@ export interface IRssItem {
   categories?: string[];
   contentSnippet?: string;
   enclosure?: any;
-}
+}
+
+export interface IParsedSiteMap {
+  urlset: {
+    url:
+      | {
+          loc: string;
+          lastmod: string;
+          changefreq: string;
+        }
+      | {
+          loc: string;
+          lastmod: string;
+          changefreq: string;
+        }[]
+      | {
+          loc: string;
+          'news:news': {
+            'news:publication': [];
+            'news:keywords': string;
+            'news:publication_date': string;
+            'news:title': string;
+          };
+        }[];
+  };
+}

ts/smartsitemap.classes.sitemapnews.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartsitemap.plugins';
+import * as plugins from './smartsitemap.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 export class SitemapNews {
   public rssItems: interfaces.IRssItem[] = [];
@@ -23,7 +23,8 @@ export class SitemapNews {
       return {
         title: articleArg.title,
         content: articleArg.content,
-        isoDate: new Date(/* TODO: put article timestamp here */).toISOString()
+        isoDate: new Date(/* TODO: put article timestamp here */).toISOString(),
+        link: articleArg.url
       };
     });
 
@@ -44,6 +45,7 @@ export class SitemapNews {
       };
     }[] = [];
     for (const itemArg of this.rssItems) {
+      console.log(itemArg);
       urls.push({
         loc: itemArg.link,
         'news:news': {

ts/smartsitemap.classes.sitemapwebsite.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartsitemap.plugins';
+import * as plugins from './smartsitemap.plugins.js';
 
 export type TUpdateFrequency = 'never' | 'daily' | 'weekly' | 'monthly' | 'yearly';
 

ts/smartsitemap.classes.smartsitemap.ts

@@ -1,7 +1,7 @@
-import { SitemapNews } from './smartsitemap.classes.sitemapnews';
+import { SitemapNews } from './smartsitemap.classes.sitemapnews.js';
-import { IUrlInfo, SitemapWebsite } from './smartsitemap.classes.sitemapwebsite';
+import { IUrlInfo, SitemapWebsite } from './smartsitemap.classes.sitemapwebsite.js';
-import * as plugins from './smartsitemap.plugins';
+import * as plugins from './smartsitemap.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 export class SmartSitemap {
   constructor() {}
@@ -75,7 +75,7 @@ export class SmartSitemap {
   /**
    * parses a sitemap
    */
-  public async parseSitemap(sitemapXmlArg: string) {
+  public async parseSitemap(sitemapXmlArg: string): Promise<interfaces.IParsedSiteMap> {
     return (new plugins.smartxml.SmartXml()).parseXmlToObject(sitemapXmlArg);
   }
 }

tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext"
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}