@meistrari/mise-en-place 2.7.0 → 2.8.0

package/Makefile

@@ -3,10 +3,7 @@ default: help
 
 _MISE_EN_PLACE_PACKAGE_NAME = @meistrari/mise-en-place
 
-## Public commands
-
-.editorconfig: ./node_modules/$(_MISE_EN_PLACE_PACKAGE_NAME)/.editorconfig ## Copy/update .editorconfig file from @meistrari/mise-en-place package
-	@cp ./node_modules/$(_MISE_EN_PLACE_PACKAGE_NAME)/.editorconfig .editorconfig
+# region Public commands
 
 .PHONY: update-meistrari-libs
 update-meistrari-libs: ## Update @meistrari/* packages recursively in the workspace
@@ -14,13 +11,17 @@ update-meistrari-libs: ## Update @meistrari/* packages recursively in the worksp
 
 .PHONY: mise-en-place
 mise-en-place: .editorconfig ## Setup the mise en place to start cooking
-	@echo "export { default } from '$(_MISE_EN_PLACE_PACKAGE_NAME)/eslint'" > eslint.config.mjs
+	@npx mise-en-place postinstall
 	@echo "Mise en place is ready! 🍳"
 
-## Hidden commands
+# endregion
+
+# region Hidden
 
 .PHONY: help
 help:
 	@echo "Make tasks:"
 	@grep -hE '^[%a-zA-Z_-]+:.*?## .*$$' Makefile ./node_modules/$(_MISE_EN_PLACE_PACKAGE_NAME)/Makefile | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m  %-17s\033[0m %s\n", $$1, $$2}'
 	@echo ""
+
+# endregion

package/README.md

@@ -9,9 +9,9 @@ Add `mise-en-place postinstall` to your project's `package.json` `postinstall` s
 
 ```json
 {
-  "scripts": {
-    "postinstall": "mise-en-place postinstall"
-  }
+    "scripts": {
+        "postinstall": "mise-en-place postinstall"
+    }
 }
 ```
 
@@ -53,6 +53,6 @@ Add the following code in your `tsconfig.json` to include this project's TypeScr
 
 ```json
 {
-  "extends": "./node_modules/@meistrari/mise-en-place/tsconfig.base.json"
+    "extends": "./node_modules/@meistrari/mise-en-place/tsconfig.base.json"
 }
 ```

package/dist/cli/cli.mjs

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 import { argv } from 'node:process';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
-import { execSync } from 'node:child_process';
 import { globSync } from 'glob';
+import { execSync } from 'node:child_process';
 import { dirname } from 'node:path';
 import { parse } from 'yaml';
+import dedent from 'dedent';
 
 function readPackageJson(path) {
   return JSON.parse(readFileSync(path, "utf-8"));
@@ -209,17 +210,95 @@ function updateMeistrariLibraries(args) {
   }
 }
 
+const name = "@meistrari/mise-en-place";
+const packageJson = {
+	name: name};
+
+const {
+  name: packageName
+} = packageJson;
+const oldMakefileIncludeLine = "include ./node_modules/@meistrari/mise-en-place/Makefile";
+const makeFileIncludeLine = "-include ./node_modules/@meistrari/mise-en-place/Makefile";
 function handleMakefileInitialSetup() {
-  if (existsSync("Makefile")) {
-    console.log("Makefile already exists. Skipping initial setup");
+  if (!existsSync("Makefile")) {
+    console.log("No Makefile found. Generating one that includes mise-en-place Makefile.");
+    writeFileSync("Makefile", `${makeFileIncludeLine}
+`);
     return;
   }
-  console.log("No Makefile found. Generating one that includes mise-en-place Makefile.");
-  writeFileSync("Makefile", "-include ./node_modules/@meistrari/mise-en-place/Makefile\n");
-  execSync("make mise-en-place", { stdio: "inherit" });
+  const makefileContent = readFileSync("Makefile", "utf-8");
+  if (makefileContent.includes(makeFileIncludeLine.trim())) {
+    return;
+  }
+  if (makefileContent.includes(oldMakefileIncludeLine)) {
+    console.log();
+    writeFileSync("Makefile", makefileContent.replace(oldMakefileIncludeLine, makeFileIncludeLine));
+    return;
+  }
+  console.log("Adding mise-en-place Makefile include to existing Makefile.");
+  const newContent = `${makeFileIncludeLine}
+
+${makefileContent}`;
+  writeFileSync("Makefile", newContent);
+}
+const miseEnPlaceExtends = "./node_modules/@meistrari/mise-en-place/tsconfig.base.json";
+function handleTsConfig() {
+  if (!existsSync("tsconfig.json")) {
+    console.log("No tsconfig.json found. Generating one that extends mise-en-place tsconfig.json.");
+    writeFileSync(
+      "tsconfig.json",
+      dedent`{
+                "extends": "${miseEnPlaceExtends}"
+            }`
+    );
+    return;
+  }
+  const tsconfigRaw = readFileSync("tsconfig.json", "utf-8");
+  const tsconfigContent = JSON.parse(tsconfigRaw);
+  if (!tsconfigContent.extends) {
+    console.log("tsconfig.json has no extends field. Adding mise-en-place tsconfig as extends.");
+    tsconfigContent.extends = miseEnPlaceExtends;
+    writeFileSync("tsconfig.json", `${JSON.stringify(tsconfigContent, null, 4)}
+`);
+    return;
+  }
+  if (typeof tsconfigContent.extends === "string") {
+    if (tsconfigContent.extends === miseEnPlaceExtends) {
+      return;
+    }
+    console.log("tsconfig.json extends is a string. Converting to array and adding mise-en-place tsconfig.");
+    tsconfigContent.extends = [tsconfigContent.extends, miseEnPlaceExtends];
+    writeFileSync("tsconfig.json", `${JSON.stringify(tsconfigContent, null, 4)}
+`);
+    return;
+  }
+  if (Array.isArray(tsconfigContent.extends)) {
+    if (tsconfigContent.extends.includes(miseEnPlaceExtends)) {
+      return;
+    }
+    console.log("tsconfig.json extends is an array. Adding mise-en-place tsconfig to the extends array.");
+    tsconfigContent.extends.push(miseEnPlaceExtends);
+    writeFileSync("tsconfig.json", `${JSON.stringify(tsconfigContent, null, 4)}
+`);
+    return;
+  }
+  console.error(tsconfigContent.extends);
+  throw new Error("Unhandled tsconfig.json extends field type");
+}
+function handleEslintConfigFile() {
+  const eslintContent = `export { default } from '${packageName}/eslint'
+`;
+  writeFileSync("eslint.config.mjs", eslintContent);
+}
+function handleEditorconfigFile() {
+  const editorconfigContent = readFileSync(`./node_modules/${packageName}/.editorconfig`, "utf-8");
+  writeFileSync(".editorconfig", editorconfigContent);
 }
 function postinstall(args) {
   handleMakefileInitialSetup();
+  handleTsConfig();
+  handleEslintConfigFile();
+  handleEditorconfigFile();
   updateMeistrariLibraries(args);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meistrari/mise-en-place",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "",
   "repository": {
     "type": "git",
@@ -35,6 +35,7 @@
   "homepage": "https://github.com/meistrari/mise-en-place#readme",
   "dependencies": {
     "@antfu/eslint-config": "6.2.0",
+    "dedent": "1.7.1",
     "eslint": "9.39.1",
     "eslint-plugin-diff": "2.0.3",
     "eslint-plugin-drizzle": "0.2.3",