miniscript-languageserver 1.3.1 → 1.3.2

package/index.js

@@ -148,8 +148,8 @@ ${e}`;for(let a=0;a<this.details.length;++a){let u=a+1;o=`${o}
 `,ref:{start:e.start,end:e.start}});for(let r of e.body){let i=this.tokens.length;this.process(r),i<this.tokens.length&&this.tokens.push({type:H.TokenType.EndOfLine,value:`
 `,ref:{start:r.end,end:r.end}})}},ElseClause:function(e,n){this.tokens.push({type:H.TokenType.Text,value:"else",ref:{start:e.start,end:e.start}}),this.tokens.push({type:H.TokenType.EndOfLine,value:`
 `,ref:{start:e.start,end:e.start}});for(let r of e.body){let i=this.tokens.length;this.process(r),i<this.tokens.length&&this.tokens.push({type:H.TokenType.EndOfLine,value:`
-`,ref:{start:r.end,end:r.end}})}},ContinueStatement:function(e,n){this.tokens.push({type:H.TokenType.Text,value:"continue",ref:e})},BreakStatement:function(e,n){this.tokens.push({type:H.TokenType.Text,value:"break",ref:e})},CallStatement:function(e,n){this.process(e.expression)},FeatureInjectExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:`#inject "${e.path}";`,ref:e});return}if(this.currentDependency===null){this.tokens.push({type:H.TokenType.Text,value:`#inject "${e.path}";`,ref:e});return}let r=this.currentDependency.injections.get(e.path);if(r==null){this.tokens.push({type:H.TokenType.Text,value:"null",ref:e});return}this.tokens.push({type:H.TokenType.Text,value:`"${r.replace(/"/g,'""')}"`,ref:e})},FeatureImportExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:"#import ",ref:e}),this.process(e.name),this.tokens.push({type:H.TokenType.Text,value:` from "${e.path}";`,ref:e});return}if(!e.chunk){this.tokens.push({type:H.TokenType.Text,value:"#import ",ref:e}),this.process(e.name),this.tokens.push({type:H.TokenType.Text,value:` from "${e.path}";`,ref:e});return}this.process(e.name),this.tokens.push({type:H.TokenType.Text,value:' = __REQUIRE("'+e.namespace+'")',ref:e})},FeatureIncludeExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:`#include "${e.path}";`,ref:e});return}if(!e.chunk){this.tokens.push({type:H.TokenType.Text,value:`#include "${e.path}";`,ref:e});return}this.process(e.chunk)},FeatureDebuggerExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:"debugger",ref:e});return}this.tokens.push({type:H.TokenType.Text,value:"//debugger",ref:e})},FeatureLineExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:"#line",ref:e});return}this.tokens.push({type:H.TokenType.Text,value:`${e.start.line}`,ref:e})},FeatureFileExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:"#filename",ref:e});return}this.tokens.push({type:H.TokenType.Text,value:`"${(0,SN.basename)(e.filename).replace(/"/g,'"')}"`,ref:e})},ListConstructorExpression:function(e,n){this.tokens.push({type:H.TokenType.Text,value:"[",ref:e});for(let r=0;r<e.fields.length;r++){let i=e.fields[r];this.process(i),r!==e.fields.length-1&&this.tokens.push({type:H.TokenType.Text,value:",",ref:i})}this.tokens.push({type:H.TokenType.Text,value:"]",ref:e})},ListValue:function(e,n){this.process(e.value)},BooleanLiteral:function(e,n){this.tokens.push({type:H.TokenType.Text,value:(e.negated?"-":"")+e.raw.toString(),ref:e})},EmptyExpression:function(e,n){this.tokens.push({type:H.TokenType.Text,value:"",ref:e})},IsaExpression:function(e,n){this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:" "+e.operator+" ",ref:e}),this.process(e.right)},LogicalExpression:function(e,n){this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:" "+e.operator+" ",ref:e}),this.process(e.right)},BinaryExpression:function(e,n){if(e.operator==="|"){this.tokens.push({type:H.TokenType.Text,value:"bitOr(",ref:e}),this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:",",ref:e}),this.process(e.right),this.tokens.push({type:H.TokenType.Text,value:")",ref:e});return}else if(e.operator==="&"){this.tokens.push({type:H.TokenType.Text,value:"bitAnd(",ref:e}),this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:",",ref:e}),this.process(e.right),this.tokens.push({type:H.TokenType.Text,value:")",ref:e});return}else if(e.operator==="<<"||e.operator===">>"||e.operator===">>>")throw new Error("Operators in binary expression are not supported");this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:e.operator,ref:e}),this.process(e.right)},BinaryNegatedExpression:function(e,n){this.tokens.push({type:H.TokenType.Text,value:e.operator,ref:e}),this.process(e.argument)},ComparisonGroupExpression:function(e,n){this.process(e.expressions[0]);for(let r=0;r<e.operators.length;r++)this.tokens.push({type:H.TokenType.Text,value:e.operators[r],ref:e}),this.process(e.expressions[r+1])},Chunk:function(e,n){for(let r of e.body)this.process(r),this.tokens.push({type:H.TokenType.EndOfLine,value:`
-`,ref:{start:r.end,end:r.end}})}}}transform(e,n){this._tokens=[],this._currentDependency=n,this.process(e);let r="";for(let i=0;i<this.tokens.length-1;i++){let s=this.tokens[i];if(s.type===H.TokenType.Text||s.type===H.TokenType.Comment)r+=s.value;else if(s.type===H.TokenType.EndOfLine)r+=`
+`,ref:{start:r.end,end:r.end}})}},ContinueStatement:function(e,n){this.tokens.push({type:H.TokenType.Text,value:"continue",ref:e})},BreakStatement:function(e,n){this.tokens.push({type:H.TokenType.Text,value:"break",ref:e})},CallStatement:function(e,n){this.process(e.expression)},FeatureInjectExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:`#inject "${e.path}";`,ref:e});return}if(this.currentDependency===null){this.tokens.push({type:H.TokenType.Text,value:`#inject "${e.path}";`,ref:e});return}let r=this.currentDependency.injections.get(e.path);if(r==null){this.tokens.push({type:H.TokenType.Text,value:"null",ref:e});return}this.tokens.push({type:H.TokenType.Text,value:`"${r.replace(/"/g,'""')}"`,ref:e})},FeatureImportExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:"#import ",ref:e}),this.process(e.name),this.tokens.push({type:H.TokenType.Text,value:` from "${e.path}";`,ref:e});return}if(!e.chunk){this.tokens.push({type:H.TokenType.Text,value:"#import ",ref:e}),this.process(e.name),this.tokens.push({type:H.TokenType.Text,value:` from "${e.path}";`,ref:e});return}this.process(e.name),this.tokens.push({type:H.TokenType.Text,value:' = __REQUIRE("'+e.namespace+'")',ref:e})},FeatureIncludeExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:`#include "${e.path}";`,ref:e});return}if(!e.chunk){this.tokens.push({type:H.TokenType.Text,value:`#include "${e.path}";`,ref:e});return}this.process(e.chunk)},FeatureDebuggerExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:"debugger",ref:e});return}this.tokens.push({type:H.TokenType.Text,value:"//debugger",ref:e})},FeatureLineExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:"#line",ref:e});return}this.tokens.push({type:H.TokenType.Text,value:`${e.start.line}`,ref:e})},FeatureFileExpression:function(e,n){if(this.transformer.buildOptions.isDevMode){this.tokens.push({type:H.TokenType.Text,value:"#filename",ref:e});return}this.tokens.push({type:H.TokenType.Text,value:`"${(0,SN.basename)(e.filename).replace(/"/g,'"')}"`,ref:e})},ListConstructorExpression:function(e,n){this.tokens.push({type:H.TokenType.Text,value:"[",ref:e});for(let r=0;r<e.fields.length;r++){let i=e.fields[r];this.process(i),r!==e.fields.length-1&&this.tokens.push({type:H.TokenType.Text,value:",",ref:i})}this.tokens.push({type:H.TokenType.Text,value:"]",ref:e})},ListValue:function(e,n){this.process(e.value)},BooleanLiteral:function(e,n){this.tokens.push({type:H.TokenType.Text,value:(e.negated?"-":"")+e.raw.toString(),ref:e})},EmptyExpression:function(e,n){this.tokens.push({type:H.TokenType.Text,value:"",ref:e})},IsaExpression:function(e,n){this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:" "+e.operator+" ",ref:e}),this.process(e.right)},LogicalExpression:function(e,n){this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:" "+e.operator+" ",ref:e}),this.process(e.right)},BinaryExpression:function(e,n){if(e.operator==="|"){this.tokens.push({type:H.TokenType.Text,value:"bitOr(",ref:e}),this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:",",ref:e}),this.process(e.right),this.tokens.push({type:H.TokenType.Text,value:")",ref:e});return}else if(e.operator==="&"){this.tokens.push({type:H.TokenType.Text,value:"bitAnd(",ref:e}),this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:",",ref:e}),this.process(e.right),this.tokens.push({type:H.TokenType.Text,value:")",ref:e});return}else if(e.operator==="<<"||e.operator===">>"||e.operator===">>>")throw new Error("Operators in binary expression are not supported");this.process(e.left),this.tokens.push({type:H.TokenType.Text,value:e.operator,ref:e}),this.process(e.right)},BinaryNegatedExpression:function(e,n){this.tokens.push({type:H.TokenType.Text,value:e.operator,ref:e}),this.process(e.argument)},ComparisonGroupExpression:function(e,n){this.process(e.expressions[0]);for(let r=0;r<e.operators.length;r++)this.tokens.push({type:H.TokenType.Text,value:e.operators[r],ref:e}),this.process(e.expressions[r+1])},Chunk:function(e,n){for(let r of e.body){let i=this.tokens.length;this.process(r),i<this.tokens.length&&this.tokens.push({type:H.TokenType.EndOfLine,value:`
+`,ref:{start:r.end,end:r.end}})}}}}transform(e,n){this._tokens=[],this._currentDependency=n,this.process(e);let r="";for(let i=0;i<this.tokens.length-1;i++){let s=this.tokens[i];if(s.type===H.TokenType.Text||s.type===H.TokenType.Comment)r+=s.value;else if(s.type===H.TokenType.EndOfLine)r+=`
 `;else throw new Error("Unknown token type!")}return r}};Sd.DefaultFactory=Qy});var eb=g(xd=>{"use strict";Object.defineProperty(xd,"__esModule",{value:!0});xd.createExpressionString=void 0;var kd=Le();function Qa(t){switch(t.type){case kd.ASTType.ParenthesisExpression:return Qa(t.expression);case kd.ASTType.MemberExpression:{let e=t;return`${Qa(e.base)}.${Qa(e.identifier)}`}case kd.ASTType.IndexExpression:return`${Qa(t.base)}[]`;case kd.ASTType.Identifier:return t.name}}function kN(t){return Qa(t)}xd.createExpressionString=kN});var nb=g(wd=>{"use strict";Object.defineProperty(wd,"__esModule",{value:!0});wd.UglifyFactory=void 0;var xN=require("path"),BE=eb(),U=_o(),tb=class extends U.Factory{constructor(){super(...arguments),this.handlers={ParenthesisExpression:function(e,n){this.tokens.push({type:U.TokenType.Text,value:"(",ref:e}),this.process(e.expression),this.tokens.push({type:U.TokenType.Text,value:")",ref:e})},Comment:function(e,n){},AssignmentStatement:function(e,n){let r=e.variable,i=e.init;this.process(r),this.tokens.push({type:U.TokenType.Text,value:"=",ref:e}),this.process(i)},MemberExpression:function(e,n){this.process(e.base),this.tokens.push({type:U.TokenType.Text,value:e.indexer,ref:e});let r=(0,BE.createExpressionString)(e.base);this.process(e.identifier,{usesNativeVar:r==="globals"||r==="locals"||r==="outer",isMember:!0})},FunctionDeclaration:function(e,n){if(e.parameters.length===0)this.tokens.push({type:U.TokenType.Text,value:"function",ref:{start:e.start,end:e.start}});else{this.tokens.push({type:U.TokenType.Text,value:"function(",ref:{start:e.start,end:e.start}});for(let r=0;r<e.parameters.length;r++){let i=e.parameters[r];this.process(i),r!==e.parameters.length-1&&this.tokens.push({type:U.TokenType.Text,value:",",ref:i})}this.tokens.push({type:U.TokenType.Text,value:")",ref:{start:e.start,end:e.start}})}this.tokens.push({type:U.TokenType.EndOfLine,value:`
 `,ref:{start:e.start,end:e.start}});for(let r of e.body){let i=this.tokens.length;this.process(r),i<this.tokens.length&&this.tokens.push({type:U.TokenType.EndOfLine,value:`
 `,ref:{start:r.end,end:r.end}})}this.tokens.push({type:U.TokenType.Text,value:"end function",ref:{start:e.end,end:e.end}})},MapConstructorExpression:function(e,n){this.tokens.push({type:U.TokenType.Text,value:"{",ref:{start:e.start,end:e.start}});for(let r=0;r<e.fields.length;r++){let i=e.fields[r];this.process(i),r!==e.fields.length-1&&this.tokens.push({type:U.TokenType.Text,value:",",ref:i})}this.tokens.push({type:U.TokenType.Text,value:"}",ref:{start:e.end,end:e.end}})},MapKeyString:function(e,n){this.process(e.key),this.tokens.push({type:U.TokenType.Text,value:":",ref:e}),this.process(e.value)},Identifier:function(e,n){let r=e.name;if(n.isMember){if(n.usesNativeVar){this.tokens.push({type:U.TokenType.Text,value:this.transformer.context.variables.get(r)||r,ref:e});return}this.tokens.push({type:U.TokenType.Text,value:r,ref:e});return}this.tokens.push({type:U.TokenType.Text,value:this.transformer.context.variables.get(r)||r,ref:e})},ReturnStatement:function(e,n){this.tokens.push({type:U.TokenType.Text,value:"return ",ref:e}),e.argument&&this.process(e.argument)},NumericLiteral:function(e,{isArgument:n=!1}){let r=this.transformer.context.literals.get(e);if(!n&&r!==null&&r.namespace!==null){this.tokens.push({type:U.TokenType.Text,value:r.namespace,ref:e});return}this.tokens.push({type:U.TokenType.Text,value:(e.negated?"-":"")+e.value.toString(),ref:e})},WhileStatement:function(e,n){this.tokens.push({type:U.TokenType.Text,value:"while ",ref:{start:e.start,end:e.start}}),this.process(e.condition),this.tokens.push({type:U.TokenType.EndOfLine,value:`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miniscript-languageserver",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Language server for MiniScript",
   "main": "./index.js",
   "scripts": {
@@ -69,7 +69,7 @@
   "dependencies": {
     "greybel-core": "~2.1.1",
     "miniscript-meta": "~1.2.3",
-    "greybel-transpiler": "~3.1.7",
+    "greybel-transpiler": "~3.1.8",
     "miniscript-type-analyzer": "~0.9.0",
     "miniscript-languageserver-core": "^1.1.2"
   }