@tamagui/cli 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/generate.cjs

@@ -3,42 +3,44 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var generate_exports = {};
 __export(generate_exports, {
   generateTypes: () => generateTypes,
   getTypes: () => getTypes
 });
 module.exports = __toCommonJS(generate_exports);
-var import_fs_extra = __toESM(require("fs-extra")),
-  import_ts_morph = require("ts-morph"),
-  import_utils = require("./utils.cjs");
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_ts_morph = require("ts-morph");
+var import_utils = require("./utils.cjs");
 async function generateTypes(options) {
   const types = await getTypes(options);
   await import_fs_extra.default.writeJSON(options.paths.types, types, {
@@ -47,17 +49,28 @@ async function generateTypes(options) {
 }
 async function getTypes(options) {
   const tamagui = await (0, import_utils.loadTamagui)(options.tamaguiOptions);
-  if (!tamagui) throw new Error("No tamagui config");
-  const nameToPaths = tamagui.nameToPaths || [],
-    uniqueViewExportingPaths = new Set(Object.keys(nameToPaths).map(name => `${[...nameToPaths[name]][0]}.ts*`)),
-    files = new import_ts_morph.Project({
-      compilerOptions: {
-        noEmit: !1,
-        declaration: !0,
-        emitDeclarationOnly: !0
-      },
-      skipAddingFilesFromTsConfig: !0,
-      tsConfigFilePath: options.tsconfigPath
-    }).addSourceFilesAtPaths([...uniqueViewExportingPaths]);
-  return Object.fromEntries(files.flatMap(x => [...x.getExportedDeclarations()].map(([k, v]) => [k, v[0].getType().getApparentType().getProperties().map(prop => [prop.getEscapedName(), prop.getValueDeclaration()?.getType().getText()])])));
+  if (!tamagui) {
+    throw new Error(`No tamagui config`);
+  }
+  const nameToPaths = tamagui.nameToPaths || [];
+  const uniqueViewExportingPaths = new Set(Object.keys(nameToPaths).map(name => {
+    return `${[...nameToPaths[name]][0]}.ts*`;
+  }));
+  const project = new import_ts_morph.Project({
+    compilerOptions: {
+      noEmit: false,
+      declaration: true,
+      emitDeclarationOnly: true
+    },
+    skipAddingFilesFromTsConfig: true,
+    tsConfigFilePath: options.tsconfigPath
+  });
+  const files = project.addSourceFilesAtPaths([...uniqueViewExportingPaths]);
+  return Object.fromEntries(files.flatMap(x => {
+    return [...x.getExportedDeclarations()].map(([k, v]) => {
+      return [k, v[0].getType().getApparentType().getProperties().map(prop => {
+        return [prop.getEscapedName(), prop.getValueDeclaration()?.getType().getText()];
+      })];
+    });
+  }));
 }

package/dist/update-template.cjs

@@ -2,54 +2,66 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var update_template_exports = {};
 __export(update_template_exports, {
   updateTemplate: () => updateTemplate
 });
 module.exports = __toCommonJS(update_template_exports);
-var import_chalk = __toESM(require("chalk")),
-  import_node_child_process = require("node:child_process");
+var import_chalk = __toESM(require("chalk"));
+var import_node_child_process = require("node:child_process");
 function updateTemplate(templateUrl, ignoredPatterns = []) {
-  const remoteName = `${templateUrl.split("/").pop()?.split(".")[0] || "template"}-template`,
-    addRemoteCommand = `git remote add ${remoteName} ${templateUrl}`,
-    rmRemoteCommand = `git remote remove ${remoteName}`;
+  const templateName = templateUrl.split("/").pop()?.split(".")[0] || "template";
+  const remoteName = `${templateName}-template`;
+  const addRemoteCommand = `git remote add ${remoteName} ${templateUrl}`;
+  const rmRemoteCommand = `git remote remove ${remoteName}`;
   try {
     (0, import_node_child_process.execSync)(addRemoteCommand);
   } catch (error) {
-    if (error instanceof Error && error.toString().includes("already exists")) (0, import_node_child_process.execSync)(rmRemoteCommand), (0, import_node_child_process.execSync)(addRemoteCommand);else throw error;
+    if (error instanceof Error && error.toString().includes("already exists")) {
+      (0, import_node_child_process.execSync)(rmRemoteCommand);
+      (0, import_node_child_process.execSync)(addRemoteCommand);
+    } else {
+      throw error;
+    }
   }
-  (0, import_node_child_process.execSync)("git fetch --all");
+  (0, import_node_child_process.execSync)(`git fetch --all`);
   try {
-    (0, import_node_child_process.execSync)("git merge takeout-template/main --allow-unrelated-histories");
+    (0, import_node_child_process.execSync)(`git merge takeout-template/main --allow-unrelated-histories`);
   } catch (error) {
-    if (error instanceof Error && error.message.includes("unresolved conflict")) console.info(tamaguiLog("We've merged the latest changes. Please resolve the conflicts and commit the merge."));else throw error;
+    if (error instanceof Error && error.message.includes("unresolved conflict")) {
+      console.info(tamaguiLog("We've merged the latest changes. Please resolve the conflicts and commit the merge."));
+    } else {
+      throw error;
+    }
   }
   (0, import_node_child_process.execSync)(`git reset HEAD ${ignoredPatterns.join(" ")}`);
 }

package/dist/update.cjs

@@ -3,20 +3,22 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var update_exports = {};
 __export(update_exports, {