construct-hub 0.3.274 → 0.3.275

package/.jsii

@@ -14540,6 +14540,6 @@
       "symbolId": "src/package-sources/npmjs:NpmJsProps"
     }
   },
-  "version": "0.3.274",
-  "fingerprint": "p4BU3gsVpiWVR3BT5QPh/zvw0RUKHUa1K1ANOjEOI8s="
+  "version": "0.3.275",
+  "fingerprint": "61ipjh2Rs2qxaJlMHcIQ6A5ZXmqKyIPsjTRunohsDCI="
 }

package/changelog.md

@@ -1,2 +1,7 @@
 
-### [0.3.274](https://github.com/cdklabs/construct-hub/compare/v0.3.273...v0.3.274) (2022-03-14)
+### [0.3.275](https://github.com/cdklabs/construct-hub/compare/v0.3.274...v0.3.275) (2022-03-15)
+
+
+### Features
+
+* tag packages with multiple construct frameworks ([#794](https://github.com/cdklabs/construct-hub/issues/794)) ([78ea2dd](https://github.com/cdklabs/construct-hub/commit/78ea2dd76aef0556fea83b07c85d50039d199301)), closes [#717](https://github.com/cdklabs/construct-hub/issues/717)

package/lib/backend/ingestion/framework-detection.lambda-shared.d.ts

@@ -23,4 +23,4 @@ export interface ConstructFramework {
  *
  * @returns a construct framework if one could be identified.
  */
-export declare function detectConstructFramework(assembly: Assembly): ConstructFramework | undefined;
+export declare function detectConstructFrameworks(assembly: Assembly): ConstructFramework[];

package/lib/backend/ingestion/framework-detection.lambda-shared.js

@@ -1,7 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectConstructFramework = void 0;
+exports.detectConstructFrameworks = void 0;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const assert = require("assert");
 const semver_1 = require("semver");
+/**
+ * Predicates that determine whether a package is indicative of the CDK
+ * framework someone is using.
+ */
+const FRAMEWORK_MATCHERS = {
+    ["aws-cdk" /* AWS_CDK */]: (name) => name.startsWith('@aws-cdk/') || name === 'aws-cdk-lib' || name === 'monocdk',
+    ["cdk8s" /* CDK8S */]: (name) => name === 'cdk8s' || /^cdk8s-plus(?:-(?:17|20|21|22))?$/.test(name),
+    // cdktf providers dependencies ("@cdktf/provider-xxx") are major versioned
+    // differently than the core library, so do not take them into account
+    ["cdktf" /* CDKTF */]: (name) => name === 'cdktf',
+};
 /**
  * Determines the Construct framework used by the provided assembly.
  *
@@ -10,69 +23,75 @@ const semver_1 = require("semver");
  *
  * @returns a construct framework if one could be identified.
  */
-function detectConstructFramework(assembly) {
-    var _a, _b;
-    let name;
-    let nameAmbiguous = false;
-    let majorVersion;
-    let majorVersionAmbiguous = false;
-    // exception: we assume all @cdktf/ libraries are cdktf, even if they
-    // also take other CDK types as dependencies
-    if (assembly.name.startsWith('@cdktf/')) {
-        name = "cdktf" /* CDKTF */;
-        if ('cdktf' in ((_a = assembly.dependencyClosure) !== null && _a !== void 0 ? _a : {})) {
-            detectConstructFrameworkPackage('cdktf');
-        }
-        return { name, majorVersion };
-    }
+function detectConstructFrameworks(assembly) {
+    var _a;
+    // "not-sure" means we haven't seen a major version for the framework yet,
+    // e.g. in the case of a transitive dependency where the info isn't provided
+    // "ambiguous" means we have seen multiple major versions so it's impossible
+    // to resolve a single number
+    const detectedFrameworks = {};
     detectConstructFrameworkPackage(assembly.name, assembly.version);
-    for (const depName of Object.keys((_b = assembly.dependencyClosure) !== null && _b !== void 0 ? _b : {})) {
+    for (const depName of Object.keys((_a = assembly.dependencyClosure) !== null && _a !== void 0 ? _a : {})) {
         detectConstructFrameworkPackage(depName);
-        if (nameAmbiguous) {
-            return undefined;
-        }
     }
-    return name && { name, majorVersion: majorVersionAmbiguous ? undefined : majorVersion };
-    function detectConstructFrameworkPackage(packageName, versionRange) {
-        var _a, _b;
-        if (versionRange === void 0) { versionRange = (_a = assembly.dependencies) === null || _a === void 0 ? void 0 : _a[packageName]; }
-        if (packageName.startsWith('@aws-cdk/') || packageName === 'aws-cdk-lib' || packageName === 'monocdk') {
-            if (name && name !== "aws-cdk" /* AWS_CDK */) {
-                // Identified multiple candidates, so returning ambiguous...
-                nameAmbiguous = true;
-                return;
-            }
-            name = "aws-cdk" /* AWS_CDK */;
-        }
-        else if (packageName === 'cdktf') {
-            if (name && name !== "cdktf" /* CDKTF */) {
-                // Identified multiple candidates, so returning ambiguous...
-                nameAmbiguous = true;
-                return;
-            }
-            name = "cdktf" /* CDKTF */;
+    const frameworks = new Array();
+    for (const [frameworkName, majorVersion] of Object.entries(detectedFrameworks)) {
+        const name = frameworkName;
+        if (majorVersion === undefined) {
+            continue;
         }
-        else if (packageName === 'cdk8s' || /^cdk8s-plus(?:-(?:17|20|21|22))?$/.test(packageName)) {
-            if (name && name !== "cdk8s" /* CDK8S */) {
-                // Identified multiple candidates, so returning ambiguous...
-                nameAmbiguous = true;
-                return;
-            }
-            name = "cdk8s" /* CDK8S */;
+        else if (majorVersion === 'ambiguous' || majorVersion === 'no-data') {
+            frameworks.push({ name });
         }
-        else {
-            return;
+        else if (typeof majorVersion === 'number') {
+            frameworks.push({ name, majorVersion });
         }
-        if (versionRange) {
-            const major = (_b = semver_1.minVersion(versionRange)) === null || _b === void 0 ? void 0 : _b.major;
-            if (majorVersion != null && majorVersion !== major) {
-                // Identified multiple candidates, so this is ambiguous...
-                majorVersionAmbiguous = true;
+    }
+    return frameworks;
+    /**
+     * Analyses the package name and version range, and updates
+     * `detectedFrameworks` from the parent scope appropriately
+     */
+    function detectConstructFrameworkPackage(packageName, versionRange) {
+        var _a, _b, _c;
+        if (versionRange === void 0) { versionRange = (_a = assembly.dependencies) === null || _a === void 0 ? void 0 : _a[packageName]; }
+        for (const frameworkName of ["aws-cdk" /* AWS_CDK */, "cdk8s" /* CDK8S */, "cdktf" /* CDKTF */]) {
+            const matchesFramework = FRAMEWORK_MATCHERS[frameworkName];
+            if (matchesFramework(packageName)) {
+                const frameworkVersion = detectedFrameworks[frameworkName];
+                if (frameworkVersion === 'ambiguous') {
+                    // We have already seen multiple major versions and have determined
+                    // the major version is ambiguous, so this package won't give
+                    // us any new information.
+                    return;
+                }
+                const packageMajor = (_c = (versionRange ? (_b = semver_1.minVersion(versionRange)) === null || _b === void 0 ? void 0 : _b.major : undefined)) !== null && _c !== void 0 ? _c : 'no-data';
+                if (frameworkVersion === undefined) {
+                    // It's the first time seeing this major version, so we record
+                    // whatever new information we found ("no-data" or number).
+                    detectedFrameworks[frameworkName] = packageMajor;
+                    return;
+                }
+                else if (frameworkVersion === 'no-data') {
+                    // We've seen this framework before but haven't seen a major version,
+                    // so record whatever new information we found ("no-data" or number).
+                    detectedFrameworks[frameworkName] = packageMajor;
+                    return;
+                }
+                else {
+                    // At this point, frameworkVersion can only be a MV number
+                    assert(typeof frameworkVersion === 'number');
+                    // We've seen evidence of a particular major version for this
+                    // framework, so only update if this package conflicts with what
+                    // we're expecting.
+                    if (packageMajor !== 'no-data' && frameworkVersion !== packageMajor) {
+                        detectedFrameworks[frameworkName] = 'ambiguous';
+                    }
+                    return;
+                }
             }
-            majorVersion = major;
         }
-        return;
     }
 }
-exports.detectConstructFramework = detectConstructFramework;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJhbWV3b3JrLWRldGVjdGlvbi5sYW1iZGEtc2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2JhY2tlbmQvaW5nZXN0aW9uL2ZyYW1ld29yay1kZXRlY3Rpb24ubGFtYmRhLXNoYXJlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxtQ0FBb0M7QUFxQnBDOzs7Ozs7O0dBT0c7QUFDSCxTQUFnQix3QkFBd0IsQ0FBQyxRQUFrQjs7SUFDekQsSUFBSSxJQUE0QyxDQUFDO0lBQ2pELElBQUksYUFBYSxHQUFHLEtBQUssQ0FBQztJQUMxQixJQUFJLFlBQWdDLENBQUM7SUFDckMsSUFBSSxxQkFBcUIsR0FBRyxLQUFLLENBQUM7SUFFbEMscUVBQXFFO0lBQ3JFLDRDQUE0QztJQUM1QyxJQUFJLFFBQVEsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxFQUFFO1FBQ3ZDLElBQUksc0JBQStCLENBQUM7UUFDcEMsSUFBSSxPQUFPLElBQUksT0FBQyxRQUFRLENBQUMsaUJBQWlCLG1DQUFJLEVBQUUsQ0FBQyxFQUFFO1lBQ2pELCtCQUErQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQzFDO1FBQ0QsT0FBTyxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsQ0FBQztLQUMvQjtJQUVELCtCQUErQixDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2pFLEtBQUssTUFBTSxPQUFPLElBQUksTUFBTSxDQUFDLElBQUksT0FBQyxRQUFRLENBQUMsaUJBQWlCLG1DQUFJLEVBQUUsQ0FBQyxFQUFFO1FBQ25FLCtCQUErQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3pDLElBQUksYUFBYSxFQUFFO1lBQ2pCLE9BQU8sU0FBUyxDQUFDO1NBQ2xCO0tBQ0Y7SUFFRCxPQUFPLElBQUksSUFBSSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUscUJBQXFCLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsWUFBWSxFQUFFLENBQUM7SUFFeEYsU0FBUywrQkFBK0IsQ0FBQyxXQUFtQixFQUFFLFlBQW1EOztxQ0FBbkQsRUFBQSxxQkFBZSxRQUFRLENBQUMsWUFBWSwwQ0FBRyxXQUFXLENBQUM7UUFDL0csSUFBSSxXQUFXLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxJQUFJLFdBQVcsS0FBSyxhQUFhLElBQUksV0FBVyxLQUFLLFNBQVMsRUFBRTtZQUNyRyxJQUFJLElBQUksSUFBSSxJQUFJLDRCQUFtQyxFQUFFO2dCQUNuRCw0REFBNEQ7Z0JBQzVELGFBQWEsR0FBRyxJQUFJLENBQUM7Z0JBQ3JCLE9BQU87YUFDUjtZQUNELElBQUksMEJBQWlDLENBQUM7U0FDdkM7YUFBTSxJQUFJLFdBQVcsS0FBSyxPQUFPLEVBQUU7WUFDbEMsSUFBSSxJQUFJLElBQUksSUFBSSx3QkFBaUMsRUFBRTtnQkFDakQsNERBQTREO2dCQUM1RCxhQUFhLEdBQUcsSUFBSSxDQUFDO2dCQUNyQixPQUFPO2FBQ1I7WUFDRCxJQUFJLHNCQUErQixDQUFDO1NBQ3JDO2FBQU0sSUFBSSxXQUFXLEtBQUssT0FBTyxJQUFJLG1DQUFtQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsRUFBRTtZQUMzRixJQUFJLElBQUksSUFBSSxJQUFJLHdCQUFpQyxFQUFFO2dCQUNqRCw0REFBNEQ7Z0JBQzVELGFBQWEsR0FBRyxJQUFJLENBQUM7Z0JBQ3JCLE9BQU87YUFDUjtZQUNELElBQUksc0JBQStCLENBQUM7U0FDckM7YUFBTTtZQUNMLE9BQU87U0FDUjtRQUNELElBQUksWUFBWSxFQUFFO1lBQ2hCLE1BQU0sS0FBSyxTQUFHLG1CQUFVLENBQUMsWUFBWSxDQUFDLDBDQUFFLEtBQUssQ0FBQztZQUM5QyxJQUFJLFlBQVksSUFBSSxJQUFJLElBQUksWUFBWSxLQUFLLEtBQUssRUFBRTtnQkFDbEQsMERBQTBEO2dCQUMxRCxxQkFBcUIsR0FBRyxJQUFJLENBQUM7YUFDOUI7WUFDRCxZQUFZLEdBQUcsS0FBSyxDQUFDO1NBQ3RCO1FBQ0QsT0FBTztJQUNULENBQUM7QUFDSCxDQUFDO0FBN0RELDREQTZEQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFzc2VtYmx5IH0gZnJvbSAnQGpzaWkvc3BlYyc7XG5pbXBvcnQgeyBtaW5WZXJzaW9uIH0gZnJvbSAnc2VtdmVyJztcblxuZXhwb3J0IGNvbnN0IGVudW0gQ29uc3RydWN0RnJhbWV3b3JrTmFtZSB7XG4gIEFXU19DREsgPSAnYXdzLWNkaycsXG4gIENESzhTID0gJ2NkazhzJyxcbiAgQ0RLVEYgPSAnY2RrdGYnLFxufVxuXG5leHBvcnQgaW50ZXJmYWNlIENvbnN0cnVjdEZyYW1ld29yayB7XG4gIC8qKlxuICAgKiBUaGUgbmFtZSBvZiB0aGUgY29uc3RydWN0IGZyYW1ld29yay5cbiAgICovXG4gIHJlYWRvbmx5IG5hbWU6IENvbnN0cnVjdEZyYW1ld29ya05hbWU7XG5cbiAgLyoqXG4gICAqIFRoZSBtYWpvciB2ZXJzaW9uIG9mIHRoZSBjb25zdHJ1Y3QgZnJhbWV3b3JrIHRoYXQgaXMgdXNlZCwgaWYgaXQgY291bGQgYmVcbiAgICogaWRlbnRpZmllZC5cbiAgICovXG4gIHJlYWRvbmx5IG1ham9yVmVyc2lvbj86IG51bWJlcjtcbn1cblxuLyoqXG4gKiBEZXRlcm1pbmVzIHRoZSBDb25zdHJ1Y3QgZnJhbWV3b3JrIHVzZWQgYnkgdGhlIHByb3ZpZGVkIGFzc2VtYmx5LlxuICpcbiAqIEBwYXJhbSBhc3NlbWJseSB0aGUgYXNzZW1ibHkgZm9yIHdoaWNoIGEgY29uc3RydWN0IGZyYW1ld29yayBzaG91bGQgYmVcbiAqICAgICAgICAgICAgICAgICBpZGVudGlmaWVkLlxuICpcbiAqIEByZXR1cm5zIGEgY29uc3RydWN0IGZyYW1ld29yayBpZiBvbmUgY291bGQgYmUgaWRlbnRpZmllZC5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGRldGVjdENvbnN0cnVjdEZyYW1ld29yayhhc3NlbWJseTogQXNzZW1ibHkpOiBDb25zdHJ1Y3RGcmFtZXdvcmsgfCB1bmRlZmluZWQge1xuICBsZXQgbmFtZTogQ29uc3RydWN0RnJhbWV3b3JrWyduYW1lJ10gfCB1bmRlZmluZWQ7XG4gIGxldCBuYW1lQW1iaWd1b3VzID0gZmFsc2U7XG4gIGxldCBtYWpvclZlcnNpb246IG51bWJlciB8IHVuZGVmaW5lZDtcbiAgbGV0IG1ham9yVmVyc2lvbkFtYmlndW91cyA9IGZhbHNlO1xuXG4gIC8vIGV4Y2VwdGlvbjogd2UgYXNzdW1lIGFsbCBAY2RrdGYvIGxpYnJhcmllcyBhcmUgY2RrdGYsIGV2ZW4gaWYgdGhleVxuICAvLyBhbHNvIHRha2Ugb3RoZXIgQ0RLIHR5cGVzIGFzIGRlcGVuZGVuY2llc1xuICBpZiAoYXNzZW1ibHkubmFtZS5zdGFydHNXaXRoKCdAY2RrdGYvJykpIHtcbiAgICBuYW1lID0gQ29uc3RydWN0RnJhbWV3b3JrTmFtZS5DREtURjtcbiAgICBpZiAoJ2Nka3RmJyBpbiAoYXNzZW1ibHkuZGVwZW5kZW5jeUNsb3N1cmUgPz8ge30pKSB7XG4gICAgICBkZXRlY3RDb25zdHJ1Y3RGcmFtZXdvcmtQYWNrYWdlKCdjZGt0ZicpO1xuICAgIH1cbiAgICByZXR1cm4geyBuYW1lLCBtYWpvclZlcnNpb24gfTtcbiAgfVxuXG4gIGRldGVjdENvbnN0cnVjdEZyYW1ld29ya1BhY2thZ2UoYXNzZW1ibHkubmFtZSwgYXNzZW1ibHkudmVyc2lvbik7XG4gIGZvciAoY29uc3QgZGVwTmFtZSBvZiBPYmplY3Qua2V5cyhhc3NlbWJseS5kZXBlbmRlbmN5Q2xvc3VyZSA/PyB7fSkpIHtcbiAgICBkZXRlY3RDb25zdHJ1Y3RGcmFtZXdvcmtQYWNrYWdlKGRlcE5hbWUpO1xuICAgIGlmIChuYW1lQW1iaWd1b3VzKSB7XG4gICAgICByZXR1cm4gdW5kZWZpbmVkO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBuYW1lICYmIHsgbmFtZSwgbWFqb3JWZXJzaW9uOiBtYWpvclZlcnNpb25BbWJpZ3VvdXMgPyB1bmRlZmluZWQgOiBtYWpvclZlcnNpb24gfTtcblxuICBmdW5jdGlvbiBkZXRlY3RDb25zdHJ1Y3RGcmFtZXdvcmtQYWNrYWdlKHBhY2thZ2VOYW1lOiBzdHJpbmcsIHZlcnNpb25SYW5nZSA9IGFzc2VtYmx5LmRlcGVuZGVuY2llcz8uW3BhY2thZ2VOYW1lXSk6IHZvaWQge1xuICAgIGlmIChwYWNrYWdlTmFtZS5zdGFydHNXaXRoKCdAYXdzLWNkay8nKSB8fCBwYWNrYWdlTmFtZSA9PT0gJ2F3cy1jZGstbGliJyB8fCBwYWNrYWdlTmFtZSA9PT0gJ21vbm9jZGsnKSB7XG4gICAgICBpZiAobmFtZSAmJiBuYW1lICE9PSBDb25zdHJ1Y3RGcmFtZXdvcmtOYW1lLkFXU19DREspIHtcbiAgICAgICAgLy8gSWRlbnRpZmllZCBtdWx0aXBsZSBjYW5kaWRhdGVzLCBzbyByZXR1cm5pbmcgYW1iaWd1b3VzLi4uXG4gICAgICAgIG5hbWVBbWJpZ3VvdXMgPSB0cnVlO1xuICAgICAgICByZXR1cm47XG4gICAgICB9XG4gICAgICBuYW1lID0gQ29uc3RydWN0RnJhbWV3b3JrTmFtZS5BV1NfQ0RLO1xuICAgIH0gZWxzZSBpZiAocGFja2FnZU5hbWUgPT09ICdjZGt0ZicpIHtcbiAgICAgIGlmIChuYW1lICYmIG5hbWUgIT09IENvbnN0cnVjdEZyYW1ld29ya05hbWUuQ0RLVEYpIHtcbiAgICAgICAgLy8gSWRlbnRpZmllZCBtdWx0aXBsZSBjYW5kaWRhdGVzLCBzbyByZXR1cm5pbmcgYW1iaWd1b3VzLi4uXG4gICAgICAgIG5hbWVBbWJpZ3VvdXMgPSB0cnVlO1xuICAgICAgICByZXR1cm47XG4gICAgICB9XG4gICAgICBuYW1lID0gQ29uc3RydWN0RnJhbWV3b3JrTmFtZS5DREtURjtcbiAgICB9IGVsc2UgaWYgKHBhY2thZ2VOYW1lID09PSAnY2RrOHMnIHx8IC9eY2RrOHMtcGx1cyg/Oi0oPzoxN3wyMHwyMXwyMikpPyQvLnRlc3QocGFja2FnZU5hbWUpKSB7XG4gICAgICBpZiAobmFtZSAmJiBuYW1lICE9PSBDb25zdHJ1Y3RGcmFtZXdvcmtOYW1lLkNESzhTKSB7XG4gICAgICAgIC8vIElkZW50aWZpZWQgbXVsdGlwbGUgY2FuZGlkYXRlcywgc28gcmV0dXJuaW5nIGFtYmlndW91cy4uLlxuICAgICAgICBuYW1lQW1iaWd1b3VzID0gdHJ1ZTtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuICAgICAgbmFtZSA9IENvbnN0cnVjdEZyYW1ld29ya05hbWUuQ0RLOFM7XG4gICAgfSBlbHNlIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG4gICAgaWYgKHZlcnNpb25SYW5nZSkge1xuICAgICAgY29uc3QgbWFqb3IgPSBtaW5WZXJzaW9uKHZlcnNpb25SYW5nZSk/Lm1ham9yO1xuICAgICAgaWYgKG1ham9yVmVyc2lvbiAhPSBudWxsICYmIG1ham9yVmVyc2lvbiAhPT0gbWFqb3IpIHtcbiAgICAgICAgLy8gSWRlbnRpZmllZCBtdWx0aXBsZSBjYW5kaWRhdGVzLCBzbyB0aGlzIGlzIGFtYmlndW91cy4uLlxuICAgICAgICBtYWpvclZlcnNpb25BbWJpZ3VvdXMgPSB0cnVlO1xuICAgICAgfVxuICAgICAgbWFqb3JWZXJzaW9uID0gbWFqb3I7XG4gICAgfVxuICAgIHJldHVybjtcbiAgfVxufVxuIl19
+exports.detectConstructFrameworks = detectConstructFrameworks;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"framework-detection.lambda-shared.js","sourceRoot":"","sources":["../../../src/backend/ingestion/framework-detection.lambda-shared.ts"],"names":[],"mappings":"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","sourcesContent":["// eslint-disable-next-line @typescript-eslint/no-require-imports\nimport assert = require('assert');\n\nimport { Assembly } from '@jsii/spec';\nimport { minVersion } from 'semver';\n\n\nexport const enum ConstructFrameworkName {\n  AWS_CDK = 'aws-cdk',\n  CDK8S = 'cdk8s',\n  CDKTF = 'cdktf',\n}\n\nexport interface ConstructFramework {\n  /**\n   * The name of the construct framework.\n   */\n  readonly name: ConstructFrameworkName;\n\n  /**\n   * The major version of the construct framework that is used, if it could be\n   * identified.\n   */\n  readonly majorVersion?: number;\n}\n\n/**\n * Predicates that determine whether a package is indicative of the CDK\n * framework someone is using.\n */\nconst FRAMEWORK_MATCHERS: Record<ConstructFrameworkName, (name: string) => boolean> = {\n  [ConstructFrameworkName.AWS_CDK]: (name: string) => name.startsWith('@aws-cdk/') || name === 'aws-cdk-lib' || name === 'monocdk',\n  [ConstructFrameworkName.CDK8S]: (name: string) => name === 'cdk8s' || /^cdk8s-plus(?:-(?:17|20|21|22))?$/.test(name),\n  // cdktf providers dependencies (\"@cdktf/provider-xxx\") are major versioned\n  // differently than the core library, so do not take them into account\n  [ConstructFrameworkName.CDKTF]: (name: string) => name === 'cdktf',\n};\n\n/**\n * Determines the Construct framework used by the provided assembly.\n *\n * @param assembly the assembly for which a construct framework should be\n *                 identified.\n *\n * @returns a construct framework if one could be identified.\n */\nexport function detectConstructFrameworks(assembly: Assembly): ConstructFramework[] {\n  // \"not-sure\" means we haven't seen a major version for the framework yet,\n  // e.g. in the case of a transitive dependency where the info isn't provided\n  // \"ambiguous\" means we have seen multiple major versions so it's impossible\n  // to resolve a single number\n  const detectedFrameworks: { [P in ConstructFrameworkName]?: number | 'no-data' | 'ambiguous' } = {};\n\n  detectConstructFrameworkPackage(assembly.name, assembly.version);\n  for (const depName of Object.keys(assembly.dependencyClosure ?? {})) {\n    detectConstructFrameworkPackage(depName);\n  }\n\n  const frameworks = new Array<ConstructFramework>();\n  for (const [frameworkName, majorVersion] of Object.entries(detectedFrameworks)) {\n    const name = frameworkName as ConstructFrameworkName;\n    if (majorVersion === undefined) {\n      continue;\n    } else if (majorVersion === 'ambiguous' || majorVersion === 'no-data') {\n      frameworks.push({ name });\n    } else if (typeof majorVersion === 'number') {\n      frameworks.push({ name, majorVersion });\n    }\n  }\n\n  return frameworks;\n\n  /**\n   * Analyses the package name and version range, and updates\n   * `detectedFrameworks` from the parent scope appropriately\n   */\n  function detectConstructFrameworkPackage(packageName: string, versionRange = assembly.dependencies?.[packageName]): void {\n    for (const frameworkName of [ConstructFrameworkName.AWS_CDK, ConstructFrameworkName.CDK8S, ConstructFrameworkName.CDKTF]) {\n      const matchesFramework = FRAMEWORK_MATCHERS[frameworkName];\n      if (matchesFramework(packageName)) {\n        const frameworkVersion = detectedFrameworks[frameworkName];\n        if (frameworkVersion === 'ambiguous') {\n          // We have already seen multiple major versions and have determined\n          // the major version is ambiguous, so this package won't give\n          // us any new information.\n          return;\n        }\n\n        const packageMajor = (versionRange ? minVersion(versionRange)?.major : undefined) ?? 'no-data';\n\n        if (frameworkVersion === undefined) {\n          // It's the first time seeing this major version, so we record\n          // whatever new information we found (\"no-data\" or number).\n          detectedFrameworks[frameworkName] = packageMajor;\n          return;\n        } else if (frameworkVersion === 'no-data') {\n          // We've seen this framework before but haven't seen a major version,\n          // so record whatever new information we found (\"no-data\" or number).\n          detectedFrameworks[frameworkName] = packageMajor;\n          return;\n        } else {\n          // At this point, frameworkVersion can only be a MV number\n          assert(typeof frameworkVersion === 'number');\n\n          // We've seen evidence of a particular major version for this\n          // framework, so only update if this package conflicts with what\n          // we're expecting.\n          if (packageMajor !== 'no-data' && frameworkVersion !== packageMajor) {\n            detectedFrameworks[frameworkName] = 'ambiguous';\n          }\n          return;\n        }\n      }\n    }\n  }\n}\n"]}