move import inside module declaration in package types

Author: jjspace

gulpfile.js

@@ -1234,13 +1234,6 @@ function generateTypeScriptDefinitions(
       "raiseEvent(...arguments: Parameters<Listener>): void;",
     );
 
-  // Wrap the source to actually be inside of a declared cesium module
-  // and add any workaround and private utility types.
-  source = `declare module "@${scope}/${workspaceName}" {
-${source}
-}
-`;
-
   if (importModules) {
     let imports = "";
     Object.keys(importModules).forEach((workspace) => {
@@ -1254,6 +1247,13 @@ ${source}
     source = imports + source;
   }
 
+  // Wrap the source to actually be inside of a declared cesium module
+  // and add any workaround and private utility types.
+  source = `declare module "@${scope}/${workspaceName}" {
+${source}
+}
+`;
+
   // Write the final source file back out
   writeFileSync(definitionsPath, source);
 

packages/sandcastle/sandcastle.config.js

@@ -3,7 +3,7 @@ import process from "process";
 const config = {
   root: ".",
   sourceUrl: "https://github.com/CesiumGS/cesium/blob/main/packages/sandcastle",
-  publicDir: "./public",
+  publicDirectory: "./public",
   gallery: {
     files: ["gallery"],
     searchOptions: {

packages/sandcastle/scripts/buildGallery.js

@@ -304,7 +304,7 @@ if (import.meta.url.endsWith(`${pathToFileURL(process.argv[1])}`)) {
 
   try {
     const config = await import(configPath);
-    const { root, publicDir, gallery, sourceUrl } = config.default;
+    const { root, publicDirectory, gallery, sourceUrl } = config.default;
 
     // Paths are specified relative to the config file
     const configDir = dirname(configPath);
@@ -320,7 +320,7 @@ if (import.meta.url.endsWith(`${pathToFileURL(process.argv[1])}`)) {
 
     buildGalleryOptions = {
       rootDirectory: configRoot,
-      publicDirectory: publicDir,
+      publicDirectory: publicDirectory,
       galleryFiles: files,
       sourceUrl,
       defaultThumbnail,

packages/sandcastle/src/SandcastleEditor.tsx

@@ -214,49 +214,15 @@ function SandcastleEditor({
       var Sandcastle: typeof import('Sandcastle').default;`;
         },
       },
-      {
-        url: typeImportPaths["@cesium/engine"],
-        filename: "ts:cesium-engine.d.ts",
-      },
-      {
-        url: typeImportPaths["@cesium/widgets"],
-        filename: "ts:cesium-widgets.d.ts",
-        transformTypes(typesContent) {
-          // Monaco expects the import statements to be inside the module so
-          // move the module declaration to the top of the "file"
-          return `declare module "@cesium/widgets" {
-          ${typesContent.replace('declare module "@cesium/widgets" {', "")}`;
-        },
-      },
     ];
 
     const extraImportNames = Object.keys(typeImportPaths).filter(
-      (name) =>
-        !["cesium", "Sandcastle", "@cesium/engine", "@cesium/widgets"].includes(
-          name,
-        ),
+      (name) => !["cesium", "Sandcastle"].includes(name),
     );
     for (const extraName of extraImportNames) {
       typeImports.push({
         url: typeImportPaths[extraName],
         filename: `ts:${extraName.replace(/@\//, "-")}.d.ts`,
-        transformTypes(typesContent) {
-          // TODO: this feels a little messy and still very targeted at our own modules, is there a way to improve?
-          // I was experimenting with setting the transform from Vite but that doesn't work with functions
-
-          // Monaco expects the import statements to be inside the module so
-          // move the module declaration to the top of the "file"
-          if (typesContent.trim().startsWith("import")) {
-            const declareModuleLine = typesContent.match(
-              /declare module "([\w@\-\/]+)" {/gm,
-            )?.[0];
-            if (declareModuleLine) {
-              return `${declareModuleLine}
-              ${typesContent.replace(declareModuleLine, "")}`;
-            }
-          }
-          return typesContent;
-        },
       });
     }