Skip to content

R component generation - support different package structures #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tcbegley wants to merge 4 commits into from
+12 −2
Closed

R component generation - support different package structures #1125

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c72e6f
Correctly infer package name from build location
tcbegley Jan 24, 2020
15496ff
Less confusing handling of split
tcbegley Feb 19, 2020
152fe04
Pass full build location to write_js_metadata
tcbegley Feb 19, 2020
6c606d8
Merge branch 'dev' into r-build-project-shortname
Marc-Andre-Rivet Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions dash/development/_r_components_generation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@
"""


def _get_package_name(project_shortname):
# this helper function enables building of projects that do not keep their
# package.json or generated .py files in the top level of the package
return project_shortname.split("/", 1)[0]


# pylint: disable=R0914
def generate_class_string(name, props, project_shortname, prefix):
# Here we convert from snake case to camel case
Expand Down Expand Up @@ -454,6 +460,7 @@ def write_class_file(
# from within Python
write_help_file(name, props, description, prefix, rpkg_data)

project_shortname = _get_package_name(project_shortname)
import_string = "# AUTO GENERATED FILE - DO NOT EDIT\n\n"
class_string = generate_class_string(name, props, project_shortname, prefix)

Expand All @@ -479,7 +486,8 @@ def write_js_metadata(pkg_data, project_shortname, has_wildcards):
-------
"""
function_string = generate_js_metadata(
pkg_data=pkg_data, project_shortname=project_shortname
pkg_data=pkg_data,
project_shortname=_get_package_name(project_shortname),
)
file_name = "internal.R"

Expand Down Expand Up @@ -543,7 +551,9 @@ def generate_rpkg(
# to R package that we're generating here, use .get in case the key
# does not exist in package.json

package_name = snake_case_to_camel_case(project_shortname)
package_name = snake_case_to_camel_case(
_get_package_name(project_shortname)
)
lib_name = pkg_data.get("name")

if rpkg_data is not None:
Expand Down