circuitscript 0.3.2 → 0.4.1

package/dist/esm/{RefdesAnnotationVisitor.js → annotate/RefdesAnnotationVisitor.js}

@@ -1,5 +1,5 @@
-import { CircuitScriptParser } from './antlr/CircuitScriptParser.js';
-import { BaseVisitor } from './BaseVisitor.js';
+import { BaseVisitor } from '../BaseVisitor.js';
+import { generateModifiedSourceText } from './utils.js';
 export class RefdesAnnotationVisitor extends BaseVisitor {
     sourceText;
     tokenStream;
@@ -13,6 +13,9 @@ export class RefdesAnnotationVisitor extends BaseVisitor {
         this.tokenStream = tokenStream;
         this.componentCtxLinks = componentCtxLinks;
     }
+    getModifications() {
+        return this.modifications;
+    }
     getOriginalText(ctx) {
         if (!ctx.start || !ctx.stop) {
             return '';
@@ -24,7 +27,7 @@ export class RefdesAnnotationVisitor extends BaseVisitor {
     visitScript = async (ctx) => {
         this.runExpressions(this.getExecutor(), ctx.expression());
         this.getExecutor().closeOpenPathBlocks();
-        this.resultText = this.generateModifiedText();
+        this.resultText = generateModifiedSourceText(this.modifications, this.tokenStream.getTokens(), this.sourceText);
     };
     visitAdd_component_expr = (ctx) => {
         this.addRefdesAnnotationComment(ctx);
@@ -72,6 +75,8 @@ export class RefdesAnnotationVisitor extends BaseVisitor {
     };
     visitParameters = (ctx) => {
     };
+    visitTrailer = (ctx) => {
+    };
     addedRefdesAnnotations = [];
     generateRefdesAnnotationComment(ctx) {
         if (this.componentCtxLinks.has(ctx)) {
@@ -126,88 +131,9 @@ export class RefdesAnnotationVisitor extends BaseVisitor {
         });
         return result;
     }
-    generateModifiedText() {
-        const output = [];
-        const allTokens = this.tokenStream.getTokens();
-        const processedTokens = new Set();
-        let lastSourcePos = 0;
-        const contextTokenRanges = this.buildContextTokenRanges();
-        for (let i = 0; i < allTokens.length; i++) {
-            const token = allTokens[i];
-            if (processedTokens.has(i)) {
-                continue;
-            }
-            const tokenText = this.sourceText.substring(token.start, token.stop + 1);
-            this.log(i, `token: [${tokenText}], length: ${tokenText.length}, text: [${token.text}]`);
-            if (token.type === CircuitScriptParser.DEDENT
-                || token.type === CircuitScriptParser.EOF
-                || (token.type === CircuitScriptParser.NEWLINE && token.__skip)) {
-                this.log('--skip dedent/EOF token');
-                continue;
-            }
-            const ctx = this.findContextForToken(token, contextTokenRanges);
-            if (ctx) {
-                const isFirstTokenInContext = token.tokenIndex === ctx.start?.tokenIndex;
-                if (isFirstTokenInContext) {
-                    if (token.start > lastSourcePos) {
-                        output.push(this.sourceText.substring(lastSourcePos, token.start));
-                    }
-                    if (this.modifications.has(ctx)) {
-                        output.push(this.generateReplacementText(this.modifications.get(ctx)));
-                        this.markTokensAsProcessed(ctx, processedTokens);
-                        if (ctx.stop) {
-                            lastSourcePos = ctx.stop.stop + 1;
-                        }
-                        continue;
-                    }
-                }
-            }
-            if (token.start > lastSourcePos) {
-                output.push(this.sourceText.substring(lastSourcePos, token.start));
-            }
-            if (tokenText.length > 0) {
-                output.push(tokenText);
-            }
-            processedTokens.add(i);
-            lastSourcePos = token.stop + 1;
-        }
-        if (lastSourcePos < this.sourceText.length) {
-            output.push(this.sourceText.substring(lastSourcePos));
-        }
-        return output.join('');
-    }
-    buildContextTokenRanges() {
-        const ranges = new Map();
-        for (const ctx of this.modifications.keys()) {
-            if (ctx.start && ctx.stop) {
-                ranges.set(ctx, [ctx.start.tokenIndex, ctx.stop.tokenIndex]);
-            }
-        }
-        return ranges;
-    }
-    findContextForToken(token, contextRanges) {
-        for (const [ctx, [start, end]] of contextRanges) {
-            if (token.tokenIndex >= start && token.tokenIndex <= end) {
-                return ctx;
-            }
-        }
-        return null;
-    }
-    markTokensAsProcessed(ctx, processedTokens) {
-        if (!ctx.start || !ctx.stop) {
-            return;
-        }
-        for (let i = ctx.start.tokenIndex; i <= ctx.stop.tokenIndex; i++) {
-            processedTokens.add(i);
-        }
-    }
     log(...message) {
         if (this.debug) {
             console.log(...message);
         }
     }
-    generateReplacementText(modification) {
-        const joinedRefdes = modification.refdes.join(', ');
-        return `${modification.originalText} #= ${joinedRefdes}`;
-    }
 }

package/dist/esm/annotate/utils.js

@@ -0,0 +1,66 @@
+import { CircuitScriptParser } from '../antlr/CircuitScriptParser.js';
+export function generateModifiedSourceText(modifications, tokens, sourceText, tokenStartOffset = 0) {
+    const output = [];
+    const processedTokens = new Set();
+    let lastSourcePos = 0;
+    const contextTokenRanges = new Map();
+    for (const ctx of modifications.keys()) {
+        if (ctx.start && ctx.stop) {
+            contextTokenRanges.set(ctx, [ctx.start.tokenIndex, ctx.stop.tokenIndex]);
+        }
+    }
+    for (let i = 0; i < tokens.length; i++) {
+        const token = tokens[i];
+        if (processedTokens.has(i)) {
+            continue;
+        }
+        const tokenText = sourceText.substring(token.start - tokenStartOffset, token.stop + 1 - tokenStartOffset);
+        if (token.type === CircuitScriptParser.DEDENT
+            || token.type === CircuitScriptParser.EOF
+            || (token.type === CircuitScriptParser.NEWLINE && token.__skip)) {
+            continue;
+        }
+        let ctx = null;
+        for (const [c, [start, end]] of contextTokenRanges) {
+            if (token.tokenIndex >= start && token.tokenIndex <= end) {
+                ctx = c;
+                break;
+            }
+        }
+        if (ctx) {
+            const isFirstTokenInContext = token.tokenIndex === ctx.start?.tokenIndex;
+            if (isFirstTokenInContext) {
+                if (token.start - tokenStartOffset > lastSourcePos) {
+                    output.push(sourceText.substring(lastSourcePos, token.start - tokenStartOffset));
+                }
+                if (modifications.has(ctx)) {
+                    const modification = modifications.get(ctx);
+                    const joinedRefdes = modification.refdes.join(', ');
+                    output.push(`${modification.originalText} #= ${joinedRefdes}`);
+                    if (ctx.start && ctx.stop) {
+                        const tokensNum = ctx.stop.tokenIndex - ctx.start.tokenIndex;
+                        for (let j = i; j <= i + tokensNum; j++) {
+                            processedTokens.add(j);
+                        }
+                    }
+                    if (ctx.stop) {
+                        lastSourcePos = ctx.stop.stop + 1 - tokenStartOffset;
+                    }
+                    continue;
+                }
+            }
+        }
+        if (token.start - tokenStartOffset > lastSourcePos) {
+            output.push(sourceText.substring(lastSourcePos, token.start - tokenStartOffset));
+        }
+        if (tokenText.length > 0) {
+            output.push(tokenText);
+        }
+        processedTokens.add(i);
+        lastSourcePos = token.stop + 1 - tokenStartOffset;
+    }
+    if (lastSourcePos < sourceText.length) {
+        output.push(sourceText.substring(lastSourcePos));
+    }
+    return output.join('');
+}