Release 0.0.12 (#6)

* enhance parameterSize arr and parenthese nodes

examples/easy-example/package.json

@@ -7,7 +7,7 @@
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
-    "monaco-azure-logic-app-lang": "^0.0.11",
+    "monaco-azure-logic-app-lang": "^0.0.12",
     "monaco-editor": "^0.27.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -65,5 +65,5 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "version": "0.0.11"
+  "version": "0.0.12"
 }

languages/monaco-az-logic-app-lang-e2e/package.json

@@ -2,7 +2,7 @@
   "name": "monaco-az-logic-app-lang-e2e",
   "private": true,
   "dependencies": {
-    "monaco-azure-logic-app-lang": "^0.0.11",
+    "monaco-azure-logic-app-lang": "^0.0.12",
     "monaco-editor": "^0.27.0"
   },
   "devDependencies": {
@@ -62,5 +62,5 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "version": "0.0.11"
+  "version": "0.0.12"
 }

languages/monaco-az-logic-app-lang-e2e/test/validation.spec.js

@@ -40,6 +40,7 @@ function generateValidationTests(openOnePage, closeOnePage) {
         "@activity('Get Metadata1').output.childItems[0].name",
         "@item().one.two.three",
         "@item().one['two'].three",
+        "@contains( [pipeline().DataFactory], [pipeline().GroupId] )",
       ].forEach((value, index)=>{
         it(`Valid expression ${index}`, async ()=>{
           let nextText, content, problems;

languages/monaco-az-logic-app-lang/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-azure-logic-app-lang",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "",
   "main": "./lib/index.js",
   "typings": "./lib/typings/index.d.ts",
@@ -20,11 +20,11 @@
     "url": "git@github.com:albertleigh/monaco-imposture-tools.git"
   },
   "dependencies": {
-    "@monaco-imposture-tools/core": "^0.0.11",
-    "@monaco-imposture-tools/oniguruma-asm": "^0.0.11"
+    "@monaco-imposture-tools/core": "^0.0.12",
+    "@monaco-imposture-tools/oniguruma-asm": "^0.0.12"
   },
   "devDependencies": {
-    "@monaco-imposture-tools/grammars": "^0.0.11",
+    "@monaco-imposture-tools/grammars": "^0.0.12",
     "@types/chai": "^4.2.21",
     "@types/mocha": "^9.0.0",
     "@types/node": "^14.14.31",

languages/monaco-az-logic-app-lang/src/parser.ts

@@ -215,20 +215,21 @@ export class ParenthesisNode extends SyntaxNode{
     return this._cachedCommaIndices.slice();
   }
 
-  public get parameterSize(){
+  private _ensureCommaIndicesPopulated(){
     if(!this._cachedCommaIndices){
-      const _dummyCommaIndices = this.commaIndices;
+      this._cachedCommaIndices = this.commaIndices;
     }
+  }
+
+  public get parameterSize(){
+    this._ensureCommaIndicesPopulated();
     return this._cachedCommaIndices.length === 0?
       this.content.length > 0 ? 1: 0:
       this._cachedCommaIndices.length+1;
   }
 
   public parameter(index:number):SyntaxNode|undefined{
-    if(!this._cachedCommaIndices){
-      const _dummyCommaIndices = this.commaIndices;
-    }
-
+    this._ensureCommaIndicesPopulated();
     if (
       index === 0 && !(this.content[0] instanceof CommaPunctuator)
     ){
@@ -245,19 +246,15 @@ export class ParenthesisNode extends SyntaxNode{
   }
 
   public comma(index:number):CommaPunctuator|undefined{
-    if(!this._cachedCommaIndices){
-      const _dummyCommaIndices = this.commaIndices;
-    }
+    this._ensureCommaIndicesPopulated();
     if (index >= 0 && index < this._cachedCommaIndices.length){
       return this.content[this._cachedCommaIndices[index]];
     }
     return undefined;
   }
 
   public paramIndexByOffset(offset:number){
-    if(!this._cachedCommaIndices){
-      const _dummyCommaIndices = this.commaIndices;
-    }
+    this._ensureCommaIndicesPopulated();
     if (
       this.offset+1 <= offset &&
       this.offset+ this.length -1 >= offset
@@ -276,9 +273,7 @@ export class ParenthesisNode extends SyntaxNode{
   }
 
   public startPosOfParameter(paramIndex:number){
-    if(!this._cachedCommaIndices){
-      const _dummyCommaIndices = this.commaIndices;
-    }
+    this._ensureCommaIndicesPopulated();
     if (paramIndex <= 0){
       return this.offset + 1;
     }else if (paramIndex >= this._cachedCommaIndices.length + 1){
@@ -289,9 +284,7 @@ export class ParenthesisNode extends SyntaxNode{
   }
 
   public endPosOfParameter(paramIndex:number){
-    if(!this._cachedCommaIndices){
-      const _dummyCommaIndices = this.commaIndices;
-    }
+    this._ensureCommaIndicesPopulated();
     if (paramIndex > this._cachedCommaIndices.length -1 ){
       return this.offset + this.length -1;
     }else if (paramIndex < 0){
@@ -642,7 +635,7 @@ export class LiteralArrayNode extends LiteralValueNode{
 
   private _ensureCommaIndicesPopulated(){
     if(!this._cachedCommaIndices){
-      const _dummyCommaIndices = this.commaIndices;
+      this._cachedCommaIndices = this.commaIndices;
     }
   }
 

lerna.json

@@ -4,7 +4,7 @@
     "examples/*",
     "languages/*"
   ],
-  "version": "0.0.11",
+  "version": "0.0.12",
   "npmClient": "npm",
   "command": {
     "publish": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monaco-imposture-tools/core",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "",
   "main": "./lib/main.js",
   "typings": "./lib/typings/main.d.ts",
@@ -24,11 +24,11 @@
     "url": "git@github.com:albertleigh/monaco-imposture-tools.git"
   },
   "dependencies": {
-    "@monaco-imposture-tools/oniguruma-asm": "^0.0.11",
+    "@monaco-imposture-tools/oniguruma-asm": "^0.0.12",
     "fast-plist": "^0.1.2"
   },
   "devDependencies": {
-    "@monaco-imposture-tools/grammars": "^0.0.11",
+    "@monaco-imposture-tools/grammars": "^0.0.12",
     "@types/chai": "^4.2.21",
     "@types/mocha": "^9.0.0",
     "@types/node": "^14.14.31",

packages/grammars/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monaco-imposture-tools/grammars",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Textmate grammars for monaco imposture tools.",
   "main": "index.js",
   "scripts": {

packages/onigasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monaco-imposture-tools/oniguruma-asm",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/typings/index.d.ts",