Merge branch 'main' into update-spec-062023

Author: antmendoza

tools/download-schemas.ts

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 import $RefParser from '@apidevtools/json-schema-ref-parser';
-import { promises as fsPromises } from 'fs';
+import {promises as fsPromises} from 'fs';
 import * as path from 'path';
 import { URL } from 'url';
 import { schemaDir, reset, schemaUrl } from './utils';
 
+
 const { writeFile, mkdir } = fsPromises;
 
 /**
@@ -52,4 +53,5 @@ const download = async (schemaUrl: URL, destDir: string): Promise<void> => {
   }
 };
 
+
 download(schemaUrl, schemaDir).then(console.log.bind(console)).catch(console.error.bind(console));

tools/generate-merged_json.ts

@@ -17,9 +17,10 @@ import $RefParser from '@apidevtools/json-schema-ref-parser';
 import { promises as fsPromises } from 'fs';
 import * as path from 'path';
 import { URL } from 'url';
-import { schemaDir, mergeDefinitions, mergeSchemas, schemaUrl } from './utils';
+import {schemaDir, mergeDefinitions, mergeSchemas, schemaUrl} from './utils';
+
+const { writeFile} = fsPromises;
 
-const { writeFile } = fsPromises;
 
 /**
  * Generate a merged schema `__merged.json` from schemas in schemas directory

tools/utils.ts

@@ -19,9 +19,15 @@ import { promises as fsPromises } from 'fs';
 import * as path from 'path';
 import rimraf from 'rimraf';
 import { readMeDisclaimer } from './consts';
+<<<<<<< HEAD
 import { URL } from 'url';
 import yargs from 'yargs';
 import { schemaVersion } from '../package.json';
+=======
+import {URL} from "url";
+import yargs from "yargs";
+import {schemaVersion} from "../package.json";
+>>>>>>> main
 
 const { writeFile, mkdir } = fsPromises;
 
@@ -185,5 +191,7 @@ export const schemaDir = path.resolve(process.cwd(), 'src/lib/schema');
 /** The URL to download the schema from */
 export const schemaUrl: URL = new URL(
   (yargs(process.argv.slice(2)).argv.url as string) ||
-    `https://raw.githubusercontent.com/serverlessworkflow/specification/${schemaVersion}.x/schema/workflow.json`
+  `https://raw.githubusercontent.com/serverlessworkflow/specification/${schemaVersion}.x/schema/workflow.json`
 );
+
+