@sciexpr/parser 0.1.1 → 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])) {
@@ -465,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));
@@ -485,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;
@@ -507,6 +517,7 @@ var ChemicalParser = class {
 };
 
 // src/registry.ts
+var import_core5 = require("@sciexpr/core");
 var ParserRegistry = class {
   parsers = /* @__PURE__ */ new Map();
   defaultParsers;
@@ -547,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) {
@@ -557,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;
     /** 自定义宏 */

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;
     /** 自定义宏 */

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])) {
@@ -444,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));
@@ -464,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;
@@ -486,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;
@@ -526,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) {
@@ -536,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,6 +1,6 @@
 {
   "name": "@sciexpr/parser",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Scientific Expression Engine - LaTeX & Chemical formula parser",
   "type": "module",
   "main": "./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",