Configuration file and modernization

Author: engthiago

README.md

@@ -38,8 +38,8 @@ Path to a JSON configuration file. Default: `./typesharp.json` when that file ex
 `-s`, `--source` required unless set in config  
 Folder containing `.cs` files. Subfolders are included.
 
-`-f`, `--file-filter` required unless set in config  
-Glob-style filter for source files, such as `*.cs` or `*Dto.cs`. Default: none.
+`-f`, `--file-filter` optional  
+Glob-style filter for source files, such as `*.cs` or `*Dto.cs`. Default: `*.cs`.
 
 `-t`, `--type-filter` optional  
 Glob-style filter for parsed type names, such as `Person*`. Default: all parsed types.

samples/SampleModels/Typescript/Dictionaries.ts

@@ -1,7 +1,7 @@
 import { Person } from "./Person";
 
 export interface Dictionaries {
-   personDictionary: { [key: string]: Person };
-   personDictionaryDouble: { [key: number]: Person };
-   personDictionaryInt: { [key: number]: Person };
+   personDictionary: Record<string, Person>;
+   personDictionaryDouble: Record<number, Person>;
+   personDictionaryInt: Record<number, Person>;
 }

samples/SampleModels/Typescript/Person.ts

@@ -30,6 +30,6 @@ export interface Person {
    typeUnionDouble: 1.2 | 2.2;
    shouldBeAny: any;
    shouldBeUnknown?: unknown;
-   pairs?: { [key: string]: any };
-   subpersonPairs?: { [key: string]: SubPerson };
+   pairs?: Record<string, any>;
+   subpersonPairs?: Record<string, SubPerson>;
 }

samples/SampleModels/Typescript/SampleModels.Module.ts

@@ -1,7 +1,7 @@
-export { AccessLevel } from "./AccessLevel";
-export { ClassWithEvents } from "./ClassWithEvents";
-export { Dictionaries } from "./Dictionaries";
-export { GenericPerson } from "./GenericPerson";
-export { Person } from "./Person";
-export { PersonInput } from "./PersonInput";
-export { SubPerson } from "./SubPerson";
+export * from "./AccessLevel";
+export * from "./ClassWithEvents";
+export * from "./Dictionaries";
+export * from "./GenericPerson";
+export * from "./Person";
+export * from "./PersonInput";
+export * from "./SubPerson";

src/typesharp-ts/main.ts

@@ -126,7 +126,6 @@ function resolveConfigPaths(options: ConfigFileOptions, base: string): ConfigFil
 
 function finalizeOptions(options: ConfigFileOptions): CliOptions {
   if (typeof options.source !== "string") throw new Error("Missing required argument --source");
-  if (typeof options.fileFilter !== "string") throw new Error("Missing required argument --file-filter");
   if (typeof options.destination !== "string") throw new Error("Missing required argument --destination");
   if (
     options.dictionaryStyle !== undefined && options.dictionaryStyle !== "index-signature" &&
@@ -139,7 +138,7 @@ function finalizeOptions(options: ConfigFileOptions): CliOptions {
   }
   return {
     source: options.source,
-    fileFilter: options.fileFilter,
+    fileFilter: options.fileFilter ?? "*.cs",
     destination: options.destination,
     typeFilter: options.typeFilter,
     watch: options.watch ?? false,

src/typesharp-ts/parser_test.ts

@@ -245,6 +245,30 @@ Deno.test("loads typesharp.json and lets CLI override file values", async () =>
   }
 });
 
+Deno.test("defaults fileFilter to C# source files", async () => {
+  const temp = await Deno.makeTempDir();
+  try {
+    await Deno.writeTextFile(
+      `${temp}/typesharp.json`,
+      JSON.stringify({
+        source: "models",
+        destination: "generated",
+      }),
+    );
+
+    const options = await resolveOptions([], temp);
+    assertEquals(options, {
+      source: `${temp}/models`,
+      fileFilter: "*.cs",
+      destination: `${temp}/generated`,
+      watch: false,
+      exportModule: false,
+    });
+  } finally {
+    await Deno.remove(temp, { recursive: true });
+  }
+});
+
 Deno.test("fails clearly on unsupported property bodies", async () => {
   await assertRejects(
     () => {

typesharp.json

@@ -0,0 +1,12 @@
+{
+  "source": "./samples/SampleModels",
+  "fileFilter": "*.cs",
+  "typeFilter": "*",
+  "destination": "./samples/SampleModels/Typescript",
+  "watch": false,
+  "exportModule": true,
+  "dictionaryStyle": "record",
+  "readonlyProperties": false,
+  "quoteStyle": "double",
+  "semicolons": true
+}