generator-easy-ui5 2.4.6 → 3.1.0

package/generators/newcontrol/index.js

@@ -1,81 +0,0 @@
-const Generator = require("yeoman-generator");
-
-module.exports = class extends Generator {
-
-  prompting() {
-    const modules = this.config.get("uimodules");
-    var aPrompt = [{
-      type: "list",
-      name: "modulename",
-      message: "To which module do you want to add a control?",
-      choices: modules || [],
-      when: modules && modules.length > 1
-    }, {
-      type: "input",
-      name: "controlname",
-      message: "What is the name of the new control?",
-      validate: (s) => {
-        if (/^\d*[a-zA-Z][a-zA-Z0-9]*$/g.test(s)) {
-          return true;
-        }
-        return "Please use alpha numeric characters only for the control name.";
-      }
-    }, {
-      type: "input",
-      name: "supercontrol",
-      message: "Which control would you like to extend?",
-      validate: (s) => {
-        if (/^[a-zA-Z0-9\.]*$/g.test(s)) {
-          return true;
-        }
-        return "Please use alpha numeric characters and dots only to specifiy the super control.";
-      },
-      default: "sap.ui.core.Control"
-    }];
-    if (!this.config.getAll().viewtype) {
-      aPrompt = aPrompt.concat([{
-        type: "input",
-        name: "projectname",
-        message: "Seems like this project has not been generated with Easy-UI5. Please enter the name your project.",
-        validate: (s) => {
-          if (/^\d*[a-zA-Z][a-zA-Z0-9]*$/g.test(s)) {
-            return true;
-          }
-          return "Please use alpha numeric characters only for the project name.";
-        },
-        default: "myUI5App"
-      }, {
-        type: "input",
-        name: "namespace",
-        message: "Please enter the namespace you use currently",
-        validate: (s) => {
-          if (/^[a-zA-Z0-9_\.]*$/g.test(s)) {
-            return true;
-          }
-          return "Please use alpha numeric characters and dots only for the namespace.";
-        },
-        default: "com.myorg"
-      }]);
-    }
-    return this.prompt(aPrompt).then((answers) => {
-      this.options.oneTimeConfig = this.config.getAll();
-      this.options.oneTimeConfig.controlname = answers.controlname;
-      this.options.oneTimeConfig.supercontrol = answers.supercontrol;
-      this.options.oneTimeConfig.modulename = answers.modulename || modules[0];
-
-      this.options.oneTimeConfig.appId = this.options.oneTimeConfig.namespace + "." + (this.options.modulename === "uimodule" ? this.options.oneTimeConfig.projectname : this.options.modulename);
-      if (answers.projectname) {
-        this.options.oneTimeConfig.projectname = answers.projectname;
-        this.options.oneTimeConfig.namespace = answers.namespace;
-      }
-    });
-  }
-
-  writing() {
-    const sOrigin = this.templatePath("webapp/control/template.js");
-    const sTarget = `${this.options.oneTimeConfig.modulename}/webapp/control/${this.options.oneTimeConfig.controlname}.js`;
-
-    this.fs.copyTpl(sOrigin, sTarget, this.options.oneTimeConfig);
-  }
-
-};

package/generators/newcontrol/templates/webapp/control/template.js

@@ -1,23 +0,0 @@
-sap.ui.define(
-  ["<%= supercontrol.replace(/\./g, '/') %>"],
-  function(Control) {
-    return Control.extend("<%=appId%>.control.<%=controlname%>",{
-         metadata: {
-              properties: {},
-              aggregations: {},
-         },
-
-         renderer: {},
-
-         <% if (supercontrol !== 'sap.ui.core.Control') { %>
-         onAfterRendering: function() {
-              if(<%=supercontrol%>.prototype.onAfterRendering) {
-                   <%=supercontrol%>.prototype.onAfterRendering.apply(this,arguments); //run the super class's method first
-              }
-
-              alert('<%=controlname%> has been rendered!');
-         },
-         <% } %>
-    });
-  }
-);

package/generators/newmodel/index.js

@@ -1,142 +0,0 @@
-const Generator = require("yeoman-generator"),
-  fileaccess = require("../../helpers/fileaccess");
-
-module.exports = class extends Generator {
-
-  prompting() {
-    const modules = this.config.get("uimodules");
-    var aPrompt = [{
-      type: "list",
-      name: "modulename",
-      message: "To which module do you want to add a model?",
-      choices: modules || [],
-      when: modules && modules.length > 1
-    }, {
-      type: "input",
-      name: "modelName",
-      message: "What is the name of your model, press enter if it is the default model?",
-      validate: (s) => {
-        if (/^[a-zA-Z0-9_-]*$/g.test(s)) {
-          return true;
-        }
-        return "Please use alpha numeric characters only for the view name.";
-      },
-      default: ""
-    },
-    {
-      type: "list",
-      name: "modelType",
-      message: "Which type of model do you want to add?",
-      choices: ["OData v2", "OData v4", "JSON"],
-      default: "OData v4"
-    },
-    {
-      type: "list",
-      name: "bindingMode",
-      message: "Which binding mode do you want to use?",
-      choices: ["TwoWay", "OneWay"],
-      default: "TwoWay"
-    },
-    {
-      when: function (props) {
-        return props.modelType.includes("OData");
-      },
-      type: "input",
-      name: "url",
-      message: "What is the data source url?"
-    },
-    {
-      when: function (props) {
-        return props.modelType === "OData v2";
-      },
-      type: "list",
-      name: "countMode",
-      message: "Which count mode do you want to use?",
-      choices: ["Inline", "Request"],
-      default: "Inline"
-    }];
-
-    return this.prompt(aPrompt).then((answers) => {
-      this.options.oneTimeConfig = this.config.getAll();
-      this.options.oneTimeConfig.modelName = answers.modelName;
-      this.options.oneTimeConfig.modelType = answers.modelType;
-      this.options.oneTimeConfig.bindingMode = answers.bindingMode;
-      this.options.oneTimeConfig.modulename = answers.modulename || modules[0];
-
-      if (answers.modelType.includes("OData")) {
-        this.options.oneTimeConfig.url = answers.url;
-        if (answers.modelType === "OData v2") {
-          this.options.oneTimeConfig.countMode = answers.countMode;
-        }
-      }
-    });
-  }
-
-  async writing() {
-
-    let override;
-
-    if (this.options.oneTimeConfig.modelType.includes("OData")) {
-      let sDataSource = this.options.oneTimeConfig.url.replace("/sap/opu/odata/sap/", "");
-      sDataSource = sDataSource.replace(/\//ig, "");
-
-      const sourceSettings = this.options.oneTimeConfig.modelType === "OData v2" ? {
-        localUri: "localService/" + this.options.oneTimeConfig.url + "/metadata.xml"
-      } : {
-          localUri: "localService/" + this.options.oneTimeConfig.url + "/metadata.xml",
-          odataVersion: "4.0"
-        };
-      const modelType = this.options.oneTimeConfig.modelType === "OData v2" ? "sap.ui.model.odata.v2.ODataModel" : "sap.ui.model.odata.v4.ODataModel";
-      const modelSettings = this.options.oneTimeConfig.modelType === "OData v2" ? {
-        defaultOperationMode: "Server",
-        defaultBindingMode: this.options.oneTimeConfig.bindingMode,
-        defaultCountMode: this.options.oneTimeConfig.countMode,
-        preload: true
-      } : {
-          synchronizationMode: "None",
-          operationMode: "Server",
-          autoExpandSelect: true,
-          earlyRequests: true,
-          groupProperties: {
-            default: {
-              submit: "Auto"
-            }
-          }
-        };
-
-      override = {
-        ["sap.app"]: {
-          dataSources: {
-            [sDataSource]: {
-              uri: this.options.oneTimeConfig.url,
-              type: "OData",
-              settings: sourceSettings
-            }
-          }
-        },
-        ["sap.ui5"]: {
-          models: {
-            [this.options.oneTimeConfig.modelName]: {
-              type: modelType,
-              settings: modelSettings,
-              dataSource: sDataSource
-            }
-          }
-        }
-      };
-    } else {
-      override = {
-        ["sap.ui5"]: {
-          models: {
-            [this.options.oneTimeConfig.modelName]: {
-              "type": "sap.ui.model.json.JSONModel",
-              "settings": {}
-            }
-          }
-        }
-      };
-    }
-
-    await fileaccess.manipulateJSON.call(this, "/" + this.options.oneTimeConfig.modulename + "/webapp/manifest.json", override);
-  }
-};

package/generators/newopa5journey/index.js

@@ -1,99 +0,0 @@
-const Generator = require("yeoman-generator");
-const validFilename = require("valid-filename");
-const fs = require("fs");
-
-module.exports = class extends Generator {
-
-  prompting() {
-    let aPrompt = [];
-    this.options.oneTimeConfig = this.config.getAll();
-
-    if (this.options.isSubgeneratorCall) {
-      this.options.oneTimeConfig.projectname = this.options.projectname;
-      this.options.oneTimeConfig.namespaceInput = this.options.namespaceInput;
-      this.options.oneTimeConfig.modulename = this.options.modulename;
-    } else {
-      if (!this.config.getAll().viewtype) {
-        aPrompt = aPrompt.concat([{
-          type: "input",
-          name: "projectname",
-          message: "Seems like this project has not been generated with Easy-UI5. Please enter the name of your project.",
-          validate: (s) => {
-            if (/^\d*[a-zA-Z][a-zA-Z0-9]*$/g.test(s)) {
-              return true;
-            }
-            return "Please use alpha numeric characters only for the project name.";
-          },
-          default: "myUI5App"
-        }, {
-          type: "input",
-          name: "namespaceInput",
-          message: "Please enter the namespace you use currently",
-          validate: (s) => {
-            if (/^[a-zA-Z0-9_\.]*$/g.test(s)) {
-              return true;
-            }
-            return "Please use alpha numeric characters and dots only for the namespace.";
-          },
-          default: "com.myorg"
-        }]);
-      }
-
-      const modules = this.config.get("uimodules") || [];
-      if (modules.length) {
-        aPrompt.push({
-          type: "list",
-          name: "modulename",
-          message: "To which module do you want to add an OPA5 page object?",
-          choices: modules,
-          when: modules.length
-        });
-      }
-    }
-
-    aPrompt = aPrompt.concat([{
-      type: "input",
-      name: "journey",
-      message: "Journey name:",
-      default: "Master",
-      validate: validFilename
-    }]);
-
-    return this.prompt(aPrompt).then((answers) => {
-      for (var key in answers) {
-        this.options.oneTimeConfig[key] = answers[key];
-      }
-
-      this.options.oneTimeConfig.namespaceInput = this.options.oneTimeConfig.namespaceInput || this.options.oneTimeConfig.namespace;
-      this.options.oneTimeConfig.journey = this.options.oneTimeConfig.journey.charAt(0).toUpperCase() + this.options.oneTimeConfig.journey.substr(1);
-
-      const journeys = this.config.get("opa5Journeys") || [];
-      journeys.push(this.options.oneTimeConfig.journey);
-      this.config.set("opa5Journeys", journeys);
-      this.options.oneTimeConfig.opa5Journeys = journeys;
-
-      // set default value for opa5pos if empty
-      const pos = this.config.get("opa5pos") || [];
-      this.config.set("opa5pos", pos);
-      this.options.oneTimeConfig.opa5pos = pos;
-    });
-  }
-
-  async writing() {
-    const sModule = (this.options.oneTimeConfig.modulename ? this.options.oneTimeConfig.modulename + "/" : "") + "webapp/";
-
-    this.fs.copyTpl(
-      this.templatePath("test/integration/$journey.js"),
-      this.destinationPath(sModule + "test/integration/" + this.options.oneTimeConfig.journey + "Journey.js"),
-      this.options.oneTimeConfig
-    );
-
-    // add new journey to AllJourneys list
-    const allJourneysFile = this.destinationPath(sModule + "test/integration/AllJourneys.js");
-    if (fs.existsSync(allJourneysFile)) {
-      const content = fs.readFileSync(allJourneysFile, "utf8").replace(/sap.ui.define\(\[(.*)\s\]/gms,
-        `sap.ui.define([$1,\n  "./${this.options.oneTimeConfig.journey}Journey"\n]`).replace(/\s,\s/, ",\n");
-      fs.writeFileSync(allJourneysFile, content);
-    }
-  }
-};

package/generators/newopa5journey/templates/test/integration/$journey.js

@@ -1,23 +0,0 @@
-sap.ui.define([
-  "sap/ui/test/opaQunit",
-  // "./pages/<%= journey %>"<% opa5pos.forEach(function (po) { %>,
-  "./pages/<%= po %>"<% }) %>
-], function (opaTest) {
-  "use strict";
-
-  opaTest("Should see the page", function (Given, When, Then) {
-
-    // Arrangements
-    Given.iStartMyApp();
-
-    // Actions
-    // When.onThe<%= journey %>Page.iPressTheButton();
-
-    // Assertions
-    Then.onThe<%= journey %>Page.iShouldSeeTheTitle();
-
-    // Cleanup
-    Then.iTeardownMyApp();
-  });
-
-});

package/generators/newopa5po/index.js

@@ -1,107 +0,0 @@
-const Generator = require("yeoman-generator");
-const validFilename = require("valid-filename");
-const fs = require("fs");
-
-module.exports = class extends Generator {
-
-  prompting() {
-    let aPrompt = [];
-    this.options.oneTimeConfig = this.config.getAll();
-
-    if (this.options.isSubgeneratorCall) {
-      this.options.oneTimeConfig.projectname = this.options.projectname;
-      this.options.oneTimeConfig.namespaceInput = this.options.namespaceInput;
-      this.options.oneTimeConfig.modulename = this.options.modulename;
-    } else {
-      if (!this.config.getAll().viewtype) {
-        aPrompt = aPrompt.concat([{
-          type: "input",
-          name: "projectname",
-          message: "Seems like this project has not been generated with Easy-UI5. Please enter the name of your project.",
-          validate: (s) => {
-            if (/^\d*[a-zA-Z][a-zA-Z0-9]*$/g.test(s)) {
-              return true;
-            }
-            return "Please use alpha numeric characters only for the project name.";
-          },
-          default: "myUI5App"
-        }, {
-          type: "input",
-          name: "namespaceInput",
-          message: "Please enter the namespace you use currently",
-          validate: (s) => {
-            if (/^[a-zA-Z0-9_\.]*$/g.test(s)) {
-              return true;
-            }
-            return "Please use alpha numeric characters and dots only for the namespace.";
-          },
-          default: "com.myorg"
-        }]);
-      }
-
-      const modules = this.config.get("uimodules") || [];
-      if (modules.length) {
-        aPrompt.push({
-          type: "list",
-          name: "modulename",
-          message: "To which module do you want to add an OPA5 page object?",
-          choices: modules,
-          when: modules.length
-        });
-      }
-    }
-
-    aPrompt = aPrompt.concat([{
-      type: "input",
-      name: "poName",
-      message: "Page object name:",
-      default: "Master",
-      validate: validFilename
-    }, {
-      type: "input",
-      name: "action",
-      message: "Add action with name (empty string to skip actions):"
-    }, {
-      type: "input",
-      name: "assertion",
-      message: "Add assertion with name (empty string to skip assertions):"
-    }]);
-
-    return this.prompt(aPrompt).then((answers) => {
-      for (var key in answers) {
-        this.options.oneTimeConfig[key] = answers[key];
-      }
-
-      var appName = !this.options.oneTimeConfig.modulename || this.options.oneTimeConfig.modulename === "uimodule" ? this.options.oneTimeConfig.projectname : this.options.oneTimeConfig.modulename;
-      this.options.oneTimeConfig.namespaceInput = this.options.oneTimeConfig.namespaceInput || this.options.oneTimeConfig.namespace;
-      this.options.oneTimeConfig.poName = this.options.oneTimeConfig.poName.charAt(0).toUpperCase() + this.options.oneTimeConfig.poName.substr(1);
-      this.options.oneTimeConfig.appId = this.options.oneTimeConfig.appId || this.options.oneTimeConfig.namespaceInput + "." + appName;
-
-      const pos = this.config.get("opa5pos") || [];
-      pos.push(this.options.oneTimeConfig.poName);
-      this.config.set("opa5pos", pos);
-      this.options.oneTimeConfig.opa5pos = pos;
-    });
-  }
-
-  async writing() {
-    const sModule = (this.options.oneTimeConfig.modulename ? this.options.oneTimeConfig.modulename + "/" : "") + "webapp/";
-    const journeys = this.config.get("opa5Journeys") || [];
-
-    this.fs.copyTpl(
-      this.templatePath("test/integration/pages/$poFile.js"),
-      this.destinationPath(sModule + "test/integration/pages/" + this.options.oneTimeConfig.poName + ".js"),
-      this.options.oneTimeConfig
-    );
-
-    // add new po to existing journeys
-    journeys.forEach((journey) => {
-      const journeyFile = this.destinationPath(sModule + "test/integration/" + journey + "Journey.js");
-      if (fs.existsSync(journeyFile)) {
-        const content = fs.readFileSync(journeyFile, "utf8").replace(/sap.ui.define\(\[(.*)\s\]/gms,
-          `sap.ui.define([$1,\n  "./pages/${this.options.oneTimeConfig.poName}"\n]`).replace(/\s,\s/, ",\n");
-        fs.writeFileSync(journeyFile, content);
-      }
-    });
-  }
-};

package/generators/newopa5po/templates/test/integration/pages/$poFile.js

@@ -1,43 +0,0 @@
-<% function upperFirst (str) { return str.charAt(0).toUpperCase() + str.substr(1);} %>sap.ui.require([
-  "sap/ui/test/Opa5"<% if (action) { %>,
-  "sap/ui/test/actions/Press"<% } %>
-], function (Opa5<% if (action) { %>, Press<% } %>) {
-  "use strict";
-
-  var sViewName = "<%= appId %>.view.<%= upperFirst(poName) %>View";
-
-  Opa5.createPageObjects({
-    onThe<%= upperFirst(poName) %>Page: {
-      viewName: sViewName,
-
-      actions: {
-        // add action functions here<% if (action) { %>
-        <%= action %>: function () {
-          return this.waitFor({
-            controlType: "sap.m.Button",
-            actions: new Press(),
-            errorMessage: "App does not have a button"
-          });
-        }<% } %>
-      },
-
-      assertions: {
-          // add assertion functions here<% if (assertion) { %>
-          <%= assertion %>: function () {
-            return this.waitFor({
-              controlType: "sap.m.Title",
-              properties: {
-                text: "<%=appId%>"
-              },
-              success: function() {
-                Opa5.assert.ok(true, "The page shows the correct title");
-              },
-              errorMessage: "App does not show the expected title <%=appId%>"
-            });
-        }<% } %>
-      }
-
-    }
-  });
-
-});

package/generators/newuiveri5po/index.js

@@ -1,84 +0,0 @@
-var Generator = require("yeoman-generator");
-var validFilename = require("valid-filename");
-var fs = require("fs");
-
-module.exports = class extends Generator {
-  constructor(args, opts) {
-    super(args, opts);
-    this.answers = {};
-  }
-
-  prompting() {
-    return this.prompt([{
-      type: "input",
-      name: "poName",
-      message: "Page object name:",
-      default: "Master",
-      validate: validFilename
-    }, {
-      type: "input",
-      name: "action",
-      message: "Add action with name (empty string to skip actions):"
-    }, {
-      type: "input",
-      name: "assertion",
-      message: "Add assertion with name (empty string to skip assertions):"
-    }]).then(function (answers) {
-      this.options.oneTimeConfig = this.config.getAll();
-      for (var key in answers) {
-        this.options.oneTimeConfig[key] = answers[key];
-      }
-      this.options.oneTimeConfig.poFile = this.options.oneTimeConfig.poName.charAt(0).toLowerCase() + this.options.oneTimeConfig.poName.substr(1);
-
-      this.options.oneTimeConfig.dirname = "";
-      if (this.options.dirname) {
-        this.options.oneTimeConfig.dirname = this.options.dirname + "/";
-      } else if (this.options.oneTimeConfig.uiveri5Tests) {
-        this.options.oneTimeConfig.dirname = this.options.oneTimeConfig.uiveri5Tests + "/";
-      }
-
-      const pos = this.config.get("uiveri5pos") || {};
-      pos[this.options.oneTimeConfig.poFile] = {
-        action: this.options.oneTimeConfig.action,
-        assertion: this.options.oneTimeConfig.assertion
-      };
-      this.config.set("uiveri5pos", pos);
-      this.options.oneTimeConfig.uiveri5pos = pos;
-    }.bind(this));
-  }
-
-  writing() {
-    const specs = this.config.get("uiveri5specs") || [];
-
-    this.fs.copyTpl(
-      this.templatePath("pages/$poFile.js"),
-      this.destinationPath(this.options.oneTimeConfig.dirname + "pages/" + this.options.oneTimeConfig.poFile + ".js"),
-      this.options.oneTimeConfig
-    );
-
-    // add new po to existing specs
-    specs.forEach((spec) => {
-      const specFile = this.destinationPath(this.options.oneTimeConfig.dirname + spec + ".spec.js");
-      if (fs.existsSync(specFile)) {
-        let content = fs.readFileSync(specFile, "utf8");
-        content = `require("./pages/${this.options.oneTimeConfig.poFile}");\n` + content.substr(0, content.lastIndexOf("});"));
-        Object.keys(this.options.oneTimeConfig.uiveri5pos).forEach(function (poFile) {
-          const poName = poFile.charAt(0).toUpperCase() + poFile.substr(1);
-          content += `  it("should see the ${poName} page", function () {\n    // call the page object's actions and assertions:\n` +
-            `    // When.onThe${poName}Page.iDoSomething();\n` +
-            `    // Then.onThe${poName}Page.iAssertSomething();\n`;
-          if (this.options.oneTimeConfig.uiveri5pos[poFile].action) {
-            content += `    When.onThe${poName}Page.${this.options.oneTimeConfig.uiveri5pos[poFile].action}();\n`;
-          }
-          if (this.options.oneTimeConfig.uiveri5pos[poFile].assertion) {
-            content += `    Then.onThe${poName}Page.${this.options.oneTimeConfig.uiveri5pos[poFile].assertion}();\n`;
-          }
-          content += "  });\n\n";
-        }.bind(this));
-        content += "});\n";
-
-        fs.writeFileSync(specFile, content);
-      }
-    });
-  }
-};

package/generators/newuiveri5po/templates/pages/$poFile.js

@@ -1,20 +0,0 @@
-<% function upperFirst (str) { return str.charAt(0).toUpperCase() + str.substr(1);} %>module.exports = createPageObjects({
-  <%= upperFirst(poName) %>: {
-    actions: {
-      // add action functions here
-      <% if (action) { %><%= action %>: function () {
-        element(by.control({
-          controlType: "sap.m.Button"
-        })).click();
-      }<% } %>
-    },
-    assertions: {
-      // add assertion functions here
-      <% if (assertion) { %><%= assertion %>: function () {
-        expect(element(by.control({
-          controlType: "sap.m.Button"
-        })).isDisplayed()).toBeTruthy();
-      }<% } %>
-    }
-  }
-});

package/generators/newuiveri5spec/index.js

@@ -1,51 +0,0 @@
-var Generator = require("yeoman-generator");
-var validFilename = require("valid-filename");
-
-module.exports = class extends Generator {
-
-  prompting() {
-    return this.prompt([{
-      type: "input",
-      name: "suiteName",
-      message: "Name for the suite (describe block):",
-      default: "masterdetail",
-      validate: validFilename
-    }, {
-      type: "input",
-      name: "specName",
-      message: "Name for the spec (it block):",
-      default: "should see the app"
-    }]).then(function (answers) {
-      this.options.oneTimeConfig = this.config.getAll();
-      for (var key in answers) {
-        this.options.oneTimeConfig[key] = answers[key];
-      }
-
-      this.options.oneTimeConfig.dirname = "";
-      if (this.options.dirname) {
-        this.options.oneTimeConfig.dirname = this.options.dirname + "/";
-      } else if (this.options.oneTimeConfig.uiveri5Tests) {
-        this.options.oneTimeConfig.dirname = this.options.oneTimeConfig.uiveri5Tests + "/";
-      }
-
-      const specs = this.config.get("uiveri5specs") || [];
-      specs.push(this.options.oneTimeConfig.suiteName);
-      this.config.set("uiveri5specs", specs);
-      this.options.oneTimeConfig.uiveri5specs = specs;
-
-      // set default value for uiveri5pos if empty
-      const pos = this.config.get("uiveri5pos") || {};
-      this.config.set("uiveri5pos", pos);
-      this.options.oneTimeConfig.uiveri5pos = pos;
-    }.bind(this));
-  }
-
-  async writing() {
-    this.fs.copyTpl(
-      this.templatePath("$specName.spec.js"),
-      this.destinationPath(this.options.oneTimeConfig.dirname + "/" + this.options.oneTimeConfig.suiteName + ".spec.js"),
-      this.options.oneTimeConfig
-    );
-  }
-
-};