wikilint 2.28.0 → 2.29.0

package/data/ext/mapframe.json

@@ -1,4 +1,491 @@
 {
-	"$schema": "http://json-schema.org/draft-07/schema#",
-	"$ref": "https://geojson.org/schema/GeoJSON.json"
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"id": "http://json-schema.org/geojson/geojson.json#",
+	"oneOf": [
+		{
+			"$ref": "#/definitions/root"
+		},
+		{
+			"type": "array",
+			"items": {
+				"$ref": "#/definitions/root"
+			}
+		}
+	],
+	"definitions": {
+		"root": {
+			"title": "Geo JSON object",
+			"description": "Schema for a Geo JSON object",
+			"type": "object",
+			"required": [
+				"type"
+			],
+			"properties": {
+				"crs": {
+					"$ref": "#/definitions/crs"
+				},
+				"bbox": {
+					"$ref": "#/definitions/bbox"
+				}
+			},
+			"oneOf": [
+				{
+					"$ref": "#/definitions/geometry"
+				},
+				{
+					"$ref": "#/definitions/feature"
+				},
+				{
+					"$ref": "#/definitions/featureCollection"
+				},
+				{
+					"$ref": "#/definitions/externalData"
+				}
+			]
+		},
+		"crs": {
+			"title": "crs",
+			"description": "a Coordinate Reference System object",
+			"type": [
+				"object",
+				"null"
+			],
+			"required": [
+				"type",
+				"properties"
+			],
+			"properties": {
+				"type": {
+					"type": "string"
+				},
+				"properties": {
+					"type": "object"
+				}
+			},
+			"additionalProperties": false,
+			"oneOf": [
+				{
+					"$ref": "#/definitions/namedCrs"
+				},
+				{
+					"$ref": "#/definitions/linkedCrs"
+				}
+			]
+		},
+		"bbox": {
+			"description": "A bounding box as defined by GeoJSON",
+			"FIXME": "unenforceable constraint: even number of elements in array",
+			"type": "array",
+			"items": {
+				"type": "number"
+			}
+		},
+		"geometry": {
+			"title": "geometry",
+			"description": "One geometry as defined by GeoJSON",
+			"type": "object",
+			"required": [
+				"type"
+			],
+			"oneOf": [
+				{
+					"$ref": "#/definitions/primitiveGeometry"
+				},
+				{
+					"$ref": "#/definitions/geometryCollection"
+				}
+			]
+		},
+		"primitiveGeometry": {
+			"title": "primitiveGeometry",
+			"description": "All the non-collection Geometry types",
+			"type": "object",
+			"required": [
+				"coordinates"
+			],
+			"oneOf": [
+				{
+					"title": "Point",
+					"properties": {
+						"type": {
+							"enum": [
+								"Point"
+							]
+						},
+						"coordinates": {
+							"$ref": "#/definitions/position"
+						}
+					}
+				},
+				{
+					"title": "MultiPoint",
+					"properties": {
+						"type": {
+							"enum": [
+								"MultiPoint"
+							]
+						},
+						"coordinates": {
+							"$ref": "#/definitions/positionArray"
+						}
+					}
+				},
+				{
+					"title": "LineString",
+					"properties": {
+						"type": {
+							"enum": [
+								"LineString"
+							]
+						},
+						"coordinates": {
+							"$ref": "#/definitions/lineString"
+						}
+					}
+				},
+				{
+					"title": "MultiLineString",
+					"properties": {
+						"type": {
+							"enum": [
+								"MultiLineString"
+							]
+						},
+						"coordinates": {
+							"type": "array",
+							"items": {
+								"$ref": "#/definitions/lineString"
+							}
+						}
+					}
+				},
+				{
+					"title": "Polygon",
+					"properties": {
+						"type": {
+							"enum": [
+								"Polygon"
+							]
+						},
+						"coordinates": {
+							"$ref": "#/definitions/polygon"
+						}
+					}
+				},
+				{
+					"title": "MultiPolygon",
+					"properties": {
+						"type": {
+							"enum": [
+								"MultiPolygon"
+							]
+						},
+						"coordinates": {
+							"type": "array",
+							"items": {
+								"$ref": "#/definitions/polygon"
+							}
+						}
+					}
+				}
+			]
+		},
+		"geometryCollection": {
+			"title": "GeometryCollection",
+			"description": "A collection of geometry objects",
+			"required": [
+				"geometries"
+			],
+			"properties": {
+				"type": {
+					"enum": [
+						"GeometryCollection"
+					]
+				},
+				"geometries": {
+					"type": "array",
+					"items": {
+						"$ref": "#/definitions/geometry"
+					}
+				}
+			}
+		},
+		"feature": {
+			"title": "Feature",
+			"description": "A Geo JSON feature object",
+			"required": [
+				"geometry"
+			],
+			"properties": {
+				"type": {
+					"enum": [
+						"Feature"
+					]
+				},
+				"geometry": {
+					"oneOf": [
+						{
+							"type": "null"
+						},
+						{
+							"$ref": "#/definitions/geometry"
+						}
+					]
+				},
+				"properties": {
+					"$ref": "#/definitions/simplestyle"
+				},
+				"id": {
+					"type": [
+						"string",
+						"number"
+					]
+				}
+			}
+		},
+		"featureCollection": {
+			"title": "FeatureCollection",
+			"description": "A Geo JSON feature collection",
+			"required": [
+				"features"
+			],
+			"properties": {
+				"type": {
+					"enum": [
+						"FeatureCollection"
+					]
+				},
+				"features": {
+					"type": "array",
+					"items": {
+						"$ref": "#/definitions/feature"
+					}
+				}
+			}
+		},
+		"externalData": {
+			"title": "ExternalData",
+			"description": "WMF extension - reference to external geometries",
+			"required": [
+				"type",
+				"service"
+			],
+			"oneOf": [
+				{
+					"required": [
+						"title"
+					],
+					"properties": {
+						"service": {
+							"enum": [
+								"page"
+							]
+						},
+						"title": {
+							"type": "string"
+						}
+					}
+				},
+				{
+					"anyOf": [
+						{
+							"required": [
+								"query"
+							]
+						},
+						{
+							"required": [
+								"ids"
+							]
+						}
+					],
+					"properties": {
+						"service": {
+							"enum": [
+								"geoshape",
+								"geoline",
+								"geopoint",
+								"geomask"
+							]
+						},
+						"query": {
+							"type": "string"
+						},
+						"ids": {
+							"oneOf": [
+								{
+									"type": "array",
+									"items": {
+										"type": "string",
+										"pattern": "^Q[1-9]\\d{0,19}$"
+									}
+								},
+								{
+									"type": "string",
+									"pattern": "^Q[1-9]\\d{0,19}(\\s*,\\s*Q[1-9]\\d{0,19})*$"
+								}
+							]
+						}
+					}
+				}
+			],
+			"properties": {
+				"type": {
+					"enum": [
+						"ExternalData"
+					]
+				},
+				"service": {
+					"type": "string"
+				},
+				"properties": {
+					"$ref": "#/definitions/simplestyle"
+				}
+			}
+		},
+		"position": {
+			"description": "A single position",
+			"type": "array",
+			"minItems": 2,
+			"items": {
+				"type": "number"
+			}
+		},
+		"positionArray": {
+			"description": "An array of positions",
+			"type": "array",
+			"items": {
+				"$ref": "#/definitions/position"
+			}
+		},
+		"lineString": {
+			"description": "An array of two or more positions",
+			"allOf": [
+				{
+					"$ref": "#/definitions/positionArray"
+				},
+				{
+					"minItems": 2
+				}
+			]
+		},
+		"linearRing": {
+			"description": "An array of four positions where the first equals the last",
+			"allOf": [
+				{
+					"$ref": "#/definitions/positionArray"
+				},
+				{
+					"minItems": 4
+				}
+			]
+		},
+		"polygon": {
+			"description": "An array of linear rings",
+			"type": "array",
+			"items": {
+				"$ref": "#/definitions/linearRing"
+			}
+		},
+		"namedCrs": {
+			"properties": {
+				"type": {
+					"enum": [
+						"name"
+					]
+				},
+				"properties": {
+					"required": [
+						"name"
+					],
+					"additionalProperties": false,
+					"properties": {
+						"name": {
+							"type": "string",
+							"FIXME": "semantic validation necessary"
+						}
+					}
+				}
+			}
+		},
+		"linkedObject": {
+			"type": "object",
+			"required": [
+				"href"
+			],
+			"properties": {
+				"href": {
+					"type": "string",
+					"format": "uri",
+					"FIXME": "spec says \"dereferenceable\", cannot enforce that"
+				},
+				"type": {
+					"type": "string",
+					"description": "Suggested values: proj4, ogjwkt, esriwkt"
+				}
+			}
+		},
+		"linkedCrs": {
+			"properties": {
+				"type": {
+					"enum": [
+						"link"
+					]
+				},
+				"properties": {
+					"$ref": "#/definitions/linkedObject"
+				}
+			}
+		},
+		"simplestyle": {
+			"type": "object",
+			"properties": {
+				"title": {
+					"type": "string"
+				},
+				"description": {
+					"type": "string"
+				},
+				"marker-size": {
+					"enum": [
+						"small",
+						"medium",
+						"large"
+					]
+				},
+				"marker-symbol": {
+					"type": "string",
+					"pattern": "^(|[a-zA-Z0-9-]+)$"
+				},
+				"marker-color": {
+					"$ref": "#/definitions/color"
+				},
+				"stroke": {
+					"$ref": "#/definitions/color"
+				},
+				"stroke-opacity": {
+					"$ref": "#/definitions/opacity"
+				},
+				"stroke-width": {
+					"type": "number",
+					"minimum": 0
+				},
+				"fill": {
+					"$ref": "#/definitions/color"
+				},
+				"fill-opacity": {
+					"$ref": "#/definitions/opacity"
+				}
+			}
+		},
+		"color": {
+			"type": "string",
+			"pattern": "^#?([0-9a-fA-F]{3}){1,2}$"
+		},
+		"opacity": {
+			"type": "number",
+			"minimum": 0,
+			"maximum": 1
+		}
+	}
 }

package/dist/base.d.mts

@@ -45,7 +45,7 @@ export declare const stages: {
     'list-range': number;
 };
 export type Stage = keyof typeof stages;
-export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css"];
+export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "invalid-url", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css", "invalid-math"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';
     type Rule = typeof rules[number];
@@ -304,8 +304,10 @@ export interface Parser {
      * 解析wikitext
      * @param include whether to be transcluded / 是否嵌入
      * @param maxStage max stage for parsing / 最大解析层级
+     * @param page page name / 页面名称
      */
-    parse(wikitext: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config): Token;
+    parse(wikitext: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config, page?: string): Token;
+    parse(wikitext: string, page: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config): Token;
     /**
      * Create a language server
      *

package/dist/base.d.ts

@@ -45,7 +45,7 @@ export declare const stages: {
     'list-range': number;
 };
 export type Stage = keyof typeof stages;
-export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css"];
+export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "invalid-url", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css", "invalid-math"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';
     type Rule = typeof rules[number];
@@ -304,8 +304,10 @@ export interface Parser {
      * 解析wikitext
      * @param include whether to be transcluded / 是否嵌入
      * @param maxStage max stage for parsing / 最大解析层级
+     * @param page page name / 页面名称
      */
-    parse(wikitext: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config): Token;
+    parse(wikitext: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config, page?: string): Token;
+    parse(wikitext: string, page: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config): Token;
     /**
      * Create a language server
      *

package/dist/base.js

@@ -44,6 +44,7 @@ exports.rules = (() => {
         'invalid-imagemap',
         'invalid-invoke',
         'invalid-isbn',
+        'invalid-url',
         'lonely-apos',
         'lonely-bracket',
         'lonely-http',
@@ -70,6 +71,7 @@ exports.rules = (() => {
         'void-ext',
         /* NOT FOR BROWSER ONLY */
         'invalid-css',
+        'invalid-math',
     ];
     Object.freeze(arr);
     return arr;

package/dist/base.mjs

@@ -41,6 +41,7 @@ const rules = /* @__PURE__ */ (() => {
     "invalid-imagemap",
     "invalid-invoke",
     "invalid-isbn",
+    "invalid-url",
     "lonely-apos",
     "lonely-bracket",
     "lonely-http",
@@ -66,7 +67,8 @@ const rules = /* @__PURE__ */ (() => {
     "var-anchor",
     "void-ext",
     /* NOT FOR BROWSER ONLY */
-    "invalid-css"
+    "invalid-css",
+    "invalid-math"
   ];
   Object.freeze(arr);
   return arr;

package/dist/bin/config.js

@@ -77,7 +77,7 @@ const mw = {
         },
     },
 };
-const pkg = "wikilint", version = "2.28.0";
+const pkg = "wikilint", version = "2.29.0";
 let mwConfig;
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
@@ -147,12 +147,12 @@ exports.default = async (site, url, user, force, internal) => {
             ...namespacealiases.filter(({ id }) => filterGadget(id)).map(({ id, alias }) => [alias.toLowerCase(), id]),
         ]),
         articlePath: articlepath,
-    };
-    config.doubleUnderscore[0] = [];
-    config.doubleUnderscore[1] = [];
-    Object.assign(config.parserFunction[0], (0, cm_util_1.getConfig)(magicwords, ({ name }) => name === 'msgnw'));
-    config.parserFunction[2] = getAliases(magicwords, new Set(['msg', 'raw']));
-    config.parserFunction[3] = getAliases(magicwords, new Set(['subst', 'safesubst']));
+    }, { doubleUnderscore, parserFunction, variable } = config;
+    doubleUnderscore[0] = [];
+    doubleUnderscore[1] = [];
+    Object.assign(parserFunction[0], (0, cm_util_1.getConfig)(magicwords, ({ name }) => name === 'msgnw'));
+    parserFunction[2] = getAliases(magicwords, new Set(['msg', 'raw']));
+    parserFunction[3] = getAliases(magicwords, new Set(['subst', 'safesubst']));
     if (!mwConfig.functionHooks) {
         Object.assign(config, { functionHook: [...functionhooks.map(s => s.toLowerCase()), 'msgnw'] });
     }
@@ -160,11 +160,11 @@ exports.default = async (site, url, user, force, internal) => {
         const { query: { variables } } = await (await fetch(`${url}/api.php?${new URLSearchParams({ ...params, siprop: 'variables' }).toString()}`, headers)).json();
         Object.assign(config, { variable: [...new Set([...variables, '='])] });
     }
-    if ('#choose' in config.parserFunction[0]) {
-        delete config.parserFunction[0]['choose'];
-        const i = config.variable.indexOf('choose');
+    if ('#choose' in parserFunction[0]) {
+        delete parserFunction[0]['choose'];
+        const i = variable.indexOf('choose');
         if (i !== -1) {
-            config.variable.splice(i, 1);
+            variable.splice(i, 1);
         }
     }
     // saving configuration

package/dist/index.d.ts

@@ -17,7 +17,8 @@ declare interface Parser extends ParserBase {
      * @param include whether to be transcluded / 是否嵌入
      */
     normalizeTitle(title: string, defaultNs?: number, include?: boolean, config?: Config): Title;
-    parse(wikitext: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config): Token;
+    parse(wikitext: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config, page?: string): Token;
+    parse(wikitext: string, page: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config): Token;
     /**
      * Create a language server
      *

package/dist/index.js

@@ -132,6 +132,7 @@ const Parser = {
             titleObj = debug_1.Shadow.run(() => {
                 const root = new Token(title, config);
                 root.type = 'root';
+                root.pageName = opt?.page;
                 root.parseOnce(0, include).parseOnce();
                 const t = new Title(root.toString(), defaultNs, config, opt);
                 root.build();
@@ -153,8 +154,23 @@ const Parser = {
         return titleObj;
     },
     /** @implements */
-    parse(wikitext, include, maxStage = constants_1.MAX_STAGE, config = Parser.getConfig()) {
+    parse(wikitext, includeOrPage, maxStageOrInclude, configOrStage, pageOrConfig) {
         wikitext = (0, string_1.tidy)(wikitext);
+        let include, maxStage, config, page;
+        if (typeof includeOrPage === 'string') {
+            include = Boolean(maxStageOrInclude);
+            maxStage = configOrStage;
+            config = pageOrConfig;
+            page = includeOrPage;
+        }
+        else {
+            include = Boolean(includeOrPage);
+            maxStage = maxStageOrInclude;
+            config = configOrStage;
+            page = pageOrConfig;
+        }
+        maxStage ??= constants_1.MAX_STAGE;
+        config ??= this.getConfig();
         let types;
         LINT: { // eslint-disable-line no-unused-labels
             if (typeof maxStage !== 'number') {
@@ -166,6 +182,7 @@ const Parser = {
         const root = debug_1.Shadow.run(() => {
             const token = new Token(wikitext, config);
             token.type = 'root';
+            token.pageName = page;
             try {
                 return token.parse(maxStage, include);
                 /* NOT FOR BROWSER ONLY */
@@ -180,7 +197,7 @@ const Parser = {
                     }
                     fs_1.default.writeFileSync(file, stage === constants_1.MAX_STAGE ? wikitext : token.toString());
                     fs_1.default.writeFileSync(`${file}.err`, e.stack);
-                    fs_1.default.writeFileSync(`${file}.json`, JSON.stringify({ stage, include, config }, null, '\t'));
+                    fs_1.default.writeFileSync(`${file}.json`, JSON.stringify({ stage, include, config, page }, null, '\t'));
                 }
                 throw e;
             }
@@ -189,6 +206,10 @@ const Parser = {
         return root;
     },
     /** @implements */
+    parseWithRef(wikitext, ref, maxStage, include = ref.getAttribute('include')) {
+        return this.parse(wikitext, include, maxStage, ref.getAttribute('config'), ref.pageName);
+    },
+    /** @implements */
     async partialParse(wikitext, watch, include, config = Parser.getConfig()) {
         LSP: { // eslint-disable-line no-unused-labels
             const { Token } = require('./src/index');