@digdir/designsystemet 1.12.1 → 1.13.0

package/dist/bin/config.d.ts

@@ -1,12 +1,12 @@
 import type { Command, OptionValues } from '@commander-js/extra-typings';
 import { type BuildConfigSchema, type CreateConfigSchema } from '../src/config.js';
-export declare function readConfigFile(configPath: string, allowFileNotFound?: boolean): Promise<string>;
+export declare function readConfigFile(configFilePath: string, allowFileNotFound?: boolean): Promise<string>;
 export declare function parseCreateConfig(configFile: string, options: {
     theme: string;
     cmd: Command<unknown[], OptionValues>;
-    configPath: string;
+    configFilePath: string;
 }): Promise<CreateConfigSchema>;
-export declare function parseBuildConfig(configFile: string, { configPath }: {
-    configPath: string;
+export declare function parseBuildConfig(configFile: string, { configFilePath }: {
+    configFilePath: string;
 }): Promise<BuildConfigSchema>;
 //# sourceMappingURL=config.d.ts.map

package/dist/bin/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../bin/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGzE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAKxB,MAAM,kBAAkB,CAAC;AAI1B,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,UAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBlG;AAED,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACpF,OAAO,CAAC,kBAAkB,CAAC,CAiE7B;AAED,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,iBAAiB,CAAC,CAI5B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../bin/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGzE,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAKxB,MAAM,kBAAkB,CAAC;AAI1B,wBAAsB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,iBAAiB,UAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBtG;AAED,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,GACxF,OAAO,CAAC,kBAAkB,CAAC,CAiE7B;AAED,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,EAAE,cAAc,EAAE,EAAE;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,GAC7C,OAAO,CAAC,iBAAiB,CAAC,CAI5B"}

package/dist/bin/config.js

@@ -1,5 +1,4 @@
 // bin/config.ts
-import path2 from "path";
 import pc3 from "picocolors";
 import * as R8 from "ramda";
 
@@ -360,24 +359,24 @@ function makeFriendlyError(err) {
     console.error(err instanceof Error ? err.stack : "No stack trace available");
   }
 }
-function validateConfig(schema, unvalidatedConfig, configPath) {
+function validateConfig(schema, unvalidatedConfig, configFilePath) {
   try {
     return schema.parse(unvalidatedConfig);
   } catch (err) {
-    console.error(pc.redBright(`Invalid config file at ${pc.red(configPath)}`));
+    console.error(pc.redBright(`Invalid config file at ${pc.red(configFilePath)}`));
     const validationError = makeFriendlyError(err);
     console.error(validationError?.toString());
     process.exit(1);
   }
 }
-function parseConfig(configFile, configPath) {
+function parseConfig(configFile, configFilePath) {
   if (!configFile) {
     return {};
   }
   try {
     return JSON.parse(configFile);
   } catch (err) {
-    console.error(pc.redBright(`Failed parsing config file at ${pc.red(configPath)}`));
+    console.error(pc.redBright(`Failed parsing config file at ${pc.red(configFilePath)}`));
     const validationError = makeFriendlyError(err);
     console.error(validationError?.toString());
     process.exit(1);
@@ -456,23 +455,130 @@ var _configFileCreateSchema = z.object({
 }).required();
 var configFileCreateSchema = _configFileCreateSchema.extend(commonConfig.shape);
 
-// src/utils.ts
+// src/utils/filesystem.ts
 import fs from "fs/promises";
+import path2 from "path";
 import pc2 from "picocolors";
-var readFile = async (path3, dry, allowFileNotFound) => {
-  if (dry) {
-    console.log(`${pc2.blue("readFile")} ${path3}`);
-    return Promise.resolve("");
-  }
-  try {
-    return await fs.readFile(path3, "utf-8");
-  } catch (error) {
-    if (allowFileNotFound && error.code === "ENOENT") {
-      return "";
+var FileSystem = class {
+  isInitialized = false;
+  dry = false;
+  verbose = false;
+  /** Default working directory is where the process was started */
+  workingDir = process.cwd();
+  outDir = this.workingDir;
+  /** Initialize the file system */
+  init({ dry, outdir, verbose }) {
+    if (this.isInitialized) {
+      console.warn(pc2.yellow("FileSystem is already initialized. Ignoring subsequent init call."));
+      return;
+    }
+    if (dry) {
+      console.log(pc2.blue("Initializing FileSystem in dry-run mode. No files will be written."));
     }
-    throw error;
+    this.dry = dry ?? false;
+    this.verbose = verbose ?? false;
+    this.outDir = outdir ? path2.isAbsolute(outdir) ? outdir : path2.join(this.workingDir, outdir) : this.workingDir;
+    if (this.verbose) {
+      console.log(
+        `FileSystem initialized with workingDir: ${pc2.green(this.workingDir)}, outDir: ${pc2.green(this.outDir)}`
+      );
+    }
+    this.isInitialized = true;
   }
+  /**
+   * Creates a directory if it does not already exist.
+   *
+   * @param dir - The path of the directory to create.
+   *
+   * @returns A promise that resolves when the operation is complete.
+   * If the directory already exists or `dry` is `true`, the promise resolves immediately.
+   */
+  mkdir = async (dir) => {
+    if (this.dry) {
+      console.log(`${pc2.blue("mkdir")} ${dir}`);
+      return Promise.resolve();
+    }
+    const exists = await fs.access(dir, fs.constants.F_OK).then(() => true).catch(() => false);
+    if (exists) {
+      return Promise.resolve();
+    }
+    return fs.mkdir(dir, { recursive: true });
+  };
+  writeFile = async (path3, data) => {
+    if (this.dry) {
+      console.log(`${pc2.blue("writeFile")} ${path3}`);
+      return Promise.resolve();
+    }
+    return fs.writeFile(path3, data, { encoding: "utf-8" }).catch((error) => {
+      console.error(pc2.red(`Error writing file: ${path3}`));
+      console.error(pc2.red(error));
+      throw error;
+    });
+  };
+  cp = async (src, dest, filter) => {
+    if (this.dry) {
+      console.log(`${pc2.blue("cp")} ${src} ${dest}`);
+      return Promise.resolve();
+    }
+    return fs.cp(src, dest, { recursive: true, filter });
+  };
+  copyFile = async (src, dest) => {
+    if (this.dry) {
+      console.log(`${pc2.blue("copyFile")} ${src} to ${dest}`);
+      return Promise.resolve();
+    }
+    return fs.copyFile(src, dest);
+  };
+  cleanDir = async (dir) => {
+    if (this.dry) {
+      console.log(`${pc2.blue("cleanDir")} ${dir}`);
+      return Promise.resolve();
+    }
+    console.log(`
+\u{1F525} Cleaning dir ${pc2.red(`${dir.trim()}`)} `);
+    return fs.rm(dir, { recursive: true, force: true });
+  };
+  readFile = async (path3, allowFileNotFound) => {
+    if (this.dry) {
+      console.log(`${pc2.blue("readFile")} ${path3}`);
+    }
+    try {
+      return await fs.readFile(path3, "utf-8");
+    } catch (error) {
+      if (allowFileNotFound && error.code === "ENOENT") {
+        return "";
+      }
+      throw error;
+    }
+  };
+  readdir = async (path3) => {
+    if (this.dry) {
+      console.log(`${pc2.blue("readdir")} ${path3}`);
+    }
+    try {
+      return await fs.readdir(path3);
+    } catch (error) {
+      if (error.code === "ENOENT") {
+        return [];
+      }
+      throw error;
+    }
+  };
+  writeFiles = async (files, outDir, log) => {
+    for (const { destination: filename, output } of files) {
+      if (filename) {
+        const filePath = path2.join(outDir, filename);
+        const fileDir = path2.dirname(filePath);
+        if (log) {
+          console.log(filename);
+        }
+        await this.mkdir(fileDir);
+        await this.writeFile(filePath, output);
+      }
+    }
+  };
 };
+var dsfs = new FileSystem();
 
 // bin/options.ts
 var getOptionIfMatchingSource = (...sources) => (command, option) => {
@@ -486,26 +592,25 @@ var getDefaultCliOption = getOptionIfMatchingSource("default");
 var getCliOption = getOptionIfMatchingSource("cli", "default");
 
 // bin/config.ts
-async function readConfigFile(configPath, allowFileNotFound = true) {
-  const resolvedPath = path2.resolve(process.cwd(), configPath);
+async function readConfigFile(configFilePath, allowFileNotFound = true) {
   let configFile;
   try {
-    configFile = await readFile(resolvedPath, false, allowFileNotFound);
+    configFile = await dsfs.readFile(configFilePath, allowFileNotFound);
   } catch (err) {
     if (allowFileNotFound) {
       return "";
     }
-    console.error(pc3.redBright(`Could not read config file at ${pc3.blue(resolvedPath)}`));
+    console.error(pc3.redBright(`Could not read config file at ${pc3.blue(configFilePath)}`));
     throw err;
   }
   if (configFile) {
-    console.log(`Found config file: ${pc3.green(resolvedPath)}`);
+    console.log(`Found config file: ${pc3.green(configFilePath)}`);
   }
   return configFile;
 }
 async function parseCreateConfig(configFile, options) {
-  const { cmd, theme = "theme", configPath } = options;
-  const configParsed = parseConfig(configFile, configPath);
+  const { cmd, theme = "theme", configFilePath } = options;
+  const configParsed = parseConfig(configFile, configFilePath);
   const themeColors = Object.values(configParsed?.themes ?? {}).map(
     (x) => /* @__PURE__ */ new Set([...R8.keys(x.colors.main), ...R8.keys(x.colors.support)])
   );
@@ -548,11 +653,11 @@ async function parseCreateConfig(configFile, options) {
       }
     )
   });
-  return validateConfig(configFileCreateSchema, unvalidatedConfig, configPath);
+  return validateConfig(configFileCreateSchema, unvalidatedConfig, configFilePath);
 }
-async function parseBuildConfig(configFile, { configPath }) {
-  const configParsed = parseConfig(configFile, configPath);
-  return validateConfig(commonConfig, configParsed, configPath);
+async function parseBuildConfig(configFile, { configFilePath }) {
+  const configParsed = parseConfig(configFile, configFilePath);
+  return validateConfig(commonConfig, configParsed, configFilePath);
 }
 export {
   parseBuildConfig,

package/dist/bin/designsystemet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"designsystemet.d.ts","sourceRoot":"","sources":["../../bin/designsystemet.ts"],"names":[],"mappings":";AAeA,eAAO,MAAM,WAAW,4iBASvB,CAAC"}
+{"version":3,"file":"designsystemet.d.ts","sourceRoot":"","sources":["../../bin/designsystemet.ts"],"names":[],"mappings":";AAgBA,eAAO,MAAM,WAAW,4iBASvB,CAAC"}