npm - mwoffliner - Versions diffs - 1.17.4 → 2.0.0 - Mend

mwoffliner 1.17.4 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (227) hide show

package/README.md +355 -62
package/docs/functional_architecture.md +34 -38
package/extensions/wiktionary_fr.js +18 -17
package/jest.config.cjs +2 -2
package/lib/DOMUtils.js +0 -1
package/lib/DOMUtils.js.map +1 -1
package/lib/Downloader.d.ts +39 -31
package/lib/Downloader.js +418 -349
package/lib/Downloader.js.map +1 -1
package/lib/Dump.d.ts +24 -10
package/lib/Dump.js +95 -50
package/lib/Dump.js.map +1 -1
package/lib/Gadgets.d.ts +2 -1
package/lib/Gadgets.js +7 -5
package/lib/Gadgets.js.map +1 -1
package/lib/Logger.d.ts +6 -6
package/lib/Logger.js +33 -33
package/lib/Logger.js.map +1 -1
package/lib/MediaWiki.d.ts +14 -31
package/lib/MediaWiki.js +119 -172
package/lib/MediaWiki.js.map +1 -1
package/lib/RedisStore.d.ts +3 -3
package/lib/RedisStore.js +21 -23
package/lib/RedisStore.js.map +1 -1
package/lib/S3.js +1 -1
package/lib/S3.js.map +1 -1
package/lib/Templates.d.ts +3 -10
package/lib/Templates.js +5 -14
package/lib/Templates.js.map +1 -1
package/lib/cli.js +7 -6
package/lib/cli.js.map +1 -1
package/lib/config.d.ts +10 -16
package/lib/config.js +33 -55
package/lib/config.js.map +1 -1
package/lib/error.manager.d.ts +2 -2
package/lib/error.manager.js +42 -49
package/lib/error.manager.js.map +1 -1
package/lib/i18n.d.ts +2 -0
package/lib/i18n.js +53 -0
package/lib/i18n.js.map +1 -0
package/lib/mutex.d.ts +2 -1
package/lib/mutex.js +2 -1
package/lib/mutex.js.map +1 -1
package/lib/mwoffliner.lib.js +370 -222
package/lib/mwoffliner.lib.js.map +1 -1
package/lib/parameterList.d.ts +20 -8
package/lib/parameterList.js +30 -18
package/lib/parameterList.js.map +1 -1
package/lib/renderers/abstract.renderer.d.ts +48 -55
package/lib/renderers/abstract.renderer.js +377 -98
package/lib/renderers/abstract.renderer.js.map +1 -1
package/lib/renderers/action-parse.renderer.d.ts +22 -3
package/lib/renderers/action-parse.renderer.js +123 -81
package/lib/renderers/action-parse.renderer.js.map +1 -1
package/lib/renderers/renderer.builder.js +6 -69
package/lib/renderers/renderer.builder.js.map +1 -1
package/lib/renderers/rendering.context.d.ts +2 -3
package/lib/renderers/rendering.context.js +6 -14
package/lib/renderers/rendering.context.js.map +1 -1
package/lib/sanitize-argument.d.ts +7 -4
package/lib/sanitize-argument.js +99 -41
package/lib/sanitize-argument.js.map +1 -1
package/lib/util/FileManager.d.ts +36 -0
package/lib/util/FileManager.js +246 -0
package/lib/util/FileManager.js.map +1 -0
package/lib/util/RedisKvs.js +4 -4
package/lib/util/RedisKvs.js.map +1 -1
package/lib/util/RedisQueue.js +1 -1
package/lib/util/RedisQueue.js.map +1 -1
package/lib/util/builders/url/action-parse.director.d.ts +2 -2
package/lib/util/builders/url/action-parse.director.js +7 -7
package/lib/util/builders/url/action-parse.director.js.map +1 -1
package/lib/util/builders/url/api.director.d.ts +2 -4
package/lib/util/builders/url/api.director.js +10 -17
package/lib/util/builders/url/api.director.js.map +1 -1
package/lib/util/builders/url/base.director.d.ts +0 -4
package/lib/util/builders/url/base.director.js +0 -25
package/lib/util/builders/url/base.director.js.map +1 -1
package/lib/util/builders/url/basic.director.d.ts +1 -1
package/lib/util/builders/url/basic.director.js +1 -1
package/lib/util/builders/url/web.director.d.ts +1 -1
package/lib/util/builders/url/web.director.js +2 -2
package/lib/util/builders/url/web.director.js.map +1 -1
package/lib/util/categories.d.ts +5 -5
package/lib/util/categories.js +175 -174
package/lib/util/categories.js.map +1 -1
package/lib/util/const.d.ts +4 -8
package/lib/util/const.js +9 -17
package/lib/util/const.js.map +1 -1
package/lib/util/customCssJs.d.ts +6 -0
package/lib/util/customCssJs.js +70 -0
package/lib/util/customCssJs.js.map +1 -0
package/lib/util/dump.d.ts +15 -4
package/lib/util/dump.js +282 -86
package/lib/util/dump.js.map +1 -1
package/lib/util/index.d.ts +1 -1
package/lib/util/index.js +1 -1
package/lib/util/index.js.map +1 -1
package/lib/util/metaData.js.map +1 -1
package/lib/util/misc.d.ts +23 -13
package/lib/util/misc.js +90 -59
package/lib/util/misc.js.map +1 -1
package/lib/util/mw-api.d.ts +7 -5
package/lib/util/mw-api.js +167 -221
package/lib/util/mw-api.js.map +1 -1
package/lib/util/pageListMainPage.d.ts +3 -0
package/lib/util/pageListMainPage.js +10 -0
package/lib/util/pageListMainPage.js.map +1 -0
package/lib/util/pages.d.ts +30 -0
package/lib/util/pages.js +146 -0
package/lib/util/pages.js.map +1 -0
package/lib/util/rewriteUrls.d.ts +2 -2
package/lib/util/rewriteUrls.js +33 -31
package/lib/util/rewriteUrls.js.map +1 -1
package/lib/util/savePages.d.ts +8 -0
package/lib/util/savePages.js +182 -0
package/lib/util/savePages.js.map +1 -0
package/lib/version.d.ts +1 -1
package/lib/version.js +1 -1
package/lib/version.js.map +1 -1
package/offliner-definition.json +178 -90
package/package.json +50 -49
package/res/page_list_home.js +20 -0
package/res/{article_not_found.svg → page_not_found.svg} +1 -1
package/res/script.js +30 -45
package/res/style.css +52 -68
package/res/templates/download_error_placeholder.html +7 -8
package/res/templates/javaScript.html +19 -0
package/res/templates/pageFallback.html +9 -7
package/res/templates/pageVector2022.html +9 -7
package/res/templates/pageVectorLegacy.html +9 -7
package/res/templates/{article_list_home.html → page_list_home.html} +1 -2
package/translation/ar.json +21 -21
package/translation/bn.json +1 -1
package/translation/de.json +46 -19
package/translation/en.json +54 -21
package/translation/es.json +17 -19
package/translation/fi.json +23 -3
package/translation/fr.json +57 -21
package/translation/he.json +8 -6
package/translation/ia.json +19 -19
package/translation/id.json +13 -13
package/translation/it.json +13 -8
package/translation/ko.json +55 -3
package/translation/lb.json +5 -2
package/translation/mk.json +5 -5
package/translation/nl.json +57 -22
package/translation/or.json +2 -2
package/translation/pt.json +2 -2
package/translation/qqq.json +55 -22
package/translation/ru.json +2 -2
package/translation/sc.json +2 -2
package/translation/sk.json +62 -0
package/translation/sl.json +54 -21
package/translation/sv.json +20 -19
package/translation/sw.json +45 -2
package/translation/zh-hans.json +56 -22
package/translation/zh-hant.json +26 -19
package/lib/renderers/abstractDesktop.render.d.ts +0 -12
package/lib/renderers/abstractDesktop.render.js +0 -67
package/lib/renderers/abstractDesktop.render.js.map +0 -1
package/lib/renderers/abstractMobile.render.d.ts +0 -12
package/lib/renderers/abstractMobile.render.js +0 -54
package/lib/renderers/abstractMobile.render.js.map +0 -1
package/lib/renderers/rest-api.renderer.d.ts +0 -7
package/lib/renderers/rest-api.renderer.js +0 -68
package/lib/renderers/rest-api.renderer.js.map +0 -1
package/lib/renderers/visual-editor.renderer.d.ts +0 -7
package/lib/renderers/visual-editor.renderer.js +0 -76
package/lib/renderers/visual-editor.renderer.js.map +0 -1
package/lib/renderers/wikimedia-desktop.renderer.d.ts +0 -4
package/lib/renderers/wikimedia-desktop.renderer.js +0 -7
package/lib/renderers/wikimedia-desktop.renderer.js.map +0 -1
package/lib/renderers/wikimedia-mobile.renderer.d.ts +0 -19
package/lib/renderers/wikimedia-mobile.renderer.js +0 -243
package/lib/renderers/wikimedia-mobile.renderer.js.map +0 -1
package/lib/util/articleListMainPage.d.ts +0 -3
package/lib/util/articleListMainPage.js +0 -10
package/lib/util/articleListMainPage.js.map +0 -1
package/lib/util/articles.d.ts +0 -26
package/lib/util/articles.js +0 -102
package/lib/util/articles.js.map +0 -1
package/lib/util/builders/url/desktop.director.d.ts +0 -8
package/lib/util/builders/url/desktop.director.js +0 -15
package/lib/util/builders/url/desktop.director.js.map +0 -1
package/lib/util/builders/url/mobile.director.d.ts +0 -8
package/lib/util/builders/url/mobile.director.js +0 -15
package/lib/util/builders/url/mobile.director.js.map +0 -1
package/lib/util/builders/url/rest-api.director.d.ts +0 -8
package/lib/util/builders/url/rest-api.director.js +0 -18
package/lib/util/builders/url/rest-api.director.js.map +0 -1
package/lib/util/builders/url/visual-editor.director.d.ts +0 -9
package/lib/util/builders/url/visual-editor.director.js +0 -18
package/lib/util/builders/url/visual-editor.director.js.map +0 -1
package/lib/util/saveArticles.d.ts +0 -8
package/lib/util/saveArticles.js +0 -411
package/lib/util/saveArticles.js.map +0 -1
package/res/article_list_home.js +0 -24
package/res/content.parsoid.css +0 -196
package/res/inserted_style.css +0 -45
package/res/templates/categories.html +0 -11
package/res/templates/lead_section_wrapper.html +0 -6
package/res/templates/pageWikimediaDesktop.html +0 -24
package/res/templates/pageWikimediaMobile.html +0 -24
package/res/templates/section_wrapper.html +0 -5
package/res/templates/subcategories.html +0 -23
package/res/templates/subpages.html +0 -17
package/res/templates/subsection_wrapper.html +0 -5
package/res/webpHandler.js +0 -165
package/res/wm_mobile_override_script.js +0 -15
package/res/wm_mobile_override_style.css +0 -20
package/translation/br.json +0 -8
package/translation/dag.json +0 -9
package/translation/es-formal.json +0 -29
package/translation/ha.json +0 -10
package/translation/hi.json +0 -9
package/translation/ig.json +0 -10
package/translation/kaa.json +0 -9
package/translation/nb.json +0 -9
package/translation/nqo.json +0 -8
package/translation/pt-br.json +0 -10
package/translation/ro.json +0 -9
package/translation/scn.json +0 -8
package/translation/sq.json +0 -9
package/translation/te.json +0 -9
package/translation/tn.json +0 -9
package/translation/tr.json +0 -10

package/lib/MediaWiki.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MediaWiki.js","sourceRoot":"","sources":["../src/MediaWiki.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"MediaWiki.js","sourceRoot":"","sources":["../src/MediaWiki.ts"],"names":[],"mappings":"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"}

package/lib/RedisStore.d.ts CHANGED Viewed

@@ -5,9 +5,9 @@ declare class RedisStore implements RS {
     private static instance;
     private constructor();
     get client(): RedisClientType;
-    get filesToDownloadXPath(): RKVS<FileDetail>;
-    get articleDetailXId(): RKVS<ArticleDetail>;
-    get redirectsXId(): RKVS<ArticleRedirect>;
+    get filesStore(): RKVS<FileDetail>;
+    get pagesStore(): RKVS<PageDetail>;
+    get redirectsStore(): RKVS<PageRedirect>;
     get filesQueues(): RedisQueue<FileToDownload>[];
     static getInstance(): RedisStore;
     setOptions(redisPath: string, opts?: any): void;

package/lib/RedisStore.js CHANGED Viewed

@@ -5,9 +5,9 @@ class RedisStore {
     static instance;
     #client;
     #storesReady;
-    #filesToDownloadXPath;
-    #articleDetailXId;
-    #redirectsXId;
+    #filesStore;
+    #pagesStore;
+    #redirectsStore;
     #filesQueues;
     constructor() {
         this.#filesQueues = [];
@@ -15,14 +15,14 @@ class RedisStore {
     get client() {
         return this.#client;
     }
-    get filesToDownloadXPath() {
-        return this.#filesToDownloadXPath;
+    get filesStore() {
+        return this.#filesStore;
     }
-    get articleDetailXId() {
-        return this.#articleDetailXId;
+    get pagesStore() {
+        return this.#pagesStore;
     }
-    get redirectsXId() {
-        return this.#redirectsXId;
+    get redirectsStore() {
+        return this.#redirectsStore;
     }
     get filesQueues() {
         return this.#filesQueues;
@@ -72,8 +72,8 @@ class RedisStore {
     }
     async close() {
         if (this.#client.isReady && this.#storesReady) {
-            logger.log('Flushing Redis DBs');
-            await Promise.all([this.#filesToDownloadXPath.flush(), this.#articleDetailXId.flush(), this.#redirectsXId.flush(), ...this.#filesQueues.map((queue) => queue.flush)]);
+            logger.info('Flushing Redis DBs');
+            await Promise.all([this.#filesStore.flush(), this.#pagesStore.flush(), this.#redirectsStore.flush(), ...this.#filesQueues.map((queue) => queue.flush())]);
         }
         if (this.#client.isOpen) {
             await this.#client.quit();
@@ -85,27 +85,25 @@ class RedisStore {
         for (const pattern of patterns) {
             keys = keys.concat(await this.#client.keys(pattern));
         }
-        keys.forEach(async (key) => {
+        await Promise.all(keys.map(async (key) => {
             try {
-                const length = await this.#client.hLen(key);
                 const time = new Date(Number(key.slice(0, key.indexOf('-'))));
-                logger.warn(`Deleting store from previous run from ${time} that was still in Redis: ${key} with length ${length}`);
-                this.#client.del(key);
+                logger.warn(`Deleting store from previous run from ${time} that was still in Redis: ${key}`);
+                await this.#client.del(key);
             }
-            catch {
-                logger.error(`Key ${key} exists in DB, and is no hash.`);
+            catch (err) {
+                logger.error(`Failed to delete stale key ${key}:`, err);
             }
-        });
+        }));
     }
     async populateStores() {
-        this.#filesToDownloadXPath = new RedisKvs(this.#client, `${Date.now()}-media`, {
+        this.#filesStore = new RedisKvs(this.#client, `${Date.now()}-media`, {
             u: 'url',
             m: 'mult',
             w: 'width',
+            k: 'kind',
         });
-        this.#articleDetailXId = new RedisKvs(this.#client, `${Date.now()}-detail`, {
-            s: 'subCategories',
-            c: 'categories',
+        this.#pagesStore = new RedisKvs(this.#client, `${Date.now()}-detail`, {
             p: 'pages',
             h: 'thumbnail',
             g: 'coordinates',
@@ -115,7 +113,7 @@ class RedisStore {
             m: 'missing',
             n: 'title',
         });
-        this.#redirectsXId = new RedisKvs(this.#client, `${Date.now()}-redirect`, {
+        this.#redirectsStore = new RedisKvs(this.#client, `${Date.now()}-redirect`, {
             f: 'fragment',
             t: 'targetId',
             n: 'title',

package/lib/RedisStore.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RedisStore.js","sourceRoot":"","sources":["../src/RedisStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpC,OAAO,QAAQ,MAAM,oBAAoB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAGrC,MAAM,UAAU;IACN,MAAM,CAAC,QAAQ,CAAY;IAEnC,OAAO,CAAiB;IACxB,YAAY,CAAS;IACrB,~~qBAAqB~~,CAAkB;~~IACvC~~,~~iBAAiB~~,~~CAAqB~~;~~IACtC~~,~~aAAa~~,~~CAAuB~~;~~IACpC~~,YAAY,CAA8B;IAE1C;QACE,IAAI,CAAC,YAAY,GAAG,EAAE,CAAA;IACxB,CAAC;IAED,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAED,IAAW,~~oBAAoB~~;~~QAC7B~~,OAAO,IAAI,CAAC,~~qBAAqB~~,CAAA;~~IACnC~~,CAAC;IAED,IAAW,~~gBAAgB~~;~~QACzB~~,OAAO,IAAI,CAAC,~~iBAAiB~~,CAAA;~~IAC/B~~,CAAC;IAED,IAAW,~~YAAY~~;~~QACrB~~,OAAO,IAAI,CAAC,~~aAAa~~,CAAA;~~IAC3B~~,CAAC;IAED,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAA;IAC1B,CAAC;IAEM,MAAM,CAAC,WAAW;QACvB,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACzB,UAAU,CAAC,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAA;QACxC,CAAC;QACD,OAAO,UAAU,CAAC,QAAQ,CAAA;IAC5B,CAAC;IAEM,UAAU,CAAC,SAAiB,EAAE,IAAU;QAC7C,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,EAAE,GAAG,IAAI,EAAE,CAAA;YAC3B,MAAM,WAAW,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,KAAK,KAAK,CAAC,CAAA;YACpD,OAAO,OAAO,CAAC,WAAW,CAAA;YAE1B,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5D,OAAO,CAAC,MAAM,GAAG;oBACf,GAAG,OAAO,CAAC,MAAM;oBACjB,IAAI,EAAE,SAAS;iBAChB,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,GAAG,SAAS,CAAA;YACzB,CAAC;YAED,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YAEpC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC/B,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAA;oBACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBACjB,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAA;QACjF,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,cAAc,GAAG,IAAI;QACxC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACxB,OAAM;QACR,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;QAC5B,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAA;YACnC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;YAC3B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QAC1B,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC9C,MAAM,CAAC,~~GAAG~~,CAAC,oBAAoB,CAAC,CAAA;~~YAChC~~,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,~~qBAAqB~~,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,~~iBAAiB~~,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,~~aAAa~~,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;~~QACvK~~,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;QAC3B,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,sBAAsB;QACjC,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;QACjE,IAAI,IAAI,GAAa,EAAE,CAAA;QACvB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QACtD,CAAC;QAED,IAAI,CAAC,~~OAAO~~,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;~~YACzB~~,IAAI,CAAC;gBACH,MAAM,~~MAAM,GAAG,MAAM,~~IAAI,~~CAAC,OAAO,CAAC,IAAI,CAAC,~~GAAG,~~CAAC,CAAA;gBAC3C,MAAM,~~IAAI,~~GAAG,~~IAAI,~~IAAI,~~CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC7D,MAAM,CAAC,IAAI,CAAC,yCAAyC,IAAI,6BAA6B,GAAG,~~gBAAgB,MAAM,~~EAAE,CAAC,CAAA;~~gBAClH~~,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;~~YACvB~~,CAAC;YAAC,~~MAAM~~,CAAC;~~gBACP~~,MAAM,CAAC,KAAK,CAAC,~~OAAO~~,GAAG,~~gCAAgC~~,CAAC,CAAA;~~YAC1D~~,CAAC;QACH,CAAC,CAAC,CAAA;~~IACJ~~,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,IAAI,CAAC,~~qBAAqB~~,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE;~~YAC7E~~,CAAC,EAAE,KAAK;YACR,CAAC,EAAE,MAAM;YACT,CAAC,EAAE,OAAO;~~SACX~~,CAAC,CAAA;QACF,IAAI,CAAC,~~iBAAiB~~,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE;~~YAC1E~~,CAAC,EAAE,~~eAAe;YAClB,CAAC,EAAE,YAAY;YACf,CAAC,EAAE,~~OAAO;YACV,CAAC,EAAE,WAAW;YACd,CAAC,EAAE,aAAa;YAChB,CAAC,EAAE,WAAW;YACd,CAAC,EAAE,YAAY;YACf,CAAC,EAAE,sBAAsB;YACzB,CAAC,EAAE,SAAS;YACZ,CAAC,EAAE,OAAO;SACX,CAAC,CAAA;QACF,IAAI,CAAC,~~aAAa~~,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE;~~YACxE~~,CAAC,EAAE,UAAU;YACb,CAAC,EAAE,UAAU;YACb,CAAC,EAAE,OAAO;SACX,CAAC,CAAA;IACJ,CAAC;IAEM,cAAc,CAAC,GAAG,IAA4B;QACnD,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;IAC5C,CAAC;CACF;AAED,MAAM,EAAE,GAAG,UAAU,CAAC,WAAW,EAAE,CAAA;AACnC,eAAe,EAAgB,CAAA"}
1	+ {"version":3,"file":"RedisStore.js","sourceRoot":"","sources":["../src/RedisStore.ts"],"names":[],"mappings":"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"}

package/lib/S3.js CHANGED Viewed

@@ -104,7 +104,7 @@ class S3 {
                 .catch((err) => {
                 // For 404 error handle AWS service-specific exception
                 if (err && err.name === 'NoSuchKey') {
-                    logger.info(`The specified key '${key}' does not exist in the cache.`);
+                    logger.debug(`The specified key '${key}' does not exist in the cache.`);
                     resolve(null);
                 }
                 else {

package/lib/S3.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"S3.js","sourceRoot":"","sources":["../src/S3.ts"],"names":[],"mappings":"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~~IAAI~~,CAAC,sBAAsB,GAAG,gCAAgC,CAAC,CAAA;~~oBACtE~~,OAAO,CAAC,IAAI,CAAC,CAAA;gBACf,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,mCAAmC,GAAG,mBAAmB,CAAC,CAAA;oBACpF,MAAM,CAAC,GAAG,CAAC,CAAA;gBACb,CAAC;YACH,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,2BAA2B;IACpB,UAAU,CAAC,MAAoB;QACpC,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAA;QAC/C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,SAAS;iBACX,IAAI,CAAC,OAAO,CAAC;iBACb,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;iBAChC,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;gBAClB,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE,GAAG,CAAC,CAAA;gBAC7D,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAED,eAAe,EAAE,CAAA"}
1	+ {"version":3,"file":"S3.js","sourceRoot":"","sources":["../src/S3.ts"],"names":[],"mappings":"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"}

package/lib/Templates.d.ts CHANGED Viewed

@@ -1,16 +1,9 @@
 declare const footerTemplate: any;
-declare const leadSectionTemplate: any;
-declare const sectionTemplate: any;
-declare const subSectionTemplate: any;
-declare const categoriesTemplate: any;
-declare const subCategoriesTemplate: any;
-declare const subPagesTemplate: any;
 declare const downloadErrorPlaceholderTemplate: any;
-declare const htmlWikimediaMobileTemplateCode: () => string;
-declare const htmlWikimediaDesktopTemplateCode: () => string;
 declare const htmlVectorLegacyTemplateCode: () => string;
 declare const htmlVector2022TemplateCode: () => string;
 declare const htmlFallbackTemplateCode: () => string;
 declare const htmlRedirectTemplateCode: () => string;
-declare const articleListHomeTemplate: string;
-export { footerTemplate, leadSectionTemplate, sectionTemplate, subSectionTemplate, htmlWikimediaMobileTemplateCode, htmlWikimediaDesktopTemplateCode, htmlVectorLegacyTemplateCode, htmlVector2022TemplateCode, htmlFallbackTemplateCode, htmlRedirectTemplateCode, articleListHomeTemplate, categoriesTemplate, subCategoriesTemplate, subPagesTemplate, downloadErrorPlaceholderTemplate, };
+declare const javaScriptTemplateCode: () => string;
+declare const pageListHomeTemplate: string;
+export { footerTemplate, htmlVectorLegacyTemplateCode, htmlVector2022TemplateCode, htmlFallbackTemplateCode, htmlRedirectTemplateCode, javaScriptTemplateCode, pageListHomeTemplate, downloadErrorPlaceholderTemplate, };

package/lib/Templates.js CHANGED Viewed

@@ -11,19 +11,7 @@ function readTemplate(t) {
 }
 /* Compile templates */
 const footerTemplate = swig.compile(readTemplate(config.output.templates.footer));
-const leadSectionTemplate = swig.compile(readTemplate(config.output.templates.lead_section_wrapper));
-const sectionTemplate = swig.compile(readTemplate(config.output.templates.section_wrapper));
-const subSectionTemplate = swig.compile(readTemplate(config.output.templates.subsection_wrapper));
-const categoriesTemplate = swig.compile(readTemplate(config.output.templates.categories));
-const subCategoriesTemplate = swig.compile(readTemplate(config.output.templates.subCategories));
-const subPagesTemplate = swig.compile(readTemplate(config.output.templates.subPages));
 const downloadErrorPlaceholderTemplate = swig.compile(readTemplate(config.output.templates.downloadErrorPlaceholder));
-const htmlWikimediaMobileTemplateCode = () => {
-    return readTemplate(config.output.templates.pageWikimediaMobile);
-};
-const htmlWikimediaDesktopTemplateCode = () => {
-    return readTemplate(config.output.templates.pageWikimediaDesktop);
-};
 const htmlVectorLegacyTemplateCode = () => {
     return readTemplate(config.output.templates.pageVectorLegacy);
 };
@@ -36,6 +24,9 @@ const htmlFallbackTemplateCode = () => {
 const htmlRedirectTemplateCode = () => {
     return readTemplate(config.output.templates.htmlRedirect);
 };
-const articleListHomeTemplate = readTemplate(config.output.templates.articleListHomeTemplate);
-export { footerTemplate, leadSectionTemplate, sectionTemplate, subSectionTemplate, htmlWikimediaMobileTemplateCode, htmlWikimediaDesktopTemplateCode, htmlVectorLegacyTemplateCode, htmlVector2022TemplateCode, htmlFallbackTemplateCode, htmlRedirectTemplateCode, articleListHomeTemplate, categoriesTemplate, subCategoriesTemplate, subPagesTemplate, downloadErrorPlaceholderTemplate, };
+const javaScriptTemplateCode = () => {
+    return readTemplate(config.output.templates.javaScript);
+};
+const pageListHomeTemplate = readTemplate(config.output.templates.pageListHomeTemplate);
+export { footerTemplate, htmlVectorLegacyTemplateCode, htmlVector2022TemplateCode, htmlFallbackTemplateCode, htmlRedirectTemplateCode, javaScriptTemplateCode, pageListHomeTemplate, downloadErrorPlaceholderTemplate, };
 //# sourceMappingURL=Templates.js.map

package/lib/Templates.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Templates.js","sourceRoot":"","sources":["../src/Templates.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,gBAAgB,CAAA;AACjC,OAAO,UAAU,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AACjC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAEnC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;AAE1C,SAAS,YAAY,CAAC,CAAS;IAC7B,OAAO,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AAC1E,CAAC;AAED,uBAAuB;AACvB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;AACjF,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAA;AACpG,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAA;AAC3F,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAA;AACjG,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAA;AACzF,MAAM,qBAAqB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAA;AAC/F,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;AACrF,MAAM,gCAAgC,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC,CAAA;AAErH,MAAM~~,+BAA+B~~,GAAG,GAAG,EAAE;~~IAC3C~~,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,~~mBAAmB~~,CAAC,CAAA;~~AAClE~~,CAAC,CAAA;AAED,MAAM,~~gCAAgC~~,GAAG,GAAG,EAAE;~~IAC5C~~,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,~~oBAAoB~~,CAAC,CAAA;~~AACnE~~,CAAC,CAAA;AAED,MAAM,~~4BAA4B~~,GAAG,GAAG,EAAE;~~IACxC~~,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,~~gBAAgB,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,0BAA0B,GAAG,GAAG,EAAE;IACtC,OAAO,~~YAAY,CAAC,~~MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,~~CAAA;~~AAC7D~~,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,GAAG,EAAE;IACpC,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;AAC3D,CAAC,CAAA;AAED,MAAM,~~wBAAwB~~,GAAG,GAAG,EAAE;~~IACpC~~,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,~~YAAY~~,CAAC,CAAA;~~AAC3D~~,CAAC,CAAA;AAED,MAAM,~~uBAAuB~~,GAAG,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,~~uBAAuB~~,CAAC,CAAA;~~AAE7F~~,OAAO,EACL,cAAc,EACd,~~mBAAmB,EACnB,eAAe,EACf,kBAAkB,EAClB,+BAA+B,EAC/B,gCAAgC,EAChC,~~4BAA4B,EAC5B,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EACxB,~~uBAAuB~~,~~EACvB~~,~~kBAAkB~~,~~EAClB~~,~~qBAAqB,EACrB,gBAAgB,EAChB,~~gCAAgC,GACjC,CAAA"}
1	+ {"version":3,"file":"Templates.js","sourceRoot":"","sources":["../src/Templates.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,gBAAgB,CAAA;AACjC,OAAO,UAAU,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AACjC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAEnC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;AAE1C,SAAS,YAAY,CAAC,CAAS;IAC7B,OAAO,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AAC1E,CAAC;AAED,uBAAuB;AACvB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;AACjF,MAAM,gCAAgC,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC,CAAA;AAErH,MAAM,4BAA4B,GAAG,GAAG,EAAE;IACxC,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,0BAA0B,GAAG,GAAG,EAAE;IACtC,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;AAC7D,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,GAAG,EAAE;IACpC,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;AAC3D,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,GAAG,EAAE;IACpC,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;AAC3D,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,GAAG,EAAE;IAClC,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;AACzD,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;AAEvF,OAAO,EACL,cAAc,EACd,4BAA4B,EAC5B,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EACxB,sBAAsB,EACtB,oBAAoB,EACpB,gCAAgC,GACjC,CAAA"}

package/lib/cli.js CHANGED Viewed

@@ -17,10 +17,11 @@ const argv = yargs(hideBin(process.argv))
 Usage: npm run mwoffliner -- --help`)
     .describe(parameterDescriptions)
     .demandOption(requiredParams)
-    .deprecateOption('mwWikiPath')
-    .deprecateOption('mwIndexPhpPath')
-    .deprecateOption('keepEmptyParagraphs', 'use --keepEmptySections instead')
     .strict().argv;
+// Set log level as early as possible so sanitize errors and fatal errors are visible.
+// If the value is not a valid level, default to 'info' and let sanitize_all report it.
+const earlyLogLevel = argv.logLevel;
+logger.setLogLevel(logger.logLevels.includes(earlyLogLevel) ? earlyLogLevel : 'info');
 /* ***********************************/
 /* TMPDIR OVERRIDE HAS TO BE HANDLED */
 /* AT THE REALLY BEGIN               */
@@ -54,7 +55,7 @@ sanitize_all(argv)
     mwofflinerLib
         .execute(argv)
         .then(() => {
-        logger.info(`Finished running mwoffliner after [${Math.round((Date.now() - execStartTime) / 1000)}s]`);
+        logger.debug(`Finished running mwoffliner after [${Math.round((Date.now() - execStartTime) / 1000)}s]`);
         process.exit(0);
     })
         .catch((err) => {
@@ -70,9 +71,9 @@ if (!('toJSON' in Error.prototype)) {
     Object.defineProperty(Error.prototype, 'toJSON', {
         value() {
             const alt = {};
-            Object.getOwnPropertyNames(this).forEach(function (key) {
+            Object.getOwnPropertyNames(this).forEach((key) => {
                 alt[key] = this[key];
-            }, this);
+            });
             return alt;
         },
         configurable: true,

package/lib/cli.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,YAAY,CAAA;AAEZ,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAC1E,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAElD,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AAEpD,uCAAuC;AACvC,sCAAsC;AACtC,uCAAuC;AACvC,MAAM,IAAI,GAAQ,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAC3C,IAAI,CAAC,MAAM,CAAC;KACZ,KAAK,CACJ;;oCAEgC,CACjC;KACA,QAAQ,CAAC,qBAAqB,CAAC;KAC/B,YAAY,CAAC,cAAc,CAAC;KAC5B,~~eAAe~~,CAAC,~~YAAY~~,CAAC;~~KAC7B~~,~~eAAe~~,CAAC,~~gBAAgB~~,CAAC~~;KACjC~~,~~eAAe~~,CAAC,~~qBAAqB~~,~~EAAE~~,~~iCAAiC~~,CAAC~~;KACzE~~,~~MAAM~~,~~EAAE~~,CAAC,~~IAAI~~,CAAA;~~AAEhB~~,uCAAuC;AACvC,uCAAuC;AACvC,uCAAuC;AACvC,uCAAuC;AAEvC,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAkB,CAAA;IAExC,IAAI,CAAC;QACH,IAAI,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,QAAQ,CAAA;QAC/B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,EAAE,CAAA;QACnB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,CAAC,KAAK,CAAC,qBAAqB,QAAQ,gBAAgB,CAAC,CAAA;QAC3D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;AACH,CAAC;AAED,uCAAuC;AACvC,uCAAuC;AACvC,uCAAuC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;AAChC,YAAY,CAAC,IAAI,CAAC;KACf,IAAI,CAAC,GAAG,EAAE;IACT,uCAAuC;IACvC,uCAAuC;IACvC,uCAAuC;IAEvC,aAAa;SACV,OAAO,CAAC,IAAI,CAAC;SACb,IAAI,CAAC,GAAG,EAAE;QACT,MAAM,CAAC,~~IAAI~~,CAAC,sCAAsC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;~~QACtG~~,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,YAAY,CAAC,GAAG,CAAC,CAAA;IACnB,CAAC,CAAC,CAAA;AACN,CAAC,CAAC;KACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACb,YAAY,CAAC,GAAG,CAAC,CAAA;AACnB,CAAC,CAAC,CAAA;AAEJ,sCAAsC;AACtC,6GAA6G;AAC7G,IAAI,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;IACnC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE;QAC/C,KAAK;YACH,MAAM,GAAG,GAAG,EAAS,CAAA;YAErB,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,~~UAAU~~,GAAG;~~gBACpD~~,GAAG,CAAC,GAAG,CAAC,~~GAAG~~,~~IAAI~~,CAAC,GAAG,CAAC,CAAA;~~YACtB~~,CAAC,~~EAAE,IAAI,~~CAAC,CAAA;~~YAER~~,OAAO,GAAG,CAAA;QACZ,CAAC;QACD,YAAY,EAAE,IAAI;QAClB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,GAAQ;IAC5B,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;QAC9B,GAAG,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAC9B,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAC5G,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC"}
1	+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/lib/config.d.ts CHANGED Viewed

@@ -20,37 +20,31 @@ declare const config: {
     output: {
         cssResourcesCommon: string[];
         jsResourcesCommon: string[];
-        cssResources: string[];
-        jsResources: string[];
-        wikimediaMobileCssResources: string[];
-        wikimediaMobileJsResources: string[];
         downloadErrorResources: string[];
         mw: {
             css: string[];
             js: string[];
-            css_simplified: string[];
-            js_simplified: string[];
+            js_trusted: string[];
+            js_dynamic_dependencies: {
+                'mediawiki.page.ready': string[];
+                'ext.tmh.player': string[];
+                'ext.cargo.main': string[];
+            };
         };
         dirs: {
             mediawiki: string;
-            webp: string;
             assets: string;
             res: string;
+            mathjax: string;
+            categories_partials: string;
         };
         templates: {
-            pageWikimediaDesktop: string;
-            pageWikimediaMobile: string;
             pageVectorLegacy: string;
             pageVector2022: string;
             pageFallback: string;
-            categories: string;
-            subCategories: string;
-            subPages: string;
-            articleListHomeTemplate: string;
+            javaScript: string;
+            pageListHomeTemplate: string;
             footer: string;
-            lead_section_wrapper: string;
-            section_wrapper: string;
-            subsection_wrapper: string;
             downloadErrorPlaceholder: string;
             htmlRedirect: string;
         };

package/lib/config.js CHANGED Viewed

@@ -35,7 +35,7 @@ const config = {
         /* Lead section to display */
         leadSectionId: '0',
         /* List of style to be removed. 'onlyoffline' is a *hack* to
-        /* display WPEN medical articles, see for example
+        /* display WPEN medical pages, see for example
         /* [[Carcinoid_syndrome]] */
         cssClassCallsBlackList: ['plainlinks', 'onlyoffline'],
         /* All nodes with one of these ids will be removed */
@@ -48,83 +48,61 @@ const config = {
     },
     output: {
         // CSS and JS resources added by Kiwix
-        cssResourcesCommon: ['style', 'mobile_main_page', 'footer'],
-        jsResourcesCommon: ['script', 'masonry.min', 'article_list_home', 'images_loaded.min'],
-        cssResources: ['content.parsoid', 'inserted_style'],
-        jsResources: ['../node_modules/details-element-polyfill/dist/details-element-polyfill'],
-        wikimediaMobileCssResources: ['wm_mobile_override_style'],
-        wikimediaMobileJsResources: ['wm_mobile_override_script'],
-        downloadErrorResources: ['article_not_found.svg', 'DMSans-Regular.ttf', 'download_error_placeholder.css'],
+        cssResourcesCommon: ['style.css', 'mobile_main_page.css', 'footer.css'],
+        jsResourcesCommon: ['script.js', 'masonry.min.js', 'page_list_home.js', 'images_loaded.min.js'],
+        downloadErrorResources: ['page_not_found.svg', 'DMSans-Regular.ttf', 'download_error_placeholder.css'],
         // JS/CSS resources to be imported from MediaWiki
         mw: {
             css: [
-                [
-                    'skins.minerva.base.reset',
-                    'skins.minerva.content.styles',
-                    'ext.cite.style',
-                    'site.styles',
-                    'mobile.app.pagestyles.android',
-                    'mediawiki.page.gallery.styles',
-                    'mediawiki.skinning.content.parsoid',
-                ].join('|'),
+                'site.styles', // always needed
+                'noscript', // in case client has JS disabled
             ],
             js: [
-                'startup',
-                'jquery,mediawiki',
+                // base JS scripts always needed / never returned on API calls
+                'jquery',
                 'mediawiki.base',
-                'mediawiki.util',
-                'site',
-                'mediawiki.page.ready',
-                // Gadget resources are not shared by Parsoid API https://phabricator.wikimedia.org/T161278
-                'jquery.cookie',
-                'mediawiki.cookie',
-                'mediawiki.storage',
-                'ext.gadget.VisibilityToggles',
-                'ext.gadget.defaultVisibilityToggles',
-            ],
-            css_simplified: [
-                'site.styles', // always needed
-                'noscript', // recommended until we solve https://github.com/openzim/mwoffliner/issues/2310
             ],
-            js_simplified: [
-                // base JS scripts always needed / never returned on API calls
-                'startup',
+            js_trusted: [
+                // JS modules and their dependencies trusted to not request any external resources
+                'jquery',
+                'mediawiki.base',
+                'jquery.tablesorter',
+                'jquery.makeCollapsible',
+                'mediawiki.page.ready',
+                'mediawiki.page.gallery',
+                'ext.cite.ux-enhancements',
+                'ext.pygments.view',
+                'ext.Tabber',
+                'ext.tabberNeue',
+                'ext.tmh.player',
+                'ext.cargo.main',
             ],
+            js_dynamic_dependencies: {
+                'mediawiki.page.ready': ['jquery.tablesorter', 'jquery.makeCollapsible'],
+                'ext.tmh.player': ['ext.tmh.player.inline', 'ext.tmh.player.dialog'],
+                'ext.cargo.main': ['oojs-ui-core'],
+            },
         },
         // Output paths for storing stuff
         dirs: {
             mediawiki: '_mw_', // mw related js and css resources
-            webp: '_webp_', // webp polyfills
             assets: '_assets_', // images, videos and other assets
             res: '_res_', // additional resources from mwoffliner
+            mathjax: '_mathjax_', // MathJax library files
+            categories_partials: '_categories_partials_', // HTML partials for category pagination
         },
         // Output templates (TODO: Needs more docs)
         templates: {
-            /* In these files, the following replacements will occur:
-             * __ARTICLE_JS_LIST__  ==> list of script tags linking to all the js modules dependencies
-             * __ARTICLE_CSS_LIST__ ==> list of link tags linking to all the css modules dependencies
-             * __CSS_LINKS__        ==> list of link tags for config.output.cssResources
-             */
-            pageWikimediaDesktop: './templates/pageWikimediaDesktop.html',
-            pageWikimediaMobile: './templates/pageWikimediaMobile.html',
             pageVectorLegacy: './templates/pageVectorLegacy.html',
             pageVector2022: './templates/pageVector2022.html',
             pageFallback: './templates/pageFallback.html',
-            categories: './templates/categories.html',
-            subCategories: './templates/subcategories.html',
-            subPages: './templates/subpages.html',
-            articleListHomeTemplate: './templates/article_list_home.html',
+            javaScript: './templates/javaScript.html',
+            pageListHomeTemplate: './templates/page_list_home.html',
             /* License footer template code */
             footer: './templates/footer.html',
-            /* Template for wrapping lead section content */
-            lead_section_wrapper: './templates/lead_section_wrapper.html',
-            /* Template for wrapping all other toplevel sections */
-            section_wrapper: './templates/section_wrapper.html',
-            /* Template for wrapping subsections */
-            subsection_wrapper: './templates/subsection_wrapper.html',
-            /* Template for article download error */
+            /* Template for page download error */
             downloadErrorPlaceholder: './templates/download_error_placeholder.html',
-            /* Template for HTML-based redirects (to section of an article typically) */
+            /* Template for HTML-based redirects (to section of a page typically) */
             htmlRedirect: './templates/html_redirect.html',
         },
     },

package/lib/config.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,MAAM,MAAM,GAAG;IACb,SAAS,EAAE,cAAc,WAAW,EAAE;IAEtC,QAAQ,EAAE;QACR,SAAS,EAAE,SAAS;QACpB,SAAS,EAAE,wBAAwB;QACnC,cAAc,EAAE,GAAG,GAAG,IAAI;QAC1B,MAAM,EAAE,GAAG;KACZ;IAED,kBAAkB,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC;IAE7D,OAAO,EAAE;QACP,4DAA4D;QAC5D,8EAA8E;QAC9E,iBAAiB,EAAE;YACjB,SAAS;YACT,UAAU;YACV,OAAO;YACP,MAAM;YACN,SAAS;YACT,SAAS;YACT,QAAQ;YACR,2BAA2B;YAC3B,uBAAuB;YACvB,iBAAiB;YACjB,sBAAsB;YACtB,YAAY;SACb;QAED,mDAAmD;QACnD,sBAAsB,EAAE,CAAC,QAAQ,CAAC;QAElC;uDAC+C;QAC/C,yBAAyB,EAAE,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC;QAEtF,kDAAkD;QAClD,mBAAmB,EAAE,CAAC,OAAO,CAAC;QAE9B,6BAA6B;QAC7B,aAAa,EAAE,GAAG;QAElB;;oCAE4B;QAC5B,sBAAsB,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC;QAErD,qDAAqD;QACrD,WAAW,EAAE,CAAC,WAAW,CAAC;QAE1B;;;WAGG;QACH,mBAAmB,EAAE,CAAC,wBAAwB,CAAC;KAChD;IAED,MAAM,EAAE;QACN,sCAAsC;QACtC,kBAAkB,EAAE,CAAC,~~OAAO~~,EAAE,~~kBAAkB~~,EAAE,~~QAAQ~~,CAAC;~~QAC3D~~,iBAAiB,EAAE,CAAC,~~QAAQ~~,EAAE,~~aAAa~~,EAAE,mBAAmB,EAAE,~~mBAAmB~~,CAAC;~~QAEtF~~,~~YAAY,EAAE,CAAC,iBAAiB,EAAE,gBAAgB,CAAC;QACnD,WAAW,EAAE,CAAC,wEAAwE,CAAC;QAEvF,2BAA2B,EAAE,CAAC,0BAA0B,CAAC;QACzD,0BAA0B,EAAE,CAAC,2BAA2B,CAAC;QAEzD,~~sBAAsB,EAAE,CAAC,~~uBAAuB~~,EAAE,oBAAoB,EAAE,gCAAgC,CAAC;~~QAEzG~~,iDAAiD;QACjD,EAAE,EAAE;YACF,GAAG,EAAE;gBACH~~;oBACE~~,~~0BAA0B;oBAC1B~~,~~8BAA8B;oBAC9B~~,gBAAgB;~~oBAChB,aAAa;oBACb,+BAA+B;oBAC~~/B~~,+BAA+B;oBAC/B~~,~~oCAAoC~~;~~iBACrC~~,~~CAAC~~,~~IAAI~~,~~CAAC~~,~~GAAG~~,~~CAAC~~;~~aACZ~~;YACD,~~EAAE~~,EAAE;~~gBACF~~,~~SAAS~~;~~gBACT~~,~~kBAAkB~~;~~gBAClB~~,gBAAgB;gBAChB,~~gBAAgB~~;~~gBAChB~~,~~MAAM~~;~~gBACN~~,sBAAsB;~~gBAEtB~~,~~2FAA2F~~;~~gBAC3F~~,~~eAAe~~;~~gBACf~~,~~kBAAkB;gBAClB,~~mBAAmB;gBACnB,~~8BAA8B~~;~~gBAC9B~~,~~qCAAqC~~;~~aACtC~~;YACD,~~cAAc~~,EAAE;~~gBACd~~,~~aAAa~~,EAAE,~~gBAAgB;gBAC/B~~,~~UAAU~~,EAAE~~,+EAA+E~~;~~aAC5F;YACD~~,~~aAAa~~,EAAE~~;gBACb~~,~~8DAA8D~~;~~gBAC9D~~,~~SAAS~~;~~aACV~~;SACF;QAED,iCAAiC;QACjC,IAAI,EAAE;YACJ,SAAS,EAAE,MAAM,EAAE,kCAAkC;YACrD,~~IAAI,EAAE,QAAQ,EAAE,iBAAiB;YACjC,~~MAAM,EAAE,UAAU,EAAE,kCAAkC;YACtD,GAAG,EAAE,OAAO,EAAE,uCAAuC;~~SACtD;QAED~~,~~2CAA2C;QAC3C~~,~~SAAS,~~EAAE~~;YACT;;;;eAIG;YACH~~,~~oBAAoB~~,EAAE,~~uCAAuC~~;~~YAC7D~~,mBAAmB,EAAE,~~sCAAsC~~;~~YAC3D~~,gBAAgB,EAAE,mCAAmC;YACrD,cAAc,EAAE,iCAAiC;YACjD,YAAY,EAAE,+BAA+B;YAE7C,UAAU,EAAE,6BAA6B;YAEzC,~~aAAa~~,EAAE,~~gCAAgC~~;~~YAE/C~~,~~QAAQ,EAAE,2BAA2B;YAErC,uBAAuB,EAAE,oCAAoC;YAE7D,~~kCAAkC;YAClC,MAAM,EAAE,yBAAyB;YAEjC,~~gDAAgD~~;~~YAChD~~,~~oBAAoB,EAAE,uCAAuC;YAE7D,uDAAuD;YACvD,eAAe,EAAE,kCAAkC;YAEnD,uCAAuC;YACvC,kBAAkB,EAAE,qCAAqC;YAEzD,yCAAyC;YACzC,~~wBAAwB,EAAE,6CAA6C;YAEvE,~~4EAA4E~~;~~YAC5E~~,YAAY,EAAE,gCAAgC;SAC/C;KACF;CACF,CAAA;AAID,OAAO,EAAE,MAAM,EAAe,CAAA"}
1	+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/lib/error.manager.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Dump } from 'src/Dump.js';
+import { Dump } from './Dump.js';
 import { DownloadErrorContext } from './Downloader.js';
 interface HttpReturnCodeRange {
     min: number;
@@ -22,5 +22,5 @@ interface MatchingRule {
     isHardFailure: boolean;
 }
 export declare function findFirstMatchingRule(err: DownloadErrorContext): MatchingRule | null;
-export declare function renderDownloadError(matchingRule: MatchingRule, dump: Dump, articleId: string, articleTitle: string): string | null;
+export declare function renderDownloadError(matchingRule: MatchingRule, dump: Dump, pageTitle: PageTitle): string | null;
 export {};