jspm 3.3.1 → 3.3.2

package/dist/cli.js

@@ -4,7 +4,7 @@ var __esm = (fn, res) => function __init() {
 };
 
 // node_modules/rollup/dist/es/shared/node-entry.js
-import { resolve, basename, extname, dirname, relative as relative$1 } from "node:path";
+import { resolve, basename, extname as extname2, dirname, relative as relative$1 } from "node:path";
 import require$$0$1, { win32, posix, isAbsolute as isAbsolute$1, resolve as resolve$1 } from "path";
 import process$1, { env as env$1 } from "node:process";
 import { performance } from "node:perf_hooks";
@@ -243,7 +243,7 @@ function normalize(path4) {
 }
 function getAliasName(id) {
   const base2 = basename(id);
-  return base2.slice(0, Math.max(0, base2.length - extname(id).length));
+  return base2.slice(0, Math.max(0, base2.length - extname2(id).length));
 }
 function relativeId(id) {
   if (!isAbsolute(id))
@@ -701,7 +701,7 @@ function logInvalidFormatForTopLevelAwait(id, format) {
   };
 }
 function logMissingExport(binding, importingModule, exporter) {
-  const isJson = extname(exporter) === ".json";
+  const isJson = extname2(exporter) === ".json";
   return {
     binding,
     code: MISSING_EXPORT,
@@ -2671,7 +2671,7 @@ function renderNamePattern(pattern, patternName, replacements) {
 function makeUnique(name, { [lowercaseBundleKeys]: reservedLowercaseBundleKeys }) {
   if (!reservedLowercaseBundleKeys.has(name.toLowerCase()))
     return name;
-  const extension = extname(name);
+  const extension = extname2(name);
   name = name.slice(0, Math.max(0, name.length - extension.length));
   let uniqueName, uniqueIndex = 1;
   while (reservedLowercaseBundleKeys.has((uniqueName = name + ++uniqueIndex + extension).toLowerCase()))
@@ -4100,10 +4100,10 @@ function getSourceHash(source) {
 function generateAssetFileName(name, source, sourceHash, outputOptions, bundle) {
   const emittedName = outputOptions.sanitizeFileName(name || "asset");
   return makeUnique(renderNamePattern(typeof outputOptions.assetFileNames === "function" ? outputOptions.assetFileNames({ name, source, type: "asset" }) : outputOptions.assetFileNames, "output.assetFileNames", {
-    ext: () => extname(emittedName).slice(1),
-    extname: () => extname(emittedName),
+    ext: () => extname2(emittedName).slice(1),
+    extname: () => extname2(emittedName),
     hash: (size) => sourceHash.slice(0, Math.max(0, size || defaultHashSize)),
-    name: () => emittedName.slice(0, Math.max(0, emittedName.length - extname(emittedName).length))
+    name: () => emittedName.slice(0, Math.max(0, emittedName.length - extname2(emittedName).length))
   }), bundle);
 }
 function reserveFileNameInBundle(fileName, { bundle }, log2) {
@@ -15052,7 +15052,7 @@ var init_node_entry = __esm({
       }
       basename() {
         const base2 = basename(this.id);
-        const extension = extname(this.id);
+        const extension = extname2(this.id);
         return makeLegal(extension ? base2.slice(0, -extension.length) : base2);
       }
       bindReferences() {
@@ -16565,7 +16565,7 @@ ${next}` : out;
           return predefinedChunkName;
         const { preserveModulesRoot, sanitizeFileName: sanitizeFileName2 } = this.outputOptions;
         const sanitizedId = sanitizeFileName2(normalize(module.id.split(QUERY_HASH_REGEX, 1)[0]));
-        const extensionName = extname(sanitizedId);
+        const extensionName = extname2(sanitizedId);
         const idWithoutExtension = NON_ASSET_EXTENSIONS.has(extensionName) ? sanitizedId.slice(0, -extensionName.length) : sanitizedId;
         if (isAbsolute(idWithoutExtension)) {
           return preserveModulesRoot && resolve(idWithoutExtension).startsWith(preserveModulesRoot) ? idWithoutExtension.slice(preserveModulesRoot.length).replace(/^[/\\]/, "") : relative(this.inputBase, idWithoutExtension);
@@ -24334,7 +24334,7 @@ var cac = (name = "") => new CAC(name);
 var dist_default = cac;
 
 // package.json
-var version = "3.3.1";
+var version = "3.3.2";
 
 // src/clearCache.ts
 import c from "picocolors";
@@ -24414,12 +24414,16 @@ function createLogger() {
 
 // src/utils.ts
 import fs2 from "node:fs/promises";
+import { accessSync } from "node:fs";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { Generator, analyzeHtml } from "@jspm/generator";
 import ora from "ora";
 import c3 from "picocolors";
-var defaultInputPath = "./importmap.json";
+var defaultMapPath = "importmap.json";
+function isJsExtension(ext) {
+  return ext === ".js" || ext === ".mjs" || ext === ".cjs" || ext === ".ts" || ext === ".mts" || ext === ".cts" || ext === ".jsx" || ext === ".tsx";
+}
 var defaultHtmlTemplate = `<!DOCTYPE html>
 <html>
   <head>
@@ -24479,7 +24483,7 @@ async function writeHtmlOutput(mapFile, generator, pins, env2, flags, silent = f
       `JSPM does not have permission to write to ${mapFile}.`
     );
   const mapFileRel = path.relative(process.cwd(), mapFile);
-  if (!await exists(mapFile)) {
+  if (!exists(mapFile)) {
     !silent && console.warn(
       `${c3.cyan(
         "Note:"
@@ -24562,12 +24566,12 @@ async function getGenerator(flags, setEnv = true) {
     // TODO: only for --local flag
   });
 }
-async function getInput(flags) {
-  const mapFile = getInputPath(flags);
-  if (!await exists(mapFile))
+async function getInput(flags, fallbackDefaultMap = defaultMapPath) {
+  const mapFile = getInputPath(flags, fallbackDefaultMap);
+  if (!exists(mapFile))
     return void 0;
-  if (!await canRead(mapFile)) {
-    if (mapFile === defaultInputPath)
+  if (!canRead(mapFile)) {
+    if (mapFile === defaultMapPath)
       return void 0;
     else
       throw new JspmError(`JSPM does not have permission to read ${mapFile}.`);
@@ -24596,13 +24600,16 @@ async function getInputMap(flags) {
   }
   return inputMap || {};
 }
-function getInputPath(flags) {
-  return path.resolve(process.cwd(), flags?.map || defaultInputPath);
+function getInputPath(flags, fallbackDefaultMap = defaultMapPath) {
+  return path.resolve(
+    process.cwd(),
+    flags?.map || (exists(defaultMapPath) ? defaultMapPath : fallbackDefaultMap)
+  );
 }
 function getOutputPath(flags) {
   return path.resolve(
     process.cwd(),
-    flags.output || flags.map || defaultInputPath
+    flags.output || flags.map || defaultMapPath
   );
 }
 function getOutputMapUrl(flags) {
@@ -24740,27 +24747,27 @@ function startSpinner(text) {
 function stopSpinner() {
   spinner.stop();
 }
-async function exists(file) {
+function exists(file) {
   try {
-    await fs2.access(file);
+    accessSync(file);
     return true;
   } catch (e) {
     return false;
   }
 }
-async function canRead(file) {
+function canRead(file) {
   try {
-    await fs2.access(file, (fs2.constants || fs2).R_OK);
+    accessSync(file, (fs2.constants || fs2).R_OK);
     return true;
   } catch (e) {
     return false;
   }
 }
-async function canWrite(file) {
+function canWrite(file) {
   try {
-    if (!await exists(file))
+    if (!exists(file))
       return true;
-    await fs2.access(file, (fs2.constants || fs2).W_OK);
+    accessSync(file, (fs2.constants || fs2).W_OK);
     return true;
   } catch (e) {
     return false;
@@ -24836,21 +24843,23 @@ async function install(packages, flags) {
 
 // src/link.ts
 import * as fs3 from "node:fs/promises";
+import { extname } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "url";
 import c5 from "picocolors";
 async function link(modules, flags) {
   const log2 = withType("link/link");
   log2(`Linking modules: ${modules.join(", ")}`);
   log2(`Flags: ${JSON.stringify(flags)}`);
+  const fallbackMap = !modules[0] || isJsExtension(extname(modules[0])) ? void 0 : modules[0];
   const env2 = await getEnv(flags);
-  const inputMapPath = getInputPath(flags);
+  const inputMapPath = getInputPath(flags, fallbackMap);
   const outputMapPath = getOutputPath(flags);
   const generator = await getGenerator(flags);
   const inlinePins = [];
   const resolvedModules = (await Promise.all(
     modules.map((spec) => resolveModule(spec, inlinePins, generator))
   )).filter((m) => !!m);
-  const input = await getInput(flags);
+  const input = await getInput(flags, fallbackMap);
   const pins = inlinePins.concat(resolvedModules.map((p) => p.target));
   let allPins = pins;
   if (input) {
@@ -25106,8 +25115,8 @@ async function build(entry, options) {
 var cli = dist_default(c8.yellow("jspm"));
 var mapOpt = [
   "-m, --map <file>",
-  "File containing initial import map",
-  { default: "importmap.json" }
+  "File containing initial import map (defaults to importmap.json, or the input HTML if linking)",
+  {}
 ];
 var envOpt = [
   "-e, --env <environments>",
@@ -25193,7 +25202,7 @@ cli.command("link [...modules]", "link modules").alias("trace").option(...mapOpt
 `
 ).example(
   (name) => `Link an HTML file and update its import map including preload and integrity tags
-  $ ${name} link --map index.html --integrity --preload dynamic
+  $ ${name} link --map index.html --integrity --preload
 `
 ).usage(
   `link [flags] [...modules]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jspm",
   "type": "module",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Import Map Package Manager",
   "license": "Apache-2.0",
   "bin": {