@formspec/build 0.1.0-alpha.52 → 0.1.0-alpha.54

package/dist/cli.js

@@ -1719,11 +1719,16 @@ var init_ir_generator = __esm({
 });
 
 // src/json-schema/generator.ts
+import { noopLogger as noopLogger2 } from "@formspec/core";
 function generateJsonSchema(form, options) {
+  const logger = (options?.logger ?? noopLogger2).child({ stage: "ir" });
   const metadata = options?.metadata;
   const vendorPrefix = options?.vendorPrefix;
   const enumSerialization = options?.enumSerialization;
+  logger.debug("canonicalizing chain DSL to IR");
   const ir = canonicalizeChainDSL(form, metadata !== void 0 ? { metadata } : void 0);
+  const schemaLogger = (options?.logger ?? noopLogger2).child({ stage: "schema" });
+  schemaLogger.debug("generating JSON Schema from IR");
   const internalOptions = vendorPrefix === void 0 && enumSerialization === void 0 ? void 0 : {
     ...vendorPrefix !== void 0 && { vendorPrefix },
     ...enumSerialization !== void 0 && { enumSerialization }
@@ -2010,11 +2015,16 @@ var init_ir_generator2 = __esm({
 });
 
 // src/ui-schema/generator.ts
+import { noopLogger as noopLogger3 } from "@formspec/core";
 function generateUiSchema(form, options) {
+  const logger = (options?.logger ?? noopLogger3).child({ stage: "ir" });
+  logger.debug("canonicalizing chain DSL to IR for UI Schema generation");
   const ir = canonicalizeChainDSL(
     form,
     options?.metadata !== void 0 ? { metadata: options.metadata } : void 0
   );
+  const schemaLogger = (options?.logger ?? noopLogger3).child({ stage: "schema" });
+  schemaLogger.debug("generating UI Schema from IR");
   return generateUiSchemaFromIR(ir);
 }
 var init_generator2 = __esm({
@@ -2493,39 +2503,85 @@ function isNonReferenceIdentifier(node) {
   }
   return false;
 }
-function statementReferencesImportedName(statement, importedNames) {
+function astReferencesImportedName(root, importedNames) {
   if (importedNames.size === 0) {
     return false;
   }
-  let referencesImportedName = false;
+  let found = false;
   const visit = (node) => {
-    if (referencesImportedName) {
-      return;
-    }
+    if (found) return;
     if (ts4.isIdentifier(node) && importedNames.has(node.text) && !isNonReferenceIdentifier(node)) {
-      referencesImportedName = true;
+      found = true;
       return;
     }
     ts4.forEachChild(node, visit);
   };
-  visit(statement);
-  return referencesImportedName;
+  visit(root);
+  return found;
+}
+function getObjectMembers(statement) {
+  if (ts4.isInterfaceDeclaration(statement)) {
+    return statement.members;
+  }
+  if (ts4.isTypeLiteralNode(statement.type)) {
+    return statement.type.members;
+  }
+  return void 0;
+}
+function rewriteImportedMemberTypes(statement, sourceFile, importedNames) {
+  const members = getObjectMembers(statement);
+  if (members === void 0) {
+    return null;
+  }
+  const replacements = [];
+  for (const member of members) {
+    if (!ts4.isPropertySignature(member)) {
+      if (astReferencesImportedName(member, importedNames)) {
+        return null;
+      }
+      continue;
+    }
+    const typeAnnotation = member.type;
+    if (typeAnnotation === void 0) continue;
+    if (astReferencesImportedName(typeAnnotation, importedNames)) {
+      replacements.push({
+        start: typeAnnotation.getStart(sourceFile),
+        end: typeAnnotation.getEnd()
+      });
+    }
+  }
+  if (replacements.length === 0) {
+    return statement.getText(sourceFile);
+  }
+  const stmtStart = statement.getStart(sourceFile);
+  let result = statement.getText(sourceFile);
+  for (const { start, end } of [...replacements].reverse()) {
+    result = result.slice(0, start - stmtStart) + "unknown" + result.slice(end - stmtStart);
+  }
+  return result;
 }
 function buildSupportingDeclarations(sourceFile, extensionTypeNames) {
   const importedNames = collectImportedNames(sourceFile);
   const importedNamesToSkip = new Set(
     [...importedNames].filter((name) => !extensionTypeNames.has(name))
   );
-  return sourceFile.statements.filter((statement) => {
-    if (ts4.isImportDeclaration(statement)) return false;
-    if (ts4.isImportEqualsDeclaration(statement)) return false;
-    if (ts4.isExportDeclaration(statement) && statement.moduleSpecifier !== void 0)
-      return false;
-    if (statementReferencesImportedName(statement, importedNamesToSkip)) {
-      return false;
+  const result = [];
+  for (const statement of sourceFile.statements) {
+    if (ts4.isImportDeclaration(statement)) continue;
+    if (ts4.isImportEqualsDeclaration(statement)) continue;
+    if (ts4.isExportDeclaration(statement) && statement.moduleSpecifier !== void 0) continue;
+    if (!astReferencesImportedName(statement, importedNamesToSkip)) {
+      result.push(statement.getText(sourceFile));
+      continue;
     }
-    return true;
-  }).map((statement) => statement.getText(sourceFile));
+    if (ts4.isInterfaceDeclaration(statement) || ts4.isTypeAliasDeclaration(statement)) {
+      const rewritten = rewriteImportedMemberTypes(statement, sourceFile, importedNamesToSkip);
+      if (rewritten !== null) {
+        result.push(rewritten);
+      }
+    }
+  }
+  return result;
 }
 function pushUniqueCompilerDiagnostics(target, additions) {
   for (const diagnostic of additions) {
@@ -4385,10 +4441,22 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
     sourceNode
   );
   if (customTypeLookup !== null) {
+    const typeId = customTypeIdFromLookup(customTypeLookup);
+    let payload = null;
+    if (customTypeLookup.registration.extractPayload !== void 0) {
+      try {
+        payload = customTypeLookup.registration.extractPayload(type, checker) ?? null;
+      } catch (cause) {
+        throw new Error(
+          `extractPayload for custom type "${customTypeLookup.registration.typeName}" in extension "${customTypeLookup.extensionId}" threw`,
+          { cause }
+        );
+      }
+    }
     return {
       kind: "custom",
-      typeId: customTypeIdFromLookup(customTypeLookup),
-      payload: null
+      typeId,
+      payload
     };
   }
   const primitiveAlias = tryResolveNamedPrimitiveAlias(
@@ -6927,9 +6995,12 @@ __export(index_exports, {
   uiSchemaSchema: () => uiSchema,
   writeSchemas: () => writeSchemas
 });
+import { noopLogger as noopLogger4 } from "@formspec/core";
 import * as fs from "fs";
 import * as path3 from "path";
 function buildFormSchemas(form, options) {
+  const logger = options?.logger ?? noopLogger4;
+  logger.debug("buildFormSchemas: starting schema generation");
   return {
     jsonSchema: generateJsonSchema(form, options),
     uiSchema: generateUiSchema(form, options)
@@ -6942,12 +7013,15 @@ function writeSchemas(form, options) {
     indent = 2,
     vendorPrefix,
     enumSerialization,
-    metadata
+    metadata,
+    logger: rawLogger
   } = options;
-  const buildOptions = vendorPrefix === void 0 && enumSerialization === void 0 && metadata === void 0 ? void 0 : {
+  const logger = (rawLogger ?? noopLogger4).child({ stage: "write" });
+  const buildOptions = vendorPrefix === void 0 && enumSerialization === void 0 && metadata === void 0 ? { logger: rawLogger } : {
     ...vendorPrefix !== void 0 && { vendorPrefix },
     ...enumSerialization !== void 0 && { enumSerialization },
-    ...metadata !== void 0 && { metadata }
+    ...metadata !== void 0 && { metadata },
+    logger: rawLogger
   };
   const { jsonSchema, uiSchema: uiSchema2 } = buildFormSchemas(form, buildOptions);
   if (!fs.existsSync(outDir)) {
@@ -6955,7 +7029,9 @@ function writeSchemas(form, options) {
   }
   const jsonSchemaPath = path3.join(outDir, `${name}-schema.json`);
   const uiSchemaPath = path3.join(outDir, `${name}-uischema.json`);
+  logger.debug("writing JSON Schema", { path: jsonSchemaPath });
   fs.writeFileSync(jsonSchemaPath, JSON.stringify(jsonSchema, null, indent));
+  logger.debug("writing UI Schema", { path: uiSchemaPath });
   fs.writeFileSync(uiSchemaPath, JSON.stringify(uiSchema2, null, indent));
   return { jsonSchemaPath, uiSchemaPath };
 }
@@ -6983,6 +7059,33 @@ var init_index = __esm({
 // src/cli.ts
 import * as path4 from "path";
 import { pathToFileURL } from "url";
+
+// src/cli/logger.ts
+import { createRequire } from "module";
+import { isNamespaceEnabled, noopLogger } from "@formspec/core";
+var require2 = createRequire(import.meta.url);
+function createLogger(namespace) {
+  const debugEnv = process.env["DEBUG"] ?? "";
+  if (!isNamespaceEnabled(debugEnv, namespace)) {
+    return noopLogger;
+  }
+  const pinoModule = require2("pino");
+  const pino = typeof pinoModule === "function" ? pinoModule : pinoModule.default;
+  const isTTY = process.stderr.isTTY;
+  if (isTTY) {
+    const pinoPretty = require2("pino-pretty");
+    const prettyTransport = pinoPretty.default ?? pinoPretty;
+    const stream = prettyTransport({ destination: 2, colorize: true, sync: true });
+    return pino({ name: namespace, level: "debug" }, stream);
+  }
+  return pino(
+    { name: namespace, level: "debug" },
+    pino.destination({ dest: 2, sync: true })
+  );
+}
+
+// src/cli.ts
+var log = createLogger("formspec:build");
 function printHelp() {
   console.log(`
 FormSpec Build CLI - Generate JSON Schema and UI Schema
@@ -7072,6 +7175,7 @@ function parseArgs(args) {
   if (!name) {
     name = path4.basename(inputFile, path4.extname(inputFile));
   }
+  log.debug("Arguments parsed", { inputFile, outDir, name, enumSerialization });
   return { inputFile, outDir, name, enumSerialization };
 }
 async function main() {
@@ -7082,11 +7186,14 @@ async function main() {
   }
   const { inputFile, outDir, name, enumSerialization } = options;
   const absoluteInput = path4.resolve(process.cwd(), inputFile);
+  log.debug("Resolved input file", { absoluteInput });
   try {
     const fileUrl = pathToFileURL(absoluteInput).href;
+    log.debug("Loading form module", { fileUrl });
     const module = await import(fileUrl);
     const form = module["default"] ?? module["form"];
     if (!form || typeof form !== "object" || !("elements" in form)) {
+      log.error("Input file does not export a valid FormSpec", { fileUrl });
       console.error("Error: Input file must export a FormSpec as default export or as 'form'");
       console.error("Example:");
       console.error('  export default formspec(field.text("name"));');
@@ -7094,18 +7201,22 @@ async function main() {
       console.error('  export const form = formspec(field.text("name"));');
       process.exit(1);
     }
+    log.debug("Form module loaded, generating schemas");
     const { writeSchemas: writeSchemas2 } = await Promise.resolve().then(() => (init_index(), index_exports));
     const { jsonSchemaPath, uiSchemaPath } = writeSchemas2(
       form,
       { outDir, name, enumSerialization }
     );
+    log.debug("Schemas written", { jsonSchemaPath, uiSchemaPath });
     console.log("Generated:");
     console.log(`  ${jsonSchemaPath}`);
     console.log(`  ${uiSchemaPath}`);
   } catch (error) {
     if (error instanceof Error) {
+      log.child({ err: error.message }).error("Schema generation failed");
       console.error(`Error: ${error.message}`);
     } else {
+      log.error("Schema generation failed with unknown error");
       console.error("Error:", error);
     }
     process.exit(1);