@atlassian/clientside-extensions-schema 3.0.2 → 3.1.0

package/dist/cjs/bin/generate-from-schema.js

@@ -2,19 +2,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const glob_1 = (0, tslib_1.__importDefault)(require("glob"));
-const util_1 = require("util");
+const glob_1 = require("glob");
 const yargs_1 = (0, tslib_1.__importDefault)(require("yargs"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
 const mkdirp_1 = (0, tslib_1.__importDefault)(require("mkdirp"));
-const rimraf_1 = (0, tslib_1.__importDefault)(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const chokidar_1 = (0, tslib_1.__importDefault)(require("chokidar"));
 const lodash_snakecase_1 = (0, tslib_1.__importDefault)(require("lodash.snakecase"));
 const code_generator_1 = (0, tslib_1.__importDefault)(require("../code-generator/code-generator"));
 const schema_1 = require("../utils/schema");
-const globPromise = (0, util_1.promisify)(glob_1.default);
-const rimrafPromise = (0, util_1.promisify)(rimraf_1.default);
 const appendExtension = (baseFileName, extension) => {
     return `${baseFileName}.${extension}`;
 };
@@ -63,13 +60,13 @@ ${e}`);
     }
 };
 const cleanupTargetDir = async (targetDir) => {
-    await rimrafPromise(targetDir);
+    await (0, rimraf_1.rimraf)(targetDir);
 };
 const getProvidedTypesPaths = async (options) => {
     let paths = [];
     const { providedTypes: pattern, cwd } = options;
     if (pattern) {
-        paths = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });
+        paths = await (0, glob_1.glob)(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });
         if (!paths.length) {
             console.warn(`Schema code generator: Provided pattern "${pattern}" could not find any files with GraphQL provided types`);
         }
@@ -79,7 +76,7 @@ const getProvidedTypesPaths = async (options) => {
 const generate = async (options, providedTypesPaths) => {
     const { glob: pattern, cwd, strictMode, validatorOnly } = options;
     // TODO: Extract all this
-    const resultFiles = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });
+    const resultFiles = await (0, glob_1.glob)(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });
     const absoluteFilePaths = resultFiles.map((filePath) => path_1.default.resolve(path_1.default.join(cwd, filePath)));
     // eslint-disable-next-line no-restricted-syntax
     for (const absolutePath of absoluteFilePaths) {

package/dist/cjs/bin/generate-from-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-from-schema.js","sourceRoot":"","sources":["../../../lib/bin/generate-from-schema.ts"],"names":[],"mappings":"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","sourcesContent":["#!/usr/bin/env node\nimport glob from 'glob';\nimport { promisify } from 'util';\nimport yargs from 'yargs';\nimport path from 'path';\nimport fs from 'fs';\nimport mkdirp from 'mkdirp';\nimport rimraf from 'rimraf';\nimport chokidar from 'chokidar';\nimport snakeCase from 'lodash.snakecase';\nimport generateCode from '../code-generator/code-generator';\nimport { loadSchema } from '../utils/schema';\n\nimport type { FileWriter, GeneratorOptions } from '../code-generator/code-generator';\n\nconst globPromise = promisify(glob);\nconst rimrafPromise = promisify(rimraf);\n\nconst appendExtension = (baseFileName: string, extension: string) => {\n    return `${baseFileName}.${extension}`;\n};\n\nconst getGeneratorTargetDirectory = (filePath: string) => {\n    return path.join(path.dirname(filePath), 'generated');\n};\n\nconst ensureFileName = (name: string) => {\n    return snakeCase(name) as string;\n};\n\nconst bustCacheForFile = (filePath: string) => {\n    delete require.cache[require.resolve(filePath)]; // watch mode cache busting\n};\n\nconst toRelativeIfExists = (filePath: string) => {\n    if (!filePath) {\n        return null;\n    }\n\n    return `./${filePath}`;\n};\n\nconst writeContentsToFile =\n    (targetDirectory: string): FileWriter =>\n    async (baseIdentifier: string, typescriptCode: string, javascriptCode: string) => {\n        const baseFilename = ensureFileName(baseIdentifier);\n        const wrapperFileNameTs = path.join(targetDirectory, appendExtension(baseFilename, 'ts'));\n        const wrapperFileNameJs = path.join(targetDirectory, appendExtension(baseFilename, 'js'));\n        await mkdirp(path.dirname(wrapperFileNameTs));\n        await fs.promises.writeFile(wrapperFileNameTs, typescriptCode, 'utf8');\n        await fs.promises.writeFile(wrapperFileNameJs, javascriptCode, 'utf8');\n\n        return toRelativeIfExists(baseFilename);\n    };\n\nconst generateContentForSchemaFile = async (filePath: string, generatorOptions: GeneratorOptions) => {\n    bustCacheForFile(filePath);\n    const schemaData = await loadSchema(filePath);\n    if (!schemaData) {\n        return;\n    }\n    const targetDirectory = getGeneratorTargetDirectory(filePath);\n    try {\n        await generateCode(schemaData, generatorOptions, writeContentsToFile(targetDirectory), true);\n    } catch (e) {\n        console.error(`Something went wrong trying to generate the hooks for your extension point specified at \"${filePath}\".\nIf this persists, feel free to raise an issue with us at: https://bitbucket.org/atlassian/atlassian-clientside-extensions/issues\n\nProvided Schema:\n${schemaData}\nOriginal Error:\n${e}`);\n    }\n};\n\nconst cleanupTargetDir = async (targetDir: string) => {\n    await rimrafPromise(targetDir);\n};\n\ntype Options = yargs.Arguments<{\n    glob: string;\n    cwd: string;\n    watch: boolean;\n    providedTypes: string;\n    strictMode: boolean;\n    validatorOnly: boolean;\n}>;\n\nconst getProvidedTypesPaths = async (options: Options): Promise<string[]> => {\n    let paths: string[] = [];\n    const { providedTypes: pattern, cwd } = options;\n\n    if (pattern) {\n        paths = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });\n\n        if (!paths.length) {\n            console.warn(`Schema code generator: Provided pattern \"${pattern}\" could not find any files with GraphQL provided types`);\n        }\n    }\n\n    return paths;\n};\n\nconst generate = async (options: Options, providedTypesPaths: string[]) => {\n    const { glob: pattern, cwd, strictMode, validatorOnly } = options;\n\n    // TODO: Extract all this\n    const resultFiles = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });\n    const absoluteFilePaths = resultFiles.map((filePath) => path.resolve(path.join(cwd, filePath)));\n\n    // eslint-disable-next-line no-restricted-syntax\n    for (const absolutePath of absoluteFilePaths) {\n        // we have to run this first to remove all preexisting directories before generating any files\n        // eslint-disable-next-line no-await-in-loop\n        await cleanupTargetDir(getGeneratorTargetDirectory(absolutePath));\n    }\n\n    const generatorOptions: GeneratorOptions = {\n        providedTypesPaths,\n        strictMode,\n        validatorOnly,\n    };\n\n    // eslint-disable-next-line no-restricted-syntax\n    for (const absolutePath of absoluteFilePaths) {\n        bustCacheForFile(absolutePath);\n        // eslint-disable-next-line no-await-in-loop\n        await generateContentForSchemaFile(absolutePath, generatorOptions);\n    }\n};\n\nconst run = async (options: Options) => {\n    // TODO: Refactor this part to be more smart about watching changes in provided types\n    let providedTypesPaths = await getProvidedTypesPaths(options);\n\n    await generate(options, providedTypesPaths);\n\n    if (options.watch) {\n        console.log('Schema code generator watching for changes....');\n        chokidar\n            .watch([options.glob, options.providedTypes], {\n                cwd: options.cwd,\n                ignored: (changedFilePath: string) => {\n                    return changedFilePath.includes('node_modules');\n                },\n            })\n            .on('all', async (eventName: string, filePath: string) => {\n                // eslint-disable-next-line no-console\n                console.log(`Schema code generator detected changes. Rebuilding \"${filePath}\"...`);\n                const absolutePath = path.resolve(path.join(options.cwd, filePath));\n                if (eventName !== 'unlink') {\n                    bustCacheForFile(absolutePath);\n\n                    // TODO: Refactor this part to be more smart about watching changes in provided types\n                    providedTypesPaths = await getProvidedTypesPaths(options);\n\n                    const generatorOptions: GeneratorOptions = {\n                        providedTypesPaths,\n                        strictMode: options.strictMode,\n                        validatorOnly: options.validatorOnly,\n                    };\n\n                    await generateContentForSchemaFile(absolutePath, generatorOptions);\n                }\n            });\n    }\n};\n// eslint-disable-next-line @typescript-eslint/no-unused-expressions\nyargs\n    .command(\n        '$0 [options]',\n        'Generate hooks and other related code based on provided schema.',\n        (builder) => {\n            builder\n                .option('glob', {\n                    describe: `Glob pattern to find schemas.`,\n                    type: 'string',\n                    demandOption: true,\n                })\n                .option('strict-mode', {\n                    describe: 'Toggles validation strict mode',\n                    type: 'boolean',\n                    default: true,\n                })\n                .option('provided-types', {\n                    describe: `Glob pattern to find provided types for schemas.`,\n                    type: 'string',\n                    default: '',\n                })\n                /** @since 2.1.0 */\n                .option('validator-only', {\n                    describe: `Only generate validators for the given schema files.`,\n                    type: 'boolean',\n                    default: false,\n                })\n                .option('watch', {\n                    describe: `Continuously watch for and generate on changes.`,\n                    type: 'boolean',\n                    default: false,\n                })\n                .option('cwd', {\n                    describe: `The cwd in which the glob is searching for schemas. Defaults to process.cwd()`,\n                    type: 'string',\n                    default: process.cwd(),\n                });\n        },\n        run,\n    )\n    .help().argv; // for --help and -h to work\n"]}
+{"version":3,"file":"generate-from-schema.js","sourceRoot":"","sources":["../../../lib/bin/generate-from-schema.ts"],"names":[],"mappings":";;;;AACA,+BAA4B;AAC5B,+DAA0B;AAC1B,6DAAwB;AACxB,yDAAoB;AACpB,iEAA4B;AAC5B,mCAAgC;AAChC,qEAAgC;AAChC,qFAAyC;AACzC,mGAA4D;AAC5D,4CAA6C;AAI7C,MAAM,eAAe,GAAG,CAAC,YAAoB,EAAE,SAAiB,EAAE,EAAE;IAChE,OAAO,GAAG,YAAY,IAAI,SAAS,EAAE,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,QAAgB,EAAE,EAAE;IACrD,OAAO,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;IACpC,OAAO,IAAA,0BAAS,EAAC,IAAI,CAAW,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC1C,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,2BAA2B;AAChF,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC5C,IAAI,CAAC,QAAQ,EAAE;QACX,OAAO,IAAI,CAAC;KACf;IAED,OAAO,KAAK,QAAQ,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,mBAAmB,GACrB,CAAC,eAAuB,EAAc,EAAE,CACxC,KAAK,EAAE,cAAsB,EAAE,cAAsB,EAAE,cAAsB,EAAE,EAAE;IAC7E,MAAM,YAAY,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1F,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1F,MAAM,IAAA,gBAAM,EAAC,cAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC9C,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IACvE,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,iBAAiB,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IAEvE,OAAO,kBAAkB,CAAC,YAAY,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEN,MAAM,4BAA4B,GAAG,KAAK,EAAE,QAAgB,EAAE,gBAAkC,EAAE,EAAE;IAChG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3B,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC;IAC9C,IAAI,CAAC,UAAU,EAAE;QACb,OAAO;KACV;IACD,MAAM,eAAe,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI;QACA,MAAM,IAAA,wBAAY,EAAC,UAAU,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,CAAC;KAChG;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,4FAA4F,QAAQ;;;;EAIxH,UAAU;;EAEV,CAAC,EAAE,CAAC,CAAC;KACF;AACL,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;IACjD,MAAM,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC;AAC5B,CAAC,CAAC;AAWF,MAAM,qBAAqB,GAAG,KAAK,EAAE,OAAgB,EAAqB,EAAE;IACxE,IAAI,KAAK,GAAa,EAAE,CAAC;IACzB,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAEhD,IAAI,OAAO,EAAE;QACT,KAAK,GAAG,MAAM,IAAA,WAAI,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,oBAAoB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtF,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,4CAA4C,OAAO,wDAAwD,CAAC,CAAC;SAC7H;KACJ;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAgB,EAAE,kBAA4B,EAAE,EAAE;IACtE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAElE,yBAAyB;IACzB,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,oBAAoB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAClG,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEhG,gDAAgD;IAChD,KAAK,MAAM,YAAY,IAAI,iBAAiB,EAAE;QAC1C,8FAA8F;QAC9F,4CAA4C;QAC5C,MAAM,gBAAgB,CAAC,2BAA2B,CAAC,YAAY,CAAC,CAAC,CAAC;KACrE;IAED,MAAM,gBAAgB,GAAqB;QACvC,kBAAkB;QAClB,UAAU;QACV,aAAa;KAChB,CAAC;IAEF,gDAAgD;IAChD,KAAK,MAAM,YAAY,IAAI,iBAAiB,EAAE;QAC1C,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC/B,4CAA4C;QAC5C,MAAM,4BAA4B,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;KACtE;AACL,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;IACnC,qFAAqF;IACrF,IAAI,kBAAkB,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAE9D,MAAM,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAE5C,IAAI,OAAO,CAAC,KAAK,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;QAC9D,kBAAQ;aACH,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE;YAC1C,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,CAAC,eAAuB,EAAE,EAAE;gBACjC,OAAO,eAAe,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACpD,CAAC;SACJ,CAAC;aACD,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,SAAiB,EAAE,QAAgB,EAAE,EAAE;YACrD,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,uDAAuD,QAAQ,MAAM,CAAC,CAAC;YACnF,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;YACpE,IAAI,SAAS,KAAK,QAAQ,EAAE;gBACxB,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAE/B,qFAAqF;gBACrF,kBAAkB,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBAE1D,MAAM,gBAAgB,GAAqB;oBACvC,kBAAkB;oBAClB,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,aAAa,EAAE,OAAO,CAAC,aAAa;iBACvC,CAAC;gBAEF,MAAM,4BAA4B,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;aACtE;QACL,CAAC,CAAC,CAAC;KACV;AACL,CAAC,CAAC;AACF,oEAAoE;AACpE,eAAK;KACA,OAAO,CACJ,cAAc,EACd,iEAAiE,EACjE,CAAC,OAAO,EAAE,EAAE;IACR,OAAO;SACF,MAAM,CAAC,MAAM,EAAE;QACZ,QAAQ,EAAE,+BAA+B;QACzC,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACrB,CAAC;SACD,MAAM,CAAC,aAAa,EAAE;QACnB,QAAQ,EAAE,gCAAgC;QAC1C,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;KAChB,CAAC;SACD,MAAM,CAAC,gBAAgB,EAAE;QACtB,QAAQ,EAAE,kDAAkD;QAC5D,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;KACd,CAAC;QACF,mBAAmB;SAClB,MAAM,CAAC,gBAAgB,EAAE;QACtB,QAAQ,EAAE,sDAAsD;QAChE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACjB,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACb,QAAQ,EAAE,iDAAiD;QAC3D,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACjB,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACX,QAAQ,EAAE,+EAA+E;QACzF,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE;KACzB,CAAC,CAAC;AACX,CAAC,EACD,GAAG,CACN;KACA,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,4BAA4B","sourcesContent":["#!/usr/bin/env node\nimport { glob } from 'glob';\nimport yargs from 'yargs';\nimport path from 'path';\nimport fs from 'fs';\nimport mkdirp from 'mkdirp';\nimport { rimraf } from 'rimraf';\nimport chokidar from 'chokidar';\nimport snakeCase from 'lodash.snakecase';\nimport generateCode from '../code-generator/code-generator';\nimport { loadSchema } from '../utils/schema';\n\nimport type { FileWriter, GeneratorOptions } from '../code-generator/code-generator';\n\nconst appendExtension = (baseFileName: string, extension: string) => {\n    return `${baseFileName}.${extension}`;\n};\n\nconst getGeneratorTargetDirectory = (filePath: string) => {\n    return path.join(path.dirname(filePath), 'generated');\n};\n\nconst ensureFileName = (name: string) => {\n    return snakeCase(name) as string;\n};\n\nconst bustCacheForFile = (filePath: string) => {\n    delete require.cache[require.resolve(filePath)]; // watch mode cache busting\n};\n\nconst toRelativeIfExists = (filePath: string) => {\n    if (!filePath) {\n        return null;\n    }\n\n    return `./${filePath}`;\n};\n\nconst writeContentsToFile =\n    (targetDirectory: string): FileWriter =>\n    async (baseIdentifier: string, typescriptCode: string, javascriptCode: string) => {\n        const baseFilename = ensureFileName(baseIdentifier);\n        const wrapperFileNameTs = path.join(targetDirectory, appendExtension(baseFilename, 'ts'));\n        const wrapperFileNameJs = path.join(targetDirectory, appendExtension(baseFilename, 'js'));\n        await mkdirp(path.dirname(wrapperFileNameTs));\n        await fs.promises.writeFile(wrapperFileNameTs, typescriptCode, 'utf8');\n        await fs.promises.writeFile(wrapperFileNameJs, javascriptCode, 'utf8');\n\n        return toRelativeIfExists(baseFilename);\n    };\n\nconst generateContentForSchemaFile = async (filePath: string, generatorOptions: GeneratorOptions) => {\n    bustCacheForFile(filePath);\n    const schemaData = await loadSchema(filePath);\n    if (!schemaData) {\n        return;\n    }\n    const targetDirectory = getGeneratorTargetDirectory(filePath);\n    try {\n        await generateCode(schemaData, generatorOptions, writeContentsToFile(targetDirectory), true);\n    } catch (e) {\n        console.error(`Something went wrong trying to generate the hooks for your extension point specified at \"${filePath}\".\nIf this persists, feel free to raise an issue with us at: https://bitbucket.org/atlassian/atlassian-clientside-extensions/issues\n\nProvided Schema:\n${schemaData}\nOriginal Error:\n${e}`);\n    }\n};\n\nconst cleanupTargetDir = async (targetDir: string) => {\n    await rimraf(targetDir);\n};\n\ntype Options = yargs.Arguments<{\n    glob: string;\n    cwd: string;\n    watch: boolean;\n    providedTypes: string;\n    strictMode: boolean;\n    validatorOnly: boolean;\n}>;\n\nconst getProvidedTypesPaths = async (options: Options): Promise<string[]> => {\n    let paths: string[] = [];\n    const { providedTypes: pattern, cwd } = options;\n\n    if (pattern) {\n        paths = await glob(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });\n\n        if (!paths.length) {\n            console.warn(`Schema code generator: Provided pattern \"${pattern}\" could not find any files with GraphQL provided types`);\n        }\n    }\n\n    return paths;\n};\n\nconst generate = async (options: Options, providedTypesPaths: string[]) => {\n    const { glob: pattern, cwd, strictMode, validatorOnly } = options;\n\n    // TODO: Extract all this\n    const resultFiles = await glob(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });\n    const absoluteFilePaths = resultFiles.map((filePath) => path.resolve(path.join(cwd, filePath)));\n\n    // eslint-disable-next-line no-restricted-syntax\n    for (const absolutePath of absoluteFilePaths) {\n        // we have to run this first to remove all preexisting directories before generating any files\n        // eslint-disable-next-line no-await-in-loop\n        await cleanupTargetDir(getGeneratorTargetDirectory(absolutePath));\n    }\n\n    const generatorOptions: GeneratorOptions = {\n        providedTypesPaths,\n        strictMode,\n        validatorOnly,\n    };\n\n    // eslint-disable-next-line no-restricted-syntax\n    for (const absolutePath of absoluteFilePaths) {\n        bustCacheForFile(absolutePath);\n        // eslint-disable-next-line no-await-in-loop\n        await generateContentForSchemaFile(absolutePath, generatorOptions);\n    }\n};\n\nconst run = async (options: Options) => {\n    // TODO: Refactor this part to be more smart about watching changes in provided types\n    let providedTypesPaths = await getProvidedTypesPaths(options);\n\n    await generate(options, providedTypesPaths);\n\n    if (options.watch) {\n        console.log('Schema code generator watching for changes....');\n        chokidar\n            .watch([options.glob, options.providedTypes], {\n                cwd: options.cwd,\n                ignored: (changedFilePath: string) => {\n                    return changedFilePath.includes('node_modules');\n                },\n            })\n            .on('all', async (eventName: string, filePath: string) => {\n                // eslint-disable-next-line no-console\n                console.log(`Schema code generator detected changes. Rebuilding \"${filePath}\"...`);\n                const absolutePath = path.resolve(path.join(options.cwd, filePath));\n                if (eventName !== 'unlink') {\n                    bustCacheForFile(absolutePath);\n\n                    // TODO: Refactor this part to be more smart about watching changes in provided types\n                    providedTypesPaths = await getProvidedTypesPaths(options);\n\n                    const generatorOptions: GeneratorOptions = {\n                        providedTypesPaths,\n                        strictMode: options.strictMode,\n                        validatorOnly: options.validatorOnly,\n                    };\n\n                    await generateContentForSchemaFile(absolutePath, generatorOptions);\n                }\n            });\n    }\n};\n// eslint-disable-next-line @typescript-eslint/no-unused-expressions\nyargs\n    .command(\n        '$0 [options]',\n        'Generate hooks and other related code based on provided schema.',\n        (builder) => {\n            builder\n                .option('glob', {\n                    describe: `Glob pattern to find schemas.`,\n                    type: 'string',\n                    demandOption: true,\n                })\n                .option('strict-mode', {\n                    describe: 'Toggles validation strict mode',\n                    type: 'boolean',\n                    default: true,\n                })\n                .option('provided-types', {\n                    describe: `Glob pattern to find provided types for schemas.`,\n                    type: 'string',\n                    default: '',\n                })\n                /** @since 2.1.0 */\n                .option('validator-only', {\n                    describe: `Only generate validators for the given schema files.`,\n                    type: 'boolean',\n                    default: false,\n                })\n                .option('watch', {\n                    describe: `Continuously watch for and generate on changes.`,\n                    type: 'boolean',\n                    default: false,\n                })\n                .option('cwd', {\n                    describe: `The cwd in which the glob is searching for schemas. Defaults to process.cwd()`,\n                    type: 'string',\n                    default: process.cwd(),\n                });\n        },\n        run,\n    )\n    .help().argv; // for --help and -h to work\n"]}

package/dist/cjs/graphql-definition.js

@@ -1,9 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const glob_1 = (0, tslib_1.__importDefault)(require("glob"));
-const util_1 = require("util");
-const globPromise = (0, util_1.promisify)(glob_1.default);
+const glob_1 = require("glob");
 const scalarToDefinitionString = (scalar) => {
     return `
 """
@@ -14,16 +30,16 @@ scalar ${scalar.name}
 `;
 };
 const getScalars = async () => {
-    const scalarFiles = await globPromise('./scalars/**/*.js', { cwd: __dirname });
+    const scalarFiles = await (0, glob_1.glob)('./scalars/**/*.js', { cwd: __dirname, dotRelative: true });
     const scalars = (await Promise.all(scalarFiles.map(async (filePath) => {
-        return (await Promise.resolve().then(() => (0, tslib_1.__importStar)(require(filePath)))).default;
+        return (await Promise.resolve().then(() => __importStar(require(filePath)))).default;
     }))).filter(Boolean);
     return scalars.map(scalarToDefinitionString).join('\n\n');
 };
 const getProvidedTypes = async () => {
-    const providedTypesFiles = await globPromise('./providedTypes/*.js', { cwd: __dirname });
+    const providedTypesFiles = await (0, glob_1.glob)('./providedTypes/*.js', { cwd: __dirname, dotRelative: true });
     const providedTypes = await Promise.all(providedTypesFiles.map(async (filePath) => {
-        return (await Promise.resolve().then(() => (0, tslib_1.__importStar)(require(filePath)))).default;
+        return (await Promise.resolve().then(() => __importStar(require(filePath)))).default;
     }));
     return providedTypes.join('\n\n');
 };

package/dist/cjs/graphql-definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-definition.js","sourceRoot":"","sources":["../../lib/graphql-definition.ts"],"names":[],"mappings":";;;AAAA,6DAAwB;AACxB,+BAAiC;AAGjC,MAAM,WAAW,GAAG,IAAA,gBAAS,EAAC,cAAI,CAAC,CAAC;AAEpC,MAAM,wBAAwB,GAAG,CAAC,MAAc,EAAE,EAAE;IAChD,OAAO;;EAET,MAAM,CAAC,WAAW;WACT,OAAO,MAAM,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc;;SAE3G,MAAM,CAAC,IAAI;CACnB,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;IAC1B,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IAC/E,MAAM,OAAO,GAAG,CACZ,MAAM,OAAO,CAAC,GAAG,CACb,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC/B,OAAO,CAAC,qEAAa,QAAQ,GAAC,CAAC,CAAC,OAAiB,CAAC;IACtD,CAAC,CAAC,CACL,CACJ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElB,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,kBAAkB,GAAG,MAAM,WAAW,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IACzF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACtC,OAAO,CAAC,qEAAa,QAAQ,GAAC,CAAC,CAAC,OAAiB,CAAC;IACtD,CAAC,CAAC,CACL,CAAC;IAEF,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,kBAAe,KAAK,IAAI,EAAE;IACtB,MAAM,iBAAiB,GAAG,MAAM,UAAU,EAAE,CAAC;IAC7C,MAAM,wBAAwB,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAE1D,OAAO;;;;EAIT,iBAAiB;;;;;EAKjB,wBAAwB;CACzB,CAAC;AACF,CAAC,CAAC","sourcesContent":["import glob from 'glob';\nimport { promisify } from 'util';\nimport type { Scalar } from './scalars/types';\n\nconst globPromise = promisify(glob);\n\nconst scalarToDefinitionString = (scalar: Scalar) => {\n    return `\n\"\"\"\n${scalar.description}\nExample: ${typeof scalar.defaultExample === 'string' ? JSON.stringify(scalar.defaultExample) : scalar.defaultExample}\n\"\"\"\nscalar ${scalar.name}\n`;\n};\n\nconst getScalars = async () => {\n    const scalarFiles = await globPromise('./scalars/**/*.js', { cwd: __dirname });\n    const scalars = (\n        await Promise.all(\n            scalarFiles.map(async (filePath) => {\n                return (await import(filePath)).default as Scalar;\n            }),\n        )\n    ).filter(Boolean);\n\n    return scalars.map(scalarToDefinitionString).join('\\n\\n');\n};\n\nconst getProvidedTypes = async () => {\n    const providedTypesFiles = await globPromise('./providedTypes/*.js', { cwd: __dirname });\n    const providedTypes = await Promise.all(\n        providedTypesFiles.map(async (filePath) => {\n            return (await import(filePath)).default as string;\n        }),\n    );\n\n    return providedTypes.join('\\n\\n');\n};\n\nexport default async () => {\n    const scalarDefinitions = await getScalars();\n    const providedTypesDefinitions = await getProvidedTypes();\n\n    return `\n###########################################################\n# GENERATED: Scalar definitions for clientside extensions #\n###########################################################\n${scalarDefinitions}\n\n############################################################################\n# GENERATED: Other provided types, enums, unions for clientside extensions #\n############################################################################\n${providedTypesDefinitions}\n`;\n};\n"]}
+{"version":3,"file":"graphql-definition.js","sourceRoot":"","sources":["../../lib/graphql-definition.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,+BAA4B;AAG5B,MAAM,wBAAwB,GAAG,CAAC,MAAc,EAAE,EAAE;IAChD,OAAO;;EAET,MAAM,CAAC,WAAW;WACT,OAAO,MAAM,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc;;SAE3G,MAAM,CAAC,IAAI;CACnB,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;IAC1B,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,MAAM,OAAO,GAAG,CACZ,MAAM,OAAO,CAAC,GAAG,CACb,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC/B,OAAO,CAAC,wDAAa,QAAQ,GAAC,CAAC,CAAC,OAAiB,CAAC;IACtD,CAAC,CAAC,CACL,CACJ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElB,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,kBAAkB,GAAG,MAAM,IAAA,WAAI,EAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IACrG,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACtC,OAAO,CAAC,wDAAa,QAAQ,GAAC,CAAC,CAAC,OAAiB,CAAC;IACtD,CAAC,CAAC,CACL,CAAC;IAEF,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,kBAAe,KAAK,IAAI,EAAE;IACtB,MAAM,iBAAiB,GAAG,MAAM,UAAU,EAAE,CAAC;IAC7C,MAAM,wBAAwB,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAE1D,OAAO;;;;EAIT,iBAAiB;;;;;EAKjB,wBAAwB;CACzB,CAAC;AACF,CAAC,CAAC","sourcesContent":["import { glob } from 'glob';\nimport type { Scalar } from './scalars/types';\n\nconst scalarToDefinitionString = (scalar: Scalar) => {\n    return `\n\"\"\"\n${scalar.description}\nExample: ${typeof scalar.defaultExample === 'string' ? JSON.stringify(scalar.defaultExample) : scalar.defaultExample}\n\"\"\"\nscalar ${scalar.name}\n`;\n};\n\nconst getScalars = async () => {\n    const scalarFiles = await glob('./scalars/**/*.js', { cwd: __dirname, dotRelative: true });\n    const scalars = (\n        await Promise.all(\n            scalarFiles.map(async (filePath) => {\n                return (await import(filePath)).default as Scalar;\n            }),\n        )\n    ).filter(Boolean);\n\n    return scalars.map(scalarToDefinitionString).join('\\n\\n');\n};\n\nconst getProvidedTypes = async () => {\n    const providedTypesFiles = await glob('./providedTypes/*.js', { cwd: __dirname, dotRelative: true });\n    const providedTypes = await Promise.all(\n        providedTypesFiles.map(async (filePath) => {\n            return (await import(filePath)).default as string;\n        }),\n    );\n\n    return providedTypes.join('\\n\\n');\n};\n\nexport default async () => {\n    const scalarDefinitions = await getScalars();\n    const providedTypesDefinitions = await getProvidedTypes();\n\n    return `\n###########################################################\n# GENERATED: Scalar definitions for clientside extensions #\n###########################################################\n${scalarDefinitions}\n\n############################################################################\n# GENERATED: Other provided types, enums, unions for clientside extensions #\n############################################################################\n${providedTypesDefinitions}\n`;\n};\n"]}

package/dist/cjs/loader/schema-loader.js

@@ -2,22 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const loader_utils_1 = require("loader-utils");
-const glob_1 = (0, tslib_1.__importDefault)(require("glob"));
+const glob_1 = require("glob");
 const schema_utils_1 = require("schema-utils");
-const util_1 = require("util");
 const code_generator_1 = (0, tslib_1.__importDefault)(require("../code-generator/code-generator"));
 const loader_schema_json_1 = (0, tslib_1.__importDefault)(require("./loader-schema.json"));
-const globPromise = (0, util_1.promisify)(glob_1.default);
 const toFilename = (loaderContext, identifier, content) => (0, loader_utils_1.interpolateName)(loaderContext, `${identifier}.[contenthash].js`, {
     context: loaderContext.rootContext,
     content,
 });
 const fileStore = new Map();
 const findProvidedTypes = async (pattern, cwd) => {
-    const providedTypes = await globPromise(pattern, {
+    const providedTypes = await (0, glob_1.glob)(pattern, {
         ignore: '**/node_modules/**',
         absolute: true,
         cwd,
+        dotRelative: true,
     });
     if (!providedTypes.length) {
         console.warn(`CSE schema-loader: Provided pattern "${pattern}" could not find any files with GraphQL provided types`);

package/dist/cjs/loader/schema-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-loader.js","sourceRoot":"","sources":["../../../lib/loader/schema-loader.ts"],"names":[],"mappings":"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","sourcesContent":["import { getOptions, interpolateName, parseQuery } from 'loader-utils';\nimport glob from 'glob';\nimport { validate } from 'schema-utils';\n\nimport type { Schema } from 'schema-utils/declarations/validate';\nimport { promisify } from 'util';\nimport type { GeneratorOptions } from '../code-generator/code-generator';\nimport generateCode from '../code-generator/code-generator';\nimport schema from './loader-schema.json';\nimport type { LoaderOptions, LoaderContext, LoaderCallback, QueryObject } from './types';\n\nconst globPromise = promisify(glob);\n\nconst toFilename = (loaderContext: LoaderContext, identifier: string, content: string) =>\n    interpolateName(loaderContext, `${identifier}.[contenthash].js`, {\n        context: loaderContext.rootContext,\n        content,\n    });\n\nconst fileStore = new Map<string, string>();\n\nconst findProvidedTypes = async (pattern: string, cwd?: string): Promise<string[]> => {\n    const providedTypes = await globPromise(pattern, {\n        ignore: '**/node_modules/**',\n        absolute: true,\n        cwd,\n    });\n\n    if (!providedTypes.length) {\n        console.warn(`CSE schema-loader: Provided pattern \"${pattern}\" could not find any files with GraphQL provided types`);\n    }\n\n    return providedTypes;\n};\n\n// We need a way to serialize and convert Windows OS style path before outputting it as a string. The webpack loader had issues when the \"\\\"\n// directory separator character was not escaped and as a result the file path end-up glued together e.g. \"C:foobarfile.graphql\".\n// The solution is either to convert this path \"C:\\foo\\bar\\file.graphql\" to \"C:\\\\foo\\\\bar\\\\file.graphql\"\n// or to a unix style \"C:/foo/bar/file.graphql\"\nconst serializePath = (filePath: string): string => {\n    return filePath.replace(/\\\\/g, '\\\\\\\\');\n};\n\n// The full name of the webpack GraphQL loader we are referencing in the generated code\nconst graphqlLoaderPath = '@atlassian/clientside-extensions-schema/loader';\n\nconst defaultLoaderOptions: LoaderOptions = {\n    providedTypes: '',\n    strictMode: true,\n};\n\n// get's a \"this\" context so !MUST! be a \"function\" and !NOT! an arrow-function\nexport default async function schemaLoader(this: LoaderContext, content: string) {\n    const callback = this.async() as LoaderCallback;\n\n    // Get and validate loader options\n    const loaderOptions: Readonly<LoaderOptions> = getOptions(this);\n\n    validate(schema as Schema, loaderOptions, { name: 'CSE schema-loader' });\n\n    const { providedTypes: providedTypesPattern, strictMode }: LoaderOptions = { ...defaultLoaderOptions, ...loaderOptions };\n\n    // Get provided types\n    let providedTypesPaths: string[] = [];\n\n    if (providedTypesPattern) {\n        providedTypesPaths = await findProvidedTypes(providedTypesPattern, loaderOptions.cwd);\n\n        // Track custom type files\n        providedTypesPaths.forEach((file: string) => this.addDependency(file));\n    }\n\n    // Run schema compiler\n    const loaderContext = this as LoaderContext;\n\n    if (this.resourceQuery) {\n        const rqOptions = parseQuery(this.resourceQuery) as QueryObject;\n\n        if (rqOptions.subfile && fileStore.has(rqOptions.subfile)) {\n            callback(null, fileStore.get(rqOptions.subfile));\n            return;\n        }\n\n        callback(new Error(`CSE Schema-loader: Unknown subfile ${rqOptions.subfile} requested.`));\n        return;\n    }\n\n    try {\n        const generatorOptions: Partial<GeneratorOptions> = {\n            providedTypesPaths,\n            strictMode,\n        };\n\n        const [, , generatedJavascript] = await generateCode(\n            content,\n            generatorOptions,\n            async (baseIdentifier: string, typescriptCode: string, javascriptCode: string) => {\n                const filename = toFilename(loaderContext, baseIdentifier, javascriptCode);\n                fileStore.set(filename, javascriptCode);\n\n                const resourcePath = serializePath(loaderContext.resourcePath);\n\n                return `!!${graphqlLoaderPath}!${resourcePath}?subfile=${filename}`;\n            },\n            false,\n        );\n        callback(null, generatedJavascript);\n    } catch (err) {\n        const error = err as Error;\n\n        callback(error);\n    }\n}\n"]}
+{"version":3,"file":"schema-loader.js","sourceRoot":"","sources":["../../../lib/loader/schema-loader.ts"],"names":[],"mappings":"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","sourcesContent":["import { getOptions, interpolateName, parseQuery } from 'loader-utils';\nimport { glob } from 'glob';\nimport { validate } from 'schema-utils';\n\nimport type { Schema } from 'schema-utils/declarations/validate';\nimport type { GeneratorOptions } from '../code-generator/code-generator';\nimport generateCode from '../code-generator/code-generator';\nimport schema from './loader-schema.json';\nimport type { LoaderOptions, LoaderContext, LoaderCallback, QueryObject } from './types';\n\nconst toFilename = (loaderContext: LoaderContext, identifier: string, content: string) =>\n    interpolateName(loaderContext, `${identifier}.[contenthash].js`, {\n        context: loaderContext.rootContext,\n        content,\n    });\n\nconst fileStore = new Map<string, string>();\n\nconst findProvidedTypes = async (pattern: string, cwd?: string): Promise<string[]> => {\n    const providedTypes = await glob(pattern, {\n        ignore: '**/node_modules/**',\n        absolute: true,\n        cwd,\n        dotRelative: true,\n    });\n\n    if (!providedTypes.length) {\n        console.warn(`CSE schema-loader: Provided pattern \"${pattern}\" could not find any files with GraphQL provided types`);\n    }\n\n    return providedTypes;\n};\n\n// We need a way to serialize and convert Windows OS style path before outputting it as a string. The webpack loader had issues when the \"\\\"\n// directory separator character was not escaped and as a result the file path end-up glued together e.g. \"C:foobarfile.graphql\".\n// The solution is either to convert this path \"C:\\foo\\bar\\file.graphql\" to \"C:\\\\foo\\\\bar\\\\file.graphql\"\n// or to a unix style \"C:/foo/bar/file.graphql\"\nconst serializePath = (filePath: string): string => {\n    return filePath.replace(/\\\\/g, '\\\\\\\\');\n};\n\n// The full name of the webpack GraphQL loader we are referencing in the generated code\nconst graphqlLoaderPath = '@atlassian/clientside-extensions-schema/loader';\n\nconst defaultLoaderOptions: LoaderOptions = {\n    providedTypes: '',\n    strictMode: true,\n};\n\n// get's a \"this\" context so !MUST! be a \"function\" and !NOT! an arrow-function\nexport default async function schemaLoader(this: LoaderContext, content: string) {\n    const callback = this.async() as LoaderCallback;\n\n    // Get and validate loader options\n    const loaderOptions: Readonly<LoaderOptions> = getOptions(this);\n\n    validate(schema as Schema, loaderOptions, { name: 'CSE schema-loader' });\n\n    const { providedTypes: providedTypesPattern, strictMode }: LoaderOptions = { ...defaultLoaderOptions, ...loaderOptions };\n\n    // Get provided types\n    let providedTypesPaths: string[] = [];\n\n    if (providedTypesPattern) {\n        providedTypesPaths = await findProvidedTypes(providedTypesPattern, loaderOptions.cwd);\n\n        // Track custom type files\n        providedTypesPaths.forEach((file: string) => this.addDependency(file));\n    }\n\n    // Run schema compiler\n    const loaderContext = this as LoaderContext;\n\n    if (this.resourceQuery) {\n        const rqOptions = parseQuery(this.resourceQuery) as QueryObject;\n\n        if (rqOptions.subfile && fileStore.has(rqOptions.subfile)) {\n            callback(null, fileStore.get(rqOptions.subfile));\n            return;\n        }\n\n        callback(new Error(`CSE Schema-loader: Unknown subfile ${rqOptions.subfile} requested.`));\n        return;\n    }\n\n    try {\n        const generatorOptions: Partial<GeneratorOptions> = {\n            providedTypesPaths,\n            strictMode,\n        };\n\n        const [, , generatedJavascript] = await generateCode(\n            content,\n            generatorOptions,\n            async (baseIdentifier: string, typescriptCode: string, javascriptCode: string) => {\n                const filename = toFilename(loaderContext, baseIdentifier, javascriptCode);\n                fileStore.set(filename, javascriptCode);\n\n                const resourcePath = serializePath(loaderContext.resourcePath);\n\n                return `!!${graphqlLoaderPath}!${resourcePath}?subfile=${filename}`;\n            },\n            false,\n        );\n        callback(null, generatedJavascript);\n    } catch (err) {\n        const error = err as Error;\n\n        callback(error);\n    }\n}\n"]}

package/dist/esm/bin/generate-from-schema.js

@@ -1,17 +1,14 @@
 #!/usr/bin/env node
-import glob from 'glob';
-import { promisify } from 'util';
+import { glob } from 'glob';
 import yargs from 'yargs';
 import path from 'path';
 import fs from 'fs';
 import mkdirp from 'mkdirp';
-import rimraf from 'rimraf';
+import { rimraf } from 'rimraf';
 import chokidar from 'chokidar';
 import snakeCase from 'lodash.snakecase';
 import generateCode from '../code-generator/code-generator';
 import { loadSchema } from '../utils/schema';
-const globPromise = promisify(glob);
-const rimrafPromise = promisify(rimraf);
 const appendExtension = (baseFileName, extension) => {
     return `${baseFileName}.${extension}`;
 };
@@ -60,13 +57,13 @@ ${e}`);
     }
 };
 const cleanupTargetDir = async (targetDir) => {
-    await rimrafPromise(targetDir);
+    await rimraf(targetDir);
 };
 const getProvidedTypesPaths = async (options) => {
     let paths = [];
     const { providedTypes: pattern, cwd } = options;
     if (pattern) {
-        paths = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });
+        paths = await glob(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });
         if (!paths.length) {
             console.warn(`Schema code generator: Provided pattern "${pattern}" could not find any files with GraphQL provided types`);
         }
@@ -76,7 +73,7 @@ const getProvidedTypesPaths = async (options) => {
 const generate = async (options, providedTypesPaths) => {
     const { glob: pattern, cwd, strictMode, validatorOnly } = options;
     // TODO: Extract all this
-    const resultFiles = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });
+    const resultFiles = await glob(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });
     const absoluteFilePaths = resultFiles.map((filePath) => path.resolve(path.join(cwd, filePath)));
     // eslint-disable-next-line no-restricted-syntax
     for (const absolutePath of absoluteFilePaths) {

package/dist/esm/bin/generate-from-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-from-schema.js","sourceRoot":"","sources":["../../../lib/bin/generate-from-schema.ts"],"names":[],"mappings":"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","sourcesContent":["#!/usr/bin/env node\nimport glob from 'glob';\nimport { promisify } from 'util';\nimport yargs from 'yargs';\nimport path from 'path';\nimport fs from 'fs';\nimport mkdirp from 'mkdirp';\nimport rimraf from 'rimraf';\nimport chokidar from 'chokidar';\nimport snakeCase from 'lodash.snakecase';\nimport generateCode from '../code-generator/code-generator';\nimport { loadSchema } from '../utils/schema';\n\nimport type { FileWriter, GeneratorOptions } from '../code-generator/code-generator';\n\nconst globPromise = promisify(glob);\nconst rimrafPromise = promisify(rimraf);\n\nconst appendExtension = (baseFileName: string, extension: string) => {\n    return `${baseFileName}.${extension}`;\n};\n\nconst getGeneratorTargetDirectory = (filePath: string) => {\n    return path.join(path.dirname(filePath), 'generated');\n};\n\nconst ensureFileName = (name: string) => {\n    return snakeCase(name) as string;\n};\n\nconst bustCacheForFile = (filePath: string) => {\n    delete require.cache[require.resolve(filePath)]; // watch mode cache busting\n};\n\nconst toRelativeIfExists = (filePath: string) => {\n    if (!filePath) {\n        return null;\n    }\n\n    return `./${filePath}`;\n};\n\nconst writeContentsToFile =\n    (targetDirectory: string): FileWriter =>\n    async (baseIdentifier: string, typescriptCode: string, javascriptCode: string) => {\n        const baseFilename = ensureFileName(baseIdentifier);\n        const wrapperFileNameTs = path.join(targetDirectory, appendExtension(baseFilename, 'ts'));\n        const wrapperFileNameJs = path.join(targetDirectory, appendExtension(baseFilename, 'js'));\n        await mkdirp(path.dirname(wrapperFileNameTs));\n        await fs.promises.writeFile(wrapperFileNameTs, typescriptCode, 'utf8');\n        await fs.promises.writeFile(wrapperFileNameJs, javascriptCode, 'utf8');\n\n        return toRelativeIfExists(baseFilename);\n    };\n\nconst generateContentForSchemaFile = async (filePath: string, generatorOptions: GeneratorOptions) => {\n    bustCacheForFile(filePath);\n    const schemaData = await loadSchema(filePath);\n    if (!schemaData) {\n        return;\n    }\n    const targetDirectory = getGeneratorTargetDirectory(filePath);\n    try {\n        await generateCode(schemaData, generatorOptions, writeContentsToFile(targetDirectory), true);\n    } catch (e) {\n        console.error(`Something went wrong trying to generate the hooks for your extension point specified at \"${filePath}\".\nIf this persists, feel free to raise an issue with us at: https://bitbucket.org/atlassian/atlassian-clientside-extensions/issues\n\nProvided Schema:\n${schemaData}\nOriginal Error:\n${e}`);\n    }\n};\n\nconst cleanupTargetDir = async (targetDir: string) => {\n    await rimrafPromise(targetDir);\n};\n\ntype Options = yargs.Arguments<{\n    glob: string;\n    cwd: string;\n    watch: boolean;\n    providedTypes: string;\n    strictMode: boolean;\n    validatorOnly: boolean;\n}>;\n\nconst getProvidedTypesPaths = async (options: Options): Promise<string[]> => {\n    let paths: string[] = [];\n    const { providedTypes: pattern, cwd } = options;\n\n    if (pattern) {\n        paths = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });\n\n        if (!paths.length) {\n            console.warn(`Schema code generator: Provided pattern \"${pattern}\" could not find any files with GraphQL provided types`);\n        }\n    }\n\n    return paths;\n};\n\nconst generate = async (options: Options, providedTypesPaths: string[]) => {\n    const { glob: pattern, cwd, strictMode, validatorOnly } = options;\n\n    // TODO: Extract all this\n    const resultFiles = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });\n    const absoluteFilePaths = resultFiles.map((filePath) => path.resolve(path.join(cwd, filePath)));\n\n    // eslint-disable-next-line no-restricted-syntax\n    for (const absolutePath of absoluteFilePaths) {\n        // we have to run this first to remove all preexisting directories before generating any files\n        // eslint-disable-next-line no-await-in-loop\n        await cleanupTargetDir(getGeneratorTargetDirectory(absolutePath));\n    }\n\n    const generatorOptions: GeneratorOptions = {\n        providedTypesPaths,\n        strictMode,\n        validatorOnly,\n    };\n\n    // eslint-disable-next-line no-restricted-syntax\n    for (const absolutePath of absoluteFilePaths) {\n        bustCacheForFile(absolutePath);\n        // eslint-disable-next-line no-await-in-loop\n        await generateContentForSchemaFile(absolutePath, generatorOptions);\n    }\n};\n\nconst run = async (options: Options) => {\n    // TODO: Refactor this part to be more smart about watching changes in provided types\n    let providedTypesPaths = await getProvidedTypesPaths(options);\n\n    await generate(options, providedTypesPaths);\n\n    if (options.watch) {\n        console.log('Schema code generator watching for changes....');\n        chokidar\n            .watch([options.glob, options.providedTypes], {\n                cwd: options.cwd,\n                ignored: (changedFilePath: string) => {\n                    return changedFilePath.includes('node_modules');\n                },\n            })\n            .on('all', async (eventName: string, filePath: string) => {\n                // eslint-disable-next-line no-console\n                console.log(`Schema code generator detected changes. Rebuilding \"${filePath}\"...`);\n                const absolutePath = path.resolve(path.join(options.cwd, filePath));\n                if (eventName !== 'unlink') {\n                    bustCacheForFile(absolutePath);\n\n                    // TODO: Refactor this part to be more smart about watching changes in provided types\n                    providedTypesPaths = await getProvidedTypesPaths(options);\n\n                    const generatorOptions: GeneratorOptions = {\n                        providedTypesPaths,\n                        strictMode: options.strictMode,\n                        validatorOnly: options.validatorOnly,\n                    };\n\n                    await generateContentForSchemaFile(absolutePath, generatorOptions);\n                }\n            });\n    }\n};\n// eslint-disable-next-line @typescript-eslint/no-unused-expressions\nyargs\n    .command(\n        '$0 [options]',\n        'Generate hooks and other related code based on provided schema.',\n        (builder) => {\n            builder\n                .option('glob', {\n                    describe: `Glob pattern to find schemas.`,\n                    type: 'string',\n                    demandOption: true,\n                })\n                .option('strict-mode', {\n                    describe: 'Toggles validation strict mode',\n                    type: 'boolean',\n                    default: true,\n                })\n                .option('provided-types', {\n                    describe: `Glob pattern to find provided types for schemas.`,\n                    type: 'string',\n                    default: '',\n                })\n                /** @since 2.1.0 */\n                .option('validator-only', {\n                    describe: `Only generate validators for the given schema files.`,\n                    type: 'boolean',\n                    default: false,\n                })\n                .option('watch', {\n                    describe: `Continuously watch for and generate on changes.`,\n                    type: 'boolean',\n                    default: false,\n                })\n                .option('cwd', {\n                    describe: `The cwd in which the glob is searching for schemas. Defaults to process.cwd()`,\n                    type: 'string',\n                    default: process.cwd(),\n                });\n        },\n        run,\n    )\n    .help().argv; // for --help and -h to work\n"]}
+{"version":3,"file":"generate-from-schema.js","sourceRoot":"","sources":["../../../lib/bin/generate-from-schema.ts"],"names":[],"mappings":"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","sourcesContent":["#!/usr/bin/env node\nimport { glob } from 'glob';\nimport yargs from 'yargs';\nimport path from 'path';\nimport fs from 'fs';\nimport mkdirp from 'mkdirp';\nimport { rimraf } from 'rimraf';\nimport chokidar from 'chokidar';\nimport snakeCase from 'lodash.snakecase';\nimport generateCode from '../code-generator/code-generator';\nimport { loadSchema } from '../utils/schema';\n\nimport type { FileWriter, GeneratorOptions } from '../code-generator/code-generator';\n\nconst appendExtension = (baseFileName: string, extension: string) => {\n    return `${baseFileName}.${extension}`;\n};\n\nconst getGeneratorTargetDirectory = (filePath: string) => {\n    return path.join(path.dirname(filePath), 'generated');\n};\n\nconst ensureFileName = (name: string) => {\n    return snakeCase(name) as string;\n};\n\nconst bustCacheForFile = (filePath: string) => {\n    delete require.cache[require.resolve(filePath)]; // watch mode cache busting\n};\n\nconst toRelativeIfExists = (filePath: string) => {\n    if (!filePath) {\n        return null;\n    }\n\n    return `./${filePath}`;\n};\n\nconst writeContentsToFile =\n    (targetDirectory: string): FileWriter =>\n    async (baseIdentifier: string, typescriptCode: string, javascriptCode: string) => {\n        const baseFilename = ensureFileName(baseIdentifier);\n        const wrapperFileNameTs = path.join(targetDirectory, appendExtension(baseFilename, 'ts'));\n        const wrapperFileNameJs = path.join(targetDirectory, appendExtension(baseFilename, 'js'));\n        await mkdirp(path.dirname(wrapperFileNameTs));\n        await fs.promises.writeFile(wrapperFileNameTs, typescriptCode, 'utf8');\n        await fs.promises.writeFile(wrapperFileNameJs, javascriptCode, 'utf8');\n\n        return toRelativeIfExists(baseFilename);\n    };\n\nconst generateContentForSchemaFile = async (filePath: string, generatorOptions: GeneratorOptions) => {\n    bustCacheForFile(filePath);\n    const schemaData = await loadSchema(filePath);\n    if (!schemaData) {\n        return;\n    }\n    const targetDirectory = getGeneratorTargetDirectory(filePath);\n    try {\n        await generateCode(schemaData, generatorOptions, writeContentsToFile(targetDirectory), true);\n    } catch (e) {\n        console.error(`Something went wrong trying to generate the hooks for your extension point specified at \"${filePath}\".\nIf this persists, feel free to raise an issue with us at: https://bitbucket.org/atlassian/atlassian-clientside-extensions/issues\n\nProvided Schema:\n${schemaData}\nOriginal Error:\n${e}`);\n    }\n};\n\nconst cleanupTargetDir = async (targetDir: string) => {\n    await rimraf(targetDir);\n};\n\ntype Options = yargs.Arguments<{\n    glob: string;\n    cwd: string;\n    watch: boolean;\n    providedTypes: string;\n    strictMode: boolean;\n    validatorOnly: boolean;\n}>;\n\nconst getProvidedTypesPaths = async (options: Options): Promise<string[]> => {\n    let paths: string[] = [];\n    const { providedTypes: pattern, cwd } = options;\n\n    if (pattern) {\n        paths = await glob(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });\n\n        if (!paths.length) {\n            console.warn(`Schema code generator: Provided pattern \"${pattern}\" could not find any files with GraphQL provided types`);\n        }\n    }\n\n    return paths;\n};\n\nconst generate = async (options: Options, providedTypesPaths: string[]) => {\n    const { glob: pattern, cwd, strictMode, validatorOnly } = options;\n\n    // TODO: Extract all this\n    const resultFiles = await glob(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });\n    const absoluteFilePaths = resultFiles.map((filePath) => path.resolve(path.join(cwd, filePath)));\n\n    // eslint-disable-next-line no-restricted-syntax\n    for (const absolutePath of absoluteFilePaths) {\n        // we have to run this first to remove all preexisting directories before generating any files\n        // eslint-disable-next-line no-await-in-loop\n        await cleanupTargetDir(getGeneratorTargetDirectory(absolutePath));\n    }\n\n    const generatorOptions: GeneratorOptions = {\n        providedTypesPaths,\n        strictMode,\n        validatorOnly,\n    };\n\n    // eslint-disable-next-line no-restricted-syntax\n    for (const absolutePath of absoluteFilePaths) {\n        bustCacheForFile(absolutePath);\n        // eslint-disable-next-line no-await-in-loop\n        await generateContentForSchemaFile(absolutePath, generatorOptions);\n    }\n};\n\nconst run = async (options: Options) => {\n    // TODO: Refactor this part to be more smart about watching changes in provided types\n    let providedTypesPaths = await getProvidedTypesPaths(options);\n\n    await generate(options, providedTypesPaths);\n\n    if (options.watch) {\n        console.log('Schema code generator watching for changes....');\n        chokidar\n            .watch([options.glob, options.providedTypes], {\n                cwd: options.cwd,\n                ignored: (changedFilePath: string) => {\n                    return changedFilePath.includes('node_modules');\n                },\n            })\n            .on('all', async (eventName: string, filePath: string) => {\n                // eslint-disable-next-line no-console\n                console.log(`Schema code generator detected changes. Rebuilding \"${filePath}\"...`);\n                const absolutePath = path.resolve(path.join(options.cwd, filePath));\n                if (eventName !== 'unlink') {\n                    bustCacheForFile(absolutePath);\n\n                    // TODO: Refactor this part to be more smart about watching changes in provided types\n                    providedTypesPaths = await getProvidedTypesPaths(options);\n\n                    const generatorOptions: GeneratorOptions = {\n                        providedTypesPaths,\n                        strictMode: options.strictMode,\n                        validatorOnly: options.validatorOnly,\n                    };\n\n                    await generateContentForSchemaFile(absolutePath, generatorOptions);\n                }\n            });\n    }\n};\n// eslint-disable-next-line @typescript-eslint/no-unused-expressions\nyargs\n    .command(\n        '$0 [options]',\n        'Generate hooks and other related code based on provided schema.',\n        (builder) => {\n            builder\n                .option('glob', {\n                    describe: `Glob pattern to find schemas.`,\n                    type: 'string',\n                    demandOption: true,\n                })\n                .option('strict-mode', {\n                    describe: 'Toggles validation strict mode',\n                    type: 'boolean',\n                    default: true,\n                })\n                .option('provided-types', {\n                    describe: `Glob pattern to find provided types for schemas.`,\n                    type: 'string',\n                    default: '',\n                })\n                /** @since 2.1.0 */\n                .option('validator-only', {\n                    describe: `Only generate validators for the given schema files.`,\n                    type: 'boolean',\n                    default: false,\n                })\n                .option('watch', {\n                    describe: `Continuously watch for and generate on changes.`,\n                    type: 'boolean',\n                    default: false,\n                })\n                .option('cwd', {\n                    describe: `The cwd in which the glob is searching for schemas. Defaults to process.cwd()`,\n                    type: 'string',\n                    default: process.cwd(),\n                });\n        },\n        run,\n    )\n    .help().argv; // for --help and -h to work\n"]}

package/dist/esm/graphql-definition.js

@@ -1,6 +1,4 @@
-import glob from 'glob';
-import { promisify } from 'util';
-const globPromise = promisify(glob);
+import { glob } from 'glob';
 const scalarToDefinitionString = (scalar) => {
     return `
 """
@@ -11,14 +9,14 @@ scalar ${scalar.name}
 `;
 };
 const getScalars = async () => {
-    const scalarFiles = await globPromise('./scalars/**/*.js', { cwd: __dirname });
+    const scalarFiles = await glob('./scalars/**/*.js', { cwd: __dirname, dotRelative: true });
     const scalars = (await Promise.all(scalarFiles.map(async (filePath) => {
         return (await import(filePath)).default;
     }))).filter(Boolean);
     return scalars.map(scalarToDefinitionString).join('\n\n');
 };
 const getProvidedTypes = async () => {
-    const providedTypesFiles = await globPromise('./providedTypes/*.js', { cwd: __dirname });
+    const providedTypesFiles = await glob('./providedTypes/*.js', { cwd: __dirname, dotRelative: true });
     const providedTypes = await Promise.all(providedTypesFiles.map(async (filePath) => {
         return (await import(filePath)).default;
     }));

package/dist/esm/graphql-definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-definition.js","sourceRoot":"","sources":["../../lib/graphql-definition.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGjC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAEpC,MAAM,wBAAwB,GAAG,CAAC,MAAc,EAAE,EAAE;IAChD,OAAO;;EAET,MAAM,CAAC,WAAW;WACT,OAAO,MAAM,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc;;SAE3G,MAAM,CAAC,IAAI;CACnB,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;IAC1B,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IAC/E,MAAM,OAAO,GAAG,CACZ,MAAM,OAAO,CAAC,GAAG,CACb,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC/B,OAAO,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAiB,CAAC;IACtD,CAAC,CAAC,CACL,CACJ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElB,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,kBAAkB,GAAG,MAAM,WAAW,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IACzF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACtC,OAAO,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAiB,CAAC;IACtD,CAAC,CAAC,CACL,CAAC;IAEF,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,eAAe,KAAK,IAAI,EAAE;IACtB,MAAM,iBAAiB,GAAG,MAAM,UAAU,EAAE,CAAC;IAC7C,MAAM,wBAAwB,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAE1D,OAAO;;;;EAIT,iBAAiB;;;;;EAKjB,wBAAwB;CACzB,CAAC;AACF,CAAC,CAAC","sourcesContent":["import glob from 'glob';\nimport { promisify } from 'util';\nimport type { Scalar } from './scalars/types';\n\nconst globPromise = promisify(glob);\n\nconst scalarToDefinitionString = (scalar: Scalar) => {\n    return `\n\"\"\"\n${scalar.description}\nExample: ${typeof scalar.defaultExample === 'string' ? JSON.stringify(scalar.defaultExample) : scalar.defaultExample}\n\"\"\"\nscalar ${scalar.name}\n`;\n};\n\nconst getScalars = async () => {\n    const scalarFiles = await globPromise('./scalars/**/*.js', { cwd: __dirname });\n    const scalars = (\n        await Promise.all(\n            scalarFiles.map(async (filePath) => {\n                return (await import(filePath)).default as Scalar;\n            }),\n        )\n    ).filter(Boolean);\n\n    return scalars.map(scalarToDefinitionString).join('\\n\\n');\n};\n\nconst getProvidedTypes = async () => {\n    const providedTypesFiles = await globPromise('./providedTypes/*.js', { cwd: __dirname });\n    const providedTypes = await Promise.all(\n        providedTypesFiles.map(async (filePath) => {\n            return (await import(filePath)).default as string;\n        }),\n    );\n\n    return providedTypes.join('\\n\\n');\n};\n\nexport default async () => {\n    const scalarDefinitions = await getScalars();\n    const providedTypesDefinitions = await getProvidedTypes();\n\n    return `\n###########################################################\n# GENERATED: Scalar definitions for clientside extensions #\n###########################################################\n${scalarDefinitions}\n\n############################################################################\n# GENERATED: Other provided types, enums, unions for clientside extensions #\n############################################################################\n${providedTypesDefinitions}\n`;\n};\n"]}
+{"version":3,"file":"graphql-definition.js","sourceRoot":"","sources":["../../lib/graphql-definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,MAAM,wBAAwB,GAAG,CAAC,MAAc,EAAE,EAAE;IAChD,OAAO;;EAET,MAAM,CAAC,WAAW;WACT,OAAO,MAAM,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc;;SAE3G,MAAM,CAAC,IAAI;CACnB,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;IAC1B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,MAAM,OAAO,GAAG,CACZ,MAAM,OAAO,CAAC,GAAG,CACb,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC/B,OAAO,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAiB,CAAC;IACtD,CAAC,CAAC,CACL,CACJ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElB,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IACrG,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACtC,OAAO,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAiB,CAAC;IACtD,CAAC,CAAC,CACL,CAAC;IAEF,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,eAAe,KAAK,IAAI,EAAE;IACtB,MAAM,iBAAiB,GAAG,MAAM,UAAU,EAAE,CAAC;IAC7C,MAAM,wBAAwB,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAE1D,OAAO;;;;EAIT,iBAAiB;;;;;EAKjB,wBAAwB;CACzB,CAAC;AACF,CAAC,CAAC","sourcesContent":["import { glob } from 'glob';\nimport type { Scalar } from './scalars/types';\n\nconst scalarToDefinitionString = (scalar: Scalar) => {\n    return `\n\"\"\"\n${scalar.description}\nExample: ${typeof scalar.defaultExample === 'string' ? JSON.stringify(scalar.defaultExample) : scalar.defaultExample}\n\"\"\"\nscalar ${scalar.name}\n`;\n};\n\nconst getScalars = async () => {\n    const scalarFiles = await glob('./scalars/**/*.js', { cwd: __dirname, dotRelative: true });\n    const scalars = (\n        await Promise.all(\n            scalarFiles.map(async (filePath) => {\n                return (await import(filePath)).default as Scalar;\n            }),\n        )\n    ).filter(Boolean);\n\n    return scalars.map(scalarToDefinitionString).join('\\n\\n');\n};\n\nconst getProvidedTypes = async () => {\n    const providedTypesFiles = await glob('./providedTypes/*.js', { cwd: __dirname, dotRelative: true });\n    const providedTypes = await Promise.all(\n        providedTypesFiles.map(async (filePath) => {\n            return (await import(filePath)).default as string;\n        }),\n    );\n\n    return providedTypes.join('\\n\\n');\n};\n\nexport default async () => {\n    const scalarDefinitions = await getScalars();\n    const providedTypesDefinitions = await getProvidedTypes();\n\n    return `\n###########################################################\n# GENERATED: Scalar definitions for clientside extensions #\n###########################################################\n${scalarDefinitions}\n\n############################################################################\n# GENERATED: Other provided types, enums, unions for clientside extensions #\n############################################################################\n${providedTypesDefinitions}\n`;\n};\n"]}

package/dist/esm/loader/schema-loader.js

@@ -1,20 +1,19 @@
 import { getOptions, interpolateName, parseQuery } from 'loader-utils';
-import glob from 'glob';
+import { glob } from 'glob';
 import { validate } from 'schema-utils';
-import { promisify } from 'util';
 import generateCode from '../code-generator/code-generator';
 import schema from './loader-schema.json';
-const globPromise = promisify(glob);
 const toFilename = (loaderContext, identifier, content) => interpolateName(loaderContext, `${identifier}.[contenthash].js`, {
     context: loaderContext.rootContext,
     content,
 });
 const fileStore = new Map();
 const findProvidedTypes = async (pattern, cwd) => {
-    const providedTypes = await globPromise(pattern, {
+    const providedTypes = await glob(pattern, {
         ignore: '**/node_modules/**',
         absolute: true,
         cwd,
+        dotRelative: true,
     });
     if (!providedTypes.length) {
         console.warn(`CSE schema-loader: Provided pattern "${pattern}" could not find any files with GraphQL provided types`);

package/dist/esm/loader/schema-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-loader.js","sourceRoot":"","sources":["../../../lib/loader/schema-loader.ts"],"names":[],"mappings":"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","sourcesContent":["import { getOptions, interpolateName, parseQuery } from 'loader-utils';\nimport glob from 'glob';\nimport { validate } from 'schema-utils';\n\nimport type { Schema } from 'schema-utils/declarations/validate';\nimport { promisify } from 'util';\nimport type { GeneratorOptions } from '../code-generator/code-generator';\nimport generateCode from '../code-generator/code-generator';\nimport schema from './loader-schema.json';\nimport type { LoaderOptions, LoaderContext, LoaderCallback, QueryObject } from './types';\n\nconst globPromise = promisify(glob);\n\nconst toFilename = (loaderContext: LoaderContext, identifier: string, content: string) =>\n    interpolateName(loaderContext, `${identifier}.[contenthash].js`, {\n        context: loaderContext.rootContext,\n        content,\n    });\n\nconst fileStore = new Map<string, string>();\n\nconst findProvidedTypes = async (pattern: string, cwd?: string): Promise<string[]> => {\n    const providedTypes = await globPromise(pattern, {\n        ignore: '**/node_modules/**',\n        absolute: true,\n        cwd,\n    });\n\n    if (!providedTypes.length) {\n        console.warn(`CSE schema-loader: Provided pattern \"${pattern}\" could not find any files with GraphQL provided types`);\n    }\n\n    return providedTypes;\n};\n\n// We need a way to serialize and convert Windows OS style path before outputting it as a string. The webpack loader had issues when the \"\\\"\n// directory separator character was not escaped and as a result the file path end-up glued together e.g. \"C:foobarfile.graphql\".\n// The solution is either to convert this path \"C:\\foo\\bar\\file.graphql\" to \"C:\\\\foo\\\\bar\\\\file.graphql\"\n// or to a unix style \"C:/foo/bar/file.graphql\"\nconst serializePath = (filePath: string): string => {\n    return filePath.replace(/\\\\/g, '\\\\\\\\');\n};\n\n// The full name of the webpack GraphQL loader we are referencing in the generated code\nconst graphqlLoaderPath = '@atlassian/clientside-extensions-schema/loader';\n\nconst defaultLoaderOptions: LoaderOptions = {\n    providedTypes: '',\n    strictMode: true,\n};\n\n// get's a \"this\" context so !MUST! be a \"function\" and !NOT! an arrow-function\nexport default async function schemaLoader(this: LoaderContext, content: string) {\n    const callback = this.async() as LoaderCallback;\n\n    // Get and validate loader options\n    const loaderOptions: Readonly<LoaderOptions> = getOptions(this);\n\n    validate(schema as Schema, loaderOptions, { name: 'CSE schema-loader' });\n\n    const { providedTypes: providedTypesPattern, strictMode }: LoaderOptions = { ...defaultLoaderOptions, ...loaderOptions };\n\n    // Get provided types\n    let providedTypesPaths: string[] = [];\n\n    if (providedTypesPattern) {\n        providedTypesPaths = await findProvidedTypes(providedTypesPattern, loaderOptions.cwd);\n\n        // Track custom type files\n        providedTypesPaths.forEach((file: string) => this.addDependency(file));\n    }\n\n    // Run schema compiler\n    const loaderContext = this as LoaderContext;\n\n    if (this.resourceQuery) {\n        const rqOptions = parseQuery(this.resourceQuery) as QueryObject;\n\n        if (rqOptions.subfile && fileStore.has(rqOptions.subfile)) {\n            callback(null, fileStore.get(rqOptions.subfile));\n            return;\n        }\n\n        callback(new Error(`CSE Schema-loader: Unknown subfile ${rqOptions.subfile} requested.`));\n        return;\n    }\n\n    try {\n        const generatorOptions: Partial<GeneratorOptions> = {\n            providedTypesPaths,\n            strictMode,\n        };\n\n        const [, , generatedJavascript] = await generateCode(\n            content,\n            generatorOptions,\n            async (baseIdentifier: string, typescriptCode: string, javascriptCode: string) => {\n                const filename = toFilename(loaderContext, baseIdentifier, javascriptCode);\n                fileStore.set(filename, javascriptCode);\n\n                const resourcePath = serializePath(loaderContext.resourcePath);\n\n                return `!!${graphqlLoaderPath}!${resourcePath}?subfile=${filename}`;\n            },\n            false,\n        );\n        callback(null, generatedJavascript);\n    } catch (err) {\n        const error = err as Error;\n\n        callback(error);\n    }\n}\n"]}
+{"version":3,"file":"schema-loader.js","sourceRoot":"","sources":["../../../lib/loader/schema-loader.ts"],"names":[],"mappings":"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","sourcesContent":["import { getOptions, interpolateName, parseQuery } from 'loader-utils';\nimport { glob } from 'glob';\nimport { validate } from 'schema-utils';\n\nimport type { Schema } from 'schema-utils/declarations/validate';\nimport type { GeneratorOptions } from '../code-generator/code-generator';\nimport generateCode from '../code-generator/code-generator';\nimport schema from './loader-schema.json';\nimport type { LoaderOptions, LoaderContext, LoaderCallback, QueryObject } from './types';\n\nconst toFilename = (loaderContext: LoaderContext, identifier: string, content: string) =>\n    interpolateName(loaderContext, `${identifier}.[contenthash].js`, {\n        context: loaderContext.rootContext,\n        content,\n    });\n\nconst fileStore = new Map<string, string>();\n\nconst findProvidedTypes = async (pattern: string, cwd?: string): Promise<string[]> => {\n    const providedTypes = await glob(pattern, {\n        ignore: '**/node_modules/**',\n        absolute: true,\n        cwd,\n        dotRelative: true,\n    });\n\n    if (!providedTypes.length) {\n        console.warn(`CSE schema-loader: Provided pattern \"${pattern}\" could not find any files with GraphQL provided types`);\n    }\n\n    return providedTypes;\n};\n\n// We need a way to serialize and convert Windows OS style path before outputting it as a string. The webpack loader had issues when the \"\\\"\n// directory separator character was not escaped and as a result the file path end-up glued together e.g. \"C:foobarfile.graphql\".\n// The solution is either to convert this path \"C:\\foo\\bar\\file.graphql\" to \"C:\\\\foo\\\\bar\\\\file.graphql\"\n// or to a unix style \"C:/foo/bar/file.graphql\"\nconst serializePath = (filePath: string): string => {\n    return filePath.replace(/\\\\/g, '\\\\\\\\');\n};\n\n// The full name of the webpack GraphQL loader we are referencing in the generated code\nconst graphqlLoaderPath = '@atlassian/clientside-extensions-schema/loader';\n\nconst defaultLoaderOptions: LoaderOptions = {\n    providedTypes: '',\n    strictMode: true,\n};\n\n// get's a \"this\" context so !MUST! be a \"function\" and !NOT! an arrow-function\nexport default async function schemaLoader(this: LoaderContext, content: string) {\n    const callback = this.async() as LoaderCallback;\n\n    // Get and validate loader options\n    const loaderOptions: Readonly<LoaderOptions> = getOptions(this);\n\n    validate(schema as Schema, loaderOptions, { name: 'CSE schema-loader' });\n\n    const { providedTypes: providedTypesPattern, strictMode }: LoaderOptions = { ...defaultLoaderOptions, ...loaderOptions };\n\n    // Get provided types\n    let providedTypesPaths: string[] = [];\n\n    if (providedTypesPattern) {\n        providedTypesPaths = await findProvidedTypes(providedTypesPattern, loaderOptions.cwd);\n\n        // Track custom type files\n        providedTypesPaths.forEach((file: string) => this.addDependency(file));\n    }\n\n    // Run schema compiler\n    const loaderContext = this as LoaderContext;\n\n    if (this.resourceQuery) {\n        const rqOptions = parseQuery(this.resourceQuery) as QueryObject;\n\n        if (rqOptions.subfile && fileStore.has(rqOptions.subfile)) {\n            callback(null, fileStore.get(rqOptions.subfile));\n            return;\n        }\n\n        callback(new Error(`CSE Schema-loader: Unknown subfile ${rqOptions.subfile} requested.`));\n        return;\n    }\n\n    try {\n        const generatorOptions: Partial<GeneratorOptions> = {\n            providedTypesPaths,\n            strictMode,\n        };\n\n        const [, , generatedJavascript] = await generateCode(\n            content,\n            generatorOptions,\n            async (baseIdentifier: string, typescriptCode: string, javascriptCode: string) => {\n                const filename = toFilename(loaderContext, baseIdentifier, javascriptCode);\n                fileStore.set(filename, javascriptCode);\n\n                const resourcePath = serializePath(loaderContext.resourcePath);\n\n                return `!!${graphqlLoaderPath}!${resourcePath}?subfile=${filename}`;\n            },\n            false,\n        );\n        callback(null, generatedJavascript);\n    } catch (err) {\n        const error = err as Error;\n\n        callback(error);\n    }\n}\n"]}

package/dist/types/graphql-definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-definition.d.ts","sourceRoot":"","sources":["../../lib/graphql-definition.ts"],"names":[],"mappings":";AAwCA,wBAeE"}
+{"version":3,"file":"graphql-definition.d.ts","sourceRoot":"","sources":["../../lib/graphql-definition.ts"],"names":[],"mappings":";AAqCA,wBAeE"}

package/dist/types/loader/schema-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-loader.d.ts","sourceRoot":"","sources":["../../../lib/loader/schema-loader.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAiB,aAAa,EAA+B,MAAM,SAAS,CAAC;AA2CzF,wBAA8B,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,iBA4D9E"}
+{"version":3,"file":"schema-loader.d.ts","sourceRoot":"","sources":["../../../lib/loader/schema-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAiB,aAAa,EAA+B,MAAM,SAAS,CAAC;AA0CzF,wBAA8B,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,iBA4D9E"}

package/lib/bin/generate-from-schema.ts

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
-import glob from 'glob';
-import { promisify } from 'util';
+import { glob } from 'glob';
 import yargs from 'yargs';
 import path from 'path';
 import fs from 'fs';
 import mkdirp from 'mkdirp';
-import rimraf from 'rimraf';
+import { rimraf } from 'rimraf';
 import chokidar from 'chokidar';
 import snakeCase from 'lodash.snakecase';
 import generateCode from '../code-generator/code-generator';
@@ -13,9 +12,6 @@ import { loadSchema } from '../utils/schema';
 
 import type { FileWriter, GeneratorOptions } from '../code-generator/code-generator';
 
-const globPromise = promisify(glob);
-const rimrafPromise = promisify(rimraf);
-
 const appendExtension = (baseFileName: string, extension: string) => {
     return `${baseFileName}.${extension}`;
 };
@@ -74,7 +70,7 @@ ${e}`);
 };
 
 const cleanupTargetDir = async (targetDir: string) => {
-    await rimrafPromise(targetDir);
+    await rimraf(targetDir);
 };
 
 type Options = yargs.Arguments<{
@@ -91,7 +87,7 @@ const getProvidedTypesPaths = async (options: Options): Promise<string[]> => {
     const { providedTypes: pattern, cwd } = options;
 
     if (pattern) {
-        paths = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });
+        paths = await glob(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });
 
         if (!paths.length) {
             console.warn(`Schema code generator: Provided pattern "${pattern}" could not find any files with GraphQL provided types`);
@@ -105,7 +101,7 @@ const generate = async (options: Options, providedTypesPaths: string[]) => {
     const { glob: pattern, cwd, strictMode, validatorOnly } = options;
 
     // TODO: Extract all this
-    const resultFiles = await globPromise(pattern, { cwd, ignore: '**/node_modules/**' });
+    const resultFiles = await glob(pattern, { cwd, ignore: '**/node_modules/**', dotRelative: true });
     const absoluteFilePaths = resultFiles.map((filePath) => path.resolve(path.join(cwd, filePath)));
 
     // eslint-disable-next-line no-restricted-syntax

package/lib/graphql-definition.ts

@@ -1,9 +1,6 @@
-import glob from 'glob';
-import { promisify } from 'util';
+import { glob } from 'glob';
 import type { Scalar } from './scalars/types';
 
-const globPromise = promisify(glob);
-
 const scalarToDefinitionString = (scalar: Scalar) => {
     return `
 """
@@ -15,7 +12,7 @@ scalar ${scalar.name}
 };
 
 const getScalars = async () => {
-    const scalarFiles = await globPromise('./scalars/**/*.js', { cwd: __dirname });
+    const scalarFiles = await glob('./scalars/**/*.js', { cwd: __dirname, dotRelative: true });
     const scalars = (
         await Promise.all(
             scalarFiles.map(async (filePath) => {
@@ -28,7 +25,7 @@ const getScalars = async () => {
 };
 
 const getProvidedTypes = async () => {
-    const providedTypesFiles = await globPromise('./providedTypes/*.js', { cwd: __dirname });
+    const providedTypesFiles = await glob('./providedTypes/*.js', { cwd: __dirname, dotRelative: true });
     const providedTypes = await Promise.all(
         providedTypesFiles.map(async (filePath) => {
             return (await import(filePath)).default as string;

package/lib/loader/schema-loader.ts

@@ -1,16 +1,13 @@
 import { getOptions, interpolateName, parseQuery } from 'loader-utils';
-import glob from 'glob';
+import { glob } from 'glob';
 import { validate } from 'schema-utils';
 
 import type { Schema } from 'schema-utils/declarations/validate';
-import { promisify } from 'util';
 import type { GeneratorOptions } from '../code-generator/code-generator';
 import generateCode from '../code-generator/code-generator';
 import schema from './loader-schema.json';
 import type { LoaderOptions, LoaderContext, LoaderCallback, QueryObject } from './types';
 
-const globPromise = promisify(glob);
-
 const toFilename = (loaderContext: LoaderContext, identifier: string, content: string) =>
     interpolateName(loaderContext, `${identifier}.[contenthash].js`, {
         context: loaderContext.rootContext,
@@ -20,10 +17,11 @@ const toFilename = (loaderContext: LoaderContext, identifier: string, content: s
 const fileStore = new Map<string, string>();
 
 const findProvidedTypes = async (pattern: string, cwd?: string): Promise<string[]> => {
-    const providedTypes = await globPromise(pattern, {
+    const providedTypes = await glob(pattern, {
         ignore: '**/node_modules/**',
         absolute: true,
         cwd,
+        dotRelative: true,
     });
 
     if (!providedTypes.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@atlassian/clientside-extensions-schema",
-    "version": "3.0.2",
+    "version": "3.1.0",
     "description": "Implements the handling of extension-schemas used for validation, code-generation and documentation.",
     "license": "BSD-3-Clause",
     "homepage": "https://bitbucket.org/atlassian/atlassian-clientside-extensions#readme",
@@ -70,7 +70,7 @@
         "verify": "tsc --noEmit -p tsconfig.all.json",
         "watch": "tsc --watch -p tsconfig.cjs.json",
         "test": "jest",
-        "test:webpack4": "WEBPACK_4=true jest",
+        "test:webpack4": "env NODE_OPTIONS=--openssl-legacy-provider WEBPACK_4=true jest",
         "test:watch": "jest --watch"
     },
     "devDependencies": {
@@ -79,7 +79,6 @@
         "@types/lodash.camelcase": "4.3.6",
         "@types/lodash.snakecase": "4.1.6",
         "@types/mkdirp": "1.0.2",
-        "@types/rimraf": "3.0.2",
         "@types/webpack": "5.28.0",
         "jest": "27.3.1",
         "jest-in-case": "1.0.2",
@@ -88,19 +87,18 @@
         "webpack-4": "npm:webpack@4.46.0"
     },
     "dependencies": {
-        "@atlassian/clientside-extensions-registry": "^3.0.2",
+        "@atlassian/clientside-extensions-registry": "^3.1.0",
         "@graphql-tools/schema": "^8.0.0",
         "@graphql-tools/utils": "^8.0.0",
         "chokidar": "3.6.0",
-        "glob": "8.1.0",
+        "glob": "11.0.0",
         "graphql": "^16.0.0",
         "gray-matter": "4.0.3",
         "loader-utils": "2.0.4",
         "lodash.camelcase": "^4.3.0",
         "lodash.snakecase": "4.1.1",
         "mkdirp": "1.0.4",
-        "rehype-add-classes": "1.0.0",
-        "rimraf": "3.0.2",
+        "rimraf": "6.0.0",
         "schema-utils": "3.1.1",
         "tslib": "^2.2.0",
         "typescript": "4.5.2",
@@ -110,7 +108,7 @@
         "webpack": "^4.0.0 || ^5.0.0"
     },
     "engines": {
-        "node": ">=12.19.0"
+        "node": ">=20.16.0"
     },
-    "gitHead": "a1e02a9209592bbcb13acf1524d697c42d78d328"
+    "gitHead": "1237d7f0c4fb95343d966f9cede9ea69d6b880a5"
 }