@eighty4/dank 0.0.4-1 → 0.0.4-2

package/lib_js/esbuild.js

@@ -1,186 +1,176 @@
-import { readFile } from 'node:fs/promises';
-import esbuild, {} from 'esbuild';
-export async function esbuildDevContext(b, r, define, entryPoints, c) {
-    return await esbuild.context({
-        define,
-        entryNames: '[dir]/[name]',
-        entryPoints: mapEntryPointPaths(entryPoints),
-        outdir: b.dirs.buildWatch,
-        ...commonBuildOptions(b, r, c),
-        splitting: false,
-        write: false,
-    });
+import { readFile } from "node:fs/promises";
+import esbuild, {} from "esbuild";
+async function esbuildDevContext(b, r, define, entryPoints, c) {
+  return await esbuild.context({
+    define,
+    entryNames: "[dir]/[name]",
+    entryPoints: mapEntryPointPaths(entryPoints),
+    outdir: b.dirs.buildWatch,
+    ...commonBuildOptions(b, r, c),
+    splitting: false,
+    write: false
+  });
 }
-export async function esbuildWebpages(b, r, define, entryPoints, c) {
-    try {
-        await esbuild.build({
-            define,
-            entryNames: '[dir]/[name]-[hash]',
-            entryPoints: mapEntryPointPaths(entryPoints),
-            outdir: b.dirs.buildDist,
-            ...commonBuildOptions(b, r, c),
-        });
-    }
-    catch (ignore) {
-        process.exit(1);
-    }
+async function esbuildWebpages(b, r, define, entryPoints, c) {
+  try {
+    await esbuild.build({
+      define,
+      entryNames: "[dir]/[name]-[hash]",
+      entryPoints: mapEntryPointPaths(entryPoints),
+      outdir: b.dirs.buildDist,
+      ...commonBuildOptions(b, r, c)
+    });
+  } catch (ignore) {
+    process.exit(1);
+  }
 }
-export async function esbuildWorkers(b, r, define, entryPoints, c) {
-    try {
-        await esbuild.build({
-            define,
-            entryNames: '[dir]/[name]-[hash]',
-            entryPoints: mapEntryPointPaths(entryPoints),
-            outdir: b.dirs.buildDist,
-            ...commonBuildOptions(b, r, c),
-            splitting: false,
-            metafile: true,
-            write: true,
-            assetNames: 'assets/[name]-[hash]',
-        });
-    }
-    catch (ignore) {
-        process.exit(1);
-    }
+async function esbuildWorkers(b, r, define, entryPoints, c) {
+  try {
+    await esbuild.build({
+      define,
+      entryNames: "[dir]/[name]-[hash]",
+      entryPoints: mapEntryPointPaths(entryPoints),
+      outdir: b.dirs.buildDist,
+      ...commonBuildOptions(b, r, c),
+      splitting: false,
+      metafile: true,
+      write: true,
+      assetNames: "assets/[name]-[hash]"
+    });
+  } catch (ignore) {
+    process.exit(1);
+  }
 }
 function commonBuildOptions(b, r, c) {
-    const p = workersPlugin(r.buildRegistry());
-    return {
-        absWorkingDir: b.dirs.projectRootAbs,
-        assetNames: 'assets/[name]-[hash]',
-        bundle: true,
-        format: 'esm',
-        loader: c?.loaders || defaultLoaders(),
-        metafile: true,
-        minify: b.minify,
-        platform: 'browser',
-        plugins: c?.plugins?.length ? [p, ...c.plugins] : [p],
-        splitting: true,
-        treeShaking: true,
-        write: true,
-    };
+  const p = workersPlugin(r.buildRegistry());
+  return {
+    absWorkingDir: b.dirs.projectRootAbs,
+    assetNames: "assets/[name]-[hash]",
+    bundle: true,
+    format: "esm",
+    loader: c?.loaders || defaultLoaders(),
+    metafile: true,
+    minify: b.minify,
+    platform: "browser",
+    plugins: c?.plugins?.length ? [p, ...c.plugins] : [p],
+    splitting: true,
+    treeShaking: true,
+    write: true
+  };
 }
 function defaultLoaders() {
-    return {
-        '.woff': 'file',
-        '.woff2': 'file',
-    };
+  return {
+    ".woff": "file",
+    ".woff2": "file"
+  };
 }
-// esbuild will append the .js or .css to output filenames
-// keeping extension on entryPoints data for consistency
-// and only trimming when creating esbuild opts
 function mapEntryPointPaths(entryPoints) {
-    return entryPoints.map(entryPoint => {
-        return {
-            in: entryPoint.in,
-            out: entryPoint.out.replace(/\.(tsx?|jsx?|css)$/, ''),
-        };
-    });
+  return entryPoints.map((entryPoint) => {
+    return {
+      in: entryPoint.in,
+      out: entryPoint.out.replace(/\.(tsx?|jsx?|css)$/, "")
+    };
+  });
 }
 const WORKER_CTOR_REGEX = /new(?:\s|\r?\n)+(?<ctor>(?:Shared)?Worker)(?:\s|\r?\n)*\((?:\s|\r?\n)*(?<url>.*?)(?:\s|\r?\n)*(?<end>[\),])/g;
 const WORKER_URL_REGEX = /^('.*'|".*")$/;
-export function workersPlugin(r) {
-    return {
-        name: '@eighty4/dank/esbuild/workers',
-        setup(build) {
-            if (!build.initialOptions.absWorkingDir)
-                throw TypeError('plugin requires absWorkingDir');
-            if (!build.initialOptions.metafile)
-                throw TypeError('plugin requires metafile');
-            const { absWorkingDir } = build.initialOptions;
-            build.onLoad({ filter: /\.(t|m?j)s$/ }, async (args) => {
-                let contents = await readFile(args.path, 'utf8');
-                let offset = 0;
-                let errors = undefined;
-                for (const workerCtorMatch of contents.matchAll(WORKER_CTOR_REGEX)) {
-                    if (!WORKER_URL_REGEX.test(workerCtorMatch.groups.url)) {
-                        if (!errors)
-                            errors = [];
-                        errors.push(invalidWorkerUrlCtorArg(locationFromMatch(args, contents, workerCtorMatch), workerCtorMatch));
-                        continue;
-                    }
-                    if (isIndexCommented(contents, workerCtorMatch.index)) {
-                        continue;
-                    }
-                    const clientScript = args.path
-                        .replace(absWorkingDir, '')
-                        .substring(1);
-                    const workerUrl = workerCtorMatch.groups.url.substring(1, workerCtorMatch.groups.url.length - 1);
-                    const workerEntryPoint = r.resolver.resolveHrefInPagesDir(clientScript, workerUrl);
-                    if (workerEntryPoint === 'outofbounds') {
-                        if (!errors)
-                            errors = [];
-                        errors.push(outofboundsWorkerUrlCtorArg(locationFromMatch(args, contents, workerCtorMatch), workerCtorMatch));
-                        continue;
-                    }
-                    const workerUrlPlaceholder = workerEntryPoint
-                        .replace(/^pages/, '')
-                        .replace(/\.(t|m?j)s$/, '.js');
-                    const workerCtorReplacement = `new ${workerCtorMatch.groups.ctor}('${workerUrlPlaceholder}'${workerCtorMatch.groups.end}`;
-                    contents =
-                        contents.substring(0, workerCtorMatch.index + offset) +
-                            workerCtorReplacement +
-                            contents.substring(workerCtorMatch.index +
-                                workerCtorMatch[0].length +
-                                offset);
-                    offset +=
-                        workerCtorReplacement.length - workerCtorMatch[0].length;
-                    r.addWorker({
-                        clientScript,
-                        workerEntryPoint,
-                        workerUrl,
-                        workerUrlPlaceholder,
-                    });
-                }
-                const loader = args.path.endsWith('ts') ? 'ts' : 'js';
-                return { contents, errors, loader };
-            });
-            build.onEnd((result) => {
-                if (result.metafile) {
-                    r.completeBuild(result);
-                }
-            });
-        },
-    };
+function workersPlugin(r) {
+  return {
+    name: "@eighty4/dank/esbuild/workers",
+    setup(build) {
+      if (!build.initialOptions.absWorkingDir)
+        throw TypeError("plugin requires absWorkingDir");
+      if (!build.initialOptions.metafile)
+        throw TypeError("plugin requires metafile");
+      const { absWorkingDir } = build.initialOptions;
+      build.onLoad({ filter: /\.(t|m?j)s$/ }, async (args) => {
+        let contents = await readFile(args.path, "utf8");
+        let offset = 0;
+        let errors = void 0;
+        for (const workerCtorMatch of contents.matchAll(WORKER_CTOR_REGEX)) {
+          if (!WORKER_URL_REGEX.test(workerCtorMatch.groups.url)) {
+            if (!errors)
+              errors = [];
+            errors.push(invalidWorkerUrlCtorArg(locationFromMatch(args, contents, workerCtorMatch), workerCtorMatch));
+            continue;
+          }
+          if (isIndexCommented(contents, workerCtorMatch.index)) {
+            continue;
+          }
+          const clientScript = args.path.replace(absWorkingDir, "").substring(1);
+          const workerUrl = workerCtorMatch.groups.url.substring(1, workerCtorMatch.groups.url.length - 1);
+          const workerEntryPoint = r.resolver.resolveHrefInPagesDir(clientScript, workerUrl);
+          if (workerEntryPoint === "outofbounds") {
+            if (!errors)
+              errors = [];
+            errors.push(outofboundsWorkerUrlCtorArg(locationFromMatch(args, contents, workerCtorMatch), workerCtorMatch));
+            continue;
+          }
+          const workerUrlPlaceholder = workerEntryPoint.replace(/^pages/, "").replace(/\.(t|m?j)s$/, ".js");
+          const workerCtorReplacement = `new ${workerCtorMatch.groups.ctor}('${workerUrlPlaceholder}'${workerCtorMatch.groups.end}`;
+          contents = contents.substring(0, workerCtorMatch.index + offset) + workerCtorReplacement + contents.substring(workerCtorMatch.index + workerCtorMatch[0].length + offset);
+          offset += workerCtorReplacement.length - workerCtorMatch[0].length;
+          r.addWorker({
+            clientScript,
+            workerEntryPoint,
+            workerUrl,
+            workerUrlPlaceholder
+          });
+        }
+        const loader = args.path.endsWith("ts") ? "ts" : "js";
+        return { contents, errors, loader };
+      });
+      build.onEnd((result) => {
+        if (result.metafile) {
+          r.completeBuild(result);
+        }
+      });
+    }
+  };
 }
 function isIndexCommented(contents, index) {
-    const preamble = contents.substring(0, index);
-    const lineIndex = preamble.lastIndexOf('\n') || 0;
-    const lineCommented = /\/\//.test(preamble.substring(lineIndex));
-    if (lineCommented) {
-        return true;
-    }
-    const blockCommentIndex = preamble.lastIndexOf('/*');
-    const blockCommented = blockCommentIndex !== -1 &&
-        preamble.substring(blockCommentIndex).indexOf('*/') === -1;
-    return blockCommented;
+  const preamble = contents.substring(0, index);
+  const lineIndex = preamble.lastIndexOf("\n") || 0;
+  const lineCommented = /\/\//.test(preamble.substring(lineIndex));
+  if (lineCommented) {
+    return true;
+  }
+  const blockCommentIndex = preamble.lastIndexOf("/*");
+  const blockCommented = blockCommentIndex !== -1 && preamble.substring(blockCommentIndex).indexOf("*/") === -1;
+  return blockCommented;
 }
 function locationFromMatch(args, contents, match) {
-    const preamble = contents.substring(0, match.index);
-    const line = preamble.match(/\n/g)?.length || 0;
-    let lineIndex = preamble.lastIndexOf('\n');
-    lineIndex = lineIndex === -1 ? 0 : lineIndex + 1;
-    const column = preamble.length - lineIndex;
-    const lineText = contents.substring(lineIndex, contents.indexOf('\n', lineIndex) || contents.length);
-    return {
-        lineText,
-        line,
-        column,
-        file: args.path,
-        length: match[0].length,
-    };
+  const preamble = contents.substring(0, match.index);
+  const line = preamble.match(/\n/g)?.length || 0;
+  let lineIndex = preamble.lastIndexOf("\n");
+  lineIndex = lineIndex === -1 ? 0 : lineIndex + 1;
+  const column = preamble.length - lineIndex;
+  const lineText = contents.substring(lineIndex, contents.indexOf("\n", lineIndex) || contents.length);
+  return {
+    lineText,
+    line,
+    column,
+    file: args.path,
+    length: match[0].length
+  };
 }
 function outofboundsWorkerUrlCtorArg(location, workerCtorMatch) {
-    return {
-        id: 'worker-url-outofbounds',
-        text: `The ${workerCtorMatch.groups.ctor} constructor URL arg \`${workerCtorMatch.groups.url}\` cannot resolve to a path outside of the pages directory`,
-        location,
-    };
+  return {
+    id: "worker-url-outofbounds",
+    text: `The ${workerCtorMatch.groups.ctor} constructor URL arg \`${workerCtorMatch.groups.url}\` cannot resolve to a path outside of the pages directory`,
+    location
+  };
 }
 function invalidWorkerUrlCtorArg(location, workerCtorMatch) {
-    return {
-        id: 'worker-url-unresolvable',
-        text: `The ${workerCtorMatch.groups.ctor} constructor URL arg \`${workerCtorMatch.groups.url}\` must be a relative module path`,
-        location,
-    };
+  return {
+    id: "worker-url-unresolvable",
+    text: `The ${workerCtorMatch.groups.ctor} constructor URL arg \`${workerCtorMatch.groups.url}\` must be a relative module path`,
+    location
+  };
 }
+export {
+  esbuildDevContext,
+  esbuildWebpages,
+  esbuildWorkers,
+  workersPlugin
+};

package/lib_js/flags.js

@@ -1,128 +1,124 @@
-import { join, resolve } from 'node:path';
-import { cwd } from 'node:process';
-export function resolveBuildFlags() {
-    const flags = {
-        dirs: defaultProjectDirs(cwd()),
-        minify: willMinify(),
-        production: isProductionBuild(),
-    };
-    return {
-        get dirs() {
-            return flags.dirs;
-        },
-        get minify() {
-            return flags.minify;
-        },
-        get production() {
-            return flags.production;
-        },
-    };
+import { join, resolve } from "node:path";
+import { cwd } from "node:process";
+function resolveBuildFlags() {
+  const flags = {
+    dirs: defaultProjectDirs(cwd()),
+    minify: willMinify(),
+    production: isProductionBuild()
+  };
+  return {
+    get dirs() {
+      return flags.dirs;
+    },
+    get minify() {
+      return flags.minify;
+    },
+    get production() {
+      return flags.production;
+    }
+  };
 }
-export function resolveServeFlags(c) {
-    const preview = isPreviewBuild();
-    const flags = {
-        dirs: defaultProjectDirs(cwd()),
-        dankPort: dankPort(c, preview),
-        esbuildPort: esbuildPort(c),
-        logHttp: willLogHttp(),
-        minify: willMinify(),
-        preview,
-        production: isProductionBuild(),
-    };
-    return {
-        get dirs() {
-            return flags.dirs;
-        },
-        get dankPort() {
-            return flags.dankPort;
-        },
-        get esbuildPort() {
-            return flags.esbuildPort;
-        },
-        get logHttp() {
-            return flags.logHttp;
-        },
-        get minify() {
-            return flags.minify;
-        },
-        get preview() {
-            return flags.preview;
-        },
-        get production() {
-            return flags.production;
-        },
-    };
+function resolveServeFlags(c) {
+  const preview = isPreviewBuild();
+  const flags = {
+    dirs: defaultProjectDirs(cwd()),
+    dankPort: dankPort(c, preview),
+    esbuildPort: esbuildPort(c),
+    logHttp: willLogHttp(),
+    minify: willMinify(),
+    preview,
+    production: isProductionBuild()
+  };
+  return {
+    get dirs() {
+      return flags.dirs;
+    },
+    get dankPort() {
+      return flags.dankPort;
+    },
+    get esbuildPort() {
+      return flags.esbuildPort;
+    },
+    get logHttp() {
+      return flags.logHttp;
+    },
+    get minify() {
+      return flags.minify;
+    },
+    get preview() {
+      return flags.preview;
+    },
+    get production() {
+      return flags.production;
+    }
+  };
 }
-// `dank serve` will pre-bundle and use service worker
-const isPreviewBuild = () => process.env.PREVIEW === 'true' || process.argv.includes('--preview');
-// `dank build` will minify sources and append git release tag to build tag
-// `dank serve` will pre-bundle with service worker and minify
-const isProductionBuild = () => process.env.PRODUCTION === 'true' || process.argv.includes('--production');
-// `dank serve` dank port for frontend webserver
-// alternate --preview port for service worker builds
+const isPreviewBuild = () => process.env.PREVIEW === "true" || process.argv.includes("--preview");
+const isProductionBuild = () => process.env.PRODUCTION === "true" || process.argv.includes("--production");
 function dankPort(c, preview) {
-    if (process.env.DANK_PORT?.length) {
-        return parsePortEnvVar('DANK_PORT');
-    }
-    return preview ? c.previewPort || c.port || 4000 : c.port || 3000;
+  if (process.env.DANK_PORT?.length) {
+    return parsePortEnvVar("DANK_PORT");
+  }
+  return preview ? c.previewPort || c.port || 4e3 : c.port || 3e3;
 }
-// `dank serve` esbuild port for bundler integration
 function esbuildPort(c) {
-    if (process.env.ESBUILD_PORT?.length) {
-        return parsePortEnvVar('ESBUILD_PORT');
-    }
-    return c.esbuild?.port || 3995;
+  if (process.env.ESBUILD_PORT?.length) {
+    return parsePortEnvVar("ESBUILD_PORT");
+  }
+  return c.esbuild?.port || 3995;
 }
 function parsePortEnvVar(name) {
-    const port = parseInt(process.env[name], 10);
-    if (isNaN(port)) {
-        throw Error(`env var ${name}=${port} must be a valid port number`);
-    }
-    else {
-        return port;
-    }
+  const port = parseInt(process.env[name], 10);
+  if (isNaN(port)) {
+    throw Error(`env var ${name}=${port} must be a valid port number`);
+  } else {
+    return port;
+  }
 }
-export function defaultProjectDirs(projectRootAbs) {
-    const pages = 'pages';
-    const dirs = {
-        buildRoot: 'build',
-        buildDist: join('build', 'dist'),
-        buildWatch: join('build', 'watch'),
-        pages,
-        pagesResolved: resolve(join(projectRootAbs, pages)),
-        projectResolved: resolve(projectRootAbs),
-        projectRootAbs,
-        public: 'public',
-    };
-    return {
-        get buildRoot() {
-            return dirs.buildRoot;
-        },
-        get buildDist() {
-            return dirs.buildDist;
-        },
-        get buildWatch() {
-            return dirs.buildWatch;
-        },
-        get pages() {
-            return dirs.pages;
-        },
-        get pagesResolved() {
-            return dirs.pagesResolved;
-        },
-        get projectResolved() {
-            return dirs.projectResolved;
-        },
-        get projectRootAbs() {
-            return dirs.projectRootAbs;
-        },
-        get public() {
-            return dirs.public;
-        },
-    };
+function defaultProjectDirs(projectRootAbs) {
+  const pages = "pages";
+  const dirs = {
+    buildRoot: "build",
+    buildDist: join("build", "dist"),
+    buildWatch: join("build", "watch"),
+    pages,
+    pagesResolved: resolve(join(projectRootAbs, pages)),
+    projectResolved: resolve(projectRootAbs),
+    projectRootAbs,
+    public: "public"
+  };
+  return {
+    get buildRoot() {
+      return dirs.buildRoot;
+    },
+    get buildDist() {
+      return dirs.buildDist;
+    },
+    get buildWatch() {
+      return dirs.buildWatch;
+    },
+    get pages() {
+      return dirs.pages;
+    },
+    get pagesResolved() {
+      return dirs.pagesResolved;
+    },
+    get projectResolved() {
+      return dirs.projectResolved;
+    },
+    get projectRootAbs() {
+      return dirs.projectRootAbs;
+    },
+    get public() {
+      return dirs.public;
+    }
+  };
 }
-const willMinify = () => isProductionBuild() ||
-    process.env.MINIFY === 'true' ||
-    process.argv.includes('--minify');
-// `dank serve` will print http access logs to console
-const willLogHttp = () => process.env.LOG_HTTP === 'true' || process.argv.includes('--log-http');
+const willMinify = () => isProductionBuild() || process.env.MINIFY === "true" || process.argv.includes("--minify");
+const willLogHttp = () => process.env.LOG_HTTP === "true" || process.argv.includes("--log-http");
+export {
+  defaultProjectDirs,
+  isProductionBuild,
+  resolveBuildFlags,
+  resolveServeFlags
+};