@applicaster/zapplicaster-cli 15.1.0-rc.3 → 16.0.0-alpha.7128076344

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapplicaster-cli",
-  "version": "15.1.0-rc.3",
+  "version": "16.0.0-alpha.7128076344",
   "description": "CLI Tool for the zapp app and Quick Brick project",
   "main": "index.js",
   "publishConfig": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/zapp-react-dom-cli-template": "15.1.0-rc.3",
-    "@applicaster/zapp-react-native-android-tv-cli-template": "15.1.0-rc.3",
-    "@applicaster/zapp-react-native-cli-template": "15.1.0-rc.3",
-    "@applicaster/zapp-react-native-tvos-cli-template": "15.1.0-rc.3",
+    "@applicaster/zapp-react-dom-cli-template": "16.0.0-alpha.7128076344",
+    "@applicaster/zapp-react-native-android-tv-cli-template": "16.0.0-alpha.7128076344",
+    "@applicaster/zapp-react-native-cli-template": "16.0.0-alpha.7128076344",
+    "@applicaster/zapp-react-native-tvos-cli-template": "16.0.0-alpha.7128076344",
     "axios": "^0.28.0",
     "camelize": "^1.0.0",
     "chalk": "^2.3.2",

package/src/commands/index.js

@@ -117,7 +117,7 @@ const commands = [
       ["-g, --skip-git", "Doesn't commit changes to git"],
       [
         "-s, --single-platform [singlePlatform]",
-        "Platform to deploy. Ommit to publish for all supported platforms",
+        "Platform to deploy. Omit to publish for all supported platforms",
       ],
       [
         "-m, --manifest-only",

package/src/commands/prepareWorkspace/appBootstrapper.js

@@ -1,8 +1,7 @@
 const R = require("ramda");
 const fs = require("fs");
 const semver = require("semver");
-const { resolve, join } = require("path");
-const { existsSync } = require("fs");
+const { resolve } = require("path");
 const packageJSON = require("../../../package.json");
 
 const {
@@ -31,36 +30,6 @@ const {
 
 const { buildMobileApp } = require("./buildMobile");
 
-async function patchPackages() {
-  if (existsSync(join(process.cwd(), "quick_brick", "patch_rn.js"))) {
-    exec(`node ${process.cwd()}/quick_brick/patch_rn.js`);
-  } else if (
-    existsSync(join(process.cwd(), "development-app", "patch_rn.js"))
-  ) {
-    exec(`node ${process.cwd()}/development-app/patch_rn.js`);
-  } else if (
-    existsSync(
-      join(
-        process.cwd(),
-        "packages",
-        "zapp-react-dom-development-app",
-        "patch_rn.js"
-      )
-    )
-  ) {
-    const pathToFile = join(
-      process.cwd(),
-      "packages",
-      "zapp-react-dom-development-app",
-      "patch_rn.js"
-    );
-
-    exec(`node ${pathToFile}`);
-  } else {
-    logger.log("Cannot patch packages, can't find the patch_rn.js file");
-  }
-}
-
 /**
  * fallback to en for missing dayjslocalization
  * converts the locale code to a dayjs compatible locale code
@@ -132,7 +101,12 @@ async function appBootstrapper(configuration) {
 
   const { templatePath, filesToCopy } = template.files;
 
-  copyFiles(templatePath, filesToCopy, quickBrickProjectPath, configuration);
+  await copyFiles(
+    templatePath,
+    filesToCopy,
+    quickBrickProjectPath,
+    configuration
+  );
 
   logger.log("injecting dependencies...");
   const { dependencies, scripts } = template;
@@ -216,8 +190,6 @@ async function appBootstrapper(configuration) {
   const quickBrickVersion = packageJSON.version;
   checkAllPluginsSatisfiesQuickBrickVersion({ quickBrickVersion, plugins });
 
-  await patchPackages();
-
   if (buildMobile) {
     await buildMobileApp(configuration);
   }

package/src/commands/publishPlugin/__tests__/generateManifest.test.js

@@ -42,9 +42,19 @@ function clearMocks() {
 describe("generate manifest", () => {
   beforeEach(clearMocks);
 
-  it("doesn't create the manifest if there is no platform", () => {
+  it("throws if an invalid platform is provided", async () => {
+    const configuration = getConfig({
+      platforms: ["android", "invalid_platform"],
+    });
+
+    await expect(generateManifest(configuration)).rejects.toThrow(
+      /Invalid platform provided/
+    );
+  });
+
+  it("doesn't create the manifest if there is no platform", async () => {
     const configuration = getConfig({ platforms: undefined });
-    expect(generateManifest(configuration)).resolves.toBe(true);
+    await expect(generateManifest(configuration)).resolves.toBe(true);
     expect(writeJsonToFile).not.toHaveBeenCalled();
   });
 
@@ -91,12 +101,11 @@ describe("generate manifest", () => {
 
   it("throws if the config file cannot be found", async () => {
     const configuration = getConfig({ pluginPath: "resolve_error" });
-
-    expect(generateManifest(configuration)).rejects.toMatchSnapshot();
+    await expect(generateManifest(configuration)).rejects.toMatchSnapshot();
   });
 
   it("throws if the manifests cannot be written", async () => {
     const configuration = getConfig({ pluginPath: "write_error" });
-    expect(generateManifest(configuration)).rejects.toMatchSnapshot();
+    await expect(generateManifest(configuration)).rejects.toMatchSnapshot();
   });
 });

package/src/commands/publishPlugin/generateManifest.js

@@ -1,4 +1,3 @@
-const R = require("ramda");
 const { resolve } = require("path");
 const { inspect } = require("util");
 
@@ -48,6 +47,19 @@ function renderManifest({
   };
 }
 
+const validPlatforms = [
+  "lg_tv",
+  "samsung_tv",
+  "vizio",
+  "android_tv_for_quickbrick",
+  "amazon_fire_tv_for_quickbrick",
+  "tvos_for_quickbrick",
+  "android_for_quickbrick",
+  "ios_for_quickbrick",
+  "ios",
+  "android",
+];
+
 async function generateManifest(configuration) {
   const { pluginPath, platforms, version, dryRun } = configuration;
 
@@ -57,6 +69,12 @@ async function generateManifest(configuration) {
     return true;
   }
 
+  if (!platforms.every((platform) => validPlatforms.includes(platform))) {
+    throw new Error(
+      `Invalid platform provided. Valid platforms are: ${validPlatforms.join(", ")}`
+    );
+  }
+
   try {
     const manifestConfig = require(
       resolve(pluginPath, "manifests/manifest.config.js")
@@ -72,7 +90,7 @@ async function generateManifest(configuration) {
       dryRun,
     });
 
-    return Promise.all(R.map(manifestRenderer, platforms));
+    return Promise.all(platforms.map(manifestRenderer));
   } catch (e) {
     throw new Error(
       "An error occured when generating the manifest: " + e.message

package/src/file/__tests__/__snapshots__/file.test.js.snap

@@ -5,10 +5,27 @@ exports[`copyFiles when destination path has no package.json doesn't skips the c
   [
     "some/source/path/foo.json",
     "some/destination/Path/foo.json",
+    [Function],
   ],
   [
     "some/source/path/package.json",
     "some/destination/Path/package.json",
+    [Function],
+  ],
+]
+`;
+
+exports[`copyFiles when there is no package.json to copy copies the dir 1`] = `
+[
+  [
+    "some/source/path/files/file1.txt",
+    "some/destination/Path/files/file1.txt",
+    [Function],
+  ],
+  [
+    "some/source/path/files/file2.txt",
+    "some/destination/Path/files/file2.txt",
+    [Function],
   ],
 ]
 `;
@@ -18,10 +35,12 @@ exports[`copyFiles when there is no package.json to copy copies the files 1`] =
   [
     "some/source/path/foo.json",
     "some/destination/Path/foo.json",
+    [Function],
   ],
   [
     "some/source/path/bar.json",
     "some/destination/Path/bar.json",
+    [Function],
   ],
 ]
 `;

package/src/file/__tests__/file.test.js

@@ -38,14 +38,27 @@ describe("copyFiles", () => {
     fs.writeFile("foo.json", { foo: "bar" }, jest.fn());
     fs.writeFile("bar.json", { bar: "baz" }, jest.fn());
     fs.writeFile("qux.json", { qux: 42 }, jest.fn());
-    fs.copyFileSync.mockClear();
+    fs.copyFile.mockClear();
+    fs.readdir.mockClear();
   });
 
   describe("when there is no package.json to copy", () => {
-    it("copies the files", () => {
-      copyFiles(sourcePath, ["foo.json", "bar.json"], destinationPath);
-      expect(fs.copyFileSync).toHaveBeenCalledTimes(2);
-      expect(fs.copyFileSync.mock.calls).toMatchSnapshot();
+    it("copies the files", async () => {
+      await copyFiles(sourcePath, ["foo.json", "bar.json"], destinationPath);
+      expect(fs.copyFile).toHaveBeenCalledTimes(2);
+      expect(fs.copyFile.mock.calls).toMatchSnapshot();
+    });
+
+    it("copies the dir", async () => {
+      // Mock fs.readdir to return some files when the directory is read
+      fs.readdir.mockImplementationOnce((path, callback) => {
+        callback(null, ["file1.txt", "file2.txt"]);
+      });
+
+      await copyFiles(sourcePath, ["files/"], destinationPath);
+
+      expect(fs.copyFile).toHaveBeenCalledTimes(2);
+      expect(fs.copyFile.mock.calls).toMatchSnapshot();
     });
   });
 
@@ -60,29 +73,40 @@ describe("copyFiles", () => {
       fs.__resetFiles();
     });
 
-    it("overrides it", () => {
+    it("overrides it", async () => {
       const sourcePath = "some/source/path";
       const destinationPath = "some/destination/Path";
 
-      copyFiles(sourcePath, ["foo.json", "package.json"], destinationPath);
-      expect(fs.copyFileSync).toHaveBeenCalledTimes(2);
+      await copyFiles(
+        sourcePath,
+        ["foo.json", "package.json"],
+        destinationPath
+      );
+
+      expect(fs.copyFile).toHaveBeenCalledTimes(2);
 
-      expect(fs.copyFileSync).toHaveBeenCalledWith(
+      expect(fs.copyFile).toHaveBeenCalledWith(
         `${sourcePath}/foo.json`,
-        `${destinationPath}/foo.json`
+        `${destinationPath}/foo.json`,
+        expect.any(Function)
       );
     });
   });
 
   describe("when destination path has no package.json", () => {
-    it("doesn't skips the copy", () => {
+    it("doesn't skips the copy", async () => {
       const sourcePath = "some/source/path";
       const destinationPath = "some/destination/Path";
 
-      copyFiles(sourcePath, ["foo.json", "package.json"], destinationPath);
-      expect(fs.copyFileSync).toHaveBeenCalledTimes(2);
+      await copyFiles(
+        sourcePath,
+        ["foo.json", "package.json"],
+        destinationPath
+      );
+
+      expect(fs.copyFile).toHaveBeenCalledTimes(2);
 
-      expect(fs.copyFileSync.mock.calls).toMatchSnapshot();
+      expect(fs.copyFile.mock.calls).toMatchSnapshot();
       expect(logger.warn).not.toHaveBeenCalled();
     });
   });
@@ -100,7 +124,7 @@ describe("copyFolder", () => {
   });
 
   beforeEach(() => {
-    fs.copyFileSync.mockClear();
+    fs.copyFile.mockClear();
   });
 
   it("copies the file in the folder", async () => {
@@ -110,7 +134,7 @@ describe("copyFolder", () => {
     await copyFolder(sourcePath, destinationPath);
 
     expect(fs.readdir).toHaveBeenCalledWith(sourcePath, expect.any(Function));
-    expect(fs.copyFileSync).toHaveBeenCalledTimes(2);
+    expect(fs.copyFile).toHaveBeenCalledTimes(2);
   });
 
   afterAll(() => {

package/src/file/index.js

@@ -5,7 +5,16 @@ const R = require("ramda");
  * @module @applicaster/zapplicaster-cli/util/file
  */
 
-const { writeFile, readFile, readdir, copyFile, copyFileSync } = require("fs");
+const {
+  writeFile,
+  readFile,
+  readdir,
+  copyFile,
+  lstatSync,
+  mkdirSync,
+  existsSync,
+} = require("fs");
+
 const { promisify } = require("util");
 const { join } = require("path");
 
@@ -66,19 +75,43 @@ function destinationFileNameMapper(destinationFileName) {
  * @param {String} destination path
  * @returns {Promise[]} array of promises with the status of the copied files
  */
-function copyFiles(source, filesOrFilesGetter, destination, config) {
+async function copyFiles(source, filesOrFilesGetter, destination, config) {
   const files =
     typeof filesOrFilesGetter === "function"
       ? filesOrFilesGetter(config)
       : filesOrFilesGetter;
 
-  return R.map(
-    (file) =>
-      copyFileSync(
-        join(source, file),
-        destinationFileNameMapper(join(destination, file))
-      ),
-    files
+  return Promise.all(
+    R.map(async (file) => {
+      let sourcePath, destinationPath;
+
+      try {
+        if (Array.isArray(file)) {
+          sourcePath = join(source, file[0]);
+
+          destinationPath = destinationFileNameMapper(
+            join(destination, file[1])
+          );
+        } else {
+          sourcePath = join(source, file);
+          destinationPath = destinationFileNameMapper(join(destination, file));
+        }
+
+        if (lstatSync(sourcePath).isDirectory()) {
+          if (!existsSync(destinationPath)) {
+            mkdirSync(destinationPath, { recursive: true });
+          }
+
+          return await copyFolder(sourcePath, destinationPath);
+        }
+
+        return await copyFileAsync(sourcePath, destinationPath);
+      } catch (error) {
+        throw new Error(
+          `Failed to copy "${sourcePath}" to "${destinationPath}": ${error.message}`
+        );
+      }
+    }, files)
   );
 }
 

package/test_helpers/fsMock.js

@@ -2,6 +2,10 @@ const fs = jest.genMockFromModule("fs");
 const _fs = jest.requireActual("fs");
 const R = require("ramda");
 
+function mkdirSync() {
+  return undefined;
+}
+
 function readdirSync(folder) {
   return _fs.readdirSync(folder);
 }
@@ -77,10 +81,16 @@ function __resetFiles() {
   fs.__writenFiles = [];
 }
 
+fs.lstatSync = (_path) => ({
+  isDirectory: () => _path.endsWith("/"),
+  isFile: () => _path.endsWith("/") === false,
+});
+
 fs.__writenFiles = [];
 fs.__resetFiles = __resetFiles;
 fs.__addMockedFiles = __addMockedFiles;
 fs.readdirSync = readdirSync;
+fs.mkdirSync = mkdirSync;
 fs.readdir = jest.fn(readdir);
 fs.writeFile = jest.fn(writeFile);
 fs.readFile = jest.fn(readFile);