goldstein 5.10.0 → 5.12.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.05.30, v5.12.0
+
+feature:
+- ade2799 goldstein: useless comma
+
+2024.05.28, v5.11.0
+
+feature:
+- c84aaa4 goldstein: add support of jsx/typescript
+
 2024.05.27, v5.10.0
 
 feature:

package/README.md

@@ -15,8 +15,7 @@
 >
 > *(c) “1984”, George Orwell*
 
-JavaScript with no limits 🤫.
-
+JavaScript with no limits 🤫 with built-in JSX and TypeScript.
 Language ruled by the users, [create an issue](https://github.com/coderaiser/goldstein/issues/new/choose) with ideas of a new language construction and what is look like in JavaScript, and most likely we implement it :).
 
 ## Install
@@ -382,7 +381,7 @@ When you import `.gs` files during compile step it will be replaced with `.js`:
 // hello.js
 export const hello = () => 'world';
 
-// index.js
+// index.js1
 import hello from './hello.gs';
 ```
 
@@ -440,16 +439,27 @@ const b = 'world';
 
 Forget to add assignment (`=`), not problem!
 
-```gs
+```diff
 -const {code, places} await samadhi(source);
 +const {code, places} = await samadhi(source);
 ```
 
+### Useless comma
+
+Added useless comma (`,`)? no problem!
+
+```diff
+const a = {
+-    b,,
++    b,
+}
+```
+
 ## How to contribute?
 
 Clone the registry, create a new keyword with a prefix `keyword-`, then create directory `fixture` and put there two files with extensions `.js` and `.gs`. Half way done 🥳!
 
-Then goes test and implementation in `index.js` and `index.spec.js` accordingly. Use scripts:
+Then goes test and implementation in `index.js1` and `index.spec.js` accordingly. Use scripts:
 
 - `npm test`
 - `UPDATE=1 npm test` - update `fixtures`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldstein",
-  "version": "5.10.0",
+  "version": "5.12.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "JavaScript with no limits",
@@ -32,6 +32,7 @@
     "@putout/plugin-try-catch": "^3.0.0",
     "@putout/printer": "^8.0.1",
     "acorn": "^8.7.1",
+    "acorn-typescript": "^1.4.13",
     "estree-to-babel": "^9.0.0",
     "estree-util-attach-comments": "^3.0.0",
     "putout": "^35.0.0",

package/packages/goldstein/index.js

@@ -5,9 +5,12 @@ import declarePlugin from '@putout/plugin-declare';
 import logicalExpressionsPlugin from '@putout/plugin-logical-expressions';
 import {parse} from './parser.js';
 
-export * from './parser.js';
-export {print} from '../printer/index.js';
 export {convert} from '../convert/index.js';
+export {print} from '../printer/index.js';
+export * from './parser.js';
+
+import * as renameUnnamedIdentifier from '../keyword-useless-comma/rename-unnamed-identifier/index.js';
+
 export const compile = (source, options = {}) => {
     const ast = parse(source, options);
     
@@ -19,6 +22,7 @@ export const compile = (source, options = {}) => {
             ['try-catch', tryCatchPlugin],
             ['declare', declarePlugin],
             ['logical-expressions', logicalExpressionsPlugin],
+            ['remove-unnamed-identifiers', renameUnnamedIdentifier],
         ],
     });
     
@@ -28,3 +32,4 @@ export const compile = (source, options = {}) => {
 export const fixEmpty = (source) => {
     return source.replace(/;(\s+)?;/g, ';');
 };
+

package/packages/goldstein/parser.js

@@ -1,4 +1,5 @@
 import estreeToBabel from 'estree-to-babel';
+import typescript from 'acorn-typescript';
 import {extendParser} from '../parser/index.js';
 import keywordFn from '../keyword-fn/index.js';
 import keywordGuard from '../keyword-guard/index.js';
@@ -14,6 +15,7 @@ import keywordArrow from '../keyword-arrow/index.js';
 import keywordAddArray from '../keyword-add-array/index.js';
 import keywordBrokenString from '../keyword-broken-string/index.js';
 import keywordMissingInitializer from '../keyword-missing-initializer/index.js';
+import keywordUselessComma from '../keyword-useless-comma/index.js';
 
 const {values} = Object;
 
@@ -32,6 +34,7 @@ const defaultKeywords = {
     keywordBrokenString,
     stringInterpolation,
     keywordMissingInitializer,
+    keywordUselessComma,
 };
 
 export const keywords = defaultKeywords;
@@ -40,7 +43,11 @@ export const parse = (source, options = {}) => {
     const keywords = options.keywords || defaultKeywords;
     const extensions = values(keywords).filter(Boolean);
     
-    const {parse} = extendParser(extensions);
+    const {parse} = extendParser([
+        typescript(),
+        ...extensions,
+    ]);
+    
     const ast = parse(source);
     
     if (options.type === 'estree')

package/packages/keyword-add-array/index.js

@@ -34,7 +34,8 @@ export default function keywordAddArray(Parser) {
                 oldParenAssign = refDestructuringErrors.parenthesizedAssign;
                 oldTrailingComma = refDestructuringErrors.trailingComma;
                 oldDoubleProto = refDestructuringErrors.doubleProto;
-                refDestructuringErrors.parenthesizedAssign = refDestructuringErrors.trailingComma = -1;
+                refDestructuringErrors.parenthesizedAssign = -1;
+                refDestructuringErrors.trailingComma = -1;
             } else {
                 refDestructuringErrors = new DestructuringErrors();
                 ownDestructuringErrors = true;
@@ -61,8 +62,11 @@ export default function keywordAddArray(Parser) {
                 if (this.type === tt.eq)
                     left = this.toAssignable(left, false, refDestructuringErrors);
                 
-                if (!ownDestructuringErrors)
-                    refDestructuringErrors.parenthesizedAssign = refDestructuringErrors.trailingComma = refDestructuringErrors.doubleProto = -1;
+                if (!ownDestructuringErrors) {
+                    refDestructuringErrors.parenthesizedAssign = -1;
+                    refDestructuringErrors.trailingComma = -1;
+                    refDestructuringErrors.doubleProto = -1;
+                }
                 
                 if (refDestructuringErrors.shorthandAssign >= left.start)
                     refDestructuringErrors.shorthandAssign = -1;

package/packages/keyword-if/index.js

@@ -50,6 +50,7 @@ function createIfLet({isParenL}) {
     const node = {
         loc: {},
         range: [],
+        type: 'BlockStatement',
         body: [{
             type: 'VariableDeclaration',
             kind: 'let',
@@ -81,6 +82,7 @@ function createIf({test, isParenL}) {
     node.alternate = this.eat(tt._else) ? this.parseStatement('if') : null;
     node.loc = {};
     node.range = [];
+    node.type = 'IfStatement';
     
     setGoldsteinIf(node);
     

package/packages/keyword-import/index.js

@@ -16,10 +16,11 @@ export default function keywordImport(Parser) {
                 node.specifiers = this.parseImportSpecifiers();
                 this.expectContextual('from');
                 
-                if (this.type === tokTypes.string)
+                if (this.type === tokTypes.string) {
                     node.source = this.parseLiteral(this.value);
-                else if (this.type === tokTypes.name) {
+                } else if (this.type === tokTypes.name) {
                     const {value} = this;
+                    
                     node.source = this.parseLiteral(this.value);
                     node.source.raw = `'${value}'`;
                 } else {

package/packages/keyword-missing-initializer/index.js

@@ -12,8 +12,7 @@ export default function keywordMissingInitializer(Parser) {
                 if (this.eat(tt.eq))
                     decl.init = this.parseMaybeAssign(isFor);
                 else if (!allowMissingInitializer && kind === 'const' && !(this.type === tt._in || this.options.ecmaVersion >= 6 && this.isContextual('of')))
-                    decl.init = this.parseMaybeAssign(isFor);
-                /* c8 ignore start */
+                    decl.init = this.parseMaybeAssign(isFor); /* c8 ignore start */
                 else if (!allowMissingInitializer && decl.id.type !== 'Identifier' && !(isFor && (this.type === tt._in || this.isContextual('of'))))
                     this.raise(this.lastTokEnd, 'Complex binding patterns require an initialization value');
                 else

package/packages/keyword-useless-comma/index.js

@@ -0,0 +1,29 @@
+import {tokTypes as tt} from 'acorn';
+
+export default function fn(Parser) {
+    return class extends Parser {
+        parseIdentNode() {
+            const node = this.startNode();
+            
+            /* c8 ignore start */
+            if (this.type === tt.name) {
+                node.name = this.value;
+            } else if (this.type.keyword) {
+                node.name = this.type.keyword;
+                
+                // To fix https://github.com/acornjs/acorn/issues/575
+                // `class` and `function` keywords push new context into this.context.
+                // But there is no chance to pop the context if the keyword is consumed as an identifier such as a property name.
+                // If the previous token is a dot, this does not apply because the context-managing code already ignored the keyword
+                if ((node.name === 'class' || node.name === 'function') && (this.lastTokEnd !== this.lastTokStart + 1 || this.input.charCodeAt(this.lastTokStart) !== 46))
+                    this.context.pop();
+                
+                this.type = tt.name;
+                /* c8 ignore end */
+            }
+            
+            return node;
+        }
+    };
+}
+

package/packages/keyword-useless-comma/rename-unnamed-identifier/index.js

@@ -0,0 +1,8 @@
+export const report = () => {};
+export const fix = (path) => path.remove();
+export const traverse = ({push}) => ({
+    ObjectProperty(path) {
+        if (!path.node.key.name)
+            push(path);
+    },
+});