@sdeverywhere/create 0.2.25 → 0.2.27

package/dist/index.cjs

@@ -97,7 +97,6 @@ var import_path = require("path");
 var import_colors2 = require("kleur/colors");
 var import_ora2 = __toESM(require("ora"), 1);
 var import_prompts2 = __toESM(require("prompts"), 1);
-var import_yaml = __toESM(require("yaml"), 1);
 var import_compile = require("@sdeverywhere/compile");
 var sampleChecksContent = `# yaml-language-server: $schema=SCHEMA_PATH
 
@@ -144,7 +143,7 @@ async function updateSdeConfig(projDir, mdlPath, genFormat) {
   const configPath = (0, import_path.join)(projDir, "sde.config.js");
   let configText = await (0, import_promises.readFile)(configPath, "utf8");
   configText = configText.replace(`const genFormat = 'js'`, `const genFormat = '${genFormat}'`);
-  configText = configText.replaceAll("MODEL_NAME.mdl", mdlPath);
+  configText = configText.replaceAll("model/MODEL_NAME.mdl", mdlPath);
   await (0, import_promises.writeFile)(configPath, configText);
 }
 async function generateYaml(projDir, kind, template) {
@@ -282,16 +281,21 @@ async function chooseGenGraphConfig(projDir, mdlVars) {
       }
     }
   );
+  const graphsCsvFile = (0, import_path.join)(projDir, "config", "graphs.csv");
+  const origGraphsCsvContent = await (0, import_promises.readFile)(graphsCsvFile, "utf8");
+  const graphsCsvHeader = origGraphsCsvContent.split("\n")[0];
+  let newGraphsCsvContent = `${graphsCsvHeader}
+`;
+  if (varsResponse.vars.length > 0) {
+    const csvLine = graphsCsvLine(varsResponse.vars);
+    newGraphsCsvContent += `${csvLine}
+`;
+  }
+  await (0, import_promises.writeFile)(graphsCsvFile, newGraphsCsvContent);
   if (varsResponse.vars.length === 0) {
     (0, import_ora2.default)().info((0, import_colors2.dim)(`No variables selected. You can edit the "${(0, import_colors2.cyan)("config/graphs.csv")}" file later.`));
     return;
   }
-  const graphsCsvFile = (0, import_path.join)(projDir, "config", "graphs.csv");
-  const csvLine = graphsCsvLine(varsResponse.vars);
-  let graphsCsvContent = await (0, import_promises.readFile)(graphsCsvFile, "utf8");
-  graphsCsvContent += `${csvLine}
-`;
-  await (0, import_promises.writeFile)(graphsCsvFile, graphsCsvContent);
   (0, import_ora2.default)(
     (0, import_colors2.green)(`Added graph to "${(0, import_colors2.bold)("config/graphs.csv")}". ${(0, import_colors2.dim)("You can configure graphs in that file later.")}`)
   ).succeed();
@@ -365,24 +369,29 @@ async function chooseGenSliderConfig(projDir, mdlVars) {
       }
     }
   );
-  if (varsResponse.vars.length === 0) {
-    (0, import_ora2.default)().info((0, import_colors2.dim)(`No variables selected. You can edit the "${(0, import_colors2.cyan)("config/inputs.csv")}" file later.`));
-    return;
-  }
   const inputsCsvFile = (0, import_path.join)(projDir, "config", "inputs.csv");
-  let inputsCsvContent = await (0, import_promises.readFile)(inputsCsvFile, "utf8");
-  let idNumber = 1;
-  for (const inputVarName of varsResponse.vars) {
-    const inputVar = mdlVars.find((v) => v.name === inputVarName);
-    if (inputVar && inputVar.kind === "const") {
-      const defaultValue = inputVar.value;
-      const csvLine = inputsCsvLine(inputVarName, defaultValue, idNumber.toString());
-      inputsCsvContent += `${csvLine}
+  const origInputsCsvContent = await (0, import_promises.readFile)(inputsCsvFile, "utf8");
+  const inputsCsvHeader = origInputsCsvContent.split("\n")[0];
+  let newInputsCsvContent = `${inputsCsvHeader}
 `;
-      idNumber++;
+  if (varsResponse.vars.length > 0) {
+    let idNumber = 1;
+    for (const inputVarName of varsResponse.vars) {
+      const inputVar = mdlVars.find((v) => v.name === inputVarName);
+      if (inputVar && inputVar.kind === "const") {
+        const defaultValue = inputVar.value;
+        const csvLine = inputsCsvLine(inputVarName, defaultValue, idNumber.toString());
+        newInputsCsvContent += `${csvLine}
+`;
+        idNumber++;
+      }
     }
   }
-  await (0, import_promises.writeFile)(inputsCsvFile, inputsCsvContent);
+  await (0, import_promises.writeFile)(inputsCsvFile, newInputsCsvContent);
+  if (varsResponse.vars.length === 0) {
+    (0, import_ora2.default)().info((0, import_colors2.dim)(`No variables selected. You can edit the "${(0, import_colors2.cyan)("config/inputs.csv")}" file later.`));
+    return;
+  }
   const slidersText = varsResponse.vars.length > 1 ? "sliders" : "sliders";
   (0, import_ora2.default)(
     (0, import_colors2.green)(
@@ -421,9 +430,10 @@ async function readModelVars(projDir, mdlPath) {
   const mdlDir = (0, import_path.dirname)(mdlFile);
   const mdlName = (0, import_path.parse)(mdlFile).name;
   await (0, import_compile.parseAndGenerate)(mdlContent, spec, ["printVarList"], mdlDir, mdlName, buildDir);
-  const varsYamlFile = (0, import_path.join)(buildDir, `${mdlName}_vars.yaml`);
-  const varsYamlContent = await (0, import_promises.readFile)(varsYamlFile, "utf8");
-  const varObjs = import_yaml.default.parse(varsYamlContent);
+  const jsonListFile = (0, import_path.join)(buildDir, `${mdlName}.json`);
+  const jsonListContent = await (0, import_promises.readFile)(jsonListFile, "utf8");
+  const jsonList = JSON.parse(jsonListContent);
+  const varObjs = jsonList.variables;
   const mdlVars = [];
   for (const varObj of varObjs) {
     switch (varObj.varType) {
@@ -724,24 +734,6 @@ var import_path4 = require("path");
 var import_colors7 = require("kleur/colors");
 var import_ora7 = __toESM(require("ora"), 1);
 var import_prompts7 = __toESM(require("prompts"), 1);
-var sampleMdlContent = `{UTF-8}
-
-X = TIME
-  ~~|
-
-Y = 0
-  ~ [-10,10,0.1]
-  ~
-  |
-
-Z = X + Y
-  ~~|
-
-INITIAL TIME = 2000 ~~|
-FINAL TIME = 2100 ~~|
-TIME STEP = 1 ~~|
-SAVEPER = TIME STEP ~~|
-`;
 async function chooseMdlFile(projDir) {
   async function getFiles(dir) {
     const dirents = await (0, import_promises2.readdir)(dir, { withFileTypes: true });
@@ -763,19 +755,11 @@ async function chooseMdlFile(projDir) {
   });
   let mdlFile;
   if (mdlFiles.length === 0) {
-    const sampleMdlFile = (0, import_path4.join)(projDir, "sample.mdl");
-    await (0, import_promises2.writeFile)(sampleMdlFile, sampleMdlContent);
-    (0, import_ora7.default)(
-      (0, import_colors7.yellow)(
-        `No mdl files were found in "${projDir}". A "${(0, import_colors7.cyan)(
-          "sample.mdl"
-        )}" file has been added to the project to get you started.`
-      )
-    ).warn();
-    mdlFile = "sample.mdl";
+    (0, import_ora7.default)((0, import_colors7.yellow)(`No mdl files were found in "${projDir}". The mdl file from the template will be used instead.`)).warn();
+    mdlFile = void 0;
   } else if (mdlFiles.length === 1) {
-    (0, import_ora7.default)().succeed(`Found "${mdlFiles[0]}", will configure the project to use that mdl file.`);
     mdlFile = mdlFiles[0];
+    (0, import_ora7.default)().succeed(`Found "${mdlFile}", will configure the project to use that mdl file.`);
   } else {
     const options = await (0, import_prompts7.default)(
       [
@@ -794,8 +778,8 @@ async function chooseMdlFile(projDir) {
       }
     );
     mdlFile = options.mdlFile;
+    (0, import_ora7.default)((0, import_colors7.green)(`Using "${(0, import_colors7.bold)(mdlFile)}" as the model for the project.`)).succeed();
   }
-  (0, import_ora7.default)((0, import_colors7.green)(`Using "${(0, import_colors7.bold)(mdlFile)}" as the model for the project.`)).succeed();
   return mdlFile;
 }
 
@@ -811,71 +795,88 @@ var import_ora8 = __toESM(require("ora"), 1);
 var import_prompts8 = __toESM(require("prompts"), 1);
 var TEMPLATES = [
   {
-    title: "Default project",
-    description: "Includes recommended structure with config files, app, core library, model-check, etc",
-    value: "template-default"
+    title: "Default (jQuery) project",
+    description: "Includes recommended structure with config files, jQuery-based app, core library, model-check, etc",
+    value: "default"
+  },
+  {
+    title: "Svelte project",
+    description: "Includes recommended structure with config files, Svelte-based app, core library, model-check, etc",
+    value: "svelte"
   },
   {
     title: "Minimal project",
     description: "Includes simple config for model-check",
-    value: "template-minimal"
+    value: "minimal"
   }
 ];
-async function chooseTemplate(projDir, args, pkgManager) {
-  const options = await (0, import_prompts8.default)(
-    [
+async function chooseTemplate(args) {
+  let templateName;
+  if (args.template) {
+    templateName = args.template;
+  } else {
+    const options = await (0, import_prompts8.default)(
+      [
+        {
+          type: "select",
+          name: "template",
+          message: "Which template would you like to use?",
+          choices: TEMPLATES
+        }
+      ],
       {
-        type: "select",
-        name: "template",
-        message: "Which template would you like to use?",
-        choices: TEMPLATES
-      }
-    ],
-    {
-      onCancel: () => {
-        (0, import_ora8.default)().info((0, import_colors8.dim)("Operation cancelled."));
-        process.exit(0);
+        onCancel: () => {
+          (0, import_ora8.default)().info((0, import_colors8.dim)("Operation cancelled."));
+          process.exit(0);
+        }
       }
-    }
-  );
-  if (args.dryRun) {
-    (0, import_ora8.default)().info((0, import_colors8.dim)(`--dry-run enabled, skipping.`));
-    return;
+    );
+    templateName = options.template;
   }
   const defaultRev = "main";
   const commit = args.commit || defaultRev;
-  const templateTarget = `climateinteractive/SDEverywhere/examples/${options.template}#${commit}`;
-  const templateSpinner = (0, import_ora8.default)("Copying project files...").start();
-  await copyTemplate(templateTarget, projDir, templateSpinner);
-  templateSpinner.text = (0, import_colors8.green)("Template copied!");
-  templateSpinner.succeed();
-  if (options.template === "template-default" && pkgManager === "pnpm") {
-    const workspaceFile = (0, import_path5.join)(projDir, "pnpm-workspace.yaml");
-    const workspaceContent = `packages:
-  - packages/*
-`;
-    await (0, import_promises3.writeFile)(workspaceFile, workspaceContent);
+  let baseTemplateUri;
+  if (templateName.includes(":")) {
+    baseTemplateUri = templateName;
+  } else if (templateName.includes("/")) {
+    baseTemplateUri = `github:${templateName}`;
+  } else {
+    baseTemplateUri = `github:climateinteractive/SDEverywhere/examples/template-${templateName}`;
   }
-  return options.template;
+  const templateUri = `${baseTemplateUri}#${commit}`;
+  (0, import_ora8.default)((0, import_colors8.green)(`Using "${(0, import_colors8.bold)(templateUri)}" as the template for the project.`)).succeed();
+  return {
+    uri: templateUri,
+    name: templateName
+  };
 }
-async function copyTemplate(templateTarget, dstDir, spinner) {
+async function copyTemplate(template, projDir, pkgManager, configDirExisted, mdlExisted) {
+  const templateSpinner = (0, import_ora8.default)("Copying template files...").start();
   try {
     const tmpDir = (0, import_fs4.mkdtempSync)((0, import_path5.join)((0, import_os.tmpdir)(), "sde-create-"));
-    await (0, import_giget.downloadTemplate)(`github:${templateTarget}`, {
+    await (0, import_giget.downloadTemplate)(template.uri, {
       force: true,
-      provider: "github",
       dir: tmpDir
     });
     if (!(0, import_fs4.existsSync)(tmpDir) || (0, import_fs4.readdirSync)(tmpDir).length === 0) {
       throw new Error("Failed to download the requested template: the temporary directory is empty.");
     }
-    await (0, import_fs_extra.copy)(tmpDir, dstDir, {
+    if (configDirExisted) {
+      (0, import_fs4.rmSync)((0, import_path5.join)(tmpDir, "config"), { recursive: true, force: true });
+    }
+    if (mdlExisted) {
+      (0, import_fs4.rmSync)((0, import_path5.join)(tmpDir, "model"), { recursive: true, force: true });
+    }
+    await (0, import_fs_extra.copy)(tmpDir, projDir, {
       overwrite: false,
       errorOnExist: false
     });
+    if (!mdlExisted) {
+      (0, import_fs4.renameSync)((0, import_path5.join)(projDir, "model", "MODEL_NAME.mdl"), (0, import_path5.join)(projDir, "model", "sample.mdl"));
+    }
     (0, import_fs4.rmSync)(tmpDir, { recursive: true, force: true });
   } catch (e) {
-    spinner.fail();
+    templateSpinner.fail();
     console.error((0, import_colors8.red)(e.message));
     console.error((0, import_colors8.yellow)("\nThere was a problem copying the template."));
     console.error(
@@ -885,6 +886,15 @@ async function copyTemplate(templateTarget, dstDir, spinner) {
     );
     process.exit(0);
   }
+  if ((0, import_fs4.existsSync)((0, import_path5.join)(projDir, "packages")) && pkgManager === "pnpm") {
+    const workspaceFile = (0, import_path5.join)(projDir, "pnpm-workspace.yaml");
+    const workspaceContent = `packages:
+  - packages/*
+`;
+    await (0, import_promises3.writeFile)(workspaceFile, workspaceContent);
+  }
+  templateSpinner.text = (0, import_colors8.green)("Template copied!");
+  templateSpinner.succeed();
 }
 
 // src/index.ts
@@ -903,28 +913,38 @@ ${(0, import_colors9.bold)("Welcome to SDEverywhere!")}`);
   const projDir = await chooseProjectDir(args);
   console.log();
   const configDirExisted = (0, import_fs5.existsSync)((0, import_path6.resolve)(projDir, "config"));
-  const templateName = await chooseTemplate(projDir, args, pkgManager);
+  const template = await chooseTemplate(args);
   console.log();
-  const mdlPath = await chooseMdlFile(projDir);
+  let mdlPath = await chooseMdlFile(projDir);
+  const mdlExisted = mdlPath !== void 0;
   console.log();
+  if (!args.dryRun) {
+    await copyTemplate(template, projDir, pkgManager, configDirExisted, mdlExisted);
+    console.log();
+  }
+  if (mdlPath === void 0) {
+    mdlPath = `model${import_path6.posix.sep}sample.mdl`;
+  }
   const genFormat = await chooseCodeFormat();
   if (!args.dryRun) {
     await updateSdeConfig(projDir, mdlPath, genFormat);
-    await generateSampleYamlFiles(projDir);
+    const modelCheckFilesExist = (0, import_fs5.existsSync)((0, import_path6.resolve)(projDir, "model", "checks")) || (0, import_fs5.existsSync)((0, import_path6.resolve)(projDir, "model", "comparisons"));
+    if (!modelCheckFilesExist) {
+      await generateSampleYamlFiles(projDir);
+    }
   }
   console.log();
-  if (templateName === "template-default") {
-    if (configDirExisted) {
-      (0, import_ora9.default)().succeed(`Found existing "${(0, import_colors9.bold)("config")}" directory.`);
-      (0, import_ora9.default)().info(
-        (0, import_colors9.dim)(`You can edit the files in the "${(0, import_colors9.cyan)("config")}" directory later to configure graphs and sliders.`)
-      );
+  if (configDirExisted) {
+    (0, import_ora9.default)().succeed(`Found existing "${(0, import_colors9.bold)("config")}" directory.`);
+    (0, import_ora9.default)().info(
+      (0, import_colors9.dim)(`You can edit the files in the "${(0, import_colors9.cyan)("config")}" directory later to configure graphs and sliders.`)
+    );
+    console.log();
+  } else {
+    const configDirExistsNow = (0, import_fs5.existsSync)((0, import_path6.resolve)(projDir, "config"));
+    if (configDirExistsNow && mdlExisted && !args.dryRun) {
+      await chooseGenConfig(projDir, mdlPath);
       console.log();
-    } else {
-      if (!args.dryRun) {
-        await chooseGenConfig(projDir, mdlPath);
-        console.log();
-      }
     }
   }
   if (genFormat === "c") {