From 5f5cfe77a358ca0b92098cf2166e81b982d6cb4a Mon Sep 17 00:00:00 2001
From: BluJ <dragondef@gmail.com>
Date: Mon, 24 Apr 2023 16:07:35 -0600
Subject: [PATCH] chore: Modify the oldspec to do nested as an option

---
 Makefile                    |  5 ++++-
 lib/test/output.test.ts     |  5 +----
 package.json                |  2 +-
 scripts/oldSpecToBuilder.ts | 28 ++++++++++++++++------------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index d9ed9c1..08a3ec5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,10 @@ clean:
 lib/test/output.ts: lib/test/makeOutput.ts scripts/oldSpecToBuilder.ts
 	npm run buildOutput
 
-bundle: clean fmt $(TS_FILES) package.json .FORCE node_modules test
+buildOutput: lib/test/output.ts fmt
+	echo 'done'	
+
+bundle: clean  $(TS_FILES) package.json .FORCE node_modules test fmt
 	npx tsc
 	cp package.json dist/package.json
 	cp README.md dist/README.md
diff --git a/lib/test/output.test.ts b/lib/test/output.test.ts
index 53201f2..f061ec0 100644
--- a/lib/test/output.test.ts
+++ b/lib/test/output.test.ts
@@ -5,7 +5,7 @@ import {
   unionValueKey,
 } from "../config/configTypes";
 import { deepMerge } from "../util";
-import { InputSpec, matchInputSpec, testListUnion } from "./output";
+import { InputSpec, matchInputSpec } from "./output";
 
 export type IfEquals<T, U, Y = unknown, N = never> = (<G>() => G extends T
   ? 1
@@ -97,9 +97,6 @@ describe("Inputs", () => {
     },
   };
 
-  test("Test just the input unions", () => {
-    testListUnion.validator().unsafeCast(validInput.testListUnion);
-  });
   test("test valid input", () => {
     const output = matchInputSpec.unsafeCast(validInput);
     expect(output).toEqual(validInput);
diff --git a/package.json b/package.json
index 6379cd6..ed0d21f 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "types": "./lib/index.d.ts",
   "scripts": {
     "test": "jest -c ./jest.config.js",
-    "buildOutput": "ts-node --esm ./lib/test/makeOutput.ts",
+    "buildOutput": "ts-node --esm ./lib/test/makeOutput.ts && npx prettier --write '**/*.ts'",
     "check": "tsc --noEmit"
   },
   "repository": {
diff --git a/scripts/oldSpecToBuilder.ts b/scripts/oldSpecToBuilder.ts
index e063591..d0d8721 100644
--- a/scripts/oldSpecToBuilder.ts
+++ b/scripts/oldSpecToBuilder.ts
@@ -16,11 +16,11 @@ export async function writeConvertedFileFromOld(
 
 export default async function makeFileContentFromOld(
   inputData: Promise<any> | any,
-  { startSdk = "start-sdk" } = {},
+  { startSdk = "start-sdk", nested = true } = {},
 ) {
   const outputLines: string[] = [];
   outputLines.push(`
-  import {Config, Value, List, Variants} from '${startSdk}/config/builder';
+  import {Config, Value, List, Variants} from '${startSdk}/config/builder'
 `);
   const data = await inputData;
 
@@ -41,14 +41,18 @@ export default async function makeFileContentFromOld(
     outputLines.push(`export const ${variableName} = ${data};`);
     return variableName;
   }
+  function maybeNewConst(key: string, data: string) {
+    if (nested) return data;
+    return newConst(key, data);
+  }
   function convertInputSpec(data: any) {
     let answer = "Config.of({";
     for (const [key, value] of Object.entries(data)) {
-      const variableName = newConst(key, convertValueSpec(value));
+      const variableName = maybeNewConst(key, convertValueSpec(value));
 
       answer += `${JSON.stringify(key)}: ${variableName},`;
     }
-    return `${answer}});`;
+    return `${answer}})`;
   }
   function convertValueSpec(value: any): string {
     switch (value.type) {
@@ -149,7 +153,7 @@ export default async function makeFileContentFromOld(
         )} as const)`;
       }
       case "object": {
-        const specName = newConst(
+        const specName = maybeNewConst(
           value.name + "_spec",
           convertInputSpec(value.spec),
         );
@@ -160,7 +164,7 @@ export default async function makeFileContentFromOld(
       }, ${specName})`;
       }
       case "union": {
-        const variants = newConst(
+        const variants = maybeNewConst(
           value.name + "_variants",
           convertVariants(value.variants, value.tag["variant-names"] || {}),
         );
@@ -174,7 +178,7 @@ export default async function makeFileContentFromOld(
       }, ${variants})`;
       }
       case "list": {
-        const list = newConst(value.name + "_list", convertList(value));
+        const list = maybeNewConst(value.name + "_list", convertList(value));
         return `Value.list(${list})`;
       }
       case "pointer": {
@@ -263,7 +267,7 @@ export default async function makeFileContentFromOld(
         )})`;
       }
       case "object": {
-        const specName = newConst(
+        const specName = maybeNewConst(
           value.name + "_spec",
           convertInputSpec(value.spec.spec),
         );
@@ -281,14 +285,14 @@ export default async function makeFileContentFromOld(
         })`;
       }
       case "union": {
-        const variants = newConst(
+        const variants = maybeNewConst(
           value.name + "_variants",
           convertVariants(
             value.spec.variants,
             value.spec["variant-names"] || {},
           ),
         );
-        const unionValueName = newConst(
+        const unionValueName = maybeNewConst(
           value.name + "_union",
           `${rangeToTodoComment(value?.range)}
           Value.union({
@@ -302,7 +306,7 @@ export default async function makeFileContentFromOld(
           }, ${variants})
         `,
         );
-        const listConfig = newConst(
+        const listConfig = maybeNewConst(
           value.name + "_list_config",
           `
           Config.of({
@@ -333,7 +337,7 @@ export default async function makeFileContentFromOld(
   ): string {
     let answer = "Variants.of({";
     for (const [key, value] of Object.entries(variants)) {
-      const variantSpec = newConst(key, convertInputSpec(value));
+      const variantSpec = maybeNewConst(key, convertInputSpec(value));
       answer += `"${key}": {name: "${
         variantNames[key] || key
       }", spec: ${variantSpec}},`;