Merge b008b82 into ea3916e

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.1.0",
+    "monaco-azure-logic-app-lang": "^0.1.1",
     "monaco-editor": "^0.27.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -65,5 +65,5 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "version": "0.1.0"
+  "version": "0.1.1"
 }

examples/easy-example/src/editors/DummyEditor.tsx

@@ -334,9 +334,8 @@ const useStyles = makeStyles((theme) => ({
 
 // @item().one['two'].
 
-
 const sampleCodes =
-`@activity('GetMetadata 2').output.structure[1].`;
+`@min(pipeline().globalParameters.oneTypedObj.anotherGlobalFloat,activity('Lookup 3').output.firstRow.count)`;
 
 const MONACO_EDITOR_ID = 'first-dummy-monaco-editor';
 

examples/easy-example/tsconfig.json

@@ -14,6 +14,7 @@
     "module": "esnext",
     "moduleResolution": "node",
     "resolveJsonModule": true,
+    "strictNullChecks": true,
     "isolatedModules": false,
     "noEmit": true,
     "jsx": "react",

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.1.0",
+    "monaco-azure-logic-app-lang": "^0.1.1",
     "monaco-editor": "^0.27.0"
   },
   "devDependencies": {
@@ -62,5 +62,5 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "version": "0.1.0"
+  "version": "0.1.1"
 }

languages/monaco-az-logic-app-lang-e2e/src/editors/ExpressionEditor.ts

@@ -308,7 +308,7 @@ export const mount = (root:HTMLDivElement)=> {
     MONACO_EDITOR_ID,
     rootSymbolTable
   )
-  AzLogicAppExpressionLangMonacoEditor.init.then(()=>{
+  AzLogicAppExpressionLangMonacoEditor.init?.then(()=>{
     theEditor.azLgcExpDocEventEmitter?.subscribe(subscribeCodeDoc);
     theEditor.validationResultEventEmitter?.subscribe(subscribeValidateResult);
     (window as any).regenerateNextSymbolTable = function () {

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

@@ -58,6 +58,15 @@ function generateValidationTests(openOnePage, closeOnePage) {
         "@concat('Baba', '''s ', 'book store')",
         "@if(contains(json(item().DataLoadingBehaviorSettings).watermarkColumnType, 'Int'),'','''')",
         "@equals(pipeline().globalParameters.firstGlobalStrPara,  '0')",
+        "@array('abc', 'defg')",
+        "@union([1, 2, 3], [101, 2, 1, 10])",
+        "@min(pipeline().globalParameters.oneTypedObj.anotherGlobalFloat,activity('Lookup 3').output.firstRow.count)",
+        "@max(pipeline().globalParameters.oneTypedObj.anotherGlobalNumber,activity('Lookup 4').output.firstRow.count)",
+        "@coalesce(1,2,'',true, false, xml(''))",
+        "@createArray(1,2,'',true, false, json(''))",
+        "@float('0.777')",
+        "@subtractFromTime('',1, string( json('')))",
+        "@subtractFromTime('',1, string( json('')), 'another')",
       ].forEach((value, index)=>{
         it(`Valid expression ${index}`, async ()=>{
           let nextText, content, problems;

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

@@ -14,6 +14,7 @@
     "module": "esnext",
     "moduleResolution": "node",
     "resolveJsonModule": true,
+    "strictNullChecks": true,
     "isolatedModules": false,
     "noEmit": true,
     "jsx": "react",

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

@@ -1,6 +1,6 @@
 {
   "name": "monaco-azure-logic-app-lang",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "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.1.0",
-    "@monaco-imposture-tools/oniguruma-asm": "^0.1.0"
+    "@monaco-imposture-tools/core": "^0.1.1",
+    "@monaco-imposture-tools/oniguruma-asm": "^0.1.1"
   },
   "devDependencies": {
-    "@monaco-imposture-tools/grammars": "^0.1.0",
+    "@monaco-imposture-tools/grammars": "^0.1.1",
     "@types/chai": "^4.2.21",
     "@types/mocha": "^9.0.0",
     "@types/node": "^14.14.31",

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

@@ -140,7 +140,7 @@ export abstract class AbstractReturnChainType {
       let isPropertyLiteral = false;
       if (node.children?.length){
         firstChildAstNode = node.children[0] as AzLogicAppNode;
-        switch (firstChildAstNode.$impostureLang.dataType) {
+        switch (firstChildAstNode.$impostureLang?.dataType) {
           case 'string':
             identifierName = codeDocument.getNodeContent(firstChildAstNode).replace(/'/gm, '');
             label = identifierName;

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

@@ -60,7 +60,7 @@ export class AzLogicAppLangConstants{
   static _init: Promise<any> | undefined = undefined;
   static _registry: Registry | undefined = undefined;
 
-  static _grammar: IGrammar | undefined = undefined;
+  static _grammar: IGrammar | null | undefined = undefined;
   static _theme: IRawTheme = themes['default'];
   static _usingBuiltInTheme = true;