[Automated] Merge release/dec-2022 into main

packages/bundler/package.json

@@ -38,7 +38,7 @@
     "!dist/test/**"
   ],
   "dependencies": {
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@rollup/plugin-virtual": "~3.0.1",
     "@rollup/plugin-commonjs": "~23.0.2",
     "@rollup/plugin-json": "~5.0.1",

packages/cadl-vscode/package.json

@@ -121,7 +121,7 @@
     "@types/mocha": "~10.0.0",
     "@types/node": "~18.11.9",
     "@types/vscode": "~1.53.0",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/eslint-config-cadl": "~0.5.0",
     "@cadl-lang/internal-build-utils": "~0.3.2",
     "eslint": "^8.12.0",

packages/compiler/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "@cadl-lang/compiler",
   "entries": [
+    {
+      "version": "0.38.4",
+      "tag": "@cadl-lang/compiler_v0.38.4",
+      "date": "Thu, 15 Dec 2022 02:21:08 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix: `--arg` wasn't being picked up"
+          }
+        ]
+      }
+    },
     {
       "version": "0.38.3",
       "tag": "@cadl-lang/compiler_v0.38.3",

packages/compiler/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log - @cadl-lang/compiler
 
-This log was last generated on Fri, 09 Dec 2022 22:03:04 GMT and should not be manually modified.
+This log was last generated on Thu, 15 Dec 2022 02:21:08 GMT and should not be manually modified.
+
+## 0.38.4
+Thu, 15 Dec 2022 02:21:08 GMT
+
+### Patches
+
+- Fix: `--arg` wasn't being picked up
 
 ## 0.38.3
 Fri, 09 Dec 2022 22:03:04 GMT

packages/compiler/config/config-interpolation.ts

@@ -55,8 +55,9 @@ function resolveArgs(
   if (declarations !== undefined) {
     for (const [name, definition] of Object.entries(declarations)) {
       unmatchedArgs.delete(name);
-      result[name] =
-        args?.[name] ?? ignoreDiagnostics(resolveValue(definition.default, predefinedVariables));
+      result[name] = ignoreDiagnostics(
+        resolveValue(args?.[name] ?? definition.default, predefinedVariables)
+      );
     }
   }
 

packages/compiler/core/cli/cli.ts

@@ -116,6 +116,7 @@ async function main() {
           })
           .option("arg", {
             type: "array",
+            alias: "args",
             string: true,
             describe: "Key/value of arguments that are used in the configuration.",
           });

packages/compiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cadl-lang/compiler",
-  "version": "0.38.3",
+  "version": "0.38.4",
   "description": "Cadl Compiler Preview",
   "author": "Microsoft Corporation",
   "license": "MIT",

packages/compiler/test/config/config-interpolation.test.ts

@@ -170,6 +170,17 @@ describe("compiler: config interpolation", () => {
           outputDir: "/github-dir/my-output",
         });
       });
+
+      it("expand predefined variables inside args passed", () => {
+        const resolved = expectExpandConfigVariables(config, {
+          cwd: "/dev/wd",
+          args: { "repo-dir": "{cwd}/github-dir" },
+        });
+        deepStrictEqual(resolved, {
+          ...config,
+          outputDir: "/dev/wd/github-dir/my-output",
+        });
+      });
     });
 
     describe("interpolating env", () => {

packages/html-program-viewer/package.json

@@ -51,7 +51,7 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.38.3"
+    "@cadl-lang/compiler": "~0.38.4"
   },
   "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.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/eslint-config-cadl": "~0.5.0",
     "@babel/core": "^7.0.0",
     "eslint": "^8.12.0",

packages/library-linter/package.json

@@ -51,12 +51,12 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.38.3"
+    "@cadl-lang/compiler": "~0.38.4"
   },
   "devDependencies": {
     "@types/mocha": "~10.0.0",
     "@types/node": "~18.11.9",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/eslint-config-cadl": "~0.5.0",
     "eslint": "^8.12.0",
     "mocha": "~10.1.0",

packages/lint/package.json

@@ -50,12 +50,12 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.38.3"
+    "@cadl-lang/compiler": "~0.38.4"
   },
   "devDependencies": {
     "@types/mocha": "~10.0.0",
     "@types/node": "~18.11.9",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/eslint-config-cadl": "~0.5.0",
     "@cadl-lang/eslint-plugin": "~0.38.0",
     "eslint": "^8.12.0",

packages/migrate/package.json

@@ -39,13 +39,13 @@
   ],
   "dependencies": {
     "globby": "~13.1.1",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/compiler-v0.37": "npm:@cadl-lang/compiler@0.37.0"
   },
   "devDependencies": {
     "@types/mocha": "~10.0.0",
     "@types/node": "~18.11.9",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/eslint-config-cadl": "~0.5.0",
     "@cadl-lang/eslint-plugin": "~0.38.0",
     "eslint": "^8.12.0",

packages/openapi/package.json

@@ -52,13 +52,13 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/rest": "~0.38.1"
   },
   "devDependencies": {
     "@types/mocha": "~10.0.0",
     "@types/node": "~18.11.9",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/rest": "~0.38.1",
     "@cadl-lang/eslint-config-cadl": "~0.5.0",
     "@cadl-lang/library-linter": "~0.38.0",

packages/openapi3/package.json

@@ -53,14 +53,14 @@
   ],
   "peerDependencies": {
     "@cadl-lang/versioning": "~0.38.0",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/rest": "~0.38.1",
     "@cadl-lang/openapi": "~0.38.0"
   },
   "devDependencies": {
     "@types/mocha": "~10.0.0",
     "@types/node": "~18.11.9",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/rest": "~0.38.1",
     "@cadl-lang/openapi": "~0.38.0",
     "@cadl-lang/versioning": "~0.38.0",

packages/playground/package.json

@@ -42,7 +42,7 @@
   ],
   "dependencies": {
     "@cadl-lang/versioning": "~0.38.0",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/rest": "~0.38.1",
     "@cadl-lang/openapi3": "~0.38.0",
     "@cadl-lang/openapi": "~0.38.0",

packages/prettier-plugin-cadl/package.json

@@ -15,7 +15,7 @@
     "prettier": "~2.7.1"
   },
   "devDependencies": {
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/internal-build-utils": "~0.3.2",
     "@rollup/plugin-commonjs": "~23.0.2",
     "@rollup/plugin-json": "~5.0.1",

packages/ref-doc/package.json

@@ -47,11 +47,11 @@
     "!dist/test/**"
   ],
   "dependencies": {
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "prettier": "~2.7.1"
   },
   "devDependencies": {
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/eslint-config-cadl": "~0.5.0",
     "@types/mocha": "~10.0.0",
     "@types/node": "~18.11.9",

packages/rest/package.json

@@ -56,12 +56,12 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@cadl-lang/compiler": "~0.38.3"
+    "@cadl-lang/compiler": "~0.38.4"
   },
   "devDependencies": {
     "@types/mocha": "~10.0.0",
     "@types/node": "~18.11.9",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/eslint-config-cadl": "~0.5.0",
     "@cadl-lang/library-linter": "~0.38.0",
     "@cadl-lang/eslint-plugin": "~0.38.0",

packages/samples/package.json

@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "@cadl-lang/versioning": "~0.38.0",
-    "@cadl-lang/compiler": "~0.38.3",
+    "@cadl-lang/compiler": "~0.38.4",
     "@cadl-lang/rest": "~0.38.1",
     "@cadl-lang/openapi": "~0.38.0",
     "@cadl-lang/openapi3": "~0.38.0",

packages/versioning/package.json

@@ -52,7 +52,7 @@
     "!dist/test/**"
   ],
   "dependencies": {
-    "@cadl-lang/compiler": "~0.38.3"
+    "@cadl-lang/compiler": "~0.38.4"
   },
   "devDependencies": {
     "@types/mocha": "~10.0.0",