@batijs/cli 0.0.176 → 0.0.178

package/dist/index.js

@@ -4,6 +4,188 @@ import {
   consola
 } from "./chunk-P3F3WO2D.js";
 
+// index.ts
+import { existsSync as existsSync2 } from "fs";
+import { access, constants, lstat, readdir, readFile as readFile3 } from "fs/promises";
+import { dirname, join, parse } from "path";
+import { fileURLToPath } from "url";
+
+// ../build/dist/index.js
+import { existsSync } from "fs";
+import { mkdir, opendir, readFile as readFile2, writeFile } from "fs/promises";
+import path from "path";
+import { transformAndFormat as transformAndFormat2 } from "@batijs/core";
+import { readFile } from "fs/promises";
+import { parseModule, transformAndFormat } from "@batijs/core";
+async function mergeDts({
+  target,
+  fileContent,
+  filepath,
+  meta
+}) {
+  const previousCode = await readFile(target, { encoding: "utf-8" });
+  const previousAst = parseModule(previousCode);
+  const currentAst = parseModule(fileContent);
+  for (const imp of previousAst.imports.$items) {
+    currentAst.imports[imp.local] = imp;
+  }
+  const index = currentAst.$ast.body.findIndex(
+    (node) => node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration"
+  );
+  for (const node of previousAst.$ast.body) {
+    if (node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration") {
+      continue;
+    }
+    if (index === -1) {
+      currentAst.$ast.body.push(node);
+    } else {
+      currentAst.$ast.body.splice(index, 0, node);
+    }
+  }
+  return transformAndFormat(currentAst.generate().code, meta, {
+    filepath
+  });
+}
+function queue() {
+  const tasks = [];
+  return {
+    add(task) {
+      tasks.push(task);
+    },
+    async run() {
+      let task;
+      while (task = tasks.shift()) {
+        await task();
+      }
+    }
+  };
+}
+var reIgnoreFile = /^(chunk-|asset-|#)/gi;
+var isWin = process.platform === "win32";
+function toDist(filepath, source, dist) {
+  const split = filepath.split(path.sep);
+  split[split.length - 1] = split[split.length - 1].replace(/^\$\$?(.*)\.[tj]sx?$/, "$1");
+  return split.join(path.sep).replace(source, dist);
+}
+async function safeWriteFile(destination, content) {
+  const destinationDir = path.dirname(destination);
+  await mkdir(destinationDir, {
+    recursive: true
+  });
+  await writeFile(destination, content, { encoding: "utf-8" });
+}
+async function* walk(dir) {
+  if (!existsSync(dir))
+    return;
+  for await (const d of await opendir(dir)) {
+    const entry = path.join(dir, d.name);
+    if (d.isDirectory()) {
+      yield* walk(entry);
+    } else if (d.isFile())
+      yield entry;
+  }
+}
+function transformFileAfterExec(filepath, fileContent) {
+  if (fileContent === void 0 || fileContent === null)
+    return null;
+  const parsed = path.parse(filepath);
+  const toTest = [parsed.base, parsed.ext, parsed.name].filter(Boolean);
+  for (const ext of toTest) {
+    switch (ext) {
+      case ".ts":
+      case ".js":
+      case ".tsx":
+      case ".jsx":
+      case ".env":
+      case ".env.local":
+      case ".env.development":
+      case ".env.development.local":
+      case ".env.test":
+      case ".env.test.local":
+      case ".env.production":
+      case ".env.production.local":
+      case ".html":
+      case ".md":
+        return fileContent;
+      case ".json":
+        return JSON.stringify(fileContent, null, 2);
+    }
+  }
+  throw new Error(`Unsupported file extension ${parsed.base} (${filepath})`);
+}
+async function importTransformer(p) {
+  const importFile = isWin ? "file://" + p : p;
+  const f = await import(importFile);
+  return f.default;
+}
+async function main(options, meta) {
+  const sources = Array.isArray(options.source) ? options.source : [options.source];
+  const targets = /* @__PURE__ */ new Set();
+  const priorityQ = queue();
+  const transformAndWriteQ = queue();
+  for (const source of sources) {
+    for await (const p of walk(source)) {
+      const target = toDist(p, source, options.dist);
+      const parsed = path.parse(p);
+      if (parsed.name.match(reIgnoreFile)) {
+        continue;
+      } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.tsx?$/)) {
+        throw new Error(
+          `Typescript file needs to be compiled before it can be executed: '${p}'.
+Please report this issue to https://github.com/batijs/bati`
+        );
+      } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.jsx?$/)) {
+        transformAndWriteQ.add(async () => {
+          const transformer = await importTransformer(p);
+          const rf = () => {
+            return readFile2(target, { encoding: "utf-8" });
+          };
+          const fileContent = transformFileAfterExec(
+            target,
+            await transformer({
+              readfile: targets.has(target) ? rf : void 0,
+              meta,
+              source,
+              target
+            })
+          );
+          if (fileContent !== null) {
+            await safeWriteFile(target, fileContent);
+            targets.add(target);
+          }
+        });
+      } else {
+        priorityQ.add(async () => {
+          const code = await readFile2(p, { encoding: "utf-8" });
+          const filepath = path.relative(source, p);
+          let fileContent = await transformAndFormat2(code, meta, {
+            filepath
+          });
+          if (p.endsWith(".d.ts") && targets.has(target)) {
+            fileContent = await mergeDts({
+              fileContent,
+              target,
+              meta,
+              filepath
+            });
+          }
+          if (fileContent) {
+            await safeWriteFile(target, fileContent.trimStart());
+            targets.add(target);
+          }
+        });
+      }
+    }
+  }
+  await priorityQ.run();
+  await transformAndWriteQ.run();
+}
+
+// index.ts
+import { withIcon } from "@batijs/core";
+import { flags as coreFlags, features } from "@batijs/features";
+import { execRules } from "@batijs/features/rules";
+
 // ../../node_modules/.pnpm/citty@0.1.6/node_modules/citty/dist/index.mjs
 function toArray(val) {
   if (Array.isArray(val)) {
@@ -455,190 +637,6 @@ async function runMain(cmd, opts = {}) {
   }
 }
 
-// ../build/dist/index.js
-import { existsSync } from "fs";
-import { mkdir, opendir, readFile, writeFile } from "fs/promises";
-import path from "path";
-import { transformAndFormat } from "@batijs/core";
-function queue() {
-  const tasks = [];
-  return {
-    add(task) {
-      tasks.push(task);
-    },
-    async run() {
-      let task;
-      while (task = tasks.shift()) {
-        await task();
-      }
-    }
-  };
-}
-var reIgnoreFile = /^(chunk-|asset-|#)/gi;
-var isWin = process.platform === "win32";
-function toDist(filepath, source, dist) {
-  const split = filepath.split(path.sep);
-  split[split.length - 1] = split[split.length - 1].replace(/^\$\$?(.*)\.[tj]sx?$/, "$1");
-  return split.join(path.sep).replace(source, dist);
-}
-async function safeWriteFile(destination, content) {
-  const destinationDir = path.dirname(destination);
-  await mkdir(destinationDir, {
-    recursive: true
-  });
-  await writeFile(destination, content, { encoding: "utf-8" });
-}
-async function* walk(dir) {
-  if (!existsSync(dir))
-    return;
-  for await (const d of await opendir(dir)) {
-    const entry = path.join(dir, d.name);
-    if (d.isDirectory()) {
-      yield* walk(entry);
-    } else if (d.isFile())
-      yield entry;
-  }
-}
-function transformFileAfterExec(filepath, fileContent) {
-  if (fileContent === void 0 || fileContent === null)
-    return null;
-  const parsed = path.parse(filepath);
-  const toTest = [parsed.base, parsed.ext, parsed.name].filter(Boolean);
-  for (const ext of toTest) {
-    switch (ext) {
-      case ".ts":
-      case ".js":
-      case ".tsx":
-      case ".jsx":
-      case ".env":
-      case ".env.local":
-      case ".env.development":
-      case ".env.development.local":
-      case ".env.test":
-      case ".env.test.local":
-      case ".env.production":
-      case ".env.production.local":
-      case ".html":
-      case ".md":
-        return fileContent;
-      case ".json":
-        return JSON.stringify(fileContent, null, 2);
-    }
-  }
-  throw new Error(`Unsupported file extension ${parsed.base} (${filepath})`);
-}
-async function importTransformer(p) {
-  const importFile = isWin ? "file://" + p : p;
-  const f = await import(importFile);
-  return f.default;
-}
-async function main(options, meta) {
-  const sources = Array.isArray(options.source) ? options.source : [options.source];
-  const targets = /* @__PURE__ */ new Set();
-  const simpleCopyQ = queue();
-  const transformAndWriteQ = queue();
-  for (const source of sources) {
-    for await (const p of walk(source)) {
-      const target = toDist(p, source, options.dist);
-      const parsed = path.parse(p);
-      if (parsed.name.match(reIgnoreFile)) {
-        continue;
-      } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.tsx?$/)) {
-        throw new Error(
-          `Typescript file needs to be compiled before it can be executed: '${p}'.
-Please report this issue to https://github.com/magne4000/bati`
-        );
-      } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.jsx?$/)) {
-        transformAndWriteQ.add(async () => {
-          const transformer = await importTransformer(p);
-          const rf = () => {
-            return readFile(target, { encoding: "utf-8" });
-          };
-          const fileContent = transformFileAfterExec(
-            target,
-            await transformer({
-              readfile: targets.has(target) ? rf : void 0,
-              meta,
-              source,
-              target
-            })
-          );
-          if (fileContent !== null) {
-            await safeWriteFile(target, fileContent);
-            targets.add(target);
-          }
-        });
-      } else {
-        transformAndWriteQ.add(async () => {
-          const code = await readFile(p, { encoding: "utf-8" });
-          const fileContent = await transformAndFormat(code, meta, {
-            filepath: path.relative(source, p)
-          });
-          if (fileContent) {
-            await safeWriteFile(target, fileContent);
-            targets.add(target);
-          }
-        });
-      }
-    }
-  }
-  await simpleCopyQ.run();
-  await transformAndWriteQ.run();
-}
-
-// package.json
-var package_default = {
-  name: "@batijs/cli",
-  version: "0.0.176",
-  type: "module",
-  scripts: {
-    "check-types": "tsc --noEmit",
-    prerelease: "rimraf ./dist",
-    prepublishOnly: "pnpm run build-cli",
-    "build-cli": "rimraf ./dist && tsup"
-  },
-  keywords: [],
-  description: "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
-  author: "Jo\xEBl Charles",
-  repository: "https://github.com/batijs/bati",
-  license: "MIT",
-  devDependencies: {
-    "@batijs/build": "workspace:*",
-    "@batijs/compile": "workspace:*",
-    "@types/node": "^18.19.14",
-    "@types/which": "^3.0.3",
-    citty: "^0.1.6",
-    colorette: "^2.0.20",
-    esbuild: "^0.20.2",
-    execa: "^8.0.1",
-    rimraf: "^5.0.5",
-    sift: "^17.1.2",
-    tsup: "^8.0.2",
-    typescript: "^5.4.5",
-    vite: "^5.2.8"
-  },
-  dependencies: {
-    "@batijs/core": "workspace:*",
-    "@batijs/features": "workspace:*"
-  },
-  bin: "./dist/index.js",
-  exports: {
-    ".": "./dist/index.js"
-  },
-  files: [
-    "dist/"
-  ]
-};
-
-// index.ts
-import { withIcon } from "@batijs/core";
-import { features, flags as coreFlags } from "@batijs/features";
-import { execRules } from "@batijs/features/rules";
-import { existsSync as existsSync2 } from "fs";
-import { fileURLToPath } from "url";
-import { dirname, join, parse } from "path";
-import { access, constants, lstat, readdir, readFile as readFile2 } from "fs/promises";
-
 // ../../node_modules/.pnpm/colorette@2.0.20/node_modules/colorette/index.js
 import * as tty from "tty";
 var {
@@ -754,32 +752,6 @@ var {
   bgWhiteBright
 } = createColors();
 
-// rules.ts
-import { RulesMessage } from "@batijs/features/rules";
-function error(value) {
-  return {
-    type: "error",
-    value
-  };
-}
-function info(value) {
-  return {
-    type: "info",
-    value
-  };
-}
-var rulesMessages = {
-  [RulesMessage.ERROR_AUTH_R_SERVER]: error(
-    `A ${inverse(bold("Server"))} is required when using ${inverse(
-      bold("Auth")
-    )}. Check https://vite-plugin-ssr.com/integration#server-side-tools for details and https://batijs.dev for available servers`
-  ),
-  [RulesMessage.ERROR_COMPILED_R_REACT]: error(
-    `${inverse(bold("React"))} is required when using ${inverse(bold("Compiled"))}.`
-  ),
-  [RulesMessage.INFO_HATTIP]: info(`${inverse(bold("HatTip"))} is an experimental project`)
-};
-
 // ../../node_modules/.pnpm/sift@17.1.2/node_modules/sift/es5m/index.js
 var extendStatics = function(d, b) {
   extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
@@ -1562,6 +1534,76 @@ var createDefaultQueryTester = function(query, options) {
   return createOperationTester(op);
 };
 
+// package.json
+var package_default = {
+  name: "@batijs/cli",
+  version: "0.0.178",
+  type: "module",
+  scripts: {
+    "check-types": "tsc --noEmit",
+    prerelease: "rimraf ./dist",
+    prepublishOnly: "pnpm run build-cli",
+    "build-cli": "rimraf ./dist && tsup"
+  },
+  keywords: [],
+  description: "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
+  author: "Jo\xEBl Charles",
+  repository: "https://github.com/batijs/bati",
+  license: "MIT",
+  devDependencies: {
+    "@batijs/build": "workspace:*",
+    "@batijs/compile": "workspace:*",
+    "@types/node": "^18.19.14",
+    "@types/which": "^3.0.3",
+    citty: "^0.1.6",
+    colorette: "^2.0.20",
+    esbuild: "^0.20.2",
+    execa: "^8.0.1",
+    rimraf: "^5.0.5",
+    sift: "^17.1.2",
+    tsup: "^8.0.2",
+    typescript: "^5.4.5",
+    vite: "^5.2.8"
+  },
+  dependencies: {
+    "@batijs/core": "workspace:*",
+    "@batijs/features": "workspace:*"
+  },
+  bin: "./dist/index.js",
+  exports: {
+    ".": "./dist/index.js"
+  },
+  files: [
+    "dist/"
+  ]
+};
+
+// rules.ts
+import { RulesMessage } from "@batijs/features/rules";
+function error(value) {
+  return {
+    type: "error",
+    value
+  };
+}
+function info(value) {
+  return {
+    type: "info",
+    value
+  };
+}
+var rulesMessages = {
+  [RulesMessage.ERROR_AUTH_R_SERVER]: error(
+    `A ${inverse(bold("Server"))} is required when using ${inverse(
+      bold("Auth")
+    )}. Check https://vite-plugin-ssr.com/integration#server-side-tools for details and https://batijs.dev for available servers`
+  ),
+  [RulesMessage.ERROR_COMPILED_R_REACT]: error(
+    `${inverse(bold("React"))} is required when using ${inverse(bold("Compiled"))}.`
+  ),
+  [RulesMessage.INFO_HATTIP]: info(`${inverse(bold("HatTip"))} is an experimental project`)
+};
+
 // index.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname(__filename);
@@ -1575,7 +1617,7 @@ function boilerplatesDir() {
   throw new Error("Missing boilerplates.json file. Run `pnpm run build`");
 }
 async function parseBoilerplates(dir) {
-  return JSON.parse(await readFile2(join(dir, "boilerplates.json"), "utf-8"));
+  return JSON.parse(await readFile3(join(dir, "boilerplates.json"), "utf-8"));
 }
 function toArg(flag, description) {
   if (!flag)
@@ -1617,7 +1659,9 @@ function printOK(dist, flags) {
   console.log(cmd3(`cd ${dist}`));
   console.log(cmd3("pnpm install"));
   console.log(cmd3("pnpm run dev"));
-  console.log("\n" + bold(book0("Be sure to check the ") + cyan("README.md") + " file for remaining steps and documentation."));
+  console.log(
+    "\n" + bold(book0("Be sure to check the ") + cyan("README.md") + " file for remaining steps and documentation.")
+  );
 }
 var defaultDef = {
   project: {
@@ -1735,11 +1779,7 @@ async function run() {
       version: package_default.version,
       description: package_default.description
     },
-    args: Object.assign(
-      {},
-      defaultDef,
-      ...coreFlags.map((k) => toArg(k, findDescription(k)))
-    ),
+    args: Object.assign({}, defaultDef, ...coreFlags.map((k) => toArg(k, findDescription(k)))),
     async run({ args }) {
       await checkArguments(args);
       const sources = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.176",
+  "version": "0.0.178",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -19,12 +19,12 @@
     "tsup": "^8.0.2",
     "typescript": "^5.4.5",
     "vite": "^5.2.8",
-    "@batijs/build": "0.0.176",
-    "@batijs/compile": "0.0.176"
+    "@batijs/build": "0.0.178",
+    "@batijs/compile": "0.0.178"
   },
   "dependencies": {
-    "@batijs/core": "0.0.176",
-    "@batijs/features": "0.0.176"
+    "@batijs/core": "0.0.178",
+    "@batijs/features": "0.0.178"
   },
   "bin": "./dist/index.js",
   "exports": {

package/dist/boilerplates/@batijs/firebase-auth/files/firebase/service-account-example.json

@@ -1,13 +0,0 @@
-{
-  "type": "",
-  "project_id": "",
-  "private_key_id": "",
-  "private_key": "",
-  "client_email": "",
-  "client_id": "",
-  "auth_uri": "",
-  "token_uri": "",
-  "auth_provider_x509_cert_url": "",
-  "client_x509_cert_url": "",
-  "universe_domain": ""
-}

package/dist/boilerplates/@batijs/firebase-auth/types/types.d.ts

@@ -1,18 +0,0 @@
-import type { UserRecord } from "firebase-admin/auth";
-import type { FirebaseApp } from "firebase/app";
-declare global {
-    namespace Express {
-        interface Request {
-            user?: UserRecord | null;
-        }
-    }
-    namespace Vike {
-        interface PageContext {
-            user?: UserRecord | null;
-        }
-        interface Config {
-            firebaseApp?: FirebaseApp;
-        }
-    }
-}
-export {};