@aidc-toolkit/dev 0.9.19-beta → 0.9.20-beta

package/config/publish.json

@@ -7,34 +7,38 @@
         "src/publish/",
         "config/publish.json"
       ],
-      "lastBetaPublished": "2025-06-09T02:29:43.810Z"
+      "lastBetaPublished": "2025-11-24T01:51:22.533Z",
+      "lastBetaTag": "v0.9.19-beta"
     },
     "core": {
       "dependencyType": "external",
-      "lastBetaPublished": "2025-06-09T02:31:46.793Z"
+      "lastBetaPublished": "2025-11-24T02:47:43.671Z",
+      "lastBetaTag": "v0.9.19-beta"
     },
     "utility": {
       "dependencyType": "external",
-      "lastBetaPublished": "2025-06-09T12:43:30.472Z"
+      "lastBetaPublished": "2025-11-24T04:12:17.212Z",
+      "lastBetaTag": "v0.9.19-beta"
     },
     "gs1": {
       "dependencyType": "external",
-      "lastBetaPublished": "2025-06-09T12:44:44.764Z"
+      "lastBetaPublished": "2025-11-24T04:32:15.180Z",
+      "lastBetaTag": "v0.9.19-beta"
     },
     "demo": {
       "dependencyType": "none",
-      "lastBetaPublished": "2025-06-09T13:03:31.157Z"
+      "lastBetaPublished": "2025-11-24T04:32:22.770Z",
+      "lastBetaTag": "v0.9.19-beta"
     },
     "app-extension": {
-      "dependencyType": "internal",
-      "lastBetaPublished": "2025-06-09T13:03:49.309Z"
-    },
-    "app-generator": {
-      "dependencyType": "internal",
-      "lastBetaPublished": "2025-06-09T13:03:53.348Z"
+      "dependencyType": "external",
+      "lastBetaPublished": "2025-11-24T04:32:30.078Z",
+      "lastBetaTag": "v0.9.19-beta"
     },
     "microsoft-add-in": {
-      "dependencyType": "none"
+      "dependencyType": "none",
+      "lastBetaPublished": "2025-11-24T15:27:57.639Z",
+      "lastBetaTag": "v0.9.19-beta"
     },
     "aidc-toolkit.github.io": {
       "directory": "doc",
@@ -44,7 +48,8 @@
         "gs1"
       ],
       "dependencyType": "none",
-      "lastBetaPublished": "2025-06-09T13:15:55.394Z"
+      "lastBetaPublished": "2025-11-24T19:35:57.785Z",
+      "lastBetaTag": "v0.9.19-beta"
     }
   }
 }

package/copy-workflows.json

@@ -11,6 +11,10 @@
     {
       "from": ".github/workflows/release.yml",
       "to": "../gs1/.github/workflows/"
+    },
+    {
+      "from": ".github/workflows/release.yml",
+      "to": "../app-extension/.github/workflows/"
     }
   ],
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aidc-toolkit/dev",
-  "version": "0.9.19-beta",
+  "version": "0.9.20-beta",
   "description": "Shared development artefacts for AIDC Toolkit",
   "type": "module",
   "main": "dist/index.js",

package/src/publish/publish-alpha.ts

@@ -70,7 +70,7 @@ class PublishAlpha extends Publish {
             this.run(false, false, "npm", "update", ...this.npmPlatformArgs);
         }
 
-        const anyChanges = this.anyChanges(this.repository.lastAlphaPublished, true);
+        const anyChanges = this.anyChanges(this.repository.lastAlphaPublished, true) || this.organizationDependenciesUpdated;
 
         if (anyChanges) {
             const switchToAlpha = this.preReleaseIdentifier !== "alpha";
@@ -80,15 +80,11 @@ class PublishAlpha extends Publish {
                 this.updatePackageVersion(undefined, undefined, this.patchVersion + 1, "alpha");
 
                 // Use specified registry for organization until no longer in alpha mode.
-                this.run(false, false, "npm", "set", this.atOrganizationRegistry, "--location", "project");
+                this.run(false, false, "npm", "config", "set", this.atOrganizationRegistry, "--location", "project");
             }
 
             if (this.organizationDependenciesUpdated && (switchToAlpha || !this._updateAll)) {
-                const updateOrganizationDependencies = Object.values(this.organizationDependencies).filter(updateOrganizationDependency => updateOrganizationDependency !== null);
-
-                logger.debug(`Updating organization dependencies [${updateOrganizationDependencies.join(", ")}]`);
-
-                this.run(false, false, "npm", "update", ...updateOrganizationDependencies, ...this.npmPlatformArgs);
+                this.updateOrganizationDependencies();
             }
         }
 

package/src/publish/publish-beta.ts

@@ -35,7 +35,7 @@ interface WorkflowConfiguration {
              * Push branches.
              */
             branches?: string[];
-        };
+        } | null;
 
         /**
          * Release trigger.
@@ -45,14 +45,14 @@ interface WorkflowConfiguration {
              * Release types.
              */
             types?: string[];
-        };
+        } | null;
     };
 }
 
 /**
  * Publish steps.
  */
-type Step = "install" | "build" | "commit" | "tag" | "push" | "workflow (push)" | "release" | "workflow (release)";
+type Step = "update" | "build" | "commit" | "tag" | "push" | "workflow (push)" | "release" | "workflow (release)" | "complete";
 
 /**
  * Publish beta versions.
@@ -182,12 +182,17 @@ class PublishBeta extends Publish {
             publish = true;
 
             this.updatePackageVersion(undefined, undefined, undefined, "beta");
+
+            // Revert to default registry for organization.
+            this.run(false, false, "npm", "config", "delete", this.atOrganizationRegistry, "--location", "project");
         } else {
-            // Publish beta step is defined if previous attempt failed at that step.
-            publish = this.repository.publishBetaStep !== undefined;
+            const startingPublication = this.repository.publishBetaStep === undefined;
+
+            // Publish beta step is defined and not "complete" if previous attempt failed at that step.
+            publish = !startingPublication && this.repository.publishBetaStep !== "complete";
 
             // Ignore changes after publication process has started.
-            if (!publish && this.anyChanges(this.repository.lastBetaPublished, false)) {
+            if (startingPublication && this.anyChanges(this.repository.lastAlphaPublished, false)) {
                 throw new Error("Internal error, repository has changed without intermediate alpha publication");
             }
         }
@@ -211,13 +216,13 @@ class PublishBeta extends Publish {
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Workflow configuration format is known.
                     const workflowOn = (yamlParse(fs.readFileSync(path.resolve(workflowsPath, workflowFile)).toString()) as WorkflowConfiguration).on;
 
-                    if (workflowOn.push !== undefined && (workflowOn.push.branches === undefined || workflowOn.push.branches.includes("v*"))) {
+                    if (workflowOn.push !== undefined && (workflowOn.push?.branches === undefined || workflowOn.push.branches.includes("v*"))) {
                         logger.debug("Repository has push workflow");
 
                         hasPushWorkflow = true;
                     }
 
-                    if (workflowOn.release !== undefined && (workflowOn.release.types === undefined || workflowOn.release.types.includes("published"))) {
+                    if (workflowOn.release !== undefined && (workflowOn.release?.types === undefined || workflowOn.release.types.includes("published"))) {
                         logger.debug("Repository has release workflow");
 
                         hasReleaseWorkflow = true;
@@ -225,8 +230,8 @@ class PublishBeta extends Publish {
                 }
             }
 
-            await this.runStep("install", () => {
-                this.run(false, false, "npm", "install", ...this.npmPlatformArgs);
+            await this.runStep("update", () => {
+                this.updateOrganizationDependencies();
             });
 
             await this.runStep("build", () => {
@@ -272,7 +277,8 @@ class PublishBeta extends Publish {
             }
 
             this.repository.lastBetaPublished = new Date().toISOString();
-            this.repository.publishBetaStep = undefined;
+            this.repository.lastBetaTag = tag;
+            this.repository.publishBetaStep = "complete";
         }
     }
 

package/src/publish/publish.ts

@@ -59,14 +59,19 @@ export interface Repository {
     lastAlphaPublished?: string;
 
     /**
-     * Current step in beta publication; used to resume after failure recovery.
+     * Date/time in ISO format the last beta version was published.
      */
-    publishBetaStep?: string | undefined;
+    lastBetaPublished?: string;
 
     /**
-     * Date/time in ISO format the last beta version was published.
+     * Last beta tag.
      */
-    lastBetaPublished?: string;
+    lastBetaTag?: string;
+
+    /**
+     * Current step in beta publication; used to resume after failure recovery.
+     */
+    publishBetaStep?: string | undefined;
 
     /**
      * Date/time in ISO format the last production version was published.
@@ -170,7 +175,7 @@ export abstract class Publish {
     /**
      * All organization dependencies, keyed on repository name.
      */
-    private readonly _allOrganizationDependencies: Record<string, Record<string, string | null>>;
+    private readonly _allOrganizationDependencies: Record<string, Record<string, string>>;
 
     /**
      * Current repository name.
@@ -218,10 +223,9 @@ export abstract class Publish {
     private _preReleaseIdentifier!: string | null;
 
     /**
-     * Dependencies that belong to the organization, keyed on repository name; null if additional (not included in
-     * package configuration).
+     * Dependencies that belong to the organization, keyed on repository name.
      */
-    private _organizationDependencies!: Record<string, string | null>;
+    private _organizationDependencies!: Record<string, string>;
 
     /**
      * True if any organization dependency has been updated.
@@ -253,7 +257,7 @@ export abstract class Publish {
 
         this._atOrganization = `@${this.configuration.organization}`;
 
-        this._atOrganizationRegistry = `${this.atOrganization}:registry=${this.configuration.alphaRegistry}`;
+        this._atOrganizationRegistry = `${this.atOrganization}:registry${releaseType === "alpha" ? `=${this.configuration.alphaRegistry}` : ""}`;
 
         this._allOrganizationDependencies = {};
 
@@ -300,7 +304,7 @@ export abstract class Publish {
     /**
      * Get all organization dependencies, keyed on repository name.
      */
-    protected get allOrganizationDependencies(): Record<string, Record<string, string | null>> {
+    protected get allOrganizationDependencies(): Record<string, Record<string, string>> {
         return this._allOrganizationDependencies;
     }
 
@@ -370,7 +374,7 @@ export abstract class Publish {
     /**
      * Get dependencies that belong to the organization, keyed on repository name.
      */
-    protected get organizationDependencies(): Record<string, string | null> {
+    protected get organizationDependencies(): Record<string, string> {
         return this._organizationDependencies;
     }
 
@@ -532,10 +536,7 @@ export abstract class Publish {
             const output = this.run(true, true, "git", "status", "--porcelain");
 
             if (output.length !== 0) {
-                // Beta or production publication requires that repository be fully committed.
-                if (this.releaseType !== "alpha") {
-                    throw new Error("Repository has uncommitted changes");
-                }
+                const committedCount = changedFilesSet.size;
 
                 logger.debug("Uncommitted");
 
@@ -546,6 +547,11 @@ export abstract class Publish {
 
                     processChangedFile(status, file, newFile);
                 }
+
+                // Beta or production publication requires that repository be fully committed except for excluded paths.
+                if (this.releaseType !== "alpha" && changedFilesSet.size !== committedCount) {
+                    throw new Error("Repository has uncommitted changes");
+                }
             }
 
             const lastPublishedDateTime = new Date(lastPublished);
@@ -564,12 +570,6 @@ export abstract class Publish {
                 }
             }
 
-            if (!anyChanges && this.organizationDependenciesUpdated) {
-                logger.info("Organization dependencies updated");
-
-                anyChanges = true;
-            }
-
             if (!anyChanges) {
                 logger.info("No changes");
             }
@@ -664,6 +664,17 @@ export abstract class Publish {
         this.savePackageConfiguration();
     }
 
+    /**
+     * Update organization dependencies.
+     */
+    protected updateOrganizationDependencies(): void {
+        const organizationDependencies = Object.values(this.organizationDependencies);
+
+        logger.debug(`Updating organization dependencies [${organizationDependencies.join(", ")}]`);
+
+        this.run(false, false, "npm", "update", ...organizationDependencies, ...this.npmPlatformArgs);
+    }
+
     /**
      * Commit changes resulting from updating the package version.
      *
@@ -777,19 +788,48 @@ export abstract class Publish {
 
                                 this.organizationDependencies[dependencyRepositoryName] = dependency;
 
-                                if (this.releaseType !== "production") {
-                                    // This change will ultimately be discarded if there are no changes and no updates to organization dependencies.
-                                    currentDependencies[dependency] = this.releaseType;
-                                } else {
-                                    const dependencyRepository = this.configuration.repositories[dependencyRepositoryName];
+                                const dependencyRepository = this.configuration.repositories[dependencyRepositoryName];
+
+                                // Dependency changes will ultimately be discarded if there are no changes and no updates to organization dependencies.
+                                switch (this.releaseType) {
+                                    case "alpha":
+                                        currentDependencies[dependency] = "alpha";
+                                        break;
+
+                                    case "beta":
+                                        switch (dependencyRepository.dependencyType) {
+                                            case "external":
+                                                currentDependencies[dependency] = "beta";
+                                                break;
+
+                                            case "internal":
+                                                {
+                                                    const lastBetaTag = dependencyRepository.lastBetaTag;
 
-                                    const lastProductionVersion = dependencyRepository.lastProductionVersion;
+                                                    if (lastBetaTag === undefined) {
+                                                        throw new Error(`Internal error, last beta tag not set for ${dependencyRepositoryName}`);
+                                                    }
 
-                                    if (lastProductionVersion === undefined) {
-                                        throw new Error(`Internal error, last production version not set for ${dependencyRepositoryName}`);
-                                    }
+                                                    currentDependencies[dependency] = `${this.configuration.organization}/${dependencyRepositoryName}#${lastBetaTag}`;
+                                                }
+                                                break;
 
-                                    currentDependencies[dependency] = `^${lastProductionVersion}`;
+                                            default:
+                                                throw new Error(`Invalid dependency type "${dependencyRepository.dependencyType}" for dependency ${dependencyRepositoryName}`);
+                                        }
+                                        break;
+
+                                    case "production":
+                                        {
+                                            const lastProductionVersion = dependencyRepository.lastProductionVersion;
+
+                                            if (lastProductionVersion === undefined) {
+                                                throw new Error(`Internal error, last production version not set for ${dependencyRepositoryName}`);
+                                            }
+
+                                            currentDependencies[dependency] = `^${lastProductionVersion}`;
+                                        }
+                                        break;
                                 }
                             }
                         }
@@ -797,13 +837,15 @@ export abstract class Publish {
                 }
 
                 if (repository.additionalDependencies !== undefined) {
-                    for (const additionalDependency of repository.additionalDependencies) {
-                        if (additionalDependency in this.organizationDependencies) {
-                            logger.warn(`Additional dependency ${additionalDependency} already exists`);
+                    for (const additionalDependencyName of repository.additionalDependencies) {
+                        if (additionalDependencyName in this.organizationDependencies) {
+                            logger.warn(`Additional dependency ${additionalDependencyName} already exists`);
                         } else {
-                            logger.trace(`Organization dependency from additional dependencies ${additionalDependency}:null`);
+                            const dependency = `${this.atOrganization}/${additionalDependencyName}`;
+
+                            logger.trace(`Organization dependency from additional dependencies ${additionalDependencyName}:${dependency}`);
 
-                            this.organizationDependencies[additionalDependency] = null;
+                            this.organizationDependencies[additionalDependencyName] = dependency;
                         }
                     }
                 }
@@ -853,7 +895,7 @@ export abstract class Publish {
                     }
 
                     if (lastPublished === undefined || dependencyLastPublished > lastPublished) {
-                        logger.info(`Repository ${dependencyRepositoryName} recently published`);
+                        logger.info(`Dependency ${dependencyRepositoryName} recently published`);
 
                         // At least one dependency repository has been published since the last publication of this repository.
                         this._organizationDependenciesUpdated = true;