@betty-blocks/cli 25.84.2 → 25.85.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -80,19 +80,17 @@ void (() => __awaiter(void 0, void 0, void 0, function* () {
80
80
  const functionsDir = path_1.default.join(workingDir, 'functions');
81
81
  const funcDefinitions = functionDefinitions_1.functionDefinitions(functionsDir);
82
82
  const blockFunctions = functionDefinitions_1.whitelistedFunctions(funcDefinitions, block.functions);
83
- const { valid: validFunctions } = yield function_block_validations_1.validateFunctions(blockFunctions);
84
- const { valid: validBlockDependencies, invalidDependencies } = function_block_validations_1.validateBlockDependencies(block.dependencies);
85
- if (validFunctions && validBlockDependencies) {
83
+ const { valid, errorMessage } = yield function_block_validations_1.validateBlock({
84
+ blockFunctions,
85
+ block,
86
+ blockName: name,
87
+ });
88
+ if (valid) {
86
89
  const zip = createBlockZip(name, block);
87
90
  if (zip)
88
91
  yield publishBlocks_1.default(block.functions, zip);
89
92
  }
90
93
  else {
91
- const errorMessage = function_block_validations_1.getErrorMessage({
92
- validFunctions,
93
- validBlockDependencies,
94
- invalidDependencies,
95
- });
96
94
  throw Error(chalk_1.default.red(`\n${errorMessage}\n`));
97
95
  }
98
96
  }
@@ -1 +1 @@
1
- {"version":3,"file":"bb-blocks-publish.js","sourceRoot":"","sources":["../src/bb-blocks-publish.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bb-blocks-publish.js","sourceRoot":"","sources":["../src/bb-blocks-publish.ts"],"names":[],"mappings":"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"}
@@ -165,7 +165,7 @@ exports.OPTIONS = [
165
165
  ];
166
166
  exports.MEDIA_TYPES = ['IMAGE', 'VIDEO'];
167
167
  exports.CONDITION_TYPE = ['HIDE', 'SHOW'];
168
- exports.COMPARATORS = ['EQ'];
168
+ exports.COMPARATORS = ['EQ', 'EQ_COMPONENT_ID'];
169
169
  exports.MODAL_TYPE = ['MODEL_AND_PROPERTIES'];
170
170
  exports.INHERIT_TYPES = ['PROPERTY', 'PROPERTY_LABEL'];
171
171
  exports.CONFIGURATION_AS = [
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/validations/constants.ts"],"names":[],"mappings":";;AAAa,QAAA,WAAW,GAAG,CAAC,CAAC;AAChB,QAAA,aAAa,GAAG,EAAE,CAAC;AACnB,QAAA,gBAAgB,GAAG,EAAE,CAAC;AACtB,QAAA,iBAAiB,GAAG,EAAE,CAAC;AAEvB,QAAA,KAAK,GAAG;IACnB,eAAe;IACf,mBAAmB;IACnB,WAAW;IACX,kBAAkB;IAClB,YAAY;IACZ,cAAc;IACd,gBAAgB;IAChB,oBAAoB;IACpB,iBAAiB;IACjB,YAAY;IACZ,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,UAAU;IACV,eAAe;IACf,mBAAmB;IACnB,cAAc;IACd,UAAU;IACV,aAAa;IACb,aAAa;IACb,YAAY;IACZ,iBAAiB;IACjB,eAAe;IACf,gBAAgB;IAChB,eAAe;IACf,UAAU;IACV,WAAW;IACX,eAAe;IACf,iBAAiB;IACjB,eAAe;IACf,cAAc;IACd,gBAAgB;IAChB,oBAAoB;IACpB,kBAAkB;IAClB,oBAAoB;IACpB,kBAAkB;IAClB,gBAAgB;IAChB,YAAY;IACZ,YAAY;IACZ,iBAAiB;IACjB,kBAAkB;IAClB,kBAAkB;IAClB,gBAAgB;IAChB,eAAe;IACf,YAAY;IACZ,UAAU;IACV,UAAU;IACV,iBAAiB;IACjB,oBAAoB;IACpB,UAAU;IACV,eAAe;IACf,UAAU;IACV,mBAAmB;IACnB,WAAW;IACX,gBAAgB;IAChB,aAAa;IACb,WAAW;IACX,aAAa;IACb,aAAa;IACb,gBAAgB;IAChB,eAAe;IACf,eAAe;IACf,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;IACd,kBAAkB;IAClB,eAAe;IACf,YAAY;IACZ,UAAU;IACV,cAAc;IACd,eAAe;IACf,iBAAiB;IACjB,YAAY;IACZ,aAAa;IACb,gBAAgB;IAChB,iBAAiB;IACjB,cAAc;IACd,iBAAiB;IACjB,WAAW;IACX,WAAW;IACX,eAAe;IACf,mBAAmB;IACnB,gBAAgB;IAChB,cAAc;IACd,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;IACjB,YAAY;IACZ,oBAAoB;IACpB,eAAe;IACf,SAAS;IACT,YAAY;IACZ,iBAAiB;IACjB,qBAAqB;IACrB,cAAc;IACd,UAAU;IACV,aAAa;IACb,kBAAkB;IAClB,aAAa;IACb,iBAAiB;IACjB,cAAc;IACd,SAAS;IACT,OAAO;IACP,UAAU;IACV,cAAc;IACd,eAAe;IACf,gBAAgB;IAChB,WAAW;IACX,mBAAmB;IACnB,gBAAgB;IAChB,cAAc;CACf,CAAC;AAEW,QAAA,OAAO,GAAG;IACrB,QAAQ;IACR,cAAc;IACd,sBAAsB;IACtB,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,mBAAmB;IACnB,wBAAwB;IACxB,SAAS;IACT,aAAa;IACb,gBAAgB;IAChB,OAAO;IACP,QAAQ;IACR,wBAAwB;IACxB,UAAU;IACV,UAAU;IACV,QAAQ;IACR,MAAM;IACN,WAAW;IACX,MAAM;IACN,OAAO;IACP,QAAQ;IACR,oBAAoB;IACpB,QAAQ;IACR,YAAY;IACZ,UAAU;IACV,aAAa;IACb,aAAa;IACb,WAAW;IACX,MAAM;IACN,OAAO;IACP,MAAM;IACN,QAAQ;IACR,MAAM;IACN,UAAU;IACV,eAAe;IACf,KAAK;IACL,SAAS;IACT,SAAS;IACT,OAAO;IACP,cAAc;IACd,QAAQ;IACR,cAAc;CACf,CAAC;AAEW,QAAA,WAAW,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACjC,QAAA,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAClC,QAAA,WAAW,GAAG,CAAC,IAAI,CAAC,CAAC;AACrB,QAAA,UAAU,GAAG,CAAC,sBAAsB,CAAC,CAAC;AACtC,QAAA,aAAa,GAAG,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;AAE/C,QAAA,gBAAgB,GAAG;IAC9B,aAAa;IACb,UAAU;IACV,WAAW;IACX,MAAM;IACN,YAAY;CACb,CAAC;AAEW,QAAA,gBAAgB,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAExC,QAAA,sBAAsB,GAAG,mBAAmB,CAAC;AAE7C,QAAA,UAAU,GAAG;IACxB,QAAQ;IACR,QAAQ;IACR,yBAAyB;IACzB,oBAAoB;IACpB,WAAW;IACX,QAAQ;IACR,mBAAmB;IACnB,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,OAAO;IACP,cAAc;IACd,QAAQ;IACR,gBAAgB;IAChB,iBAAiB;IACjB,MAAM;IACN,cAAc;IACd,WAAW;IACX,mBAAmB;IACnB,qBAAqB;IACrB,WAAW;IACX,eAAe;IACf,WAAW;IACX,aAAa;IACb,QAAQ;IACR,KAAK;CACN,CAAC;AAEW,QAAA,aAAa,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/validations/constants.ts"],"names":[],"mappings":"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"}
@@ -18,6 +18,10 @@ const validations_1 = require("../../functions/validations");
18
18
  const config_1 = __importDefault(require("../../functions/config"));
19
19
  const workingDir = process.cwd();
20
20
  exports.validateBlockConfig = ({ functions }) => !!functions.length;
21
+ const validateBlockName = (name) => {
22
+ const kebabCaseRegex = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
23
+ return kebabCaseRegex.test(name);
24
+ };
21
25
  exports.validateBlockDependencies = (dependencies) => {
22
26
  const packageJson = fs_extra_1.default.readJsonSync(path_1.default.join(workingDir, 'package.json'));
23
27
  const packageJsonDependencies = Object.keys(packageJson.dependencies);
@@ -27,7 +31,7 @@ exports.validateBlockDependencies = (dependencies) => {
27
31
  }
28
32
  return { valid: true, invalidDependencies: [] };
29
33
  };
30
- exports.validateFunctions = (blockFunctions) => __awaiter(void 0, void 0, void 0, function* () {
34
+ exports.validateBlockFunctions = (blockFunctions) => __awaiter(void 0, void 0, void 0, function* () {
31
35
  const baseFunctionsPath = path_1.default.join(workingDir, 'functions');
32
36
  console.log(`Validating functions in ${baseFunctionsPath}`);
33
37
  const config = new config_1.default();
@@ -43,7 +47,10 @@ exports.validateFunctions = (blockFunctions) => __awaiter(void 0, void 0, void 0
43
47
  });
44
48
  return { valid };
45
49
  });
46
- exports.getErrorMessage = ({ validFunctions, validBlockDependencies, invalidDependencies = [], }) => {
50
+ exports.getErrorMessage = ({ validFunctions, validBlockDependencies, validBlockName, invalidDependencies = [], blockName, }) => {
51
+ if (!validBlockName) {
52
+ return `${blockName} is not valid as it should be kebab case`;
53
+ }
47
54
  if (!validFunctions) {
48
55
  return 'One or more functions are not valid';
49
56
  }
@@ -55,4 +62,19 @@ exports.getErrorMessage = ({ validFunctions, validBlockDependencies, invalidDepe
55
62
  }
56
63
  return 'Something went wrong';
57
64
  };
65
+ exports.validateBlock = ({ block: { dependencies }, blockFunctions, blockName, }) => __awaiter(void 0, void 0, void 0, function* () {
66
+ const { valid: validFunctions } = yield exports.validateBlockFunctions(blockFunctions);
67
+ const { valid: validBlockDependencies, invalidDependencies } = exports.validateBlockDependencies(dependencies);
68
+ const validBlockName = validateBlockName(blockName);
69
+ return {
70
+ valid: validFunctions && validBlockDependencies && validBlockName,
71
+ errorMessage: exports.getErrorMessage({
72
+ validFunctions,
73
+ validBlockDependencies,
74
+ validBlockName,
75
+ invalidDependencies,
76
+ blockName,
77
+ }),
78
+ };
79
+ });
58
80
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validations/function-block-validations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AAGxB,6DAGqC;AACrC,oEAA4C;AAE5C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAEpB,QAAA,mBAAmB,GAAG,CAAC,EAAE,SAAS,EAAS,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;AAEnE,QAAA,yBAAyB,GAAG,CACvC,YAAsB,EAC6B,EAAE;IACrD,MAAM,WAAW,GAAG,kBAAE,CAAC,YAAY,CACjC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CACS,CAAC;IACjD,MAAM,uBAAuB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACtE,MAAM,mBAAmB,GAAG,YAAY,CAAC,MAAM,CAC7C,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,uBAAuB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC9D,CAAC;IACF,IAAI,mBAAmB,CAAC,MAAM,EAAE;QAC9B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC;KAC9C;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAAE,EAAE,CAAC;AAClD,CAAC,CAAC;AAEW,QAAA,iBAAiB,GAAG,CAC/B,cAAoC,EACP,EAAE;IAC/B,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,2BAA2B,iBAAiB,EAAE,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAI,gBAAM,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,IAAI,+BAAiB,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACnE,MAAM,SAAS,CAAC,UAAU,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,iBAAiB,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IACtE,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACzB,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE;YAC7B,KAAK,GAAG,KAAK,CAAC;SACf;QACD,iCAAmB,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC,CAAA,CAAC;AAEW,QAAA,eAAe,GAAG,CAAC,EAC9B,cAAc,EACd,sBAAsB,EACtB,mBAAmB,GAAG,EAAE,GAKzB,EAAE,EAAE;IACH,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,qCAAqC,CAAC;KAC9C;IAED,IAAI,CAAC,sBAAsB,IAAI,mBAAmB,CAAC,MAAM,EAAE;QACzD,OAAO,6CAA6C,mBAAmB,CAAC,IAAI,CAC1E,IAAI,CACL,EAAE,CAAC;KACL;IAED,IAAI,CAAC,sBAAsB,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE;QAC1D,OAAO,4CAA4C,CAAC;KACrD;IAED,OAAO,sBAAsB,CAAC;AAChC,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/validations/function-block-validations/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@betty-blocks/cli",
3
- "version": "25.84.2",
3
+ "version": "25.85.1",
4
4
  "description": "A Betty Blocks CLI",
5
5
  "main": "build/index.js",
6
6
  "author": "Niek Nijland <niek.nijland@bettyblocks.com>",