Rename packages in preparation for OSS release (#714)

docs/tutorial.md

@@ -400,14 +400,14 @@ The first step in using a library is to install it via `npm`. You can get `npm`
 
 If you haven't already intiialized your Cadl project's package.json file, now would be a good time to do so. The package.json file lets you track the dependencies your project depends on, and is a best practice to check in along with any Cadl files you create. Run `npm init` create your package.json file.
 
-Then, in your Cadl project directory, type `npm install libraryName` to install a library. For example, to install the official Cadl REST API bindings and OpenAPI generator, you would type `npm install @azure-tools/cadl-rest @azure-tools/cadl-openapi`.
+Then, in your Cadl project directory, type `npm install libraryName` to install a library. For example, to install the official Cadl REST API bindings and OpenAPI generator, you would type `npm install @cadl-lang/rest @azure-tools/cadl-autorest`.
 
 Lastly, you need to import the libraries into your Cadl program. By convention, all external dependencies are imported in your `main.cadl` file, but can be in any Cadl file imported into your program. Importing the two libraries we installed above would look like this:
 
 ```
 // in main.cadl
-import "@azure-tools/cadl-rest";
-import "@azure-tools/cadl-openapi";
+import "@cadl-lang/rest";
+import "@azure-tools/cadl-autorest";
 ```
 
 #### Creating libraries
@@ -418,11 +418,11 @@ The package.json file for an Cadl library requires one additional field: `cadlMa
 
 ### REST APIs
 
-With the language building blocks we've covered so far we're ready to author our first REST API. Cadl has an official REST API "binding" called `@azure-tools/cadl-rest`. It's a set of Cadl declarations and decorators that describe REST APIs and can be used by code generators to generate OpenAPI descriptions, implementation code, and the like.
+With the language building blocks we've covered so far we're ready to author our first REST API. Cadl has an official REST API "binding" called `@cadl-lang/rest`. It's a set of Cadl declarations and decorators that describe REST APIs and can be used by code generators to generate OpenAPI descriptions, implementation code, and the like.
 
-Cadl also has an official OpenAPI emitter called `@azure-tools/cadl-openapi` that consumes the REST API bindings and emits standard OpenAPI descriptions. This can then be fed in to any OpenAPI code generation pipeline.
+Cadl also has an official OpenAPI emitter called `@azure-tools/cadl-autorest` that consumes the REST API bindings and emits standard OpenAPI descriptions. This can then be fed in to any OpenAPI code generation pipeline.
 
-The following examples assume you have imported both `@azure-tools/cadl-openapi` and `@azure-tools/cadl-rest` somewhere in your Cadl program (though importing them in `main.cadl` is the standard convention).
+The following examples assume you have imported both `@azure-tools/cadl-autorest` and `@cadl-lang/rest` somewhere in your Cadl program (though importing them in `main.cadl` is the standard convention).
 
 #### Service definition and metadata
 

eng/scripts/helpers.js

@@ -14,8 +14,8 @@ function read(filename) {
 }
 
 export const repoRoot = resolve(dirname(fileURLToPath(import.meta.url)), "../..");
-export const prettier = resolve(repoRoot, "packages/cadl/node_modules/.bin/prettier");
-export const tsc = resolve(repoRoot, "packages/cadl/node_modules/.bin/tsc");
+export const prettier = resolve(repoRoot, "packages/compiler/node_modules/.bin/prettier");
+export const tsc = resolve(repoRoot, "packages/compiler/node_modules/.bin/tsc");
 
 const rush = read(`${repoRoot}/rush.json`);
 

packages/cadl-vs/CHANGELOG.json

@@ -1,6 +1,23 @@
 {
-  "name": "@azure-tools/cadl-vs",
+  "name": "cadl-vs",
   "entries": [
+    {
+      "version": "0.4.0",
+      "tag": "cadl-vs_v0.4.0",
+      "date": "Tue, 10 Aug 2021 20:23:04 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Rename package to cadl-vs"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"cadl-vscode\" from `0.7.0` to `0.8.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.3.0",
       "tag": "@azure-tools/cadl-vs_v0.3.0",

packages/cadl-vs/CHANGELOG.md

@@ -1,6 +1,13 @@
-# Change Log - @azure-tools/cadl-vs
+# Change Log - cadl-vs
 
-This log was last generated on Mon, 02 Aug 2021 18:17:00 GMT and should not be manually modified.
+This log was last generated on Tue, 10 Aug 2021 20:23:04 GMT and should not be manually modified.
+
+## 0.4.0
+Tue, 10 Aug 2021 20:23:04 GMT
+
+### Minor changes
+
+- Rename package to cadl-vs
 
 ## 0.3.0
 Mon, 02 Aug 2021 18:17:00 GMT

packages/cadl-vs/README.md

@@ -1 +1,5 @@
 # Cadl Language Support for Visual Studio
+
+NOTE: This package is used as an implementation detail of the `cadl vs`
+command that installs the Visual Studio Cadl extension, and not intended to
+be used for other purposes.

packages/cadl-vs/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@azure-tools/cadl-vs",
+  "name": "cadl-vs",
   "author": "Microsoft Corporation",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Cadl Language Support for Visual Studio",
   "homepage": "https://github.com/Azure/adl",
   "readme": "https://github.com/Azure/adl/blob/master/README.md",
@@ -29,6 +29,6 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "cadl-vscode": "0.7.0"
+    "cadl-vscode": "0.8.0"
   }
 }

packages/cadl-vs/src/VSExtension.cs

@@ -125,7 +125,7 @@ namespace Microsoft.Cadl.VisualStudio {
       // the source tree.
       var thisDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
       var srcDir = File.ReadAllText(Path.Combine(thisDir, "DebugSourceDirectory.txt")).Trim();
-      return Path.GetFullPath(Path.Combine(srcDir, "../cadl/cmd/cadl-server.js"));
+      return Path.GetFullPath(Path.Combine(srcDir, "../compiler/cmd/cadl-server.js"));
     }
 #endif
   }

packages/cadl-vscode/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "cadl-vscode",
   "entries": [
+    {
+      "version": "0.8.0",
+      "tag": "cadl-vscode_v0.8.0",
+      "date": "Tue, 10 Aug 2021 20:23:04 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "React to package renames"
+          }
+        ]
+      }
+    },
     {
       "version": "0.7.0",
       "tag": "cadl-vscode_v0.7.0",

packages/cadl-vscode/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log - cadl-vscode
 
-This log was last generated on Mon, 02 Aug 2021 18:17:00 GMT and should not be manually modified.
+This log was last generated on Tue, 10 Aug 2021 20:23:04 GMT and should not be manually modified.
+
+## 0.8.0
+Tue, 10 Aug 2021 20:23:04 GMT
+
+### Minor changes
+
+- React to package renames
 
 ## 0.7.0
 Mon, 02 Aug 2021 18:17:00 GMT

packages/cadl-vscode/README.md

@@ -1 +1,5 @@
 # Cadl Language Support for VS Code
+
+NOTE: This package is used as an implementation detail of the `cadl code`
+command that installs the VS Code Cadl extension, and not intended to be
+used for other purposes.

packages/cadl-vscode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cadl-vscode",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "author": "Microsoft Corporation",
   "description": "Cadl Language Support for VS Code",
   "homepage": "https://github.com/Azure/adl",

packages/cadl-vscode/src/extension.ts

@@ -35,7 +35,7 @@ function resolveCadlServer(context: ExtensionContext): Executable {
 
   // In development mode (F5 launch from source), resolve to locally built server.js.
   if (process.env.CADL_DEVELOPMENT_MODE) {
-    const script = context.asAbsolutePath("../cadl/dist/server/server.js");
+    const script = context.asAbsolutePath("../compiler/dist/server/server.js");
     // we use CLI instead of NODE_OPTIONS environment variable in this case
     // because --nolazy is not supported by NODE_OPTIONS.
     const options = nodeOptions?.split(" ") ?? [];
@@ -55,7 +55,7 @@ function resolveCadlServer(context: ExtensionContext): Executable {
   }
 
   // Default to cadl-server on PATH, which would come from `npm install -g
-  // @azure-tools/cadl` in a vanilla setup.
+  // @cadl-lang/compiler` in a vanilla setup.
   if (!command) {
     command = "cadl-server";
   }

packages/compiler/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
-  "name": "@azure-tools/cadl",
+  "name": "@cadl-lang/compiler",
   "entries": [
+    {
+      "version": "0.17.0",
+      "tag": "@cadl-lang/compiler_v0.17.0",
+      "date": "Tue, 10 Aug 2021 20:23:04 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Rename package to @cadl-lang/compiler"
+          }
+        ]
+      }
+    },
     {
       "version": "0.16.0",
       "tag": "@azure-tools/cadl_v0.16.0",

packages/compiler/CHANGELOG.md

@@ -1,6 +1,13 @@
-# Change Log - @azure-tools/cadl
+# Change Log - @cadl-lang/compiler
 
-This log was last generated on Mon, 09 Aug 2021 21:14:12 GMT and should not be manually modified.
+This log was last generated on Tue, 10 Aug 2021 20:23:04 GMT and should not be manually modified.
+
+## 0.17.0
+Tue, 10 Aug 2021 20:23:04 GMT
+
+### Minor changes
+
+- Rename package to @cadl-lang/compiler
 
 ## 0.16.0
 Mon, 09 Aug 2021 21:14:12 GMT

packages/compiler/cmd/cadl.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 import { runScript } from "../dist/cmd/runner.js";
-await runScript("dist/compiler/cli.js");
+await runScript("dist/core/cli.js");

packages/compiler/cmd/runner.ts

@@ -3,7 +3,7 @@ import resolveModule from "resolve";
 import url from "url";
 
 /**
- * Run script given by relative path from @azure-tools/cadl package root.
+ * Run script given by relative path from @cadl-lang/compiler package root.
  * Prefer local install resolved from cwd over current package.
  *
  * Prevents loading two conflicting copies of Cadl modules from global and
@@ -12,7 +12,7 @@ import url from "url";
 export function runScript(relativePath: string): Promise<void> {
   return new Promise((resolve, reject) => {
     resolveModule(
-      "@azure-tools/cadl",
+      "@cadl-lang/compiler",
       {
         basedir: process.cwd(),
         preserveSymlinks: false,
@@ -31,7 +31,7 @@ export function runScript(relativePath: string): Promise<void> {
           reject(new Error("BUG: Module resolution succeeded, but didn't return a value."));
           return;
         } else {
-          // Resolution succeeded to dist/compiler/index.js in local package.
+          // Resolution succeeded to dist/core/index.js in local package.
           packageRoot = path.resolve(resolved, "../../..");
         }
         const script = path.join(packageRoot, relativePath);

packages/compiler/config/config-loader.ts

@@ -1,7 +1,7 @@
 import { basename, extname, join } from "path";
-import { Message } from "../compiler/diagnostics.js";
-import { CompilerHost, Diagnostic } from "../compiler/types.js";
-import { deepClone, deepFreeze, loadFile } from "../compiler/util.js";
+import { Message } from "../core/diagnostics.js";
+import { CompilerHost, Diagnostic } from "../core/types.js";
+import { deepClone, deepFreeze, loadFile } from "../core/util.js";
 import { ConfigValidator } from "./config-validator.js";
 import { CadlConfig } from "./types.js";
 

packages/compiler/config/config-validator.ts

@@ -1,6 +1,6 @@
 import Ajv, { ErrorObject } from "ajv";
-import { compilerAssert, DiagnosticHandler } from "../compiler/diagnostics.js";
-import { Diagnostic, SourceFile } from "../compiler/types.js";
+import { compilerAssert, DiagnosticHandler } from "../core/diagnostics.js";
+import { Diagnostic, SourceFile } from "../core/types.js";
 import { CadlConfigJsonSchema } from "./config-schema.js";
 import { CadlRawConfig } from "./types.js";
 

packages/compiler/config/types.ts

@@ -1,4 +1,4 @@
-import { Diagnostic } from "../compiler";
+import { Diagnostic } from "../core";
 
 /**
  * Represent the normalized user configuration.

packages/compiler/core/cli.ts

@@ -6,9 +6,9 @@ import os from "os";
 import { basename, extname, join, resolve } from "path";
 import url from "url";
 import yargs from "yargs";
-import { CompilerOptions } from "../compiler/options.js";
-import { compile, Program } from "../compiler/program.js";
 import { loadCadlConfigInDir } from "../config/index.js";
+import { CompilerOptions } from "../core/options.js";
+import { compile, Program } from "../core/program.js";
 import { compilerAssert, dumpError, logDiagnostics } from "./diagnostics.js";
 import { formatCadlFiles } from "./formatter.js";
 import { cadlVersion, NodeHost } from "./util.js";
@@ -439,7 +439,7 @@ async function installVSExtension(debug: boolean) {
   }
 
   await installVsix(
-    "@azure-tools/cadl-vs",
+    "cadl-vs",
     (vsixPaths) => {
       for (const vsix of vsixPaths) {
         const vsixFilename = basename(vsix);

packages/compiler/formatter/index.ts

@@ -1,5 +1,5 @@
 import { Parser, SupportLanguage } from "prettier";
-import { Node } from "../compiler/types.js";
+import { Node } from "../core/types.js";
 import { parse } from "./parser.js";
 import { cadlPrinter } from "./print/index.js";
 

packages/compiler/formatter/parser.ts

@@ -1,6 +1,6 @@
 import { Parser, ParserOptions } from "prettier";
-import { parse as cadlParse } from "../compiler/parser.js";
-import { CadlScriptNode, Diagnostic } from "../compiler/types.js";
+import { parse as cadlParse } from "../core/parser.js";
+import { CadlScriptNode, Diagnostic } from "../core/types.js";
 
 export function parse(
   text: string,

packages/compiler/formatter/print/printer.ts

@@ -22,7 +22,7 @@ import {
   TextRange,
   TypeReferenceNode,
   UnionExpressionNode,
-} from "../../compiler/types.js";
+} from "../../core/types.js";
 import { CadlPrettierOptions, DecorableNode, PrettierChildPrint } from "./types.js";
 
 const {

packages/compiler/formatter/print/types.ts

@@ -1,5 +1,5 @@
 import { Doc, FastPath, ParserOptions } from "prettier";
-import { DecoratorExpressionNode, Node } from "../../compiler/types.js";
+import { DecoratorExpressionNode, Node } from "../../core/types.js";
 
 export interface CadlPrettierOptions extends ParserOptions {}
 

packages/compiler/lib/decorators.ts

@@ -1,5 +1,5 @@
-import { Program } from "../compiler/program.js";
-import { ModelTypeProperty, NamespaceType, Type } from "../compiler/types.js";
+import { Program } from "../core/program.js";
+import { ModelTypeProperty, NamespaceType, Type } from "../core/types.js";
 
 const docsKey = Symbol();
 export function doc(program: Program, target: Type, text: string) {

packages/compiler/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@azure-tools/cadl",
-  "version": "0.16.0",
+  "name": "@cadl-lang/compiler",
+  "version": "0.17.0",
   "description": "Cadl Compiler Preview",
   "author": "Microsoft Corporation",
   "license": "MIT",
@@ -18,8 +18,8 @@
     "cli"
   ],
   "type": "module",
-  "main": "dist/compiler/index.js",
-  "types": "dist/compiler/index.d.ts",
+  "main": "dist/core/index.js",
+  "types": "dist/core/index.d.ts",
   "engines": {
     "node": ">=14.0.0"
   },

packages/compiler/scripts/dogfood.js

@@ -3,4 +3,4 @@ import { readFileSync } from "fs";
 
 const version = JSON.parse(readFileSync("package.json")).version;
 run("npm", ["pack"]);
-run("npm", ["install", "-g", `azure-tools-cadl-${version}.tgz`]);
+run("npm", ["install", "-g", `cadl-lang-compiler-${version}.tgz`]);

packages/compiler/server/server.ts

@@ -19,11 +19,11 @@ import {
   WorkspaceFolder,
   WorkspaceFoldersChangeEvent,
 } from "vscode-languageserver/node.js";
-import { compilerAssert, createSourceFile, formatDiagnostic } from "../compiler/diagnostics.js";
-import { CompilerOptions } from "../compiler/options.js";
-import { createProgram } from "../compiler/program.js";
-import { CompilerHost, Diagnostic as CadlDiagnostic, SourceFile } from "../compiler/types.js";
-import { cadlVersion, doIO, loadFile, NodeHost } from "../compiler/util.js";
+import { compilerAssert, createSourceFile, formatDiagnostic } from "../core/diagnostics.js";
+import { CompilerOptions } from "../core/options.js";
+import { createProgram } from "../core/program.js";
+import { CompilerHost, Diagnostic as CadlDiagnostic, SourceFile } from "../core/types.js";
+import { cadlVersion, doIO, loadFile, NodeHost } from "../core/util.js";
 
 interface ServerSourceFile extends SourceFile {
   // Keep track of the open doucment (if any) associated with a source file.

packages/compiler/test/checker/alias.ts

@@ -1,5 +1,5 @@
 import { ok, strictEqual } from "assert";
-import { ModelType, UnionType } from "../../compiler/types.js";
+import { ModelType, UnionType } from "../../core/types.js";
 import { createTestHost, TestHost } from "../test-host.js";
 
 describe("cadl: aliases", () => {

packages/compiler/test/checker/duplicate-ids.ts

@@ -1,5 +1,5 @@
 import { match, strictEqual } from "assert";
-import { Diagnostic } from "../../compiler/types.js";
+import { Diagnostic } from "../../core/types.js";
 import { createTestHost, TestHost } from "../test-host.js";
 
 describe("cadl: duplicate declarations", () => {

packages/compiler/test/checker/enum.ts

@@ -1,5 +1,5 @@
 import { match, ok, strictEqual } from "assert";
-import { EnumMemberType, EnumType, ModelType } from "../../compiler/types.js";
+import { EnumMemberType, EnumType, ModelType } from "../../core/types.js";
 import { createTestHost, TestHost } from "../test-host.js";
 
 describe("cadl: enums", () => {

packages/compiler/test/checker/model.ts

@@ -1,5 +1,5 @@
 import { match, ok, strictEqual } from "assert";
-import { ModelType, Type } from "../../compiler/types.js";
+import { ModelType, Type } from "../../core/types.js";
 import { createTestHost, TestHost } from "../test-host.js";
 
 describe("cadl: models", () => {

packages/compiler/test/checker/namespaces.ts

@@ -1,5 +1,5 @@
 import { ok, strictEqual } from "assert";
-import { ModelType, NamespaceType, Type } from "../../compiler/types.js";
+import { ModelType, NamespaceType, Type } from "../../core/types.js";
 import { createTestHost, TestHost } from "../test-host.js";
 
 describe("cadl: namespaces with blocks", () => {

packages/compiler/test/checker/spread.ts

@@ -1,5 +1,5 @@
 import { ok, strictEqual } from "assert";
-import { ModelType, Type } from "../../compiler/types.js";
+import { ModelType, Type } from "../../core/types.js";
 import { createTestHost, TestHost } from "../test-host.js";
 
 describe("cadl: spread", () => {

packages/compiler/test/checker/using.ts

@@ -1,5 +1,5 @@
 import { rejects, strictEqual } from "assert";
-import { ModelType } from "../../compiler/types";
+import { ModelType } from "../../core/types";
 import { createTestHost, TestHost } from "../test-host.js";
 
 describe("cadl: using statements", () => {

packages/compiler/test/config/config.ts

@@ -1,11 +1,11 @@
 import { deepStrictEqual } from "assert";
 import { dirname, join, resolve } from "path";
 import { fileURLToPath } from "url";
-import { createSourceFile } from "../../compiler/diagnostics.js";
-import { Diagnostic } from "../../compiler/types.js";
-import { NodeHost } from "../../compiler/util.js";
 import { ConfigValidator } from "../../config/config-validator.js";
 import { CadlRawConfig, loadCadlConfigInDir } from "../../config/index.js";
+import { createSourceFile } from "../../core/diagnostics.js";
+import { Diagnostic } from "../../core/types.js";
+import { NodeHost } from "../../core/util.js";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 

packages/compiler/test/decorators/range-limits.ts

@@ -1,5 +1,5 @@
 import { strictEqual } from "assert";
-import { ModelType } from "../../compiler/types.js";
+import { ModelType } from "../../core/types.js";
 import { getMaxValue, getMinValue } from "../../lib/decorators.js";
 import { createTestHost, TestHost } from "../test-host.js";
 

packages/compiler/test/formatter/formatter.ts

@@ -25,13 +25,13 @@ describe("cadl: prettier formatter", () => {
   it("format imports", () => {
     assertFormat({
       code: `
-    import   "@azure-tools/cadl-rest";
-import        "@azure-tools/cadl-openapi";
+    import   "@cadl-lang/rest";
+import        "@azure-tools/cadl-autorest";
 import "@azure-tools/cadl-rpaas"  ;
 `,
       expected: `
-import "@azure-tools/cadl-rest";
-import "@azure-tools/cadl-openapi";
+import "@cadl-lang/rest";
+import "@azure-tools/cadl-autorest";
 import "@azure-tools/cadl-rpaas";
 `,
     });

packages/compiler/test/formatter/scenarios/inputs/misc.cadl

@@ -1,5 +1,5 @@
-import   "@azure-tools/cadl-rest";
-import "@azure-tools/cadl-openapi";
+import   "@cadl-lang/rest";
+import "@azure-tools/cadl-autorest";
 import "@azure-tools/cadl-rpaas";
 
 alias Bar =   "that" |    "this";

packages/compiler/test/formatter/scenarios/outputs/misc.cadl

@@ -1,5 +1,5 @@
-import "@azure-tools/cadl-rest";
-import "@azure-tools/cadl-openapi";
+import "@cadl-lang/rest";
+import "@azure-tools/cadl-autorest";
 import "@azure-tools/cadl-rpaas";
 
 alias Bar = "that" | "this";

packages/compiler/test/libraries/test-libraries.ts

@@ -1,6 +1,6 @@
 import { fileURLToPath, URL } from "url";
-import { createProgram } from "../../compiler/program.js";
-import { NodeHost } from "../../compiler/util.js";
+import { createProgram } from "../../core/program.js";
+import { NodeHost } from "../../core/util.js";
 
 const libs = ["simple"];
 

packages/compiler/test/manual/fuzz.ts

@@ -1,5 +1,5 @@
-import { logVerboseTestOutput } from "../../compiler/diagnostics.js";
-import { parse } from "../../compiler/parser.js";
+import { logVerboseTestOutput } from "../../core/diagnostics.js";
+import { parse } from "../../core/parser.js";
 
 interface FuzzedFile extends FuzzedScope {
   name: string;

packages/compiler/test/test-host.ts

@@ -6,10 +6,10 @@ import {
   formatDiagnostic,
   logDiagnostics,
   logVerboseTestOutput,
-} from "../compiler/diagnostics.js";
-import { CompilerOptions } from "../compiler/options.js";
-import { createProgram, Program } from "../compiler/program.js";
-import { CompilerHost, Diagnostic, Type } from "../compiler/types.js";
+} from "../core/diagnostics.js";
+import { CompilerOptions } from "../core/options.js";
+import { createProgram, Program } from "../core/program.js";
+import { CompilerHost, Diagnostic, Type } from "../core/types.js";
 
 export interface TestHost {
   addCadlFile(path: string, contents: string): void;

packages/compiler/test/test-mutators.ts

@@ -3,9 +3,9 @@ import {
   addModelProperty,
   addOperationParameter,
   addOperationResponseType,
-} from "../compiler/mutators.js";
-import { Program } from "../compiler/program.js";
-import { ModelType, OperationType, UnionType } from "../compiler/types.js";
+} from "../core/mutators.js";
+import { Program } from "../core/program.js";
+import { ModelType, OperationType, UnionType } from "../core/types.js";
 import { createTestHost, TestHost } from "./test-host.js";
 
 describe("cadl: mutators", () => {

packages/compiler/test/test-parser.ts

@@ -1,8 +1,8 @@
 import assert from "assert";
-import { CharCode } from "../compiler/charcode.js";
-import { formatDiagnostic, logDiagnostics, logVerboseTestOutput } from "../compiler/diagnostics.js";
-import { hasParseError, NodeFlags, parse } from "../compiler/parser.js";
-import { CadlScriptNode, SyntaxKind } from "../compiler/types.js";
+import { CharCode } from "../core/charcode.js";
+import { formatDiagnostic, logDiagnostics, logVerboseTestOutput } from "../core/diagnostics.js";
+import { hasParseError, NodeFlags, parse } from "../core/parser.js";
+import { CadlScriptNode, SyntaxKind } from "../core/types.js";
 
 describe("cadl: syntax", () => {
   describe("import statements", () => {

packages/compiler/test/test-scanner.ts

@@ -1,8 +1,8 @@
 import assert from "assert";
 import { readFile } from "fs/promises";
 import { URL } from "url";
-import { isIdentifierContinue, isIdentifierStart } from "../compiler/charcode.js";
-import { DiagnosticHandler, formatDiagnostic } from "../compiler/diagnostics.js";
+import { isIdentifierContinue, isIdentifierStart } from "../core/charcode.js";
+import { DiagnosticHandler, formatDiagnostic } from "../core/diagnostics.js";
 import {
   createScanner,
   isKeyword,
@@ -12,7 +12,7 @@ import {
   Keywords,
   Token,
   TokenDisplay,
-} from "../compiler/scanner.js";
+} from "../core/scanner.js";
 
 type TokenEntry = [
   Token,

packages/prettier-plugin-cadl/CHANGELOG.json

@@ -1,6 +1,23 @@
 {
-  "name": "@azure-tools/prettier-plugin-cadl",
+  "name": "@cadl-lang/prettier-plugin-cadl",
   "entries": [
+    {
+      "version": "0.3.0",
+      "tag": "@cadl-lang/prettier-plugin-cadl_v0.3.0",
+      "date": "Tue, 10 Aug 2021 20:23:04 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Rename package to @cadl-lang/prettier-plugin-cadl"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@cadl-lang/compiler\" from `0.16.0` to `0.17.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.1",
       "tag": "@azure-tools/prettier-plugin-cadl_v0.2.1",

packages/prettier-plugin-cadl/CHANGELOG.md

@@ -1,6 +1,13 @@
-# Change Log - @azure-tools/prettier-plugin-cadl
+# Change Log - @cadl-lang/prettier-plugin-cadl
 
-This log was last generated on Mon, 09 Aug 2021 21:14:12 GMT and should not be manually modified.
+This log was last generated on Tue, 10 Aug 2021 20:23:04 GMT and should not be manually modified.
+
+## 0.3.0
+Tue, 10 Aug 2021 20:23:04 GMT
+
+### Minor changes
+
+- Rename package to @cadl-lang/prettier-plugin-cadl
 
 ## 0.2.1
 Mon, 09 Aug 2021 21:14:12 GMT

packages/prettier-plugin-cadl/README.md

@@ -8,7 +8,7 @@
 ## Getting Started
 
 ```bash
-npm install --save-dev prettier @azure-tools/prettier-plugin-cadl
+npm install --save-dev prettier @cadl-lang/prettier-plugin-cadl
 ```
 
 You can now call prettier

packages/prettier-plugin-cadl/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@azure-tools/prettier-plugin-cadl",
-  "version": "0.2.1",
+  "name": "@cadl-lang/prettier-plugin-cadl",
+  "version": "0.3.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -15,7 +15,7 @@
     "prettier": "~2.2.1"
   },
   "devDependencies": {
-    "@azure-tools/cadl": "0.16.0",
+    "@cadl-lang/compiler": "0.17.0",
     "@rollup/plugin-commonjs": "~17.1.0",
     "@rollup/plugin-json": "~4.1.0",
     "@rollup/plugin-node-resolve": "~11.2.0",

packages/prettier-plugin-cadl/src/index.js

@@ -1,2 +1,2 @@
-const { CadlPrettierPlugin } = require("@azure-tools/cadl");
+const { CadlPrettierPlugin } = require("@cadl-lang/compiler");
 module.exports = CadlPrettierPlugin;

packages/rest/CHANGELOG.json

@@ -1,6 +1,23 @@
 {
-  "name": "@azure-tools/cadl-rest",
+  "name": "@cadl-lang/rest",
   "entries": [
+    {
+      "version": "0.5.0",
+      "tag": "@cadl-lang/rest_v0.5.0",
+      "date": "Tue, 10 Aug 2021 20:23:04 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Rename package to @cadl-lang/rest"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@cadl-lang/compiler\" from `0.16.0` to `0.17.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.4.1",
       "tag": "@azure-tools/cadl-rest_v0.4.1",

packages/rest/CHANGELOG.md

@@ -1,6 +1,13 @@
-# Change Log - @azure-tools/cadl-rest
+# Change Log - @cadl-lang/rest
 
-This log was last generated on Mon, 09 Aug 2021 21:14:12 GMT and should not be manually modified.
+This log was last generated on Tue, 10 Aug 2021 20:23:04 GMT and should not be manually modified.
+
+## 0.5.0
+Tue, 10 Aug 2021 20:23:04 GMT
+
+### Minor changes
+
+- Rename package to @cadl-lang/rest
 
 ## 0.4.1
 Mon, 09 Aug 2021 21:14:12 GMT