@sciexpr/parser 0.1.0 → 0.1.2

package/dist/index.cjs

@@ -139,8 +139,6 @@ var LatexTokenizer = class {
       this.pos++;
       return { type: "ampersand" /* Ampersand */, value: "&", position: start, length: 1 };
     }
-    if (ch === "\\" && this.input[this.pos + 1] === "\\") {
-    }
     if (/[0-9]/.test(ch)) {
       this.pos++;
       while (this.pos < this.input.length && /[0-9.]/.test(this.input[this.pos])) {
@@ -182,9 +180,17 @@ var LatexParser = class {
   // ==========================================================================
   // Parse Expressions
   // ==========================================================================
-  parseExpressions() {
+  /**
+   * Parse a sequence of expressions.
+   * @param stopType Optional token type to stop at (e.g. CloseBrace inside a group).
+   *                 When set, the loop breaks BEFORE consuming the stop token.
+   */
+  parseExpressions(stopType) {
     const exprs = [];
     while (!this.isEOF()) {
+      if (stopType !== void 0 && this.peek()?.type === stopType) {
+        break;
+      }
       const expr = this.parseExpression();
       if (expr) exprs.push(expr);
     }
@@ -220,6 +226,10 @@ var LatexParser = class {
         this.advance();
         expr = (0, import_core2.createSymbol)(token.value, this.classifySymbol(token.value));
         break;
+      case "ampersand" /* Ampersand */:
+        this.advance();
+        expr = (0, import_core2.createSymbol)("&", import_core.SymbolType.Ordinary);
+        break;
       case "number" /* Number */:
         this.advance();
         expr = (0, import_core2.createSymbol)(token.value, import_core.SymbolType.Number);
@@ -230,13 +240,13 @@ var LatexParser = class {
       // Skip whitespace
       case "openParen" /* OpenParen */:
         this.advance();
-        const body = this.parseExpressions();
+        const body = this.parseExpressions("closeParen" /* CloseParen */);
         this.skipType("closeParen" /* CloseParen */);
         expr = (0, import_core2.createDelimiter)("(", ")", body.length === 1 ? body[0] : (0, import_core2.createGroup)(body));
         break;
       case "openBracket" /* OpenBracket */:
         this.advance();
-        const bracketBody = this.parseExpressions();
+        const bracketBody = this.parseExpressions("closeBracket" /* CloseBracket */);
         this.skipType("closeBracket" /* CloseBracket */);
         expr = (0, import_core2.createDelimiter)("[", "]", bracketBody.length === 1 ? bracketBody[0] : (0, import_core2.createGroup)(bracketBody));
         break;
@@ -346,7 +356,7 @@ var LatexParser = class {
   /** 解析 { expressions } 分组 */
   parseGroup() {
     this.skipType("openBrace" /* OpenBrace */);
-    const children = this.parseExpressions();
+    const children = this.parseExpressions("closeBrace" /* CloseBrace */);
     this.skipType("closeBrace" /* CloseBrace */);
     return (0, import_core2.createGroup)(children);
   }
@@ -453,9 +463,17 @@ var ChemicalParser = class {
           }
           groupCount = parseInt(numStr, 10);
           if (groupCount && groupCount > 1) {
-            for (const atom of groupAtoms) {
-              atom.count = (atom.count ?? 1) * groupCount;
-            }
+            const multiplier = groupCount;
+            const scaledAtoms = groupAtoms.map(
+              (atom) => (0, import_core4.createChemElement)(atom.symbol, {
+                count: (atom.count ?? 1) * multiplier,
+                isotope: atom.isotope,
+                charge: atom.charge,
+                chargeSign: atom.chargeSign
+              })
+            );
+            nodes.push((0, import_core4.createChemGroup)(scaledAtoms));
+            continue;
           }
         }
         nodes.push((0, import_core4.createChemGroup)(groupAtoms));
@@ -473,8 +491,12 @@ var ChemicalParser = class {
           const chargeMatch = chargeStr.match(/^(\d*)([+\-])$/);
           if (chargeMatch) {
             const el = lastNode;
-            el.charge = parseInt(chargeMatch[1] || "1", 10);
-            el.chargeSign = chargeMatch[2];
+            nodes[nodes.length - 1] = (0, import_core4.createChemElement)(el.symbol, {
+              count: el.count,
+              isotope: el.isotope,
+              charge: parseInt(chargeMatch[1] || "1", 10),
+              chargeSign: chargeMatch[2]
+            });
           }
         }
         continue;
@@ -495,6 +517,7 @@ var ChemicalParser = class {
 };
 
 // src/registry.ts
+var import_core5 = require("@sciexpr/core");
 var ParserRegistry = class {
   parsers = /* @__PURE__ */ new Map();
   defaultParsers;
@@ -535,6 +558,9 @@ var ParserRegistry = class {
    * @returns 解析后的 AST
    */
   parse(input, options) {
+    if (!input || input.trim().length === 0) {
+      return (0, import_core5.createRoot)(import_core5.ExpressionKind.Text, []);
+    }
     if (options?.hint && options.hint !== "auto") {
       const parser2 = this.parsers.get(options.hint);
       if (parser2) {
@@ -545,6 +571,9 @@ var ParserRegistry = class {
     if (parser) {
       return parser.parse(input, options);
     }
+    if (options?.hint === "physics") {
+      return this.defaultParsers[0].parse(input, options);
+    }
     return this.defaultParsers[0].parse(input, options);
   }
   /** 列出所有已注册的解析器 ID */

package/dist/index.d.cts

@@ -14,7 +14,7 @@ interface IParser {
 /** 解析选项 */
 interface ParseOptions {
     /** 输入格式提示 */
-    hint?: 'latex' | 'chemical' | 'unicode' | 'auto';
+    hint?: 'latex' | 'chemical' | 'physics' | 'unicode' | 'auto';
     /** 是否为 display 模式 */
     displayMode?: boolean;
     /** 自定义宏 */
@@ -83,6 +83,11 @@ declare class LatexParser implements IParser {
     private displayMode;
     canParse(input: string): boolean;
     parse(input: string, options?: ParseOptions): ExpressionRoot;
+    /**
+     * Parse a sequence of expressions.
+     * @param stopType Optional token type to stop at (e.g. CloseBrace inside a group).
+     *                 When set, the loop breaks BEFORE consuming the stop token.
+     */
     private parseExpressions;
     private parseExpression;
     /** 处理上/下标：检查 ^ 和 _ 后附加到 base 节点 */

package/dist/index.d.ts

@@ -14,7 +14,7 @@ interface IParser {
 /** 解析选项 */
 interface ParseOptions {
     /** 输入格式提示 */
-    hint?: 'latex' | 'chemical' | 'unicode' | 'auto';
+    hint?: 'latex' | 'chemical' | 'physics' | 'unicode' | 'auto';
     /** 是否为 display 模式 */
     displayMode?: boolean;
     /** 自定义宏 */
@@ -83,6 +83,11 @@ declare class LatexParser implements IParser {
     private displayMode;
     canParse(input: string): boolean;
     parse(input: string, options?: ParseOptions): ExpressionRoot;
+    /**
+     * Parse a sequence of expressions.
+     * @param stopType Optional token type to stop at (e.g. CloseBrace inside a group).
+     *                 When set, the loop breaks BEFORE consuming the stop token.
+     */
     private parseExpressions;
     private parseExpression;
     /** 处理上/下标：检查 ^ 和 _ 后附加到 base 节点 */

package/dist/index.js

@@ -109,8 +109,6 @@ var LatexTokenizer = class {
       this.pos++;
       return { type: "ampersand" /* Ampersand */, value: "&", position: start, length: 1 };
     }
-    if (ch === "\\" && this.input[this.pos + 1] === "\\") {
-    }
     if (/[0-9]/.test(ch)) {
       this.pos++;
       while (this.pos < this.input.length && /[0-9.]/.test(this.input[this.pos])) {
@@ -161,9 +159,17 @@ var LatexParser = class {
   // ==========================================================================
   // Parse Expressions
   // ==========================================================================
-  parseExpressions() {
+  /**
+   * Parse a sequence of expressions.
+   * @param stopType Optional token type to stop at (e.g. CloseBrace inside a group).
+   *                 When set, the loop breaks BEFORE consuming the stop token.
+   */
+  parseExpressions(stopType) {
     const exprs = [];
     while (!this.isEOF()) {
+      if (stopType !== void 0 && this.peek()?.type === stopType) {
+        break;
+      }
       const expr = this.parseExpression();
       if (expr) exprs.push(expr);
     }
@@ -199,6 +205,10 @@ var LatexParser = class {
         this.advance();
         expr = createSymbol(token.value, this.classifySymbol(token.value));
         break;
+      case "ampersand" /* Ampersand */:
+        this.advance();
+        expr = createSymbol("&", SymbolType.Ordinary);
+        break;
       case "number" /* Number */:
         this.advance();
         expr = createSymbol(token.value, SymbolType.Number);
@@ -209,13 +219,13 @@ var LatexParser = class {
       // Skip whitespace
       case "openParen" /* OpenParen */:
         this.advance();
-        const body = this.parseExpressions();
+        const body = this.parseExpressions("closeParen" /* CloseParen */);
         this.skipType("closeParen" /* CloseParen */);
         expr = createDelimiter("(", ")", body.length === 1 ? body[0] : createGroup(body));
         break;
       case "openBracket" /* OpenBracket */:
         this.advance();
-        const bracketBody = this.parseExpressions();
+        const bracketBody = this.parseExpressions("closeBracket" /* CloseBracket */);
         this.skipType("closeBracket" /* CloseBracket */);
         expr = createDelimiter("[", "]", bracketBody.length === 1 ? bracketBody[0] : createGroup(bracketBody));
         break;
@@ -325,7 +335,7 @@ var LatexParser = class {
   /** 解析 { expressions } 分组 */
   parseGroup() {
     this.skipType("openBrace" /* OpenBrace */);
-    const children = this.parseExpressions();
+    const children = this.parseExpressions("closeBrace" /* CloseBrace */);
     this.skipType("closeBrace" /* CloseBrace */);
     return createGroup(children);
   }
@@ -432,9 +442,17 @@ var ChemicalParser = class {
           }
           groupCount = parseInt(numStr, 10);
           if (groupCount && groupCount > 1) {
-            for (const atom of groupAtoms) {
-              atom.count = (atom.count ?? 1) * groupCount;
-            }
+            const multiplier = groupCount;
+            const scaledAtoms = groupAtoms.map(
+              (atom) => createChemElement(atom.symbol, {
+                count: (atom.count ?? 1) * multiplier,
+                isotope: atom.isotope,
+                charge: atom.charge,
+                chargeSign: atom.chargeSign
+              })
+            );
+            nodes.push(createChemGroup(scaledAtoms));
+            continue;
           }
         }
         nodes.push(createChemGroup(groupAtoms));
@@ -452,8 +470,12 @@ var ChemicalParser = class {
           const chargeMatch = chargeStr.match(/^(\d*)([+\-])$/);
           if (chargeMatch) {
             const el = lastNode;
-            el.charge = parseInt(chargeMatch[1] || "1", 10);
-            el.chargeSign = chargeMatch[2];
+            nodes[nodes.length - 1] = createChemElement(el.symbol, {
+              count: el.count,
+              isotope: el.isotope,
+              charge: parseInt(chargeMatch[1] || "1", 10),
+              chargeSign: chargeMatch[2]
+            });
           }
         }
         continue;
@@ -474,6 +496,7 @@ var ChemicalParser = class {
 };
 
 // src/registry.ts
+import { createRoot as createRoot3, ExpressionKind as ExpressionKind3 } from "@sciexpr/core";
 var ParserRegistry = class {
   parsers = /* @__PURE__ */ new Map();
   defaultParsers;
@@ -514,6 +537,9 @@ var ParserRegistry = class {
    * @returns 解析后的 AST
    */
   parse(input, options) {
+    if (!input || input.trim().length === 0) {
+      return createRoot3(ExpressionKind3.Text, []);
+    }
     if (options?.hint && options.hint !== "auto") {
       const parser2 = this.parsers.get(options.hint);
       if (parser2) {
@@ -524,6 +550,9 @@ var ParserRegistry = class {
     if (parser) {
       return parser.parse(input, options);
     }
+    if (options?.hint === "physics") {
+      return this.defaultParsers[0].parse(input, options);
+    }
     return this.defaultParsers[0].parse(input, options);
   }
   /** 列出所有已注册的解析器 ID */

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@sciexpr/parser",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Scientific Expression Engine - LaTeX & Chemical formula parser",
   "type": "module",
   "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
+  "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
+      "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     }
   },
@@ -43,7 +43,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sciexpr/core": "0.1.0"
+    "@sciexpr/core": "0.1.1"
   },
   "devDependencies": {
     "tsup": "^8.0.0",