@fluixi/cli 0.1.0-alpha.81 → 0.1.0-alpha.83

package/dist/scaffold/edit.d.ts

@@ -0,0 +1,35 @@
+/** One thing done to a file, or the lines the author has to add themselves. */
+export type Step = {
+    kind: 'created' | 'updated' | 'kept' | 'listed';
+    file: string;
+    detail?: string;
+} | {
+    kind: 'hint';
+    file: string;
+    lines: string[];
+};
+/** After the last import statement, or at the top. */
+export declare function addImport(text: string, line: string): string;
+export interface Registration {
+    /** The import line, written as it should appear. */
+    importLine: string;
+    /** What goes in `imports: [...]`. */
+    entry: string;
+    /** Extra imports the entry needs, such as the config a condition reads. */
+    extraImports?: string[];
+}
+/**
+ * List a module in `src/app.config.ts` or `app.config.server.ts`, creating the file when the
+ * app has none. Returns false when it could only hint.
+ */
+export declare function register(log: Step[], file: string, header: string, r: Registration): boolean;
+/** Names already in `env.public` in fluixi.config, or null when there is no such list. */
+export declare function envPublicNames(configFile: string): string[] | null;
+/**
+ * Add names to `env.public`, skipping those already there. A `defineConfig({ ... })` with no
+ * `env` block gets one, as the first property.
+ */
+export declare function addEnvPublic(log: Step[], configFile: string, names: string[]): void;
+/** Append variables `.env.example` does not list yet, under a comment. */
+export declare function addEnvExample(log: Step[], file: string, comment: string, vars: Record<string, string>): void;
+//# sourceMappingURL=edit.d.ts.map

package/dist/scaffold/edit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/scaffold/edit.ts"],"names":[],"mappings":"AAaA,+EAA+E;AAC/E,MAAM,MAAM,IAAI,GACZ;IAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAClF;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAqCpD,sDAAsD;AACtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAK5D;AAED,MAAM,WAAW,YAAY;IAC3B,oDAAoD;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,YAAY,GAAG,OAAO,CA0B5F;AAED,0FAA0F;AAC1F,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAQlE;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAqBnF;AAED,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAQ5G"}

package/dist/scaffold/edit.js

@@ -0,0 +1,140 @@
+/**
+ * The few edits a generator makes to files the app already has.
+ *
+ * Text insertions at known shapes, never a parse and reprint: `app.config.ts` and
+ * `fluixi.config.ts` are the author's code, and reprinting them loses their formatting. When a
+ * file does not have the shape looked for, the lines to add are returned instead.
+ *
+ * Nothing here prints or depends on a package: `fluixi g`, `fluixi add` and create-fluixi all
+ * run this code and each reports the steps its own way.
+ */
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname } from 'node:path';
+/** Index just past the bracket matching the one at `open`, skipping strings and comments. */
+function closing(text, open) {
+    let depth = 0;
+    for (let i = open; i < text.length; i++) {
+        const ch = text[i];
+        if (ch === '/' && text[i + 1] === '/')
+            i = text.indexOf('\n', i) === -1 ? text.length : text.indexOf('\n', i);
+        else if (ch === '/' && text[i + 1] === '*')
+            i = text.indexOf('*/', i + 2) + 1;
+        else if (ch === "'" || ch === '"' || ch === '`') {
+            for (i++; i < text.length && text[i] !== ch; i++)
+                if (text[i] === '\\')
+                    i++;
+        }
+        else if ('([{'.includes(ch))
+            depth++;
+        else if (')]}'.includes(ch) && --depth === 0)
+            return i;
+    }
+    return -1;
+}
+/**
+ * Add items to the array literal at `open`, in its layout: one per line when it is written
+ * that way, inline otherwise.
+ */
+function appendToArray(text, open, items) {
+    const close = closing(text, open);
+    const inner = text.slice(open + 1, close);
+    if (!inner.trim())
+        return text.slice(0, open + 1) + items.join(', ') + text.slice(close);
+    if (inner.includes('\n')) {
+        const last = inner.trimEnd();
+        const indent = last.slice(last.lastIndexOf('\n') + 1).match(/^\s*/)[0];
+        const comma = last.endsWith(',') ? '' : ',';
+        const tail = inner.slice(last.length);
+        return text.slice(0, open + 1) + last + comma + items.map((i) => `\n${indent}${i},`).join('') + tail + text.slice(close);
+    }
+    const body = inner.replace(/,?\s*$/, '');
+    const trailing = inner.slice(body.length).replace(/^,/, '');
+    return text.slice(0, open + 1) + body + ', ' + items.join(', ') + trailing + text.slice(close);
+}
+/** After the last import statement, or at the top. */
+export function addImport(text, line) {
+    if (text.includes(line))
+        return text;
+    const imports = [...text.matchAll(/^import[\s\S]*?from\s+['"][^'"]+['"];?[^\n]*\n/gm)];
+    const at = imports.length ? imports[imports.length - 1].index + imports[imports.length - 1][0].length : 0;
+    return text.slice(0, at) + line + '\n' + text.slice(at);
+}
+/**
+ * List a module in `src/app.config.ts` or `app.config.server.ts`, creating the file when the
+ * app has none. Returns false when it could only hint.
+ */
+export function register(log, file, header, r) {
+    const imports = [...(r.extraImports ?? []), r.importLine];
+    if (!existsSync(file)) {
+        mkdirSync(dirname(file), { recursive: true });
+        writeFileSync(file, `${header}import { defineApp } from '@fluixi/start/app';\n${imports.join('\n')}\n\nexport default defineApp({ imports: [${r.entry}] });\n`);
+        log.push({ kind: 'created', file });
+        return true;
+    }
+    let text = readFileSync(file, 'utf8');
+    if (text.includes(r.importLine)) {
+        log.push({ kind: 'listed', file, detail: r.entry });
+        return true;
+    }
+    const m = text.match(/\bimports\s*:\s*\[/);
+    if (!m) {
+        log.push({ kind: 'hint', file, lines: [...imports, `imports: [${r.entry}]`] });
+        return false;
+    }
+    text = appendToArray(text, m.index + m[0].length - 1, [r.entry]);
+    for (const line of imports)
+        text = addImport(text, line);
+    writeFileSync(file, text);
+    log.push({ kind: 'updated', file, detail: `imports ${r.entry}` });
+    return true;
+}
+/** Names already in `env.public` in fluixi.config, or null when there is no such list. */
+export function envPublicNames(configFile) {
+    if (!existsSync(configFile))
+        return null;
+    const text = readFileSync(configFile, 'utf8');
+    const m = text.match(/\bpublic\s*:\s*\[/);
+    if (!m)
+        return null;
+    const open = m.index + m[0].length - 1;
+    const list = text.slice(open, closing(text, open) + 1);
+    return [...list.matchAll(/['"]([A-Za-z_][A-Za-z0-9_]*)['"]/g)].map((x) => x[1]);
+}
+/**
+ * Add names to `env.public`, skipping those already there. A `defineConfig({ ... })` with no
+ * `env` block gets one, as the first property.
+ */
+export function addEnvPublic(log, configFile, names) {
+    const list = (indent) => `${indent}public: [\n${names.map((n) => `${indent}  '${n}',\n`).join('')}${indent}],\n`;
+    const have = envPublicNames(configFile);
+    if (have === null) {
+        const text = existsSync(configFile) ? readFileSync(configFile, 'utf8') : '';
+        const call = text.match(/defineConfig\(\{\n/);
+        if (call && !/\benv\s*:/.test(text)) {
+            const at = call.index + call[0].length;
+            writeFileSync(configFile, text.slice(0, at) + `  env: {\n${list('    ')}  },\n` + text.slice(at));
+            log.push({ kind: 'updated', file: configFile, detail: `env.public ${names.join(', ')}` });
+            return;
+        }
+        log.push({ kind: 'hint', file: configFile, lines: [`env: { public: [${names.map((n) => `'${n}'`).join(', ')}] },`] });
+        return;
+    }
+    const missing = names.filter((n) => !have.includes(n));
+    if (!missing.length)
+        return;
+    const text = readFileSync(configFile, 'utf8');
+    const m = text.match(/\bpublic\s*:\s*\[/);
+    writeFileSync(configFile, appendToArray(text, m.index + m[0].length - 1, missing.map((n) => `'${n}'`)));
+    log.push({ kind: 'updated', file: configFile, detail: `env.public + ${missing.join(', ')}` });
+}
+/** Append variables `.env.example` does not list yet, under a comment. */
+export function addEnvExample(log, file, comment, vars) {
+    const text = existsSync(file) ? readFileSync(file, 'utf8') : '';
+    const have = new Set([...text.matchAll(/^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=/gm)].map((m) => m[1]));
+    const add = Object.entries(vars).filter(([k]) => !have.has(k) && !have.has(`VITE_${k}`));
+    if (!add.length)
+        return;
+    const block = `${comment.split('\n').map((l) => `# ${l}`).join('\n')}\n${add.map(([k, v]) => `${k}=${v}`).join('\n')}\n`;
+    writeFileSync(file, text ? `${text.replace(/\n*$/, '\n')}\n${block}` : block);
+    log.push({ kind: text ? 'updated' : 'created', file, detail: add.map(([k]) => k).join(', ') });
+}

package/dist/scaffold/edit.mjs

@@ -0,0 +1,124 @@
+// src/scaffold/edit.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+function closing(text, open) {
+  let depth = 0;
+  for (let i = open; i < text.length; i++) {
+    const ch = text[i];
+    if (ch === "/" && text[i + 1] === "/") i = text.indexOf("\n", i) === -1 ? text.length : text.indexOf("\n", i);
+    else if (ch === "/" && text[i + 1] === "*") i = text.indexOf("*/", i + 2) + 1;
+    else if (ch === "'" || ch === '"' || ch === "`") {
+      for (i++; i < text.length && text[i] !== ch; i++) if (text[i] === "\\") i++;
+    } else if ("([{".includes(ch)) depth++;
+    else if (")]}".includes(ch) && --depth === 0) return i;
+  }
+  return -1;
+}
+function appendToArray(text, open, items) {
+  const close = closing(text, open);
+  const inner = text.slice(open + 1, close);
+  if (!inner.trim()) return text.slice(0, open + 1) + items.join(", ") + text.slice(close);
+  if (inner.includes("\n")) {
+    const last = inner.trimEnd();
+    const indent = last.slice(last.lastIndexOf("\n") + 1).match(/^\s*/)[0];
+    const comma = last.endsWith(",") ? "" : ",";
+    const tail = inner.slice(last.length);
+    return text.slice(0, open + 1) + last + comma + items.map((i) => `
+${indent}${i},`).join("") + tail + text.slice(close);
+  }
+  const body = inner.replace(/,?\s*$/, "");
+  const trailing = inner.slice(body.length).replace(/^,/, "");
+  return text.slice(0, open + 1) + body + ", " + items.join(", ") + trailing + text.slice(close);
+}
+function addImport(text, line) {
+  if (text.includes(line)) return text;
+  const imports = [...text.matchAll(/^import[\s\S]*?from\s+['"][^'"]+['"];?[^\n]*\n/gm)];
+  const at = imports.length ? imports[imports.length - 1].index + imports[imports.length - 1][0].length : 0;
+  return text.slice(0, at) + line + "\n" + text.slice(at);
+}
+function register(log, file, header, r) {
+  const imports = [...r.extraImports ?? [], r.importLine];
+  if (!existsSync(file)) {
+    mkdirSync(dirname(file), { recursive: true });
+    writeFileSync(
+      file,
+      `${header}import { defineApp } from '@fluixi/start/app';
+${imports.join("\n")}
+
+export default defineApp({ imports: [${r.entry}] });
+`
+    );
+    log.push({ kind: "created", file });
+    return true;
+  }
+  let text = readFileSync(file, "utf8");
+  if (text.includes(r.importLine)) {
+    log.push({ kind: "listed", file, detail: r.entry });
+    return true;
+  }
+  const m = text.match(/\bimports\s*:\s*\[/);
+  if (!m) {
+    log.push({ kind: "hint", file, lines: [...imports, `imports: [${r.entry}]`] });
+    return false;
+  }
+  text = appendToArray(text, m.index + m[0].length - 1, [r.entry]);
+  for (const line of imports) text = addImport(text, line);
+  writeFileSync(file, text);
+  log.push({ kind: "updated", file, detail: `imports ${r.entry}` });
+  return true;
+}
+function envPublicNames(configFile) {
+  if (!existsSync(configFile)) return null;
+  const text = readFileSync(configFile, "utf8");
+  const m = text.match(/\bpublic\s*:\s*\[/);
+  if (!m) return null;
+  const open = m.index + m[0].length - 1;
+  const list = text.slice(open, closing(text, open) + 1);
+  return [...list.matchAll(/['"]([A-Za-z_][A-Za-z0-9_]*)['"]/g)].map((x) => x[1]);
+}
+function addEnvPublic(log, configFile, names) {
+  const list = (indent) => `${indent}public: [
+${names.map((n) => `${indent}  '${n}',
+`).join("")}${indent}],
+`;
+  const have = envPublicNames(configFile);
+  if (have === null) {
+    const text2 = existsSync(configFile) ? readFileSync(configFile, "utf8") : "";
+    const call = text2.match(/defineConfig\(\{\n/);
+    if (call && !/\benv\s*:/.test(text2)) {
+      const at = call.index + call[0].length;
+      writeFileSync(configFile, text2.slice(0, at) + `  env: {
+${list("    ")}  },
+` + text2.slice(at));
+      log.push({ kind: "updated", file: configFile, detail: `env.public ${names.join(", ")}` });
+      return;
+    }
+    log.push({ kind: "hint", file: configFile, lines: [`env: { public: [${names.map((n) => `'${n}'`).join(", ")}] },`] });
+    return;
+  }
+  const missing = names.filter((n) => !have.includes(n));
+  if (!missing.length) return;
+  const text = readFileSync(configFile, "utf8");
+  const m = text.match(/\bpublic\s*:\s*\[/);
+  writeFileSync(configFile, appendToArray(text, m.index + m[0].length - 1, missing.map((n) => `'${n}'`)));
+  log.push({ kind: "updated", file: configFile, detail: `env.public + ${missing.join(", ")}` });
+}
+function addEnvExample(log, file, comment, vars) {
+  const text = existsSync(file) ? readFileSync(file, "utf8") : "";
+  const have = new Set([...text.matchAll(/^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=/gm)].map((m) => m[1]));
+  const add = Object.entries(vars).filter(([k]) => !have.has(k) && !have.has(`VITE_${k}`));
+  if (!add.length) return;
+  const block = `${comment.split("\n").map((l) => `# ${l}`).join("\n")}
+${add.map(([k, v]) => `${k}=${v}`).join("\n")}
+`;
+  writeFileSync(file, text ? `${text.replace(/\n*$/, "\n")}
+${block}` : block);
+  log.push({ kind: text ? "updated" : "created", file, detail: add.map(([k]) => k).join(", ") });
+}
+export {
+  addEnvExample,
+  addEnvPublic,
+  addImport,
+  envPublicNames,
+  register
+};