sb-mig 5.5.4-beta.1 → 5.6.0-beta.2

package/dist-cjs/utils/logger.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
+class Logger {
+    static log(content) {
+        console.log(content);
+    }
+    static success(content) {
+        console.log(chalk_1.default.green(`✓ ${content}`));
+    }
+    static warning(content) {
+        console.log(chalk_1.default.yellow(`! ${content}`));
+    }
+    static error(content, { verbose } = { verbose: false }) {
+        if (verbose) {
+            console.log(content);
+        }
+        else {
+            console.log(chalk_1.default.red(`✘ ${content}`));
+        }
+    }
+    static upload(content) {
+        console.log(chalk_1.default.blue(`↑ ${content}`));
+    }
+    static download(content) {
+        console.log(chalk_1.default.yellow(`↓ ${content}`));
+    }
+}
+exports.default = Logger;

package/dist-cjs/utils/object-utils.js

@@ -0,0 +1,77 @@
+"use strict";
+/**
+ * General object utility functions
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractFields = exports.isObjectEmpty = exports.notNullish = void 0;
+/**
+ * Filter out null and undefined values from an object
+ * Keeps all properties that have defined values (including falsy values like 0, '', false)
+ *
+ * @param params - The object to filter
+ * @returns A new object with only non-nullish values
+ *
+ * @example
+ * notNullish({ a: 1, b: null, c: undefined, d: 0 }) // => { a: 1, d: 0 }
+ */
+const notNullish = (params) => {
+    return Object.keys(params).reduce((acc, key) => {
+        if (params[key] !== null && params[key] !== undefined) {
+            acc[key] = params[key];
+        }
+        return acc;
+    }, {});
+};
+exports.notNullish = notNullish;
+/**
+ * Check if an object is empty (has no own properties)
+ * Returns true for null, undefined, and empty objects {}
+ * Returns false for arrays (even empty ones) and objects with properties
+ *
+ * @param obj - The object to check
+ * @returns true if the object is empty, null, or undefined
+ *
+ * @example
+ * isObjectEmpty({}) // => true
+ * isObjectEmpty(null) // => true
+ * isObjectEmpty({ name: 'test' }) // => false
+ * isObjectEmpty([]) // => false (arrays are not plain objects)
+ */
+const isObjectEmpty = (obj) => {
+    if (obj) {
+        return Object.keys(obj).length === 0 && obj.constructor === Object;
+    }
+    else {
+        return true;
+    }
+};
+exports.isObjectEmpty = isObjectEmpty;
+/**
+ * Extract specific fields from an object based on a filter object
+ * Supports nested object extraction
+ *
+ * @param data - The source object to extract fields from
+ * @param filter - An object where true means include the field, nested objects for nested extraction
+ * @returns A new object containing only the specified fields
+ *
+ * @example
+ * const data = { name: 'hero', id: 123, schema: { title: 'text' } };
+ * extractFields(data, { name: true, id: true }) // => { name: 'hero', id: 123 }
+ *
+ * @example
+ * // Nested extraction
+ * extractFields(data, { schema: { title: true } }) // => { schema: { title: 'text' } }
+ */
+const extractFields = (data, filter) => {
+    const result = {};
+    for (const key in filter) {
+        if (filter[key] === true) {
+            result[key] = data[key];
+        }
+        else if (typeof filter[key] === "object") {
+            result[key] = (0, exports.extractFields)(data[key], filter[key]);
+        }
+    }
+    return result;
+};
+exports.extractFields = extractFields;

package/dist-cjs/utils/path-utils.js

@@ -0,0 +1,115 @@
+"use strict";
+/**
+ * Path and glob pattern utilities for file discovery
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compare = exports.filesPattern = exports.normalizeDiscover = void 0;
+const path_1 = __importDefault(require("path"));
+/**
+ * Normalizes an array of directory segments for glob pattern usage.
+ * Handles the glob.sync quirk where single segments don't need braces,
+ * but multiple segments need {segment1,segment2} format.
+ *
+ * @param segments - Array of directory path segments
+ * @returns Normalized string for glob pattern
+ *
+ * @example
+ * normalizeDiscover({ segments: [] }) // => ""
+ * normalizeDiscover({ segments: ["src"] }) // => "src"
+ * normalizeDiscover({ segments: ["src", "lib"] }) // => "{src,lib}"
+ */
+const normalizeDiscover = ({ segments, }) => {
+    if (segments.length === 0) {
+        return "";
+    }
+    if (segments.length === 1) {
+        return segments[0];
+    }
+    return `{${segments.join(",")}}`;
+};
+exports.normalizeDiscover = normalizeDiscover;
+/**
+ * Builds a glob file pattern for discovering files with a specific extension.
+ * Automatically handles single vs multiple directory paths.
+ *
+ * @param mainDirectory - The root directory to search from
+ * @param componentDirectories - Array of subdirectories to search in
+ * @param ext - File extension to match (without leading dot)
+ * @returns A glob pattern string
+ *
+ * @example
+ * filesPattern({
+ *   mainDirectory: "/project",
+ *   componentDirectories: ["src"],
+ *   ext: "sb.js"
+ * })
+ * // => "/project/src/**\/[^_]*.sb.js"
+ *
+ * filesPattern({
+ *   mainDirectory: "/project",
+ *   componentDirectories: ["src", "lib"],
+ *   ext: "sb.js"
+ * })
+ * // => "/project/{src,lib}/**\/[^_]*.sb.js"
+ */
+const filesPattern = ({ mainDirectory, componentDirectories, ext, }) => {
+    return componentDirectories.length === 1
+        ? path_1.default.join(`${mainDirectory}`, `${componentDirectories[0]}`, "**", `[^_]*.${ext}`)
+        : path_1.default.join(`${mainDirectory}`, `{${componentDirectories.join(",")}}`, "**", `[^_]*.${ext}`);
+};
+exports.filesPattern = filesPattern;
+/**
+ * Compares local and external file path arrays.
+ * Splits paths to extract file names, filters out duplicates from external
+ * (preferring local files), and filters out nested node_modules.
+ *
+ * @param request - Object containing local and external path arrays
+ * @returns CompareResult with processed local and external file elements
+ *
+ * @example
+ * compare({
+ *   local: ["/project/src/hero.sb.js"],
+ *   external: ["/project/node_modules/pkg/hero.sb.js", "/project/node_modules/pkg/card.sb.js"]
+ * })
+ * // => {
+ * //   local: [{ name: "hero.sb.js", p: "/project/src/hero.sb.js" }],
+ * //   external: [{ name: "card.sb.js", p: "/project/node_modules/pkg/card.sb.js" }]
+ * // }
+ */
+const compare = (request) => {
+    const { local, external } = request;
+    const splittedLocal = local.map((p) => {
+        return {
+            name: p.split(path_1.default.sep)[p.split(path_1.default.sep).length - 1], // last element of split array - file name
+            p,
+        };
+    });
+    const splittedExternal = external
+        .map((p) => {
+        return {
+            name: p.split(path_1.default.sep)[p.split(path_1.default.sep).length - 1], // last element of split array - file name
+            p,
+        };
+    })
+        .filter((file) => {
+        // Filter out files from nested node_modules (node_modules within node_modules)
+        const nodeModulesCount = (file.p.match(/node_modules/g) || [])
+            .length;
+        return nodeModulesCount <= 1;
+    });
+    // Filter external array to remove items that exist locally (local takes priority)
+    const result = {
+        local: splittedLocal,
+        external: splittedExternal.filter((externalComponent) => {
+            if (splittedLocal.find((localComponent) => externalComponent.name === localComponent.name)) {
+                return false;
+            }
+            return true;
+        }),
+    };
+    return result;
+};
+exports.compare = compare;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sb-mig",
-  "version": "5.5.4-beta.1",
+  "version": "5.6.0-beta.2",
   "description": "CLI to rule the world. (and handle stuff related to Storyblok CMS)",
   "author": "Marcin Krawczyk <marckraw@icloud.com>",
   "license": "MIT",
@@ -25,6 +25,11 @@
   "type": "module",
   "exports": {
     ".": "./dist/cli/index.js",
+    "./api-v2": {
+      "types": "./dist/api-v2/index.d.ts",
+      "import": "./dist/api-v2/index.js",
+      "require": "./dist-cjs/api-v2/index.js"
+    },
     "./dist/*": "./dist/*"
   },
   "engines": {
@@ -32,30 +37,47 @@
   },
   "files": [
     "/dist",
+    "/dist-cjs",
     "README.md"
   ],
   "scripts": {
     "lint-staged": "node ./src/scripts/fix-esm.js && lint-staged",
-    "build": "rm -rf dist && tsc -p tsconfig.json && chmod +x ./dist/cli/index.js",
-    "build:dev": "chokidar 'src/**/*.{js,ts,cjs,mjs}' -c 'yarn build'",
-    "build:dev:yalc": "chokidar 'src/**/*.{js,ts,cjs,mjs}' -c 'yarn build && yalc push'",
-    "build:test": "tsc -p tsconfig.test.json",
-    "build:test:dev": "chokidar '__tests__/**/*.ts' -c 'yarn build:test'",
+    "build": "rm -rf dist dist-cjs && tsc -p tsconfig.json && tsc -p tsconfig.api-v2.cjs.json && node ./src/scripts/write-cjs-package.js && chmod +x ./dist/cli/index.js",
+    "build:dev": "chokidar 'src/**/*.{js,ts,cjs,mjs}' -c 'npm run build'",
+    "build:dev:yalc": "chokidar 'src/**/*.{js,ts,cjs,mjs}' -c 'npm run build && yalc push'",
+    "lint": "eslint . --max-warnings=0",
     "lint:fix": "eslint --fix",
     "lint:all": "eslint .",
     "lint:fix:all": "eslint . --fix",
     "lint:ts": "cd src && tsc --declaration --emitDeclarationOnly && cd ..",
-    "test": "mocha ./dist-tests/__tests__ --require esm",
-    "start": "yarn build && ./dist/cli/index.js",
-    "debug": "yarn build && ./dist/cli/index.js sync components accordion accordion-item",
+    "typecheck": "tsc --noEmit",
+    "start": "npm run build && ./dist/cli/index.js",
+    "debug": "npm run build && ./dist/cli/index.js sync components accordion accordion-item",
     "semantic-release": "semantic-release",
     "prepare": "husky install",
-    "build:yalc": "yarn build && yalc push"
+    "build:yalc": "npm run build && yalc push",
+    "########## Tests ##########": "########################################################",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "test:unit": "vitest run --exclude=**/*.live.test.ts --exclude=**/*.e2e.test.ts",
+    "test:config": "vitest run __tests__/config",
+    "########## API Live Tests ##########": "########################################################",
+    "test:api-live": "STORYBLOK_LIVE_TESTS=true vitest run --testTimeout 60000 __tests__/api-live",
+    "test:api-live:spaces": "STORYBLOK_LIVE_TESTS=true vitest run --testTimeout 60000 __tests__/api-live/spaces",
+    "test:api-live:components": "STORYBLOK_LIVE_TESTS=true vitest run --testTimeout 60000 __tests__/api-live/components",
+    "test:api-live:stories": "STORYBLOK_LIVE_TESTS=true vitest run --testTimeout 60000 __tests__/api-live/stories",
+    "########## E2E Tests ##########": "########################################################",
+    "test:e2e": "STORYBLOK_E2E_TESTS=true vitest run --testTimeout 120000 __tests__/e2e",
+    "test:e2e:cli": "STORYBLOK_E2E_TESTS=true vitest run --testTimeout 120000 __tests__/e2e/cli-basic",
+    "test:e2e:sync": "STORYBLOK_E2E_TESTS=true vitest run --testTimeout 120000 __tests__/e2e/sync-components",
+    "########## All Tests ##########": "########################################################",
+    "test:all": "npm run test:unit && npm run test:api-live && npm run test:e2e"
   },
   "dependencies": {
     "@swc/core": "1.3.41",
     "@swc/helpers": "0.4.14",
-    "chalk": "^5.3.0",
+    "chalk": "^4.1.2",
     "dotenv": "^16.4.5",
     "form-data": "^4.0.0",
     "fs-extra": "^11.2.0",
@@ -66,7 +88,7 @@
     "rollup": "^3.28.0",
     "rollup-plugin-ts": "^3.4.4",
     "semver": "^7.6.2",
-    "storyblok-js-client": "^5.12.0",
+    "storyblok-js-client": "5.12.0",
     "storyblok-schema-types": "^1.2.4",
     "typescript": "^5.1.6",
     "uuid": "^9.0.0"
@@ -81,30 +103,25 @@
     "@semantic-release/git": "^10.0.1",
     "@sindresorhus/tsconfig": "^3.0.1",
     "@storyblok/react": "^3.0.10",
-    "@types/chai": "^4.3.10",
     "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
-    "@types/mocha": "^10.0.4",
     "@types/ncp": "^2.0.8",
     "@types/node": "18.16.18",
-    "@types/sinon": "^10.0.16",
     "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^6.4.1",
     "@typescript-eslint/parser": "^6.4.1",
-    "chai": "^4.3.10",
+    "@vitest/coverage-v8": "^2.1.0",
     "chokidar-cli": "^3.0.0",
     "eslint": "^8.47.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.1",
-    "esm": "^3.2.25",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.3",
-    "mocha": "^10.2.0",
     "prettier": "^3.0.3",
     "semantic-release": "^21.0.9",
     "semantic-release-slack-bot": "^4.0.1",
-    "sinon": "^15.2.0",
-    "tsc-files": "^1.1.4"
+    "tsc-files": "^1.1.4",
+    "vitest": "^2.1.0"
   },
   "config": {
     "commitizen": {

package/dist/utils/pkg-require.d.ts

@@ -1,2 +0,0 @@
-declare const pkg: (path: string) => any;
-export { pkg };

package/dist/utils/pkg-require.js

@@ -1,4 +0,0 @@
-const pkg = (path) => {
-    return require(path);
-};
-export { pkg };