@betty-blocks/cli 25.58.5 → 25.59.1

package/build/bb-components-generate.js

@@ -27,45 +27,96 @@ const name = args[0];
 // eslint-disable-next-line no-void
 void (() => __awaiter(void 0, void 0, void 0, function* () {
     yield checkUpdateAvailable_1.checkUpdateAvailableCLI();
-    if (name.includes(' ')) {
-        throw new Error(chalk_1.default.red(`\nName cannot contain spaces\n`));
+    if (!/^[a-z][a-z0-9]*$/i.test(name)) {
+        throw Error(chalk_1.default.red(`\nName cannot contain special characters or spaces\n`));
     }
-    if (yield fs_extra_1.pathExists(`src/prefabs/${name}.js`)) {
-        throw new Error(chalk_1.default.red(`\nPrefab ${name} already exists\n`));
+    if (yield fs_extra_1.pathExists(`src/prefabs/${name}.tsx`)) {
+        throw Error(chalk_1.default.red(`\nPrefab ${name} already exists\n`));
     }
     if (yield fs_extra_1.pathExists(`src/components/${name}.js`)) {
-        throw new Error(chalk_1.default.red(`\nComponent ${name} already exists\n`));
+        throw Error(chalk_1.default.red(`\nComponent ${name} already exists\n`));
     }
-    const prefab = `
-(() => ({
-  name: '${name}',
-  icon: 'TitleIcon',
+    const capitalisedName = name.charAt(0).toUpperCase() + name.slice(1);
+    const prefab = `import { prefab, Icon } from '@betty-blocks/component-sdk';
+
+import { ${capitalisedName} } from './structures/${capitalisedName}';
+
+const attributes = {
   category: 'CONTENT',
-  structure: [
-    {
-      name: '${name}',
-      options: [],
-      descendants: [],
-    },
-  ],
-}))();
-  `;
-    const component = `
-(() => ({
-  name: '${name}',
-  type: 'ROW',
+  icon: Icon.TitleIcon,
+  keywords: [''],
+};
+
+export default prefab('${capitalisedName}', attributes, undefined, [${capitalisedName}({})]);
+`;
+    const structureIndex = `import { component, PrefabReference } from '@betty-blocks/component-sdk';
+import { Configuration } from '../Configuration';
+import {
+  ${name}Options as defaultOptions,
+  categories as defaultCategories,
+} from './options';
+
+export const ${capitalisedName} = (
+  config: Configuration,
+  descendants: PrefabReference[] = [],
+) => {
+  const options = { ...(config.options || defaultOptions) };
+  const style = { ...config.style };
+  const ref = config.ref ? { ...config.ref } : undefined;
+  const label = config.label ? config.label : undefined;
+  const optionCategories = config.optionCategories
+    ? { ...config.optionCategories }
+    : defaultCategories;
+
+  return component(
+    '${capitalisedName}',
+    { options, ref, style, label, optionCategories },
+    descendants,
+  );
+};
+`;
+    const optionsIndex = `import { variable } from '@betty-blocks/component-sdk';
+import { advanced } from '../../advanced';
+
+export const categories = [
+  {
+    label: 'Advanced Options',
+    expanded: false,
+    members: ['dataComponentAttribute'],
+  },
+];
+
+export const ${name}Options = {
+  content: variable('Content', {
+    value: ['Hello world'],
+    configuration: { as: 'MULTILINE' },
+  }),
+
+  ...advanced('${capitalisedName}'),
+};
+`;
+    const component = `(() => ({
+  name: '${capitalisedName}',
+  type: 'CONTENT_COMPONENT',
   allowedTypes: [],
   orientation: 'HORIZONTAL',
-  jsx: <div className={classes.root}>Hello World</div>,
+  jsx: (() => {
+    const { useText } = B;
+    const { content } = options;
+    return <div className={classes.root}>{useText(content)}</div>;
+  })(),
   styles: () => () => ({
     root: {},
   }),
 }))();
-  `;
+`;
     yield Promise.all([
-        fs_extra_1.outputFile(`src/prefabs/${name}.js`, prefab.trim()),
-        fs_extra_1.outputFile(`src/components/${name}.js`, component.trim()),
+        fs_extra_1.outputFile(`src/prefabs/structures/${capitalisedName}/index.ts`, structureIndex),
+        fs_extra_1.outputFile(`src/prefabs/structures/${capitalisedName}/options/index.ts`, optionsIndex),
+        fs_extra_1.outputFile(`src/prefabs/${name}.tsx`, prefab),
+        fs_extra_1.outputFile(`src/components/${name}.js`, component),
         console.log(chalk_1.default.green('The component has been generated')),
+        console.log(chalk_1.default.blueBright("\nIf you would like to use the component in another prefab, \nwe recommend adding the import and export of the component structure to 'src/prefabs/structures/index.ts' for a clean import from the same file")),
     ]);
 }))();
 //# sourceMappingURL=bb-components-generate.js.map

package/build/bb-components-generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"bb-components-generate.js","sourceRoot":"","sources":["../src/bb-components-generate.ts"],"names":[],"mappings":";AAAA,sBAAsB;;;;;;;;;;;;;;AAEtB,0DAAqD;AACrD,kDAA0B;AAC1B,uCAAkD;AAElD,uEAAuE;AACvE,uBAAuB;AAEvB,mBAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3E,MAAM,EAAE,IAAI,EAAE,GAAoB,mBAAO,CAAC;AAE1C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;IACrB,mBAAO,CAAC,IAAI,EAAE,CAAC;CAChB;AAED,MAAM,IAAI,GAAW,IAAI,CAAC,CAAC,CAAC,CAAC;AAE7B,mCAAmC;AACnC,KAAK,CAAC,GAAwB,EAAE;IAC9B,MAAM,8CAAuB,EAAE,CAAC;IAChC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC,CAAC;KAC9D;IAED,IAAI,MAAM,qBAAU,CAAC,eAAe,IAAI,KAAK,CAAC,EAAE;QAC9C,MAAM,IAAI,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,YAAY,IAAI,mBAAmB,CAAC,CAAC,CAAC;KACjE;IAED,IAAI,MAAM,qBAAU,CAAC,kBAAkB,IAAI,KAAK,CAAC,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,eAAe,IAAI,mBAAmB,CAAC,CAAC,CAAC;KACpE;IAED,MAAM,MAAM,GAAG;;WAEN,IAAI;;;;;eAKA,IAAI;;;;;;GAMhB,CAAC;IAEF,MAAM,SAAS,GAAG;;WAET,IAAI;;;;;;;;;GASZ,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,qBAAU,CAAC,eAAe,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QACnD,qBAAU,CAAC,kBAAkB,IAAI,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;KAC7D,CAAC,CAAC;AACL,CAAC,CAAA,CAAC,EAAE,CAAC"}
+{"version":3,"file":"bb-components-generate.js","sourceRoot":"","sources":["../src/bb-components-generate.ts"],"names":[],"mappings":";AAAA,sBAAsB;;;;;;;;;;;;;;AAEtB,0DAAqD;AACrD,kDAA0B;AAC1B,uCAAkD;AAElD,uEAAuE;AACvE,uBAAuB;AAEvB,mBAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3E,MAAM,EAAE,IAAI,EAAE,GAAoB,mBAAO,CAAC;AAE1C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;IACrB,mBAAO,CAAC,IAAI,EAAE,CAAC;CAChB;AAED,MAAM,IAAI,GAAW,IAAI,CAAC,CAAC,CAAC,CAAC;AAE7B,mCAAmC;AACnC,KAAK,CAAC,GAAwB,EAAE;IAC9B,MAAM,8CAAuB,EAAE,CAAC;IAChC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACnC,MAAM,KAAK,CACT,eAAK,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAClE,CAAC;KACH;IAED,IAAI,MAAM,qBAAU,CAAC,eAAe,IAAI,MAAM,CAAC,EAAE;QAC/C,MAAM,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,YAAY,IAAI,mBAAmB,CAAC,CAAC,CAAC;KAC7D;IAED,IAAI,MAAM,qBAAU,CAAC,kBAAkB,IAAI,KAAK,CAAC,EAAE;QACjD,MAAM,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,eAAe,IAAI,mBAAmB,CAAC,CAAC,CAAC;KAChE;IACD,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAErE,MAAM,MAAM,GAAG;;WAEN,eAAe,yBAAyB,eAAe;;;;;;;;yBAQzC,eAAe,8BAA8B,eAAe;CACpF,CAAC;IAEA,MAAM,cAAc,GAAG;;;IAGrB,IAAI;;;;eAIO,eAAe;;;;;;;;;;;;;OAavB,eAAe;;;;;CAKrB,CAAC;IAEA,MAAM,YAAY,GAAG;;;;;;;;;;;eAWR,IAAI;;;;;;iBAMF,eAAe;;CAE/B,CAAC;IAEA,MAAM,SAAS,GAAG;WACT,eAAe;;;;;;;;;;;;;CAazB,CAAC;IAEA,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,qBAAU,CACR,0BAA0B,eAAe,WAAW,EACpD,cAAc,CACf;QACD,qBAAU,CACR,0BAA0B,eAAe,mBAAmB,EAC5D,YAAY,CACb;QACD,qBAAU,CAAC,eAAe,IAAI,MAAM,EAAE,MAAM,CAAC;QAC7C,qBAAU,CAAC,kBAAkB,IAAI,KAAK,EAAE,SAAS,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAC5D,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,UAAU,CACd,+MAA+M,CAChN,CACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@betty-blocks/cli",
-  "version": "25.58.5",
+  "version": "25.59.1",
   "description": "A Betty Blocks CLI",
   "main": "build/index.js",
   "author": "Niek Nijland <niek.nijland@bettyblocks.com>",