@adobe/aio-cli-plugin-api-mesh 5.2.3 → 5.2.4-alpha.0

package/src/meshArtifact.js

@@ -1,231 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const { fixPlugins } = require('./fixPlugins');
-const logger = require('../src/classes/logger');
-
-/**
- * Whether file is TypeScript
- * @param filePath Filepath
- */
-function isTypeScriptFile(filePath) {
-	const ext = path.extname(filePath);
-	return ext === '.ts' || ext === '.tsx';
-}
-
-/**
- * Gets
- * @param builtMeshTenantDir
- * @returns {string}
- */
-function getBuiltMeshEntrypoint(builtMeshTenantDir) {
-	let builtMeshIndexPath = path.join(builtMeshTenantDir, 'index');
-	return fs.existsSync(`${builtMeshIndexPath}.ts`)
-		? `${builtMeshIndexPath}.ts`
-		: `${builtMeshIndexPath}.js`;
-}
-
-/**
- * Converts composer string to static imports compatible with bundling
- * @param data {string} Data read from the built mesh
- * @returns {string} Updated data
- * @example Converts composer string
- * ```
- * "beforeAll": {
- *     "composer": "/Users/user/project/hooks.js#isAuth",
- *     "blocking": true
- * }
- * ```
- * To:
- * ```
- * "beforeAll": {
- *     "module": await import("/Users/user/project/hooks.js"), "fn": "isAuth",
- *         "blocking": true
- * }
- * ```
- */
-function resolveComposerAsTypeScriptModule(data) {
-	return data.replace(
-		/"composer":\s*"([^#]+)#([^"]+)"/,
-		`"module": await import("$1"), "fn": "$2"`,
-	);
-}
-
-/**
- * Converts composer string to static imports compatible with bundling
- * @param data {string} Data read from the built mesh
- * @returns {string} Updated data
- * @example Converts composer string
- * ```
- * "beforeAll": {
- *     "composer": "/Users/user/project/hooks.js#isAuth",
- *     "blocking": true
- * }
- * ```
- * To:
- * ```
- * "beforeAll": {
- *     "module": __importStar(require("/Users/user/project/hooks.js")), "fn": "isAuth",
- *         "blocking": true
- * }
- * ```
- */
-function resolveComposerAsJavaScriptModule(data) {
-	return data.replace(
-		/"composer":\s*"([^#]+)#([^"]+)"/,
-		`"module": __importStar(require("$1")), "fn": "$2"`,
-	);
-}
-
-/**
- * Takes a mesh artifact and converts composer configuration to static imports
- * compatible with bundling
- * @param meshArtifactPath Path to the mesh artifact used to determine extension
- * @param data {string} Data read from the built mesh
- * @returns {string} Updated data
- * @see {@link resolveComposerAsJavaScriptModule}
- * @see {@link resolveComposerAsTypeScriptModule}
- */
-function resolveComposerAsStaticImport(meshArtifactPath, data) {
-	return isTypeScriptFile(meshArtifactPath)
-		? resolveComposerAsTypeScriptModule(data)
-		: resolveComposerAsJavaScriptModule(data);
-}
-
-// /**
-//  * Converts handler string to static imports compatible with bundling
-//  * @param data {string} Data read from the built mesh
-//  * @returns {string} Updated data
-//  * @example Converts composer string
-//  * ```
-//  * "onFetch": {
-//  *     "handler": "/Users/user/project/fetch.js",
-//  *     "blocking": true
-//  * }
-//  * ```
-//  * To:
-//  * ```
-//  * "onFetch": {
-//  *     "handler": await import("/Users/user/project/fetch.js"),
-//  *         "blocking": true
-//  * }
-//  * ```
-//  */
-// function resolveHandlerAsTypeScriptModule(data) {
-// 	return data.replace(/"handler":\s*"([^"]+)"/, `"handler": await import("$1")`);
-// }
-
-// /**
-//  * Converts handler string to static imports compatible with bundling
-//  * @param data {string} Data read from the built mesh
-//  * @returns {string} Updated data
-//  * @example Converts composer string
-//  * ```
-//  * "onFetch": {
-//  *     "handler": "/Users/user/project/fetch.js",
-//  *     "blocking": true
-//  * }
-//  * ```
-//  * To:
-//  * ```
-//  * "onFetch": {
-//  *     "module": __importStar(require("/Users/user/project/fetch.js")),
-//  *         "blocking": true
-//  * }
-//  * ```
-//  */
-// function resolveHandlerAsJavaScriptModule(data) {
-// 	return data.replace(/"handler":\s*"([^"]+)"/, `"handler": __importStar(require("$1"))`);
-// }
-
-// /**
-//  * Takes a mesh artifact and converts handler configuration to static imports
-//  * compatible with bundling
-//  * @param meshArtifactPath Path to the mesh artifact used to determine extension
-//  * @param data {string} Data read from the built mesh
-//  * @returns {string} Updated data
-//  * @see {@link resolveHandlerAsJavaScriptModule}
-//  * @see {@link resolveHandlerAsTypeScriptModule}
-//  */
-// TODO: onFetch support - requires plugin changes
-// function resolveHandlerAsStaticImport(meshArtifactPath, data) {
-// 	return isTypeScriptFile(meshArtifactPath)
-// 		? resolveHandlerAsTypeScriptModule(data)
-// 		: resolveHandlerAsJavaScriptModule(data);
-// }
-
-const resolveRelativeSources = async builtMeshTenantDir => {
-	let builtMeshPath = getBuiltMeshEntrypoint(builtMeshTenantDir);
-
-	// Fix http details extensions plugin for edge compatibility
-	await fixPlugins(builtMeshPath);
-
-	// Read tenant files inventory
-	const artifactFilesPath = path.join(builtMeshTenantDir, 'files.json');
-	if (fs.existsSync(artifactFilesPath)) {
-		// Read mesh artifact
-		let builtMeshData = fs.readFileSync(builtMeshPath).toString();
-
-		const parentDirRegex = new RegExp('../tenantFiles'.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g');
-		builtMeshData = builtMeshData.replace(parentDirRegex, './tenantFiles');
-
-		// Write the modified mesh artifact
-		fs.writeFileSync(builtMeshPath, builtMeshData, 'utf8');
-	}
-};
-
-/**
- * Resolve original sources to materialized files in mesh artifact for local development and debugging
- * @param builtMeshTenantDir Built mesh tenant directory
- * @param localFileOverrides Local file overrides
- */
-const resolveOriginalSources = async (builtMeshTenantDir, localFileOverrides) => {
-	let builtMeshPath = getBuiltMeshEntrypoint(builtMeshTenantDir);
-
-	// Read tenant files inventory
-	const artifactFilesPath = path.join(builtMeshTenantDir, 'files.json');
-	if (fs.existsSync(artifactFilesPath)) {
-		let files = {};
-		try {
-			files = JSON.parse(fs.readFileSync(artifactFilesPath).toString());
-		} catch (err) {
-			logger.error('Malformed "files.json" file. Skipping original source resolution.');
-		}
-
-		// Read mesh artifact
-		let builtMeshData = fs.readFileSync(builtMeshPath).toString();
-		files.files.forEach(file => {
-			// Skip replacement of files for local development when the user was prompted
-			// to override and answered no
-			if (
-				Object.keys(localFileOverrides).includes(file.path) &&
-				localFileOverrides[file.path] === false
-			) {
-				return;
-			}
-
-			// When the source exists in project use it instead of the materialized file
-			const absoluteFilePath = path.resolve(file.path);
-
-			// Replace all occurrences of the materialized path with the fully qualified original path when it exists
-			if (fs.existsSync(absoluteFilePath)) {
-				const regex = new RegExp(file.materializedPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g');
-				builtMeshData = builtMeshData.replace(regex, absoluteFilePath);
-				builtMeshData = resolveComposerAsStaticImport(builtMeshPath, builtMeshData);
-				// TODO: onFetch support - requires plugin changes
-				// builtMeshData = resolveHandlerAsStaticImport(builtMeshPath, builtMeshData);
-			}
-		});
-
-		// Write the modified mesh artifact
-		fs.writeFileSync(builtMeshPath, builtMeshData, 'utf8');
-	}
-};
-
-module.exports = {
-	isTypeScriptFile,
-	resolveComposerAsTypeScriptModule,
-	resolveComposerAsJavaScriptModule,
-	resolveComposerAsStaticImport,
-	resolveRelativeSources,
-	resolveOriginalSources,
-};

package/src/project.js

@@ -1,56 +0,0 @@
-const { cpSync, existsSync, renameSync, rmSync } = require('node:fs');
-const { join } = require('node:path');
-const { resolveOriginalSources } = require('./meshArtifact');
-
-const BUILT_MESH_ARTIFACT_DIRECTORY = 'mesh-artifact';
-const BUILT_MESH_TENANT_FILES_DIRECTORY = join(BUILT_MESH_ARTIFACT_DIRECTORY, 'tenantFiles');
-const PACKAGED_MESH_DIR = '.mesh';
-const PACKAGED_MESH_DIR_TENANT_FILES_DIRECTORY = join(PACKAGED_MESH_DIR, 'tenantFiles');
-const PACKAGED_MESH_CLI_MIRROR_DIR = `${__dirname}/../${PACKAGED_MESH_DIR}`;
-const TEMP_FILES_DIRECTORY = 'tempfiles';
-const getBuiltMeshTenantDirectory = meshId => join(BUILT_MESH_ARTIFACT_DIRECTORY, meshId);
-
-/**
- * Copy built mesh artifact to packaged directory that runs local development.
- * @param builtMeshTenantDir Built mesh directory path
- * @returns {Promise<void>}
- */
-const copyBuiltMeshToPackage = async builtMeshTenantDir => {
-	// Reset packaged directories
-	safeDelete(PACKAGED_MESH_DIR);
-	safeDelete(PACKAGED_MESH_CLI_MIRROR_DIR);
-
-	// Copy the built mesh to the packaged directory for in-project SDK
-	safeRename(builtMeshTenantDir, PACKAGED_MESH_DIR);
-	safeRename(BUILT_MESH_TENANT_FILES_DIRECTORY, PACKAGED_MESH_DIR_TENANT_FILES_DIRECTORY);
-
-	// Copy the packaged mesh to the CLI mirror directory for local server
-	safeCopy(PACKAGED_MESH_DIR, PACKAGED_MESH_CLI_MIRROR_DIR);
-};
-
-const safeDelete = path => {
-	if (existsSync(path)) {
-		rmSync(path, { recursive: true });
-	}
-};
-
-const safeRename = (oldPath, newPath) => {
-	if (existsSync(oldPath)) {
-		renameSync(oldPath, newPath);
-	}
-};
-
-const safeCopy = (source, destination) => {
-	if (existsSync(source)) {
-		cpSync(source, destination, { recursive: true });
-	}
-};
-
-module.exports = {
-	BUILT_MESH_ARTIFACT_DIRECTORY,
-	safeDelete,
-	copyBuiltMeshToPackage,
-	resolveOriginalSources,
-	TEMP_FILES_DIRECTORY,
-	getBuiltMeshTenantDirectory,
-};

package/src/wranglerCli.js

@@ -1,54 +0,0 @@
-const { spawn } = require('child_process');
-const { readSecretsFile } = require('./serverUtils');
-const packageData = require('../package.json');
-const { join } = require('node:path');
-
-/**
- * Starts the wrangler dev server
- * @param command {Command} CLI command
- * @param port Port number
- * @param debug Whether debug mode is enabled
- * @param inspectPort Port number for local dev server inspector
- */
-const start = (command, port, debug, inspectPort) => {
-	const wranglerPackageNumber = packageData.dependencies.wrangler;
-	const wranglerVersion = `wrangler@${wranglerPackageNumber.replace(/^[\^~]/, '')}`;
-	const wranglerToml = join(__dirname, '..', 'wrangler.toml');
-	const meshDir = '.mesh';
-	const secrets = readSecretsFile(meshDir);
-	const entrypoint = join(__dirname, 'worker.js');
-
-	const commandArgs = [
-		wranglerVersion,
-		'--config',
-		wranglerToml,
-		'--cwd',
-		process.cwd(),
-		'dev',
-		entrypoint,
-		'--show-interactive-dev-session',
-		'false',
-		'--var',
-		`Secret:${JSON.stringify(secrets)}`,
-		'--port',
-		port,
-		'--inspector-port',
-		debug ? inspectPort : 0,
-	];
-
-	const wrangler = spawn('npx', commandArgs, {
-		stdio: 'inherit',
-	});
-
-	wrangler.on('close', code => {
-		// eslint-disable-next-line no-console
-		console.log(`wrangler dev process exited with code ${code}`);
-	});
-
-	wrangler.on('error', error => {
-		// eslint-disable-next-line no-console
-		console.error(`Failed to start wrangler dev: ${error.message}`);
-	});
-};
-
-module.exports = { start };

package/wrangler.toml

@@ -1,13 +0,0 @@
-# Tenant worker core definition. For platform workers metadata configs are used to set bindings.
-name = "tenant-worker-core"
-compatibility_date = "2024-06-03"
-
-find_additional_modules = true
-base_dir = ".mesh"
-rules = [
-  { type = "CommonJS", globs = ["tenantFiles/**/*.js"] }
-]
-
-
-[[migrations]]
-tag = "v1"