@stepzen/transpiler - npm Package Compare versions

Comparing version 0.1.0 to 0.2.0

lib/actions/merge.d.ts

@@ -10,3 +10,5 @@ declare const _default: (original: string, imported: {
     mergeTypes?: boolean;
+    /** merge behaviour when a schema with the given name exists in the source */
+    onConflict?: 'overwrite' | 'append';
 }) => Promise<string>;
 export default _default;

lib/actions/merge.js

@@ -29,2 +29,3 @@ "use strict";
     mergeTypes: true,
+    onConflict: 'append',
 }) => {
@@ -40,2 +41,4 @@ // Make sure there is an output directory
         options.mergeTypes = true;
+    if (options.onConflict === undefined)
+        options.onConflict = 'append';
     // To stop things like
@@ -65,3 +68,5 @@ // C:\Users\Darren\AppData\Local\Temp\stepzen-tmp-config-1638293497187\C:\Users\Darren\AppData\Local\Temp\stepzen-tmp-1638293496286
     }
-    const targetSubfolder = merge_helpers_1.findNextAvailableSubfolder(original, imported.name);
+    const targetSubfolder = options.onConflict === 'overwrite'
+        ? imported.name
+        : merge_helpers_1.findNextAvailableSubfolder(original, imported.name);
     if (options.mergeTypes) {
@@ -68,0 +73,0 @@ const merged = merge_1.mergeTypeDefs([

package.json

 {
   "name": "@stepzen/transpiler",
   "description": "The StepZen transpiler",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "author": "Darren Waddell <[e-mail]>",
@@ -6,0 +6,0 @@ "license": "MIT",

src/actions/merge.ts

@@ -49,2 +49,4 @@ import * as fs from 'fs-extra'
     mergeTypes?: boolean
+    /** merge behaviour when a schema with the given name exists in the source */
+    onConflict?: 'overwrite' | 'append'
   } = {
@@ -55,2 +57,3 @@ answers: {},
     mergeTypes: true,
+    onConflict: 'append',
   },
@@ -64,2 +67,3 @@ ) => {
   if (options.mergeTypes === undefined) options.mergeTypes = true
+  if (options.onConflict === undefined) options.onConflict = 'append'
 
@@ -97,3 +101,6 @@ // To stop things like
 
-  const targetSubfolder = findNextAvailableSubfolder(original, imported.name)
+  const targetSubfolder =
+    options.onConflict === 'overwrite'
+      ? imported.name
+      : findNextAvailableSubfolder(original, imported.name)
 
@@ -100,0 +107,0 @@ if (options.mergeTypes) {

No alert changes

Improved metrics

Total package byte prevSize

113133

increased by0.67%

Lines of code

2103

increased by0.67%

No dependency changes