@valbuild/init 0.60.23 → 0.60.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/init",
-  "version": "0.60.23",
+  "version": "0.60.27",
   "description": "Initialize a new val.build project",
   "exports": {
     "./main": {

package/src/init.ts

@@ -76,10 +76,15 @@ type Analysis = Partial<{
   isTypeScript: boolean;
   isJavaScript: boolean;
 
-  // Val package:
-  isValInstalled: boolean;
-  valVersion: string;
-  valVersionIsSatisfied: boolean;
+  // @valbuild/core package:
+  isValCoreInstalled: boolean;
+  valCoreVersion: string;
+  valCoreVersionIsSatisfied: boolean;
+
+  // @valbuild/next package:
+  isValNextInstalled: boolean;
+  valNextVersion: string;
+  valNextVersionIsSatisfied: boolean;
 
   // eslint:
   eslintRcJsonPath: string;
@@ -129,13 +134,17 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
     if (packageJsonText) {
       try {
         const packageJson = JSON.parse(packageJsonText);
-        analysis.isValInstalled = !!packageJson.dependencies["@valbuild/next"];
+        analysis.isValCoreInstalled =
+          !!packageJson.dependencies["@valbuild/core"];
+        analysis.isValNextInstalled =
+          !!packageJson.dependencies["@valbuild/next"];
         analysis.isNextInstalled = !!packageJson.dependencies["next"];
         analysis.valEslintVersion =
           packageJson.devDependencies["@valbuild/eslint-plugin"] ||
           packageJson.dependencies["@valbuild/eslint-plugin"];
         analysis.nextVersion = packageJson.dependencies["next"];
-        analysis.valVersion = packageJson.dependencies["@valbuild/next"];
+        analysis.valCoreVersion = packageJson.dependencies["@valbuild/core"];
+        analysis.valNextVersion = packageJson.dependencies["@valbuild/next"];
       } catch (err) {
         throw new Error(
           `Failed to parse package.json in file: ${packageJsonPath}`
@@ -152,10 +161,19 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
       );
     }
   }
-  if (analysis.valVersion) {
-    const minValVersion = semver.minVersion(analysis.valVersion)?.version;
+  if (analysis.valNextVersion) {
+    const minValVersion = semver.minVersion(analysis.valNextVersion)?.version;
+    if (minValVersion) {
+      analysis.valNextVersionIsSatisfied = semver.satisfies(
+        minValVersion,
+        ">=" + MIN_VAL_VERSION
+      );
+    }
+  }
+  if (analysis.valCoreVersion) {
+    const minValVersion = semver.minVersion(analysis.valCoreVersion)?.version;
     if (minValVersion) {
-      analysis.valVersionIsSatisfied = semver.satisfies(
+      analysis.valCoreVersionIsSatisfied = semver.satisfies(
         minValVersion,
         ">=" + MIN_VAL_VERSION
       );
@@ -303,13 +321,40 @@ async function plan(
     logger.error("Val requires a Next.js project");
     return { abort: true };
   }
-  if (!analysis.isValInstalled) {
+  if (!analysis.isValCoreInstalled) {
+    logger.error("Install @valbuild/core first");
+    return { abort: true };
+  } else {
+    if (!analysis.valCoreVersionIsSatisfied) {
+      logger.warn(
+        `  This init script expects @valbuild/core >= ${MIN_VAL_VERSION}. Found: ${analysis.valCoreVersion}`
+      );
+      const answer = !defaultAnswers
+        ? await confirm({
+            message: "Continue?",
+            default: false,
+          })
+        : false;
+      if (!answer) {
+        logger.error(
+          `Aborted: @valbuild/core version is not satisfied.\n\nInstall the @valbuild/core@${MIN_VAL_VERSION} package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/core@${MIN_VAL_VERSION}\n`
+        );
+        return { abort: true };
+      }
+    } else {
+      logger.info(
+        `  Val version: found ${analysis.valCoreVersion} >= ${MIN_VAL_VERSION}`,
+        { isGood: true }
+      );
+    }
+  }
+  if (!analysis.isValNextInstalled) {
     logger.error("Install @valbuild/next first");
     return { abort: true };
   } else {
-    if (!analysis.valVersionIsSatisfied) {
+    if (!analysis.valNextVersionIsSatisfied) {
       logger.warn(
-        `  This init script expects @valbuild/next >= ${MIN_VAL_VERSION}. Found: ${analysis.valVersion}`
+        `  This init script expects @valbuild/next >= ${MIN_VAL_VERSION}. Found: ${analysis.valNextVersion}`
       );
       const answer = !defaultAnswers
         ? await confirm({
@@ -319,13 +364,13 @@ async function plan(
         : false;
       if (!answer) {
         logger.error(
-          `Aborted: val version is not satisfied.\n\nInstall the @valbuild/next@${MIN_VAL_VERSION} package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/next@${MIN_VAL_VERSION}\n`
+          `Aborted: @valbuild/next version is not satisfied.\n\nInstall the @valbuild/next@${MIN_VAL_VERSION} package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/next@${MIN_VAL_VERSION}\n`
         );
         return { abort: true };
       }
     } else {
       logger.info(
-        `  Val version: found ${analysis.valVersion} >= ${MIN_VAL_VERSION}`,
+        `  Val version: found ${analysis.valNextVersion} >= ${MIN_VAL_VERSION}`,
         { isGood: true }
       );
     }
@@ -698,11 +743,11 @@ async function plan(
       } catch {
         // ignore - dir does not exist (most likely)
       }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const currentRecommendations: string[] = (currentSettings as any)
-        .recommendations;
+      const currentRecommendations: string[] | undefined =
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (currentSettings as any).recommendations;
       const valBuildIntelliSense = "valbuild.vscode-val-build";
-      if (!currentRecommendations.includes(valBuildIntelliSense)) {
+      if (!currentRecommendations?.includes(valBuildIntelliSense)) {
         currentSettings = {
           ...currentSettings,
           recommendations: (currentRecommendations || []).concat(

package/src/templates.ts

@@ -101,9 +101,9 @@ export const testSchema = s.object({
   text: s.string(),
 
   /**
-   * Optional fields are marked with \`.optional()\`
+   * Nullable are optional fields in the UI that can be null or not
    */
-  optionals: s.string().optional(),
+  optionals: s.string().nullable(),
 
   arrays: s.array(s.string()),
   /**
@@ -140,7 +140,7 @@ export const testSchema = s.object({
    *
    * @see ValImage component to see how to render this in your app
    */
-  image: s.image().optional(),
+  image: s.image().nullable(),
 
   /**
    * String enums: presents as a dropdown in the UI