goldstein 5.5.2 → 5.6.1

package/ChangeLog

@@ -1,3 +1,14 @@
+2024.05.09, v5.6.1
+
+fix:
+- ecd46b4 goldstein: override keywords
+
+2024.05.08, v5.6.0
+
+feature:
+- 4be8b79 goldstein: keyword-fn: add constant
+- f0b7d54 goldstein: keyword-fn: add ability to use "fn" as function name
+
 2024.05.08, v5.5.2
 
 fix:

package/README.md

@@ -111,14 +111,14 @@ const source = `
 const {keywordFn} = keywords;
 
 compile(source, {
-    keywords: [
+    keywords: {
         keywordFn,
-        function id(Parser) {
+        keywordId(Parser) {
             const {keywordTypes} = Parser.acorn;
             
             return class extends Parser {};
         },
-    ],
+    },
     rules: {
         declare: ['on', {
             declarations: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldstein",
-  "version": "5.5.2",
+  "version": "5.6.1",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "JavaScript with no limits",

package/packages/goldstein/parser.js

@@ -30,11 +30,8 @@ const defaultKeywords = {
 
 export const keywords = defaultKeywords;
 
-export const parse = (source, options = {}, keywords = defaultKeywords) => {
-    const {parse} = extendParser(Object.values({
-        ...options.keywords,
-        ...keywords,
-    }));
+export const parse = (source, options = {}) => {
+    const {parse} = extendParser(Object.values(options.keywords || defaultKeywords));
     
     const ast = parse(source);
     

package/packages/keyword-fn/index.js

@@ -1,29 +1,42 @@
 import {addKeyword, TokenType} from '../operator/index.js';
 
+const KEYWORD_FN = 'fn';
+
 export default function fn(Parser) {
-    Parser.acorn.keywordTypes.fn = new TokenType('fn', {
-        keyword: 'fn',
+    const {keywordTypes} = Parser.acorn;
+    
+    keywordTypes.fn = new TokenType(KEYWORD_FN, {
+        keyword: KEYWORD_FN,
     });
     
     return class extends Parser {
         parse() {
-            this.keywords = addKeyword('fn', this.keywords);
+            this.keywords = addKeyword(KEYWORD_FN, this.keywords);
             
             return super.parse();
         }
         
         parseStatement(context, topLevel, exports) {
-            if (this.type === Parser.acorn.keywordTypes.fn)
-                this.type = Parser.acorn.keywordTypes.function;
+            if (this.type === keywordTypes.fn)
+                this.type = keywordTypes.function;
             
             return super.parseStatement(context, topLevel, exports);
         }
         
         shouldParseExportStatement() {
-            if (this.type === Parser.acorn.keywordTypes.fn)
+            if (this.type === keywordTypes.fn)
                 return true;
             
             return super.shouldParseExportStatement();
         }
+        
+        checkUnreserved(ref) {
+            const {name} = ref;
+            
+            if (name === KEYWORD_FN)
+                return;
+            
+            return super.checkUnreserved(ref);
+        }
     };
 }