presetter 3.4.0 → 3.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/content.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import type { MergeMode } from './template';
2
1
  import type { Config, PresetContext, PresetGraph, PresetNode, PresetterConfig, ResolvedPresetContext, Template } from './types';
3
2
  export declare function resolveContext(_: {
4
3
  graph: PresetGraph;
@@ -28,17 +27,6 @@ export declare function resolveVariable(_: {
28
27
  graph: PresetGraph;
29
28
  config: PresetterConfig;
30
29
  }): Record<string, string>;
31
- export declare function mergeTemplate(current: Record<string, Template>, candidate: Record<string, Template>, options: {
32
- mode: MergeMode;
33
- }): Record<string, Template>;
34
- export declare function resolveTemplate(_: {
35
- graph: PresetGraph;
36
- context: ResolvedPresetContext;
37
- }): Promise<Record<string, Template>>;
38
- export declare function resolveTemplateFromNode(_: {
39
- node: PresetNode;
40
- context: ResolvedPresetContext;
41
- }): Promise<Record<string, Template>>;
42
30
  export declare function resolveScripts(_: {
43
31
  graph: PresetGraph;
44
32
  context: ResolvedPresetContext<'variable'>;
@@ -47,3 +35,11 @@ export declare function resolveScriptsFromNode(_: {
47
35
  node: PresetNode;
48
36
  context: ResolvedPresetContext<'variable'>;
49
37
  }): Promise<Record<string, string>>;
38
+ export declare function resolveTemplate(_: {
39
+ graph: PresetGraph;
40
+ context: ResolvedPresetContext;
41
+ }): Promise<Record<string, Template>>;
42
+ export declare function resolveTemplateFromNode(_: {
43
+ node: PresetNode;
44
+ context: ResolvedPresetContext;
45
+ }): Promise<Record<string, Template>>;
package/lib/content.js CHANGED
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- 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;
4
- const path_1 = require("path");
3
+ exports.resolveTemplateFromNode = exports.resolveTemplate = exports.resolveScriptsFromNode = exports.resolveScripts = exports.resolveVariable = exports.resolveSupplementaryScriptsFromNode = exports.resolveSupplementaryScripts = exports.resolveSupplementaryConfigFromNode = exports.resolveSupplementaryConfig = exports.resolveNoSymlinks = exports.resolveContext = void 0;
5
4
  const resolution_1 = require("./resolution");
6
5
  const template_1 = require("./template");
7
6
  async function resolveContext(_) {
@@ -36,31 +35,31 @@ async function resolveNoSymlinksFromNode(_) {
36
35
  }
37
36
  async function resolveSupplementaryConfig(_) {
38
37
  const { graph, context } = _;
39
- const fromPresets = (await Promise.all(graph.map(async (node) => resolveSupplementaryConfigFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
40
- return (0, template_1.merge)(fromPresets, context.custom.config, { mode: 'overwrite' });
38
+ const fromPresets = (await Promise.all(graph.map(async (node) => resolveSupplementaryConfigFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next), {});
39
+ return (0, template_1.merge)(fromPresets, context.custom.config);
41
40
  }
42
41
  exports.resolveSupplementaryConfig = resolveSupplementaryConfig;
43
42
  async function resolveSupplementaryConfigFromNode(_) {
44
43
  const { node, context } = _;
45
44
  const { asset, nodes } = node;
46
- const fromChildren = (await Promise.all(nodes.map(async (node) => resolveSupplementaryConfigFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
45
+ const fromChildren = (await Promise.all(nodes.map(async (node) => resolveSupplementaryConfigFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next), {});
47
46
  const fromPreset = await (0, resolution_1.loadDynamicMap)(asset.supplementaryConfig, context);
48
- return (0, template_1.merge)(fromChildren, fromPreset, { mode: 'addition' });
47
+ return (0, template_1.merge)(fromChildren, fromPreset);
49
48
  }
50
49
  exports.resolveSupplementaryConfigFromNode = resolveSupplementaryConfigFromNode;
51
50
  async function resolveSupplementaryScripts(_) {
52
51
  const { graph, context } = _;
53
- const fromPresets = (await Promise.all(graph.map(async (node) => resolveSupplementaryScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
54
- return (0, template_1.merge)(fromPresets, context.custom.scripts, { mode: 'overwrite' });
52
+ const fromPresets = (await Promise.all(graph.map(async (node) => resolveSupplementaryScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next), {});
53
+ return (0, template_1.merge)(fromPresets, context.custom.scripts);
55
54
  }
56
55
  exports.resolveSupplementaryScripts = resolveSupplementaryScripts;
57
56
  async function resolveSupplementaryScriptsFromNode(_) {
58
57
  const { node, context } = _;
59
58
  const { asset, nodes } = node;
60
59
  const { supplementaryScripts } = asset;
61
- const fromChildren = (await Promise.all(nodes.map(async (node) => resolveSupplementaryScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
60
+ const fromChildren = (await Promise.all(nodes.map(async (node) => resolveSupplementaryScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next), {});
62
61
  const fromPreset = await (0, resolution_1.loadDynamic)(supplementaryScripts !== null && supplementaryScripts !== void 0 ? supplementaryScripts : {}, context);
63
- return (0, template_1.merge)(fromChildren, fromPreset, { mode: 'addition' });
62
+ return (0, template_1.merge)(fromChildren, fromPreset);
64
63
  }
65
64
  exports.resolveSupplementaryScriptsFromNode = resolveSupplementaryScriptsFromNode;
66
65
  function resolveVariable(_) {
@@ -79,26 +78,32 @@ function resolveVariableFromNode(_) {
79
78
  .reduce((merged, next) => (0, template_1.merge)(merged, next), {});
80
79
  return (0, template_1.merge)(fromChildren, asset.variable);
81
80
  }
82
- function mergeTemplate(current, candidate, options) {
83
- const resolvedMerge = Object.fromEntries(Object.entries(current).map(([path, template]) => {
84
- const isIgnoreFile = !(0, path_1.extname)(path) && typeof template === 'string';
85
- const modeForText = isIgnoreFile ? 'addition' : 'overwrite';
86
- const mode = typeof template === 'string' ? modeForText : options.mode;
87
- return [path, (0, template_1.merge)(template, candidate[path], { mode })];
88
- }));
89
- return Object.assign(Object.assign({}, candidate), resolvedMerge);
81
+ async function resolveScripts(_) {
82
+ const { graph, context } = _;
83
+ const fromPresets = (await Promise.all(graph.map(async (node) => resolveScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next), {});
84
+ const fromConfig = context.custom.scripts;
85
+ return (0, template_1.template)((0, template_1.merge)(fromPresets, fromConfig), context.custom.variable);
86
+ }
87
+ exports.resolveScripts = resolveScripts;
88
+ async function resolveScriptsFromNode(_) {
89
+ var _a;
90
+ const { node, context } = _;
91
+ const { asset, nodes } = node;
92
+ const fromChildren = (await Promise.all(nodes.map(async (node) => resolveScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next), {});
93
+ const fromPreset = await (0, resolution_1.loadDynamic)((_a = asset.scripts) !== null && _a !== void 0 ? _a : {}, context);
94
+ return (0, template_1.merge)(fromChildren, fromPreset);
90
95
  }
91
- exports.mergeTemplate = mergeTemplate;
96
+ exports.resolveScriptsFromNode = resolveScriptsFromNode;
92
97
  async function resolveTemplate(_) {
93
98
  var _a;
94
99
  const { graph, context } = _;
95
- const fromPreset = (await Promise.all(graph.map(async (node) => resolveTemplateFromNode({ node, context })))).reduce((merged, next) => mergeTemplate(merged, next, { mode: 'overwrite' }), {});
96
- const merged = Object.fromEntries(Object.entries(fromPreset).map(([path, current]) => {
100
+ const fromPreset = (await Promise.all(graph.map(async (node) => resolveTemplateFromNode({ node, context })))).reduce((merged, next) => (0, template_1.mergeTemplate)(merged, next), {});
101
+ const customTemplate = Object.fromEntries(Object.entries(fromPreset).map(([path, current]) => {
97
102
  const config = context.custom.config[(0, resolution_1.getConfigKey)(path)];
98
103
  const candidate = Array.isArray(config) ? config.join('\n') : config;
99
- const options = { mode: 'addition' };
100
- return [path, (0, template_1.merge)(current, candidate, options)];
104
+ return [path, candidate !== null && candidate !== void 0 ? candidate : current];
101
105
  }));
106
+ const merged = (0, template_1.mergeTemplate)(fromPreset, customTemplate);
102
107
  const resolvedTemplate = (0, template_1.filter)(merged, ...((_a = context.custom.ignores) !== null && _a !== void 0 ? _a : []));
103
108
  return (0, template_1.template)(resolvedTemplate, context.custom.variable);
104
109
  }
@@ -107,29 +112,13 @@ async function resolveTemplateFromNode(_) {
107
112
  const { node, context } = _;
108
113
  const { asset, nodes } = node;
109
114
  const { supplementaryIgnores } = asset;
110
- const fromChildren = (await Promise.all(nodes.map(async (node) => resolveTemplateFromNode({ node, context })))).reduce((current, next) => mergeTemplate(current, next, { mode: 'overwrite' }), {});
115
+ const fromChildren = (await Promise.all(nodes.map(async (node) => resolveTemplateFromNode({ node, context })))).reduce((current, next) => (0, template_1.mergeTemplate)(current, next), {});
111
116
  const fromPreset = await (0, resolution_1.loadDynamicMap)(asset.template, context);
112
- const merged = mergeTemplate(fromChildren, fromPreset, { mode: 'addition' });
117
+ const merged = (0, template_1.mergeTemplate)(fromChildren, fromPreset);
113
118
  const ignoreRules = typeof supplementaryIgnores === 'function'
114
119
  ? await supplementaryIgnores(context)
115
120
  : supplementaryIgnores;
116
121
  return (0, template_1.filter)(merged, ...(ignoreRules !== null && ignoreRules !== void 0 ? ignoreRules : []));
117
122
  }
118
123
  exports.resolveTemplateFromNode = resolveTemplateFromNode;
119
- async function resolveScripts(_) {
120
- const { graph, context } = _;
121
- const fromPresets = (await Promise.all(graph.map(async (node) => resolveScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
122
- const fromConfig = context.custom.scripts;
123
- return (0, template_1.template)((0, template_1.merge)(fromPresets, fromConfig, { mode: 'addition' }), context.custom.variable);
124
- }
125
- exports.resolveScripts = resolveScripts;
126
- async function resolveScriptsFromNode(_) {
127
- var _a;
128
- const { node, context } = _;
129
- const { asset, nodes } = node;
130
- const fromChildren = (await Promise.all(nodes.map(async (node) => resolveScriptsFromNode({ node, context })))).reduce((merged, next) => (0, template_1.merge)(merged, next, { mode: 'overwrite' }), {});
131
- const fromPreset = await (0, resolution_1.loadDynamic)((_a = asset.scripts) !== null && _a !== void 0 ? _a : {}, context);
132
- return (0, template_1.merge)(fromChildren, fromPreset, { mode: 'addition' });
133
- }
134
- exports.resolveScriptsFromNode = resolveScriptsFromNode;
135
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"content.js","sourceRoot":"","sources":["../source/content.ts"],"names":[],"mappings":"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"}
124
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"content.js","sourceRoot":"","sources":["../source/content.ts"],"names":[],"mappings":"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"}
package/lib/template.d.ts CHANGED
@@ -1,11 +1,16 @@
1
1
  import type { IgnoreRule } from './types';
2
- export declare type MergeMode = 'addition' | 'overwrite';
2
+ import type { JsonObject, JsonValue } from 'type-fest';
3
+ declare type MergedType<A, B> = A extends JsonObject ? B extends JsonObject ? A & B : MergedArray<A, B> : MergedArray<A, B>;
4
+ declare type MergedArray<A, B> = A extends JsonValue[] ? B extends JsonValue[] ? Array<A[number] | B[number]> : keyof B extends `${number}` ? JsonValue[] : B : B;
3
5
  export declare function filter<C extends Record<string, unknown>>(subject: C, ...ignores: IgnoreRule[]): C;
4
6
  export declare function filter(subject: unknown[], ...ignores: IgnoreRule[]): unknown[];
5
- export declare function isJSON(subject: unknown): subject is Record<string, any>;
6
- export declare function merge<S extends string | Record<string, any> | unknown[]>(source: S, replacement?: string | Record<string, any> | unknown[], options?: {
7
- mode?: MergeMode;
8
- }): S;
7
+ export declare function isJSON(subject: unknown): subject is JsonObject;
8
+ export declare function merge<S extends JsonValue, T extends JsonValue>(source: S, target?: T): MergedType<S, T>;
9
+ export declare function mergeArray<S extends JsonValue, T extends JsonValue>(source: S[], target?: T): MergedArray<S[], T>;
10
+ export declare function mergeArrays<S extends JsonValue, T extends JsonValue>(source: S[], target: T[]): MergedArray<S[], T[]>;
11
+ export declare function mergeObject<S extends JsonObject, T extends JsonValue>(source: S, target?: T): MergedType<S, T>;
12
+ export declare function mergeTemplate(source: Record<string, JsonObject | string>, target: Record<string, JsonObject | string>): Record<string, JsonObject | string>;
9
13
  export declare function template(content: string, parameter: Record<string, string>): string;
10
14
  export declare function template<Content extends Record<string, unknown> | unknown[]>(content: Content, parameter: Record<string, string>): Content;
11
15
  export declare function template(content: unknown, parameter: Record<string, string>): unknown;
16
+ export {};
package/lib/template.js CHANGED
@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.template = exports.merge = exports.isJSON = exports.filter = void 0;
6
+ exports.template = exports.mergeTemplate = exports.mergeObject = exports.mergeArrays = exports.mergeArray = exports.merge = exports.isJSON = exports.filter = void 0;
7
+ const path_1 = require("path");
7
8
  const pupa_1 = __importDefault(require("pupa"));
8
9
  function filter(subject, ...ignores) {
9
10
  const fieldsToIgnore = ignores.filter((ignore) => typeof ignore !== 'object');
@@ -31,53 +32,69 @@ function isJSON(subject) {
31
32
  ].every((value) => value);
32
33
  }
33
34
  exports.isJSON = isJSON;
34
- function merge(source, replacement, options) {
35
- const { mode = 'addition' } = options !== null && options !== void 0 ? options : {};
35
+ function merge(source, target) {
36
36
  if (Array.isArray(source)) {
37
- return replace(source, replacement, { mode });
37
+ return mergeArray(source, target);
38
38
  }
39
- else if (typeof source === 'string' || typeof replacement === 'string') {
40
- return mergeText(source, replacement, { mode });
39
+ else if (isJSON(source)) {
40
+ return mergeObject(source, target);
41
41
  }
42
- const keys = [...Object.keys(source), ...Object.keys(replacement !== null && replacement !== void 0 ? replacement : {})];
43
- const entries = keys.map((key) => [
44
- key,
45
- replace(source[key], replacement === null || replacement === void 0 ? void 0 : replacement[key], { mode }),
46
- ]);
47
- return Object.assign({}, ...entries.map(([key, value]) => ({
48
- [key]: value,
49
- })));
42
+ return (target !== null && target !== void 0 ? target : source);
50
43
  }
51
44
  exports.merge = merge;
52
- function mergeText(current, candidate, options) {
53
- if (typeof current === 'string' &&
54
- typeof candidate === 'string' &&
55
- options.mode === 'addition') {
56
- return [...new Set(`${current}\n${candidate}`.split('\n'))].join('\n');
57
- }
58
- return typeof current === typeof candidate ? candidate : current;
59
- }
60
- function replace(source, replacement, options) {
61
- const { mode } = options;
62
- if (mode === 'addition' && Array.isArray(source)) {
63
- return replaceArray(source, replacement);
45
+ function mergeArray(source, target) {
46
+ if (Array.isArray(target)) {
47
+ return mergeArrays(source, target);
64
48
  }
65
- else if (isJSON(source) && isJSON(replacement)) {
66
- return merge(source, replacement, options);
49
+ else if (isJSON(target) &&
50
+ [...Object.keys(target)].every((key) => parseInt(key) >= 0)) {
51
+ return [...source].map((value, key) => merge(value, target[key]));
67
52
  }
68
- return replacement === undefined ? source : replacement;
53
+ return (target !== null && target !== void 0 ? target : source);
69
54
  }
70
- function replaceArray(source, replacement) {
71
- if (isJSON(replacement)) {
72
- return source.map((value, index) => replace(value, replacement[index], { mode: 'addition' }));
73
- }
74
- else if (Array.isArray(replacement)) {
75
- return [...new Set([...source, ...replacement]).values()];
55
+ exports.mergeArray = mergeArray;
56
+ function mergeArrays(source, target) {
57
+ const isPrimitive = source.every((value) => !isJSON(value)) &&
58
+ target.every((value) => !isJSON(value));
59
+ if (isPrimitive) {
60
+ return [...new Set([...source, ...target])];
76
61
  }
77
- else {
78
- return replacement !== null && replacement !== void 0 ? replacement : source;
62
+ return target;
63
+ }
64
+ exports.mergeArrays = mergeArrays;
65
+ function mergeObject(source, target) {
66
+ if (isJSON(target)) {
67
+ const mergedSource = Object.fromEntries(Object.entries(source).map(([key, value]) => [
68
+ key,
69
+ merge(value, target[key]),
70
+ ]));
71
+ return Object.assign(Object.assign(Object.assign({}, mergedSource), target), mergedSource);
79
72
  }
73
+ return (target !== null && target !== void 0 ? target : source);
74
+ }
75
+ exports.mergeObject = mergeObject;
76
+ function mergeTemplate(source, target) {
77
+ const mergedSource = Object.fromEntries(Object.entries(source).map(([path, template]) => {
78
+ const replacement = target[path];
79
+ const isIgnoreFile = !(0, path_1.extname)(path) &&
80
+ (0, path_1.basename)(path).startsWith('.') &&
81
+ typeof template === 'string' &&
82
+ typeof replacement === 'string';
83
+ if (isIgnoreFile) {
84
+ const mergedSet = new Set([
85
+ ...template.split('\n'),
86
+ ...replacement.split('\n'),
87
+ ]);
88
+ return [path, [...mergedSet].join('\n')];
89
+ }
90
+ else if (isJSON(template) && isJSON(replacement)) {
91
+ return [path, merge(template, replacement)];
92
+ }
93
+ return [path, replacement !== null && replacement !== void 0 ? replacement : template];
94
+ }));
95
+ return Object.assign(Object.assign({}, target), mergedSource);
80
96
  }
97
+ exports.mergeTemplate = mergeTemplate;
81
98
  function template(content, parameter) {
82
99
  if (typeof content === 'string') {
83
100
  return (0, pupa_1.default)(content, parameter);
@@ -95,4 +112,4 @@ function template(content, parameter) {
95
112
  }
96
113
  }
97
114
  exports.template = template;
98
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zb3VyY2UvdGVtcGxhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBZUEsZ0RBQXdCO0FBaUJ4QixTQUFnQixNQUFNLENBQ3BCLE9BQTRDLEVBQzVDLEdBQUcsT0FBcUI7SUFHeEIsTUFBTSxjQUFjLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FDbkMsQ0FBQyxNQUFNLEVBQTZCLEVBQUUsQ0FBQyxPQUFPLE1BQU0sS0FBSyxRQUFRLENBQ2xFLENBQUM7SUFHRixJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7UUFDMUIsT0FBTyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7S0FDbEU7SUFHRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUNsQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FDNUUsQ0FBQztJQUdGLE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQzlCLENBQUMsTUFBTSxFQUF3QyxFQUFFLENBQy9DLE9BQU8sTUFBTSxLQUFLLFFBQVEsQ0FDN0IsQ0FBQztJQUdGLE9BQU8sU0FBUyxDQUFDLE1BQU0sQ0FDckIsQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsRUFBRSxDQUMvQixNQUFNLENBQUMsV0FBVyxDQUNoQixNQUFNLENBQUMsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUMsR0FBRyxDQUNsQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFxQixFQUFFLENBQUM7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
115
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zb3VyY2UvdGVtcGxhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBZUEsK0JBQXlDO0FBQ3pDLGdEQUF3QjtBQThCeEIsU0FBZ0IsTUFBTSxDQUNwQixPQUE0QyxFQUM1QyxHQUFHLE9BQXFCO0lBR3hCLE1BQU0sY0FBYyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQ25DLENBQUMsTUFBTSxFQUE2QixFQUFFLENBQUMsT0FBTyxNQUFNLEtBQUssUUFBUSxDQUNsRSxDQUFDO0lBR0YsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQzFCLE9BQU8sT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0tBQ2xFO0lBR0QsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FDbEMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQzVFLENBQUM7SUFHRixNQUFNLFNBQVMsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUM5QixDQUFDLE1BQU0sRUFBd0MsRUFBRSxDQUMvQyxPQUFPLE1BQU0sS0FBSyxRQUFRLENBQzdCLENBQUM7SUFHRixPQUFPLFNBQVMsQ0FBQyxNQUFNLENBQ3JCLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxFQUFFLEVBQUUsQ0FDL0IsTUFBTSxDQUFDLFdBQVcsQ0FDaEIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLEdBQUcsQ0FDbEMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsRUFB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
package/lib/types.d.ts CHANGED
@@ -1,18 +1,19 @@
1
1
  import type { PackageJson } from 'read-pkg-up';
2
+ import type { JsonObject } from 'type-fest';
2
3
  export declare type PresetGraph = PresetNode[];
3
4
  export declare type PresetNode = {
4
5
  name: string;
5
6
  asset: PresetAsset;
6
7
  nodes: PresetGraph;
7
8
  };
8
- export interface PresetterConfig {
9
+ export declare type PresetterConfig = {
9
10
  preset: string | string[];
10
- config?: Record<string, Record<string, unknown> | string[]>;
11
+ config?: Record<string, JsonObject | string[]>;
11
12
  scripts?: Record<string, string>;
12
13
  variable?: Record<string, string>;
13
14
  ignores?: IgnoreRule[];
14
15
  noSymlinks?: string[];
15
- }
16
+ };
16
17
  export interface PresetAsset {
17
18
  extends?: string[];
18
19
  template?: TemplateMap | TemplateMapGenerator;
@@ -24,7 +25,7 @@ export interface PresetAsset {
24
25
  supplementaryScripts?: Record<string, string> | string;
25
26
  }
26
27
  export interface ResolvedPresetAsset extends Omit<PresetAsset, 'extends'> {
27
- template?: Record<string, Record<string, unknown>>;
28
+ template?: Record<string, Template>;
28
29
  noSymlinks?: string[];
29
30
  scripts?: Record<string, string>;
30
31
  variable?: Record<string, string>;
@@ -49,11 +50,11 @@ export interface ResolvedPresetContext<F extends keyof PresetterConfig = 'config
49
50
  };
50
51
  }
51
52
  declare type Path = string;
52
- export declare type Template = string | Record<string, unknown>;
53
+ export declare type Template = string | JsonObject;
53
54
  export declare type TemplateGenerator = Generator<Template>;
54
55
  export declare type TemplateMap = Record<string, Path | Template | TemplateGenerator>;
55
56
  export declare type TemplateMapGenerator = Generator<TemplateMap>;
56
- export declare type Config = string[] | Record<string, unknown>;
57
+ export declare type Config = string[] | JsonObject;
57
58
  export declare type ConfigGenerator = Generator<Config>;
58
59
  export declare type ConfigMap = Record<string, Path | Config | ConfigGenerator>;
59
60
  export declare type ConfigMapGenerator = Generator<ConfigMap, 'variable'>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "presetter",
3
- "version": "3.4.0",
3
+ "version": "3.4.1",
4
4
  "engines": {
5
5
  "node": ">=12.10.0"
6
6
  },
@@ -59,19 +59,20 @@
59
59
  "@types/yargs": "^17.0.0",
60
60
  "presetter-preset-strict": "file:../preset-strict",
61
61
  "ts-node": "^10.0.0",
62
- "tsconfig-paths": "^3.0.0",
62
+ "tsconfig-paths": "^4.0.0",
63
+ "type-fest": "^2.0.0",
63
64
  "typescript": "^4.0.0"
64
65
  },
65
66
  "dependencies": {
66
- "@npmcli/arborist": "^4.0.0",
67
- "@npmcli/config": "^2.2.0",
67
+ "@npmcli/arborist": "^5.0.0",
68
+ "@npmcli/config": "^4.0.0",
68
69
  "callsite-record": "^4.0.0",
69
70
  "chalk": "^4.0.0",
70
71
  "execa": "^5.0.0",
71
72
  "fs-extra": "^10.0.0",
72
73
  "js-yaml": "^4.0.0",
73
74
  "lodash": "^4.0.0",
74
- "mvdan-sh": "^0.5.0",
75
+ "mvdan-sh": "^0.10.0",
75
76
  "pupa": "^2.0.0",
76
77
  "read-pkg": "^5.0.0",
77
78
  "read-pkg-up": "^7.0.0",