@peterhauge/apiops-cli 0.1.6-alpha.0 → 0.1.7-alpha.0

package/dist/services/workspace-extractor.js

@@ -1,41 +1,17 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-/**
- * T027: Workspace-scoped extraction
- * List workspaces, extract workspace-scoped resources under workspaces/{name}/
- * using same resource-extractor with workspace context prefix.
- */
-import { ResourceType } from '../models/resource-types.js';
+import { ResourceType, RESOURCE_TYPE_METADATA } from '../models/resource-types.js';
 import { extractResourceType } from './resource-extractor.js';
 import { extractApiResources } from './api-extractor.js';
 import { extractProductResources } from './product-extractor.js';
 import { logger } from '../lib/logger.js';
 /**
- * Types that can exist at the workspace level.
- * Not all APIM resource types support workspace scoping.
+ * Types that can exist at the workspace level, derived from RESOURCE_TYPE_METADATA.
+ * Enumerated in declaration order for deterministic iteration.
+ * A type is workspace-capable when its metadata has `workspaceSupported: true`.
  */
-const WORKSPACE_SUPPORTED_TYPES = [
-    ResourceType.NamedValue,
-    ResourceType.Tag,
-    ResourceType.Backend,
-    ResourceType.Logger,
-    ResourceType.Diagnostic,
-    ResourceType.PolicyFragment,
-    ResourceType.Product,
-    ResourceType.Api,
-    ResourceType.Subscription,
-    ResourceType.GlobalSchema,
-    ResourceType.Documentation,
-    ResourceType.Group,
-];
+const WORKSPACE_SUPPORTED_TYPES = Object.values(ResourceType).filter((type) => RESOURCE_TYPE_METADATA[type].workspaceSupported === true);
 /**
  * Extract resources from all workspaces.
- *
- * Note: Workspace listing is not supported through the current IApimClient
- * interface (ResourceType doesn't include Workspace). This function accepts
- * workspace names from the filter config. If workspaceNames is not specified
- * in the filter, workspace extraction is skipped.
- *
+ 
  * @param client - APIM REST client
  * @param store - Artifact file store
  * @param context - APIM service context
@@ -45,23 +21,41 @@ const WORKSPACE_SUPPORTED_TYPES = [
  */
 export async function extractWorkspaces(client, store, context, outputDir, filter) {
     const results = [];
-    // Workspace names must be explicitly provided via filter config
-    // since the IApimClient interface doesn't support listing workspaces
-    const workspaceNames = filter?.workspaceNames;
-    if (!workspaceNames || workspaceNames.length === 0) {
-        logger.debug('No workspace names specified in filter — skipping workspace extraction');
+    let workspaceNames;
+    if (filter?.workspaceNames && filter.workspaceNames.length > 0) {
+        workspaceNames = filter.workspaceNames;
+    }
+    else {
+        const discovered = [];
+        for await (const item of client.listResources(context, ResourceType.Workspace)) {
+            const name = item['name'];
+            if (typeof name === 'string') {
+                discovered.push(name);
+            }
+        }
+        workspaceNames = discovered;
+    }
+    if (workspaceNames.length === 0) {
+        logger.debug('No workspaces found — skipping workspace extraction');
         return results;
     }
     logger.info(`Extracting ${workspaceNames.length} workspace(s)...`);
     for (const wsName of workspaceNames) {
+        // Persist the workspace container itself so publish can recreate it
+        // before workspace-scoped children (named values, APIs, products, etc.).
+        const wsDescriptor = { type: ResourceType.Workspace, nameParts: [wsName] };
+        const wsJson = await client.getResource(context, wsDescriptor);
+        if (!wsJson) {
+            logger.error(`Workspace container "${wsName}" was discovered but could not be read. Continuing with workspace child extraction.`);
+        }
+        else {
+            await store.writeResource(outputDir, wsDescriptor, wsJson);
+        }
         const wsResult = await extractWorkspace(client, store, context, wsName, outputDir, filter);
         results.push(wsResult);
     }
     return results;
 }
-/**
- * Extract all resources from a single workspace.
- */
 async function extractWorkspace(client, store, context, workspaceName, outputDir, filter) {
     logger.info(`Extracting workspace "${workspaceName}"...`);
     let resourceCount = 0;
@@ -72,7 +66,6 @@ async function extractWorkspace(client, store, context, workspaceName, outputDir
         ...context,
         baseUrl: `${context.baseUrl}/workspaces/${encodeURIComponent(workspaceName)}`,
     };
-    // Extract each supported resource type within the workspace
     for (const type of WORKSPACE_SUPPORTED_TYPES) {
         try {
             const result = await extractResourceType(client, store, wsContext, type, outputDir, filter, undefined, workspaceName);

package/dist/services/workspace-extractor.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peterhauge/apiops-cli",
-  "version": "0.1.6-alpha.0",
+  "version": "0.1.7-alpha.0",
   "description": "CLI tool for Azure API Management configuration-as-code",
   "type": "module",
   "private": false,