naider 1.18.0 → 1.20.0

package/src/index.js

@@ -3,6 +3,7 @@ import { Parser } from './parser.js';
 import { Generator } from './generator.js';
 import { preprocess } from './preprocess.js';
 import { TypeChecker } from './typechecker.js';
+import { generate, expandDirectives } from './gen.js';
 
 async function getGenerator(target, options) {
   switch (target) {
@@ -80,6 +81,9 @@ export function compile(source, { mode = 'naide', runtimePath, sourceFile, typeC
   if (mode === 'x') {
     processedSource = preprocess(source);
   }
+  if (processedSource.includes('~~')) {
+    processedSource = expandDirectives(processedSource).source;
+  }
   try {
     const lexer = new Lexer(processedSource);
     const tokens = lexer.tokenize();
@@ -118,6 +122,9 @@ export async function compileAsync(source, { mode = 'naide', runtimePath, source
   if (mode === 'x') {
     processedSource = preprocess(source);
   }
+  if (processedSource.includes('~~')) {
+    processedSource = expandDirectives(processedSource).source;
+  }
   try {
     const lexer = new Lexer(processedSource);
     const tokens = lexer.tokenize();
@@ -155,4 +162,4 @@ export function transpile(source, opts) {
   return compile(source, opts).js;
 }
 
-export { preprocess };
+export { preprocess, generate };

package/src/parser.js

@@ -1497,7 +1497,7 @@ export class Parser {
 
     const modifiers = [];
     while (!this.at(T.NEWLINE) && !this.at(T.DEDENT) && !this.at(T.EOF)) {
-      if (this.at(T.IDENT) || this.at(T.IDENT)) {
+      if (this.isIdentLike(this.peek().type)) {
         const modName = this.advance().value;
         if (this.at(T.LPAREN)) {
           this.advance();