@apimatic/cli 1.1.0-beta.10 → 1.1.0-beta.13

package/README.md

@@ -24,7 +24,7 @@ $ npm install -g @apimatic/cli
 $ apimatic COMMAND
 running command...
 $ apimatic (--version)
-@apimatic/cli/1.1.0-beta.8 win32-x64 node-v23.4.0
+@apimatic/cli/1.1.0-beta.11 win32-x64 node-v23.4.0
 $ apimatic --help [COMMAND]
 USAGE
   $ apimatic COMMAND
@@ -46,8 +46,11 @@ USAGE
 * [`apimatic portal recipe new`](#apimatic-portal-recipe-new)
 * [`apimatic portal serve`](#apimatic-portal-serve)
 * [`apimatic portal toc new`](#apimatic-portal-toc-new)
+* [`apimatic publishing profile list`](#apimatic-publishing-profile-list)
 * [`apimatic quickstart`](#apimatic-quickstart)
 * [`apimatic sdk generate`](#apimatic-sdk-generate)
+* [`apimatic sdk publish`](#apimatic-sdk-publish)
+* [`apimatic sdk save-changes`](#apimatic-sdk-save-changes)
 
 ## `apimatic api transform`
 
@@ -386,6 +389,25 @@ EXAMPLES
 
 _See code: [src/commands/portal/toc/new.ts](https://github.com/apimatic/apimatic-cli/blob/beta/src/commands/portal/toc/new.ts)_
 
+## `apimatic publishing profile list`
+
+List all publishing profiles
+
+```
+USAGE
+  $ apimatic publishing profile list
+
+DESCRIPTION
+  List all publishing profiles
+
+  Display all publishing profiles associated with your account, including each profile's name, ID and enabled languages.
+
+EXAMPLES
+  apimatic publishing profile list
+```
+
+_See code: [src/commands/publishing/profile/list.ts](https://github.com/apimatic/apimatic-cli/blob/beta/src/commands/publishing/profile/list.ts)_
+
 ## `apimatic quickstart`
 
 Create your first SDK or API Portal using APIMatic.
@@ -411,18 +433,21 @@ Generate an SDK for your API
 
 ```
 USAGE
-  $ apimatic sdk generate -l csharp|java|php|python|ruby|typescript|go [-i <value>] [-d <value>] [--api-version
-    <value>] [-f] [--zip] [-k <value>]
+  $ apimatic sdk generate -l csharp|java|php|python|ruby|typescript|go [-d <value>] [--skip-changes]
+    [--api-version <value>] [--zip] [--track-changes] [-i <value>] [-f] [-k <value>]
 
 FLAGS
-  -d, --destination=<value>  directory where the SDK will be generated
+  -d, --destination=<value>  [default: <input>/sdk/<language> | <input>/sdk/<api-version>/<language>] path where the SDK
+                             will be generated
   -f, --force                overwrite changes without asking for user consent.
   -i, --input=<value>        [default: ./] path to the parent directory containing the 'src' directory, which includes
                              API specifications and configuration files.
   -k, --auth-key=<value>     override current authentication state with an authentication key.
-  -l, --language=<option>    (required) programming language for SDK generation
+  -l, --language=<option>    (required) Programming language for SDK generation
                              <options: csharp|java|php|python|ruby|typescript|go>
       --api-version=<value>  Version of the API to use for SDK generation (if multiple versions exist)
+      --skip-changes         Do not apply the saved changes to the generated SDK
+      --track-changes        Enable change tracking for SDK generation (only required for initial setup)
       --zip                  Download the generated SDK as a .zip archive
 
 DESCRIPTION
@@ -440,4 +465,78 @@ EXAMPLES
 ```
 
 _See code: [src/commands/sdk/generate.ts](https://github.com/apimatic/apimatic-cli/blob/beta/src/commands/sdk/generate.ts)_
-<!-- commandsstop -->
+
+## `apimatic sdk publish`
+
+Generate and publish an SDK to a package registry and/or source repository
+
+```
+USAGE
+  $ apimatic sdk publish [-p <value>] [-v <value>] [-d <value>] [-l csharp|java|php|python|ruby|typescript] [-f]
+    [-i <value>] [--publish-type package|sourcecode...] [--dry-run]
+
+FLAGS
+  -d, --destination=<value>       [default: <input>/sdk] path where the sdk will be generated.
+  -f, --force                     overwrite changes without asking for user consent.
+  -i, --input=<value>             [default: ./] path to the parent directory containing the 'src' directory, which
+                                  includes API specifications and configuration files.
+  -l, --language=<option>         Language of the SDK to generate and publish.
+                                  <options: csharp|java|php|python|ruby|typescript>
+  -p, --profile-id=<value>        Id of the publishing profile to use.
+  -v, --version=<value>           Semantic version of the SDK to publish (e.g. 1.0.0).
+      --dry-run                   Generate the SDK locally for review without publishing.
+      --publish-type=<option>...  One or more publishing targets: 'package' for a package registry, 'sourcecode' for a
+                                  git repository.
+                                  <options: package|sourcecode>
+
+DESCRIPTION
+  Generate and publish an SDK to a package registry and/or source repository
+
+  Generate and publish an SDK using a publishing profile configured in the APIMatic App. Requires an input directory
+  containing the API specification. Run without flags for a step-by-step interactive experience, or pass all required
+  flags for CI/CD automation.
+
+EXAMPLES
+  apimatic sdk publish
+
+  apimatic sdk publish --profile-id=a1b2c3d4e5f6a1b2c3d4e5f6 --language=typescript --version=1.0.0 --publish-type=package --publish-type=sourcecode
+
+  apimatic sdk publish --profile-id=b2c3d4e5f6a1b2c3d4e5f6a1 --language=java --version=2.0.0 --publish-type=sourcecode
+
+  apimatic sdk publish --profile-id=c3d4e5f6a1b2c3d4e5f6a1b2 --language=python --version=1.0.0 --publish-type=package --dry-run
+```
+
+_See code: [src/commands/sdk/publish.ts](https://github.com/apimatic/apimatic-cli/blob/beta/src/commands/sdk/publish.ts)_
+
+## `apimatic sdk save-changes`
+
+Save customizations made to an auto-generated SDK
+
+```
+USAGE
+  $ apimatic sdk save-changes -l csharp|java|php|python|ruby|typescript|go [--sdk <value>] [--api-version <value>] [-i
+    <value>]
+
+FLAGS
+  -i, --input=<value>        [default: ./] path to the parent directory containing the 'src' directory, which includes
+                             API specifications and configuration files.
+  -l, --language=<option>    (required) Programming language of the SDK
+                             <options: csharp|java|php|python|ruby|typescript|go>
+      --api-version=<value>  Version of the API where changes should be saved (if multiple versions exist).
+      --sdk=<value>          [default: ./sdk/<language> | ./sdk/<api-version>/<language>] path to the folder containing
+                             the updated SDK.
+
+DESCRIPTION
+  Save customizations made to an auto-generated SDK
+
+  Requires an input directory with API specifications, a path to the updated SDK directory, and the programming
+  language.
+
+EXAMPLES
+  apimatic sdk save-changes --language=csharp
+
+  apimatic sdk save-changes --language=java --sdk=./sdk
+```
+
+_See code: [src/commands/sdk/save-changes.ts](https://github.com/apimatic/apimatic-cli/blob/beta/src/commands/sdk/save-changes.ts)_
+<!-- commandsstop -->

package/lib/actions/portal/generate.js

@@ -34,7 +34,13 @@ export class GenerateAction {
                 if (response.isErr()) {
                     const error = response.error;
                     if (error instanceof ServiceError) {
-                        this.prompts.portalGenerationServiceError(error);
+                        const sdkMergeFailedErrors = error.getError("sdkMergeFailed");
+                        if (sdkMergeFailedErrors) {
+                            this.prompts.portalGenerationSdkMergeFailed(sdkMergeFailedErrors);
+                        }
+                        else {
+                            this.prompts.portalGenerationError(error.errorMessage);
+                        }
                     }
                     else if (typeof error === "string") {
                         this.prompts.portalGenerationError(error);

package/lib/actions/portal/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/portal/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/portal/generate.ts"],"names":[],"mappings":"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"}

package/lib/actions/publishing/profile/list.d.ts

@@ -0,0 +1,11 @@
+import { DirectoryPath } from '../../../types/file/directoryPath.js';
+import { CommandMetadata } from '../../../types/common/command-metadata.js';
+import { ActionResult } from '../../action-result.js';
+export declare class PublishingProfileListAction {
+    private readonly configDir;
+    private readonly commandMetadata;
+    private readonly prompts;
+    private readonly publishingApiService;
+    constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata);
+    execute(): Promise<ActionResult>;
+}

package/lib/actions/publishing/profile/list.js

@@ -0,0 +1,29 @@
+import { PublishingApiService } from '../../../infrastructure/services/publishing-api-service.js';
+import { PublishingProfileListPrompts } from '../../../prompts/publishing/profile/list.js';
+import { ActionResult } from '../../action-result.js';
+import { PublishingProfiles } from '../../../types/publish/publishing-profiles.js';
+export class PublishingProfileListAction {
+    constructor(configDir, commandMetadata) {
+        this.configDir = configDir;
+        this.commandMetadata = commandMetadata;
+        this.prompts = new PublishingProfileListPrompts();
+        this.publishingApiService = new PublishingApiService();
+    }
+    async execute() {
+        const profilesResult = await this.prompts.fetchProfiles(this.publishingApiService.getPublishingProfiles(this.configDir, this.commandMetadata.shell));
+        if (profilesResult.isErr()) {
+            this.prompts.fetchError(profilesResult.error);
+            return ActionResult.failed();
+        }
+        const publishingProfilesResult = PublishingProfiles.create(profilesResult.value);
+        if (publishingProfilesResult.isErr()) {
+            this.prompts.noProfilesFound();
+            return ActionResult.success();
+        }
+        const publishingProfiles = publishingProfilesResult.value;
+        const publishingProfileSummariesByApiGroups = publishingProfiles.toPublishingProfileSummariesByApiGroups();
+        this.prompts.displayProfiles(publishingProfileSummariesByApiGroups);
+        return ActionResult.success();
+    }
+}
+//# sourceMappingURL=list.js.map

package/lib/actions/publishing/profile/list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/actions/publishing/profile/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAC;AAGlG,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AAEnF,MAAM,OAAO,2BAA2B;IAItC,YAA6B,SAAwB,EAAmB,eAAgC;QAA3E,cAAS,GAAT,SAAS,CAAe;QAAmB,oBAAe,GAAf,eAAe,CAAiB;QAHvF,YAAO,GAAG,IAAI,4BAA4B,EAAE,CAAC;QAC7C,yBAAoB,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAEwC,CAAC;IAErG,KAAK,CAAC,OAAO;QAClB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CACrD,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAC5F,CAAC;QAEF,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC;YAC3B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC9C,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;QAC/B,CAAC;QAED,MAAM,wBAAwB,GAAG,kBAAkB,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACjF,IAAI,wBAAwB,CAAC,KAAK,EAAE,EAAE,CAAC;YACrC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC/B,OAAO,YAAY,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,KAAK,CAAC;QAC1D,MAAM,qCAAqC,GAAG,kBAAkB,CAAC,uCAAuC,EAAE,CAAC;QAC3G,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,qCAAqC,CAAC,CAAC;QACpE,OAAO,YAAY,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;CACF"}

package/lib/actions/sdk/generate.d.ts

@@ -2,6 +2,7 @@ import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { ActionResult } from "../action-result.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
 import { Language } from "../../types/sdk/generate.js";
+import { SemVersion } from "../../types/publish/version.js";
 export declare class GenerateAction {
     private readonly prompts;
     private readonly portalService;
@@ -9,5 +10,8 @@ export declare class GenerateAction {
     private readonly commandMetadata;
     private readonly authKey;
     constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata, authKey?: string | null);
-    readonly execute: (buildDirectory: DirectoryPath, sdkDirectory: DirectoryPath, language: Language, force: boolean, zipSdk: boolean, apiVersion?: string) => Promise<ActionResult>;
+    readonly execute: (buildDirectory: DirectoryPath, destinationSdkDirectory: DirectoryPath, language: Language, force: boolean, zipSdk: boolean, skipChanges: boolean, trackChanges: boolean, apiVersion?: string, packageVersion?: SemVersion, packageSettingsDirectory?: DirectoryPath) => Promise<ActionResult<{
+        sourceTreeTrackingInitiated: boolean;
+        conflictsResolved: boolean;
+    }>>;
 }

package/lib/actions/sdk/generate.js

@@ -2,71 +2,86 @@ import { PortalService } from "../../infrastructure/services/portal-service.js";
 import { ActionResult } from "../action-result.js";
 import { withDirPath } from "../../infrastructure/tmp-extensions.js";
 import { SdkContext } from "../../types/sdk-context.js";
-import { VersionedBuildContext } from "../../types/versioned-build-context.js";
 import { SdkGeneratePrompts } from "../../prompts/sdk/generate.js";
 import { TempContext } from "../../types/temp-context.js";
-import { SpecContext } from "../../types/spec-context.js";
+import { MergeSourceTreeAction } from "./merge-source-tree.js";
+import { BuildContext } from "../../types/build-context.js";
 export class GenerateAction {
     constructor(configDir, commandMetadata, authKey = null) {
         this.prompts = new SdkGeneratePrompts();
         this.portalService = new PortalService();
-        this.execute = async (buildDirectory, sdkDirectory, language, force, zipSdk, apiVersion) => {
-            if (buildDirectory.isEqual(sdkDirectory)) {
+        this.execute = async (buildDirectory, destinationSdkDirectory, language, force, zipSdk, skipChanges, trackChanges, apiVersion, packageVersion, packageSettingsDirectory) => {
+            if (buildDirectory.isEqual(destinationSdkDirectory)) {
                 this.prompts.sameBuildAndSdkDir(buildDirectory);
                 return ActionResult.failed();
             }
-            const versionedBuildContext = new VersionedBuildContext(buildDirectory);
-            const versionedBuildResult = await versionedBuildContext.validate();
-            if (versionedBuildResult.isValid) {
-                if (versionedBuildResult.versions.length === 0) {
-                    this.prompts.versionedBuildEmpty(versionedBuildResult.versionsDirectory);
-                    return ActionResult.failed();
+            const rootBuildContext = new BuildContext(buildDirectory);
+            if (!(await rootBuildContext.exists())) {
+                this.prompts.srcDirectoryEmpty(buildDirectory);
+                return ActionResult.failed();
+            }
+            const versionedContextGetter = async () => {
+                if (!await rootBuildContext.isVersionedBuild()) {
+                    if (apiVersion)
+                        this.prompts.apiVersionOnlyApplicableWithVersionedBuild();
+                    return { version: undefined, buildContext: rootBuildContext };
                 }
-                let version;
-                if (apiVersion) {
-                    if (!versionedBuildResult.versions.includes(apiVersion)) {
-                        this.prompts.versionNotFound();
-                        return ActionResult.failed();
-                    }
-                    version = apiVersion;
+                const versionedBuildDirectory = await rootBuildContext.getVersionedBuildDirectory();
+                if (!versionedBuildDirectory) {
+                    this.prompts.invalidVersionedDocsDirectory(buildDirectory);
+                    return ActionResult.failed();
                 }
-                else if (versionedBuildResult.versions.length === 1) {
-                    version = versionedBuildResult.versions[0];
+                const singleVersionedBuildDirectory = await rootBuildContext.getSingleVersionedBuildDirectory();
+                if (!apiVersion && singleVersionedBuildDirectory) {
+                    return {
+                        version: singleVersionedBuildDirectory.leafName(),
+                        buildContext: new BuildContext(singleVersionedBuildDirectory)
+                    };
                 }
-                else {
-                    const selectedVersion = await this.prompts.selectVersion(versionedBuildResult.versions);
-                    if (!selectedVersion) {
-                        return ActionResult.cancelled();
-                    }
-                    version = selectedVersion;
+                const selectedVersionedBuildDirectory = await rootBuildContext.getSelectedVersionedBuildDirectory(apiVersion ? async () => apiVersion : this.prompts.selectVersion);
+                if (!selectedVersionedBuildDirectory) {
+                    this.prompts.versionNotFound();
+                    return ActionResult.failed();
                 }
-                buildDirectory = versionedBuildResult.versionsDirectory.join(version);
-                sdkDirectory = sdkDirectory.join(version);
+                return {
+                    version: selectedVersionedBuildDirectory.leafName(),
+                    buildContext: new BuildContext(selectedVersionedBuildDirectory)
+                };
+            };
+            const versionedContext = await versionedContextGetter();
+            if (versionedContext instanceof ActionResult) {
+                return versionedContext;
             }
-            const specDirectory = buildDirectory.join("spec");
-            const specContext = new SpecContext(specDirectory);
-            if (!(await specContext.validate())) {
-                this.prompts.specDirectoryEmpty(specDirectory);
+            const { version, buildContext } = versionedContext;
+            if (!(await buildContext.getSpecContext().validate())) {
+                this.prompts.specDirectoryEmpty(buildDirectory);
                 return ActionResult.failed();
             }
-            const sdkContext = new SdkContext(sdkDirectory, language);
-            if (!force && (await sdkContext.exists()) && !(await this.prompts.overwriteSdk(sdkContext.sdkLanguageDirectory))) {
+            const hasSdkSourceTree = await buildContext.hasSdkSourceTree(language);
+            const sdkContext = new SdkContext(language, destinationSdkDirectory, skipChanges && hasSdkSourceTree, version);
+            if (!force && await sdkContext.exists() && !(await this.prompts.overwriteSdk(destinationSdkDirectory))) {
                 this.prompts.destinationDirNotEmpty();
                 return ActionResult.cancelled();
             }
             return await withDirPath(async (tempDirectory) => {
                 const tempContext = new TempContext(tempDirectory);
-                const buildZipPath = await tempContext.zip(buildDirectory);
-                const response = await this.prompts.generateSDK(this.portalService.generateSdk(buildZipPath, language, this.configDir, this.commandMetadata, this.authKey));
-                // TODO: this should be service error
+                const buildZipPath = await buildContext.getBuildZipPath(tempDirectory, packageSettingsDirectory);
+                const response = await this.prompts.generateSDK(this.portalService.generateSdk(buildZipPath, language, this.configDir, this.commandMetadata, this.authKey, packageVersion));
                 if (response.isErr()) {
                     this.prompts.sdkGenerationServiceError(response.error);
                     return ActionResult.failed();
                 }
-                const tempSdkFilePath = await tempContext.save(response.value);
-                const sdkLanguageDirectory = await sdkContext.save(tempSdkFilePath, zipSdk);
-                this.prompts.sdkGenerated(sdkLanguageDirectory);
-                return ActionResult.success();
+                const responseSdkZipPath = await tempContext.save(response.value.sdk);
+                const tempSdk = await sdkContext.loadSdkInTempDirectory(tempDirectory, responseSdkZipPath);
+                if (!trackChanges && !hasSdkSourceTree) {
+                    this.prompts.sdkGenerated(await sdkContext.save(tempSdk, zipSdk));
+                    return ActionResult.success();
+                }
+                const sdkSourceTreeTempFilePath = await tempContext.save(response.value.sdkSourceTree);
+                const tempSdkWithSourceTree = await sdkContext.loadSdkWithSourceTreeInTempDirectory(tempDirectory, responseSdkZipPath, sdkSourceTreeTempFilePath);
+                const destinationSourceTreePath = buildContext.getSdkSourceTree(language);
+                const mergeSourceTree = new MergeSourceTreeAction();
+                return await mergeSourceTree.execute(tempSdkWithSourceTree, tempSdk, destinationSourceTreePath, trackChanges, skipChanges, hasSdkSourceTree, language, destinationSdkDirectory, version, zipSdk);
             });
         };
         this.configDir = configDir;

package/lib/actions/sdk/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/sdk/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/actions/sdk/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,MAAM,OAAO,cAAc;IAOzB,YAAY,SAAwB,EAAE,eAAgC,EAAE,UAAyB,IAAI;QANpF,YAAO,GAAuB,IAAI,kBAAkB,EAAE,CAAC;QACvD,kBAAa,GAAkB,IAAI,aAAa,EAAE,CAAC;QAWpD,YAAO,GAAG,KAAK,EAC7B,cAA6B,EAC7B,uBAAsC,EACtC,QAAkB,EAClB,KAAc,EACd,MAAe,EACf,WAAoB,EACpB,YAAqB,EACrB,UAAmB,EACnB,cAA2B,EAC3B,wBAAwC,EACmD,EAAE;YAC7F,IAAI,cAAc,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;gBACpD,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;gBAChD,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;YAC/B,CAAC;YAED,MAAM,gBAAgB,GAAG,IAAI,YAAY,CAAC,cAAc,CAAC,CAAC;YAC1D,IAAI,CAAC,CAAC,MAAM,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;gBAC/C,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;YAC/B,CAAC;YAED,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;gBACxC,IAAI,CAAC,MAAM,gBAAgB,CAAC,gBAAgB,EAAE,EAAE,CAAC;oBAC/C,IAAI,UAAU;wBAAE,IAAI,CAAC,OAAO,CAAC,0CAA0C,EAAE,CAAC;oBAC1E,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC;gBAChE,CAAC;gBAED,MAAM,uBAAuB,GAAG,MAAM,gBAAgB,CAAC,0BAA0B,EAAE,CAAC;gBACpF,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC7B,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAC;oBAC3D,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;gBAC/B,CAAC;gBAED,MAAM,6BAA6B,GAAG,MAAM,gBAAgB,CAAC,gCAAgC,EAAE,CAAC;gBAChG,IAAI,CAAC,UAAU,IAAI,6BAA6B,EAAE,CAAC;oBACjD,OAAO;wBACL,OAAO,EAAE,6BAA6B,CAAC,QAAQ,EAAE;wBACjD,YAAY,EAAE,IAAI,YAAY,CAAC,6BAA6B,CAAC;qBAC9D,CAAC;gBACJ,CAAC;gBAED,MAAM,+BAA+B,GAAG,MAAM,gBAAgB,CAAC,kCAAkC,CAC/F,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CACjE,CAAC;gBACF,IAAI,CAAC,+BAA+B,EAAE,CAAC;oBACrC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;oBAC/B,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;gBAC/B,CAAC;gBAED,OAAO;oBACL,OAAO,EAAE,+BAA+B,CAAC,QAAQ,EAAE;oBACnD,YAAY,EAAE,IAAI,YAAY,CAAC,+BAA+B,CAAC;iBAChE,CAAC;YACJ,CAAC,CAAC;YAEF,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,EAAE,CAAC;YACxD,IAAI,gBAAgB,YAAY,YAAY,EAAE,CAAC;gBAC7C,OAAO,gBAAgB,CAAC;YAC1B,CAAC;YAED,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,gBAAgB,CAAC;YAEnD,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;gBACtD,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;gBAChD,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;YAC/B,CAAC;YAED,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACvE,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,uBAAuB,EAAE,WAAW,IAAI,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAC/G,IAAI,CAAC,KAAK,IAAI,MAAM,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC;gBACvG,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;gBACtC,OAAO,YAAY,CAAC,SAAS,EAAE,CAAC;YAClC,CAAC;YAED,OAAO,MAAM,WAAW,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;gBAC/C,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,aAAa,CAAC,CAAC;gBACnD,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,aAAa,EAAE,wBAAwB,CAAC,CAAC;gBAEjG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAC7C,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAC3H,CAAC;gBAEF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;oBACrB,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oBACvD,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC;gBAC/B,CAAC;gBAED,MAAM,kBAAkB,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,sBAAsB,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;gBAE3F,IAAI,CAAC,YAAY,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACvC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;oBAClE,OAAO,YAAY,CAAC,OAAO,EAAE,CAAC;gBAChC,CAAC;gBAED,MAAM,yBAAyB,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBAEvF,MAAM,qBAAqB,GAAG,MAAM,UAAU,CAAC,oCAAoC,CACjF,aAAa,EACb,kBAAkB,EAClB,yBAAyB,CAC1B,CAAC;gBACF,MAAM,yBAAyB,GAAG,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBAE1E,MAAM,eAAe,GAAG,IAAI,qBAAqB,EAAE,CAAC;gBACpD,OAAO,MAAM,eAAe,CAAC,OAAO,CAClC,qBAAqB,EAAE,OAAO,EAAE,yBAAyB,EAAE,YAAY,EAAE,WAAW,EAAE,gBAAgB,EACtG,QAAQ,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,CACnD,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QArHA,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CAmHF"}

package/lib/actions/sdk/merge-source-tree.d.ts

@@ -0,0 +1,12 @@
+import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { FilePath } from "../../types/file/filePath.js";
+import { Language } from "../../types/sdk/generate.js";
+import { ActionResult } from "../action-result.js";
+export declare class MergeSourceTreeAction {
+    private readonly prompts;
+    private readonly launcherService;
+    readonly execute: (sdkWithSourceTree: DirectoryPath, sdkWithoutSourceTree: DirectoryPath, destinationSourceTreePath: FilePath, trackChanges: boolean, skipChanges: boolean, hasSdkSourceTree: boolean, language: Language, outputSdkDirectory: DirectoryPath, version: string | undefined, zipSdk: boolean) => Promise<ActionResult<{
+        sourceTreeTrackingInitiated: boolean;
+        conflictsResolved: boolean;
+    }>>;
+}

package/lib/actions/sdk/merge-source-tree.js

@@ -0,0 +1,78 @@
+import { LauncherService } from "../../infrastructure/launcher-service.js";
+import { MergeSourceTreePrompts } from "../../prompts/sdk/merge-source-tree.js";
+import { ActionResult } from "../action-result.js";
+import isInCi from "is-in-ci";
+import { MergeSourceTreeContext } from "../../types/merge-source-tree-context.js";
+import { SdkContext } from "../../types/sdk-context.js";
+export class MergeSourceTreeAction {
+    constructor() {
+        this.prompts = new MergeSourceTreePrompts();
+        this.launcherService = new LauncherService();
+        this.execute = async (sdkWithSourceTree, sdkWithoutSourceTree, destinationSourceTreePath, trackChanges, skipChanges, hasSdkSourceTree, language, outputSdkDirectory, version, zipSdk) => {
+            const mergeSourceTreeContext = new MergeSourceTreeContext(sdkWithSourceTree, sdkWithoutSourceTree, destinationSourceTreePath, trackChanges, skipChanges, hasSdkSourceTree);
+            const sdkContext = new SdkContext(language, outputSdkDirectory, skipChanges && hasSdkSourceTree, version);
+            const saveSdk = async () => await sdkContext.save(sdkWithoutSourceTree, zipSdk);
+            const { hasSkippedChangesEnabled, hasSkippedCustomizations } = await mergeSourceTreeContext.saveSkippingChanges();
+            if (hasSkippedCustomizations) {
+                this.prompts.successfullySkippedChanges(language);
+                this.prompts.sdkGenerated(await saveSdk());
+                return ActionResult.success();
+            }
+            if (hasSkippedChangesEnabled) {
+                this.prompts.sdkGenerated(await saveSdk());
+                return ActionResult.success();
+            }
+            const { hasSourceTreeTracked, hasSourceTreeAlreadyTracked, hasAppliedCustomizations } = await mergeSourceTreeContext.saveWithoutConflicts();
+            if (hasAppliedCustomizations) {
+                this.prompts.successfullyAppliedChanges(language);
+                this.prompts.sdkGeneratedWithSourceTree(await saveSdk(), destinationSourceTreePath);
+                return ActionResult.success();
+            }
+            if (hasSourceTreeAlreadyTracked) {
+                this.prompts.changeTrackingAlreadyEnabled(language);
+                this.prompts.sdkGeneratedWithSourceTree(await saveSdk(), destinationSourceTreePath);
+                return ActionResult.success();
+            }
+            if (hasSourceTreeTracked) {
+                this.prompts.sdkGenerated(await saveSdk());
+                this.prompts.changeTrackingEnabled(language, destinationSourceTreePath);
+                return ActionResult.success({ sourceTreeTrackingInitiated: true, conflictsResolved: false });
+            }
+            this.prompts.startApplyingConflictedChanges(language);
+            let conflictedFilesDirectory = await mergeSourceTreeContext.getConflictedFilesDirectory();
+            if (isInCi) {
+                this.prompts.conflictsDetectedInCi(language, conflictedFilesDirectory);
+                return ActionResult.failed();
+            }
+            while (!conflictedFilesDirectory.isEmpty()) {
+                this.prompts.conflictsDetected(conflictedFilesDirectory);
+                if (!await this.prompts.resolveNowOrAbandon()) {
+                    this.prompts.mergeAbandoned(language);
+                    return ActionResult.failed();
+                }
+                if (await this.launcherService.isIdeAvailable()) {
+                    this.prompts.openingVsCodeForConflictResolution(language);
+                    await this.launcherService.openFolderInIdeWithWait(sdkWithSourceTree, conflictedFilesDirectory.getAllFiles());
+                }
+                else {
+                    this.prompts.openFilesForConflictResolution(language, sdkWithSourceTree);
+                }
+                const response = await this.prompts.confirmConflictsResolved();
+                if (response === "cancelled") {
+                    this.prompts.mergeAbandoned(language);
+                    return ActionResult.failed();
+                }
+                if (response === "resolved") {
+                    break;
+                }
+                conflictedFilesDirectory = await mergeSourceTreeContext.getConflictedFilesDirectory();
+            }
+            await mergeSourceTreeContext.saveWithResolvedConflicts();
+            this.prompts.conflictsResolved(language);
+            this.prompts.sdkGeneratedWithSourceTree(await saveSdk(), destinationSourceTreePath);
+            await mergeSourceTreeContext.cleanUp(() => this.prompts.directoryStillOpen(sdkWithSourceTree));
+            return ActionResult.success({ sourceTreeTrackingInitiated: false, conflictsResolved: true });
+        };
+    }
+}
+//# sourceMappingURL=merge-source-tree.js.map

package/lib/actions/sdk/merge-source-tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-source-tree.js","sourceRoot":"","sources":["../../../src/actions/sdk/merge-source-tree.ts"],"names":[],"mappings":"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"}

package/lib/actions/sdk/publish/interactive.d.ts

@@ -0,0 +1,13 @@
+import { CommandMetadata } from '../../../types/common/command-metadata.js';
+import { DirectoryPath } from '../../../types/file/directoryPath.js';
+import { ActionResult } from '../../action-result.js';
+export declare class SdkPublishInteractiveAction {
+    private readonly configDir;
+    private readonly commandMetadata;
+    private readonly prompts;
+    private readonly publishingApiService;
+    constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata);
+    readonly execute: (defaultBuildDirectory: DirectoryPath, onPublishSdkError: (errorMessage: string) => void) => Promise<ActionResult>;
+    static workingDirectoryValidator(defaultBuildDirectory: DirectoryPath): (value: string | undefined) => string | undefined;
+    static sdkDirectoryValidator(buildDirectory: DirectoryPath): (value: string | undefined) => string | undefined;
+}

package/lib/actions/sdk/publish/interactive.js

@@ -0,0 +1,105 @@
+import { PublishingApiService } from '../../../infrastructure/services/publishing-api-service.js';
+import { SdkPublishInteractivePrompts } from '../../../prompts/sdk/publish/interactive.js';
+import { DirectoryPath } from '../../../types/file/directoryPath.js';
+import { PublishType } from '../../../types/publish-api/publishing-profile-item.js';
+import { PublishingProfile } from '../../../types/publish/publishing-profile.js';
+import { PublishingProfiles } from '../../../types/publish/publishing-profiles.js';
+import { ActionResult } from '../../action-result.js';
+import { SdkPublishAction } from '../publish.js';
+import { BuildContext } from '../../../types/build-context.js';
+import { ProfileId } from '../../../types/publish/profile-id.js';
+import { removeQuotes } from '../../../utils/string-utils.js';
+export class SdkPublishInteractiveAction {
+    constructor(configDir, commandMetadata) {
+        this.configDir = configDir;
+        this.commandMetadata = commandMetadata;
+        this.prompts = new SdkPublishInteractivePrompts();
+        this.publishingApiService = new PublishingApiService();
+        this.execute = async (defaultBuildDirectory, onPublishSdkError) => {
+            const workingDirectory = await this.prompts.inputWorkingDirectory(defaultBuildDirectory, SdkPublishInteractiveAction.workingDirectoryValidator(defaultBuildDirectory));
+            if (!workingDirectory) {
+                await this.prompts.noInputDirectoryProvided();
+                return ActionResult.cancelled();
+            }
+            const buildDirectory = workingDirectory.join('src');
+            const defaultSdkDirectory = workingDirectory.join('sdk');
+            const sdkDirectory = await this.prompts.inputSdkDirectory(defaultSdkDirectory, SdkPublishInteractiveAction.sdkDirectoryValidator(buildDirectory));
+            if (!sdkDirectory) {
+                await this.prompts.noSdkDirectoryProvided();
+                return ActionResult.cancelled();
+            }
+            const publishingProfilesResponse = await this.prompts.getPublishingProfiles(this.publishingApiService.getPublishingProfiles(this.configDir, this.commandMetadata.shell));
+            if (publishingProfilesResponse.isErr()) {
+                this.prompts.getPublishingProfilesServiceError(publishingProfilesResponse.error);
+                return ActionResult.failed();
+            }
+            const publishingProfileItems = publishingProfilesResponse.value;
+            const publishingProfilesResult = PublishingProfiles.create(publishingProfileItems);
+            if (publishingProfilesResult.isErr()) {
+                this.prompts.noPublishingProfilesFound(publishingProfilesResult.error);
+                return ActionResult.failed();
+            }
+            const activePublishingProfiles = publishingProfilesResult.value.getActiveProfiles();
+            if (activePublishingProfiles.length === 0) {
+                this.prompts.noProfileWithEnabledLanguagesFound();
+                return ActionResult.failed();
+            }
+            const publishingProfileItem = await this.prompts.selectPublishingProfile(publishingProfilesResult.value.toActiveProfilesGroups());
+            if (!publishingProfileItem) {
+                this.prompts.noPublishingProfileSelected();
+                return ActionResult.cancelled();
+            }
+            const publishingProfile = PublishingProfile.create(publishingProfileItem);
+            const language = await this.prompts.selectLanguage(publishingProfile);
+            if (!language) {
+                this.prompts.noLanguageSelected();
+                return ActionResult.cancelled();
+            }
+            const version = await this.prompts.inputVersion();
+            if (!version) {
+                this.prompts.noVersionSpecified();
+                return ActionResult.cancelled();
+            }
+            const publishTypes = publishingProfile.getPublishTypesForLanguage(language);
+            this.prompts.publishingSummary(publishingProfile, language, version, publishTypes);
+            const confirmed = await this.prompts.confirmPublishing();
+            if (!confirmed) {
+                this.prompts.publishingCancelled();
+                return ActionResult.cancelled();
+            }
+            if (!publishTypes.includes(PublishType.PackagePublishing)) {
+                this.prompts.sourceCodeOnlyPublishingNotice();
+            }
+            const publishingProfileId = ProfileId.createFromPublishingProfileItem(publishingProfileItem);
+            const publishResult = await new SdkPublishAction(this.configDir, this.commandMetadata).execute(buildDirectory, sdkDirectory, language, publishTypes, false, publishingProfileId, version, publishingProfile, false, onPublishSdkError);
+            if (publishResult.isFailed()) {
+                return ActionResult.failed();
+            }
+            if (publishResult.isCancelled()) {
+                return ActionResult.cancelled();
+            }
+            this.prompts.sdkPublishingInProgress(publishResult.getValue().publishingLogUrl);
+            return ActionResult.success();
+        };
+    }
+    static workingDirectoryValidator(defaultBuildDirectory) {
+        return (value) => {
+            if (!value) {
+                if (!new BuildContext(defaultBuildDirectory.join('src')).existsSync())
+                    return "The 'src' directory does not exist at the provided location. Please check the path and try again.";
+                return;
+            }
+            if (!new BuildContext(new DirectoryPath(removeQuotes(value.trim())).join('src')).existsSync())
+                return "The 'src' directory does not exist at the provided location. Please check the path and try again.";
+        };
+    }
+    static sdkDirectoryValidator(buildDirectory) {
+        return (value) => {
+            if (!value)
+                return;
+            if (new DirectoryPath(removeQuotes(value.trim())).isEqual(buildDirectory))
+                return 'SDK directory must be different from the src directory.';
+        };
+    }
+}
+//# sourceMappingURL=interactive.js.map