Fix the dependency on css for good this time (hopefully)

Author: garronej

src/bin/css_to_ts/css_to_ts.ts

@@ -5,18 +5,11 @@ import { getProjectRoot } from "../tools/getProjectRoot";
 import { generateTypographyTsCode } from "./typography";
 import { generateSpacingTsCode } from "./spacing";
 import { generateClassNamesTsCode } from "./classNames";
+import { collectIcons } from "./icons";
 import * as fs from "fs";
-import { readFile } from "fs/promises";
-import {
-    join as pathJoin,
-    basename as pathBasename,
-    relative as pathRelative,
-    dirname as pathDirname
-} from "path";
-import { crawl } from "../tools/crawl";
-import { id } from "tsafe/id";
+import { join as pathJoin, basename as pathBasename, relative as pathRelative } from "path";
 
-export async function main() {
+(async () => {
     const projectRoot = getProjectRoot();
 
     const dsfrDistDirPath = pathJoin(projectRoot, "dsfr");
@@ -124,71 +117,4 @@ export async function main() {
             "utf8"
         )
     );
-}
-
-export type Icon = Icon.Dsfr | Icon.Remixicon;
-
-export namespace Icon {
-    export type Common = {
-        iconId: string;
-    };
-
-    export type Dsfr = Common & {
-        prefix: "fr-icon-";
-        category: string;
-    };
-
-    export type Remixicon = Common & {
-        prefix: "ri-";
-        rawSvgCode: string;
-    };
-}
-
-export async function collectIcons(params: {
-    dsfrDistDirPath: string;
-    remixiconDirPath: string;
-}): Promise<Icon[]> {
-    const { dsfrDistDirPath, remixiconDirPath } = params;
-
-    return (
-        await Promise.all([
-            (async () => {
-                const iconDirPath = pathJoin(remixiconDirPath, "icons");
-
-                return Promise.all(
-                    (await crawl({ "dirPath": iconDirPath }))
-                        .filter(filePath => filePath.endsWith(".svg"))
-                        .map(async svgFilePath =>
-                            id<Icon.Remixicon>({
-                                "prefix": "ri-",
-                                "iconId": pathBasename(svgFilePath).replace(/\.svg$/, ""),
-                                "rawSvgCode": (
-                                    await readFile(pathJoin(iconDirPath, svgFilePath))
-                                ).toString("utf8")
-                            })
-                        )
-                );
-            })(),
-            (async () =>
-                (
-                    await crawl({
-                        "dirPath": pathJoin(dsfrDistDirPath, "icons"),
-                        "getDoCrawlInDir": ({ relativeDirPath }) =>
-                            pathBasename(relativeDirPath) !== "remixicon"
-                    })
-                )
-                    .filter(filePath => filePath.endsWith(".svg"))
-                    .map(svgFilePath =>
-                        id<Icon.Dsfr>({
-                            "prefix": "fr-icon-",
-                            "category": pathBasename(pathDirname(svgFilePath)),
-                            "iconId": pathBasename(svgFilePath).replace(/\.svg$/, "")
-                        })
-                    ))()
-        ])
-    ).flat();
-}
-
-if (require.main === module) {
-    main();
-}
+})();

src/bin/css_to_ts/icons/collectIcons.ts

@@ -0,0 +1,67 @@
+import { readFile } from "fs/promises";
+import { join as pathJoin, basename as pathBasename, dirname as pathDirname } from "path";
+import { id } from "tsafe/id";
+import { crawl } from "../../tools/crawl";
+
+export type Icon = Icon.Dsfr | Icon.Remixicon;
+
+export namespace Icon {
+    export type Common = {
+        iconId: string;
+    };
+
+    export type Dsfr = Common & {
+        prefix: "fr-icon-";
+        category: string;
+    };
+
+    export type Remixicon = Common & {
+        prefix: "ri-";
+        rawSvgCode: string;
+    };
+}
+
+export async function collectIcons(params: {
+    dsfrDistDirPath: string;
+    remixiconDirPath: string;
+}): Promise<Icon[]> {
+    const { dsfrDistDirPath, remixiconDirPath } = params;
+
+    return (
+        await Promise.all([
+            (async () => {
+                const iconDirPath = pathJoin(remixiconDirPath, "icons");
+
+                return Promise.all(
+                    (await crawl({ "dirPath": iconDirPath }))
+                        .filter(filePath => filePath.endsWith(".svg"))
+                        .map(async svgFilePath =>
+                            id<Icon.Remixicon>({
+                                "prefix": "ri-",
+                                "iconId": pathBasename(svgFilePath).replace(/\.svg$/, ""),
+                                "rawSvgCode": (
+                                    await readFile(pathJoin(iconDirPath, svgFilePath))
+                                ).toString("utf8")
+                            })
+                        )
+                );
+            })(),
+            (async () =>
+                (
+                    await crawl({
+                        "dirPath": pathJoin(dsfrDistDirPath, "icons"),
+                        "getDoCrawlInDir": ({ relativeDirPath }) =>
+                            pathBasename(relativeDirPath) !== "remixicon"
+                    })
+                )
+                    .filter(filePath => filePath.endsWith(".svg"))
+                    .map(svgFilePath =>
+                        id<Icon.Dsfr>({
+                            "prefix": "fr-icon-",
+                            "category": pathBasename(pathDirname(svgFilePath)),
+                            "iconId": pathBasename(svgFilePath).replace(/\.svg$/, "")
+                        })
+                    ))()
+        ])
+    ).flat();
+}

src/bin/css_to_ts/icons/generateIconsRawCssCode.ts

@@ -1,4 +1,4 @@
-import type { Icon } from "../css_to_ts";
+import type { Icon } from "../icons";
 
 type IconLike = Icon.Dsfr | Omit<Icon.Remixicon, "rawSvgCode">;
 

src/bin/css_to_ts/icons/index.ts

@@ -1,2 +1,3 @@
 export * from "./generateIconsRawCssCode";
 export * from "./getPatchedRawCssCodeForCompatWithRemixIcon";
+export * from "./collectIcons";

src/bin/css_to_ts/index.ts

@@ -1,6 +1 @@
-export * from "./css_to_ts";
-import { main } from "./css_to_ts";
-
-if (require.main === module) {
-    main();
-}
+import "./css_to_ts";

src/bin/only_include_used_icons.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-import { collectIcons } from "./css_to_ts";
+import { collectIcons } from "./css_to_ts/icons/collectIcons";
+import type { Icon } from "./css_to_ts/icons/collectIcons";
 import { generateIconsRawCssCode } from "./css_to_ts/icons/generateIconsRawCssCode";
 import { pathOfPatchedRawCssCodeForCompatWithRemixIconRelativeToDsfrDist } from "./css_to_ts/icons/getPatchedRawCssCodeForCompatWithRemixIcon/pathOfPatchedRawCssCodeForCompatWithRemixIconRelativeToDsfrDist";
 import { getProjectRoot } from "./tools/getProjectRoot";
@@ -10,7 +11,6 @@ import { exclude } from "tsafe/exclude";
 import { writeFile, readFile } from "fs/promises";
 import { crawl } from "./tools/crawl";
 import { basename as pathBasename } from "path";
-import type { Icon } from "./css_to_ts";
 import type { Equals } from "tsafe";
 
 (async () => {