shopify-cli 2.6.5 → 2.7.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.7.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
 description: |
   Shopify CLI helps you build Shopify apps faster. It quickly scaffolds Node.js
   and Ruby on Rails embedded apps. It also automates many common tasks in the
@@ -107,11 +107,12 @@ description: |
   and webhooks.
 email:
 - dev-tools-education@shopify.com
-executables: []
-extensions:
-- ext/shopify-cli/extconf.rb
+executables:
+- shopify
+extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer.json"
 - ".github/CODEOWNERS"
 - ".github/CODE_OF_CONDUCT.md"
 - ".github/CONTRIBUTING.md"
@@ -127,9 +128,11 @@ files:
 - ".ruby-version"
 - ".tmp/.gitkeep"
 - ".tmp/sv/.gitkeep"
+- ".vscode/extensions.json"
+- ".vscode/settings.json"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Dockerfile
+- Codespace.dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -137,29 +140,21 @@ files:
 - RELEASING.md
 - Rakefile
 - SECURITY.md
-- THEMEKIT_MIGRATION.md
+- Tests.dockerfile
+- assets/logo.png
 - bin/console
 - bin/load_shopify.rb
 - bin/shopify
 - dev.yml
-- docs/_config.yml
-- docs/app/node/commands/index.md
-- docs/app/node/index.md
-- docs/app/rails/commands/index.md
-- docs/app/rails/index.md
-- docs/core/index.md
-- docs/getting-started/index.md
-- docs/getting-started/install/index.md
-- docs/getting-started/migrate/index.md
-- docs/getting-started/uninstall/index.md
-- docs/getting-started/upgrade/index.md
-- docs/help/start-app/index.md
-- docs/index.md
-- ext/shopify-cli/extconf.rb
+- docs/README.md
+- docs/contributors/testing.md
+- docs/users/installation.md
+- docs/users/migrate-from-themekit.md
+- ext/javy/javy.rb
+- ext/javy/version
 - ext/shopify-extensions/extconf.rb
 - ext/shopify-extensions/shopify_extensions.rb
 - ext/shopify-extensions/version
-- install.sh
 - lib/docgen/class_template.md.erb
 - lib/docgen/index_template.md.erb
 - lib/docgen/markdown.rb
@@ -223,10 +218,12 @@ files:
 - lib/project_types/extension/models/npm_package.rb
 - lib/project_types/extension/models/product.rb
 - lib/project_types/extension/models/registration.rb
+- lib/project_types/extension/models/server_config/app.rb
 - lib/project_types/extension/models/server_config/base.rb
 - lib/project_types/extension/models/server_config/development.rb
 - lib/project_types/extension/models/server_config/development_entries.rb
 - lib/project_types/extension/models/server_config/development_renderer.rb
+- lib/project_types/extension/models/server_config/development_resource.rb
 - lib/project_types/extension/models/server_config/extension.rb
 - lib/project_types/extension/models/server_config/root.rb
 - lib/project_types/extension/models/server_config/user.rb
@@ -241,70 +238,54 @@ files:
 - lib/project_types/extension/tasks/choose_next_available_port.rb
 - lib/project_types/extension/tasks/configure_features.rb
 - lib/project_types/extension/tasks/configure_options.rb
+- lib/project_types/extension/tasks/convert_server_config.rb
 - lib/project_types/extension/tasks/converters/app_converter.rb
 - lib/project_types/extension/tasks/converters/product_converter.rb
 - lib/project_types/extension/tasks/converters/registration_converter.rb
-- lib/project_types/extension/tasks/converters/server_config_converter.rb
 - lib/project_types/extension/tasks/converters/validation_error_converter.rb
 - lib/project_types/extension/tasks/converters/version_converter.rb
 - lib/project_types/extension/tasks/create_extension.rb
+- lib/project_types/extension/tasks/ensure_resource_url.rb
 - lib/project_types/extension/tasks/fetch_specifications.rb
 - lib/project_types/extension/tasks/find_npm_packages.rb
+- lib/project_types/extension/tasks/find_package_from_json.rb
 - lib/project_types/extension/tasks/get_app.rb
 - lib/project_types/extension/tasks/get_apps.rb
 - lib/project_types/extension/tasks/get_extensions.rb
 - lib/project_types/extension/tasks/get_product.rb
-- lib/project_types/extension/tasks/load_server_config.rb
+- lib/project_types/extension/tasks/merge_server_config.rb
 - lib/project_types/extension/tasks/run_extension_command.rb
 - lib/project_types/extension/tasks/update_draft.rb
 - lib/project_types/extension/tasks/user_errors.rb
 - lib/project_types/node/cli.rb
-- lib/project_types/node/commands/connect.rb
-- lib/project_types/node/commands/create.rb
-- lib/project_types/node/commands/deploy.rb
-- lib/project_types/node/commands/deploy/heroku.rb
-- lib/project_types/node/commands/generate.rb
-- lib/project_types/node/commands/open.rb
-- lib/project_types/node/commands/serve.rb
-- lib/project_types/node/commands/tunnel.rb
 - lib/project_types/node/forms/create.rb
 - lib/project_types/node/messages/messages.rb
 - lib/project_types/php/cli.rb
-- lib/project_types/php/commands/connect.rb
-- lib/project_types/php/commands/create.rb
-- lib/project_types/php/commands/deploy.rb
-- lib/project_types/php/commands/deploy/heroku.rb
-- lib/project_types/php/commands/open.rb
-- lib/project_types/php/commands/serve.rb
-- lib/project_types/php/commands/tunnel.rb
 - lib/project_types/php/forms/create.rb
 - lib/project_types/php/messages/messages.rb
 - lib/project_types/rails/cli.rb
-- lib/project_types/rails/commands/connect.rb
 - lib/project_types/rails/commands/create.rb
-- lib/project_types/rails/commands/deploy.rb
-- lib/project_types/rails/commands/deploy/heroku.rb
-- lib/project_types/rails/commands/generate.rb
-- lib/project_types/rails/commands/generate/webhook.rb
-- lib/project_types/rails/commands/open.rb
-- lib/project_types/rails/commands/serve.rb
-- lib/project_types/rails/commands/tunnel.rb
 - lib/project_types/rails/forms/create.rb
 - lib/project_types/rails/gem.rb
 - lib/project_types/rails/messages/messages.rb
 - lib/project_types/rails/ruby.rb
 - lib/project_types/script/cli.rb
 - lib/project_types/script/commands/create.rb
+- lib/project_types/script/commands/javy.rb
 - lib/project_types/script/commands/push.rb
 - lib/project_types/script/config/extension_points.yml
 - lib/project_types/script/errors.rb
+- lib/project_types/script/forms/ask_app.rb
+- lib/project_types/script/forms/ask_org.rb
+- lib/project_types/script/forms/ask_script_uuid.rb
 - lib/project_types/script/forms/create.rb
+- lib/project_types/script/forms/run_against_shopify_org.rb
 - lib/project_types/script/graphql/app_script_set.graphql
-- lib/project_types/script/graphql/app_script_update_or_create.graphql
 - lib/project_types/script/graphql/get_app_scripts.graphql
 - lib/project_types/script/graphql/module_upload_url_generate.graphql
 - lib/project_types/script/graphql/script_service_proxy.graphql
 - lib/project_types/script/layers/application/build_script.rb
+- lib/project_types/script/layers/application/connect_app.rb
 - lib/project_types/script/layers/application/create_script.rb
 - lib/project_types/script/layers/application/extension_points.rb
 - lib/project_types/script/layers/application/project_dependencies.rb
@@ -332,7 +313,6 @@ files:
 - lib/project_types/script/layers/infrastructure/script_uploader.rb
 - lib/project_types/script/layers/infrastructure/service_locator.rb
 - lib/project_types/script/messages/messages.rb
-- lib/project_types/script/tasks/ensure_env.rb
 - lib/project_types/script/ui/error_handler.rb
 - lib/project_types/script/ui/printing_spinner.rb
 - lib/project_types/script/ui/strict_spinner.rb
@@ -359,9 +339,21 @@ files:
 - lib/shopify_cli/app_type_detector.rb
 - lib/shopify_cli/command.rb
 - lib/shopify_cli/command/app_sub_command.rb
+- lib/shopify_cli/command/project_command.rb
+- lib/shopify_cli/command/sub_command.rb
 - lib/shopify_cli/command_options.rb
 - lib/shopify_cli/command_options/command_serve_options.rb
 - lib/shopify_cli/commands.rb
+- lib/shopify_cli/commands/app.rb
+- lib/shopify_cli/commands/app/connect.rb
+- lib/shopify_cli/commands/app/create.rb
+- lib/shopify_cli/commands/app/create/node.rb
+- lib/shopify_cli/commands/app/create/php.rb
+- lib/shopify_cli/commands/app/create/rails.rb
+- lib/shopify_cli/commands/app/deploy.rb
+- lib/shopify_cli/commands/app/open.rb
+- lib/shopify_cli/commands/app/serve.rb
+- lib/shopify_cli/commands/app/tunnel.rb
 - lib/shopify_cli/commands/config.rb
 - lib/shopify_cli/commands/help.rb
 - lib/shopify_cli/commands/login.rb
@@ -391,6 +383,8 @@ files:
 - lib/shopify_cli/feature.rb
 - lib/shopify_cli/form.rb
 - lib/shopify_cli/git.rb
+- lib/shopify_cli/github.rb
+- lib/shopify_cli/github/issue_url_generator.rb
 - lib/shopify_cli/helpers.rb
 - lib/shopify_cli/helpers/haikunator.rb
 - lib/shopify_cli/heroku.rb
@@ -421,10 +415,23 @@ files:
 - lib/shopify_cli/resources/env_file.rb
 - lib/shopify_cli/result.rb
 - lib/shopify_cli/services.rb
+- lib/shopify_cli/services/app/connect_service.rb
+- lib/shopify_cli/services/app/create/node_service.rb
+- lib/shopify_cli/services/app/create/php_service.rb
+- lib/shopify_cli/services/app/create/rails_service.rb
+- lib/shopify_cli/services/app/deploy/heroku/node_service.rb
+- lib/shopify_cli/services/app/deploy/heroku/php_service.rb
+- lib/shopify_cli/services/app/deploy/heroku/rails_service.rb
+- lib/shopify_cli/services/app/open_service.rb
+- lib/shopify_cli/services/app/serve/node_service.rb
+- lib/shopify_cli/services/app/serve/php_service.rb
+- lib/shopify_cli/services/app/serve/rails_service.rb
+- lib/shopify_cli/services/app/tunnel/auth_service.rb
+- lib/shopify_cli/services/app/tunnel/start_service.rb
+- lib/shopify_cli/services/app/tunnel/stop_service.rb
 - lib/shopify_cli/services/base_service.rb
 - lib/shopify_cli/services/reporting_service.rb
 - lib/shopify_cli/shopifolk.rb
-- lib/shopify_cli/sub_command.rb
 - lib/shopify_cli/task.rb
 - lib/shopify_cli/tasks.rb
 - lib/shopify_cli/tasks/confirm_store.rb
@@ -451,13 +458,16 @@ files:
 - lib/shopify_cli/theme/ignore_filter.rb
 - lib/shopify_cli/theme/mime_type.rb
 - lib/shopify_cli/theme/syncer.rb
+- lib/shopify_cli/theme/syncer/error_reporter.rb
+- lib/shopify_cli/theme/syncer/operation.rb
+- lib/shopify_cli/theme/syncer/standard_reporter.rb
 - lib/shopify_cli/theme/theme.rb
 - lib/shopify_cli/transform_data_structure.rb
 - lib/shopify_cli/tunnel.rb
 - lib/shopify_cli/version.rb
 - shopify-cli.gemspec
-- shopify.fish
-- shopify.sh
+- shopify-dev
+- utilities/constants.rb
 - utilities/docker.rb
 - utilities/docker/container.rb
 - utilities/utilities.rb

data/docs/_config.yml

@@ -1,2 +0,0 @@
-plugins:
-  - jekyll-redirect-from

data/docs/app/node/commands/index.md

@@ -1,4 +0,0 @@
----
-title: Node.js app commands
-redirect_to: https://shopify.dev/tools/cli/reference/node-app
----

data/docs/app/node/index.md

@@ -1,4 +0,0 @@
----
-title: Getting started with Shopify CLI
-redirect_to: https://shopify.dev/tools/cli/getting-started
----

data/docs/app/rails/commands/index.md

@@ -1,4 +0,0 @@
----
-title: Ruby on Rails app commands
-redirect_to: https://shopify.dev/tools/cli/reference/ruby-on-rails-app
----

data/docs/app/rails/index.md

@@ -1,4 +0,0 @@
----
-title: Getting started with Shopify CLI
-redirect_to: https://shopify.dev/tools/cli/getting-started
----

data/docs/core/index.md

@@ -1,4 +0,0 @@
----
-title: Shopify CLI core commands
-redirect_to: https://shopify.dev/tools/cli/reference
----

data/docs/getting-started/index.md

@@ -1,4 +0,0 @@
----
-title: Getting started with Shopify CLI
-redirect_to: https://shopify.dev/tools/cli/getting-started
----

data/docs/getting-started/install/index.md

@@ -1,4 +0,0 @@
----
-title: Install Shopify CLI
-redirect_to: https://shopify.dev/tools/cli/installation
----

data/docs/getting-started/migrate/index.md

@@ -1,4 +0,0 @@
----
-title: Troubleshooting Shopify CLI
-redirect_to: https://shopify.dev/tools/cli/troubleshooting
----

data/docs/getting-started/uninstall/index.md

@@ -1,4 +0,0 @@
----
-title: Troubleshooting Shopify CLI
-redirect_to: https://shopify.dev/tools/cli/troubleshooting
----

data/docs/getting-started/upgrade/index.md

@@ -1,4 +0,0 @@
----
-title: Troubleshooting Shopify CLI
-redirect_to: https://shopify.dev/tools/cli/troubleshooting
----

data/docs/help/start-app/index.md

@@ -1,4 +0,0 @@
----
-title: Getting started with Shopify CLI
-redirect_to: https://shopify.dev/tools/cli/getting-started
----

data/docs/index.md

@@ -1,4 +0,0 @@
----
-title: Shopify CLI
-redirect_to: https://shopify.dev/tools/cli
----

data/ext/shopify-cli/extconf.rb

@@ -1,60 +0,0 @@
-require "rbconfig"
-require "fileutils"
-require "date"
-
-gem = File.expand_path("../../../", __FILE__)
-exe = File.join(gem, "bin", "shopify")
-
-# `--skip-cli-build` will be passed from the brew `shopify-cli.rb` formula, so
-# as to prevent this extension builder doing the script and sym-link creation;
-# the brew install process takes care of these itself - see
-# https://github.com/Shopify/homebrew-shopify/shopify-cli.rb
-if ARGV && ARGV[0]&.match(/skip-cli-build/)
-  makefile_content = <<~MAKEFILE
-    .PHONY: clean
-
-    clean: ;
-
-    install: ;
-  MAKEFILE
-elsif RUBY_PLATFORM.match(/mswin|mingw|cygwin/)
-  bat_path = File.dirname(RbConfig.ruby)
-  bat = "#{bat_path}\\shopify.bat"
-
-  script_content = "#{RbConfig.ruby} -I '#{gem}' '#{exe}' %*"
-
-  FileUtils.mkdir_p(bat_path)
-  makefile_content = <<~MAKEFILE
-    .PHONY: clean install
-
-    clean:
-    \t rm -f "#{bat}"
-
-    install: clean
-    \t echo "@ECHO OFF"> "#{bat}"
-    \t echo "#{script_content}">> "#{bat}"
-  MAKEFILE
-else
-  script = exe + ".sh"
-  symlink = "/usr/local/bin/shopify"
-
-  script_content = <<~SCRIPT
-    #!/usr/bin/env bash
-    #{RbConfig.ruby} -I #{gem} #{exe} $@
-  SCRIPT
-
-  File.write(script, script_content)
-  FileUtils.chmod("+x", script)
-
-  makefile_content = <<~MAKEFILE
-    .PHONY: clean install
-
-    clean:
-    \t@sudo rm -f #{symlink}
-
-    install: clean
-    \t@sudo ln -s #{script} #{symlink}
-  MAKEFILE
-end
-
-File.write("Makefile", makefile_content)

data/install.sh

@@ -1,7 +0,0 @@
-# shellcheck shell=sh disable=1012,1001
-\cat << 'EOF'
-This install method for Shopify CLI is no longer supported.
-
-Please visit this page for complete instructions:
-  https://shopify.dev/tools/cli/troubleshooting#migrate-from-a-legacy-version
-EOF

data/lib/project_types/extension/tasks/converters/server_config_converter.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-require "shopify_cli"
-
-module Extension
-  module Tasks
-    module Converters
-      module ServerConfigConverter
-        def self.from_hash(hash, type)
-          context.abort(context.message("tasks.errors.parse_error")) if hash.nil?
-
-          project = ExtensionProject.current
-
-          extension = Models::ServerConfig::Extension.new(
-            uuid: project.registration_uuid,
-            type: type.upcase,
-            user: Models::ServerConfig::User.new,
-            development: Models::ServerConfig::Development.new(
-              build_dir: hash.dig("development", "build_dir"),
-              renderer: Models::ServerConfig::DevelopmentRenderer.find(type),
-              entries: Models::ServerConfig::DevelopmentEntries.new(
-                main: hash.dig("development", "entries", "main")
-              )
-            )
-          )
-
-          Models::ServerConfig::Root.new(extensions: [extension])
-        end
-      end
-    end
-  end
-end

data/lib/project_types/extension/tasks/load_server_config.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-require "shopify_cli"
-require "yaml"
-
-module Extension
-  module Tasks
-    class LoadServerConfig < ShopifyCLI::Task
-      include SmartProperties
-
-      class << self
-        def call(file_name:, type:)
-          config = YAML.load_file(file_name)
-          Tasks::Converters::ServerConfigConverter.from_hash(config, type)
-        rescue Psych::SyntaxError => e
-          raise(
-            ShopifyCLI::Abort,
-            ShopifyCLI::Context.message("core.yaml.error.invalid", file_name, e.message)
-          )
-        end
-      end
-    end
-  end
-end

data/lib/project_types/node/commands/connect.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-module Node
-  class Command
-    class Connect < ShopifyCLI::SubCommand
-      prerequisite_task ensure_project_type: :node
-
-      def call(*)
-        if ShopifyCLI::Project.has_current? && ShopifyCLI::Project.current.env
-          @ctx.puts(@ctx.message("node.connect.production_warning"))
-        end
-
-        app = ShopifyCLI::Connect.new(@ctx).default_connect("node")
-        @ctx.done(@ctx.message("node.connect.connected", app))
-      end
-
-      def self.help
-        ShopifyCLI::Context.message("node.connect.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
-      end
-    end
-  end
-end

data/lib/project_types/node/commands/create.rb

@@ -1,125 +0,0 @@
-# frozen_string_literal: true
-module Node
-  class Command
-    class Create < ShopifyCLI::SubCommand
-      prerequisite_task :ensure_authenticated
-
-      options do |parser, flags|
-        # backwards compatibility allow 'title' for now
-        parser.on("--title=TITLE") { |t| flags[:title] = t }
-        parser.on("--name=NAME") { |t| flags[:title] = t }
-        parser.on("--organization_id=ID") { |id| flags[:organization_id] = id }
-        parser.on("--organization-id=ID") { |id| flags[:organization_id] = id }
-        parser.on("--store=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
-        # backwards compatibility allow 'shop domain' for now
-        parser.on("--shop_domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
-        parser.on("--shop-domain=MYSHOPIFYDOMAIN") { |url| flags[:shop_domain] = url }
-        parser.on("--type=APPTYPE") { |type| flags[:type] = type }
-        parser.on("--verbose") { flags[:verbose] = true }
-      end
-
-      def call(args, _name)
-        form = Forms::Create.ask(@ctx, args, options.flags)
-        return @ctx.puts(self.class.help) if form.nil?
-
-        check_node
-        check_npm
-        build(form.name)
-
-        ShopifyCLI::Project.write(
-          @ctx,
-          project_type: "node",
-          organization_id: form.organization_id,
-        )
-
-        api_client = ShopifyCLI::Tasks::CreateApiClient.call(
-          @ctx,
-          org_id: form.organization_id,
-          title: form.title,
-          type: form.type,
-        )
-
-        ShopifyCLI::Resources::EnvFile.new(
-          api_key: api_client["apiKey"],
-          secret: api_client["apiSecretKeys"].first["secret"],
-          shop: form.shop_domain,
-          scopes: "write_products,write_customers,write_draft_orders",
-        ).write(@ctx)
-
-        partners_url = ShopifyCLI::PartnersAPI.partners_url_for(form.organization_id, api_client["id"])
-
-        @ctx.puts(@ctx.message("apps.create.info.created", form.title, partners_url))
-        @ctx.puts(@ctx.message("apps.create.info.serve", form.name, ShopifyCLI::TOOL_NAME, "node"))
-        unless ShopifyCLI::Shopifolk.acting_as_shopify_organization?
-          @ctx.puts(@ctx.message("apps.create.info.install", partners_url, form.title))
-        end
-      end
-
-      def self.help
-        ShopifyCLI::Context.message("node.create.help", ShopifyCLI::TOOL_NAME, ShopifyCLI::TOOL_NAME)
-      end
-
-      private
-
-      def check_node
-        cmd_path = @ctx.which("node")
-        @ctx.abort(@ctx.message("node.create.error.node_required")) if cmd_path.nil?
-
-        version, stat = @ctx.capture2e("node", "-v")
-        @ctx.abort(@ctx.message("node.create.error.node_version_failure")) unless stat.success?
-
-        @ctx.done(@ctx.message("node.create.node_version", version))
-      end
-
-      def check_npm
-        cmd_path = @ctx.which("npm")
-        @ctx.abort(@ctx.message("node.create.error.npm_required")) if cmd_path.nil?
-
-        version, stat = @ctx.capture2e("npm", "-v")
-        @ctx.abort(@ctx.message("node.create.error.npm_version_failure")) unless stat.success?
-
-        @ctx.done(@ctx.message("node.create.npm_version", version))
-      end
-
-      def set_npm_config
-        # check available npmrc (either user or system) for production registry
-        registry, _ = @ctx.capture2("npm config get @shopify:registry")
-        return if registry.include?("https://registry.yarnpkg.com")
-
-        # available npmrc doesn't have production registry =>
-        # set a project-based .npmrc
-        @ctx.system(
-          "npm",
-          "--userconfig",
-          "./.npmrc",
-          "config",
-          "set",
-          "@shopify:registry",
-          "https://registry.yarnpkg.com",
-          chdir: @ctx.root
-        )
-      end
-
-      def build(name)
-        ShopifyCLI::Git.clone("https://github.com/Shopify/shopify-app-node.git", name)
-
-        @ctx.root = File.join(@ctx.root, name)
-
-        set_npm_config
-        ShopifyCLI::JsDeps.install(@ctx, !options.flags[:verbose].nil?)
-
-        begin
-          @ctx.rm_r(".git")
-          @ctx.rm_r(".github")
-          @ctx.rm(File.join("server", "handlers", "client.js"))
-          @ctx.rename(
-            File.join("server", "handlers", "client.cli.js"),
-            File.join("server", "handlers", "client.js")
-          )
-        rescue Errno::ENOENT => e
-          @ctx.debug(e)
-        end
-      end
-    end
-  end
-end