@webiny/project 0.0.0-unstable.e2758ee1cf → 0.0.0-unstable.e6f0dc8ca7

package/services/InstallExtensionService/downloadFolderFromS3.js

@@ -1,4 +1,3 @@
-import { S3Client, ListObjectsV2Command, GetObjectCommand } from "@webiny/aws-sdk/client-s3/index.js";
 import fs from "fs";
 import path from "path";
 export class NoObjectsFoundError extends Error {
@@ -15,65 +14,57 @@ export const downloadFolderFromS3 = async params => {
     bucketFolderKey,
     downloadFolderPath
   } = params;
-
-  // Prepend v6/ to the folder key
   const s3FolderKey = `v6/${bucketFolderKey}`;
-
-  // Configure the S3 client
-  const s3Client = new S3Client({
-    region: bucketRegion
-  });
-
-  // List all objects in the specified S3 folder
-  const listObjects = async (bucket, folderKey) => {
-    const command = new ListObjectsV2Command({
-      Bucket: bucket,
-      Prefix: folderKey
-    });
-    const response = await s3Client.send(command);
-    return response.Contents;
+  const baseUrl = `https://${bucketName}.s3.${bucketRegion}.amazonaws.com`;
+  const listObjects = async () => {
+    const keys = [];
+    let continuationToken;
+    do {
+      let url = `${baseUrl}/?list-type=2&prefix=${encodeURIComponent(s3FolderKey)}`;
+      if (continuationToken) {
+        url += `&continuation-token=${encodeURIComponent(continuationToken)}`;
+      }
+      const response = await fetch(url);
+      if (!response.ok) {
+        throw new Error(`Failed to list objects: ${response.status} ${response.statusText}`);
+      }
+      const xml = await response.text();
+      for (const match of xml.matchAll(/<Key>([^<]+)<\/Key>/g)) {
+        keys.push(match[1]);
+      }
+      const isTruncated = xml.includes("<IsTruncated>true</IsTruncated>");
+      continuationToken = isTruncated ? xml.match(/<NextContinuationToken>([^<]+)<\/NextContinuationToken>/)?.[1] : undefined;
+    } while (continuationToken);
+    return keys;
   };
-
-  // Download an individual file from S3
-  const downloadFile = async (bucket, key, localPath) => {
-    const command = new GetObjectCommand({
-      Bucket: bucket,
-      Key: key
-    });
-    const response = await s3Client.send(command);
-    return new Promise((resolve, reject) => {
-      const fileStream = fs.createWriteStream(localPath);
-      // @ts-expect-error Body is a stream
-      response.Body.pipe(fileStream);
-      // @ts-expect-error Body is a stream
-      response.Body.on("error", reject);
-      fileStream.on("finish", () => resolve());
-    });
+  const downloadFile = async (key, localPath) => {
+    const response = await fetch(`${baseUrl}/${key}`);
+    if (!response.ok) {
+      throw new Error(`Failed to download ${key}: ${response.status} ${response.statusText}`);
+    }
+    fs.writeFileSync(localPath, Buffer.from(await response.arrayBuffer()));
   };
-  const objects = (await listObjects(bucketName, s3FolderKey)) || [];
-  if (!objects.length) {
+  const keys = await listObjects();
+  if (!keys.length) {
     throw new NoObjectsFoundError(`No objects found in the specified S3 folder.`);
   }
-  for (const object of objects) {
-    const s3Key = object.Key;
-    const relativePath = path.relative(s3FolderKey, s3Key);
+  for (const key of keys) {
+    const relativePath = path.relative(s3FolderKey, key);
     const localFilePath = path.join(downloadFolderPath, relativePath);
-    if (s3Key.endsWith("/")) {
-      // It's a directory, create it if it doesn't exist.
+    if (key.endsWith("/")) {
       if (!fs.existsSync(localFilePath)) {
         fs.mkdirSync(localFilePath, {
           recursive: true
         });
       }
     } else {
-      // It's a file, download it.
       const localDirPath = path.dirname(localFilePath);
       if (!fs.existsSync(localDirPath)) {
         fs.mkdirSync(localDirPath, {
           recursive: true
         });
       }
-      await downloadFile(bucketName, s3Key, localFilePath);
+      await downloadFile(key, localFilePath);
     }
   }
 };

package/services/InstallExtensionService/downloadFolderFromS3.js.map

@@ -1 +1 @@
-{"version":3,"names":["S3Client","ListObjectsV2Command","GetObjectCommand","fs","path","NoObjectsFoundError","Error","code","constructor","message","name","downloadFolderFromS3","params","bucketName","bucketRegion","bucketFolderKey","downloadFolderPath","s3FolderKey","s3Client","region","listObjects","bucket","folderKey","command","Bucket","Prefix","response","send","Contents","downloadFile","key","localPath","Key","Promise","resolve","reject","fileStream","createWriteStream","Body","pipe","on","objects","length","object","s3Key","relativePath","relative","localFilePath","join","endsWith","existsSync","mkdirSync","recursive","localDirPath","dirname"],"sources":["downloadFolderFromS3.ts"],"sourcesContent":["import {\n    S3Client,\n    ListObjectsV2Command,\n    GetObjectCommand\n} from \"@webiny/aws-sdk/client-s3/index.js\";\nimport fs from \"fs\";\nimport path from \"path\";\n\ninterface DownloadFolderFromS3Params {\n    bucketName: string;\n    bucketRegion: string;\n    bucketFolderKey: string;\n    downloadFolderPath: string;\n}\n\nexport class NoObjectsFoundError extends Error {\n    code = \"NO_OBJECTS_FOUND\";\n    constructor(message: string) {\n        super(message);\n        this.name = \"NoObjectsFoundError\";\n    }\n}\n\nexport const downloadFolderFromS3 = async (params: DownloadFolderFromS3Params) => {\n    const { bucketName, bucketRegion, bucketFolderKey, downloadFolderPath } = params;\n\n    // Prepend v6/ to the folder key\n    const s3FolderKey = `v6/${bucketFolderKey}`;\n\n    // Configure the S3 client\n    const s3Client = new S3Client({ region: bucketRegion });\n\n    // List all objects in the specified S3 folder\n    const listObjects = async (bucket: string, folderKey: string) => {\n        const command = new ListObjectsV2Command({\n            Bucket: bucket,\n            Prefix: folderKey\n        });\n        const response = await s3Client.send(command);\n        return response.Contents;\n    };\n\n    // Download an individual file from S3\n    const downloadFile = async (bucket: string, key: string, localPath: string) => {\n        const command = new GetObjectCommand({\n            Bucket: bucket,\n            Key: key\n        });\n\n        const response = await s3Client.send(command);\n\n        return new Promise<void>((resolve, reject) => {\n            const fileStream = fs.createWriteStream(localPath);\n            // @ts-expect-error Body is a stream\n            response.Body.pipe(fileStream);\n            // @ts-expect-error Body is a stream\n            response.Body.on(\"error\", reject);\n            fileStream.on(\"finish\", () => resolve());\n        });\n    };\n\n    const objects = (await listObjects(bucketName, s3FolderKey)) || [];\n    if (!objects.length) {\n        throw new NoObjectsFoundError(`No objects found in the specified S3 folder.`);\n    }\n\n    for (const object of objects) {\n        const s3Key = object.Key!;\n        const relativePath = path.relative(s3FolderKey, s3Key);\n        const localFilePath = path.join(downloadFolderPath, relativePath);\n\n        if (s3Key.endsWith(\"/\")) {\n            // It's a directory, create it if it doesn't exist.\n            if (!fs.existsSync(localFilePath)) {\n                fs.mkdirSync(localFilePath, { recursive: true });\n            }\n        } else {\n            // It's a file, download it.\n            const localDirPath = path.dirname(localFilePath);\n            if (!fs.existsSync(localDirPath)) {\n                fs.mkdirSync(localDirPath, { recursive: true });\n            }\n\n            await downloadFile(bucketName, s3Key, localFilePath);\n        }\n    }\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["fs","path","NoObjectsFoundError","Error","code","constructor","message","name","downloadFolderFromS3","params","bucketName","bucketRegion","bucketFolderKey","downloadFolderPath","s3FolderKey","baseUrl","listObjects","keys","continuationToken","url","encodeURIComponent","response","fetch","ok","status","statusText","xml","text","match","matchAll","push","isTruncated","includes","undefined","downloadFile","key","localPath","writeFileSync","Buffer","from","arrayBuffer","length","relativePath","relative","localFilePath","join","endsWith","existsSync","mkdirSync","recursive","localDirPath","dirname"],"sources":["downloadFolderFromS3.ts"],"sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\n\ninterface DownloadFolderFromS3Params {\n    bucketName: string;\n    bucketRegion: string;\n    bucketFolderKey: string;\n    downloadFolderPath: string;\n}\n\nexport class NoObjectsFoundError extends Error {\n    code = \"NO_OBJECTS_FOUND\";\n    constructor(message: string) {\n        super(message);\n        this.name = \"NoObjectsFoundError\";\n    }\n}\n\nexport const downloadFolderFromS3 = async (params: DownloadFolderFromS3Params) => {\n    const { bucketName, bucketRegion, bucketFolderKey, downloadFolderPath } = params;\n\n    const s3FolderKey = `v6/${bucketFolderKey}`;\n    const baseUrl = `https://${bucketName}.s3.${bucketRegion}.amazonaws.com`;\n\n    const listObjects = async (): Promise<string[]> => {\n        const keys: string[] = [];\n        let continuationToken: string | undefined;\n\n        do {\n            let url = `${baseUrl}/?list-type=2&prefix=${encodeURIComponent(s3FolderKey)}`;\n            if (continuationToken) {\n                url += `&continuation-token=${encodeURIComponent(continuationToken)}`;\n            }\n\n            const response = await fetch(url);\n            if (!response.ok) {\n                throw new Error(\n                    `Failed to list objects: ${response.status} ${response.statusText}`\n                );\n            }\n\n            const xml = await response.text();\n\n            for (const match of xml.matchAll(/<Key>([^<]+)<\\/Key>/g)) {\n                keys.push(match[1]);\n            }\n\n            const isTruncated = xml.includes(\"<IsTruncated>true</IsTruncated>\");\n            continuationToken = isTruncated\n                ? xml.match(/<NextContinuationToken>([^<]+)<\\/NextContinuationToken>/)?.[1]\n                : undefined;\n        } while (continuationToken);\n\n        return keys;\n    };\n\n    const downloadFile = async (key: string, localPath: string): Promise<void> => {\n        const response = await fetch(`${baseUrl}/${key}`);\n        if (!response.ok) {\n            throw new Error(`Failed to download ${key}: ${response.status} ${response.statusText}`);\n        }\n        fs.writeFileSync(localPath, Buffer.from(await response.arrayBuffer()));\n    };\n\n    const keys = await listObjects();\n    if (!keys.length) {\n        throw new NoObjectsFoundError(`No objects found in the specified S3 folder.`);\n    }\n\n    for (const key of keys) {\n        const relativePath = path.relative(s3FolderKey, key);\n        const localFilePath = path.join(downloadFolderPath, relativePath);\n\n        if (key.endsWith(\"/\")) {\n            if (!fs.existsSync(localFilePath)) {\n                fs.mkdirSync(localFilePath, { recursive: true });\n            }\n        } else {\n            const localDirPath = path.dirname(localFilePath);\n            if (!fs.existsSync(localDirPath)) {\n                fs.mkdirSync(localDirPath, { recursive: true });\n            }\n            await downloadFile(key, localFilePath);\n        }\n    }\n};\n"],"mappings":"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","ignoreList":[]}

package/services/InstallExtensionService/types.d.ts

@@ -38,6 +38,10 @@ export interface ExtensionWebinyConfigTsx {
      * Component to render in the Extensions component.
      */
     component?: ExtensionComponent;
+    /**
+     * Multiple components to render in the Extensions component.
+     */
+    components?: ExtensionComponent[];
 }
 export interface ExtensionImport {
     /**

package/services/InstallExtensionService/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["/**\n * Schema for Webiny extension.json configuration files.\n * Based on: https://github.com/webiny/extensions/blob/main/schemas/extension.schema.json\n */\nexport interface ExtensionJson {\n    $schema?: string;\n    /**\n     * The unique name of the extension.\n     */\n    name: string;\n    /**\n     * The type of extension.\n     */\n    type: \"admin\" | \"api\" | \"cli\" | \"infra\";\n    /**\n     * Configuration for how this extension integrates with webiny.config.tsx.\n     */\n    webinyConfigTsx?: ExtensionWebinyConfigTsx;\n    /**\n     * Next steps to display after installation (legacy support).\n     */\n    nextSteps?: ExtensionMessagesConfig;\n    /**\n     * Additional notes and messages for the extension.\n     */\n    additionalNotes?: ExtensionMessagesConfig;\n    /**\n     * Additional package.json properties to merge.\n     */\n    packageJson?: Record<string, any>;\n}\n\nexport interface ExtensionWebinyConfigTsx {\n    /**\n     * Array of imports to add to the user's webiny.config.tsx.\n     */\n    imports?: ExtensionImport[];\n    /**\n     * Component to render in the Extensions component.\n     */\n    component?: ExtensionComponent;\n}\n\nexport interface ExtensionImport {\n    /**\n     * The named import specifier (e.g., 'AdminLogo').\n     */\n    specifier: string;\n    /**\n     * The relative path to import from (e.g., './extensions/AdminLogo/AdminLogo.js').\n     */\n    path: string;\n}\n\nexport interface ExtensionComponent {\n    /**\n     * The component name to render (should match one of the imported specifiers).\n     */\n    name: string;\n    /**\n     * Props to pass to the component (optional).\n     */\n    props?: Record<string, any>;\n}\n\nexport interface ExtensionMessage {\n    /**\n     * Message text (can include %s placeholders for variables).\n     */\n    text: string;\n    /**\n     * Variables to substitute into the message text.\n     */\n    variables?: string[];\n}\n\nexport interface ExtensionMessagesConfig {\n    /**\n     * Array of messages to display to users.\n     */\n    messages?: ExtensionMessage[];\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["/**\n * Schema for Webiny extension.json configuration files.\n * Based on: https://github.com/webiny/extensions/blob/main/schemas/extension.schema.json\n */\nexport interface ExtensionJson {\n    $schema?: string;\n    /**\n     * The unique name of the extension.\n     */\n    name: string;\n    /**\n     * The type of extension.\n     */\n    type: \"admin\" | \"api\" | \"cli\" | \"infra\";\n    /**\n     * Configuration for how this extension integrates with webiny.config.tsx.\n     */\n    webinyConfigTsx?: ExtensionWebinyConfigTsx;\n    /**\n     * Next steps to display after installation (legacy support).\n     */\n    nextSteps?: ExtensionMessagesConfig;\n    /**\n     * Additional notes and messages for the extension.\n     */\n    additionalNotes?: ExtensionMessagesConfig;\n    /**\n     * Additional package.json properties to merge.\n     */\n    packageJson?: Record<string, any>;\n}\n\nexport interface ExtensionWebinyConfigTsx {\n    /**\n     * Array of imports to add to the user's webiny.config.tsx.\n     */\n    imports?: ExtensionImport[];\n    /**\n     * Component to render in the Extensions component.\n     */\n    component?: ExtensionComponent;\n    /**\n     * Multiple components to render in the Extensions component.\n     */\n    components?: ExtensionComponent[];\n}\n\nexport interface ExtensionImport {\n    /**\n     * The named import specifier (e.g., 'AdminLogo').\n     */\n    specifier: string;\n    /**\n     * The relative path to import from (e.g., './extensions/AdminLogo/AdminLogo.js').\n     */\n    path: string;\n}\n\nexport interface ExtensionComponent {\n    /**\n     * The component name to render (should match one of the imported specifiers).\n     */\n    name: string;\n    /**\n     * Props to pass to the component (optional).\n     */\n    props?: Record<string, any>;\n}\n\nexport interface ExtensionMessage {\n    /**\n     * Message text (can include %s placeholders for variables).\n     */\n    text: string;\n    /**\n     * Variables to substitute into the message text.\n     */\n    variables?: string[];\n}\n\nexport interface ExtensionMessagesConfig {\n    /**\n     * Array of messages to display to users.\n     */\n    messages?: ExtensionMessage[];\n}\n"],"mappings":"","ignoreList":[]}

package/services/InstallExtensionService/updateWebinyConfig.js

@@ -10,27 +10,27 @@ import fs from "fs";
 const serializePropsToJsx = props => {
   const attributes = [];
   for (const [key, value] of Object.entries(props)) {
-    // Skip undefined values
+    // Skip undefined values.
     if (value === undefined) {
       continue;
     }
 
-    // Determine the serialization based on value type
+    // Determine the serialization based on value type.
     let serializedValue;
     if (typeof value === "string") {
-      // Strings: use JSON.stringify to handle escaping, then wrap in curly braces
+      // Strings: use JSON.stringify to handle escaping, then wrap in curly braces.
       serializedValue = `{${JSON.stringify(value)}}`;
     } else if (typeof value === "number" || typeof value === "boolean") {
-      // Numbers and booleans: wrap in curly braces without quotes
+      // Numbers and booleans: wrap in curly braces without quotes.
       serializedValue = `{${value}}`;
     } else if (value === null) {
-      // Null values
+      // Null values.
       serializedValue = `{null}`;
     } else if (Array.isArray(value) || typeof value === "object") {
-      // Arrays and objects: use JSON.stringify, then wrap in curly braces
+      // Arrays and objects: use JSON.stringify, then wrap in curly braces.
       serializedValue = `{${JSON.stringify(value)}}`;
     } else {
-      // Fallback for any other types
+      // Fallback for any other types.
       serializedValue = `{${JSON.stringify(value)}}`;
     }
     attributes.push(`${key}=${serializedValue}`);
@@ -38,6 +38,48 @@ const serializePropsToJsx = props => {
   return attributes.join(" ");
 };
 
+/**
+ * Adds a component to the Extensions function in the webiny.config.tsx content.
+ */
+const addComponentToExtensions = (content, componentName, props) => {
+  // Serialize props to JSX attributes.
+  const propsString = props ? serializePropsToJsx(props) : "";
+
+  // Generate component tag with or without props.
+  const componentTag = propsString ? `<${componentName} ${propsString} />` : `<${componentName} />`;
+
+  // Check if component already exists.
+  if (content.includes(componentTag)) {
+    return content;
+  }
+
+  // Find the Extensions function's return statement and add component before the final </>.
+  // Strategy: Find "export const Extensions" block, then find the last </> and insert before it.
+  const extensionsFuncRegex = /export const Extensions = \(\) => \{[\s\S]*?\};/;
+  const extensionsFuncMatch = content.match(extensionsFuncRegex);
+  if (!extensionsFuncMatch) {
+    return content;
+  }
+  const funcContent = extensionsFuncMatch[0];
+  // Find all </> in the function - the last one closes the return statement.
+  const closingTags = [...funcContent.matchAll(/<\/>/g)];
+  if (closingTags.length === 0) {
+    return content;
+  }
+  const lastClosingTag = closingTags[closingTags.length - 1];
+  const lastClosingTagIndex = lastClosingTag.index;
+
+  // Find the indentation of the line containing the last </>.
+  const beforeClosing = funcContent.substring(0, lastClosingTagIndex);
+  const lines = beforeClosing.split("\n");
+  const lastLine = lines[lines.length - 1];
+  const indent = lastLine.match(/^(\s*)/)?.[1] || "        ";
+
+  // Insert the component before the last </>.
+  const newFuncContent = funcContent.substring(0, lastClosingTagIndex) + `${indent}${componentTag}\n${indent}` + funcContent.substring(lastClosingTagIndex);
+  return content.replace(extensionsFuncRegex, newFuncContent);
+};
+
 /**
  * Update the webiny.config.tsx file to add extension imports and component.
  */
@@ -54,62 +96,47 @@ export const updateWebinyConfig = async params => {
   // Add imports at the top (after existing imports)
   if (webinyConfigTsx.imports && webinyConfigTsx.imports.length > 0) {
     for (const importStatement of webinyConfigTsx.imports) {
-      const importLine = `import { ${importStatement.specifier} } from "${importStatement.path}";`;
+      // Check if we need to add to an existing import from the same path.
+      const existingImportRegex = new RegExp(`import\\s+{([^}]+)}\\s+from\\s+["']${importStatement.path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["'];?`, "m");
+      const existingImportMatch = content.match(existingImportRegex);
+      if (existingImportMatch) {
+        // Import from this path exists, check if specifier is already imported.
+        const existingSpecifiers = existingImportMatch[1].split(",").map(s => s.trim());
+        if (!existingSpecifiers.includes(importStatement.specifier)) {
+          // Append the new specifier to the existing import.
+          const updatedSpecifiers = [...existingSpecifiers, importStatement.specifier].join(", ");
+          const updatedImportLine = `import { ${updatedSpecifiers} } from "${importStatement.path}";`;
+          content = content.replace(existingImportRegex, updatedImportLine);
+        }
+      } else {
+        // No existing import from this path, add a new import line.
+        const importLine = `import { ${importStatement.specifier} } from "${importStatement.path}";`;
 
-      // Check if import already exists
-      if (!content.includes(importLine)) {
-        // Find the position after the last import or at the beginning
+        // Find the position after the last import or at the beginning.
         const importRegex = /^import\s+.*?from\s+["'].*?["'];?\s*$/gm;
         const matches = Array.from(content.matchAll(importRegex));
         if (matches.length > 0) {
-          // Add after the last import
+          // Add after the last import.
           const lastImport = matches[matches.length - 1];
           const lastImportEnd = lastImport.index + lastImport[0].length;
           content = content.slice(0, lastImportEnd) + "\n" + importLine + content.slice(lastImportEnd);
         } else {
-          // No imports found, add at the beginning
+          // No imports found, add at the beginning.
           content = importLine + "\n\n" + content;
         }
       }
     }
   }
 
-  // Add component to the Extensions function
+  // Add component to the Extensions function.
   if (webinyConfigTsx.component) {
-    const componentName = webinyConfigTsx.component.name;
-    const props = webinyConfigTsx.component.props;
-
-    // Serialize props to JSX attributes
-    const propsString = props ? serializePropsToJsx(props) : "";
-
-    // Generate component tag with or without props
-    const componentTag = propsString ? `<${componentName} ${propsString} />` : `<${componentName} />`;
-
-    // Check if component already exists
-    if (!content.includes(componentTag)) {
-      // Find the Extensions function's return statement and add component before the final </>
-      // Strategy: Find "export const Extensions" block, then find the last </> and insert before it
-      const extensionsFuncRegex = /export const Extensions = \(\) => \{[\s\S]*?\};/;
-      const extensionsFuncMatch = content.match(extensionsFuncRegex);
-      if (extensionsFuncMatch) {
-        const funcContent = extensionsFuncMatch[0];
-        // Find all </> in the function - the last one closes the return statement
-        const closingTags = [...funcContent.matchAll(/<\/>/g)];
-        if (closingTags.length > 0) {
-          const lastClosingTag = closingTags[closingTags.length - 1];
-          const lastClosingTagIndex = lastClosingTag.index;
-
-          // Find the indentation of the line containing the last </>
-          const beforeClosing = funcContent.substring(0, lastClosingTagIndex);
-          const lines = beforeClosing.split("\n");
-          const lastLine = lines[lines.length - 1];
-          const indent = lastLine.match(/^(\s*)/)?.[1] || "        ";
+    content = addComponentToExtensions(content, webinyConfigTsx.component.name, webinyConfigTsx.component.props);
+  }
 
-          // Insert the component before the last </>
-          const newFuncContent = funcContent.substring(0, lastClosingTagIndex) + `${indent}${componentTag}\n${indent}` + funcContent.substring(lastClosingTagIndex);
-          content = content.replace(extensionsFuncRegex, newFuncContent);
-        }
-      }
+  // Add multiple components to the Extensions function.
+  if (webinyConfigTsx.components && webinyConfigTsx.components.length > 0) {
+    for (const component of webinyConfigTsx.components) {
+      content = addComponentToExtensions(content, component.name, component.props);
     }
   }
 

package/services/InstallExtensionService/updateWebinyConfig.js.map

@@ -1 +1 @@
-{"version":3,"names":["fs","serializePropsToJsx","props","attributes","key","value","Object","entries","undefined","serializedValue","JSON","stringify","Array","isArray","push","join","updateWebinyConfig","params","projectRoot","webinyConfigTsx","webinyConfigPath","content","readFileSync","imports","length","importStatement","importLine","specifier","path","includes","importRegex","matches","from","matchAll","lastImport","lastImportEnd","index","slice","component","componentName","name","propsString","componentTag","extensionsFuncRegex","extensionsFuncMatch","match","funcContent","closingTags","lastClosingTag","lastClosingTagIndex","beforeClosing","substring","lines","split","lastLine","indent","newFuncContent","replace","writeFileSync"],"sources":["updateWebinyConfig.ts"],"sourcesContent":["import fs from \"fs\";\nimport { ExtensionWebinyConfigTsx } from \"./types.js\";\n\ninterface UpdateWebinyConfigParams {\n    projectRoot: string;\n    webinyConfigTsx: ExtensionWebinyConfigTsx;\n}\n\n/**\n * Serializes a props object to JSX attribute syntax.\n * Examples:\n * - { secretKey: \"value\" } => 'secretKey={\"value\"}'\n * - { enabled: true } => 'enabled={true}'\n * - { count: 42 } => 'count={42}'\n * - { config: { key: \"value\" } } => 'config={{\"key\":\"value\"}}'\n */\nconst serializePropsToJsx = (props: Record<string, any>): string => {\n    const attributes: string[] = [];\n\n    for (const [key, value] of Object.entries(props)) {\n        // Skip undefined values\n        if (value === undefined) {\n            continue;\n        }\n\n        // Determine the serialization based on value type\n        let serializedValue: string;\n\n        if (typeof value === \"string\") {\n            // Strings: use JSON.stringify to handle escaping, then wrap in curly braces\n            serializedValue = `{${JSON.stringify(value)}}`;\n        } else if (typeof value === \"number\" || typeof value === \"boolean\") {\n            // Numbers and booleans: wrap in curly braces without quotes\n            serializedValue = `{${value}}`;\n        } else if (value === null) {\n            // Null values\n            serializedValue = `{null}`;\n        } else if (Array.isArray(value) || typeof value === \"object\") {\n            // Arrays and objects: use JSON.stringify, then wrap in curly braces\n            serializedValue = `{${JSON.stringify(value)}}`;\n        } else {\n            // Fallback for any other types\n            serializedValue = `{${JSON.stringify(value)}}`;\n        }\n\n        attributes.push(`${key}=${serializedValue}`);\n    }\n\n    return attributes.join(\" \");\n};\n\n/**\n * Update the webiny.config.tsx file to add extension imports and component.\n */\nexport const updateWebinyConfig = async (params: UpdateWebinyConfigParams): Promise<void> => {\n    const { projectRoot, webinyConfigTsx } = params;\n\n    const webinyConfigPath = `${projectRoot}/webiny.config.tsx`;\n\n    // Read the current webiny.config.tsx\n    let content = fs.readFileSync(webinyConfigPath, \"utf-8\");\n\n    // Add imports at the top (after existing imports)\n    if (webinyConfigTsx.imports && webinyConfigTsx.imports.length > 0) {\n        for (const importStatement of webinyConfigTsx.imports) {\n            const importLine = `import { ${importStatement.specifier} } from \"${importStatement.path}\";`;\n\n            // Check if import already exists\n            if (!content.includes(importLine)) {\n                // Find the position after the last import or at the beginning\n                const importRegex = /^import\\s+.*?from\\s+[\"'].*?[\"'];?\\s*$/gm;\n                const matches = Array.from(content.matchAll(importRegex));\n\n                if (matches.length > 0) {\n                    // Add after the last import\n                    const lastImport = matches[matches.length - 1];\n                    const lastImportEnd = lastImport.index! + lastImport[0].length;\n                    content =\n                        content.slice(0, lastImportEnd) +\n                        \"\\n\" +\n                        importLine +\n                        content.slice(lastImportEnd);\n                } else {\n                    // No imports found, add at the beginning\n                    content = importLine + \"\\n\\n\" + content;\n                }\n            }\n        }\n    }\n\n    // Add component to the Extensions function\n    if (webinyConfigTsx.component) {\n        const componentName = webinyConfigTsx.component.name;\n        const props = webinyConfigTsx.component.props;\n\n        // Serialize props to JSX attributes\n        const propsString = props ? serializePropsToJsx(props) : \"\";\n\n        // Generate component tag with or without props\n        const componentTag = propsString\n            ? `<${componentName} ${propsString} />`\n            : `<${componentName} />`;\n\n        // Check if component already exists\n        if (!content.includes(componentTag)) {\n            // Find the Extensions function's return statement and add component before the final </>\n            // Strategy: Find \"export const Extensions\" block, then find the last </> and insert before it\n            const extensionsFuncRegex = /export const Extensions = \\(\\) => \\{[\\s\\S]*?\\};/;\n            const extensionsFuncMatch = content.match(extensionsFuncRegex);\n\n            if (extensionsFuncMatch) {\n                const funcContent = extensionsFuncMatch[0];\n                // Find all </> in the function - the last one closes the return statement\n                const closingTags = [...funcContent.matchAll(/<\\/>/g)];\n\n                if (closingTags.length > 0) {\n                    const lastClosingTag = closingTags[closingTags.length - 1];\n                    const lastClosingTagIndex = lastClosingTag.index!;\n\n                    // Find the indentation of the line containing the last </>\n                    const beforeClosing = funcContent.substring(0, lastClosingTagIndex);\n                    const lines = beforeClosing.split(\"\\n\");\n                    const lastLine = lines[lines.length - 1];\n                    const indent = lastLine.match(/^(\\s*)/)?.[1] || \"        \";\n\n                    // Insert the component before the last </>\n                    const newFuncContent =\n                        funcContent.substring(0, lastClosingTagIndex) +\n                        `${indent}${componentTag}\\n${indent}` +\n                        funcContent.substring(lastClosingTagIndex);\n\n                    content = content.replace(extensionsFuncRegex, newFuncContent);\n                }\n            }\n        }\n    }\n\n    // Write the updated content back\n    fs.writeFileSync(webinyConfigPath, content, \"utf-8\");\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["fs","serializePropsToJsx","props","attributes","key","value","Object","entries","undefined","serializedValue","JSON","stringify","Array","isArray","push","join","addComponentToExtensions","content","componentName","propsString","componentTag","includes","extensionsFuncRegex","extensionsFuncMatch","match","funcContent","closingTags","matchAll","length","lastClosingTag","lastClosingTagIndex","index","beforeClosing","substring","lines","split","lastLine","indent","newFuncContent","replace","updateWebinyConfig","params","projectRoot","webinyConfigTsx","webinyConfigPath","readFileSync","imports","importStatement","existingImportRegex","RegExp","path","existingImportMatch","existingSpecifiers","map","s","trim","specifier","updatedSpecifiers","updatedImportLine","importLine","importRegex","matches","from","lastImport","lastImportEnd","slice","component","name","components","writeFileSync"],"sources":["updateWebinyConfig.ts"],"sourcesContent":["import fs from \"fs\";\nimport { ExtensionWebinyConfigTsx } from \"./types.js\";\n\ninterface UpdateWebinyConfigParams {\n    projectRoot: string;\n    webinyConfigTsx: ExtensionWebinyConfigTsx;\n}\n\n/**\n * Serializes a props object to JSX attribute syntax.\n * Examples:\n * - { secretKey: \"value\" } => 'secretKey={\"value\"}'\n * - { enabled: true } => 'enabled={true}'\n * - { count: 42 } => 'count={42}'\n * - { config: { key: \"value\" } } => 'config={{\"key\":\"value\"}}'\n */\nconst serializePropsToJsx = (props: Record<string, any>): string => {\n    const attributes: string[] = [];\n\n    for (const [key, value] of Object.entries(props)) {\n        // Skip undefined values.\n        if (value === undefined) {\n            continue;\n        }\n\n        // Determine the serialization based on value type.\n        let serializedValue: string;\n\n        if (typeof value === \"string\") {\n            // Strings: use JSON.stringify to handle escaping, then wrap in curly braces.\n            serializedValue = `{${JSON.stringify(value)}}`;\n        } else if (typeof value === \"number\" || typeof value === \"boolean\") {\n            // Numbers and booleans: wrap in curly braces without quotes.\n            serializedValue = `{${value}}`;\n        } else if (value === null) {\n            // Null values.\n            serializedValue = `{null}`;\n        } else if (Array.isArray(value) || typeof value === \"object\") {\n            // Arrays and objects: use JSON.stringify, then wrap in curly braces.\n            serializedValue = `{${JSON.stringify(value)}}`;\n        } else {\n            // Fallback for any other types.\n            serializedValue = `{${JSON.stringify(value)}}`;\n        }\n\n        attributes.push(`${key}=${serializedValue}`);\n    }\n\n    return attributes.join(\" \");\n};\n\n/**\n * Adds a component to the Extensions function in the webiny.config.tsx content.\n */\nconst addComponentToExtensions = (\n    content: string,\n    componentName: string,\n    props?: Record<string, any>\n): string => {\n    // Serialize props to JSX attributes.\n    const propsString = props ? serializePropsToJsx(props) : \"\";\n\n    // Generate component tag with or without props.\n    const componentTag = propsString\n        ? `<${componentName} ${propsString} />`\n        : `<${componentName} />`;\n\n    // Check if component already exists.\n    if (content.includes(componentTag)) {\n        return content;\n    }\n\n    // Find the Extensions function's return statement and add component before the final </>.\n    // Strategy: Find \"export const Extensions\" block, then find the last </> and insert before it.\n    const extensionsFuncRegex = /export const Extensions = \\(\\) => \\{[\\s\\S]*?\\};/;\n    const extensionsFuncMatch = content.match(extensionsFuncRegex);\n\n    if (!extensionsFuncMatch) {\n        return content;\n    }\n\n    const funcContent = extensionsFuncMatch[0];\n    // Find all </> in the function - the last one closes the return statement.\n    const closingTags = [...funcContent.matchAll(/<\\/>/g)];\n\n    if (closingTags.length === 0) {\n        return content;\n    }\n\n    const lastClosingTag = closingTags[closingTags.length - 1];\n    const lastClosingTagIndex = lastClosingTag.index!;\n\n    // Find the indentation of the line containing the last </>.\n    const beforeClosing = funcContent.substring(0, lastClosingTagIndex);\n    const lines = beforeClosing.split(\"\\n\");\n    const lastLine = lines[lines.length - 1];\n    const indent = lastLine.match(/^(\\s*)/)?.[1] || \"        \";\n\n    // Insert the component before the last </>.\n    const newFuncContent =\n        funcContent.substring(0, lastClosingTagIndex) +\n        `${indent}${componentTag}\\n${indent}` +\n        funcContent.substring(lastClosingTagIndex);\n\n    return content.replace(extensionsFuncRegex, newFuncContent);\n};\n\n/**\n * Update the webiny.config.tsx file to add extension imports and component.\n */\nexport const updateWebinyConfig = async (params: UpdateWebinyConfigParams): Promise<void> => {\n    const { projectRoot, webinyConfigTsx } = params;\n\n    const webinyConfigPath = `${projectRoot}/webiny.config.tsx`;\n\n    // Read the current webiny.config.tsx\n    let content = fs.readFileSync(webinyConfigPath, \"utf-8\");\n\n    // Add imports at the top (after existing imports)\n    if (webinyConfigTsx.imports && webinyConfigTsx.imports.length > 0) {\n        for (const importStatement of webinyConfigTsx.imports) {\n            // Check if we need to add to an existing import from the same path.\n            const existingImportRegex = new RegExp(\n                `import\\\\s+{([^}]+)}\\\\s+from\\\\s+[\"']${importStatement.path.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\")}[\"'];?`,\n                \"m\"\n            );\n            const existingImportMatch = content.match(existingImportRegex);\n\n            if (existingImportMatch) {\n                // Import from this path exists, check if specifier is already imported.\n                const existingSpecifiers = existingImportMatch[1].split(\",\").map(s => s.trim());\n\n                if (!existingSpecifiers.includes(importStatement.specifier)) {\n                    // Append the new specifier to the existing import.\n                    const updatedSpecifiers = [\n                        ...existingSpecifiers,\n                        importStatement.specifier\n                    ].join(\", \");\n                    const updatedImportLine = `import { ${updatedSpecifiers} } from \"${importStatement.path}\";`;\n                    content = content.replace(existingImportRegex, updatedImportLine);\n                }\n            } else {\n                // No existing import from this path, add a new import line.\n                const importLine = `import { ${importStatement.specifier} } from \"${importStatement.path}\";`;\n\n                // Find the position after the last import or at the beginning.\n                const importRegex = /^import\\s+.*?from\\s+[\"'].*?[\"'];?\\s*$/gm;\n                const matches = Array.from(content.matchAll(importRegex));\n\n                if (matches.length > 0) {\n                    // Add after the last import.\n                    const lastImport = matches[matches.length - 1];\n                    const lastImportEnd = lastImport.index! + lastImport[0].length;\n                    content =\n                        content.slice(0, lastImportEnd) +\n                        \"\\n\" +\n                        importLine +\n                        content.slice(lastImportEnd);\n                } else {\n                    // No imports found, add at the beginning.\n                    content = importLine + \"\\n\\n\" + content;\n                }\n            }\n        }\n    }\n\n    // Add component to the Extensions function.\n    if (webinyConfigTsx.component) {\n        content = addComponentToExtensions(\n            content,\n            webinyConfigTsx.component.name,\n            webinyConfigTsx.component.props\n        );\n    }\n\n    // Add multiple components to the Extensions function.\n    if (webinyConfigTsx.components && webinyConfigTsx.components.length > 0) {\n        for (const component of webinyConfigTsx.components) {\n            content = addComponentToExtensions(content, component.name, component.props);\n        }\n    }\n\n    // Write the updated content back\n    fs.writeFileSync(webinyConfigPath, content, \"utf-8\");\n};\n"],"mappings":"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","ignoreList":[]}

package/services/ListPackagesService/ListPackagesService.js

@@ -5,7 +5,7 @@ import path from "path";
 import glob from "fast-glob";
 const globToRegex = pattern => {
   // Escape regex special chars except *
-  const escaped = pattern.replace(/[-\/\\^$+?.()|[\]{}]/g, "\\$&");
+  const escaped = pattern.replace(/[-/\\^$+?.()|[\]{}]/g, "\\$&");
   // Replace * with .* in regex pattern
   const regexStr = "^" + escaped.replace(/\*/g, ".*") + "$";
   return new RegExp(regexStr);

package/services/ListPackagesService/ListPackagesService.js.map

@@ -1 +1 @@
-{"version":3,"names":["createImplementation","GetAppService","GetProjectService","ListPackagesService","fs","path","glob","globToRegex","pattern","escaped","replace","regexStr","RegExp","matchesGlobPattern","packageName","regex","test","withoutPrefix","startsWith","regexWithPrefix","DefaultListPackagesService","constructor","getProjectService","getAppService","execute","params","appName","packageWhitelist","Error","project","app","packagesFullList","packagesFolderPath","paths","rootFolder","join","toString","existsSync","readdirSync","map","name","pkgFolderPath","webinyConfigPath","packageFolder","webinyConfigFile","filter","Boolean","webinyConfigPaths","sync","cwd","workspaceFolder","absolute","ignore","appPackages","packageFolderPath","dirname","basename","push","packagesToWatch","length","whitelistedPackages","whitelistedPkgName","split","flat","trim","pkg","includes","listPackagesService","abstraction","implementation","dependencies"],"sources":["ListPackagesService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { GetAppService, GetProjectService, ListPackagesService } from \"~/abstractions/index.js\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport glob from \"fast-glob\";\n\nconst globToRegex = (pattern: string) => {\n    // Escape regex special chars except *\n    const escaped = pattern.replace(/[-\\/\\\\^$+?.()|[\\]{}]/g, \"\\\\$&\");\n    // Replace * with .* in regex pattern\n    const regexStr = \"^\" + escaped.replace(/\\*/g, \".*\") + \"$\";\n    return new RegExp(regexStr);\n};\n\nconst matchesGlobPattern = (packageName: string, pattern: string): boolean => {\n    // Try matching with the full package name\n    const regex = globToRegex(pattern);\n    if (regex.test(packageName)) {\n        return true;\n    }\n\n    // Also try matching against the name without @webiny/ or @app/ prefix\n    const withoutPrefix = packageName.replace(/^@[^/]+\\//, \"\");\n    if (regex.test(withoutPrefix)) {\n        return true;\n    }\n\n    // If pattern doesn't start with @, also try adding @webiny/ prefix to pattern\n    if (!pattern.startsWith(\"@\")) {\n        const regexWithPrefix = globToRegex(`@webiny/${pattern}`);\n        if (regexWithPrefix.test(packageName)) {\n            return true;\n        }\n    }\n\n    return false;\n};\n\nexport class DefaultListPackagesService implements ListPackagesService.Interface {\n    constructor(\n        private getProjectService: GetProjectService.Interface,\n        private getAppService: GetAppService.Interface\n    ) {}\n\n    async execute(params: ListPackagesService.Params) {\n        if (!params.appName && !params.packageWhitelist) {\n            throw new Error(`Either \"packageWhitelist\" or \"appName\" argument must be provided.`);\n        }\n\n        const { packageWhitelist = [], appName } = params;\n        const project = this.getProjectService.execute();\n        const app = appName ? this.getAppService.execute(appName) : null;\n\n        // List all packages in `packages` folder.\n        let packagesFullList: ListPackagesService.Result = [];\n\n        const packagesFolderPath = project.paths.rootFolder.join(\"packages\").toString();\n        if (fs.existsSync(packagesFolderPath)) {\n            packagesFullList = fs\n                .readdirSync(project.paths.rootFolder.join(\"packages\").toString())\n                .map(name => {\n                    const pkgFolderPath = project.paths.rootFolder\n                        .join(\"/packages/\", name)\n                        .toString();\n\n                    let webinyConfigPath = path.join(pkgFolderPath, \"webiny.config.ts\");\n                    if (!fs.existsSync(webinyConfigPath)) {\n                        webinyConfigPath = path.join(pkgFolderPath, \"webiny.config.js\");\n                    }\n\n                    return {\n                        name: `@webiny/${name}`,\n                        paths: {\n                            packageFolder: pkgFolderPath,\n                            webinyConfigFile: webinyConfigPath\n                        }\n                    } as ListPackagesService.Package;\n                })\n                .filter(Boolean);\n        }\n\n        if (app) {\n            const webinyConfigPaths = glob.sync(\"**/webiny.config.@(ts|js)\", {\n                cwd: app.paths.workspaceFolder.toString(),\n                absolute: true,\n                ignore: [\"**/node_modules/**\", \"**/dist/**\"]\n            });\n\n            const appPackages = webinyConfigPaths.map(webinyConfigPath => {\n                const packageFolderPath = path.dirname(webinyConfigPath);\n                const packageName = path.basename(packageFolderPath);\n\n                return {\n                    name: `@${app.name}/${packageName}`,\n                    paths: {\n                        packageFolder: packageFolderPath,\n                        webinyConfigFile: webinyConfigPath\n                    }\n                } as ListPackagesService.Package;\n            });\n\n            packagesFullList.push(...appPackages);\n        }\n\n        const packagesToWatch = [];\n\n        if (packageWhitelist.length) {\n            const whitelistedPackages = packageWhitelist\n                .map(whitelistedPkgName => {\n                    return whitelistedPkgName.split(\",\");\n                })\n                .flat()\n                .map(whitelistedPkgName => whitelistedPkgName.trim())\n                .map(whitelistedPkgName => {\n                    return packagesFullList.filter(pkg => {\n                        if (whitelistedPkgName.includes(\"*\")) {\n                            return matchesGlobPattern(pkg.name, whitelistedPkgName);\n                        }\n\n                        // We consider both `name` and `@webiny/name` as valid package names.\n                        // The @webiny/ prefix is optional (makes it easier to type for us).\n                        return (\n                            pkg.name === whitelistedPkgName ||\n                            pkg.name === `@webiny/${whitelistedPkgName}`\n                        );\n                    });\n                })\n                .flat()\n                .filter(Boolean) as ListPackagesService.Result;\n\n            packagesToWatch.push(...whitelistedPackages);\n        }\n\n        if (app) {\n            // We've hardcoded this filtering here just because of lack of time.\n            // With v5, these \"presets\" were located within `webiny.application.ts` files.\n            if (app.name === \"api\") {\n                packagesToWatch.push(\n                    ...packagesFullList.filter(pkg => {\n                        return pkg.name === \"@api/graphql\";\n                    })\n                );\n\n                return packagesToWatch;\n            }\n\n            packagesToWatch.push(\n                ...packagesFullList.filter(pkg => {\n                    return pkg.name.startsWith(`@${app.name}`);\n                })\n            );\n        }\n\n        return packagesToWatch;\n    }\n}\n\nexport const listPackagesService = createImplementation({\n    abstraction: ListPackagesService,\n    implementation: DefaultListPackagesService,\n    // TODO: move getApp into a service\n    dependencies: [GetProjectService, GetAppService]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createImplementation","GetAppService","GetProjectService","ListPackagesService","fs","path","glob","globToRegex","pattern","escaped","replace","regexStr","RegExp","matchesGlobPattern","packageName","regex","test","withoutPrefix","startsWith","regexWithPrefix","DefaultListPackagesService","constructor","getProjectService","getAppService","execute","params","appName","packageWhitelist","Error","project","app","packagesFullList","packagesFolderPath","paths","rootFolder","join","toString","existsSync","readdirSync","map","name","pkgFolderPath","webinyConfigPath","packageFolder","webinyConfigFile","filter","Boolean","webinyConfigPaths","sync","cwd","workspaceFolder","absolute","ignore","appPackages","packageFolderPath","dirname","basename","push","packagesToWatch","length","whitelistedPackages","whitelistedPkgName","split","flat","trim","pkg","includes","listPackagesService","abstraction","implementation","dependencies"],"sources":["ListPackagesService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { GetAppService, GetProjectService, ListPackagesService } from \"~/abstractions/index.js\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport glob from \"fast-glob\";\n\nconst globToRegex = (pattern: string) => {\n    // Escape regex special chars except *\n    const escaped = pattern.replace(/[-/\\\\^$+?.()|[\\]{}]/g, \"\\\\$&\");\n    // Replace * with .* in regex pattern\n    const regexStr = \"^\" + escaped.replace(/\\*/g, \".*\") + \"$\";\n    return new RegExp(regexStr);\n};\n\nconst matchesGlobPattern = (packageName: string, pattern: string): boolean => {\n    // Try matching with the full package name\n    const regex = globToRegex(pattern);\n    if (regex.test(packageName)) {\n        return true;\n    }\n\n    // Also try matching against the name without @webiny/ or @app/ prefix\n    const withoutPrefix = packageName.replace(/^@[^/]+\\//, \"\");\n    if (regex.test(withoutPrefix)) {\n        return true;\n    }\n\n    // If pattern doesn't start with @, also try adding @webiny/ prefix to pattern\n    if (!pattern.startsWith(\"@\")) {\n        const regexWithPrefix = globToRegex(`@webiny/${pattern}`);\n        if (regexWithPrefix.test(packageName)) {\n            return true;\n        }\n    }\n\n    return false;\n};\n\nexport class DefaultListPackagesService implements ListPackagesService.Interface {\n    constructor(\n        private getProjectService: GetProjectService.Interface,\n        private getAppService: GetAppService.Interface\n    ) {}\n\n    async execute(params: ListPackagesService.Params) {\n        if (!params.appName && !params.packageWhitelist) {\n            throw new Error(`Either \"packageWhitelist\" or \"appName\" argument must be provided.`);\n        }\n\n        const { packageWhitelist = [], appName } = params;\n        const project = this.getProjectService.execute();\n        const app = appName ? this.getAppService.execute(appName) : null;\n\n        // List all packages in `packages` folder.\n        let packagesFullList: ListPackagesService.Result = [];\n\n        const packagesFolderPath = project.paths.rootFolder.join(\"packages\").toString();\n        if (fs.existsSync(packagesFolderPath)) {\n            packagesFullList = fs\n                .readdirSync(project.paths.rootFolder.join(\"packages\").toString())\n                .map(name => {\n                    const pkgFolderPath = project.paths.rootFolder\n                        .join(\"/packages/\", name)\n                        .toString();\n\n                    let webinyConfigPath = path.join(pkgFolderPath, \"webiny.config.ts\");\n                    if (!fs.existsSync(webinyConfigPath)) {\n                        webinyConfigPath = path.join(pkgFolderPath, \"webiny.config.js\");\n                    }\n\n                    return {\n                        name: `@webiny/${name}`,\n                        paths: {\n                            packageFolder: pkgFolderPath,\n                            webinyConfigFile: webinyConfigPath\n                        }\n                    } as ListPackagesService.Package;\n                })\n                .filter(Boolean);\n        }\n\n        if (app) {\n            const webinyConfigPaths = glob.sync(\"**/webiny.config.@(ts|js)\", {\n                cwd: app.paths.workspaceFolder.toString(),\n                absolute: true,\n                ignore: [\"**/node_modules/**\", \"**/dist/**\"]\n            });\n\n            const appPackages = webinyConfigPaths.map(webinyConfigPath => {\n                const packageFolderPath = path.dirname(webinyConfigPath);\n                const packageName = path.basename(packageFolderPath);\n\n                return {\n                    name: `@${app.name}/${packageName}`,\n                    paths: {\n                        packageFolder: packageFolderPath,\n                        webinyConfigFile: webinyConfigPath\n                    }\n                } as ListPackagesService.Package;\n            });\n\n            packagesFullList.push(...appPackages);\n        }\n\n        const packagesToWatch = [];\n\n        if (packageWhitelist.length) {\n            const whitelistedPackages = packageWhitelist\n                .map(whitelistedPkgName => {\n                    return whitelistedPkgName.split(\",\");\n                })\n                .flat()\n                .map(whitelistedPkgName => whitelistedPkgName.trim())\n                .map(whitelistedPkgName => {\n                    return packagesFullList.filter(pkg => {\n                        if (whitelistedPkgName.includes(\"*\")) {\n                            return matchesGlobPattern(pkg.name, whitelistedPkgName);\n                        }\n\n                        // We consider both `name` and `@webiny/name` as valid package names.\n                        // The @webiny/ prefix is optional (makes it easier to type for us).\n                        return (\n                            pkg.name === whitelistedPkgName ||\n                            pkg.name === `@webiny/${whitelistedPkgName}`\n                        );\n                    });\n                })\n                .flat()\n                .filter(Boolean) as ListPackagesService.Result;\n\n            packagesToWatch.push(...whitelistedPackages);\n        }\n\n        if (app) {\n            // We've hardcoded this filtering here just because of lack of time.\n            // With v5, these \"presets\" were located within `webiny.application.ts` files.\n            if (app.name === \"api\") {\n                packagesToWatch.push(\n                    ...packagesFullList.filter(pkg => {\n                        return pkg.name === \"@api/graphql\";\n                    })\n                );\n\n                return packagesToWatch;\n            }\n\n            packagesToWatch.push(\n                ...packagesFullList.filter(pkg => {\n                    return pkg.name.startsWith(`@${app.name}`);\n                })\n            );\n        }\n\n        return packagesToWatch;\n    }\n}\n\nexport const listPackagesService = createImplementation({\n    abstraction: ListPackagesService,\n    implementation: DefaultListPackagesService,\n    // TODO: move getApp into a service\n    dependencies: [GetProjectService, GetAppService]\n});\n"],"mappings":"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","ignoreList":[]}

package/services/ProjectInfoService/ProjectInfoService.js

@@ -10,10 +10,10 @@ export class DefaultProjectInfoService {
     this.getProjectVersion = getProjectVersion;
   }
   async execute() {
-    const wcpProjectId = process.env.WCP_PROJECT_ID || "";
+    const wcpProjectId = process.env.WEBINY_PROJECT_ID || process.env.WCP_PROJECT_ID || "";
     // const wcpUser = await getUser().catch(() => null);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const wcpUsingProjectEnvironmentApiKey = Boolean(process.env.WCP_ENVIRONMENT_API_KEY);
+    // oxlint-disable-next-line typescript/no-unused-vars
+    const wcpUsingProjectEnvironmentApiKey = Boolean(process.env.WEBINY_PROJECT_API_KEY || process.env.WCP_PROJECT_ENVIRONMENT_API_KEY || process.env.WCP_ENVIRONMENT_API_KEY);
     const isCI = this.getIsCi.execute();
     const npmVersion = this.getNpmVersion.execute();
     const npxVersion = this.getNpxVersion.execute();

package/services/ProjectInfoService/ProjectInfoService.js.map

@@ -1 +1 @@
-{"version":3,"names":["createImplementation","ProjectInfoService","GetIsCiService","GetNpmVersionService","GetNpxVersionService","GetPulumiVersionService","GetYarnVersionService","GetProjectVersionService","DefaultProjectInfoService","constructor","getIsCi","getNpmVersion","getNpxVersion","getPulumiVersion","getYarnVersion","getProjectVersion","execute","wcpProjectId","process","env","WCP_PROJECT_ID","wcpUsingProjectEnvironmentApiKey","Boolean","WCP_ENVIRONMENT_API_KEY","isCI","npmVersion","npxVersion","yarnVersion","pulumiVersion","pulumiAwsVersion","webiny","version","debugEnabled","DEBUG","featureFlags","WEBINY_FEATURE_FLAGS","wcp","projectId","usingProjectEnvironmentApiKey","host","os","platform","arch","nodeJs","npm","npx","yarn","pulumi","secretsProvider","PULUMI_SECRETS_PROVIDER","usingPassword","PULUMI_CONFIG_PASSPHRASE","projectInfoService","abstraction","implementation","dependencies"],"sources":["ProjectInfoService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport {\n    ProjectInfoService,\n    GetIsCiService,\n    GetNpmVersionService,\n    GetNpxVersionService,\n    GetPulumiVersionService,\n    GetYarnVersionService,\n    GetProjectVersionService\n} from \"~/abstractions/index.js\";\nimport { IProjectInfoServiceResult } from \"~/abstractions/services/ProjectInfoService/ProjectInfoService.js\";\n\nexport class DefaultProjectInfoService implements ProjectInfoService.Interface {\n    constructor(\n        private getIsCi: GetIsCiService.Interface,\n        private getNpmVersion: GetNpmVersionService.Interface,\n        private getNpxVersion: GetNpxVersionService.Interface,\n        private getPulumiVersion: GetPulumiVersionService.Interface,\n        private getYarnVersion: GetYarnVersionService.Interface,\n        private getProjectVersion: GetProjectVersionService.Interface\n    ) {}\n\n    async execute() {\n        const wcpProjectId = process.env.WCP_PROJECT_ID || \"\";\n        // const wcpUser = await getUser().catch(() => null);\n        // eslint-disable-next-line @typescript-eslint/no-unused-vars\n        const wcpUsingProjectEnvironmentApiKey = Boolean(process.env.WCP_ENVIRONMENT_API_KEY);\n\n        const isCI = this.getIsCi.execute();\n        const npmVersion = this.getNpmVersion.execute();\n        const npxVersion = this.getNpxVersion.execute();\n        const yarnVersion = this.getYarnVersion.execute();\n        const [pulumiVersion, pulumiAwsVersion] = this.getPulumiVersion.execute();\n\n        return {\n            webiny: {\n                version: this.getProjectVersion.execute(),\n                debugEnabled: process.env.DEBUG === \"true\",\n                featureFlags: process.env.WEBINY_FEATURE_FLAGS || {}\n            },\n            wcp: {\n                projectId: wcpProjectId,\n                // user: wcpUser?.email || \"N/A\",\n                usingProjectEnvironmentApiKey: false // wcpUsingProject\n            },\n            host: {\n                os: `${process.platform} (${process.arch})`,\n                nodeJs: process.version,\n                npm: npmVersion,\n                npx: npxVersion,\n                yarn: yarnVersion,\n                isCI: isCI\n            },\n            pulumi: {\n                \"@pulumi/pulumi\": pulumiVersion,\n                \"@pulumi/aws\": pulumiAwsVersion,\n                secretsProvider: process.env.PULUMI_SECRETS_PROVIDER || \"\",\n                usingPassword: !!process.env.PULUMI_CONFIG_PASSPHRASE\n            }\n        } as IProjectInfoServiceResult;\n    }\n}\n\nexport const projectInfoService = createImplementation({\n    abstraction: ProjectInfoService,\n    implementation: DefaultProjectInfoService,\n    dependencies: [\n        GetIsCiService,\n        GetNpmVersionService,\n        GetNpxVersionService,\n        GetPulumiVersionService,\n        GetYarnVersionService,\n        GetProjectVersionService\n    ]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SACIC,kBAAkB,EAClBC,cAAc,EACdC,oBAAoB,EACpBC,oBAAoB,EACpBC,uBAAuB,EACvBC,qBAAqB,EACrBC,wBAAwB;AAI5B,OAAO,MAAMC,yBAAyB,CAAyC;EAC3EC,WAAWA,CACCC,OAAiC,EACjCC,aAA6C,EAC7CC,aAA6C,EAC7CC,gBAAmD,EACnDC,cAA+C,EAC/CC,iBAAqD,EAC/D;IAAA,KANUL,OAAiC,GAAjCA,OAAiC;IAAA,KACjCC,aAA6C,GAA7CA,aAA6C;IAAA,KAC7CC,aAA6C,GAA7CA,aAA6C;IAAA,KAC7CC,gBAAmD,GAAnDA,gBAAmD;IAAA,KACnDC,cAA+C,GAA/CA,cAA+C;IAAA,KAC/CC,iBAAqD,GAArDA,iBAAqD;EAC9D;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ,MAAMC,YAAY,GAAGC,OAAO,CAACC,GAAG,CAACC,cAAc,IAAI,EAAE;IACrD;IACA;IACA,MAAMC,gCAAgC,GAAGC,OAAO,CAACJ,OAAO,CAACC,GAAG,CAACI,uBAAuB,CAAC;IAErF,MAAMC,IAAI,GAAG,IAAI,CAACd,OAAO,CAACM,OAAO,CAAC,CAAC;IACnC,MAAMS,UAAU,GAAG,IAAI,CAACd,aAAa,CAACK,OAAO,CAAC,CAAC;IAC/C,MAAMU,UAAU,GAAG,IAAI,CAACd,aAAa,CAACI,OAAO,CAAC,CAAC;IAC/C,MAAMW,WAAW,GAAG,IAAI,CAACb,cAAc,CAACE,OAAO,CAAC,CAAC;IACjD,MAAM,CAACY,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAI,CAAChB,gBAAgB,CAACG,OAAO,CAAC,CAAC;IAEzE,OAAO;MACHc,MAAM,EAAE;QACJC,OAAO,EAAE,IAAI,CAAChB,iBAAiB,CAACC,OAAO,CAAC,CAAC;QACzCgB,YAAY,EAAEd,OAAO,CAACC,GAAG,CAACc,KAAK,KAAK,MAAM;QAC1CC,YAAY,EAAEhB,OAAO,CAACC,GAAG,CAACgB,oBAAoB,IAAI,CAAC;MACvD,CAAC;MACDC,GAAG,EAAE;QACDC,SAAS,EAAEpB,YAAY;QACvB;QACAqB,6BAA6B,EAAE,KAAK,CAAC;MACzC,CAAC;MACDC,IAAI,EAAE;QACFC,EAAE,EAAE,GAAGtB,OAAO,CAACuB,QAAQ,KAAKvB,OAAO,CAACwB,IAAI,GAAG;QAC3CC,MAAM,EAAEzB,OAAO,CAACa,OAAO;QACvBa,GAAG,EAAEnB,UAAU;QACfoB,GAAG,EAAEnB,UAAU;QACfoB,IAAI,EAAEnB,WAAW;QACjBH,IAAI,EAAEA;MACV,CAAC;MACDuB,MAAM,EAAE;QACJ,gBAAgB,EAAEnB,aAAa;QAC/B,aAAa,EAAEC,gBAAgB;QAC/BmB,eAAe,EAAE9B,OAAO,CAACC,GAAG,CAAC8B,uBAAuB,IAAI,EAAE;QAC1DC,aAAa,EAAE,CAAC,CAAChC,OAAO,CAACC,GAAG,CAACgC;MACjC;IACJ,CAAC;EACL;AACJ;AAEA,OAAO,MAAMC,kBAAkB,GAAGpD,oBAAoB,CAAC;EACnDqD,WAAW,EAAEpD,kBAAkB;EAC/BqD,cAAc,EAAE9C,yBAAyB;EACzC+C,YAAY,EAAE,CACVrD,cAAc,EACdC,oBAAoB,EACpBC,oBAAoB,EACpBC,uBAAuB,EACvBC,qBAAqB,EACrBC,wBAAwB;AAEhC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["createImplementation","ProjectInfoService","GetIsCiService","GetNpmVersionService","GetNpxVersionService","GetPulumiVersionService","GetYarnVersionService","GetProjectVersionService","DefaultProjectInfoService","constructor","getIsCi","getNpmVersion","getNpxVersion","getPulumiVersion","getYarnVersion","getProjectVersion","execute","wcpProjectId","process","env","WEBINY_PROJECT_ID","WCP_PROJECT_ID","wcpUsingProjectEnvironmentApiKey","Boolean","WEBINY_PROJECT_API_KEY","WCP_PROJECT_ENVIRONMENT_API_KEY","WCP_ENVIRONMENT_API_KEY","isCI","npmVersion","npxVersion","yarnVersion","pulumiVersion","pulumiAwsVersion","webiny","version","debugEnabled","DEBUG","featureFlags","WEBINY_FEATURE_FLAGS","wcp","projectId","usingProjectEnvironmentApiKey","host","os","platform","arch","nodeJs","npm","npx","yarn","pulumi","secretsProvider","PULUMI_SECRETS_PROVIDER","usingPassword","PULUMI_CONFIG_PASSPHRASE","projectInfoService","abstraction","implementation","dependencies"],"sources":["ProjectInfoService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport {\n    ProjectInfoService,\n    GetIsCiService,\n    GetNpmVersionService,\n    GetNpxVersionService,\n    GetPulumiVersionService,\n    GetYarnVersionService,\n    GetProjectVersionService\n} from \"~/abstractions/index.js\";\nimport { IProjectInfoServiceResult } from \"~/abstractions/services/ProjectInfoService/ProjectInfoService.js\";\n\nexport class DefaultProjectInfoService implements ProjectInfoService.Interface {\n    constructor(\n        private getIsCi: GetIsCiService.Interface,\n        private getNpmVersion: GetNpmVersionService.Interface,\n        private getNpxVersion: GetNpxVersionService.Interface,\n        private getPulumiVersion: GetPulumiVersionService.Interface,\n        private getYarnVersion: GetYarnVersionService.Interface,\n        private getProjectVersion: GetProjectVersionService.Interface\n    ) {}\n\n    async execute() {\n        const wcpProjectId = process.env.WEBINY_PROJECT_ID || process.env.WCP_PROJECT_ID || \"\";\n        // const wcpUser = await getUser().catch(() => null);\n        // oxlint-disable-next-line typescript/no-unused-vars\n        const wcpUsingProjectEnvironmentApiKey = Boolean(\n            process.env.WEBINY_PROJECT_API_KEY ||\n            process.env.WCP_PROJECT_ENVIRONMENT_API_KEY ||\n            process.env.WCP_ENVIRONMENT_API_KEY\n        );\n\n        const isCI = this.getIsCi.execute();\n        const npmVersion = this.getNpmVersion.execute();\n        const npxVersion = this.getNpxVersion.execute();\n        const yarnVersion = this.getYarnVersion.execute();\n        const [pulumiVersion, pulumiAwsVersion] = this.getPulumiVersion.execute();\n\n        return {\n            webiny: {\n                version: this.getProjectVersion.execute(),\n                debugEnabled: process.env.DEBUG === \"true\",\n                featureFlags: process.env.WEBINY_FEATURE_FLAGS || {}\n            },\n            wcp: {\n                projectId: wcpProjectId,\n                // user: wcpUser?.email || \"N/A\",\n                usingProjectEnvironmentApiKey: false // wcpUsingProject\n            },\n            host: {\n                os: `${process.platform} (${process.arch})`,\n                nodeJs: process.version,\n                npm: npmVersion,\n                npx: npxVersion,\n                yarn: yarnVersion,\n                isCI: isCI\n            },\n            pulumi: {\n                \"@pulumi/pulumi\": pulumiVersion,\n                \"@pulumi/aws\": pulumiAwsVersion,\n                secretsProvider: process.env.PULUMI_SECRETS_PROVIDER || \"\",\n                usingPassword: !!process.env.PULUMI_CONFIG_PASSPHRASE\n            }\n        } as IProjectInfoServiceResult;\n    }\n}\n\nexport const projectInfoService = createImplementation({\n    abstraction: ProjectInfoService,\n    implementation: DefaultProjectInfoService,\n    dependencies: [\n        GetIsCiService,\n        GetNpmVersionService,\n        GetNpxVersionService,\n        GetPulumiVersionService,\n        GetYarnVersionService,\n        GetProjectVersionService\n    ]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SACIC,kBAAkB,EAClBC,cAAc,EACdC,oBAAoB,EACpBC,oBAAoB,EACpBC,uBAAuB,EACvBC,qBAAqB,EACrBC,wBAAwB;AAI5B,OAAO,MAAMC,yBAAyB,CAAyC;EAC3EC,WAAWA,CACCC,OAAiC,EACjCC,aAA6C,EAC7CC,aAA6C,EAC7CC,gBAAmD,EACnDC,cAA+C,EAC/CC,iBAAqD,EAC/D;IAAA,KANUL,OAAiC,GAAjCA,OAAiC;IAAA,KACjCC,aAA6C,GAA7CA,aAA6C;IAAA,KAC7CC,aAA6C,GAA7CA,aAA6C;IAAA,KAC7CC,gBAAmD,GAAnDA,gBAAmD;IAAA,KACnDC,cAA+C,GAA/CA,cAA+C;IAAA,KAC/CC,iBAAqD,GAArDA,iBAAqD;EAC9D;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ,MAAMC,YAAY,GAAGC,OAAO,CAACC,GAAG,CAACC,iBAAiB,IAAIF,OAAO,CAACC,GAAG,CAACE,cAAc,IAAI,EAAE;IACtF;IACA;IACA,MAAMC,gCAAgC,GAAGC,OAAO,CAC5CL,OAAO,CAACC,GAAG,CAACK,sBAAsB,IAClCN,OAAO,CAACC,GAAG,CAACM,+BAA+B,IAC3CP,OAAO,CAACC,GAAG,CAACO,uBAChB,CAAC;IAED,MAAMC,IAAI,GAAG,IAAI,CAACjB,OAAO,CAACM,OAAO,CAAC,CAAC;IACnC,MAAMY,UAAU,GAAG,IAAI,CAACjB,aAAa,CAACK,OAAO,CAAC,CAAC;IAC/C,MAAMa,UAAU,GAAG,IAAI,CAACjB,aAAa,CAACI,OAAO,CAAC,CAAC;IAC/C,MAAMc,WAAW,GAAG,IAAI,CAAChB,cAAc,CAACE,OAAO,CAAC,CAAC;IACjD,MAAM,CAACe,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAI,CAACnB,gBAAgB,CAACG,OAAO,CAAC,CAAC;IAEzE,OAAO;MACHiB,MAAM,EAAE;QACJC,OAAO,EAAE,IAAI,CAACnB,iBAAiB,CAACC,OAAO,CAAC,CAAC;QACzCmB,YAAY,EAAEjB,OAAO,CAACC,GAAG,CAACiB,KAAK,KAAK,MAAM;QAC1CC,YAAY,EAAEnB,OAAO,CAACC,GAAG,CAACmB,oBAAoB,IAAI,CAAC;MACvD,CAAC;MACDC,GAAG,EAAE;QACDC,SAAS,EAAEvB,YAAY;QACvB;QACAwB,6BAA6B,EAAE,KAAK,CAAC;MACzC,CAAC;MACDC,IAAI,EAAE;QACFC,EAAE,EAAE,GAAGzB,OAAO,CAAC0B,QAAQ,KAAK1B,OAAO,CAAC2B,IAAI,GAAG;QAC3CC,MAAM,EAAE5B,OAAO,CAACgB,OAAO;QACvBa,GAAG,EAAEnB,UAAU;QACfoB,GAAG,EAAEnB,UAAU;QACfoB,IAAI,EAAEnB,WAAW;QACjBH,IAAI,EAAEA;MACV,CAAC;MACDuB,MAAM,EAAE;QACJ,gBAAgB,EAAEnB,aAAa;QAC/B,aAAa,EAAEC,gBAAgB;QAC/BmB,eAAe,EAAEjC,OAAO,CAACC,GAAG,CAACiC,uBAAuB,IAAI,EAAE;QAC1DC,aAAa,EAAE,CAAC,CAACnC,OAAO,CAACC,GAAG,CAACmC;MACjC;IACJ,CAAC;EACL;AACJ;AAEA,OAAO,MAAMC,kBAAkB,GAAGvD,oBAAoB,CAAC;EACnDwD,WAAW,EAAEvD,kBAAkB;EAC/BwD,cAAc,EAAEjD,yBAAyB;EACzCkD,YAAY,EAAE,CACVxD,cAAc,EACdC,oBAAoB,EACpBC,oBAAoB,EACpBC,uBAAuB,EACvBC,qBAAqB,EACrBC,wBAAwB;AAEhC,CAAC,CAAC","ignoreList":[]}

package/utils/ExtensionSrcResolver.js

@@ -1,6 +1,7 @@
 import path from "path";
 import fs from "fs";
 import { getTsconfig } from "get-tsconfig";
+import { toImportSpecifier } from "./toImportSpecifier.js";
 export class ExtensionSrcResolver {
   static pathMappings = null;
 
@@ -14,7 +15,7 @@ export class ExtensionSrcResolver {
   static async importFromPath(filePath, project) {
     const importPath = this.resolvePath(filePath, project);
     const exportName = path.basename(filePath).replace(path.extname(filePath), "");
-    const importedModule = await import(importPath);
+    const importedModule = await import(toImportSpecifier(importPath));
 
     // Support both default and named exports.
     // Check for 'default' property existence rather than truthiness.

package/utils/ExtensionSrcResolver.js.map

@@ -1 +1 @@
-{"version":3,"names":["path","fs","getTsconfig","ExtensionSrcResolver","pathMappings","importFromPath","filePath","project","importPath","resolvePath","exportName","basename","replace","extname","importedModule","default","startsWith","paths","rootFolder","join","toString","resolved","resolvePathAlias","existsSync","absolutePath","projectRoot","loadPathMappings","pattern","targets","Object","entries","match","matchPattern","target","resolvedPath","replacePlaceholder","resolve","tsConfigPath","tsConfigFile","tsconfig","config","compilerOptions","endsWith","prefix","slice","length","mapping"],"sources":["ExtensionSrcResolver.ts"],"sourcesContent":["import path from \"path\";\nimport fs from \"fs\";\nimport { getTsconfig } from \"get-tsconfig\";\nimport { type IProjectModel } from \"~/abstractions/models/index.js\";\n\nexport class ExtensionSrcResolver {\n    private static pathMappings: { [key: string]: string[] } | null = null;\n\n    /**\n     * Import a module from a given file path.\n     * - If path starts with \"/extensions/\", it resolves from project root\n     * - If path matches tsconfig path alias (e.g., \"@/*\"), it resolves using tsconfig\n     * - Otherwise, treats path as absolute\n     * Returns the default export or named export matching the filename.\n     */\n    static async importFromPath(filePath: string, project: IProjectModel) {\n        const importPath = this.resolvePath(filePath, project);\n        const exportName = path.basename(filePath).replace(path.extname(filePath), \"\");\n\n        const importedModule = await import(importPath);\n\n        // Support both default and named exports.\n        // Check for 'default' property existence rather than truthiness.\n        return (\n            (\"default\" in importedModule && importedModule.default) || importedModule[exportName]\n        );\n    }\n\n    /**\n     * Resolve a file path to an absolute path.\n     * - If path starts with \"/extensions/\", it resolves from project root\n     * - If path matches tsconfig path alias (e.g., \"@/*\"), it resolves using tsconfig\n     * - Otherwise, treats path as absolute\n     * Returns the absolute path without importing.\n     */\n    static resolvePath(filePath: string, project: IProjectModel): string {\n        if (filePath.startsWith(\"/extensions/\")) {\n            // Resolve from project root.\n            return project.paths.rootFolder.join(filePath).toString();\n        } else {\n            // Try to resolve using tsconfig path aliases.\n            const resolved = this.resolvePathAlias(filePath, project);\n            if (resolved) {\n                return resolved;\n            } else {\n                // Treat as absolute path.\n                return filePath;\n            }\n        }\n    }\n\n    /**\n     * Check if a file exists at the given path.\n     * Resolves the path using the same logic as resolvePath before checking.\n     * - If path starts with \"/extensions/\", it resolves from project root\n     * - If path matches tsconfig path alias (e.g., \"@/*\"), it resolves using tsconfig\n     * - Otherwise, treats path as absolute\n     * Returns true if the file exists, false otherwise.\n     */\n    static existsSync(filePath: string, project: IProjectModel): boolean {\n        const absolutePath = this.resolvePath(filePath, project);\n        return fs.existsSync(absolutePath);\n    }\n\n    private static resolvePathAlias(filePath: string, project: IProjectModel): string | null {\n        const projectRoot = project.paths.rootFolder.toString();\n\n        // Load path mappings from tsconfig if not already cached.\n        if (this.pathMappings === null) {\n            this.loadPathMappings(project);\n        }\n\n        if (!this.pathMappings) {\n            return null;\n        }\n\n        // Try to match against each path pattern.\n        for (const [pattern, targets] of Object.entries(this.pathMappings)) {\n            const match = this.matchPattern(filePath, pattern);\n            if (match !== null) {\n                // Use the first mapping.\n                const target = targets[0];\n                const resolvedPath = this.replacePlaceholder(target, match);\n                return path.resolve(projectRoot, resolvedPath);\n            }\n        }\n\n        return null;\n    }\n\n    private static loadPathMappings(project: IProjectModel): void {\n        const tsConfigPath = project.paths.tsConfigFile.toString();\n\n        try {\n            // Use get-tsconfig to parse tsconfig with extends resolution.\n            const tsconfig = getTsconfig(tsConfigPath);\n\n            if (tsconfig?.config.compilerOptions?.paths) {\n                this.pathMappings = tsconfig.config.compilerOptions.paths;\n            } else {\n                this.pathMappings = {};\n            }\n        } catch {\n            // Ignore tsconfig parsing errors.\n            this.pathMappings = {};\n        }\n    }\n\n    private static matchPattern(importPath: string, pattern: string): string | null {\n        // Handle wildcard patterns like \"@/*\" or \"@extensions/*\".\n        if (pattern.endsWith(\"/*\")) {\n            const prefix = pattern.slice(0, -2);\n            // Only match if there's a slash after the prefix.\n            if (importPath.startsWith(prefix + \"/\")) {\n                return importPath.slice(prefix.length + 1);\n            }\n        } else if (pattern === importPath) {\n            return \"\";\n        }\n\n        return null;\n    }\n\n    private static replacePlaceholder(mapping: string, match: string): string {\n        // Replace wildcard with the matched part.\n        if (mapping.endsWith(\"/*\")) {\n            return mapping.slice(0, -2) + \"/\" + match;\n        }\n        return mapping;\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["path","fs","getTsconfig","toImportSpecifier","ExtensionSrcResolver","pathMappings","importFromPath","filePath","project","importPath","resolvePath","exportName","basename","replace","extname","importedModule","default","startsWith","paths","rootFolder","join","toString","resolved","resolvePathAlias","existsSync","absolutePath","projectRoot","loadPathMappings","pattern","targets","Object","entries","match","matchPattern","target","resolvedPath","replacePlaceholder","resolve","tsConfigPath","tsConfigFile","tsconfig","config","compilerOptions","endsWith","prefix","slice","length","mapping"],"sources":["ExtensionSrcResolver.ts"],"sourcesContent":["import path from \"path\";\nimport fs from \"fs\";\nimport { getTsconfig } from \"get-tsconfig\";\nimport { toImportSpecifier } from \"./toImportSpecifier.js\";\nimport { type IProjectModel } from \"~/abstractions/models/index.js\";\n\nexport class ExtensionSrcResolver {\n    private static pathMappings: { [key: string]: string[] } | null = null;\n\n    /**\n     * Import a module from a given file path.\n     * - If path starts with \"/extensions/\", it resolves from project root\n     * - If path matches tsconfig path alias (e.g., \"@/*\"), it resolves using tsconfig\n     * - Otherwise, treats path as absolute\n     * Returns the default export or named export matching the filename.\n     */\n    static async importFromPath(filePath: string, project: IProjectModel) {\n        const importPath = this.resolvePath(filePath, project);\n        const exportName = path.basename(filePath).replace(path.extname(filePath), \"\");\n\n        const importedModule = await import(toImportSpecifier(importPath));\n\n        // Support both default and named exports.\n        // Check for 'default' property existence rather than truthiness.\n        return (\n            (\"default\" in importedModule && importedModule.default) || importedModule[exportName]\n        );\n    }\n\n    /**\n     * Resolve a file path to an absolute path.\n     * - If path starts with \"/extensions/\", it resolves from project root\n     * - If path matches tsconfig path alias (e.g., \"@/*\"), it resolves using tsconfig\n     * - Otherwise, treats path as absolute\n     * Returns the absolute path without importing.\n     */\n    static resolvePath(filePath: string, project: IProjectModel): string {\n        if (filePath.startsWith(\"/extensions/\")) {\n            // Resolve from project root.\n            return project.paths.rootFolder.join(filePath).toString();\n        } else {\n            // Try to resolve using tsconfig path aliases.\n            const resolved = this.resolvePathAlias(filePath, project);\n            if (resolved) {\n                return resolved;\n            } else {\n                // Treat as absolute path.\n                return filePath;\n            }\n        }\n    }\n\n    /**\n     * Check if a file exists at the given path.\n     * Resolves the path using the same logic as resolvePath before checking.\n     * - If path starts with \"/extensions/\", it resolves from project root\n     * - If path matches tsconfig path alias (e.g., \"@/*\"), it resolves using tsconfig\n     * - Otherwise, treats path as absolute\n     * Returns true if the file exists, false otherwise.\n     */\n    static existsSync(filePath: string, project: IProjectModel): boolean {\n        const absolutePath = this.resolvePath(filePath, project);\n        return fs.existsSync(absolutePath);\n    }\n\n    private static resolvePathAlias(filePath: string, project: IProjectModel): string | null {\n        const projectRoot = project.paths.rootFolder.toString();\n\n        // Load path mappings from tsconfig if not already cached.\n        if (this.pathMappings === null) {\n            this.loadPathMappings(project);\n        }\n\n        if (!this.pathMappings) {\n            return null;\n        }\n\n        // Try to match against each path pattern.\n        for (const [pattern, targets] of Object.entries(this.pathMappings)) {\n            const match = this.matchPattern(filePath, pattern);\n            if (match !== null) {\n                // Use the first mapping.\n                const target = targets[0];\n                const resolvedPath = this.replacePlaceholder(target, match);\n                return path.resolve(projectRoot, resolvedPath);\n            }\n        }\n\n        return null;\n    }\n\n    private static loadPathMappings(project: IProjectModel): void {\n        const tsConfigPath = project.paths.tsConfigFile.toString();\n\n        try {\n            // Use get-tsconfig to parse tsconfig with extends resolution.\n            const tsconfig = getTsconfig(tsConfigPath);\n\n            if (tsconfig?.config.compilerOptions?.paths) {\n                this.pathMappings = tsconfig.config.compilerOptions.paths;\n            } else {\n                this.pathMappings = {};\n            }\n        } catch {\n            // Ignore tsconfig parsing errors.\n            this.pathMappings = {};\n        }\n    }\n\n    private static matchPattern(importPath: string, pattern: string): string | null {\n        // Handle wildcard patterns like \"@/*\" or \"@extensions/*\".\n        if (pattern.endsWith(\"/*\")) {\n            const prefix = pattern.slice(0, -2);\n            // Only match if there's a slash after the prefix.\n            if (importPath.startsWith(prefix + \"/\")) {\n                return importPath.slice(prefix.length + 1);\n            }\n        } else if (pattern === importPath) {\n            return \"\";\n        }\n\n        return null;\n    }\n\n    private static replacePlaceholder(mapping: string, match: string): string {\n        // Replace wildcard with the matched part.\n        if (mapping.endsWith(\"/*\")) {\n            return mapping.slice(0, -2) + \"/\" + match;\n        }\n        return mapping;\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/utils/index.d.ts

@@ -8,5 +8,6 @@ export * from "./isValidRegionName.js";
 export * from "./isValidVariantName.js";
 export * from "./measureDuration.js";
 export * from "./requireConfig.js";
+export * from "./toImportSpecifier.js";
 export * from "./projectSdkContext.js";
 export * from "./registerExtension.js";