@typespec/http-server-js 0.58.0-alpha.13-dev.6 → 0.58.0-alpha.13-dev.8

package/src/common/scalar.ts

@@ -143,6 +143,21 @@ const DURATION_BIGINT_ENCODING: Dependent<ScalarEncoding> = (_, module) => {
   };
 };
 
+/**
+ * Resolves the encoding of Duration values to a BigDecimal number of seconds.
+ */
+const DURATION_BIGDECIMAL_ENCODING: Dependent<ScalarEncoding> = (_, module) => {
+  module.imports.push(
+    { from: dateTimeModule, binder: ["Duration"] },
+    { from: "decimal.js", binder: ["Decimal"] },
+  );
+
+  return {
+    encodeTemplate: "new Decimal(Duration.totalSeconds({}).toString())",
+    decodeTemplate: "Duration.fromSeconds({}.toNumber())",
+  };
+};
+
 const TYPESPEC_DURATION: ScalarInfo = {
   type: function importDuration(_, module) {
     module.imports.push({ from: dateTimeModule, binder: ["Duration"] });
@@ -163,7 +178,7 @@ const TYPESPEC_DURATION: ScalarInfo = {
       },
     },
     ...Object.fromEntries(
-      ["int32", "uint32"].map((n) => [
+      ["int32", "uint32", "float32", "float64"].map((n) => [
         `TypeSpec.${n}`,
         {
           default: { via: "seconds" },
@@ -180,6 +195,10 @@ const TYPESPEC_DURATION: ScalarInfo = {
         },
       ]),
     ),
+    "TypeSpec.float": {
+      default: { via: "seconds" },
+      seconds: DURATION_BIGDECIMAL_ENCODING,
+    },
   },
   defaultEncodings: {
     byMimeType: {
@@ -202,6 +221,23 @@ const NUMBER: ScalarInfo = {
   isJsonCompatible: true,
 };
 
+const BIGDECIMAL: ScalarInfo = {
+  type(_, module) {
+    module.imports.push({ from: "decimal.js", binder: ["Decimal"] });
+
+    return "Decimal";
+  },
+  encodings: {
+    "TypeSpec.string": {
+      default: {
+        encodeTemplate: "{}.toString()",
+        decodeTemplate: "new Decimal({})",
+      },
+    },
+  },
+  isJsonCompatible: false,
+};
+
 /**
  * Declarative scalar table.
  *
@@ -287,6 +323,11 @@ const SCALARS = new Map<string, ScalarInfo>([
   ["TypeSpec.int8", NUMBER],
   ["TypeSpec.safeint", NUMBER],
 
+  ["TypeSpec.numeric", BIGDECIMAL],
+  ["TypeSpec.float", BIGDECIMAL],
+  ["TypeSpec.decimal", BIGDECIMAL],
+  ["TypeSpec.decimal128", BIGDECIMAL],
+
   [
     "TypeSpec.integer",
     {

package/src/scripts/scaffold/bin.mts

@@ -3,6 +3,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+import { hsjsDependencies } from "../../../generated-defs/package.json.js";
+
 import { compile, formatDiagnostic, NodeHost, OperationContainer } from "@typespec/compiler";
 
 import YAML from "yaml";
@@ -126,7 +128,7 @@ function parseScaffoldArguments(args: string[]): ScaffoldingOptions {
     } else if (arg === "--force") {
       options.force = true;
     } else {
-      console.error(`[hsj] Unrecognized scaffolding argument: '${arg}'`);
+      console.error(`[hsjs] Unrecognized scaffolding argument: '${arg}'`);
       process.exit(1);
     }
 
@@ -146,7 +148,7 @@ async function confirmYesNo(message: string): Promise<void> {
     const response = await rl.question(`${message} [y/N] `);
 
     if (response.trim().toLowerCase() !== "y") {
-      console.error("[hsj] Operation cancelled.");
+      console.error("[hsjs] Operation cancelled.");
       process.exit(0);
     }
   } finally {
@@ -157,7 +159,7 @@ async function confirmYesNo(message: string): Promise<void> {
 export async function scaffold(options: ScaffoldingOptions) {
   if (options.force) {
     await confirmYesNo(
-      "[hsj] The `--force` flag is set and will overwrite existing files and settings that may have been modified. Continue?",
+      "[hsjs] The `--force` flag is set and will overwrite existing files and settings that may have been modified. Continue?",
     );
   }
 
@@ -166,9 +168,9 @@ export async function scaffold(options: ScaffoldingOptions) {
   const projectYamlPath = path.resolve(cwd, COMMON_PATHS.projectYaml);
   const mainTspPath = path.resolve(cwd, COMMON_PATHS.mainTsp);
 
-  console.info("[hsj] Scaffolding TypeScript project...");
+  console.info("[hsjs] Scaffolding TypeScript project...");
   console.info(
-    `[hsj] Using project file '${path.relative(cwd, projectYamlPath)}' and main file '${path.relative(cwd, mainTspPath)}'`,
+    `[hsjs] Using project file '${path.relative(cwd, projectYamlPath)}' and main file '${path.relative(cwd, mainTspPath)}'`,
   );
 
   let config: any;
@@ -179,7 +181,7 @@ export async function scaffold(options: ScaffoldingOptions) {
     config = YAML.parse(configText.toString("utf-8"));
   } catch {
     console.error(
-      "[hsj] Failed to read project configuration file. Is the project initialized using `tsp init`?",
+      "[hsjs] Failed to read project configuration file. Is the project initialized using `tsp init`?",
     );
     process.exit(1);
   }
@@ -204,16 +206,16 @@ export async function scaffold(options: ScaffoldingOptions) {
   };
 
   console.info(
-    `[hsj] Emitter options have 'express: ${expressOptions.isExpress}'. Generating server model: '${expressOptions.isExpress ? "Express" : "Node"}'.`,
+    `[hsjs] Emitter options have 'express: ${expressOptions.isExpress}'. Generating server model: '${expressOptions.isExpress ? "Express" : "Node"}'.`,
   );
 
   if (options["no-standalone"]) {
-    console.info("[hsj] Standalone mode disabled, generating project in current directory.");
+    console.info("[hsjs] Standalone mode disabled, generating project in current directory.");
   } else {
-    console.info("[hsj] Generating standalone project in output directory.");
+    console.info("[hsjs] Generating standalone project in output directory.");
   }
 
-  console.info("[hsj] Compiling TypeSpec project...");
+  console.info("[hsjs] Compiling TypeSpec project...");
 
   const program = await compile(NodeHost, mainTspPath, {
     noEmit: true,
@@ -228,7 +230,7 @@ export async function scaffold(options: ScaffoldingOptions) {
   });
 
   if (!jsCtx) {
-    console.error("[hsj] No services were found in the program. Exiting.");
+    console.error("[hsjs] No services were found in the program. Exiting.");
     process.exit(1);
   }
 
@@ -244,17 +246,17 @@ export async function scaffold(options: ScaffoldingOptions) {
   }
 
   if (program.hasError() || hadError) {
-    console.error("[hsj] TypeScript compilation failed. See above error output.");
+    console.error("[hsjs] TypeScript compilation failed. See above error output.");
     process.exit(1);
   }
 
-  console.info("[hsj] TypeSpec compiled successfully. Scaffolding implementation...");
+  console.info("[hsjs] TypeSpec compiled successfully. Scaffolding implementation...");
 
   const indexModule = jsCtx.srcModule;
 
   const routeControllers = await createRouteControllers(jsCtx, httpService, indexModule);
 
-  console.info("[hsj] Generating server entry point...");
+  console.info("[hsjs] Generating server entry point...");
 
   const controllerModules = new Set<Module>();
 
@@ -370,7 +372,7 @@ export async function scaffold(options: ScaffoldingOptions) {
     ]);
   }
 
-  console.info("[hsj] Writing files...");
+  console.info("[hsjs] Writing files...");
 
   const queue = createOnceQueue<Module>();
 
@@ -430,36 +432,39 @@ export async function scaffold(options: ScaffoldingOptions) {
   try {
     ownPackageJson = JSON.parse((await fs.readFile(ownPackageJsonPath)).toString("utf-8"));
   } catch {
-    console.error("[hsj] Failed to read package.json of TypeSpec project. Exiting.");
+    console.error("[hsjs] Failed to read package.json of TypeSpec project. Exiting.");
     process.exit(1);
   }
 
+  // Accumulate all dependencies
+  const externalDependencies = getAllExternalDependencies(jsCtx);
+
   let packageJsonChanged = true;
 
   if (options["no-standalone"]) {
-    console.info("[hsj] Checking package.json for changes...");
+    console.info("[hsjs] Checking package.json for changes...");
 
-    packageJsonChanged = updatePackageJson(ownPackageJson, expressOptions, options.force);
+    packageJsonChanged = updatePackageJson(ownPackageJson, options.force, externalDependencies);
 
     if (packageJsonChanged) {
-      console.info("[hsj] Writing updated package.json...");
+      console.info("[hsjs] Writing updated package.json...");
 
       try {
         await fs.writeFile(ownPackageJsonPath, JSON.stringify(ownPackageJson, null, 2) + "\n");
       } catch {
-        console.error("[hsj] Failed to write package.json.");
+        console.error("[hsjs] Failed to write package.json.");
         process.exit(1);
       }
     } else {
-      console.info("[hsj] No changes to package.json suggested.");
+      console.info("[hsjs] No changes to package.json suggested.");
     }
   } else {
     // Standalone mode, need to generate package.json from scratch
     const relativePathToSpec = path.relative(baseOutputDir, cwd);
     const packageJson = getPackageJsonForStandaloneProject(
       ownPackageJson,
-      expressOptions,
       relativePathToSpec,
+      externalDependencies,
     );
 
     const packageJsonPath = path.resolve(baseOutputDir, COMMON_PATHS.packageJson);
@@ -469,7 +474,7 @@ export async function scaffold(options: ScaffoldingOptions) {
 
   if (packageJsonChanged) {
     // Run npm install to ensure dependencies are installed.
-    console.info("[hsj] Running npm install...");
+    console.info("[hsjs] Running npm install...");
 
     try {
       await spawn("npm", ["install"], {
@@ -479,12 +484,12 @@ export async function scaffold(options: ScaffoldingOptions) {
       });
     } catch {
       console.warn(
-        "[hsj] Failed to run npm install. Check the output above for errors and install dependencies manually.",
+        "[hsjs] Failed to run npm install. Check the output above for errors and install dependencies manually.",
       );
     }
   }
 
-  console.info("[hsj] Project scaffolding complete. Building project...");
+  console.info("[hsjs] Project scaffolding complete. Building project...");
 
   try {
     await spawn("npm", ["run", "build"], {
@@ -493,21 +498,21 @@ export async function scaffold(options: ScaffoldingOptions) {
       shell: process.platform === "win32",
     });
   } catch {
-    console.error("[hsj] Failed to build project. Check the output above for errors.");
+    console.error("[hsjs] Failed to build project. Check the output above for errors.");
     process.exit(1);
   }
 
   const codeDirectory = path.relative(cwd, options["no-standalone"] ? cwd : baseOutputDir);
 
-  console.info("[hsj] Project is ready to run. Use `npm start` to launch the server.");
-  console.info("[hsj] A debug configuration has been created for Visual Studio Code.");
+  console.info("[hsjs] Project is ready to run. Use `npm start` to launch the server.");
+  console.info("[hsjs] A debug configuration has been created for Visual Studio Code.");
   console.info(
-    `[hsj] Try \`code ${codeDirectory}\` to open the project and press F5 to start debugging.`,
+    `[hsjs] Try \`code ${codeDirectory}\` to open the project and press F5 to start debugging.`,
   );
   console.info(
-    `[hsj] The newly-generated route controllers in '${path.join(codeDirectory, "src", "controllers")}' are ready to be implemented.`,
+    `[hsjs] The newly-generated route controllers in '${path.join(codeDirectory, "src", "controllers")}' are ready to be implemented.`,
   );
-  console.info("[hsj] Done.");
+  console.info("[hsjs] Done.");
 
   async function tryWrite(file: string, contents: string): Promise<void> {
     try {
@@ -519,20 +524,54 @@ export async function scaffold(options: ScaffoldingOptions) {
         .catch(() => false);
 
       if (exists && !options.force) {
-        console.warn(`[hsj] File '${relative}' already exists and will not be overwritten.`);
-        console.warn(`[hsj] Manually update the file or delete it and run scaffolding again.`);
+        console.warn(`[hsjs] File '${relative}' already exists and will not be overwritten.`);
+        console.warn(`[hsjs] Manually update the file or delete it and run scaffolding again.`);
 
         return;
       } else if (exists) {
-        console.warn(`[hsj] Overwriting file '${relative}'...`);
+        console.warn(`[hsjs] Overwriting file '${relative}'...`);
       } else {
-        console.info(`[hsj] Writing file '${relative}'...`);
+        console.info(`[hsjs] Writing file '${relative}'...`);
       }
 
       await fs.mkdir(path.dirname(file), { recursive: true });
       await fs.writeFile(file, contents);
     } catch (e: unknown) {
-      console.error(`[hsj] Failed to write file: '${(e as Error).message}'`);
+      console.error(`[hsjs] Failed to write file: '${(e as Error).message}'`);
+    }
+  }
+}
+
+function getAllExternalDependencies(ctx: JsContext): Set<string> {
+  const externalDependencies = new Set<string>();
+
+  const visited = new Set<Module>();
+
+  addModule(ctx.rootModule);
+
+  return externalDependencies;
+
+  function addModule(module: Module) {
+    visited.add(module);
+
+    for (const declaration of module.declarations) {
+      if (isModule(declaration) && !visited.has(declaration)) {
+        addModule(declaration);
+      }
+    }
+
+    for (const _import of module.imports) {
+      if (
+        typeof _import.from === "string" &&
+        !_import.from.startsWith(".") &&
+        !_import.from.startsWith("/")
+      ) {
+        externalDependencies.add(_import.from);
+      } else if (typeof _import.from !== "string") {
+        if (!visited.has(_import.from)) {
+          addModule(_import.from);
+        }
+      }
     }
   }
 }
@@ -595,7 +634,7 @@ async function createRouteController(
 
   const controllerName = containerNameCase.pascalCase + "Impl";
 
-  console.info(`[hsj] Generating controller '${controllerName}'...`);
+  console.info(`[hsjs] Generating controller '${controllerName}'...`);
 
   module.declarations.push([
     `export class ${controllerName} implements ${containerNameCase.pascalCase}<HttpContext> {`,
@@ -688,8 +727,8 @@ function* emitControllerOperationHandlers(
 
 function getPackageJsonForStandaloneProject(
   ownPackageJson: any,
-  express: PackageJsonExpressOptions,
   relativePathToSpec: string,
+  externalDependencies: Set<string>,
 ): any {
   const packageJson = {
     name: (ownPackageJson.name ?? path.basename(process.cwd())) + "-server",
@@ -702,7 +741,7 @@ function getPackageJsonForStandaloneProject(
     packageJson.private = true;
   }
 
-  updatePackageJson(packageJson, express, true, () => {});
+  updatePackageJson(packageJson, true, externalDependencies, () => {});
 
   delete packageJson.scripts["build:scaffold"];
   packageJson.scripts["build:typespec"] = 'tsp compile --output-dir=".." ' + relativePathToSpec;
@@ -719,8 +758,8 @@ interface PackageJsonExpressOptions {
 
 function updatePackageJson(
   packageJson: any,
-  express: PackageJsonExpressOptions,
   force: boolean,
+  externalDependencies: Set<string>,
   info: (...args: any[]) => void = console.info,
 ): boolean {
   let changed = false;
@@ -733,17 +772,31 @@ function updatePackageJson(
   updateObjectPath(["devDependencies", "typescript"], "^5.7.3");
   updateObjectPath(["devDependencies", "@types/node"], "^22.13.1");
 
-  if (express.isExpress) {
-    updateObjectPath(["dependencies", "express"], "^5.0.1");
-    updateObjectPath(["devDependencies", "@types/express"], "^5.0.0");
+  let hadError = false;
+
+  for (const dependency of externalDependencies) {
+    const dependencyVersion = hsjsDependencies[dependency];
 
-    if (express.openApi3) {
-      updateObjectPath(["dependencies", "swagger-ui-express"], "^5.0.1");
-      updateObjectPath(["devDependencies", "@types/swagger-ui-express"], "^4.1.7");
+    if (!dependencyVersion) {
+      hadError = true;
+      console.error("[hsjs] Failed to find version for dependency:", dependency);
+      continue;
     }
 
-    updateObjectPath(["dependencies", "morgan"], "^1.10.0");
-    updateObjectPath(["devDependencies", "@types/morgan"], "^1.9.9");
+    updateObjectPath(["dependencies", dependency], dependencyVersion);
+
+    const typesDependency = `@types/${dependency}`;
+    const typesDependencyVersion = hsjsDependencies[typesDependency];
+    if (typesDependencyVersion) {
+      updateObjectPath(["devDependencies", typesDependency], typesDependencyVersion);
+    }
+  }
+
+  if (hadError) {
+    console.error(
+      "[hsjs] FATAL: Failed to find dependency versions. This is a bug. Please report this error to https://github.com/microsoft/typespec",
+    );
+    process.exit(1);
   }
 
   return changed;
@@ -769,9 +822,9 @@ function updatePackageJson(
 
     if (!existingValue || force) {
       if (!existingValue) {
-        info(`[hsj] - Setting package.json property '${property}' to "${value}".`);
+        info(`[hsjs] - Setting package.json property '${property}' to "${value}".`);
       } else if (force) {
-        info(`[hsj] - Overwriting package.json property '${property}' to "${value}".`);
+        info(`[hsjs] - Overwriting package.json property '${property}' to "${value}".`);
       }
 
       current[path[path.length - 1]] = value;
@@ -782,10 +835,10 @@ function updatePackageJson(
     }
 
     if (current[path[path.length - 1]] !== value) {
-      info(`[hsj] - Skipping package.json property '${property}'.`);
-      info(`[hsj]   Scaffolding prefers "${value}", but it is already set to "${existingValue}".`);
+      info(`[hsjs] - Skipping package.json property '${property}'.`);
+      info(`[hsjs]   Scaffolding prefers "${value}", but it is already set to "${existingValue}".`);
       info(
-        "[hsj]   Manually update the property or remove it and run scaffolding again if needed.",
+        "[hsjs]   Manually update the property or remove it and run scaffolding again if needed.",
       );
     }
   }

package/src/scripts/scaffold/data-mocks.ts

@@ -190,13 +190,18 @@ function mockScalar(ctx: JsContext, module: Module, scalar: Scalar): string | un
     return JSON.stringify(true);
   }
   if ($.scalar.isNumeric(scalar) || $.scalar.extendsNumeric(scalar)) {
-    switch ((scalar as Scalar).name) {
-      case "integer":
-      case "int64":
-      case "uint64":
-        return "42n";
-      default:
-        return "42";
+    if (
+      $.scalar.extendsSafeint(scalar) ||
+      $.scalar.extendsInt32(scalar) ||
+      $.scalar.extendsUint32(scalar) ||
+      $.scalar.extendsFloat64(scalar)
+    ) {
+      return "42";
+    } else if ($.scalar.extendsInteger(scalar)) {
+      return "42n";
+    } else {
+      module.imports.push({ from: "decimal.js", binder: ["Decimal"] });
+      return "new Decimal(42)";
     }
   }