storyblok 4.0.0-beta.2 → 4.0.0-beta.3

package/dist/index.mjs

@@ -353,7 +353,10 @@ const toPascalCase = (str) => {
   return str.replace(/(?:^|_)(\w)/g, (_, char) => char.toUpperCase());
 };
 const toCamelCase = (str) => {
-  return str.replace(/(?:^|_)(\w)/g, (_, char) => char.toUpperCase()).replace(/_/g, "").replace(/^[A-Z]/, (char) => char.toLowerCase());
+  return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase()).replace(/_/g, "").replace(/-([a-z])/g, (_, letter) => letter.toUpperCase()).replace(/[^a-z0-9]([a-z])/gi, (_, letter) => letter.toUpperCase()).replace(/[^a-z0-9]/gi, "");
+};
+const capitalize = (str) => {
+  return str.charAt(0).toUpperCase() + str.slice(1);
 };
 function maskToken(token) {
   if (token.length <= 4) {
@@ -563,14 +566,18 @@ const getCredentials = async (filePath = join(getStoryblokGlobalPath(), "credent
   try {
     await access(filePath);
     const content = await readFile(filePath);
-    return JSON.parse(content);
+    const parsedContent = JSON.parse(content);
+    if (Object.keys(parsedContent).length === 0) {
+      return null;
+    }
+    return parsedContent;
   } catch (error) {
     if (error.code === "ENOENT") {
       await saveToFile(filePath, JSON.stringify({}, null, 2), { mode: 384 });
-      return {};
+      return null;
     }
     handleFileSystemError("read", error);
-    return {};
+    return null;
   }
 };
 const addCredentials = async ({
@@ -604,7 +611,7 @@ function createSession() {
   const state = {
     isLoggedIn: false
   };
-  async function initializeSession(region = "eu") {
+  async function initializeSession() {
     const envCredentials = getEnvCredentials();
     if (envCredentials) {
       state.isLoggedIn = true;
@@ -614,9 +621,9 @@ function createSession() {
       state.envLogin = true;
       return;
     }
-    const machines = await getCredentials();
-    const creds = machines[regionsDomain[region] || "api.storyblok.com"];
-    if (creds) {
+    const credentials = await getCredentials();
+    if (credentials) {
+      const creds = Object.values(credentials)[0];
       state.isLoggedIn = true;
       state.login = creds.login;
       state.password = creds.password;
@@ -3223,18 +3230,67 @@ const storyblokSchemas = /* @__PURE__ */ new Map([
   ["richtext", getRichtextJSONSchema]
 ]);
 
+const STORY_TYPE = "ISbStoryData";
 const DEFAULT_TYPEDEFS_HEADER = [
   "// This file was generated by the storyblok CLI.",
   "// DO NOT MODIFY THIS FILE BY HAND."
 ];
-const getPropertyTypeAnnotation = (property) => {
+const getPropertyTypeAnnotation = (property, prefix) => {
   if (Array.from(storyblokSchemas.keys()).includes(property.type)) {
     return { type: property.type };
   }
+  let type = "unknown";
   const options = property.options && property.options.length > 0 ? property.options.map((item) => item.value) : [];
   if (options.length > 0 && property.exclude_empty_option !== true) {
     options.unshift("");
   }
+  if (property.source === "internal_stories") {
+    if (property.filter_content_type) {
+      if (typeof property.filter_content_type === "string") {
+        return {
+          tsType: `(${getStoryType(property.filter_content_type, prefix)} | string )${property.type === "options" ? "[]" : ""}`
+        };
+      }
+      return {
+        tsType: `(${property.filter_content_type.map((type2) => getStoryType(type2, prefix)).join(" | ")} | string )${property.type === "options" ? "[]" : ""}`
+      };
+    }
+  }
+  if (
+    // If there is no `source` and there are options, the data source is the component itself
+    // TODO: check if this is an old behaviour (shouldn't this be handled as an "internal" source?)
+    options.length > 0 && !property.source || property.source === "internal_languages" || property.source === "external"
+  ) {
+    type = "string";
+  }
+  if (property.source === "internal") {
+    type = ["number", "string"];
+  }
+  if (property.type === "option") {
+    if (options.length > 0) {
+      return {
+        type,
+        enum: options
+      };
+    }
+    return {
+      type
+    };
+  }
+  if (property.type === "options") {
+    if (options.length > 0) {
+      return {
+        type: "array",
+        items: {
+          enum: options
+        }
+      };
+    }
+    return {
+      type: "array",
+      items: { type }
+    };
+  }
   switch (property.type) {
     case "bloks":
       return { type: "array" };
@@ -3251,6 +3307,9 @@ const getPropertyTypeAnnotation = (property) => {
       return { type: "any" };
   }
 };
+function getStoryType(property, prefix) {
+  return `${STORY_TYPE}<${prefix ?? ""}${capitalize(toCamelCase(property))}>`;
+}
 const getComponentType = (componentName, options) => {
   const prefix = options.typePrefix ?? "";
   const sanitizedName = componentName.replace(/[^a-z0-9]/gi, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
@@ -3266,7 +3325,7 @@ const getComponentPropertiesTypeAnnotations = async (component, options, spaceDa
     }
     const propertyType = value.type;
     const propertyTypeAnnotation = {
-      [key]: getPropertyTypeAnnotation(value)
+      [key]: getPropertyTypeAnnotation(value, options.typePrefix)
     };
     if (propertyType === "custom" && customFieldsParser) {
       const customField = typeof customFieldsParser === "function" ? customFieldsParser(key, value) : {};
@@ -3354,7 +3413,7 @@ const generateTypes = async (spaceData, options = {
     const schemas = await Promise.all(spaceData.components.map(async (component) => {
       const type = getComponentType(component.name, options);
       const componentPropertiesTypeAnnotations = await getComponentPropertiesTypeAnnotations(component, options, spaceData, customFieldsParser);
-      const requiredFields = Object.entries(component.schema).reduce(
+      const requiredFields = Object.entries(component?.schema || {}).reduce(
         (acc, [key, value]) => {
           if (value.required) {
             return [...acc, key];
@@ -3424,45 +3483,12 @@ const saveTypesToFile = async (space, typedefString, options) => {
 const generateStoryblokTypes = async (options = {}) => {
   const { filename = "storyblok", path } = options;
   try {
-    const storyblokTypesPath = resolve(process.cwd(), "src", "types", "storyblok.ts");
+    const storyblokTypesPath = resolve(__dirname, "./index.d.ts");
     const storyblokTypesContent = readFileSync(storyblokTypesPath, "utf-8");
-    const lines = storyblokTypesContent.split("\n");
-    const typeDefinitions = [];
-    let isCollecting = false;
-    let bracketCount = 0;
-    let currentType = "";
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      if (line.includes("export type StoryblokPropertyType") || line.includes("export interface Storyblok")) {
-        if (isCollecting) {
-          typeDefinitions.push("");
-        }
-        isCollecting = true;
-        typeDefinitions.push(line);
-        currentType = line.includes("type") ? "type" : "interface";
-        bracketCount += (line.match(/\{/g) || []).length;
-        bracketCount -= (line.match(/\}/g) || []).length;
-        if (currentType === "type") {
-          isCollecting = false;
-          continue;
-        }
-        let j = i + 1;
-        while (j < lines.length && bracketCount > 0) {
-          const nextLine = lines[j];
-          bracketCount += (nextLine.match(/\{/g) || []).length;
-          bracketCount -= (nextLine.match(/\}/g) || []).length;
-          typeDefinitions.push(nextLine);
-          j++;
-        }
-        i = j - 1;
-        isCollecting = false;
-      }
-    }
     const typeDefs = [
-      "// This file was generated by the storyblok CLI.",
+      "// This file was generated by the Storyblok CLI.",
       "// DO NOT MODIFY THIS FILE BY HAND.",
-      "",
-      ...typeDefinitions
+      storyblokTypesContent
     ].join("\n");
     const resolvedPath = path ? resolve(process.cwd(), path, "types") : resolvePath(path, "types");
     await saveToFile(join(resolvedPath, `${filename}.d.ts`), typeDefs);
@@ -3516,7 +3542,7 @@ typesCommand.command("generate").description("Generate types d.ts for your compo
   }
 });
 
-const version = "4.0.0-beta.2";
+const version = "4.0.0-beta.3";
 const pkg = {
 	version: version};