Merge hotfix release branch back in main (microsoft#1193)

datsirul · Oct 20, 2022 · 3676818 · 3676818
1 parent 08502ef
commit 3676818
Show file tree

Hide file tree

Showing 20 changed files with 55 additions and 22 deletions.
diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml
@@ -2,6 +2,9 @@
 
 trigger:
   - main
+  # For patch releases
+  - release/*
+
 pr: none
 
 jobs:

diff --git a/eng/pipelines/pr.yml b/eng/pipelines/pr.yml
@@ -2,6 +2,7 @@ trigger:
   - main
 pr:
   - main
+  - release/*
 
 jobs:
   - job: Build_And_Test

diff --git a/eng/pipelines/pull-request-consistency.yml b/eng/pipelines/pull-request-consistency.yml
@@ -11,7 +11,7 @@ steps:
     displayName: Install JavaScript Dependencies
 
   - script: node common/scripts/install-run-rush.js change -v
-    condition: and(succeeded(), eq(startsWith(variables['System.PullRequest.SourceBranch'], 'publish/'), false))
+    condition: and(succeeded(), not(or(startsWith(variables['System.PullRequest.SourceBranch'], 'publish/'), startsWith(variables['System.PullRequest.SourceBranch'], 'backmerge/'))))
     displayName: Check that changelog has been provided
 
   - script: node common/scripts/install-run-rush.js publish --apply && node eng/scripts/check-for-changed-files.js publish

diff --git a/packages/bundler/package.json b/packages/bundler/package.json
@@ -38,7 +38,7 @@
     "!dist/test/**"
   ],
   "dependencies": {
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@rollup/plugin-virtual": "~2.1.0",
     "@rollup/plugin-commonjs": "~22.0.2",
     "@rollup/plugin-json": "~4.1.0",

diff --git a/packages/cadl-vscode/package.json b/packages/cadl-vscode/package.json
@@ -122,7 +122,7 @@
     "@types/mocha": "~9.1.0",
     "@types/node": "~16.0.3",
     "@types/vscode": "~1.53.0",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/eslint-config-cadl": "~0.4.1",
     "@cadl-lang/internal-build-utils": "~0.3.1",
     "eslint": "^8.12.0",

diff --git a/packages/compiler/CHANGELOG.json b/packages/compiler/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@cadl-lang/compiler",
   "entries": [
+    {
+      "version": "0.36.1",
+      "tag": "@cadl-lang/compiler_v0.36.1",
+      "date": "Wed, 19 Oct 2022 19:36:13 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "**Fix** augment decorators can be applied on namespace"
+          }
+        ]
+      }
+    },
     {
       "version": "0.36.0",
       "tag": "@cadl-lang/compiler_v0.36.0",

diff --git a/packages/compiler/CHANGELOG.md b/packages/compiler/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @cadl-lang/compiler
 
-This log was last generated on Wed, 12 Oct 2022 21:12:35 GMT and should not be manually modified.
+This log was last generated on Wed, 19 Oct 2022 19:36:13 GMT and should not be manually modified.
+
+## 0.36.1
+Wed, 19 Oct 2022 19:36:13 GMT
+
+### Patches
+
+- **Fix** augment decorators can be applied on namespace
 
 ## 0.36.0
 Wed, 12 Oct 2022 21:12:35 GMT

diff --git a/packages/compiler/core/checker.ts b/packages/compiler/core/checker.ts
@@ -397,7 +397,15 @@ export function createChecker(program: Program): Checker {
     for (const decNode of augmentDecorators) {
       const ref = resolveTypeReference(decNode.targetType, undefined);
       if (ref) {
-        if (ref.flags & SymbolFlags.LateBound) {
+        if (ref.flags & SymbolFlags.Namespace) {
+          const decApp = checkDecorator(decNode, undefined);
+          if (decApp) {
+            const links = getSymbolLinks(getMergedSymbol(ref));
+            const type: Type & DecoratedType = links.type! as any;
+            type.decorators.push(decApp);
+            applyDecoratorToType(program, decApp, type);
+          }
+        } else if (ref.flags & SymbolFlags.LateBound) {
           const decApp = checkDecorator(decNode, undefined);
           if (decApp) {
             const type: Type & DecoratedType = ref.type! as any;

diff --git a/packages/compiler/package.json b/packages/compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cadl-lang/compiler",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Cadl Compiler Preview",
   "author": "Microsoft Corporation",
   "license": "MIT",

diff --git a/packages/compiler/test/checker/augment-decorators.test.ts b/packages/compiler/test/checker/augment-decorators.test.ts
@@ -150,6 +150,8 @@ describe("compiler: checker: augment decorators", () => {
       strictEqual(customName, "FooCustom");
     }
 
+    it("namespace", () => expectTarget(`@test("target") namespace Foo {}`, "Foo"));
+
     it("model", () => expectTarget(`@test("target") model Foo {}`, "Foo"));
     it("model property", () =>
       expectTarget(

diff --git a/packages/html-program-viewer/package.json b/packages/html-program-viewer/package.json
@@ -51,7 +51,7 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.36.0"
+    "@cadl-lang/compiler": "~0.36.1"
   },
   "dependencies": {
     "prettier": "~2.7.1",
@@ -66,7 +66,7 @@
     "@types/prettier": "2.6.0",
     "@types/react": "~18.0.5",
     "@types/react-dom": "~18.0.1",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/eslint-config-cadl": "~0.4.1",
     "@babel/core": "^7.0.0",
     "eslint": "^8.12.0",

diff --git a/packages/library-linter/package.json b/packages/library-linter/package.json
@@ -51,12 +51,12 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.36.0"
+    "@cadl-lang/compiler": "~0.36.1"
   },
   "devDependencies": {
     "@types/mocha": "~9.1.0",
     "@types/node": "~16.0.3",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/eslint-config-cadl": "~0.4.1",
     "eslint": "^8.12.0",
     "mocha": "~9.2.0",

diff --git a/packages/lint/package.json b/packages/lint/package.json
@@ -50,12 +50,12 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.36.0"
+    "@cadl-lang/compiler": "~0.36.1"
   },
   "devDependencies": {
     "@types/mocha": "~9.1.0",
     "@types/node": "~16.0.3",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/eslint-config-cadl": "~0.4.1",
     "@cadl-lang/eslint-plugin": "~0.1.1",
     "eslint": "^8.12.0",

diff --git a/packages/openapi/package.json b/packages/openapi/package.json
@@ -52,13 +52,13 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/rest": "~0.18.0"
   },
   "devDependencies": {
     "@types/mocha": "~9.1.0",
     "@types/node": "~16.0.3",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/rest": "~0.18.0",
     "@cadl-lang/eslint-config-cadl": "~0.4.1",
     "@cadl-lang/library-linter": "~0.2.1",

diff --git a/packages/openapi3/package.json b/packages/openapi3/package.json
@@ -53,14 +53,14 @@
   ],
   "peerDependencies": {
     "@cadl-lang/versioning": "~0.9.0",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/rest": "~0.18.0",
     "@cadl-lang/openapi": "~0.13.0"
   },
   "devDependencies": {
     "@types/mocha": "~9.1.0",
     "@types/node": "~16.0.3",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/rest": "~0.18.0",
     "@cadl-lang/openapi": "~0.13.0",
     "@cadl-lang/versioning": "~0.9.0",

diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -42,7 +42,7 @@
   ],
   "dependencies": {
     "@cadl-lang/versioning": "~0.9.0",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/rest": "~0.18.0",
     "@cadl-lang/openapi3": "~0.16.0",
     "@cadl-lang/openapi": "~0.13.0",

diff --git a/packages/prettier-plugin-cadl/package.json b/packages/prettier-plugin-cadl/package.json
@@ -15,7 +15,7 @@
     "prettier": "~2.7.1"
   },
   "devDependencies": {
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/internal-build-utils": "~0.3.1",
     "@rollup/plugin-commonjs": "~22.0.2",
     "@rollup/plugin-json": "~4.1.0",

diff --git a/packages/rest/package.json b/packages/rest/package.json
@@ -56,12 +56,12 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.36.0"
+    "@cadl-lang/compiler": "~0.36.1"
   },
   "devDependencies": {
     "@types/mocha": "~9.1.0",
     "@types/node": "~16.0.3",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/eslint-config-cadl": "~0.4.1",
     "@cadl-lang/library-linter": "~0.2.1",
     "@cadl-lang/eslint-plugin": "~0.1.1",

diff --git a/packages/samples/package.json b/packages/samples/package.json
@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "@cadl-lang/versioning": "~0.9.0",
-    "@cadl-lang/compiler": "~0.36.0",
+    "@cadl-lang/compiler": "~0.36.1",
     "@cadl-lang/rest": "~0.18.0",
     "@cadl-lang/openapi": "~0.13.0",
     "@cadl-lang/openapi3": "~0.16.0",

diff --git a/packages/versioning/package.json b/packages/versioning/package.json
@@ -52,7 +52,7 @@
     "!dist/test/**"
   ],
   "dependencies": {
-    "@cadl-lang/compiler": "~0.36.0"
+    "@cadl-lang/compiler": "~0.36.1"
   },
   "devDependencies": {
     "@types/mocha": "~9.1.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ trigger: @@
       - main
     pr:
       - main
+      - release/*
     jobs:
       - job: Build_And_Test
@@ Expand Down @@