ref(init): disambiguate module name from file path and basename

Author: coolaj86

bin/jswt-init.js

@@ -27,12 +27,13 @@ async function main() {
     process.argv.includes("-g") || process.argv.includes("--global");
 
   let pkg = await readPackageJson();
-  let pkgName = pkg.name;
-  if (pkgName.includes("/")) {
+  let mainBasename = pkg.name;
+  if (mainBasename.includes("/")) {
     let index = 1;
-    index += pkgName.lastIndexOf("/");
-    pkgName = pkgName.slice(index);
+    index += mainBasename.lastIndexOf("/");
+    mainBasename = mainBasename.slice(index);
   }
+  let moduleName = toTitleCase(mainBasename);
 
   // await Fs.mkdir("./docs", { recursive: true });
   // let fh = await Fs.open("./docs/.gitkeep", "a");
@@ -81,9 +82,9 @@ async function main() {
         "// auto-generated by `jswt reexport`",
         "// DO NOT EDIT",
         "",
-        `import ${pkgName} from "${prefix}/${pkgName}.js";`,
+        `import ${moduleName} from "${prefix}/${mainBasename}.js";`,
         "",
-        `export default ${pkgName};`,
+        `export default ${moduleName};`,
         "",
       ].join("\n"),
     );
@@ -96,7 +97,7 @@ async function main() {
       pkg,
       tsconfigTxt,
       prefix,
-      `${prefix}/${pkgName}.js`,
+      `${prefix}/${mainBasename}.js`,
     );
   }
 
@@ -216,23 +217,22 @@ async function main() {
 
   let indexNames = ["index.js", "./index.js"];
   let mainIsIndex = indexNames.includes(pkg.main);
-  let mainPath = `${prefix}/${pkgName}.js`;
+  let mainFilePath = `${prefix}/${mainBasename}.js`;
   if (!mainIsIndex) {
     // ensures that filepath has leading './'
-    mainPath = Path.relative(".", pkg.main);
-    mainPath = `./${mainPath}`;
+    mainFilePath = Path.relative(".", pkg.main);
+    mainFilePath = `./${mainFilePath}`;
   }
 
   {
-    let mainName = toTitleCase(pkgName);
     await initFile(
-      mainPath,
+      mainFilePath,
       [
-        `let ${mainName} = {};`,
+        `let ${moduleName} = {};`,
         "",
-        `${mainName}.answer = 42;`,
+        `${moduleName}.answer = 42;`,
         "",
-        `export default ${mainName};`,
+        `export default ${moduleName};`,
         "",
       ].join("\n"),
     );
@@ -241,7 +241,7 @@ async function main() {
   let hasIndex = await fileExists("./index.js");
   if (!hasIndex) {
     if (mainIsIndex) {
-      let allArgs = ["pkg", "set", `main=${mainPath}`];
+      let allArgs = ["pkg", "set", `main=${mainFilePath}`];
       await exec("npm", allArgs);
       await sortAndWritePackageJson();
     }
@@ -287,7 +287,7 @@ async function main() {
       let allArgs = [
         "pkg",
         "set",
-        `files[]=${mainPath}`,
+        `files[]=${mainFilePath}`,
         `files[]=./bin/*.js`,
         `files[]=./lib/*.js`,
         `files[]=./tests/*.js`,
@@ -318,7 +318,7 @@ async function main() {
         "pkg",
         "set",
         "type=module",
-        `exports[.]=${mainPath}`,
+        `exports[.]=${mainFilePath}`,
         `exports[./*]=${prefix}/*`,
       ];
       await exec("npm", allArgs);
@@ -334,7 +334,7 @@ async function main() {
         "pkg",
         "set",
         "type=module",
-        `imports[${pkg.name}]=${mainPath}`,
+        `imports[${pkg.name}]=${mainFilePath}`,
         `imports[${pkg.name}/]=${prefix}/`,
       ];
       await exec("npm", allArgs);
@@ -346,7 +346,7 @@ async function main() {
           `<script type="importmap">`,
           `  {`,
           `    "imports": {`,
-          `      "${pkg.name}": "${mainPath}",`,
+          `      "${pkg.name}": "${mainFilePath}",`,
           `      "${pkg.name}/": "${prefix}/"`,
           `    }`,
           `  }`,
@@ -631,10 +631,10 @@ async function getLatest20xx() {
  * @param {String} pkg.name
  * @param {String} tsconfigTxt
  * @param {String} prefix
- * @param {String} mainPath
+ * @param {String} mainFilePath
  * @returns
  */
-async function createJsConfig(pkg, tsconfigTxt, prefix, mainPath) {
+async function createJsConfig(pkg, tsconfigTxt, prefix, mainFilePath) {
   if (!tsconfigTxt.includes(`"include":`)) {
     let includables = [
       "*.js",
@@ -653,7 +653,7 @@ async function createJsConfig(pkg, tsconfigTxt, prefix, mainPath) {
 
   {
     let lines = [
-      `      "${pkg.name}": ["${mainPath}"]`,
+      `      "${pkg.name}": ["${mainFilePath}"]`,
       `      "${pkg.name}/*": ["${prefix}/*"]`,
     ];
     let str = lines.join(`,\n`);