@finos/legend-query-builder 4.1.3 → 4.1.5

package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderProjectionColumnState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,WAAW,EAMhB,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,wCAAwC,EAE9C,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAEL,mCAAmC,EACpC,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,IAAI,EACT,KAAK,kBAAkB,EAOvB,SAAS,EAIV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAMvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAGzE,eAAO,MAAM,wCAAwC,sBAAsB,CAAC;AAE5E,MAAM,WAAW,sCAAsC;IACrD,WAAW,EAAE,iCAAiC,CAAC;CAChD;AAED,8BAAsB,iCACpB,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;gBAEP,QAAQ,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM;IAa9D,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAGjC;AAED,qBAAa,uCACX,SAAQ,iCACR,YAAW,QAAQ;IAEnB,mBAAmB,EAAE,MAAM,CAAgC;IAC3D,uBAAuB,EAAE,mCAAmC,CAAC;gBAG3D,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,EAAE,0BAA0B,EAC9C,oBAAoB,EAAE,OAAO;IAqB/B,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIzC,cAAc,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO;IAWrD,cAAc,CACZ,IAAI,EAAE,wCAAwC,EAC9C,oBAAoB,EAAE,OAAO,GAC5B,IAAI;IAcE,aAAa,IAAI,IAAI,GAAG,SAAS;IAK1C,IAAI,QAAQ,IAAI,MAAM,CAMrB;CACF;AAED,cAAM,2CAA4C,SAAQ,iBAAiB;IACzE,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,+BAA+B,EAAE,2CAA2C,CAAC;IAC7E;;;OAGG;IACH,kBAAkB,SAAM;gBAGtB,iBAAiB,EAAE,iBAAiB,EACpC,+BAA+B,EAAE,2CAA2C;IAO9E,IAAI,QAAQ,IAAI,MAAM,CAQrB;IAED,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAItC,kCAAkC,IAAI,WAAW,CAAC,IAAI,CAAC;IA2BvD,kCAAkC,CAAC,MAAM,EAAE,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC;CAmCxE;AAED,qBAAa,2CACX,SAAQ,iCACR,YAAW,QAAQ;IAEnB,2BAA2B,EAAE,2CAA2C,CAAC;IACzE,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,IAAI,GAAG,SAAS,CAAC;gBAEjB,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,SAAS;IAkB7D,SAAS,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAI/B,aAAa,CAAC,GAAG,EAAE,IAAI,GAAG,SAAS,GAAG,IAAI;IAI1C;;;;OAIG;IACF,+BAA+B,IAAI,WAAW,CAAC,IAAI,CAAC;IAqC5C,aAAa,IAAI,IAAI,GAAG,SAAS;IAI1C,IAAI,QAAQ,IAAI,MAAM,CAOrB;CACF"}
+{"version":3,"file":"QueryBuilderProjectionColumnState.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,WAAW,EAMhB,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,wCAAwC,EAE9C,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAEL,mCAAmC,EACpC,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,IAAI,EACT,KAAK,kBAAkB,EAOvB,SAAS,EAIV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAMvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAGzE,eAAO,MAAM,wCAAwC,sBAAsB,CAAC;AAE5E,MAAM,WAAW,sCAAsC;IACrD,WAAW,EAAE,iCAAiC,CAAC;CAChD;AAED,8BAAsB,iCACpB,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;gBAEP,QAAQ,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM;IAa9D,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAGjC;AAED,qBAAa,uCACX,SAAQ,iCACR,YAAW,QAAQ;IAEnB,mBAAmB,EAAE,MAAM,CAAgC;IAC3D,uBAAuB,EAAE,mCAAmC,CAAC;gBAG3D,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,EAAE,0BAA0B,EAC9C,oBAAoB,EAAE,OAAO;IAqB/B,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIzC,cAAc,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO;IAWrD,cAAc,CACZ,IAAI,EAAE,wCAAwC,EAC9C,oBAAoB,EAAE,OAAO,GAC5B,IAAI;IAcE,aAAa,IAAI,IAAI,GAAG,SAAS;IAK1C,IAAI,QAAQ,IAAI,MAAM,CAMrB;CACF;AAED,cAAM,2CAA4C,SAAQ,iBAAiB;IACzE,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,+BAA+B,EAAE,2CAA2C,CAAC;IAC7E;;;OAGG;IACH,kBAAkB,SAAM;gBAGtB,iBAAiB,EAAE,iBAAiB,EACpC,+BAA+B,EAAE,2CAA2C;IAO9E,IAAI,QAAQ,IAAI,MAAM,CAQrB;IAED,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAItC,kCAAkC,IAAI,WAAW,CAAC,IAAI,CAAC;IA2BvD,kCAAkC,CAAC,OAAO,CAAC,EAAE;QAC5C,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC7B,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KAChD,GAAG,WAAW,CAAC,IAAI,CAAC;CAqCtB;AAED,qBAAa,2CACX,SAAQ,iCACR,YAAW,QAAQ;IAEnB,2BAA2B,EAAE,2CAA2C,CAAC;IACzE,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,IAAI,GAAG,SAAS,CAAC;gBAEjB,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,SAAS;IAkB7D,SAAS,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAI/B,aAAa,CAAC,GAAG,EAAE,IAAI,GAAG,SAAS,GAAG,IAAI;IAI1C;;;;OAIG;IACF,+BAA+B,IAAI,WAAW,CAAC,IAAI,CAAC;IAqC5C,aAAa,IAAI,IAAI,GAAG,SAAS;IAI1C,IAAI,QAAQ,IAAI,MAAM,CAOrB;CACF"}

package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js

@@ -125,17 +125,19 @@ class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
             this.derivationProjectionColumnState.setLambda(emptyLambda);
         }
     }
-    *convertLambdaObjectToGrammarString(pretty) {
+    *convertLambdaObjectToGrammarString(options) {
         if (this.derivationProjectionColumnState.lambda.body) {
             try {
                 const lambdas = new Map();
                 lambdas.set(this.lambdaId, new RawLambda(this.derivationProjectionColumnState.lambda.parameters, this.derivationProjectionColumnState.lambda.body));
-                const isolatedLambdas = (yield this.queryBuilderState.graphManagerState.graphManager.lambdasToPureCode(lambdas, pretty));
+                const isolatedLambdas = (yield this.queryBuilderState.graphManagerState.graphManager.lambdasToPureCode(lambdas, options?.pretty));
                 const grammarText = isolatedLambdas.get(this.lambdaId);
                 this.setLambdaString(grammarText !== undefined
                     ? this.extractLambdaString(grammarText)
                     : '');
-                this.clearErrors();
+                this.clearErrors({
+                    preserveCompilationError: options?.preserveCompilationError,
+                });
             }
             catch (error) {
                 assertErrorThrown(error);

package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderProjectionColumnState.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAC1E,OAAO,EAEL,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EAEpB,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,+CAA+C,GAChD,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,oBAAoB,EACpB,mCAAmC,GACpC,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAIL,mCAAmC,EACnC,mBAAmB,EACnB,8BAA8B,EAC9B,WAAW,EACX,qBAAqB,EACrB,WAAW,EACX,SAAS,EACT,cAAc,EACd,YAAY,EACZ,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,kCAAkC,EAAE,MAAM,kDAAkD,CAAC;AAEtG,MAAM,CAAC,MAAM,wCAAwC,GAAG,mBAAmB,CAAC;AAM5E,MAAM,OAAgB,iCACpB,SAAQ,0BAA0B;IAGlC,QAAQ,CAAuB;IAC/B,UAAU,CAAS;IAEnB,YAAY,QAA8B,EAAE,UAAkB;QAC5D,KAAK,EAAE,CAAC;QACR,cAAc,CAAC,IAAI,EAAE;YACnB,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,UAAU;YACtB,aAAa,EAAE,MAAM;YACrB,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,aAAa,CAAC,GAAW;QACvB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;CACF;AAED,MAAM,OAAO,uCACX,SAAQ,iCAAiC;IAGzC,mBAAmB,GAAW,4BAA4B,CAAC;IAC3D,uBAAuB,CAAsC;IAE7D,YACE,QAA8B,EAC9B,kBAA8C,EAC9C,oBAA6B;QAE7B,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAEpB,cAAc,CAAC,IAAI,EAAE;YACnB,mBAAmB,EAAE,UAAU;YAC/B,uBAAuB,EAAE,UAAU;YACnC,sBAAsB,EAAE,MAAM;YAC9B,cAAc,EAAE,MAAM;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAuB,GAAG,IAAI,mCAAmC,CACpE,QAAQ,CAAC,iBAAiB,EAC1B,kBAAkB,CACnB,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,oBAAoB,CACpC,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,EAC/C,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,GAAW;QAChC,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC;IACjC,CAAC;IAED,cAAc,CAAC,QAA4B;QACzC,OAAO,OAAO,CACZ,IAAI,CAAC,uBAAuB,CAAC,+BAA+B,CAAC,IAAI,CAC/D,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACrC,kCAAkC,CAAC,QAAQ,EAAE,KAAK,CAAC,CACpD,CACJ,CACF,CAAC;IACJ,CAAC;IAED,cAAc,CACZ,IAA8C,EAC9C,oBAA6B;QAE7B,IAAI,CAAC,uBAAuB,GAAG,IAAI,mCAAmC,CACpE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAC/B,+CAA+C,CAC7C,IAAI,EACJ,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,aAAa,CAC9C,CACF,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,oBAAoB,CACpC,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,EAC/C,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAEQ,aAAa;QACpB,OAAO,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aAC9D,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,8BAA8B;YACjE,IAAI,CAAC,uBAAuB;YAC5B,IAAI,CAAC,UAAU;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,2CAA4C,SAAQ,iBAAiB;IACzE,iBAAiB,CAAoB;IACrC,+BAA+B,CAA8C;IAC7E;;;OAGG;IACH,kBAAkB,GAAG,EAAE,CAAC;IAExB,YACE,iBAAoC,EACpC,+BAA4E;QAE5E,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACd,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,+BAA+B,GAAG,+BAA+B,CAAC;IACzE,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,8BAA8B,CAAC;YACpC,uBAAuB;YACvB,yDAAyD;YACzD,6BAA6B,CAAC,aAAa;YAC3C,6BAA6B,CAAC,UAAU;YACxC,IAAI,CAAC,+BAA+B,CAAC,IAAI;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,UAAkB;QAC9B,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC;IACvC,CAAC;IAED,CAAC,kCAAkC;QACjC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI;gBACF,MAAM,MAAM,GACV,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,gBAAgB,CAC3E,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,QAAQ,CACd,CAAc,CAAC;gBAClB,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;gBAC/B,IAAI,CAAC,+BAA+B,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aACxD;YAAC,OAAO,KAAK,EAAE;gBACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,KAAK,YAAY,WAAW,EAAE;oBAChC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;iBAC5B;gBACD,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CACtD,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,eAAe,CAAC,EACpD,KAAK,CACN,CAAC;aACH;SACF;aAAM;YACL,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,+BAA+B,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;SAC7D;IACH,CAAC;IAED,CAAC,kCAAkC,CAAC,MAAe;QACjD,IAAI,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,IAAI,EAAE;YACpD,IAAI;gBACF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqB,CAAC;gBAC7C,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,QAAQ,EACb,IAAI,SAAS,CACX,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,UAAU,EACtD,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,IAAI,CACjD,CACF,CAAC;gBACF,MAAM,eAAe,GACnB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,iBAAiB,CAC5E,OAAO,EACP,MAAM,CACP,CAAwB,CAAC;gBAC5B,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACvD,IAAI,CAAC,eAAe,CAClB,WAAW,KAAK,SAAS;oBACvB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC;oBACvC,CAAC,CAAC,EAAE,CACP,CAAC;gBACF,IAAI,CAAC,WAAW,EAAE,CAAC;aACpB;YAAC,OAAO,KAAK,EAAE;gBACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CACtD,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,eAAe,CAAC,EACpD,KAAK,CACN,CAAC;aACH;SACF;aAAM;YACL,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;SAC1B;IACH,CAAC;CACF;AAED,MAAM,OAAO,2CACX,SAAQ,iCAAiC;IAGzC,2BAA2B,CAA8C;IACzE,MAAM,CAAY;IAClB,UAAU,CAAmB;IAE7B,YAAY,QAA8B,EAAE,MAAiB;QAC3D,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAEhC,cAAc,CAAC,IAAI,EAAE;YACnB,MAAM,EAAE,UAAU;YAClB,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,MAAM;YACjB,+BAA+B,EAAE,IAAI;SACtC,CAAC,CAAC;QAEH,IAAI,CAAC,2BAA2B;YAC9B,IAAI,2CAA2C,CAC7C,QAAQ,CAAC,iBAAiB,EAC1B,IAAI,CACL,CAAC;QACJ,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,SAAS,CAAC,GAAc;QACtB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,aAAa,CAAC,GAAqB;QACjC,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACH,CAAC,+BAA+B;QAC9B,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAClD,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,UAAsB,CAAC;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC;QACtE,UAAU,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,CAAC,CAAuB,CAAC;QAC9D,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,iCAAiC;QACjC,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,CACrD,QAAQ,CAAC,IAAI,EACb,YAAY,CAAC,GAAG,EAChB,mCAAmC,CAAC,MAAM,CACxC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAC5D,CACF,CAAC;QACF,MAAM,sBAAsB,GAC1B,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,8BAA8B,CAC3F,qBAAqB,CACtB,CAAC;QACJ,MAAM,cAAc,GAAG,IAAI,SAAS,CAClC,CAAC,sBAAsB,CAAC,EACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CACjB,CAAC;QACF,MAAM,IAAI,GACR,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,mBAAmB,CACvF,cAAc,EACd,KAAK,CACN,CAAW,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzC,UAAU,CACR,YAAY,YAAY,aAAa;YACnC,YAAY,YAAY,WAAW,EACrC,gFAAgF,CACjF,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IACnC,CAAC;IAEQ,aAAa;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,kCAAkC;YACrE,IAAI,CAAC,UAAU,IAAI,EAAE;YACrB,IAAI,CAAC,MAAM;YACX,IAAI,CAAC,UAAU;SAChB,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderProjectionColumnState.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAC1E,OAAO,EAEL,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EAEpB,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,+CAA+C,GAChD,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,oBAAoB,EACpB,mCAAmC,GACpC,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAIL,mCAAmC,EACnC,mBAAmB,EACnB,8BAA8B,EAC9B,WAAW,EACX,qBAAqB,EACrB,WAAW,EACX,SAAS,EACT,cAAc,EACd,YAAY,EACZ,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,kCAAkC,EAAE,MAAM,kDAAkD,CAAC;AAEtG,MAAM,CAAC,MAAM,wCAAwC,GAAG,mBAAmB,CAAC;AAM5E,MAAM,OAAgB,iCACpB,SAAQ,0BAA0B;IAGlC,QAAQ,CAAuB;IAC/B,UAAU,CAAS;IAEnB,YAAY,QAA8B,EAAE,UAAkB;QAC5D,KAAK,EAAE,CAAC;QACR,cAAc,CAAC,IAAI,EAAE;YACnB,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,UAAU;YACtB,aAAa,EAAE,MAAM;YACrB,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,aAAa,CAAC,GAAW;QACvB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;CACF;AAED,MAAM,OAAO,uCACX,SAAQ,iCAAiC;IAGzC,mBAAmB,GAAW,4BAA4B,CAAC;IAC3D,uBAAuB,CAAsC;IAE7D,YACE,QAA8B,EAC9B,kBAA8C,EAC9C,oBAA6B;QAE7B,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAEpB,cAAc,CAAC,IAAI,EAAE;YACnB,mBAAmB,EAAE,UAAU;YAC/B,uBAAuB,EAAE,UAAU;YACnC,sBAAsB,EAAE,MAAM;YAC9B,cAAc,EAAE,MAAM;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAuB,GAAG,IAAI,mCAAmC,CACpE,QAAQ,CAAC,iBAAiB,EAC1B,kBAAkB,CACnB,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,oBAAoB,CACpC,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,EAC/C,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,GAAW;QAChC,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC;IACjC,CAAC;IAED,cAAc,CAAC,QAA4B;QACzC,OAAO,OAAO,CACZ,IAAI,CAAC,uBAAuB,CAAC,+BAA+B,CAAC,IAAI,CAC/D,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACrC,kCAAkC,CAAC,QAAQ,EAAE,KAAK,CAAC,CACpD,CACJ,CACF,CAAC;IACJ,CAAC;IAED,cAAc,CACZ,IAA8C,EAC9C,oBAA6B;QAE7B,IAAI,CAAC,uBAAuB,GAAG,IAAI,mCAAmC,CACpE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAC/B,+CAA+C,CAC7C,IAAI,EACJ,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,aAAa,CAC9C,CACF,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,oBAAoB,CACpC,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,EAC/C,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAEQ,aAAa;QACpB,OAAO,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK;aAC9D,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,8BAA8B;YACjE,IAAI,CAAC,uBAAuB;YAC5B,IAAI,CAAC,UAAU;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,2CAA4C,SAAQ,iBAAiB;IACzE,iBAAiB,CAAoB;IACrC,+BAA+B,CAA8C;IAC7E;;;OAGG;IACH,kBAAkB,GAAG,EAAE,CAAC;IAExB,YACE,iBAAoC,EACpC,+BAA4E;QAE5E,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACd,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,+BAA+B,GAAG,+BAA+B,CAAC;IACzE,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,8BAA8B,CAAC;YACpC,uBAAuB;YACvB,yDAAyD;YACzD,6BAA6B,CAAC,aAAa;YAC3C,6BAA6B,CAAC,UAAU;YACxC,IAAI,CAAC,+BAA+B,CAAC,IAAI;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,UAAkB;QAC9B,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC;IACvC,CAAC;IAED,CAAC,kCAAkC;QACjC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI;gBACF,MAAM,MAAM,GACV,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,gBAAgB,CAC3E,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,QAAQ,CACd,CAAc,CAAC;gBAClB,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;gBAC/B,IAAI,CAAC,+BAA+B,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aACxD;YAAC,OAAO,KAAK,EAAE;gBACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,KAAK,YAAY,WAAW,EAAE;oBAChC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;iBAC5B;gBACD,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CACtD,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,eAAe,CAAC,EACpD,KAAK,CACN,CAAC;aACH;SACF;aAAM;YACL,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,+BAA+B,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;SAC7D;IACH,CAAC;IAED,CAAC,kCAAkC,CAAC,OAGnC;QACC,IAAI,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,IAAI,EAAE;YACpD,IAAI;gBACF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqB,CAAC;gBAC7C,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,QAAQ,EACb,IAAI,SAAS,CACX,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,UAAU,EACtD,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,IAAI,CACjD,CACF,CAAC;gBACF,MAAM,eAAe,GACnB,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,iBAAiB,CAC5E,OAAO,EACP,OAAO,EAAE,MAAM,CAChB,CAAwB,CAAC;gBAC5B,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACvD,IAAI,CAAC,eAAe,CAClB,WAAW,KAAK,SAAS;oBACvB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC;oBACvC,CAAC,CAAC,EAAE,CACP,CAAC;gBACF,IAAI,CAAC,WAAW,CAAC;oBACf,wBAAwB,EAAE,OAAO,EAAE,wBAAwB;iBAC5D,CAAC,CAAC;aACJ;YAAC,OAAO,KAAK,EAAE;gBACd,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CACtD,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,eAAe,CAAC,EACpD,KAAK,CACN,CAAC;aACH;SACF;aAAM;YACL,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;SAC1B;IACH,CAAC;CACF;AAED,MAAM,OAAO,2CACX,SAAQ,iCAAiC;IAGzC,2BAA2B,CAA8C;IACzE,MAAM,CAAY;IAClB,UAAU,CAAmB;IAE7B,YAAY,QAA8B,EAAE,MAAiB;QAC3D,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAEhC,cAAc,CAAC,IAAI,EAAE;YACnB,MAAM,EAAE,UAAU;YAClB,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,MAAM;YACjB,+BAA+B,EAAE,IAAI;SACtC,CAAC,CAAC;QAEH,IAAI,CAAC,2BAA2B;YAC9B,IAAI,2CAA2C,CAC7C,QAAQ,CAAC,iBAAiB,EAC1B,IAAI,CACL,CAAC;QACJ,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,SAAS,CAAC,GAAc;QACtB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,aAAa,CAAC,GAAqB;QACjC,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACH,CAAC,+BAA+B;QAC9B,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAClD,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,UAAsB,CAAC;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC;QACtE,UAAU,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,CAAC,CAAuB,CAAC;QAC9D,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,iCAAiC;QACjC,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,CACrD,QAAQ,CAAC,IAAI,EACb,YAAY,CAAC,GAAG,EAChB,mCAAmC,CAAC,MAAM,CACxC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAC5D,CACF,CAAC;QACF,MAAM,sBAAsB,GAC1B,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,8BAA8B,CAC3F,qBAAqB,CACtB,CAAC;QACJ,MAAM,cAAc,GAAG,IAAI,SAAS,CAClC,CAAC,sBAAsB,CAAC,EACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CACjB,CAAC;QACF,MAAM,IAAI,GACR,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,mBAAmB,CACvF,cAAc,EACd,KAAK,CACN,CAAW,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzC,UAAU,CACR,YAAY,YAAY,aAAa;YACnC,YAAY,YAAY,WAAW,EACrC,gFAAgF,CACjF,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IACnC,CAAC;IAEQ,aAAa;QACpB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,kCAAkC;YACrE,IAAI,CAAC,UAAU,IAAI,EAAE;YACrB,IAAI,CAAC,MAAM;YACX,IAAI,CAAC,UAAU;SAChB,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/shared/LambdaEditorState.d.ts

@@ -29,12 +29,17 @@ export declare abstract class LambdaEditorState {
     abstract get lambdaId(): string;
     get fullLambdaString(): string;
     setLambdaString(val: string): void;
-    clearErrors(): void;
+    clearErrors(options?: {
+        preserveCompilationError?: boolean | undefined;
+    }): void;
     setCompilationError(compilationError: CompilationError | undefined): void;
     setParserError(parserError: ParserError | undefined): void;
     processSourceInformation(sourceInformation: SourceInformation): SourceInformation;
     extractLambdaString(fullLambdaString: string): string;
     abstract convertLambdaGrammarStringToObject(): GeneratorFn<void>;
-    abstract convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void>;
+    abstract convertLambdaObjectToGrammarString(options?: {
+        pretty?: boolean | undefined;
+        preserveCompilationError?: boolean | undefined;
+    }): GeneratorFn<void>;
 }
 //# sourceMappingURL=LambdaEditorState.d.ts.map

package/lib/stores/shared/LambdaEditorState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LambdaEditorState.d.ts","sourceRoot":"","sources":["../../../src/stores/shared/LambdaEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,KAAK,WAAW,EAAQ,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACrB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,8BAAsB,iBAAiB;IACrC,QAAQ,CAAC,IAAI,SAAU;IAEvB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;gBAEpC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAmBtD,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;IAGhC,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIlC,WAAW,IAAI,IAAI;IAKnB,mBAAmB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,GAAG,IAAI;IAUzE,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI;IAU1D,wBAAwB,CACtB,iBAAiB,EAAE,iBAAiB,GACnC,iBAAiB;IAcpB,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM;IAOrD,QAAQ,CAAC,kCAAkC,IAAI,WAAW,CAAC,IAAI,CAAC;IAChE,QAAQ,CAAC,kCAAkC,CACzC,MAAM,EAAE,OAAO,GACd,WAAW,CAAC,IAAI,CAAC;CACrB"}
+{"version":3,"file":"LambdaEditorState.d.ts","sourceRoot":"","sources":["../../../src/stores/shared/LambdaEditorState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,KAAK,WAAW,EAAQ,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACrB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,8BAAsB,iBAAiB;IACrC,QAAQ,CAAC,IAAI,SAAU;IAEvB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;gBAEpC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAmBtD,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;IAGhC,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIlC,WAAW,CAAC,OAAO,CAAC,EAAE;QACpB,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KAChD,GAAG,IAAI;IASR,mBAAmB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,GAAG,IAAI;IAUzE,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI;IAU1D,wBAAwB,CACtB,iBAAiB,EAAE,iBAAiB,GACnC,iBAAiB;IAcpB,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM;IAOrD,QAAQ,CAAC,kCAAkC,IAAI,WAAW,CAAC,IAAI,CAAC;IAChE,QAAQ,CAAC,kCAAkC,CAAC,OAAO,CAAC,EAAE;QACpD,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC7B,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KAChD,GAAG,WAAW,CAAC,IAAI,CAAC;CACtB"}

package/lib/stores/shared/LambdaEditorState.js

@@ -50,9 +50,14 @@ export class LambdaEditorState {
     setLambdaString(val) {
         this.lambdaString = val;
     }
-    clearErrors() {
-        this.setCompilationError(undefined);
+    clearErrors(options) {
         this.setParserError(undefined);
+        if (options?.preserveCompilationError && this.compilationError) {
+            this.compilationError.sourceInformation = undefined;
+        }
+        else {
+            this.setCompilationError(undefined);
+        }
     }
     setCompilationError(compilationError) {
         // account for the lambda prefix offset in source information

package/lib/stores/shared/LambdaEditorState.js.map

@@ -1 +1 @@
-{"version":3,"file":"LambdaEditorState.js","sourceRoot":"","sources":["../../../src/stores/shared/LambdaEditorState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LambdaEditorState.js","sourceRoot":"","sources":["../../../src/stores/shared/LambdaEditorState.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -42,15 +42,15 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "15.0.27",
-    "@finos/legend-art": "7.0.27",
-    "@finos/legend-graph": "30.0.12",
-    "@finos/legend-lego": "1.1.4",
-    "@finos/legend-server-depot": "6.0.16",
-    "@finos/legend-shared": "10.0.15",
-    "@finos/legend-storage": "3.0.65",
+    "@finos/legend-application": "15.0.29",
+    "@finos/legend-art": "7.0.29",
+    "@finos/legend-graph": "30.0.14",
+    "@finos/legend-lego": "1.1.6",
+    "@finos/legend-server-depot": "6.0.18",
+    "@finos/legend-shared": "10.0.17",
+    "@finos/legend-storage": "3.0.67",
     "@testing-library/react": "14.0.0",
-    "@types/react": "18.2.13",
+    "@types/react": "18.2.14",
     "@types/react-dom": "18.2.6",
     "chart.js": "4.3.0",
     "mathjs": "11.8.2",
@@ -65,15 +65,15 @@
     "sql-formatter": "12.2.3"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.70",
-    "@jest/globals": "29.5.0",
+    "@finos/legend-dev-utils": "2.0.72",
+    "@jest/globals": "29.6.1",
     "cross-env": "7.0.3",
-    "eslint": "8.43.0",
-    "jest": "29.5.0",
+    "eslint": "8.44.0",
+    "jest": "29.6.1",
     "npm-run-all": "4.1.5",
     "rimraf": "5.0.1",
     "sass": "1.63.6",
-    "typescript": "5.1.3"
+    "typescript": "5.1.6"
   },
   "peerDependencies": {
     "react": "^18.0.0"

package/src/components/QueryBuilderTextEditor.tsx

@@ -54,7 +54,9 @@ export const QueryBuilderTextEditor = observer(
     const mode = queryTextEditorState.mode;
     useEffect(() => {
       flowResult(
-        queryTextEditorState.convertLambdaObjectToGrammarString(true),
+        queryTextEditorState.convertLambdaObjectToGrammarString({
+          pretty: true,
+        }),
       ).catch(applicationStore.alertUnhandledError);
     }, [applicationStore, queryTextEditorState]);
 

package/src/components/QueryBuilder_LegendApplicationPlugin.ts

@@ -23,7 +23,7 @@ import {
   type LegendApplicationPluginManager,
   type LegendApplicationSetup,
 } from '@finos/legend-application';
-import packageJson from '../../package.json';
+import packageJson from '../../package.json' assert { type: 'json' };
 import { QUERY_BUILDER_SETTING_CONFIG } from '../__lib__/QueryBuilderSetting.js';
 import { QUERY_BUILDER_COMMAND_CONFIG } from '../stores/QueryBuilderCommand.js';
 import type { QueryBuilderState } from '../stores/QueryBuilderState.js';

package/src/components/execution-plan/FunctionParametersValidationNodeViewer.tsx

@@ -90,9 +90,8 @@ export const FunctionParametersValidationNodeViewer: React.FC<{
                   <tr>
                     <td className="table__cell--left">{parameter.name}</td>
                     <td className="table__cell--left">
-                      {`${
-                        parameter.genericType?.value.rawType.name
-                      } ${showMultiplicity(parameter.multiplicity)}`}
+                      {`${parameter.genericType?.value.rawType
+                        .name} ${showMultiplicity(parameter.multiplicity)}`}
                     </td>
                   </tr>
                 </React.Fragment>

package/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx

@@ -166,12 +166,16 @@ const QueryBuilderPostFilterGroupConditionEditor = observer(
           : QUERY_BUILDER_GROUP_OPERATION.AND,
       );
     };
+
+    const operationName =
+      node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.AND ? 'AND' : 'OR';
+
     return (
       <div className="query-builder-post-filter-tree__node__label__content dnd__entry__container">
         <PanelEntryDropZonePlaceholder
           isDragOver={isDragOver}
           isDroppable={isDroppable}
-          label="Add to Logical Group"
+          label={`Add to Logical Group '${operationName}'`}
         >
           <div
             className={clsx('query-builder-post-filter-tree__group-node', {

package/src/components/fetch-structure/QueryBuilderTDSPanel.tsx

@@ -324,12 +324,25 @@ const buildCalendarTypeOption = (
 });
 
 const QueryBuilderProjectionColumnEditor = observer(
-  (props: { projectionColumnState: QueryBuilderProjectionColumnState }) => {
-    const { projectionColumnState } = props;
-    const columnIdx = projectionColumnState.tdsState.tdsColumns.indexOf(
+  (props: {
+    projectionColumnState: QueryBuilderProjectionColumnState;
+    isRearrangeActive: boolean;
+    currentRearrangeDraggedColumnIndex: number | undefined;
+    setCurrentRearrangeDraggedColumnIndex: (val: number | undefined) => void;
+    currentRearrangeDropGapIndex: number | undefined;
+    setCurrentRearrangeDropGapIndex: (val: number | undefined) => void;
+    columnIdx: number;
+  }) => {
+    const {
+      isRearrangeActive,
       projectionColumnState,
-    );
-    const handleRef = useRef<HTMLDivElement>(null);
+      columnIdx,
+      currentRearrangeDraggedColumnIndex,
+      setCurrentRearrangeDraggedColumnIndex,
+      currentRearrangeDropGapIndex,
+      setCurrentRearrangeDropGapIndex,
+    } = props;
+    const dragHandleRef = useRef<HTMLDivElement>(null);
     const applicationStore = useApplicationStore();
     const ref = useRef<HTMLDivElement>(null);
     const [isSelectedFromContextMenu, setIsSelectedFromContextMenu] =
@@ -405,6 +418,7 @@ const QueryBuilderProjectionColumnEditor = observer(
         aggregateColumnState?.calendarFunction?.setCalendarType(option.value);
       }
     };
+
     const defaultEndDate = observe_PrimitiveInstanceValue(
       new PrimitiveInstanceValue(
         GenericTypeExplicitReference.create(
@@ -484,17 +498,26 @@ const QueryBuilderProjectionColumnEditor = observer(
       (type: string): void => {
         if (
           type === QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE &&
-          tdsState.draggedColumnIndex !== undefined &&
-          tdsState.hoveredColumnIndex !== undefined
+          currentRearrangeDropGapIndex !== undefined &&
+          currentRearrangeDraggedColumnIndex !== undefined
         ) {
           tdsState.moveColumn(
-            tdsState.draggedColumnIndex,
-            tdsState.hoveredColumnIndex,
+            currentRearrangeDraggedColumnIndex,
+            currentRearrangeDropGapIndex === tdsState.projectionColumns.length
+              ? tdsState.projectionColumns.length - 1
+              : currentRearrangeDropGapIndex,
           );
         }
-        tdsState.setRearrangeColumnsIndex(undefined, undefined);
+        setCurrentRearrangeDraggedColumnIndex(undefined);
+        setCurrentRearrangeDropGapIndex(undefined);
       },
-      [tdsState],
+      [
+        tdsState,
+        currentRearrangeDropGapIndex,
+        currentRearrangeDraggedColumnIndex,
+        setCurrentRearrangeDraggedColumnIndex,
+        setCurrentRearrangeDropGapIndex,
+      ],
     );
 
     // Drag and Drop
@@ -506,36 +529,47 @@ const QueryBuilderProjectionColumnEditor = observer(
         const dragIndex = tdsState.projectionColumns.findIndex(
           (e) => e === item.columnState,
         );
-        const hoverIndex = tdsState.projectionColumns.findIndex(
-          (e) => e === projectionColumnState,
-        );
+        const hoveredRectangle = ref.current?.getBoundingClientRect();
+        const hoveredRectangleMiddle =
+          hoveredRectangle?.top && hoveredRectangle.bottom
+            ? (hoveredRectangle.top + hoveredRectangle.bottom) / 2
+            : undefined;
+        const yCoordinate = monitor.getClientOffset()?.y ?? 0;
 
-        if (dragIndex === hoverIndex) {
-          tdsState.setRearrangeColumnsIndex(undefined, hoverIndex);
+        if (yCoordinate && hoveredRectangleMiddle) {
+          setCurrentRearrangeDropGapIndex(
+            yCoordinate < hoveredRectangleMiddle ? columnIdx : columnIdx + 1,
+          );
         }
 
-        if (dragIndex === -1 || hoverIndex === -1 || dragIndex === hoverIndex) {
-          return;
-        }
         // move the item being hovered on when the dragged item position is beyond the its middle point
         const hoverBoundingReact = ref.current?.getBoundingClientRect();
-
         const distanceThreshold =
           ((hoverBoundingReact?.bottom ?? 0) - (hoverBoundingReact?.top ?? 0)) /
           2;
-        const dragDistance =
-          (monitor.getClientOffset()?.y ?? 0) - (hoverBoundingReact?.top ?? 0);
-        if (dragIndex < hoverIndex && dragDistance < distanceThreshold) {
+        const dragDistance = yCoordinate - (hoverBoundingReact?.top ?? 0);
+
+        if (dragIndex === -1 || columnIdx === -1 || dragIndex === columnIdx) {
+          return;
+        }
+
+        if (dragIndex < columnIdx && dragDistance < distanceThreshold) {
           return;
         }
-        if (dragIndex > hoverIndex && dragDistance > distanceThreshold) {
+        if (dragIndex > columnIdx && dragDistance > distanceThreshold) {
           return;
         }
 
-        tdsState.setRearrangeColumnsIndex(dragIndex, hoverIndex);
+        setCurrentRearrangeDraggedColumnIndex(dragIndex);
       },
-      [projectionColumnState, tdsState],
+      [
+        tdsState,
+        columnIdx,
+        setCurrentRearrangeDropGapIndex,
+        setCurrentRearrangeDraggedColumnIndex,
+      ],
     );
+
     const [, dropConnector] = useDrop<QueryBuilderProjectionColumnDragSource>(
       () => ({
         accept: [QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE],
@@ -580,11 +614,7 @@ const QueryBuilderProjectionColumnEditor = observer(
       [projectionColumnState],
     );
 
-    const isBeingDragged =
-      columnIdx === tdsState.hoveredColumnIndex &&
-      projectionColumnBeingDragged !== undefined;
-
-    dragConnector(handleRef);
+    dragConnector(dragHandleRef);
     dropConnector(ref);
 
     useDragPreviewLayer(dragPreviewConnector);
@@ -647,22 +677,24 @@ const QueryBuilderProjectionColumnEditor = observer(
     return (
       <PanelDnDEntry
         ref={ref}
-        // TODO: this is the more appropriate solution than what we did
-        // before and in other places for rearrange because it does no
-        // rearrange while on hovering, but on drop, there's some work to
-        // do about the drop location indicator though
-        // See https://github.com/finos/legend-studio/pull/2330
         placeholder={
           <div
-            className={
-              (tdsState.hoveredColumnIndex ?? 0) >
-              (tdsState.draggedColumnIndex ?? 0)
-                ? 'query-builder__projection__column__placeholder--bottom'
-                : 'query-builder__projection__column__placeholder--top'
-            }
+            className={clsx(
+              {
+                'query-builder__projection__column__placeholder--bottom':
+                  currentRearrangeDropGapIndex === columnIdx + 1 &&
+                  columnIdx === tdsState.projectionColumns.length - 1,
+              },
+              {
+                'query-builder__projection__column__placeholder--top':
+                  currentRearrangeDropGapIndex === columnIdx,
+              },
+            )}
           />
         }
-        showPlaceholder={isBeingDragged}
+        showPlaceholder={
+          projectionColumnBeingDragged !== undefined && isRearrangeActive
+        }
         className="query-builder__projection__column"
       >
         <ContextMenu
@@ -687,8 +719,8 @@ const QueryBuilderProjectionColumnEditor = observer(
         >
           <div className="query-builder__projection__column__container">
             <PanelEntryDragHandle
-              isDragging={isBeingDragged}
-              dragSourceConnector={handleRef}
+              isDragging={false}
+              dragSourceConnector={dragHandleRef}
               className="query-builder__projection__column__drag-handle__container"
             />
             <div className="query-builder__projection__column__name">
@@ -904,6 +936,12 @@ export const QueryBuilderTDSPanel = observer(
     const applicationStore = useApplicationStore();
     const { tdsState } = props;
     const projectionColumns = tdsState.projectionColumns;
+    const [
+      currentRearrangeDraggedColumnIndex,
+      setCurrentRearrangeDraggedColumnIndex,
+    ] = useState<number | undefined>();
+    const [currentRearrangeDropGapIndex, setCurrentRearrangeDropGapIndex] =
+      useState<number | undefined>();
 
     // Toolbar
     const openResultSetModifierEditor = (): void =>
@@ -986,15 +1024,15 @@ export const QueryBuilderTDSPanel = observer(
       [handleDrop],
     );
 
-    const [, projectionColumnDropConnector] = useDrop<
+    const [{ isRearrangeActive }, rearrangeColumnDropConnector] = useDrop<
       QueryBuilderProjectionColumnDragSource,
       void,
-      { isOverProjectionColumns: boolean }
+      { isRearrangeActive: boolean }
     >(
       () => ({
         accept: [QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE],
         collect: (monitor) => ({
-          isOverProjectionColumns: monitor.isOver({ shallow: false }),
+          isRearrangeActive: monitor.isOver({ shallow: false }),
         }),
       }),
       [],
@@ -1065,24 +1103,39 @@ export const QueryBuilderTDSPanel = observer(
               <div
                 data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_TDS}
                 className="query-builder__projection__columns"
-                ref={projectionColumnDropConnector}
               >
-                <DragPreviewLayer
-                  labelGetter={(
-                    item: QueryBuilderProjectionColumnDragSource,
-                  ): string =>
-                    item.columnState.columnName === ''
-                      ? '(unknown)'
-                      : item.columnState.columnName
-                  }
-                  types={[QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE]}
-                />
-                {projectionColumns.map((projectionColumnState) => (
-                  <QueryBuilderProjectionColumnEditor
-                    key={projectionColumnState.uuid}
-                    projectionColumnState={projectionColumnState}
+                <div ref={rearrangeColumnDropConnector}>
+                  <DragPreviewLayer
+                    labelGetter={(
+                      item: QueryBuilderProjectionColumnDragSource,
+                    ): string =>
+                      item.columnState.columnName === ''
+                        ? '(unknown)'
+                        : item.columnState.columnName
+                    }
+                    types={[QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE]}
                   />
-                ))}
+                  {projectionColumns.map((projectionColumnState, columnIdx) => (
+                    <QueryBuilderProjectionColumnEditor
+                      key={projectionColumnState.uuid}
+                      projectionColumnState={projectionColumnState}
+                      isRearrangeActive={isRearrangeActive}
+                      currentRearrangeDraggedColumnIndex={
+                        currentRearrangeDraggedColumnIndex
+                      }
+                      currentRearrangeDropGapIndex={
+                        currentRearrangeDropGapIndex
+                      }
+                      setCurrentRearrangeDraggedColumnIndex={
+                        setCurrentRearrangeDraggedColumnIndex
+                      }
+                      setCurrentRearrangeDropGapIndex={
+                        setCurrentRearrangeDropGapIndex
+                      }
+                      columnIdx={columnIdx}
+                    />
+                  ))}
+                </div>
               </div>
             )}
             <QueryResultModifierModal tdsState={tdsState} />

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -118,12 +118,16 @@ const QueryBuilderFilterGroupConditionEditor = observer(
           : QUERY_BUILDER_GROUP_OPERATION.AND,
       );
     };
+
+    const operationName =
+      node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.AND ? 'AND' : 'OR';
+
     return (
       <div className="query-builder-filter-tree__node__label__content dnd__entry__container">
         <PanelEntryDropZonePlaceholder
           isDragOver={isDragOver}
           isDroppable={isDroppable}
-          label="Add to Logical Group"
+          label={`Add to Logical Group '${operationName}'`}
         >
           <div
             className={clsx('query-builder-filter-tree__group-node', {

package/src/components/shared/CustomDatePicker.tsx

@@ -687,10 +687,9 @@ export const buildDatePickerOption = (
         );
       case QUERY_BUILDER_SUPPORTED_FUNCTIONS.PREVIOUS_DAY_OF_WEEK:
         return new CustomPreviousDayOfWeekOption(
-          `Previous ${
-            (valueSpecification.parametersValues[0] as EnumValueInstanceValue)
-              .values[0]?.value.name
-          }`,
+          `Previous ${(
+            valueSpecification.parametersValues[0] as EnumValueInstanceValue
+          ).values[0]?.value.name}`,
           (valueSpecification.parametersValues[0] as EnumValueInstanceValue)
             .values[0]?.value.name as CUSTOM_DATE_DAY_OF_WEEK,
         );

package/src/components/shared/LambdaEditor.tsx

@@ -140,7 +140,9 @@ const LambdaEditor_Inner = observer(
     const transformLambdaToString = async (pretty: boolean): Promise<void> => {
       transformStringToLambda?.cancel();
       return flowResult(
-        lambdaEditorState.convertLambdaObjectToGrammarString(pretty),
+        lambdaEditorState.convertLambdaObjectToGrammarString({
+          pretty: pretty,
+        }),
       ).catch(applicationStore.alertUnhandledError);
     };
     const discardChanges = applicationStore.guardUnhandledError(() =>
@@ -447,7 +449,9 @@ const LambdaEditor_PopUp = observer(
     const transformLambdaToString = async (pretty: boolean): Promise<void> => {
       transformStringToLambda?.cancel();
       return flowResult(
-        lambdaEditorState.convertLambdaObjectToGrammarString(pretty),
+        lambdaEditorState.convertLambdaObjectToGrammarString({
+          pretty: pretty,
+        }),
       ).catch(applicationStore.alertUnhandledError);
     };
     const discardChanges = applicationStore.guardUnhandledError(() =>
@@ -554,7 +558,10 @@ const LambdaEditor_PopUp = observer(
 
     useEffect(() => {
       flowResult(
-        lambdaEditorState.convertLambdaObjectToGrammarString(true),
+        lambdaEditorState.convertLambdaObjectToGrammarString({
+          pretty: true,
+          preserveCompilationError: true,
+        }),
       ).catch(applicationStore.alertUnhandledError);
     }, [applicationStore, lambdaEditorState]);
 

package/src/graph-manager/QueryBuilder_GraphManagerPreset.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import packageJson from '../../package.json';
+import packageJson from '../../package.json' assert { type: 'json' };
 import { AbstractPreset } from '@finos/legend-shared';
 import { QueryBuilder_PureProtocolProcessorPlugin } from './protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.js';
 import { QueryBuilder_PureGraphManagerPlugin } from './QueryBuilder_PureGraphManagerPlugin.js';

package/src/graph-manager/QueryBuilder_PureGraphManagerPlugin.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import packageJson from '../../package.json';
+import packageJson from '../../package.json' assert { type: 'json' };
 import {
   PureGraphManagerPlugin,
   type PureGraphManagerExtensionBuilder,

package/src/graph-manager/protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import packageJson from '../../../../package.json';
+import packageJson from '../../../../package.json' assert { type: 'json' };
 import {
   V1_buildExistsFunctionExpression,
   V1_buildFilterFunctionExpression,

package/src/stores/QueryBuilderTextEditorState.ts

@@ -129,7 +129,9 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
     }
   }
 
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options: {
+    pretty?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (this.rawLambdaState.lambda.body) {
       this.isConvertingLambdaToString = true;
       try {
@@ -144,7 +146,7 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
         const isolatedLambdas =
           (yield this.queryBuilderState.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(