textlint-plugin-typst 1.0.1 → 1.1.1

package/README.md

@@ -40,7 +40,7 @@ bun add textlint-plugin-typst
 
 ## Syntax support
 
-This plugin supports the syntax of Typst [v0.11.1](https://github.com/typst/typst/releases/tag/v0.11.1).
+This plugin supports the syntax of Typst [v0.12.0](https://github.com/typst/typst/releases/tag/v0.12.0).
 
 Legend for syntax support:
 

package/lib/index.js

@@ -1375,21 +1375,29 @@ ${indent}`) + "'";
         start = start.replace(/\n+/g, `$&${indent}`);
       }
       const indentSize = indent ? "2" : "1";
-      let header = (literal ? "|" : ">") + (startWithSpace ? indentSize : "") + chomp;
+      let header = (startWithSpace ? indentSize : "") + chomp;
       if (comment) {
         header += " " + commentString(comment.replace(/ ?[\r\n]+/g, " "));
         if (onComment)
           onComment();
       }
-      if (literal) {
-        value = value.replace(/\n+/g, `$&${indent}`);
-        return `${header}
-${indent}${start}${value}${end}`;
-      }
-      value = value.replace(/\n+/g, "\n$&").replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, "$1$2").replace(/\n+/g, `$&${indent}`);
-      const body = foldFlowLines.foldFlowLines(`${start}${value}${end}`, indent, foldFlowLines.FOLD_BLOCK, getFoldOptions(ctx, true));
-      return `${header}
+      if (!literal) {
+        const foldedValue = value.replace(/\n+/g, "\n$&").replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, "$1$2").replace(/\n+/g, `$&${indent}`);
+        let literalFallback = false;
+        const foldOptions = getFoldOptions(ctx, true);
+        if (blockQuote !== "folded" && type !== Scalar.Scalar.BLOCK_FOLDED) {
+          foldOptions.onOverflow = () => {
+            literalFallback = true;
+          };
+        }
+        const body = foldFlowLines.foldFlowLines(`${start}${foldedValue}${end}`, indent, foldFlowLines.FOLD_BLOCK, foldOptions);
+        if (!literalFallback)
+          return `>${header}
 ${indent}${body}`;
+      }
+      value = value.replace(/\n+/g, `$&${indent}`);
+      return `|${header}
+${indent}${start}${value}${end}`;
     }
     function plainString(item, ctx, onComment, onChompKeep) {
       const { type, value } = item;
@@ -1719,14 +1727,15 @@ ${ctx.indent}`;
 var require_log = __commonJS({
   "node_modules/yaml/dist/log.js"(exports2) {
     "use strict";
+    var node_process = require("node:process");
     function debug(logLevel, ...messages) {
       if (logLevel === "debug")
         console.log(...messages);
     }
     function warn(logLevel, warning) {
       if (logLevel === "debug" || logLevel === "warn") {
-        if (typeof process !== "undefined" && process.emitWarning)
-          process.emitWarning(warning);
+        if (typeof node_process.emitWarning === "function")
+          node_process.emitWarning(warning);
         else
           console.warn(warning);
       }
@@ -2584,7 +2593,7 @@ var require_schema2 = __commonJS({
         identify: (value) => typeof value === "boolean",
         default: true,
         tag: "tag:yaml.org,2002:bool",
-        test: /^true|false$/,
+        test: /^true$|^false$/,
         resolve: (str) => str === "true",
         stringify: stringifyJSON
       },
@@ -2623,6 +2632,7 @@ var require_schema2 = __commonJS({
 var require_binary = __commonJS({
   "node_modules/yaml/dist/schema/yaml-1.1/binary.js"(exports2) {
     "use strict";
+    var node_buffer = require("node:buffer");
     var Scalar = require_Scalar();
     var stringifyString = require_stringifyString();
     var binary = {
@@ -2639,8 +2649,8 @@ var require_binary = __commonJS({
        *   document.querySelector('#photo').src = URL.createObjectURL(blob)
        */
       resolve(src, onError) {
-        if (typeof Buffer === "function") {
-          return Buffer.from(src, "base64");
+        if (typeof node_buffer.Buffer === "function") {
+          return node_buffer.Buffer.from(src, "base64");
         } else if (typeof atob === "function") {
           const str = atob(src.replace(/[\n\r]/g, ""));
           const buffer = new Uint8Array(str.length);
@@ -2655,8 +2665,8 @@ var require_binary = __commonJS({
       stringify({ comment, type, value }, ctx, onComment, onChompKeep) {
         const buf = value;
         let str;
-        if (typeof Buffer === "function") {
-          str = buf instanceof Buffer ? buf.toString("base64") : Buffer.from(buf.buffer).toString("base64");
+        if (typeof node_buffer.Buffer === "function") {
+          str = buf instanceof node_buffer.Buffer ? buf.toString("base64") : node_buffer.Buffer.from(buf.buffer).toString("base64");
         } else if (typeof btoa === "function") {
           let s = "";
           for (let i = 0; i < buf.length; ++i)
@@ -3168,7 +3178,7 @@ var require_timestamp = __commonJS({
         }
         return new Date(date);
       },
-      stringify: ({ value }) => value.toISOString().replace(/((T00:00)?:00)?\.000Z$/, "")
+      stringify: ({ value }) => value.toISOString().replace(/(T00:00:00)?\.000Z$/, "")
     };
     exports2.floatTime = floatTime;
     exports2.intTime = intTime;
@@ -3854,7 +3864,7 @@ var require_resolve_props = __commonJS({
             if (atNewline) {
               if (comment)
                 comment += token.source;
-              else
+              else if (!found || indicator !== "seq-item-ind")
                 spaceBefore = true;
             } else
               commentSep += token.source;
@@ -5131,6 +5141,7 @@ var require_compose_doc = __commonJS({
 var require_composer = __commonJS({
   "node_modules/yaml/dist/compose/composer.js"(exports2) {
     "use strict";
+    var node_process = require("node:process");
     var directives = require_directives();
     var Document = require_Document();
     var errors = require_errors();
@@ -5246,7 +5257,7 @@ ${cb}` : comment;
       }
       /** Advance the composer by one CST token. */
       *next(token) {
-        if (process.env.LOG_STREAM)
+        if (node_process.env.LOG_STREAM)
           console.dir(token, { depth: null });
         switch (token.type) {
           case "directive":
@@ -6352,6 +6363,7 @@ var require_line_counter = __commonJS({
 var require_parser = __commonJS({
   "node_modules/yaml/dist/parse/parser.js"(exports2) {
     "use strict";
+    var node_process = require("node:process");
     var cst = require_cst();
     var lexer = require_lexer();
     function includesToken(list, type) {
@@ -6475,7 +6487,7 @@ var require_parser = __commonJS({
        */
       *next(source) {
         this.source = source;
-        if (process.env.LOG_TOKENS)
+        if (node_process.env.LOG_TOKENS)
           console.log("|", cst.prettyToken(source));
         if (this.atScalar) {
           this.atScalar = false;
@@ -7540,16 +7552,14 @@ replaceTraps((oldTraps) => ({
 
 // node_modules/@myriaddreamin/typst.ts/dist/esm/init.mjs
 var ComponentBuilder = class {
-  constructor() {
-    this.loadedFonts = /* @__PURE__ */ new Set();
-    this.fetcher = fetch;
-  }
+  loadedFonts = /* @__PURE__ */ new Set();
+  fetcher = fetch;
   setFetcher(fetcher) {
     this.fetcher = fetcher;
   }
   async loadFonts(builder, fonts) {
     const escapeImport = new Function("m", "return import(m)");
-    const fetcher = this.fetcher || (this.fetcher = await async function() {
+    const fetcher = this.fetcher ||= await async function() {
       const { fetchBuilder, FileSystemCache } = await escapeImport("node-fetch-cache");
       const cache = new FileSystemCache({
         /// By default, we don't have a complicated cache policy.
@@ -7564,7 +7574,7 @@ var ComponentBuilder = class {
           clearTimeout(timeout);
         });
       };
-    }());
+    }();
     const fontsToLoad = fonts.filter((font) => {
       if (font instanceof Uint8Array) {
         return true;
@@ -7685,6 +7695,8 @@ var once = (fn) => {
   };
 };
 var LazyWasmModule = class {
+  wasmBin;
+  initOnce;
   constructor(initFn) {
     if (typeof initFn !== "function") {
       throw new Error("initFn is not a function");
@@ -7701,6 +7713,10 @@ var LazyWasmModule = class {
 
 // node_modules/@myriaddreamin/typst.ts/dist/esm/compiler.mjs
 var IncrementalServer = class {
+  /**
+   * @internal
+   */
+  [kObject];
   /**
    * @internal
    */
@@ -7734,6 +7750,8 @@ function createTypstCompiler() {
   return new TypstCompilerDriver();
 }
 var TypstCompilerDriver = class {
+  compiler;
+  compilerJs;
   constructor() {
   }
   async init(options) {
@@ -7753,15 +7771,15 @@ var TypstCompilerDriver = class {
   compile(options) {
     return new Promise((resolve) => {
       if ("incrementalServer" in options) {
-        resolve(this.compiler.incr_compile(options.mainFilePath, options.incrementalServer[kObject], getDiagnosticsArg(options.diagnostics)));
+        resolve(this.compiler.incr_compile(options.mainFilePath, convertInputs(options.inputs), options.incrementalServer[kObject], getDiagnosticsArg(options.diagnostics)));
         return;
       }
-      resolve(this.compiler.compile(options.mainFilePath, options.format || "vector", getDiagnosticsArg(options.diagnostics)));
+      resolve(this.compiler.compile(options.mainFilePath, convertInputs(options.inputs), options.format || "vector", getDiagnosticsArg(options.diagnostics)));
     });
   }
   query(options) {
     return new Promise((resolve) => {
-      resolve(JSON.parse(this.compiler.query(options.mainFilePath, options.selector, options.field)));
+      resolve(JSON.parse(this.compiler.query(options.mainFilePath, convertInputs(options.inputs), options.selector, options.field)));
     });
   }
   getSemanticTokenLegend() {
@@ -7811,6 +7829,9 @@ var TypstCompilerDriver = class {
     throw new Error("Please use the api TypstRenderer.renderToCanvas in v0.4.0");
   }
 };
+function convertInputs(inputs) {
+  return inputs ? Object.entries(inputs) : void 0;
+}
 function getDiagnosticsArg(diagnostics) {
   switch (diagnostics) {
     case "none":
@@ -8060,6 +8081,17 @@ var convertRawTypstAstObjectToTextlintAstObject = (rawTypstAstObject, typstSourc
     delete node.c;
     return endOffset;
   };
+  if (textlintAstObject.c) {
+    const rootChildrenStartLocation = extractLocation(
+      textlintAstObject.c[0].s,
+      textlintAstObject.c[0].c
+    );
+    if (rootChildrenStartLocation.start.line === 2) {
+      textlintAstObject.c.unshift({
+        s: "<span style='color:#7dcfff'>Marked::Parbreak</span> &lt;1:0~2:0&gt;"
+      });
+    }
+  }
   calculateOffsets(textlintAstObject);
   textlintAstObject.type = import_ast_node_types.ASTNodeTypes.Document;
   return textlintAstObject;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "textlint-plugin-typst",
-	"version": "1.0.1",
+	"version": "1.1.1",
 	"description": "textlint plugin to lint Typst",
 	"keywords": ["textlint", "textlintplugin", "plugin", "lint", "typst"],
 	"repository": "https://github.com/3w36zj6/textlint-plugin-typst",
@@ -25,8 +25,8 @@
 		"update-fixtures": "bun ./test/update-fixtures.ts && biome check --write ./test/fixtures"
 	},
 	"dependencies": {
-		"@myriaddreamin/typst-ts-web-compiler": "^0.5.0-rc7",
-		"@myriaddreamin/typst.ts": "^0.5.0-rc7",
+		"@myriaddreamin/typst-ts-web-compiler": "^0.5.1",
+		"@myriaddreamin/typst.ts": "^0.5.1",
 		"yaml": "^2.5.1"
 	},
 	"devDependencies": {