@openwebf/webf 0.22.13 → 0.23.0

package/dist/commands.js

@@ -233,10 +233,16 @@ function createCommand(target, options) {
             fs_1.default.mkdirSync(srcDir, { recursive: true });
         }
         const indexFilePath = path_1.default.join(srcDir, 'index.ts');
-        const indexContent = lodash_1.default.template(reactIndexTpl)({
-            components: [],
-        });
-        writeFileIfChanged(indexFilePath, indexContent);
+        if (!fs_1.default.existsSync(indexFilePath)) {
+            const indexContent = lodash_1.default.template(reactIndexTpl)({
+                components: [],
+            });
+            writeFileIfChanged(indexFilePath, indexContent);
+        }
+        else {
+            // Do not overwrite existing index.ts created by the user
+            // Leave merge to the codegen step which appends exports safely
+        }
         (0, child_process_1.spawnSync)(NPM, ['install', '--omit=peer'], {
             cwd: target,
             stdio: 'inherit'

package/dist/dart.js

@@ -80,6 +80,12 @@ ${enumValues};
 }`;
 }
 function generateReturnType(type, enumName) {
+    // Handle union types first (e.g., 'left' | 'center' | 'right')
+    // so we don't incorrectly treat string literal unions as pointer types.
+    if (Array.isArray(type.value)) {
+        // If we have an enum name, use it; otherwise fall back to String
+        return enumName || 'String';
+    }
     if ((0, utils_1.isPointerType)(type)) {
         const pointerType = (0, utils_1.getPointerType)(type);
         return pointerType;
@@ -87,11 +93,6 @@ function generateReturnType(type, enumName) {
     if (type.isArray && typeof type.value === 'object' && !Array.isArray(type.value)) {
         return `${(0, utils_1.getPointerType)(type.value)}[]`;
     }
-    // Handle union types (e.g., 'left' | 'center' | 'right')
-    if (Array.isArray(type.value)) {
-        // If we have an enum name, use it; otherwise fall back to String
-        return enumName || 'String';
-    }
     // Handle when type.value is a ParameterType object (nested type)
     if (typeof type.value === 'object' && !Array.isArray(type.value) && type.value !== null) {
         // This might be a nested ParameterType, recurse
@@ -250,7 +251,7 @@ interface ${object.name} {
     }
     // Generate enums for union types
     const enums = [];
-    const enumMap = new Map(); // prop name -> enum name
+    const enumMap = new Map(); // camelCase prop name -> enum name
     if (componentProperties) {
         for (const prop of componentProperties.props) {
             if (isStringUnionType(prop.type)) {
@@ -261,7 +262,8 @@ interface ${object.name} {
                         name: enumName,
                         definition: generateDartEnum(enumName, values)
                     });
-                    enumMap.set(prop.name, enumName);
+                    // Store by camelCase prop name to match template usage
+                    enumMap.set(lodash_1.default.camelCase(prop.name), enumName);
                 }
             }
         }

package/dist/generator.js

@@ -29,6 +29,7 @@ const dart_1 = require("./dart");
 const react_1 = require("./react");
 const vue_1 = require("./vue");
 const logger_1 = require("./logger");
+const typescript_1 = __importDefault(require("typescript"));
 // Cache for file content to avoid redundant reads
 const fileContentCache = new Map();
 // Cache for generated content to detect changes
@@ -287,32 +288,90 @@ function reactGen(_a) {
                 (0, logger_1.error)(`Error generating React component for ${blob.filename}`, err);
             }
         }));
-        // Generate index file
-        // Avoid overriding a user-managed index.ts. Only write when:
-        // - index.ts does not exist, or
-        // - it contains the auto-generated marker from our template
+        // Generate/merge index file
         const indexFilePath = path_1.default.join(normalizedTarget, 'src', 'index.ts');
-        const newExports = (0, react_1.generateReactIndex)(blobs);
-        let shouldWriteIndex = true;
-        if (fs_1.default.existsSync(indexFilePath)) {
+        // Build desired export map: moduleSpecifier -> Set of names
+        const desiredExports = new Map();
+        const components = blobs.flatMap(blob => {
+            const classObjects = blob.objects.filter(obj => obj instanceof declaration_1.ClassObject);
+            const properties = classObjects.filter(object => object.name.endsWith('Properties'));
+            const events = classObjects.filter(object => object.name.endsWith('Events'));
+            const componentMap = new Map();
+            properties.forEach(prop => componentMap.set(prop.name.replace(/Properties$/, ''), true));
+            events.forEach(evt => componentMap.set(evt.name.replace(/Events$/, ''), true));
+            return Array.from(componentMap.keys()).map(className => ({
+                className,
+                fileName: blob.filename,
+                relativeDir: blob.relativeDir,
+            }));
+        });
+        // Deduplicate by className
+        const unique = new Map();
+        for (const c of components) {
+            if (!unique.has(c.className))
+                unique.set(c.className, c);
+        }
+        for (const { className, fileName, relativeDir } of unique.values()) {
+            const spec = `./${relativeDir ? `${relativeDir}/` : ''}${fileName}`;
+            if (!desiredExports.has(spec))
+                desiredExports.set(spec, new Set());
+            const set = desiredExports.get(spec);
+            set.add(className);
+            set.add(`${className}Element`);
+        }
+        if (!fs_1.default.existsSync(indexFilePath)) {
+            // No index.ts -> generate fresh file from template
+            const newExports = (0, react_1.generateReactIndex)(blobs);
+            if (writeFileIfChanged(indexFilePath, newExports)) {
+                filesChanged++;
+                (0, logger_1.debug)(`Generated: index.ts`);
+            }
+        }
+        else {
+            // Merge into existing index.ts without removing user code
             try {
                 const existing = fs_1.default.readFileSync(indexFilePath, 'utf-8');
-                const isAutoGenerated = existing.includes('Generated by TSDL');
-                if (!isAutoGenerated) {
-                    shouldWriteIndex = false;
-                    (0, logger_1.warn)(`Found existing user-managed index.ts at ${indexFilePath}; skipping overwrite.`);
+                const sourceFile = typescript_1.default.createSourceFile(indexFilePath, existing, typescript_1.default.ScriptTarget.ES2020, true, typescript_1.default.ScriptKind.TS);
+                // Track which names already exported per module
+                for (const stmt of sourceFile.statements) {
+                    if (typescript_1.default.isExportDeclaration(stmt) && stmt.exportClause && typescript_1.default.isNamedExports(stmt.exportClause)) {
+                        const moduleSpecifier = stmt.moduleSpecifier && typescript_1.default.isStringLiteral(stmt.moduleSpecifier)
+                            ? stmt.moduleSpecifier.text
+                            : undefined;
+                        if (!moduleSpecifier)
+                            continue;
+                        const desired = desiredExports.get(moduleSpecifier);
+                        if (!desired)
+                            continue;
+                        for (const el of stmt.exportClause.elements) {
+                            const name = el.name.getText(sourceFile);
+                            if (desired.has(name))
+                                desired.delete(name);
+                        }
+                    }
+                }
+                // Prepare new export lines for any remaining names
+                const lines = [];
+                for (const [spec, names] of desiredExports) {
+                    const missing = Array.from(names);
+                    if (missing.length === 0)
+                        continue;
+                    const specEscaped = spec.replace(/\\/g, '/');
+                    lines.push(`export { ${missing.join(', ')} } from "${specEscaped}";`);
+                }
+                if (lines.length > 0) {
+                    const appended = (existing.endsWith('\n') ? '' : '\n') + lines.join('\n') + '\n';
+                    if (writeFileIfChanged(indexFilePath, existing + appended)) {
+                        filesChanged++;
+                        (0, logger_1.debug)(`Merged exports into existing index.ts`);
+                    }
+                }
+                else {
+                    (0, logger_1.debug)(`index.ts is up to date; no merge needed.`);
                 }
             }
             catch (err) {
-                // If we cannot read the file for some reason, be conservative and skip overwriting
-                shouldWriteIndex = false;
-                (0, logger_1.warn)(`Unable to read existing index.ts; skipping overwrite: ${indexFilePath}`);
-            }
-        }
-        if (shouldWriteIndex) {
-            if (writeFileIfChanged(indexFilePath, newExports)) {
-                filesChanged++;
-                (0, logger_1.debug)(`Generated: index.ts`);
+                (0, logger_1.warn)(`Failed to merge into existing index.ts. Skipping modifications: ${indexFilePath}`);
             }
         }
         (0, logger_1.timeEnd)('reactGen');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openwebf/webf",
-  "version": "0.22.13",
+  "version": "0.23.0",
   "description": "Command line tools for WebF",
   "main": "index.js",
   "bin": {
@@ -30,6 +30,7 @@
     "@types/inquirer": "^8.2.11",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.17",
+    "@types/minimatch": "^5.1.2",
     "@types/node": "^22.15.21",
     "@types/yaml": "^1.9.6",
     "jest": "^29.7.0",
@@ -39,7 +40,7 @@
     "@microsoft/tsdoc": "^0.15.1",
     "@microsoft/tsdoc-config": "^0.17.1",
     "commander": "^14.0.0",
-    "glob": "^10.3.10",
+    "glob": "^10.4.5",
     "inquirer": "^8.2.6",
     "lodash": "^4.17.21",
     "typescript": "^5.8.3",

package/src/commands.ts

@@ -300,10 +300,15 @@ function createCommand(target: string, options: { framework: string; packageName
     }
 
     const indexFilePath = path.join(srcDir, 'index.ts');
-    const indexContent = _.template(reactIndexTpl)({
-      components: [],
-    });
-    writeFileIfChanged(indexFilePath, indexContent);
+    if (!fs.existsSync(indexFilePath)) {
+      const indexContent = _.template(reactIndexTpl)({
+        components: [],
+      });
+      writeFileIfChanged(indexFilePath, indexContent);
+    } else {
+      // Do not overwrite existing index.ts created by the user
+      // Leave merge to the codegen step which appends exports safely
+    }
 
     spawnSync(NPM, ['install', '--omit=peer'], {
       cwd: target,

package/src/dart.ts

@@ -83,6 +83,13 @@ ${enumValues};
 }
 
 function generateReturnType(type: ParameterType, enumName?: string) {
+  // Handle union types first (e.g., 'left' | 'center' | 'right')
+  // so we don't incorrectly treat string literal unions as pointer types.
+  if (Array.isArray(type.value)) {
+    // If we have an enum name, use it; otherwise fall back to String
+    return enumName || 'String';
+  }
+
   if (isPointerType(type)) {
     const pointerType = getPointerType(type);
     return pointerType;
@@ -91,12 +98,6 @@ function generateReturnType(type: ParameterType, enumName?: string) {
     return `${getPointerType(type.value)}[]`;
   }
   
-  // Handle union types (e.g., 'left' | 'center' | 'right')
-  if (Array.isArray(type.value)) {
-    // If we have an enum name, use it; otherwise fall back to String
-    return enumName || 'String';
-  }
-  
   // Handle when type.value is a ParameterType object (nested type)
   if (typeof type.value === 'object' && !Array.isArray(type.value) && type.value !== null) {
     // This might be a nested ParameterType, recurse
@@ -278,7 +279,7 @@ interface ${object.name} {
   
   // Generate enums for union types
   const enums: { name: string; definition: string }[] = [];
-  const enumMap: Map<string, string> = new Map(); // prop name -> enum name
+  const enumMap: Map<string, string> = new Map(); // camelCase prop name -> enum name
   
   if (componentProperties) {
     for (const prop of componentProperties.props) {
@@ -290,7 +291,8 @@ interface ${object.name} {
             name: enumName,
             definition: generateDartEnum(enumName, values)
           });
-          enumMap.set(prop.name, enumName);
+          // Store by camelCase prop name to match template usage
+          enumMap.set(_.camelCase(prop.name), enumName);
         }
       }
     }

package/src/generator.ts

@@ -11,6 +11,7 @@ import { generateDartClass } from './dart';
 import { generateReactComponent, generateReactIndex } from './react';
 import { generateVueTypings } from './vue';
 import { logger, debug, info, success, warn, error, group, progress, time, timeEnd } from './logger';
+import ts from 'typescript';
 
 // Cache for file content to avoid redundant reads
 const fileContentCache = new Map<string, string>();
@@ -321,34 +322,88 @@ export async function reactGen({ source, target, exclude, packageName }: Generat
     }
   });
   
-  // Generate index file
-  // Avoid overriding a user-managed index.ts. Only write when:
-  // - index.ts does not exist, or
-  // - it contains the auto-generated marker from our template
+  // Generate/merge index file
   const indexFilePath = path.join(normalizedTarget, 'src', 'index.ts');
-  const newExports = generateReactIndex(blobs);
 
-  let shouldWriteIndex = true;
-  if (fs.existsSync(indexFilePath)) {
-    try {
-      const existing = fs.readFileSync(indexFilePath, 'utf-8');
-      const isAutoGenerated = existing.includes('Generated by TSDL');
-      if (!isAutoGenerated) {
-        shouldWriteIndex = false;
-        warn(`Found existing user-managed index.ts at ${indexFilePath}; skipping overwrite.`);
-      }
-    } catch (err) {
-      // If we cannot read the file for some reason, be conservative and skip overwriting
-      shouldWriteIndex = false;
-      warn(`Unable to read existing index.ts; skipping overwrite: ${indexFilePath}`);
-    }
+  // Build desired export map: moduleSpecifier -> Set of names
+  const desiredExports = new Map<string, Set<string>>();
+  const components = blobs.flatMap(blob => {
+    const classObjects = blob.objects.filter(obj => obj instanceof ClassObject) as ClassObject[];
+    const properties = classObjects.filter(object => object.name.endsWith('Properties'));
+    const events = classObjects.filter(object => object.name.endsWith('Events'));
+    const componentMap = new Map<string, boolean>();
+    properties.forEach(prop => componentMap.set(prop.name.replace(/Properties$/, ''), true));
+    events.forEach(evt => componentMap.set(evt.name.replace(/Events$/, ''), true));
+    return Array.from(componentMap.keys()).map(className => ({
+      className,
+      fileName: blob.filename,
+      relativeDir: blob.relativeDir,
+    }));
+  });
+
+  // Deduplicate by className
+  const unique = new Map<string, { className: string; fileName: string; relativeDir: string }>();
+  for (const c of components) {
+    if (!unique.has(c.className)) unique.set(c.className, c);
+  }
+  for (const { className, fileName, relativeDir } of unique.values()) {
+    const spec = `./${relativeDir ? `${relativeDir}/` : ''}${fileName}`;
+    if (!desiredExports.has(spec)) desiredExports.set(spec, new Set());
+    const set = desiredExports.get(spec)!;
+    set.add(className);
+    set.add(`${className}Element`);
   }
 
-  if (shouldWriteIndex) {
+  if (!fs.existsSync(indexFilePath)) {
+    // No index.ts -> generate fresh file from template
+    const newExports = generateReactIndex(blobs);
     if (writeFileIfChanged(indexFilePath, newExports)) {
       filesChanged++;
       debug(`Generated: index.ts`);
     }
+  } else {
+    // Merge into existing index.ts without removing user code
+    try {
+      const existing = fs.readFileSync(indexFilePath, 'utf-8');
+      const sourceFile = ts.createSourceFile(indexFilePath, existing, ts.ScriptTarget.ES2020, true, ts.ScriptKind.TS);
+
+      // Track which names already exported per module
+      for (const stmt of sourceFile.statements) {
+        if (ts.isExportDeclaration(stmt) && stmt.exportClause && ts.isNamedExports(stmt.exportClause)) {
+          const moduleSpecifier = stmt.moduleSpecifier && ts.isStringLiteral(stmt.moduleSpecifier)
+            ? stmt.moduleSpecifier.text
+            : undefined;
+          if (!moduleSpecifier) continue;
+          const desired = desiredExports.get(moduleSpecifier);
+          if (!desired) continue;
+          for (const el of stmt.exportClause.elements) {
+            const name = el.name.getText(sourceFile);
+            if (desired.has(name)) desired.delete(name);
+          }
+        }
+      }
+
+      // Prepare new export lines for any remaining names
+      const lines: string[] = [];
+      for (const [spec, names] of desiredExports) {
+        const missing = Array.from(names);
+        if (missing.length === 0) continue;
+        const specEscaped = spec.replace(/\\/g, '/');
+        lines.push(`export { ${missing.join(', ')} } from "${specEscaped}";`);
+      }
+
+      if (lines.length > 0) {
+        const appended = (existing.endsWith('\n') ? '' : '\n') + lines.join('\n') + '\n';
+        if (writeFileIfChanged(indexFilePath, existing + appended)) {
+          filesChanged++;
+          debug(`Merged exports into existing index.ts`);
+        }
+      } else {
+        debug(`index.ts is up to date; no merge needed.`);
+      }
+    } catch (err) {
+      warn(`Failed to merge into existing index.ts. Skipping modifications: ${indexFilePath}`);
+    }
   }
   
   timeEnd('reactGen');

package/templates/class.dart.tpl

@@ -1,6 +1,6 @@
 // AUTO GENERATED FILE, DO NOT EDIT.
 //
-// Generated by <%= command %>
+// Generated by `webf codegen`
 
 // ignore_for_file: avoid_unused_constructor_parameters
 // ignore_for_file: non_constant_identifier_names

package/tsconfig.json

@@ -20,7 +20,10 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "declaration": false,
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "typeRoots": [
+      "./node_modules/@types"
+    ]
   },
   "include": [
     "src/**/*.ts"