From dc566087fbbb3d2eef66f5edf9aaa4b4b33ba3eb Mon Sep 17 00:00:00 2001 From: shmyga Date: Fri, 16 Oct 2026 15:38:58 +0300 Subject: [PATCH] feat(preset): add preset tasks template support --- project_manager/preset/default/nodejs.toml | 22 +++---- project_manager/preset/detector.py | 71 ++++++++++++++-------- 2 files changed, 52 insertions(+), 41 deletions(-) diff --git a/project_manager/preset/default/nodejs.toml b/project_manager/preset/default/nodejs.toml index cebaef7..2ed881e 100644 --- a/project_manager/preset/default/nodejs.toml +++ b/project_manager/preset/default/nodejs.toml @@ -2,6 +2,7 @@ conditions = ["{{ 'package.json' | file }}"] variables.use_nvm = "{{ (((('home' | env) + '/.nvm/nvm.sh') | file) and ('.nvmrc' | file)) | bool }}" variables.nvm = "{{ '. ~/.nvm/nvm.sh && nvm use && ' if use_nvm | bool else '' }}" +variables.npm_scripts = "{{ 'package.json' | read | get('scripts') | tojson }}" # install [presets.nodejs.tasks.setup.npm] @@ -13,20 +14,9 @@ commands = ["{{ nvm }}npm install-clean"] conditions = ["{{ not ('package-lock.json' | file) }}"] commands = ["{{ nvm }}npm install"] -# test -[presets.nodejs.tasks.test.jest] -conditions = ["{{ 'node_modules/jest' | file }}"] -commands = ["{{ nvm }}npx jest"] - -# build -[presets.nodejs.tasks.build.npm] -conditions = ["{{ 'package.json' | read | get('scripts.build') }}"] -commands = ["{{ nvm }}npm run build"] - -# publish -[presets.nodejs.tasks.publish.npm] -conditions = ["{{ 'package.json' | read | get('scripts.publish') }}"] -commands = ["{{ nvm }}npm run publish"] +# scripts +[presets.nodejs.tasks."{{ npm_scripts | tojson }}".npm] +commands = ["{{ nvm }}npm run {{ task }}"] # clean [presets.nodejs.tasks.clean.node_modules] @@ -36,4 +26,6 @@ commands = ["rm -rf node_modules"] # version [presets.nodejs.tasks.version.npm] conditions = ["{{ version }}"] -commands = ["{{ nvm }}npm version {{ version }} --allow-same-version --commit-hooks false --git-tag-version false"] +commands = [ + "{{ nvm }}npm version {{ version }} --allow-same-version --commit-hooks false --git-tag-version false", +] diff --git a/project_manager/preset/detector.py b/project_manager/preset/detector.py index bf85875..26a2bd9 100644 --- a/project_manager/preset/detector.py +++ b/project_manager/preset/detector.py @@ -15,6 +15,21 @@ class PresetEntryDetector(EntryDetector): def __init__(self, preset_loader_config: PresetLoaderConfig | None = None): self._preset_loader_config = preset_loader_config + def _expand_section( + self, + section: str, + template: PathTemplate, + variables: Variables, + ) -> dict[str, str | None]: + data = template.fill_template(section, variables) + try: + sections: dict[str, str | None] = json.loads(data) + if isinstance(sections, str): + sections = json.loads(sections) + except ValueError: + sections = {data: None} + return sections + # pylint:disable=too-many-locals,too-many-nested-blocks,too-many-branches def detect_entry(self, basepath: Path, rootpath: Path) -> Entry: template = PathTemplate(basepath) @@ -46,33 +61,37 @@ class PresetEntryDetector(EntryDetector): ): continue for task_name, task_pack in preset.tasks.items(): - for sub_tag, task_preset in task_pack.items(): - sub_tags = template.fill_template(sub_tag, preset_variables) - try: - sub_tags = json.loads(sub_tags) - except ValueError: - sub_tags = {sub_tags: None} - for i_sub_tag, i_sub_tag_value in sub_tags.items(): - if i_sub_tag_value: - preset_variables["item"] = i_sub_tag_value - if not task_preset.conditions or template.check_conditions( - task_preset.conditions, preset_variables - ): - variables = preset_variables.copy() - if task_preset.variables: - template.update_variables( - task_preset.variables, variables + task_names = self._expand_section(task_name, template, preset_variables) + for i_task_name, i_task_value in task_names.items(): + if i_task_value: + preset_variables["task"] = i_task_name + preset_variables["item"] = i_task_value + for sub_tag, task_preset in task_pack.items(): + sub_tags = self._expand_section( + sub_tag, template, preset_variables + ) + for i_sub_tag, i_sub_tag_value in sub_tags.items(): + if i_sub_tag_value: + preset_variables["sub_tag"] = i_sub_tag + preset_variables["item"] = i_sub_tag_value + if not task_preset.conditions or template.check_conditions( + task_preset.conditions, preset_variables + ): + variables = preset_variables.copy() + if task_preset.variables: + template.update_variables( + task_preset.variables, variables + ) + task = Task( + key=TaskKey(i_task_name, tag, i_sub_tag), + commands=[ + template.fill_template(command, variables) + for command in task_preset.commands + ], + priority=task_preset.priority, + cwd=task_preset.cwd, ) - task = Task( - key=TaskKey(task_name, tag, i_sub_tag), - commands=[ - template.fill_template(command, variables) - for command in task_preset.commands - ], - priority=task_preset.priority, - cwd=task_preset.cwd, - ) - tasks.append(task) + tasks.append(task) if tasks: tasks = sorted(tasks, key=operator.attrgetter("priority"), reverse=True) return Entry(tasks, entry_variables, basepath, rootpath)