@digigov/cli-build 2.0.0-2177f152 → 2.0.0-2271444d

package/copy-files.js

@@ -1,14 +1,10 @@
-import { logger, resolveProject } from "@digigov/cli/lib";
-import fs from "fs-extra";
-import path from "path";
-import glob from "globby";
+import { logger, resolveProject } from '@digigov/cli/lib';
+import fs from 'fs-extra';
+import path from 'path';
 
 const packagePath = process.cwd();
-
-function getBuildPath() {
-  const project = resolveProject();
-  return path.join(project.root, project.distDir);
-}
+const project = resolveProject();
+const buildPath = path.join(project.root, project.distDir);
 
 /**
  * Copy a file from the package to the build directory
@@ -17,10 +13,9 @@ function getBuildPath() {
  */
 function includeFileInBuild(file) {
   const sourcePath = path.resolve(packagePath, file);
-  const buildPath = getBuildPath();
   const targetPath = path.resolve(buildPath, path.basename(file));
   fs.copySync(sourcePath, targetPath);
-  logger.log(`Copied ${sourcePath} to ${targetPath}`);
+  logger.debug(`Copied ${sourcePath} to build directory`);
 }
 
 /**
@@ -28,55 +23,42 @@ function includeFileInBuild(file) {
  */
 function createRootPackageFile() {
   const packageData = fs.readFileSync(
-    path.resolve(packagePath, "./package.json"),
-    "utf8",
+    path.resolve(packagePath, './package.json'),
+    'utf8'
   );
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { nyc, scripts, devDependencies, workspaces, ...packageDataOther } =
     JSON.parse(packageData);
   const newPackageData = {
     ...packageDataOther,
+    main: undefined,
     private: false,
-    main: "./cjs/index.js",
-    module: "./index.js",
-    typings: "./index.d.ts",
+    type: 'module', // ESM only
+    exports: {
+      '.': {
+        types: './index.d.ts',
+        import: './index.js',
+      },
+      './src/*': './src/*',
+      './*': {
+        types: ['./*.d.ts', './*/index.d.ts'],
+        import: ['./*', './*/index.js'],
+      },
+      './*.js': {
+        types: './*.d.ts',
+        import: './*.js',
+      },
+    },
   };
-  const buildPath = getBuildPath();
-  const targetPath = path.resolve(buildPath, "./package.json");
+  const targetPath = path.resolve(buildPath, './package.json');
 
-  fs.writeFileSync(targetPath, JSON.stringify(newPackageData, null, 2), "utf8");
-  logger.log(`Created package.json in ${targetPath}`);
+  fs.writeFileSync(targetPath, JSON.stringify(newPackageData, null, 2), 'utf8');
+  logger.debug(`Created package.json in build directory`);
 
   return newPackageData;
 }
 
-/**
- * Create nested package.json files in the build directory
- *
- */
-function createNestedPackageFiles() {
-  const buildPath = getBuildPath();
-  const indexPaths = glob.sync(path.join(buildPath, "**/index.js"), {
-    ignore: [path.join(buildPath, "cjs/**")],
-  });
-
-  indexPaths.forEach((indexPath) => {
-    if (indexPath === path.join(buildPath, "index.js")) return;
-    const packageData = {
-      sideEffects: false,
-      module: "./index.js",
-      types: "./index.d.ts",
-      main: path.relative(
-        path.dirname(indexPath),
-        indexPath.replace(buildPath, path.join(buildPath, "/cjs")),
-      ),
-    };
-    fs.writeFileSync(
-      path.join(path.dirname(indexPath), "package.json"),
-      JSON.stringify(packageData, null, 2),
-    );
-  });
-}
-
 /**
  * Prepend a string to a file
  *
@@ -84,8 +66,9 @@ function createNestedPackageFiles() {
  * @param {string} string - The string to prepend
  */
 function prepend(file, string) {
-  const data = fs.readFileSync(file, "utf8");
-  fs.writeFileSync(file, string + data, "utf8");
+  const data = fs.readFileSync(file, 'utf8');
+  fs.writeFileSync(file, string + data, 'utf8');
+  logger.debug(`Prepended license to ${file}`);
 }
 
 /**
@@ -94,24 +77,23 @@ function prepend(file, string) {
  * @param {object} packageData - The package data
  */
 function addLicense(packageData) {
-  const buildPath = getBuildPath();
-  const license = `/** @license Digigov v${packageData["version"]}
+  const license = `/** @license Digigov v${packageData['version']}
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.
  */
 `;
-  ["./index.js", "./index.mjs"].map(async (file) => {
+  ['./index.js', './index.mjs'].map(async (file) => {
     try {
       prepend(path.resolve(buildPath, file), license);
     } catch (err) {
       if (
-        typeof err === "object" &&
+        typeof err === 'object' &&
         err &&
-        "code" in err &&
-        err.code === "ENOENT"
+        'code' in err &&
+        err.code === 'ENOENT'
       ) {
-        logger.log(`Skipped license for ${file}`);
+        logger.debug(`Skipped license for ${file}`);
       } else {
         throw err;
       }
@@ -119,36 +101,19 @@ function addLicense(packageData) {
   });
 }
 
-/**
- * Create separate index modules for each directory
- */
-function createSeparateIndexModules() {
-  const buildPath = getBuildPath();
-  const files = glob.sync(path.join(buildPath, "**/*.js"), {
-    ignore: [path.join(buildPath, "**/index.js")],
-  });
-
-  files.forEach((file) => {
-    fs.mkdirSync(file.replace(/\.js$/, ""));
-    fs.renameSync(file, file.replace(/\.js$/, "/index.js"));
-  });
-}
-
 /**
  * Run the copy files script
  */
 export default function run() {
   const packageData = createRootPackageFile();
-  createSeparateIndexModules();
-  createNestedPackageFiles();
 
   [
     // use enhanced readme from workspace root for `@digigov/ui`
     // packageData.name === '@digigov/ui' ? '../../README.md' : './README.md',
-    "./src",
-    "./README.md",
-    "./CHANGELOG.md",
-    "../../LICENSE",
-  ].map((file) => includeFileInBuild(file)),
-    addLicense(packageData);
+    './src',
+    './README.md',
+    './CHANGELOG.md',
+    '../../LICENSE',
+  ].map((file) => includeFileInBuild(file));
+  addLicense(packageData);
 }

package/eslint.config.js

@@ -0,0 +1,3 @@
+import config from '@digigov/cli-lint/eslint.config';
+
+export default [...config];

package/generate-registry.js

@@ -0,0 +1,215 @@
+import { logger } from '@digigov/cli/lib';
+import path from 'path';
+import fs from 'fs-extra';
+import { SyntaxKind, Project as TsMorphProject } from 'ts-morph';
+import assert from 'assert';
+
+import { getProjectTsconfig } from './common.js';
+
+/** @typedef {Object} Project - Represents the project to be built
+ * @property {string} root - The project root directory
+ * @property {string} name - The project name as in package.json
+ * @property {string} src - The project src directory
+ * @property {string} distDir - The project build directory
+ */
+
+/**
+ * Generate registry file for the given project
+ *
+ * @param {Project} project - The project object
+ * @param {string} [registryFilename="registry.js"] - The name of the registry file
+ * @param {string[]} absoluteFilePaths - The absolute paths of the files to include in the registry
+ * @returns {Promise<string>} - The path to the generated registry file
+ */
+export async function generateRegistry(
+  project,
+  absoluteFilePaths,
+  registryFilename = 'registry.js'
+) {
+  const registryPath = ensureRegistryPath(project, registryFilename);
+
+  const relativePaths = absoluteFilePaths.map((path) => {
+    assert(
+      path.startsWith(project.root),
+      'Expected path to be in project root'
+    );
+    return toNodeResolvablePath(
+      path.replace(`${project.root}/src/`, `${project.name}/`)
+    );
+  });
+  let registryPaths = relativePaths.map((path) => ({
+    path,
+    uid: createUid(path),
+  }));
+
+  if (registryPaths.length === 0)
+    throw new Error(
+      'Could not generate registry. No exportable modules found.'
+    );
+
+  const importStatements = registryPaths.map(
+    (file) => `import * as ${file.uid} from "${file.path}";`
+  );
+  const componentsToExport = registryPaths.map(
+    (file) => `  '${file.path}': lazyImport(${file.uid})`
+  );
+
+  logger.debug(
+    `Including ${componentsToExport.length} items in ${registryPath}`
+  );
+
+  let registryFileContent = `
+${importStatements.join('\n')}
+function lazyImport(pkgImport) {
+  return new Proxy(
+    {},
+    {
+      get: (_target, name) => {
+        if (name === '__esModule' || name === 'default') {
+          return pkgImport.default;
+        } else if(
+          name === '*'
+        ) {
+          return pkgImport;
+        } else {
+          return pkgImport[name];
+        }
+      },
+    }
+  )
+}
+export default {
+${componentsToExport.join(',\n')}
+};
+`;
+  await fs.writeFile(registryPath, registryFileContent);
+
+  return registryPath;
+}
+
+/**
+ * Generate a lazy registry file for the given project
+ *
+ * @param {Project} project - The project object
+ * @param {string[]} filePaths - The files whose exports will be included in the lazy registry
+ * @param {string} [lazyFilename="lazy.js"] - The name of the registry file
+ * @returns {Promise<string>} - The path to the generated lazy registry file
+ */
+export async function generateLazyRegistry(
+  project,
+  filePaths,
+  lazyFilename = 'lazy.js'
+) {
+  const lazyPath = ensureRegistryPath(project, lazyFilename);
+
+  const tsMorphProject = new TsMorphProject({
+    tsConfigFilePath: getProjectTsconfig(project.root),
+  });
+
+  /** @type {Record<string, string>} */
+  let allComponents = {};
+
+  for (const filePath of filePaths) {
+    const sourceFile = tsMorphProject.addSourceFileAtPath(filePath);
+    const exports = sourceFile
+      .getExportSymbols()
+      .filter(isJsExport)
+      .map((symbol) => symbol.getName());
+
+    for (const exportedComponent of exports) {
+      if (
+        exportedComponent !== 'default' &&
+        exportedComponent.match(/^[A-Z][a-z]+/)
+      ) {
+        if (
+          !allComponents[exportedComponent] ||
+          allComponents[exportedComponent].length < filePath.length // Make import path more specific
+        ) {
+          allComponents[exportedComponent] = toNodeResolvablePath(
+            filePath.replace(`${project.root}/src/`, `${project.name}/`)
+          );
+        }
+      }
+    }
+  }
+
+  const componentCount = Object.keys(allComponents).length;
+
+  if (componentCount === 0)
+    throw new Error(
+      'Could not generate lazy registry. No exportable components found.'
+    );
+
+  logger.debug(`Including ${componentCount} components in ${lazyPath}`);
+
+  const componentsToExport = Object.entries(allComponents)
+    .map(
+      ([component, filePath]) =>
+        `  '${component}': lazy(() => import('${filePath}').then((module) => ({ default: module['${component}'] })))`
+    )
+    .join(',\n');
+
+  const lazyFileContent = `import { lazy } from 'react';
+export default {
+${componentsToExport}
+};
+`;
+
+  await fs.writeFile(lazyPath, lazyFileContent);
+
+  return lazyPath;
+}
+
+/**
+ * Ensure that the registry file does not already exist at the given path
+ *
+ * @param {Project} project - The project object
+ * @param {string} fileName - The name of the registry file
+ */
+function ensureRegistryPath(project, fileName) {
+  const registryPath = path.join(project.root, project.src, fileName);
+  if (fs.existsSync(registryPath))
+    throw new Error(`A "${fileName}" file already exists at ${registryPath}.`);
+  return registryPath;
+}
+
+/**
+ * Extract a node-resolvable path
+ *
+ * @param {string} inputPath - The file path
+ * @returns {string} - The node-resolvable path
+ */
+function toNodeResolvablePath(inputPath) {
+  const dir = path.dirname(inputPath);
+  const base = path.basename(inputPath, path.extname(inputPath));
+
+  return base === 'index' ? dir : path.join(dir, base);
+}
+
+/**
+ * Create a UID from a path
+ *
+ * @param {string} inputPath - The path
+ * @returns {string} - The UID
+ */
+function createUid(inputPath) {
+  return inputPath.replace(/[/@\-.]/g, '_');
+}
+
+/**
+ * Check if a symbol is a JS export
+ *
+ * @param {import("ts-morph").Symbol} symbol - The symbol to check
+ */
+function isJsExport(symbol) {
+  const declarations = symbol.getDeclarations();
+  return declarations.some((declaration) => {
+    const kind = declaration.getKind();
+    return (
+      kind === SyntaxKind.FunctionDeclaration ||
+      kind === SyntaxKind.ClassDeclaration ||
+      kind === SyntaxKind.VariableDeclaration ||
+      kind === SyntaxKind.ExportSpecifier
+    );
+  });
+}

package/index.js

@@ -1,85 +1,176 @@
-import { DigigovCommand, resolveProject } from "@digigov/cli/lib";
-import copyFiles from "./copy-files.js";
+import { DigigovCommand, resolveProject, logger } from '@digigov/cli/lib';
+import { build } from '@rslib/core';
+import copyFiles from './copy-files.js';
 
-import fs from "fs-extra";
-import path from "path";
-import esbuild from "esbuild";
-import glob from "globby";
+import { Option } from 'commander';
+import path from 'path';
+import glob from 'globby';
+import assert from 'assert';
+import { getProjectTsconfig } from './common.js';
+import { generateLazyRegistry, generateRegistry } from './generate-registry.js';
+import transformImportsPlugin from './transform-imports-plugin.js';
 
-const command = new DigigovCommand("build", import.meta.url).action(build);
+const command = new DigigovCommand('build', import.meta.url)
+  .option(
+    '--generate-registry',
+    'Generate a registry file for the build output'
+  )
+  .addOption(
+    new Option('--include-stories', 'Include stories in the output').implies({
+      generateRegistry: true,
+    })
+  )
+  .action(main);
 export default command;
 
+const SRC_GLOB = 'src/**/*.{tsx,ts,js,jsx}';
+const TEST_GLOBS = [
+  '**/*.test.{js,jsx,ts,tsx}',
+  '**/*.spec.{js,jsx,ts,tsx}',
+  '**/__tests__/**/*.{js,jsx,ts,tsx}',
+];
+const STORIES_GLOBS = [
+  '**/*.stories.{js,jsx,ts,tsx}',
+  '**/__stories__/**/*.{js,jsx,ts,tsx}',
+  '**/__stories__/*.{js,jsx,ts,tsx}',
+];
+
 /**
+ * @param {object} options - The command options
+ * @param {boolean} options.generateRegistry - Generate a registry file for the build output
+ * @param {boolean} options.includeStories - Include stories in the generated registry file
  * @param {DigigovCommand} ctx
  */
-async function build(_, ctx) {
-  await ctx.exec("rimraf", ["dist"]);
-  const project = resolveProject();
+async function main(options, ctx) {
+  /** @type {string[]} */
+  let filesToDelete = [];
+  let isCleaningUp = false;
+  let signalHandlersRegistered = false;
 
-  const distDir = path.resolve(project.root, project.distDir);
-  const basename = path.basename(project.root);
+  const cleanup = async () => {
+    if (isCleaningUp) return;
+    isCleaningUp = true;
 
-  if (project.isTs) {
-    const tsconfigProduction = path.join(
-      project.root,
-      "tsconfig.production.json",
-    );
-    /** @type {string[]} */
-    const tsArgs = [];
-    if (fs.existsSync(tsconfigProduction)) {
-      tsArgs.push("--project", tsconfigProduction);
+    if (options.generateRegistry && filesToDelete.length > 0) {
+      logger.debug('Deleting temporary registry files...');
+      try {
+        await ctx.exec('rimraf', filesToDelete, {}, true);
+      } catch (error) {
+        logger.error('Error during cleanup:', error);
+      }
     }
-    await ctx.exec("tsc", [
-      "--emitDeclarationOnly",
-      "--outDir",
-      "dist",
-      ...tsArgs,
-    ]);
-    if (fs.existsSync(path.join(distDir, basename))) {
-      const typesIncluded = fs.readdirSync(path.join(distDir));
-      const paths = fs.readdirSync(path.join(distDir, basename, project.src));
-      paths.forEach((p) => {
-        fs.renameSync(
-          path.join(distDir, basename, project.src, p),
-          path.join(distDir, p),
-        );
-      });
-      typesIncluded.forEach((typesDir) => {
-        fs.rmSync(path.join(distDir, typesDir), { recursive: true });
-      });
+
+    // Remove signal handlers after cleanup
+    if (signalHandlersRegistered) {
+      process.off('SIGINT', handleSignal);
+      process.off('SIGTERM', handleSignal);
     }
-  }
+  };
 
-  const files = glob.sync(
-    path.join(project.root, "src", "**/*.{tsx,ts,js,jsx}"),
-    {
-      ignore: ["**/*.{spec,test}.{ts,tsx,js,jsx}"],
-    },
-  );
-  const commonBuildOptions = {
-    entryPoints: files,
-    platform: "node",
-    sourcemap: true,
-    target: ["esnext"],
-    logLevel: "error",
+  /** @param {string} signal */
+  const handleSignal = async (signal) => {
+    logger.log(`\nReceived ${signal}, cleaning up...`);
+    await cleanup();
+    process.exit(signal === 'SIGINT' ? 130 : 143);
   };
-  if (fs.existsSync(path.join(project.root, "tsconfig.production.json"))) {
-    commonBuildOptions["tsconfig"] = "tsconfig.production.json";
-  } else if (fs.existsSync(path.join(project.root, "tsconfig.json"))) {
-    commonBuildOptions["tsconfig"] = "tsconfig.json";
-  }
 
-  await Promise.all([
-    esbuild.build({
-      ...commonBuildOptions,
-      format: "esm",
-      outdir: `dist`,
-    }),
-    esbuild.build({
-      ...commonBuildOptions,
-      format: "cjs",
-      outdir: `dist/cjs`,
-    }),
-  ]);
-  copyFiles();
+  // Register signal handlers
+  process.on('SIGINT', handleSignal);
+  process.on('SIGTERM', handleSignal);
+  signalHandlersRegistered = true;
+
+  try {
+    const project = resolveProject();
+
+    await ctx.exec('rimraf', [project.distDir]);
+
+    /**
+     * The project tsconfig, or undefined if the project is not using TypeScript
+     * @type {string | undefined}
+     */
+    let tsconfig;
+    if (project.isTs) {
+      tsconfig = getProjectTsconfig(project.root);
+      assert(tsconfig, 'Expected tsconfig to be in project');
+    }
+
+    if (options.generateRegistry) {
+      logger.debug('Generating registry files...');
+
+      const initialFiles = await glob(path.join(project.root, SRC_GLOB), {
+        ignore: [...TEST_GLOBS, ...STORIES_GLOBS],
+      });
+
+      const filesToIncludeInRegistry = initialFiles.filter(
+        (file) => !(file.includes('native') || file.endsWith('.d.ts'))
+      );
+      let storiesFiles = null;
+      if (options.includeStories) {
+        logger.debug('Including stories in the registry...');
+
+        storiesFiles = await glob(
+          STORIES_GLOBS.map((glob) =>
+            path.join(project.root, project.src, glob)
+          ),
+          {
+            ignore: ['**/*.native.*, **/*.d.ts'],
+          }
+        );
+      }
+
+      filesToDelete = await Promise.all([
+        storiesFiles
+          ? generateRegistry(project, storiesFiles, 'stories-registry.ts')
+          : null,
+        generateRegistry(project, filesToIncludeInRegistry, 'registry.ts'),
+        generateLazyRegistry(project, filesToIncludeInRegistry, 'lazy.ts'),
+      ]).then((paths) => paths.filter((p) => p !== null));
+
+      logger.log('Generated registry files');
+    }
+
+    const IGNORE_BLOBS = [...TEST_GLOBS, ...STORIES_GLOBS].map(
+      (path) => `!${project.root}/${path}`
+    );
+
+    logger.debug('Building...');
+    await build({
+      source: {
+        tsconfigPath: tsconfig,
+        entry: {
+          index: [`${project.root}/${SRC_GLOB}`, ...IGNORE_BLOBS],
+        },
+      },
+      output: {
+        distPath: {
+          root: project.distDir,
+        },
+      },
+      lib: [
+        {
+          redirect: {
+            dts: {
+              extension: true,
+            },
+          },
+          bundle: false,
+          dts: {
+            bundle: false,
+            autoExtension: true,
+          },
+          format: 'esm',
+          plugins: [
+            transformImportsPlugin(project, ['@uides/react-qr-reader']),
+          ],
+        },
+      ],
+    });
+    logger.debug('Building done.');
+
+    logger.debug('Copying files to build directory...');
+    copyFiles();
+    logger.debug('Files copied.');
+  } finally {
+    await cleanup();
+  }
 }