@citolab/tspci 2.8.2 → 2.9.7

package/scripts/test-init-matrix.sh

@@ -16,6 +16,16 @@ clean_dir_contents() {
 mkdir -p "${NPM_CACHE_DIR}"
 clean_dir_contents "${TEST_ROOT}"
 
+# On Windows (Git Bash), convert Unix-style paths to native Windows paths so
+# npm can resolve file: references correctly. No-op on Linux/macOS.
+npm_path() {
+  if command -v cygpath &>/dev/null; then
+    cygpath -m "$1"
+  else
+    echo "$1"
+  fi
+}
+
 TARBALLS=()
 cleanup() {
   for file in "${TARBALLS[@]:-}"; do
@@ -37,7 +47,7 @@ pack_local_pkg() {
   local tgz
   prepare_pkg_for_pack "${pkg_dir}"
   echo "  - packing ${pkg_name}" >&2
-  tgz="$(cd "${pkg_dir}" && npm pack --silent --ignore-scripts --cache "${NPM_CACHE_DIR}" | tail -n 1)"
+  tgz="$(cd "${pkg_dir}" && npm pack --silent --ignore-scripts --cache "${NPM_CACHE_DIR}" | tail -n 1 | tr -d '\r')"
   local full_path="${pkg_dir}/${tgz}"
   TARBALLS+=("${full_path}")
   echo "${full_path}"
@@ -76,7 +86,7 @@ create_project() {
       pkg.dependencies["@citolab/preact-store"] = `file:${preactStoreTar}`;
     }
     fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
-  ' "${project_dir}/package.json" "${TSPCI_TGZ}" "${PREACT_STORE_TGZ}"
+  ' "${project_dir}/package.json" "$(npm_path "${TSPCI_TGZ}")" "$(npm_path "${PREACT_STORE_TGZ}")"
 
   (cd "${project_dir}" && npm install --cache "${NPM_CACHE_DIR}" --workspaces=false)
 }
@@ -112,21 +122,21 @@ run_base_build "${TEST_ROOT}/TypeScriptTailwindPci"
 
 echo "Scenario 4: add tspci-qbci and export .ci package"
 create_project "QbciPci" "typescript" "QBCI export matrix test"
-(cd "${TEST_ROOT}/QbciPci" && npm install --save-dev "file:${QBCI_TGZ}" --cache "${NPM_CACHE_DIR}" --workspaces=false)
+(cd "${TEST_ROOT}/QbciPci" && npm install --save-dev "file:$(npm_path "${QBCI_TGZ}")" --cache "${NPM_CACHE_DIR}" --workspaces=false)
 (cd "${TEST_ROOT}/QbciPci" && npm run tspci -- add --target qbci)
 (cd "${TEST_ROOT}/QbciPci" && npm run prod -- --target qbci)
 ls "${TEST_ROOT}/QbciPci/ci-dist/"*.ci >/dev/null
 
 echo "Scenario 5: add tspci-qti3 and export qti3 zip"
 create_project "Qti3Pci" "typescript" "QTI3 export matrix test"
-(cd "${TEST_ROOT}/Qti3Pci" && npm install --save-dev "file:${QTI3_TGZ}" --cache "${NPM_CACHE_DIR}" --workspaces=false)
+(cd "${TEST_ROOT}/Qti3Pci" && npm install --save-dev "file:$(npm_path "${QTI3_TGZ}")" --cache "${NPM_CACHE_DIR}" --workspaces=false)
 (cd "${TEST_ROOT}/Qti3Pci" && npm run tspci -- add --target qti3)
 (cd "${TEST_ROOT}/Qti3Pci" && npm run prod -- --target qti3)
 ls "${TEST_ROOT}/Qti3Pci/qti3-dist/"*.zip >/dev/null
 
 echo "Scenario 6: add tspci-tao and export tao zip"
 create_project "TaoPci" "typescript" "TAO export matrix test"
-(cd "${TEST_ROOT}/TaoPci" && npm install --save-dev "file:${TAO_TGZ}" --cache "${NPM_CACHE_DIR}" --workspaces=false)
+(cd "${TEST_ROOT}/TaoPci" && npm install --save-dev "file:$(npm_path "${TAO_TGZ}")" --cache "${NPM_CACHE_DIR}" --workspaces=false)
 (cd "${TEST_ROOT}/TaoPci" && npm run tspci -- add --target tao --ci)
 node -e '
   const fs = require("fs");
@@ -146,7 +156,7 @@ ls "${TEST_ROOT}/TaoPci/dist/tao-pci-"*.zip >/dev/null
 
 echo "Scenario 7: preact-store with TypeScript + tailwind builds"
 create_project "TailwindPreactStorePci" "preact+tailwind" "Tailwind + preact-store matrix test"
-(cd "${TEST_ROOT}/TailwindPreactStorePci" && npm install --save "file:${PREACT_STORE_TGZ}" --cache "${NPM_CACHE_DIR}" --workspaces=false)
+(cd "${TEST_ROOT}/TailwindPreactStorePci" && npm install --save "file:$(npm_path "${PREACT_STORE_TGZ}")" --cache "${NPM_CACHE_DIR}" --workspaces=false)
 run_base_build "${TEST_ROOT}/TailwindPreactStorePci"
 
 echo ""

package/src/cli.js

@@ -9,12 +9,13 @@ import fs from "fs";
 import os from "os";
 import clear from "clear";
 import figlet from "figlet";
-import inquirer from "inquirer";
+import chokidar from "chokidar";
+import { select } from "@inquirer/prompts";
 
 const args = process.argv.slice(2);
 
 // PK: retreive dirname, most of the time automaticly inserted in es modules
-import { fileURLToPath } from "url";
+import { fileURLToPath, pathToFileURL } from "url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
@@ -22,6 +23,52 @@ const PACKAGE_ROOT_PATH = process.cwd();
 const PACKAGE_DIST_PATH = path.join(PACKAGE_ROOT_PATH, "dist");
 const NODE_MODULES = path.join(process.cwd(), "node_modules");
 
+const getDevIndexHtmlSourceCandidates = (target = "IMS") => {
+  const projectSource = path.join(PACKAGE_ROOT_PATH, "src/index.html");
+  const templateSource =
+    target === "IMS"
+      ? path.join(__dirname, "../public/index.html")
+      : path.join(NODE_MODULES, `@citolab/tspci-${target}/public/index.html`);
+  return { projectSource, templateSource };
+};
+
+const resolveActiveDevIndexHtmlSource = (target = "IMS") => {
+  const { projectSource, templateSource } = getDevIndexHtmlSourceCandidates(target);
+  return fs.existsSync(projectSource) ? projectSource : templateSource;
+};
+
+const copyDevIndexHtmlToDist = (target = "IMS", reason = "initial") => {
+  const source = resolveActiveDevIndexHtmlSource(target);
+  if (!fs.existsSync(source)) {
+    throw new Error(`No index.html template found for dev mode. Expected: ${source}`);
+  }
+  fs.copyFileSync(source, path.join(PACKAGE_DIST_PATH, "index.html"));
+  console.log(`index.html copied to dist (${reason}) from ${source}`);
+};
+
+const watchDevIndexHtmlSources = (target = "IMS") => {
+  const { projectSource, templateSource } = getDevIndexHtmlSourceCandidates(target);
+  const watcher = chokidar.watch([projectSource, templateSource], {
+    ignoreInitial: true,
+    awaitWriteFinish: {
+      stabilityThreshold: 120,
+      pollInterval: 20,
+    },
+  });
+
+  watcher.on("all", (event, changedPath) => {
+    try {
+      copyDevIndexHtmlToDist(target, `${event}: ${changedPath}`);
+    } catch (err) {
+      console.error(`Failed to refresh index.html after ${event} on ${changedPath}`, err);
+    }
+  });
+
+  const closeWatcher = () => watcher.close();
+  process.on("SIGINT", closeWatcher);
+  process.on("SIGTERM", closeWatcher);
+};
+
 // https://rollupjs.org/guide/en/#programmatically-loading-a-config-file
 const watchBuild = (devServer = false, target = "IMS") => {
   const rollupFile = devServer ? "rollup.config.dev.js" : "rollup.config.js";
@@ -36,27 +83,8 @@ const watchBuild = (devServer = false, target = "IMS") => {
   }
   if (devServer) {
     try {
-      if (fs.existsSync(path.join(PACKAGE_ROOT_PATH, "src/index.html"))) {
-        fs.copyFile(
-          path.join(PACKAGE_ROOT_PATH, "src/index.html"),
-          path.join(PACKAGE_DIST_PATH, "index.html"),
-          (err) => {
-            if (err) throw err;
-            console.log("using index.html found in src/index.html, copied to dist");
-          }
-        );
-      } else {
-        let fileToCopy;
-        if (target == "IMS") {
-          fileToCopy = path.join(__dirname, `../public/index.html`);
-        } else {
-          fileToCopy = path.join(NODE_MODULES, `@citolab/tspci-${target}/public/index.html`);
-        }
-        fs.copyFile(fileToCopy, path.join(PACKAGE_DIST_PATH, "index.html"), (err) => {
-          if (err) throw err;
-          console.log("using index.html was copied to /dist folder pci");
-        });
-      }
+      copyDevIndexHtmlToDist(target);
+      watchDevIndexHtmlSources(target);
     } catch (err) {
       console.error(err);
     }
@@ -110,16 +138,13 @@ const prodBuild = async () => {
   });
 };
 
-function selectOptions(prompt, options) {
-  return inquirer.prompt([
-    {
-      type: "list",
-      message: prompt,
-      name: "value",
-      choices: options,
-      default: options[0],
-    },
-  ]);
+async function selectOptions(prompt, options) {
+  const value = await select({
+    message: prompt,
+    choices: options.map((o) => ({ value: o })),
+    default: options[0],
+  });
+  return { value };
 }
 
 function askOption(prompt) {
@@ -446,7 +471,7 @@ const run = async () => {
       let init = false;
       if (fs.existsSync(scriptFile)) {
         // run init() script
-        import(`file:///${scriptFile}`).then((script) => {
+        import(pathToFileURL(scriptFile).href).then((script) => {
           if (script.init) {
             init = true;
             console.log(chalk.green(`Running init script for ${targetName}`));
@@ -511,7 +536,7 @@ const run = async () => {
       return;
     }
     const scriptFile = path.join(path.join(path.join(NODE_MODULES, `${targetName}`), "src"), `createPackage.mjs`);
-    import(`file:///${scriptFile}`).then((script) => {
+    import(pathToFileURL(scriptFile).href).then((script) => {
       script.bundle();
     });
   });