@fynpo/base 1.1.12 → 1.1.13
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/dist/caching.d.ts +23 -6
- package/dist/caching.js +27 -16
- package/dist/caching.js.map +1 -1
- package/dist/minimatch-group.d.ts +26 -0
- package/dist/minimatch-group.js +73 -1
- package/dist/minimatch-group.js.map +1 -1
- package/package.json +1 -1
package/dist/caching.d.ts
CHANGED
|
@@ -16,7 +16,17 @@ declare type FilesFilterPatterns = {
|
|
|
16
16
|
/**
|
|
17
17
|
*
|
|
18
18
|
*/
|
|
19
|
-
declare type
|
|
19
|
+
declare type CacheBaseRule = {
|
|
20
|
+
/**
|
|
21
|
+
* minimatch options to be passed directly to minimatch
|
|
22
|
+
* Default: `{ dot: true }`
|
|
23
|
+
*/
|
|
24
|
+
minimatchOptions?: any;
|
|
25
|
+
};
|
|
26
|
+
/**
|
|
27
|
+
*
|
|
28
|
+
*/
|
|
29
|
+
declare type CacheInputRule = FilesFilterPatterns & CacheBaseRule & {
|
|
20
30
|
/** npm scripts to include as the input */
|
|
21
31
|
npmScripts?: string | string[];
|
|
22
32
|
/** env variables to include as the input */
|
|
@@ -27,16 +37,22 @@ declare type CacheInput = FilesFilterPatterns & {
|
|
|
27
37
|
/**
|
|
28
38
|
*
|
|
29
39
|
*/
|
|
30
|
-
declare type
|
|
40
|
+
declare type CacheOutputRule = FilesFilterPatterns & CacheBaseRule & {
|
|
31
41
|
/**
|
|
32
42
|
* use npm pack to create a list of files to include.
|
|
33
43
|
* will check them against the exclude patterns and ignore any that match
|
|
34
44
|
*/
|
|
35
45
|
filesFromNpmPack?: boolean;
|
|
36
46
|
};
|
|
47
|
+
/**
|
|
48
|
+
* process caching input rules and return result from it
|
|
49
|
+
*
|
|
50
|
+
* @param param0
|
|
51
|
+
* @returns result from processing input rules
|
|
52
|
+
*/
|
|
37
53
|
export declare function processInput({ cwd, input, packageJson, extra, }?: {
|
|
38
54
|
cwd?: string;
|
|
39
|
-
input:
|
|
55
|
+
input: CacheInputRule;
|
|
40
56
|
packageJson?: Record<string, string | unknown>;
|
|
41
57
|
extra?: any;
|
|
42
58
|
}): Promise<{
|
|
@@ -51,17 +67,18 @@ export declare function processInput({ cwd, input, packageJson, extra, }?: {
|
|
|
51
67
|
hash: string;
|
|
52
68
|
}>;
|
|
53
69
|
/**
|
|
70
|
+
* process lifecycle caching input rules
|
|
54
71
|
*
|
|
55
72
|
* @param param0
|
|
56
73
|
* @returns
|
|
57
74
|
*/
|
|
58
75
|
export declare function processLifecycleInput({ cwd, input, packageJson, }?: {
|
|
59
76
|
cwd?: string;
|
|
60
|
-
input:
|
|
77
|
+
input: CacheInputRule;
|
|
61
78
|
packageJson?: Record<string, string | unknown>;
|
|
62
79
|
}): Promise<{}>;
|
|
63
80
|
/**
|
|
64
|
-
* Process build cache output
|
|
81
|
+
* Process build cache output rules.
|
|
65
82
|
*
|
|
66
83
|
* @param param0
|
|
67
84
|
* @returns
|
|
@@ -74,7 +91,7 @@ export declare function processOutput({ cwd, inputHash, calcHash, output, preFil
|
|
|
74
91
|
/** Should we calculate hash for the output files? */
|
|
75
92
|
calcHash?: boolean;
|
|
76
93
|
/** output config */
|
|
77
|
-
output:
|
|
94
|
+
output: CacheOutputRule;
|
|
78
95
|
/** list of pre-determined files, will be filtered with output.exclude */
|
|
79
96
|
preFiles?: string[];
|
|
80
97
|
}): Promise<{
|
package/dist/caching.js
CHANGED
|
@@ -8,6 +8,7 @@ const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
|
|
|
8
8
|
const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
|
|
9
9
|
const path_1 = (0, tslib_1.__importDefault)(require("path"));
|
|
10
10
|
const crypto_1 = (0, tslib_1.__importDefault)(require("crypto"));
|
|
11
|
+
const minimatch_group_1 = require("./minimatch-group");
|
|
11
12
|
/**
|
|
12
13
|
* create a sha256 hash for some data
|
|
13
14
|
*
|
|
@@ -74,15 +75,6 @@ function makeMmPatterns(patterns, options = { dot: true }) {
|
|
|
74
75
|
.map((x) => x && new minimatch_1.default.Minimatch(x, options))
|
|
75
76
|
.filter((x) => x);
|
|
76
77
|
}
|
|
77
|
-
/**
|
|
78
|
-
*
|
|
79
|
-
* @param fullPath
|
|
80
|
-
* @param patterns
|
|
81
|
-
* @returns
|
|
82
|
-
*/
|
|
83
|
-
function checkMmMatch(fullPath, patterns) {
|
|
84
|
-
return !lodash_1.default.isEmpty(patterns) && patterns.find((patternMm) => patternMm.match(fullPath));
|
|
85
|
-
}
|
|
86
78
|
/**
|
|
87
79
|
* Scan for files using include and exclude patterns
|
|
88
80
|
*
|
|
@@ -92,21 +84,39 @@ function checkMmMatch(fullPath, patterns) {
|
|
|
92
84
|
*/
|
|
93
85
|
async function scanFiles(cwd, includes, excludes) {
|
|
94
86
|
const filter = (_file, _path, extras) => {
|
|
95
|
-
if (!checkMmMatch(extras.dirFile, includes) || checkMmMatch(extras.dirFile, excludes)) {
|
|
87
|
+
if (!(0, minimatch_group_1.checkMmMatch)(extras.dirFile, includes) || (0, minimatch_group_1.checkMmMatch)(extras.dirFile, excludes)) {
|
|
96
88
|
return false;
|
|
97
89
|
}
|
|
98
90
|
return true;
|
|
99
91
|
};
|
|
92
|
+
const dirIncludes = includes.map((mx) => (0, minimatch_group_1.deconstructMM)(mx));
|
|
93
|
+
const filterDir = (_file, _path, extras) => {
|
|
94
|
+
const dir = `${extras.dirFile}/`; // add extra / to force matching directory
|
|
95
|
+
const inc = dirIncludes.find((di) => (0, minimatch_group_1.checkMmMatch)(dir, di.mms));
|
|
96
|
+
if (inc) {
|
|
97
|
+
const exc = (0, minimatch_group_1.checkMmMatch)(dir, excludes);
|
|
98
|
+
if (!exc) {
|
|
99
|
+
return true;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return false;
|
|
103
|
+
};
|
|
100
104
|
return (await (0, filter_scan_dir_1.filterScanDir)({
|
|
101
105
|
cwd,
|
|
102
106
|
filter,
|
|
103
|
-
filterDir
|
|
107
|
+
filterDir,
|
|
104
108
|
fullStat: false,
|
|
105
109
|
concurrency: 500,
|
|
106
110
|
})).sort();
|
|
107
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* process caching input rules and return result from it
|
|
114
|
+
*
|
|
115
|
+
* @param param0
|
|
116
|
+
* @returns result from processing input rules
|
|
117
|
+
*/
|
|
108
118
|
async function processInput({ cwd, input, packageJson, extra, } = { input: {} }) {
|
|
109
|
-
const files = await scanFiles(cwd, makeMmPatterns(input.include), makeMmPatterns(input.exclude));
|
|
119
|
+
const files = await scanFiles(cwd, makeMmPatterns(input.include, input.minimatchOptions), makeMmPatterns(input.exclude, input.minimatchOptions));
|
|
110
120
|
const fileHashes = await hashFiles(cwd, files);
|
|
111
121
|
const data = {
|
|
112
122
|
env: lodash_1.default.pick(process.env, input.includeEnv),
|
|
@@ -120,6 +130,7 @@ async function processInput({ cwd, input, packageJson, extra, } = { input: {} })
|
|
|
120
130
|
}
|
|
121
131
|
exports.processInput = processInput;
|
|
122
132
|
/**
|
|
133
|
+
* process lifecycle caching input rules
|
|
123
134
|
*
|
|
124
135
|
* @param param0
|
|
125
136
|
* @returns
|
|
@@ -134,19 +145,19 @@ async function processLifecycleInput({ cwd, input, packageJson, } = { input: {}
|
|
|
134
145
|
}
|
|
135
146
|
exports.processLifecycleInput = processLifecycleInput;
|
|
136
147
|
/**
|
|
137
|
-
* Process build cache output
|
|
148
|
+
* Process build cache output rules.
|
|
138
149
|
*
|
|
139
150
|
* @param param0
|
|
140
151
|
* @returns
|
|
141
152
|
*/
|
|
142
153
|
async function processOutput({ cwd, inputHash, calcHash, output, preFiles, } = { output: {} }) {
|
|
143
|
-
const mmIncludes = makeMmPatterns(output.include);
|
|
144
|
-
const mmExcludes = makeMmPatterns(output.exclude);
|
|
154
|
+
const mmIncludes = makeMmPatterns(output.include, output.minimatchOptions);
|
|
155
|
+
const mmExcludes = makeMmPatterns(output.exclude, output.minimatchOptions);
|
|
145
156
|
const files = await scanFiles(cwd, mmIncludes, mmExcludes);
|
|
146
157
|
preFiles = []
|
|
147
158
|
.concat(preFiles)
|
|
148
159
|
.filter((x) => {
|
|
149
|
-
if (!x ||
|
|
160
|
+
if (!x || (0, minimatch_group_1.unrollMmMatch)(x, mmExcludes)) {
|
|
150
161
|
return false;
|
|
151
162
|
}
|
|
152
163
|
return true;
|
package/dist/caching.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"caching.js","sourceRoot":"","sources":["../src/caching.ts"],"names":[],"mappings":";;;;AAAA,qDAA4D;AAC5D,uEAA2B;AAC3B,iEAAuB;AACvB,yDAAoB;AACpB,6DAAwB;AACxB,iEAA4B;
|
|
1
|
+
{"version":3,"file":"caching.js","sourceRoot":"","sources":["../src/caching.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,4 +23,30 @@ export declare type MMGroups = Record<string, MMGroup[]>;
|
|
|
23
23
|
* @returns object of grouped minimatch objects
|
|
24
24
|
*/
|
|
25
25
|
export declare function groupMM(mms: mm.IMinimatch[], groups: MMGroups): MMGroups;
|
|
26
|
+
/**
|
|
27
|
+
* process a minimatch pattern to group them for matching directories
|
|
28
|
+
*
|
|
29
|
+
* - needs to create a new pattern at every non-string part
|
|
30
|
+
* @param pattern
|
|
31
|
+
*/
|
|
32
|
+
export declare function deconstructMM(m0: mm.IMinimatch): {
|
|
33
|
+
m0: mm.IMinimatch;
|
|
34
|
+
mms: mm.IMinimatch[];
|
|
35
|
+
};
|
|
36
|
+
/**
|
|
37
|
+
* check that a path matches against a list of minimatch patterns
|
|
38
|
+
*
|
|
39
|
+
* @param fullPath
|
|
40
|
+
* @param patterns
|
|
41
|
+
* @returns the first pattern that match or false
|
|
42
|
+
*/
|
|
43
|
+
export declare function checkMmMatch(fullPath: string, patterns: mm.IMinimatch[]): mm.IMinimatch;
|
|
44
|
+
/**
|
|
45
|
+
* Take a full path and match each level of it to a list of minimatch patterns
|
|
46
|
+
*
|
|
47
|
+
* @param path
|
|
48
|
+
* @param mms
|
|
49
|
+
* @returns
|
|
50
|
+
*/
|
|
51
|
+
export declare function unrollMmMatch(path: string, mms: mm.IMinimatch[]): boolean;
|
|
26
52
|
export {};
|
package/dist/minimatch-group.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.groupMM = void 0;
|
|
3
|
+
exports.unrollMmMatch = exports.checkMmMatch = exports.deconstructMM = exports.groupMM = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const minimatch_1 = (0, tslib_1.__importDefault)(require("minimatch"));
|
|
6
|
+
const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
|
|
4
7
|
/**
|
|
5
8
|
* process a list of minimatch objects and group them by the string prefix of their patterns
|
|
6
9
|
*
|
|
@@ -32,4 +35,73 @@ function groupMM(mms, groups) {
|
|
|
32
35
|
return groups;
|
|
33
36
|
}
|
|
34
37
|
exports.groupMM = groupMM;
|
|
38
|
+
/**
|
|
39
|
+
* process a minimatch pattern to group them for matching directories
|
|
40
|
+
*
|
|
41
|
+
* - needs to create a new pattern at every non-string part
|
|
42
|
+
* @param pattern
|
|
43
|
+
*/
|
|
44
|
+
function deconstructMM(m0) {
|
|
45
|
+
const mms = [];
|
|
46
|
+
const patterns = { m0, mms };
|
|
47
|
+
const set = m0.set[0];
|
|
48
|
+
const globParts = m0.globParts[0];
|
|
49
|
+
const iParts = [];
|
|
50
|
+
const { GLOBSTAR } = minimatch_1.default;
|
|
51
|
+
for (let ix = 0; ix < set.length; ix++) {
|
|
52
|
+
const s = set[ix];
|
|
53
|
+
const g = globParts[ix];
|
|
54
|
+
// if we hit something that's not string, then we need a mm with just the strings
|
|
55
|
+
// because a dir like "src" will not match "src/*"
|
|
56
|
+
if (typeof s !== "string" && iParts.length > 0) {
|
|
57
|
+
mms.push(new minimatch_1.default.Minimatch(iParts.join("/"), m0.options));
|
|
58
|
+
}
|
|
59
|
+
if (ix === set.length - 1) {
|
|
60
|
+
mms.push(m0);
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
iParts.push(g);
|
|
65
|
+
if (typeof s !== "string") {
|
|
66
|
+
mms.push(new minimatch_1.default.Minimatch(iParts.join("/"), m0.options));
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (s === GLOBSTAR) {
|
|
70
|
+
// a pattern ending in GLOBSTAR will match anything
|
|
71
|
+
break;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
return patterns;
|
|
75
|
+
}
|
|
76
|
+
exports.deconstructMM = deconstructMM;
|
|
77
|
+
/**
|
|
78
|
+
* check that a path matches against a list of minimatch patterns
|
|
79
|
+
*
|
|
80
|
+
* @param fullPath
|
|
81
|
+
* @param patterns
|
|
82
|
+
* @returns the first pattern that match or false
|
|
83
|
+
*/
|
|
84
|
+
function checkMmMatch(fullPath, patterns) {
|
|
85
|
+
return !lodash_1.default.isEmpty(patterns) && patterns.find((patternMm) => patternMm.match(fullPath));
|
|
86
|
+
}
|
|
87
|
+
exports.checkMmMatch = checkMmMatch;
|
|
88
|
+
/**
|
|
89
|
+
* Take a full path and match each level of it to a list of minimatch patterns
|
|
90
|
+
*
|
|
91
|
+
* @param path
|
|
92
|
+
* @param mms
|
|
93
|
+
* @returns
|
|
94
|
+
*/
|
|
95
|
+
function unrollMmMatch(path, mms) {
|
|
96
|
+
const parts = path.split("/");
|
|
97
|
+
let rp;
|
|
98
|
+
for (let i = 0; i < parts.length - 1; i++) {
|
|
99
|
+
rp = rp !== undefined ? rp + "/" + parts[i] : parts[i];
|
|
100
|
+
if (checkMmMatch(`${rp}/`, mms)) {
|
|
101
|
+
return true;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
return !!checkMmMatch(path, mms);
|
|
105
|
+
}
|
|
106
|
+
exports.unrollMmMatch = unrollMmMatch;
|
|
35
107
|
//# sourceMappingURL=minimatch-group.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minimatch-group.js","sourceRoot":"","sources":["../src/minimatch-group.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"minimatch-group.js","sourceRoot":"","sources":["../src/minimatch-group.ts"],"names":[],"mappings":"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"}
|