@axintai/compiler 0.3.1 → 0.3.2

package/dist/cli/index.js

@@ -1163,6 +1163,142 @@ var init_compiler = __esm({
   }
 });
 
+// src/core/format.ts
+var format_exports = {};
+__export(format_exports, {
+  SWIFT_FORMAT_CONFIG: () => SWIFT_FORMAT_CONFIG,
+  formatSwift: () => formatSwift
+});
+import { spawn } from "child_process";
+import { writeFile, unlink } from "fs/promises";
+import { join } from "path";
+import { tmpdir } from "os";
+async function formatSwift(source, options = {}) {
+  const available = await hasSwiftFormat();
+  if (!available) {
+    if (options.strict) {
+      throw new Error(
+        "swift-format not found on $PATH. Install Xcode + Command Line Tools, or drop --format."
+      );
+    }
+    return {
+      formatted: source,
+      ran: false,
+      reason: "swift-format not found on $PATH"
+    };
+  }
+  const configPath = join(
+    tmpdir(),
+    `axint-swift-format-${Date.now()}-${Math.random().toString(36).slice(2)}.json`
+  );
+  await writeFile(configPath, JSON.stringify(SWIFT_FORMAT_CONFIG, null, 2));
+  try {
+    const result = await runSwiftFormat(source, configPath, options.timeoutMs ?? 8e3);
+    if (result.code === 0) {
+      return { formatted: result.stdout, ran: true };
+    }
+    if (options.strict) {
+      throw new Error(`swift-format failed: ${result.stderr}`);
+    }
+    return {
+      formatted: source,
+      ran: false,
+      reason: `swift-format exited ${result.code}: ${result.stderr}`
+    };
+  } finally {
+    await unlink(configPath).catch(() => void 0);
+  }
+}
+function hasSwiftFormat() {
+  return new Promise((resolve3) => {
+    const child = spawn("swift-format", ["--version"], { stdio: "pipe" });
+    child.on("error", () => resolve3(false));
+    child.on("exit", (code) => resolve3(code === 0));
+  });
+}
+function runSwiftFormat(source, configPath, timeoutMs) {
+  return new Promise((resolve3) => {
+    const child = spawn("swift-format", ["format", "--configuration", configPath], {
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (d) => stdout += d.toString());
+    child.stderr?.on("data", (d) => stderr += d.toString());
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      resolve3({
+        stdout,
+        stderr: stderr + `
+[format] killed after ${timeoutMs}ms`,
+        code: 124
+      });
+    }, timeoutMs);
+    child.on("exit", (code) => {
+      clearTimeout(timer);
+      resolve3({ stdout, stderr, code: code ?? 1 });
+    });
+    child.stdin?.write(source);
+    child.stdin?.end();
+  });
+}
+var SWIFT_FORMAT_CONFIG;
+var init_format = __esm({
+  "src/core/format.ts"() {
+    "use strict";
+    SWIFT_FORMAT_CONFIG = {
+      version: 1,
+      lineLength: 100,
+      indentation: { spaces: 4 },
+      tabWidth: 4,
+      maximumBlankLines: 1,
+      respectsExistingLineBreaks: true,
+      lineBreakBeforeControlFlowKeywords: false,
+      lineBreakBeforeEachArgument: false,
+      lineBreakBeforeEachGenericRequirement: false,
+      prioritizeKeepingFunctionOutputTogether: false,
+      indentConditionalCompilationBlocks: true,
+      lineBreakAroundMultilineExpressionChainComponents: false,
+      fileScopedDeclarationPrivacy: { accessLevel: "private" },
+      rules: {
+        AllPublicDeclarationsHaveDocumentation: false,
+        AlwaysUseLowerCamelCase: true,
+        AmbiguousTrailingClosureOverload: true,
+        BeginDocumentationCommentWithOneLineSummary: false,
+        DoNotUseSemicolons: true,
+        DontRepeatTypeInStaticProperties: true,
+        FileScopedDeclarationPrivacy: true,
+        FullyIndirectEnum: true,
+        GroupNumericLiterals: true,
+        IdentifiersMustBeASCII: true,
+        NeverForceUnwrap: false,
+        NeverUseForceTry: false,
+        NeverUseImplicitlyUnwrappedOptionals: false,
+        NoBlockComments: false,
+        NoCasesWithOnlyFallthrough: true,
+        NoEmptyTrailingClosureParentheses: true,
+        NoLabelsInCasePatterns: true,
+        NoLeadingUnderscores: false,
+        NoParensAroundConditions: true,
+        NoVoidReturnOnFunctionSignature: true,
+        OneCasePerLine: true,
+        OneVariableDeclarationPerLine: true,
+        OnlyOneTrailingClosureArgument: true,
+        OrderedImports: true,
+        ReturnVoidInsteadOfEmptyTuple: true,
+        UseEarlyExits: false,
+        UseLetInEveryBoundCaseVariable: true,
+        UseShorthandTypeNames: true,
+        UseSingleLinePropertyGetter: true,
+        UseSynthesizedInitializer: true,
+        UseTripleSlashForDocumentationComments: true,
+        UseWhereClausesInForLoops: false,
+        ValidateDocumentationComments: false
+      }
+    };
+  }
+});
+
 // src/templates/index.ts
 function getTemplate(id) {
   return TEMPLATES.find((t) => t.id === id);
@@ -1525,142 +1661,6 @@ export default defineIntent({
   }
 });
 
-// src/core/format.ts
-var format_exports = {};
-__export(format_exports, {
-  SWIFT_FORMAT_CONFIG: () => SWIFT_FORMAT_CONFIG,
-  formatSwift: () => formatSwift
-});
-import { spawn as spawn2 } from "child_process";
-import { writeFile as writeFile2, unlink } from "fs/promises";
-import { join as join2 } from "path";
-import { tmpdir } from "os";
-async function formatSwift(source, options = {}) {
-  const available = await hasSwiftFormat();
-  if (!available) {
-    if (options.strict) {
-      throw new Error(
-        "swift-format not found on $PATH. Install Xcode + Command Line Tools, or drop --format."
-      );
-    }
-    return {
-      formatted: source,
-      ran: false,
-      reason: "swift-format not found on $PATH"
-    };
-  }
-  const configPath = join2(
-    tmpdir(),
-    `axint-swift-format-${Date.now()}-${Math.random().toString(36).slice(2)}.json`
-  );
-  await writeFile2(configPath, JSON.stringify(SWIFT_FORMAT_CONFIG, null, 2));
-  try {
-    const result = await runSwiftFormat(source, configPath, options.timeoutMs ?? 8e3);
-    if (result.code === 0) {
-      return { formatted: result.stdout, ran: true };
-    }
-    if (options.strict) {
-      throw new Error(`swift-format failed: ${result.stderr}`);
-    }
-    return {
-      formatted: source,
-      ran: false,
-      reason: `swift-format exited ${result.code}: ${result.stderr}`
-    };
-  } finally {
-    await unlink(configPath).catch(() => void 0);
-  }
-}
-function hasSwiftFormat() {
-  return new Promise((resolve3) => {
-    const child = spawn2("swift-format", ["--version"], { stdio: "pipe" });
-    child.on("error", () => resolve3(false));
-    child.on("exit", (code) => resolve3(code === 0));
-  });
-}
-function runSwiftFormat(source, configPath, timeoutMs) {
-  return new Promise((resolve3) => {
-    const child = spawn2("swift-format", ["format", "--configuration", configPath], {
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    let stdout = "";
-    let stderr = "";
-    child.stdout?.on("data", (d) => stdout += d.toString());
-    child.stderr?.on("data", (d) => stderr += d.toString());
-    const timer = setTimeout(() => {
-      child.kill("SIGKILL");
-      resolve3({
-        stdout,
-        stderr: stderr + `
-[format] killed after ${timeoutMs}ms`,
-        code: 124
-      });
-    }, timeoutMs);
-    child.on("exit", (code) => {
-      clearTimeout(timer);
-      resolve3({ stdout, stderr, code: code ?? 1 });
-    });
-    child.stdin?.write(source);
-    child.stdin?.end();
-  });
-}
-var SWIFT_FORMAT_CONFIG;
-var init_format = __esm({
-  "src/core/format.ts"() {
-    "use strict";
-    SWIFT_FORMAT_CONFIG = {
-      version: 1,
-      lineLength: 100,
-      indentation: { spaces: 4 },
-      tabWidth: 4,
-      maximumBlankLines: 1,
-      respectsExistingLineBreaks: true,
-      lineBreakBeforeControlFlowKeywords: false,
-      lineBreakBeforeEachArgument: false,
-      lineBreakBeforeEachGenericRequirement: false,
-      prioritizeKeepingFunctionOutputTogether: false,
-      indentConditionalCompilationBlocks: true,
-      lineBreakAroundMultilineExpressionChainComponents: false,
-      fileScopedDeclarationPrivacy: { accessLevel: "private" },
-      rules: {
-        AllPublicDeclarationsHaveDocumentation: false,
-        AlwaysUseLowerCamelCase: true,
-        AmbiguousTrailingClosureOverload: true,
-        BeginDocumentationCommentWithOneLineSummary: false,
-        DoNotUseSemicolons: true,
-        DontRepeatTypeInStaticProperties: true,
-        FileScopedDeclarationPrivacy: true,
-        FullyIndirectEnum: true,
-        GroupNumericLiterals: true,
-        IdentifiersMustBeASCII: true,
-        NeverForceUnwrap: false,
-        NeverUseForceTry: false,
-        NeverUseImplicitlyUnwrappedOptionals: false,
-        NoBlockComments: false,
-        NoCasesWithOnlyFallthrough: true,
-        NoEmptyTrailingClosureParentheses: true,
-        NoLabelsInCasePatterns: true,
-        NoLeadingUnderscores: false,
-        NoParensAroundConditions: true,
-        NoVoidReturnOnFunctionSignature: true,
-        OneCasePerLine: true,
-        OneVariableDeclarationPerLine: true,
-        OnlyOneTrailingClosureArgument: true,
-        OrderedImports: true,
-        ReturnVoidInsteadOfEmptyTuple: true,
-        UseEarlyExits: false,
-        UseLetInEveryBoundCaseVariable: true,
-        UseShorthandTypeNames: true,
-        UseSingleLinePropertyGetter: true,
-        UseSynthesizedInitializer: true,
-        UseTripleSlashForDocumentationComments: true,
-        UseWhereClausesInForLoops: false,
-        ValidateDocumentationComments: false
-      }
-    };
-  }
-});
-
 // src/core/sandbox.ts
 var sandbox_exports = {};
 __export(sandbox_exports, {
@@ -2091,7 +2091,8 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/core/eject.ts
 init_compiler();
-function ejectIntent(source, fileName, options = {}) {
+init_format();
+async function ejectIntent(source, fileName, options = {}) {
   const compileResult = compileSource(source, fileName, {
     validate: true,
     emitInfoPlist: true,
@@ -2104,7 +2105,11 @@ function ejectIntent(source, fileName, options = {}) {
   }
   const { ir, swiftCode, infoPlistFragment, entitlementsFragment } = compileResult.output;
   const outDir = options.outDir ?? ".";
-  const ejectedSwift = transformSwiftForEject(swiftCode, ir);
+  let ejectedSwift = transformSwiftForEject(swiftCode, ir);
+  if (options.format) {
+    const { formatted, ran } = await formatSwift(ejectedSwift);
+    if (ran) ejectedSwift = formatted;
+  }
   const intentFileName = `${ir.name}Intent.swift`;
   const swiftPath = `${outDir}/${intentFileName}`;
   const plistPath = infoPlistFragment ? `${outDir}/${ir.name}Intent.plist.fragment.xml` : null;
@@ -2161,12 +2166,8 @@ function transformSwiftForEject(swiftCode, ir) {
       if (line.includes("// TODO: Implement your intent logic here.")) {
         result.push(`        // TODO: Implement your intent logic here.`);
         result.push(`        //`);
-        result.push(
-          `        // For more information about App Intents, see:`
-        );
-        result.push(
-          `        // https://developer.apple.com/documentation/appintents`
-        );
+        result.push(`        // For more information about App Intents, see:`);
+        result.push(`        // https://developer.apple.com/documentation/appintents`);
       } else {
         result.push(line);
       }
@@ -2203,10 +2204,10 @@ function generateTestFile(ir) {
 
 // src/cli/scaffold.ts
 init_templates();
-import { mkdir, writeFile, readdir } from "fs/promises";
+import { mkdir, writeFile as writeFile2, readdir } from "fs/promises";
 import { existsSync } from "fs";
-import { join, relative } from "path";
-import { spawn } from "child_process";
+import { join as join2, relative } from "path";
+import { spawn as spawn2 } from "child_process";
 async function scaffoldProject(opts) {
   const { targetDir, projectName, template, version, install } = opts;
   const tpl = getTemplate(template);
@@ -2228,8 +2229,8 @@ async function scaffoldProject(opts) {
   }
   const files = [];
   const write = async (rel, content) => {
-    const abs = join(targetDir, rel);
-    await mkdir(join(abs, "..").replace(/[/\\][^/\\]+$/, ""), { recursive: true }).catch(
+    const abs = join2(targetDir, rel);
+    await mkdir(join2(abs, "..").replace(/[/\\][^/\\]+$/, ""), { recursive: true }).catch(
       () => void 0
     );
     const parent = abs.substring(
@@ -2239,7 +2240,7 @@ async function scaffoldProject(opts) {
     if (parent && parent !== abs) {
       await mkdir(parent, { recursive: true }).catch(() => void 0);
     }
-    await writeFile(abs, content, "utf-8");
+    await writeFile2(abs, content, "utf-8");
     files.push(relative(targetDir, abs));
   };
   await write(
@@ -2307,7 +2308,7 @@ async function scaffoldProject(opts) {
     ) + "\n"
   );
   await write("README.md", scaffoldReadme(projectName, template, tpl.title, version));
-  await mkdir(join(targetDir, "ios", "Intents"), { recursive: true });
+  await mkdir(join2(targetDir, "ios", "Intents"), { recursive: true });
   await write("ios/Intents/.gitkeep", "");
   if (install) {
     await runNpmInstall(targetDir);
@@ -2360,7 +2361,7 @@ _Generated by \`axint init\`_
 }
 function runNpmInstall(cwd) {
   return new Promise((resolve3, reject) => {
-    const child = spawn("npm", ["install"], { cwd, stdio: "inherit" });
+    const child = spawn2("npm", ["install"], { cwd, stdio: "inherit" });
     child.on("exit", (code) => {
       if (code === 0) resolve3();
       else reject(new Error(`npm install exited with code ${code}`));
@@ -2664,7 +2665,7 @@ program.command("eject").description("Eject an intent to standalone Swift with n
         console.error(`\x1B[31merror:\x1B[0m Cannot read file: ${filePath}`);
         process.exit(1);
       }
-      const result = ejectIntent(source, basename(filePath), {
+      const result = await ejectIntent(source, basename(filePath), {
         outDir: options.out,
         includeTests: options.includeTests,
         format: options.format