presetter 3.1.1 → 3.4.0

package/README.md

@@ -4,14 +4,14 @@
 
 🏄🏻 _Setup build settings from a template, quick and right!_
 
-•   [Quick Start](#quick-start)   •   [Usage](#usage)   •   [Customisation](#customisation)   •
+•   [Quick Start](#quick-start)   •   [Usage](#usage)   •   [Customization](#customization)   •
 
 [![npm](https://img.shields.io/npm/v/presetter?style=flat-square)](https://github.com/alvis/presetter/releases)
 [![build](https://img.shields.io/github/workflow/status/alvis/presetter/code%20test?style=flat-square)](https://github.com/alvis/presetter/actions)
 [![maintainability](https://img.shields.io/codeclimate/maintainability/alvis/presetter?style=flat-square)](https://codeclimate.com/github/alvis/presetter/maintainability)
 [![coverage](https://img.shields.io/codeclimate/coverage/alvis/presetter?style=flat-square)](https://codeclimate.com/github/alvis/presetter/test_coverage)
 [![security](https://img.shields.io/snyk/vulnerabilities/github/alvis/presetter/packages/presetter/package.json.svg?style=flat-square)](https://snyk.io/test/github/alvis/presetter?targetFile=packages/presetter/package.json&style=flat-square)
-[![dependencies](https://img.shields.io/david/alvis/presetter?path=packages/presetter&style=flat-square)](https://david-dm.org/alvis/presetter?path=packages/presetter)
+[![dependencies](https://img.shields.io/librariesio/release/npm/presetter-presetter?style=flat-square)](https://libraries.io/npm/presetter-presetter)
 [![license](https://img.shields.io/github/license/alvis/presetter.svg?style=flat-square)](https://github.com/alvis/presetter/blob/master/LICENSE)
 
 </div>
@@ -21,7 +21,7 @@ How many dev dependencies you have to install before you can kick start a projec
 
 What's more, what if you want to update configs for all projects? :man_facepalming:
 
-**Presetter is a utility for setting up building tools for your project from a template.** This means with just only two dev packages, namely this package and your favourite template preset, all essential development packages, such as typescript, eslint and jest, together with their configuration files provided by the preset, are automatically setup for you upon the project's initialisation.
+**Presetter is a utility for setting up building tools for your project from a template.** This means with just only two dev packages, namely this package and your favorite template preset, all essential development packages, such as typescript, eslint and jest, together with their configuration files provided by the preset, are automatically setup for you upon the project's initialization.
 
 ---
 
@@ -128,13 +128,13 @@ _PROTIPS_: Install `presetter` globally via `npm install -g presetter` and you c
 
 ---
 
-## Customisation
+## Customization
 
-Presetter support customisation in two ways.
+Presetter support customization in two ways.
 
-#### Preset Customisation
+#### Preset Customization
 
-If your preset support customisation, you can supply the customisation parameter via the `config` field in `.presetterrc`.
+If your preset support customization, you can supply the customization parameter via the `config` field in `.presetterrc`.
 e.g. For [presetter-preset-essentials](https://github.com/alvis/presetter/tree/master/packages/preset-essentials), you can adding an expression to `.gitignore` with the following in `.presetterrc`:
 
 ```json

package/lib/content.d.ts

@@ -1,7 +1,49 @@
-import type { DynamicAsset, DynamicAssetField, PresetAsset, PresetContext, RequiredResolution, ResolvedPresetContext, Template } from './types';
-export declare function customise(template: Template, custom?: string[] | Record<string, unknown>): Template;
-export declare function generateContent(assets: PresetAsset[], context: PresetContext): Promise<Record<string, Template>>;
-export declare function getConfigKey(filename: string): string;
-export declare function getVariable(assets: PresetAsset[], context: PresetContext): Record<string, string>;
-export declare function resolveContext(assets: PresetAsset[], context: PresetContext): Promise<ResolvedPresetContext>;
-export declare function resolveDynamicMap<F extends DynamicAssetField>(assets: PresetAsset[], context: ResolvedPresetContext<RequiredResolution<F>>, field: F): Promise<Record<string, DynamicAsset<F>>>;
+import type { MergeMode } from './template';
+import type { Config, PresetContext, PresetGraph, PresetNode, PresetterConfig, ResolvedPresetContext, Template } from './types';
+export declare function resolveContext(_: {
+    graph: PresetGraph;
+    context: PresetContext;
+}): Promise<ResolvedPresetContext>;
+export declare function resolveNoSymlinks(_: {
+    graph: PresetGraph;
+    context: ResolvedPresetContext<'variable'>;
+}): Promise<string[]>;
+export declare function resolveSupplementaryConfig(_: {
+    graph: PresetGraph;
+    context: ResolvedPresetContext<'variable'>;
+}): Promise<Record<string, Config>>;
+export declare function resolveSupplementaryConfigFromNode(_: {
+    node: PresetNode;
+    context: ResolvedPresetContext<'variable'>;
+}): Promise<Record<string, Config>>;
+export declare function resolveSupplementaryScripts(_: {
+    graph: PresetGraph;
+    context: ResolvedPresetContext<'variable'>;
+}): Promise<Record<string, string>>;
+export declare function resolveSupplementaryScriptsFromNode(_: {
+    node: PresetNode;
+    context: ResolvedPresetContext<'variable'>;
+}): Promise<Record<string, string>>;
+export declare function resolveVariable(_: {
+    graph: PresetGraph;
+    config: PresetterConfig;
+}): Record<string, string>;
+export declare function mergeTemplate(current: Record<string, Template>, candidate: Record<string, Template>, options: {
+    mode: MergeMode;
+}): Record<string, Template>;
+export declare function resolveTemplate(_: {
+    graph: PresetGraph;
+    context: ResolvedPresetContext;
+}): Promise<Record<string, Template>>;
+export declare function resolveTemplateFromNode(_: {
+    node: PresetNode;
+    context: ResolvedPresetContext;
+}): Promise<Record<string, Template>>;
+export declare function resolveScripts(_: {
+    graph: PresetGraph;
+    context: ResolvedPresetContext<'variable'>;
+}): Promise<Record<string, string>>;
+export declare function resolveScriptsFromNode(_: {
+    node: PresetNode;
+    context: ResolvedPresetContext<'variable'>;
+}): Promise<Record<string, string>>;

package/lib/content.js

@@ -1,141 +1,135 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.customise = customise;
-exports.generateContent = generateContent;
-exports.getConfigKey = getConfigKey;
-exports.getVariable = getVariable;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveScriptsFromNode = exports.resolveScripts = exports.resolveTemplateFromNode = exports.resolveTemplate = exports.mergeTemplate = exports.resolveVariable = exports.resolveSupplementaryScriptsFromNode = exports.resolveSupplementaryScripts = exports.resolveSupplementaryConfigFromNode = exports.resolveSupplementaryConfig = exports.resolveNoSymlinks = exports.resolveContext = void 0;
+const path_1 = require("path");
+const resolution_1 = require("./resolution");
+const template_1 = require("./template");
+async function resolveContext(_) {
+    const { graph } = _;
+    const context = Object.assign(Object.assign({}, _.context), { custom: Object.assign(Object.assign({}, _.context.custom), { variable: resolveVariable({ graph, config: _.context.custom }) }) });
+    const config = await resolveSupplementaryConfig({ graph, context });
+    const noSymlinks = await resolveNoSymlinks({ graph, context });
+    const scripts = await resolveSupplementaryScripts({ graph, context });
+    return {
+        target: context.target,
+        custom: Object.assign(Object.assign({}, context.custom), { preset: context.custom.preset, config,
+            noSymlinks,
+            scripts }),
+    };
+}
 exports.resolveContext = resolveContext;
-exports.resolveDynamicMap = resolveDynamicMap;
-
-var _path = require("path");
-
-var _io = require("./io");
-
-var _template = require("./template");
-
-/*
- *                            *** MIT LICENSE ***
- * -------------------------------------------------------------------------
- * This code may be modified and distributed under the MIT license.
- * See the LICENSE file for details.
- * -------------------------------------------------------------------------
- *
- * @summary   Collection of config related helpers
- *
- * @author    Alvis HT Tang <alvis@hilbert.space>
- * @license   MIT
- * @copyright Copyright (c) 2021 - All Rights Reserved.
- * -------------------------------------------------------------------------
- */
-
-/**
- * customise the template with customisation from .presetterrc
- * @param template template configuration
- * @param custom content to be merged with the template configuration
- * @returns customised configuration
- */
-function customise(template, custom) {
-  if (typeof template === 'string' && Array.isArray(custom)) {
-    return (0, _template.merge)(template.split('\n'), custom).join('\n');
-  } else if (typeof template === 'object' && !Array.isArray(custom)) {
-    return (0, _template.merge)(template, custom);
-  } else {
-    return template;
-  }
+async function resolveNoSymlinks(_) {
+    var _a;
+    const { graph, context } = _;
+    const fromPreset = (await Promise.all(graph.map(async (node) => resolveNoSymlinksFromNode({ node, context })))).flat();
+    const fromUser = (_a = context.custom.noSymlinks) !== null && _a !== void 0 ? _a : [];
+    return [...new Set([...fromPreset, ...fromUser])];
+}
+exports.resolveNoSymlinks = resolveNoSymlinks;
+async function resolveNoSymlinksFromNode(_) {
+    var _a;
+    const { node, context } = _;
+    const { asset, nodes } = node;
+    const fromChildren = (await Promise.all(nodes.map(async (extension) => resolveNoSymlinksFromNode({ node: extension, context })))).flat();
+    const fromPreset = await (0, resolution_1.loadDynamic)((_a = asset.noSymlinks) !== null && _a !== void 0 ? _a : [], context);
+    return [...new Set([...fromChildren, ...fromPreset])];
+}
+async function resolveSupplementaryConfig(_) {
+    const { graph, context } = _;
+    const fromPresets = (await Promise.all(graph.map(async (node) => resolveSupplementaryConfigFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
+    return (0, template_1.merge)(fromPresets, context.custom.config, { mode: 'overwrite' });
+}
+exports.resolveSupplementaryConfig = resolveSupplementaryConfig;
+async function resolveSupplementaryConfigFromNode(_) {
+    const { node, context } = _;
+    const { asset, nodes } = node;
+    const fromChildren = (await Promise.all(nodes.map(async (node) => resolveSupplementaryConfigFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
+    const fromPreset = await (0, resolution_1.loadDynamicMap)(asset.supplementaryConfig, context);
+    return (0, template_1.merge)(fromChildren, fromPreset, { mode: 'addition' });
+}
+exports.resolveSupplementaryConfigFromNode = resolveSupplementaryConfigFromNode;
+async function resolveSupplementaryScripts(_) {
+    const { graph, context } = _;
+    const fromPresets = (await Promise.all(graph.map(async (node) => resolveSupplementaryScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
+    return (0, template_1.merge)(fromPresets, context.custom.scripts, { mode: 'overwrite' });
+}
+exports.resolveSupplementaryScripts = resolveSupplementaryScripts;
+async function resolveSupplementaryScriptsFromNode(_) {
+    const { node, context } = _;
+    const { asset, nodes } = node;
+    const { supplementaryScripts } = asset;
+    const fromChildren = (await Promise.all(nodes.map(async (node) => resolveSupplementaryScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
+    const fromPreset = await (0, resolution_1.loadDynamic)(supplementaryScripts !== null && supplementaryScripts !== void 0 ? supplementaryScripts : {}, context);
+    return (0, template_1.merge)(fromChildren, fromPreset, { mode: 'addition' });
+}
+exports.resolveSupplementaryScriptsFromNode = resolveSupplementaryScriptsFromNode;
+function resolveVariable(_) {
+    const { graph, config } = _;
+    const fromPresets = graph
+        .map((node) => resolveVariableFromNode({ node }))
+        .reduce((merged, next) => (0, template_1.merge)(merged, next), {});
+    return (0, template_1.merge)(fromPresets, config.variable);
+}
+exports.resolveVariable = resolveVariable;
+function resolveVariableFromNode(_) {
+    const { node } = _;
+    const { asset, nodes } = node;
+    const fromChildren = nodes
+        .map((node) => resolveVariableFromNode({ node }))
+        .reduce((merged, next) => (0, template_1.merge)(merged, next), {});
+    return (0, template_1.merge)(fromChildren, asset.variable);
 }
-/**
- * generate configuration content from preset with user customisation
- * @param assets list of preset assets
- * @param context context about the target project and any customisation in .presetterrc
- * @returns a map of configuration content
- */
-
-
-async function generateContent(assets, context) {
-  const resolvedContext = await resolveContext(assets, context);
-  const resolvedTemplate = await resolveDynamicMap(assets, resolvedContext, 'template'); // merge templates with custom configuration
-
-  const custom = Object.fromEntries(await Promise.all(Object.entries(resolvedTemplate).map(async ([relativePath, templateConfig]) => {
-    const customConfig = resolvedContext.custom.config[getConfigKey(relativePath)];
-    return [relativePath, customise(templateConfig, customConfig)];
-  })));
-  return (0, _template.template)(custom, resolvedContext.custom.variable);
+function mergeTemplate(current, candidate, options) {
+    const resolvedMerge = Object.fromEntries(Object.entries(current).map(([path, template]) => {
+        const isIgnoreFile = !(0, path_1.extname)(path) && typeof template === 'string';
+        const modeForText = isIgnoreFile ? 'addition' : 'overwrite';
+        const mode = typeof template === 'string' ? modeForText : options.mode;
+        return [path, (0, template_1.merge)(template, candidate[path], { mode })];
+    }));
+    return Object.assign(Object.assign({}, candidate), resolvedMerge);
 }
-/**
- * compute the corresponding field within the config field of .presetterrc
- * @param filename symlink name
- * @returns field name in config
- */
-
-
-function getConfigKey(filename) {
-  return (0, _path.basename)(filename, (0, _path.extname)(filename)).replace(/^\./, '').replace(/rc$/, '').replace(/\.config$/, '');
+exports.mergeTemplate = mergeTemplate;
+async function resolveTemplate(_) {
+    var _a;
+    const { graph, context } = _;
+    const fromPreset = (await Promise.all(graph.map(async (node) => resolveTemplateFromNode({ node, context })))).reduce((merged, next) => mergeTemplate(merged, next, { mode: 'overwrite' }), {});
+    const merged = Object.fromEntries(Object.entries(fromPreset).map(([path, current]) => {
+        const config = context.custom.config[(0, resolution_1.getConfigKey)(path)];
+        const candidate = Array.isArray(config) ? config.join('\n') : config;
+        const options = { mode: 'addition' };
+        return [path, (0, template_1.merge)(current, candidate, options)];
+    }));
+    const resolvedTemplate = (0, template_1.filter)(merged, ...((_a = context.custom.ignores) !== null && _a !== void 0 ? _a : []));
+    return (0, template_1.template)(resolvedTemplate, context.custom.variable);
 }
-/**
- * combine the default variables from presets with custom variables
- * @param assets list of preset assets
- * @param context context about the target project and any customisation in .presetterrc
- * @returns combined variables
- */
-
-
-function getVariable(assets, context) {
-  const variables = assets.map(asset => asset.variable).filter(variable => !!variable);
-  const variableFromPresets = variables.reduce((merged, variable) => (0, _template.merge)(merged, variable), {});
-  const variableWithCustomConfig = (0, _template.merge)(variableFromPresets, context.custom.variable);
-  return { ...variableWithCustomConfig
-  };
+exports.resolveTemplate = resolveTemplate;
+async function resolveTemplateFromNode(_) {
+    const { node, context } = _;
+    const { asset, nodes } = node;
+    const { supplementaryIgnores } = asset;
+    const fromChildren = (await Promise.all(nodes.map(async (node) => resolveTemplateFromNode({ node, context })))).reduce((current, next) => mergeTemplate(current, next, { mode: 'overwrite' }), {});
+    const fromPreset = await (0, resolution_1.loadDynamicMap)(asset.template, context);
+    const merged = mergeTemplate(fromChildren, fromPreset, { mode: 'addition' });
+    const ignoreRules = typeof supplementaryIgnores === 'function'
+        ? await supplementaryIgnores(context)
+        : supplementaryIgnores;
+    return (0, template_1.filter)(merged, ...(ignoreRules !== null && ignoreRules !== void 0 ? ignoreRules : []));
 }
-/**
- * resolve context values which may be dynamic
- * @param assets list of preset assets
- * @param context context about the target project and any customisation in .presetterrc
- * @returns a context with no further dynamic content
- */
-
-
-async function resolveContext(assets, context) {
-  var _context$custom$noSym;
-
-  const variableContext = { ...context,
-    custom: { ...context.custom,
-      variable: getVariable(assets, context)
-    }
-  };
-  const config = (0, _template.merge)(await resolveDynamicMap(assets, variableContext, 'supplementaryConfig'), context.custom.config);
-  const customList = (_context$custom$noSym = context.custom.noSymlinks) !== null && _context$custom$noSym !== void 0 ? _context$custom$noSym : [];
-  const assetList = assets.map(async ({
-    noSymlinks
-  }) => (0, _io.loadDynamic)(noSymlinks !== null && noSymlinks !== void 0 ? noSymlinks : [], variableContext));
-  const noSymlinks = [...(await Promise.all(assetList)), ...customList].flat();
-  return { ...variableContext,
-    custom: { ...variableContext.custom,
-      config,
-      noSymlinks: [...new Set(noSymlinks)]
-    }
-  };
+exports.resolveTemplateFromNode = resolveTemplateFromNode;
+async function resolveScripts(_) {
+    const { graph, context } = _;
+    const fromPresets = (await Promise.all(graph.map(async (node) => resolveScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
+    const fromConfig = context.custom.scripts;
+    return (0, template_1.template)((0, template_1.merge)(fromPresets, fromConfig, { mode: 'addition' }), context.custom.variable);
 }
-/**
- * resolve a dynamic asset content
- * @param assets list of preset assets
- * @param context arguments to be passed to the generator function
- * @param field field name of PresetAsset to be resolved
- * @returns content of the resolved field
- */
-
-
-async function resolveDynamicMap(assets, context, field) {
-  // load templated configuration from presets
-  const templates = await Promise.all(assets.map(async asset => {
-    const content = asset[field];
-    return Object.fromEntries(await Promise.all(Object.entries(content instanceof Function ? await content(context) : { ...content
-    }).map(async ([relativePath, value]) => [relativePath, // load a file if it's a valid path only
-    typeof value === 'string' && (0, _path.isAbsolute)(value) ? await (0, _io.loadFile)(value) : await (0, _io.loadDynamic)(value, context)])));
-  })); // merge all maps
-
-  return templates.reduce((merged, map) => (0, _template.merge)(merged, map), {});
+exports.resolveScripts = resolveScripts;
+async function resolveScriptsFromNode(_) {
+    var _a;
+    const { node, context } = _;
+    const { asset, nodes } = node;
+    const fromChildren = (await Promise.all(nodes.map(async (node) => resolveScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
+    const fromPreset = await (0, resolution_1.loadDynamic)((_a = asset.scripts) !== null && _a !== void 0 ? _a : {}, context);
+    return (0, template_1.merge)(fromChildren, fromPreset, { mode: 'addition' });
 }
-//# sourceMappingURL=content.js.map
+exports.resolveScriptsFromNode = resolveScriptsFromNode;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"content.js","sourceRoot":"","sources":["../source/content.ts"],"names":[],"mappings":"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"}