@webiny/project 6.0.0-rc.1 → 6.0.0-rc.2

package/extensions/index.js

@@ -5,6 +5,11 @@ import { ProjectId } from "./ProjectId.js";
 import { Telemetry } from "./Telemetry.js";
 import { EnvVar } from "./EnvVar.js";
 import { DatabaseSetup } from "./DatabaseSetup.js";
+import { FeatureFlags } from "./FeatureFlags.js";
+import { BuildParam } from "./ApiBuildParam.js";
+import { AdminBuildParam } from "./AdminBuildParam.js";
+import { AdminExtension } from "./AdminExtension.js";
+import { ApiExtension } from "./ApiExtension.js";
 
 // Hooks.
 import { AdminAfterBuild, AdminAfterDeploy, AdminBeforeBuild, AdminBeforeDeploy, AdminBeforeWatch, AfterBuild, AfterDeploy, BeforeDeploy, BeforeWatch, ApiAfterBuild, ApiAfterDeploy, ApiBeforeBuild, ApiBeforeDeploy, ApiBeforeWatch, BeforeBuild, CoreAfterBuild, CoreAfterDeploy, CoreBeforeBuild, CoreBeforeDeploy, CoreBeforeWatch } from "./hooks/index.js";
@@ -19,7 +24,12 @@ export { ProjectDecorator };
 export { ProjectImplementation };
 export { ExtensionDefinitions };
 export { EnvVar };
+export { FeatureFlags };
 export { DatabaseSetup };
+export { BuildParam };
+export { AdminBuildParam };
+export { AdminExtension };
+export { ApiExtension };
 
 // Hooks.
 export { BeforeBuild };
@@ -54,11 +64,11 @@ export { ApiStackOutputValue };
 export { AdminStackOutputValue };
 
 // Definitions (used internally). 👇
-export const definitions = [Telemetry.def, ProjectId.def, ProjectDecorator.def, ProjectImplementation.def, ExtensionDefinitions.def, EnvVar.def,
+export const definitions = [Telemetry.def, ProjectId.def, ProjectDecorator.def, ProjectImplementation.def, ExtensionDefinitions.def, EnvVar.def, FeatureFlags.def,
 // Hooks.
 AdminAfterBuild.def, AdminAfterDeploy.def, BeforeBuild.def, BeforeDeploy.def, BeforeWatch.def, AfterBuild.def, AfterDeploy.def, AdminBeforeBuild.def, AdminBeforeDeploy.def, AdminBeforeWatch.def, ApiAfterBuild.def, ApiAfterDeploy.def, ApiBeforeBuild.def, ApiBeforeDeploy.def, ApiBeforeWatch.def, CoreAfterBuild.def, CoreAfterDeploy.def, CoreBeforeBuild.def, CoreBeforeDeploy.def, CoreBeforeWatch.def,
 // Pulumi.
-CorePulumi.def, PulumiResourceNamePrefix.def, ProductionEnvironments.def, CoreStackOutputValue.def, ApiStackOutputValue.def, AdminStackOutputValue.def, DatabaseSetup.def];
+AdminPulumi.def, ApiPulumi.def, CorePulumi.def, PulumiResourceNamePrefix.def, ProductionEnvironments.def, CoreStackOutputValue.def, ApiStackOutputValue.def, AdminStackOutputValue.def, DatabaseSetup.def, BuildParam.def, AdminBuildParam.def, AdminExtension.def, ApiExtension.def];
 export { Project } from "./Project.js";
 export * from "../defineExtension/index.js";
 

package/extensions/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["ExtensionDefinitions","ProjectDecorator","ProjectImplementation","ProjectId","Telemetry","EnvVar","DatabaseSetup","AdminAfterBuild","AdminAfterDeploy","AdminBeforeBuild","AdminBeforeDeploy","AdminBeforeWatch","AfterBuild","AfterDeploy","BeforeDeploy","BeforeWatch","ApiAfterBuild","ApiAfterDeploy","ApiBeforeBuild","ApiBeforeDeploy","ApiBeforeWatch","BeforeBuild","CoreAfterBuild","CoreAfterDeploy","CoreBeforeBuild","CoreBeforeDeploy","CoreBeforeWatch","AdminPulumi","ApiPulumi","CorePulumi","ProductionEnvironments","PulumiResourceNamePrefix","CoreStackOutputValue","ApiStackOutputValue","AdminStackOutputValue","definitions","def","Project"],"sources":["index.ts"],"sourcesContent":["import { ExtensionDefinitions } from \"./ExtensionDefinitions.js\";\nimport { ProjectDecorator } from \"./ProjectDecorator.js\";\nimport { ProjectImplementation } from \"./ProjectImplementation.js\";\nimport { ProjectId } from \"./ProjectId.js\";\nimport { Telemetry } from \"./Telemetry.js\";\nimport { EnvVar } from \"./EnvVar.js\";\nimport { DatabaseSetup } from \"./DatabaseSetup.js\";\n\n// Hooks.\nimport {\n    AdminAfterBuild,\n    AdminAfterDeploy,\n    AdminBeforeBuild,\n    AdminBeforeDeploy,\n    AdminBeforeWatch,\n    AfterBuild,\n    AfterDeploy,\n    BeforeDeploy,\n    BeforeWatch,\n    ApiAfterBuild,\n    ApiAfterDeploy,\n    ApiBeforeBuild,\n    ApiBeforeDeploy,\n    ApiBeforeWatch,\n    BeforeBuild,\n    CoreAfterBuild,\n    CoreAfterDeploy,\n    CoreBeforeBuild,\n    CoreBeforeDeploy,\n    CoreBeforeWatch\n} from \"./hooks/index.js\";\n\n// Pulumi.\nimport {\n    AdminPulumi,\n    ApiPulumi,\n    CorePulumi,\n    ProductionEnvironments,\n    PulumiResourceNamePrefix,\n    CoreStackOutputValue,\n    ApiStackOutputValue,\n    AdminStackOutputValue\n} from \"./pulumi/index.js\";\n\n// Exports.\nexport { Telemetry };\nexport { ProjectId };\nexport { ProjectDecorator };\nexport { ProjectImplementation };\nexport { ExtensionDefinitions };\nexport { EnvVar };\nexport { DatabaseSetup };\n\n// Hooks.\nexport { BeforeBuild };\nexport { BeforeDeploy };\nexport { BeforeWatch };\nexport { AfterBuild };\nexport { AfterDeploy };\nexport { AdminBeforeBuild };\nexport { AdminBeforeDeploy };\nexport { AdminBeforeWatch };\nexport { AdminAfterBuild };\nexport { AdminAfterDeploy };\nexport { ApiBeforeBuild };\nexport { ApiBeforeDeploy };\nexport { ApiBeforeWatch };\nexport { ApiAfterBuild };\nexport { ApiAfterDeploy };\nexport { CoreBeforeBuild };\nexport { CoreBeforeDeploy };\nexport { CoreBeforeWatch };\nexport { CoreAfterBuild };\nexport { CoreAfterDeploy };\n\n// Pulumi.\nexport { CorePulumi };\nexport { AdminPulumi };\nexport { ApiPulumi };\nexport { PulumiResourceNamePrefix };\nexport { ProductionEnvironments };\nexport { CoreStackOutputValue };\nexport { ApiStackOutputValue };\nexport { AdminStackOutputValue };\n\n// Definitions (used internally). 👇\nexport const definitions = [\n    Telemetry.def,\n    ProjectId.def,\n    ProjectDecorator.def,\n    ProjectImplementation.def,\n    ExtensionDefinitions.def,\n    EnvVar.def,\n\n    // Hooks.\n    AdminAfterBuild.def,\n    AdminAfterDeploy.def,\n    BeforeBuild.def,\n    BeforeDeploy.def,\n    BeforeWatch.def,\n    AfterBuild.def,\n    AfterDeploy.def,\n    AdminBeforeBuild.def,\n    AdminBeforeDeploy.def,\n    AdminBeforeWatch.def,\n    ApiAfterBuild.def,\n    ApiAfterDeploy.def,\n    ApiBeforeBuild.def,\n    ApiBeforeDeploy.def,\n    ApiBeforeWatch.def,\n    CoreAfterBuild.def,\n    CoreAfterDeploy.def,\n    CoreBeforeBuild.def,\n    CoreBeforeDeploy.def,\n    CoreBeforeWatch.def,\n\n    // Pulumi.\n    CorePulumi.def,\n    PulumiResourceNamePrefix.def,\n    ProductionEnvironments.def,\n    CoreStackOutputValue.def,\n    ApiStackOutputValue.def,\n    AdminStackOutputValue.def,\n    DatabaseSetup.def\n];\n\nexport { Project } from \"./Project.js\";\n\nexport * from \"../defineExtension/index.js\";\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ExtensionDefinitions","ProjectDecorator","ProjectImplementation","ProjectId","Telemetry","EnvVar","DatabaseSetup","FeatureFlags","BuildParam","AdminBuildParam","AdminExtension","ApiExtension","AdminAfterBuild","AdminAfterDeploy","AdminBeforeBuild","AdminBeforeDeploy","AdminBeforeWatch","AfterBuild","AfterDeploy","BeforeDeploy","BeforeWatch","ApiAfterBuild","ApiAfterDeploy","ApiBeforeBuild","ApiBeforeDeploy","ApiBeforeWatch","BeforeBuild","CoreAfterBuild","CoreAfterDeploy","CoreBeforeBuild","CoreBeforeDeploy","CoreBeforeWatch","AdminPulumi","ApiPulumi","CorePulumi","ProductionEnvironments","PulumiResourceNamePrefix","CoreStackOutputValue","ApiStackOutputValue","AdminStackOutputValue","definitions","def","Project"],"sources":["index.ts"],"sourcesContent":["import { ExtensionDefinitions } from \"./ExtensionDefinitions.js\";\nimport { ProjectDecorator } from \"./ProjectDecorator.js\";\nimport { ProjectImplementation } from \"./ProjectImplementation.js\";\nimport { ProjectId } from \"./ProjectId.js\";\nimport { Telemetry } from \"./Telemetry.js\";\nimport { EnvVar } from \"./EnvVar.js\";\nimport { DatabaseSetup } from \"./DatabaseSetup.js\";\nimport { FeatureFlags } from \"./FeatureFlags.js\";\nimport { BuildParam } from \"./ApiBuildParam.js\";\nimport { AdminBuildParam } from \"./AdminBuildParam.js\";\nimport { AdminExtension } from \"./AdminExtension.js\";\nimport { ApiExtension } from \"./ApiExtension.js\";\n\n// Hooks.\nimport {\n    AdminAfterBuild,\n    AdminAfterDeploy,\n    AdminBeforeBuild,\n    AdminBeforeDeploy,\n    AdminBeforeWatch,\n    AfterBuild,\n    AfterDeploy,\n    BeforeDeploy,\n    BeforeWatch,\n    ApiAfterBuild,\n    ApiAfterDeploy,\n    ApiBeforeBuild,\n    ApiBeforeDeploy,\n    ApiBeforeWatch,\n    BeforeBuild,\n    CoreAfterBuild,\n    CoreAfterDeploy,\n    CoreBeforeBuild,\n    CoreBeforeDeploy,\n    CoreBeforeWatch\n} from \"./hooks/index.js\";\n\n// Pulumi.\nimport {\n    AdminPulumi,\n    ApiPulumi,\n    CorePulumi,\n    ProductionEnvironments,\n    PulumiResourceNamePrefix,\n    CoreStackOutputValue,\n    ApiStackOutputValue,\n    AdminStackOutputValue\n} from \"./pulumi/index.js\";\n\n// Exports.\nexport { Telemetry };\nexport { ProjectId };\nexport { ProjectDecorator };\nexport { ProjectImplementation };\nexport { ExtensionDefinitions };\nexport { EnvVar };\nexport { FeatureFlags };\nexport { DatabaseSetup };\nexport { BuildParam };\nexport { AdminBuildParam };\nexport { AdminExtension };\nexport { ApiExtension };\n\n// Hooks.\nexport { BeforeBuild };\nexport { BeforeDeploy };\nexport { BeforeWatch };\nexport { AfterBuild };\nexport { AfterDeploy };\nexport { AdminBeforeBuild };\nexport { AdminBeforeDeploy };\nexport { AdminBeforeWatch };\nexport { AdminAfterBuild };\nexport { AdminAfterDeploy };\nexport { ApiBeforeBuild };\nexport { ApiBeforeDeploy };\nexport { ApiBeforeWatch };\nexport { ApiAfterBuild };\nexport { ApiAfterDeploy };\nexport { CoreBeforeBuild };\nexport { CoreBeforeDeploy };\nexport { CoreBeforeWatch };\nexport { CoreAfterBuild };\nexport { CoreAfterDeploy };\n\n// Pulumi.\nexport { CorePulumi };\nexport { AdminPulumi };\nexport { ApiPulumi };\nexport { PulumiResourceNamePrefix };\nexport { ProductionEnvironments };\nexport { CoreStackOutputValue };\nexport { ApiStackOutputValue };\nexport { AdminStackOutputValue };\n\n// Definitions (used internally). 👇\nexport const definitions = [\n    Telemetry.def,\n    ProjectId.def,\n    ProjectDecorator.def,\n    ProjectImplementation.def,\n    ExtensionDefinitions.def,\n    EnvVar.def,\n    FeatureFlags.def,\n\n    // Hooks.\n    AdminAfterBuild.def,\n    AdminAfterDeploy.def,\n    BeforeBuild.def,\n    BeforeDeploy.def,\n    BeforeWatch.def,\n    AfterBuild.def,\n    AfterDeploy.def,\n    AdminBeforeBuild.def,\n    AdminBeforeDeploy.def,\n    AdminBeforeWatch.def,\n    ApiAfterBuild.def,\n    ApiAfterDeploy.def,\n    ApiBeforeBuild.def,\n    ApiBeforeDeploy.def,\n    ApiBeforeWatch.def,\n    CoreAfterBuild.def,\n    CoreAfterDeploy.def,\n    CoreBeforeBuild.def,\n    CoreBeforeDeploy.def,\n    CoreBeforeWatch.def,\n\n    // Pulumi.\n    AdminPulumi.def,\n    ApiPulumi.def,\n    CorePulumi.def,\n    PulumiResourceNamePrefix.def,\n    ProductionEnvironments.def,\n    CoreStackOutputValue.def,\n    ApiStackOutputValue.def,\n    AdminStackOutputValue.def,\n    DatabaseSetup.def,\n    BuildParam.def,\n    AdminBuildParam.def,\n    AdminExtension.def,\n    ApiExtension.def\n];\n\nexport { Project } from \"./Project.js\";\n\nexport * from \"../defineExtension/index.js\";\n"],"mappings":"AAAA,SAASA,oBAAoB;AAC7B,SAASC,gBAAgB;AACzB,SAASC,qBAAqB;AAC9B,SAASC,SAAS;AAClB,SAASC,SAAS;AAClB,SAASC,MAAM;AACf,SAASC,aAAa;AACtB,SAASC,YAAY;AACrB,SAASC,UAAU;AACnB,SAASC,eAAe;AACxB,SAASC,cAAc;AACvB,SAASC,YAAY;;AAErB;AACA,SACIC,eAAe,EACfC,gBAAgB,EAChBC,gBAAgB,EAChBC,iBAAiB,EACjBC,gBAAgB,EAChBC,UAAU,EACVC,WAAW,EACXC,YAAY,EACZC,WAAW,EACXC,aAAa,EACbC,cAAc,EACdC,cAAc,EACdC,eAAe,EACfC,cAAc,EACdC,WAAW,EACXC,cAAc,EACdC,eAAe,EACfC,eAAe,EACfC,gBAAgB,EAChBC,eAAe;;AAGnB;AACA,SACIC,WAAW,EACXC,SAAS,EACTC,UAAU,EACVC,sBAAsB,EACtBC,wBAAwB,EACxBC,oBAAoB,EACpBC,mBAAmB,EACnBC,qBAAqB;;AAGzB;AACA,SAASnC,SAAS;AAClB,SAASD,SAAS;AAClB,SAASF,gBAAgB;AACzB,SAASC,qBAAqB;AAC9B,SAASF,oBAAoB;AAC7B,SAASK,MAAM;AACf,SAASE,YAAY;AACrB,SAASD,aAAa;AACtB,SAASE,UAAU;AACnB,SAASC,eAAe;AACxB,SAASC,cAAc;AACvB,SAASC,YAAY;;AAErB;AACA,SAASe,WAAW;AACpB,SAASP,YAAY;AACrB,SAASC,WAAW;AACpB,SAASH,UAAU;AACnB,SAASC,WAAW;AACpB,SAASJ,gBAAgB;AACzB,SAASC,iBAAiB;AAC1B,SAASC,gBAAgB;AACzB,SAASJ,eAAe;AACxB,SAASC,gBAAgB;AACzB,SAASU,cAAc;AACvB,SAASC,eAAe;AACxB,SAASC,cAAc;AACvB,SAASJ,aAAa;AACtB,SAASC,cAAc;AACvB,SAASO,eAAe;AACxB,SAASC,gBAAgB;AACzB,SAASC,eAAe;AACxB,SAASJ,cAAc;AACvB,SAASC,eAAe;;AAExB;AACA,SAASM,UAAU;AACnB,SAASF,WAAW;AACpB,SAASC,SAAS;AAClB,SAASG,wBAAwB;AACjC,SAASD,sBAAsB;AAC/B,SAASE,oBAAoB;AAC7B,SAASC,mBAAmB;AAC5B,SAASC,qBAAqB;;AAE9B;AACA,OAAO,MAAMC,WAAW,GAAG,CACvBpC,SAAS,CAACqC,GAAG,EACbtC,SAAS,CAACsC,GAAG,EACbxC,gBAAgB,CAACwC,GAAG,EACpBvC,qBAAqB,CAACuC,GAAG,EACzBzC,oBAAoB,CAACyC,GAAG,EACxBpC,MAAM,CAACoC,GAAG,EACVlC,YAAY,CAACkC,GAAG;AAEhB;AACA7B,eAAe,CAAC6B,GAAG,EACnB5B,gBAAgB,CAAC4B,GAAG,EACpBf,WAAW,CAACe,GAAG,EACftB,YAAY,CAACsB,GAAG,EAChBrB,WAAW,CAACqB,GAAG,EACfxB,UAAU,CAACwB,GAAG,EACdvB,WAAW,CAACuB,GAAG,EACf3B,gBAAgB,CAAC2B,GAAG,EACpB1B,iBAAiB,CAAC0B,GAAG,EACrBzB,gBAAgB,CAACyB,GAAG,EACpBpB,aAAa,CAACoB,GAAG,EACjBnB,cAAc,CAACmB,GAAG,EAClBlB,cAAc,CAACkB,GAAG,EAClBjB,eAAe,CAACiB,GAAG,EACnBhB,cAAc,CAACgB,GAAG,EAClBd,cAAc,CAACc,GAAG,EAClBb,eAAe,CAACa,GAAG,EACnBZ,eAAe,CAACY,GAAG,EACnBX,gBAAgB,CAACW,GAAG,EACpBV,eAAe,CAACU,GAAG;AAEnB;AACAT,WAAW,CAACS,GAAG,EACfR,SAAS,CAACQ,GAAG,EACbP,UAAU,CAACO,GAAG,EACdL,wBAAwB,CAACK,GAAG,EAC5BN,sBAAsB,CAACM,GAAG,EAC1BJ,oBAAoB,CAACI,GAAG,EACxBH,mBAAmB,CAACG,GAAG,EACvBF,qBAAqB,CAACE,GAAG,EACzBnC,aAAa,CAACmC,GAAG,EACjBjC,UAAU,CAACiC,GAAG,EACdhC,eAAe,CAACgC,GAAG,EACnB/B,cAAc,CAAC+B,GAAG,EAClB9B,YAAY,CAAC8B,GAAG,CACnB;AAED,SAASC,OAAO;AAEhB","ignoreList":[]}

package/features/Watch/Watch.js

@@ -149,6 +149,7 @@ export class DefaultWatch {
     // Ignore promise, we don't need to wait for this to finish.
     replaceLambdaFunctions({
       app,
+      deploymentId,
       dependencies: {
         uiService: ui,
         loggerService: logger,

package/features/Watch/Watch.js.map

@@ -1 +1 @@
-{"version":3,"names":["createImplementation","BuildAppWorkspaceService","WatchedLambdaFunctionsService","GetApp","GetProductionEnvironments","GetProject","GetProjectConfigService","ListAppLambdaFunctionsService","ListPackagesService","LoggerService","ProjectSdkParamsService","PulumiExportService","PulumiGetStackOutputService","UiService","ValidateProjectConfigService","Watch","chalk","PackagesWatcher","WebinyConfigWatcher","getIotEndpoint","replaceLambdaFunctions","initInvocationForwarding","DefaultWatch","constructor","getApp","logger","listAppLambdaFunctionsService","listPackagesService","getProject","getProjectConfigService","validateProjectConfigService","getProductionEnvironments","ui","pulumiGetStackOutputService","pulumiExportService","watchedLambdaFunctionsService","buildAppWorkspaceService","projectSdkParamsService","execute","params","hasAppOrPackage","Error","whitelistArray","Array","isArray","package","filter","Boolean","packages","packageWhitelist","packagesWatcher","app","sdkParams","get","env","productionEnvironments","includes","allowProduction","red","increaseTimeout","forceRebuild","project","projectConfig","tags","appName","runtimeContext","renderArgs","extensionType","config","oneOrMoreExtensions","extensionsArray","extensionInstance","build","webinyConfigWatcher","webinyConfigPath","paths","webinyConfigFile","toString","packagesWhitelist","functionsWhitelist","function","packagesList","name","functionsList","whitelist","deployCommand","learnMoreLink","troubleshootingLink","meta","count","totalCount","info","join","warning","getDisplayName","debug","list","map","fn","emptyLine","default","exitHook","console","log","coreApp","coreStackOutput","bold","deploymentId","iotEndpointTopic","iotEndpoint","sessionId","Date","getTime","localExecutionHandshakeTimeout","increaseHandshakeTimeout","dependencies","uiService","loggerService","inspector","undefined","inspect","open","close","watch","abstraction","implementation"],"sources":["Watch.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport {\n    BuildAppWorkspaceService,\n    WatchedLambdaFunctionsService,\n    GetApp,\n    GetProductionEnvironments,\n    GetProject,\n    GetProjectConfigService,\n    ListAppLambdaFunctionsService,\n    ListPackagesService,\n    LoggerService,\n    ProjectSdkParamsService,\n    PulumiExportService,\n    PulumiGetStackOutputService,\n    UiService,\n    ValidateProjectConfigService,\n    Watch\n} from \"~/abstractions/index.js\";\nimport chalk from \"chalk\";\nimport type inspectorType from \"inspector\";\nimport { PackagesWatcher } from \"./watchers/PackagesWatcher.js\";\nimport { WebinyConfigWatcher } from \"~/features/Watch/watchers/WebinyConfigWatcher.js\";\nimport { type ICoreStackOutput } from \"~/abstractions/features/GetAppStackOutput.js\";\nimport { getIotEndpoint } from \"./getIotEndpoint.js\";\nimport { replaceLambdaFunctions } from \"~/features/Watch/replaceLambdaFunctions.js\";\nimport { initInvocationForwarding } from \"./initInvocationForwarding.js\";\n\nexport class DefaultWatch implements Watch.Interface {\n    constructor(\n        private getApp: GetApp.Interface,\n        private logger: LoggerService.Interface,\n        private listAppLambdaFunctionsService: ListAppLambdaFunctionsService.Interface,\n        private listPackagesService: ListPackagesService.Interface,\n        private getProject: GetProject.Interface,\n        private getProjectConfigService: GetProjectConfigService.Interface,\n        private validateProjectConfigService: ValidateProjectConfigService.Interface,\n        private getProductionEnvironments: GetProductionEnvironments.Interface,\n        private ui: UiService.Interface,\n        private pulumiGetStackOutputService: PulumiGetStackOutputService.Interface,\n        private pulumiExportService: PulumiExportService.Interface,\n        private watchedLambdaFunctionsService: WatchedLambdaFunctionsService.Interface,\n        private buildAppWorkspaceService: BuildAppWorkspaceService.Interface,\n        private projectSdkParamsService: ProjectSdkParamsService.Interface\n    ) {}\n\n    async execute(params: Watch.Params) {\n        const hasAppOrPackage = \"app\" in params || \"package\" in params;\n        if (!hasAppOrPackage) {\n            throw new Error(\n                `Either \"app\" or \"package\" arguments must be passed. Cannot have both undefined.`\n            );\n        }\n\n        // If we're not watching a specific app, we can only watch packages.\n        if (!(\"app\" in params)) {\n            const whitelistArray = Array.isArray(params.package)\n                ? params.package\n                : ([params.package].filter(Boolean) as string[]);\n\n            const packages = await this.listPackagesService.execute({\n                packageWhitelist: whitelistArray\n            });\n\n            const packagesWatcher = new PackagesWatcher({ packages, params, logger: this.logger });\n\n            return { packagesWatcher };\n        }\n\n        // Get project application metadata. Will throw an error if an invalid folder is specified.\n        const app = this.getApp.execute(params.app);\n\n        if (!app) {\n            throw new Error(\n                `Invalid app name \"${params.app}\". Please specify a valid app name (core, api, or admin).`\n            );\n        }\n\n        const sdkParams = this.projectSdkParamsService.get();\n\n        if (!sdkParams.env) {\n            throw new Error(`Please specify environment, for example \"dev\".`);\n        }\n\n        const productionEnvironments = await this.getProductionEnvironments.execute();\n\n        if (productionEnvironments.includes(sdkParams.env)) {\n            if (!params.allowProduction) {\n                throw new Error(\n                    `${chalk.red(\n                        \"webiny watch\"\n                    )} command cannot be used with production environments.`\n                );\n            }\n        }\n\n        // A maximum of 15 minutes in seconds can be passed.\n        if (params.increaseTimeout && params.increaseTimeout > 900) {\n            throw new Error(\n                `When increasing the timeout, the maximum value that can be passed is 900 seconds (15 minutes).`\n            );\n        }\n\n        await this.buildAppWorkspaceService.execute(params.app, { forceRebuild: true });\n\n        const ui = this.ui;\n        const logger = this.logger;\n        const project = this.getProject.execute();\n        const getProjectConfigService = this.getProjectConfigService;\n        const validateProjectConfigService = this.validateProjectConfigService;\n\n        const projectConfig = await getProjectConfigService.execute({\n            tags: { appName: params.app, runtimeContext: \"app-build\" },\n            renderArgs: params\n        });\n\n        await validateProjectConfigService.execute(projectConfig);\n\n        for (const extensionType in projectConfig.config) {\n            const oneOrMoreExtensions = projectConfig.config[extensionType];\n            const extensionsArray = Array.isArray(oneOrMoreExtensions)\n                ? [...oneOrMoreExtensions]\n                : [oneOrMoreExtensions];\n\n            for (const extensionInstance of extensionsArray) {\n                await extensionInstance.build();\n            }\n        }\n\n        const webinyConfigWatcher = new WebinyConfigWatcher({\n            webinyConfigPath: project.paths.webinyConfigFile.toString(),\n            appName: params.app,\n            getProjectConfigService,\n            validateProjectConfigService\n        });\n\n        const packagesWhitelist = Array.isArray(params.package)\n            ? params.package\n            : ([params.package].filter(Boolean) as string[]);\n\n        const functionsWhitelist = Array.isArray(params.function)\n            ? params.function\n            : ([params.function].filter(Boolean) as string[]);\n\n        const packagesList = await this.listPackagesService.execute({\n            appName: app.name,\n            packageWhitelist: packagesWhitelist\n        });\n\n        const packagesWatcher = new PackagesWatcher({\n            packages: packagesList,\n            params,\n            logger\n        });\n\n        const functionsList = await this.listAppLambdaFunctionsService.execute(app, {\n            whitelist: functionsWhitelist\n        });\n\n        const deployCommand = `yarn webiny deploy ${app.name} --env ${sdkParams.env}`;\n        const learnMoreLink = \"https://webiny.link/local-aws-lambda-development\";\n        const troubleshootingLink = learnMoreLink + \"#troubleshooting\";\n\n        if (functionsList.meta.count === 0) {\n            // If functions exist, but none are selected for watching, show a warning.\n            if (functionsList.meta.totalCount > 0) {\n                ui.info(\n                    [\n                        \"No AWS Lambda functions will be invoked locally. If this is unexpected, you can try the following:\",\n                        \" ‣ stop the current development session\",\n                        \" ‣ redeploy the %s application by running %s command\",\n                        \" ‣ start a new %s session by rerunning %s command\",\n                        \"\",\n                        \"Learn more: %s\"\n                    ].join(\"\\n\"),\n                    app.name,\n                    deployCommand,\n                    \"webiny watch\",\n                    \"webiny watch\",\n                    troubleshootingLink\n                );\n            }\n            return { packagesWatcher, webinyConfigWatcher };\n        }\n\n        ui.info(`Local AWS Lambda development session started.`);\n        ui.warning(\n            `Note that once the session is terminated, the %s application will no longer work. To fix this, you %s redeploy it via the %s command. Learn more: %s.`,\n            app.getDisplayName(),\n            \"MUST\",\n            deployCommand,\n            learnMoreLink\n        );\n\n        logger.debug(\n            \"The events for following AWS Lambda functions will be forwarded locally: \",\n            functionsList.list.map(fn => fn.name)\n        );\n\n        ui.emptyLine();\n        const { default: exitHook } = await import(/* webpackChunkName: \"exit-hook\" */ \"exit-hook\");\n\n        exitHook(() => {\n            console.log();\n            console.log();\n\n            ui.info(`Terminating local AWS Lambda development session.`);\n            ui.warning(\n                `Note that once the session is terminated, the %s application will no longer work. To fix this, you %s redeploy it via the %s command. Learn more: %s.`,\n                app?.getDisplayName(),\n                \"MUST\",\n                deployCommand,\n                learnMoreLink\n            );\n        });\n\n        const coreApp = this.getApp.execute(\"core\");\n        const coreStackOutput =\n            await this.pulumiGetStackOutputService.execute<ICoreStackOutput>(coreApp);\n\n        if (!coreStackOutput) {\n            throw new Error(\n                `You must deploy the ${chalk.bold(\n                    \"core\"\n                )} app before you can start a watch session. To do that, run: ${chalk.bold(\n                    `yarn webiny deploy core --env ${sdkParams.env}`\n                )}`\n            );\n        }\n\n        const deploymentId = coreStackOutput?.deploymentId;\n\n        const iotEndpointTopic = `webiny-watch-${deploymentId}`;\n        const iotEndpoint = await getIotEndpoint(coreStackOutput);\n\n        const sessionId = new Date().getTime();\n        const increaseTimeout = params.increaseTimeout;\n        const localExecutionHandshakeTimeout = params.increaseHandshakeTimeout || 5; // Default to 5 seconds.\n\n        // Ignore promise, we don't need to wait for this to finish.\n        replaceLambdaFunctions({\n            app,\n            dependencies: {\n                uiService: ui,\n                loggerService: logger,\n                pulumiExportService: this.pulumiExportService,\n                watchedLambdaFunctionsService: this.watchedLambdaFunctionsService\n            },\n            iotEndpoint,\n            iotEndpointTopic,\n            sessionId,\n            functionsList,\n            increaseTimeout,\n            localExecutionHandshakeTimeout\n        });\n\n        let inspector: typeof inspectorType | undefined = undefined;\n        if (params.inspect) {\n            inspector = await import(\"inspector\");\n            inspector!.open(9229, \"127.0.0.1\");\n            ui.emptyLine();\n\n            exitHook(() => {\n                inspector!.close();\n            });\n        }\n\n        // Ignore promise, we don't need to wait for this to finish.\n        initInvocationForwarding({\n            iotEndpoint,\n            iotEndpointTopic,\n            functionsList,\n            sessionId\n        });\n\n        return { packagesWatcher };\n    }\n}\n\nexport const watch = createImplementation({\n    abstraction: Watch,\n    implementation: DefaultWatch,\n    dependencies: [\n        GetApp,\n        LoggerService,\n        ListAppLambdaFunctionsService,\n        ListPackagesService,\n        GetProject,\n        GetProjectConfigService,\n        ValidateProjectConfigService,\n        GetProductionEnvironments,\n        UiService,\n        PulumiGetStackOutputService,\n        PulumiExportService,\n        WatchedLambdaFunctionsService,\n        BuildAppWorkspaceService,\n        ProjectSdkParamsService\n    ]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createImplementation","BuildAppWorkspaceService","WatchedLambdaFunctionsService","GetApp","GetProductionEnvironments","GetProject","GetProjectConfigService","ListAppLambdaFunctionsService","ListPackagesService","LoggerService","ProjectSdkParamsService","PulumiExportService","PulumiGetStackOutputService","UiService","ValidateProjectConfigService","Watch","chalk","PackagesWatcher","WebinyConfigWatcher","getIotEndpoint","replaceLambdaFunctions","initInvocationForwarding","DefaultWatch","constructor","getApp","logger","listAppLambdaFunctionsService","listPackagesService","getProject","getProjectConfigService","validateProjectConfigService","getProductionEnvironments","ui","pulumiGetStackOutputService","pulumiExportService","watchedLambdaFunctionsService","buildAppWorkspaceService","projectSdkParamsService","execute","params","hasAppOrPackage","Error","whitelistArray","Array","isArray","package","filter","Boolean","packages","packageWhitelist","packagesWatcher","app","sdkParams","get","env","productionEnvironments","includes","allowProduction","red","increaseTimeout","forceRebuild","project","projectConfig","tags","appName","runtimeContext","renderArgs","extensionType","config","oneOrMoreExtensions","extensionsArray","extensionInstance","build","webinyConfigWatcher","webinyConfigPath","paths","webinyConfigFile","toString","packagesWhitelist","functionsWhitelist","function","packagesList","name","functionsList","whitelist","deployCommand","learnMoreLink","troubleshootingLink","meta","count","totalCount","info","join","warning","getDisplayName","debug","list","map","fn","emptyLine","default","exitHook","console","log","coreApp","coreStackOutput","bold","deploymentId","iotEndpointTopic","iotEndpoint","sessionId","Date","getTime","localExecutionHandshakeTimeout","increaseHandshakeTimeout","dependencies","uiService","loggerService","inspector","undefined","inspect","open","close","watch","abstraction","implementation"],"sources":["Watch.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport {\n    BuildAppWorkspaceService,\n    WatchedLambdaFunctionsService,\n    GetApp,\n    GetProductionEnvironments,\n    GetProject,\n    GetProjectConfigService,\n    ListAppLambdaFunctionsService,\n    ListPackagesService,\n    LoggerService,\n    ProjectSdkParamsService,\n    PulumiExportService,\n    PulumiGetStackOutputService,\n    UiService,\n    ValidateProjectConfigService,\n    Watch\n} from \"~/abstractions/index.js\";\nimport chalk from \"chalk\";\nimport type inspectorType from \"inspector\";\nimport { PackagesWatcher } from \"./watchers/PackagesWatcher.js\";\nimport { WebinyConfigWatcher } from \"~/features/Watch/watchers/WebinyConfigWatcher.js\";\nimport { type ICoreStackOutput } from \"~/abstractions/features/GetAppStackOutput.js\";\nimport { getIotEndpoint } from \"./getIotEndpoint.js\";\nimport { replaceLambdaFunctions } from \"~/features/Watch/replaceLambdaFunctions.js\";\nimport { initInvocationForwarding } from \"./initInvocationForwarding.js\";\n\nexport class DefaultWatch implements Watch.Interface {\n    constructor(\n        private getApp: GetApp.Interface,\n        private logger: LoggerService.Interface,\n        private listAppLambdaFunctionsService: ListAppLambdaFunctionsService.Interface,\n        private listPackagesService: ListPackagesService.Interface,\n        private getProject: GetProject.Interface,\n        private getProjectConfigService: GetProjectConfigService.Interface,\n        private validateProjectConfigService: ValidateProjectConfigService.Interface,\n        private getProductionEnvironments: GetProductionEnvironments.Interface,\n        private ui: UiService.Interface,\n        private pulumiGetStackOutputService: PulumiGetStackOutputService.Interface,\n        private pulumiExportService: PulumiExportService.Interface,\n        private watchedLambdaFunctionsService: WatchedLambdaFunctionsService.Interface,\n        private buildAppWorkspaceService: BuildAppWorkspaceService.Interface,\n        private projectSdkParamsService: ProjectSdkParamsService.Interface\n    ) {}\n\n    async execute(params: Watch.Params) {\n        const hasAppOrPackage = \"app\" in params || \"package\" in params;\n        if (!hasAppOrPackage) {\n            throw new Error(\n                `Either \"app\" or \"package\" arguments must be passed. Cannot have both undefined.`\n            );\n        }\n\n        // If we're not watching a specific app, we can only watch packages.\n        if (!(\"app\" in params)) {\n            const whitelistArray = Array.isArray(params.package)\n                ? params.package\n                : ([params.package].filter(Boolean) as string[]);\n\n            const packages = await this.listPackagesService.execute({\n                packageWhitelist: whitelistArray\n            });\n\n            const packagesWatcher = new PackagesWatcher({ packages, params, logger: this.logger });\n\n            return { packagesWatcher };\n        }\n\n        // Get project application metadata. Will throw an error if an invalid folder is specified.\n        const app = this.getApp.execute(params.app);\n\n        if (!app) {\n            throw new Error(\n                `Invalid app name \"${params.app}\". Please specify a valid app name (core, api, or admin).`\n            );\n        }\n\n        const sdkParams = this.projectSdkParamsService.get();\n\n        if (!sdkParams.env) {\n            throw new Error(`Please specify environment, for example \"dev\".`);\n        }\n\n        const productionEnvironments = await this.getProductionEnvironments.execute();\n\n        if (productionEnvironments.includes(sdkParams.env)) {\n            if (!params.allowProduction) {\n                throw new Error(\n                    `${chalk.red(\n                        \"webiny watch\"\n                    )} command cannot be used with production environments.`\n                );\n            }\n        }\n\n        // A maximum of 15 minutes in seconds can be passed.\n        if (params.increaseTimeout && params.increaseTimeout > 900) {\n            throw new Error(\n                `When increasing the timeout, the maximum value that can be passed is 900 seconds (15 minutes).`\n            );\n        }\n\n        await this.buildAppWorkspaceService.execute(params.app, { forceRebuild: true });\n\n        const ui = this.ui;\n        const logger = this.logger;\n        const project = this.getProject.execute();\n        const getProjectConfigService = this.getProjectConfigService;\n        const validateProjectConfigService = this.validateProjectConfigService;\n\n        const projectConfig = await getProjectConfigService.execute({\n            tags: { appName: params.app, runtimeContext: \"app-build\" },\n            renderArgs: params\n        });\n\n        await validateProjectConfigService.execute(projectConfig);\n\n        for (const extensionType in projectConfig.config) {\n            const oneOrMoreExtensions = projectConfig.config[extensionType];\n            const extensionsArray = Array.isArray(oneOrMoreExtensions)\n                ? [...oneOrMoreExtensions]\n                : [oneOrMoreExtensions];\n\n            for (const extensionInstance of extensionsArray) {\n                await extensionInstance.build();\n            }\n        }\n\n        const webinyConfigWatcher = new WebinyConfigWatcher({\n            webinyConfigPath: project.paths.webinyConfigFile.toString(),\n            appName: params.app,\n            getProjectConfigService,\n            validateProjectConfigService\n        });\n\n        const packagesWhitelist = Array.isArray(params.package)\n            ? params.package\n            : ([params.package].filter(Boolean) as string[]);\n\n        const functionsWhitelist = Array.isArray(params.function)\n            ? params.function\n            : ([params.function].filter(Boolean) as string[]);\n\n        const packagesList = await this.listPackagesService.execute({\n            appName: app.name,\n            packageWhitelist: packagesWhitelist\n        });\n\n        const packagesWatcher = new PackagesWatcher({\n            packages: packagesList,\n            params,\n            logger\n        });\n\n        const functionsList = await this.listAppLambdaFunctionsService.execute(app, {\n            whitelist: functionsWhitelist\n        });\n\n        const deployCommand = `yarn webiny deploy ${app.name} --env ${sdkParams.env}`;\n        const learnMoreLink = \"https://webiny.link/local-aws-lambda-development\";\n        const troubleshootingLink = learnMoreLink + \"#troubleshooting\";\n\n        if (functionsList.meta.count === 0) {\n            // If functions exist, but none are selected for watching, show a warning.\n            if (functionsList.meta.totalCount > 0) {\n                ui.info(\n                    [\n                        \"No AWS Lambda functions will be invoked locally. If this is unexpected, you can try the following:\",\n                        \" ‣ stop the current development session\",\n                        \" ‣ redeploy the %s application by running %s command\",\n                        \" ‣ start a new %s session by rerunning %s command\",\n                        \"\",\n                        \"Learn more: %s\"\n                    ].join(\"\\n\"),\n                    app.name,\n                    deployCommand,\n                    \"webiny watch\",\n                    \"webiny watch\",\n                    troubleshootingLink\n                );\n            }\n            return { packagesWatcher, webinyConfigWatcher };\n        }\n\n        ui.info(`Local AWS Lambda development session started.`);\n        ui.warning(\n            `Note that once the session is terminated, the %s application will no longer work. To fix this, you %s redeploy it via the %s command. Learn more: %s.`,\n            app.getDisplayName(),\n            \"MUST\",\n            deployCommand,\n            learnMoreLink\n        );\n\n        logger.debug(\n            \"The events for following AWS Lambda functions will be forwarded locally: \",\n            functionsList.list.map(fn => fn.name)\n        );\n\n        ui.emptyLine();\n        const { default: exitHook } = await import(/* webpackChunkName: \"exit-hook\" */ \"exit-hook\");\n\n        exitHook(() => {\n            console.log();\n            console.log();\n\n            ui.info(`Terminating local AWS Lambda development session.`);\n            ui.warning(\n                `Note that once the session is terminated, the %s application will no longer work. To fix this, you %s redeploy it via the %s command. Learn more: %s.`,\n                app?.getDisplayName(),\n                \"MUST\",\n                deployCommand,\n                learnMoreLink\n            );\n        });\n\n        const coreApp = this.getApp.execute(\"core\");\n        const coreStackOutput =\n            await this.pulumiGetStackOutputService.execute<ICoreStackOutput>(coreApp);\n\n        if (!coreStackOutput) {\n            throw new Error(\n                `You must deploy the ${chalk.bold(\n                    \"core\"\n                )} app before you can start a watch session. To do that, run: ${chalk.bold(\n                    `yarn webiny deploy core --env ${sdkParams.env}`\n                )}`\n            );\n        }\n\n        const deploymentId = coreStackOutput?.deploymentId;\n\n        const iotEndpointTopic = `webiny-watch-${deploymentId}`;\n        const iotEndpoint = await getIotEndpoint(coreStackOutput);\n\n        const sessionId = new Date().getTime();\n        const increaseTimeout = params.increaseTimeout;\n        const localExecutionHandshakeTimeout = params.increaseHandshakeTimeout || 5; // Default to 5 seconds.\n\n        // Ignore promise, we don't need to wait for this to finish.\n        replaceLambdaFunctions({\n            app,\n            deploymentId,\n            dependencies: {\n                uiService: ui,\n                loggerService: logger,\n                pulumiExportService: this.pulumiExportService,\n                watchedLambdaFunctionsService: this.watchedLambdaFunctionsService\n            },\n            iotEndpoint,\n            iotEndpointTopic,\n            sessionId,\n            functionsList,\n            increaseTimeout,\n            localExecutionHandshakeTimeout\n        });\n\n        let inspector: typeof inspectorType | undefined = undefined;\n        if (params.inspect) {\n            inspector = await import(\"inspector\");\n            inspector!.open(9229, \"127.0.0.1\");\n            ui.emptyLine();\n\n            exitHook(() => {\n                inspector!.close();\n            });\n        }\n\n        // Ignore promise, we don't need to wait for this to finish.\n        initInvocationForwarding({\n            iotEndpoint,\n            iotEndpointTopic,\n            functionsList,\n            sessionId\n        });\n\n        return { packagesWatcher };\n    }\n}\n\nexport const watch = createImplementation({\n    abstraction: Watch,\n    implementation: DefaultWatch,\n    dependencies: [\n        GetApp,\n        LoggerService,\n        ListAppLambdaFunctionsService,\n        ListPackagesService,\n        GetProject,\n        GetProjectConfigService,\n        ValidateProjectConfigService,\n        GetProductionEnvironments,\n        UiService,\n        PulumiGetStackOutputService,\n        PulumiExportService,\n        WatchedLambdaFunctionsService,\n        BuildAppWorkspaceService,\n        ProjectSdkParamsService\n    ]\n});\n"],"mappings":"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","ignoreList":[]}

package/features/Watch/replaceLambdaFunctions.d.ts

@@ -2,6 +2,7 @@ import { type ListAppLambdaFunctionsService, type LoggerService, type PulumiExpo
 import { type AppModel } from "../../models/index.js";
 export interface IReplaceLambdaFunctionsParams {
     app: AppModel;
+    deploymentId: string | undefined;
     iotEndpoint: string;
     iotEndpointTopic: string;
     sessionId: number;
@@ -15,4 +16,4 @@ export interface IReplaceLambdaFunctionsParams {
         watchedLambdaFunctionsService: WatchedLambdaFunctionsService.Interface;
     };
 }
-export declare const replaceLambdaFunctions: ({ app, iotEndpoint, iotEndpointTopic, sessionId, functionsList, increaseTimeout, localExecutionHandshakeTimeout, dependencies }: IReplaceLambdaFunctionsParams) => Promise<void[]>;
+export declare const replaceLambdaFunctions: ({ app, deploymentId, iotEndpoint, iotEndpointTopic, sessionId, functionsList, increaseTimeout, localExecutionHandshakeTimeout, dependencies }: IReplaceLambdaFunctionsParams) => Promise<void[]>;

package/features/Watch/replaceLambdaFunctions.js

@@ -5,6 +5,7 @@ const WATCH_MODE_NOTE_IN_DESCRIPTION = " (💡 local development mode, redeploy
 const DEFAULT_INCREASE_TIMEOUT = 120;
 export const replaceLambdaFunctions = async ({
   app,
+  deploymentId,
   iotEndpoint,
   iotEndpointTopic,
   sessionId,
@@ -43,7 +44,10 @@ export const replaceLambdaFunctions = async ({
 
   // Mark these functions as needing replacement on next deployment
   if (replacedFunctionUrns.length > 0) {
-    watchedLambdaFunctionsService.markDirty(app.name, replacedFunctionUrns);
+    watchedLambdaFunctionsService.markDirty({
+      name: app.name,
+      deploymentId
+    }, replacedFunctionUrns);
     logger.info(`Marked ${replacedFunctionUrns.length} Lambda function(s) for replacement on next deployment.`);
   }
   logger.info("replacing %s AWS Lambda function(s).", functionsList.meta.count);

package/features/Watch/replaceLambdaFunctions.js.map

@@ -1 +1 @@
-{"version":3,"names":["fs","pRetry","GetFunctionConfigurationCommand","LambdaClient","UpdateFunctionCodeCommand","UpdateFunctionConfigurationCommand","WATCH_MODE_NOTE_IN_DESCRIPTION","DEFAULT_INCREASE_TIMEOUT","replaceLambdaFunctions","app","iotEndpoint","iotEndpointTopic","sessionId","functionsList","increaseTimeout","localExecutionHandshakeTimeout","dependencies","loggerService","logger","pulumiExportService","exportStackState","watchedLambdaFunctionsService","stackExport","execute","info","functionNamesToUpdate","list","map","fn","name","replacedFunctionUrns","deployment","resources","resource","type","functionName","inputs","includes","push","urn","debug","length","markDirty","meta","count","lambdaClient","replacementsPromises","getFnConfigCmd","FunctionName","lambdaFnConfiguration","send","updateFnCodeCmd","ZipFile","readFileSync","import","dirname","Description","endsWith","Timeout","Environment","Variables","WEBINY_WATCH","JSON","stringify","enabled","Promise","all","then","res"],"sources":["replaceLambdaFunctions.ts"],"sourcesContent":["import fs from \"fs\";\nimport pRetry from \"p-retry\";\nimport {\n    GetFunctionConfigurationCommand,\n    LambdaClient,\n    UpdateFunctionCodeCommand,\n    UpdateFunctionConfigurationCommand\n} from \"@webiny/aws-sdk/client-lambda/index.js\";\nimport {\n    type ListAppLambdaFunctionsService,\n    type LoggerService,\n    type PulumiExportService,\n    type WatchedLambdaFunctionsService,\n    type UiService\n} from \"~/abstractions/index.js\";\nimport { type AppModel } from \"~/models/index.js\";\n\nconst WATCH_MODE_NOTE_IN_DESCRIPTION = \" (💡 local development mode, redeploy to remove)\";\nconst DEFAULT_INCREASE_TIMEOUT = 120;\n\nexport interface IReplaceLambdaFunctionsParams {\n    app: AppModel;\n    iotEndpoint: string;\n    iotEndpointTopic: string;\n    sessionId: number;\n    functionsList: ListAppLambdaFunctionsService.Result;\n    increaseTimeout?: number;\n    localExecutionHandshakeTimeout?: number;\n    dependencies: {\n        uiService: UiService.Interface;\n        loggerService: LoggerService.Interface;\n        pulumiExportService: PulumiExportService.Interface;\n        watchedLambdaFunctionsService: WatchedLambdaFunctionsService.Interface;\n    };\n}\n\nexport const replaceLambdaFunctions = async ({\n    app,\n    iotEndpoint,\n    iotEndpointTopic,\n    sessionId,\n    functionsList,\n    increaseTimeout,\n    localExecutionHandshakeTimeout,\n    dependencies\n}: IReplaceLambdaFunctionsParams) => {\n    const {\n        loggerService: logger,\n        pulumiExportService: exportStackState,\n        watchedLambdaFunctionsService\n    } = dependencies;\n\n    const stackExport = await exportStackState.execute(app);\n    if (!stackExport) {\n        // If no stack export is found, return an empty array. This is a valid scenario.\n        // For example, watching the Admin app locally, but not deploying it.\n        logger.info(\"No AWS Lambda functions to replace.\");\n        return [];\n    }\n\n    // Find the URNs of Lambda functions that will be replaced\n    const functionNamesToUpdate = functionsList.list.map(fn => fn.name);\n    const replacedFunctionUrns: string[] = [];\n\n    if (stackExport.deployment?.resources) {\n        for (const resource of stackExport.deployment.resources) {\n            if (resource.type === \"aws:lambda/function:Function\") {\n                const functionName = resource.inputs?.name;\n                if (functionName && functionNamesToUpdate.includes(functionName)) {\n                    replacedFunctionUrns.push(resource.urn);\n                    logger.debug(`Will replace Lambda function: ${functionName} (${resource.urn})`);\n                }\n            }\n        }\n    }\n\n    // Mark these functions as needing replacement on next deployment\n    if (replacedFunctionUrns.length > 0) {\n        watchedLambdaFunctionsService.markDirty(app.name, replacedFunctionUrns);\n        logger.info(\n            `Marked ${replacedFunctionUrns.length} Lambda function(s) for replacement on next deployment.`\n        );\n    }\n\n    logger.info(\"replacing %s AWS Lambda function(s).\", functionsList.meta.count);\n    const lambdaClient = new LambdaClient();\n\n    const replacementsPromises = functionsList.list.map(async fn => {\n        const getFnConfigCmd = new GetFunctionConfigurationCommand({ FunctionName: fn.name });\n        const lambdaFnConfiguration = await lambdaClient.send(getFnConfigCmd);\n\n        const updateFnCodeCmd = new UpdateFunctionCodeCommand({\n            FunctionName: fn.name,\n            ZipFile: fs.readFileSync(import.meta.dirname + \"/handler/handler.zip\")\n        });\n\n        await lambdaClient.send(updateFnCodeCmd);\n\n        let Description = lambdaFnConfiguration.Description || \"\";\n        if (!Description.endsWith(WATCH_MODE_NOTE_IN_DESCRIPTION)) {\n            Description += WATCH_MODE_NOTE_IN_DESCRIPTION;\n        }\n\n        const Timeout = increaseTimeout || DEFAULT_INCREASE_TIMEOUT;\n\n        await pRetry(() =>\n            lambdaClient.send(\n                new UpdateFunctionConfigurationCommand({\n                    FunctionName: fn.name,\n                    Timeout,\n                    Description,\n                    Environment: {\n                        Variables: {\n                            ...lambdaFnConfiguration.Environment?.Variables,\n                            WEBINY_WATCH: JSON.stringify({\n                                enabled: true,\n                                localExecutionHandshakeTimeout,\n                                sessionId,\n                                iotEndpoint,\n                                iotEndpointTopic,\n                                functionName: fn.name\n                            })\n                        }\n                    }\n                })\n            )\n        );\n    });\n\n    return Promise.all(replacementsPromises).then(res => {\n        logger.info(\"%s AWS Lambda function(s) replaced.\", functionsList.meta.count);\n        return res;\n    });\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["fs","pRetry","GetFunctionConfigurationCommand","LambdaClient","UpdateFunctionCodeCommand","UpdateFunctionConfigurationCommand","WATCH_MODE_NOTE_IN_DESCRIPTION","DEFAULT_INCREASE_TIMEOUT","replaceLambdaFunctions","app","deploymentId","iotEndpoint","iotEndpointTopic","sessionId","functionsList","increaseTimeout","localExecutionHandshakeTimeout","dependencies","loggerService","logger","pulumiExportService","exportStackState","watchedLambdaFunctionsService","stackExport","execute","info","functionNamesToUpdate","list","map","fn","name","replacedFunctionUrns","deployment","resources","resource","type","functionName","inputs","includes","push","urn","debug","length","markDirty","meta","count","lambdaClient","replacementsPromises","getFnConfigCmd","FunctionName","lambdaFnConfiguration","send","updateFnCodeCmd","ZipFile","readFileSync","import","dirname","Description","endsWith","Timeout","Environment","Variables","WEBINY_WATCH","JSON","stringify","enabled","Promise","all","then","res"],"sources":["replaceLambdaFunctions.ts"],"sourcesContent":["import fs from \"fs\";\nimport pRetry from \"p-retry\";\nimport {\n    GetFunctionConfigurationCommand,\n    LambdaClient,\n    UpdateFunctionCodeCommand,\n    UpdateFunctionConfigurationCommand\n} from \"@webiny/aws-sdk/client-lambda/index.js\";\nimport {\n    type ListAppLambdaFunctionsService,\n    type LoggerService,\n    type PulumiExportService,\n    type WatchedLambdaFunctionsService,\n    type UiService\n} from \"~/abstractions/index.js\";\nimport { type AppModel } from \"~/models/index.js\";\n\nconst WATCH_MODE_NOTE_IN_DESCRIPTION = \" (💡 local development mode, redeploy to remove)\";\nconst DEFAULT_INCREASE_TIMEOUT = 120;\n\nexport interface IReplaceLambdaFunctionsParams {\n    app: AppModel;\n    deploymentId: string | undefined;\n    iotEndpoint: string;\n    iotEndpointTopic: string;\n    sessionId: number;\n    functionsList: ListAppLambdaFunctionsService.Result;\n    increaseTimeout?: number;\n    localExecutionHandshakeTimeout?: number;\n    dependencies: {\n        uiService: UiService.Interface;\n        loggerService: LoggerService.Interface;\n        pulumiExportService: PulumiExportService.Interface;\n        watchedLambdaFunctionsService: WatchedLambdaFunctionsService.Interface;\n    };\n}\n\nexport const replaceLambdaFunctions = async ({\n    app,\n    deploymentId,\n    iotEndpoint,\n    iotEndpointTopic,\n    sessionId,\n    functionsList,\n    increaseTimeout,\n    localExecutionHandshakeTimeout,\n    dependencies\n}: IReplaceLambdaFunctionsParams) => {\n    const {\n        loggerService: logger,\n        pulumiExportService: exportStackState,\n        watchedLambdaFunctionsService\n    } = dependencies;\n\n    const stackExport = await exportStackState.execute(app);\n    if (!stackExport) {\n        // If no stack export is found, return an empty array. This is a valid scenario.\n        // For example, watching the Admin app locally, but not deploying it.\n        logger.info(\"No AWS Lambda functions to replace.\");\n        return [];\n    }\n\n    // Find the URNs of Lambda functions that will be replaced\n    const functionNamesToUpdate = functionsList.list.map(fn => fn.name);\n    const replacedFunctionUrns: string[] = [];\n\n    if (stackExport.deployment?.resources) {\n        for (const resource of stackExport.deployment.resources) {\n            if (resource.type === \"aws:lambda/function:Function\") {\n                const functionName = resource.inputs?.name;\n                if (functionName && functionNamesToUpdate.includes(functionName)) {\n                    replacedFunctionUrns.push(resource.urn);\n                    logger.debug(`Will replace Lambda function: ${functionName} (${resource.urn})`);\n                }\n            }\n        }\n    }\n\n    // Mark these functions as needing replacement on next deployment\n    if (replacedFunctionUrns.length > 0) {\n        watchedLambdaFunctionsService.markDirty(\n            { name: app.name, deploymentId },\n            replacedFunctionUrns\n        );\n        logger.info(\n            `Marked ${replacedFunctionUrns.length} Lambda function(s) for replacement on next deployment.`\n        );\n    }\n\n    logger.info(\"replacing %s AWS Lambda function(s).\", functionsList.meta.count);\n    const lambdaClient = new LambdaClient();\n\n    const replacementsPromises = functionsList.list.map(async fn => {\n        const getFnConfigCmd = new GetFunctionConfigurationCommand({ FunctionName: fn.name });\n        const lambdaFnConfiguration = await lambdaClient.send(getFnConfigCmd);\n\n        const updateFnCodeCmd = new UpdateFunctionCodeCommand({\n            FunctionName: fn.name,\n            ZipFile: fs.readFileSync(import.meta.dirname + \"/handler/handler.zip\")\n        });\n\n        await lambdaClient.send(updateFnCodeCmd);\n\n        let Description = lambdaFnConfiguration.Description || \"\";\n        if (!Description.endsWith(WATCH_MODE_NOTE_IN_DESCRIPTION)) {\n            Description += WATCH_MODE_NOTE_IN_DESCRIPTION;\n        }\n\n        const Timeout = increaseTimeout || DEFAULT_INCREASE_TIMEOUT;\n\n        await pRetry(() =>\n            lambdaClient.send(\n                new UpdateFunctionConfigurationCommand({\n                    FunctionName: fn.name,\n                    Timeout,\n                    Description,\n                    Environment: {\n                        Variables: {\n                            ...lambdaFnConfiguration.Environment?.Variables,\n                            WEBINY_WATCH: JSON.stringify({\n                                enabled: true,\n                                localExecutionHandshakeTimeout,\n                                sessionId,\n                                iotEndpoint,\n                                iotEndpointTopic,\n                                functionName: fn.name\n                            })\n                        }\n                    }\n                })\n            )\n        );\n    });\n\n    return Promise.all(replacementsPromises).then(res => {\n        logger.info(\"%s AWS Lambda function(s) replaced.\", functionsList.meta.count);\n        return res;\n    });\n};\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/project",
-	"version": "6.0.0-rc.1",
+	"version": "6.0.0-rc.2",
 	"type": "module",
 	"main": "index.js",
 	"repository": {
@@ -10,16 +10,16 @@
 	"description": "An SDK for managing Webiny projects.",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/aws-sdk": "6.0.0-rc.1",
-		"@webiny/build-tools": "6.0.0-rc.1",
+		"@webiny/aws-sdk": "6.0.0-rc.2",
+		"@webiny/build-tools": "6.0.0-rc.2",
 		"@webiny/di": "0.2.3",
-		"@webiny/global-config": "6.0.0-rc.1",
-		"@webiny/pulumi-sdk": "6.0.0-rc.1",
-		"@webiny/react-properties": "6.0.0-rc.1",
-		"@webiny/system-requirements": "6.0.0-rc.1",
-		"@webiny/telemetry": "6.0.0-rc.1",
-		"@webiny/utils": "6.0.0-rc.1",
-		"@webiny/wcp": "6.0.0-rc.1",
+		"@webiny/global-config": "6.0.0-rc.2",
+		"@webiny/pulumi-sdk": "6.0.0-rc.2",
+		"@webiny/react-properties": "6.0.0-rc.2",
+		"@webiny/system-requirements": "6.0.0-rc.2",
+		"@webiny/telemetry": "6.0.0-rc.2",
+		"@webiny/utils": "6.0.0-rc.2",
+		"@webiny/wcp": "6.0.0-rc.2",
 		"chalk": "4.1.2",
 		"chokidar": "4.0.3",
 		"ci-info": "4.4.0",
@@ -35,7 +35,7 @@
 		"humanize-duration": "3.33.2",
 		"load-json-file": "7.0.1",
 		"lodash": "4.17.23",
-		"minimatch": "10.2.2",
+		"minimatch": "10.2.4",
 		"mqtt": "5.15.0",
 		"neverthrow": "8.2.0",
 		"p-retry": "7.1.1",
@@ -54,7 +54,7 @@
 	"devDependencies": {
 		"@types/debounce": "1.2.4",
 		"@types/humanize-duration": "3.27.4",
-		"@types/lodash": "4.17.23",
+		"@types/lodash": "4.17.24",
 		"@types/react-test-renderer": "18.3.1",
 		"@types/read-json-sync": "2.0.3",
 		"rimraf": "6.1.3",
@@ -75,5 +75,5 @@
 		"access": "public",
 		"directory": "dist"
 	},
-	"gitHead": "36d702721ff9ed39fb21d6f5fe7922a2a8716e63"
+	"gitHead": "5facada4cbb8617cc60e3c98be0f1839f44be38e"
 }

package/services/SetProjectIdService/SetProjectIdService.js

@@ -11,7 +11,7 @@ class DefaultSetProjectIdService {
     const tsMorphProject = new TsMorphProject();
     const sourceFile = tsMorphProject.addSourceFileAtPath(webinyConfigFileTsx);
 
-    // Ensure import { Project } from "webiny/extensions";
+    // Ensure import { Project } from "webiny/extensions".
     const hasProjectImport = sourceFile.getImportDeclarations().some(decl => decl.getModuleSpecifierValue() === "webiny/extensions" && decl.getNamedImports().some(imp => imp.getName() === "Project"));
     if (!hasProjectImport) {
       sourceFile.insertImportDeclaration(0, {
@@ -19,31 +19,41 @@ class DefaultSetProjectIdService {
         moduleSpecifier: "webiny/extensions"
       });
     }
-
-    // Find <Webiny />
     const jsxElements = sourceFile.getDescendantsOfKind(SyntaxKind.JsxSelfClosingElement);
-    const webinyEl = jsxElements.find(el => el.getTagNameNode().getText() === "Webiny");
-    if (!webinyEl) {
-      throw new Error(`Could not find <Webiny /> in ${webinyConfigFileTsx}`);
-    }
 
-    // Check for <Project.Id />
-    const hasProjectId = jsxElements.some(el => el.getTagNameNode().getText() === "Project.Id");
-    if (hasProjectId) {
+    // Check for existing <Project.Id />.
+    const existingProjectIdEl = jsxElements.find(el => el.getTagNameNode().getText() === "Project.Id");
+    if (existingProjectIdEl) {
       if (options.force !== true) {
         throw new Error("Project.Id already exists in the file.");
+      }
+      // Update the id attribute in-place.
+      const idAttr = existingProjectIdEl.getAttributes().find(attr => attr.getFirstChildByKind(SyntaxKind.Identifier)?.getText() === "id");
+      if (idAttr) {
+        idAttr.replaceWithText(`id={"${id}"}`);
       } else {
-        // Remove existing <Project.Id />
-        const projectIdEl = jsxElements.find(el => el.getTagNameNode().getText() === "Project.Id");
-        if (projectIdEl) {
-          projectIdEl.replaceWithText("");
-        }
+        existingProjectIdEl.replaceWithText(`<Project.Id id={"${id}"} />`);
       }
+      await sourceFile.save();
+      return;
     }
 
-    // Insert after <Webiny />
-    const insertPos = webinyEl.getEnd();
-    sourceFile.insertText(insertPos, `\n            <Project.Id id={"${id}"} />`);
+    /* Determine the insertion point — after the last <Project.*> element that is a
+       direct child of the outermost JSX fragment (i.e. not inside a conditional expression).
+       Fall back to inserting after the opening tag of the outermost JSX fragment. */
+    const fragment = sourceFile.getFirstDescendantByKind(SyntaxKind.JsxFragment);
+    const projectEls = jsxElements.filter(el => el.getTagNameNode().getText().startsWith("Project.") && el.getParent()?.getParent() === fragment);
+    if (projectEls.length > 0) {
+      const lastProjectEl = projectEls[projectEls.length - 1];
+      sourceFile.insertText(lastProjectEl.getEnd(), `\n            <Project.Id id={"${id}"} />`);
+    } else {
+      // Fallback: insert as first child of the outermost JSX fragment.
+      if (!fragment) {
+        throw new Error(`Could not find a JSX fragment or <Project.*> element to anchor <Project.Id /> in ${webinyConfigFileTsx}`);
+      }
+      const openingFragment = fragment.getOpeningFragment();
+      sourceFile.insertText(openingFragment.getEnd(), `\n            <Project.Id id={"${id}"} />`);
+    }
     await sourceFile.save();
   }
 }

package/services/SetProjectIdService/SetProjectIdService.js.map

@@ -1 +1 @@
-{"version":3,"names":["createImplementation","GetProjectService","SetProjectIdService","Project","TsMorphProject","SyntaxKind","DefaultSetProjectIdService","constructor","getProjectService","execute","id","options","project","webinyConfigFileTsx","paths","webinyConfigFile","toString","tsMorphProject","sourceFile","addSourceFileAtPath","hasProjectImport","getImportDeclarations","some","decl","getModuleSpecifierValue","getNamedImports","imp","getName","insertImportDeclaration","namedImports","moduleSpecifier","jsxElements","getDescendantsOfKind","JsxSelfClosingElement","webinyEl","find","el","getTagNameNode","getText","Error","hasProjectId","force","projectIdEl","replaceWithText","insertPos","getEnd","insertText","save","setProjectIdService","abstraction","implementation","dependencies"],"sources":["SetProjectIdService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { GetProjectService, SetProjectIdService } from \"~/abstractions/index.js\";\nimport { Project as TsMorphProject, SyntaxKind } from \"ts-morph\";\n\nclass DefaultSetProjectIdService implements SetProjectIdService.Interface {\n    constructor(private getProjectService: GetProjectService.Interface) {}\n\n    async execute(id: string, options: SetProjectIdService.Options = {}) {\n        const project = this.getProjectService.execute();\n        const webinyConfigFileTsx = project.paths.webinyConfigFile.toString();\n\n        const tsMorphProject = new TsMorphProject();\n        const sourceFile = tsMorphProject.addSourceFileAtPath(webinyConfigFileTsx);\n\n        // Ensure import { Project } from \"webiny/extensions\";\n        const hasProjectImport = sourceFile\n            .getImportDeclarations()\n            .some(\n                decl =>\n                    decl.getModuleSpecifierValue() === \"webiny/extensions\" &&\n                    decl.getNamedImports().some(imp => imp.getName() === \"Project\")\n            );\n        if (!hasProjectImport) {\n            sourceFile.insertImportDeclaration(0, {\n                namedImports: [\"Project\"],\n                moduleSpecifier: \"webiny/extensions\"\n            });\n        }\n\n        // Find <Webiny />\n        const jsxElements = sourceFile.getDescendantsOfKind(SyntaxKind.JsxSelfClosingElement);\n        const webinyEl = jsxElements.find(el => el.getTagNameNode().getText() === \"Webiny\");\n        if (!webinyEl) {\n            throw new Error(`Could not find <Webiny /> in ${webinyConfigFileTsx}`);\n        }\n\n        // Check for <Project.Id />\n        const hasProjectId = jsxElements.some(el => el.getTagNameNode().getText() === \"Project.Id\");\n        if (hasProjectId) {\n            if (options.force !== true) {\n                throw new Error(\"Project.Id already exists in the file.\");\n            } else {\n                // Remove existing <Project.Id />\n                const projectIdEl = jsxElements.find(\n                    el => el.getTagNameNode().getText() === \"Project.Id\"\n                );\n                if (projectIdEl) {\n                    projectIdEl.replaceWithText(\"\");\n                }\n            }\n        }\n\n        // Insert after <Webiny />\n        const insertPos = webinyEl.getEnd();\n        sourceFile.insertText(insertPos, `\\n            <Project.Id id={\"${id}\"} />`);\n\n        await sourceFile.save();\n    }\n}\n\nexport const setProjectIdService = createImplementation({\n    abstraction: SetProjectIdService,\n    implementation: DefaultSetProjectIdService,\n    dependencies: [GetProjectService]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SAASC,iBAAiB,EAAEC,mBAAmB;AAC/C,SAASC,OAAO,IAAIC,cAAc,EAAEC,UAAU,QAAQ,UAAU;AAEhE,MAAMC,0BAA0B,CAA0C;EACtEC,WAAWA,CAASC,iBAA8C,EAAE;IAAA,KAAhDA,iBAA8C,GAA9CA,iBAA8C;EAAG;EAErE,MAAMC,OAAOA,CAACC,EAAU,EAAEC,OAAoC,GAAG,CAAC,CAAC,EAAE;IACjE,MAAMC,OAAO,GAAG,IAAI,CAACJ,iBAAiB,CAACC,OAAO,CAAC,CAAC;IAChD,MAAMI,mBAAmB,GAAGD,OAAO,CAACE,KAAK,CAACC,gBAAgB,CAACC,QAAQ,CAAC,CAAC;IAErE,MAAMC,cAAc,GAAG,IAAIb,cAAc,CAAC,CAAC;IAC3C,MAAMc,UAAU,GAAGD,cAAc,CAACE,mBAAmB,CAACN,mBAAmB,CAAC;;IAE1E;IACA,MAAMO,gBAAgB,GAAGF,UAAU,CAC9BG,qBAAqB,CAAC,CAAC,CACvBC,IAAI,CACDC,IAAI,IACAA,IAAI,CAACC,uBAAuB,CAAC,CAAC,KAAK,mBAAmB,IACtDD,IAAI,CAACE,eAAe,CAAC,CAAC,CAACH,IAAI,CAACI,GAAG,IAAIA,GAAG,CAACC,OAAO,CAAC,CAAC,KAAK,SAAS,CACtE,CAAC;IACL,IAAI,CAACP,gBAAgB,EAAE;MACnBF,UAAU,CAACU,uBAAuB,CAAC,CAAC,EAAE;QAClCC,YAAY,EAAE,CAAC,SAAS,CAAC;QACzBC,eAAe,EAAE;MACrB,CAAC,CAAC;IACN;;IAEA;IACA,MAAMC,WAAW,GAAGb,UAAU,CAACc,oBAAoB,CAAC3B,UAAU,CAAC4B,qBAAqB,CAAC;IACrF,MAAMC,QAAQ,GAAGH,WAAW,CAACI,IAAI,CAACC,EAAE,IAAIA,EAAE,CAACC,cAAc,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,KAAK,QAAQ,CAAC;IACnF,IAAI,CAACJ,QAAQ,EAAE;MACX,MAAM,IAAIK,KAAK,CAAC,gCAAgC1B,mBAAmB,EAAE,CAAC;IAC1E;;IAEA;IACA,MAAM2B,YAAY,GAAGT,WAAW,CAACT,IAAI,CAACc,EAAE,IAAIA,EAAE,CAACC,cAAc,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,KAAK,YAAY,CAAC;IAC3F,IAAIE,YAAY,EAAE;MACd,IAAI7B,OAAO,CAAC8B,KAAK,KAAK,IAAI,EAAE;QACxB,MAAM,IAAIF,KAAK,CAAC,wCAAwC,CAAC;MAC7D,CAAC,MAAM;QACH;QACA,MAAMG,WAAW,GAAGX,WAAW,CAACI,IAAI,CAChCC,EAAE,IAAIA,EAAE,CAACC,cAAc,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,KAAK,YAC5C,CAAC;QACD,IAAII,WAAW,EAAE;UACbA,WAAW,CAACC,eAAe,CAAC,EAAE,CAAC;QACnC;MACJ;IACJ;;IAEA;IACA,MAAMC,SAAS,GAAGV,QAAQ,CAACW,MAAM,CAAC,CAAC;IACnC3B,UAAU,CAAC4B,UAAU,CAACF,SAAS,EAAE,kCAAkClC,EAAE,OAAO,CAAC;IAE7E,MAAMQ,UAAU,CAAC6B,IAAI,CAAC,CAAC;EAC3B;AACJ;AAEA,OAAO,MAAMC,mBAAmB,GAAGhD,oBAAoB,CAAC;EACpDiD,WAAW,EAAE/C,mBAAmB;EAChCgD,cAAc,EAAE5C,0BAA0B;EAC1C6C,YAAY,EAAE,CAAClD,iBAAiB;AACpC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["createImplementation","GetProjectService","SetProjectIdService","Project","TsMorphProject","SyntaxKind","DefaultSetProjectIdService","constructor","getProjectService","execute","id","options","project","webinyConfigFileTsx","paths","webinyConfigFile","toString","tsMorphProject","sourceFile","addSourceFileAtPath","hasProjectImport","getImportDeclarations","some","decl","getModuleSpecifierValue","getNamedImports","imp","getName","insertImportDeclaration","namedImports","moduleSpecifier","jsxElements","getDescendantsOfKind","JsxSelfClosingElement","existingProjectIdEl","find","el","getTagNameNode","getText","force","Error","idAttr","getAttributes","attr","getFirstChildByKind","Identifier","replaceWithText","save","fragment","getFirstDescendantByKind","JsxFragment","projectEls","filter","startsWith","getParent","length","lastProjectEl","insertText","getEnd","openingFragment","getOpeningFragment","setProjectIdService","abstraction","implementation","dependencies"],"sources":["SetProjectIdService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { GetProjectService, SetProjectIdService } from \"~/abstractions/index.js\";\nimport { Project as TsMorphProject, SyntaxKind } from \"ts-morph\";\n\nclass DefaultSetProjectIdService implements SetProjectIdService.Interface {\n    constructor(private getProjectService: GetProjectService.Interface) {}\n\n    async execute(id: string, options: SetProjectIdService.Options = {}) {\n        const project = this.getProjectService.execute();\n        const webinyConfigFileTsx = project.paths.webinyConfigFile.toString();\n\n        const tsMorphProject = new TsMorphProject();\n        const sourceFile = tsMorphProject.addSourceFileAtPath(webinyConfigFileTsx);\n\n        // Ensure import { Project } from \"webiny/extensions\".\n        const hasProjectImport = sourceFile\n            .getImportDeclarations()\n            .some(\n                decl =>\n                    decl.getModuleSpecifierValue() === \"webiny/extensions\" &&\n                    decl.getNamedImports().some(imp => imp.getName() === \"Project\")\n            );\n        if (!hasProjectImport) {\n            sourceFile.insertImportDeclaration(0, {\n                namedImports: [\"Project\"],\n                moduleSpecifier: \"webiny/extensions\"\n            });\n        }\n\n        const jsxElements = sourceFile.getDescendantsOfKind(SyntaxKind.JsxSelfClosingElement);\n\n        // Check for existing <Project.Id />.\n        const existingProjectIdEl = jsxElements.find(\n            el => el.getTagNameNode().getText() === \"Project.Id\"\n        );\n        if (existingProjectIdEl) {\n            if (options.force !== true) {\n                throw new Error(\"Project.Id already exists in the file.\");\n            }\n            // Update the id attribute in-place.\n            const idAttr = existingProjectIdEl\n                .getAttributes()\n                .find(attr => attr.getFirstChildByKind(SyntaxKind.Identifier)?.getText() === \"id\");\n            if (idAttr) {\n                idAttr.replaceWithText(`id={\"${id}\"}`);\n            } else {\n                existingProjectIdEl.replaceWithText(`<Project.Id id={\"${id}\"} />`);\n            }\n            await sourceFile.save();\n            return;\n        }\n\n        /* Determine the insertion point — after the last <Project.*> element that is a\n           direct child of the outermost JSX fragment (i.e. not inside a conditional expression).\n           Fall back to inserting after the opening tag of the outermost JSX fragment. */\n        const fragment = sourceFile.getFirstDescendantByKind(SyntaxKind.JsxFragment);\n        const projectEls = jsxElements.filter(\n            el =>\n                el.getTagNameNode().getText().startsWith(\"Project.\") &&\n                el.getParent()?.getParent() === fragment\n        );\n\n        if (projectEls.length > 0) {\n            const lastProjectEl = projectEls[projectEls.length - 1];\n            sourceFile.insertText(\n                lastProjectEl.getEnd(),\n                `\\n            <Project.Id id={\"${id}\"} />`\n            );\n        } else {\n            // Fallback: insert as first child of the outermost JSX fragment.\n            if (!fragment) {\n                throw new Error(\n                    `Could not find a JSX fragment or <Project.*> element to anchor <Project.Id /> in ${webinyConfigFileTsx}`\n                );\n            }\n            const openingFragment = fragment.getOpeningFragment();\n            sourceFile.insertText(\n                openingFragment.getEnd(),\n                `\\n            <Project.Id id={\"${id}\"} />`\n            );\n        }\n\n        await sourceFile.save();\n    }\n}\n\nexport const setProjectIdService = createImplementation({\n    abstraction: SetProjectIdService,\n    implementation: DefaultSetProjectIdService,\n    dependencies: [GetProjectService]\n});\n"],"mappings":"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","ignoreList":[]}

package/services/WatchedLambdaFunctionsService/WatchedLambdaFunctionsService.d.ts

@@ -1,12 +1,12 @@
 import { WatchedLambdaFunctionsService, LocalStorageService } from "../../abstractions/index.js";
-import { type AppName } from "../../abstractions/types.js";
 export declare class DefaultWatchedLambdaFunctionsService implements WatchedLambdaFunctionsService.Interface {
     private localStorageService;
     constructor(localStorageService: LocalStorageService.Interface);
-    markDirty(app: AppName, functionUrns: string[]): void;
-    getDirty(app: AppName): string[];
-    clearDirty(app: AppName): void;
+    markDirty(params: WatchedLambdaFunctionsService.Params, functionUrns: string[]): void;
+    getDirty(params: WatchedLambdaFunctionsService.Params): string[];
+    clearDirty(params: WatchedLambdaFunctionsService.Params): void;
     clearAll(): void;
+    private getCacheKey;
     private getData;
     private setData;
 }

package/services/WatchedLambdaFunctionsService/WatchedLambdaFunctionsService.js

@@ -5,34 +5,40 @@ export class DefaultWatchedLambdaFunctionsService {
   constructor(localStorageService) {
     this.localStorageService = localStorageService;
   }
-  markDirty(app, functionUrns) {
-    const data = this.getData();
-    if (!data[app]) {
-      data[app] = [];
+  markDirty(params, functionUrns) {
+    const key = this.getCacheKey(params);
+    const data = this.getData(key);
+    if (!data[params.name]) {
+      data[params.name] = [];
     }
 
-    // Add new URNs, avoiding duplicates
+    // Add new URNs, avoiding duplicates.
     for (const urn of functionUrns) {
-      if (!data[app].includes(urn)) {
-        data[app].push(urn);
+      if (!data[params.name].includes(urn)) {
+        data[params.name].push(urn);
       }
     }
-    this.setData(data);
+    this.setData(key, data);
   }
-  getDirty(app) {
-    const data = this.getData();
-    return data[app] || [];
+  getDirty(params) {
+    const key = this.getCacheKey(params);
+    const data = this.getData(key);
+    return data[params.name] || [];
   }
-  clearDirty(app) {
-    const data = this.getData();
-    delete data[app];
-    this.setData(data);
+  clearDirty(params) {
+    const key = this.getCacheKey(params);
+    const data = this.getData(key);
+    delete data[params.name];
+    this.setData(key, data);
   }
   clearAll() {
-    this.setData({});
+    this.setData(WATCHED_LAMBDA_FUNCTIONS_KEY, {});
   }
-  getData() {
-    const data = this.localStorageService.get(WATCHED_LAMBDA_FUNCTIONS_KEY);
+  getCacheKey(params) {
+    return params.deploymentId ? `${WATCHED_LAMBDA_FUNCTIONS_KEY}-${params.deploymentId}` : WATCHED_LAMBDA_FUNCTIONS_KEY;
+  }
+  getData(key) {
+    const data = this.localStorageService.get(key);
     if (!data) {
       return {};
     }
@@ -42,8 +48,8 @@ export class DefaultWatchedLambdaFunctionsService {
       return {};
     }
   }
-  setData(data) {
-    this.localStorageService.set(WATCHED_LAMBDA_FUNCTIONS_KEY, data);
+  setData(key, data) {
+    this.localStorageService.set(key, data);
   }
 }
 export const watchedLambdaFunctionsService = createImplementation({

package/services/WatchedLambdaFunctionsService/WatchedLambdaFunctionsService.js.map

@@ -1 +1 @@
-{"version":3,"names":["createImplementation","WatchedLambdaFunctionsService","LocalStorageService","WATCHED_LAMBDA_FUNCTIONS_KEY","DefaultWatchedLambdaFunctionsService","constructor","localStorageService","markDirty","app","functionUrns","data","getData","urn","includes","push","setData","getDirty","clearDirty","clearAll","get","JSON","parse","set","watchedLambdaFunctionsService","abstraction","implementation","dependencies"],"sources":["WatchedLambdaFunctionsService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { WatchedLambdaFunctionsService, LocalStorageService } from \"~/abstractions/index.js\";\nimport { type AppName } from \"~/abstractions/types.js\";\n\nconst WATCHED_LAMBDA_FUNCTIONS_KEY = \"watchedLambdaFunctions\";\n\ninterface WatchedLambdaFunctionsData {\n    [app: string]: string[]; // app name -> array of Lambda URNs\n}\n\nexport class DefaultWatchedLambdaFunctionsService\n    implements WatchedLambdaFunctionsService.Interface\n{\n    constructor(private localStorageService: LocalStorageService.Interface) {}\n\n    markDirty(app: AppName, functionUrns: string[]): void {\n        const data = this.getData();\n\n        if (!data[app]) {\n            data[app] = [];\n        }\n\n        // Add new URNs, avoiding duplicates\n        for (const urn of functionUrns) {\n            if (!data[app].includes(urn)) {\n                data[app].push(urn);\n            }\n        }\n\n        this.setData(data);\n    }\n\n    getDirty(app: AppName): string[] {\n        const data = this.getData();\n        return data[app] || [];\n    }\n\n    clearDirty(app: AppName): void {\n        const data = this.getData();\n        delete data[app];\n        this.setData(data);\n    }\n\n    clearAll(): void {\n        this.setData({});\n    }\n\n    private getData(): WatchedLambdaFunctionsData {\n        const data = this.localStorageService.get(WATCHED_LAMBDA_FUNCTIONS_KEY);\n        if (!data) {\n            return {};\n        }\n\n        try {\n            return typeof data === \"string\" ? JSON.parse(data) : data;\n        } catch {\n            return {};\n        }\n    }\n\n    private setData(data: WatchedLambdaFunctionsData): void {\n        this.localStorageService.set(WATCHED_LAMBDA_FUNCTIONS_KEY, data);\n    }\n}\n\nexport const watchedLambdaFunctionsService = createImplementation({\n    abstraction: WatchedLambdaFunctionsService,\n    implementation: DefaultWatchedLambdaFunctionsService,\n    dependencies: [LocalStorageService]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SAASC,6BAA6B,EAAEC,mBAAmB;AAG3D,MAAMC,4BAA4B,GAAG,wBAAwB;AAM7D,OAAO,MAAMC,oCAAoC,CAEjD;EACIC,WAAWA,CAASC,mBAAkD,EAAE;IAAA,KAApDA,mBAAkD,GAAlDA,mBAAkD;EAAG;EAEzEC,SAASA,CAACC,GAAY,EAAEC,YAAsB,EAAQ;IAClD,MAAMC,IAAI,GAAG,IAAI,CAACC,OAAO,CAAC,CAAC;IAE3B,IAAI,CAACD,IAAI,CAACF,GAAG,CAAC,EAAE;MACZE,IAAI,CAACF,GAAG,CAAC,GAAG,EAAE;IAClB;;IAEA;IACA,KAAK,MAAMI,GAAG,IAAIH,YAAY,EAAE;MAC5B,IAAI,CAACC,IAAI,CAACF,GAAG,CAAC,CAACK,QAAQ,CAACD,GAAG,CAAC,EAAE;QAC1BF,IAAI,CAACF,GAAG,CAAC,CAACM,IAAI,CAACF,GAAG,CAAC;MACvB;IACJ;IAEA,IAAI,CAACG,OAAO,CAACL,IAAI,CAAC;EACtB;EAEAM,QAAQA,CAACR,GAAY,EAAY;IAC7B,MAAME,IAAI,GAAG,IAAI,CAACC,OAAO,CAAC,CAAC;IAC3B,OAAOD,IAAI,CAACF,GAAG,CAAC,IAAI,EAAE;EAC1B;EAEAS,UAAUA,CAACT,GAAY,EAAQ;IAC3B,MAAME,IAAI,GAAG,IAAI,CAACC,OAAO,CAAC,CAAC;IAC3B,OAAOD,IAAI,CAACF,GAAG,CAAC;IAChB,IAAI,CAACO,OAAO,CAACL,IAAI,CAAC;EACtB;EAEAQ,QAAQA,CAAA,EAAS;IACb,IAAI,CAACH,OAAO,CAAC,CAAC,CAAC,CAAC;EACpB;EAEQJ,OAAOA,CAAA,EAA+B;IAC1C,MAAMD,IAAI,GAAG,IAAI,CAACJ,mBAAmB,CAACa,GAAG,CAAChB,4BAA4B,CAAC;IACvE,IAAI,CAACO,IAAI,EAAE;MACP,OAAO,CAAC,CAAC;IACb;IAEA,IAAI;MACA,OAAO,OAAOA,IAAI,KAAK,QAAQ,GAAGU,IAAI,CAACC,KAAK,CAACX,IAAI,CAAC,GAAGA,IAAI;IAC7D,CAAC,CAAC,MAAM;MACJ,OAAO,CAAC,CAAC;IACb;EACJ;EAEQK,OAAOA,CAACL,IAAgC,EAAQ;IACpD,IAAI,CAACJ,mBAAmB,CAACgB,GAAG,CAACnB,4BAA4B,EAAEO,IAAI,CAAC;EACpE;AACJ;AAEA,OAAO,MAAMa,6BAA6B,GAAGvB,oBAAoB,CAAC;EAC9DwB,WAAW,EAAEvB,6BAA6B;EAC1CwB,cAAc,EAAErB,oCAAoC;EACpDsB,YAAY,EAAE,CAACxB,mBAAmB;AACtC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["createImplementation","WatchedLambdaFunctionsService","LocalStorageService","WATCHED_LAMBDA_FUNCTIONS_KEY","DefaultWatchedLambdaFunctionsService","constructor","localStorageService","markDirty","params","functionUrns","key","getCacheKey","data","getData","name","urn","includes","push","setData","getDirty","clearDirty","clearAll","deploymentId","get","JSON","parse","set","watchedLambdaFunctionsService","abstraction","implementation","dependencies"],"sources":["WatchedLambdaFunctionsService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { WatchedLambdaFunctionsService, LocalStorageService } from \"~/abstractions/index.js\";\n\nconst WATCHED_LAMBDA_FUNCTIONS_KEY = \"watchedLambdaFunctions\";\n\ninterface WatchedLambdaFunctionsData {\n    [app: string]: string[]; // app name -> array of Lambda URNs\n}\n\nexport class DefaultWatchedLambdaFunctionsService\n    implements WatchedLambdaFunctionsService.Interface\n{\n    constructor(private localStorageService: LocalStorageService.Interface) {}\n\n    markDirty(params: WatchedLambdaFunctionsService.Params, functionUrns: string[]): void {\n        const key = this.getCacheKey(params);\n        const data = this.getData(key);\n\n        if (!data[params.name]) {\n            data[params.name] = [];\n        }\n\n        // Add new URNs, avoiding duplicates.\n        for (const urn of functionUrns) {\n            if (!data[params.name].includes(urn)) {\n                data[params.name].push(urn);\n            }\n        }\n\n        this.setData(key, data);\n    }\n\n    getDirty(params: WatchedLambdaFunctionsService.Params): string[] {\n        const key = this.getCacheKey(params);\n        const data = this.getData(key);\n        return data[params.name] || [];\n    }\n\n    clearDirty(params: WatchedLambdaFunctionsService.Params): void {\n        const key = this.getCacheKey(params);\n        const data = this.getData(key);\n        delete data[params.name];\n        this.setData(key, data);\n    }\n\n    clearAll(): void {\n        this.setData(WATCHED_LAMBDA_FUNCTIONS_KEY, {});\n    }\n\n    private getCacheKey(params: WatchedLambdaFunctionsService.Params): string {\n        return params.deploymentId\n            ? `${WATCHED_LAMBDA_FUNCTIONS_KEY}-${params.deploymentId}`\n            : WATCHED_LAMBDA_FUNCTIONS_KEY;\n    }\n\n    private getData(key: string): WatchedLambdaFunctionsData {\n        const data = this.localStorageService.get(key);\n        if (!data) {\n            return {};\n        }\n\n        try {\n            return typeof data === \"string\" ? JSON.parse(data) : data;\n        } catch {\n            return {};\n        }\n    }\n\n    private setData(key: string, data: WatchedLambdaFunctionsData): void {\n        this.localStorageService.set(key, data);\n    }\n}\n\nexport const watchedLambdaFunctionsService = createImplementation({\n    abstraction: WatchedLambdaFunctionsService,\n    implementation: DefaultWatchedLambdaFunctionsService,\n    dependencies: [LocalStorageService]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SAASC,6BAA6B,EAAEC,mBAAmB;AAE3D,MAAMC,4BAA4B,GAAG,wBAAwB;AAM7D,OAAO,MAAMC,oCAAoC,CAEjD;EACIC,WAAWA,CAASC,mBAAkD,EAAE;IAAA,KAApDA,mBAAkD,GAAlDA,mBAAkD;EAAG;EAEzEC,SAASA,CAACC,MAA4C,EAAEC,YAAsB,EAAQ;IAClF,MAAMC,GAAG,GAAG,IAAI,CAACC,WAAW,CAACH,MAAM,CAAC;IACpC,MAAMI,IAAI,GAAG,IAAI,CAACC,OAAO,CAACH,GAAG,CAAC;IAE9B,IAAI,CAACE,IAAI,CAACJ,MAAM,CAACM,IAAI,CAAC,EAAE;MACpBF,IAAI,CAACJ,MAAM,CAACM,IAAI,CAAC,GAAG,EAAE;IAC1B;;IAEA;IACA,KAAK,MAAMC,GAAG,IAAIN,YAAY,EAAE;MAC5B,IAAI,CAACG,IAAI,CAACJ,MAAM,CAACM,IAAI,CAAC,CAACE,QAAQ,CAACD,GAAG,CAAC,EAAE;QAClCH,IAAI,CAACJ,MAAM,CAACM,IAAI,CAAC,CAACG,IAAI,CAACF,GAAG,CAAC;MAC/B;IACJ;IAEA,IAAI,CAACG,OAAO,CAACR,GAAG,EAAEE,IAAI,CAAC;EAC3B;EAEAO,QAAQA,CAACX,MAA4C,EAAY;IAC7D,MAAME,GAAG,GAAG,IAAI,CAACC,WAAW,CAACH,MAAM,CAAC;IACpC,MAAMI,IAAI,GAAG,IAAI,CAACC,OAAO,CAACH,GAAG,CAAC;IAC9B,OAAOE,IAAI,CAACJ,MAAM,CAACM,IAAI,CAAC,IAAI,EAAE;EAClC;EAEAM,UAAUA,CAACZ,MAA4C,EAAQ;IAC3D,MAAME,GAAG,GAAG,IAAI,CAACC,WAAW,CAACH,MAAM,CAAC;IACpC,MAAMI,IAAI,GAAG,IAAI,CAACC,OAAO,CAACH,GAAG,CAAC;IAC9B,OAAOE,IAAI,CAACJ,MAAM,CAACM,IAAI,CAAC;IACxB,IAAI,CAACI,OAAO,CAACR,GAAG,EAAEE,IAAI,CAAC;EAC3B;EAEAS,QAAQA,CAAA,EAAS;IACb,IAAI,CAACH,OAAO,CAACf,4BAA4B,EAAE,CAAC,CAAC,CAAC;EAClD;EAEQQ,WAAWA,CAACH,MAA4C,EAAU;IACtE,OAAOA,MAAM,CAACc,YAAY,GACpB,GAAGnB,4BAA4B,IAAIK,MAAM,CAACc,YAAY,EAAE,GACxDnB,4BAA4B;EACtC;EAEQU,OAAOA,CAACH,GAAW,EAA8B;IACrD,MAAME,IAAI,GAAG,IAAI,CAACN,mBAAmB,CAACiB,GAAG,CAACb,GAAG,CAAC;IAC9C,IAAI,CAACE,IAAI,EAAE;MACP,OAAO,CAAC,CAAC;IACb;IAEA,IAAI;MACA,OAAO,OAAOA,IAAI,KAAK,QAAQ,GAAGY,IAAI,CAACC,KAAK,CAACb,IAAI,CAAC,GAAGA,IAAI;IAC7D,CAAC,CAAC,MAAM;MACJ,OAAO,CAAC,CAAC;IACb;EACJ;EAEQM,OAAOA,CAACR,GAAW,EAAEE,IAAgC,EAAQ;IACjE,IAAI,CAACN,mBAAmB,CAACoB,GAAG,CAAChB,GAAG,EAAEE,IAAI,CAAC;EAC3C;AACJ;AAEA,OAAO,MAAMe,6BAA6B,GAAG3B,oBAAoB,CAAC;EAC9D4B,WAAW,EAAE3B,6BAA6B;EAC1C4B,cAAc,EAAEzB,oCAAoC;EACpD0B,YAAY,EAAE,CAAC5B,mBAAmB;AACtC,CAAC,CAAC","ignoreList":[]}

package/defineExtension/defineApiExtension.d.ts

@@ -1,17 +0,0 @@
-import { z } from "zod";
-import { Abstraction } from "@webiny/di";
-export type DefineApiExtensionParams = {
-    type: string;
-    description?: string;
-    abstraction?: Abstraction<any>;
-};
-export declare const defineApiExtension: (params: DefineApiExtensionParams) => import("~/defineExtension/index.js").ExtensionComponent<z.ZodObject<{
-    src: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
-    exportName: z.ZodOptional<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    src: string;
-    exportName?: string | undefined;
-}, {
-    src: string;
-    exportName?: string | undefined;
-}>>;

package/defineExtension/defineApiExtension.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["z","Node","Project","defineExtension","zodSrcPath","ExtensionSrcResolver","path","crypto","defineApiExtension","params","type","tags","runtimeContext","appName","description","multiple","paramsSchema","project","object","src","abstraction","exportName","string","optional","build","ctx","extensionsTsFilePath","paths","workspaceFolder","join","toString","extensionFilePath","absoluteExtensionFilePath","resolvePath","extensionFileName","basename","parse","name","hash","createHash","update","digest","exportNameAlias","slice","importPath","relative","dirname","replace","addSourceFileAtPath","source","getSourceFileOrThrow","existingImportDeclaration","getImportDeclaration","index","importDeclarations","getImportDeclarations","length","last","getChildIndex","extensionProject","extensionSource","hasDefaultExport","getDefaultExportSymbol","undefined","insertImportDeclaration","defaultImport","moduleSpecifier","namedImports","alias","pluginsArray","getFirstDescendant","node","isArrayLiteralExpression","addElement","contextPluginImportPath","existingContextPluginImport","save"],"sources":["defineApiExtension.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { Node, Project, ArrayLiteralExpression } from \"ts-morph\";\nimport { Abstraction } from \"@webiny/di\";\nimport { defineExtension } from \"~/defineExtension/index.js\";\nimport { zodSrcPath } from \"~/defineExtension/zodTypes/zodSrcPath.js\";\nimport { ExtensionSrcResolver } from \"~/utils/index.js\";\nimport path from \"path\";\nimport crypto from \"crypto\";\n\nexport type DefineApiExtensionParams = {\n    type: string;\n    description?: string;\n    abstraction?: Abstraction<any>;\n};\n\nexport const defineApiExtension = (params: DefineApiExtensionParams) =>\n    defineExtension({\n        type: params.type,\n        tags: { runtimeContext: \"app-build\", appName: \"api\" },\n        description: params.description,\n        multiple: true,\n        paramsSchema: ({ project }) => {\n            return z.object({\n                src: zodSrcPath({ project, abstraction: params.abstraction }),\n                exportName: z.string().optional()\n            });\n        },\n        async build(params, ctx) {\n            const extensionsTsFilePath = ctx.project.paths.workspaceFolder\n                .join(\"apps\", \"api\", \"graphql\", \"src\", \"extensions.ts\")\n                .toString();\n\n            const { src: extensionFilePath } = params;\n\n            // Resolve to absolute path for file operations\n            const absoluteExtensionFilePath = ExtensionSrcResolver.resolvePath(\n                extensionFilePath,\n                ctx.project\n            );\n\n            const extensionFileName = path.basename(absoluteExtensionFilePath);\n\n            // 1. Export name is always the file name without extension.\n            const exportName = params.exportName ?? path.parse(extensionFileName).name;\n\n            // 2. Alias name is \"ApiExtension_\" + hash of the file path. This way we\n            //    avoid potential naming conflicts and keep the identifier constant.\n            const hash = crypto.createHash(\"sha256\").update(extensionFilePath).digest(\"hex\");\n            const exportNameAlias = `ApiExtension_${hash.slice(-10)}`;\n\n            // 3. Calculate import path relative to `extensions.ts` file.\n            const importPath = path\n                .relative(path.dirname(extensionsTsFilePath), absoluteExtensionFilePath)\n                .replace(/\\.tsx?$/, \".js\");\n\n            const project = new Project();\n            project.addSourceFileAtPath(extensionsTsFilePath);\n\n            const source = project.getSourceFileOrThrow(extensionsTsFilePath);\n\n            const existingImportDeclaration = source.getImportDeclaration(importPath);\n            if (existingImportDeclaration) {\n                return;\n            }\n\n            let index = 1;\n\n            const importDeclarations = source.getImportDeclarations();\n            if (importDeclarations.length) {\n                const last = importDeclarations[importDeclarations.length - 1];\n                index = last.getChildIndex() + 1;\n            }\n\n            // Check if the file has a default export using AST parsing.\n            const extensionProject = new Project();\n            extensionProject.addSourceFileAtPath(absoluteExtensionFilePath);\n            const extensionSource =\n                extensionProject.getSourceFileOrThrow(absoluteExtensionFilePath);\n            const hasDefaultExport = extensionSource.getDefaultExportSymbol() !== undefined;\n\n            // Support both default and named exports.\n            if (hasDefaultExport) {\n                source.insertImportDeclaration(index, {\n                    defaultImport: exportNameAlias,\n                    moduleSpecifier: importPath\n                });\n            } else {\n                source.insertImportDeclaration(index, {\n                    namedImports: [{ name: exportName, alias: exportNameAlias }],\n                    moduleSpecifier: importPath\n                });\n            }\n\n            const pluginsArray = source.getFirstDescendant(node =>\n                Node.isArrayLiteralExpression(node)\n            ) as ArrayLiteralExpression;\n\n            pluginsArray.addElement(\n                `\\ncreateContextPlugin(ctx => {\\n\\tregisterExtension(ctx.container, ${exportNameAlias});\\n})`\n            );\n\n            {\n                let index = 1;\n\n                const importDeclarations = source.getImportDeclarations();\n                if (importDeclarations.length) {\n                    const last = importDeclarations[importDeclarations.length - 1];\n                    index = last.getChildIndex() + 1;\n                }\n\n                const contextPluginImportPath = \"@webiny/api/plugins/ContextPlugin\";\n                const existingContextPluginImport =\n                    source.getImportDeclaration(contextPluginImportPath);\n                if (!existingContextPluginImport) {\n                    source.insertImportDeclaration(index, {\n                        namedImports: [\"createContextPlugin\"],\n                        moduleSpecifier: contextPluginImportPath\n                    });\n                }\n            }\n\n            await source.save();\n        }\n    });\n"],"mappings":"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","ignoreList":[]}