@stepzen/transpiler 0.0.39 → 0.2.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/actions/configure.js
CHANGED
|
@@ -18,7 +18,18 @@ exports.default = async (source, silent = false, answers = {}) => {
|
|
|
18
18
|
for (const y of glob.sync('**/config.yaml', { cwd: source })) {
|
|
19
19
|
const filePath = path.join(source, y);
|
|
20
20
|
const file = fs.readFileSync(filePath, 'utf8');
|
|
21
|
-
|
|
21
|
+
let asYAML;
|
|
22
|
+
try {
|
|
23
|
+
asYAML = yaml.parse(file);
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
debug('stepzen:transpiler')(`error parsing ${filePath}: ${error} -> ignoring this file`);
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
if (!asYAML) {
|
|
30
|
+
debug('stepzen:transpiler')(`Ignoring an empty config.yaml ${filePath}`);
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
22
33
|
debug('stepzen:transpiler')(`Adding config.yaml ${filePath}`);
|
|
23
34
|
debug('stepzen:transpiler')(`Contents: ${JSON.stringify(asYAML, null, 2)}`);
|
|
24
35
|
if (asYAML.configurationset) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../src/actions/configure.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAC9B,+BAA8B;AAC9B,6BAA4B;AAC5B,qCAAoC;AACpC,6BAA4B;AAC5B,6BAA4B;AAE5B,kBAAe,KAAK,EAAE,MAAc,EAAE,MAAM,GAAG,KAAK,EAAE,UAAe,EAAE,EAAE,EAAE;;;IACzE,IAAI,MAAM,GAAQ;QAChB,gBAAgB,EAAE,EAAE;QACpB,OAAO,EAAE,EAAE;KACZ,CAAA;IAED,2CAA2C;IAC3C,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAC,GAAG,EAAE,MAAM,EAAC,CAAC,EAAE;QAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAErC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../src/actions/configure.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAC9B,+BAA8B;AAC9B,6BAA4B;AAC5B,qCAAoC;AACpC,6BAA4B;AAC5B,6BAA4B;AAE5B,kBAAe,KAAK,EAAE,MAAc,EAAE,MAAM,GAAG,KAAK,EAAE,UAAe,EAAE,EAAE,EAAE;;;IACzE,IAAI,MAAM,GAAQ;QAChB,gBAAgB,EAAE,EAAE;QACpB,OAAO,EAAE,EAAE;KACZ,CAAA;IAED,2CAA2C;IAC3C,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAC,GAAG,EAAE,MAAM,EAAC,CAAC,EAAE;QAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAErC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC9C,IAAI,MAAM,CAAA;QACV,IAAI;YACF,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;SAC1B;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,CAAC,oBAAoB,CAAC,CACzB,iBAAiB,QAAQ,KAAK,KAAK,wBAAwB,CAC5D,CAAA;YACD,SAAQ;SACT;QAED,IAAI,CAAC,MAAM,EAAE;YACX,KAAK,CAAC,oBAAoB,CAAC,CAAC,iCAAiC,QAAQ,EAAE,CAAC,CAAA;YACxE,SAAQ;SACT;QAED,KAAK,CAAC,oBAAoB,CAAC,CAAC,sBAAsB,QAAQ,EAAE,CAAC,CAAA;QAC7D,KAAK,CAAC,oBAAoB,CAAC,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;QAE3E,IAAI,MAAM,CAAC,gBAAgB,EAAE;YAC3B,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,MAAM,CACtD,MAAM,CAAC,gBAAgB,CACxB,CAAA;SACF;QAED,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;SACvD;KACF;;QAED,yCAAyC;QACzC,KAAsB,IAAA,KAAA,sBAAA,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;YACxD,GAAG,EAAE,MAAM;SACZ,CAAC,CAAA,IAAA;YAFS,MAAM,CAAC,WAAA,CAAA;YAGhB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;YAErC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAE/B,KAAK,CAAC,oBAAoB,CAAC,CAAC,8BAA8B,QAAQ,EAAE,CAAC,CAAA;YACrE,KAAK,CAAC,oBAAoB,CAAC,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YAE3E,IAAI,MAAA,MAAM,CAAC,MAAM,0CAAE,SAAS,EAAE;;oBAC5B,KAA6B,IAAA,oBAAA,sBAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,SAAS,CAAA,CAAA,IAAA;wBAA1C,MAAM,QAAQ,WAAA,CAAA;wBACvB,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;wBAE5C,IAAI,MAAM,GAAQ,EAAE,CAAA;wBAEpB,IAAI,MAAM,EAAE;4BACV,MAAM,GAAG;gCACP,CAAC,IAAI,CAAC,EAAE,EAAC,CAAC,GAAG,CAAC,EAAE,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,0CAAG,GAAG,CAAC,EAAC,CAAC,CAAC,MAAA,OAAO,CAAC,IAAI,CAAC,0CAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAC;6BAClE,CAAA;yBACF;6BAAM;4BACL,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,iBAC5B,IAAI,EAAE,UAAU,IACb,QAAQ,EACX,CAAA;yBACH;wBAED,MAAM,SAAS,GAAG;4BAChB,aAAa,EAAE;gCACb,IAAI;gCACJ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;6BACzB;yBACF,CAAA;wBAED,KAAK,CAAC,oBAAoB,CAAC,CACzB,aAAa,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACjD,CAAA;wBACD,KAAK,CAAC,oBAAoB,CAAC,CACzB,WAAW,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAChD,CAAA;wBAED,MAAM,CAAC,gBAAgB,CAAC,IAAI,mBAAK,SAAS,EAAE,CAAA;qBAC7C;;;;;;;;;aACF;SACF;;;;;;;;;IAED,KAAK,CAAC,oBAAoB,CAAC,CACzB,kBAAkB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACpD,CAAA;IAED,6DAA6D;IAC7D,MAAM,GAAG,GAAQ,EAAE,CAAA;IACnB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,gBAAgB,EAAE;QACvC,MAAM,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,IAAI,CAAA;QACjC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;QAC9B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE;YAC1D,IAAI,GAAG,KAAK,IAAI;gBAAE,SAAQ;YAC1B,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;SACvB;KACF;IAED,uCAAuC;IACvC,MAAM,UAAU,GAAQ;QACtB,gBAAgB,EAAE,EAAE;QACpB,OAAO,EAAE,EAAE;KACZ,CAAA;IACD,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAC5C,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC/B,aAAa,oBAAM,GAAG,CAAC,aAAa,CAAC,CAAC;SACvC,CAAC,CAAA;KACH;IACD,UAAU,CAAC,OAAO,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;IAExC,8BAA8B;IAC9B,IAAI,UAAU,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC;QAC1C,OAAO,UAAU,CAAC,gBAAgB,CAAA;IACpC,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,UAAU,CAAC,OAAO,CAAA;IAE9D,IAAI,UAAU,CAAC,gBAAgB,IAAI,UAAU,CAAC,OAAO,EAAE;QACrD,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;KAClC;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
|
package/lib/actions/merge.d.ts
CHANGED
|
@@ -7,5 +7,7 @@ declare const _default: (original: string, imported: {
|
|
|
7
7
|
silent: boolean;
|
|
8
8
|
/** when `false` merge only covers config files and updates @sdl directrive */
|
|
9
9
|
mergeTypes?: boolean;
|
|
10
|
+
/** merge behaviour when a schema with the given name exists in the source */
|
|
11
|
+
onConflict?: 'overwrite' | 'append';
|
|
10
12
|
}) => Promise<string>;
|
|
11
13
|
export default _default;
|
package/lib/actions/merge.js
CHANGED
|
@@ -26,6 +26,7 @@ exports.default = async (original, imported, options = {
|
|
|
26
26
|
output: null,
|
|
27
27
|
silent: false,
|
|
28
28
|
mergeTypes: true,
|
|
29
|
+
onConflict: 'append',
|
|
29
30
|
}) => {
|
|
30
31
|
// Make sure there is an output directory
|
|
31
32
|
if (!options.answers)
|
|
@@ -36,6 +37,8 @@ exports.default = async (original, imported, options = {
|
|
|
36
37
|
options.silent = false;
|
|
37
38
|
if (options.mergeTypes === undefined)
|
|
38
39
|
options.mergeTypes = true;
|
|
40
|
+
if (options.onConflict === undefined)
|
|
41
|
+
options.onConflict = 'append';
|
|
39
42
|
// To stop things like
|
|
40
43
|
// C:\Users\Darren\AppData\Local\Temp\stepzen-tmp-config-1638293497187\C:\Users\Darren\AppData\Local\Temp\stepzen-tmp-1638293496286
|
|
41
44
|
options.output = merge_helpers_1.dedupeTempFolder(options.output);
|
|
@@ -60,7 +63,9 @@ exports.default = async (original, imported, options = {
|
|
|
60
63
|
// (https://github.com/steprz/stepzen-cli/issues/482).
|
|
61
64
|
BLANK_INDEX_TEMPLATE);
|
|
62
65
|
}
|
|
63
|
-
const targetSubfolder =
|
|
66
|
+
const targetSubfolder = options.onConflict === 'overwrite'
|
|
67
|
+
? imported.name
|
|
68
|
+
: merge_helpers_1.findNextAvailableSubfolder(original, imported.name);
|
|
64
69
|
if (options.mergeTypes) {
|
|
65
70
|
const merged = merge_1.mergeTypeDefs([
|
|
66
71
|
await merge_helpers_1.getSchema(options.output),
|
package/lib/actions/merge.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/actions/merge.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,6BAA4B;AAC5B,gDAAkD;AAClD,qCAAoC;AACpC,yBAAwB;AACxB,6BAA4B;AAE5B,0DAW+B;AAC/B,mCAA2B;AAC3B,gEAAqD;AACrD,kGAAsF;AACtF,4EAAkE;AAElE,MAAM,oBAAoB,GAAG;;;;CAI5B,CAAC,IAAI,EAAE,CAAA;AAER,MAAM,gBAAgB,GAAG;;;;CAIxB,CAAC,IAAI,EAAE,CAAA;AAER,kBAAe,KAAK,EAClB,QAAgB,EAChB,QAGC,EACD,
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/actions/merge.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/actions/configure.ts
CHANGED
|
@@ -16,7 +16,20 @@ export default async (source: string, silent = false, answers: any = {}) => {
|
|
|
16
16
|
const filePath = path.join(source, y)
|
|
17
17
|
|
|
18
18
|
const file = fs.readFileSync(filePath, 'utf8')
|
|
19
|
-
|
|
19
|
+
let asYAML
|
|
20
|
+
try {
|
|
21
|
+
asYAML = yaml.parse(file)
|
|
22
|
+
} catch (error) {
|
|
23
|
+
debug('stepzen:transpiler')(
|
|
24
|
+
`error parsing ${filePath}: ${error} -> ignoring this file`,
|
|
25
|
+
)
|
|
26
|
+
continue
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
if (!asYAML) {
|
|
30
|
+
debug('stepzen:transpiler')(`Ignoring an empty config.yaml ${filePath}`)
|
|
31
|
+
continue
|
|
32
|
+
}
|
|
20
33
|
|
|
21
34
|
debug('stepzen:transpiler')(`Adding config.yaml ${filePath}`)
|
|
22
35
|
debug('stepzen:transpiler')(`Contents: ${JSON.stringify(asYAML, null, 2)}`)
|
package/src/actions/merge.ts
CHANGED
|
@@ -46,11 +46,14 @@ export default async (
|
|
|
46
46
|
silent: boolean
|
|
47
47
|
/** when `false` merge only covers config files and updates @sdl directrive */
|
|
48
48
|
mergeTypes?: boolean
|
|
49
|
+
/** merge behaviour when a schema with the given name exists in the source */
|
|
50
|
+
onConflict?: 'overwrite' | 'append'
|
|
49
51
|
} = {
|
|
50
52
|
answers: {},
|
|
51
53
|
output: null,
|
|
52
54
|
silent: false,
|
|
53
55
|
mergeTypes: true,
|
|
56
|
+
onConflict: 'append',
|
|
54
57
|
},
|
|
55
58
|
) => {
|
|
56
59
|
// Make sure there is an output directory
|
|
@@ -59,6 +62,7 @@ export default async (
|
|
|
59
62
|
options.output = path.join(os.tmpdir(), `stepzen-tmp-${Date.now()}`)
|
|
60
63
|
if (!options.silent) options.silent = false
|
|
61
64
|
if (options.mergeTypes === undefined) options.mergeTypes = true
|
|
65
|
+
if (options.onConflict === undefined) options.onConflict = 'append'
|
|
62
66
|
|
|
63
67
|
// To stop things like
|
|
64
68
|
// C:\Users\Darren\AppData\Local\Temp\stepzen-tmp-config-1638293497187\C:\Users\Darren\AppData\Local\Temp\stepzen-tmp-1638293496286
|
|
@@ -91,7 +95,10 @@ export default async (
|
|
|
91
95
|
)
|
|
92
96
|
}
|
|
93
97
|
|
|
94
|
-
const targetSubfolder =
|
|
98
|
+
const targetSubfolder =
|
|
99
|
+
options.onConflict === 'overwrite'
|
|
100
|
+
? imported.name
|
|
101
|
+
: findNextAvailableSubfolder(original, imported.name)
|
|
95
102
|
|
|
96
103
|
if (options.mergeTypes) {
|
|
97
104
|
const merged = mergeTypeDefs([
|