tm1npm 1.6.0 → 2.1.0

package/lib/objects/Process.js

@@ -56,11 +56,17 @@ class Process extends TM1Object_1.TM1Object {
         this._uiData = uiData;
         this._parameters = parameters ? Array.from(parameters) : [];
         this._variables = variables ? Array.from(variables) : [];
-        this._variablesUiData = variablesUiData ? Array.from(variablesUiData) : [];
-        this._prologProcedure = prologProcedure;
-        this._metadataProcedure = metadataProcedure;
-        this._dataProcedure = dataProcedure;
-        this._epilogProcedure = epilogProcedure;
+        if (variablesUiData) {
+            // Handle encoding issue in variable_ui_data for async requests
+            this._variablesUiData = Array.from(variablesUiData).map((entry) => typeof entry === 'string' ? entry.replace(/€/g, '\f') : entry);
+        }
+        else {
+            this._variablesUiData = [];
+        }
+        this._prologProcedure = Process.addGeneratedStringToCode(prologProcedure);
+        this._metadataProcedure = Process.addGeneratedStringToCode(metadataProcedure);
+        this._dataProcedure = Process.addGeneratedStringToCode(dataProcedure);
+        this._epilogProcedure = Process.addGeneratedStringToCode(epilogProcedure);
         this._datasourceType = datasourceType;
         this._datasourceAsciiDecimalSeparator = datasourceAsciiDecimalSeparator;
         this._datasourceAsciiDelimiterChar = datasourceAsciiDelimiterChar;
@@ -146,13 +152,76 @@ class Process extends TM1Object_1.TM1Object {
         this._datasourceType = value;
     }
     static fromDict(processAsDict) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         /** Alternative constructor
          *
          * :param process_as_dict: process as dict
          * :return: process, an instance of this class
          */
-        return new Process(processAsDict.Name, processAsDict.HasSecurityAccess || false, processAsDict.UIData || "CubeAction=1511\fDataAction=1503\fCubeLogChanges=0\f", processAsDict.Parameters || [], processAsDict.Variables || [], processAsDict.VariablesUIData || [], processAsDict.PrologProcedure || '', processAsDict.MetadataProcedure || '', processAsDict.DataProcedure || '', processAsDict.EpilogProcedure || '', ((_a = processAsDict.DataSource) === null || _a === void 0 ? void 0 : _a.Type) || 'None', ((_b = processAsDict.DataSource) === null || _b === void 0 ? void 0 : _b.AsciiDecimalSeparator) || '.', ((_c = processAsDict.DataSource) === null || _c === void 0 ? void 0 : _c.AsciiDelimiterChar) || ';', ((_d = processAsDict.DataSource) === null || _d === void 0 ? void 0 : _d.AsciiDelimiterType) || 'Character', ((_e = processAsDict.DataSource) === null || _e === void 0 ? void 0 : _e.AsciiHeaderRecords) || 1, ((_f = processAsDict.DataSource) === null || _f === void 0 ? void 0 : _f.AsciiQuoteCharacter) || '', ((_g = processAsDict.DataSource) === null || _g === void 0 ? void 0 : _g.AsciiThousandSeparator) || ',', ((_h = processAsDict.DataSource) === null || _h === void 0 ? void 0 : _h.DataSourceNameForClient) || '', ((_j = processAsDict.DataSource) === null || _j === void 0 ? void 0 : _j.DataSourceNameForServer) || '', ((_k = processAsDict.DataSource) === null || _k === void 0 ? void 0 : _k.Password) || '', ((_l = processAsDict.DataSource) === null || _l === void 0 ? void 0 : _l.UserName) || '', ((_m = processAsDict.DataSource) === null || _m === void 0 ? void 0 : _m.Query) || '', ((_o = processAsDict.DataSource) === null || _o === void 0 ? void 0 : _o.UsesUnicode) !== false, ((_p = processAsDict.DataSource) === null || _p === void 0 ? void 0 : _p.View) || '', ((_q = processAsDict.DataSource) === null || _q === void 0 ? void 0 : _q.Subset) || '', ((_r = processAsDict.DataSource) === null || _r === void 0 ? void 0 : _r.JsonRootPointer) || '', ((_s = processAsDict.DataSource) === null || _s === void 0 ? void 0 : _s.JsonVariableMapping) || '');
+        const ds = (_a = processAsDict['DataSource']) !== null && _a !== void 0 ? _a : {};
+        return new Process(processAsDict['Name'], processAsDict['HasSecurityAccess'], (_b = processAsDict['UIData']) !== null && _b !== void 0 ? _b : '', processAsDict['Parameters'], processAsDict['Variables'], (_c = processAsDict['VariablesUIData']) !== null && _c !== void 0 ? _c : '', processAsDict['PrologProcedure'], processAsDict['MetadataProcedure'], processAsDict['DataProcedure'], processAsDict['EpilogProcedure'], (_d = ds['Type']) !== null && _d !== void 0 ? _d : '', (_e = ds['asciiDecimalSeparator']) !== null && _e !== void 0 ? _e : '', (_f = ds['asciiDelimiterChar']) !== null && _f !== void 0 ? _f : '', (_g = ds['asciiDelimiterType']) !== null && _g !== void 0 ? _g : '', (_h = ds['asciiHeaderRecords']) !== null && _h !== void 0 ? _h : '', (_j = ds['asciiQuoteCharacter']) !== null && _j !== void 0 ? _j : '', (_k = ds['asciiThousandSeparator']) !== null && _k !== void 0 ? _k : '', (_l = ds['dataSourceNameForClient']) !== null && _l !== void 0 ? _l : '', (_m = ds['dataSourceNameForServer']) !== null && _m !== void 0 ? _m : '', (_o = ds['password']) !== null && _o !== void 0 ? _o : '', (_p = ds['userName']) !== null && _p !== void 0 ? _p : '', (_q = ds['query']) !== null && _q !== void 0 ? _q : '', (_r = ds['usesUnicode']) !== null && _r !== void 0 ? _r : '', (_s = ds['view']) !== null && _s !== void 0 ? _s : '', (_t = ds['subset']) !== null && _t !== void 0 ? _t : '', (_u = ds['jsonRootPointer']) !== null && _u !== void 0 ? _u : '', (_v = ds['jsonVariableMapping']) !== null && _v !== void 0 ? _v : '');
+    }
+    addVariable(name, variableType) {
+        // variable consists of actual variable and UI-Information ('ignore','other', etc.)
+        // 1. handle Variable info
+        const variable = {
+            Name: name,
+            Type: variableType,
+            Position: this._variables.length + 1,
+            StartByte: 0,
+            EndByte: 0,
+        };
+        this._variables.push(variable);
+        // 2. handle UI info
+        const varType = variableType === 'Numeric' ? 33 : 32;
+        // '\f' !
+        const variableUiData = 'VarType=' + varType + '\f' + 'ColType=' + 827 + '\f';
+        /*
+         * mapping VariableUIData:
+         *     VarType 33 -> Numeric
+         *     VarType 32 -> String
+         *     ColType 827 -> Other
+         */
+        this._variablesUiData.push(variableUiData);
+    }
+    removeVariable(name) {
+        for (const variable of this._variables.slice()) {
+            if (variable['Name'] === name) {
+                const vuid = this._variablesUiData[this._variables.indexOf(variable)];
+                const vuidIdx = this._variablesUiData.indexOf(vuid);
+                if (vuidIdx !== -1) {
+                    this._variablesUiData.splice(vuidIdx, 1);
+                }
+                const varIdx = this._variables.indexOf(variable);
+                if (varIdx !== -1) {
+                    this._variables.splice(varIdx, 1);
+                }
+            }
+        }
+    }
+    addParameter(name, prompt, value, parameterType) {
+        if (!parameterType) {
+            parameterType = typeof value === 'string' ? 'String' : 'Numeric';
+        }
+        const parameter = { Name: name, Prompt: prompt, Value: value, Type: parameterType };
+        this._parameters.push(parameter);
+    }
+    removeParameter(name) {
+        for (const parameter of this._parameters.slice()) {
+            if (parameter['Name'] === name) {
+                const idx = this._parameters.indexOf(parameter);
+                if (idx !== -1) {
+                    this._parameters.splice(idx, 1);
+                }
+            }
+        }
+    }
+    dropParameterTypes() {
+        for (let p = 0; p < this._parameters.length; p++) {
+            if ('Type' in this._parameters[p]) {
+                delete this._parameters[p]['Type'];
+            }
+        }
     }
     get body() {
         return JSON.stringify(this.constructBody());
@@ -161,39 +230,80 @@ class Process extends TM1Object_1.TM1Object {
         return this.constructBody();
     }
     constructBody() {
-        const body = {
+        // general parameters — key order matches tm1py _construct_body_as_dict
+        const bodyAsDict = {
             Name: this._name,
+            PrologProcedure: this._prologProcedure,
+            MetadataProcedure: this._metadataProcedure,
+            DataProcedure: this._dataProcedure,
+            EpilogProcedure: this._epilogProcedure,
             HasSecurityAccess: this._hasSecurityAccess,
             UIData: this._uiData,
+            DataSource: {},
             Parameters: this._parameters,
             Variables: this._variables,
             VariablesUIData: this._variablesUiData,
-            PrologProcedure: this._prologProcedure,
-            MetadataProcedure: this._metadataProcedure,
-            DataProcedure: this._dataProcedure,
-            EpilogProcedure: this._epilogProcedure
-        };
-        // Add DataSource information
-        body.DataSource = {
-            Type: this._datasourceType,
-            AsciiDecimalSeparator: this._datasourceAsciiDecimalSeparator,
-            AsciiDelimiterChar: this._datasourceAsciiDelimiterChar,
-            AsciiDelimiterType: this._datasourceAsciiDelimiterType,
-            AsciiHeaderRecords: this._datasourceAsciiHeaderRecords,
-            AsciiQuoteCharacter: this._datasourceAsciiQuoteCharacter,
-            AsciiThousandSeparator: this._datasourceAsciiThousandSeparator,
-            DataSourceNameForClient: this._datasourceDataSourceNameForClient,
-            DataSourceNameForServer: this._datasourceDataSourceNameForServer,
-            Password: this._datasourcePassword,
-            UserName: this._datasourceUserName,
-            Query: this._datasourceQuery,
-            UsesUnicode: this._datasourceUsesUnicode,
-            View: this._datasourceView,
-            Subset: this._datasourceSubset,
-            JsonRootPointer: this._datasourceJsonRootPointer,
-            JsonVariableMapping: this._datasourceJsonVariableMapping
         };
-        return body;
+        // specific parameters (depending on datasource type)
+        if (this._datasourceType === 'ASCII') {
+            bodyAsDict['DataSource'] = {
+                Type: this._datasourceType,
+                asciiDecimalSeparator: this._datasourceAsciiDecimalSeparator,
+                asciiDelimiterChar: this._datasourceAsciiDelimiterChar,
+                asciiDelimiterType: this._datasourceAsciiDelimiterType,
+                asciiHeaderRecords: this._datasourceAsciiHeaderRecords,
+                asciiQuoteCharacter: this._datasourceAsciiQuoteCharacter,
+                asciiThousandSeparator: this._datasourceAsciiThousandSeparator,
+                dataSourceNameForClient: this._datasourceDataSourceNameForClient,
+                dataSourceNameForServer: this._datasourceDataSourceNameForServer,
+            };
+            if (this._datasourceAsciiDelimiterType === 'FixedWidth') {
+                delete bodyAsDict['DataSource']['asciiDelimiterChar'];
+            }
+        }
+        else if (this._datasourceType === 'None') {
+            bodyAsDict['DataSource'] = { Type: 'None' };
+        }
+        else if (this._datasourceType === 'ODBC') {
+            bodyAsDict['DataSource'] = {
+                Type: this._datasourceType,
+                dataSourceNameForClient: this._datasourceDataSourceNameForClient,
+                dataSourceNameForServer: this._datasourceDataSourceNameForServer,
+                userName: this._datasourceUserName,
+                password: this._datasourcePassword,
+                query: this._datasourceQuery,
+                usesUnicode: this._datasourceUsesUnicode,
+            };
+        }
+        else if (this._datasourceType === 'TM1CubeView') {
+            bodyAsDict['DataSource'] = {
+                Type: this._datasourceType,
+                // Note: tm1py uses _datasource_data_source_name_for_server for BOTH client and server
+                dataSourceNameForClient: this._datasourceDataSourceNameForServer,
+                dataSourceNameForServer: this._datasourceDataSourceNameForServer,
+                view: this._datasourceView,
+            };
+        }
+        else if (this._datasourceType === 'TM1DimensionSubset') {
+            bodyAsDict['DataSource'] = {
+                Type: this._datasourceType,
+                // Note: tm1py uses _datasource_data_source_name_for_server for BOTH client and server
+                dataSourceNameForClient: this._datasourceDataSourceNameForServer,
+                dataSourceNameForServer: this._datasourceDataSourceNameForServer,
+                subset: this._datasourceSubset,
+            };
+        }
+        else if (this._datasourceType === 'JSON') {
+            bodyAsDict['DataSource'] = {
+                Type: this._datasourceType,
+                // Note: tm1py uses _datasource_data_source_name_for_server for BOTH client and server
+                dataSourceNameForClient: this._datasourceDataSourceNameForServer,
+                dataSourceNameForServer: this._datasourceDataSourceNameForServer,
+                jsonRootPointer: this._datasourceJsonRootPointer,
+                jsonVariableMapping: this._datasourceJsonVariableMapping,
+            };
+        }
+        return bodyAsDict;
     }
 }
 exports.Process = Process;

package/lib/objects/Subset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Subset.d.ts","sourceRoot":"","sources":["../../src/objects/Subset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,qBAAa,MAAO,SAAQ,SAAS;IACjC;OACG;IAEH,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAW;gBAGxB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,EAAE;IAmBvB,IAAW,aAAa,IAAI,MAAM,CAEjC;IAED,IAAW,aAAa,CAAC,KAAK,EAAE,MAAM,EAErC;IAED,IAAW,aAAa,IAAI,MAAM,CAEjC;IAED,IAAW,aAAa,CAAC,KAAK,EAAE,MAAM,EAErC;IAED,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,IAAW,IAAI,CAAC,KAAK,EAAE,MAAM,EAE5B;IAED,IAAW,KAAK,IAAI,MAAM,GAAG,SAAS,CAErC;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEzC;IAED,IAAW,UAAU,IAAI,MAAM,GAAG,SAAS,CAE1C;IAED,IAAW,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE9C;IAED,IAAW,QAAQ,IAAI,MAAM,EAAE,CAE9B;IAED,IAAW,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,EAElC;IAED,IAAW,IAAI,IAAI,MAAM,CAKxB;IAED,IAAW,SAAS,IAAI,OAAO,CAE9B;IAED,IAAW,QAAQ,IAAI,OAAO,CAE7B;WAEa,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;WAatC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAajE,IAAW,IAAI,IAAI,MAAM,CAIxB;IAED,IAAW,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQ3C;IAEM,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAQ5C,SAAS,CAAC,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAerD,SAAS,CAAC,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAuBvD;AAGD,qBAAa,eAAgB,SAAQ,MAAM;IACvC;OACG;gBAGC,aAAa,EAAE,MAAM,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EACnB,KAAK,GAAE,MAAW;WAYR,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe;WAa/C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,eAAe;IA2D1E,SAAS,CAAC,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAcrD,SAAS,CAAC,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAsBvD"}
+{"version":3,"file":"Subset.d.ts","sourceRoot":"","sources":["../../src/objects/Subset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,qBAAa,MAAO,SAAQ,SAAS;IACjC;OACG;IAEH,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAW;gBAGxB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,EAAE;IAmBvB,IAAW,aAAa,IAAI,MAAM,CAEjC;IAED,IAAW,aAAa,CAAC,KAAK,EAAE,MAAM,EAErC;IAED,IAAW,aAAa,IAAI,MAAM,CAEjC;IAED,IAAW,aAAa,CAAC,KAAK,EAAE,MAAM,EAErC;IAED,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,IAAW,IAAI,CAAC,KAAK,EAAE,MAAM,EAE5B;IAED,IAAW,KAAK,IAAI,MAAM,GAAG,SAAS,CAErC;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEzC;IAED,IAAW,UAAU,IAAI,MAAM,GAAG,SAAS,CAE1C;IAED,IAAW,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE9C;IAED,IAAW,QAAQ,IAAI,MAAM,EAAE,CAE9B;IAED,IAAW,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,EAElC;IAED,IAAW,IAAI,IAAI,MAAM,CAKxB;IAED,IAAW,SAAS,IAAI,OAAO,CAE9B;IAED,IAAW,QAAQ,IAAI,OAAO,CAE7B;WAEa,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;WAatC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAajE,IAAW,IAAI,IAAI,MAAM,CAIxB;IAED,IAAW,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQ3C;IAEM,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAQ5C,SAAS,CAAC,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAerD,SAAS,CAAC,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAuBvD;AAGD,qBAAa,eAAgB,SAAQ,MAAM;IACvC;OACG;gBAGC,aAAa,EAAE,MAAM,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EACnB,KAAK,GAAE,MAAW;WAYR,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe;WAa/C,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,eAAe;IAyE1E,SAAS,CAAC,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAcrD,SAAS,CAAC,mBAAmB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAsBvD"}

package/lib/objects/Subset.js

@@ -166,11 +166,18 @@ class AnonymousSubset extends Subset {
         }
         else if ("Hierarchy@odata.bind" in subsetAsDict) {
             const hierarchyOdata = subsetAsDict["Hierarchy@odata.bind"];
-            dimensionName = (0, Utils_1.readObjectNameFromUrl)(hierarchyOdata);
-            hierarchyName = (0, Utils_1.readObjectNameFromUrl)(hierarchyOdata);
-            if (!dimensionName || !hierarchyName) {
+            // tm1py parity (TM1py/Objects/Subset.py): two read_object_name_from_url
+            // calls with these exact regex patterns. Both return match.group(1) (the
+            // first capture group), so both names resolve to the dimension. This
+            // mirrors tm1py's behavior — including the latent bug where a non-default
+            // hierarchy name in the URL is dropped. Do NOT "fix" without tm1py.
+            const dimResult = (0, Utils_1.readObjectNameFromUrl)(hierarchyOdata, /^Dimensions\('(.*?)'\)\/Hierarchies\('(.+?)'\)/);
+            const hierResult = (0, Utils_1.readObjectNameFromUrl)(hierarchyOdata, /^Dimensions\('(.+?)'\)\/Hierarchies\('(.*?)'\)/);
+            if (!dimResult || !hierResult) {
                 throw new Error(`Unexpected value for 'Hierarchy@odata.bind' property in subset dict: '${hierarchyOdata}'`);
             }
+            dimensionName = dimResult;
+            hierarchyName = hierResult;
         }
         else {
             throw new Error("Subset dict must contain 'Hierarchy' or 'Hierarchy@odata.bind' as key");

package/lib/objects/User.d.ts

@@ -1,10 +1,10 @@
 import { TM1Object } from './TM1Object';
 export declare enum UserType {
-    User = 0,
-    SecurityAdmin = 1,
-    DataAdmin = 2,
-    Admin = 3,
-    OperationsAdmin = 4
+    User = "User",
+    SecurityAdmin = "SecurityAdmin",
+    DataAdmin = "DataAdmin",
+    Admin = "Admin",
+    OperationsAdmin = "OperationsAdmin"
 }
 export declare class User extends TM1Object {
     /** Abstraction of a TM1 User

package/lib/objects/User.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../src/objects/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,oBAAY,QAAQ;IAChB,IAAI,IAAI;IACR,aAAa,IAAI;IACjB,SAAS,IAAI;IACb,KAAK,IAAI;IACT,eAAe,IAAI;CACtB;AAED,qBAAa,IAAK,SAAQ,SAAS;IAC/B;;OAEG;IAEH,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,SAAS,CAA2B;gBAGxC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EACxB,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,OAAO;IA8BrB,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,IAAW,IAAI,CAAC,KAAK,EAAE,MAAM,EAE5B;IAED,IAAW,QAAQ,IAAI,QAAQ,CAE9B;IAED,IAAW,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,EAqB3C;IAED,IAAW,YAAY,IAAI,MAAM,GAAG,SAAS,CAE5C;IAED,IAAW,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEhD;IAED,IAAW,QAAQ,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAW,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE5C;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,WAAW,IAAI,OAAO,CAEhC;IAED,IAAW,eAAe,IAAI,OAAO,CAEpC;IAED,IAAW,UAAU,IAAI,OAAO,CAE/B;IAED,IAAW,MAAM,IAAI,MAAM,EAAE,CAE5B;IAED,IAAW,OAAO,IAAI,OAAO,GAAG,SAAS,CAExC;IAED,IAAW,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,EAE5C;IAEM,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIjC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;WAI7B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;WAUlC,QAAQ,CAAC,UAAU,EAAE,GAAG,GAAG,IAAI;IAgB7C,IAAW,IAAI,IAAI,MAAM,CAExB;IAEM,aAAa,IAAI,MAAM;CAqBjC"}
+{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../src/objects/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,oBAAY,QAAQ;IAChB,IAAI,SAAS;IACb,aAAa,kBAAkB;IAC/B,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,eAAe,oBAAoB;CACtC;AAMD,qBAAa,IAAK,SAAQ,SAAS;IAC/B;;OAEG;IAEH,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,SAAS,CAA2B;gBAGxC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EACxB,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,OAAO;IA8BrB,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,IAAW,IAAI,CAAC,KAAK,EAAE,MAAM,EAE5B;IAED,IAAW,QAAQ,IAAI,QAAQ,CAE9B;IAED,IAAW,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,EAW3C;IAED,IAAW,YAAY,IAAI,MAAM,GAAG,SAAS,CAE5C;IAED,IAAW,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAEhD;IAED,IAAW,QAAQ,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAW,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAE5C;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,WAAW,IAAI,OAAO,CAEhC;IAED,IAAW,eAAe,IAAI,OAAO,CAEpC;IAED,IAAW,UAAU,IAAI,OAAO,CAE/B;IAED,IAAW,MAAM,IAAI,MAAM,EAAE,CAE5B;IAED,IAAW,OAAO,IAAI,OAAO,GAAG,SAAS,CAExC;IAED,IAAW,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,EAE5C;IAEM,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIjC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;WAI7B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;WAUlC,QAAQ,CAAC,UAAU,EAAE,GAAG,GAAG,IAAI;IAgB7C,IAAW,IAAI,IAAI,MAAM,CAExB;IAEM,aAAa,IAAI,MAAM;CAqBjC"}

package/lib/objects/User.js

@@ -5,12 +5,13 @@ const TM1Object_1 = require("./TM1Object");
 const Utils_1 = require("../utils/Utils");
 var UserType;
 (function (UserType) {
-    UserType[UserType["User"] = 0] = "User";
-    UserType[UserType["SecurityAdmin"] = 1] = "SecurityAdmin";
-    UserType[UserType["DataAdmin"] = 2] = "DataAdmin";
-    UserType[UserType["Admin"] = 3] = "Admin";
-    UserType[UserType["OperationsAdmin"] = 4] = "OperationsAdmin";
+    UserType["User"] = "User";
+    UserType["SecurityAdmin"] = "SecurityAdmin";
+    UserType["DataAdmin"] = "DataAdmin";
+    UserType["Admin"] = "Admin";
+    UserType["OperationsAdmin"] = "OperationsAdmin";
 })(UserType || (exports.UserType = UserType = {}));
+const USER_TYPE_LOOKUP = new Map(Object.entries(UserType).map(([k, v]) => [k.toLowerCase(), v]));
 class User extends TM1Object_1.TM1Object {
     constructor(name, groups, friendlyName, password, userType, enabled) {
         super();
@@ -55,25 +56,14 @@ class User extends TM1Object_1.TM1Object {
         return this._userType;
     }
     set userType(value) {
-        if (typeof value === 'string') {
-            // Parse string to UserType enum
-            const lowerValue = value.replace(/\s+/g, '').toLowerCase();
-            for (const [key, enumValue] of Object.entries(UserType)) {
-                if (key.toLowerCase() === lowerValue) {
-                    this._userType = enumValue;
-                    break;
-                }
-            }
-            if (this._userType === undefined) {
-                throw new Error(`Invalid element type=${value}`);
-            }
-        }
-        else {
-            this._userType = value;
+        const resolved = USER_TYPE_LOOKUP.get((0, Utils_1.lowerAndDropSpaces)(value));
+        if (resolved === undefined) {
+            throw new Error(`Invalid user type=${value}`);
         }
+        this._userType = resolved;
         // update groups as well, since TM1 doesn't react to change in user_type property
         if (this._userType !== UserType.User) {
-            this.addGroup(this._userType.toString());
+            this.addGroup(this._userType);
         }
     }
     get friendlyName() {
@@ -89,7 +79,7 @@ class User extends TM1Object_1.TM1Object {
         this._password = value;
     }
     get isAdmin() {
-        return this._groups.has("ADMIN");
+        return this._groups.has("Admin");
     }
     get isDataAdmin() {
         return this._groups.has("Admin") || this._groups.has("DataAdmin");
@@ -125,13 +115,14 @@ class User extends TM1Object_1.TM1Object {
         return User.fromDict(userAsDict);
     }
     static fromDict(userAsDict) {
+        var _a;
         /** Alternative constructor
          *
          * :param user_as_dict: user as dict
          * :return: user, an instance of this class
          */
         return new User(userAsDict.Name, userAsDict.Groups.map((group) => group.Name), userAsDict.FriendlyName, undefined, // password not included in dict
-        userAsDict.Type, userAsDict.Enabled);
+        (_a = userAsDict.Type) !== null && _a !== void 0 ? _a : undefined, userAsDict.Enabled);
     }
     get body() {
         return this.constructBody();

package/lib/services/ApplicationService.d.ts.map

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

package/lib/services/AsyncOperationService.d.ts

@@ -46,6 +46,12 @@ export interface AsyncOperation {
     result?: any;
     parameters?: Record<string, any>;
     metadata?: Record<string, any>;
+    /**
+     * When true, the operation is tracked with a client-side UUID and the
+     * TM1 server has no record of it. `getAsyncOperationStatus` returns the
+     * cached status instead of polling `/_async('{id}')`.
+     */
+    trackedLocally?: boolean;
 }
 /**
  * Interface for schedule configuration
@@ -87,6 +93,8 @@ export declare class AsyncOperationService {
      * @returns Promise resolving to the operation status
      */
     getAsyncOperationStatus(operationId: string): Promise<OperationStatus>;
+    private deriveStatusFromResponse;
+    private extractErrorFromResponse;
     /**
      * List all active async operations
      *
@@ -169,7 +177,6 @@ export declare class AsyncOperationService {
     getAllOperations(): AsyncOperation[];
     private generateOperationId;
     private isTerminalStatus;
-    private mapServerStatus;
     private stopPolling;
     private sleep;
     /**

package/lib/services/AsyncOperationService.d.ts.map

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

package/lib/services/AsyncOperationService.js

@@ -44,6 +44,7 @@ class AsyncOperationService {
      * @returns Promise resolving to the operation status
      */
     async getAsyncOperationStatus(operationId) {
+        var _a, _b, _c;
         const operation = this.operations.get(operationId);
         if (!operation) {
             throw new TM1Exception_1.TM1Exception(`Operation with ID ${operationId} not found`);
@@ -52,29 +53,79 @@ class AsyncOperationService {
         if (this.isTerminalStatus(operation.status)) {
             return operation.status;
         }
-        // Poll TM1 server for updated status
+        // Locally tracked operations hold a client-side UUID; the TM1 server
+        // would return 404 for them. Rely on the in-memory cache, which is
+        // populated by background .then()/.catch() callbacks in helpers like
+        // ProcessService.executeWithReturnAsync.
+        if (operation.trackedLocally) {
+            return operation.status;
+        }
+        // Poll TM1 server for updated status. /_async('{id}') returns 202 while
+        // the op is pending, and 200/201 with the final operation payload once done.
+        // TM1 v12 may encode embedded failures in the `asyncresult` response header.
         try {
-            const url = (0, Utils_1.formatUrl)("/AsyncOperations('{}')", operationId);
-            const response = await this.rest.get(url);
-            const serverStatus = this.mapServerStatus(response.data.Status);
-            // Update operation status
+            const url = (0, Utils_1.formatUrl)("/_async('{}')", operationId);
+            const response = await this.rest.get(url, { asyncRequestsMode: false });
+            const serverStatus = this.deriveStatusFromResponse(response);
             operation.status = serverStatus;
             if (this.isTerminalStatus(serverStatus)) {
                 operation.endTime = new Date();
-                if (serverStatus === OperationStatus.COMPLETED && response.data.Result) {
-                    operation.result = response.data.Result;
+                if (serverStatus === OperationStatus.COMPLETED) {
+                    operation.result = response.data;
                 }
-                else if (serverStatus === OperationStatus.FAILED && response.data.Error) {
-                    operation.error = response.data.Error;
+                else if (serverStatus === OperationStatus.FAILED) {
+                    operation.error = this.extractErrorFromResponse(response);
                 }
             }
             return serverStatus;
         }
         catch (error) {
-            // If server doesn't support AsyncOperations endpoint, return cached status
+            // HTTP 4xx/5xx surfaces as a thrown TM1RestException — treat as a terminal FAILED
+            // so callers stop polling. Network errors (no status) leave cached status intact.
+            // Note: 404 is treated as FAILED here (operation never materialized). This differs
+            // from ProcessService.pollExecuteWithReturn which treats 404 as "not ready yet"
+            // because process async IDs can take a moment to register on the server.
+            const status = (_a = error === null || error === void 0 ? void 0 : error.status) !== null && _a !== void 0 ? _a : (_b = error === null || error === void 0 ? void 0 : error.response) === null || _b === void 0 ? void 0 : _b.status;
+            if (typeof status === 'number' && status >= 400) {
+                operation.status = OperationStatus.FAILED;
+                operation.endTime = new Date();
+                operation.error = (_c = error === null || error === void 0 ? void 0 : error.message) !== null && _c !== void 0 ? _c : String(error);
+                return OperationStatus.FAILED;
+            }
             return operation.status;
         }
     }
+    deriveStatusFromResponse(response) {
+        var _a;
+        if (response.status === 202) {
+            return OperationStatus.RUNNING;
+        }
+        const asyncResult = (_a = response.headers) === null || _a === void 0 ? void 0 : _a['asyncresult'];
+        if (typeof asyncResult === 'string') {
+            const embedded = parseInt(asyncResult.trim().split(/\s+/)[0], 10);
+            if (!Number.isNaN(embedded) && (embedded < 200 || embedded >= 300)) {
+                return OperationStatus.FAILED;
+            }
+        }
+        if (response.status === 200 || response.status === 201) {
+            return OperationStatus.COMPLETED;
+        }
+        return OperationStatus.PENDING;
+    }
+    extractErrorFromResponse(response) {
+        var _a, _b, _c;
+        const asyncResult = (_a = response.headers) === null || _a === void 0 ? void 0 : _a['asyncresult'];
+        if (typeof asyncResult === 'string') {
+            return asyncResult;
+        }
+        if (typeof response.data === 'string') {
+            return response.data;
+        }
+        if ((_c = (_b = response.data) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.message) {
+            return response.data.error.message;
+        }
+        return JSON.stringify(response.data);
+    }
     /**
      * List all active async operations
      *
@@ -110,12 +161,11 @@ class AsyncOperationService {
         // Stop polling if active
         this.stopPolling(operationId);
         try {
-            // Try to cancel on server if supported
-            const url = (0, Utils_1.formatUrl)("/AsyncOperations('{}')/Cancel", operationId);
-            await this.rest.post(url, {});
+            const url = (0, Utils_1.formatUrl)("/_async('{}')", operationId);
+            await this.rest.delete(url, { asyncRequestsMode: false });
         }
         catch (error) {
-            // If server doesn't support cancellation, just mark as cancelled locally
+            console.warn(`Failed to cancel async operation ${operationId} on server:`, error);
         }
         // Update operation status
         operation.status = OperationStatus.CANCELLED;
@@ -173,6 +223,9 @@ class AsyncOperationService {
      */
     async createAsyncOperation(definition) {
         const operationId = this.generateOperationId();
+        // generateOperationId produces a client-side UUID; the server has no
+        // record of it, so polling /_async('{id}') would 404. Mark as locally
+        // tracked so getAsyncOperationStatus returns the cached status instead.
         const operation = {
             id: operationId,
             type: definition.type,
@@ -180,7 +233,8 @@ class AsyncOperationService {
             status: OperationStatus.PENDING,
             startTime: new Date(),
             parameters: definition.parameters,
-            metadata: definition.metadata
+            metadata: definition.metadata,
+            trackedLocally: true
         };
         this.operations.set(operationId, operation);
         return operationId;
@@ -337,17 +391,6 @@ class AsyncOperationService {
             status === OperationStatus.CANCELLED ||
             status === OperationStatus.TIMEOUT;
     }
-    mapServerStatus(serverStatus) {
-        const statusMap = {
-            'Pending': OperationStatus.PENDING,
-            'Running': OperationStatus.RUNNING,
-            'CompletedSuccessfully': OperationStatus.COMPLETED,
-            'CompletedWithErrors': OperationStatus.FAILED,
-            'Cancelled': OperationStatus.CANCELLED,
-            'Timeout': OperationStatus.TIMEOUT
-        };
-        return statusMap[serverStatus] || OperationStatus.PENDING;
-    }
     stopPolling(operationId) {
         const intervalId = this.pollingIntervals.get(operationId);
         if (intervalId) {

package/lib/services/FileService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileService.d.ts","sourceRoot":"","sources":["../../src/services/FileService.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,aAAa,EAAE,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,qBAAa,WAAY,SAAQ,aAAa;IAC1C;OACG;IAEH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CAAY;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAY;IACxD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;gBAEhC,IAAI,EAAE,WAAW;IAKhB,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM7B,WAAW,CAAC,SAAS,GAAE,MAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAOtD,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQtC,MAAM,CACf,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,CAAC,EAAE,OAAO,EACzB,YAAY,GAAE,MAAY,EAC1B,UAAU,GAAE,MAAU,GACvB,OAAO,CAAC,aAAa,CAAC;IA8BZ,MAAM,CACf,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,CAAC,EAAE,OAAO,EACzB,YAAY,GAAE,MAAY,EAC1B,UAAU,GAAE,MAAU,GACvB,OAAO,CAAC,aAAa,CAAC;IAYZ,cAAc,CACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,CAAC,EAAE,OAAO,EACzB,YAAY,GAAE,MAAY,EAC1B,UAAU,GAAE,MAAU,GACvB,OAAO,CAAC,aAAa,CAAC;IAOZ,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM1C,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAOhD,kBAAkB,CAC3B,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,EAChC,oBAAoB,GAAE,KAAK,GAAG,IAAY,EAC1C,SAAS,GAAE,MAAW,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAgCP,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,aAAa,CAAC,IAAI,GAAE,MAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAInD,gBAAgB,CACzB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,CAAC,EAAE,OAAO,EACzB,YAAY,GAAE,MAAY,EAC1B,UAAU,GAAE,MAAU,GACvB,OAAO,CAAC,aAAa,CAAC;IAIZ,qBAAqB,CAC9B,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,EAChC,oBAAoB,GAAE,KAAK,GAAG,IAAY,EAC1C,SAAS,GAAE,MAAW,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;YAIN,qBAAqB;YAmBrB,iBAAiB;YAyBjB,2BAA2B;YAO3B,wBAAwB;IAoEtC,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,gBAAgB;CAK3B"}
+{"version":3,"file":"FileService.d.ts","sourceRoot":"","sources":["../../src/services/FileService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAkB,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,qBAAa,WAAY,SAAQ,aAAa;IAC1C;OACG;IAEH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CAAY;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAY;IACxD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;gBAEhC,IAAI,EAAE,WAAW;IAKhB,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM7B,WAAW,CAAC,SAAS,GAAE,MAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAOtD,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQtC,MAAM,CACf,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,CAAC,EAAE,OAAO,EACzB,YAAY,GAAE,MAAY,EAC1B,UAAU,GAAE,MAAU,GACvB,OAAO,CAAC,aAAa,CAAC;IA8BZ,MAAM,CACf,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,CAAC,EAAE,OAAO,EACzB,YAAY,GAAE,MAAY,EAC1B,UAAU,GAAE,MAAU,GACvB,OAAO,CAAC,aAAa,CAAC;IAYZ,cAAc,CACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,CAAC,EAAE,OAAO,EACzB,YAAY,GAAE,MAAY,EAC1B,UAAU,GAAE,MAAU,GACvB,OAAO,CAAC,aAAa,CAAC;IAOZ,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM1C,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAOhD,kBAAkB,CAC3B,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,EAChC,oBAAoB,GAAE,KAAK,GAAG,IAAY,EAC1C,SAAS,GAAE,MAAW,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAgCP,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,aAAa,CAAC,IAAI,GAAE,MAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAInD,gBAAgB,CACzB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,CAAC,EAAE,OAAO,EACzB,YAAY,GAAE,MAAY,EAC1B,UAAU,GAAE,MAAU,GACvB,OAAO,CAAC,aAAa,CAAC;IAIZ,qBAAqB,CAC9B,cAAc,CAAC,EAAE,MAAM,EACvB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,EAChC,oBAAoB,GAAE,KAAK,GAAG,IAAY,EAC1C,SAAS,GAAE,MAAW,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;YAIN,qBAAqB;YAmBrB,iBAAiB;YAyBjB,2BAA2B;YAO3B,wBAAwB;IAoEtC,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,gBAAgB;CAK3B"}