newcandies 0.1.40 → 0.1.42

package/dist/index.js

@@ -10,7 +10,7 @@ import { fileURLToPath } from "url";
 import { execa } from "execa";
 var __dirname = path.dirname(fileURLToPath(import.meta.url));
 var REGISTRY_PATH = path.join(__dirname, "..", "templates", "registry.json");
-var program = new Command().name("newcandies").option("-t, --type <type>").option("--template <name>").option("--category <name>").option("--variant <name>").option("-y, --yes").option("--pm <pm>", "npm|pnpm|yarn|bun").option("--no-install").option("--no-prebuild").parse(process.argv);
+var program = new Command().name("newcandies").option("-t, --type <type>").option("--template <name>").option("--category <name>").option("--variant <name>").option("-y, --yes").option("--pm <pm>", "package manager (pnpm for boilerplates, bun for app-briefs)").option("--no-install").option("--no-prebuild").parse(process.argv);
 var opts = program.opts();
 function deepMerge(target, source) {
   for (const key in source) {
@@ -25,84 +25,108 @@ async function main() {
   console.clear();
   p.intro(pc.bgMagenta(pc.black(" newcandies ")));
   const registry = await fs.readJSON(REGISTRY_PATH);
-  const project = await p.group({
-    name: () => p.text({
-      message: "Project name?",
-      placeholder: "my-newcandies-app",
-      validate: (v) => !v ? "Enter a name" : /[^a-zA-Z0-9_-]/.test(v) ? "Use letters, numbers, _ or -" : void 0
-    }),
-    type: async () => {
-      if (opts.type) return opts.type;
-      return p.select({
-        message: "Pick type",
-        options: [
-          { value: "boilerplates", label: "Boilerplate (Full Projects)" },
-          { value: "mini-boilerplates", label: "Mini-boilerplate" },
-          { value: "app-briefs", label: "App-brief (2 levels)" },
-          { value: "mini-app-briefs", label: "Mini-app-brief (2 levels)" },
-          { value: "default", label: "Default (Base)" }
-        ]
-      });
-    },
-    template: async ({ results }) => {
-      const type = results.type;
-      if (type === "default" || type === "app-briefs" || type === "mini-app-briefs") return null;
-      if (opts.template) return opts.template;
-      const items = registry[type];
-      return p.select({
-        message: "Pick template",
-        options: items.map((i) => ({ value: i.name, label: `${i.name} - ${i.description}` }))
-      });
-    },
-    category: async ({ results }) => {
-      const type = results.type;
-      if (type !== "app-briefs" && type !== "mini-app-briefs") return null;
-      if (opts.category) return opts.category;
-      const cats = registry[type];
-      return p.select({
-        message: "Pick category",
-        options: cats.map((c) => ({ value: c.category, label: c.category }))
-      });
-    },
-    variant: async ({ results }) => {
-      const type = results.type;
-      if (type !== "app-briefs" && type !== "mini-app-briefs") return null;
-      if (opts.variant) return opts.variant;
-      const cats = registry[type];
-      const cat = cats.find((c) => c.category === results.category);
-      return p.select({
-        message: "Pick variant",
-        options: cat.variants.map((v) => ({ value: v.name, label: `${v.name} - ${v.description}` }))
-      });
-    },
-    install: async () => {
-      if (opts.yes !== void 0) return !!opts.yes;
-      if (opts.install === false) return false;
-      return p.confirm({ message: "Install dependencies?", initialValue: true });
+  const project = await p.group(
+    {
+      name: () => p.text({
+        message: "Project name?",
+        placeholder: "my-newcandies-app",
+        validate: (v) => !v ? "Enter a name" : /[^a-zA-Z0-9_-]/.test(v) ? "Use letters, numbers, _ or -" : void 0
+      }),
+      type: async () => {
+        if (opts.type) return opts.type;
+        return p.select({
+          message: "Pick type",
+          options: [
+            { value: "boilerplates", label: "Boilerplate (Full Projects)" },
+            { value: "mini-boilerplates", label: "Mini-boilerplate" },
+            { value: "app-briefs", label: "App-brief (2 levels)" },
+            { value: "mini-app-briefs", label: "Mini-app-brief (2 levels)" },
+            { value: "default", label: "Default (Base)" }
+          ]
+        });
+      },
+      template: async ({ results }) => {
+        const type = results.type;
+        if (type === "default" || type === "app-briefs" || type === "mini-app-briefs")
+          return null;
+        if (opts.template) return opts.template;
+        const items = registry[type];
+        return p.select({
+          message: "Pick template",
+          options: items.map((i) => ({
+            value: i.name,
+            label: `${i.name} - ${i.description}`
+          }))
+        });
+      },
+      category: async ({ results }) => {
+        const type = results.type;
+        if (type !== "app-briefs" && type !== "mini-app-briefs") return null;
+        if (opts.category) return opts.category;
+        const cats = registry[type];
+        return p.select({
+          message: "Pick category",
+          options: cats.map((c) => ({ value: c.category, label: c.category }))
+        });
+      },
+      variant: async ({ results }) => {
+        const type = results.type;
+        if (type !== "app-briefs" && type !== "mini-app-briefs") return null;
+        if (opts.variant) return opts.variant;
+        const cats = registry[type];
+        const cat = cats.find((c) => c.category === results.category);
+        return p.select({
+          message: "Pick variant",
+          options: cat.variants.map((v) => ({
+            value: v.name,
+            label: `${v.name} - ${v.description}`
+          }))
+        });
+      },
+      install: async () => {
+        if (opts.yes !== void 0) return !!opts.yes;
+        if (opts.install === false) return false;
+        return p.confirm({
+          message: "Install dependencies?",
+          initialValue: true
+        });
+      },
+      pm: async ({ results }) => {
+        const type = results.type;
+        if (type === "boilerplates" || type === "mini-boilerplates") {
+          if (opts.pm) return opts.pm;
+          return p.select({
+            message: "Package manager?",
+            options: [{ value: "pnpm", label: "pnpm" }],
+            initialValue: "pnpm"
+          });
+        }
+        if (opts.pm) return opts.pm;
+        return p.select({
+          message: "Package manager?",
+          options: [{ value: "bun", label: "bun" }],
+          initialValue: "bun"
+        });
+      }
     },
-    pm: async () => {
-      if (opts.pm) return opts.pm;
-      return p.select({
-        message: "Package manager?",
-        options: [
-          { value: "pnpm", label: "pnpm" },
-          { value: "npm", label: "npm" },
-          { value: "yarn", label: "yarn" },
-          { value: "bun", label: "bun" }
-        ],
-        initialValue: "pnpm"
-      });
+    {
+      onCancel: () => {
+        p.cancel("Aborted");
+        process.exit(0);
+      }
     }
-  }, { onCancel: () => {
-    p.cancel("Aborted");
-    process.exit(0);
-  } });
+  );
   const dest = path.resolve(process.cwd(), project.name);
   const s = p.spinner();
   s.start("Scaffolding");
   let selectedItem = null;
   if (project.type === "default") {
-    selectedItem = { name: "default", path: "", description: "Default", strategy: "base" };
+    selectedItem = {
+      name: "default",
+      path: "",
+      description: "Default",
+      strategy: "base"
+    };
   } else if (project.type === "boilerplates" || project.type === "mini-boilerplates") {
     const list = registry[project.type];
     selectedItem = list.find((i) => i.name === project.template) || null;
@@ -130,24 +154,51 @@ async function main() {
     if (await fs.pathExists(appPath)) baseApp = await fs.readJSON(appPath);
   }
   if (selectedItem.path) {
-    const templatePath = path.join(__dirname, "..", "templates", selectedItem.path);
+    const templatePath = path.join(
+      __dirname,
+      "..",
+      "templates",
+      selectedItem.path
+    );
     if (await fs.pathExists(templatePath)) {
       await fs.copy(templatePath, dest, { overwrite: true });
     }
   }
   if (strategy === "base" && basePkg) {
-    const templatePkgPath = path.join(__dirname, "..", "templates", selectedItem.path, "package.json");
-    const templateAppPath = path.join(__dirname, "..", "templates", selectedItem.path, "app.json");
+    const templatePkgPath = path.join(
+      __dirname,
+      "..",
+      "templates",
+      selectedItem.path,
+      "package.json"
+    );
+    const templateAppPath = path.join(
+      __dirname,
+      "..",
+      "templates",
+      selectedItem.path,
+      "app.json"
+    );
     if (await fs.pathExists(templatePkgPath)) {
       const tmplPkg = await fs.readJSON(templatePkgPath);
       const isFullPackageJson = tmplPkg.scripts || tmplPkg.main || tmplPkg.version;
       if (isFullPackageJson) {
-        await fs.writeJSON(path.join(dest, "package.json"), tmplPkg, { spaces: 2 });
+        await fs.writeJSON(path.join(dest, "package.json"), tmplPkg, {
+          spaces: 2
+        });
       } else {
-        basePkg.dependencies = { ...basePkg.dependencies, ...tmplPkg.dependencies };
-        basePkg.devDependencies = { ...basePkg.devDependencies, ...tmplPkg.devDependencies };
+        basePkg.dependencies = {
+          ...basePkg.dependencies,
+          ...tmplPkg.dependencies
+        };
+        basePkg.devDependencies = {
+          ...basePkg.devDependencies,
+          ...tmplPkg.devDependencies
+        };
         basePkg.scripts = { ...basePkg.scripts, ...tmplPkg.scripts };
-        await fs.writeJSON(path.join(dest, "package.json"), basePkg, { spaces: 2 });
+        await fs.writeJSON(path.join(dest, "package.json"), basePkg, {
+          spaces: 2
+        });
       }
     }
     if (await fs.pathExists(templateAppPath) && baseApp) {
@@ -160,7 +211,9 @@ async function main() {
   for (const file of destFiles) {
     if (file === "env" || file.startsWith("env.") || file === "npmrc") {
       const newName = "." + file;
-      await fs.move(path.join(dest, file), path.join(dest, newName), { overwrite: true });
+      await fs.move(path.join(dest, file), path.join(dest, newName), {
+        overwrite: true
+      });
     }
   }
   const pkgPath = path.join(dest, "package.json");
@@ -191,14 +244,18 @@ async function main() {
       const sp = p.spinner();
       sp.start("Generating ios/android (expo prebuild)");
       try {
-        await execa("npx", ["expo", "prebuild"], { cwd: dest, stdio: "inherit", env: { ...process.env, CI: "1" } });
+        await execa("npx", ["expo", "prebuild"], {
+          cwd: dest,
+          stdio: "inherit",
+          env: { ...process.env, CI: "1" }
+        });
         sp.stop("Native projects generated");
       } catch (e) {
         sp.stop("Prebuild failed (check logs)");
       }
     }
   }
-  const runCmd = (cmd) => `  ${project.pm} ${project.pm === "npm" ? "run " : ""}${cmd}`;
+  const runCmd = (cmd) => `  ${project.pm} ${cmd}`;
   const nextSteps = [
     pc.green("Next steps:"),
     `  cd ${project.name}`,
@@ -209,14 +266,8 @@ async function main() {
   p.outro(nextSteps.filter(Boolean).join("\n"));
 }
 async function installDeps(pm, cwd) {
-  const cmd = pm === "bun" ? "bun" : pm;
-  let args = ["install"];
-  if (pm === "npm") {
-    args.push("--no-audit", "--no-fund", "--loglevel=error");
-  } else if (pm === "pnpm") {
-    args.push("--no-optional");
-  }
-  await execa(cmd, args, { cwd, stdio: "pipe" });
+  const args = ["install"];
+  await execa(pm, args, { cwd, stdio: "pipe" });
 }
 main().catch((e) => {
   p.log.error(e?.message ?? String(e));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newcandies",
-  "version": "0.1.40",
+  "version": "0.1.42",
   "description": "Scaffold Expo Router + Uniwind React Native apps with layered templates.",
   "type": "module",
   "bin": {

package/templates/boilerplate/holidia/app/(tabs)/index.tsx

@@ -0,0 +1,11 @@
+import { Text, View } from 'react-native';
+
+const Home = () => {
+  return (
+    <View>
+      <Text>Home</Text>
+    </View>
+  );
+};
+
+export default Home;

package/templates/boilerplate/holidia/app/properties/[id].tsx

@@ -1,264 +0,0 @@
-import Ionicons from '@expo/vector-icons/Ionicons';
-import BottomSheet, {
-  BottomSheetBackdrop,
-  BottomSheetBackdropProps,
-  BottomSheetView,
-} from '@gorhom/bottom-sheet';
-import { Calendar, fromDateId, toDateId, useDateRange } from '@marceloterreiro/flash-calendar';
-import { nanoid } from 'nanoid/non-secure';
-import { toast } from 'sonner-native';
-
-import { useQuery } from '@tanstack/react-query';
-import {
-  addMonths,
-  differenceInDays,
-  isBefore,
-  isSameMonth,
-  startOfMonth,
-  subMonths,
-} from 'date-fns';
-import { router, useLocalSearchParams } from 'expo-router';
-import { SquircleButton } from 'expo-squircle-view';
-import { useCallback, useMemo, useRef, useState } from 'react';
-import { Pressable, ScrollView, View } from 'react-native';
-import Container from '~/components/container';
-import Header from '~/components/header';
-import LoadingIndicator from '~/components/loading-indicator';
-import AmenitiesList from '~/components/property/amenities-list';
-import PropertyImage from '~/components/property/property-image';
-import Text from '~/components/text';
-import { client } from '~/core/api/client';
-import { today } from '~/core/constants';
-import useShoppingCartStore from '~/core/store';
-import { calendarTheme } from '~/core/theme/calendar-theme';
-import { PRIMARY } from '~/core/theme/colors';
-
-type Props = {};
-const Property = ({}: Props) => {
-  const { id } = useLocalSearchParams();
-
-  const { data: property, isLoading } = useQuery<Property>({
-    queryKey: ['property' + id],
-    queryFn: async () => {
-      const { data } = await client.get(`/properties/${id}`);
-      return data.property;
-    },
-  });
-
-  const { addItem } = useShoppingCartStore();
-
-  const { calendarActiveDateRanges, onCalendarDayPress } = useDateRange();
-
-  console.log({ calendarActiveDateRanges });
-
-  const bottomSheetRef = useRef<BottomSheet>(null);
-
-  const snapPoints = useMemo(() => ['60%'], []);
-
-  const renderBackdrop = useCallback((props: BottomSheetBackdropProps) => {
-    return (
-      <BottomSheetBackdrop
-        {...props}
-        disappearsOnIndex={-1}
-        appearsOnIndex={0}
-        pressBehavior={'close'}
-      />
-    );
-  }, []);
-
-  const calculateDays = () => {
-    if (!calendarActiveDateRanges[0]?.startId) return 0;
-    if (!calendarActiveDateRanges[0]?.endId) return 1;
-
-    const startDate = new Date(calendarActiveDateRanges[0].startId);
-    const endDate = new Date(calendarActiveDateRanges[0].endId);
-
-    return differenceInDays(endDate, startDate) + 1;
-  };
-
-  const hasSelectedDates = Boolean(calendarActiveDateRanges[0]?.startId);
-  const [calendarMonthId, setCalendarMonthId] = useState(today);
-
-  const nextMonth = () => {
-    const month = addMonths(calendarMonthId, 1);
-    setCalendarMonthId(toDateId(month));
-  };
-
-  const currentDisplayMonth = fromDateId(calendarMonthId);
-  const canGoBack =
-    !isSameMonth(currentDisplayMonth, today) && !isBefore(currentDisplayMonth, startOfMonth(today));
-
-  const prevMonth = () => {
-    if (canGoBack) {
-      const month = subMonths(calendarMonthId, 1);
-      setCalendarMonthId(toDateId(month));
-    }
-  };
-  if (isLoading || !property) {
-    return <LoadingIndicator />;
-  }
-  const days = calculateDays();
-  const totalPrice = days * property.price_per_night;
-
-  return (
-    <Container>
-      <Header title="Property" />
-      <ScrollView className="flex-1 bg-gray-100 p-4">
-        <PropertyImage
-          imageUrl={property?.images[1]}
-          isFavorite={property?.is_favorite}
-          rating={5}
-        />
-        <View className="flex flex-row items-center justify-between">
-          <Text variant="subtitle-primary" className="mt-4">
-            {property.name}
-          </Text>
-          <View className="flex flex-row items-center justify-center">
-            <Ionicons name="pricetag" size={12} color={PRIMARY} />
-            <Text variant="body-primary" className="ml-2">
-              ${property.price_per_night} per night
-            </Text>
-          </View>
-        </View>
-        <View className="flex flex-row items-center">
-          <Ionicons name="location" size={16} color={PRIMARY} />
-          <Text variant="body-primary" className="">
-            {property.city}, {property.country}
-          </Text>
-        </View>
-        <Text variant="body" className="mt-1 text-gray-700">
-          {property.description}
-        </Text>
-        <AmenitiesList amenities={property.amenities} />
-      </ScrollView>
-
-      <BottomSheet
-        ref={bottomSheetRef}
-        snapPoints={snapPoints}
-        backdropComponent={renderBackdrop}
-        index={-1}
-        enablePanDownToClose={true}
-        enableDynamicSizing={false}>
-        <BottomSheetView style={{ flex: 1 }}>
-          <View className="my-4 flex flex-row items-center justify-between px-4">
-            <View className="flex flex-row items-center justify-center">
-              <Ionicons name="wallet" color={PRIMARY} size={24} />
-              <Text variant="subtitle" className="mx-4">
-                Price : ${hasSelectedDates ? totalPrice : property.price_per_night}
-                {!hasSelectedDates && ' per night'}
-              </Text>
-            </View>
-          </View>
-          <BottomSheetView style={{ flex: 1, paddingHorizontal: 4, position: 'relative' }}>
-            <View className="mt-20 flex flex-row justify-between">
-              <Pressable onPress={prevMonth} disabled={!canGoBack}>
-                <Ionicons name="arrow-back" size={24} color={canGoBack ? PRIMARY : 'gray'} />
-              </Pressable>
-              <Pressable onPress={nextMonth}>
-                <Ionicons name="arrow-forward" size={24} color={PRIMARY} />
-              </Pressable>
-            </View>
-
-            <Calendar
-              calendarMonthId={calendarMonthId}
-              calendarActiveDateRanges={calendarActiveDateRanges}
-              calendarMinDateId={today}
-              onCalendarDayPress={onCalendarDayPress}
-              theme={calendarTheme}
-            />
-            <SquircleButton
-              backgroundColor={PRIMARY}
-              cornerSmoothing={100}
-              onPress={() => {
-                bottomSheetRef.current?.close();
-
-                if (!hasSelectedDates || !calendarActiveDateRanges[0]?.startId) {
-                  console.log('error: please select dates');
-                  return;
-                }
-
-                const cartItem: ICartItem = {
-                  id: 'cart' + nanoid(),
-                  image: property.images[0],
-                  name: property.name,
-                  product: property.id,
-                  price_per_night: property.price_per_night,
-                  quantity: 1,
-                  startDate: calendarActiveDateRanges[0].startId,
-                  endDate:
-                    calendarActiveDateRanges[0]?.endId ?? calendarActiveDateRanges[0].startId,
-                  days: calculateDays(),
-                };
-                addItem(cartItem);
-                bottomSheetRef.current?.close();
-              }}
-              preserveSmoothing
-              className="m-8 flex flex-row items-center justify-center px-4 "
-              style={{
-                paddingVertical: 16,
-                position: 'absolute',
-                bottom: -120,
-                left: 0,
-                right: 0,
-              }}
-              borderRadius={24}>
-              <Ionicons name="checkmark-circle" size={20} color={'white'} />
-              <Text variant="button" className="mx-2 text-center">
-                Confirm
-              </Text>
-            </SquircleButton>
-          </BottomSheetView>
-        </BottomSheetView>
-      </BottomSheet>
-
-      <View className="bottom-0 left-0 right-0 -z-10 mx-4 mt-auto flex flex-row items-center justify-center py-2">
-        {hasSelectedDates ? (
-          <Pressable
-            className="mr-4"
-            onPress={() => {
-              bottomSheetRef.current?.expand();
-            }}>
-            <View className="flex flex-row items-center">
-              <Ionicons name="pricetag" color={PRIMARY} size={16} />
-              <Text variant="body-primary" className="text-center">
-                ${totalPrice}
-              </Text>
-            </View>
-            <Text variant="caption" className="text-center underline">
-              {days === 1 ? '1 Night' : `${days} nights`}
-            </Text>
-          </Pressable>
-        ) : (
-          <Pressable
-            className="mr-4 flex flex-row items-center"
-            onPress={() => {
-              bottomSheetRef.current?.expand();
-            }}>
-            <Ionicons name="calendar-outline" size={24} color={PRIMARY} />
-            <Text variant="body-primary" className="ml-2 text-center underline">
-              Select dates
-            </Text>
-          </Pressable>
-        )}
-        <SquircleButton
-          onPress={() => {
-            toast.success('Property added to cart');
-            router.push('/checkout');
-          }}
-          className="flex-grow"
-          backgroundColor={PRIMARY}
-          borderRadius={16}
-          style={{
-            paddingVertical: 16,
-            marginVertical: 4,
-          }}>
-          <Text variant="button" className="text-center">
-            Book Now
-          </Text>
-        </SquircleButton>
-      </View>
-    </Container>
-  );
-};
-
-export default Property;