HotFix: Scalar migration script and scalar in namespace

common/changes/@cadl-lang/compiler/fix-scalar-migration_2022-12-08-20-18.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@cadl-lang/compiler",
+      "comment": "Fix: `scalar` can be used inside of namespace block",
+      "type": "patch"
+    }
+
+  ],
+  "packageName": "@cadl-lang/compiler"
+}

common/changes/@cadl-lang/migrate/fix-scalar-migration_2022-12-08-20-18.json

@@ -0,0 +1,15 @@
+{
+  "changes": [
+    {
+      "packageName": "@cadl-lang/migrate",
+      "comment": "Fix missing file env header",
+      "type": "patch"
+    },
+    {
+      "packageName": "@cadl-lang/migrate",
+      "comment": "Fix issue with end of file getting dropped.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cadl-lang/migrate"
+}

packages/compiler/core/parser.ts

@@ -449,6 +449,9 @@ function createParser(code: string | SourceFile, options: ParseOptions = {}): Pa
         case Token.ModelKeyword:
           item = parseModelStatement(pos, decorators);
           break;
+        case Token.ScalarKeyword:
+          item = parseScalarStatement(pos, decorators);
+          break;
         case Token.NamespaceKeyword:
           const ns = parseNamespaceStatement(pos, decorators);
 

packages/compiler/test/parser.test.ts

@@ -144,6 +144,23 @@ describe("compiler: parser", () => {
       ["model bar<a, b> = a | b;", [/'{' expected/]],
     ]);
   });
+
+  describe("scalar statements", () => {
+    parseEach([
+      "scalar uuid extends string;",
+      `@foo()
+      scalar uuid extends string;`,
+      `namespace Foo { 
+        scalar uuid extends string;}
+        `,
+    ]);
+
+    parseErrorEach([
+      ["scalar uuid extends string { }", [/Statement expected./]],
+      ["scalar uuid is string;", [/Statement expected./]],
+    ]);
+  });
+
   describe("interface statements", () => {
     parseEach([
       "interface Foo { }",

packages/migrate/src/cli.ts

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 /* eslint-disable no-console */
 import { migrateCadlFiles } from "./migrate.js";
 import { migrateModelToScalar } from "./migrations/v0.38/model-to-scalars.js";

packages/migrate/src/migrate.ts

@@ -87,6 +87,8 @@ function migrateCadlContentInternal(
     segments.push(action.content);
     last = action.target.end;
   }
+  segments.push(content.slice(last, -1));
+
   const newContent = segments.join("");
 
   try {

packages/migrate/src/migrations/v0.38/model-to-scalars.ts

@@ -1,4 +1,8 @@
-import type { CadlScriptNode, TemplateParameterDeclarationNode } from "@cadl-lang/compiler-v0.37";
+import type {
+  CadlScriptNode,
+  Node,
+  TemplateParameterDeclarationNode,
+} from "@cadl-lang/compiler-v0.37";
 import {
   CadlCompilerV0_37,
   createMigration,
@@ -24,7 +28,7 @@ export const migrateModelToScalar = createMigration({
     }
 
     const actions: MigrateAction[] = [];
-    compilerV37.visitChildren(root, (node) => {
+    visitRecursive(compilerV37, root, (node) => {
       if (
         node.kind === compilerV37.SyntaxKind.ModelStatement &&
         node.is &&
@@ -47,6 +51,14 @@ export const migrateModelToScalar = createMigration({
   },
 });
 
+function visitRecursive(compiler: any, root: Node, callback: (node: Node) => void) {
+  const visit = (node: Node) => {
+    callback(node);
+    compiler.visitChildren(node, visit);
+  };
+  visit(root);
+}
+
 const builtInTypes = new Set([
   "bytes",
   "numeric",

packages/migrate/test/model-to-scalars.test.ts

@@ -3,7 +3,7 @@ import { migrateCadlContent } from "../src/migrate.js";
 import { migrateModelToScalar } from "../src/migrations/v0.38/model-to-scalars.js";
 
 describe("migration: model to scalars", () => {
-  it("convert", async () => {
+  it("various models", async () => {
     const [result] = await migrateCadlContent(
       `
 model foo is string;
@@ -35,4 +35,44 @@ scalar Resource<T> extends int32;
     `.trim()
     );
   });
+
+  it("inside namespace", async () => {
+    const [result] = await migrateCadlContent(
+      `
+namespace MyService {        
+  model foo is string;
+}
+    `,
+      migrateModelToScalar
+    );
+
+    strictEqual(
+      result.trim(),
+      `
+namespace MyService {
+  scalar foo extends string;
+}
+    `.trim()
+    );
+  });
+
+  it("with operations", async () => {
+    const [result] = await migrateCadlContent(
+      `
+model foo is string;
+
+op test(): string;
+    `,
+      migrateModelToScalar
+    );
+
+    strictEqual(
+      result.trim(),
+      `
+scalar foo extends string;
+
+op test(): string;
+    `.trim()
+    );
+  });
 });